Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/httpapi/tests/Makefile.in | 1 dlls/httpapi/tests/httpapi.c | 528 ++++++++++++++++++++-------------------- 2 files changed, 265 insertions(+), 264 deletions(-)
diff --git a/dlls/httpapi/tests/Makefile.in b/dlls/httpapi/tests/Makefile.in index 7a078277448..20210a34510 100644 --- a/dlls/httpapi/tests/Makefile.in +++ b/dlls/httpapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = httpapi.dll IMPORTS = httpapi ws2_32
diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index b0431b0f3fd..78180822f03 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -77,7 +77,7 @@ static SOCKET create_client_socket(unsigned short port) }; SOCKET s = socket(AF_INET, SOCK_STREAM, 0), ret; ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); - ok(!ret, "Failed to connect socket, error %u.\n", GetLastError()); + ok(!ret, "Failed to connect socket, error %lu.\n", GetLastError()); return s; }
@@ -108,9 +108,9 @@ static unsigned short add_url_v1(HANDLE queue) swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); if (!(ret = HttpAddUrl(queue, url, NULL))) return port; - ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %lu.\n", debugstr_w(url), ret); } - ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); + ok(0, "Failed to add url %s, error %lu.\n", debugstr_w(url), ret); return 0; }
@@ -125,9 +125,9 @@ static ULONG add_url_v2(HTTP_URL_GROUP_ID group) swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); if (!(ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0))) return port; - ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %lu.\n", debugstr_w(url), ret); } - ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); + ok(0, "Failed to add url %s, error %lu.\n", debugstr_w(url), ret); return 0; }
@@ -158,62 +158,62 @@ static void test_v1_server(void) OVERLAPPED ovl; DWORD ret_size; WCHAR url[50]; + int len, got; ULONG ret; SOCKET s; - int len;
ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); memset(req_buffer, 0xcc, sizeof(req_buffer));
ret = HttpCreateHttpHandle(NULL, 0); - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected error %lu.\n", ret);
/* Non-zero reserved parameter is accepted on XP/2k3. */ queue = NULL; ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Unexpected ret value %u.\n", ret); + ok(!ret, "Unexpected ret value %lu.\n", ret); ok(!!queue, "Unexpected handle value %p.\n", queue);
queue2 = NULL; ret = HttpCreateHttpHandle(&queue2, 0); - ok(!ret, "Unexpected ret value %u.\n", ret); + ok(!ret, "Unexpected ret value %lu.\n", ret); ok(queue2 && queue2 != queue, "Unexpected handle %p.\n", queue2); ret = CloseHandle(queue2); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError());
ret_size = 0xdeadbeef; ret = HttpReceiveHttpRequest(NULL, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(ret == ERROR_INVALID_HANDLE, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(NULL, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_INVALID_HANDLE, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(queue, 0xdeadbeef, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
SetLastError(0xdeadbeef); ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %lu.\n", GetLastError());
ret = HttpAddUrl(NULL, L"http://localhost:50000/", NULL); - ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_INVALID_PARAMETER /* < Vista */, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_INVALID_PARAMETER /* < Vista */, "Got error %lu.\n", ret); ret = HttpAddUrl(queue, L"http://localhost:50000", NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = HttpAddUrl(queue, L"localhost:50000", NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = HttpAddUrl(queue, L"localhost:50000/", NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = HttpAddUrl(queue, L"http://localhost/", NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = HttpAddUrl(queue, L"http://localhost:/", NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = HttpAddUrl(queue, L"http://localhost:0/", NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); port = add_url_v1(queue); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); ret = HttpAddUrl(queue, url, NULL); - ok(ret == ERROR_ALREADY_EXISTS, "Got error %u.\n", ret); + ok(ret == ERROR_ALREADY_EXISTS, "Got error %lu.\n", ret);
s = create_client_socket(port); len = sizeof(sockaddr); @@ -223,15 +223,15 @@ static void test_v1_server(void) SetLastError(0xdeadbeef); ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %lu.\n", GetLastError());
sprintf(req_text, simple_req, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %u.\n", GetLastError()); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size);
/* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 * version 1507, but probably affecting others) suffer from a bug where the @@ -240,7 +240,7 @@ static void test_v1_server(void) * around this. */ Sleep(100);
- ok(!req->Flags, "Got flags %#x.\n", req->Flags); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); ok(req->RequestId, "Expected nonzero connection ID.\n"); ok(!req->UrlContext, "Got URL context %s.\n", wine_dbgstr_longlong(req->UrlContext)); @@ -265,7 +265,7 @@ static void test_v1_server(void) sin = (SOCKADDR_IN *)req->Address.pLocalAddress; ok(sin->sin_family == AF_INET, "Got family %u.\n", sin->sin_family); ok(ntohs(sin->sin_port) == port, "Got wrong port %u.\n", ntohs(sin->sin_port)); - ok(sin->sin_addr.S_un.S_addr == inet_addr("127.0.0.1"), "Got address %08x.\n", sin->sin_addr.S_un.S_addr); + ok(sin->sin_addr.S_un.S_addr == inet_addr("127.0.0.1"), "Got address %08lx.\n", sin->sin_addr.S_un.S_addr); ok(!req->Headers.UnknownHeaderCount, "Got %u unknown headers.\n", req->Headers.UnknownHeaderCount); ok(!req->Headers.pUnknownHeaders, "Got unknown headers %p.\n", req->Headers.pUnknownHeaders); for (i = 0; i < ARRAY_SIZE(req->Headers.KnownHeaders); ++i) @@ -313,57 +313,57 @@ static void test_v1_server(void) response.Headers.KnownHeaders[HttpHeaderRetryAfter].pRawValue = "120"; response.Headers.KnownHeaders[HttpHeaderRetryAfter].RawValueLength = 3; ret = HttpSendHttpResponse(queue, 0xdeadbeef, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl, NULL); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret); ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); - ok(ret, "Got error %u.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError());
- ret = recv(s, response_buffer, sizeof(response_buffer), 0); - ok(ret == ret_size, "Expected size %u, got %u.\n", ret_size, ret); + got = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(got == ret_size, "Expected size %lu, got %u.\n", ret_size, got);
if (winetest_debug > 1) - trace("%.*s\n", ret, response_buffer); + trace("%.*s\n", got, response_buffer);
ok(!strncmp(response_buffer, "HTTP/1.1 418 I'm a teapot\r\n", 27), "Got incorrect status line.\n"); ok(!!strstr(response_buffer, "\r\nRetry-After: 120\r\n"), "Missing or malformed Retry-After header.\n"); ok(!!strstr(response_buffer, "\r\nDate:"), "Missing Date header.\n");
ret = HttpReceiveHttpRequest(queue, req->RequestId, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret);
/* HttpReceiveHttpRequest() may return synchronously, but this cannot be * reliably tested. Introducing a delay after send() and before * HttpReceiveHttpRequest() confirms this. */
ret = remove_url_v1(NULL, port); - ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = remove_url_v1(queue, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); ret = remove_url_v1(queue, port); - ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "Got error %lu.\n", ret);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
ret = CancelIo(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError());
ret = WaitForSingleObject(ovl.hEvent, 100); - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret); ret_size = 0xdeadbeef; ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_OPERATION_ABORTED, "Got error %u.\n", GetLastError()); - ok(!ret_size, "Got size %u.\n", ret_size); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Got error %lu.\n", GetLastError()); + ok(!ret_size, "Got size %lu.\n", ret_size);
closesocket(s); CloseHandle(ovl.hEvent); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError());
ret = HttpAddUrl(queue, L"http://localhost:50000/", NULL); - ok(ret == ERROR_INVALID_HANDLE, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Got error %lu.\n", ret); }
static void test_v1_completion_port(void) @@ -383,62 +383,62 @@ static void test_v1_completion_port(void) ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
port = CreateIoCompletionPort(queue, NULL, 123, 0); - ok(!!port, "Failed to create completion port, error %u.\n", GetLastError()); + ok(!!port, "Failed to create completion port, error %lu.\n", GetLastError());
ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %lu.\n", GetLastError());
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
tcp_port = add_url_v1(queue); s = create_client_socket(tcp_port);
ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %lu.\n", GetLastError());
sprintf(req_text, simple_req, tcp_port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
ret_size = key = 0xdeadbeef; ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 1000); - ok(ret, "Got error %u.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError()); ok(povl == &ovl, "OVERLAPPED pointers didn't match.\n"); - ok(key == 123, "Got unexpected key %lu.\n", key); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(key == 123, "Got unexpected key %Iu.\n", key); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size);
ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %lu.\n", GetLastError());
response.StatusCode = 418; response.pReason = "I'm a teapot"; response.ReasonLength = 12; ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
ret_size = key = 0xdeadbeef; ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 1000); - ok(ret, "Got error %u.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError()); ok(povl == &ovl, "OVERLAPPED pointers didn't match.\n"); - ok(key == 123, "Got unexpected key %lu.\n", key); + ok(key == 123, "Got unexpected key %Iu.\n", key);
ret = recv(s, response_buffer, sizeof(response_buffer), 0); - ok(ret == ret_size, "Expected size %u, got %u.\n", ret_size, ret); + ok(ret == ret_size, "Expected size %lu, got %lu.\n", ret_size, ret);
ret = remove_url_v1(queue, tcp_port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); CloseHandle(port); CloseHandle(ovl.hEvent); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_v1_multiple_requests(void) @@ -461,37 +461,37 @@ static void test_v1_multiple_requests(void) ovl2.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); port = add_url_v1(queue);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req1, sizeof(req_buffer1), NULL, &ovl1); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req2, sizeof(req_buffer2), NULL, &ovl2); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
SetLastError(0xdeadbeef); ret = GetOverlappedResult(queue, &ovl1, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %lu.\n", GetLastError());
s1 = create_client_socket(port); sprintf(req_text, simple_req, port); ret = send(s1, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
ret = WaitForSingleObject(ovl1.hEvent, 100); - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret); ret = WaitForSingleObject(ovl2.hEvent, 100); - ok(ret == WAIT_TIMEOUT, "Got %u.\n", ret); + ok(ret == WAIT_TIMEOUT, "Got %lu.\n", ret);
s2 = create_client_socket(port); ret = send(s2, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
ret = WaitForSingleObject(ovl1.hEvent, 0); - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret); ret = WaitForSingleObject(ovl2.hEvent, 100); - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret);
len = sizeof(sockaddr); getsockname(s1, (struct sockaddr *)&sockaddr, &len); @@ -508,44 +508,44 @@ static void test_v1_multiple_requests(void) response.pReason = "I'm a teapot"; response.ReasonLength = 12; ret = HttpSendHttpResponse(queue, req1->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl1, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); ret = HttpSendHttpResponse(queue, req2->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl2, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
/* Test sending multiple requests from the same socket. */
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req1, sizeof(req_buffer1), NULL, &ovl1); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req2, sizeof(req_buffer2), NULL, &ovl2); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
ret = send(s1, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret); ret = send(s1, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
ret = WaitForSingleObject(ovl1.hEvent, 100); - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret); ret = WaitForSingleObject(ovl2.hEvent, 100); - ok(ret == WAIT_TIMEOUT, "Got %u.\n", ret); + ok(ret == WAIT_TIMEOUT, "Got %lu.\n", ret);
ret = HttpSendHttpResponse(queue, req1->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl1, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
ret = WaitForSingleObject(ovl2.hEvent, 100); - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret); ok(req1->ConnectionId == req2->ConnectionId, "Expected same connection IDs.\n"); ok(req1->RequestId != req2->RequestId, "Expected different request IDs, but got %s.\n", wine_dbgstr_longlong(req1->RequestId));
ret = remove_url_v1(queue, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s1); closesocket(s2); CloseHandle(ovl1.hEvent); CloseHandle(ovl2.hEvent); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_v1_short_buffer(void) @@ -565,20 +565,20 @@ static void test_v1_short_buffer(void) ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); port = add_url_v1(queue);
s = create_client_socket(port); sprintf(req_text, simple_req, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1) - 1, &ret_size, NULL); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got error %u.\n", ret); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1), &ret_size, NULL); - ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(ret == ERROR_MORE_DATA, "Got error %lu.\n", ret); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); ok(!!req->ConnectionId, "Got connection ID %s.\n", wine_dbgstr_longlong(req->ConnectionId)); ok(!!req->RequestId, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); ok(!req->Version.MajorVersion || req->Version.MajorVersion == 0xcccc /* < Vista */, @@ -589,26 +589,26 @@ static void test_v1_short_buffer(void) /* At this point the request has been assigned a specific ID, and one cannot * receive it by calling with HTTP_NULL_ID. */ ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req2, sizeof(req_buffer2), NULL, &ovl); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
req_id = req->RequestId; memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size - 1, &ret_size, NULL); - ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); + ok(ret == ERROR_MORE_DATA, "Got error %lu.\n", ret);
memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size, &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId));
CancelIo(queue);
ret = remove_url_v1(queue, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); CloseHandle(ovl.hEvent); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_v1_entity_body(void) @@ -625,6 +625,7 @@ static void test_v1_entity_body(void) DWORD ret_size; HANDLE queue; SOCKET s; + int got;
static const char post_req[] = "POST /xyzzy HTTP/1.1\r\n" @@ -647,13 +648,13 @@ static void test_v1_entity_body(void) req_body[i] = i / 111;
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); port = add_url_v1(queue);
s = create_client_socket(port); sprintf(req_text, post_req, port); ret = send(s, req_text, strlen(req_text) + 1, 0); - ok(ret == strlen(req_text) + 1, "send() returned %d.\n", ret); + ok(ret == strlen(req_text) + 1, "send() returned %ld.\n", ret); /* Windows versions before 8 will return success, and report that an entity * body exists in the Flags member, but fail to account for it in the * BytesReceived member or actually copy it to the buffer, if @@ -663,9 +664,9 @@ static void test_v1_entity_body(void)
memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#x.\n", req->Flags); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#lx.\n", req->Flags); ok(req->BytesReceived == strlen(req_text) + 1, "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(req->Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength == 1, "Got header length %u.\n", req->Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength); @@ -686,42 +687,42 @@ static void test_v1_entity_body(void) chunks[1].FromMemory.pBuffer = (void *)"pang"; chunks[1].FromMemory.BufferLength = 4; ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, NULL, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
memset(response_buffer, 0, sizeof(response_buffer));
- ret = recv(s, response_buffer, sizeof(response_buffer), 0); - ok(ret > 0, "recv() failed.\n"); + got = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(got > 0, "recv() failed.\n"); if (winetest_debug > 1) - trace("%.*s\n", ret, response_buffer); + trace("%.*s\n", got, response_buffer); ok(!strncmp(response_buffer, "HTTP/1.1 418 I'm a teapot\r\n", 27), "Got incorrect status line.\n"); ok(!!strstr(response_buffer, "\r\nContent-Length: 8\r\n"), "Missing or malformed Content-Length header.\n"); ok(!!strstr(response_buffer, "\r\nDate:"), "Missing Date header.\n"); ok(!memcmp(response_buffer + ret - 12, "\r\n\r\npongpang", 12), "Response did not end with entity data.\n");
ret = HttpReceiveHttpRequest(queue, req->RequestId, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret);
/* http won't overwrite a Content-Length header if we manually supply one, * but it also won't truncate the entity body to match. It will however * always write its own Date header. */
ret = send(s, req_text, strlen(req_text) + 1, 0); - ok(ret == strlen(req_text) + 1, "send() returned %d.\n", ret); + ok(ret == strlen(req_text) + 1, "send() returned %ld.\n", ret); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
response.Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength = 1; response.Headers.KnownHeaders[HttpHeaderContentLength].pRawValue = "6"; response.Headers.KnownHeaders[HttpHeaderDate].RawValueLength = 10; response.Headers.KnownHeaders[HttpHeaderDate].pRawValue = "yesteryear"; ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, NULL, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
- ret = recv(s, response_buffer, sizeof(response_buffer), 0); - ok(ret > 0, "recv() failed.\n"); + got = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(got > 0, "recv() failed.\n"); if (winetest_debug > 1) - trace("%.*s\n", ret, response_buffer); + trace("%.*s\n", got, response_buffer); ok(!strncmp(response_buffer, "HTTP/1.1 418 I'm a teapot\r\n", 27), "Got incorrect status line.\n"); ok(!!strstr(response_buffer, "\r\nContent-Length: 6\r\n"), "Missing or malformed Content-Length header.\n"); ok(!!strstr(response_buffer, "\r\nDate:"), "Missing Date header.\n"); @@ -731,14 +732,14 @@ static void test_v1_entity_body(void) /* Test the COPY_BODY flag. */
ret = send(s, req_text, strlen(req_text) + 1, 0); - ok(ret == strlen(req_text) + 1, "send() returned %d.\n", ret); + ok(ret == strlen(req_text) + 1, "send() returned %ld.\n", ret); Sleep(100);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - ok(!req->Flags, "Got flags %#x.\n", req->Flags); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->BytesReceived == strlen(req_text) + 1, "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(req->Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength == 1, "Got header length %u.\n", req->Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength); @@ -748,7 +749,7 @@ static void test_v1_entity_body(void) ok(req->pEntityChunks[0].DataChunkType == HttpDataChunkFromMemory, "Got chunk type %u.\n", req->pEntityChunks[0].DataChunkType); ok(req->pEntityChunks[0].FromMemory.BufferLength == 5, - "Got chunk length %u.\n", req->pEntityChunks[0].FromMemory.BufferLength); + "Got chunk length %lu.\n", req->pEntityChunks[0].FromMemory.BufferLength); ok(!memcmp(req->pEntityChunks[0].FromMemory.pBuffer, "ping", 5), "Got chunk data '%s'.\n", (char *)req->pEntityChunks[0].FromMemory.pBuffer);
@@ -756,17 +757,17 @@ static void test_v1_entity_body(void)
sprintf(req_text, post_req2, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret); ret = send(s, req_body, sizeof(req_body), 0); - ok(ret == sizeof(req_body), "send() returned %d.\n", ret); + ok(ret == sizeof(req_body), "send() returned %ld.\n", ret);
Sleep(100);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, (HTTP_REQUEST *)req, 2000, &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 2000, "Got size %u.\n", ret_size); - ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#x.\n", req->Flags); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size == 2000, "Got size %lu.\n", ret_size); + ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#lx.\n", req->Flags); ok(req->BytesReceived == strlen(req_text) + 2048, "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(req->Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength == 4, "Got header length %u.\n", req->Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength); @@ -776,7 +777,7 @@ static void test_v1_entity_body(void) ok(req->pEntityChunks[0].DataChunkType == HttpDataChunkFromMemory, "Got chunk type %u.\n", req->pEntityChunks[0].DataChunkType); chunk_size = req->pEntityChunks[0].FromMemory.BufferLength; - ok(chunk_size > 0 && chunk_size < 2000, "Got chunk size %u.\n", chunk_size); + ok(chunk_size > 0 && chunk_size < 2000, "Got chunk size %lu.\n", chunk_size); ok(!memcmp(req->pEntityChunks[0].FromMemory.pBuffer, req_body, chunk_size), "Chunk data didn't match.\n");
send_response_v1(queue, req->RequestId, s); @@ -785,128 +786,128 @@ static void test_v1_entity_body(void)
ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(NULL, HTTP_NULL_ID, 0, recv_body, sizeof(recv_body), &ret_size, NULL); - ok(ret == ERROR_INVALID_HANDLE, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Got error %lu.\n", ret); ret = HttpReceiveRequestEntityBody(NULL, HTTP_NULL_ID, 0, recv_body, sizeof(recv_body), NULL, &ovl); - ok(ret == ERROR_INVALID_HANDLE, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Got error %lu.\n", ret);
sprintf(req_text, post_req, port); ret = send(s, req_text, strlen(req_text) + 1, 0); - ok(ret == strlen(req_text) + 1, "send() returned %d.\n", ret); + ok(ret == strlen(req_text) + 1, "send() returned %ld.\n", ret); Sleep(100);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
ret = HttpReceiveRequestEntityBody(queue, HTTP_NULL_ID, 0, recv_body, sizeof(recv_body), &ret_size, NULL); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret);
ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size == 5, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n");
ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); - ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); - ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + ok(ret == ERROR_HANDLE_EOF, "Got error %lu.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %lu.\n", ret_size);
send_response_v1(queue, req->RequestId, s);
ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret);
ret = send(s, req_text, strlen(req_text) + 1, 0); - ok(ret == strlen(req_text) + 1, "send() returned %d.\n", ret); + ok(ret == strlen(req_text) + 1, "send() returned %ld.\n", ret); Sleep(100);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
memset(recv_body, 0xcc, sizeof(recv_body)); ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 2, &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 2, "Got size %u.\n", ret_size); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size == 2, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, "pi", 2), "Entity body didn't match.\n");
ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 4, &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 3, "Got size %u.\n", ret_size); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size == 3, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, "ng", 3), "Entity body didn't match.\n");
ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); - ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); - ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %u.\n", ret_size); + ok(ret == ERROR_HANDLE_EOF, "Got error %lu.\n", ret); + ok(ret_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %lu.\n", ret_size);
send_response_v1(queue, req->RequestId, s);
ret = send(s, req_text, strlen(req_text) + 1, 0); - ok(ret == strlen(req_text) + 1, "send() returned %d.\n", ret); + ok(ret == strlen(req_text) + 1, "send() returned %ld.\n", ret); Sleep(100);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
memset(recv_body, 0xcc, sizeof(recv_body)); ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); - ok(!ret || ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(!ret || ret == ERROR_IO_PENDING, "Got error %lu.\n", ret); ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %u.\n", GetLastError()); - ok(ret_size == 5, "Got size %u.\n", ret_size); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size == 5, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, "ping", 5), "Entity body didn't match.\n");
ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); - ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret == ERROR_HANDLE_EOF, "Got error %lu.\n", ret);
send_response_v1(queue, req->RequestId, s);
ret = send(s, req_text, strlen(req_text) + 1, 0); - ok(ret == strlen(req_text) + 1, "send() returned %d.\n", ret); + ok(ret == strlen(req_text) + 1, "send() returned %ld.\n", ret); Sleep(100);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); - ok(ret == ERROR_HANDLE_EOF, "Got error %u.\n", ret); + ok(ret == ERROR_HANDLE_EOF, "Got error %lu.\n", ret);
send_response_v1(queue, req->RequestId, s);
sprintf(req_text, post_req2, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret); ret = send(s, req_body, sizeof(req_body), 0); - ok(ret == sizeof(req_body), "send() returned %d.\n", ret); + ok(ret == sizeof(req_body), "send() returned %ld.\n", ret);
Sleep(100);
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY, (HTTP_REQUEST *)req, 2000, &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 2000, "Got size %u.\n", ret_size); - ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#x.\n", req->Flags); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size == 2000, "Got size %lu.\n", ret_size); + ok(req->Flags == HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS, "Got flags %#lx.\n", req->Flags); chunk_size = req->pEntityChunks[0].FromMemory.BufferLength;
memset(recv_body, 0xcc, sizeof(recv_body)); ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 2048 - chunk_size, "Got size %u.\n", ret_size); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size == 2048 - chunk_size, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, req_body + chunk_size, ret_size), "Entity body didn't match.\n");
send_response_v1(queue, req->RequestId, s);
CloseHandle(ovl.hEvent); ret = remove_url_v1(queue, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_v1_bad_request(void) @@ -916,26 +917,27 @@ static void test_v1_bad_request(void) HANDLE queue; ULONG ret; SOCKET s; + int got;
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); port = add_url_v1(queue);
s = create_client_socket(port); ret = send(s, "foo\r\n", strlen("foo\r\n"), 0); - ok(ret == strlen("foo\r\n"), "send() returned %d.\n", ret); + ok(ret == strlen("foo\r\n"), "send() returned %ld.\n", ret);
- ret = recv(s, response_buffer, sizeof(response_buffer), 0); - ok(ret > 0, "recv() failed.\n"); + got = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(got > 0, "recv() failed.\n");
if (winetest_debug > 1) - trace("%.*s\n", ret, response_buffer); + trace("%.*s\n", got, response_buffer);
ok(!strncmp(response_buffer, "HTTP/1.1 400 Bad Request\r\n", 26), "Got incorrect status line.\n"); ok(!!strstr(response_buffer, "\r\nConnection: close\r\n"), "Missing or malformed Connection header.\n");
ret = send(s, "foo\r\n", strlen("foo\r\n"), 0); - ok(ret == strlen("foo\r\n"), "send() returned %d.\n", ret); + ok(ret == strlen("foo\r\n"), "send() returned %ld.\n", ret);
WSASetLastError(0xdeadbeef); ret = recv(s, response_buffer, sizeof(response_buffer), 0); @@ -943,10 +945,10 @@ static void test_v1_bad_request(void) ok(!WSAGetLastError(), "Got error %u.\n", WSAGetLastError());
ret = remove_url_v1(queue, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_v1_cooked_url(void) @@ -974,18 +976,18 @@ static void test_v1_cooked_url(void) "\r\n";
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); port = add_url_v1(queue);
s = create_client_socket(port); sprintf(req_text, req1, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); ok(req->RawUrlLength == 11, "Got raw URL length %u.\n", req->RawUrlLength); ok(!strcmp(req->pRawUrl, "/foobar?a=b"), "Got raw URL %s.\n", req->pRawUrl); ok(req->CookedUrl.FullUrlLength == 66, "Got full URL length %u.\n", req->CookedUrl.FullUrlLength); @@ -1005,12 +1007,12 @@ static void test_v1_cooked_url(void)
sprintf(req_text, req2, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); ok(req->RawUrlLength == 23, "Got raw URL length %u.\n", req->RawUrlLength); sprintf(expect, "http://localhost:%u/", port); ok(!strcmp(req->pRawUrl, expect), "Expected raw URL "%s", got "%s".\n", expect, req->pRawUrl); @@ -1029,10 +1031,10 @@ static void test_v1_cooked_url(void) send_response_v1(queue, req->RequestId, s);
ret = remove_url_v1(queue, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_v1_unknown_tokens(void) @@ -1054,17 +1056,17 @@ static void test_v1_unknown_tokens(void) "\r\n";
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); port = add_url_v1(queue);
s = create_client_socket(port); sprintf(req_text, req1, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); ok(req->Verb == HttpVerbUnknown, "Got verb %u.\n", req->Verb); ok(req->UnknownVerbLength == 5, "Got unknown verb length %u.\n", req->UnknownVerbLength); ok(!strcmp(req->pUnknownVerb, "xyzzy"), "Got unknown verb %s.\n", req->pUnknownVerb); @@ -1079,10 +1081,10 @@ static void test_v1_unknown_tokens(void) req->Headers.pUnknownHeaders[0].pRawValue);
ret = remove_url_v1(queue, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_v1_urls(void) @@ -1098,7 +1100,7 @@ static void test_v1_urls(void) SOCKET s;
ret = HttpCreateHttpHandle(&queue, 0); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
for (port = 50000; port < 51000; ++port) { @@ -1111,28 +1113,28 @@ static void test_v1_urls(void) CloseHandle(queue); return; } - ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %lu.\n", debugstr_w(url), ret); }
- ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
s = create_client_socket(port); sprintf(req_text, simple_req, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); - ok(!ret, "Got error %u.\n", ret); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(!ret, "Got error %lu.\n", ret); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size);
send_response_v1(queue, req->RequestId, s);
ret = HttpRemoveUrl(queue, url); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); ret = CloseHandle(queue); - ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); }
static void test_HttpCreateServerSession(void) @@ -1144,34 +1146,34 @@ static void test_HttpCreateServerSession(void) version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, NULL, 0); - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %lu.\n", ret);
version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 1; ret = pHttpCreateServerSession(version, &session, 0); - ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); + ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %lu.\n", ret);
version.HttpApiMajorVersion = 3; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); - ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); + ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %lu.\n", ret);
version.HttpApiMajorVersion = 2; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret); ret = pHttpCloseServerSession(session); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret);
version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret); ret = pHttpCloseServerSession(session); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret);
ret = pHttpCloseServerSession(0xdead); - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %lu.\n", ret); }
static void test_HttpCreateUrlGroup(void) @@ -1183,41 +1185,41 @@ static void test_HttpCreateUrlGroup(void)
group_id = 1; ret = pHttpCreateUrlGroup(0, &group_id, 0); - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %lu.\n", ret); ok(group_id == 1, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id));
/* Create session, url group, close session. */ version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret);
group_id = 0; ret = pHttpCreateUrlGroup(session, &group_id, 0); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret); ok(group_id != 0, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id));
ret = pHttpCloseServerSession(session); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret);
/* Groups are closed together with their session. */ ret = pHttpCloseUrlGroup(group_id); - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %lu.\n", ret);
/* Create session, url group, close group. */ ret = pHttpCreateServerSession(version, &session, 0); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret);
group_id = 0; ret = pHttpCreateUrlGroup(session, &group_id, 0); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret); ok(group_id != 0, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id));
ret = pHttpCloseUrlGroup(group_id); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret);
ret = pHttpCloseServerSession(session); - ok(!ret, "Unexpected return value %u.\n", ret); + ok(!ret, "Unexpected return value %lu.\n", ret); }
static void test_v2_server(void) @@ -1238,53 +1240,53 @@ static void test_v2_server(void) DWORD ret_size; WCHAR url[50]; HANDLE queue; + int len, got; ULONG ret; SOCKET s; - int len;
ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); memset(req_buffer, 0xcc, sizeof(req_buffer));
ret = pHttpCreateServerSession(version, &session, 0); - ok(!ret, "Failed to create session, error %u.\n", ret); + ok(!ret, "Failed to create session, error %lu.\n", ret); ret = pHttpCreateUrlGroup(session, &group, 0); - ok(!ret, "Failed to create URL group, error %u.\n", ret); + ok(!ret, "Failed to create URL group, error %lu.\n", ret); ret = pHttpCreateRequestQueue(version, NULL, NULL, 0, &queue); - ok(!ret, "Failed to create request queue, error %u.\n", ret); + ok(!ret, "Failed to create request queue, error %lu.\n", ret); binding.Flags.Present = 1; binding.RequestQueueHandle = queue; ret = pHttpSetUrlGroupProperty(group, HttpServerBindingProperty, &binding, sizeof(binding)); - ok(!ret, "Failed to bind request queue, error %u.\n", ret); + ok(!ret, "Failed to bind request queue, error %lu.\n", ret);
ret = HttpReceiveHttpRequest(NULL, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_INVALID_HANDLE, "Got error %u.\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(queue, 0xdeadbeef, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret); ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
SetLastError(0xdeadbeef); ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %lu.\n", GetLastError());
port = add_url_v2(group);
ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:50000", 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000", 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000/", 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = pHttpAddUrlToUrlGroup(group, L"http://localhost/", 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:/", 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:0/", 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %lu.\n", ret); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_ALREADY_EXISTS, "Got error %u.\n", ret); + todo_wine ok(ret == ERROR_ALREADY_EXISTS, "Got error %lu.\n", ret);
s = create_client_socket(port); len = sizeof(sockaddr); @@ -1294,22 +1296,22 @@ static void test_v2_server(void) SetLastError(0xdeadbeef); ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %lu.\n", GetLastError());
sprintf(req_text, simple_req, port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
ret = WaitForSingleObject(ovl.hEvent, 100); - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret);
Sleep(100);
ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %u.\n", GetLastError()); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size);
- ok(!req->Flags, "Got flags %#x.\n", req->Flags); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); ok(req->RequestId, "Expected nonzero connection ID.\n"); ok(req->UrlContext == 0xdeadbeef, "Got URL context %s.\n", wine_dbgstr_longlong(req->UrlContext)); @@ -1335,7 +1337,7 @@ static void test_v2_server(void) sin = (SOCKADDR_IN *)req->Address.pLocalAddress; ok(sin->sin_family == AF_INET, "Got family %u.\n", sin->sin_family); ok(ntohs(sin->sin_port) == port, "Got wrong port %u.\n", ntohs(sin->sin_port)); - ok(sin->sin_addr.S_un.S_addr == inet_addr("127.0.0.1"), "Got address %08x.\n", sin->sin_addr.S_un.S_addr); + ok(sin->sin_addr.S_un.S_addr == inet_addr("127.0.0.1"), "Got address %08lx.\n", sin->sin_addr.S_un.S_addr); ok(!req->Headers.UnknownHeaderCount, "Got %u unknown headers.\n", req->Headers.UnknownHeaderCount); ok(!req->Headers.pUnknownHeaders, "Got unknown headers %p.\n", req->Headers.pUnknownHeaders); for (i = 0; i < ARRAY_SIZE(req->Headers.KnownHeaders); ++i) @@ -1384,38 +1386,38 @@ static void test_v2_server(void) response.s.Headers.KnownHeaders[HttpHeaderRetryAfter].pRawValue = "120"; response.s.Headers.KnownHeaders[HttpHeaderRetryAfter].RawValueLength = 3; ret = HttpSendHttpResponse(queue, 0xdeadbeef, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl, NULL); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret); ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); - ok(ret, "Got error %u.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError());
- ret = recv(s, response_buffer, sizeof(response_buffer), 0); - ok(ret == ret_size, "Expected size %u, got %u.\n", ret_size, ret); + got = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(got == ret_size, "Expected size %lu, got %u.\n", ret_size, got);
if (winetest_debug > 1) - trace("%.*s\n", ret, response_buffer); + trace("%.*s\n", got, response_buffer);
ok(!strncmp(response_buffer, "HTTP/1.1 418 I'm a teapot\r\n", 27), "Got incorrect status line.\n"); ok(!!strstr(response_buffer, "\r\nRetry-After: 120\r\n"), "Missing or malformed Retry-After header.\n"); ok(!!strstr(response_buffer, "\r\nDate:"), "Missing Date header.\n");
ret = HttpReceiveHttpRequest(queue, req->RequestId, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\n", ret); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %lu.\n", ret);
ret = remove_url_v2(group, port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); ret = remove_url_v2(group, port); - ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "Got error %lu.\n", ret);
closesocket(s); CloseHandle(ovl.hEvent); ret = pHttpCloseRequestQueue(queue); - ok(!ret, "Failed to close queue handle, error %u.\n", ret); + ok(!ret, "Failed to close queue handle, error %lu.\n", ret); ret = pHttpCloseUrlGroup(group); - ok(!ret, "Failed to close group, error %u.\n", ret); + ok(!ret, "Failed to close group, error %lu.\n", ret); ret = pHttpCloseServerSession(session); - ok(!ret, "Failed to close group, error %u.\n", ret); + ok(!ret, "Failed to close group, error %lu.\n", ret); }
static void test_v2_completion_port(void) @@ -1439,74 +1441,74 @@ static void test_v2_completion_port(void) ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
ret = pHttpCreateServerSession(version, &session, 0); - ok(!ret, "Failed to create session, error %u.\n", ret); + ok(!ret, "Failed to create session, error %lu.\n", ret); ret = pHttpCreateUrlGroup(session, &group, 0); - ok(!ret, "Failed to create URL group, error %u.\n", ret); + ok(!ret, "Failed to create URL group, error %lu.\n", ret); ret = pHttpCreateRequestQueue(version, NULL, NULL, 0, &queue); - ok(!ret, "Failed to create request queue, error %u.\n", ret); + ok(!ret, "Failed to create request queue, error %lu.\n", ret); binding.Flags.Present = 1; binding.RequestQueueHandle = queue; ret = pHttpSetUrlGroupProperty(group, HttpServerBindingProperty, &binding, sizeof(binding)); - ok(!ret, "Failed to bind request queue, error %u.\n", ret); + ok(!ret, "Failed to bind request queue, error %lu.\n", ret);
port = CreateIoCompletionPort(queue, NULL, 123, 0); - ok(!!port, "Failed to create completion port, error %u.\n", GetLastError()); + ok(!!port, "Failed to create completion port, error %lu.\n", GetLastError());
ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %lu.\n", GetLastError());
ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); - ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + ok(ret == ERROR_IO_PENDING, "Got error %lu.\n", ret);
tcp_port = add_url_v2(group); s = create_client_socket(tcp_port);
ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %lu.\n", GetLastError());
sprintf(req_text, simple_req, tcp_port); ret = send(s, req_text, strlen(req_text), 0); - ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ok(ret == strlen(req_text), "send() returned %ld.\n", ret);
ret_size = key = 0xdeadbeef; ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 1000); - ok(ret, "Got error %u.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError()); ok(povl == &ovl, "OVERLAPPED pointers didn't match.\n"); - ok(key == 123, "Got unexpected key %lu.\n", key); - ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + ok(key == 123, "Got unexpected key %Iu.\n", key); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size);
ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %lu.\n", GetLastError());
response.s.StatusCode = 418; response.s.pReason = "I'm a teapot"; response.s.ReasonLength = 12; ret = HttpSendHttpResponse(queue, req->s.RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl, NULL); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret);
ret_size = key = 0xdeadbeef; ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 1000); - ok(ret, "Got error %u.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError()); ok(povl == &ovl, "OVERLAPPED pointers didn't match.\n"); - ok(key == 123, "Got unexpected key %lu.\n", key); + ok(key == 123, "Got unexpected key %Iu.\n", key);
ret = recv(s, response_buffer, sizeof(response_buffer), 0); - ok(ret == ret_size, "Expected size %u, got %u.\n", ret_size, ret); + ok(ret == ret_size, "Expected size %lu, got %lu.\n", ret_size, ret);
ret = remove_url_v2(group, tcp_port); - ok(!ret, "Got error %u.\n", ret); + ok(!ret, "Got error %lu.\n", ret); closesocket(s); CloseHandle(port); CloseHandle(ovl.hEvent); ret = pHttpCloseRequestQueue(queue); - ok(!ret, "Failed to close queue handle, error %u.\n", ret); + ok(!ret, "Failed to close queue handle, error %lu.\n", ret); ret = pHttpCloseUrlGroup(group); - ok(!ret, "Failed to close group, error %u.\n", ret); + ok(!ret, "Failed to close group, error %lu.\n", ret); ret = pHttpCloseServerSession(session); - ok(!ret, "Failed to close group, error %u.\n", ret); + ok(!ret, "Failed to close group, error %lu.\n", ret); }
START_TEST(httpapi) @@ -1520,7 +1522,7 @@ START_TEST(httpapi) WSAStartup(MAKEWORD(1,1), &wsadata);
ret = HttpInitialize(version, HTTP_INITIALIZE_SERVER, NULL); - ok(!ret, "Failed to initialize library, ret %u.\n", ret); + ok(!ret, "Failed to initialize library, ret %lu.\n", ret);
test_v1_server(); test_v1_completion_port(); @@ -1533,7 +1535,7 @@ START_TEST(httpapi) test_v1_urls();
ret = HttpTerminate(HTTP_INITIALIZE_SERVER, NULL); - ok(!ret, "Failed to terminate, ret %u.\n", ret); + ok(!ret, "Failed to terminate, ret %lu.\n", ret);
version.HttpApiMajorVersion = 2; if (!HttpInitialize(version, HTTP_INITIALIZE_SERVER, NULL)) @@ -1544,7 +1546,7 @@ START_TEST(httpapi) test_v2_completion_port();
ret = HttpTerminate(HTTP_INITIALIZE_SERVER, NULL); - ok(!ret, "Failed to terminate, ret %u.\n", ret); + ok(!ret, "Failed to terminate, ret %lu.\n", ret); } else win_skip("Version 2 is not supported.\n");