Changeset 4274 for trunk/src/ole32/ole2.cpp

Timestamp:

Sep 17, 2000, 12:31:07 PM (25 years ago)

Author:

davidr

Message:

Updates from wine

File:

• trunk/src/ole32/ole2.cpp (modified) (5 diffs)

trunk/src/ole32/ole2.cpp

@@ -1 @@
-/* $Id: ole2.cpp,v 1.2 1999-09-08 11:29:28 davidr Exp $ */
+/* $Id: ole2.cpp,v 1.3 2000-09-17 10:31:05 davidr Exp $ */
 /* 
  * 
@@ -21 +21 @@
 #include "commctrl.h"
 #include "oString.h"
+#include "heapstring.h"
 #include <assert.h>
 
@@ -155 +156 @@
     HKEY                clsidKey;
     LONG                hres;
+    LPSTR               buffer;
 
     dprintf(("OLE32: OleRegGetUserType"));
@@ -180 +182 @@
 
     // Allocate a buffer for the registry value.
-    *pszUserType = (LPOLESTR)CoTaskMemAlloc(cbData);
-
-    if (*pszUserType == NULL)
+    buffer = (LPSTR)HeapAlloc(GetProcessHeap(), 0, cbData);
+
+    if (buffer == NULL)
     {
         RegCloseKey(clsidKey);
@@ -188 +190 @@
     }
 
-    hres = RegQueryValueExA(HKEY_CLASSES_ROOT, "", NULL, &dwKeyType, (LPBYTE)*pszUserType, &cbData);
+    hres = RegQueryValueExA(HKEY_CLASSES_ROOT, "", NULL, &dwKeyType, (LPBYTE)buffer, &cbData);
     RegCloseKey(clsidKey);
     if (hres != ERROR_SUCCESS)
     {
-        CoTaskMemFree(*pszUserType);
-        *pszUserType = NULL;
+        HeapFree(GetProcessHeap(), 0, buffer);
         return REGDB_E_READREGDB;
     }
+
+    // Allocate a buffer for the return value.
+    *pszUserType = (LPOLESTR)CoTaskMemAlloc(cbData * 2);
+
+    if (*pszUserType == NULL)
+    {
+        HeapFree(GetProcessHeap(), 0, buffer);
+        return E_OUTOFMEMORY;
+    }
+
+    // Copy & convert to unicode...
+    lstrcpyAtoW(*pszUserType, buffer);
+    HeapFree(GetProcessHeap(), 0, buffer);
 
     return S_OK;