wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Nikolay Sivov : imm32: Replace macros with helper functions.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: c4a4146534cc47f5a60d57a4fd06400ff2472fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a4146534cc47f5a60d57a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 7 11:23:35 2019 +0300 imm32: Replace macros with helper functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28eb00f..96a11ab 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -119,8 +119,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; -#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) -#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) +static inline BOOL is_himc_ime_unicode(const InputContextData *data) +{ + return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE); +} + +static inline BOOL is_kbd_ime_unicode(const ImmHkl *hkl) +{ + return !!(hkl->imeInfo.fdwProperty & IME_PROP_UNICODE); +} static BOOL IMM_DestroyContext(HIMC hIMC); static InputContextData* get_imc_data(HIMC hIMC);

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

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

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

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 : 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 : mshtml: Store GeckoBrowser weak reference in HTMLOuterWindow.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: a007de5242fc4a8cb12e258e9d37af2663879f08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a007de5242fc4a8cb12e258e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:25:21 2019 +0100 mshtml: Store GeckoBrowser weak reference in HTMLOuterWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 7 +++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d980645..e5d08c9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -216,6 +216,11 @@ static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) static void release_outer_window(HTMLOuterWindow *This) { + if(This->browser) { + list_remove(&This->browser_entry); + This->browser = NULL; + } + if(This->pending_window) { abort_window_bindings(This->pending_window); This->pending_window->base.outer_window = NULL; @@ -970,7 +975,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, if(replace) FIXME("unsupported relace argument\n"); - if(!window->doc_obj || !window->uri_nofrag) + if(!window->browser || !window->uri_nofrag) return E_UNEXPECTED; if(name && *name == '_') { @@ -3547,6 +3552,8 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow window->base.inner_window = NULL; window->doc_obj = browser->doc; + window->browser = browser; + list_add_head(&browser->outer_windows, &window->browser_entry); mozIDOMWindowProxy_AddRef(mozwindow); window->window_proxy = mozwindow; @@ -3630,7 +3637,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return E_FAIL; } - hres = create_document_node(nshtmldoc, outer_window->doc_obj->nscontainer, window, &window->doc); + hres = create_document_node(nshtmldoc, outer_window->browser, window, &window->doc); nsIDOMHTMLDocument_Release(nshtmldoc); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aa0cac8..922ac02 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -486,6 +486,9 @@ struct HTMLOuterWindow { HTMLOuterWindow *parent; HTMLFrameBase *frame_element; + GeckoBrowser *browser; + struct list browser_entry; + READYSTATE readystate; BOOL readystate_locked; unsigned readystate_pending; @@ -724,6 +727,7 @@ struct GeckoBrowser { HWND hwnd; struct list document_nodes; + struct list outer_windows; }; typedef struct { diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 49bbbfd..cab41c3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2158,6 +2158,7 @@ HRESULT create_gecko_browser(HTMLDocumentObj *doc, GeckoBrowser **_ret) ret->doc = doc; ret->ref = 1; list_init(&ret->document_nodes); + list_init(&ret->outer_windows); hres = init_browser(ret); if(SUCCEEDED(hres)) @@ -2179,6 +2180,12 @@ void detach_gecko_browser(GeckoBrowser *This) doc->browser = NULL; } + while(!list_empty(&This->outer_windows)) { + HTMLOuterWindow *window = LIST_ENTRY(list_head(&This->outer_windows), HTMLOuterWindow, browser_entry); + list_remove(&window->browser_entry); + window->browser = NULL; + } + ShowWindow(This->hwnd, SW_HIDE); SetParent(This->hwnd, NULL);

1 0

Jacek Caban : mshtml: Pass GeckoBrowser instead of HTMLDocumentObj to create_outer_window.
by Alexandre Julliard 11 Mar '19

11 Mar '19

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

Jacek Caban : mshtml: Store weak GeckoBrowser reference in HTMLDocumentNode.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 5e581621ab55be8658a495d867086f0ee221cc94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e581621ab55be8658a495d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:24:26 2019 +0100 mshtml: Store weak GeckoBrowser reference in HTMLDocumentNode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 8 ++++++++ dlls/mshtml/mshtml_private.h | 5 +++++ dlls/mshtml/nsembed.c | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7478785..afb4a8a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4911,6 +4911,11 @@ void detach_document_node(HTMLDocumentNode *doc) IHTMLWindow2_Release(&doc->window->base.IHTMLWindow2_iface); doc->window = NULL; } + + if(doc->browser) { + list_remove(&doc->browser_entry); + doc->browser = NULL; + } } static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) @@ -5194,6 +5199,9 @@ HRESULT create_document_node(nsIDOMHTMLDocument *nsdoc, GeckoBrowser *browser, H doc->node.vtbl = &HTMLDocumentNodeImplVtbl; + list_add_head(&browser->document_nodes, &doc->browser_entry); + doc->browser = browser; + *ret = doc; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 93265d6..2808ca9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -722,6 +722,8 @@ struct GeckoBrowser { nsIURIContentListener *content_listener; HWND hwnd; + + struct list document_nodes; }; typedef struct { @@ -830,6 +832,9 @@ struct HTMLDocumentNode { HTMLInnerWindow *window; + GeckoBrowser *browser; + struct list browser_entry; + compat_mode_t document_mode; BOOL document_mode_locked; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fb0d2b8..49bbbfd 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1359,6 +1359,8 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->doc) + detach_gecko_browser(This); if(This->weak_reference) { This->weak_reference->browser = NULL; nsIWeakReference_Release(&This->weak_reference->nsIWeakReference_iface); @@ -2155,6 +2157,7 @@ HRESULT create_gecko_browser(HTMLDocumentObj *doc, GeckoBrowser **_ret) ret->doc = doc; ret->ref = 1; + list_init(&ret->document_nodes); hres = init_browser(ret); if(SUCCEEDED(hres)) @@ -2170,6 +2173,12 @@ void detach_gecko_browser(GeckoBrowser *This) This->doc = NULL; + while(!list_empty(&This->document_nodes)) { + HTMLDocumentNode *doc = LIST_ENTRY(list_head(&This->document_nodes), HTMLDocumentNode, browser_entry); + list_remove(&doc->browser_entry); + doc->browser = NULL; + } + ShowWindow(This->hwnd, SW_HIDE); SetParent(This->hwnd, NULL);

1 0

Jacek Caban : mshtml: Use global security manager.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 0ebbceddaa27d42fd975268f3d313df9576a763b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ebbceddaa27d42fd975268f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 14:24:09 2019 +0100 mshtml: Use global security manager. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++++ dlls/mshtml/htmlwindow.c | 9 --------- dlls/mshtml/main.c | 20 ++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/mutation.c | 3 ++- dlls/mshtml/persist.c | 2 +- dlls/mshtml/secmgr.c | 6 +++--- 7 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2d58b8d..7478785 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5446,6 +5446,10 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii return E_INVALIDARG; } + /* ensure that security manager is initialized */ + if(!get_security_manager()) + return E_OUTOFMEMORY; + doc = heap_alloc_zero(sizeof(HTMLDocumentObj)); if(!doc) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 71ffaea..4d36f60 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -228,9 +228,6 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->base.inner_window) detach_inner_window(This->base.inner_window); - if(This->secmgr) - IInternetSecurityManager_Release(This->secmgr); - if(This->frame_element) This->frame_element->content_window = NULL; @@ -3574,12 +3571,6 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, return hres; } - hres = CoInternetCreateSecurityManager(NULL, &window->secmgr, 0); - if(FAILED(hres)) { - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); - return hres; - } - if(parent) { IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 2ba648f..683e732 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -54,6 +54,7 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; +static IInternetSecurityManager *security_manager; static unsigned global_max_compat_mode = COMPAT_MODE_IE11; static struct list compat_config = LIST_INIT(compat_config); @@ -118,6 +119,23 @@ BSTR charset_string_from_cp(UINT cp) return SysAllocString(info.wszWebCharset); } +IInternetSecurityManager *get_security_manager(void) +{ + if(!security_manager) { + IInternetSecurityManager *manager; + HRESULT hres; + + hres = CoInternetCreateSecurityManager(NULL, &manager, 0); + if(FAILED(hres)) + return NULL; + + if(InterlockedCompareExchangePointer((void**)&security_manager, manager, NULL)) + IInternetSecurityManager_Release(manager); + } + + return security_manager; +} + static BOOL read_compat_mode(HKEY key, compat_mode_t *r) { WCHAR version[32]; @@ -266,6 +284,8 @@ static void process_detach(void) TlsFree(mshtml_tls); if(mlang) IMultiLanguage2_Release(mlang); + if(security_manager) + IInternetSecurityManager_Release(security_manager); free_strings(); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 34a0d8b..93265d6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -499,8 +499,6 @@ struct HTMLOuterWindow { SCRIPTMODE scriptmode; - IInternetSecurityManager *secmgr; - struct list sibling_entry; struct wine_rb_entry entry; }; @@ -1330,5 +1328,6 @@ UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN; +IInternetSecurityManager *get_security_manager(void) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 1a1cfe3..23e6a39 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -818,6 +818,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, if(This->document_mode == COMPAT_MODE_QUIRKS) { nsIDOMDocumentType *nsdoctype; + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMDocumentType, (void**)&nsdoctype); if(NS_SUCCEEDED(nsres)) { compat_mode_t mode = COMPAT_MODE_IE7; @@ -835,7 +836,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, * X-UA-Compatible version, allow configuration and default to higher version * (once it's well supported). */ - hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0); + hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), window->url, &zone, 0); if(SUCCEEDED(hres) && zone == URLZONE_INTERNET) mode = COMPAT_MODE_IE8; } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d789356..926689d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -62,7 +62,7 @@ static BOOL use_gecko_script(HTMLOuterWindow *window) DWORD zone; HRESULT hres; - hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0); + hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), window->url, &zone, 0); if(FAILED(hres)) { WARN("Could not map %s to zone: %08x\n", debugstr_w(window->url), hres); return TRUE; diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index f961bca..a03a796 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -86,7 +86,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; - return IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, dwAction, pPolicy, cbPolicy, + return IInternetSecurityManager_ProcessUrlAction(get_security_manager(), url, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); } @@ -122,7 +122,7 @@ static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct C /* FIXME: Check URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY */ - hres = IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, + hres = IInternetSecurityManager_ProcessUrlAction(get_security_manager(), url, URLACTION_SCRIPT_SAFE_ACTIVEX, (BYTE*)&policy, sizeof(policy), NULL, 0, 0, 0); if(FAILED(hres) || policy != URLPOLICY_ALLOW) { *ret = URLPOLICY_DISALLOW; @@ -191,7 +191,7 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; - hres = IInternetSecurityManager_QueryCustomPolicy(This->basedoc.window->secmgr, url, guidKey, ppPolicy, pcbPolicy, + hres = IInternetSecurityManager_QueryCustomPolicy(get_security_manager(), url, guidKey, ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); if(hres != HRESULT_FROM_WIN32(ERROR_NOT_FOUND)) return hres;

1 0

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 March 2019