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

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/async.c: > +{ > + return CONTAINING_RECORD(iface, struct texture_processor, ID3DX10DataProcessor_iface); > +} > + > +static HRESULT WINAPI texture_processor_Process(ID3DX10DataProcessor *iface, void *data, SIZE_T size) > +{ > + struct texture_processor *processor = texture_processor_from_ID3DX10DataProcessor(iface); > + > + TRACE("iface %p, data %p, size %Iu.\n", iface, data, size); > + > + if (processor->resource_data) > + { > + FIXME("called multiple times\n"); > + free(processor->resource_data); > + processor->resource_data = NULL; > + } What's supposed to happen eventually? This is okay for the time being, although it could use a nicer FIXME message (even simply capitalize at the front and period at the end). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2071

June 14, 2022

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/texture.c: > + texture_2d_desc.Width = load_info->Width; > + texture_2d_desc.Height = load_info->Height; > + texture_2d_desc.MipLevels = load_info->MipLevels; > + texture_2d_desc.ArraySize = 1; > + texture_2d_desc.Format = load_info->Format; > + texture_2d_desc.SampleDesc.Count = 1; > + texture_2d_desc.Usage = load_info->Usage; > + texture_2d_desc.BindFlags = load_info->BindFlags; > + texture_2d_desc.MiscFlags = load_info->MiscFlags; > + > + if (FAILED(hr = ID3D10Device_CreateTexture2D(device, &texture_2d_desc, resource_data, &texture_2d))) > + return hr; > + > + *texture = (ID3D10Resource *)texture_2d; > + return S_OK; > +} Maybe create_d3d_texture() or create_d3d10_texture(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2070

June 14, 2022

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/texture.c: > stride = (width * get_bpp_from_format(img_info.Format) + 7) / 8; > frame_size = stride * height; > > - if (!(buffer = malloc(frame_size))) > + if(!(res_data = malloc(sizeof(**resource_data) + frame_size))) Whitespace. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2069

June 14, 2022

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/texture.c: > + if (FAILED(D3DX10GetImageInfoFromMemory(data, size, NULL, &img_info, NULL))) > return E_FAIL; > - } > if (img_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) > { > FIXME("Cube map is not supported.\n"); > - if (hresult) > - *hresult = E_FAIL; > return E_FAIL; > } > if (img_info.ArraySize != 1) > { > - FIXME("img_info.ArraySize = %d\n", img_info.ArraySize); > - if (hresult) > - *hresult = E_NOTIMPL; > + FIXME("img_info.ArraySize = %d not supported.\n", img_info.ArraySize); Nitpick, this changes the FIXME message introduced a couple of patches back. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2068

June 14, 2022

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/texture.c: > + out->Height = D3DX10_DEFAULT; > + out->Depth = D3DX10_DEFAULT; > + out->FirstMipLevel = D3DX10_DEFAULT; > + out->MipLevels = D3DX10_DEFAULT; > + out->Usage = D3DX10_DEFAULT; > + out->BindFlags = D3DX10_DEFAULT; > + out->CpuAccessFlags = D3DX10_DEFAULT; > + out->MiscFlags = D3DX10_DEFAULT; > + out->Format = D3DX10_DEFAULT; > + out->Filter = D3DX10_DEFAULT; > + out->MipFilter = D3DX10_DEFAULT; > + out->pSrcInfo = NULL; > +} > + > +HRESULT create_resource_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO *load_info, > + D3D10_SUBRESOURCE_DATA **resource_data) load_texture_data() / load_resource_data()? We might consider introducing of our own structure for storing texture data, like e.g.: ``` struct texture_data { unsigned int row_pitch, slice_pitch; BYTE *data; }; ``` instead of sort-of abusing D3D10_SUBRESOURCE_DATA by attaching the data at the end. Otherwise, probably a comment explaining that this function is returning an "object" combining a D3D10_SUBRESOURCE_DATA header with the actual texture data would be nice. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2067

June 14, 2022

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/texture.c: > + } > + > + out->Width = D3DX10_DEFAULT; > + out->Height = D3DX10_DEFAULT; > + out->Depth = D3DX10_DEFAULT; > + out->FirstMipLevel = D3DX10_DEFAULT; > + out->MipLevels = D3DX10_DEFAULT; > + out->Usage = D3DX10_DEFAULT; > + out->BindFlags = D3DX10_DEFAULT; > + out->CpuAccessFlags = D3DX10_DEFAULT; > + out->MiscFlags = D3DX10_DEFAULT; > + out->Format = D3DX10_DEFAULT; > + out->Filter = D3DX10_DEFAULT; > + out->MipFilter = D3DX10_DEFAULT; > + out->pSrcInfo = NULL; > +} Maybe init_load_info()? Separately, let's try to use consistent naming for D3DX10_IMAGE_LOAD_INFO variables in new code, like either load_info or just info. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2066

June 14, 2022

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/texture.c: > > +static HRESULT create_texture_helper(ID3D10Device *device, const void *data, SIZE_T size, > + D3DX10_IMAGE_LOAD_INFO *load_info, ID3D10Resource **texture) > +{ > + D3D10_SUBRESOURCE_DATA *resource_data; > + D3DX10_IMAGE_LOAD_INFO info; > + HRESULT hr; > + > + create_image_load_info(load_info, &info); > + > + if (FAILED((hr = create_resource_data(data, size, &info, &resource_data)))) > + return hr; > + hr = create_texture(device, &info, resource_data, texture); > + free(resource_data); > + return hr; > +} The helpers themselves are probably okay but I don't like the naming. Shocking, I know... Maybe this one could be just create_texture(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2065

June 14, 2022

Re: [PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/d3dx10_43/tests/d3dx10.c: > + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); > + hr2 = 0xdeadbeef; > + hr = D3DX10CreateTextureFromResourceA(device, NULL, NULL, NULL, NULL, &resource, &hr2); > ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); > - hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, NULL); > + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); > + hr2 = 0xdeadbeef; > + hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, &hr2); > ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); > + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); > > for (i = 0; i < ARRAY_SIZE(test_image); ++i) > { > winetest_push_context("Test %u", i); > resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); > This could use an additional test similar to the one from 35939bbe0c04534da07ece7f6a47a560d356f7a1: ``` hr2 = 0xdeadbeef; hr = D3DX10CreateTextureFromResourceW(device, resource_module, L"deadbeef", NULL, NULL, &resource, &hr2); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228#note_2063

June 14, 2022

Re: Gitlab experiment wrapup

by Zebediah Figura

On 6/14/22 15:29, Gabriel Ivăncescu wrote: > Hi, > > On 14/06/2022 13:55, Alexandre Julliard wrote: >> * Some other things I like: >> >> - Updating status doesn't need to go through me, people can assign >> reviewers, supersede patches, etc. directly. That reduces my workload >> and improves the bus factor. Once we have figured out how to make >> testbot results reliable, we could also have maintainers merge commits >> directly. >> > > I created my first MR since the switch seems inevitable. I completely > fail at assigning a reviewer. I even tried the web UI and I can't find > any setting. > > I also tried the /assign_reviewer "quick action" on a comment and it said: > > `Could not apply assign_reviewer command.` > > Is this feature not working currently? FWIW, there's a "lab" command line tool that lets you do lab mr edit --assign <username> and also lab mr edit --review <username> and I'm sure the "glab" has something with identical syntax. Not sure what the difference between those are, though?

June 14, 2022

[PATCH 4/4] http.sys: Add support for adding multiple urls to request queues.

by Julian Klemann

The request queue has a growable array rather than single URL and socket properties. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- dlls/http.sys/http.c | 134 ++++++++++++++++++++++++----------- dlls/http.sys/request.h | 2 +- dlls/httpapi/tests/httpapi.c | 40 ++++++++++- 3 files changed, 132 insertions(+), 44 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 523c70ee12c..31687485179 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -70,6 +70,7 @@ struct connection BOOL available; struct request_queue *queue; HTTP_REQUEST_ID req_id; + HTTP_URL_CONTEXT context; /* Things we already parsed out of the request header in parse_request(). * These are valid only if "available" is TRUE. */ @@ -82,15 +83,21 @@ struct connection static struct list connections = LIST_INIT(connections); -struct request_queue +struct url { struct list entry; - LIST_ENTRY irp_queue; - HTTP_URL_CONTEXT context; char *url; + HTTP_URL_CONTEXT context; SOCKET socket; }; +struct request_queue +{ + struct list entry; + LIST_ENTRY irp_queue; + struct list urls; +}; + static struct list request_queues = LIST_INIT(request_queues); static void accept_connection(SOCKET socket) @@ -319,17 +326,30 @@ static int parse_number(const char *str, const char **endptr, const char *end) return n; } -static BOOL host_matches(const struct connection *conn, const struct request_queue *queue) +static struct url *host_matches(const struct connection *conn, const struct request_queue *queue) { const char *conn_host = (conn->url[0] == '/') ? conn->host : conn->url + 7; + struct url *url; - if (queue->url[7] == '+') + LIST_FOR_EACH_ENTRY(url, &queue->urls, struct url, entry) { - const char *queue_port = strchr(queue->url + 7, ':'); - return !strncmp(queue_port, strchr(conn_host, ':'), strlen(queue_port) - 1 /* strip final slash */); + if (url->url) + { + if (url->url && url->url[7] == '+') + { + /* strip final slash */ + const char *queue_port = strchr(url->url + 7, ':'); + if (!strncmp(queue_port, strchr(conn_host, ':'), strlen(queue_port) - 1)) + return url; + } + + /* strip final slash */ + if (!memicmp(url->url + 7, conn_host, strlen(url->url) - 8)) + return url; + } } - return !memicmp(queue->url + 7, conn_host, strlen(queue->url) - 8 /* strip final slash */); + return NULL; } /* Upon receiving a request, parse it to ensure that it is a valid HTTP request, @@ -339,6 +359,7 @@ static int parse_request(struct connection *conn) { const char *const req = conn->buffer, *const end = conn->buffer + conn->len; struct request_queue *queue; + struct url *conn_url; const char *p = req, *q; int len, ret; @@ -432,10 +453,11 @@ static int parse_request(struct connection *conn) /* Find a queue which can receive this request. */ LIST_FOR_EACH_ENTRY(queue, &request_queues, struct request_queue, entry) { - if (host_matches(conn, queue)) + if ((conn_url = host_matches(conn, queue))) { TRACE("Assigning request to queue %p.\n", queue); conn->queue = queue; + conn->context = conn_url->context; break; } } @@ -544,6 +566,7 @@ static DWORD WINAPI request_thread_proc(void *arg) { struct connection *conn, *cursor; struct request_queue *queue; + struct url *url; TRACE("Starting request thread.\n"); @@ -553,8 +576,11 @@ static DWORD WINAPI request_thread_proc(void *arg) LIST_FOR_EACH_ENTRY(queue, &request_queues, struct request_queue, entry) { - if (queue->socket != -1) - accept_connection(queue->socket); + LIST_FOR_EACH_ENTRY(url, &queue->urls, struct url, entry) + { + if (url->socket != -1) + accept_connection(url->socket); + } } LIST_FOR_EACH_ENTRY_SAFE(conn, cursor, &connections, struct connection, entry) @@ -575,6 +601,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; struct sockaddr_in addr; struct connection *conn; + struct url *url_entry, *new_entry; unsigned int count = 0; char *url, *endptr; ULONG true = 1; @@ -594,7 +621,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) if (!(addr.sin_port = htons(strtol(strchr(params->url + 7, ':') + 1, &endptr, 10))) || *endptr != '/') return STATUS_INVALID_PARAMETER; - if (!(url = heap_alloc(strlen(params->url)+1))) + if (!(url = malloc(strlen(params->url)+1))) return STATUS_NO_MEMORY; strcpy(url, params->url); @@ -603,27 +630,28 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) if (count > 3) FIXME("Binding to relative URIs is not implemented; binding to all URIs instead.\n"); + if (!(new_entry = malloc(sizeof(struct url)))) + return STATUS_NO_MEMORY; + EnterCriticalSection(&http_cs); - if (queue->url && !strcmp(queue->url, url)) - { - LeaveCriticalSection(&http_cs); - heap_free(url); - return STATUS_OBJECT_NAME_COLLISION; - } - else if (queue->url) + LIST_FOR_EACH_ENTRY(url_entry, &queue->urls, struct url, entry) { - FIXME("Binding to multiple URLs is not implemented.\n"); - LeaveCriticalSection(&http_cs); - heap_free(url); - return STATUS_NOT_IMPLEMENTED; + if (url_entry->url && !strcmp(url_entry->url, url)) + { + LeaveCriticalSection(&http_cs); + free(url); + free(new_entry); + return STATUS_OBJECT_NAME_COLLISION; + } } if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { ERR("Failed to create socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs); - heap_free(url); + free(url); + free(new_entry); return STATUS_UNSUCCESSFUL; } @@ -633,7 +661,8 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) { LeaveCriticalSection(&http_cs); closesocket(s); - heap_free(url); + free(url); + free(new_entry); if (WSAGetLastError() == WSAEADDRINUSE) { WARN("Address %s is already in use.\n", debugstr_a(params->url)); @@ -653,15 +682,17 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) ERR("Failed to listen to port %u, error %u.\n", addr.sin_port, WSAGetLastError()); LeaveCriticalSection(&http_cs); closesocket(s); - heap_free(url); + free(url); + free(new_entry); return STATUS_OBJECT_NAME_COLLISION; } ioctlsocket(s, FIONBIO, &true); WSAEventSelect(s, request_event, FD_ACCEPT); - queue->socket = s; - queue->url = url; - queue->context = params->context; + new_entry->url = url; + new_entry->context = params->context; + new_entry->socket = s; + list_add_head(&queue->urls, &new_entry->entry); /* See if any pending requests now match this queue. */ LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) @@ -669,6 +700,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) if (conn->available && !conn->queue && host_matches(conn, queue)) { conn->queue = queue; + conn->context = params->context; try_complete_irp(conn); } } @@ -681,21 +713,33 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) static NTSTATUS http_remove_url(struct request_queue *queue, IRP *irp) { const char *url = irp->AssociatedIrp.SystemBuffer; + struct url *url_entry; TRACE("host %s.\n", debugstr_a(url)); EnterCriticalSection(&http_cs); - if (!queue->url || strcmp(url, queue->url)) + LIST_FOR_EACH_ENTRY(url_entry, &queue->urls, struct url, entry) { - LeaveCriticalSection(&http_cs); - return STATUS_OBJECT_NAME_NOT_FOUND; + if (url_entry->url && !strcmp(url, url_entry->url)) + { + free(url_entry->url); + url_entry->url = NULL; + + shutdown(url_entry->socket, SD_BOTH); + closesocket(url_entry->socket); + url_entry->socket = -1; + + list_remove(&url_entry->entry); + free(url_entry); + + LeaveCriticalSection(&http_cs); + return STATUS_SUCCESS; + } } - heap_free(queue->url); - queue->url = NULL; LeaveCriticalSection(&http_cs); - return STATUS_SUCCESS; + return STATUS_OBJECT_NAME_NOT_FOUND; } static struct connection *get_connection(HTTP_REQUEST_ID req_id) @@ -892,8 +936,9 @@ static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); struct request_queue *queue; - if (!(queue = heap_alloc_zero(sizeof(*queue)))) + if (!(queue = calloc(1, sizeof(*queue)))) return STATUS_NO_MEMORY; + list_init(&queue->urls); stack->FileObject->FsContext = queue; InitializeListHead(&queue->irp_queue); @@ -910,17 +955,22 @@ static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) static void close_queue(struct request_queue *queue) { + struct url *url, *url_next; + EnterCriticalSection(&http_cs); list_remove(&queue->entry); - if (queue->socket != -1) + + LIST_FOR_EACH_ENTRY_SAFE(url, url_next, &queue->urls, struct url, entry) { - shutdown(queue->socket, SD_BOTH); - closesocket(queue->socket); + free(url->url); + shutdown(url->socket, SD_BOTH); + closesocket(url->socket); + list_remove(&url->entry); + free(url); } - LeaveCriticalSection(&http_cs); + free(queue); - heap_free(queue->url); - heap_free(queue); + LeaveCriticalSection(&http_cs); } static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) diff --git a/dlls/http.sys/request.h b/dlls/http.sys/request.h index f044db3bb2c..f307ca3dead 100644 --- a/dlls/http.sys/request.h +++ b/dlls/http.sys/request.h @@ -181,9 +181,9 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) offset = sizeof(*req); + req->UrlContext = conn->context; req->ConnectionId = (ULONG_PTR)conn; req->RequestId = conn->req_id; - req->UrlContext = conn->queue->context; req->Version = conn->version; req->Verb = conn->verb; req->UnknownVerbLength = conn->unk_verb_len; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 3c3f7abcd90..bbed4580b92 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -108,7 +108,7 @@ static unsigned short add_url_v1(HANDLE queue) swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); if (!(ret = HttpAddUrl(queue, url, NULL))) return port; - ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); + ok(ret == ERROR_SHARING_VIOLATION || ret == ERROR_ALREADY_EXISTS, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; @@ -1083,6 +1083,43 @@ static void test_v1_unknown_tokens(void) ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); } +static void test_v1_multiple_urls(void) +{ + char DECLSPEC_ALIGN(8) req_buffer[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; + unsigned short ports[4]; + char req_text[200]; + DWORD ret_size; + HANDLE queue; + SOCKET s; + int ret; + + ret = HttpCreateHttpHandle(&queue, 0); + ok(!ret, "Got error %u.\n", ret); + + for (int i = 0; i < 4; ++i) + ports[i] = add_url_v1(queue); + + for (int i = 0; i < 4; ++i) + { + s = create_client_socket(ports[i]); + sprintf(req_text, simple_req, ports[i]); + ret = send(s, req_text, strlen(req_text), 0); + ok(ret == strlen(req_text), "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 %lu.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + closesocket(s); + } + + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %lu.\n", GetLastError()); +} + static void test_v1_urls(void) { char DECLSPEC_ALIGN(8) req_buffer[2048]; @@ -1643,6 +1680,7 @@ START_TEST(httpapi) test_v1_bad_request(); test_v1_cooked_url(); test_v1_unknown_tokens(); + test_v1_multiple_urls(); test_v1_urls(); ret = HttpTerminate(HTTP_INITIALIZE_SERVER, NULL); -- 2.36.1

June 14, 2022