Rebase against 4312be1646cad32548f855e25823857092bf31dc.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "16c6c249a5134de2422fbd3471ead7425c968301"
+	echo "4312be1646cad32548f855e25823857092bf31dc"
 }
 
 # Show version information
@@ -3722,7 +3722,7 @@ fi
 # |   *	[#44061] Check Parameter in WTHelperGetProvCertFromChain
 # |
 # | Modified files:
-# |   *	dlls/wintrust/tests/softpub.c, dlls/wintrust/wintrust_main.c
+# |   *	dlls/user.exe16/window.c, dlls/wintrust/tests/softpub.c, dlls/wintrust/wintrust_main.c
 # |
 if test "$enable_wintrust_WTHelperGetProvCertFromChain" -eq 1; then
 	patch_apply wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch

patches/wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch

@@ -1,20 +1,34 @@
-From d5ac0d0d4a4e5d26f2892572502ab7e7fd5d812e Mon Sep 17 00:00:00 2001
+From 452d18312589f22e6dcfcba61b4901ae30537540 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 18 Apr 2018 03:55:16 +0000
 Subject: [PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
+ dlls/user.exe16/window.c      | 2 +-
  dlls/wintrust/tests/softpub.c | 9 +++++++++
  dlls/wintrust/wintrust_main.c | 2 +-
- 2 files changed, 10 insertions(+), 1 deletion(-)
+ 3 files changed, 11 insertions(+), 2 deletions(-)
 
+diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c
+index 69d178e31b0..e906df026c3 100644
+--- a/dlls/user.exe16/window.c
++++ b/dlls/user.exe16/window.c
+@@ -349,7 +349,7 @@ BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString )
+ {
+     return SendMessage16( hwnd, WM_SETTEXT, 0, lpString );
+ }
+-
++wine_call_to_16_regs
+ 
+ /**************************************************************************
+  *              GetWindowTextLength   (USER.38)
 diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c
-index 8195e6006b1..1fa99fa71ce 100644
+index 77e15b2feb4..219fd8dc26f 100644
 --- a/dlls/wintrust/tests/softpub.c
 +++ b/dlls/wintrust/tests/softpub.c
-@@ -1312,6 +1312,14 @@ static void test_get_known_usages(void)
-      "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
+@@ -1892,6 +1892,14 @@ static void test_multiple_signatures(void)
+     DeleteFileW(pathW);
  }
  
 +static void test_WTHelperGetProvCertFromChain(void)
@@ -28,17 +42,18 @@ index 8195e6006b1..1fa99fa71ce 100644
  START_TEST(softpub)
  {
      InitFunctionPtrs();
-@@ -1320,4 +1328,5 @@ START_TEST(softpub)
+@@ -1900,5 +1908,6 @@ START_TEST(softpub)
      test_wintrust();
      test_wintrust_digest();
      test_get_known_usages();
 +    test_WTHelperGetProvCertFromChain();
+     test_multiple_signatures();
  }
 diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c
-index 33695008b24..60c633e5abf 100644
+index 925ae7ca85a..c48dbbfe2d8 100644
 --- a/dlls/wintrust/wintrust_main.c
 +++ b/dlls/wintrust/wintrust_main.c
-@@ -782,7 +782,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain(
+@@ -786,7 +786,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain(
  
      TRACE("(%p %ld)\n", pSgnr, idxCert);
  
@@ -48,5 +63,5 @@ index 33695008b24..60c633e5abf 100644
      cert = &pSgnr->pasCertChain[idxCert];
      TRACE("returning %p\n", cert);
 -- 
-2.35.1
+2.37.2
 

staging/upstream-commit

@@ -1 +1 @@
-16c6c249a5134de2422fbd3471ead7425c968301
+4312be1646cad32548f855e25823857092bf31dc