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

Nikolay Sivov : include: Add Media Foundation handler interfaces definition.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 68f576f106c41ad6c09d611fcc125a9b39e8e0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=68f576f106c41ad6c09d611f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:03 2019 +0300 include: Add Media Foundation handler interfaces definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 04a6d71..630dc61 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -185,6 +185,58 @@ interface IMFMediaSession : IMFMediaEventGenerator [ object, + uuid(bb420aa4-765b-4a1f-91fe-d6a8a143924c), + local +] +interface IMFByteStreamHandler : IUnknown +{ + HRESULT BeginCreateObject( + [in] IMFByteStream *stream, + [in] const WCHAR *url, + [in] DWORD flags, + [in] IPropertyStore *props, + [out] IUnknown **cancel_cookie, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state); + + HRESULT EndCreateObject( + [in] IMFAsyncResult *result, + [out] MF_OBJECT_TYPE *obj_type, + [out] IUnknown **object); + + HRESULT CancelObjectCreation( + [in] IUnknown *cancel_cookie); + + HRESULT GetMaxNumberOfBytesRequiredForResolution( + [out] QWORD *bytes); +} + +[ + object, + uuid(6d4c7b74-52a0-4bb7-b0db-55f29f47a668), + local +] +interface IMFSchemeHandler : IUnknown +{ + HRESULT BeginCreateObject( + [in] const WCHAR *url, + [in] DWORD flags, + [in] IPropertyStore *props, + [out] IUnknown **cancel_cookie, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state); + + HRESULT EndCreateObject( + [in] IMFAsyncResult *result, + [out] MF_OBJECT_TYPE *obj_type, + [out] IUnknown **object); + + HRESULT CancelObjectCreation( + [in] IUnknown *cancel_cookie); +} + +[ + object, uuid(fbe5a32d-a497-4b61-bb85-97b1a848a6e3) ] interface IMFSourceResolver : IUnknown

1 0

Nikolay Sivov : mfplat/tests: Remove a test crashing on XP/Vista.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: f78bd03a75dc30e892836f262744a2aa25ab0919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f78bd03a75dc30e892836f26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 14:44:18 2019 +0300 mfplat/tests: Remove a test crashing on XP/Vista. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1bf7ebb..7e8968b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -874,9 +874,6 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul IMFMediaEvent_Release(event); - hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); - ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); - IMFMediaEventQueue_Release(queue); SetEvent(callback->event);

1 0

Jacek Caban : ntoskrnl.exe: Support NULL type in ObReferenceObjectByHandle.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: fdcd9ee712736550543aebdb03794c2c809e14f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdcd9ee712736550543aebdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:59:57 2019 +0100 ntoskrnl.exe: Support NULL type in ObReferenceObjectByHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl_private.h | 9 +++++++++ dlls/ntoskrnl.exe/tests/driver.c | 11 +++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 52e0228..67024b9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -315,6 +315,18 @@ static void ObReferenceObject( void *obj ) TRACE( "(%p) ref=%u\n", obj, ref ); } +static const POBJECT_TYPE *known_types[] = +{ + &ExEventObjectType, + &ExSemaphoreObjectType, + &IoDeviceObjectType, + &IoDriverObjectType, + &IoFileObjectType, + &PsProcessType, + &PsThreadType, + &SeTokenObjectType +}; + static NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) { char buf[256]; @@ -326,8 +338,24 @@ static NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, voi status = NtQueryObject(handle, ObjectTypeInformation, buf, sizeof(buf), &size); if (status) return status; - if (!!RtlCompareUnicodeStrings(type->name, strlenW(type->name), type_info->TypeName.Buffer, - type_info->TypeName.Length / sizeof(WCHAR), FALSE)) + if (!type) + { + size_t i; + for (i = 0; i < ARRAY_SIZE(known_types); i++) + { + type = *known_types[i]; + if (!RtlCompareUnicodeStrings( type->name, strlenW(type->name), type_info->TypeName.Buffer, + type_info->TypeName.Length / sizeof(WCHAR), FALSE )) + break; + } + if (i == ARRAY_SIZE(known_types)) + { + FIXME("Unsupported type %s\n", debugstr_us(&type_info->TypeName)); + return STATUS_INVALID_HANDLE; + } + } + else if (!!RtlCompareUnicodeStrings( type->name, strlenW(type->name), type_info->TypeName.Buffer, + type_info->TypeName.Length / sizeof(WCHAR), FALSE )) return STATUS_OBJECT_TYPE_MISMATCH; FIXME( "semi-stub: returning new %s object instance\n", debugstr_w(type->name) ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 440e638..58ecf0c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -27,6 +27,15 @@ struct _OBJECT_TYPE { void (*release)(void*); /* called when the last reference is released */ }; +extern POBJECT_TYPE ExEventObjectType; +extern POBJECT_TYPE ExSemaphoreObjectType; +extern POBJECT_TYPE IoDeviceObjectType; +extern POBJECT_TYPE IoDriverObjectType; +extern POBJECT_TYPE IoFileObjectType; +extern POBJECT_TYPE PsProcessType; +extern POBJECT_TYPE PsThreadType; +extern POBJECT_TYPE SeTokenObjectType; + #ifdef __i386__ #define DEFINE_FASTCALL1_WRAPPER(func) \ diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 2fbe493..7f2e68c 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -705,7 +705,7 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj1, NULL); ok(status == STATUS_OBJECT_TYPE_MISMATCH, "ObReferenceObjectByHandle returned: %#x\n", status); - status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj1, NULL); + status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, NULL, KernelMode, &obj1, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); if (sizeof(void *) != 4) /* avoid dealing with fastcall */ @@ -722,9 +722,16 @@ static void test_ob_reference(const WCHAR *test_path) todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); - ObDereferenceObject(obj1); ObDereferenceObject(obj2); + status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, NULL, KernelMode, &obj2, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + todo_wine + ok(obj1 == obj2, "obj1 != obj2\n"); + + ObDereferenceObject(obj2); + ObDereferenceObject(obj1); + status = ObReferenceObjectByHandle(file_handle, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj1, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status);

1 0

Jacek Caban : mshtml: Pass GeckoBrowser instead of HTMLDocumentObj to create_outer_window.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 2d8610050df647065080e30d1d10b9bd16f505ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8610050df647065080e30d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:24:59 2019 +0100 mshtml: Pass GeckoBrowser instead of HTMLDocumentObj to create_outer_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 +-------- dlls/mshtml/htmlframe.c | 10 ++-------- dlls/mshtml/htmlwindow.c | 18 +++++++----------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index afb4a8a..5731d36 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5445,7 +5445,6 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii { mozIDOMWindowProxy *mozwindow; HTMLDocumentObj *doc; - nsIDOMWindow *nswindow = NULL; nsresult nsres; HRESULT hres; @@ -5497,13 +5496,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii if(NS_FAILED(nsres)) ERR("GetContentDOMWindow failed: %08x\n", nsres); - nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&nswindow); - mozIDOMWindowProxy_Release(mozwindow); - assert(nsres == NS_OK); - - hres = HTMLOuterWindow_Create(doc, nswindow, NULL /* FIXME */, &doc->basedoc.window); - if(nswindow) - nsIDOMWindow_Release(nswindow); + hres = create_outer_window(doc->nscontainer, mozwindow, NULL, &doc->basedoc.window); if(FAILED(hres)) { htmldoc_release(&doc->basedoc); return hres; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 17a78e5..1a0d017 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -54,15 +54,9 @@ static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) return E_FAIL; window = mozwindow_to_window(mozwindow); - if(!window) { - nsIDOMWindow *nswindow; - nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&nswindow); - assert(nsres == NS_OK); - - hres = HTMLOuterWindow_Create(frame->element.node.doc->basedoc.doc_obj, nswindow, + if(!window && frame->element.node.doc->browser) + hres = create_outer_window(frame->element.node.doc->browser, mozwindow, frame->element.node.doc->basedoc.window, &window); - nsIDOMWindow_Release(nswindow); - } mozIDOMWindowProxy_Release(mozwindow); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4d36f60..d980645 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3532,10 +3532,11 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, return S_OK; } -HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, +HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow, HTMLOuterWindow *parent, HTMLOuterWindow **ret) { HTMLOuterWindow *window; + nsresult nsres; HRESULT hres; window = alloc_window(sizeof(HTMLOuterWindow)); @@ -3545,17 +3546,12 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, window->base.outer_window = window; window->base.inner_window = NULL; - window->doc_obj = doc_obj; - - if(nswindow) { - nsresult nsres; - - nsIDOMWindow_AddRef(nswindow); - window->nswindow = nswindow; + window->doc_obj = browser->doc; - nsres = nsIDOMWindow_QueryInterface(nswindow, &IID_mozIDOMWindowProxy, (void**)&window->window_proxy); - assert(nsres == NS_OK); - } + mozIDOMWindowProxy_AddRef(mozwindow); + window->window_proxy = mozwindow; + nsres = mozIDOMWindowProxy_QueryInterface(mozwindow, &IID_nsIDOMWindow, (void**)&window->nswindow); + assert(nsres == NS_OK); window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO; window->readystate = READYSTATE_UNINITIALIZED; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2808ca9..aa0cac8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -867,7 +867,7 @@ HRESULT MHTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT create_document_node(nsIDOMHTMLDocument*,GeckoBrowser*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; -HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; +HRESULT create_outer_window(GeckoBrowser*,mozIDOMWindowProxy*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetMatrixArray() helper.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 96e2d0e018ba469599d50527f187c53f93b76216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e2d0e018ba469599d50527… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Mar 9 11:21:32 2019 +0100 d3dx9: Merge the d3dx_effect_SetMatrixArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 343260b..c5cedbb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,44 +1526,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - set_dirty(param); - for (i = 0; i < count; ++i) - { - set_matrix(&param->members[i], &matrix[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3483,10 +3445,39 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count); + if (param && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_dirty(param); + for (i = 0; i < count; ++i) + set_matrix(&param->members[i], &matrix[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetMatrixArray() helper.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 2d7430f7143acc9e14cd58d3bc598ca79f7bff5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d7430f7143acc9e14cd58d3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Mar 9 11:21:29 2019 +0100 d3dx9: Merge the d3dx_effect_GetMatrixArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 72 ++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 124e1cf..3385d64 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1597,45 +1597,6 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_matrix_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (matrix && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < count; ++i) - { - get_matrix(&param->members[i], &matrix[i], FALSE); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) { @@ -3577,10 +3538,41 @@ static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); - return d3dx9_base_effect_get_matrix_array(&effect->base_effect, parameter, matrix, count); + if (!count) + return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + get_matrix(&param->members[i], &matrix[i], FALSE); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetInt() helper.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 2e771d77761a78b1b597144edfd69ae05b31561e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e771d77761a78b1b597144e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 11 16:33:49 2019 +0100 d3dx9: Merge the d3dx_effect_SetInt() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 78 ++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 44 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7425c7b..f77348c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,49 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - if (param->rows == 1 && param->columns == 1) - { - DWORD value; - - set_number(&value, param->type, &n, D3DXPT_INT); - if (value != *(DWORD *)param->data) - set_dirty(param); - *(DWORD *)param->data = value; - return D3D_OK; - } - - /* - * Split the value, if parameter is a vector with dimension 3 or 4. - */ - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) || - (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; - if (param->rows * param->columns > 3) - { - ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - } - set_dirty(param); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3351,10 +3308,43 @@ static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); - return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); + if (param && !param->element_count) + { + if (param->rows == 1 && param->columns == 1) + { + DWORD value; + + set_number(&value, param->type, &n, D3DXPT_INT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; + return D3D_OK; + } + + /* Split the value if parameter is a vector with dimension 3 or 4. */ + if (param->type == D3DXPT_FLOAT + && ((param->class == D3DXPC_VECTOR && param->columns != 2) + || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + *(float *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + ((float *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + ((float *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; + if (param->rows * param->columns > 3) + ((float *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + set_dirty(param); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetIntArray() helper.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 570ae3b2aa2e7da3f14fbd59979a39e8f21763be URL: https://source.winehq.org/git/wine.git/?a=commit;h=570ae3b2aa2e7da3f14fbd59… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Mar 9 11:21:25 2019 +0100 d3dx9: Merge the d3dx_effect_GetIntArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5d0be34..7425c7b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1426,30 +1426,6 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3431,10 +3407,25 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); + if (n && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetInt() helper.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: 5015e2a7cf5fa3779fd651817058e03c94807088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5015e2a7cf5fa3779fd65181… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Mar 9 11:21:24 2019 +0100 d3dx9: Merge the d3dx_effect_GetInt() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 230af5b..5d0be34 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1388,44 +1388,6 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT *n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && !param->element_count) - { - if (param->columns == 1 && param->rows == 1) - { - set_number(n, D3DXPT_INT, param->data, param->type); - TRACE("Returning %i\n", *n); - return D3D_OK; - } - - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) - || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - /* all components (3,4) are clamped (0,255) and put in the INT */ - *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; - if (param->columns * param->rows > 3) - { - *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; - } - - TRACE("Returning %i\n", *n); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3422,10 +3384,39 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); - return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); + if (n && param && !param->element_count) + { + if (param->columns == 1 && param->rows == 1) + { + set_number(n, D3DXPT_INT, param->data, param->type); + TRACE("Returning %d.\n", *n); + return D3D_OK; + } + + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) + || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + *n = min(max(0.0f, *((float *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI; + *n += ((int)(min(max(0.0f, *((float *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; + *n += ((int)(min(max(0.0f, *((float *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; + if (param->columns * param->rows > 3) + *n += ((int)(min(max(0.0f, *((float *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; + + TRACE("Returning %d.\n", *n); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count)

1 0

Andrew Eikum : winhttp: Don't crash setting up secure proxy.
by Alexandre Julliard March 11, 2019

March 11, 2019

Module: wine Branch: master Commit: e87f2c399dc9cf0666ef7d4e5e41548bef2e8169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87f2c399dc9cf0666ef7d4e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 8 11:52:01 2019 -0600 winhttp: Don't crash setting up secure proxy. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index af484cc..d3d9f57 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1673,6 +1673,9 @@ static BOOL open_connection( struct request *request ) } netconn_set_timeout( netconn, TRUE, request->send_timeout ); netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + + request->netconn = netconn; + if (is_secure) { if (connect->session->proxy_server && @@ -1680,6 +1683,7 @@ static BOOL open_connection( struct request *request ) { if (!secure_proxy_connect( request )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; @@ -1693,13 +1697,13 @@ static BOOL open_connection( struct request *request ) !netconn_secure_connect( netconn, connect->hostname, request->security_flags, &request->cred_handle, request->check_revocation )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; } } - request->netconn = netconn; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, strlenW(addressW) + 1 ); } else

1 0