Module: wine Branch: master Commit: 97f4bfa7ed75725e1e4b3046c9aee436ecb8f46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4bfa7ed75725e1e4b3046c9...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Jan 3 20:15:00 2009 +0100
winhttp/tests: Use ~0u instead of ~0ul for DWORD values.
---
dlls/winhttp/tests/url.c | 20 ++++++++++---------- dlls/winhttp/tests/winhttp.c | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 2a04208..2765a67 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -124,12 +124,12 @@ static void WinHttpCreateUrl_test( void ) BOOL ret;
/* NULL components */ - len = ~0UL; + len = ~0u; SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( NULL, 0, NULL, &len ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0UL, "expected len ~0UL got %u\n", len ); + ok( len == ~0u, "expected len ~0u got %u\n", len );
/* zero'ed components */ memset( &uc, 0, sizeof(URL_COMPONENTS) ); @@ -137,7 +137,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0UL, "expected len ~0UL got %u\n", len ); + ok( len == ~0u, "expected len ~0u got %u\n", len );
/* valid components, NULL url, NULL length */ fill_url_components( &uc ); @@ -145,7 +145,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, NULL, NULL ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0UL, "expected len ~0UL got %u\n", len ); + ok( len == ~0u, "expected len ~0u got %u\n", len );
/* valid components, NULL url */ SetLastError( 0xdeadbeef ); @@ -310,13 +310,13 @@ static void reset_url_components( URL_COMPONENTS *uc ) { memset( uc, 0, sizeof(URL_COMPONENTS) ); uc->dwStructSize = sizeof(URL_COMPONENTS); - uc->dwSchemeLength = ~0UL; - uc->dwHostNameLength = ~0UL; + uc->dwSchemeLength = ~0u; + uc->dwHostNameLength = ~0u; uc->nPort = 0; - uc->dwUserNameLength = ~0UL; - uc->dwPasswordLength = ~0UL; - uc->dwUrlPathLength = ~0UL; - uc->dwExtraInfoLength = ~0UL; + uc->dwUserNameLength = ~0u; + uc->dwPasswordLength = ~0u; + uc->dwUrlPathLength = ~0u; + uc->dwExtraInfoLength = ~0u; }
static void WinHttpCrackUrl_test( void ) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a4e33b4..74e1c9a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -665,22 +665,22 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders succeeded unexpectedly, found third header.\n");
- ret = WinHttpAddRequestHeaders(request, test_headers[8], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[8], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n");
- ret = WinHttpAddRequestHeaders(request, test_headers[9], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[9], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(ret, "WinHttpAddRequestHeaders failed\n");
- ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n");
- ret = WinHttpAddRequestHeaders(request, test_headers[11], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[11], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n");
- ret = WinHttpAddRequestHeaders(request, test_headers[12], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[12], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(!ret, "WinHttpAddRequestHeaders failed\n");
- ret = WinHttpAddRequestHeaders(request, test_headers[13], ~0UL, WINHTTP_ADDREQ_FLAG_ADD); + ret = WinHttpAddRequestHeaders(request, test_headers[13], ~0u, WINHTTP_ADDREQ_FLAG_ADD); ok(ret, "WinHttpAddRequestHeaders failed\n");
index = 0;