Author: akhaldi Date: Sun Sep 22 16:53:31 2013 New Revision: 60311
URL: http://svn.reactos.org/svn/reactos?rev=60311&view=rev Log: [MSISYS.OCX] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt trunk/reactos/dll/win32/msisys.ocx/msisys.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/CMakeL... ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msisys.ocx msisys.ocx.spec)
list(APPEND SOURCE @@ -9,8 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/msisys.def)
add_library(msisys SHARED ${SOURCE}) - set_module_type(msisys win32ocx) -target_link_libraries(msisys uuid wine) +target_link_libraries(msisys wine) add_importlibs(msisys msvcrt kernel32 ntdll) add_cd_file(TARGET msisys DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/msisys.ocx/msisys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/msisys... ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/msisys.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisys.ocx/msisys.c [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -37,50 +37,6 @@
/*********************************************************************** - * MSISYS_InitProcess (internal) - */ -static BOOL MSISYS_InitProcess( void ) -{ - TRACE("()\n"); - - return TRUE; -} - -/*********************************************************************** - * MSISYS_UninitProcess (internal) - */ -static void MSISYS_UninitProcess( void ) -{ - TRACE("()\n"); -} - -/*********************************************************************** - * DllMain for MSISYS - */ -BOOL WINAPI DllMain( - HINSTANCE hInstDLL, - DWORD fdwReason, - LPVOID lpvReserved ) -{ - TRACE("(%p,%d,%p)\n",hInstDLL,fdwReason,lpvReserved); - - switch ( fdwReason ) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - if ( !MSISYS_InitProcess() ) - return FALSE; - break; - case DLL_PROCESS_DETACH: - MSISYS_UninitProcess(); - break; - } - - return TRUE; -} - - -/*********************************************************************** * DllCanUnloadNow (MSISYS.@) * * RETURNS @@ -89,7 +45,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; }
/***********************************************************************
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:53:31 2013 @@ -120,7 +120,7 @@ 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.7.1 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 +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 # Autosync reactos/dll/win32/mssign32 # Synced to Wine-1.5.19