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

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/kernel32/registry.cpp (modified) (23 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/kernel32/registry.cpp

@@ -79 +79 @@
 }
 
+extern "C" {
+
 void WIN32API SetRegistryRootKey(HKEY hRootkey, HKEY hKey)
 {
   switch((DWORD)hRootkey)
   {
-    case HKEY_CLASSES_ROOT:   
+    case HKEY_CLASSES_ROOT:
         hKeyClassesRoot = hKey;
         break;
@@ -112 +114 @@
 LONG WIN32API RegCloseKey(HKEY hKey)
 {
-    switch(hKey) 
+    switch(hKey)
     {//Closing a root key should just return success (matters for custom builds)
     case HKEY_CLASSES_ROOT:
@@ -166 +168 @@
                         astring,
                         phkResult);
-  
+
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   return(rc);
 }
@@ -247 +249 @@
                           phkResult,
                           lpdwDisposition);
-  
+
   if (NULL != astring1)
     FreeAsciiString(astring1);
-  
+
   if (NULL != astring2)
     FreeAsciiString(astring2);
-  
+
   return(rc);
 }
@@ -278 +280 @@
   rc = O32_RegDeleteKey(ConvertKey(hKey),
                         astring);
-  
+
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   return(rc);
 }
@@ -317 +319 @@
  *****************************************************************************/
 
-LONG WIN32API RegDeleteValueA(HKEY hKey, LPSTR lpszValue)
+LONG WIN32API RegDeleteValueA(HKEY hKey, LPCSTR lpszValue)
 {
   return O32_RegDeleteValue(ConvertKey(hKey),
@@ -336 +338 @@
  *****************************************************************************/
 
-LONG WIN32API RegDeleteValueW(HKEY hKey, LPWSTR lpszValue)
+LONG WIN32API RegDeleteValueW(HKEY hKey, LPCWSTR lpszValue)
 {
   char *astring = UnicodeToAsciiString(lpszValue);
@@ -343 +345 @@
   rc = O32_RegDeleteValue(ConvertKey(hKey),
                           astring);
-  
+
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   return(rc);
 }
@@ -385 +387 @@
  *****************************************************************************/
 
-LONG WIN32API RegEnumKeyW(HKEY  hKey, DWORD  iSubKey, LPWSTR lpszName,                          
+LONG WIN32API RegEnumKeyW(HKEY  hKey, DWORD  iSubKey, LPWSTR lpszName,
                           DWORD cchName)
 {
@@ -529 +531 @@
  * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
  *****************************************************************************/
- 
+
 LONG WIN32API RegEnumValueW(HKEY    hkey,
                             DWORD   iValue,
@@ -638 +640 @@
   if(rc)
     *arg3 = 0;
-  
+
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   return(rc);
 }
@@ -705 +707 @@
   if(rc)
     *arg5 = 0;
-  
+
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   return(rc);
 }
@@ -741 +743 @@
                                lpcchClass, lpdwReserved, lpcSubKeys,
                                lpcchMaxSubKey, lpcchMaxClass, lpcValues,
-                               lpcchMaxValueName, lpcbMaxValueData, 
+                               lpcchMaxValueName, lpcbMaxValueData,
                                lpcbSecurityDescriptor,lpftLastWriteTime);
 }
@@ -776 +778 @@
                              lpcchClass, lpdwReserved, lpcSubKeys,
                              lpcchMaxSubKey, lpcchMaxClass, lpcValues,
-                             lpcchMaxValueName, lpcbMaxValueData, 
+                             lpcchMaxValueName, lpcbMaxValueData,
                              lpcbSecurityDescriptor,lpftLastWriteTime);
     if(rc == ERROR_SUCCESS)
@@ -786 +788 @@
             free(astring);
         }
-        else 
+        else
         if(lpszClass) *lpszClass = 0;
     }
@@ -852 +854 @@
   }
 
-  if((rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) && 
-     pcbValue) 
+  if((rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) &&
+     pcbValue)
   {
       *pcbValue = *pcbValue * sizeof(WCHAR); //size in bytes!!
   }
-  
+
   if (NULL != astring1)
     FreeAsciiString(astring1);
-  
+
   return(rc);
 }
@@ -986 +988 @@
   }
 
-  if((rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) && 
-     lpcbData) 
+  if((rc == ERROR_SUCCESS || rc == ERROR_MORE_DATA) &&
+     lpcbData)
   {
       switch(*lpdwType) {
@@ -1001 +1003 @@
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   if(akeydata)
     free(akeydata);
@@ -1073 +1075 @@
 
   rc = RegSetValueA(hkey, astring1, dwType, astring2, cbData);
-  
+
   if (NULL != astring1)
     FreeAsciiString(astring1);
-  
+
   if (NULL != astring2)
     FreeAsciiString(astring2);
-  
+
   return(rc);
 }
@@ -1100 +1102 @@
                              DWORD  dwReserved,
                              DWORD  fdwType,
-                             BYTE*  lpbData,
+                             const BYTE *lpbData,
                              DWORD  cbData)
 {
@@ -1165 +1167 @@
                              DWORD  dwReserved,
                              DWORD  fdwType,
-                             BYTE*  lpbData,
+                             const BYTE *lpbData,
                              DWORD  cbData)
 {
@@ -1184 +1186 @@
   }
   rc = RegSetValueExA(hkey, astring, dwReserved, fdwType, lpbData, cbData);
-  
+
   if(akeydata)
     FreeAsciiString(akeydata);
-  
+
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   return(rc);
 }
@@ -1715 +1717 @@
 }
 
+} // extern "C"
+

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk