You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 7907ccfdcb39b30dc49c96c411332534525b6ea9
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 6b07556e47ab6db08cb68371b706f11525bd2d16 Mon Sep 17 00:00:00 2001
|
||||
From 2afc731dcc7e4b8963ddc2792cce17e1ff7c40dc 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 c4e02da..79bc4e2 100644
|
||||
index 0f90291..c36337a6 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -72,6 +72,7 @@ static WCHAR current_dir[MAX_PATH];
|
||||
@@ -72,6 +72,7 @@ static PEB_LDR_DATA ldr;
|
||||
static RTL_BITMAP tls_bitmap;
|
||||
static RTL_BITMAP tls_expansion_bitmap;
|
||||
static RTL_BITMAP fls_bitmap;
|
||||
@@ -23,16 +23,16 @@ index c4e02da..79bc4e2 100644
|
||||
static int nb_threads = 1;
|
||||
|
||||
static RTL_CRITICAL_SECTION peb_lock;
|
||||
@@ -308,6 +309,7 @@ void thread_init(void)
|
||||
@@ -275,6 +276,7 @@ void thread_init(void)
|
||||
peb = addr;
|
||||
|
||||
peb->FastPebLock = &peb_lock;
|
||||
peb->ProcessParameters = ¶ms;
|
||||
+ 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 cc78b1c..e6d554b 100644
|
||||
index 5485084..72e6e5d 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -13,6 +13,7 @@ SOURCES = \
|
||||
@@ -88,7 +88,7 @@ index 0000000..f55f804
|
||||
+#endif
|
||||
+
|
||||
diff --git a/include/winternl.h b/include/winternl.h
|
||||
index 9c88613..c09f462 100644
|
||||
index 064444d..a9c6cab 100644
|
||||
--- a/include/winternl.h
|
||||
+++ b/include/winternl.h
|
||||
@@ -23,6 +23,7 @@
|
||||
|
Reference in New Issue
Block a user