Changeset 39735 in vbox for trunk/src

Timestamp:

Jan 10, 2012 10:59:41 AM (13 years ago)

Author:

vboxsync

Message:

coOpenGL: fix XP hosts, bugs #10071 and #10088

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -157 +157 @@
     char *pBufPos = pBuf;
     DWORD cbBufRemain = cbBuf, cbTotal = 0;
-    HKEY hKey;
+    HKEY hKey, hSubkey;
     DWORD dwIndex = 0;
     int i;
@@ -191 +191 @@
         }
 
+        lRc = RegOpenKeyEx(hKey,
+                NameBuf,
+                0, /* reserved*/
+                KEY_READ,
+                &hSubkey);
+        if (ERROR_SUCCESS != lRc)
+        {
+            crDebug("RegOpenKeyEx 2 failed, %d", lRc);
+            RegCloseKey(hKey);
+            return VERR_OPEN_FAILED;
+        }
+
         for (i = 0; i < RT_ELEMENTS(aValueNames); ++i)
         {
             DWORD cbCur = cbBufRemain;
-            lRc = RegGetValueA(hKey, NameBuf, aValueNames[i], RRF_RT_REG_MULTI_SZ,
-                    NULL, /* LPDWORD pdwType */
-                    pBufPos,
-                    &cbCur);
+            lRc = RegQueryValueExA(hSubkey, aValueNames[i], NULL, /* reserved*/
+                    REG_MULTI_SZ,
+                    (PBYTE)pBufPos, &cbCur);
             /* exclude second null termination */
             --cbCur;
+
             if (ERROR_MORE_DATA == lRc)
             {
@@ -222 +234 @@
             CRASSERT(cbBufRemain < UINT32_MAX/2);
         }
-    }
+
+        RegCloseKey(hSubkey);
+    }
+
+    RegCloseKey(hKey);
 
     if (cbTotal)