Changeset 1582 for trunk/gsinstaller

Timestamp:

2000-10-04T04:48:28+13:00 (24 years ago)

Author:

cs025

Message:

Improved tolerance to odd win32s installations by checking for w32sys.dll
in the windows\system folder as well as in the windows\system\win32s folder.

File:

• trunk/gsinstaller/gs16bit.cpp (modified) (1 diff)

trunk/gsinstaller/gs16bit.cpp

@@ -75 +75 @@
     OFSTRUCT of;
 
-    if (GetSystemDirectory(buffer, MAX_PATH) != 0)
-  { if (!appendPath(buffer, "win32s\\w32sys.dll", MAX_PATH))
-    { return FALSE;
-    }
-    strcpy(buffer, "win32s\\w32.dll");
+    if (GetSystemDirectory(buffer, MAX_PATH) == 0)
+  { return true;
+  }
+
+  if (!appendPath(buffer, "win32s\\w32sys.dll", MAX_PATH))
+  { return FALSE;
+  }
+
+  strcpy(buffer, "win32s\\w32.dll");
+  if (OpenFile((LPCSTR) buffer, (LPOFSTRUCT) &of, OF_EXIST) == HFILE_ERROR)
+  { // try system directory directly; no need to error check - we know that
+    // we don't have a length problem
+    GetSystemDirectory(buffer, MAX_PATH);
+    appendPath(buffer, "w32sys.dll", MAX_PATH);
+
+    // if it isn't there either, return false
     if (OpenFile((LPCSTR) buffer, (LPOFSTRUCT) &of, OF_EXIST) == HFILE_ERROR)
-    { return false;
+    {   return false;
     }
   }