=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: psapi/tests: Also accept strlen as return value.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 5 10:30:25 CDT 2015
Module: wine
Branch: master
Commit: 4d98658621346f6e18e7d31ebc2efd1fbe637640
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d98658621346f6e18e7d31ebc2efd1fbe637640
Author: André Hentschel <nerv at dawncrow.de>
Date: Sat Oct 3 18:58:39 2015 +0200
psapi/tests: Also accept strlen as return value.
Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
dlls/psapi/tests/psapi_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 95f7c9f..799f0d8 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -624,7 +624,7 @@ static void test_GetModuleFileNameEx(void)
SetLastError(0xdeadbeef);
memset( szModExPath, 0xcc, sizeof(szModExPath) );
ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 4 );
- ok( ret == 4, "wrong length %u\n", ret );
+ ok( ret == 4 || ret == strlen(szModExPath), "wrong length %u\n", ret );
ok( broken(szModExPath[3]) /*w2kpro*/ || strlen(szModExPath) == 3,
"szModExPath=\"%s\" ret=%d\n", szModExPath, ret );
ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError());
@@ -640,7 +640,7 @@ static void test_GetModuleFileNameEx(void)
SetLastError(0xdeadbeef);
memset( buffer, 0xcc, sizeof(buffer) );
ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 4 );
- ok( ret == 4, "wrong length %u\n", ret );
+ ok( ret == 4 || ret == lstrlenW(buffer), "wrong length %u\n", ret );
ok( broken(buffer[3]) /*w2kpro*/ || lstrlenW(buffer) == 3,
"buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret );
ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError());
More information about the wine-cvs
mailing list