[ros-diffs] [cwittich] 45878: [FUSION] sync fusion to wine 1.1.39

[cwittich at svn.reactos.org]

Author: cwittich
Date: Fri Mar  5 19:30:07 2010
New Revision: 45878

URL: http://svn.reactos.org/svn/reactos?rev=45878&view=rev
Log:
[FUSION]
sync fusion to wine 1.1.39

Modified:
    trunk/reactos/dll/win32/fusion/asmname.c
    trunk/reactos/dll/win32/fusion/fusion_main.c

Modified: trunk/reactos/dll/win32/fusion/asmname.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c?rev=45878&r1=45877&r2=45878&view=diff
==============================================================================
--- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Fri Mar  5 19:30:07 2010
@@ -471,6 +471,11 @@
 
 done:
     HeapFree(GetProcessHeap(), 0, save);
+    if (FAILED(hr))
+    {
+        HeapFree(GetProcessHeap(), 0, name->displayname);
+        HeapFree(GetProcessHeap(), 0, name->name);
+    }
     return hr;
 }
 

Modified: trunk/reactos/dll/win32/fusion/fusion_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_main.c?rev=45878&r1=45877&r2=45878&view=diff
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusion_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/fusion_main.c [iso-8859-1] Fri Mar  5 19:30:07 2010
@@ -34,6 +34,8 @@
 
     switch (fdwReason)
     {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hinstDLL);
             break;