Module: wine Branch: master Commit: 252525da9a5e5c4e4e13e698c15cc966b950ca50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252525da9a5e5c4e4e13e698c1...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Fri Dec 5 16:52:39 2008 +0100
shell32/tests: Fix some new test failures on W2K.
---
dlls/shell32/tests/shlfolder.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f374070..6a06fb7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1563,29 +1563,35 @@ static void test_LocalizedNames(void) ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr);
hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); - ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr);
if (SUCCEEDED(hr) && pStrRetToBufW) { hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (SUCCEEDED(hr), "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW) || + broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); }
/* editing name is also read from the resource */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); - ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr);
if (SUCCEEDED(hr) && pStrRetToBufW) { hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (SUCCEEDED(hr), "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW) || + broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); }
/* parsing name is unchanged */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); - ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr);
if (SUCCEEDED(hr) && pStrRetToBufW) {