Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-28 03:39:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCAT32]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60291
This commit is contained in:
Amine Khaldi 2013-09-21 19:51:32 +00:00
parent 7ae750c1d9
commit 47843717cb
3 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/mscat32/CMakeLists.txt
View file

@ -1,8 +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(mscat32.dll mscat32.spec) spec2def(mscat32.dll mscat32.spec)
list(APPEND SOURCE list(APPEND SOURCE
@ -10,7 +8,6 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/mscat32.def) ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
add_library(mscat32 SHARED ${SOURCE}) add_library(mscat32 SHARED ${SOURCE})
set_module_type(mscat32 win32dll) set_module_type(mscat32 win32dll)
target_link_libraries(mscat32 wine) target_link_libraries(mscat32 wine)
add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll) add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll)

5
reactos/dll/win32/mscat32/main.c
View file

@ -38,11 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
if (fdwReason == DLL_PROCESS_ATTACH) if (fdwReason == DLL_PROCESS_ATTACH)
{ {
DisableThreadLibraryCalls( hinstDLL ); DisableThreadLibraryCalls( hinstDLL );
/* FIXME: Initialisation */
}
else if (fdwReason == DLL_PROCESS_DETACH)
{
/* FIXME: Cleanup */
} }
return TRUE; return TRUE;

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

@ -107,7 +107,7 @@ reactos/dll/win32/mpr # Synced to Wine-1.7.1
reactos/dll/win32/mprapi # Synced to Wine-1.5.19 reactos/dll/win32/mprapi # Synced to Wine-1.5.19
reactos/dll/win32/msacm32 # Synced to Wine-1.7.1 reactos/dll/win32/msacm32 # Synced to Wine-1.7.1
reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.1
reactos/dll/win32/mscat32 # Synced to Wine-1.5.19 reactos/dll/win32/mscat32 # Synced to Wine-1.7.1
reactos/dll/win32/mscms # Synced to Wine-1.5.4 reactos/dll/win32/mscms # Synced to Wine-1.5.4
reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/mscoree # Synced to Wine-1.5.4
reactos/dll/win32/msctf # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.5.4