Author: akhaldi Date: Sat Sep 21 19:51:32 2013 New Revision: 60291
URL: http://svn.reactos.org/svn/reactos?rev=60291&view=rev Log: [MSCAT32] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/mscat32/CMakeLists.txt trunk/reactos/dll/win32/mscat32/main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mscat32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscat32/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/mscat32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscat32/CMakeLists.txt [iso-8859-1] Sat Sep 21 19:51:32 2013 @@ -1,8 +1,6 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mscat32.dll mscat32.spec)
list(APPEND SOURCE @@ -10,7 +8,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
add_library(mscat32 SHARED ${SOURCE}) - set_module_type(mscat32 win32dll) target_link_libraries(mscat32 wine) add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll)
Modified: trunk/reactos/dll/win32/mscat32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscat32/main.c?re... ============================================================================== --- trunk/reactos/dll/win32/mscat32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscat32/main.c [iso-8859-1] Sat Sep 21 19:51:32 2013 @@ -38,11 +38,6 @@ if (fdwReason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls( hinstDLL ); - /* FIXME: Initialisation */ - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - /* FIXME: Cleanup */ }
return TRUE;
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] Sat Sep 21 19:51:32 2013 @@ -107,7 +107,7 @@ reactos/dll/win32/mprapi # Synced to Wine-1.5.19 reactos/dll/win32/msacm32 # 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/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.5.4