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

Browse Source
This commit is contained in:
Sebastian Lackner
2017-08-31 23:11:13 +02:00
parent f98abfe0dc
commit c50463197f
8 changed files with 48 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 4f48082aac2ff759f0806371acbec167b95df13a Mon Sep 17 00:00:00 2001
From b97e38f96a743c0aa44572ae8dbc477375e0d64e 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: ntdll: Add dummy apiset to PEB.
@@ -12,7 +12,7 @@ Subject: 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 ccbc41d6ac..ab23ec127a 100644
index 08318ebeeb4..88d315f1e9c 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -69,6 +69,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH];
@@ -22,20 +22,20 @@ index ccbc41d6ac..ab23ec127a 100644
+static API_SET_NAMESPACE_ARRAY apiset_map;
static int nb_threads = 1;
static RTL_CRITICAL_SECTION peb_lock;
@@ -388,6 +389,7 @@ HANDLE thread_init(void)
@@ -352,6 +353,7 @@ HANDLE thread_init(void)
peb = addr;
peb->FastPebLock = &peb_lock;
peb->ProcessParameters = &params;
+ 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 5065815c6d..c663902804 100644
index fcdd8b323ce..7e005f6bb1e 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -201,6 +201,7 @@ HEADER_SRCS = \
@@ -208,6 +208,7 @@ HEADER_SRCS = \
advpub.h \
af_irda.h \
amaudio.h \
@@ -45,7 +45,7 @@ index 5065815c6d..c663902804 100644
atlbase.h \
diff --git a/include/apiset.h b/include/apiset.h
new file mode 100644
index 0000000000..5f911717ee
index 00000000000..5f911717eea
--- /dev/null
+++ b/include/apiset.h
@@ -0,0 +1,33 @@
@@ -83,7 +83,7 @@ index 0000000000..5f911717ee
+ API_SET_NAMESPACE_ENTRY Array[1];
+} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY;
diff --git a/include/winternl.h b/include/winternl.h
index dbef76921c..d6f47ad3ba 100644
index df20da58c3c..f3f9b047e50 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@
@@ -104,5 +104,5 @@ index dbef76921c..d6f47ad3ba 100644
PRTL_BITMAP TlsBitmap; /* 040/078 */
ULONG TlsBitmapBits[2]; /* 044/080 */
--
2.11.0
2.14.1