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 aa27dd07aa55301f3e23acf9f74daa0f465e7b6d

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-04-12 10:22:53 +10:00
parent f70daff195
commit 8853cef050
4 changed files with 40 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch
View File

@ -1,4 +1,4 @@
From 7bf5a7068cff54c7edad3ef4ac66fa9fa07151cd Mon Sep 17 00:00:00 2001
From bcb51e3caed3cb8c5bc6ed90b3c53f9d9175e1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 4 Feb 2017 16:20:37 +0100
Subject: [PATCH] kernel32: Implement some processor group functions.
@ -12,7 +12,7 @@ Subject: [PATCH] kernel32: Implement some processor group functions.
5 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
index 7c196c9..4aa415b 100644
index e653ac6..b6af37a 100644
--- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
@@ -21,7 +21,7 @@
@ -21,14 +21,14 @@ index 7c196c9..4aa415b 100644
@ stub GetDurationFormatEx
-@ stub GetMaximumProcessorGroupCount
+@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount
@ stub GetNamedPipeClientProcessId
@ stub GetNamedPipeServerProcessId
@ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
@ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
@ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
index ec1fd0f..e6e1aa3 100644
index 5be6201..757853a 100644
--- a/dlls/kernel32/cpu.c
+++ b/dlls/kernel32/cpu.c
@@ -309,7 +309,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
@@ -291,7 +291,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
*/
WORD WINAPI GetActiveProcessorGroupCount(void)
{
@ -39,7 +39,7 @@ index ec1fd0f..e6e1aa3 100644
return 1;
}
@@ -318,14 +320,43 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
@@ -300,14 +302,43 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
*/
DWORD WINAPI GetActiveProcessorCount(WORD group)
{
@ -90,7 +90,7 @@ index ec1fd0f..e6e1aa3 100644
/***********************************************************************
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 60809f4..6fb9856 100644
index e4a9e46..eb91df2 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -716,8 +716,8 @@
@ -105,7 +105,7 @@ index 60809f4..6fb9856 100644
@ stdcall GetModuleFileNameW(long ptr long)
@ stdcall GetModuleHandleA(str)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index cbca00e..b6516e5 100644
index 5324894..6dd6f03 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
@ -124,7 +124,7 @@ index cbca00e..b6516e5 100644
return TRUE;
}
@@ -3773,6 +3775,26 @@ static void test_ProcThreadAttributeList(void)
@@ -3872,6 +3874,26 @@ static void test_ProcThreadAttributeList(void)
pDeleteProcThreadAttributeList(&list);
}
@ -151,7 +151,7 @@ index cbca00e..b6516e5 100644
START_TEST(process)
{
HANDLE job;
@@ -3847,6 +3869,7 @@ START_TEST(process)
@@ -3946,6 +3968,7 @@ START_TEST(process)
test_GetNumaProcessorNode();
test_session_info();
test_GetLogicalProcessorInformationEx();
@ -160,10 +160,10 @@ index cbca00e..b6516e5 100644
test_ProcThreadAttributeList();
test_SuspendProcessState();
diff --git a/include/winnt.h b/include/winnt.h
index 6b598f3..624bda5 100644
index b8bab01..a54de27 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -5959,6 +5959,8 @@ typedef struct _GROUP_AFFINITY
@@ -5972,6 +5972,8 @@ typedef struct _GROUP_AFFINITY
WORD Reserved[3];
} GROUP_AFFINITY, *PGROUP_AFFINITY;
@ -173,5 +173,5 @@ index 6b598f3..624bda5 100644
{
WORD Group;
--
2.7.4
1.9.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "4a6a7655e1cbc614f609ea53939e240f4f785a94"
echo "aa27dd07aa55301f3e23acf9f74daa0f465e7b6d"
}
# Show version information

22
patches/user32-GetAutoRotationState/0001-user32-Add-semi-stub-for-GetAutoRotationState.patch
View File

@ -1,4 +1,4 @@
From 4eb59ab2c6634560799be4d2fe3021f028f1e3e8 Mon Sep 17 00:00:00 2001
From 519f8f585bc53f6de0174e5c3b73833fb81a7499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 8 Jan 2017 18:22:30 +0100
Subject: [PATCH] user32: Add semi-stub for GetAutoRotationState.
@ -9,10 +9,10 @@ Subject: [PATCH] user32: Add semi-stub for GetAutoRotationState.
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index a018dfc..c2559e0 100644
index 95a883d..c64047a 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3074,8 +3074,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
@@ -3124,8 +3124,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
*/
BOOL WINAPI GetAutoRotationState( AR_STATE *state )
{
@ -31,18 +31,18 @@ index a018dfc..c2559e0 100644
}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 876f84f..5096553 100644
index 5b185b9..e71aa3a 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -46,6 +46,7 @@ static DPI_AWARENESS_CONTEXT (WINAPI *pGetThreadDpiAwarenessContext)(void);
static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
@@ -50,6 +50,7 @@ static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENE
static DPI_AWARENESS_CONTEXT (WINAPI *pGetWindowDpiAwarenessContext)(HWND);
static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
+static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
static BOOL strict;
static int dpi, real_dpi;
@@ -3125,6 +3126,28 @@ static void test_window_dpi(void)
@@ -3254,6 +3255,28 @@ static void test_window_dpi(void)
pSetThreadDpiAwarenessContext( orig );
}
@ -71,15 +71,15 @@ index 876f84f..5096553 100644
START_TEST(sysparams)
{
int argc;
@@ -3144,6 +3167,7 @@ START_TEST(sysparams)
pSetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetThreadDpiAwarenessContext");
@@ -3277,6 +3300,7 @@ START_TEST(sysparams)
pGetWindowDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetWindowDpiAwarenessContext");
pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext");
pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext");
+ pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
hInstance = GetModuleHandleA( NULL );
hdc = GetDC(0);
@@ -3165,6 +3189,7 @@ START_TEST(sysparams)
@@ -3298,6 +3322,7 @@ START_TEST(sysparams)
trace("testing EnumDisplaySettings vs GetDeviceCaps\n");
test_EnumDisplaySettings( );
test_GetSysColorBrush( );
@ -88,5 +88,5 @@ index 876f84f..5096553 100644
change_counter = 0;
change_last_param = 0;
--
2.7.4
1.9.1

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

@ -1,15 +1,15 @@
From 828665a6803984db12958dfe7e9c735c192ae257 Mon Sep 17 00:00:00 2001
From 159a7b00133485a0d6d89caac91b66996fbfb439 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 22 Jun 2014 19:04:38 +0200
Subject: wtsapi32: Partial implementation of WTSEnumerateProcessesW.
Subject: [PATCH] wtsapi32: Partial implementation of WTSEnumerateProcessesW.
---
dlls/wtsapi32/tests/wtsapi.c | 1 -
dlls/wtsapi32/wtsapi32.c | 82 ++++++++++++++++++++++++++++++++++++++----
2 files changed, 75 insertions(+), 8 deletions(-)
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 e8dced7..a317e5f 100644
index 341d9e6..648d7b9 100644
--- a/dlls/wtsapi32/tests/wtsapi.c
+++ b/dlls/wtsapi32/tests/wtsapi.c
@@ -85,7 +85,6 @@ static void test_WTSEnumerateProcessesW(void)
@ -18,10 +18,10 @@ index e8dced7..a317e5f 100644
}
- todo_wine
ok(found || broken(!ret), "process name %s not found\n", wine_dbgstr_w(pname));
if (info) WTSFreeMemory(info);
WTSFreeMemory(info);
}
diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c
index 79d5a7f..9457143 100644
index 5569502..ca13d2f 100644
--- a/dlls/wtsapi32/wtsapi32.c
+++ b/dlls/wtsapi32/wtsapi32.c
@@ -18,8 +18,11 @@
@ -35,8 +35,8 @@ index 79d5a7f..9457143 100644
+#include "winternl.h"
#include "wtsapi32.h"
#include "wine/debug.h"
@@ -84,8 +87,13 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version
#include "wine/heap.h"
@@ -94,8 +97,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 79d5a7f..9457143 100644
if (!ppProcessInfo || !pCount || Reserved != 0 || Version != 1)
{
@@ -93,9 +101,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version
@@ -103,9 +111,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version
return FALSE;
}
@ -84,7 +84,7 @@ index 79d5a7f..9457143 100644
+ SetLastError(RtlNtStatusToDosError(status));
+ return FALSE;
+ }
+
+ spi = buf;
+ count = size = 0;
+ for (;;)
@ -121,22 +121,11 @@ index 79d5a7f..9457143 100644
+ name += (spi->ProcessName.Length + sizeof(WCHAR))/sizeof(WCHAR);
+ spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset);
+ }
+
+ HeapFree(GetProcessHeap(), 0, buf);
return TRUE;
}
@@ -159,9 +229,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version,
*/
void WINAPI WTSFreeMemory(PVOID pMemory)
{
- static int once;
-
- if (!once++) FIXME("Stub %p\n", pMemory);
+ HeapFree(GetProcessHeap(), 0, pMemory);
}
/************************************************************
--
1.7.9.5
1.9.1