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

Jacek Caban : mshtml: Create top content window in init_browser.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: a3037ec2f2715b65601ccb00b53c40190e6e2f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3037ec2f2715b65601ccb00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:26:39 2019 +0100 mshtml: Create top content window in init_browser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 13 +++---------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsembed.c | 17 ++++++++++++++++- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5731d36..56a8617 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5443,9 +5443,7 @@ static dispex_static_data_t HTMLDocumentObj_dispex = { static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID riid, void **ppv) { - mozIDOMWindowProxy *mozwindow; HTMLDocumentObj *doc; - nsresult nsres; HRESULT hres; if(outer && !IsEqualGUID(&IID_IUnknown, riid)) { @@ -5492,15 +5490,10 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii return hres; } - nsres = nsIWebBrowser_GetContentDOMWindow(doc->nscontainer->webbrowser, &mozwindow); - if(NS_FAILED(nsres)) - ERR("GetContentDOMWindow failed: %08x\n", nsres); + doc->basedoc.window = doc->nscontainer->content_window; + IHTMLWindow2_AddRef(&doc->basedoc.window->base.IHTMLWindow2_iface); - hres = create_outer_window(doc->nscontainer, mozwindow, NULL, &doc->basedoc.window); - if(FAILED(hres)) { - htmldoc_release(&doc->basedoc); - return hres; - } + doc->basedoc.window->doc_obj = doc; if(!doc->basedoc.doc_node && doc->basedoc.window->base.inner_window->doc) { doc->basedoc.doc_node = doc->basedoc.window->base.inner_window->doc; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 922ac02..1fdedce 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -713,6 +713,8 @@ struct GeckoBrowser { nsIBaseWindow *window; nsIWebBrowserFocus *focus; + HTMLOuterWindow *content_window; + nsIEditor *editor; nsIController *editor_controller; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index cab41c3..c05c83a 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2029,9 +2029,11 @@ static const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { static HRESULT init_browser(GeckoBrowser *browser) { + mozIDOMWindowProxy *mozwindow; nsIWebBrowserSetup *wbsetup; nsIScrollable *scrollable; nsresult nsres; + HRESULT hres; nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_WEBBROWSER_CONTRACTID, NULL, &IID_nsIWebBrowser, (void**)&browser->webbrowser); @@ -2132,7 +2134,15 @@ static HRESULT init_browser(GeckoBrowser *browser) ERR("Could not get nsIScrollable: %08x\n", nsres); } - return S_OK; + nsres = nsIWebBrowser_GetContentDOMWindow(browser->webbrowser, &mozwindow); + if(NS_FAILED(nsres)) { + ERR("GetContentDOMWindow failed: %08x\n", nsres); + return E_FAIL; + } + + hres = create_outer_window(browser, mozwindow, NULL, &browser->content_window); + mozIDOMWindowProxy_Release(mozwindow); + return hres; } HRESULT create_gecko_browser(HTMLDocumentObj *doc, GeckoBrowser **_ret) @@ -2174,6 +2184,11 @@ void detach_gecko_browser(GeckoBrowser *This) This->doc = NULL; + if(This->content_window) { + IHTMLWindow2_Release(&This->content_window->base.IHTMLWindow2_iface); + This->content_window = NULL; + } + while(!list_empty(&This->document_nodes)) { HTMLDocumentNode *doc = LIST_ENTRY(list_head(&This->document_nodes), HTMLDocumentNode, browser_entry); list_remove(&doc->browser_entry);

1 0

Jacek Caban : jscript: Add Object.getPrototypeOf implementation.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: f2a07b117abdc655d36e9acdf92d93f5c3cad70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a07b117abdc655d36e9acd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:39:27 2019 +0100 jscript: Add Object.getPrototypeOf implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 30 +++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 2 ++ dlls/mshtml/tests/es5.js | 30 +++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 487eb5f..c4c3a6e 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -34,6 +34,8 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static const WCHAR getOwnPropertyDescriptorW[] = {'g','e','t','O','w','n','P','r','o','p','e','r','t','y','D','e','s','c','r','i','p','t','o','r',0}; +static const WCHAR getPrototypeOfW[] = + {'g','e','t','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR definePropertyW[] = {'d','e','f','i','n','e','P','r','o','p','e','r','t','y',0}; static const WCHAR definePropertiesW[] = {'d','e','f','i','n','e','P','r','o','p','e','r','t','i','e','s',0}; @@ -519,10 +521,36 @@ static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthi return hres; } +static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0])) { + FIXME("invalid arguments\n"); + return E_NOTIMPL; + } + + TRACE("(%s)\n", debugstr_jsval(argv[1])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + if(r) + *r = obj->prototype + ? jsval_obj(jsdisp_addref(obj->prototype)) + : jsval_null(); + return S_OK; +} + static const builtin_prop_t ObjectConstr_props[] = { {definePropertiesW, Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {definePropertyW, Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, - {getOwnPropertyDescriptorW, Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2} + {getOwnPropertyDescriptorW, Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, + {getPrototypeOfW, Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1} }; static const builtin_info_t ObjectConstr_info = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 58c7a4c..1e8fabd 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -198,6 +198,8 @@ function test_javascript() { test_exposed("defineProperties", Object, v >= 8); } + test_exposed("getPrototypeOf", Object, v >= 9); + test_parses("if(false) { o.default; }", v >= 9); test_parses("if(false) { o.with; }", v >= 9); test_parses("if(false) { o.if; }", v >= 9); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 928c558..69fe0fe 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -592,6 +592,33 @@ function test_string_split() { next_test(); } +function test_getPrototypeOf() { + ok(Object.getPrototypeOf(new Object()) === Object.prototype, + "Object.getPrototypeOf(new Object()) !== Object.prototype"); + + function Constr() {} + var obj = new Constr(); + ok(Object.getPrototypeOf(Constr.prototype) === Object.prototype, + "Object.getPrototypeOf(Constr.prototype) !== Object.prototype"); + ok(Object.getPrototypeOf(obj) === Constr.prototype, + "Object.getPrototypeOf(obj) !== Constr.prototype"); + + var proto = new Object(); + Constr.prototype = proto; + ok(Object.getPrototypeOf(obj) != proto, + "Object.getPrototypeOf(obj) == proto"); + obj = new Constr(); + ok(Object.getPrototypeOf(obj) === proto, + "Object.getPrototypeOf(obj) !== proto"); + ok(Object.getPrototypeOf(obj, 2, 3, 4) === proto, + "Object.getPrototypeOf(obj) !== proto"); + + ok(Object.getPrototypeOf(Object.prototype) === null, + "Object.getPrototypeOf(Object.prototype) !== null"); + + next_test(); +} + var tests = [ test_date_now, test_toISOString, @@ -604,5 +631,6 @@ var tests = [ test_property_definitions, test_string_trim, test_global_properties, - test_string_split + test_string_split, + test_getPrototypeOf ];

1 0

Jacek Caban : ntoskrnl.exe: Support NULL type in ObReferenceObjectByHandle.
by Alexandre Julliard 11 Mar '19

11 Mar '19

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

Hans Leidekker : msi: Skip the special SummaryInformation stream in msi_commit_streams.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 02a25a9d4fb170755d8de7aa7cb5d388c206b337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02a25a9d4fb170755d8de7aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 11 15:46:54 2019 +0100 msi: Skip the special SummaryInformation stream in msi_commit_streams. Avoids adding a useless table stream when called on an existing database. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/streams.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index bc02fb2..cfce816 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -592,7 +592,10 @@ UINT msi_commit_streams( MSIDATABASE *db ) for (i = 0; i < db->num_streams; i++) { name = msi_string_lookup( db->strings, db->streams[i].str_index, NULL ); + if (!strcmpW( name, szSumInfo )) continue; + if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; + TRACE("saving stream %s as %s\n", debugstr_w(name), debugstr_w(encname)); hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); if (SUCCEEDED( hr ))

1 0

Michael Stefaniuc : gphoto2.ds: Remove useless casts to self.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: e8a82e230f086b5b42fa868f9dc56c8bf046fa80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8a82e230f086b5b42fa868f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:21 2019 +0100 gphoto2.ds: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/ds_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index cb3bbed..32f5267 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -192,7 +192,7 @@ static TW_UINT16 _get_image_and_startup_jpeg(void) { activeDS.jd.err = pjpeg_std_error(&activeDS.jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&activeDS.jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&activeDS.jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); activeDS.jd.src = &activeDS.xjsm; ret=pjpeg_read_header(&activeDS.jd,TRUE); activeDS.jd.out_color_space = JCS_RGB; @@ -610,7 +610,7 @@ _get_gphoto2_file_as_DIB( jd.err = pjpeg_std_error(&jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); jd.src = &xjsm; ret=pjpeg_read_header(&jd,TRUE); jd.out_color_space = JCS_RGB;

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() helper.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: c47355a3dc3685c44982ecb9944c0826c0b03526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47355a3dc3685c44982ecb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Mar 9 11:21:33 2019 +0100 d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() 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 | 63 ++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c5cedbb..6e5dfbd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1526,41 +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_pointer_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && count <= param->element_count) - { - UINT i; - - 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: - 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_transpose(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { @@ -3525,10 +3490,36 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX 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_pointer_array(&effect->base_effect, parameter, matrix, count); + if (param && count <= param->element_count) + { + unsigned int i; + + 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: + 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_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Nikolay Sivov : mfplat/tests: Remove a test crashing on XP/Vista.
by Alexandre Julliard 11 Mar '19

11 Mar '19

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

Nikolay Sivov : include: Add Media Foundation handler interfaces definition.
by Alexandre Julliard 11 Mar '19

11 Mar '19

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: Close event handle on async result release.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 8098edb6c63adefa127601dc8d746d107118052e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8098edb6c63adefa127601dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:04 2019 +0300 mfplat: Close event handle on async result release. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 2 ++ dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 408526f..66f8588 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -649,6 +649,8 @@ static ULONG WINAPI async_result_Release(IMFAsyncResult *iface) IUnknown_Release(result->object); if (result->state) IUnknown_Release(result->state); + if (result->result.hEvent) + CloseHandle(result->result.hEvent); heap_free(result); MFUnlockPlatform(); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7e8968b..7d26b3d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -904,7 +904,10 @@ static void test_MFCreateAsyncResult(void) IUnknown *state, *object; MFASYNCRESULT *data; ULONG refcount; + HANDLE event; + DWORD flags; HRESULT hr; + BOOL ret; init_test_callback(&callback); @@ -991,6 +994,35 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); refcount = IMFAsyncResult_Release(result); ok(!refcount, "Unexpected refcount %u\n.", refcount); + + /* Event handle is closed on release. */ + hr = MFCreateAsyncResult(NULL, NULL, NULL, &result); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result; + data->hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(data->hEvent != NULL, "Failed to create event.\n"); + ret = GetHandleInformation(event, &flags); + ok(ret, "Failed to get handle info.\n"); + + refcount = IMFAsyncResult_Release(result); + ok(!refcount, "Unexpected refcount %u\n.", refcount); + ret = GetHandleInformation(event, &flags); + ok(!ret, "Expected handle to be closed.\n"); + + hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result; + data->hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(data->hEvent != NULL, "Failed to create event.\n"); + ret = GetHandleInformation(event, &flags); + ok(ret, "Failed to get handle info.\n"); + + refcount = IMFAsyncResult_Release(result); + ok(!refcount, "Unexpected refcount %u\n.", refcount); + ret = GetHandleInformation(event, &flags); + ok(!ret, "Expected handle to be closed.\n"); } static void test_startup(void) @@ -1693,6 +1725,40 @@ static void test_system_time_source(void) IMFPresentationTimeSource_Release(time_source); } +static void test_MFInvokeCallback(void) +{ + struct test_callback callback; + IMFAsyncResult *result; + MFASYNCRESULT *data; + ULONG refcount; + HRESULT hr; + DWORD ret; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + init_test_callback(&callback); + + hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result; + data->hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(data->hEvent != NULL, "Failed to create event.\n"); + + hr = MFInvokeCallback(result); + ok(hr == S_OK, "Failed to invoke, hr %#x.\n", hr); + + ret = WaitForSingleObject(data->hEvent, 100); + ok(ret == WAIT_TIMEOUT, "Expected timeout, ret %#x.\n", ret); + + refcount = IMFAsyncResult_Release(result); + ok(!refcount, "Unexpected refcount %u\n.", refcount); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1720,6 +1786,7 @@ START_TEST(mfplat) test_event_queue(); test_presentation_descriptor(); test_system_time_source(); + test_MFInvokeCallback(); CoUninitialize(); }

1 0

Nikolay Sivov : mfplat: Free event value on release.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 14e63ff9129a8b56654c4eac6e46059176fd69d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e63ff9129a8b56654c4eac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 13:28:05 2019 +0300 mfplat: Free event value on release. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6bec418..7a8361f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2088,7 +2088,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) return S_OK; } -typedef struct _mfmediaevent +typedef struct media_event { mfattributes attributes; IMFMediaEvent IMFMediaEvent_iface; @@ -2139,14 +2139,15 @@ static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface) static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); - ULONG ref = InterlockedDecrement(&This->attributes.ref); + struct media_event *event = impl_from_IMFMediaEvent(iface); + ULONG ref = InterlockedDecrement(&event->attributes.ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%u\n", iface, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + PropVariantClear(&event->value); + heap_free(event); } return ref;

1 0