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

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

01 Mar '22

Module: wine Branch: master Commit: 7180a9b926214acc8ff984b4b8fc04287d238d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7180a9b926214acc8ff984b4… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sun Feb 27 02:02:34 2022 +0100 powrprof: Add PowerSettingRegisterNotification stub. Needed by old Special K versions according to https://github.com/ValveSoftware/Proton/issues/5625. 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 dc6e8bdaa15..3a5b93fed3c 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -343,6 +343,13 @@ DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY handle) return ERROR_SUCCESS; } +DWORD WINAPI PowerSettingRegisterNotification(const GUID *setting, DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) +{ + FIXME("(%s,0x%08lx,%p,%p) stub!\n", debugstr_guid(setting), flags, recipient, handle); + *handle = (PHPOWERNOTIFY)0xdeadbeef; + return ERROR_SUCCESS; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index cbd2e47c1f2..3524be251a6 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -19,6 +19,7 @@ @ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) @ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) @ stdcall PowerUnregisterSuspendResumeNotification(ptr) +@ stdcall PowerSettingRegisterNotification(ptr long ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 6959a9aeb13..51fa158f239 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -162,6 +162,7 @@ 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); +DWORD WINAPI PowerSettingRegisterNotification(const GUID *, DWORD, HANDLE, PHPOWERNOTIFY); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0

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

01 Mar '22

Module: wine Branch: master Commit: ce6365551b663472d9ad3bfd40c2b5fdfbefa84c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6365551b663472d9ad3bfd… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sun Feb 27 02:02:35 2022 +0100 powrprof: Add PowerSettingUnregisterNotification stub. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 1 + 3 files changed, 8 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 3a5b93fed3c..ac1fa34bc05 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -350,6 +350,12 @@ DWORD WINAPI PowerSettingRegisterNotification(const GUID *setting, DWORD flags, return ERROR_SUCCESS; } +DWORD WINAPI PowerSettingUnregisterNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p) stub!\n", handle); + return ERROR_SUCCESS; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 3524be251a6..7a65fd37fc2 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -20,6 +20,7 @@ @ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) @ stdcall PowerUnregisterSuspendResumeNotification(ptr) @ stdcall PowerSettingRegisterNotification(ptr long ptr ptr) +@ stdcall PowerSettingUnregisterNotification(ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 51fa158f239..4c6cee41d16 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -163,6 +163,7 @@ DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCES DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD, HANDLE, PHPOWERNOTIFY); DWORD WINAPI PowerUnregisterSuspendResumeNotification(HPOWERNOTIFY); DWORD WINAPI PowerSettingRegisterNotification(const GUID *, DWORD, HANDLE, PHPOWERNOTIFY); +DWORD WINAPI PowerSettingUnregisterNotification(HPOWERNOTIFY); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0

Eric Pouech : kernelbase: Support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: ef8d44e58e71019fdacbc866806f61128893cdc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8d44e58e71019fdacbc866… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 09:25:56 2022 +0100 kernelbase: Support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 32 +++++++++++++- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 104 ++++++++++++++++++++++++++++++++++++--------- programs/conhost/conhost.h | 1 + server/console.c | 1 + 5 files changed, 118 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef8d44e58e71019fdacb…

1 0

Eric Pouech : kernelbase: Return key state in ReadConsoleW with control.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 68b4ffebfbca59b62ba861fcf8140a0b42ffb9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b4ffebfbca59b62ba861fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 09:26:02 2022 +0100 kernelbase: Return key state in ReadConsoleW with control. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 12 ++++++++---- programs/conhost/conhost.c | 10 ++++++++-- programs/conhost/conhost.h | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1f23292d467..b2bb6c53fd9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -2031,7 +2031,7 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - if (!(tmp = HeapAlloc( GetProcessHeap(), 0, sizeof(DWORD) + crc->nInitialChars * sizeof(WCHAR) ))) + if (!(tmp = HeapAlloc( GetProcessHeap(), 0, sizeof(DWORD) + length * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; @@ -2041,9 +2041,13 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun memcpy( tmp + sizeof(DWORD), buffer, crc->nInitialChars * sizeof(WCHAR) ); ret = console_ioctl( handle, IOCTL_CONDRV_READ_CONSOLE_CONTROL, tmp, sizeof(DWORD) + crc->nInitialChars * sizeof(WCHAR), - buffer, length * sizeof(WCHAR), - count ); - crc->dwConsoleKeyState = 0; + tmp, sizeof(DWORD) + length * sizeof(WCHAR), count ); + if (ret) + { + memcpy( &crc->dwConsoleKeyState, tmp, sizeof(DWORD) ); + *count -= sizeof(DWORD); + memcpy( buffer, tmp + sizeof(DWORD), *count ); + } HeapFree( GetProcessHeap(), 0, tmp ); } else diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index b08d26c2641..11e97993fd8 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -457,6 +457,8 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v req->signal = signal; req->read = 1; req->status = status; + if (console->read_ioctl == IOCTL_CONDRV_READ_CONSOLE_CONTROL) + wine_server_add_data( req, &console->key_state, sizeof(console->key_state) ); wine_server_add_data( req, buf, size ); status = wine_server_call( req ); } @@ -1250,6 +1252,7 @@ static NTSTATUS process_console_input( struct console *console ) struct edit_line *ctx = &console->edit_line; unsigned int i; WCHAR ctrl_value = FIRST_NON_CONTROL_CHAR; + unsigned int ctrl_keyvalue = 0; switch (console->read_ioctl) { @@ -1297,6 +1300,7 @@ static NTSTATUS process_console_input( struct console *console ) if (ctx->ctrl_mask & (1u << ir.Event.KeyEvent.uChar.UnicodeChar)) { ctrl_value = ir.Event.KeyEvent.uChar.UnicodeChar; + ctrl_keyvalue = ir.Event.KeyEvent.dwControlKeyState; ctx->status = STATUS_SUCCESS; TRACE("Found ctrl char in mask: ^%lc %x\n", ir.Event.KeyEvent.uChar.UnicodeChar + '@', ctx->ctrl_mask); continue; @@ -1363,6 +1367,7 @@ static NTSTATUS process_console_input( struct console *console ) if (ctrl_value < FIRST_NON_CONTROL_CHAR) { edit_line_insert( console, &ctrl_value, 1 ); + console->key_state = ctrl_keyvalue; } else { @@ -1404,6 +1409,7 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ } console->read_ioctl = ioctl; + console->key_state = 0; if (!out_size || console->read_buffer_count) { read_from_buffer( console, out_size ); @@ -2562,10 +2568,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_CONSOLE_CONTROL: if ((in_size < sizeof(DWORD)) || ((in_size - sizeof(DWORD)) % sizeof(WCHAR)) || - (*out_size % sizeof(WCHAR))) + (*out_size < sizeof(DWORD)) || ((*out_size - sizeof(DWORD)) % sizeof(WCHAR))) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - status = read_console( console, code, *out_size, + status = read_console( console, code, *out_size - sizeof(DWORD), (const WCHAR*)((const char*)in_data + sizeof(DWORD)), (in_size - sizeof(DWORD)) / sizeof(WCHAR), *(DWORD*)in_data ); diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index e5f70aa3ca4..35876689419 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -88,6 +88,7 @@ struct console unsigned int read_ioctl; /* current read ioctl */ size_t pending_read; /* size of pending read buffer */ struct edit_line edit_line; /* edit line context */ + unsigned int key_state; struct console_window *window; WCHAR *title; /* console title */ struct history_line **history; /* lines history */

1 0

Eric Pouech : conhost/tests: Add tests for ReadConsoleW with control.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 89a8b32d7a976504ee98ba1a7d08574bc9bc00e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a8b32d7a976504ee98ba1a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 09:26:08 2022 +0100 conhost/tests: Add tests for ReadConsoleW with control. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 179 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 175 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89a8b32d7a976504ee98…

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: 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

Eric Pouech : ndis.sys/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 8e4114be1081b2f03cd6ad3f67995f58314a87fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e4114be1081b2f03cd6ad3f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:49 2022 +0100 ndis.sys/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/tests/Makefile.in | 1 - dlls/ndis.sys/tests/ndis.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ndis.sys/tests/Makefile.in b/dlls/ndis.sys/tests/Makefile.in index f7073072fbf..8544dfdff2f 100644 --- a/dlls/ndis.sys/tests/Makefile.in +++ b/dlls/ndis.sys/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ndis.sys IMPORTS = iphlpapi advapi32 ole32 diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index 3349f1dae97..9a9ddcf7e7f 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -54,7 +54,7 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) if (status != STATUS_SUCCESS) { - skip( "Couldn't open the device (status = %d)\n", status ); + skip( "Couldn't open the device (status = %ld)\n", status ); return; } @@ -63,8 +63,8 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) iosb.Information = 0xdeadbeef; status = NtDeviceIoControlFile( netdev, NULL, NULL, NULL, &iosb, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium) ); - ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); - ok(iosb.Status == 0xdeadbeef, "got %#x\n", iosb.Status); + ok(status == STATUS_INVALID_PARAMETER, "got status %#lx\n", status); + ok(iosb.Status == 0xdeadbeef, "got %#lx\n", iosb.Status); ok(iosb.Information == 0xdeadbeef, "got size %#Ix\n", iosb.Information); oid = OID_GEN_MEDIA_SUPPORTED;

1 0

Eric Pouech : netapi32/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 017115a58715efa25d4f7ee2b30417e7656e420a URL: https://source.winehq.org/git/wine.git/?a=commit;h=017115a58715efa25d4f7ee2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:55 2022 +0100 netapi32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/Makefile.in | 1 - dlls/netapi32/tests/access.c | 90 ++++++++++++++++++++--------------------- dlls/netapi32/tests/apibuf.c | 4 +- dlls/netapi32/tests/ds.c | 14 +++---- dlls/netapi32/tests/wksta.c | 20 ++++----- 5 files changed, 64 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=017115a58715efa25d4f…

1 0

Eric Pouech : netcfgx/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 2dd647a5bac5f27c9740c8fd11cf92e298a5db1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dd647a5bac5f27c9740c8fd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:35:01 2022 +0100 netcfgx/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/tests/Makefile.in | 1 - dlls/netcfgx/tests/netcfgx.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/netcfgx/tests/Makefile.in b/dlls/netcfgx/tests/Makefile.in index 3caf6c9da7a..699af30f213 100644 --- a/dlls/netcfgx/tests/Makefile.in +++ b/dlls/netcfgx/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netcfgx.dll IMPORTS = uuid ole32 diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 31558f44f42..ab8104fa611 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -36,11 +36,11 @@ static void create_configuration(void) if(SUCCEEDED(hr)) { hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); ok(hr == S_OK || - hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08lx\n", hr); if(hr == S_OK) { trace("Lock value: %s\n", wine_dbgstr_w(client)); @@ -50,27 +50,27 @@ static void create_configuration(void) trace("Not run with Admin permissions\n"); hr = INetCfg_Initialize(config, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); /* AcquireWriteLock needs to be run before Initialize */ hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); - todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08lx\n", hr); hr = INetCfg_FindComponent(config, L"MS_TCPIP", &component); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08lx\n", hr); if(hr == S_OK) { INetCfgComponent_Release(component); } hr = INetCfg_Apply(config); - todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08lx\n", hr); hr = INetCfg_Uninitialize(config); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_ReleaseWriteLock(netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); INetCfgLock_Release(netlock); INetCfg_Release(config);

1 0