From 7882bfa033cca45423c2845ef99f4c12dfcea957 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 23 Sep 2013 11:32:21 +0000 Subject: [PATCH] [MSSIP32] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60333 --- reactos/dll/win32/mssip32/CMakeLists.txt | 4 ---- reactos/dll/win32/mssip32/main.c | 4 ---- reactos/media/doc/README.WINE | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/reactos/dll/win32/mssip32/CMakeLists.txt b/reactos/dll/win32/mssip32/CMakeLists.txt index 0e3d3eebedf..5860512f227 100644 --- a/reactos/dll/win32/mssip32/CMakeLists.txt +++ b/reactos/dll/win32/mssip32/CMakeLists.txt @@ -10,11 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def) add_library(mssip32 SHARED ${SOURCE}) - set_module_type(mssip32 win32dll) - target_link_libraries(mssip32 wine) - add_importlibs(mssip32 msvcrt kernel32 ntdll) - add_cd_file(TARGET mssip32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/mssip32/main.c b/reactos/dll/win32/mssip32/main.c index 7a1896b071f..1d1270aa851 100644 --- a/reactos/dll/win32/mssip32/main.c +++ b/reactos/dll/win32/mssip32/main.c @@ -39,10 +39,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index b7c24585a6a..be0f1d32e08 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -124,7 +124,7 @@ reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssip32 # Synced to Wine-1.5.19 +reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 reactos/dll/win32/mstask # Synced to Wine-1.5.4 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync