From 843314ed9ac9bbd428f49b93070d3bf8f3c68359 Mon Sep 17 00:00:00 2001 From: Saulius Krasuckas Date: Mon, 8 Aug 2005 11:04:30 +0000 Subject: [PATCH] Wine and NT4 returns E_FAIL on failure. --- dlls/shell32/tests/shlfolder.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3d6f2a7c72e..565ab420fdc 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -78,12 +78,8 @@ static void test_ParseDisplayName(void) MultiByteToWideChar(CP_ACP, 0, cNonExistDir1A, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - /* This call returns HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) only in Windows. - * Should we distinguish between cNonExistDir1A and cNonExistDir2A ? - * Putting test as todo. */ - todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "ParseDisplayName returned %08lx, expected 80070002\n", hr); + ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL), + "ParseDisplayName returned %08lx, expected 80070002 or E_FAIL\n", hr); res = GetFileAttributesA(cNonExistDir2A); if(res != INVALID_FILE_ATTRIBUTES) return;