Rebase against ab7756619c1b16c761618a68d1b6a06ad437cbe8.

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

@@ -1,4 +1,4 @@
-From 2afc731dcc7e4b8963ddc2792cce17e1ff7c40dc Mon Sep 17 00:00:00 2001
+From 7e49bdcb1622494a4ca5e5b36f05482189cf151f 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,13 +6,13 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
 ---
  dlls/ntdll/thread.c |  2 ++
  include/Makefile.in |  1 +
- include/apiset.h    | 38 ++++++++++++++++++++++++++++++++++++++
+ include/apiset.h    | 37 +++++++++++++++++++++++++++++++++++++
  include/winternl.h  |  3 ++-
- 4 files changed, 43 insertions(+), 1 deletion(-)
+ 4 files changed, 42 insertions(+), 1 deletion(-)
  create mode 100644 include/apiset.h
 
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 0f90291..c36337a6 100644
+index 0f90291e2..c36337a64 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
 @@ -72,6 +72,7 @@ static PEB_LDR_DATA ldr;
@@ -32,11 +32,11 @@ index 0f90291..c36337a6 100644
      peb->TlsExpansionBitmap = &tls_expansion_bitmap;
      peb->FlsBitmap          = &fls_bitmap;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 5485084..72e6e5d 100644
+index 2817c10d1..8a4759d17 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -13,6 +13,7 @@ SOURCES = \
- 	amaudio.h \
+@@ -14,6 +14,7 @@ SOURCES = \
+ 	amsi.idl \
  	amstream.idl \
  	amvideo.idl \
 +	apiset.h \
@@ -45,10 +45,10 @@ index 5485084..72e6e5d 100644
  	appmodel.h \
 diff --git a/include/apiset.h b/include/apiset.h
 new file mode 100644
-index 0000000..f55f804
+index 000000000..6801cd5f5
 --- /dev/null
 +++ b/include/apiset.h
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,37 @@
 +/*
 + * Copyright (C) 2017 Michael Müller
 + *
@@ -86,9 +86,8 @@ index 0000000..f55f804
 +} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY;
 +
 +#endif
-+
 diff --git a/include/winternl.h b/include/winternl.h
-index 064444d..a9c6cab 100644
+index 46dac7e48..352d9f64d 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
 @@ -23,6 +23,7 @@
@@ -109,5 +108,5 @@ index 064444d..a9c6cab 100644
      PRTL_BITMAP                  TlsBitmap;                         /* 040/078 */
      ULONG                        TlsBitmapBits[2];                  /* 044/080 */
 -- 
-1.9.1
+2.20.1