shlwapi: Fixed handling mk protocol URLs in UrlCombineW.

dlls/shlwapi/tests/url.c

@@ -234,6 +234,8 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = {
     {"foo:today", "bar:calendar", 0, S_OK, "bar:calendar"},
     {"foo:/today", "foo:calendar", 0, S_OK, "foo:/calendar"},
     {"foo:/today/", "foo:calendar", 0, S_OK, "foo:/today/calendar"},
+    {"mk:@MSITStore:dir/test.chm::dir/index.html", "image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"},
+    {"mk:@MSITStore:dir/test.chm::dir/dir2/index.html", "../image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"}
 };
 
 /* ################ */

dlls/shlwapi/url.c

@@ -659,8 +659,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
                 base.pszSuffix += delta;
                 base.cchSuffix -= delta;
             }
-        }
-
+        }else {
             /* get size of location field (if it exists) */
             work = (LPWSTR)base.pszSuffix;
             sizeloc = 0;
@@ -673,6 +672,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
                     sizeloc = (DWORD)(work - base.pszSuffix);
                 }
             }
+        }
 
         /* Change .sizep2 to not have the last leaf in it,
          * Note: we need to start after the location (if it exists)
@@ -723,7 +723,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
 		process_case = 4;
 		break;
 	    }
-            process_case = (*base.pszSuffix == '/') ? 5 : 3;
+            process_case = (*base.pszSuffix == '/' || base.nScheme == URL_SCHEME_MK) ? 5 : 3;
 	    break;
 	}