Author: akhaldi Date: Mon Jul 20 22:56:16 2015 New Revision: 68500
URL: http://svn.reactos.org/svn/reactos?rev=68500&view=rev Log: [SHDOCVW] Sync with Wine Staging 1.7.47. CORE-9924
Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_m... ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Mon Jul 20 22:56:16 2015 @@ -64,7 +64,7 @@ */ 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 @@ 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;
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jul 20 22:56:16 2015 @@ -177,7 +177,7 @@ 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