From f554481baf886de6d457230ed8a4233b8f00099d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 4 Jun 2018 03:59:11 +0100 Subject: [PATCH] [WTSAPI32] Sync with Wine Staging 3.9. CORE-14656 --- dll/win32/wtsapi32/CMakeLists.txt | 2 +- dll/win32/wtsapi32/wtsapi32.c | 16 +++++++++++++++- media/doc/README.WINE | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt index b7c19e5cc3f..6c587337917 100644 --- a/dll/win32/wtsapi32/CMakeLists.txt +++ b/dll/win32/wtsapi32/CMakeLists.txt @@ -11,5 +11,5 @@ list(APPEND SOURCE add_library(wtsapi32 SHARED ${SOURCE}) set_module_type(wtsapi32 win32dll) target_link_libraries(wtsapi32 wine) -add_importlibs(wtsapi32 msvcrt kernel32 ntdll) +add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET wtsapi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wtsapi32/wtsapi32.c b/dll/win32/wtsapi32/wtsapi32.c index fad7aa8d7d2..f684dd90580 100644 --- a/dll/win32/wtsapi32/wtsapi32.c +++ b/dll/win32/wtsapi32/wtsapi32.c @@ -25,6 +25,7 @@ #include "wine/winternl.h" #include "wtsapi32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); @@ -241,7 +242,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version, */ void WINAPI WTSFreeMemory(PVOID pMemory) { - HeapFree(GetProcessHeap(), 0, pMemory); + heap_free(pMemory); } /************************************************************ @@ -305,6 +306,19 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (WTSInfoClass == WTSUserName) + { + WCHAR *username; + DWORD count = 0; + + GetUserNameW(NULL, &count); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; + if (!(username = heap_alloc(count * sizeof(WCHAR)))) return FALSE; + GetUserNameW(username, &count); + *Buffer = username; + *BytesReturned = count * sizeof(WCHAR); + return TRUE; + } return FALSE; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 9d019760d20..c71caf41965 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -212,7 +212,7 @@ reactos/dll/win32/wmi # Synced to WineStaging-2.9 reactos/dll/win32/wmiutils # Synced to WineStaging-3.3 reactos/dll/win32/wmvcore # Synced to WineStaging-3.9 reactos/dll/win32/wshom.ocx # Synced to WineStaging-3.3 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-3.3 +reactos/dll/win32/wtsapi32 # Synced to WineStaging-3.9 reactos/dll/win32/wuapi # Synced to WineStaging-3.3 reactos/dll/win32/xinput1_1 # Synced to WineStaging-2.9 reactos/dll/win32/xinput1_2 # Synced to WineStaging-2.9