Rebase against 3c86adab766e3bc7c91da088c2dd6bc41a917055.

This commit is contained in:
Zebediah Figura
2020-06-01 22:31:00 -05:00
parent f132e60b9d
commit c81093882b
17 changed files with 224 additions and 257 deletions

View File

@@ -1,4 +1,4 @@
From 8c3c4edd9393b71f66501a9972ee6e6b4f60aeb5 Mon Sep 17 00:00:00 2001
From 708e627172f61b5d0744135e31d4e9e3f7b32536 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,19 +12,19 @@ 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 ca8b5e2bf8a..565dea14b39 100644
index 21e8b0c08f8..24254d4b43c 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -75,6 +75,7 @@ static PEB_LDR_DATA ldr;
@@ -71,6 +71,7 @@ static PEB_LDR_DATA ldr;
static RTL_BITMAP tls_bitmap;
static RTL_BITMAP tls_expansion_bitmap;
static RTL_BITMAP fls_bitmap;
+static API_SET_NAMESPACE_ARRAY apiset_map;
static int nb_threads = 1;
static RTL_CRITICAL_SECTION peb_lock;
struct ldt_copy *__wine_ldt_copy = NULL;
@@ -300,6 +301,7 @@ TEB *thread_init(void)
teb = virtual_alloc_first_teb();
peb = teb->Peb;
peb->FastPebLock = &peb_lock;
+ peb->ApiSetMap = &apiset_map;
@@ -32,7 +32,7 @@ index ca8b5e2bf8a..565dea14b39 100644
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->FlsBitmap = &fls_bitmap;
diff --git a/include/Makefile.in b/include/Makefile.in
index 74db5ee1516..f250ea74d4b 100644
index 9796dd8e5d9..2bc410f4308 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 87d0bde2955..eab44d1a57a 100644
index f362790dbca..b33e346885f 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@