Author: akhaldi
Date: Sun Sep 22 16:47:51 2013
New Revision: 60310
URL:
http://svn.reactos.org/svn/reactos?rev=60310&view=rev
Log:
[MSISIP]
* Sync with Wine 1.7.1.
CORE-7469
Modified:
trunk/reactos/dll/win32/msisip/CMakeLists.txt
trunk/reactos/dll/win32/msisip/main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msisip/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/msisip/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msisip/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:47:51 2013
@@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
spec2def(msisip.dll msisip.spec)
list(APPEND SOURCE
@@ -10,9 +9,7 @@
${CMAKE_CURRENT_BINARY_DIR}/msisip.def)
add_library(msisip SHARED ${SOURCE})
-
set_module_type(msisip win32dll)
-
target_link_libraries(msisip wine)
add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll)
add_cd_file(TARGET msisip DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/msisip/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/main.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] Sun Sep 22 16:47:51 2013
@@ -44,10 +44,6 @@
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL);
break;
- case DLL_PROCESS_DETACH:
- break;
- default:
- break;
}
return TRUE;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 22 16:47:51 2013
@@ -119,7 +119,7 @@
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.7.1
-reactos/dll/win32/msisip # Synced to Wine-1.5.19
+reactos/dll/win32/msisip # Synced to Wine-1.7.1
reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4
reactos/dll/win32/msnet32 # Synced to Wine-1.5.19
reactos/dll/win32/msrle32 # Autosync