[akhaldi] 60377: [SHDOCVW] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 16:48:23 2013
New Revision: 60377

URL: http://svn.reactos.org/svn/reactos?rev=60377&view=rev
Log:
[SHDOCVW]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/shdocvw/CMakeLists.txt
    trunk/reactos/dll/win32/shdocvw/shdocvw_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt	[iso-8859-1] Thu Sep 26 16:48:23 2013
@@ -2,8 +2,8 @@
 add_definitions(
     -D__WINESRC__
     -D_SHDOCVW_)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
@@ -17,11 +17,9 @@
 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)

Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_…
==============================================================================
--- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c	[iso-8859-1] Thu Sep 26 16:48:23 2013
@@ -149,9 +149,9 @@
         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 @@
     }
 
     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);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Sep 26 16:48:23 2013
@@ -174,7 +174,7 @@
 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