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

Jacek Caban : ntdll: Introduce RtlSetLastWin32Error for unixlibs that additionally sets 32-bit error on wow64.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 35ae4703c4e92f97a32ee28cfdb11375427bf790 URL: https://gitlab.winehq.org/wine/wine/-/commit/35ae4703c4e92f97a32ee28cfdb113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 15:30:32 2022 +0200 ntdll: Introduce RtlSetLastWin32Error for unixlibs that additionally sets 32-bit error on wow64. --- dlls/ntdll/unix/env.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 17450b5ab4c..105038a34cb 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2390,3 +2390,19 @@ ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status ) return map_status( status ); } + +/********************************************************************** + * RtlSetLastWin32Error (ntdll.so) + */ +void WINAPI RtlSetLastWin32Error( DWORD err ) +{ + TEB *teb = NtCurrentTeb(); +#ifdef _WIN64 + if (teb->WowTebOffset) + { + TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + teb32->LastErrorValue = err; + } +#endif + teb->LastErrorValue = err; +}

1 0

Jacek Caban : include: Use RtlSetLastWin32Error in server.h.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 2f0c2684b274d39197f8e85dc9ff64b8c6b31e5e URL: https://gitlab.winehq.org/wine/wine/-/commit/2f0c2684b274d39197f8e85dc9ff64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:50:58 2022 +0200 include: Use RtlSetLastWin32Error in server.h. --- include/wine/server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/server.h b/include/wine/server.h index b05271b7522..228682dc914 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -57,7 +57,7 @@ extern NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int acce static inline unsigned int wine_server_call_err( void *req_ptr ) { unsigned int res = wine_server_call( req_ptr ); - if (res) SetLastError( RtlNtStatusToDosError(res) ); + if (res) RtlSetLastWin32Error( RtlNtStatusToDosError(res) ); return res; }

1 0

Jacek Caban : win32u: Use RtlSetLastWin32Error.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 1dfedae9030b18d6648d48fe613a1ade2af382e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1dfedae9030b18d6648d48fe613a1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:49:50 2022 +0200 win32u: Use RtlSetLastWin32Error. --- dlls/win32u/bitblt.c | 8 ++-- dlls/win32u/bitmap.c | 12 +++--- dlls/win32u/class.c | 24 +++++------ dlls/win32u/clipboard.c | 14 +++--- dlls/win32u/cursoricon.c | 6 +-- dlls/win32u/dc.c | 6 +-- dlls/win32u/dce.c | 6 +-- dlls/win32u/defwnd.c | 4 +- dlls/win32u/dib.c | 10 ++--- dlls/win32u/driver.c | 4 +- dlls/win32u/font.c | 16 +++---- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/hook.c | 16 +++---- dlls/win32u/imm.c | 4 +- dlls/win32u/input.c | 32 +++++++------- dlls/win32u/menu.c | 38 ++++++++-------- dlls/win32u/message.c | 32 +++++++------- dlls/win32u/painting.c | 2 +- dlls/win32u/path.c | 28 ++++++------ dlls/win32u/pen.c | 4 +- dlls/win32u/rawinput.c | 44 +++++++++---------- dlls/win32u/spy.c | 8 ++-- dlls/win32u/sysparams.c | 16 +++---- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 100 +++++++++++++++++++++---------------------- dlls/win32u/winstation.c | 18 ++++---- 26 files changed, 228 insertions(+), 228 deletions(-)

1 0

Jacek Caban : winex11: Use RtlSetLastWin32Error.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 131de4bb8dd068c0c0c2cca92a953236f93df699 URL: https://gitlab.winehq.org/wine/wine/-/commit/131de4bb8dd068c0c0c2cca92a9532… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:49:57 2022 +0200 winex11: Use RtlSetLastWin32Error. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/display.c | 4 ++-- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/keyboard.c | 4 ++-- dlls/winex11.drv/opengl.c | 50 ++++++++++++++++++++++----------------------- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xrender.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 8 files changed, 34 insertions(+), 34 deletions(-)

1 0

Jacek Caban : wineandroid: Use RtlSetLastWin32Error.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 7ea592e5fe63bf231f479c184c387ebc64db7151 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ea592e5fe63bf231f479c184c387e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:50:05 2022 +0200 wineandroid: Use RtlSetLastWin32Error. --- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/opengl.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 4ddc66e73e8..738b8943175 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -312,7 +312,7 @@ BOOL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, D if (n > 0) { TRACE( "mode %d -- not present\n", n ); - SetLastError( ERROR_NO_MORE_FILES ); + RtlSetLastWin32Error( ERROR_NO_MORE_FILES ); return FALSE; } diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 911f6e3f3d1..337486ba6be 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -363,7 +363,7 @@ static BOOL android_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct goto done; } } - SetLastError( ERROR_INVALID_HANDLE ); + RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); done: release_gl_drawable( read_gl ); @@ -382,7 +382,7 @@ static BOOL android_wglSwapIntervalEXT( int interval ) if (interval < 0) { - SetLastError(ERROR_INVALID_DATA); + RtlSetLastWin32Error( ERROR_INVALID_DATA ); return FALSE; } @@ -391,7 +391,7 @@ static BOOL android_wglSwapIntervalEXT( int interval ) if (ret) swap_interval = interval; else - SetLastError( ERROR_DC_NOT_FOUND ); + RtlSetLastWin32Error( ERROR_DC_NOT_FOUND ); return ret; } @@ -553,7 +553,7 @@ static BOOL WINAPI android_wglMakeCurrent( HDC hdc, struct wgl_context *ctx ) goto done; } } - SetLastError( ERROR_INVALID_HANDLE ); + RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); done: release_gl_drawable( gl );

1 0

Jacek Caban : winemac: Use RtlSetLastWin32Error.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: f79f58cb3a29eb72cdb8decacdf09a960b6e705d URL: https://gitlab.winehq.org/wine/wine/-/commit/f79f58cb3a29eb72cdb8decacdf09a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:50:14 2022 +0200 winemac: Use RtlSetLastWin32Error. --- dlls/winemac.drv/display.c | 2 +- dlls/winemac.drv/keyboard.c | 4 +-- dlls/winemac.drv/opengl.c | 86 ++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 46 deletions(-)

1 0

Jacek Caban : wow64win: Set last error in 32-bit TEB in wow64 thunks.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 0d4817fadbcdf9b3ee785bcc6239eb4e99db403f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4817fadbcdf9b3ee785bcc6239eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 15:32:27 2022 +0200 wow64win: Set last error in 32-bit TEB in wow64 thunks. --- dlls/wow64win/user.c | 40 ++++++++++++++++++++-------------------- dlls/wow64win/wow64win_private.h | 7 +++++++ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 4f54921ff02..c69c8fd6d6c 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -722,13 +722,13 @@ NTSTATUS WINAPI wow64_NtUserFlashWindowEx( UINT *args ) if (!info32) { - SetLastError( ERROR_NOACCESS ); + set_last_error32( ERROR_NOACCESS ); return FALSE; } if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -962,7 +962,7 @@ NTSTATUS WINAPI wow64_NtUserGetGUIThreadInfo( UINT *args ) if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -1104,7 +1104,7 @@ NTSTATUS WINAPI wow64_NtUserGetMenuBarInfo( UINT *args ) if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -1210,7 +1210,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputBuffer( UINT *args ) if (header_size != sizeof(RAWINPUTHEADER32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1230,7 +1230,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) if (header_size != sizeof(RAWINPUTHEADER32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1246,7 +1246,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) data_size64 = *data_size + sizeof(RAWINPUTHEADER); if (!(data64 = Wow64AllocateTemp( data_size64 ))) { - SetLastError( STATUS_NO_MEMORY ); + set_last_error32( STATUS_NO_MEMORY ); return ~0u; } @@ -1256,7 +1256,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) body_size = ret - sizeof(RAWINPUTHEADER); if (*data_size < sizeof(RAWINPUTHEADER32) + body_size) { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); + set_last_error32( ERROR_INSUFFICIENT_BUFFER ); return ~0u; } @@ -1292,7 +1292,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) if (*data_size < sizeof(RAWINPUTHEADER32)) { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); + set_last_error32( ERROR_INSUFFICIENT_BUFFER ); return ~0u; } @@ -1306,7 +1306,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) } default: - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } } @@ -1329,7 +1329,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputDeviceList( UINT *args ) if (size != sizeof(RAWINPUTDEVICELIST32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1340,7 +1340,7 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputDeviceList( UINT *args ) if (!(devices64 = Wow64AllocateTemp( (*count) * sizeof(*devices64) ))) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + set_last_error32( ERROR_NOT_ENOUGH_MEMORY ); return ~0u; } @@ -1376,7 +1376,7 @@ NTSTATUS WINAPI wow64_NtUserRegisterClassExWOW( UINT *args ) if (wc32->cbSize != sizeof(*wc32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return 0; } @@ -1408,7 +1408,7 @@ NTSTATUS WINAPI wow64_NtUserGetRegisteredRawInputDevices( UINT *args ) if (size != sizeof(RAWINPUTDEVICE32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return ~0u; } @@ -1419,7 +1419,7 @@ NTSTATUS WINAPI wow64_NtUserGetRegisteredRawInputDevices( UINT *args ) if (!(devices64 = Wow64AllocateTemp( (*count) * sizeof(*devices64) ))) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + set_last_error32( ERROR_NOT_ENOUGH_MEMORY ); return ~0u; } @@ -1662,7 +1662,7 @@ NTSTATUS WINAPI wow64_NtUserMsgWaitForMultipleObjectsEx( UINT *args ) if (count > ARRAYSIZE(handles)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return WAIT_FAILED; } for (i = 0; i < count; i++) handles[i] = UlongToHandle( handles32[i] ); @@ -1794,13 +1794,13 @@ NTSTATUS WINAPI wow64_NtUserRegisterRawInputDevices( UINT *args ) if (size != sizeof(RAWINPUTDEVICE32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } if (!(devices64 = Wow64AllocateTemp( count * sizeof(*devices64) ))) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + set_last_error32( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } @@ -1864,7 +1864,7 @@ NTSTATUS WINAPI wow64_NtUserSendInput( UINT *args ) if (size != sizeof(*inputs32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return 0; } @@ -2489,7 +2489,7 @@ NTSTATUS WINAPI wow64_NtUserTrackMouseEvent( UINT *args ) if (info32->cbSize != sizeof(*info32)) { - SetLastError( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return FALSE; } diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h index 9127085b7b4..cf0b2b62e5f 100644 --- a/dlls/wow64win/wow64win_private.h +++ b/dlls/wow64win/wow64win_private.h @@ -124,4 +124,11 @@ static inline OBJECT_ATTRIBUTES *objattr_32to64( struct object_attr64 *out, cons return &out->attr; } +static inline void set_last_error32( DWORD err ) +{ + TEB *teb = NtCurrentTeb(); + TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + teb32->LastErrorValue = err; +} + #endif /* __WOW64WIN_PRIVATE_H */

1 0

Gabriel Ivăncescu : mshtml: Semi-implement non-string primitive data for postMessage.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 619312fd76a0f51654629fa7398c44d604d7072e URL: https://gitlab.winehq.org/wine/wine/-/commit/619312fd76a0f51654629fa7398c44… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 10 18:07:38 2022 +0300 mshtml: Semi-implement non-string primitive data for postMessage. IE10 and up actually pass cloned data without converting them to strings, using the Structured Clone Algorithm. Implement support for the basic variant types for now. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 46 ++++++++++++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 106 ++++++++++++++++++++++++++--------- dlls/mshtml/mshtml_private_iface.idl | 2 + dlls/mshtml/tests/documentmode.js | 8 ++- 5 files changed, 126 insertions(+), 38 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement targetOrigin for postMessage.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 5b07fb4d568e2cba4c224ad5f62ba5332dd66c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/5b07fb4d568e2cba4c224ad5f62ba5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 10 18:07:38 2022 +0300 mshtml: Implement targetOrigin for postMessage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 70 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 53 +++++++++++++++++++++++++++-- dlls/mshtml/tests/events.js | 2 +- 3 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 75f211e4cac..3ab42af0fa4 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -25,6 +25,7 @@ #include "winuser.h" #include "ole2.h" #include "mshtmdid.h" +#include "wininet.h" #include "shlguid.h" #include "shobjidl.h" #include "exdispid.h" @@ -2218,7 +2219,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR HTMLWindow *This = impl_from_IHTMLWindow6(iface); VARIANT var, transfer; - FIXME("(%p)->(%s %s) semi-stub\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); + TRACE("(%p)->(%s %s)\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); if(V_VT(&targetOrigin) != VT_BSTR) return E_INVALIDARG; @@ -3155,6 +3156,69 @@ static HRESULT WINAPI window_private_matchMedia(IWineHTMLWindowPrivate *iface, B return create_media_query_list(This, media_query, media_query_list); } +static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_origin) +{ + IUri *uri, *target; + DWORD port, port2; + BSTR bstr, bstr2; + HRESULT hres; + + if(!target_origin) + return E_INVALIDARG; + + if(!wcscmp(target_origin, L"*")) + return S_OK; + + hres = create_uri(target_origin, Uri_CREATE_NOFRAG | Uri_CREATE_NO_DECODE_EXTRA_INFO, &target); + if(FAILED(hres)) + return hres; + + if(!(uri = window->base.outer_window->uri)) { + FIXME("window with no URI\n"); + hres = S_FALSE; + goto done; + } + + hres = IUri_GetSchemeName(uri, &bstr); + if(FAILED(hres)) + goto done; + hres = IUri_GetSchemeName(target, &bstr2); + if(SUCCEEDED(hres)) { + hres = !wcsicmp(bstr, bstr2) ? S_OK : S_FALSE; + SysFreeString(bstr2); + } + SysFreeString(bstr); + if(hres != S_OK) + goto done; + + hres = IUri_GetHost(uri, &bstr); + if(FAILED(hres)) + goto done; + hres = IUri_GetHost(target, &bstr2); + if(SUCCEEDED(hres)) { + hres = !wcsicmp(bstr, bstr2) ? S_OK : S_FALSE; + SysFreeString(bstr2); + } + SysFreeString(bstr); + if(hres != S_OK) + goto done; + + /* Legacy modes ignore port */ + if(dispex_compat_mode(&window->event_target.dispex) < COMPAT_MODE_IE9) + goto done; + + hres = IUri_GetPort(uri, &port); + if(FAILED(hres)) + goto done; + hres = IUri_GetPort(target, &port2); + if(SUCCEEDED(hres)) + hres = (port == port2) ? S_OK : S_FALSE; + +done: + IUri_Release(target); + return hres; +} + static HRESULT WINAPI window_private_postMessage(IWineHTMLWindowPrivate *iface, VARIANT msg, BSTR targetOrigin, VARIANT transfer) { HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); @@ -3168,6 +3232,10 @@ static HRESULT WINAPI window_private_postMessage(IWineHTMLWindowPrivate *iface, if(V_VT(&transfer) != VT_EMPTY) FIXME("transfer not implemented, ignoring\n"); + hres = check_target_origin(window, targetOrigin); + if(hres != S_OK) + return SUCCEEDED(hres) ? S_OK : hres; + switch(V_VT(&msg)) { case VT_EMPTY: case VT_NULL: diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 0ec4785450e..5b746598dba 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -2082,10 +2082,57 @@ async_test("postMessage", function() { onmessage_called = true; if(v < 9) ok(e === undefined, "e = " + e); - else + else { ok(e.data === (v < 10 ? "10" : 10), "e.data = " + e.data); - next_test(); + next_test(); + } + } + + var invalid = [ + v < 10 ? { toString: function() { return "http://winetest.example.org"; } } : null, + (function() { return "http://winetest.example.org"; }), + "winetest.example.org", + "example.org", + undefined + ]; + for(var i = 0; i < invalid.length; i++) { + try { + window.postMessage("invalid " + i, invalid[i]); + ok(false, "expected exception with targetOrigin " + invalid[i]); + }catch(ex) { + var n = ex.number >>> 0; + todo_wine_if(v >= 10). + ok(n === (v < 10 ? 0x80070057 : 0), "postMessage with targetOrigin " + invalid[i] + " threw " + n); + if(v >= 10) + todo_wine. + ok(ex.name === "SyntaxError", "postMessage with targetOrigin " + invalid[i] + " threw " + ex.name); + } } - window.postMessage(10, "*"); + try { + window.postMessage("invalid empty", ""); + ok(false, "expected exception with empty targetOrigin"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === 0x80070057, "postMessage with empty targetOrigin threw " + n); + } + + window.postMessage("wrong port", "http://winetest.example.org:1234"); + ok(onmessage_called == (v < 9 ? true : false), "onmessage not called with wrong port"); + onmessage_called = false; + + var not_sent = [ + "http://winetest.example.com", + "ftp://winetest.example.org", + "http://wine.example.org", + "http://example.org" + ]; + for(var i = 0; i < not_sent.length; i++) { + window.postMessage("not_sent " + i, not_sent[i]); + ok(onmessage_called == false, "onmessage called with targetOrigin " + not_sent[i]); + onmessage_called = false; + } + + window.postMessage(10, (v < 10 ? "*" : { toString: function() { return "*"; } })); ok(onmessage_called == (v < 9 ? true : false), "onmessage not called"); + if(v < 9) next_test(); }); diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index e67bf07d210..997e583ad20 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -818,6 +818,6 @@ async_test("message event", function() { next_test(); }); - window.postMessage("test", "http://winetest.example.org"); + window.postMessage("test", "httP://wineTest.example.org"); ok(listener_called == false, "listener already called"); });

1 0

Zhiyi Zhang : include: Add IMediaParams definitions.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: bc712170a5bd514e32ac47de8607b4a1640e1145 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc712170a5bd514e32ac47de8607b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 26 15:01:08 2022 +0800 include: Add IMediaParams definitions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/medparam.idl | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/include/medparam.idl b/include/medparam.idl index f3b7f2f463e..f32dd49827d 100644 --- a/include/medparam.idl +++ b/include/medparam.idl @@ -16,10 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "unknwn.idl"; +import "strmif.idl"; typedef float MP_DATA; typedef DWORD MP_CAPS; +typedef DWORD MP_FLAGS; typedef DWORD MP_TIMEDATA; typedef enum _MP_Type @@ -42,6 +43,28 @@ typedef struct _MP_PARAMINFO WCHAR szLabel[32]; } MP_PARAMINFO; +typedef enum _MP_CURVE_TYPE { + MP_CURVE_JUMP = 0x0001, + MP_CURVE_LINEAR = 0x0002, + MP_CURVE_SQUARE = 0x0004, + MP_CURVE_INVSQUARE = 0x0008, + MP_CURVE_SINE = 0x0010, +} MP_CURVE_TYPE; + +const MP_FLAGS MPF_ENVLP_STANDARD = 0x0000; +const MP_FLAGS MPF_ENVLP_BEGIN_CURRENTVAL = 0x0001; +const MP_FLAGS MPF_ENVLP_BEGIN_NEUTRALVAL = 0x0002; + +typedef struct _MP_ENVELOPE_SEGMENT +{ + REFERENCE_TIME rtStart; + REFERENCE_TIME rtEnd; + MP_DATA valStart; + MP_DATA valEnd; + MP_CURVE_TYPE iCurve; + MP_FLAGS flags; +} MP_ENVELOPE_SEGMENT; + [ object, uuid(6D6CBB60-A223-44AA-842F-A2F06750BE6D), @@ -56,3 +79,17 @@ interface IMediaParamInfo : IUnknown HRESULT GetSupportedTimeFormat([in] DWORD index, [out] GUID *guid); HRESULT GetCurrentTimeFormat([out] GUID *guid, [out] MP_TIMEDATA *time_data); } + +[ +object, +uuid(6d6cbb61-a223-44aa-842f-a2f06750be6e), +version(1.0) +] +interface IMediaParams : IUnknown +{ + HRESULT GetParam([in] DWORD index, [out] MP_DATA *data); + HRESULT SetParam([in] DWORD index, [in] MP_DATA data); + HRESULT AddEnvelope([in] DWORD index, [in] DWORD count, [in] MP_ENVELOPE_SEGMENT *segments); + HRESULT FlushEnvelope([in] DWORD index, [in] REFERENCE_TIME start, [in] REFERENCE_TIME end); + HRESULT SetTimeFormat([in] GUID guid, [in] MP_TIMEDATA time_data); +}

1 0