From 8d34b14f0b9020330f0c657ed2335986b562d640 Mon Sep 17 00:00:00 2001 From: Stefan Leichter Date: Mon, 28 Jun 2004 20:29:54 +0000 Subject: [PATCH] Skip tests of GetAcceptLanguagesA if a correct call to the function does not return anything useful. --- dlls/shlwapi/tests/ordinal.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 5f5b74037d3..debe2ef1586 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -37,12 +37,25 @@ static HRESULT (WINAPI *pGetAcceptLanguagesA)(LPSTR,LPDWORD); static void test_GetAcceptLanguagesA(void) { HRESULT retval; - DWORD buffersize, buffersize2; + DWORD buffersize, buffersize2, exactsize; char buffer[100]; if (!pGetAcceptLanguagesA) return; + buffersize = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + SetLastError(ERROR_SUCCESS); + retval = pGetAcceptLanguagesA( buffer, &buffersize); + trace("GetAcceptLanguagesA: retval %08lx, size %08lx, buffer (%s)," + " last error %ld\n", retval, buffersize, buffer, GetLastError()); + if(retval != S_OK) { + trace("GetAcceptLanguagesA: skipping tests\n"); + return; + } + ok(ERROR_SUCCESS == GetLastError(), "last error set to %ld\n", GetLastError()); + exactsize = strlen(buffer); + SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( NULL, NULL); ok(retval == E_FAIL, @@ -85,15 +98,7 @@ static void test_GetAcceptLanguagesA(void) todo_wine ok(buffersize2 == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), buffersize2); - buffersize = sizeof(buffer); - memset(buffer, 0, sizeof(buffer)); - SetLastError(ERROR_SUCCESS); - retval = pGetAcceptLanguagesA( buffer, &buffersize); - ok(retval == S_OK, "function result wrong: got %08lx, expected S_OK\n", retval); - ok(ERROR_SUCCESS == GetLastError(), "last error set to %ld\n", GetLastError()); - trace("GetAcceptLanguagesA: size %08lx, buffer %s\n", buffersize, buffer); - - buffersize = buffersize2 = strlen(buffer); + buffersize = buffersize2 = exactsize; memset(buffer, 0, sizeof(buffer)); SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, &buffersize); -- 2.11.4.GIT