ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHDOCVW] Sync with Wine Staging 1.7.47. CORE-9924

Browse Source 
svn path=/trunk/; revision=68500
This commit is contained in:
Amine Khaldi
2015-07-20 22:56:16 +00:00
parent 69c06cca57
commit 1f9af4cf9b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/shdocvw/shdocvw_main.c
+3 -2
View File
@@ -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;
reactos/media/doc/README.WINE
+1 -1
View File
@@ -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