From 1f578b2d531440f9b1e2255d96c33efb87af5412 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Tue, 16 Apr 2024 18:04:01 -0500
Subject: [PATCH] Rebase against 04b829e81b3da1e98964dee4df0be4c876745f00.

---
 ...ata-implementation-for-ProcessQuotaL.patch | 63 -------------------
 patches/ntdll-ProcessQuotaLimits/definition   |  1 -
 staging/upstream-commit                       |  2 +-
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 patches/ntdll-ProcessQuotaLimits/0001-ntdll-Add-fake-data-implementation-for-ProcessQuotaL.patch
 delete mode 100644 patches/ntdll-ProcessQuotaLimits/definition

diff --git a/patches/ntdll-ProcessQuotaLimits/0001-ntdll-Add-fake-data-implementation-for-ProcessQuotaL.patch b/patches/ntdll-ProcessQuotaLimits/0001-ntdll-Add-fake-data-implementation-for-ProcessQuotaL.patch
deleted file mode 100644
index 529b3963..00000000
--- a/patches/ntdll-ProcessQuotaLimits/0001-ntdll-Add-fake-data-implementation-for-ProcessQuotaL.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 8c7d326435794a72c70e05acdff945edf506ec3c Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Wed, 21 Oct 2015 06:23:22 +0800
-Subject: [PATCH] ntdll: Add fake data implementation for ProcessQuotaLimits
- class.
-
----
- dlls/ntdll/unix/process.c | 32 +++++++++++++++++++++++++++++++-
- 1 file changed, 31 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c
-index 93d7e7b0140..ae3ab9a8058 100644
---- a/dlls/ntdll/unix/process.c
-+++ b/dlls/ntdll/unix/process.c
-@@ -1050,7 +1050,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
- 
-     switch (class)
-     {
--    UNIMPLEMENTED_INFO_CLASS(ProcessQuotaLimits);
-     UNIMPLEMENTED_INFO_CLASS(ProcessBasePriority);
-     UNIMPLEMENTED_INFO_CLASS(ProcessRaisePriority);
-     UNIMPLEMENTED_INFO_CLASS(ProcessExceptionPort);
-@@ -1109,6 +1108,37 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
-         }
-         break;
- 
-+    case ProcessQuotaLimits:
-+        {
-+            QUOTA_LIMITS pqli;
-+
-+            if (size >= sizeof(QUOTA_LIMITS))
-+            {
-+                if (!info)
-+                    ret = STATUS_ACCESS_VIOLATION;
-+                else if (!handle)
-+                    ret = STATUS_INVALID_HANDLE;
-+                else
-+                {
-+                    /* FIXME : real data */
-+                    memset(&pqli, 0, sizeof(QUOTA_LIMITS));
-+
-+                    memcpy(info, &pqli, sizeof(QUOTA_LIMITS));
-+
-+                    len = sizeof(QUOTA_LIMITS);
-+                }
-+
-+                if (size > sizeof(QUOTA_LIMITS))
-+                    ret = STATUS_INFO_LENGTH_MISMATCH;
-+            }
-+            else
-+            {
-+                len = sizeof(QUOTA_LIMITS);
-+                ret = STATUS_INFO_LENGTH_MISMATCH;
-+            }
-+        }
-+        break;
-+
-     case ProcessIoCounters:
-         {
-             IO_COUNTERS pii;
--- 
-2.27.0
-
diff --git a/patches/ntdll-ProcessQuotaLimits/definition b/patches/ntdll-ProcessQuotaLimits/definition
deleted file mode 100644
index 46f60c5f..00000000
--- a/patches/ntdll-ProcessQuotaLimits/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: [44812] Multiple applications need NtQueryInformationProcess 'ProcessQuotaLimits' class support (MSYS2, ProcessHacker 2.x)
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 2dc5fa9a..96cef560 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-00198c4084a61f65f18574d16833d945e50c0614
+04b829e81b3da1e98964dee4df0be4c876745f00