Author: akhaldi Date: Sun Sep 22 16:32:59 2013 New Revision: 60309
URL: http://svn.reactos.org/svn/reactos?rev=60309&view=rev Log: [MSIMTF] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/msimtf/CMakeLists.txt trunk/reactos/dll/win32/msimtf/main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msimtf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:32:59 2013 @@ -6,12 +6,11 @@ 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)
Modified: trunk/reactos/dll/win32/msimtf/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/main.c?rev... ============================================================================== --- trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] Sun Sep 22 16:32:59 2013 @@ -55,8 +55,6 @@ case DLL_PROCESS_ATTACH: msimtf_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); - 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] Sun Sep 22 16:32:59 2013 @@ -118,7 +118,7 @@ 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