Changeset 5600 for trunk/src

Timestamp:

Apr 26, 2001, 9:24:56 PM (24 years ago)

Author:

sandervl

Message:

update due to ole32 changes

File:

• trunk/src/oleaut32/typelib.cpp (modified) (4 diffs)

trunk/src/oleaut32/typelib.cpp

@@ -1 @@
-/* $Id: typelib.cpp,v 1.17 2001-01-18 18:12:38 sandervl Exp $ */
+/* $Id: typelib.cpp,v 1.18 2001-04-26 19:24:56 sandervl Exp $ */
 /* 
  * ITypelib interface
@@ -1701 +1701 @@
         HRSRC                   hRsrc;
         HGLOBAL                 hData;
-        char *                  szLibName = HEAP_strdupA(m_hHeap, 0, szFile);
+        char *                  szLibName = HEAP_strdupA(m_hHeap, 0, szFile);
         char *                  p = strrchr(szLibName, '\\');
         ULONG                   lResId;
@@ -1709 +1709 @@
             // Filename of form {drive:}{\\path\\}file\\resid
             *p = 0;
-            lResId = atoi(p + 1);
-            hInst = CoLoadLibrary(szLibName, TRUE);
+            lResId = atoi((p + 1));
+
+            LPOLESTR libnameW = (LPOLESTR)HEAP_strdupAtoW(m_hHeap, 0, szLibName);
+            hInst = CoLoadLibrary(libnameW, TRUE);
+            HeapFree(m_hHeap, 0, libnameW);
             HeapFree(m_hHeap, 0, szLibName);
             if (hInst != 0)
@@ -1730 +1733 @@
 
     // Check to see if this is a module...
-    hInst = CoLoadLibrary(szFile, TRUE);
+    LPOLESTR libnameW = (LPOLESTR)HEAP_strdupAtoW(m_hHeap, 0, szFile);
+    hInst = CoLoadLibrary(libnameW, TRUE);
+    HeapFree(m_hHeap, 0, libnameW);
     if (hInst)
     {