Rebase against d9fdde935a153d2ce7c27cf508c499be8ed15d0b.

patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch

@@ -1,42 +1,42 @@
-From 9ecf6543f498cfc6c1cfb44033746cfd1ba16587 Mon Sep 17 00:00:00 2001
+From f2347ae7216626d248cfaf9445862561b2b5eef7 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 1 Jul 2019 09:58:55 +1000
 Subject: [PATCH] loader: Add Keyboard Layouts registry enteries.
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- loader/wine.inf.in | 215 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 215 insertions(+)
+ loader/wine.inf.in | 209 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 209 insertions(+)
 
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 6e0cb212531..fc929859be3 100644
+index ff601e41b26..6ffb8c56d87 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -39,6 +39,7 @@ AddReg=\
+@@ -63,6 +63,7 @@ AddReg=\
      Debugger,\
      DirectX,\
      Fonts,\
 +    KeyboardLayouts,\
      MCI,\
      Misc,\
-     Nls,\
-@@ -63,6 +64,7 @@ AddReg=\
+     OLE,\
+@@ -87,6 +88,7 @@ AddReg=\
      Debugger,\
      DirectX,\
      Fonts,\
 +    KeyboardLayouts,\
      MCI,\
      Misc,\
-     Nls,\
-@@ -90,6 +92,7 @@ AddReg=\
+     OLE,\
+@@ -113,6 +115,7 @@ AddReg=\
      Debugger,\
      DirectX,\
      Fonts,\
 +    KeyboardLayouts,\
      MCI,\
      Misc,\
-     Nls,\
-@@ -138,6 +141,7 @@ AddReg=\
+     OLE,\
+@@ -160,6 +163,7 @@ AddReg=\
      CurrentVersionWow64,\
      Debugger,\
      DirectX,\
@@ -44,16 +44,10 @@ index 6e0cb212531..fc929859be3 100644
      MCI,\
      Misc,\
      Tapi,\
-@@ -1087,6 +1091,217 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021004",,"a"
- HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021404",,"9"
- HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00030404",,"9"
+@@ -597,6 +601,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
+ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http"
+ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https"
  
-+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"1",,"normnfc.nls"
-+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"2",,"normnfd.nls"
-+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"5",,"normnfkc.nls"
-+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"6",,"normnfkd.nls"
-+HKLM,System\CurrentControlSet\Control\Nls\Normalization,"d",,"normidna.nls"
-+
 +[KeyboardLayouts]
 +HKLM,SYSTEM\CurrentControlSet\Control\Keyboard Layouts,,16
 +HKLM,SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000401,,16
@@ -263,5 +257,5 @@ index 6e0cb212531..fc929859be3 100644
  HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y"
  HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"
 -- 
-2.25.1
+2.35.1
 

patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -1,4 +1,4 @@
-From 62e3109b6bd1b3324827063531ae0826571c751b Mon Sep 17 00:00:00 2001
+From 109ef0c4769a50904accb044a5d569af8261e305 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 00:50:50 +0100
 Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -9,11 +9,10 @@ Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
  2 files changed, 81 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
-index 7e0272498fa..a2c716d11d4 100644
+index 90deb5865f8..428ebde23b3 100644
 --- a/dlls/ntdll/tests/Makefile.in
 +++ b/dlls/ntdll/tests/Makefile.in
-@@ -1,6 +1,6 @@
- EXTRADEFS = -DWINE_NO_LONG_TYPES
+@@ -1,5 +1,5 @@
  TESTDLL   = ntdll.dll
 -IMPORTS   = user32 advapi32
 +IMPORTS   = user32 ole32 advapi32
@@ -21,7 +20,7 @@ index 7e0272498fa..a2c716d11d4 100644
  C_SRCS = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index c0168884a0a..c25a9185fad 100644
+index aeae4e8adf3..52b06d33b54 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -27,6 +27,9 @@
@@ -140,5 +139,5 @@ index c0168884a0a..c25a9185fad 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-2.34.1
+2.35.1
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "aa2851f167aa2089fdbb12ec58d6f6b4801edbab"
+	echo "d9fdde935a153d2ce7c27cf508c499be8ed15d0b"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-aa2851f167aa2089fdbb12ec58d6f6b4801edbab
+d9fdde935a153d2ce7c27cf508c499be8ed15d0b