August 2019 - Wine-devel - list.winehq.org

[PATCH v3] httpapi/tests: Add tests for version 1 request queues.
by Zebediah Figura 20 Aug '19

20 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: work around more test failures dlls/httpapi/tests/Makefile.in | 2 +- dlls/httpapi/tests/httpapi.c | 852 ++++++++++++++++++++++++++++++++- 2 files changed, 834 insertions(+), 20 deletions(-) diff --git a/dlls/httpapi/tests/Makefile.in b/dlls/httpapi/tests/Makefile.in index 1c253a789b..20210a3451 100644 --- a/dlls/httpapi/tests/Makefile.in +++ b/dlls/httpapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = httpapi.dll -IMPORTS = httpapi +IMPORTS = httpapi ws2_32 C_SRCS = \ httpapi.c diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index e1437552a8..6646e8e219 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -1,7 +1,8 @@ /* - * HttpApi tests + * HTTP server API tests * * Copyright 2017 Nikolay Sivov for CodeWeavers + * Copyright 2019 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,9 @@ #include "wine/test.h" +static const WCHAR localhost_urlW[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','5','0','0','0','0','/',0}; +static const WCHAR localhost_url2W[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','5','0','0','0','1','/',0}; + static ULONG (WINAPI *pHttpCreateServerSession)(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *session_id, ULONG reserved); static ULONG (WINAPI *pHttpCloseServerSession)(HTTP_SERVER_SESSION_ID session_id); @@ -49,32 +53,832 @@ static void init(void) #undef X } -static void test_HttpCreateHttpHandle(void) +static const char simple_req[] = + "GET /foobar HTTP/1.1\r\n" + "Host: localhost:50000\r\n" + "Connection: keep-alive\r\n" + "User-Agent: WINE\r\n" + "\r\n"; + +static int create_client_socket(void) +{ + struct sockaddr_in sockaddr = + { + .sin_family = AF_INET, + .sin_port = htons(50000), + .sin_addr.S_un.S_addr = inet_addr("127.0.0.1"), + }; + int 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()); + return s; +} + +/* Helper function for when we don't care about the response received. */ +static void send_response_v1(HANDLE queue, HTTP_REQUEST_ID id, int s) +{ + HTTP_RESPONSE_V1 response = {}; + char response_buffer[2048]; + int ret; + + response.StatusCode = 418; + response.pReason = "I'm a teapot"; + response.ReasonLength = 12; + ret = HttpSendHttpResponse(queue, id, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, NULL, NULL); + ok(!ret, "Got error %u.\n", ret); + ret = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(ret > 0, "recv() failed.\n"); +} + +static void test_v1_server(void) { - HANDLE handle, handle2; + static const WCHAR invalid_url1[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; + static const WCHAR invalid_url2[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; + static const WCHAR invalid_url3[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0','/',0}; + static const WCHAR invalid_url4[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/',0}; + static const WCHAR invalid_url5[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','/',0}; + static const WCHAR invalid_url6[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','0','/',0}; + static const WCHAR cooked_urlW[] = {'h','t','t','p',':','/','/', + 'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0','/','f','o','o','b','a','r',0}; + + char DECLSPEC_ALIGN(8) req_buffer[2048], response_buffer[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; + struct sockaddr_in sockaddr, *sin; + HTTP_RESPONSE_V1 response = {}; + HANDLE queue, queue2; + unsigned int i; + OVERLAPPED ovl; + DWORD ret_size; ULONG ret; - BOOL b; + SOCKET s; + int len; + + ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpCreateHttpHandle(NULL, 0); -todo_wine - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected ret value %u.\n", ret); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected error %u.\n", ret); /* Non-zero reserved parameter is accepted on XP/2k3. */ - handle = NULL; - ret = HttpCreateHttpHandle(&handle, 0); -todo_wine { + queue = NULL; + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Unexpected ret value %u.\n", ret); + if (ret) return; + ok(!!queue, "Unexpected handle value %p.\n", queue); + + queue2 = NULL; + ret = HttpCreateHttpHandle(&queue2, 0); ok(!ret, "Unexpected ret value %u.\n", ret); - ok(handle != NULL, "Unexpected handle value %p.\n", handle); + ok(queue2 && queue2 != queue, "Unexpected handle %p.\n", queue2); + ret = CloseHandle(queue2); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + + 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); + ret = HttpReceiveHttpRequest(queue, 0xdeadbeef, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); + ok(ret == ERROR_CONNECTION_INVALID, "Got error %u.\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); + + SetLastError(0xdeadbeef); + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + + ret = HttpAddUrl(NULL, localhost_urlW, NULL); + ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_INVALID_PARAMETER /* < Vista */, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, invalid_url1, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, invalid_url2, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, invalid_url3, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, invalid_url4, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, invalid_url5, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, invalid_url6, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(ret == ERROR_ALREADY_EXISTS, "Got error %u.\n", ret); + ret = HttpAddUrl(queue, localhost_url2W, NULL); + todo_wine ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(); + len = sizeof(sockaddr); + ret = getsockname(s, (struct sockaddr *)&sockaddr, &len); + ok(ret == 0, "getsockname() failed, error %u.\n", WSAGetLastError()); + + SetLastError(0xdeadbeef); + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + + ret = send(s, simple_req, strlen(simple_req), 0); + ok(ret == strlen(simple_req), "send() returned %d.\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); + + /* 64-bit Windows 10 version 1507 apparently suffers from a bug where it + * will report success before completely filling the buffer. Wait for a + * short interval to work around this. */ + Sleep(100); + + ok(!req->Flags, "Got flags %#x.\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)); + ok(req->Version.MajorVersion == 1, "Got major version %u.\n", req->Version.MajorVersion); + ok(req->Version.MinorVersion == 1, "Got major version %u.\n", req->Version.MinorVersion); + ok(req->Verb == HttpVerbGET, "Got verb %u.\n", req->Verb); + ok(!req->UnknownVerbLength, "Got unknown verb length %u.\n", req->UnknownVerbLength); + ok(req->RawUrlLength == 7, "Got raw URL length %u.\n", req->RawUrlLength); + ok(!req->pUnknownVerb, "Got unknown verb %s.\n", req->pUnknownVerb); + ok(!strcmp(req->pRawUrl, "/foobar"), "Got raw URL %s.\n", req->pRawUrl); + ok(req->CookedUrl.FullUrlLength == 58, "Got full URL length %u.\n", req->CookedUrl.FullUrlLength); + ok(req->CookedUrl.HostLength == 30, "Got host length %u.\n", req->CookedUrl.HostLength); + ok(req->CookedUrl.AbsPathLength == 14, "Got absolute path length %u.\n", req->CookedUrl.AbsPathLength); + ok(!req->CookedUrl.QueryStringLength, "Got query string length %u.\n", req->CookedUrl.QueryStringLength); + ok(!wcscmp(req->CookedUrl.pFullUrl, cooked_urlW), "Got full URL %s.\n", wine_dbgstr_w(req->CookedUrl.pFullUrl)); + ok(req->CookedUrl.pHost == req->CookedUrl.pFullUrl + 7, "Got host %s.\n", wine_dbgstr_w(req->CookedUrl.pHost)); + ok(req->CookedUrl.pAbsPath == req->CookedUrl.pFullUrl + 22, + "Got absolute path %s.\n", wine_dbgstr_w(req->CookedUrl.pAbsPath)); + ok(!req->CookedUrl.pQueryString, "Got query string %s.\n", wine_dbgstr_w(req->CookedUrl.pQueryString)); + ok(!memcmp(req->Address.pRemoteAddress, &sockaddr, len), "Client addresses didn't match.\n"); + sin = (SOCKADDR_IN *)req->Address.pLocalAddress; + ok(sin->sin_family == AF_INET, "Got family %u.\n", sin->sin_family); + ok(ntohs(sin->sin_port) == 50000, "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(!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) + { + if (i == HttpHeaderConnection) + { + ok(req->Headers.KnownHeaders[i].RawValueLength == 10, "Got length %u.\n", + req->Headers.KnownHeaders[i].RawValueLength); + ok(!strcmp(req->Headers.KnownHeaders[i].pRawValue, "keep-alive"), + "Got connection '%s'.\n", req->Headers.KnownHeaders[i].pRawValue); + } + else if (i == HttpHeaderHost) + { + ok(req->Headers.KnownHeaders[i].RawValueLength == 15, "Got length %u.\n", + req->Headers.KnownHeaders[i].RawValueLength); + ok(!strcmp(req->Headers.KnownHeaders[i].pRawValue, "localhost:50000"), + "Got connection '%s'.\n", req->Headers.KnownHeaders[i].pRawValue); + } + else if (i == HttpHeaderUserAgent) + { + ok(req->Headers.KnownHeaders[i].RawValueLength == 4, "Got length %u.\n", + req->Headers.KnownHeaders[i].RawValueLength); + ok(!strcmp(req->Headers.KnownHeaders[i].pRawValue, "WINE"), + "Got connection '%s'.\n", req->Headers.KnownHeaders[i].pRawValue); + } + else + { + ok(!req->Headers.KnownHeaders[i].RawValueLength, "Header %#x: got length %u.\n", + i, req->Headers.KnownHeaders[i].RawValueLength); + ok(!req->Headers.KnownHeaders[i].pRawValue, "Header %#x: got value '%s'.\n", + i, req->Headers.KnownHeaders[i].pRawValue); + } + } + ok(req->BytesReceived == strlen(simple_req), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); + ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); + ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); + ok(!req->RawConnectionId, "Got SSL connection ID %s.\n", wine_dbgstr_longlong(req->RawConnectionId)); + ok(!req->pSslInfo, "Got SSL info %p.\n", req->pSslInfo); + + response.StatusCode = 418; + response.pReason = "I'm a teapot"; + response.ReasonLength = 12; + 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); + ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl, NULL); + ok(!ret, "Got error %u.\n", ret); + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(ret, "Got error %u.\n", GetLastError()); + + ret = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(ret == ret_size, "Expected size %u, got %u.\n", ret_size, ret); + + if (winetest_debug > 1) + trace("%.*s\n", ret, 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); + + /* HttpReceiveHttpRequest() may return synchronously, but this cannot be + * reliably tested. Introducing a delay after send() and before + * HttpReceiveHttpRequest() confirms this. */ + + ret = HttpRemoveUrl(NULL, localhost_urlW); + ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\n", ret); + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ret = HttpRemoveUrl(queue, localhost_url2W); + todo_wine ok(!ret, "Got error %u.\n", ret); + + closesocket(s); + CloseHandle(ovl.hEvent); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(ret == ERROR_INVALID_HANDLE, "Got error %u.\n", ret); } - handle2 = NULL; - ret = HttpCreateHttpHandle(&handle2, 0); -todo_wine { - ok(!ret, "Unexpected ret value %u.\n", ret); - ok(handle2 != NULL && handle != handle2, "Unexpected handle %p.\n", handle2); + +static void test_v1_completion_port(void) +{ + char DECLSPEC_ALIGN(8) req_buffer[2048], response_buffer[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; + HTTP_RESPONSE_V1 response = {}; + OVERLAPPED ovl, *povl; + HANDLE queue, port; + DWORD ret_size; + ULONG_PTR key; + ULONG ret; + SOCKET s; + + ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Got error %u.\n", ret); + if (ret) return; + + port = CreateIoCompletionPort(queue, NULL, 123, 0); + ok(!!port, "Failed to create completion port, error %u.\n", GetLastError()); + + ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\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); + + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(); + + ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + + ret = send(s, simple_req, strlen(simple_req), 0); + ok(ret == strlen(simple_req), "send() returned %d.\n", ret); + + ret_size = key = 0xdeadbeef; + ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 1000); + ok(ret, "Got error %u.\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); + + ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 0); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\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); + + ret_size = key = 0xdeadbeef; + ret = GetQueuedCompletionStatus(port, &ret_size, &key, &povl, 1000); + ok(ret, "Got error %u.\n", GetLastError()); + ok(povl == &ovl, "OVERLAPPED pointers didn't match.\n"); + ok(key == 123, "Got unexpected key %lu.\n", key); + + ret = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(ret == ret_size, "Expected size %u, got %u.\n", ret_size, ret); + + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\n", ret); + closesocket(s); + CloseHandle(port); + CloseHandle(ovl.hEvent); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); } - b = CloseHandle(handle); -todo_wine - ok(b, "Failed to close queue handle.\n"); + +static void test_v1_multiple_requests(void) +{ + char DECLSPEC_ALIGN(8) req_buffer1[2048], DECLSPEC_ALIGN(8) req_buffer2[2048]; + HTTP_REQUEST_V1 *req1 = (HTTP_REQUEST_V1 *)req_buffer1, *req2 = (HTTP_REQUEST_V1 *)req_buffer2; + HTTP_RESPONSE_V1 response = {}; + struct sockaddr_in sockaddr; + OVERLAPPED ovl1, ovl2; + DWORD ret_size; + SOCKET s1, s2; + HANDLE queue; + ULONG ret; + int len; + + ovl1.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + ovl2.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Got error %u.\n", ret); + if (ret) return; + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + + 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); + 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); + + SetLastError(0xdeadbeef); + ret = GetOverlappedResult(queue, &ovl1, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "Got error %u.\n", GetLastError()); + + s1 = create_client_socket(); + ret = send(s1, simple_req, strlen(simple_req), 0); + ok(ret == strlen(simple_req), "send() returned %d.\n", ret); + + ret = WaitForSingleObject(ovl1.hEvent, 100); + ok(!ret, "Got %u.\n", ret); + ret = WaitForSingleObject(ovl2.hEvent, 100); + ok(ret == WAIT_TIMEOUT, "Got %u.\n", ret); + + s2 = create_client_socket(); + ret = send(s2, simple_req, strlen(simple_req), 0); + ok(ret == strlen(simple_req), "send() returned %d.\n", ret); + + ret = WaitForSingleObject(ovl1.hEvent, 0); + ok(!ret, "Got %u.\n", ret); + ret = WaitForSingleObject(ovl2.hEvent, 100); + ok(!ret, "Got %u.\n", ret); + + len = sizeof(sockaddr); + getsockname(s1, (struct sockaddr *)&sockaddr, &len); + ok(!memcmp(req1->Address.pRemoteAddress, &sockaddr, len), "Client addresses didn't match.\n"); + len = sizeof(sockaddr); + getsockname(s2, (struct sockaddr *)&sockaddr, &len); + ok(!memcmp(req2->Address.pRemoteAddress, &sockaddr, len), "Client addresses didn't match.\n"); + ok(req1->ConnectionId != req2->ConnectionId, + "Expected different connection IDs, but got %s.\n", wine_dbgstr_longlong(req1->ConnectionId)); + ok(req1->RequestId != req2->RequestId, + "Expected different request IDs, but got %s.\n", wine_dbgstr_longlong(req1->RequestId)); + + response.StatusCode = 418; + 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); + ret = HttpSendHttpResponse(queue, req2->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl2, NULL); + ok(!ret, "Got error %u.\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); + 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); + + ret = send(s1, simple_req, strlen(simple_req), 0); + ok(ret == strlen(simple_req), "send() returned %d.\n", ret); + ret = send(s1, simple_req, strlen(simple_req), 0); + ok(ret == strlen(simple_req), "send() returned %d.\n", ret); + + ret = WaitForSingleObject(ovl1.hEvent, 100); + ok(!ret, "Got %u.\n", ret); + ret = WaitForSingleObject(ovl2.hEvent, 100); + ok(ret == WAIT_TIMEOUT, "Got %u.\n", ret); + + ret = HttpSendHttpResponse(queue, req1->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, &ovl1, NULL); + ok(!ret, "Got error %u.\n", ret); + + ret = WaitForSingleObject(ovl2.hEvent, 100); + ok(!ret, "Got %u.\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 = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\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()); +} + +static void test_v1_short_buffer(void) +{ + char DECLSPEC_ALIGN(8) req_buffer[2048], DECLSPEC_ALIGN(8) req_buffer2[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer, *req2 = (HTTP_REQUEST_V1 *)req_buffer2; + HTTP_REQUEST_ID req_id; + OVERLAPPED ovl; + DWORD ret_size; + HANDLE queue; + ULONG ret; + SOCKET s; + + ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Got error %u.\n", ret); + if (ret) return; + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(); + ret = send(s, simple_req, strlen(simple_req), 0); + ok(ret == strlen(simple_req), "send() returned %d.\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); + 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(!!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 */, + "Got major version %u.\n", req->Version.MajorVersion); + ok(!req->BytesReceived || req->BytesReceived == ((ULONGLONG)0xcccccccc << 32 | 0xcccccccc) /* < Vista */, + "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); + + /* 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); + + 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); + + 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(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); + + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\n", ret); + closesocket(s); + CloseHandle(ovl.hEvent); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); +} + +static void test_v1_entity_body(void) +{ + char DECLSPEC_ALIGN(8) req_buffer[4096], response_buffer[2048], req_body[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; + HTTP_RESPONSE_V1 response = {}; + HTTP_DATA_CHUNK chunks[2] = {}; + ULONG ret, chunk_size; + unsigned int i; + DWORD ret_size; + HANDLE queue; + SOCKET s; + + static const char post_req[] = + "POST /xyzzy HTTP/1.1\r\n" + "Host: localhost:50000\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 5\r\n" + "\r\n" + "ping"; + + static const char post_req2[] = + "POST /xyzzy HTTP/1.1\r\n" + "Host: localhost:50000\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 2048\r\n" + "\r\n"; + + for (i = 0; i < sizeof(req_body); ++i) + req_body[i] = i / 111; + + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Got error %u.\n", ret); + if (ret) return; + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(); + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\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 + * HttpReceiveHttpRequest() is called before the kernel has finished + * receiving the entity body. Add a small delay to work around this. */ + Sleep(100); + + 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(req->BytesReceived == sizeof(post_req), "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); + ok(!strcmp(req->Headers.KnownHeaders[HttpHeaderContentLength].pRawValue, "5"), + "Got header value %s.\n", req->Headers.KnownHeaders[HttpHeaderContentLength].pRawValue); + ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); + ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); + + response.StatusCode = 418; + response.pReason = "I'm a teapot"; + response.ReasonLength = 12; + response.EntityChunkCount = ARRAY_SIZE(chunks); + response.pEntityChunks = chunks; + chunks[0].DataChunkType = HttpDataChunkFromMemory; + chunks[0].FromMemory.pBuffer = (void *)"pong"; + chunks[0].FromMemory.BufferLength = 4; + chunks[1].DataChunkType = HttpDataChunkFromMemory; + 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); + + ret = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(ret > 0, "recv() failed.\n"); + if (winetest_debug > 1) + trace("%.*s\n", ret, 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); + + /* 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, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\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); + + 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); + + ret = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(ret > 0, "recv() failed.\n"); + if (winetest_debug > 1) + trace("%.*s\n", ret, 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"); + ok(!strstr(response_buffer, "yesteryear"), "Unexpected Date value.\n"); + ok(!memcmp(response_buffer + ret - 12, "\r\n\r\npongpang", 12), "Response did not end with entity data.\n"); + + /* Test the COPY_BODY flag. */ + + ret = send(s, post_req, sizeof(post_req), 0); + ok(ret == sizeof(post_req), "send() returned %d.\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(req->BytesReceived == sizeof(post_req), "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); + ok(!strcmp(req->Headers.KnownHeaders[HttpHeaderContentLength].pRawValue, "5"), + "Got header value %s.\n", req->Headers.KnownHeaders[HttpHeaderContentLength].pRawValue); + ok(req->EntityChunkCount == 1, "Got %u entity chunks.\n", req->EntityChunkCount); + 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); + ok(!memcmp(req->pEntityChunks[0].FromMemory.pBuffer, "ping", 5), + "Got chunk data '%s'.\n", (char *)req->pEntityChunks[0].FromMemory.pBuffer); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, post_req2, strlen(post_req2), 0); + ok(ret == strlen(post_req2), "send() returned %d.\n", ret); + ret = send(s, req_body, sizeof(req_body), 0); + ok(ret == sizeof(req_body), "send() returned %d.\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(req->BytesReceived == strlen(post_req2) + 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); + ok(!strcmp(req->Headers.KnownHeaders[HttpHeaderContentLength].pRawValue, "2048"), + "Got header value %s.\n", req->Headers.KnownHeaders[HttpHeaderContentLength].pRawValue); + ok(req->EntityChunkCount == 1, "Got %u entity chunks.\n", req->EntityChunkCount); + 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(!memcmp(req->pEntityChunks[0].FromMemory.pBuffer, req_body, chunk_size), "Chunk data didn't match.\n"); + + send_response_v1(queue, req->RequestId, s); + + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\n", ret); + closesocket(s); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); +} + +static void test_v1_bad_request(void) +{ + char response_buffer[2048]; + HANDLE queue; + ULONG ret; + SOCKET s; + + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Got error %u.\n", ret); + if (ret) return; + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(); + ret = send(s, "foo\r\n", strlen("foo\r\n"), 0); + ok(ret == strlen("foo\r\n"), "send() returned %d.\n", ret); + + ret = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(ret > 0, "recv() failed.\n"); + + if (winetest_debug > 1) + trace("%.*s\n", ret, 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); + + WSASetLastError(0xdeadbeef); + ret = recv(s, response_buffer, sizeof(response_buffer), 0); + ok(!ret, "Connection should be shut down.\n"); + ok(!WSAGetLastError(), "Got error %u.\n", WSAGetLastError()); + + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\n", ret); + closesocket(s); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); +} + +static void test_v1_cooked_url(void) +{ + static const WCHAR cooked_urlW[] = {'h','t','t','p',':','/','/', + 'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0','/','f','o','o','b','a','r','?','a','=','b',0}; + + char DECLSPEC_ALIGN(8) req_buffer[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; + DWORD ret_size; + HANDLE queue; + ULONG ret; + SOCKET s; + + static const char req1[] = + "GET /foobar?a=b HTTP/1.1\r\n" + "Host: localhost:50000\r\n" + "Connection: keep-alive\r\n" + "\r\n"; + + static const char req2[] = + "GET http://localhost:50000/ HTTP/1.1\r\n" + "Host: ignored\r\n" + "Connection: keep-alive\r\n" + "\r\n"; + + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Got error %u.\n", ret); + if (ret) return; + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(); + ret = send(s, req1, strlen(req1), 0); + ok(ret == strlen(req1), "send() returned %d.\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(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); + ok(req->CookedUrl.HostLength == 30, "Got host length %u.\n", req->CookedUrl.HostLength); + ok(req->CookedUrl.AbsPathLength == 14, "Got absolute path length %u.\n", req->CookedUrl.AbsPathLength); + ok(req->CookedUrl.QueryStringLength == 8, "Got query string length %u.\n", req->CookedUrl.QueryStringLength); + ok(!wcscmp(req->CookedUrl.pFullUrl, cooked_urlW), + "Got full URL %s.\n", wine_dbgstr_w(req->CookedUrl.pFullUrl)); + ok(req->CookedUrl.pHost == req->CookedUrl.pFullUrl + 7, "Got host %s.\n", wine_dbgstr_w(req->CookedUrl.pHost)); + ok(req->CookedUrl.pAbsPath == req->CookedUrl.pFullUrl + 22, + "Got absolute path %s.\n", wine_dbgstr_w(req->CookedUrl.pAbsPath)); + ok(req->CookedUrl.pQueryString == req->CookedUrl.pFullUrl + 29, + "Got query string %s.\n", wine_dbgstr_w(req->CookedUrl.pQueryString)); + + send_response_v1(queue, req->RequestId, s); + + ret = send(s, req2, strlen(req2), 0); + ok(ret == strlen(req2), "send() returned %d.\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(req->RawUrlLength == 23, "Got raw URL length %u.\n", req->RawUrlLength); + ok(!strcmp(req->pRawUrl, "http://localhost:50000/"), "Got raw URL %s.\n", req->pRawUrl); + ok(req->CookedUrl.FullUrlLength == 46, "Got full URL length %u.\n", req->CookedUrl.FullUrlLength); + ok(req->CookedUrl.HostLength == 30, "Got host length %u.\n", req->CookedUrl.HostLength); + ok(req->CookedUrl.AbsPathLength == 2, "Got absolute path length %u.\n", req->CookedUrl.AbsPathLength); + ok(!req->CookedUrl.QueryStringLength, "Got query string length %u.\n", req->CookedUrl.QueryStringLength); + ok(!wcscmp(req->CookedUrl.pFullUrl, localhost_urlW), + "Got full URL %s.\n", wine_dbgstr_w(req->CookedUrl.pFullUrl)); + ok(req->CookedUrl.pHost == req->CookedUrl.pFullUrl + 7, "Got host %s.\n", wine_dbgstr_w(req->CookedUrl.pHost)); + ok(req->CookedUrl.pAbsPath == req->CookedUrl.pFullUrl + 22, + "Got absolute path %s.\n", wine_dbgstr_w(req->CookedUrl.pAbsPath)); + ok(!req->CookedUrl.pQueryString, "Got query string %s.\n", wine_dbgstr_w(req->CookedUrl.pQueryString)); + + send_response_v1(queue, req->RequestId, s); + + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\n", ret); + closesocket(s); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); +} + +static void test_v1_unknown_tokens(void) +{ + char DECLSPEC_ALIGN(8) req_buffer[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; + DWORD ret_size; + HANDLE queue; + ULONG ret; + SOCKET s; + + static const char req1[] = + "xyzzy / HTTP/1.1\r\n" + "Host: localhost:50000\r\n" + "Connection: keep-alive\r\n" + "Qux: foo baz \r\n" + "\r\n"; + + ret = HttpCreateHttpHandle(&queue, 0); + todo_wine ok(!ret, "Got error %u.\n", ret); + if (ret) return; + ret = HttpAddUrl(queue, localhost_urlW, NULL); + ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(); + ret = send(s, req1, strlen(req1), 0); + ok(ret == strlen(req1), "send() returned %d.\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(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); + ok(req->Headers.UnknownHeaderCount == 1, "Got %u unknown headers.\n", req->Headers.UnknownHeaderCount); + ok(req->Headers.pUnknownHeaders[0].NameLength == 3, "Got name length %u.\n", + req->Headers.pUnknownHeaders[0].NameLength); + ok(!strcmp(req->Headers.pUnknownHeaders[0].pName, "Qux"), "Got name %s.\n", + req->Headers.pUnknownHeaders[0].pName); + ok(req->Headers.pUnknownHeaders[0].RawValueLength == 7, "Got value length %u.\n", + req->Headers.pUnknownHeaders[0].RawValueLength); + ok(!strcmp(req->Headers.pUnknownHeaders[0].pRawValue, "foo baz"), "Got value %s.\n", + req->Headers.pUnknownHeaders[0].pRawValue); + + ret = HttpRemoveUrl(queue, localhost_urlW); + ok(!ret, "Got error %u.\n", ret); + closesocket(s); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); } static void test_HttpCreateServerSession(void) @@ -184,14 +988,24 @@ static void test_HttpCreateUrlGroup(void) START_TEST(httpapi) { HTTPAPI_VERSION version = { 1, 0 }; + WSADATA wsadata; ULONG ret; init(); + WSAStartup(MAKEWORD(1,1), &wsadata); + ret = HttpInitialize(version, HTTP_INITIALIZE_SERVER, NULL); ok(!ret, "Failed to initialize library, ret %u.\n", ret); - test_HttpCreateHttpHandle(); + test_v1_server(); + test_v1_completion_port(); + test_v1_multiple_requests(); + test_v1_short_buffer(); + test_v1_entity_body(); + test_v1_bad_request(); + test_v1_cooked_url(); + test_v1_unknown_tokens(); test_HttpCreateServerSession(); test_HttpCreateUrlGroup(); -- 2.22.0

1 0

[PATCH] testbot: Fix the "no snapshot" case in BackupVM.
by Francois Gouget 20 Aug '19

20 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/BackupVM | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index 2cf3320d..071d4afa 100755 --- a/testbot/scripts/BackupVM +++ b/testbot/scripts/BackupVM @@ -213,6 +213,8 @@ if [ -n "$opt_snapshot" -a "$snapshots" = "/$snapdir/$opt_vm/*.xml" ] then error "the '$opt_vm' VM does not seem to have snapshots! Use --no-snapshot if this is expected." exit 2 +else + snapshots="" fi # Backup the symbolic links but also their targets! -- 2.20.1

2 1

[PATCH 1/2] msctf/tests: Add multi-threaded apartment test for ITfSource_AdviseSink
by Rémi Bernon 20 Aug '19

20 Aug '19

We expect it to fail because the ITfUIElementSink interface is flagged as "local" and cannot be marshalled, and because ITfThreadMgr is flagged with "threading(apartment)" and cannot be instanciated in the MTA. Note: The real purpose of the test is to reproduce an unwinding issue that has nothing to do with msctf or ole, but that is triggered by this specific code with WINEDEBUG=-all. --- dlls/msctf/tests/inputprocessor.c | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d73a3f94510..1222085fe0a 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2511,6 +2511,53 @@ static void test_profile_mgr(void) ITfInputProcessorProfileMgr_Release(ipp_mgr); } +static DWORD WINAPI test_MultiThreadApartment_Thread(void *param) { + ITfThreadMgrEx *thmgr; + ITfSource *source; + DWORD cookie; + HRESULT hr; + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(SUCCEEDED(hr), "Failed to initialize multi-threaded apartment\n"); + + hr = CoCreateInstance(&CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ITfThreadMgrEx, (LPVOID *)&thmgr); + ok(SUCCEEDED(hr), "Failed to create ITfThreadMgrEx instance\n"); + + hr = ITfThreadMgrEx_QueryInterface(thmgr, &IID_ITfSource, (LPVOID *)&source); + ok(SUCCEEDED(hr), "Failed to query ITfSource interface\n"); + + hr = ITfSource_AdviseSink(source, &IID_ITfUIElementSink, (IUnknown*)&TfUIElementSink, &cookie); + ok(hr == REGDB_E_IIDNOTREG /* native */ || hr == E_NOINTERFACE /* wine */, + "Advise ITfUIElementSink should return marshalling failure: %08x\n", hr); + + hr = ITfSource_Release(source); + ok(SUCCEEDED(hr), "Failed to Release source\n"); + + hr = ITfThreadMgrEx_Release(thmgr); + ok(SUCCEEDED(hr), "Failed to Release thread manager\n"); + + CoUninitialize(); + + return 0xdeadcafe; +} + +static void test_MultiThreadApartment(void) +{ + DWORD ret; + HANDLE thread; + + thread = CreateThread(0, 0, test_MultiThreadApartment_Thread, 0, 0, 0); + ok(thread != NULL, "Failed to create test thread\n"); + + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread completion\n"); + + GetExitCodeThread(thread, &ret); + ok(ret == 0xdeadcafe, "Thread terminated in an unexpected way\n"); + + CloseHandle(thread); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -2540,6 +2587,7 @@ START_TEST(inputprocessor) test_UnregisterCategory(); test_Unregister(); test_profile_mgr(); + test_MultiThreadApartment(); ITextStoreACPSink_Release(ACPSink); ITfDocumentMgr_Release(g_dm); -- 2.23.0.rc1

1 3

[PATCH v3] cmd.exe: Change parsing of the if command to avoid parsing the operators.
by Bernhard Übelacker 20 Aug '19

20 Aug '19

Found while trying to look into #44236. A batch script is executed containing a line like this: if (%1)==(p) start /W " " "%SFDIR%WSFplot" wr2300.t35 3 This returns an error like this: Syntax error Can't recognize 'p' as an internal or external command, or batch script. It looks like native does handle the brackets differently when contained inside the condition part of the if command. Therefore this patch tries to skip the parsing in WCMD_ReadAndParseLine of that part. Therefore it moves most of the content of WCMD_if into a helper and calls that to estimate how long the condition part is. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44338 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- History: v0: Some comments in bug tracker by Vijay Kamuju. v1: https://www.winehq.org/pipermail/wine-devel/2018-January/121764.html (Received no comments.) v2: * Rebased to wine 3.13. * Removed --- in commit message making patchwatcher ignoring Signed-off-by line. v3: * Rebased to wine 4.14. --- programs/cmd/builtins.c | 79 ++++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 20 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++ programs/cmd/wcmd.h | 2 + programs/cmd/wcmdmain.c | 30 +++++++-- 5 files changed, 98 insertions(+), 37 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cd5f744a27..a1952e8024 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2837,25 +2837,9 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato return -1; } -/**************************************************************************** - * WCMD_if - * - * Batch file conditional. - * - * On entry, cmdlist will point to command containing the IF, and optionally - * the first command to execute (if brackets not found) - * If &&'s were found, this may be followed by a record flagged as isAmpersand - * If ('s were found, execute all within that bracket - * Command may optionally be followed by an ELSE - need to skip instructions - * in the else using the same logic - * - * FIXME: Much more syntax checking needed! - */ -void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) { - int negate; /* Negate condition */ - int test; /* Condition evaluation result */ - WCHAR condition[MAX_PATH], *command; + WCHAR condition[MAX_PATH]; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; static const WCHAR existW[] = {'e','x','i','s','t','\0'}; @@ -2863,43 +2847,43 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) static const WCHAR parmI[] = {'/','I','\0'}; int caseInsensitive = (wcsstr(quals, parmI) != NULL); - negate = !lstrcmpiW(param1,notW); - lstrcpyW(condition, (negate ? param2 : param1)); + *negate = !lstrcmpiW(param1,notW); + lstrcpyW(condition, (*negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); + WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); WCHAR *endptr; long int param_int = wcstol(param, &endptr, 10); if (*endptr) goto syntax_err; - test = ((long int)errorlevel >= param_int); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + *test = ((long int)errorlevel >= param_int); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, existW)) { WIN32_FIND_DATAW fd; HANDLE hff; - WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); + WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); int len = lstrlenW(param); /* FindFirstFile does not like a directory path ending in '\', append a '.' */ if (len && param[len-1] == '\\') lstrcatW(param, dotW); hff = FindFirstFileW(param, &fd); - test = (hff != INVALID_HANDLE_VALUE ); - if (test) FindClose(hff); + *test = (hff != INVALID_HANDLE_VALUE ); + if (*test) FindClose(hff); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, defdW)) { - test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), + *test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE), NULL, 0) > 0); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else { /* comparison operation */ WCHAR leftOperand[MAXSTRING], rightOperand[MAXSTRING], operator[MAXSTRING]; WCHAR *paramStart; - lstrcpyW(leftOperand, WCMD_parameter(p, negate+caseInsensitive, &paramStart, TRUE, FALSE)); + lstrcpyW(leftOperand, WCMD_parameter(p, (*negate)+caseInsensitive, &paramStart, TRUE, FALSE)); if (!*leftOperand) goto syntax_err; @@ -2920,14 +2904,43 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) if (!*rightOperand) goto syntax_err; - test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); - if (test == -1) + *test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); + if (*test == -1) goto syntax_err; p = paramStart + lstrlenW(rightOperand); - WCMD_parameter(p, 0, &command, FALSE, FALSE); + WCMD_parameter(p, 0, command, FALSE, FALSE); } + return 1; + +syntax_err: + return -1; +} + +/**************************************************************************** + * WCMD_if + * + * Batch file conditional. + * + * On entry, cmdlist will point to command containing the IF, and optionally + * the first command to execute (if brackets not found) + * If &&'s were found, this may be followed by a record flagged as isAmpersand + * If ('s were found, execute all within that bracket + * Command may optionally be followed by an ELSE - need to skip instructions + * in the else using the same logic + * + * FIXME: Much more syntax checking needed! + */ +void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +{ + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *command; + + if (evaluate_if_condition(p, &command, &test, &negate) == -1) + goto syntax_err; + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a992cda480..4bf37a35bb 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -993,6 +993,26 @@ if "x" == "a" ( if "y" == "b" echo broken2 echo expected post-embedded if ) +if ()==() ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if 1(==1( ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if )==) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if /i not (a)==(b) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 488c8e6fd8..5bcd29b917 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -695,6 +695,10 @@ else if seems to work else if seems to work expected1 expected post-embedded if +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 12c878c3c9..3e99a0d203 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -150,6 +150,8 @@ static inline BOOL ends_with_backslash( const WCHAR *path ) return path[0] && path[lstrlenW(path) - 1] == '\\'; } +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate); + /* Data structure to hold context when executing batch files */ typedef struct _BATCH_CONTEXT { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d7c0ce13fe..8a68c0c2df 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1943,13 +1943,35 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this is only true in the command portion of the IF statement, but this - should suffice for now - FIXME: Silly syntax like "if 1(==1( ( - echo they equal - )" will be parsed wrong */ + should suffice for now. + To be able to handle ('s in the condition part take as much as evaluate_if_condition + would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { + static const WCHAR parmI[] = {'/','I','\0'}; + static const WCHAR notW[] = {'n','o','t','\0'}; + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *p, *command; + inIf = TRUE; + p = curPos+(ARRAY_SIZE(ifCmd)); + while (*p == ' ' || *p == '\t') { + p++; + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) + p += lstrlenW(notW); + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) + p += lstrlenW(parmI); + } + + if (evaluate_if_condition(p, &command, &test, &negate) != -1) + { + int if_condition_len = command - curPos; + memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); + (*curLen)+=if_condition_len; + curPos+=if_condition_len; + } + } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { const int keyw_len = ARRAY_SIZE(ifElse) + 1; inElse = TRUE; -- 2.20.1

1 0

Bugs 47633, 47649
by Paul Gofman 20 Aug '19

20 Aug '19

Latest commits brought some extra DECLSPEC_HOTPATCH attributes to a few kernelbase.dll (former kernel32.dll) functions, which have triggered gcc bug (see [1], [2]). The bug is not triggered when -fPIC is used, or if optimization is disabled. It looks like the bug is triggered mostly in the stub functions which have just WARN or FIXME, those functions which have some other code inside look ok (though I did not check them all). I know that tweaks which workaround compiler issues are not welcome in Wine. But in the present case it is likely going to be a massive regression, as the problem affects, e. g., native .Net (at least 4.0 for me) which is crashing after the second call to SetThreadStackGuarantee(), and likely much more. This is probably going to be long standing issue, as even after the bug is fixed upstream the fix is yet to come to mingw-w64 gcc versions used in Wine builds across distributions. In the view of that, maybe it worth considering some temporary solution? E. g., adding __attribute__((optimize(0))) to DECLSPEC_HOTPATCH can workaround the problem. 1. https://bugs.winehq.org/show_bug.cgi?id=47633#c4 2. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91489

2 1

[PATCH] iphlpapi: restore spaces after 65549c5e58d42b4736bb47251030a6f6d0c0a66a.
by Serge Gautherie 20 Aug '19

20 Aug '19

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/iphlpapi/icmp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 0dc2f12..da43682 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -445,7 +445,7 @@ DWORD WINAPI IcmpSendEcho( case ICMP_UNREACH_ISOLATED: #endif #ifdef ICMP_UNREACH_HOST_PROHIB - case ICMP_UNREACH_HOST_PROHIB: + case ICMP_UNREACH_HOST_PROHIB: #endif #ifdef ICMP_UNREACH_TOSHOST case ICMP_UNREACH_TOSHOST: @@ -485,9 +485,9 @@ DWORD WINAPI IcmpSendEcho( rep_ip_header=(struct ip*)(((char*)icmp_header)+ICMP_MINLEN); rep_icmp_header=(struct icmp*)(((char*)rep_ip_header)+(rep_ip_header->ip_hl << 2)); - /* Make sure that this is really a reply to our packet */ + /* Make sure that this is really a reply to our packet */ if (ip_header_len+ICMP_MINLEN+(rep_ip_header->ip_hl << 2)+ICMP_MINLEN>ip_header->ip_len) { - ier->Status=IP_REQ_TIMED_OUT; + ier->Status=IP_REQ_TIMED_OUT; } else if ((rep_icmp_header->icmp_type!=ICMP_ECHO) || (rep_icmp_header->icmp_code!=0) || (rep_icmp_header->icmp_id!=id) || @@ -503,11 +503,11 @@ DWORD WINAPI IcmpSendEcho( TRACE("expected type,code=8,0 id,seq=%d,%d cksum=%d\n", id,seq, cksum); - ier->Status=IP_REQ_TIMED_OUT; - } + ier->Status=IP_REQ_TIMED_OUT; + } } - } - } + } + } if (ier->Status==IP_REQ_TIMED_OUT) { /* This packet was not for us. -- 2.10.0.windows.1

1 0

[PATCH] iphlpapi: restore spaces after 65549c5e58d42b4736bb47251030a6f6d0c0a66a.
by Serge Gautherie 20 Aug '19

20 Aug '19

--- dlls/iphlpapi/icmp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 0dc2f12..da43682 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -445,7 +445,7 @@ DWORD WINAPI IcmpSendEcho( case ICMP_UNREACH_ISOLATED: #endif #ifdef ICMP_UNREACH_HOST_PROHIB - case ICMP_UNREACH_HOST_PROHIB: + case ICMP_UNREACH_HOST_PROHIB: #endif #ifdef ICMP_UNREACH_TOSHOST case ICMP_UNREACH_TOSHOST: @@ -485,9 +485,9 @@ DWORD WINAPI IcmpSendEcho( rep_ip_header=(struct ip*)(((char*)icmp_header)+ICMP_MINLEN); rep_icmp_header=(struct icmp*)(((char*)rep_ip_header)+(rep_ip_header->ip_hl << 2)); - /* Make sure that this is really a reply to our packet */ + /* Make sure that this is really a reply to our packet */ if (ip_header_len+ICMP_MINLEN+(rep_ip_header->ip_hl << 2)+ICMP_MINLEN>ip_header->ip_len) { - ier->Status=IP_REQ_TIMED_OUT; + ier->Status=IP_REQ_TIMED_OUT; } else if ((rep_icmp_header->icmp_type!=ICMP_ECHO) || (rep_icmp_header->icmp_code!=0) || (rep_icmp_header->icmp_id!=id) || @@ -503,11 +503,11 @@ DWORD WINAPI IcmpSendEcho( TRACE("expected type,code=8,0 id,seq=%d,%d cksum=%d\n", id,seq, cksum); - ier->Status=IP_REQ_TIMED_OUT; - } + ier->Status=IP_REQ_TIMED_OUT; + } } - } - } + } + } if (ier->Status==IP_REQ_TIMED_OUT) { /* This packet was not for us. -- 2.10.0.windows.1

1 0

cmd.exe: Command type with multiple files should print filenames to stderr.
by Bernhard Übelacker 20 Aug '19

20 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46983 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 10 +++++++++- programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 62ae19a494..cd5f744a27 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4561,8 +4561,8 @@ void WCMD_type (WCHAR *args) { errorlevel = 1; } else { if (writeHeaders) { - static const WCHAR fmt[] = {'\n','%','1','\n','\n','\0'}; - WCMD_output(fmt, thisArg); + static const WCHAR fmt[] = {'\n','%','1','\n','\n','\n','\0'}; + WCMD_output_stderr(fmt, thisArg); } while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f4dfc9f26d..a992cda480 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -875,7 +875,15 @@ type ."\foobaz" echo ---2 type ".\foobaz" echo ---3 -del foobaz +echo foo> foobay +echo ---4 +type foobaz foobay > foobax 2> foobaw +echo ---5 +type foobax +echo ---6 +type foobaw +echo ---7 +del foobaz foobay foobax foobaw echo ------------ Testing NUL ------------ md foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d78d91a6cf..488c8e6fd8 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -659,6 +659,20 @@ bar ---2 bar ---3 +---4 +---5 +bar +foo +---6 + +foobaz + + + +foobay + + +---7 ------------ Testing NUL ------------ bar bar -- 2.20.1

1 0

[PATCH 1/2] api-ms-win-crt-private-l1-1-0: Add more functions for Star Citizen 3.6.1
by Benedikt Bär 20 Aug '19

20 Aug '19

This patch adds some missing functions that prevent Star Citizen from crashing. Signed-off-by: Benedikt Bär <beniwtv(a)relamp.tk> --- .../api-ms-win-crt-private-l1-1-0.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d496889397..1d5e2f84c8 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -840,7 +840,7 @@ @ stub _o__wfullpath @ stub _o__wgetcwd @ stub _o__wgetdcwd -@ stub _o__wgetenv +@ cdecl _o__wgetenv(wstr) ucrtbase._o__wgetenv @ stub _o__wgetenv_s @ stub _o__wmakepath @ stub _o__wmakepath_s @@ -857,7 +857,7 @@ @ stub _o__wrmdir @ stub _o__wsearchenv @ stub _o__wsearchenv_s -@ stub _o__wsetlocale +@ cdecl _o__wsetlocale(long wstr) ucrtbase._o__wsetlocale @ stub _o__wsopen_dispatch @ stub _o__wsopen_s @ stub _o__wspawnv @@ -913,7 +913,7 @@ @ stub _o_atanhf @ stub _o_atanhl @ cdecl _o_atof(str) ucrtbase._o_atof -@ stub _o_atoi +@ cdecl _o_atoi(str) ucrtbase._o_atoi @ stub _o_atol @ stub _o_atoll @ stub _o_bsearch @@ -922,7 +922,7 @@ @ cdecl _o_calloc(long long) ucrtbase._o_calloc @ stub _o_cbrt @ stub _o_cbrtf -@ stub _o_ceil +@ cdecl _o_ceil(double) ucrtbase._o_ceil @ stub _o_ceilf @ stub _o_clearerr @ stub _o_clearerr_s @@ -952,7 +952,7 @@ @ stub _o_fgets @ stub _o_fgetwc @ stub _o_fgetws -@ stub _o_floor +@ cdecl _o_floor(double) ucrtbase._o_floor @ stub _o_floorf @ stub _o_fma @ stub _o_fmaf -- 2.22.0

2 3

[PATCH] winetest: Tweak dissect to better match the TestBot WineTest log parser.
by Francois Gouget 20 Aug '19

20 Aug '19

This puts exception handling in the same relative spot, making it easier to compare the two codebases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index a468812f..c95d628f 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -603,21 +603,6 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or - ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) - { - my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) - { - # This also replaces a test summary line. - $pids{$l_pid || 0} = 1; - $s_failures++; - } - add_test_line("failed", escapeHTML($line)); - check_unit($l_unit, "unhandled exception"); - $failures++; - } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) @@ -658,6 +643,21 @@ while ($line = <IN>) { get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); } + elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + ($unit ne "" and + $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + { + my ($l_pid, $l_unit) = ($1, $2); + if ($l_unit eq $unit) + { + # This also replaces a test summary line. + $pids{$l_pid || 0} = 1; + $s_failures++; + } + add_test_line("failed", escapeHTML($line)); + check_unit($l_unit, "unhandled exception"); + $failures++; + } elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($unit ne "" and $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) -- 2.20.1

1 0