Author: akhaldi Date: Sat Sep 28 15:34:01 2013 New Revision: 60435
URL: http://svn.reactos.org/svn/reactos?rev=60435&view=rev Log: [WTSAPI32] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:34:01 2013 @@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(wtsapi32.dll wtsapi32.spec)
list(APPEND SOURCE @@ -10,11 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def)
add_library(wtsapi32 SHARED ${SOURCE}) - set_module_type(wtsapi32 win32dll) - target_link_libraries(wtsapi32 wine) - -add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) - +add_importlibs(wtsapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET wtsapi32 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi32... ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Sat Sep 28 15:34:01 2013 @@ -25,27 +25,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(wtsapi);
-static HMODULE WTSAPI32_hModule; - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - WTSAPI32_hModule = hinstDLL; - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -}
/************************************************************ * WTSCloseServer (WTSAPI32.@)
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 28 15:34:01 2013 @@ -210,7 +210,7 @@ reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1 -reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 +reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 reactos/dll/win32/wuapi # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19