[SHDOCVW]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60377

diff --git a/reactos/dll/win32/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt
index fb5d161..25f8371 100644 (file)
--- a/reactos/dll/win32/shdocvw/CMakeLists.txt
+++ b/reactos/dll/win32/shdocvw/CMakeLists.txt
@@ -2,8 +2,8 @@
 add_definitions(
     -D__WINESRC__
     -D_SHDOCVW_)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
@@ -17,11 +17,9 @@ set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT
 add_library(shdocvw SHARED ${SOURCE} shdocvw.rc)
 set_module_type(shdocvw win32dll)
 target_link_libraries(shdocvw uuid wine)
+add_delay_importlibs(shdocvw ole32 oleaut32 ieframe)
 add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll)
-add_delay_importlibs(shdocvw version ole32 oleaut32 ieframe)
-
 # shdocvw_v1.tlb needs stdole2.tlb
 add_dependencies(shdocvw stdole2)
-
 add_pch(shdocvw shdocvw.h)
 add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/shdocvw/shdocvw_main.c b/reactos/dll/win32/shdocvw/shdocvw_main.c
index bbab837..3e4a448 100644 (file)
--- a/reactos/dll/win32/shdocvw/shdocvw_main.c
+++ b/reactos/dll/win32/shdocvw/shdocvw_main.c
@@ -149,9 +149,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
         case DLL_PROCESS_ATTACH:
         break;
     case DLL_PROCESS_DETACH:
+        if (fImpLoad) break;
         if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32);
-        if(ieframe_instance)
-            FreeLibrary(ieframe_instance);
+        if (ieframe_instance) FreeLibrary(ieframe_instance);
         break;
     }
     return TRUE;
@@ -442,7 +442,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
     }
 
     len = sizeof(buffer) / sizeof(buffer[0]);
-    res = ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown);
+    ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown);
     HeapFree(GetProcessHeap(), 0, urlW);
 
     needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index ed8064e..facfc37 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -174,7 +174,7 @@ reactos/dll/win32/security        # Forked (different .spec)
 reactos/dll/win32/sensapi         # Synced to Wine-1.7.1
 reactos/dll/win32/setupapi        # Forked at Wine-20050524
 reactos/dll/win32/shdoclc         # Synced to Wine-1.5.19
-reactos/dll/win32/shdocvw         # Synced to Wine-1.5.26
+reactos/dll/win32/shdocvw         # Synced to Wine-1.7.1
 reactos/dll/win32/shell32         # Forked at Wine-20071011
 reactos/dll/win32/shfolder        # Autosync
 reactos/dll/win32/shlwapi         # Synced to Wine-1.5.26