[PATCH v2 0/2] MR2648: wininet/tests: Consistently use strlen() in the InternetGetConnectedStateExA() tests.
v2: Use strlen() instead of lstrlenA() and adjust the formats accordingly.
-- v2: wininet/tests: Consistently use strlen() instead of lstrlenA(). wininet/tests: Consistently use strlen() in the InternetGetConnectedStateExA() tests.
From: Francois Gouget fgouget@codeweavers.com
--- dlls/wininet/tests/internet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7cd21efcd36..6772036244e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1730,7 +1730,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(sz - 1 == strlen(buffer), "Expected len %lu, got %Iu: %s\n", sz - 1, strlen(buffer), wine_dbgstr_a(buffer));
memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; @@ -1738,7 +1738,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz / 2 - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(sz / 2 - 1 == strlen(buffer), "Expected len %lu, got %Iu: %s\n", sz / 2 - 1, strlen(buffer), wine_dbgstr_a(buffer));
memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; @@ -1746,7 +1746,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(strlen(buffer) == 1, "Expected len 1, got %Iu: %s\n", strlen(buffer), wine_dbgstr_a(buffer));
memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0;
From: Francois Gouget fgouget@codeweavers.com
--- dlls/wininet/tests/internet.c | 42 +++++++++++++++++------------------ dlls/wininet/tests/url.c | 14 ++++++------ 2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 6772036244e..495371d50a5 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -66,7 +66,7 @@ static void test_InternetCanonicalizeUrlA(void)
/* Acrobat Updater 5 calls this for Adobe Reader 8.1 */ url = "http://swupmf.adobe.com/manifest/50/win/AdobeUpdater.upd"; - urllen = lstrlenA(url); + urllen = strlen(url);
memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; @@ -74,8 +74,8 @@ static void test_InternetCanonicalizeUrlA(void) SetLastError(0xdeadbeef); res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (dwSize == (urllen+1)), - "got %lu and %lu with size %lu for '%s' (%d)\n", - res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + "got %lu and %lu with size %lu for '%s' (%Iu)\n", + res, GetLastError(), dwSize, buffer, strlen(buffer));
/* buffer has no space for the terminating '\0' */ @@ -86,8 +86,8 @@ static void test_InternetCanonicalizeUrlA(void) res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); /* dwSize is nr. of needed bytes with the terminating '\0' */ ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (dwSize == (urllen+1)), - "got %lu and %lu with size %lu for '%s' (%d)\n", - res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + "got %lu and %lu with size %lu for '%s' (%Iu)\n", + res, GetLastError(), dwSize, buffer, strlen(buffer));
/* buffer has the required size */ memset(buffer, '#', sizeof(buffer)-1); @@ -97,8 +97,8 @@ static void test_InternetCanonicalizeUrlA(void) res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); /* dwSize is nr. of copied bytes without the terminating '\0' */ ok( res && (dwSize == urllen) && (lstrcmpA(url, buffer) == 0), - "got %lu and %lu with size %lu for '%s' (%d)\n", - res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + "got %lu and %lu with size %lu for '%s' (%Iu)\n", + res, GetLastError(), dwSize, buffer, strlen(buffer));
memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; @@ -106,7 +106,7 @@ static void test_InternetCanonicalizeUrlA(void) SetLastError(0xdeadbeef); res = InternetCanonicalizeUrlA("file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", buffer, &dwSize, ICU_DECODE | ICU_NO_ENCODE); ok(res, "InternetCanonicalizeUrlA failed %lu\n", GetLastError()); - ok(dwSize == lstrlenA(buffer), "got %ld expected %d\n", dwSize, lstrlenA(buffer)); + ok(dwSize == strlen(buffer), "got %ld expected %Iu\n", dwSize, strlen(buffer)); ok(!lstrcmpA("file://C:\Program Files\Atmel\AVR Tools\STK500\STK500.xml", buffer), "got %s expected 'file://C:\Program Files\Atmel\AVR Tools\STK500\STK500.xml'\n", buffer);
@@ -118,8 +118,8 @@ static void test_InternetCanonicalizeUrlA(void) res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); /* dwSize is nr. of copied bytes without the terminating '\0' */ ok( res && (dwSize == urllen) && (lstrcmpA(url, buffer) == 0), - "got %lu and %lu with size %lu for '%s' (%d)\n", - res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + "got %lu and %lu with size %lu for '%s' (%Iu)\n", + res, GetLastError(), dwSize, buffer, strlen(buffer));
/* check NULL pointers */ @@ -129,8 +129,8 @@ static void test_InternetCanonicalizeUrlA(void) SetLastError(0xdeadbeef); res = InternetCanonicalizeUrlA(NULL, buffer, &dwSize, 0); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %lu and %lu with size %lu for '%s' (%d)\n", - res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + "got %lu and %lu with size %lu for '%s' (%Iu)\n", + res, GetLastError(), dwSize, buffer, strlen(buffer));
memset(buffer, '#', urllen + 4); buffer[urllen + 4] = '\0'; @@ -138,8 +138,8 @@ static void test_InternetCanonicalizeUrlA(void) SetLastError(0xdeadbeef); res = InternetCanonicalizeUrlA(url, NULL, &dwSize, 0); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %lu and %lu with size %lu for '%s' (%d)\n", - res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + "got %lu and %lu with size %lu for '%s' (%Iu)\n", + res, GetLastError(), dwSize, buffer, strlen(buffer));
memset(buffer, '#', urllen + 4); buffer[urllen + 4] = '\0'; @@ -147,8 +147,8 @@ static void test_InternetCanonicalizeUrlA(void) SetLastError(0xdeadbeef); res = InternetCanonicalizeUrlA(url, buffer, NULL, 0); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %lu and %lu with size %lu for '%s' (%d)\n", - res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + "got %lu and %lu with size %lu for '%s' (%Iu)\n", + res, GetLastError(), dwSize, buffer, strlen(buffer));
/* test with trailing space */ dwSize = 256; @@ -215,7 +215,7 @@ static void test_InternetQueryOptionA(void) len=strlen(useragent)+1; retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,NULL,&len); err=GetLastError(); - ok(len == strlen(useragent)+1,"Got wrong user agent length %ld instead of %d\n",len,lstrlenA(useragent)); + ok(len == strlen(useragent)+1,"Got wrong user agent length %ld instead of %Iu\n",len,strlen(useragent)); ok(retval == 0,"Got wrong return value %d\n",retval); ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %ld\n",err);
@@ -226,7 +226,7 @@ static void test_InternetQueryOptionA(void) if (retval) { ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); - ok(len == strlen(useragent),"Got wrong user agent length %ld instead of %d\n",len,lstrlenA(useragent)); + ok(len == strlen(useragent),"Got wrong user agent length %ld instead of %Iu\n",len,strlen(useragent)); } HeapFree(GetProcessHeap(),0,buffer);
@@ -235,7 +235,7 @@ static void test_InternetQueryOptionA(void) buffer=HeapAlloc(GetProcessHeap(),0,100); retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); err=GetLastError(); - ok(len == strlen(useragent) + 1,"Got wrong user agent length %ld instead of %d\n", len, lstrlenA(useragent) + 1); + ok(len == strlen(useragent) + 1,"Got wrong user agent length %ld instead of %Iu\n", len, strlen(useragent) + 1); ok(!retval, "Got wrong return value %d\n", retval); ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %ld\n", err); HeapFree(GetProcessHeap(),0,buffer); @@ -440,7 +440,7 @@ static void test_complicated_cookie(void) ret = InternetGetCookieA("http://testing.example.com", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); ok(len == 19, "len = %lu\n", len); - ok(strlen(buffer) == 18, "strlen(buffer) = %u\n", lstrlenA(buffer)); + ok(strlen(buffer) == 18, "strlen(buffer) = %Iu\n", strlen(buffer)); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -1754,7 +1754,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(!buffer[0], "Expected len 0, got %Iu: %s\n", strlen(buffer), wine_dbgstr_a(buffer)); }
static void test_InternetGetConnectedStateExW(void) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index aa8977973a6..c09315c301f 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1084,7 +1084,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL6), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL6) + 1, len); + ok(len == strlen(CREATE_URL6), "Expected len %Iu, got %ld\n", strlen(CREATE_URL6) + 1, len); ok(!strcmp(szUrl, CREATE_URL6), "Expected %s, got %s\n", CREATE_URL6, szUrl);
/* if lpszScheme != "http" or nPort != 80, display nPort */ @@ -1121,7 +1121,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL1), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL1), len); + ok(len == strlen(CREATE_URL1), "Expected len %Iu, got %ld\n", strlen(CREATE_URL1), len); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl);
HeapFree(GetProcessHeap(), 0, szUrl); @@ -1146,7 +1146,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL8), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL8), len); + ok(len == strlen(CREATE_URL8), "Expected len %Iu, got %ld\n", strlen(CREATE_URL8), len); ok(!strcmp(szUrl, CREATE_URL8), "Expected %s, got %s\n", CREATE_URL8, szUrl);
HeapFree(GetProcessHeap(), 0, szUrl); @@ -1162,7 +1162,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL9), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL9), len); + ok(len == strlen(CREATE_URL9), "Expected len %Iu, got %ld\n", strlen(CREATE_URL9), len); ok(!strcmp(szUrl, CREATE_URL9), "Expected %s, got %s\n", CREATE_URL9, szUrl);
HeapFree(GetProcessHeap(), 0, szUrl); @@ -1177,7 +1177,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL10), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL10), len); + ok(len == strlen(CREATE_URL10), "Expected len %Iu, got %ld\n", strlen(CREATE_URL10), len); ok(!strcmp(szUrl, CREATE_URL10), "Expected %s, got %s\n", CREATE_URL10, szUrl);
HeapFree(GetProcessHeap(), 0, szUrl); @@ -1190,7 +1190,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL11), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL11), len); + ok(len == strlen(CREATE_URL11), "Expected len %Iu, got %ld\n", strlen(CREATE_URL11), len); ok(!strcmp(szUrl, CREATE_URL11), "Expected %s, got %s\n", CREATE_URL11, szUrl);
HeapFree(GetProcessHeap(), 0, szUrl); @@ -1207,7 +1207,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL12), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL12), len); + ok(len == strlen(CREATE_URL12), "Expected len %Iu, got %ld\n", strlen(CREATE_URL12), len); ok(!strcmp(szUrl, CREATE_URL12), "Expected %s, got %s\n", CREATE_URL12, szUrl);
HeapFree(GetProcessHeap(), 0, szUrl);
This merge request was approved by Jacek Caban.
-
Francois Gouget -
Francois Gouget (＠fgouget)
-
Jacek Caban (＠jacek)