wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Gabriel Ivăncescu : msscript.ocx: Implement IScriptModuleCollection::get_Item.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 7c0231b8c3469a994add3d12f55c30f23ec3e310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0231b8c3469a994add3d12… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:23 2020 +0300 msscript.ocx: Implement IScriptModuleCollection::get_Item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 28 ++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 60 +++++++++++++++++++++++++++++++------- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 696059897f..9783c7730e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -954,10 +954,34 @@ static HRESULT WINAPI ScriptModuleCollection_get_Item(IScriptModuleCollection *i IScriptModule **ppmod) { ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ScriptModule *module; + unsigned int i; + HRESULT hr; - FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); + TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); - return E_NOTIMPL; + if (!ppmod) return E_POINTER; + if (!This->host) return E_FAIL; + + if (V_VT(&index) == VT_BSTR) + { + module = find_module(This, V_BSTR(&index)); + if (!module) return CTL_E_ILLEGALFUNCTIONCALL; + } + else + { + hr = VariantChangeType(&index, &index, 0, VT_INT); + if (FAILED(hr)) return hr; + + i = V_INT(&index) - 1; + if (i >= This->host->module_count) return 0x800a0009; + + module = This->modules[i]; + } + + *ppmod = &module->IScriptModule_iface; + IScriptModule_AddRef(*ppmod); + return S_OK; } static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection *iface, LONG *plCount) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 8945186b87..701363a6e7 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2341,9 +2341,9 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_I4; V_I4(&var) = -1; hr = IScriptModuleCollection_get_Item(mods, var, NULL); - todo_wine ok(hr == E_POINTER, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); V_VT(&var) = VT_EMPTY; str = SysAllocString(L"foobar"); @@ -2378,34 +2378,69 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_I4; V_I4(&var) = count + 1; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"non-existent module"); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); V_VT(&var) = VT_I4; V_I4(&var) = 1; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); - if (hr == S_OK) IScriptModule_Release(mod); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + hr = IScriptModule_get_Name(mod, NULL); + todo_wine ok(hr == E_POINTER, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + hr = IScriptModule_get_Name(mod, &str); + todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + if (hr == S_OK) SysFreeString(str); + str = SysAllocString(L"function add(a, b) { return a + b; }\n"); + hr = IScriptModule_AddCode(mod, str); + todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + IScriptModule_Release(mod); + SysFreeString(str); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"some other module"); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); - if (hr == S_OK) IScriptModule_Release(mod); + hr = IScriptModule_get_Name(mod, &str); + todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + IScriptModule_Release(mod); + if (hr == S_OK) SysFreeString(str); V_VT(&var) = VT_R8; V_R8(&var) = 2.0; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); - if (hr == S_OK) IScriptModule_Release(mod); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + hr = IScriptModule_get_Name(mod, &str); + todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + if (hr == S_OK) SysFreeString(str); + str = SysAllocString(L"function sub(a, b) { return a - b; }\n"); + hr = IScriptModule_AddCode(mod, str); + todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + IScriptModule_Release(mod); + SysFreeString(str); + /* The 'Global' module is the same as the script control */ + str = SysAllocString(L"add(10, 5)"); + hr = IScriptControl_Eval(sc, str, &var); + todo_wine ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + todo_wine ok(V_VT(&var) == VT_I4 && V_I4(&var) == 15, "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + SysFreeString(str); + str = SysAllocString(L"sub(10, 5)"); + hr = IScriptControl_Eval(sc, str, &var); + ok(FAILED(hr), "IScriptControl_Eval succeeded: 0x%08x.\n", hr); + SysFreeString(str); + + /* Grab a module ref and change the language to something valid */ + V_VT(&var) = VT_I2; + V_I2(&var) = 3; + hr = IScriptModuleCollection_get_Item(mods, var, &mod); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); str = SysAllocString(L"vbscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); @@ -2414,12 +2449,17 @@ static void test_IScriptControl_get_Modules(void) hr = IScriptModuleCollection_get_Count(mods, &count); ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); ok(count == 1, "count is not 1, got %d.\n", count); + IScriptModule_Release(mod); hr = IScriptControl_put_Language(sc, NULL); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); hr = IScriptModuleCollection_get_Count(mods, &count); ok(hr == E_FAIL, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); + V_VT(&var) = VT_I4; + V_I4(&var) = 1; + hr = IScriptModuleCollection_get_Item(mods, var, &mod); + ok(hr == E_FAIL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; str = SysAllocString(L"module_name");

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptModuleCollection::Add.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: a328ac5bc946e87cbfc5362f815ad2b17960de90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a328ac5bc946e87cbfc5362f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:22 2020 +0300 msscript.ocx: Implement IScriptModuleCollection::Add. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 70 +++++++++++++++++++++++++++++++++++--- dlls/msscript.ocx/tests/msscript.c | 61 +++++++++++++++++++++++++++------ 2 files changed, 117 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a328ac5bc946e87cbfc5…

1 0

Gabriel Ivăncescu : msscript.ocx: Move IScriptControl::AddObject implementation into a helper.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 523f9d2a4ffffd3b9b6dbe0959a4d3285212ddd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523f9d2a4ffffd3b9b6dbe09… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:21 2020 +0300 msscript.ocx: Move IScriptControl::AddObject implementation into a helper. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 59 ++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index df63220888..bc1811b4c2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -250,6 +250,40 @@ static HRESULT start_script(ScriptHost *host) return hr; } +static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object, DWORD flags) +{ + struct named_item *item; + HRESULT hr; + + if (host_get_named_item(host, name)) + return E_INVALIDARG; + + item = heap_alloc(sizeof(*item)); + if (!item) + return E_OUTOFMEMORY; + + item->name = SysAllocString(name); + if (!item->name) + { + heap_free(item); + return E_OUTOFMEMORY; + } + IDispatch_AddRef(item->disp = object); + list_add_tail(&host->named_items, &item->entry); + + hr = IActiveScript_AddNamedItem(host->script, name, flags); + if (FAILED(hr)) + { + list_remove(&item->entry); + IDispatch_Release(item->disp); + SysFreeString(item->name); + heap_free(item); + return hr; + } + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1392,8 +1426,6 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, { ScriptControl *This = impl_from_IScriptControl(iface); DWORD flags = SCRIPTITEM_ISVISIBLE | SCRIPTITEM_ISSOURCE; - struct named_item *item; - HRESULT hr; TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(name), object, add_members); @@ -1403,30 +1435,9 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, if (!This->host) return E_FAIL; - if (host_get_named_item(This->host, name)) - return E_INVALIDARG; - - item = heap_alloc(sizeof(*item)); - if (!item) - return E_OUTOFMEMORY; - - item->name = SysAllocString(name); - IDispatch_AddRef(item->disp = object); - list_add_tail(&This->host->named_items, &item->entry); - if (add_members) flags |= SCRIPTITEM_GLOBALMEMBERS; - hr = IActiveScript_AddNamedItem(This->host->script, name, flags); - if (FAILED(hr)) { - list_remove(&item->entry); - IDispatch_Release(item->disp); - SysFreeString(item->name); - heap_free(item); - return hr; - } - - - return hr; + return add_script_object(This->host, name, object, flags); } static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface)

1 0

Nikolay Sivov : evr: Add IMFVideoPositionMapper stub.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: cd1cf07c80dd896328f0545e78d66541cef058a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1cf07c80dd896328f0545e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:58:01 2020 +0300 evr: Add IMFVideoPositionMapper stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 1bc4f47040..7663a28ab1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -48,6 +48,7 @@ struct video_mixer IMFVideoMixerControl2 IMFVideoMixerControl2_iface; IMFGetService IMFGetService_iface; IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; + IMFVideoPositionMapper IMFVideoPositionMapper_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -89,6 +90,11 @@ static struct video_mixer *impl_from_IMFVideoMixerBitmap(IMFVideoMixerBitmap *if return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerBitmap_iface); } +static struct video_mixer *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapper *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoPositionMapper_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -142,6 +148,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoMixerBitmap_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { + *obj = &mixer->IMFVideoPositionMapper_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -858,6 +868,40 @@ static const IMFVideoMixerBitmapVtbl video_mixer_bitmap_vtbl = video_mixer_bitmap_GetAlphaBitmapParameters, }; +static HRESULT WINAPI video_mixer_position_mapper_QueryInterface(IMFVideoPositionMapper *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoPositionMapper(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_position_mapper_AddRef(IMFVideoPositionMapper *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoPositionMapper(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_position_mapper_Release(IMFVideoPositionMapper *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoPositionMapper(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_position_mapper_MapOutputCoordinateToInputStream(IMFVideoPositionMapper *iface, + float x_out, float y_out, DWORD output_stream, DWORD input_stream, float *x_in, float *y_in) +{ + FIXME("%p, %f, %f, %u, %u, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); + + return E_NOTIMPL; +} + +static const IMFVideoPositionMapperVtbl video_mixer_position_mapper_vtbl = +{ + video_mixer_position_mapper_QueryInterface, + video_mixer_position_mapper_AddRef, + video_mixer_position_mapper_Release, + video_mixer_position_mapper_MapOutputCoordinateToInputStream, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -886,6 +930,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; + object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 4e97f65be0..4f954d868a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -405,10 +405,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoPositionMapper, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); todo_wine

1 0

Nikolay Sivov : evr: Add IMFVideoMixerBitmap stub.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: a9431eb0a2f787faa6a18a6a8f0f24136f1fc531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9431eb0a2f787faa6a18a6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:58:00 2020 +0300 evr: Add IMFVideoMixerBitmap stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +-- 2 files changed, 73 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c835a62ad9..1bc4f47040 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -27,6 +27,9 @@ #include "evr_classes.h" +#include "initguid.h" +#include "evr9.h" + WINE_DEFAULT_DEBUG_CHANNEL(evr); #define MAX_MIXER_INPUT_STREAMS 16 @@ -44,6 +47,7 @@ struct video_mixer IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoMixerControl2 IMFVideoMixerControl2_iface; IMFGetService IMFGetService_iface; + IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -80,6 +84,11 @@ static struct video_mixer *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFGetService_iface); } +static struct video_mixer *impl_from_IMFVideoMixerBitmap(IMFVideoMixerBitmap *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerBitmap_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -129,6 +138,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFGetService_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap)) + { + *obj = &mixer->IMFVideoMixerBitmap_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -787,6 +800,64 @@ static const IMFGetServiceVtbl video_mixer_getservice_vtbl = video_mixer_getservice_GetService, }; +static HRESULT WINAPI video_mixer_bitmap_QueryInterface(IMFVideoMixerBitmap *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerBitmap(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_bitmap_AddRef(IMFVideoMixerBitmap *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerBitmap(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_bitmap_Release(IMFVideoMixerBitmap *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoMixerBitmap(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_bitmap_SetAlphaBitmap(IMFVideoMixerBitmap *iface, const MFVideoAlphaBitmap *bitmap) +{ + FIXME("%p, %p.\n", iface, bitmap); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_bitmap_ClearAlphaBitmap(IMFVideoMixerBitmap *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_bitmap_UpdateAlphaBitmapParameters(IMFVideoMixerBitmap *iface, + const MFVideoAlphaBitmapParams *params) +{ + FIXME("%p, %p.\n", iface, params); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_bitmap_GetAlphaBitmapParameters(IMFVideoMixerBitmap *iface, MFVideoAlphaBitmapParams *params) +{ + FIXME("%p, %p.\n", iface, params); + + return E_NOTIMPL; +} + +static const IMFVideoMixerBitmapVtbl video_mixer_bitmap_vtbl = +{ + video_mixer_bitmap_QueryInterface, + video_mixer_bitmap_AddRef, + video_mixer_bitmap_Release, + video_mixer_bitmap_SetAlphaBitmap, + video_mixer_bitmap_ClearAlphaBitmap, + video_mixer_bitmap_UpdateAlphaBitmapParameters, + video_mixer_bitmap_GetAlphaBitmapParameters, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -814,6 +885,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; + object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5ea1f1a644..4e97f65be0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -401,10 +401,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoPositionMapper, (void **)&unk); todo_wine

1 0

Nikolay Sivov : evr: Add IMFGetService stub for the mixer.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: e4791f6f9bc02341b9bc6953b05a5c1050443a33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4791f6f9bc02341b9bc6953… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:57:59 2020 +0300 evr: Add IMFGetService stub for the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a65e82d4ca..c835a62ad9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -43,6 +43,7 @@ struct video_mixer IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoMixerControl2 IMFVideoMixerControl2_iface; + IMFGetService IMFGetService_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -74,6 +75,11 @@ static struct video_mixer *impl_from_IMFVideoMixerControl2(IMFVideoMixerControl2 return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoMixerControl2_iface); } +static struct video_mixer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFGetService_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -119,6 +125,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoMixerControl2_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &mixer->IMFGetService_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -744,6 +754,39 @@ static const IMFVideoMixerControl2Vtbl video_mixer_control_vtbl = video_mixer_control_GetMixingPrefs, }; +static HRESULT WINAPI video_mixer_getservice_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFGetService(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_getservice_AddRef(IMFGetService *iface) +{ + struct video_mixer *mixer = impl_from_IMFGetService(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_getservice_Release(IMFGetService *iface) +{ + struct video_mixer *mixer = impl_from_IMFGetService(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_mixer_getservice_vtbl = +{ + video_mixer_getservice_QueryInterface, + video_mixer_getservice_AddRef, + video_mixer_getservice_Release, + video_mixer_getservice_GetService, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -770,6 +813,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->IMFVideoMixerControl2_iface.lpVtbl = &video_mixer_control_vtbl; + object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6e51dba992..5ea1f1a644 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -397,10 +397,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); todo_wine

1 0

Nikolay Sivov : evr/tests: Add some tests for supported mixer interfaces.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: c8b3ae700bda3c6588a536d58df2beda7e60b8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8b3ae700bda3c6588a536d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:57:58 2020 +0300 evr/tests: Add some tests for supported mixer interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 44819c1b38..6e51dba992 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -27,7 +27,7 @@ #include "mferror.h" #include "mfapi.h" #include "initguid.h" -#include "dxva2api.h" +#include "evr9.h" static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; @@ -396,6 +396,30 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoPositionMapper, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0

Nikolay Sivov : include: Add some more EVR mixer interfaces.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 1f57af100f43c9ecd0d30b0f1200f5c605b18297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f57af100f43c9ecd0d30b0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:57:57 2020 +0300 include: Add some more EVR mixer interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/evr9.idl | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9f70e72b4c..90fb873f20 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -276,6 +276,7 @@ SOURCES = \ evntprov.h \ evntrace.h \ evr.idl \ + evr9.idl \ excpt.h \ exdisp.idl \ exdispid.h \ diff --git a/include/evr9.idl b/include/evr9.idl new file mode 100644 index 0000000000..1572d87838 --- /dev/null +++ b/include/evr9.idl @@ -0,0 +1,114 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +import "unknwn.idl"; +import "evr.idl"; +import "dxva2api.idl"; + +typedef struct MFVideoAlphaBitmapParams +{ + DWORD dwFlags; + COLORREF clrSrcKey; + RECT rcSrc; + MFVideoNormalizedRect nrcDest; + FLOAT fAlpha; + DWORD dwFilterMode; +} MFVideoAlphaBitmapParams; + +typedef struct MFVideoAlphaBitmap +{ + BOOL GetBitmapFromDC; + union + { + HDC hdc; + IDirect3DSurface9 *pDDS; + } bitmap; + MFVideoAlphaBitmapParams params; +} MFVideoAlphaBitmap; + +[ + object, + uuid(814c7b20-0fdb-4eec-af8f-f957c8f69edc), + local +] +interface IMFVideoMixerBitmap : IUnknown +{ + HRESULT SetAlphaBitmap( + [in] const MFVideoAlphaBitmap *bitmap + ); + HRESULT ClearAlphaBitmap(void); + HRESULT UpdateAlphaBitmapParameters( + [in] const MFVideoAlphaBitmapParams *params + ); + HRESULT GetAlphaBitmapParameters( + [out] MFVideoAlphaBitmapParams *params + ); +} + +[ + object, + uuid(6AB0000C-FECE-4d1f-A2AC-A9573530656E), + pointer_default(unique) +] +interface IMFVideoProcessor : IUnknown +{ + HRESULT GetAvailableVideoProcessorModes( + [out] UINT *count, + [out, size_is(*count)] GUID **modes + ); + HRESULT GetVideoProcessorCaps( + [in] GUID *mode, + [out] DXVA2_VideoProcessorCaps *caps + ); + HRESULT GetVideoProcessorMode( + [out] GUID *mode + ); + HRESULT SetVideoProcessorMode( + [in] GUID *mode + ); + HRESULT GetProcAmpRange( + [in] DWORD prop, + [out] DXVA2_ValueRange *range + ); + HRESULT GetProcAmpValues( + [in] DWORD flags, + [out] DXVA2_ProcAmpValues *values + ); + HRESULT SetProcAmpValues( + [in] DWORD flags, + [in] DXVA2_ProcAmpValues *values + ); + HRESULT GetFilteringRange( + [in] DWORD prop, + [out] DXVA2_ValueRange *range + ); + HRESULT GetFilteringValue( + [in] DWORD prop, + [out] DXVA2_Fixed32 *value + ); + HRESULT SetFilteringValue( + [in] DWORD prop, + [in] DXVA2_Fixed32 *value + ); + HRESULT GetBackgroundColor( + [out] COLORREF *color + ); + HRESULT SetBackgroundColor( + [in] COLORREF color + ); +}

1 0

Hans Leidekker : winhttp: Add stubs for new proxy functions.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 23db5357bb0b473ecaba6cb4466e474f07cf4645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23db5357bb0b473ecaba6cb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 25 11:00:25 2020 +0200 winhttp: Add stubs for new proxy functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 12 ++++++ 2 files changed, 119 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 186b70e4a2..228eb646ae 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2028,6 +2028,113 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) return ret; } +/*********************************************************************** + * WinHttpCreateProxyResolver (winhttp.@) + */ +DWORD WINAPI WinHttpCreateProxyResolver( HINTERNET hsession, HINTERNET *hresolver ) +{ + FIXME("%p, %p\n", hsession, hresolver); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpFreeProxyResult (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResult( WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxyResultEx (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResultEx( WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxySettings (winhttp.@) + */ +void WINAPI WinHttpFreeProxySettings( WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p\n", settings); +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %lx\n", hresolver, debugstr_w(url), options, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx2 (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx2( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD selection_len, BYTE *selection, DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %u, %p, %lx\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResult (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResult( HINTERNET hresolver, WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResultEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResultEx( HINTERNET hresolver, WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxySettingsVersion (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxySettingsVersion( HINTERNET hsession, DWORD *version ) +{ + FIXME("%p, %p\n", hsession, version); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpReadProxySettings (winhttp.@) + */ +DWORD WINAPI WinHttpReadProxySettings( HINTERNET hsession, const WCHAR *connection, BOOL use_defaults, + BOOL set_autodiscover, DWORD *version, BOOL *defaults_returned, + WINHTTP_PROXY_SETTINGS *settings) +{ + FIXME("%p, %s, %d, %d, %p, %p, %p\n", hsession, debugstr_w(connection), use_defaults, set_autodiscover, + version, defaults_returned, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpResetAutoProxy (winhttp.@) + */ +DWORD WINAPI WinHttpResetAutoProxy( HINTERNET hsession, DWORD flags ) +{ + FIXME("%p, %08x\n", hsession, flags); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +DWORD WINAPI WinHttpWriteProxySettings( HINTERNET hsession, BOOL force, WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p, %d, %p\n", hsession, force, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + /*********************************************************************** * WinHttpSetStatusCallback (winhttp.@) */ diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index beace245a8..581918791e 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -7,11 +7,20 @@ @ stdcall WinHttpCloseHandle(ptr) @ stdcall WinHttpConnect(ptr wstr long long) @ stdcall WinHttpCrackUrl(wstr long long ptr) +@ stdcall WinHttpCreateProxyResolver(ptr ptr) @ stdcall WinHttpCreateUrl(ptr long ptr ptr) @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) +@ stdcall WinHttpFreeProxyResult(ptr) +@ stdcall WinHttpFreeProxyResultEx(ptr) +@ stdcall WinHttpFreeProxySettings(ptr) @ stdcall WinHttpGetDefaultProxyConfiguration(ptr) @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stdcall WinHttpGetProxyForUrl(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx2(ptr wstr ptr long ptr ptr) +@ stdcall WinHttpGetProxyResult(ptr ptr) +@ stdcall WinHttpGetProxyResultEx(ptr ptr) +@ stdcall WinHttpGetProxySettingsVersion(ptr ptr) @ stdcall WinHttpOpen(wstr long wstr wstr long) @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stdcall WinHttpQueryAuthSchemes(ptr ptr ptr ptr) @@ -19,7 +28,9 @@ @ stdcall WinHttpQueryHeaders(ptr long wstr ptr ptr ptr) @ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stdcall WinHttpReadData(ptr ptr long ptr) +@ stdcall WinHttpReadProxySettings(ptr wstr long long ptr ptr ptr) @ stdcall WinHttpReceiveResponse(ptr ptr) +@ stdcall WinHttpResetAutoProxy(ptr long) @ stdcall WinHttpSendRequest(ptr wstr long ptr long long long) @ stdcall WinHttpSetCredentials(ptr long long wstr ptr ptr) @ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @@ -35,3 +46,4 @@ @ stdcall WinHttpWebSocketSend(ptr long ptr long) @ stdcall WinHttpWebSocketShutdown(ptr long ptr long) @ stdcall WinHttpWriteData(ptr ptr long ptr) +@ stdcall WinHttpWriteProxySettings(ptr long ptr)

1 0

Hans Leidekker : winhttp: Status and reason are optional in the close response.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: 968b3745bb02fde13bfafce102de973fec7c6bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=968b3745bb02fde13bfafce1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 25 11:00:24 2020 +0200 winhttp: Status and reason are optional in the close response. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 623fdf5db5..c15be38592 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3310,7 +3310,7 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD { DWORD err; if ((err = netconn_recv( netconn, buf, len, 0, (int *)ret_len ))) return err; - if (len && !*ret_len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + if (*ret_len != len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; return ERROR_SUCCESS; } @@ -3341,8 +3341,7 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || - (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) + if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } @@ -3353,14 +3352,12 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket { USHORT len16; if ((ret = receive_bytes( netconn, (char *)&len16, sizeof(len16), &count ))) return ret; - if (count != sizeof(len16)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; len = RtlUshortByteSwap( len16 ); } else if (len == 127) { ULONGLONG len64; if ((ret = receive_bytes( netconn, (char *)&len64, sizeof(len64), &count ))) return ret; - if (count != sizeof(len64)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; len = len64; } @@ -3548,23 +3545,21 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea } if ((ret = receive_frame( netconn, &count, &socket->opcode ))) goto done; - if (socket->opcode != SOCKET_OPCODE_CLOSE || (count && count > sizeof(socket->reason))) + if (socket->opcode != SOCKET_OPCODE_CLOSE || + (count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) { ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; goto done; } - if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; - if (count != sizeof(socket->status)) + if (count) { - ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; - goto done; - } - socket->status = RtlUshortByteSwap( socket->status ); - if (!(ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ))) - { - socket->state = SOCKET_STATE_CLOSED; + DWORD reason_len = count - sizeof(socket->status); + if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + socket->status = RtlUshortByteSwap( socket->status ); + if ((ret = receive_bytes( netconn, socket->reason, reason_len, &socket->reason_len ))) goto done; } + socket->state = SOCKET_STATE_CLOSED; done: if (async)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020