From a5b69953911c34455d1637748c2fbb00605a1494 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Fri, 5 Mar 2010 18:30:07 +0000
Subject: [PATCH] [FUSION] sync fusion to wine 1.1.39

svn path=/trunk/; revision=45878
---
 reactos/dll/win32/fusion/asmname.c     | 5 +++++
 reactos/dll/win32/fusion/fusion_main.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/reactos/dll/win32/fusion/asmname.c b/reactos/dll/win32/fusion/asmname.c
index 913674aa80e..3c014ea3244 100644
--- a/reactos/dll/win32/fusion/asmname.c
+++ b/reactos/dll/win32/fusion/asmname.c
@@ -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;
 }
 
diff --git a/reactos/dll/win32/fusion/fusion_main.c b/reactos/dll/win32/fusion/fusion_main.c
index 8bc4b1e3349..5c9d77646e0 100644
--- a/reactos/dll/win32/fusion/fusion_main.c
+++ b/reactos/dll/win32/fusion/fusion_main.c
@@ -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;