Module: wine Branch: master Commit: 773c46b9295a489744767dca824b234b720c4566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773c46b9295a489744767dca82... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:43:03 2012 +0100 psapi/tests: Don't check data returned from a failing call. --- dlls/psapi/tests/psapi_main.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 71c3c95..e6e0cab 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -203,17 +203,20 @@ todo_wine todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); - ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); -todo_wine - ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); - szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ -todo_wine - ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); - if (szMapBaseName) + if (ret) { - GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); - ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), - "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); + ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); + todo_wine + ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); + szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ + todo_wine + ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); + if (szMapBaseName) + { + GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); + ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), + "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); + } } GetTempPath(MAX_PATH, temp_path);