diff --git a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch index 0ada1ea2..bb7fcb2b 100644 --- a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch +++ b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch @@ -1,57 +1,15 @@ -From e1057892b7256a8c48b4abaa1b34fb11b6735973 Mon Sep 17 00:00:00 2001 +From 6411e2db0852c46aeb6d228a52d4a32e12a6aaaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= 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 +- - ...pi-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- - dlls/kernel32/kernel32.spec | 2 +- - dlls/kernel32/process.c | 26 ++++++++++++++++--- - dlls/kernel32/tests/process.c | 21 +++++++++++++++ - 5 files changed, 46 insertions(+), 7 deletions(-) + dlls/kernel32/process.c | 14 ++++++++++---- + dlls/kernel32/tests/process.c | 21 +++++++++++++++++++++ + 2 files changed, 31 insertions(+), 4 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 e653ac6d212..b6af37ab0aa 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 @@ - @ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW - @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow - @ stub GetDurationFormatEx --@ stub GetMaximumProcessorGroupCount -+@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount - @ 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 4998af04d9b..5ce8e24713b 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 - @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx -diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index 0312e044a86..06f524a8080 100644 ---- a/dlls/kernel32/kernel32.spec -+++ b/dlls/kernel32/kernel32.spec -@@ -719,7 +719,7 @@ - @ stdcall -import GetLongPathNameW(wstr ptr long) - @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) - @ stdcall GetMaximumProcessorCount(long) --# @ stub GetMaximumProcessorGroupCount -+@ stdcall GetMaximumProcessorGroupCount() - @ stdcall -import GetModuleFileNameA(long ptr long) - @ stdcall -import GetModuleFileNameW(long ptr long) - @ stdcall -import GetModuleHandleA(str) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c -index 41a5b34af19..dc136365f50 100644 +index f07a997bea3..dcaf898e32b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -609,7 +609,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK @@ -83,25 +41,6 @@ index 41a5b34af19..dc136365f50 100644 } /*********************************************************************** -@@ -635,6 +641,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) - return cpus; - } - -+/*********************************************************************** -+ * GetMaximumProcessorGroupCount (KERNEL32.@) -+ */ -+WORD WINAPI GetMaximumProcessorGroupCount(void) -+{ -+ TRACE("()\n"); -+ -+ /* systems with less than 64 logical processors only have group 0 */ -+ return 1; -+} -+ -+ - /*********************************************************************** - * GetFirmwareEnvironmentVariableA (KERNEL32.@) - */ diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 433c12ff1fb..5049265684f 100644 --- a/dlls/kernel32/tests/process.c diff --git a/patches/ntdll-NtDevicePath/0001-ntdll-Implement-opening-files-through-nt-device-path.patch b/patches/ntdll-NtDevicePath/0001-ntdll-Implement-opening-files-through-nt-device-path.patch index 94b492ab..b43aef0a 100644 --- a/patches/ntdll-NtDevicePath/0001-ntdll-Implement-opening-files-through-nt-device-path.patch +++ b/patches/ntdll-NtDevicePath/0001-ntdll-Implement-opening-files-through-nt-device-path.patch @@ -1,4 +1,4 @@ -From 6147ac6f68fe96fd53d52b11e16dafbec37b128d Mon Sep 17 00:00:00 2001 +From f3656ad722d12021db19a015a57fa9d2b9e72622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 26 May 2017 05:17:17 +0200 Subject: [PATCH] ntdll: Implement opening files through nt device paths. @@ -63,10 +63,10 @@ index 839046a7488..8756c18c9e8 100644 static void open_file_test(void) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index 5ab24e2c334..5ad856dbebf 100644 +index d3750109a79..6250ada9570 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c -@@ -3282,8 +3282,8 @@ static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char * +@@ -3297,8 +3297,8 @@ static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char * * element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is * returned, but the unix name is still filled in properly. */ @@ -77,7 +77,7 @@ index 5ab24e2c334..5ad856dbebf 100644 { static const WCHAR unixW[] = {'u','n','i','x'}; static const WCHAR pipeW[] = {'p','i','p','e'}; -@@ -3421,6 +3421,126 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nam +@@ -3436,6 +3436,126 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nam return status; } @@ -203,7 +203,7 @@ index 5ab24e2c334..5ad856dbebf 100644 +} /****************************************************************** - * unix_to_nt_file_name + * collapse_path -- -2.20.1 +2.30.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 76f3c97c..49b8dc73 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a24bdfc2c69c5648cbb3df762149b2647e209a09" + echo "4904d90870a716fda971fc12240ddbc23323475c" } # Show version information @@ -2653,9 +2653,7 @@ fi # | * api-ms-win-Stub_DLLs # | # | 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/kernel32.spec, -# | dlls/kernel32/process.c, dlls/kernel32/tests/process.c, dlls/kernelbase/thread.c +# | * dlls/kernel32/process.c, dlls/kernel32/tests/process.c, dlls/kernelbase/thread.c # | if test "$enable_kernel32_Processor_Group" -eq 1; then patch_apply kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch diff --git a/staging/upstream-commit b/staging/upstream-commit index 0e68fd97..df8fbf64 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -a24bdfc2c69c5648cbb3df762149b2647e209a09 +4904d90870a716fda971fc12240ddbc23323475c