From b11dfca4d3f91e612cb64842d4c1c921b508f386 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 19 Sep 2013 17:52:48 +0000 Subject: [PATCH] [ICCVID] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60214 --- reactos/dll/win32/iccvid/CMakeLists.txt | 3 +-- reactos/dll/win32/iccvid/iccvid.c | 3 --- reactos/media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/iccvid/CMakeLists.txt b/reactos/dll/win32/iccvid/CMakeLists.txt index f93b2b900a3..0d9bbb74b55 100644 --- a/reactos/dll/win32/iccvid/CMakeLists.txt +++ b/reactos/dll/win32/iccvid/CMakeLists.txt @@ -5,10 +5,9 @@ spec2def(iccvid.dll iccvid.spec) 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) diff --git a/reactos/dll/win32/iccvid/iccvid.c b/reactos/dll/win32/iccvid/iccvid.c index bdca8123159..8097abab81a 100644 --- a/reactos/dll/win32/iccvid/iccvid.c +++ b/reactos/dll/win32/iccvid/iccvid.c @@ -1039,9 +1039,6 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) DisableThreadLibraryCalls(hModule); ICCVID_hModule = hModule; break; - - case DLL_PROCESS_DETACH: - break; } return TRUE; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index bd84602327d..baa683dac50 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -78,7 +78,7 @@ reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.1 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