Changeset 4197 for trunk/src/kernel32

Timestamp:

Sep 5, 2000, 10:35:40 PM (25 years ago)

Author:

sandervl

Message:

RegSetValue workaround + HMOpenFile fix

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (2 diffs)
• registry.cpp (modified) (2 diffs)
• virtual.cpp (modified) (2 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.47 2000-09-03 09:32:06 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.48 2000-09-05 20:35:38 sandervl Exp $ */
 
 /*
@@ -1010 +1010 @@
                      &pHMHandleData->dwShare);
 
-  pHMHandleData->dwCreation = 0;
+  //SvL; Must be OPEN_EXISTING because mmaps depend on it (to duplicate
+  //     the file handle when this handle is a parameter for CreateFileMappingA/W
+  pHMHandleData->dwCreation = OPEN_EXISTING;
   pHMHandleData->dwFlags    = 0;
   pHMHandleData->lpHandlerData = NULL;

trunk/src/kernel32/registry.cpp

@@ -1 @@
-/* $Id: registry.cpp,v 1.2 2000-06-08 18:08:56 sandervl Exp $ */
+/* $Id: registry.cpp,v 1.3 2000-09-05 20:35:39 sandervl Exp $ */
 
 /*
@@ -899 +899 @@
                                  DWORD, cbData)
 {
+ LONG rc;
+
   //SvL: 8-11-'97: Bugfix: crash in pmwinx if size == 0 and string is large
   if(cbData == 0)
     cbData = strlen(lpData);
 
-  return(_O32_RegSetValue(ConvertKey(hkey),
+  rc = _O32_RegSetValue(ConvertKey(hkey),
                          lpSubKey,
                          dwType,
                          lpData,
-                         cbData));
+                         cbData);
+  if(rc == ERROR_NOT_ENOUGH_MEMORY && cbData == 0 && dwType == REG_SZ) 
+  {
+    char regdata = 0;
+        //SvL: Netscape sets an empty string key this way; Open32 doesn't like it
+        rc = _O32_RegSetValue(ConvertKey(hkey),
+                         lpSubKey,
+                         dwType,
+                         &regdata,
+                         1);
+  }
+  return rc;
 }
 

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.32 2000-08-11 18:42:55 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.33 2000-09-05 20:35:40 sandervl Exp $ */
 
 /*
@@ -52 +52 @@
                 LPCSTR name      /* [in] Name of file-mapping object */ )
 {
+ HANDLE hFileMap;
+
    dprintf(("CreateFileMappingA: %x %x %x%x %s", hFile, protect, size_high, size_low, name));
-   return HMCreateFileMapping(hFile, sa, protect, size_high, size_low, name);
+   hFileMap = HMCreateFileMapping(hFile, sa, protect, size_high, size_low, name);
+   dprintf(("CreateFileMappingA returned %x", hFileMap));
+   return hFileMap;
 }