Changeset 8693

Timestamp:

Jun 16, 2002, 10:20:16 AM (23 years ago)

Author:

sandervl

Message:

Expand string when converting REG_EXPAND_SZ to REG_SZ

File:

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

trunk/src/kernel32/registry.cpp ¶

@@ -1 @@
-/* $Id: registry.cpp,v 1.16 2002-06-15 17:16:06 sandervl Exp $ */
+/* $Id: registry.cpp,v 1.17 2002-06-16 08:20:16 sandervl Exp $ */
 
 /*
@@ -1033 +1033 @@
  *****************************************************************************/
 
-LONG WIN32API RegSetValueExA(HKEY  hkey,
-                             LPCSTR  lpszValueName,
+LONG WIN32API RegSetValueExA(HKEY   hkey,
+                             LPCSTR lpszValueName,
                              DWORD  dwReserved,
                              DWORD  fdwType,
@@ -1040 +1040 @@
                              DWORD  cbData)
 {
+  LPSTR lpszExpandedString = NULL;
+  LONG  ret;
+
   if(fdwType == REG_SZ || fdwType == REG_EXPAND_SZ) {
     dprintf(("ADVAPI32: RegSetValueExA)%08xh,%s,%08xh,%08xh,%s,%08xh)",
@@ -1062 +1065 @@
       dprintf(("!WARNING!: REG_EXPAND_SZ converted to REG_SZ"));
       fdwType = REG_SZ; //registry.dll doesn't like this type
+
+      //Expand string
+      lpszExpandedString = (LPSTR)malloc(cbData);
+      if(lpszExpandedString == NULL) {
+          DebugInt3();
+          return ERROR_NOT_ENOUGH_MEMORY;
+      }
+      ExpandEnvironmentStringsA((LPSTR)lpbData, lpszExpandedString, cbData);
+      lpbData = (BYTE *)lpszExpandedString;
+      cbData  = strlen(lpszExpandedString)+1;
+      dprintf(("Expanded to: %s", lpszExpandedString));
   }
-  return O32_RegSetValueEx(ConvertKey(hkey),
-                           lpszValueName,
-                           dwReserved,
-                           fdwType,
-                           lpbData,
-                           cbData);
+  ret = O32_RegSetValueEx(ConvertKey(hkey), lpszValueName, dwReserved,
+                          fdwType, lpbData, cbData);
+
+  if(lpszExpandedString) free(lpszExpandedString);
+
+  return ret;
 }