July 2024 - Wine-Commits - list.winehq.org

Elizabeth Figura : setupapi: Correctly interpret the INFCONTEXT parameter in SetupGetSourceFileLocation().
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: bdb04298254954514e2232b1ce0f3d9418e61e12 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdb04298254954514e2232b1ce0f3d… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 15 16:34:29 2024 -0500 setupapi: Correctly interpret the INFCONTEXT parameter in SetupGetSourceFileLocation(). --- dlls/setupapi/query.c | 24 +++++++++++++++++++++--- dlls/setupapi/tests/query.c | 14 +++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 88efea17473..c94fec77124 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -413,9 +413,27 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id, buffer, buffer_size, required_size); - if (!context) context = &ctx; + if (context) + { + WCHAR *ctx_filename; + DWORD filename_size; + + if (!SetupGetStringFieldW( context, 1, NULL, 0, &filename_size )) + return FALSE; + if (!(ctx_filename = malloc( filename_size * sizeof(WCHAR) ))) + return FALSE; + SetupGetStringFieldW( context, 1, ctx_filename, filename_size, NULL ); + + source_id_str = get_source_id( hinf, &ctx, ctx_filename ); + + free( ctx_filename ); + } + else + { + source_id_str = get_source_id( hinf, &ctx, filename ); + } - if (!(source_id_str = get_source_id( hinf, context, filename ))) + if (!source_id_str) return FALSE; *source_id = wcstol( source_id_str, &end, 10 ); @@ -426,7 +444,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR } free( source_id_str ); - if (SetupGetStringFieldW( context, 4, buffer, buffer_size, required_size )) + if (SetupGetStringFieldW( &ctx, 4, buffer, buffer_size, required_size )) return TRUE; if (required_size) *required_size = 1; diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 145ca6e12eb..8f4400b802e 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -356,12 +356,12 @@ static void test_SetupGetSourceFileLocation(void) ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); ok(ret, "Got error %lu.\n", GetLastError()); - todo_wine ok(source_id == 2, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); + ok(source_id == 2, "Got source id %u.\n", source_id); + ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); /* ctx should not be changed. */ ret = SetupGetLineTextA(&ctx, NULL, NULL, NULL, buffer, sizeof(buffer), NULL); - todo_wine ok(!strcmp(buffer, "one.txt,,2"), "Got line %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "one.txt,,2"), "Got line %s.\n", debugstr_a(buffer)); /* Test when the source name differs from the destination name. * It seems SetupGetSourceFileLocation() is buggy and doesn't take that @@ -370,18 +370,18 @@ static void test_SetupGetSourceFileLocation(void) ret = SetupFindNextLine(&ctx, &ctx); ok(ret, "Got error %lu.\n", GetLastError()); ret = SetupFindNextLine(&ctx, &ctx); - todo_wine ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret, "Got error %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); - todo_wine ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_LINE_NOT_FOUND, "Got error %lu.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "Got error %lu.\n", GetLastError()); ret = SetupFindNextLine(&ctx, &ctx); ok(ret, "Got error %lu.\n", GetLastError()); ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); - ok(ret, "Got error %lu.\n", GetLastError()); + todo_wine ok(ret, "Got error %lu.\n", GetLastError()); todo_wine ok(source_id == 10, "Got source id %u.\n", source_id); todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer));

1 0

Elizabeth Figura : setupapi: Return the file's relative path from SetupGetSourceFileLocation().
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 56089f60ed1d66c68338bb150b29ac16e13248d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/56089f60ed1d66c68338bb150b29ac… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 15 16:34:29 2024 -0500 setupapi: Return the file's relative path from SetupGetSourceFileLocation(). --- dlls/setupapi/query.c | 8 +------- dlls/setupapi/tests/query.c | 14 +++++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index c94fec77124..40ec30ae11f 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -390,12 +390,6 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) return NULL; } - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id, context ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id, context )) - { - free( source_id ); - return NULL; - } return source_id; } @@ -444,7 +438,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR } free( source_id_str ); - if (SetupGetStringFieldW( &ctx, 4, buffer, buffer_size, required_size )) + if (SetupGetStringFieldW( &ctx, 2, buffer, buffer_size, required_size )) return TRUE; if (required_size) *required_size = 1; diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 8f4400b802e..d5de41b368a 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -349,7 +349,7 @@ static void test_SetupGetSourceFileLocation(void) ret = SetupGetSourceFileLocationA(hinf, NULL, "two.txt", &source_id, buffer, sizeof(buffer), NULL); ok(ret, "Got error %lu.\n", GetLastError()); ok(source_id == 4, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, "there"), "Got relative path %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "there"), "Got relative path %s.\n", debugstr_a(buffer)); ret = SetupFindFirstLineA(hinf, "copy_section", NULL, &ctx); ok(ret, "Got error %lu.\n", GetLastError()); @@ -381,14 +381,14 @@ static void test_SetupGetSourceFileLocation(void) ok(ret, "Got error %lu.\n", GetLastError()); ret = SetupGetSourceFileLocationA(hinf, &ctx, "two.txt", &source_id, buffer, sizeof(buffer), NULL); - todo_wine ok(ret, "Got error %lu.\n", GetLastError()); - todo_wine ok(source_id == 10, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(source_id == 10, "Got source id %u.\n", source_id); + ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); ret = SetupGetSourceFileLocationA(hinf, NULL, "three.txt", &source_id, buffer, sizeof(buffer), NULL); - todo_wine ok(ret, "Got error %lu.\n", GetLastError()); - todo_wine ok(source_id == 6, "Got source id %u.\n", source_id); - todo_wine ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(source_id == 6, "Got source id %u.\n", source_id); + ok(!strcmp(buffer, ""), "Got relative path %s.\n", debugstr_a(buffer)); SetLastError(0xdeadbeef); ret = SetupGetSourceFileLocationA(hinf, NULL, "four.txt", &source_id, buffer, sizeof(buffer), NULL);

1 0

Hans Leidekker : odbc32: Properly handle string length in traces.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: dfbde6730780b4ade1530a745e3d588da92bd67e URL: https://gitlab.winehq.org/wine/wine/-/commit/dfbde6730780b4ade1530a745e3d58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 15 15:25:49 2024 +0200 odbc32: Properly handle string length in traces. String length may be SQL_NTS(-3) which means the string is null-terminated. --- dlls/odbc32/proxyodbc.c | 178 ++++++++++++++++++++++----------------------- dlls/odbc32/tests/odbc32.c | 3 +- 2 files changed, 91 insertions(+), 90 deletions(-)

1 0

Jacek Caban : mshtml: Use host object script bindings for MSNamespaceInfoCollection class.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 4a4582d2e07fa5480185675492f19e104c3a5106 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a4582d2e07fa5480185675492f19e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 13:33:39 2024 +0200 mshtml: Use host object script bindings for MSNamespaceInfoCollection class. --- dlls/mshtml/htmldoc.c | 3 +-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 5 +++-- dlls/mshtml/tests/documentmode.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ca76318c1b3..172ad524538 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2819,8 +2819,7 @@ static HRESULT WINAPI HTMLDocument4_get_namespaces(IHTMLDocument4 *iface, IDispa if(!This->namespaces) { HRESULT hres; - hres = create_namespace_collection(dispex_compat_mode(&This->node.event_target.dispex), - &This->namespaces); + hres = create_namespace_collection(This, &This->namespaces); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 080ad008cbe..c7b4c972a31 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1049,7 +1049,7 @@ HRESULT create_navigator(HTMLInnerWindow*,IOmNavigator**); HRESULT create_html_screen(HTMLInnerWindow*,IHTMLScreen**); HRESULT create_performance(HTMLInnerWindow*,IHTMLPerformance**); HRESULT create_history(HTMLInnerWindow*,OmHistory**); -HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**); +HRESULT create_namespace_collection(HTMLDocumentNode*,IHTMLNamespaceCollection**); HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**); void detach_dom_implementation(IHTMLDOMImplementation*); HRESULT create_html_storage(HTMLInnerWindow*,BOOL,IHTMLStorage**); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 4fd8e9ee03f..900c4ee0ca7 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1920,7 +1920,7 @@ static dispex_static_data_t HTMLNamespaceCollection_dispex = { HTMLNamespaceCollection_iface_tids }; -HRESULT create_namespace_collection(compat_mode_t compat_mode, IHTMLNamespaceCollection **ret) +HRESULT create_namespace_collection(HTMLDocumentNode *doc, IHTMLNamespaceCollection **ret) { HTMLNamespaceCollection *namespaces; @@ -1928,7 +1928,8 @@ HRESULT create_namespace_collection(compat_mode_t compat_mode, IHTMLNamespaceCol return E_OUTOFMEMORY; namespaces->IHTMLNamespaceCollection_iface.lpVtbl = &HTMLNamespaceCollectionVtbl; - init_dispatch(&namespaces->dispex, &HTMLNamespaceCollection_dispex, NULL, compat_mode); + init_dispatch(&namespaces->dispex, &HTMLNamespaceCollection_dispex, doc->script_global, + dispex_compat_mode(&doc->node.event_target.dispex)); *ret = &namespaces->IHTMLNamespaceCollection_iface; return S_OK; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index b6f055e3c85..e6a39922157 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -320,7 +320,7 @@ sync_test("builtin_toString", function() { test("window", window, "Window", "[object Window]", true); test("xmlHttpRequest", new XMLHttpRequest(), "XMLHttpRequest", null, true); if(v < 10) { - test("namespaces", document.namespaces, "MSNamespaceInfoCollection", null, true); + test("namespaces", document.namespaces, "MSNamespaceInfoCollection"); } if(v < 11) { test("eventObject", document.createEventObject(), "MSEventObj", null, true);

1 0

Jacek Caban : mshtml: Use host object script bindings for event objects.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 6411d464e50dbede5e10069eace062591329b6b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6411d464e50dbede5e10069eace062… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 14 16:34:29 2024 +0200 mshtml: Use host object script bindings for event objects. --- dlls/mshtml/htmlevent.c | 69 +++++++++++++++++++++++---------------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 3 +- dlls/mshtml/nsevents.c | 8 ++--- dlls/mshtml/tests/documentmode.js | 14 ++++---- dlls/mshtml/tests/xhr.js | 1 - dlls/mshtml/xmlhttprequest.c | 2 +- 7 files changed, 55 insertions(+), 44 deletions(-)

1 0

Eric Pouech : winedump: Protect against corrupt minidump files.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 5712fc19032675039b7da91e3b0cbaa2601f1fea URL: https://gitlab.winehq.org/wine/wine/-/commit/5712fc19032675039b7da91e3b0cba… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 7 15:21:22 2024 +0200 winedump: Protect against corrupt minidump files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/minidump.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 80057a21829..fddfd0e45fe 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -76,7 +76,7 @@ void mdmp_dump(void) if (!hdr) { - printf("Cannot get Minidump header\n"); + printf("Corrupt file, cannot get Minidump header\n"); return; } @@ -89,13 +89,21 @@ void mdmp_dump(void) printf(" TimeDateStamp: %s\n", get_time_str(hdr->TimeDateStamp)); printf("Flags: %s\n", get_hexint64_str(hdr->Flags)); + if (!PRD(hdr->StreamDirectoryRva, hdr->NumberOfStreams * sizeof(MINIDUMP_DIRECTORY))) + { + printf("Corrupt file, can't read all minidump directories\n"); + return; + } for (idx = 0; idx < hdr->NumberOfStreams; ++idx) { dir = PRD(hdr->StreamDirectoryRva + idx * sizeof(MINIDUMP_DIRECTORY), sizeof(*dir)); - if (!dir) break; stream = PRD(dir->Location.Rva, dir->Location.DataSize); - + if (!stream) + { + printf("Stream [%u]: corrupt file, stream is larger that file\n", idx); + continue; + } switch (dir->StreamType) { case UnusedStream:

1 0

Jacek Caban : mshtml: Use host object script bindings for MSEventObj class.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: f08a2be026046113cdcd6e55ca2e9b0393d40913 URL: https://gitlab.winehq.org/wine/wine/-/commit/f08a2be026046113cdcd6e55ca2e9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 13:57:51 2024 +0200 mshtml: Use host object script bindings for MSEventObj class. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 19 +++++++++++-------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 172ad524538..a5f4f558bdd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2863,7 +2863,7 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, return E_NOTIMPL; } - return create_event_obj(NULL, dispex_compat_mode(&This->node.event_target.dispex), ppEventObj); + return create_event_obj(NULL, This, ppEventObj); } static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b56cf8030e5..12e947fecd3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1815,7 +1815,7 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode) +static HTMLEventObj *alloc_event_obj(DOMEvent *event, HTMLInnerWindow *script_global) { HTMLEventObj *event_obj; @@ -1830,18 +1830,21 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode) event_obj->IHTMLEventObj5_iface.lpVtbl = &HTMLEventObj5Vtbl; event_obj->IHTMLEventObj6_iface.lpVtbl = &HTMLEventObj6Vtbl; event_obj->event = event; - if(event) + if(event) { IDOMEvent_AddRef(&event->IDOMEvent_iface); - - init_dispatch(&event_obj->dispex, &HTMLEventObj_dispex, NULL, compat_mode); + init_dispatch_with_owner(&event_obj->dispex, &HTMLEventObj_dispex, &event->dispex); + }else { + init_dispatch(&event_obj->dispex, &HTMLEventObj_dispex, script_global, + dispex_compat_mode(&script_global->event_target.dispex)); + } return event_obj; } -HRESULT create_event_obj(DOMEvent *event, compat_mode_t compat_mode, IHTMLEventObj **ret) +HRESULT create_event_obj(DOMEvent *event, HTMLDocumentNode *doc, IHTMLEventObj **ret) { HTMLEventObj *event_obj; - event_obj = alloc_event_obj(event, compat_mode); + event_obj = alloc_event_obj(event, doc->script_global); if(!event_obj) return E_OUTOFMEMORY; @@ -4424,7 +4427,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } while(iter); if(!event->event_obj && !event->no_event_obj) { - event_obj_ref = alloc_event_obj(event, dispex_compat_mode(&event->dispex)); + event_obj_ref = alloc_event_obj(event, NULL); if(event_obj_ref) event->event_obj = &event_obj_ref->IHTMLEventObj_iface; } @@ -4556,7 +4559,7 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va } if(!event_obj) { - event_obj = alloc_event_obj(NULL, dispex_compat_mode(&node->event_target.dispex)); + event_obj = alloc_event_obj(NULL, node->doc->script_global); if(!event_obj) return E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 2fc72fb4a34..cd099850771 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -107,7 +107,7 @@ HRESULT fire_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*); HRESULT doc_init_events(HTMLDocumentNode*); void detach_events(HTMLDocumentNode *doc); -HRESULT create_event_obj(DOMEvent*,compat_mode_t,IHTMLEventObj**); +HRESULT create_event_obj(DOMEvent*,HTMLDocumentNode*,IHTMLEventObj**); void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*); HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,nsIDOMNode*,eventid_t); diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 174813a3fef..d4a84a05a3c 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -216,7 +216,7 @@ static void storage_event_proc(event_task_t *_task) if(event->event_id == EVENTID_STORAGE && (compat_mode = dispex_compat_mode(&window->event_target.dispex)) >= COMPAT_MODE_IE9) { dispatch_event(&window->event_target, event); if(window->doc) { - hres = create_event_obj(event, compat_mode, (IHTMLEventObj**)&V_DISPATCH(&var)); + hres = create_event_obj(event, window->doc, (IHTMLEventObj**)&V_DISPATCH(&var)); if(SUCCEEDED(hres)) { V_VT(&var) = VT_DISPATCH; fire_event(&window->doc->node, L"onstorage", &var, &cancelled); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index e6a39922157..24cd27ce64b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -323,7 +323,7 @@ sync_test("builtin_toString", function() { test("namespaces", document.namespaces, "MSNamespaceInfoCollection"); } if(v < 11) { - test("eventObject", document.createEventObject(), "MSEventObj", null, true); + test("eventObject", document.createEventObject(), "MSEventObj"); test("selection", document.selection, "MSSelection"); } if(v >= 9) {

1 0

Jacek Caban : mshtml: Use host object script bindings for MimeTypeArray class.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 5eb4c8e58c61aad1d3e94c598b7a3fee5bd67081 URL: https://gitlab.winehq.org/wine/wine/-/commit/5eb4c8e58c61aad1d3e94c598b7a3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 13:29:55 2024 +0200 mshtml: Use host object script bindings for MimeTypeArray class. --- dlls/mshtml/omnavigator.c | 3 +-- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 2b2b54cc2df..4fd8e9ee03f 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -786,8 +786,7 @@ static HRESULT create_mime_types_collection(OmNavigator *navigator, HTMLMimeType col->IHTMLMimeTypesCollection_iface.lpVtbl = &HTMLMimeTypesCollectionVtbl; col->navigator = navigator; - init_dispatch(&col->dispex, &HTMLMimeTypesCollection_dispex, NULL, - dispex_compat_mode(&navigator->dispex)); + init_dispatch_with_owner(&col->dispex, &HTMLMimeTypesCollection_dispex, &navigator->dispex); *ret = col; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 95652bd5b72..b6f055e3c85 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -302,7 +302,7 @@ sync_test("builtin_toString", function() { test("implementation", document.implementation, "DOMImplementation"); if(localStorage) test("localStorage", localStorage, "Storage", null, true); test("location", window.location, "Object", window.location.href, null, true); - if(v >= 11 /* todo_wine */) test("mimeTypes", window.navigator.mimeTypes, v < 11 ? "MSMimeTypesCollection" : "MimeTypeArray", null, true); + if(v >= 11 /* todo_wine */) test("mimeTypes", window.navigator.mimeTypes, v < 11 ? "MSMimeTypesCollection" : "MimeTypeArray"); test("navigator", window.navigator, "Navigator"); test("performance", window.performance, "Performance"); test("performanceNavigation", window.performance.navigation, "PerformanceNavigation");

1 0

Jacek Caban : mshtml: Use host object script bindings for PluginArray class.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: c6b349eb78503dfff6e889eeb6f99c3b5b90ed44 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6b349eb78503dfff6e889eeb6f99c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 12:18:30 2024 +0200 mshtml: Use host object script bindings for PluginArray class. --- dlls/jscript/dispex.c | 15 +++++++++++++++ dlls/jscript/jsdisp.idl | 3 +++ dlls/mshtml/dispex.c | 8 ++++++++ dlls/mshtml/htmlwindow.c | 20 ++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 3 +-- dlls/mshtml/tests/documentmode.js | 2 +- 7 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dbdc64659a8..517859433f2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2308,6 +2308,20 @@ static void WINAPI WineJSDispatch_Free(IWineJSDispatch *iface) jsdisp_free(This); } +static HRESULT WINAPI WineJSDispatch_GetScriptGlobal(IWineJSDispatch *iface, IWineJSDispatchHost **ret) +{ + jsdisp_t *This = impl_from_IWineJSDispatch(iface); + IDispatch *disp; + + if(!This->ctx->site) + return E_UNEXPECTED; + + if(!(disp = lookup_global_host(This->ctx))) + return E_NOINTERFACE; + + return IDispatch_QueryInterface(disp, &IID_IWineJSDispatchHost, (void **)ret); +} + static IWineJSDispatchVtbl DispatchExVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, @@ -2325,6 +2339,7 @@ static IWineJSDispatchVtbl DispatchExVtbl = { DispatchEx_GetNextDispID, DispatchEx_GetNameSpaceParent, WineJSDispatch_Free, + WineJSDispatch_GetScriptGlobal, }; jsdisp_t *as_jsdisp(IDispatch *disp) diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index 8ea53396f09..f01ea95ce48 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -34,6 +34,8 @@ const unsigned int PROPF_ENUMERABLE = 0x0400; const unsigned int PROPF_WRITABLE = 0x0800; const unsigned int PROPF_CONFIGURABLE = 0x1000; +interface IWineJSDispatchHost; + [ object, uuid(d359f2fe-5531-741b-a41a-5cf92edc971c), @@ -42,6 +44,7 @@ const unsigned int PROPF_CONFIGURABLE = 0x1000; interface IWineJSDispatch : IDispatchEx { void Free(); + HRESULT GetScriptGlobal(IWineJSDispatchHost **ret); } [ diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7b334ac3001..72eb8db40a7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2573,3 +2573,11 @@ void init_dispatch(DispatchEx *dispex, dispex_static_data_t *data, HTMLInnerWind dispex->info = ensure_dispex_info(dispex, data, compat_mode, script_global); } } + +void init_dispatch_with_owner(DispatchEx *dispex, dispex_static_data_t *desc, DispatchEx *owner) +{ + HTMLInnerWindow *script_global = get_script_global(owner); + init_dispatch(dispex, desc, script_global, dispex_compat_mode(owner)); + if(script_global) + IHTMLWindow2_Release(&script_global->base.IHTMLWindow2_iface); +} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 88c9879ac69..af2a0e83d66 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -4208,6 +4208,26 @@ void init_window_cc(void) ccp_init(&outer_window_ccp, &ccp_callback); } +HTMLInnerWindow *get_script_global(DispatchEx *dispex) +{ + IWineJSDispatchHost *disp; + HTMLInnerWindow *ret; + HRESULT hres; + + if(!dispex->jsdisp) + return NULL; + hres = IWineJSDispatch_GetScriptGlobal(dispex->jsdisp, &disp); + if(FAILED(hres)) + return NULL; + + assert(disp->lpVtbl == &WindowDispExVtbl); + ret = impl_from_IWineJSDispatchHost(disp)->base.inner_window; + if(ret) + IHTMLWindow2_AddRef(&ret->base.IHTMLWindow2_iface); + IWineJSDispatchHost_Release(disp); + return ret; +} + static void *alloc_window(size_t size) { HTMLWindow *window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2bd0887d735..080ad008cbe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -492,6 +492,8 @@ extern void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char* extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*); void init_dispatch(DispatchEx*,dispex_static_data_t*,HTMLInnerWindow*,compat_mode_t); +void init_dispatch_with_owner(DispatchEx*,dispex_static_data_t*,DispatchEx*); +HTMLInnerWindow *get_script_global(DispatchEx*); void dispex_props_unlink(DispatchEx*); HRESULT change_type(VARIANT*,VARIANT*,VARTYPE,IServiceProvider*); HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 6284858b763..2b2b54cc2df 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -685,8 +685,7 @@ static HRESULT create_plugins_collection(OmNavigator *navigator, HTMLPluginsColl col->IHTMLPluginsCollection_iface.lpVtbl = &HTMLPluginsCollectionVtbl; col->navigator = navigator; - init_dispatch(&col->dispex, &HTMLPluginsCollection_dispex, NULL, - dispex_compat_mode(&navigator->dispex)); + init_dispatch_with_owner(&col->dispex, &HTMLPluginsCollection_dispex, &navigator->dispex); *ret = col; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index a00647c5ddd..95652bd5b72 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -307,7 +307,7 @@ sync_test("builtin_toString", function() { test("performance", window.performance, "Performance"); test("performanceNavigation", window.performance.navigation, "PerformanceNavigation"); test("performanceTiming", window.performance.timing, "PerformanceTiming"); - if(v >= 11 /* todo_wine */) test("plugins", window.navigator.plugins, v < 11 ? "MSPluginsCollection" : "PluginArray", null, true); + if(v >= 11 /* todo_wine */) test("plugins", window.navigator.plugins, v < 11 ? "MSPluginsCollection" : "PluginArray"); test("screen", window.screen, "Screen"); test("sessionStorage", window.sessionStorage, "Storage", null, true); test("style", document.body.style, "MSStyleCSSProperties", null, true);

1 0

Jacek Caban : mshtml: Use host object script bindings for Attr class.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: ef5fe7386039202259f08aceb27e88b6e9ebf0d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef5fe7386039202259f08aceb27e88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 11 14:05:27 2024 +0200 mshtml: Use host object script bindings for Attr class. --- dlls/mshtml/htmlattr.c | 6 ++++-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index b9d3f82e84c..4f58926d237 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -422,7 +422,8 @@ HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) return iface->lpVtbl == &HTMLDOMAttributeVtbl ? impl_from_IHTMLDOMAttribute(iface) : NULL; } -HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, compat_mode_t compat_mode, HTMLDOMAttribute **attr) +HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, + HTMLDocumentNode *doc, HTMLDOMAttribute **attr) { HTMLAttributeCollection *col; HTMLDOMAttribute *ret; @@ -437,7 +438,8 @@ HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dis ret->dispid = dispid; ret->elem = elem; - init_dispatch(&ret->dispex, &HTMLDOMAttribute_dispex, NULL, compat_mode); + init_dispatch(&ret->dispex, &HTMLDOMAttribute_dispex, doc->script_global, + dispex_compat_mode(&doc->script_global->event_target.dispex)); /* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */ if(elem) { diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0ed6b1d6710..ca76318c1b3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3015,7 +3015,7 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); - hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, dispex_compat_mode(&This->node.event_target.dispex), &attr); + hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, This, &attr); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 581b50ee822..470b718523b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7615,7 +7615,7 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG } if(!*attr) { - hres = HTMLDOMAttribute_Create(NULL, This->elem, id, dispex_compat_mode(&This->elem->node.event_target.dispex), attr); + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, This->elem->node.doc, attr); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e41b4fd592c..2bd0887d735 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1208,7 +1208,7 @@ typedef struct { HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute*); -HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,compat_mode_t,HTMLDOMAttribute**); +HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDocumentNode*,HTMLDOMAttribute**); HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**); HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 3d592e9c47d..2fd940737c9 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -292,7 +292,7 @@ sync_test("builtin_toString", function() { } if(!localStorage) win_skip("localStorage is buggy and not available, skipping"); - test("attribute", document.createAttribute("class"), "Attr", null, true); + test("attribute", document.createAttribute("class"), "Attr"); if(false /* todo_wine */) test("attributes", e.attributes, "NamedNodeMap"); test("childNodes", document.body.childNodes, "NodeList", null, true); if(clientRects) test("clientRect", clientRects[0], "ClientRect", null, true);

1 0