wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 0c27d244f76ad90301c5db09d738b3a0389bcdac.

Browse Source
This commit is contained in:
Zebediah Figura
2020-04-30 17:39:18 -05:00
parent 7b0b95ee53
commit 169c49055d
11 changed files with 136 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 7e49bdcb1622494a4ca5e5b36f05482189cf151f Mon Sep 17 00:00:00 2001
From 8c3c4edd9393b71f66501a9972ee6e6b4f60aeb5 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,10 +12,10 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
create mode 100644 include/apiset.h
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 0f90291e2..c36337a64 100644
index ca8b5e2bf8a..565dea14b39 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -72,6 +72,7 @@ static PEB_LDR_DATA ldr;
@@ -75,6 +75,7 @@ static PEB_LDR_DATA ldr;
static RTL_BITMAP tls_bitmap;
static RTL_BITMAP tls_expansion_bitmap;
static RTL_BITMAP fls_bitmap;
@@ -23,19 +23,19 @@ index 0f90291e2..c36337a64 100644
static int nb_threads = 1;
static RTL_CRITICAL_SECTION peb_lock;
@@ -275,6 +276,7 @@ void thread_init(void)
peb = addr;
@@ -300,6 +301,7 @@ TEB *thread_init(void)
teb = virtual_alloc_first_teb();
peb = teb->Peb;
peb->FastPebLock = &peb_lock;
+ peb->ApiSetMap = &apiset_map;
peb->TlsBitmap = &tls_bitmap;
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->FlsBitmap = &fls_bitmap;
diff --git a/include/Makefile.in b/include/Makefile.in
index 2817c10d1..8a4759d17 100644
index 74db5ee1516..f250ea74d4b 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -14,6 +14,7 @@ SOURCES = \
@@ -15,6 +15,7 @@ SOURCES = \
amsi.idl \
amstream.idl \
amvideo.idl \
@@ -45,7 +45,7 @@ index 2817c10d1..8a4759d17 100644
appmodel.h \
diff --git a/include/apiset.h b/include/apiset.h
new file mode 100644
index 000000000..6801cd5f5
index 00000000000..6801cd5f509
--- /dev/null
+++ b/include/apiset.h
@@ -0,0 +1,37 @@
@@ -87,7 +87,7 @@ index 000000000..6801cd5f5
+
+#endif
diff --git a/include/winternl.h b/include/winternl.h
index 46dac7e48..352d9f64d 100644
index 87d0bde2955..eab44d1a57a 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@
@@ -98,7 +98,7 @@ index 46dac7e48..352d9f64d 100644
#ifdef __cplusplus
extern "C" {
@@ -286,7 +287,7 @@ typedef struct _PEB
@@ -288,7 +289,7 @@ typedef struct _PEB
ULONG EnvironmentUpdateCount; /* 028/050 */
PVOID KernelCallbackTable; /* 02c/058 */
ULONG Reserved[2]; /* 030/060 */
@@ -108,5 +108,5 @@ index 46dac7e48..352d9f64d 100644
PRTL_BITMAP TlsBitmap; /* 040/078 */
ULONG TlsBitmapBits[2]; /* 044/080 */
--
2.20.1
2.26.2