From be5814e4284febd0b5780e3eab71d3e91cf77491 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 21 Jun 2019 09:29:45 +1000
Subject: [PATCH] Rebase against cce8074aa9fb2191faba25ce7fd24e2678d3bd17

---
 patches/patchinstall.sh                        |  4 ++--
 ...lwapi-Implement-AssocGetPerceivedType.patch |  4 ++--
 ...ombineW-workaround-for-relative-paths.patch | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index d5f1e25f..962fe506 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "48f93bc3290596b8da4455496fa88cd13ea6f3c9"
+	echo "cce8074aa9fb2191faba25ce7fd24e2678d3bd17"
 }
 
 # Show version information
@@ -5770,7 +5770,7 @@ fi
 # Patchset shlwapi-UrlCombine
 # |
 # | Modified files:
-# |   *	dlls/shlwapi/tests/url.c, dlls/shlwapi/url.c
+# |   *	dlls/shlwapi/tests/url.c
 # |
 if test "$enable_shlwapi_UrlCombine" -eq 1; then
 	patch_apply shlwapi-UrlCombine/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch
diff --git a/patches/shlwapi-AssocGetPerceivedType/0002-shlwapi-Implement-AssocGetPerceivedType.patch b/patches/shlwapi-AssocGetPerceivedType/0002-shlwapi-Implement-AssocGetPerceivedType.patch
index ec15f02c..eed39b59 100644
--- a/patches/shlwapi-AssocGetPerceivedType/0002-shlwapi-Implement-AssocGetPerceivedType.patch
+++ b/patches/shlwapi-AssocGetPerceivedType/0002-shlwapi-Implement-AssocGetPerceivedType.patch
@@ -165,7 +165,7 @@ index 62c101d..a5cb4b1 100644
 +        {
 +            if (!StrCmpIW(Ext, pszExt))
 +                return &known_types[n];
-+            Ext += (strlenW(Ext) + 1);
++            Ext += (lstrlenW(Ext) + 1);
 +        }
 +    }
 +    return NULL;
@@ -229,7 +229,7 @@ index 62c101d..a5cb4b1 100644
 +        if (!Info)
 +        {
 +            WCHAR KeyName[MAX_PATH] = { 0 };
-+            snprintfW(KeyName, MAX_PATH, SystemFileAssociationsKey, lpszExt);
++            swprintf(KeyName, MAX_PATH, SystemFileAssociationsKey, lpszExt);
 +            Size = sizeof(Buffer);
 +            if (RegGetValueW(HKEY_CLASSES_ROOT, KeyName, PerceivedTypeKey,
 +                             RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS)
diff --git a/patches/shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch b/patches/shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch
index 3afe2f5d..4785a664 100644
--- a/patches/shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch
+++ b/patches/shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch
@@ -23,20 +23,20 @@ index ecbdfab..8a99f7e 100644
      {"http://www.winehq.org/tests19/test", "./", 0, S_OK, "http://www.winehq.org/tests19/", FALSE},
      {"http://www.winehq.org/tests20/test", "/", 0, S_OK, "http://www.winehq.org/", FALSE},
      {"http://www.winehq.org/tests/test", "./test21", 0, S_OK, "http://www.winehq.org/tests/test21", FALSE},
-diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
-index 11589e4..58eb87c 100644
---- a/dlls/shlwapi/url.c
-+++ b/dlls/shlwapi/url.c
-@@ -914,7 +914,10 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
- 	work = preliminary + base.cchProtocol+1+base.cchSuffix - 1;
+diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c
+index 82708be5444..8d2739b40e8 100644
+--- a/dlls/kernelbase/path.c
++++ b/dlls/kernelbase/path.c
+@@ -4990,7 +4990,10 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co
+         work = preliminary + base.cchProtocol + 1 + base.cchSuffix - 1;
          if (*work++ != '/')
              *(work++) = '/';
--	strcpyW(work, relative.pszSuffix);
+-        lstrcpyW(work, relative.pszSuffix);
 +        if (relative.pszSuffix[0] == '.' && relative.pszSuffix[1] == 0)
 +            *work = 0;
 +        else
-+            strcpyW(work, relative.pszSuffix);
- 	break;
++            lstrcpyW(work, relative.pszSuffix);
+         break;
  
      default:
 --