From 1ee9d7c6e87cdde1616e7458a35d0f130d36ba79 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 14 Sep 2018 21:10:12 -0500 Subject: [PATCH] Rebase against 64d9f309b7f74d4154e685c5d1d78c1b8335c0bc. --- ...d-stub-for-ApiSetQueryApiSetPresence.patch | 52 ------------------- .../definition | 1 - patches/patchinstall.sh | 18 +------ staging/patchutils.py | 2 +- 4 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch delete mode 100644 patches/ntdll-ApiSetQueryApiSetPresence/definition diff --git a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch deleted file mode 100644 index 5acc4599..00000000 --- a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 29ecd040a4524a81da6127c59dbb601c88dde1da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 15 Jan 2016 13:17:31 +0100 -Subject: ntdll: Add stub for ApiSetQueryApiSetPresence. - ---- - .../api-ms-win-core-apiquery-l1-1-0.spec | 2 +- - dlls/ntdll/misc.c | 11 +++++++++++ - dlls/ntdll/ntdll.spec | 1 + - 3 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec -index 6d63b5b..1d99dd7 100644 ---- a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec -+++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec -@@ -1 +1 @@ --@ stub ApiSetQueryApiSetPresence -+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence -diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 2431662..c84b004 100644 ---- a/dlls/ntdll/misc.c -+++ b/dlls/ntdll/misc.c -@@ -504,3 +504,14 @@ NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE *token_handle, HANDLE existing_token_ - *token_handle = NULL; - return STATUS_SUCCESS; - } -+ -+/********************************************************************* -+ * ApiSetQueryApiSetPresence (NTDLL.@) -+ */ -+BOOL WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING *namespace, BOOLEAN *present) -+{ -+ FIXME("(%s, %p) stub!\n", debugstr_us(namespace), present); -+ -+ *present = TRUE; -+ return TRUE; -+} -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 003e4f9..5e7c463 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -3,6 +3,7 @@ - #if you change a Nt.. function DON'T FORGET to change the - #Zw one too. - -+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) - @ stub CsrAllocateCaptureBuffer - @ stub CsrAllocateCapturePointer - @ stub CsrAllocateMessagePointer --- -2.7.4 - diff --git a/patches/ntdll-ApiSetQueryApiSetPresence/definition b/patches/ntdll-ApiSetQueryApiSetPresence/definition deleted file mode 100644 index c28de707..00000000 --- a/patches/ntdll-ApiSetQueryApiSetPresence/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Add stub for ntdll.ApiSetQueryApiSetPresence diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 2c4c9437..f63461e5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "0799550075654094a3bed080aac722b9bea01307" + echo "64d9f309b7f74d4154e685c5d1d78c1b8335c0bc" } # Show version information @@ -193,7 +193,6 @@ patch_enable_all () enable_ntdll_APC_Performance="$1" enable_ntdll_Activation_Context="$1" enable_ntdll_ApiSetMap="$1" - enable_ntdll_ApiSetQueryApiSetPresence="$1" enable_ntdll_Builtin_Prot="$1" enable_ntdll_CriticalSection="$1" enable_ntdll_DOS_Attributes="$1" @@ -749,9 +748,6 @@ patch_enable () ntdll-ApiSetMap) enable_ntdll_ApiSetMap="$2" ;; - ntdll-ApiSetQueryApiSetPresence) - enable_ntdll_ApiSetQueryApiSetPresence="$2" - ;; ntdll-Builtin_Prot) enable_ntdll_Builtin_Prot="$2" ;; @@ -4562,18 +4558,6 @@ if test "$enable_ntdll_ApiSetMap" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-ApiSetQueryApiSetPresence -# | -# | Modified files: -# | * dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec, dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec -# | -if test "$enable_ntdll_ApiSetQueryApiSetPresence" -eq 1; then - patch_apply ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch - ( - printf '%s\n' '+ { "Michael Müller", "ntdll: Add stub for ApiSetQueryApiSetPresence.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-Hide_Wine_Exports # | # | This patchset has the following (direct or indirect) dependencies: diff --git a/staging/patchutils.py b/staging/patchutils.py index cb40cd53..07037d1c 100644 --- a/staging/patchutils.py +++ b/staging/patchutils.py @@ -398,7 +398,7 @@ def apply_patch(original, patchfile, reverse=False, fuzz=2): shutil.copyfileobj(fp, result) result.close() - cmdline = ["patch", "--no-backup-if-mismatch", "--force", "-r", "-"] + cmdline = ["patch", "--no-backup-if-mismatch", "--force", "--silent", "-r", "-"] if reverse: cmdline.append("--reverse") if fuzz != 2: cmdline.append("--fuzz=%d" % fuzz) cmdline += [result.name, patchfile.name]