From 1f9af4cf9bad7d6446363f98491e4f4e10ee9339 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 20 Jul 2015 22:56:16 +0000 Subject: [PATCH] [SHDOCVW] Sync with Wine Staging 1.7.47. CORE-9924 svn path=/trunk/; revision=68500 --- reactos/dll/win32/shdocvw/shdocvw_main.c | 5 +++-- reactos/media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/shdocvw/shdocvw_main.c b/reactos/dll/win32/shdocvw/shdocvw_main.c index b36ffdf4be0..d2ab7fffbe1 100644 --- a/reactos/dll/win32/shdocvw/shdocvw_main.c +++ b/reactos/dll/win32/shdocvw/shdocvw_main.c @@ -64,7 +64,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) @@ -132,7 +132,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; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 59b5e6fa557..fabea52601b 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -177,7 +177,7 @@ reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-1.7.37 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.37 -reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.37 +reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.47 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.7.37 reactos/dll/win32/shlwapi # Synced to WineStaging-1.7.37