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

Updated kernel32-Processor_Group patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-11-22 10:58:56 +11:00
parent c6466b849b
commit ff24c240c5
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,19 @@
From 4183758f3b4ae2322c807411b5f059cbea177e20 Mon Sep 17 00:00:00 2001
From 985632c94e0175972f8a780f4d363bbfe7e284bf 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.
---
...pi-ms-win-core-kernel32-legacy-l1-1-0.spec | 2 +-
dlls/kernel32/cpu.c | 28 ++++++++++++++-----
dlls/kernel32/kernel32.spec | 2 +-
dlls/kernel32/tests/process.c | 23 +++++++++++++++
include/winnt.h | 2 ++
5 files changed, 48 insertions(+), 9 deletions(-)
.../api-ms-win-core-kernel32-legacy-l1-1-0.spec | 2 +-
.../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +-
dlls/kernel32/cpu.c | 28 ++++++++++++++++------
dlls/kernel32/kernel32.spec | 2 +-
dlls/kernel32/tests/process.c | 23 ++++++++++++++++++
include/winnt.h | 2 ++
6 files changed, 49 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 e653ac6d21..b6af37ab0a 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 @@
@ -24,11 +25,24 @@ index e653ac6d21..b6af37ab0a 100644
@ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
@ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
@ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA
diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
index 5531d2d..997b80a 100644
--- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
@@ -26,7 +26,7 @@
@ stub GetDurationFormatEx
@ stub GetFileAttributesTransactedW
@ stub GetFirmwareType
-@ stub GetMaximumProcessorGroupCount
+@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount
@ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
@ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
@ stub GetNumaAvailableMemoryNodeEx
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
index 89482a65e1..ffb88e313c 100644
index 84385c7..c06db1d 100644
--- a/dlls/kernel32/cpu.c
+++ b/dlls/kernel32/cpu.c
@@ -309,7 +309,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
@@ -312,7 +312,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
*/
WORD WINAPI GetActiveProcessorGroupCount(void)
{
@ -39,7 +53,7 @@ index 89482a65e1..ffb88e313c 100644
return 1;
}
@@ -318,14 +320,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
@@ -321,14 +323,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
*/
DWORD WINAPI GetActiveProcessorCount(WORD group)
{
@ -73,7 +87,7 @@ index 89482a65e1..ffb88e313c 100644
/***********************************************************************
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 5490b07d8e..899aa55d76 100644
index 85fce37..12a550b 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -716,7 +716,7 @@
@ -86,7 +100,7 @@ index 5490b07d8e..899aa55d76 100644
@ stdcall GetModuleFileNameW(long ptr long)
@ stdcall GetModuleHandleA(str)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index fe68d28e91..dc26549b67 100644
index fe68d28..dc26549 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
@ -141,10 +155,10 @@ index fe68d28e91..dc26549b67 100644
test_ProcThreadAttributeList();
test_SuspendProcessState();
diff --git a/include/winnt.h b/include/winnt.h
index 035d5bd097..07e7c7bb60 100644
index 742b47b..520b642 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -6093,6 +6093,8 @@ typedef struct _GROUP_AFFINITY
@@ -6096,6 +6096,8 @@ typedef struct _GROUP_AFFINITY
WORD Reserved[3];
} GROUP_AFFINITY, *PGROUP_AFFINITY;
@ -154,5 +168,5 @@ index 035d5bd097..07e7c7bb60 100644
{
WORD Group;
--
2.19.1
1.9.1