From 28bb2a3573734f3f3ecb2c15cb047ea71b1242ce Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 22 Sep 2013 16:32:59 +0000 Subject: [PATCH] [MSIMTF] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60309 --- reactos/dll/win32/msimtf/CMakeLists.txt | 5 ++--- reactos/dll/win32/msimtf/main.c | 2 -- reactos/media/doc/README.WINE | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/msimtf/CMakeLists.txt b/reactos/dll/win32/msimtf/CMakeLists.txt index 659c0f1cc9a..ea0e82adaa5 100644 --- a/reactos/dll/win32/msimtf/CMakeLists.txt +++ b/reactos/dll/win32/msimtf/CMakeLists.txt @@ -6,12 +6,11 @@ spec2def(msimtf.dll msimtf.spec) list(APPEND SOURCE activeimmapp.c main.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def) -add_library(msimtf SHARED ${SOURCE}) +add_library(msimtf SHARED ${SOURCE} rsrc.rc) set_module_type(msimtf win32dll) target_link_libraries(msimtf uuid wine) -add_importlibs(msimtf msvcrt imm32 kernel32 ntdll) +add_importlibs(msimtf imm32 msvcrt kernel32 ntdll) add_cd_file(TARGET msimtf DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msimtf/main.c b/reactos/dll/win32/msimtf/main.c index c5b823e6cda..6ea02beeacf 100644 --- a/reactos/dll/win32/msimtf/main.c +++ b/reactos/dll/win32/msimtf/main.c @@ -56,8 +56,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) msimtf_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index e626f01667a..9d0324ccdc4 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -118,7 +118,7 @@ reactos/dll/win32/mshtml # Synced to Wine-1.5.26 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26 reactos/dll/win32/msi # Synced to Wine-1.7.1 reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 -reactos/dll/win32/msimtf # Synced to Wine-1.5.19 +reactos/dll/win32/msimtf # Synced to Wine-1.7.1 reactos/dll/win32/msisip # Synced to Wine-1.5.19 reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19