wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-06-28 19:46:18 +10:00
parent 41d6d5f39a
commit fbb8eac819
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "6d417f7890ee94dd17acc18eb2ef81f152dd0ed0"
echo "90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1"
}
# Show version information

18
patches/wtsapi32-EnumerateProcesses/0001-wtsapi32-Partial-implementation-of-WTSEnumerateProce.patch
View File

@ -1,15 +1,15 @@
From 159a7b00133485a0d6d89caac91b66996fbfb439 Mon Sep 17 00:00:00 2001
From 6122f1c9de4a8e595c15034753c2838579548254 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 +++++++++++++++++++++++++++++++++++++++++---
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 341d9e6..648d7b9 100644
index 67f56bbd7f5..5b4e28a1a30 100644
--- a/dlls/wtsapi32/tests/wtsapi.c
+++ b/dlls/wtsapi32/tests/wtsapi.c
@@ -85,7 +85,6 @@ static void test_WTSEnumerateProcessesW(void)
@ -21,11 +21,11 @@ index 341d9e6..648d7b9 100644
WTSFreeMemory(info);
}
diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c
index 5569502..ca13d2f 100644
index 2f5e73d05af..c3a483af10f 100644
--- a/dlls/wtsapi32/wtsapi32.c
+++ b/dlls/wtsapi32/wtsapi32.c
@@ -18,8 +18,11 @@
#include "config.h"
@@ -17,8 +17,11 @@
#include <stdarg.h>
#include <stdlib.h>
+#include "ntstatus.h"
@ -36,7 +36,7 @@ index 5569502..ca13d2f 100644
#include "wtsapi32.h"
#include "wine/debug.h"
#include "wine/heap.h"
@@ -94,8 +97,13 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version
@@ -93,8 +96,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)
{
@ -52,7 +52,7 @@ index 5569502..ca13d2f 100644
if (!ppProcessInfo || !pCount || Reserved != 0 || Version != 1)
{
@@ -103,9 +111,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version
@@ -102,9 +110,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version
return FALSE;
}
@ -127,5 +127,5 @@ index 5569502..ca13d2f 100644
}
--
1.9.1
2.20.1