* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60214
This commit is contained in:
Amine Khaldi 2013-09-19 17:52:48 +00:00
parent 5674128508
commit b11dfca4d3
3 changed files with 2 additions and 6 deletions

View file

@ -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)

View file

@ -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;
}

View file

@ -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