Changeset 10169 for trunk/tools/install/odininst.cpp

Timestamp:

Jul 16, 2003, 12:51:10 PM (22 years ago)

Author:

sandervl

Message:

YD: check if program files registry entry already exists and verify it's valid

File:

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

trunk/tools/install/odininst.cpp

@@ -1 @@
-/* $Id: odininst.cpp,v 1.13 2003-01-07 20:01:47 sandervl Exp $ */
+/* $Id: odininst.cpp,v 1.14 2003-07-16 10:51:10 sandervl Exp $ */
 /*
  * Odin WarpIn installation app
@@ -34 +34 @@
  */
 #include <os2win.h>
+#include <io.h>
 #include <string.h>
 #include <stdio.h>
@@ -592 +593 @@
     goto initreg_error;
    }
-   //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);
+   //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);
+   }
 
    strcpy(shellpath, InternalGetWindowsDirectory());