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

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

28 Aug '19

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 : strmbase: Zero-initialize the BaseRenderer structure in strmbase_renderer_init().
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 0aa48ff150544f6c0355398c6f493b9c5f19317c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa48ff150544f6c0355398c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 20:45:16 2019 -0500 strmbase: Zero-initialize the BaseRenderer structure in strmbase_renderer_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0972f49..0d53934 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -238,6 +238,7 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb PIN_INFO piInput; HRESULT hr; + memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, vtbl, outer, clsid, &RendererBaseFilterFuncTable); filter->pFuncsTable = pBaseFuncsTable; @@ -264,7 +265,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->pMediaSample = NULL; QualityControlImpl_Create(&filter->sink.pin.IPin_iface, &filter->filter.IBaseFilter_iface, &filter->qcimpl); filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl;

1 0

Zebediah Figura : evr: Consistently use base renderer methods.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: d06ec99a0cc6bb441c09e84dd2c498dd6137efff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d06ec99a0cc6bb441c09e84d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 20:45:17 2019 -0500 evr: Consistently use base renderer methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 40 ++++++++++++++++++++++++---------------- dlls/evr/tests/evr.c | 4 ++-- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 690741e..94f88ff 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); typedef struct { - BaseFilter filter; + BaseRenderer renderer; } evr_filter; static const IBaseFilterVtbl basefilter_vtbl = @@ -55,33 +55,41 @@ static const IBaseFilterVtbl basefilter_vtbl = BaseFilterImpl_QueryVendorInfo }; -static inline evr_filter *impl_from_BaseFilter(BaseFilter *iface) +static inline evr_filter *impl_from_BaseRenderer(BaseRenderer *iface) { - return CONTAINING_RECORD(iface, evr_filter, filter); + return CONTAINING_RECORD(iface, evr_filter, renderer); } -static IPin *evr_get_pin(BaseFilter *iface, unsigned int index) +static void evr_destroy(BaseRenderer *iface) { - FIXME("iface %p, index %u, stub!\n", iface, index); - return NULL; + evr_filter *filter = impl_from_BaseRenderer(iface); + + strmbase_renderer_cleanup(&filter->renderer); + CoTaskMemFree(filter); } -static void evr_destroy(BaseFilter *iface) +static HRESULT WINAPI evr_DoRenderSample(BaseRenderer *iface, IMediaSample *sample) { - evr_filter *filter = impl_from_BaseFilter(iface); + FIXME("Not implemented.\n"); + return E_NOTIMPL; +} - strmbase_filter_cleanup(&filter->filter); - CoTaskMemFree(filter); +static HRESULT WINAPI evr_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE *mt) +{ + FIXME("Not implemented.\n"); + return E_NOTIMPL; } -static const BaseFilterFuncTable basefilter_functable = +static const BaseRendererFuncTable renderer_ops = { - .filter_get_pin = evr_get_pin, - .filter_destroy = evr_destroy, + .pfnCheckMediaType = evr_CheckMediaType, + .pfnDoRenderSample = evr_DoRenderSample, + .renderer_destroy = evr_destroy, }; HRESULT evr_filter_create(IUnknown *outer, void **out) { + static const WCHAR sink_name[] = {'E','V','R',' ','I','n','p','u','t','0',0}; evr_filter *object; *out = NULL; @@ -90,10 +98,10 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) if (!object) return E_OUTOFMEMORY; - strmbase_filter_init(&object->filter, &basefilter_vtbl, outer, - &CLSID_EnhancedVideoRenderer, &basefilter_functable); + strmbase_renderer_init(&object->renderer, &basefilter_vtbl, outer, + &CLSID_EnhancedVideoRenderer, sink_name, &renderer_ops); - *out = &object->filter.IUnknown_inner; + *out = &object->renderer.filter.IUnknown_inner; return S_OK; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index cd88ec1..81ad621 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -158,8 +158,8 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); - todo_wine check_interface(filter, &IID_IMediaPosition, TRUE); - todo_wine check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IUnknown, TRUE);

1 0

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

28 Aug '19

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

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

28 Aug '19

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

Zebediah Figura : evr/tests: Add some tests for querying pin information.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: df3e9c8e9afad5697da93b4a865490fecffb729f URL: https://source.winehq.org/git/wine.git/?a=commit;h=df3e9c8e9afad5697da93b4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 20:45:20 2019 -0500 evr/tests: Add some tests for querying pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 49b5b53..489b7b9 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -292,6 +292,51 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_evr(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + 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(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(evr) { CoInitialize(NULL); @@ -300,6 +345,7 @@ START_TEST(evr) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

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

28 Aug '19

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 : http.sys: Keep track of pending IOCTL_HTTP_RECEIVE_REQUEST IRPs and satisfy them when possible.
by Alexandre Julliard 28 Aug '19

28 Aug '19

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: Send a 400 Bad Request response when an invalid request is received.
by Alexandre Julliard 28 Aug '19

28 Aug '19

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 : httpapi: Implement HttpReceiveHttpRequest().
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 7ed2d587938cfabc536bbd3516fe4aea00255394 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ed2d587938cfabc536bbd35… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 27 16:43:01 2019 -0500 httpapi: Implement HttpReceiveHttpRequest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 5f2a307..08fbe4d 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -250,9 +250,43 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *urlW) ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) { - FIXME("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p, stub!\n", - queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); - return ERROR_CALL_NOT_IMPLEMENTED; + struct http_receive_request_params params = + { + .addr = (ULONG_PTR)request, + .id = id, + .flags = flags, + .bits = sizeof(void *) * 8, + }; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED sync_ovl; + + TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n", + queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); + + if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY) + FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); + + if (size < sizeof(HTTP_REQUEST_V1)) + return ERROR_INSUFFICIENT_BUFFER; + + if (!ovl) + { + sync_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ovl = &sync_ovl; + } + + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_REQUEST, &params, sizeof(params), request, size, NULL, ovl)) + ret = GetLastError(); + + if (ovl == &sync_ovl) + { + ret = ERROR_SUCCESS; + if (!GetOverlappedResult(queue, ovl, ret_size, TRUE)) + ret = GetLastError(); + CloseHandle(sync_ovl.hEvent); + } + + return ret; } /***********************************************************************

1 0