wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6e3d68b14120563fd584fe9c5a27885f51e7ae66.

Browse Source
This commit is contained in:
Zebediah Figura 2019-08-08 20:33:13 -05:00
parent c7780d90cb
commit f901156486
2 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
patches/kernel32-Processor_Group/0002-kernel32-Add-stub-for-SetThreadIdealProcessorEx.patch
View File

@ -1,25 +1,23 @@
From ac7b880c08822aac4e5241753dc919b7ab0e796e Mon Sep 17 00:00:00 2001
From 16944e0e4b46d0fb0346937c7d288bfc08abe612 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:31:59 +0100
Subject: kernel32: Add stub for SetThreadIdealProcessorEx.
Subject: [PATCH] kernel32: Add stub for SetThreadIdealProcessorEx.
---
dlls/kernel32/thread.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
dlls/kernelbase/thread.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c
index ac2c3687789..499fbe24d09 100644
--- a/dlls/kernel32/thread.c
+++ b/dlls/kernel32/thread.c
@@ -450,6 +450,28 @@ DWORD_PTR WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD_PTR dwThreadAffini
return tbi.AffinityMask;
}
+/**********************************************************************
+ * SetThreadIdealProcessorEx (KERNEL32.@)
+ */
+BOOL WINAPI SetThreadIdealProcessorEx(HANDLE thread, PROCESSOR_NUMBER *processor, PROCESSOR_NUMBER *previous)
+{
diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c
index 852ab354f..172a0f16b 100644
--- a/dlls/kernelbase/thread.c
+++ b/dlls/kernelbase/thread.c
@@ -431,9 +431,22 @@ DWORD WINAPI DECLSPEC_HOTPATCH SetThreadIdealProcessor( HANDLE thread, DWORD pro
BOOL WINAPI DECLSPEC_HOTPATCH SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal,
PROCESSOR_NUMBER *previous )
{
- FIXME( "(%p %p %p): stub\n", thread, ideal, previous );
- SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
- return FALSE;
+ FIXME("(%p, %p, %p): stub\n", thread, processor, previous);
+
+ if (!processor || processor->Group > 0 || processor->Number > MAXIMUM_PROCESSORS)
@ -36,27 +34,9 @@ index ac2c3687789..499fbe24d09 100644
+ }
+
+ return TRUE;
+}
/**********************************************************************
* SetThreadIdealProcessor [KERNEL32.@] Sets preferred processor for thread.
@@ -472,16 +494,6 @@ DWORD WINAPI SetThreadIdealProcessor(
}
/***********************************************************************
- * SetThreadIdealProcessorEx (KERNEL32.@)
- */
-BOOL WINAPI SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous )
-{
- FIXME("(%p %p %p): stub\n", thread, ideal, previous);
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
-}
-
-/***********************************************************************
* GetThreadSelectorEntry (KERNEL32.@)
*/
BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent )
--
2.12.2
2.22.0

4
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "9855fbe252ff3664d879e8cd9f5d1ea879af47dd"
echo "6e3d68b14120563fd584fe9c5a27885f51e7ae66"
}
# Show version information
@ -4353,7 +4353,7 @@ fi
# | Modified files:
# | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/api-ms-win-core-
# | kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec, dlls/kernel32/cpu.c, dlls/kernel32/kernel32.spec,
# | dlls/kernel32/tests/process.c, dlls/kernel32/thread.c, include/winnt.h
# | dlls/kernel32/tests/process.c, dlls/kernelbase/thread.c, include/winnt.h
# |
if test "$enable_kernel32_Processor_Group" -eq 1; then
patch_apply kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch