Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:45:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSISYS.OCX]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60311
This commit is contained in:
Amine Khaldi 2013-09-22 16:53:31 +00:00
parent e26460061a
commit eb4d53ad8d
3 changed files with 3 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/msisys.ocx/CMakeLists.txt
View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msisys.ocx msisys.ocx.spec) spec2def(msisys.ocx msisys.ocx.spec)
list(APPEND SOURCE list(APPEND SOURCE
@ -9,8 +8,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msisys.def) ${CMAKE_CURRENT_BINARY_DIR}/msisys.def)
add_library(msisys SHARED ${SOURCE}) add_library(msisys SHARED ${SOURCE})
set_module_type(msisys win32ocx) set_module_type(msisys win32ocx)
target_link_libraries(msisys uuid wine) target_link_libraries(msisys wine)
add_importlibs(msisys msvcrt kernel32 ntdll) add_importlibs(msisys msvcrt kernel32 ntdll)
add_cd_file(TARGET msisys DESTINATION reactos/system32 FOR all) add_cd_file(TARGET msisys DESTINATION reactos/system32 FOR all)

46
reactos/dll/win32/msisys.ocx/msisys.c
View file

@ -36,50 +36,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msisys); 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.@) * DllCanUnloadNow (MSISYS.@)
* *
@ -89,7 +45,7 @@ BOOL WINAPI DllMain(
*/ */
HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
return S_OK; return S_FALSE;
} }
/*********************************************************************** /***********************************************************************

2
reactos/media/doc/README.WINE
View file

@ -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/msimg32 # Synced to Wine-1.5.19
reactos/dll/win32/msimtf # Synced to Wine-1.7.1 reactos/dll/win32/msimtf # Synced to Wine-1.7.1
reactos/dll/win32/msisip # 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/msnet32 # Synced to Wine-1.5.19
reactos/dll/win32/msrle32 # Autosync reactos/dll/win32/msrle32 # Autosync
reactos/dll/win32/mssign32 # Synced to Wine-1.5.19 reactos/dll/win32/mssign32 # Synced to Wine-1.5.19