wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 3056f9beb95f66e598ab51d5d37b21a548b3e5f8

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-11-01 08:08:00 +11:00
parent 6fc555874b
commit a423a7087f
4 changed files with 77 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From f41ca623297693e58b3d286245fa01b4c9d9f5b1 Mon Sep 17 00:00:00 2001
From 6b07556e47ab6db08cb68371b706f11525bd2d16 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.
@@ -6,16 +6,16 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
---
dlls/ntdll/thread.c | 2 ++
include/Makefile.in | 1 +
include/apiset.h | 33 +++++++++++++++++++++++++++++++++
include/apiset.h | 38 ++++++++++++++++++++++++++++++++++++++
include/winternl.h | 3 ++-
4 files changed, 38 insertions(+), 1 deletion(-)
4 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 include/apiset.h
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 34e12ad..b1d04ab 100644
index c4e02da..79bc4e2 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -75,6 +75,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH];
@@ -72,6 +72,7 @@ static WCHAR current_dir[MAX_PATH];
static RTL_BITMAP tls_bitmap;
static RTL_BITMAP tls_expansion_bitmap;
static RTL_BITMAP fls_bitmap;
@@ -23,7 +23,7 @@ index 34e12ad..b1d04ab 100644
static int nb_threads = 1;
static RTL_CRITICAL_SECTION peb_lock;
@@ -396,6 +397,7 @@ HANDLE thread_init(void)
@@ -308,6 +309,7 @@ void thread_init(void)
peb->FastPebLock = &peb_lock;
peb->ProcessParameters = &params;
@@ -32,23 +32,23 @@ index 34e12ad..b1d04ab 100644
peb->TlsExpansionBitmap = &tls_expansion_bitmap;
peb->FlsBitmap = &fls_bitmap;
diff --git a/include/Makefile.in b/include/Makefile.in
index ac0ff21..be384d5 100644
index cc78b1c..e6d554b 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -14,6 +14,7 @@ SOURCES = \
@@ -13,6 +13,7 @@ SOURCES = \
amaudio.h \
amstream.idl \
amvideo.idl \
appcompatapi.h \
+ apiset.h \
appcompatapi.h \
appmgmt.h \
appmodel.h \
asptlb.idl \
diff --git a/include/apiset.h b/include/apiset.h
new file mode 100644
index 0000000..5f91171
index 0000000..f55f804
--- /dev/null
+++ b/include/apiset.h
@@ -0,0 +1,33 @@
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2017 Michael Müller
+ *
@@ -66,6 +66,8 @@ index 0000000..5f91171
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#ifndef _API_SET_H_
+#define _API_SET_H_
+
+#include <windef.h>
+
@@ -82,8 +84,11 @@ index 0000000..5f91171
+ ULONG Count;
+ API_SET_NAMESPACE_ENTRY Array[1];
+} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY;
+
+#endif
+
diff --git a/include/winternl.h b/include/winternl.h
index 9dd95c3..0701ed4 100644
index 9c88613..c09f462 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -23,6 +23,7 @@
@@ -94,7 +99,7 @@ index 9dd95c3..0701ed4 100644
#ifdef __cplusplus
extern "C" {
@@ -279,7 +280,7 @@ typedef struct _PEB
@@ -286,7 +287,7 @@ typedef struct _PEB
ULONG EnvironmentUpdateCount; /* 028/050 */
PVOID KernelCallbackTable; /* 02c/058 */
ULONG Reserved[2]; /* 030/060 */