Changeset 9482 for trunk/src

Timestamp:

Dec 10, 2002, 7:52:16 PM (23 years ago)

Author:

sandervl

Message:

Closing a root key should just return success

File:

• trunk/src/kernel32/registry.cpp (modified) (4 diffs)

trunk/src/kernel32/registry.cpp

@@ -1 @@
-/* $Id: registry.cpp,v 1.18 2002-06-25 10:27:00 sandervl Exp $ */
+/* $Id: registry.cpp,v 1.19 2002-12-10 18:52:16 sandervl Exp $ */
 
 /*
@@ -112 +112 @@
 LONG WIN32API RegCloseKey(HKEY hKey)
 {
-  return O32_RegCloseKey(ConvertKey(hKey));
+    switch(hKey) 
+    {//Closing a root key should just return success (matters for custom builds)
+    case HKEY_CLASSES_ROOT:
+    case HKEY_CURRENT_USER:
+    case HKEY_LOCAL_MACHINE:
+    case HKEY_USERS:
+        return 0;
+    }
+    return O32_RegCloseKey(ConvertKey(hKey));
 }
 
@@ -842 +850 @@
             free(astring2);
     }
+  }
+
+  if((rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) && 
+     lpszValue == NULL && pcbValue) 
+  {
+      *pcbValue = *pcbValue * sizeof(WCHAR); //size in bytes!!
   }
   
@@ -971 +985 @@
       }
   }
-  
+
+  if((rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) && 
+     lpbData == NULL && lpcbData) 
+  {
+      switch(*lpdwType) {
+      case REG_SZ:
+      case REG_EXPAND_SZ:
+      case REG_MULTI_SZ:
+      case REG_LINK: //???
+          *lpcbData = *lpcbData * sizeof(WCHAR); //size in bytes!!
+          break;
+      }
+  }
+
   if (NULL != astring)
     FreeAsciiString(astring);