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

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-10-02 08:48:09 +10:00
parent cd9f6dbd90
commit 7145412e08
8 changed files with 21 additions and 191 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 803d1e468279ef5efc5f8f872e2fb9db2466cd75 Mon Sep 17 00:00:00 2001
From 768f70f18be51fe0a1d92c04fbf3795fd619e127 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,18 +12,18 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
create mode 100644 include/apiset.h
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index bd19474e844..00a146278a5 100644
index c2187a19397..2fb24737495 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -166,6 +166,7 @@ static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE };
@@ -170,6 +170,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 CRITICAL_SECTION fls_section;
static CRITICAL_SECTION_DEBUG fls_critsect_debug =
@@ -4016,6 +4017,7 @@ void __wine_process_init(void)
static WINE_MODREF *cached_modref;
static WINE_MODREF *current_modref;
@@ -4017,6 +4018,7 @@ static NTSTATUS process_init(void)
peb->LdrData = &ldr;
peb->FastPebLock = &peb_lock;
@@ -32,7 +32,7 @@ index bd19474e844..00a146278a5 100644
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->FlsBitmap = &fls_bitmap;
diff --git a/include/Makefile.in b/include/Makefile.in
index 90fb873f203..015ad7c6942 100644
index 34daad90e78..ad4a131c245 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 9a70a2014f1..1d3ef1f5adb 100644
index 82328167c9e..6c720f7eff6 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@
@@ -98,7 +98,7 @@ index 9a70a2014f1..1d3ef1f5adb 100644
#ifdef __cplusplus
extern "C" {
@@ -288,7 +289,7 @@ typedef struct _PEB
@@ -289,7 +290,7 @@ typedef struct _PEB
ULONG EnvironmentUpdateCount; /* 028/050 */
PVOID KernelCallbackTable; /* 02c/058 */
ULONG Reserved[2]; /* 030/060 */
@@ -108,5 +108,5 @@ index 9a70a2014f1..1d3ef1f5adb 100644
PRTL_BITMAP TlsBitmap; /* 040/078 */
ULONG TlsBitmapBits[2]; /* 044/080 */
--
2.27.0
2.28.0

2
patches/ntdll-ApiSetMap/definition
View File

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