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 825d5c86415d9e76c92a9d533c00790efe847ae7.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-10-05 23:09:54 +02:00
parent 2cc3a4b98f
commit 7c183df10b
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b97e38f96a743c0aa44572ae8dbc477375e0d64e Mon Sep 17 00:00:00 2001
From 93accf8fa8225b99efed51f2b44433c1776b8403 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,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 08318ebeeb4..88d315f1e9c 100644
index 85ceb2bbeac..95511673fab 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -69,6 +69,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH];
@@ -68,6 +68,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 08318ebeeb4..88d315f1e9c 100644
static int nb_threads = 1;
static RTL_CRITICAL_SECTION peb_lock;
@@ -388,6 +389,7 @@ HANDLE thread_init(void)
@@ -304,6 +305,7 @@ HANDLE thread_init(void)
peb->FastPebLock = &peb_lock;
peb->ProcessParameters = &params;
@@ -32,17 +32,17 @@ index 08318ebeeb4..88d315f1e9c 100644
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->FlsBitmap = &fls_bitmap;
diff --git a/include/Makefile.in b/include/Makefile.in
index fcdd8b323ce..7e005f6bb1e 100644
index 025fe774552..07e0d54dd81 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -208,6 +208,7 @@ HEADER_SRCS = \
@@ -223,6 +223,7 @@ HEADER_SRCS = \
advpub.h \
af_irda.h \
amaudio.h \
+ apiset.h \
appcompatapi.h \
appmgmt.h \
atlbase.h \
appmodel.h \
diff --git a/include/apiset.h b/include/apiset.h
new file mode 100644
index 00000000000..5f911717eea
@@ -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 df20da58c3c..f3f9b047e50 100644
index ec8b3874714..2c35bbb3942 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@