From ba6e2398d7bb9b2666185a4594af85025b9decdb Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 29 May 2023 16:33:43 -0500
Subject: [PATCH] Rebase against d0d472bb3e8680e286e404a73fceb29cebe85b73.

---
 ...OLATIONAWARE_MANIFEST_RESOURCE_ID-ra.patch | 43 -------------------
 patches/ntdll-Manifest_Range/definition       |  1 -
 staging/upstream-commit                       |  2 +-
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 patches/ntdll-Manifest_Range/0001-ntdll-Support-ISOLATIONAWARE_MANIFEST_RESOURCE_ID-ra.patch
 delete mode 100644 patches/ntdll-Manifest_Range/definition

diff --git a/patches/ntdll-Manifest_Range/0001-ntdll-Support-ISOLATIONAWARE_MANIFEST_RESOURCE_ID-ra.patch b/patches/ntdll-Manifest_Range/0001-ntdll-Support-ISOLATIONAWARE_MANIFEST_RESOURCE_ID-ra.patch
deleted file mode 100644
index 284d53cd..00000000
--- a/patches/ntdll-Manifest_Range/0001-ntdll-Support-ISOLATIONAWARE_MANIFEST_RESOURCE_ID-ra.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6e76ba9655c02041be67b3466dbdb62a2c9ecc10 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
-Date: Tue, 13 Nov 2018 11:07:46 +1100
-Subject: [PATCH] ntdll: Support ISOLATIONAWARE_MANIFEST_RESOURCE_ID range
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18889
----
- dlls/ntdll/actctx.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
-index 08b6c50..4366051 100644
---- a/dlls/ntdll/actctx.c
-+++ b/dlls/ntdll/actctx.c
-@@ -57,6 +57,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx);
- /* we don't want to include winuser.h */
- #define RT_MANIFEST                        ((ULONG_PTR)24)
- #define CREATEPROCESS_MANIFEST_RESOURCE_ID ((ULONG_PTR)1)
-+#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)1)
-+#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)16)
- 
- /* from oaidl.h */
- typedef enum tagLIBFLAGS {
-@@ -3291,8 +3293,14 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl,
-             status = open_nt_file( &file, &nameW );
-             if (!status)
-             {
--                status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file,
--                                                  (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 );
-+                INT rid;
-+                for (rid = MINIMUM_RESERVED_MANIFEST_RESOURCE_ID;
-+                     rid <= MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID; rid++)
-+                {
-+                    status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file,
-+                                                      (LPCWSTR)(ULONG_PTR)rid, 0 );
-+                    if (status == STATUS_SUCCESS) break;
-+                }
-                 NtClose( file );
-                 if (status == STATUS_SUCCESS)
-                     break;
--- 
-1.9.1
-
diff --git a/patches/ntdll-Manifest_Range/definition b/patches/ntdll-Manifest_Range/definition
deleted file mode 100644
index 5e7d9ac2..00000000
--- a/patches/ntdll-Manifest_Range/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: [18889] ntdll: Support ISOLATIONAWARE_MANIFEST_RESOURCE_ID range
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 93cb027e..adafd3aa 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-9ffeb2622d087a6189ca916553529824791010c3
+d0d472bb3e8680e286e404a73fceb29cebe85b73