[akhaldi] 60214: [ICCVID] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 19 17:52:48 2013
New Revision: 60214

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

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

Modified: trunk/reactos/dll/win32/iccvid/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/CMakeLists...
==============================================================================
--- trunk/reactos/dll/win32/iccvid/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/CMakeLists.txt	[iso-8859-1] Thu Sep 19 17:52:48 2013
@@ -5,10 +5,9 @@

list(APPEND SOURCE
     iccvid.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def)

-add_library(iccvid SHARED ${SOURCE})
+add_library(iccvid SHARED ${SOURCE} rsrc.rc)
 set_module_type(iccvid win32dll)
 target_link_libraries(iccvid wine)
 add_importlibs(iccvid user32 msvcrt kernel32 ntdll)

Modified: trunk/reactos/dll/win32/iccvid/iccvid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?r...
==============================================================================
--- trunk/reactos/dll/win32/iccvid/iccvid.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/iccvid.c	[iso-8859-1] Thu Sep 19 17:52:48 2013
@@ -1039,9 +1039,6 @@
         DisableThreadLibraryCalls(hModule);
         ICCVID_hModule = hModule;
         break;
-
-    case DLL_PROCESS_DETACH:
-        break;
     }
     return TRUE;
 }

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] Thu Sep 19 17:52:48 2013
@@ -78,7 +78,7 @@
 reactos/dll/win32/hlink           # Synced to Wine-1.7.1
 reactos/dll/win32/hnetcfg         # Synced to Wine-1.7.1
 reactos/dll/win32/httpapi         # Synced to Wine-1.7.1
-reactos/dll/win32/iccvid          # Synced to Wine-1.5.19
+reactos/dll/win32/iccvid          # Synced to Wine-1.7.1
 reactos/dll/win32/icmp            # Synced to Wine-0_9_10
 reactos/dll/win32/ieframe         # Synced to Wine-1.5.26
 reactos/dll/win32/imaadp32.acm    # Synced to Wine-1.5.4