wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Torge Matthies : powrprof: Add PowerUnregisterSuspendResumeNotification stub.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 2074e13a43ad07c635388fe3739225a2752b1754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2074e13a43ad07c635388fe3… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sun Feb 27 02:02:33 2022 +0100 powrprof: Add PowerUnregisterSuspendResumeNotification stub. Allegedly needed by Final Fantasy VII Remake to not crash on exit. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 7 +++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index c4af8ab9ce1..dc6e8bdaa15 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -333,6 +333,13 @@ DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) { FIXME("(0x%08lx,%p,%p) stub!\n", flags, recipient, handle); + *handle = (HPOWERNOTIFY)0xdeadbeef; + return ERROR_SUCCESS; +} + +DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p) stub!\n", handle); return ERROR_SUCCESS; } diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index bf12e14a323..cbd2e47c1f2 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -18,6 +18,7 @@ @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) @ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) +@ stdcall PowerUnregisterSuspendResumeNotification(ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 546e259a39a..6959a9aeb13 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -161,6 +161,7 @@ BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD, HANDLE, PHPOWERNOTIFY); +DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0

Brendan Shanks : winedbg: Print thread names in 'info thread' listing.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: b2d9fbd578c1eb6a336b2a907f99fe0dfcdc9274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d9fbd578c1eb6a336b2a90… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:05 2022 -0800 winedbg: Print thread names in 'info thread' listing. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 3ac00df911d..2b8e377e6f4 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -589,12 +589,14 @@ void info_win32_threads(void) THREADENTRY32 entry; BOOL ok; DWORD lastProcessId = 0; + struct dbg_process* p = NULL; + struct dbg_thread* t = NULL; entry.dwSize = sizeof(entry); ok = Thread32First(snap, &entry); - dbg_printf("%-8.8s %-8.8s %s (all id:s are in hex)\n", - "process", "tid", "prio"); + dbg_printf("%-8.8s %-8.8s %s %s (all IDs are in hex)\n", + "process", "tid", "prio", "name"); while (ok) { if (entry.th32OwnerProcessID != GetCurrentProcessId()) @@ -605,10 +607,10 @@ void info_win32_threads(void) */ if (entry.th32OwnerProcessID != lastProcessId) { - struct dbg_process* p = dbg_get_process(entry.th32OwnerProcessID); PROCESSENTRY32 pcs_entry; const char* exename; + p = dbg_get_process(entry.th32OwnerProcessID); if (p) exename = dbg_W2A(p->imageName, -1); else if (get_process_name(entry.th32OwnerProcessID, &pcs_entry)) @@ -620,9 +622,11 @@ void info_win32_threads(void) entry.th32OwnerProcessID, p ? " (D)" : "", exename); lastProcessId = entry.th32OwnerProcessID; } - dbg_printf("\t%08lx %4ld%s\n", + t = dbg_get_thread(p, entry.th32ThreadID); + dbg_printf("\t%08lx %4ld%s %s\n", entry.th32ThreadID, entry.tpBasePri, - (entry.th32ThreadID == dbg_curr_tid) ? " <==" : ""); + (entry.th32ThreadID == dbg_curr_tid) ? " <==" : " ", + t ? t->name : ""); } ok = Thread32Next(snap, &entry);

1 0

Brendan Shanks : winedbg: Don't set initial thread->name to the tid.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 88457bf68e9ef0a38bae622c97833f202181f767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88457bf68e9ef0a38bae622c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:04 2022 -0800 winedbg: Don't set initial thread->name to the tid. Currently the name is only used by GDB, send the tid there. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 11 ++++++++++- programs/winedbg/winedbg.c | 3 +-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 89985c06666..0268a288481 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1790,7 +1790,16 @@ static enum packet_return packet_query_threads(struct gdb_context* gdbctx) reply_buffer_append_str(reply, "id=\""); reply_buffer_append_uinthex(reply, thread->tid, 4); reply_buffer_append_str(reply, "\" name=\""); - reply_buffer_append_str(reply, thread->name); + if (strlen(thread->name)) + { + reply_buffer_append_str(reply, thread->name); + } + else + { + char tid[5]; + snprintf(tid, sizeof(tid), "%04lx", thread->tid); + reply_buffer_append_str(reply, tid); + } reply_buffer_append_str(reply, "\"/>"); } reply_buffer_append_str(reply, "</threads>"); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 95318eeb2f1..89fb265fc93 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -444,6 +444,7 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, t->step_over_bp.enabled = FALSE; t->step_over_bp.refcount = 0; t->stopped_xpoint = -1; + t->name[0] = '\0'; t->in_exception = FALSE; t->frames = NULL; t->num_frames = 0; @@ -451,8 +452,6 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, t->addr_mode = AddrModeFlat; t->suspended = FALSE; - snprintf(t->name, sizeof(t->name), "%04lx", tid); - list_add_head(&p->threads, &t->entry); return t;

1 0

Brendan Shanks : winedbg: Ensure thread->name is null-terminated.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 3c2c4437969a27f5c0755c4a053702d38abd8d5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2c4437969a27f5c0755c4a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:03 2022 -0800 winedbg: Ensure thread->name is null-terminated. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/tgt_active.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 50f48e8d1b8..2caa62206d6 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -257,9 +257,12 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance dbg_printf("Thread ID=%04lx not in our list of threads -> can't rename\n", pThreadName->dwThreadID); return DBG_CONTINUE; } - if (dbg_read_memory(pThreadName->szName, pThread->name, 9)) - dbg_printf("Thread ID=%04lx renamed using MS VC6 extension (name==\"%.9s\")\n", + if (dbg_read_memory(pThreadName->szName, pThread->name, sizeof(pThread->name))) + { + pThread->name[sizeof(pThread->name) - 1] = '\0'; + dbg_printf("Thread ID=%04lx renamed using MSVC extension (name==\"%s\")\n", pThread->tid, pThread->name); + } return DBG_CONTINUE; case EXCEPTION_INVALID_HANDLE: return DBG_CONTINUE;

1 0

Brendan Shanks : winedbg: Sanity check the dwType field of MSVC thread naming exceptions.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: ce07be1a791420ab1ed2dda7474452626a35016b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce07be1a791420ab1ed2dda7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:34:02 2022 -0800 winedbg: Sanity check the dwType field of MSVC thread naming exceptions. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 ++ programs/winedbg/tgt_active.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e7f9ddaf226..89985c06666 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -485,6 +485,8 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e char name[9]; SIZE_T read; + if (threadname->dwType != 0x1000) + return FALSE; if (threadname->dwThreadID == -1) thread = dbg_get_thread(gdbctx->process, gdbctx->de.dwThreadId); else diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8c365a1e55d..50f48e8d1b8 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -245,6 +245,9 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance break; case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); + + if (pThreadName->dwType != 0x1000) + return DBG_EXCEPTION_NOT_HANDLED; if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread; else

1 0

Jacek Caban : mshtml: Post messages asynchronously in IE9+ modes.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 24c10e700c14f51073af52435a22aa7f69a604cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c10e700c14f51073af5243… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 20:10:54 2022 +0100 mshtml: Post messages asynchronously in IE9+ modes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 33 +++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 11 +++++++++++ dlls/mshtml/tests/events.js | 1 - dlls/mshtml/tests/jstest.html | 15 --------------- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 28862c4ad40..ecd530db7e2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2194,6 +2194,25 @@ static HRESULT WINAPI HTMLWindow6_get_maxConnectionsPerServer(IHTMLWindow6 *ifac return E_NOTIMPL; } +struct post_message_task { + task_t header; + HTMLInnerWindow *window; + DOMEvent *event; +} ; + +static void post_message_proc(task_t *_task) +{ + struct post_message_task *task = (struct post_message_task *)_task; + dispatch_event(&task->window->event_target, task->event); +} + +static void post_message_destr(task_t *_task) +{ + struct post_message_task *task = (struct post_message_task *)_task; + IDOMEvent_Release(&task->event->IDOMEvent_iface); + IHTMLWindow2_Release(&task->window->base.IHTMLWindow2_iface); +} + static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); @@ -2211,6 +2230,20 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR if(FAILED(hres)) return hres; + if(dispex_compat_mode(&This->inner_window->event_target.dispex) >= COMPAT_MODE_IE9) { + struct post_message_task *task; + if(!(task = heap_alloc(sizeof(*task)))) { + IDOMEvent_Release(&event->IDOMEvent_iface); + return E_OUTOFMEMORY; + } + + task->event = event; + task->window = This->inner_window; + IHTMLWindow2_AddRef(&task->window->base.IHTMLWindow2_iface); + return push_task(&task->header, post_message_proc, post_message_destr, + This->inner_window->task_magic); + } + dispatch_event(&This->inner_window->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 6dcda4a8be0..ddcb738ab26 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1331,3 +1331,14 @@ sync_test("__proto__", function() { r = Object.getPrototypeOf(x); ok(r === ctor.prototype, "x.__proto__ after delete = " + r); }); + +async_test("postMessage", function() { + var v = document.documentMode; + var onmessage_called = false; + window.onmessage = function() { + onmessage_called = true; + next_test(); + } + window.postMessage("test", "*"); + ok(onmessage_called == (v < 9 ? true : false), "onmessage not called"); +}); diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index d66b44a8ef2..75893cac204 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -809,6 +809,5 @@ async_test("message event", function() { }); window.postMessage("test", "http://winetest.example.org"); - todo_wine. ok(listener_called == false, "listener already called"); }); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 164593ee0d3..3bf9f316e7a 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -365,20 +365,6 @@ function test_xhr() { ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); } -function test_postMessage() { - if(!("postMessage" in window)) { - win_skip("postMessage not available"); - return; - } - - var onmessage_called = false; - window.onmessage = function() { - onmessage_called = true; - } - window.postMessage("test", "*"); - ok(onmessage_called, "onmessage not called"); -} - var globalVar = false; function runTests() { @@ -405,7 +391,6 @@ function runTests() { test_language_attribute(); test_text_node(); test_xhr(); - test_postMessage(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml: Implement IDOMMessageEvent::data property.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: e3e17965f332e4b1d1a051d245bb6fcaa044db18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e17965f332e4b1d1a051d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 20:10:35 2022 +0100 mshtml: Implement IDOMMessageEvent::data property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 28 +++++++++++++++++++++++++--- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/tests/events.js | 16 ++++++++++++++++ 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index abf357a66ad..fe3433692f3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2150,6 +2150,7 @@ static void DOMCustomEvent_destroy(DOMEvent *event) typedef struct { DOMEvent event; IDOMMessageEvent IDOMMessageEvent_iface; + WCHAR *data; } DOMMessageEvent; static inline DOMMessageEvent *impl_from_IDOMMessageEvent(IDOMMessageEvent *iface) @@ -2209,10 +2210,9 @@ static HRESULT WINAPI DOMMessageEvent_get_data(IDOMMessageEvent *iface, BSTR *p) { DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - return S_OK; + return (*p = SysAllocString(This->data)) ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI DOMMessageEvent_get_origin(IDOMMessageEvent *iface, BSTR *p) @@ -2268,6 +2268,8 @@ static void *DOMMessageEvent_query_interface(DOMEvent *event, REFIID riid) static void DOMMessageEvent_destroy(DOMEvent *event) { + DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(event); + heap_free(message_event->data); } static const tid_t DOMEvent_iface_tids[] = { @@ -2513,6 +2515,26 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return S_OK; } +HRESULT create_message_event(HTMLDocumentNode *doc, BSTR data, DOMEvent **ret) +{ + DOMMessageEvent *message_event; + DOMEvent *event; + HRESULT hres; + + hres = create_document_event(doc, EVENTID_MESSAGE, &event); + if(FAILED(hres)) + return hres; + message_event = DOMMessageEvent_from_DOMEvent(event); + + if(!(message_event->data = heap_strdupW(data))) { + IDOMEvent_Release(&event->IDOMEvent_iface); + return E_OUTOFMEMORY; + } + + *ret = event; + return S_OK; +} + static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) { IDispatchEx *dispex; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ae3131e48b2..7f62bd69a7f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -112,6 +112,7 @@ void dispatch_event(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; HRESULT create_document_event(HTMLDocumentNode*,eventid_t,DOMEvent**) DECLSPEC_HIDDEN; HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; HRESULT create_event_from_nsevent(nsIDOMEvent*,compat_mode_t,DOMEvent**) DECLSPEC_HIDDEN; +HRESULT create_message_event(HTMLDocumentNode*,BSTR,DOMEvent**) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3784c3a9736..28862c4ad40 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2207,7 +2207,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR return E_FAIL; } - hres = create_document_event(This->inner_window->doc, EVENTID_MESSAGE, &event); + hres = create_message_event(This->inner_window->doc, msg, &event); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 6d451a641c2..d66b44a8ef2 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -796,3 +796,19 @@ async_test("detached_img_error_event", function() { } img.src = "about:blank"; }); + +async_test("message event", function() { + var listener_called = false; + + window.addEventListener("message", function(e) { + listener_called = true; + ok(e.data === "test", "e.data = " + e.data); + ok(e.bubbles === false, "bubbles = " + e.bubbles); + ok(e.cancelable === false, "cancelable = " + e.cancelable); + next_test(); + }); + + window.postMessage("test", "http://winetest.example.org"); + todo_wine. + ok(listener_called == false, "listener already called"); +});

1 0

Jacek Caban : mshtml: Add IDOMMessageEvent stub implementation.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 223704aaedc2e6da59e1397338725f062205ead8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=223704aaedc2e6da59e13973… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 20:10:20 2022 +0100 mshtml: Add IDOMMessageEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 145 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + include/mshtml.idl | 32 ++++++++++ 3 files changed, 179 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a44c1189b93..abf357a66ad 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2147,6 +2147,128 @@ static void DOMCustomEvent_destroy(DOMEvent *event) VariantClear(&custom_event->detail); } +typedef struct { + DOMEvent event; + IDOMMessageEvent IDOMMessageEvent_iface; +} DOMMessageEvent; + +static inline DOMMessageEvent *impl_from_IDOMMessageEvent(IDOMMessageEvent *iface) +{ + return CONTAINING_RECORD(iface, DOMMessageEvent, IDOMMessageEvent_iface); +} + +static HRESULT WINAPI DOMMessageEvent_QueryInterface(IDOMMessageEvent *iface, REFIID riid, void **ppv) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDOMEvent_QueryInterface(&This->event.IDOMEvent_iface, riid, ppv); +} + +static ULONG WINAPI DOMMessageEvent_AddRef(IDOMMessageEvent *iface) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDOMEvent_AddRef(&This->event.IDOMEvent_iface); +} + +static ULONG WINAPI DOMMessageEvent_Release(IDOMMessageEvent *iface) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDOMEvent_Release(&This->event.IDOMEvent_iface); +} + +static HRESULT WINAPI DOMMessageEvent_GetTypeInfoCount(IDOMMessageEvent *iface, UINT *pctinfo) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->event.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DOMMessageEvent_GetTypeInfo(IDOMMessageEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_GetTypeInfo(&This->event.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DOMMessageEvent_GetIDsOfNames(IDOMMessageEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->event.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI DOMMessageEvent_Invoke(IDOMMessageEvent *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_Invoke(&This->event.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DOMMessageEvent_get_data(IDOMMessageEvent *iface, BSTR *p) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + + FIXME("(%p)->(%p)\n", This, p); + + *p = NULL; + return S_OK; +} + +static HRESULT WINAPI DOMMessageEvent_get_origin(IDOMMessageEvent *iface, BSTR *p) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMMessageEvent_get_source(IDOMMessageEvent *iface, IHTMLWindow2 **p) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMMessageEvent_initMessageEvent(IDOMMessageEvent *iface, BSTR type, VARIANT_BOOL can_bubble, + VARIANT_BOOL cancelable, BSTR data, BSTR origin, + BSTR last_event_id, IHTMLWindow2 *source) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + FIXME("(%p)->(%s %x %x %s %s %s %p)\n", This, debugstr_w(type), can_bubble, cancelable, + debugstr_w(data), debugstr_w(origin), debugstr_w(last_event_id), source); + return E_NOTIMPL; +} + +static const IDOMMessageEventVtbl DOMMessageEventVtbl = { + DOMMessageEvent_QueryInterface, + DOMMessageEvent_AddRef, + DOMMessageEvent_Release, + DOMMessageEvent_GetTypeInfoCount, + DOMMessageEvent_GetTypeInfo, + DOMMessageEvent_GetIDsOfNames, + DOMMessageEvent_Invoke, + DOMMessageEvent_get_data, + DOMMessageEvent_get_origin, + DOMMessageEvent_get_source, + DOMMessageEvent_initMessageEvent +}; + +static DOMMessageEvent *DOMMessageEvent_from_DOMEvent(DOMEvent *event) +{ + return CONTAINING_RECORD(event, DOMMessageEvent, event); +} + +static void *DOMMessageEvent_query_interface(DOMEvent *event, REFIID riid) +{ + DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(event); + if(IsEqualGUID(&IID_IDOMMessageEvent, riid)) + return &message_event->IDOMMessageEvent_iface; + return NULL; +} + +static void DOMMessageEvent_destroy(DOMEvent *event) +{ +} static const tid_t DOMEvent_iface_tids[] = { IDOMEvent_tid, @@ -2214,6 +2336,19 @@ static dispex_static_data_t DOMCustomEvent_dispex = { DOMCustomEvent_iface_tids }; +static const tid_t DOMMessageEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMMessageEvent_tid, + 0 +}; + +dispex_static_data_t DOMMessageEvent_dispex = { + L"MessageEvent", + NULL, + DispDOMMessageEvent_tid, + DOMMessageEvent_iface_tids +}; + static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) { nsISupports *iface; @@ -2243,6 +2378,16 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev custom_event->event.destroy = DOMCustomEvent_destroy; event = &custom_event->event; dispex_data = &DOMCustomEvent_dispex; + }else if(event_id == EVENTID_MESSAGE) { + DOMMessageEvent *message_event = heap_alloc_zero(sizeof(*message_event)); + if(!message_event) + return NULL; + + message_event->IDOMMessageEvent_iface.lpVtbl = &DOMMessageEventVtbl; + message_event->event.query_interface = DOMMessageEvent_query_interface; + message_event->event.destroy = DOMMessageEvent_destroy; + event = &message_event->event; + dispex_data = &DOMMessageEvent_dispex; }else { event = heap_alloc_zero(sizeof(*event)); if(!event) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7ce97e01053..a94f1be1969 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -87,6 +87,7 @@ typedef struct EventTarget EventTarget; XDIID(DispDOMCustomEvent) \ XDIID(DispDOMEvent) \ XDIID(DispDOMKeyboardEvent) \ + XDIID(DispDOMMessageEvent) \ XDIID(DispDOMMouseEvent) \ XDIID(DispDOMUIEvent) \ XDIID(DispHTMLAnchorElement) \ @@ -147,6 +148,7 @@ typedef struct EventTarget EventTarget; XIID(IDOMCustomEvent) \ XIID(IDOMEvent) \ XIID(IDOMKeyboardEvent) \ + XIID(IDOMMessageEvent) \ XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ diff --git a/include/mshtml.idl b/include/mshtml.idl index ef496b840ea..162a9691fb6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28462,6 +28462,38 @@ interface IDOMMessageEvent : IDispatch [in] IHTMLWindow2 *source); } +/***************************************************************************** + * DispDOMMessageEvent dispinterface + */ +[ + hidden, + uuid(30590092-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMMessageEvent +{ +properties: +methods: + WINE_IDOMEVENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMMESSAGEEVENT_DATA)] + BSTR data(); + + [propget, id(DISPID_IDOMMESSAGEEVENT_ORIGIN)] + BSTR origin(); + + [propget, id(DISPID_IDOMMESSAGEEVENT_SOURCE)] + IHTMLWindow2 *source(); + + [id(DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT)] + void initMessageEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] BSTR data, + [in] BSTR origin, + [in] BSTR lastEventId, + [in] IHTMLWindow2 *source); +} /***************************************************************************** * IHTMLNamespaceCollection interface

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.XusbGameControllerProvider runtimeclass definition.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 189a2eadcb649ed8ec40d03ade648dabf6b618a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=189a2eadcb649ed8ec40d03a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:36 2022 +0100 include: Add Windows.Gaming.Input.XusbGameControllerProvider runtimeclass definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.custom.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index 3d188ed5cf0..0811b991091 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -37,11 +37,13 @@ namespace Windows.Gaming.Input.Custom { interface IHidGameControllerInputSink; interface IHidGameControllerProvider; interface IXusbGameControllerInputSink; + interface IXusbGameControllerProvider; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; interface IGameControllerFactoryManagerStatics2; runtimeclass GameControllerFactoryManager; runtimeclass HidGameControllerProvider; + runtimeclass XusbGameControllerProvider; [contract(Windows.Foundation.UniversalApiContract, 3.0)] enum XusbDeviceSubtype @@ -138,6 +140,17 @@ namespace Windows.Gaming.Input.Custom { [in, size_is(report_len)] BYTE *report_buf); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.Custom.XusbGameControllerProvider), + uuid(6e2971eb-0efb-48b4-808b-837643b2f216) + ] + interface IXusbGameControllerProvider : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerProvider + { + HRESULT SetVibration([in] DOUBLE rumble_intensity, [in] DOUBLE buzz_intensity); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(69a0ae5e-758e-4cbe-ace6-62155fe9126f) @@ -200,4 +213,15 @@ namespace Windows.Gaming.Input.Custom { [default] interface Windows.Gaming.Input.Custom.IHidGameControllerProvider; interface Windows.Gaming.Input.Custom.IGameControllerProvider; } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass XusbGameControllerProvider + { + [default] interface Windows.Gaming.Input.Custom.IXusbGameControllerProvider; + interface Windows.Gaming.Input.Custom.IGameControllerProvider; + } }

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IXusbGameControllerInputSink interface definition.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: e762b5c45091172700d1b0f2fa152dbb2029ab8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e762b5c45091172700d1b0f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:35 2022 +0100 include: Add Windows.Gaming.Input.IXusbGameControllerInputSink interface definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.custom.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index acc15955368..3d188ed5cf0 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -36,6 +36,7 @@ namespace Windows.Gaming.Input.Custom { interface IGameControllerProvider; interface IHidGameControllerInputSink; interface IHidGameControllerProvider; + interface IXusbGameControllerInputSink; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; interface IGameControllerFactoryManagerStatics2; @@ -126,6 +127,17 @@ namespace Windows.Gaming.Input.Custom { [in, size_is(report_len)] BYTE *report_buf); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(b2ac1d95-6ecb-42b3-8aab-025401ca4712) + ] + interface IXusbGameControllerInputSink : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerInputSink + { + HRESULT OnInputReceived([in] UINT64 timestamp, [in] BYTE id, [in] UINT32 report_len, + [in, size_is(report_len)] BYTE *report_buf); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(69a0ae5e-758e-4cbe-ace6-62155fe9126f)

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 2022