sync fusion to wine 1.1.39

svn path=/trunk/; revision=45878
This commit is contained in:
Christoph von Wittich 2010-03-05 18:30:07 +00:00
parent d1efdcf9df
commit a5b6995391
2 changed files with 7 additions and 0 deletions

View 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;
}

View 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;