Changeset 3678 for trunk/src/kernel32/registry.cpp

Timestamp:

Jun 8, 2000, 8:08:58 PM (25 years ago)

Author:

sandervl

Message:

RegQueryValueW, OpenFile and LoadLibrary fixes

File:

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

trunk/src/kernel32/registry.cpp

@@ -1 @@
-/* $Id: registry.cpp,v 1.1 2000-03-03 11:15:59 sandervl Exp $ */
+/* $Id: registry.cpp,v 1.2 2000-06-08 18:08:56 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
 #include "unicode.h"
 #include <winreg.h>
+
+#define DBG_LOCALLOG    DBG_registry
+#include "dbglocal.h"
 
 
@@ -789 +792 @@
 
 ODINFUNCTION4(LONG,RegQueryValueW,HKEY,   hkey,
-                                   LPCWSTR,lpszSubKey,
-                                   LPWSTR, lpszValue,
-                                   PLONG,  pcbValue)
+                                  LPCWSTR,lpszSubKey,
+                                  LPWSTR, lpszValue,
+                                  PLONG,  pcbValue)
 {
   char *astring1 = UnicodeToAsciiString((LPWSTR)lpszSubKey);
@@ -803 +806 @@
   if(rc == ERROR_SUCCESS)
   {
-    astring2 = (char *)malloc(*pcbValue);
-    strcpy(astring2, (char *)lpszValue);
-    AsciiToUnicode(astring2, lpszValue);
-    free(astring2);
+        if(pcbValue) {
+                astring2 = (char *)malloc(*pcbValue);
+                strcpy(astring2, (char *)lpszValue);
+                AsciiToUnicode(astring2, lpszValue);
+                free(astring2);
+        }
   }
+  FreeAsciiString(astring1);
   return(rc);
 }
@@ -918 +924 @@
 
 ODINFUNCTION5(LONG,RegSetValueW,HKEY,   hkey,
-                                 LPCWSTR,lpSubKey,
-                                 DWORD,  dwType,
-                                 LPCWSTR,lpData,
-                                 DWORD,  cbData)
+                                LPCWSTR,lpSubKey,
+                                DWORD,  dwType,
+                                LPCWSTR,lpData,
+                                DWORD,  cbData)
 {
   char *astring1 = UnicodeToAsciiString((LPWSTR)lpSubKey);
@@ -956 +962 @@
 
 ODINFUNCTION6(LONG,RegSetValueExA,HKEY,  arg1,
-                                   LPSTR, arg2,
-                                   DWORD, arg3,
-                                   DWORD, arg4,
-                                   BYTE*, arg5,
-                                   DWORD, arg6)
+                                  LPSTR, arg2,
+                                  DWORD, arg3,
+                                  DWORD, arg4,
+                                  BYTE*, arg5,
+                                  DWORD, arg6)
 {
   return _O32_RegSetValueEx(ConvertKey(arg1),