shell32/tests: Fix the known folder relative path check for multiple CD drives.

When there is more than one CD drive the extra drives typically get a folder called "Burn1", etc. Signed-off-by: Francois Gouget <fgouget@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32/tests: Fix the known folder relative path check for multiple CD drives.
8aaf9e64 · Francois Gouget · Alexandre Julliard · 76b30097 · 8aaf9e64
Commit 8aaf9e64 authored Jun 29, 2021 by Francois Gouget Committed by Alexandre Julliard Jun 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

shellpath.c dlls/shell32/tests/shellpath.c +5 -1

No files found.
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -2067,7 +2067,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId
                                        debugstr_w(ikf_path), debugstr_w(ikf_parent_path));
                                ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\',
                                        "Missing slash\n");
-                                ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0,
+                                ok_(__FILE__, known_folder->line)(
+                                        wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0 ||
+                                        /* With multiple drives, there are multiple CD-burning folders */
+                                        (IsEqualGUID(folderId, &FOLDERID_CDBurning) &&
+                                         wcsnicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1, wcslen(kfd.pszRelativePath)) == 0),
                                        "Full path %s does not end with relative path %s\n",
                                        debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath));