wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 8d076bc5e46cc11ec94db631e7c608f62d75cee2.

Browse Source
This commit is contained in:
Zebediah Figura
2021-04-06 17:41:23 -05:00
parent 733a420dd7
commit 0c295023f1
9 changed files with 85 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch
View File

@@ -1,4 +1,4 @@
From 658a24832ee3e9a04a311600fd00b91b6d5cfb5f Mon Sep 17 00:00:00 2001
From 5b1520dd617c454ac8e482260b6b437f6f98d185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 3 Apr 2017 01:06:26 +0200
Subject: [PATCH] ntdll: Add dummy apiset to PEB.
@@ -12,27 +12,27 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
create mode 100644 include/apiset.h
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index c7da728964c..addc5e0adfc 100644
index 7a714a5aa6d..62d1b38f4c0 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -169,6 +169,7 @@ static RTL_CRITICAL_SECTION peb_lock = { &peb_critsect_debug, -1, 0, 0, 0, 0 };
static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE };
@@ -164,6 +164,7 @@ static PEB_LDR_DATA ldr =
static RTL_BITMAP tls_bitmap;
static RTL_BITMAP tls_expansion_bitmap;
+static API_SET_NAMESPACE_ARRAY apiset_map;
static WINE_MODREF *cached_modref;
static WINE_MODREF *current_modref;
@@ -4025,6 +4026,7 @@ static NTSTATUS process_init(void)
@@ -3626,6 +3627,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
peb->LdrData = &ldr;
peb->FastPebLock = &peb_lock;
+ peb->ApiSetMap = &apiset_map;
peb->TlsBitmap = &tls_bitmap;
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->LoaderLock = &loader_section;
peb->LdrData = &ldr;
peb->FastPebLock = &peb_lock;
+ peb->ApiSetMap = &apiset_map;
peb->TlsBitmap = &tls_bitmap;
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->LoaderLock = &loader_section;
diff --git a/include/Makefile.in b/include/Makefile.in
index 87cc175739b..ff9f0f692d9 100644
index 9133e5c6315..f56a60fae5e 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -15,6 +15,7 @@ SOURCES = \
@@ -87,7 +87,7 @@ index 00000000000..6801cd5f509
+
+#endif
diff --git a/include/winternl.h b/include/winternl.h
index cff261b6d7c..ca7a85d9578 100644
index 298ebbc2d36..163b7737e00 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@
@@ -98,7 +98,7 @@ index cff261b6d7c..ca7a85d9578 100644
#ifdef __cplusplus
extern "C" {
@@ -316,7 +317,7 @@ typedef struct _PEB
@@ -321,7 +322,7 @@ typedef struct _PEB
PVOID KernelCallbackTable; /* 02c/058 */
ULONG Reserved; /* 030/060 */
ULONG AtlThunkSListPtr32; /* 034/064 */
@@ -108,5 +108,5 @@ index cff261b6d7c..ca7a85d9578 100644
PRTL_BITMAP TlsBitmap; /* 040/078 */
ULONG TlsBitmapBits[2]; /* 044/080 */
--
2.28.0
2.30.2