Changeset 7336 for trunk/src

Timestamp:

Nov 14, 2001, 1:52:30 PM (24 years ago)

Author:

phaller

Message:

fixed memory leak and replaced heap alloc by stack alloc

File:

• trunk/src/shell32/shelllink.c (modified) (3 diffs)

trunk/src/shell32/shelllink.c

@@ -226 +226 @@
 static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode)
 {
-        _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface)
+        HRESULT         hRet = E_FAIL;
+        LPSTR           sFile;
+  
+        _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface)
         _IPersistStream_From_ICOM_THIS(IPersistStream, This)
 
-        LPSTR           sFile = HEAP_strdupWtoA ( GetProcessHeap(), 0, pszFileName);
-        HRESULT         hRet = E_FAIL;
+#ifdef __WIN32OS2__
+        STACK_strdupWtoA(pszFileName, sFile)
+#else
+        sFile = HEAP_strdupWtoA ( GetProcessHeap(), 0, pszFileName);
+#endif
 
         TRACE("(%p, %s)\n",This, sFile);
@@ -242 +248 @@
           if SUCCEEDED (IPersistStream_Load(StreamThis, This->lpFileStream))
           {
-            return NOERROR;
+            hRet = NOERROR;
           }
         }
         
+#ifndef __WIN32OS2__
+       // PH 2001-11-13 memory leak in WINE?
+       HeapFree( GetProcessHeap(), 0, sFile);
+#endif
+
         return hRet;
 }
@@ -1130 +1141 @@
             HeapFree(GetProcessHeap(), 0, This->sArgs);
 
+
           if (This->sWorkDir)
             HeapFree(GetProcessHeap(), 0, This->sWorkDir);