mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
09fdb3b5c9
Actually rebase this time.
132 lines
3.9 KiB
Diff
132 lines
3.9 KiB
Diff
From 5befee66603e60c0fee60e06805346e0e165131d Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Lackner <sebastian@fds-team.de>
|
|
Date: Sun, 22 Jun 2014 19:04:38 +0200
|
|
Subject: [PATCH] wtsapi32: Partial implementation of WTSEnumerateProcessesW.
|
|
|
|
---
|
|
dlls/wtsapi32/tests/wtsapi.c | 1 -
|
|
dlls/wtsapi32/wtsapi32.c | 78 ++++++++++++++++++++++++++++++++++--
|
|
2 files changed, 74 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c
|
|
index 8ce1dc8bf9c..54bb3b70e6e 100644
|
|
--- a/dlls/wtsapi32/tests/wtsapi.c
|
|
+++ b/dlls/wtsapi32/tests/wtsapi.c
|
|
@@ -86,7 +86,6 @@ static void test_WTSEnumerateProcessesW(void)
|
|
{
|
|
found = found || !lstrcmpW(pname, info[i].pProcessName);
|
|
}
|
|
- todo_wine
|
|
ok(found || broken(!ret), "process name %s not found\n", wine_dbgstr_w(pname));
|
|
WTSFreeMemory(info);
|
|
}
|
|
diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c
|
|
index a5c9bf6519f..ac7fc765779 100644
|
|
--- a/dlls/wtsapi32/wtsapi32.c
|
|
+++ b/dlls/wtsapi32/wtsapi32.c
|
|
@@ -17,8 +17,11 @@
|
|
|
|
#include <stdarg.h>
|
|
#include <stdlib.h>
|
|
+#include "ntstatus.h"
|
|
+#define WIN32_NO_STATUS
|
|
#include "windef.h"
|
|
#include "winbase.h"
|
|
+#include "winternl.h"
|
|
#include "winnls.h"
|
|
#include "lmcons.h"
|
|
#include "wtsapi32.h"
|
|
@@ -116,8 +119,13 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version
|
|
BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version,
|
|
PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount)
|
|
{
|
|
- FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version,
|
|
- ppProcessInfo, pCount);
|
|
+ WTS_PROCESS_INFOW *processInfo;
|
|
+ SYSTEM_PROCESS_INFORMATION *spi;
|
|
+ ULONG size = 0x4000;
|
|
+ void *buf = NULL;
|
|
+ NTSTATUS status;
|
|
+ DWORD count;
|
|
+ WCHAR *name;
|
|
|
|
if (!ppProcessInfo || !pCount || Reserved != 0 || Version != 1)
|
|
{
|
|
@@ -125,9 +133,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version
|
|
return FALSE;
|
|
}
|
|
|
|
- *pCount = 0;
|
|
- *ppProcessInfo = NULL;
|
|
+ if (hServer != WTS_CURRENT_SERVER_HANDLE)
|
|
+ {
|
|
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
+ do
|
|
+ {
|
|
+ size *= 2;
|
|
+ HeapFree(GetProcessHeap(), 0, buf);
|
|
+ buf = HeapAlloc(GetProcessHeap(), 0, size);
|
|
+ if (!buf)
|
|
+ {
|
|
+ SetLastError(ERROR_OUTOFMEMORY);
|
|
+ return FALSE;
|
|
+ }
|
|
+ status = NtQuerySystemInformation(SystemProcessInformation, buf, size, NULL);
|
|
+ }
|
|
+ while (status == STATUS_INFO_LENGTH_MISMATCH);
|
|
+
|
|
+ if (status != STATUS_SUCCESS)
|
|
+ {
|
|
+ HeapFree(GetProcessHeap(), 0, buf);
|
|
+ SetLastError(RtlNtStatusToDosError(status));
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
+ spi = buf;
|
|
+ count = size = 0;
|
|
+ for (;;)
|
|
+ {
|
|
+ size += sizeof(WTS_PROCESS_INFOW) + spi->ProcessName.Length + sizeof(WCHAR);
|
|
+ count++;
|
|
+ if (spi->NextEntryOffset == 0) break;
|
|
+ spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset);
|
|
+ }
|
|
+
|
|
+ processInfo = HeapAlloc(GetProcessHeap(), 0, size);
|
|
+ if (!processInfo)
|
|
+ {
|
|
+ HeapFree(GetProcessHeap(), 0, buf);
|
|
+ SetLastError(ERROR_OUTOFMEMORY);
|
|
+ return FALSE;
|
|
+ }
|
|
+ name = (WCHAR *)&processInfo[count];
|
|
+
|
|
+ *ppProcessInfo = processInfo;
|
|
+ *pCount = count;
|
|
+
|
|
+ spi = buf;
|
|
+ while (count--)
|
|
+ {
|
|
+ processInfo->SessionId = 0;
|
|
+ processInfo->ProcessId = HandleToUlong(spi->UniqueProcessId);
|
|
+ processInfo->pProcessName = name;
|
|
+ processInfo->pUserSid = NULL;
|
|
+ memcpy( name, spi->ProcessName.Buffer, spi->ProcessName.Length );
|
|
+ name[ spi->ProcessName.Length/sizeof(WCHAR) ] = 0;
|
|
+
|
|
+ processInfo++;
|
|
+ name += (spi->ProcessName.Length + sizeof(WCHAR))/sizeof(WCHAR);
|
|
+ spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset);
|
|
+ }
|
|
|
|
+ HeapFree(GetProcessHeap(), 0, buf);
|
|
return TRUE;
|
|
}
|
|
|
|
--
|
|
2.30.2
|
|
|