February 2022 - Wine-Devel - list.winehq.org

[PATCH] httpapi/tests: Build without -DWINE_NO_LONG_TYPES.
by Zebediah Figura Feb. 28, 2022

Feb. 28, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/httpapi/tests/Makefile.in | 1 - dlls/httpapi/tests/httpapi.c | 181 ++++++++++++++++----------------- 2 files changed, 89 insertions(+), 93 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..be1d31c12ad 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; } @@ -101,7 +101,7 @@ static unsigned short add_url_v1(HANDLE queue) { unsigned short port; WCHAR url[50]; - ULONG ret; + int ret; for (port = 50000; port < 51000; ++port) { @@ -114,11 +114,11 @@ static unsigned short add_url_v1(HANDLE queue) return 0; } -static ULONG add_url_v2(HTTP_URL_GROUP_ID group) +static unsigned short add_url_v2(HTTP_URL_GROUP_ID group) { unsigned short port; WCHAR url[50]; - ULONG ret; + int ret; for (port = 50010; port < 51000; ++port) { @@ -158,9 +158,8 @@ static void test_v1_server(void) OVERLAPPED ovl; DWORD ret_size; WCHAR url[50]; - ULONG ret; + int ret, len; SOCKET s; - int len; ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); memset(req_buffer, 0xcc, sizeof(req_buffer)); @@ -179,7 +178,7 @@ static void test_v1_server(void) ok(!ret, "Unexpected ret value %u.\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); @@ -194,7 +193,7 @@ 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()); ret = HttpAddUrl(NULL, L"http://localhost:50000/", NULL); ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_INVALID_PARAMETER /* < Vista */, "Got error %u.\n", ret); @@ -223,15 +222,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); 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 +239,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 +264,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) @@ -317,10 +316,10 @@ static void test_v1_server(void) 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()); + 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); + ok(ret == ret_size, "Expected size %lu, got %u.\n", ret_size, ret); if (winetest_debug > 1) trace("%.*s\n", ret, response_buffer); @@ -347,20 +346,20 @@ static void test_v1_server(void) ok(ret == ERROR_IO_PENDING, "Got error %u.\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); 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); @@ -377,8 +376,8 @@ static void test_v1_completion_port(void) char req_text[200]; DWORD ret_size; ULONG_PTR key; - ULONG ret; SOCKET s; + int ret; ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -386,11 +385,11 @@ static void test_v1_completion_port(void) ok(!ret, "Got error %u.\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); @@ -400,7 +399,7 @@ static void test_v1_completion_port(void) 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); @@ -408,14 +407,14 @@ static void test_v1_completion_port(void) 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"; @@ -425,12 +424,12 @@ static void test_v1_completion_port(void) 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 %u.\n", ret_size, ret); ret = remove_url_v1(queue, tcp_port); ok(!ret, "Got error %u.\n", ret); @@ -438,7 +437,7 @@ static void test_v1_completion_port(void) 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) @@ -454,8 +453,7 @@ static void test_v1_multiple_requests(void) DWORD ret_size; SOCKET s1, s2; HANDLE queue; - ULONG ret; - int len; + int ret, len; ovl1.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); ovl2.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -472,7 +470,7 @@ static void test_v1_multiple_requests(void) 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); @@ -545,7 +543,7 @@ static void test_v1_multiple_requests(void) 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) @@ -559,8 +557,8 @@ static void test_v1_short_buffer(void) OVERLAPPED ovl; DWORD ret_size; HANDLE queue; - ULONG ret; SOCKET s; + int ret; ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -578,7 +576,7 @@ static void test_v1_short_buffer(void) 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(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 */, @@ -608,7 +606,7 @@ static void test_v1_short_buffer(void) 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) @@ -617,8 +615,8 @@ static void test_v1_entity_body(void) HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; HTTP_RESPONSE_V1 response = {}; HTTP_DATA_CHUNK chunks[2] = {}; - ULONG ret, chunk_size; unsigned short port; + int ret, chunk_size; char req_text[200]; unsigned int i; OVERLAPPED ovl; @@ -664,8 +662,8 @@ 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_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); @@ -737,8 +735,8 @@ static void test_v1_entity_body(void) 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_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 +746,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); @@ -765,8 +763,8 @@ static void test_v1_entity_body(void) 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_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); @@ -803,13 +801,13 @@ static void test_v1_entity_body(void) 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_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_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %lu.\n", ret_size); send_response_v1(queue, req->RequestId, s); @@ -827,19 +825,19 @@ static void test_v1_entity_body(void) 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_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_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_size == 0xdeadbeef || !ret_size /* Win10+ */, "Got size %lu.\n", ret_size); send_response_v1(queue, req->RequestId, s); @@ -855,8 +853,8 @@ static void test_v1_entity_body(void) ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), NULL, &ovl); ok(!ret || ret == ERROR_IO_PENDING, "Got error %u.\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); @@ -888,15 +886,15 @@ static void test_v1_entity_body(void) 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_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_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); @@ -906,7 +904,7 @@ static void test_v1_entity_body(void) ok(!ret, "Got error %u.\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) @@ -914,8 +912,8 @@ static void test_v1_bad_request(void) char response_buffer[2048]; unsigned short port; HANDLE queue; - ULONG ret; SOCKET s; + int ret; ret = HttpCreateHttpHandle(&queue, 0); ok(!ret, "Got error %u.\n", ret); @@ -946,7 +944,7 @@ static void test_v1_bad_request(void) ok(!ret, "Got error %u.\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) @@ -958,8 +956,8 @@ static void test_v1_cooked_url(void) WCHAR expectW[50]; DWORD ret_size; HANDLE queue; - ULONG ret; SOCKET s; + int ret; static const char req1[] = "GET /foobar?a=b HTTP/1.1\r\n" @@ -985,7 +983,7 @@ static void test_v1_cooked_url(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(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); @@ -1010,7 +1008,7 @@ static void test_v1_cooked_url(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(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); @@ -1032,7 +1030,7 @@ static void test_v1_cooked_url(void) ok(!ret, "Got error %u.\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) @@ -1043,8 +1041,8 @@ static void test_v1_unknown_tokens(void) char req_text[200]; DWORD ret_size; HANDLE queue; - ULONG ret; SOCKET s; + int ret; static const char req1[] = "xyzzy / HTTP/1.1\r\n" @@ -1082,7 +1080,7 @@ static void test_v1_unknown_tokens(void) ok(!ret, "Got error %u.\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) @@ -1094,8 +1092,8 @@ static void test_v1_urls(void) DWORD ret_size; WCHAR url[50]; HANDLE queue; - ULONG ret; SOCKET s; + int ret; ret = HttpCreateHttpHandle(&queue, 0); ok(!ret, "Got error %u.\n", ret); @@ -1124,7 +1122,7 @@ static void test_v1_urls(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(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); send_response_v1(queue, req->RequestId, s); @@ -1132,14 +1130,14 @@ static void test_v1_urls(void) ok(!ret, "Got error %u.\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) { HTTP_SERVER_SESSION_ID session; HTTPAPI_VERSION version; - ULONG ret; + int ret; version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; @@ -1179,7 +1177,7 @@ static void test_HttpCreateUrlGroup(void) HTTP_SERVER_SESSION_ID session; HTTP_URL_GROUP_ID group_id; HTTPAPI_VERSION version; - ULONG ret; + int ret; group_id = 1; ret = pHttpCreateUrlGroup(0, &group_id, 0); @@ -1238,9 +1236,8 @@ static void test_v2_server(void) DWORD ret_size; WCHAR url[50]; HANDLE queue; - ULONG ret; + int ret, len; SOCKET s; - int len; ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); memset(req_buffer, 0xcc, sizeof(req_buffer)); @@ -1266,7 +1263,7 @@ 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()); port = add_url_v2(group); @@ -1294,7 +1291,7 @@ 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); @@ -1306,10 +1303,10 @@ static void test_v2_server(void) 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 +1332,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) @@ -1388,10 +1385,10 @@ static void test_v2_server(void) 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()); + 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); + ok(ret == ret_size, "Expected size %lu, got %u.\n", ret_size, ret); if (winetest_debug > 1) trace("%.*s\n", ret, response_buffer); @@ -1433,8 +1430,8 @@ static void test_v2_completion_port(void) char req_text[100]; DWORD ret_size; ULONG_PTR key; - ULONG ret; SOCKET s; + int ret; ovl.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -1450,11 +1447,11 @@ static void test_v2_completion_port(void) ok(!ret, "Failed to bind request queue, error %u.\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); @@ -1464,7 +1461,7 @@ static void test_v2_completion_port(void) 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); @@ -1472,14 +1469,14 @@ static void test_v2_completion_port(void) 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"; @@ -1489,12 +1486,12 @@ static void test_v2_completion_port(void) 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 %u.\n", ret_size, ret); ret = remove_url_v2(group, tcp_port); ok(!ret, "Got error %u.\n", ret); @@ -1513,7 +1510,7 @@ START_TEST(httpapi) { HTTPAPI_VERSION version = { 1, 0 }; WSADATA wsadata; - ULONG ret; + int ret; init(); -- 2.35.1

1 0

[PATCH v4 1/9] kernel32: Implement CreateBoundaryDescriptorA.
by Mohamad Al-Jaf Feb. 28, 2022

Feb. 28, 2022

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v4: - Don't use static sized buffer. --- dlls/kernel32/Makefile.in | 1 + dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/security.c | 53 +++++++++++++++++++++++++++++++++++++ include/namespaceapi.h | 2 ++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 dlls/kernel32/security.c diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 7e68a950b71..bda8d03e90c 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -23,6 +23,7 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ + security.c \ sync.c \ tape.c \ thread.c \ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 818e7d87a2f..cb994a8ce19 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -266,7 +266,7 @@ @ stdcall CopyLZFile(long long) LZCopy @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) -# @ stub CreateBoundaryDescriptorA +@ stdcall CreateBoundaryDescriptorA(str long) @ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) diff --git a/dlls/kernel32/security.c b/dlls/kernel32/security.c new file mode 100644 index 00000000000..dc8c8e58d7d --- /dev/null +++ b/dlls/kernel32/security.c @@ -0,0 +1,53 @@ +/* + * Win32 security functions + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(security); + +/****************************************************************************** + * CreateBoundaryDescriptorA (KERNEL32.@) + */ +HANDLE WINAPI CreateBoundaryDescriptorA( LPCSTR name, ULONG flags ) +{ + DWORD len; + HANDLE ret; + LPWSTR str = NULL; + + TRACE( "%s %d\n", debugstr_a(name), flags ); + + if(name) + { + len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + str = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, name, -1, str, len ); + } + + ret = CreateBoundaryDescriptorW( str, flags ); + + HeapFree( GetProcessHeap(), 0, str ); + return ret; +} diff --git a/include/namespaceapi.h b/include/namespaceapi.h index 9446806f82e..f219a2a7488 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -27,7 +27,9 @@ extern "C" { WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorA(LPCSTR,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +#define CreateBoundaryDescriptor WINELIB_NAME_AW(CreateBoundaryDescriptor) WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); -- 2.35.1

2 10

[PATCH v2 1/4] d3d10/tests: Add tests for Direct3D 10 shader reflection interfaces.
by Zebediah Figura Feb. 28, 2022

Feb. 28, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/reflection.c | 29 +++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 9c8247790c5..3d969291bba 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -53,7 +53,6 @@ static DWORD shader_creator[] = { 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, }; -#if D3D_COMPILER_VERSION /* * fxc.exe /E VS /Tvs_4_0 /Fx */ @@ -81,6 +80,7 @@ static DWORD test_reflection_blob[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; +#if D3D_COMPILER_VERSION static void test_reflection_references(void) { ID3D11ShaderReflection *ref11, *ref11_test; @@ -212,6 +212,31 @@ static void test_reflection_interfaces(void) count = ref11->lpVtbl->Release(ref11); ok(!count, "Got unexpected ref count %lu.\n", count); } +#else +static void test_d3d10_interfaces(void) +{ + ID3D10ShaderReflection *ref10; + IUnknown *unk; + HRESULT hr; + + hr = D3D10ReflectShader(test_reflection_blob, sizeof(test_reflection_blob), &ref10); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D10ShaderReflection, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D10ShaderReflection1, (void **)&unk); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D11ShaderReflection, (void **)&unk); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + + hr = ref10->lpVtbl->QueryInterface(ref10, &IID_ID3D12ShaderReflection, (void **)&unk); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + + ref10->lpVtbl->Release(ref10); +} #endif /* @@ -2125,6 +2150,8 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); test_reflection_interfaces(); +#else + test_d3d10_interfaces(); #endif test_reflection_desc_vs(); test_reflection_desc_ps(); -- 2.35.1

1 3

[PATCH v2 0/6] Supporting filename completion in cmd.exe
by Eric Pouech Feb. 28, 2022

Feb. 28, 2022

This serie implements: - filename completion in cmd - CONSOLE_READCONSOLE_CONTROL parameter in ReadConsoleW v1 -> v2: + added tests in conhost for that (Jacek: thanks for warning, but it's a real pain ;-) + minor updates thanks to the tests Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (6): kernelbase/console, programs/conhost: support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW dlls/kernelbase, programs/conhost: return key state in ReadConsoleW with control programs/conhost: handle csi escape sequence for shift tab programs/conhost/tests: added tests for shift-tab processing programs/conhost/tests: add tests for ReadConsoleW with control programs/cmd: implement filename completion dlls/kernelbase/console.c | 36 ++++- include/wine/condrv.h | 1 + programs/cmd/batch.c | 252 ++++++++++++++++++++++++++++++++++- programs/conhost/conhost.c | 120 +++++++++++++---- programs/conhost/conhost.h | 2 + programs/conhost/tests/tty.c | 192 ++++++++++++++++++++++++-- server/console.c | 1 + 7 files changed, 564 insertions(+), 40 deletions(-)

3 15

None
by dravion＠mail.de Feb. 28, 2022

Feb. 28, 2022

unsubscribe

1 0

[PATCH] win32u: Fix NtUserCallHooks return value.
by Alexandros Frantzis Feb. 28, 2022

Feb. 28, 2022

Return the actual result value of NtUserCallHooks invocations, which also fixes an inadvertent switch statement case fallthrough. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/sysparams.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b5d82748c71..cd4ff91255e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4582,7 +4582,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallHooks: { const struct win_hook_params *params = (struct win_hook_params *)arg; - call_hooks( params->id, params->code, params->wparam, params->lparam, params->next_unicode ); + return call_hooks( params->id, params->code, params->wparam, params->lparam, + params->next_unicode ); } case NtUserFlushWindowSurfaces: flush_window_surfaces( arg ); -- 2.34.1

3 2

[PATCH v2] wusa: Support additional expressions.
by Hans Leidekker Feb. 28, 2022

Feb. 28, 2022

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> v2: Avoid goto statements. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/Makefile.in | 2 +- programs/wusa/main.c | 52 +++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index c512d3e63db..9f220fca277 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,5 +1,5 @@ MODULE = wusa.exe -IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 +IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 shell32 EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/wusa/main.c b/programs/wusa/main.c index de8387cd575..b3ab6ac523c 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -23,6 +23,7 @@ #include <fdi.h> #include <shlwapi.h> +#include "shlobj.h" #include "wine/debug.h" #include "wine/list.h" #include "wusa.h" @@ -479,27 +480,52 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; + int csidl = 0; - if (!wcsicmp(key, L"runtime.system32")) + if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { #ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) - { - GetSystemWow64DirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); - } + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; +#endif + if (!csidl) csidl = CSIDL_SYSTEM; + } + else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; + else if (!wcsicmp(key, L"runtime.programfiles")) + { +#ifdef __x86_64__ + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; +#endif + if (!csidl) csidl = CSIDL_PROGRAM_FILES; + } + else if (!wcsicmp(key, L"runtime.commonfiles")) + { +#ifdef __x86_64__ + if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; #endif - GetSystemDirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); + if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; } - if (!wcsicmp(key, L"runtime.windows")) +#ifdef __x86_64__ + else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; + else if (!wcsicmp(key, L"runtime.commonfilesx86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; +#endif + else if (!wcsicmp(key, L"runtime.programdata")) csidl = CSIDL_COMMON_APPDATA; + else if (!wcsicmp(key, L"runtime.fonts")) csidl = CSIDL_FONTS; + + if (!csidl) { - GetWindowsDirectoryW(path, ARRAY_SIZE(path)); - return strdupW(path); + FIXME("Unknown expression %s\n", debugstr_w(key)); + return NULL; + } + if (!SHGetSpecialFolderPathW(NULL, path, csidl, TRUE)) + { + ERR("Failed to get folder path for %s\n", debugstr_w(key)); + return NULL; } - FIXME("Unknown expression %s\n", debugstr_w(key)); - return NULL; + if (!wcsicmp(key, L"runtime.inf")) wcscat(path, L"\\inf"); + else if (!wcsicmp(key, L"runtime.drivers")) wcscat(path, L"\\drivers"); + else if (!wcsicmp(key, L"runtime.wbem")) wcscat(path, L"\\wbem"); + return strdupW(path); } static WCHAR *expand_expression(struct assembly_entry *assembly, const WCHAR *expression) -- 2.30.2

1 0

[PATCH v2 2/3] winhttp: Support sending web socket buffer fragments.
by Hans Leidekker Feb. 28, 2022

Feb. 28, 2022

From: Paul Gofman <pgofman(a)codeweavers.com> v2: Determine whether the frame is final in socket_send() instead of passing a BOOL parameter to map_buffer_type(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 91 +++++++++++++++++++++++++++---- dlls/winhttp/tests/notification.c | 22 +++++++- dlls/winhttp/winhttp_private.h | 8 +++ 3 files changed, 108 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index de011060236..48e25023d07 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3298,13 +3298,65 @@ static BOOL socket_can_receive( struct socket *socket ) return socket->state <= SOCKET_STATE_SHUTDOWN && !socket->close_frame_received; } -static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +static BOOL validate_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type, enum fragment_type current_fragment ) +{ + switch (current_fragment) + { + case SOCKET_FRAGMENT_NONE: + return type == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + case SOCKET_FRAGMENT_BINARY: + return type == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + case SOCKET_FRAGMENT_UTF8: + return type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + } + assert( 0 ); + return FALSE; +} + +static enum socket_opcode map_buffer_type( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) { switch (type) { - case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; - case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; - case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: + if (socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_NONE; + return SOCKET_OPCODE_CONTINUE; + } + return SOCKET_OPCODE_TEXT; + + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: + if (socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_NONE; + return SOCKET_OPCODE_CONTINUE; + } + return SOCKET_OPCODE_BINARY; + + case WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE: + if (!socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_UTF8; + return SOCKET_OPCODE_TEXT; + } + return SOCKET_OPCODE_CONTINUE; + + case WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE: + if (!socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_BINARY; + return SOCKET_OPCODE_BINARY; + } + return SOCKET_OPCODE_CONTINUE; + + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: + return SOCKET_OPCODE_CLOSE; + default: FIXME("buffer type %u not supported\n", type); return SOCKET_OPCODE_INVALID; @@ -3333,9 +3385,11 @@ static void socket_send_complete( struct socket *socket, DWORD ret, WINHTTP_WEB_ static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, WSAOVERLAPPED *ovr ) { - enum socket_opcode opcode = map_buffer_type( type ); + enum socket_opcode opcode = map_buffer_type( socket, type ); + BOOL final = (type != WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE && + type != WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE); - return send_frame( socket, opcode, 0, buf, len, TRUE, ovr ); + return send_frame( socket, opcode, 0, buf, len, final, ovr ); } static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) @@ -3364,11 +3418,6 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ TRACE( "%p, %u, %p, %lu\n", hsocket, type, buf, len ); if (len && !buf) return ERROR_INVALID_PARAMETER; - if (type != WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE && type != WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE) - { - FIXME("buffer type %u not supported\n", type); - return ERROR_NOT_SUPPORTED; - } if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3393,6 +3442,13 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ release_object( &socket->hdr ); return ERROR_INVALID_OPERATION; } + if (!validate_buffer_type( type, socket->sending_fragment_type )) + { + WARN( "Invalid buffer type %u, sending_fragment_type %u.\n", type, socket->sending_fragment_type ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); + release_object( &socket->hdr ); + return ERROR_INVALID_PARAMETER; + } if (!(s = malloc( sizeof(*s) ))) { @@ -3445,7 +3501,18 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ ret = ERROR_SUCCESS; } } - else ret = socket_send( socket, type, buf, len, NULL ); + else + { + if (validate_buffer_type( type, socket->sending_fragment_type )) + { + ret = socket_send( socket, type, buf, len, NULL ); + } + else + { + WARN( "Invalid buffer type %u, sending_fragment_type %u.\n", type, socket->sending_fragment_type ); + ret = ERROR_INVALID_PARAMETER; + } + } release_object( &socket->hdr ); return ret; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index ffde61b3bf5..50874a49a07 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -676,6 +676,8 @@ static const struct notification websocket_test[] = { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, + { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, + { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, @@ -867,7 +869,25 @@ static void test_websocket(BOOL secure) for (i = 0; i < BIG_BUFFER_SIZE; ++i) big_buffer[i] = (i & 0xff) ^ 0xcc; setup_test( &info, winhttp_websocket_send, __LINE__ ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, big_buffer, BIG_BUFFER_SIZE ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, big_buffer, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE, + big_buffer + BIG_BUFFER_SIZE / 2, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, + big_buffer + BIG_BUFFER_SIZE / 2, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); + + setup_test( &info, winhttp_websocket_send, __LINE__ ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, + big_buffer + BIG_BUFFER_SIZE / 2, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_websocket_send, __LINE__ ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 0 ); ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index cf6655f561f..bebc3ac1a07 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -238,6 +238,13 @@ enum socket_opcode SOCKET_OPCODE_INVALID = 0xff, }; +enum fragment_type +{ + SOCKET_FRAGMENT_NONE, + SOCKET_FRAGMENT_BINARY, + SOCKET_FRAGMENT_UTF8, +}; + struct socket { struct object_header hdr; @@ -261,6 +268,7 @@ struct socket unsigned int client_buffer_offset; SRWLOCK send_lock; volatile LONG pending_noncontrol_send; + enum fragment_type sending_fragment_type; }; struct send_request -- 2.30.2

2 1

[PATCH vkd3d 02/10] vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_API_VERSION.
by Henri Verbeet Feb. 28, 2022

Feb. 28, 2022

Analogous to vkd3d_api_version for libvkd3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 11 +++++++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 17 +++++++++++++---- libs/vkd3d/state.c | 18 ++++++++++++++---- programs/vkd3d-compiler/main.c | 3 ++- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index be2be3c3..fece054e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -38,6 +38,15 @@ extern "C" { * compilation, transformation, and reflection of GPU shaders. */ +/** \since 1.3 */ +enum vkd3d_shader_api_version +{ + VKD3D_SHADER_API_VERSION_1_0, + VKD3D_SHADER_API_VERSION_1_1, + VKD3D_SHADER_API_VERSION_1_2, + VKD3D_SHADER_API_VERSION_1_3, +}; + /** The type of a chained structure. */ enum vkd3d_shader_structure_type { @@ -115,6 +124,8 @@ enum vkd3d_shader_compile_option_name VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, /** \a value is a member of enum vkd3d_shader_compile_option_formatting_flags. */ VKD3D_SHADER_COMPILE_OPTION_FORMATTING = 0x00000003, + /** \a value is a member of enum vkd3d_shader_api_version. \since 1.3 */ + VKD3D_SHADER_COMPILE_OPTION_API_VERSION = 0x00000004, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 006e5e20..5534453b 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -158,7 +158,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[1]; + struct vkd3d_shader_compile_option options[2]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -208,6 +208,10 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (messages_blob) *messages_blob = NULL; + option = &options[0]; + option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; + option->value = VKD3D_SHADER_API_VERSION_1_3; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; compile_info.source.code = data; @@ -215,7 +219,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; compile_info.target_type = VKD3D_SHADER_TARGET_DXBC_TPF; compile_info.options = options; - compile_info.option_count = 0; + compile_info.option_count = 1; compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; @@ -310,6 +314,11 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; int ret; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", data, size, debugstr_a(filename), macros, include, preprocessed_blob, messages_blob); @@ -322,8 +331,8 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename compile_info.source.size = size; compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; compile_info.target_type = VKD3D_SHADER_TARGET_NONE; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 91f6e27b..0cf0c55f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1768,6 +1768,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device, VkResult vr; int ret; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; stage_desc->pNext = NULL; stage_desc->flags = 0; @@ -1785,8 +1790,8 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; @@ -1814,14 +1819,19 @@ static int vkd3d_scan_dxbc(const D3D12_SHADER_BYTECODE *code, { struct vkd3d_shader_compile_info compile_info; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = descriptor_info; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index f1a6b475..2f330f62 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -34,7 +34,7 @@ #include <term.h> #endif -#define MAX_COMPILE_OPTIONS 3 +#define MAX_COMPILE_OPTIONS 4 enum { @@ -729,6 +729,7 @@ int main(int argc, char **argv) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info; -- 2.20.1

2 1

[PATCH vkd3d 01/10] vkd3d-shader/hlsl: Respect the requested target type.
by Henri Verbeet Feb. 28, 2022

Feb. 28, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 5 ++++ libs/vkd3d-shader/hlsl.c | 17 +++++++++-- libs/vkd3d-shader/hlsl.h | 3 +- libs/vkd3d-shader/hlsl_codegen.c | 19 +++++++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 3 +- libs/vkd3d-utils/vkd3d_utils_main.c | 36 ++++++++++++++++++++++++ programs/vkd3d-compiler/main.c | 4 +++ 8 files changed, 79 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6ce98194..be2be3c3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -581,6 +581,11 @@ enum vkd3d_shader_target_type VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, VKD3D_SHADER_TARGET_D3D_ASM, + /** + * Legacy Direct3D byte-code. This is the format used for Direct3D shader + * model 1, 2, and 3 shaders. + */ + VKD3D_SHADER_TARGET_D3D_BYTECODE, /** * A 'Tokenized Program Format' shader embedded in a DXBC container. This is * the format used for Direct3D shader model 4 and 5 shaders. diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a9a42770..8197fa9f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1952,7 +1952,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) } int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; struct hlsl_ir_function_decl *entry_func; @@ -1976,6 +1976,19 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE && profile->major_version > 3) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, + "The '%s' target profile is incompatible with the 'd3dbc' target type.", profile->name); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + else if (compile_info->target_type == VKD3D_SHADER_TARGET_DXBC_TPF && profile->major_version < 4) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, + "The '%s' target profile is incompatible with the 'dxbc-tpf' target type.", profile->name); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (!hlsl_ctx_init(&ctx, compile_info->source_name, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -2009,7 +2022,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } - ret = hlsl_emit_dxbc(&ctx, entry_func, dxbc); + ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); hlsl_ctx_cleanup(&ctx); return ret; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 043d7fb3..243ed72b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -711,7 +711,8 @@ bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e416647f..837d39e3 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1611,7 +1611,8 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere return ret; } -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) +int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { struct hlsl_block *const body = &entry_func->body; struct hlsl_ir_var *var; @@ -1697,8 +1698,16 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun if (ctx->result) return ctx->result; - if (ctx->profile->major_version < 4) - return hlsl_sm1_write(ctx, entry_func, out); - else - return hlsl_sm4_write(ctx, entry_func, out); + switch (target_type) + { + case VKD3D_SHADER_TARGET_D3D_BYTECODE: + return hlsl_sm1_write(ctx, entry_func, out); + + case VKD3D_SHADER_TARGET_DXBC_TPF: + return hlsl_sm4_write(ctx, entry_func, out); + + default: + ERR("Unsupported shader target type %#x.\n", target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ae0662b8..a25e28a7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1399,6 +1399,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( static const enum vkd3d_shader_target_type hlsl_types[] = { + VKD3D_SHADER_TARGET_D3D_BYTECODE, VKD3D_SHADER_TARGET_DXBC_TPF, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5ab8494c..50c1e9de 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -116,6 +116,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET = 5018, VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS = 5019, + VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE = 5020, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, @@ -1094,7 +1095,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context); + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index ee3bfb4e..006e5e20 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -163,10 +163,34 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; const D3D_SHADER_MACRO *macro; + size_t profile_len, i; char *messages; HRESULT hr; int ret; + static const char * const d3dbc_profiles[] = + { + "fx_2_", + + "ps.1.", + "ps.2.", + "ps.3.", + + "ps_1_", + "ps_2_", + "ps_3_", + + "vs.1.", + "vs.2.", + "vs.3.", + + "vs_1_", + "vs_2_", + "vs_3_", + + "tx_1_", + }; + TRACE("data %p, data_size %lu, filename %s, macros %p, include %p, entry_point %s, " "profile %s, flags %#x, effect_flags %#x, secondary_flags %#x, secondary_data %p, " "secondary_data_size %lu, shader_blob %p, messages_blob %p.\n", @@ -195,6 +219,18 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; + profile_len = strlen(profile); + for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) + { + size_t len = strlen(d3dbc_profiles[i]); + + if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) + { + compile_info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; + break; + } + } + preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; preprocess_info.next = &hlsl_info; preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index c974c9a8..f1a6b475 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -97,6 +97,10 @@ target_type_info[] = {VKD3D_SHADER_TARGET_D3D_ASM, "d3d-asm", "A shader in Direct3D assembly form.\n", false}, + {VKD3D_SHADER_TARGET_D3D_BYTECODE, + "d3dbc", "Legacy Direct3D byte-code.\n" + " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", + true}, {VKD3D_SHADER_TARGET_DXBC_TPF, "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" " This is the format used for Direct3D shader model 4 and 5 shaders.\n", -- 2.20.1

2 1