Rebase against 7c62e6b169f18f4a5d5809490f8aebdb5a9375eb.

This commit is contained in:
Zebediah Figura
2021-03-30 17:06:03 -05:00
parent 2e42e7d996
commit d90a798a26
8 changed files with 55 additions and 61 deletions

View File

@ -1,4 +1,4 @@
From c65ffcf059cf2768a9ca6ee7a7e38d8a6a25fc44 Mon Sep 17 00:00:00 2001
From d0f1e23c56e0c4b1fa01f73dc0ed8fa4b6141710 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 22 May 2020 16:37:37 +1000
Subject: [PATCH] ntdll: NtQuerySystemInformation support
@ -8,14 +8,14 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49192
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/ntdll/unix/system.c | 22 ++++++++++++++++++++++
include/winternl.h | 22 ++++++++++++++++++++++
2 files changed, 44 insertions(+)
include/winternl.h | 21 +++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 6fa71ddfb91..fad1d072962 100644
index 56f31e4147f..be8f1d74fe3 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -2714,6 +2714,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
@@ -2809,6 +2809,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
ret = STATUS_SUCCESS;
break;
@ -45,16 +45,10 @@ index 6fa71ddfb91..fad1d072962 100644
FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size );
diff --git a/include/winternl.h b/include/winternl.h
index fcdedaec8aa..618fab7d7c2 100644
index 9e6bde25569..6bbf7fdbe99 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -1550,11 +1550,33 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
SystemMemoryListInformation = 80,
SystemFileCacheInformationEx = 81,
SystemDynamicTimeZoneInformation = 102,
+ SystemCodeIntegrityInformation = 103,
SystemLogicalProcessorInformationEx = 107,
SystemHypervisorSharedPageInformation = 197,
@@ -1696,6 +1696,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
SystemInformationClassMax
} SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS;