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 ec9e556d31278d2de28b8ba82a063dc9fffdb440.

Browse Source
This commit is contained in:
Zebediah Figura
2020-06-29 18:56:48 -05:00
parent b6c2818755
commit 70d8178927
11 changed files with 137 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,38 +1,38 @@
From 708e627172f61b5d0744135e31d4e9e3f7b32536 Mon Sep 17 00:00:00 2001
From 803d1e468279ef5efc5f8f872e2fb9db2466cd75 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.
---
dlls/ntdll/thread.c | 2 ++
dlls/ntdll/loader.c | 2 ++
include/Makefile.in | 1 +
include/apiset.h | 37 +++++++++++++++++++++++++++++++++++++
include/winternl.h | 3 ++-
4 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 include/apiset.h
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 21e8b0c08f8..24254d4b43c 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -71,6 +71,7 @@ static PEB_LDR_DATA ldr;
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index bd19474e844..00a146278a5 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -166,6 +166,7 @@ static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE };
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;
struct ldt_copy *__wine_ldt_copy = NULL;
@@ -300,6 +301,7 @@ TEB *thread_init(void)
static CRITICAL_SECTION fls_section;
static CRITICAL_SECTION_DEBUG fls_critsect_debug =
@@ -4016,6 +4017,7 @@ void __wine_process_init(void)
peb = teb->Peb;
peb->LdrData = &ldr;
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 9796dd8e5d9..2bc410f4308 100644
index 90fb873f203..015ad7c6942 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 f362790dbca..b33e346885f 100644
index 9a70a2014f1..1d3ef1f5adb 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@
@@ -108,5 +108,5 @@ index f362790dbca..b33e346885f 100644
PRTL_BITMAP TlsBitmap; /* 040/078 */
ULONG TlsBitmapBits[2]; /* 044/080 */
--
2.26.2
2.27.0

1
patches/ntdll-ApiSetMap/definition
View File

@@ -1 +1,2 @@
Fixes: [44658] Add dummy apiset to PEB struct
Depends: ntdll-FLS_Callbacks