From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 22 Dec 2019 23:54:46 +0000 (+0100)
Subject: [WTSAPI32] Sync with Wine Staging 4.18. CORE-16441
X-Git-Tag: 0.4.14-RC~925
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=667d3934240600b11684e7564f96764e8fa887d4

[WTSAPI32] Sync with Wine Staging 4.18. CORE-16441
---

diff --git a/dll/win32/wtsapi32/wtsapi32.c b/dll/win32/wtsapi32/wtsapi32.c
index 60658fd29c3..dc2da98d9bd 100644
--- a/dll/win32/wtsapi32/wtsapi32.c
+++ b/dll/win32/wtsapi32/wtsapi32.c
@@ -15,7 +15,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include "ntstatus.h"
@@ -77,6 +76,27 @@ BOOL WINAPI WTSEnableChildSessions(BOOL enable)
     return TRUE;
 }
 
+
+/************************************************************
+ *                WTSEnumerateProcessesExW  (WTSAPI32.@)
+ */
+BOOL WINAPI WTSEnumerateProcessesExW(HANDLE server, DWORD *level, DWORD session_id, WCHAR **info, DWORD *count)
+{
+    FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count);
+    if (count) *count = 0;
+    return FALSE;
+}
+
+/************************************************************
+ *                WTSEnumerateProcessesExA  (WTSAPI32.@)
+ */
+BOOL WINAPI WTSEnumerateProcessesExA(HANDLE server, DWORD *level, DWORD session_id, char **info, DWORD *count)
+{
+    FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count);
+    if (count) *count = 0;
+    return FALSE;
+}
+
 /************************************************************
  *                WTSEnumerateProcessesA  (WTSAPI32.@)
  */
@@ -201,6 +221,26 @@ BOOL WINAPI WTSEnumerateServersW(LPWSTR pDomainName, DWORD Reserved, DWORD Versi
 }
 
 
+/************************************************************
+ *                WTSEnumerateEnumerateSessionsExW  (WTSAPI32.@)
+ */
+BOOL WINAPI WTSEnumerateSessionsExW(HANDLE server, DWORD *level, DWORD filter, WTS_SESSION_INFO_1W* info, DWORD *count)
+{
+    FIXME("Stub %p %p %d %p %p\n", server, level, filter, info, count);
+    if (count) *count = 0;
+    return FALSE;
+}
+
+/************************************************************
+ *                WTSEnumerateEnumerateSessionsExA  (WTSAPI32.@)
+ */
+BOOL WINAPI WTSEnumerateSessionsExA(HANDLE server, DWORD *level, DWORD filter, WTS_SESSION_INFO_1A* info, DWORD *count)
+{
+    FIXME("Stub %p %p %d %p %p\n", server, level, filter, info, count);
+    if (count) *count = 0;
+    return FALSE;
+}
+
 /************************************************************
  *                WTSEnumerateEnumerateSessionsA  (WTSAPI32.@)
  */
@@ -245,6 +285,27 @@ void WINAPI WTSFreeMemory(PVOID pMemory)
     heap_free(pMemory);
 }
 
+/************************************************************
+ *                WTSFreeMemoryExA (WTSAPI32.@)
+ */
+BOOL WINAPI WTSFreeMemoryExA(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb)
+{
+    TRACE("%d %p %d\n", type, ptr, nmemb);
+    heap_free(ptr);
+    return TRUE;
+}
+
+/************************************************************
+ *                WTSFreeMemoryExW (WTSAPI32.@)
+ */
+BOOL WINAPI WTSFreeMemoryExW(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb)
+{
+    TRACE("%d %p %d\n", type, ptr, nmemb);
+    heap_free(ptr);
+    return TRUE;
+}
+
+
 /************************************************************
  *                WTSLogoffSession (WTSAPI32.@)
  */
@@ -255,6 +316,27 @@ BOOL WINAPI WTSLogoffSession(HANDLE hserver, DWORD session_id, BOOL bwait)
     return FALSE;
 }
 
+
+/************************************************************
+ *                WTSOpenServerExW (WTSAPI32.@)
+ */
+HANDLE WINAPI WTSOpenServerExW(WCHAR *server_name)
+{
+    FIXME("(%s) stub\n", debugstr_w(server_name));
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return NULL;
+}
+
+/************************************************************
+ *                WTSOpenServerExA (WTSAPI32.@)
+ */
+HANDLE WINAPI WTSOpenServerExA(char *server_name)
+{
+    FIXME("(%s) stub\n", debugstr_a(server_name));
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return NULL;
+}
+
 /************************************************************
  *                WTSOpenServerA (WTSAPI32.@)
  */
@@ -505,7 +587,7 @@ BOOL WINAPI WTSQuerySessionInformationW(
  */
 BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token)
 {
-    FIXME("%u %p\n", session_id, token);
+    FIXME("%u %p semi-stub!\n", session_id, token);
 
     if (!token)
     {
diff --git a/dll/win32/wtsapi32/wtsapi32.spec b/dll/win32/wtsapi32/wtsapi32.spec
index 2b0174177ac..37838d5e07a 100644
--- a/dll/win32/wtsapi32/wtsapi32.spec
+++ b/dll/win32/wtsapi32/wtsapi32.spec
@@ -4,15 +4,23 @@
 @ stdcall WTSDisconnectSession(long long long)
 @ stdcall WTSEnableChildSessions(long)
 @ stdcall WTSEnumerateProcessesA(long long long ptr ptr)
+@ stdcall WTSEnumerateProcessesExA(ptr ptr long ptr ptr)
+@ stdcall WTSEnumerateProcessesExW(ptr ptr long ptr ptr)
 @ stdcall WTSEnumerateProcessesW(long long long ptr ptr)
 @ stdcall WTSEnumerateServersA(ptr long long ptr ptr)
 @ stdcall WTSEnumerateServersW(ptr long long ptr ptr)
 @ stdcall WTSEnumerateSessionsA(long long long ptr ptr)
+@ stdcall WTSEnumerateSessionsExA(ptr ptr long ptr ptr)
+@ stdcall WTSEnumerateSessionsExW(ptr ptr long ptr ptr)
 @ stdcall WTSEnumerateSessionsW(long long long ptr ptr)
 @ stdcall WTSFreeMemory(ptr)
+@ stdcall WTSFreeMemoryExA(long ptr long)
+@ stdcall WTSFreeMemoryExW(long ptr long)
 @ stdcall WTSLogoffSession(long long long)
-@ stdcall WTSOpenServerA(ptr)
-@ stdcall WTSOpenServerW(ptr)
+@ stdcall WTSOpenServerA(str)
+@ stdcall WTSOpenServerExA(str)
+@ stdcall WTSOpenServerExW(wstr)
+@ stdcall WTSOpenServerW(wstr)
 @ stdcall WTSQuerySessionInformationA(long long long ptr ptr)
 @ stdcall WTSQuerySessionInformationW(long long long ptr ptr)
 @ stdcall WTSQueryUserConfigA(ptr ptr long ptr ptr)
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 87a6b8c92ff..84e2af867cb 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -213,7 +213,7 @@ dll/win32/wmi                 # Synced to WineStaging-2.9
 dll/win32/wmiutils            # Synced to WineStaging-4.18
 dll/win32/wmvcore             # Synced to WineStaging-4.18
 dll/win32/wshom.ocx           # Synced to WineStaging-4.18
-dll/win32/wtsapi32            # Synced to WineStaging-3.9
+dll/win32/wtsapi32            # Synced to WineStaging-4.18
 dll/win32/wuapi               # Synced to WineStaging-3.3
 dll/win32/xinput1_1           # Synced to WineStaging-2.9
 dll/win32/xinput1_2           # Synced to WineStaging-2.9