Module: wine Branch: master Commit: cf7a118a9e5922d819f216c21c3a0984c7bde5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7a118a9e5922d819f216c21c...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Jul 9 15:57:11 2015 +0200
shdocvw: Call DisableThreadLibraryCalls in DllMain.
---
dlls/shdocvw/shdocvw_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 4ef2dd5..efeb08f 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -78,7 +78,7 @@ static HRESULT get_ieframe_object(REFCLSID rclsid, REFIID riid, void **ppv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - TRACE("\n"); + TRACE("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
if(IsEqualGUID(&CLSID_WebBrowser, rclsid) || IsEqualGUID(&CLSID_WebBrowser_V1, rclsid) @@ -146,7 +146,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { - case DLL_PROCESS_ATTACH: + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); break; case DLL_PROCESS_DETACH: if (fImpLoad) break;