[PATCH 0/2] MR1026: shell32: Handle drive letters properly when parsing MyComputer.
From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/tests/shfldr_special.c | 71 +++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index cc0bb20ff33..99d6e8c62a4 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -39,6 +39,76 @@ static inline BOOL SHELL_OsIsUnicode(void) return !(GetVersion() & 0x80000000); } +/* Tests for My Computer */ +static void test_parse_for_my_computer(void) +{ + WCHAR path[] = { '\\','\\','?','\\','C',':','\\',0 }; + IShellFolder *mycomp, *sf; + WCHAR *drive = path + 4; + ITEMIDLIST *pidl; + DWORD eaten; + HRESULT hr; + + hr = SHGetDesktopFolder(&sf); + ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%lx\n", hr); + if (hr != S_OK) return; + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidl); + ok(hr == S_OK, "SHGetSpecialFolderLocation failed with error 0x%lx\n", hr); + if (hr != S_OK) + { + IShellFolder_Release(sf); + return; + } + hr = IShellFolder_BindToObject(sf, pidl, NULL, &IID_IShellFolder, (void**)&mycomp); + ok(hr == S_OK, "IShellFolder::BindToObject failed with error 0x%lx\n", hr); + IShellFolder_Release(sf); + ILFree(pidl); + if (hr != S_OK) return; + + while (drive[0] <= 'Z' && GetDriveTypeW(drive) == DRIVE_NO_ROOT_DIR) drive[0]++; + if (drive[0] > 'Z') + { + skip("No drive found, skipping My Computer tests...\n"); + goto done; + } + + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK, "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl != NULL, "pidl is NULL\n"); + ILFree(pidl); + + /* \\?\ prefix is not valid */ + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl == NULL, "pidl is not NULL\n"); + ILFree(pidl); + + /* Try without backslash */ + drive[2] = '\0'; + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* WinXP */, + "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + todo_wine + ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); + ILFree(pidl); + +done: + IShellFolder_Release(mycomp); +} + /* Tests for My Network Places */ static void test_parse_for_entire_network(void) { @@ -294,6 +364,7 @@ static void test_desktop_displaynameof(void) START_TEST(shfldr_special) { + test_parse_for_my_computer(); test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1026
From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Besides PathGetDriveNumber being dangerous and having a completely messed up result with \\?\ prefix, a backslash is not required anymore on newer Windows versions. So e.g. C: should succeed to be parsed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/shfldr_desktop.c | 5 +++-- dlls/shell32/shfldr_mycomp.c | 20 ++++++++++++-------- dlls/shell32/tests/shfldr_special.c | 2 -- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index f8672836da9..f8870d58103 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -150,7 +150,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; PARSEDURLW urldata; @@ -178,7 +178,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - else if (PathGetDriveNumberW (lpszDisplayName) >= 0) + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && lpszDisplayName[1] == ':') { /* it's a filesystem path with a drive. Let MyComputer/UnixDosFolder parse it */ pidlTemp = _ILCreateMyComputer (); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 5b90458e145..2f4ebd580c1 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -189,7 +189,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPITEMIDLIST pidlTemp = NULL; CLSID clsid; @@ -209,13 +209,17 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - /* do we have an absolute path name ? */ - else if (PathGetDriveNumberW (lpszDisplayName) >= 0 && - lpszDisplayName[2] == (WCHAR) '\\') + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && + lpszDisplayName[1] == ':' && + (lpszDisplayName[2] == '\\' || lpszDisplayName[2] == '\0')) { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - /* make drive letter uppercase to enable PIDL comparison */ - szElement[0] = toupper(szElement[0]); + /* drive letter has to be uppercase to enable PIDL comparison */ + szElement[0] = c; + szElement[1] = ':'; + szElement[2] = '\\'; + szElement[3] = '\0'; + szNext = &lpszDisplayName[2] + (lpszDisplayName[2] == '\\'); pidlTemp = _ILCreateDrive (szElement); } @@ -224,7 +228,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); } - else + else if (pidlTemp) { if (pdwAttributes && *pdwAttributes) SHELL32_GetItemAttributes (&This->IShellFolder2_iface, pidlTemp, pdwAttributes); diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 99d6e8c62a4..22749c231f3 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -85,7 +85,6 @@ static void test_parse_for_my_computer(void) pidl = NULL; eaten = 0xdeadbeef; hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); - todo_wine ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); @@ -101,7 +100,6 @@ static void test_parse_for_my_computer(void) "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); - todo_wine ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); ILFree(pidl); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1026
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=124856 Your paranoid android. === debian11 (32 bit report) === shell32: shlfolder.c:241: Test succeeded inside todo block: L"c:fake": expected 0x80070057, got 0x80070057 shlfolder.c:241: Test succeeded inside todo block: L"c:/": expected 0x80070057, got 0x80070057 urlmon: protocol.c:3682: Test failed: wait timed out protocol: Timeout === debian11 (32 bit zh:CN report) === shell32: autocomplete.c:614: Test failed: Expected (null), got L"ab" autocomplete.c:637: Test failed: Expected (null), got L"www.ax" shlfolder.c:241: Test succeeded inside todo block: L"c:fake": expected 0x80070057, got 0x80070057 shlfolder.c:241: Test succeeded inside todo block: L"c:/": expected 0x80070057, got 0x80070057 === debian11 (build log) === Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24874. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24874. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24874. === debian11 (64 bit WoW report) === shell32: shlfolder.c:241: Test succeeded inside todo block: L"c:fake": expected 0x80070057, got 0x80070057 shlfolder.c:241: Test succeeded inside todo block: L"c:/": expected 0x80070057, got 0x80070057
participants (2)
-
Gabriel Ivăncescu -
Marvin