Rebase against 7b51216198237c04a8994cda1bdb45fdb4482b32.

patches/patchinstall.sh

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

patches/shlwapi-AssocGetPerceivedType/0001-shlwapi-tests-Add-tests-for-AssocGetPerceivedType.patch

@@ -1,4 +1,4 @@
-From 96ac04f742980583ab06204facb5c9f838acb12c Mon Sep 17 00:00:00 2001
+From 367dc97c7091a8dcca2c34073e03a94e0c0255e5 Mon Sep 17 00:00:00 2001
 From: Mark Jansen <learn0more@gmail.com>
 Date: Sat, 2 May 2015 13:47:30 +0200
 Subject: [PATCH] shlwapi/tests: Add tests for AssocGetPerceivedType.
@@ -27,7 +27,7 @@ index b4f5b0cf8ce..0fb6e7fcbe8 100644
  
  /*************************************************************************
 diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c
-index 84eda1317bb..ffbcea9f028 100644
+index 93e0d140518..a39cf49ea87 100644
 --- a/dlls/shlwapi/tests/assoc.c
 +++ b/dlls/shlwapi/tests/assoc.c
 @@ -23,12 +23,13 @@
@@ -44,9 +44,9 @@ index 84eda1317bb..ffbcea9f028 100644
  static HRESULT (WINAPI *pAssocCreate)(CLSID, REFIID, void **) = NULL;
 +static HRESULT (WINAPI *pAssocGetPerceivedType)(LPCWSTR, PERCEIVED *, INT *, LPWSTR *) = NULL;
  
- /* Every version of Windows with IE should have this association? */
- static const WCHAR dotHtml[] = { '.','h','t','m','l',0 };
-@@ -306,6 +307,282 @@ static void test_assoc_create(void)
+ /* Should every version of Windows with IE have .html association? */
+ 
+@@ -301,6 +302,282 @@ static void test_assoc_create(void)
      }
  }
  
@@ -329,7 +329,7 @@ index 84eda1317bb..ffbcea9f028 100644
  START_TEST(assoc)
  {
      HMODULE hshlwapi;
-@@ -313,9 +590,11 @@ START_TEST(assoc)
+@@ -308,9 +585,11 @@ START_TEST(assoc)
      pAssocQueryStringA = (void*)GetProcAddress(hshlwapi, "AssocQueryStringA");
      pAssocQueryStringW = (void*)GetProcAddress(hshlwapi, "AssocQueryStringW");
      pAssocCreate       = (void*)GetProcAddress(hshlwapi, "AssocCreate");

staging/upstream-commit

@@ -1 +1 @@
-e43288348de170fef5dfd122675ba367dd7ea0ec
+7b51216198237c04a8994cda1bdb45fdb4482b32