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 538263d0efe725124df88ce1cce124bc3ad7e2af

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-20 08:24:24 +11:00
parent 852c641a59
commit 3ee8f1c014
15 changed files with 125 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
From 93accf8fa8225b99efed51f2b44433c1776b8403 Mon Sep 17 00:00:00 2001
From f41ca623297693e58b3d286245fa01b4c9d9f5b1 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.
Subject: [PATCH] ntdll: Add dummy apiset to PEB.
---
dlls/ntdll/thread.c | 2 ++
@@ -12,10 +12,10 @@ 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 85ceb2bbeac..95511673fab 100644
index 34e12ad..b1d04ab 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -68,6 +68,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH];
@@ -75,6 +75,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH];
static RTL_BITMAP tls_bitmap;
static RTL_BITMAP tls_expansion_bitmap;
static RTL_BITMAP fls_bitmap;
@@ -23,7 +23,7 @@ index 85ceb2bbeac..95511673fab 100644
static int nb_threads = 1;
static RTL_CRITICAL_SECTION peb_lock;
@@ -304,6 +305,7 @@ HANDLE thread_init(void)
@@ -396,6 +397,7 @@ HANDLE thread_init(void)
peb->FastPebLock = &peb_lock;
peb->ProcessParameters = &params;
@@ -32,20 +32,20 @@ index 85ceb2bbeac..95511673fab 100644
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->FlsBitmap = &fls_bitmap;
diff --git a/include/Makefile.in b/include/Makefile.in
index 025fe774552..07e0d54dd81 100644
index ac0ff21..be384d5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -223,6 +223,7 @@ HEADER_SRCS = \
advpub.h \
af_irda.h \
amaudio.h \
+ apiset.h \
@@ -14,6 +14,7 @@ SOURCES = \
amstream.idl \
amvideo.idl \
appcompatapi.h \
+ apiset.h \
appmgmt.h \
appmodel.h \
asptlb.idl \
diff --git a/include/apiset.h b/include/apiset.h
new file mode 100644
index 00000000000..5f911717eea
index 0000000..5f91171
--- /dev/null
+++ b/include/apiset.h
@@ -0,0 +1,33 @@
@@ -83,7 +83,7 @@ index 00000000000..5f911717eea
+ 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 ec8b3874714..2c35bbb3942 100644
index 9dd95c3..0701ed4 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@
@@ -94,7 +94,7 @@ index ec8b3874714..2c35bbb3942 100644
#ifdef __cplusplus
extern "C" {
@@ -251,7 +252,7 @@ typedef struct _PEB
@@ -279,7 +280,7 @@ typedef struct _PEB
ULONG EnvironmentUpdateCount; /* 028/050 */
PVOID KernelCallbackTable; /* 02c/058 */
ULONG Reserved[2]; /* 030/060 */
@@ -104,5 +104,5 @@ index ec8b3874714..2c35bbb3942 100644
PRTL_BITMAP TlsBitmap; /* 040/078 */
ULONG TlsBitmapBits[2]; /* 044/080 */
--
2.14.1
1.9.1