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

Henri Verbeet : wined3d: Initialise d3d_info after quirks are applied.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: 7260e8bd4a884ef17716c0747db1c675452e36dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7260e8bd4a884ef17716c074… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 21:32:26 2019 +0430 wined3d: Initialise d3d_info after quirks are applied. In particular, quirk_broken_viewport_subpixel_bits() disables ARB_CLIP_CONTROL, which affects "d3d_info->clip_control". This fixes a regression introduced by commit e795ddb3d80d7b94d29cf97a24a01bb157b0138d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47636 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 170 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 90 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7260e8bd4a884ef17716…

1 0

Zebediah Figura : http.sys: Keep track of pending IOCTL_HTTP_RECEIVE_REQUEST IRPs and satisfy them when possible.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: 6dea703b1191d253b6abf87e43702ba5053f6e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dea703b1191d253b6abf87e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 16:42:59 2019 -0500 http.sys: Keep track of pending IOCTL_HTTP_RECEIVE_REQUEST IRPs and satisfy them when possible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index f4b9782..51881dd 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -243,6 +243,7 @@ static struct list connections = LIST_INIT(connections); struct request_queue { struct list entry; + LIST_ENTRY irp_queue; HTTP_URL_CONTEXT context; char *url; int socket; @@ -763,6 +764,18 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) return STATUS_SUCCESS; } +/* Complete an IOCTL_HTTP_RECEIVE_REQUEST IRP if there is one to complete. */ +static void try_complete_irp(struct connection *conn) +{ + LIST_ENTRY *entry; + if (conn->queue && (entry = RemoveHeadList(&conn->queue->irp_queue)) != &conn->queue->irp_queue) + { + IRP *irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp->IoStatus.Status = complete_irp(conn, irp); + IoCompleteRequest(irp, IO_NO_INCREMENT); + } +} + /* Return 1 if str matches expect, 0 if str is incomplete, -1 if they don't match. */ static int compare_exact(const char *str, const char *expect, const char *end) { @@ -902,6 +915,7 @@ static int parse_request(struct connection *conn) WSAEventSelect(conn->socket, request_event, FD_CLOSE); conn->available = TRUE; + try_complete_irp(conn); return 1; } @@ -1083,7 +1097,10 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) { if (conn->available && !conn->queue && host_matches(conn, queue)) + { conn->queue = queue; + try_complete_irp(conn); + } } LeaveCriticalSection(&http_cs); @@ -1133,7 +1150,11 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) } if (params->id == HTTP_NULL_ID) + { + TRACE("Queuing IRP %p.\n", irp); + InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); ret = STATUS_PENDING; + } else ret = STATUS_CONNECTION_INVALID; @@ -1182,6 +1203,7 @@ static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) if (!(queue = heap_alloc_zero(sizeof(*queue)))) return STATUS_NO_MEMORY; stack->FileObject->FsContext = queue; + InitializeListHead(&queue->irp_queue); EnterCriticalSection(&http_cs); list_add_head(&request_queues, &queue->entry);

1 0

Zebediah Figura : http.sys: Assign a unique ID to each request.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: a6d233583684b67290c7bcf8661b87cda73e9118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d233583684b67290c7bcf8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 16:42:58 2019 -0500 http.sys: Assign a unique ID to each request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index fe53638..f4b9782 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -203,6 +203,8 @@ DECLARE_CRITICAL_SECTION(http_cs); static HANDLE request_thread, request_event; static BOOL thread_stop; +static HTTP_REQUEST_ID req_id_counter; + struct connection { struct list entry; /* in "connections" below */ @@ -212,8 +214,20 @@ struct connection char *buffer; unsigned int len, size; + /* If there is a request fully received and waiting to be read, the + * "available" parameter will be TRUE. Either there is no queue matching + * the URL of this request yet ("queue" is NULL), there is a queue but no + * IRPs have arrived for this request yet ("queue" is non-NULL and "req_id" + * is HTTP_NULL_ID), or an IRP has arrived but did not provide a large + * enough buffer to read the whole request ("queue" is non-NULL and + * "req_id" is not HTTP_NULL_ID). + * + * If "available" is FALSE, either we are waiting for a new request + * ("req_id" is HTTP_NULL_ID), or we are waiting for the user to send a + * response ("req_id" is not HTTP_NULL_ID). */ BOOL available; struct request_queue *queue; + HTTP_REQUEST_ID req_id; /* Things we already parsed out of the request header in parse_request(). * These are valid only if "available" is TRUE. */ @@ -406,6 +420,9 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) TRACE("Completing IRP %p.\n", irp); + if (!conn->req_id) + conn->req_id = ++req_id_counter; + /* First calculate the total buffer size needed for this IRP. */ if (conn->unk_verb_len) @@ -473,11 +490,13 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) { struct http_request_32 *req = irp->AssociatedIrp.SystemBuffer; req->ConnectionId = (ULONG_PTR)conn; + req->RequestId = conn->req_id; } else { struct http_request_64 *req = irp->AssociatedIrp.SystemBuffer; req->ConnectionId = (ULONG_PTR)conn; + req->RequestId = conn->req_id; } return STATUS_BUFFER_OVERFLOW; } @@ -492,6 +511,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) offset = sizeof(*req); req->ConnectionId = (ULONG_PTR)conn; + req->RequestId = conn->req_id; req->UrlContext = conn->queue->context; req->Version = conn->version; req->Verb = conn->verb; @@ -617,6 +637,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) offset = sizeof(*req); req->ConnectionId = (ULONG_PTR)conn; + req->RequestId = conn->req_id; req->UrlContext = conn->queue->context; req->Version = conn->version; req->Verb = conn->verb; @@ -906,6 +927,8 @@ static void receive_data(struct connection *conn) if (conn->available) return; /* waiting for an HttpReceiveHttpRequest() call */ + if (conn->req_id != HTTP_NULL_ID) + return; /* waiting for an HttpSendHttpResponse() call */ TRACE("Received %u bytes of data.\n", len); @@ -1101,7 +1124,7 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) { - if (conn->available && conn->queue == queue) + if (conn->available && conn->queue == queue && params->id == conn->req_id) { ret = complete_irp(conn, irp); LeaveCriticalSection(&http_cs); @@ -1109,9 +1132,14 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) } } + if (params->id == HTTP_NULL_ID) + ret = STATUS_PENDING; + else + ret = STATUS_CONNECTION_INVALID; + LeaveCriticalSection(&http_cs); - return STATUS_PENDING; + return ret; } static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp)

1 0

Zebediah Figura : evr/tests: Add some tests for IEnumPins.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: a6f84c2e5042f76f0bf3cbbaded9ff67c7366803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f84c2e5042f76f0bf3cbba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 20:45:18 2019 -0500 evr/tests: Add some tests for IEnumPins. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 81ad621..d5ccb27 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -176,12 +176,103 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_evr(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[2]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(evr) { CoInitialize(NULL); test_aggregation(); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Zhiyi Zhang : wined3d: Truncate stencil reference values to the stencil component size.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: 124f48d3114fe86f5feda2ce200d87b97c4009de URL: https://source.winehq.org/git/wine.git/?a=commit;h=124f48d3114fe86f5feda2ce… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 28 21:32:28 2019 +0430 wined3d: Truncate stencil reference values to the stencil component size. As opposed to OpenGL, which clamps them. This fixes a regression introduced by commit a9e199e5ad76c0540381f25011d6051ace3e7c0a. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/cs.c | 7 +++++-- dlls/wined3d/state.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 948582a..9907028 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11211,7 +11211,7 @@ static void stencil_cull_test(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 280, 360); - todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 32f9954..044d586 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1152,9 +1152,12 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + else if (prev) { - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->stencil_size != op->view->format->stencil_size) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); } device_invalidate_state(device, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4cdca27..54c0c67 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -925,7 +925,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; mask = state->render_states[WINED3D_RS_STENCILMASK]; - ref = state->render_states[WINED3D_RS_STENCILREF] & mask; + ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]);

1 0

Hans Leidekker : wbemprox: Avoid evaluating row conditions twice.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: 08d928171c2e18156eb3239bb198dae6bb817bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d928171c2e18156eb3239b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 14:14:26 2019 +0200 wbemprox: Avoid evaluating row conditions twice. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 9 ++++++--- dlls/wbemprox/query.c | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 75cdfc3..3d2a067 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3026,7 +3026,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; + if (!count) return FILL_STATUS_UNFILTERED; if (!(info = heap_alloc( size ))) return FILL_STATUS_FAILED; if (!EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, (BYTE *)info, size, &size, &count )) @@ -3093,7 +3093,11 @@ static enum fill_status fill_process( struct table *table, const struct expr *co do { - if (!resize_table( table, row + 1, sizeof(*rec) )) goto done; + if (!resize_table( table, row + 1, sizeof(*rec) )) + { + status = FILL_STATUS_FAILED; + goto done; + } rec = (struct record_process *)(table->data + offset); rec->caption = heap_strdupW( entry.szExeFile ); @@ -3118,7 +3122,6 @@ static enum fill_status fill_process( struct table *table, const struct expr *co TRACE("created %u rows\n", row); table->num_rows = row; - status = FILL_STATUS_UNFILTERED; done: CloseHandle( snap ); diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0165d23..e00f067 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -404,13 +404,15 @@ HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, HRESULT execute_view( struct view *view ) { UINT i, j = 0, len; + enum fill_status status = FILL_STATUS_UNFILTERED; if (!view->table) return S_OK; if (view->table->fill) { clear_table( view->table ); - view->table->fill( view->table, view->cond ); + status = view->table->fill( view->table, view->cond ); } + if (status == FILL_STATUS_FAILED) return WBEM_E_FAILED; if (!view->table->num_rows) return S_OK; len = min( view->table->num_rows, 16 ); @@ -429,7 +431,8 @@ HRESULT execute_view( struct view *view ) if (!(tmp = heap_realloc( view->result, len * sizeof(UINT) ))) return E_OUTOFMEMORY; view->result = tmp; } - if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; + if (status == FILL_STATUS_FILTERED) val = 1; + else if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; if (val) view->result[j++] = i; } view->count = j;

1 0

Alistair Leslie-Hughes : msi: Don' t error when an ODBC Data Source fails to register.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: e4f1f9b7bdd46bf1f18c1e337ac6864bee3b0733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f1f9b7bdd46bf1f18c1e33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 28 01:05:50 2019 +0000 msi: Don't error when an ODBC Data Source fails to register. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 55f978c..f6f7ffb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6783,10 +6783,7 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) attrs[len + 1] = 0; if (!SQLConfigDataSourceW(NULL, request, driver, attrs)) - { - ERR("Failed to install SQL data source!\n"); - r = ERROR_FUNCTION_FAILED; - } + WARN("Failed to install SQL data source!\n"); uirow = MSI_CreateRecord( 5 ); MSI_RecordSetStringW( uirow, 1, desc );

1 0

Zebediah Figura : http.sys: Send a 400 Bad Request response when an invalid request is received.
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: 980a56c61b73cb33b764083219d0dc0dc1e834ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=980a56c61b73cb33b7640832… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 16:43:00 2019 -0500 http.sys: Send a 400 Bad Request response when an invalid request is received. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 51881dd..4115afc 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -920,6 +920,35 @@ static int parse_request(struct connection *conn) return 1; } +static void format_date(char *buffer) +{ + static const char day_names[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + static const char month_names[12][4] = + {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + SYSTEMTIME date; + GetSystemTime(&date); + sprintf(buffer + strlen(buffer), "Date: %s, %02u %s %u %02u:%02u:%02u GMT\r\n", + day_names[date.wDayOfWeek], date.wDay, month_names[date.wMonth - 1], + date.wYear, date.wHour, date.wMinute, date.wSecond); +} + +/* Send a 400 Bad Request response. */ +static void send_400(struct connection *conn) +{ + static const char response_header[] = "HTTP/1.1 400 Bad Request\r\n"; + static const char response_body[] = + "Content-Type: text/html; charset=utf-8\r\n" + "Content-Language: en\r\n" + "Connection: close\r\n"; + char buffer[sizeof(response_header) + sizeof(response_body) + 37]; + + strcpy(buffer, response_header); + format_date(buffer + strlen(buffer)); + strcat(buffer, response_body); + if (send(conn->socket, buffer, strlen(buffer), 0) < 0) + ERR("Failed to send 400 response, error %u.\n", WSAGetLastError()); +} + static void receive_data(struct connection *conn) { int len, ret; @@ -977,6 +1006,7 @@ static void receive_data(struct connection *conn) else if (ret < 0) { WARN("Failed to parse request; shutting down connection.\n"); + send_400(conn); close_connection(conn); } }

1 0

Zebediah Figura : strmbase: Get rid of the "debug_info" parameter to strmbase_filter_init().
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: 1317102f6cd9b2b3361e167b05ad6df49f251e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1317102f6cd9b2b3361e167b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 20:45:15 2019 -0500 strmbase: Get rid of the "debug_info" parameter to strmbase_filter_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 3 +-- dlls/qcap/avico.c | 3 +-- dlls/qcap/avimux.c | 3 +-- dlls/qcap/smartteefilter.c | 3 +-- dlls/qcap/vfwcapture.c | 3 +-- dlls/qedit/nullrenderer.c | 3 +-- dlls/qedit/samplegrabber.c | 3 +-- dlls/quartz/dsoundrender.c | 3 +-- dlls/quartz/filesource.c | 3 +-- dlls/quartz/parser.c | 3 +-- dlls/quartz/videorenderer.c | 3 +-- dlls/quartz/vmr9.c | 10 +--------- dlls/strmbase/filter.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 3 +-- dlls/winegstreamer/gstdemux.c | 3 +-- dlls/wineqtdecoder/qtsplitter.c | 3 +-- include/wine/strmbase.h | 4 ++-- 19 files changed, 23 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1317102f6cd9b2b3361e…

1 0

Zebediah Figura : evr/tests: Add some tests for IBaseFilter::FindPin().
by Alexandre Julliard Aug. 28, 2019

Aug. 28, 2019

Module: wine Branch: master Commit: e8599db83e954c61ee70bf847a182037636eb43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8599db83e954c61ee70bf84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 20:45:19 2019 -0500 evr/tests: Add some tests for IBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d5ccb27..49b5b53 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -25,6 +25,8 @@ #include "initguid.h" #include "dxva2api.h" +static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; + static IBaseFilter *create_evr(void) { IBaseFilter *filter = NULL; @@ -266,6 +268,30 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + IBaseFilter *filter = create_evr(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(evr) { CoInitialize(NULL); @@ -273,6 +299,7 @@ START_TEST(evr) test_aggregation(); test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0