[FUSION]
authorChristoph von Wittich <christoph_vw@reactos.org>
Fri, 5 Mar 2010 18:30:07 +0000 (18:30 +0000)
committerChristoph von Wittich <christoph_vw@reactos.org>
Fri, 5 Mar 2010 18:30:07 +0000 (18:30 +0000)
sync fusion to wine 1.1.39

svn path=/trunk/; revision=45878

reactos/dll/win32/fusion/asmname.c
reactos/dll/win32/fusion/fusion_main.c

index 913674a..3c014ea 100644 (file)
@@ -471,6 +471,11 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam
 
 done:
     HeapFree(GetProcessHeap(), 0, save);
+    if (FAILED(hr))
+    {
+        HeapFree(GetProcessHeap(), 0, name->displayname);
+        HeapFree(GetProcessHeap(), 0, name->name);
+    }
     return hr;
 }
 
index 8bc4b1e..5c9d776 100644 (file)
@@ -34,6 +34,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
     switch (fdwReason)
     {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hinstDLL);
             break;