diff --git a/reactos/dll/win32/msisys.ocx/CMakeLists.txt b/reactos/dll/win32/msisys.ocx/CMakeLists.txt index 94bab9d2afd..f33f0a3c68a 100644 --- a/reactos/dll/win32/msisys.ocx/CMakeLists.txt +++ b/reactos/dll/win32/msisys.ocx/CMakeLists.txt @@ -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 @@ list(APPEND SOURCE ${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) diff --git a/reactos/dll/win32/msisys.ocx/msisys.c b/reactos/dll/win32/msisys.ocx/msisys.c index f659d6f710a..786d42748f1 100644 --- a/reactos/dll/win32/msisys.ocx/msisys.c +++ b/reactos/dll/win32/msisys.ocx/msisys.c @@ -36,50 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msisys); -/*********************************************************************** - * 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.@) * @@ -89,7 +45,7 @@ BOOL WINAPI DllMain( */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /*********************************************************************** diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 8f8b8d3e2df..1836c64e19b 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -120,7 +120,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.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