Changeset 21679

Timestamp:

Sep 30, 2011, 5:58:09 PM (14 years ago)

Author:

dmik

Message:

odininst: Create "Program Files" in WINDOWSDIR instead of drive root.

File:

• trunk/tools/install/odininst.cpp (modified) (4 diffs)

trunk/tools/install/odininst.cpp ¶

@@ -4 +4 @@
  *
  *  Creates:
- *      - SYSTEMDIR\drivers
- *      - SYSTEMDIR\drivers\etc
+ *  - SYSTEMDIR\drivers
+ *  - SYSTEMDIR\drivers\etc
  *  - WINDOWSDIR\SYSTEM
- *      - WINDOWSDIR\AppData
- *      - WINDOWSDIR\Cache
- *      - WINDOWSDIR\Cookies
+ *  - WINDOWSDIR\AppData
+ *  - WINDOWSDIR\Cache
+ *  - WINDOWSDIR\Cookies
  *  - WINDOWSDIR\Desktop
  *  - WINDOWSDIR\Favorites
  *  - WINDOWSDIR\Fonts
- *      - WINDOWSDIR\History
+ *  - WINDOWSDIR\History
  *  - WINDOWSDIR\NetHood
  *  - WINDOWSDIR\My Documents
@@ -23 +23 @@
  *  - WINDOWSDIR\Start Menu\Programs\Startup
  *  - WINDOWSDIR\ShellNew
- *      - x:\Program Files
- *      - x:\Program Files\Common Files
+ *  - WINDOWSDIR\Program Files
+ *  - WINDOWSDIR\Program Files\Common Files
  *  - WINDOWSDIR\Temp
  *  - and a minimal system registry
@@ -593 +593 @@
     goto initreg_error;
    }
-   //Check if DIR_PROGRAM already created
-   val = sizeof(shellpath);
-   if (RegQueryValueEx(hkey, DIR_PROGRAM, 0, NULL, (LPBYTE)shellpath, &val) != ERROR_SUCCESS 
-       || GetFileAttributes( shellpath) == -1) {
-      //Create x:\Program Files directory
-      strcpy(shellpath, InternalGetWindowsDirectory());
-      shellpath[2] = 0;    //get drive
-      strcat(shellpath, "\\Program Files");
-      CreateDirectory(shellpath, NULL);
-      RegSetValueEx(hkey, DIR_PROGRAM, 0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-
-      //Create x:\Program Files\Common Files directory
-      strcat(shellpath, "\\Common Files");
-      CreateDirectory(shellpath, NULL);
-      RegSetValueEx(hkey, DIR_PROGRAM_COMMON, 0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-   }
+
+   //Create Program Files directory
+   strcpy(shellpath, InternalGetWindowsDirectory());
+   strcat(shellpath, "\\Program Files");
+   CreateDirectory(shellpath, NULL);
+   RegSetValueEx(hkey, DIR_PROGRAM, 0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
+
+   //Create Program Files\Common Files directory
+   strcat(shellpath, "\\Common Files");
+   CreateDirectory(shellpath, NULL);
+   RegSetValueEx(hkey, DIR_PROGRAM_COMMON, 0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
 
    strcpy(shellpath, InternalGetWindowsDirectory());
@@ -807 +802 @@
    strcpy(shellpath, InternalGetWindowsDirectory());
    strcat(shellpath, "\\system.ini");
-   
+
    if(GetPrivateProfileStringA(szMci, szCDAudio, szMciCDA, &temp, 0, shellpath) <= 1) {
       WritePrivateProfileStringA(szMci, szCDAudio, szMciCDA, shellpath);