April 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Move NtUserClientToScreen implementation from user32.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 0efb4bb92808ac18ca27afedc04b936e69bf2cea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efb4bb92808ac18ca27afed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:11:31 2022 +0200 win32u: Move NtUserClientToScreen implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 130 +-------------------------------------------------- dlls/win32u/window.c | 22 +++++++++ include/ntuser.h | 6 +++ 3 files changed, 30 insertions(+), 128 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 14511c22d9d..63c08e5d795 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -239,120 +239,6 @@ HWND WINAPI ChildWindowFromPointEx( HWND parent, POINT pt, UINT flags ) } -/******************************************************************* - * WINPOS_GetWinOffset - * - * Calculate the offset between the origin of the two windows. Used - * to implement MapWindowPoints. - */ -static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POINT *ret_offset ) -{ - WND * wndPtr; - POINT offset; - BOOL mirror_from, mirror_to, ret; - HWND hwnd; - - offset.x = offset.y = 0; - *mirrored = mirror_from = mirror_to = FALSE; - - /* Translate source window origin to screen coords */ - if (hwndFrom) - { - if (!(wndPtr = WIN_GetPtr( hwndFrom ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - if (wndPtr == WND_OTHER_PROCESS) goto other_process; - if (wndPtr != WND_DESKTOP) - { - if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) - { - mirror_from = TRUE; - offset.x += wndPtr->client_rect.right - wndPtr->client_rect.left; - } - while (wndPtr->parent) - { - offset.x += wndPtr->client_rect.left; - offset.y += wndPtr->client_rect.top; - hwnd = wndPtr->parent; - WIN_ReleasePtr( wndPtr ); - if (!(wndPtr = WIN_GetPtr( hwnd ))) break; - if (wndPtr == WND_OTHER_PROCESS) goto other_process; - if (wndPtr == WND_DESKTOP) break; - if (wndPtr->flags & WIN_CHILDREN_MOVED) - { - WIN_ReleasePtr( wndPtr ); - goto other_process; - } - } - if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); - offset = point_win_to_thread_dpi( hwndFrom, offset ); - } - } - - /* Translate origin to destination window coords */ - if (hwndTo) - { - if (!(wndPtr = WIN_GetPtr( hwndTo ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - if (wndPtr == WND_OTHER_PROCESS) goto other_process; - if (wndPtr != WND_DESKTOP) - { - POINT pt = { 0, 0 }; - if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) - { - mirror_to = TRUE; - pt.x += wndPtr->client_rect.right - wndPtr->client_rect.left; - } - while (wndPtr->parent) - { - pt.x += wndPtr->client_rect.left; - pt.y += wndPtr->client_rect.top; - hwnd = wndPtr->parent; - WIN_ReleasePtr( wndPtr ); - if (!(wndPtr = WIN_GetPtr( hwnd ))) break; - if (wndPtr == WND_OTHER_PROCESS) goto other_process; - if (wndPtr == WND_DESKTOP) break; - if (wndPtr->flags & WIN_CHILDREN_MOVED) - { - WIN_ReleasePtr( wndPtr ); - goto other_process; - } - } - if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); - pt = point_win_to_thread_dpi( hwndTo, pt ); - offset.x -= pt.x; - offset.y -= pt.y; - } - } - - *mirrored = mirror_from ^ mirror_to; - if (mirror_from) offset.x = -offset.x; - *ret_offset = offset; - return TRUE; - - other_process: /* one of the parents may belong to another process, do it the hard way */ - SERVER_START_REQ( get_windows_offset ) - { - req->from = wine_server_user_handle( hwndFrom ); - req->to = wine_server_user_handle( hwndTo ); - req->dpi = get_thread_dpi(); - if ((ret = !wine_server_call_err( req ))) - { - ret_offset->x = reply->x; - ret_offset->y = reply->y; - *mirrored = reply->mirror; - } - } - SERVER_END_REQ; - return ret; -} - - /******************************************************************* * MapWindowPoints (USER32.@) */ @@ -365,21 +251,9 @@ INT WINAPI MapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT co /******************************************************************* * ClientToScreen (USER32.@) */ -BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) +BOOL WINAPI ClientToScreen( HWND hwnd, POINT *pt ) { - POINT offset; - BOOL mirrored; - - if (!hwnd) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - if (!WINPOS_GetWinOffset( hwnd, 0, &mirrored, &offset )) return FALSE; - lppnt->x += offset.x; - lppnt->y += offset.y; - if (mirrored) lppnt->x = -lppnt->x; - return TRUE; + return NtUserClientToScreen( hwnd, pt ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 3ecbc043fc8..3df544b1bb1 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2669,6 +2669,25 @@ other_process: /* one of the parents may belong to another process, do it the h return ret; } +/* see ClientToScreen */ +static BOOL client_to_screen( HWND hwnd, POINT *pt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + + if (!get_windows_offset( hwnd, 0, get_thread_dpi(), &mirrored, &offset )) return FALSE; + pt->x += offset.x; + pt->y += offset.y; + if (mirrored) pt->x = -pt->x; + return TRUE; +} + /* see ScreenToClient */ BOOL screen_to_client( HWND hwnd, POINT *pt ) { @@ -5090,6 +5109,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) { switch (code) { + case NtUserCallHwndParam_ClientToScreen: + return client_to_screen( hwnd, (POINT *)param ); + case NtUserCallHwndParam_EnableWindow: return enable_window( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index 41abc1e2e14..6fed7a836e0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -832,6 +832,7 @@ static inline BOOL NtUserIsWindowVisible( HWND hwnd ) /* NtUserCallHwndParam codes, not compatible with Windows */ enum { + NtUserCallHwndParam_ClientToScreen, NtUserCallHwndParam_EnableWindow, NtUserCallHwndParam_GetClassLongA, NtUserCallHwndParam_GetClassLongW, @@ -865,6 +866,11 @@ enum NtUserSpyGetMsgName, }; +static inline BOOL NtUserClientToScreen( HWND hwnd, POINT *pt ) +{ + return NtUserCallHwndParam( hwnd, (UINT_PTR)pt, NtUserCallHwndParam_ClientToScreen ); +} + static inline BOOL NtUserEnableWindow( HWND hwnd, BOOL enable ) { return NtUserCallHwndParam( hwnd, enable, NtUserCallHwndParam_EnableWindow );

1 0

Jacek Caban : win32u: Introduce NtUserMapWindowPoints.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 11a75a65d705bf1d732ec6e3f2ee904f54cbce9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11a75a65d705bf1d732ec6e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:11:09 2022 +0200 win32u: Introduce NtUserMapWindowPoints. And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 22 ++-------------------- dlls/win32u/window.c | 7 +++++++ include/ntuser.h | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c38e0fabb1c..14511c22d9d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -356,27 +356,9 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI /******************************************************************* * MapWindowPoints (USER32.@) */ -INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) +INT WINAPI MapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count ) { - BOOL mirrored; - POINT offset; - UINT i; - - if (!WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored, &offset )) return 0; - - for (i = 0; i < count; i++) - { - lppt[i].x += offset.x; - lppt[i].y += offset.y; - if (mirrored) lppt[i].x = -lppt[i].x; - } - if (mirrored && count == 2) /* special case for rectangle */ - { - int tmp = lppt[0].x; - lppt[0].x = lppt[1].x; - lppt[1].x = tmp; - } - return MAKELONG( LOWORD(offset.x), LOWORD(offset.y) ); + return NtUserMapWindowPoints( hwnd_from, hwnd_to, points, count ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index eefc48a7d2d..3ecbc043fc8 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5151,6 +5151,13 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_KillSystemTimer: return kill_system_timer( hwnd, param ); + case NtUserCallHwndParam_MapWindowPoints: + { + struct map_window_points_params *params = (void *)param; + return map_window_points( hwnd, params->hwnd_to, params->points, params->count, + get_thread_dpi() ); + } + case NtUserCallHwndParam_MirrorRgn: return mirror_window_region( hwnd, UlongToHandle(param) ); diff --git a/include/ntuser.h b/include/ntuser.h index d8228a521e2..41abc1e2e14 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -852,6 +852,7 @@ enum NtUserCallHwndParam_GetWindowWord, NtUserCallHwndParam_IsChild, NtUserCallHwndParam_KillSystemTimer, + NtUserCallHwndParam_MapWindowPoints, NtUserCallHwndParam_MirrorRgn, NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, @@ -968,6 +969,23 @@ static inline BOOL NtUserKillSystemTimer( HWND hwnd, UINT_PTR id ) return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_KillSystemTimer ); } +struct map_window_points_params +{ + HWND hwnd_to; + POINT *points; + UINT count; +}; + +static inline int NtUserMapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count ) +{ + struct map_window_points_params params; + params.hwnd_to = hwnd_to; + params.points = points; + params.count = count; + return NtUserCallHwndParam( hwnd_from, (UINT_PTR)&params, + NtUserCallHwndParam_MapWindowPoints ); +} + static inline BOOL NtUserMirrorRgn( HWND hwnd, HRGN hrgn ) { return NtUserCallHwndParam( hwnd, HandleToUlong(hrgn), NtUserCallHwndParam_MirrorRgn );

1 0

Gabriel Ivăncescu : jscript: Iterate through the map in a helper function.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: ce644eedae9caf3577ee963b67b7ad43aab9e89f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce644eedae9caf3577ee963b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:40 2022 +0300 jscript: Iterate through the map in a helper function. So it can be re-used by Set objects. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 64 +++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index d87ce975a7d..8946dbbd966 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -127,6 +127,40 @@ static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry) release_map_entry(entry); } +static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, jsval_t *argv, jsval_t *r) +{ + struct jsval_map_entry *entry; + HRESULT hres; + + if(!argc || !is_object_instance(argv[0])) { + FIXME("invalid callback %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + return E_FAIL; + } + + if(argc > 1) { + FIXME("Unsupported argument\n"); + return E_NOTIMPL; + } + + LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { + jsval_t args[2], v; + if(entry->deleted) + continue; + args[0] = entry->value; + args[1] = entry->key; + grab_map_entry(entry); + hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, + ARRAY_SIZE(args), args, &v); + release_map_entry(entry); + if(FAILED(hres)) + return hres; + jsval_release(v); + } + + if(r) *r = jsval_undefined(); + return S_OK; +} + static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -170,8 +204,6 @@ static HRESULT Map_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned static HRESULT Map_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsval_t callback = argc ? argv[0] : jsval_undefined(); - struct jsval_map_entry *entry; MapInstance *map; HRESULT hres; @@ -181,33 +213,7 @@ static HRESULT Map_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne TRACE("%p (%s)\n", map, debugstr_jsval(argc >= 1 ? argv[0] : jsval_undefined())); - if(!is_object_instance(callback)) { - FIXME("invalid callback %s\n", debugstr_jsval(callback)); - return E_FAIL; - } - - if(argc > 1) { - FIXME("Unsupported argument\n"); - return E_NOTIMPL; - } - - LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { - jsval_t args[2], v; - if(entry->deleted) - continue; - args[0] = entry->value; - args[1] = entry->key; - grab_map_entry(entry); - hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, - ARRAY_SIZE(args), args, &v); - release_map_entry(entry); - if(FAILED(hres)) - return hres; - jsval_release(v); - } - - if(r) *r = jsval_undefined(); - return S_OK; + return iterate_map(map, ctx, argc, argv, r); } static HRESULT Map_get(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : winex11: Directly use win32u for user functions in mouse.c.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 5ee6fcb30c26840afd6593379f4753a60d37404b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee6fcb30c26840afd659337… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:12:04 2022 +0200 winex11: Directly use win32u for user functions in mouse.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 86 ++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ee6fcb30c26840afd65…

1 0

Jacek Caban : winex11: Directly use win32u for user functions in opengl.c.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 56b8a67f5af4aa68662a848715875fdb0b3d10d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b8a67f5af4aa68662a8487… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:12:27 2022 +0200 winex11: Directly use win32u for user functions in opengl.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ba38549e0e4..8c08c08488b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1312,7 +1312,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel RECT rect; int width, height; - GetClientRect( hwnd, &rect ); + NtUserGetClientRect( hwnd, &rect ); width = min( max( 1, rect.right ), 65535 ); height = min( max( 1, rect.bottom ), 65535 ); @@ -1327,7 +1327,8 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->ref = 1; gl->mutable_pf = mutable_pf; - if (!known_child && !GetWindow( hwnd, GW_CHILD ) && GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* childless top-level window */ + if (!known_child && !NtUserGetWindowRelative( hwnd, GW_CHILD ) && + NtUserGetAncestor( hwnd, GA_PARENT ) == NtUserGetDesktopWindow()) /* childless top-level window */ { gl->type = DC_GL_WINDOW; gl->window = create_client_window( hwnd, visual ); @@ -1407,11 +1408,11 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) { const struct wgl_pixel_format *fmt; int value; - HWND hwnd = WindowFromDC( hdc ); + HWND hwnd = NtUserWindowFromDC( hdc ); TRACE("(%p,%d)\n", hdc, format); - if (!hwnd || hwnd == GetDesktopWindow()) + if (!hwnd || hwnd == NtUserGetDesktopWindow()) { WARN( "not a valid window DC %p/%p\n", hdc, hwnd ); return FALSE; @@ -1493,7 +1494,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) break; case DC_GL_CHILD_WIN: case DC_GL_PIXMAP_WIN: - if (parent == GetDesktopWindow()) break; + if (parent == NtUserGetDesktopWindow()) break; /* fall through */ default: release_gl_drawable( old ); @@ -1684,7 +1685,7 @@ static int WINAPI glxdrv_wglGetPixelFormat( HDC hdc ) struct gl_drawable *gl; int ret = 0; - if ((gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) + if ((gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) { ret = pixel_format_index( gl->format ); /* Offscreen formats can't be used with traditional WGL calls. @@ -1725,7 +1726,7 @@ static struct wgl_context * WINAPI glxdrv_wglCreateContext( HDC hdc ) struct wgl_context *ret; struct gl_drawable *gl; - if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) + if (!(gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) { SetLastError( ERROR_INVALID_PIXEL_FORMAT ); return NULL; @@ -1815,7 +1816,7 @@ static BOOL WINAPI glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) return TRUE; } - if ((gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) + if ((gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) { if (ctx->fmt != gl->format) { @@ -1868,9 +1869,9 @@ static BOOL X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct if (!pglXMakeContextCurrent) return FALSE; - if ((draw_gl = get_gl_drawable( WindowFromDC( draw_hdc ), draw_hdc ))) + if ((draw_gl = get_gl_drawable( NtUserWindowFromDC( draw_hdc ), draw_hdc ))) { - read_gl = get_gl_drawable( WindowFromDC( read_hdc ), read_hdc ); + read_gl = get_gl_drawable( NtUserWindowFromDC( read_hdc ), read_hdc ); EnterCriticalSection( &context_section ); ret = pglXMakeContextCurrent(gdi_display, draw_gl->drawable, @@ -1950,7 +1951,7 @@ static void wglFinish(void) escape.gl_drawable = 0; escape.flush = FALSE; - if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) + if ((gl = get_gl_drawable( NtUserWindowFromDC( ctx->hdc ), 0 ))) { switch (gl->type) { @@ -1977,7 +1978,7 @@ static void wglFlush(void) escape.gl_drawable = 0; escape.flush = FALSE; - if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) + if ((gl = get_gl_drawable( NtUserWindowFromDC( ctx->hdc ), 0 ))) { switch (gl->type) { @@ -2012,7 +2013,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg TRACE("(%p %p %p)\n", hdc, hShareContext, attribList); - if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) + if (!(gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) { SetLastError( ERROR_INVALID_PIXEL_FORMAT ); return NULL; @@ -3055,7 +3056,7 @@ static int X11DRV_wglGetSwapIntervalEXT(void) TRACE("()\n"); - if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) + if (!(gl = get_gl_drawable( NtUserWindowFromDC( ctx->hdc ), ctx->hdc ))) { /* This can't happen because a current WGL context is required to get * here. Likely the application is buggy. @@ -3092,7 +3093,7 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) return FALSE; } - if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) + if (!(gl = get_gl_drawable( NtUserWindowFromDC( ctx->hdc ), ctx->hdc ))) { SetLastError(ERROR_DC_NOT_FOUND); return FALSE; @@ -3317,7 +3318,7 @@ static BOOL WINAPI glxdrv_wglSwapBuffers( HDC hdc ) escape.gl_drawable = 0; escape.flush = !pglXWaitForSbcOML; - if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) + if (!(gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) { SetLastError( ERROR_INVALID_HANDLE ); return FALSE;

1 0

Gabriel Ivăncescu : jscript: Compare numbers in a Map bitwise for equality.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 15053a1d17039980fff50e06e84ba29c197e0616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15053a1d17039980fff50e06… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:44 2022 +0300 jscript: Compare numbers in a Map bitwise for equality. Native treats -0 and 0 differently, so it must be doing a bitwise comparison. This might not order the numbers correctly, but that's not important, since we don't need them sorted other than for quick lookup (and any arbitrary sorting is fine, as long as it's consistent). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 11 +++++++++-- dlls/mshtml/tests/documentmode.js | 9 +++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 281049a91ae..bdfe7b75e55 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -56,6 +56,10 @@ static int jsval_map_compare(const void *k, const struct wine_rb_entry *e) { const struct jsval_map_entry *entry = WINE_RB_ENTRY_VALUE(e, const struct jsval_map_entry, entry); const jsval_t *key = k; + union { + double d; + INT64 n; + } bits1, bits2; if(jsval_type(entry->key) != jsval_type(*key)) return (int)jsval_type(entry->key) - (int)jsval_type(*key); @@ -70,10 +74,13 @@ static int jsval_map_compare(const void *k, const struct wine_rb_entry *e) case JSV_STRING: return jsstr_cmp(get_string(*key), get_string(entry->key)); case JSV_NUMBER: - if(get_number(*key) == get_number(entry->key)) return 0; if(isnan(get_number(*key))) return isnan(get_number(entry->key)) ? 0 : -1; if(isnan(get_number(entry->key))) return 1; - return get_number(*key) < get_number(entry->key) ? -1 : 1; + + /* native treats -0 differently than 0, so need to compare bitwise */ + bits1.d = get_number(*key); + bits2.d = get_number(entry->key); + return (bits1.n == bits2.n) ? 0 : (bits1.n < bits2.n ? -1 : 1); case JSV_BOOL: if(get_bool(*key) == get_bool(entry->key)) return 0; return get_bool(*key) ? 1 : -1; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 0da8d129383..6d06dad9fc7 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1051,6 +1051,15 @@ sync_test("map_obj", function() { }); ok(i === 66, "i = " + i); + s = new Map(); + s.set(0, 10); + s.set(-0, 20); + ok(s.size === 2, "size = " + s.size + " expected 2"); + r = s.get(-0); + ok(r === 20, "get(-0) returned " + r); + r = s.get(0); + ok(r === 10, "get(0) returned " + r); + try { Map.prototype.set.call({}, 1, 2); ok(false, "expected exception");

1 0

Gabriel Ivăncescu : jscript: Support passing 'this' context to the Map callback when iterating.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 251eda6f56fd05c26ce89dc6488dfc4b666ffebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=251eda6f56fd05c26ce89dc6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:43 2022 +0300 jscript: Support passing 'this' context to the Map callback when iterating. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 14 +++++++++----- dlls/mshtml/tests/documentmode.js | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index dd6829d9b6d..281049a91ae 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -166,6 +166,7 @@ static HRESULT set_map_entry(MapInstance *map, jsval_t key, jsval_t value, jsval static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, jsval_t *argv, jsval_t *r) { struct jsval_map_entry *entry; + IDispatch *context_obj = NULL; HRESULT hres; if(!argc || !is_object_instance(argv[0])) { @@ -173,9 +174,12 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j return E_FAIL; } - if(argc > 1) { - FIXME("Unsupported argument\n"); - return E_NOTIMPL; + if(argc > 1 && !is_undefined(argv[1])) { + if(!is_object_instance(argv[1])) { + FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); + return E_NOTIMPL; + } + context_obj = get_object(argv[1]); } LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { @@ -186,8 +190,8 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j args[1] = entry->key; args[2] = jsval_obj(&map->dispex); grab_map_entry(entry); - hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, - ARRAY_SIZE(args), args, &v); + hres = disp_call_value(ctx, get_object(argv[0]), context_obj, + DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); release_map_entry(entry); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index ed41ac1d7a7..0da8d129383 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1004,8 +1004,9 @@ sync_test("map_obj", function() { ok(value === key + 1, "value = " + value); } ok(map === s, "map = " + map); + ok(this === test_keys, "this = " + this); i++; - }); + }, test_keys); ok(i === test_keys.length, "i = " + i); ok(r === undefined, "forEach returned " + r);

1 0

Gabriel Ivăncescu : jscript: Move Set below Map.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 27ce397307a1888b290701af30b40ea325de4507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ce397307a1888b290701af… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:39 2022 +0300 jscript: Move Set below Map. So it can be implemented on top of Map. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 190 ++++++++++++++++++++++++++--------------------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 8098d76cb2f..d87ce975a7d 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -37,101 +37,6 @@ typedef struct { size_t size; } MapInstance; -static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; -} - -static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; -} - -static HRESULT Set_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; -} - -static HRESULT Set_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; -} - -static HRESULT Set_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; -} - -static HRESULT Set_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static const builtin_prop_t Set_props[] = { - {L"add", Set_add, PROPF_METHOD|1}, - {L"clear", Set_clear, PROPF_METHOD}, - {L"delete" , Set_delete, PROPF_METHOD|1}, - {L"forEach", Set_forEach, PROPF_METHOD|1}, - {L"has", Set_has, PROPF_METHOD|1}, -}; - -static const builtin_info_t Set_prototype_info = { - JSCLASS_SET, - Set_value, - ARRAY_SIZE(Set_props), - Set_props, - NULL, - NULL -}; - -static const builtin_info_t Set_info = { - JSCLASS_SET, - Set_value, - 0, NULL, - NULL, - NULL -}; - -static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - SetInstance *set; - HRESULT hres; - - switch(flags) { - case DISPATCH_CONSTRUCT: - TRACE("\n"); - - if(!r) - return S_OK; - if(!(set = heap_alloc_zero(sizeof(*set)))) - return E_OUTOFMEMORY; - - hres = init_dispex(&set->dispex, ctx, &Set_info, ctx->set_prototype); - if(FAILED(hres)) - return hres; - - *r = jsval_obj(&set->dispex); - return S_OK; - - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } -} - struct jsval_map_entry { struct wine_rb_entry entry; jsval_t key; @@ -483,6 +388,101 @@ static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns } } +static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", debugstr_jsval(vthis)); + return E_NOTIMPL; +} + +static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", debugstr_jsval(vthis)); + return E_NOTIMPL; +} + +static HRESULT Set_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", debugstr_jsval(vthis)); + return E_NOTIMPL; +} + +static HRESULT Set_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", debugstr_jsval(vthis)); + return E_NOTIMPL; +} + +static HRESULT Set_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", debugstr_jsval(vthis)); + return E_NOTIMPL; +} + +static HRESULT Set_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t Set_props[] = { + {L"add", Set_add, PROPF_METHOD|1}, + {L"clear", Set_clear, PROPF_METHOD}, + {L"delete" , Set_delete, PROPF_METHOD|1}, + {L"forEach", Set_forEach, PROPF_METHOD|1}, + {L"has", Set_has, PROPF_METHOD|1}, +}; + +static const builtin_info_t Set_prototype_info = { + JSCLASS_SET, + Set_value, + ARRAY_SIZE(Set_props), + Set_props, + NULL, + NULL +}; + +static const builtin_info_t Set_info = { + JSCLASS_SET, + Set_value, + 0, NULL, + NULL, + NULL +}; + +static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + SetInstance *set; + HRESULT hres; + + switch(flags) { + case DISPATCH_CONSTRUCT: + TRACE("\n"); + + if(!r) + return S_OK; + if(!(set = heap_alloc_zero(sizeof(*set)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&set->dispex, ctx, &Set_info, ctx->set_prototype); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(&set->dispex); + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } +} + HRESULT init_set_constructor(script_ctx_t *ctx) { jsdisp_t *constructor;

1 0

Jacek Caban : win32u: Move EnableWindow implementation from user32.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 8b6a4584b80477f5dc43d71fe2dd16f7b1a135de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6a4584b80477f5dc43d71f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:10:56 2022 +0200 win32u: Move EnableWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/window.c | 37 +++++++++++++++++++++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f5c22bfbadc..d44f058d256 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -869,35 +869,7 @@ HWND WINAPI GetDesktopWindow(void) */ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) { - BOOL retvalue; - - if (is_broadcast(hwnd)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - TRACE("( %p, %d )\n", hwnd, enable); - - if (enable) - { - retvalue = (WIN_SetStyle( hwnd, 0, WS_DISABLED ) & WS_DISABLED) != 0; - if (retvalue) SendMessageW( hwnd, WM_ENABLE, TRUE, 0 ); - } - else - { - SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); - - retvalue = (WIN_SetStyle( hwnd, WS_DISABLED, 0 ) & WS_DISABLED) != 0; - if (!retvalue) - { - if (hwnd == GetFocus()) - NtUserSetFocus( 0 ); /* A disabled window can't have the focus */ - - SendMessageW( hwnd, WM_ENABLE, FALSE, 0 ); - } - } - return retvalue; + return NtUserEnableWindow( hwnd, enable ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 6eb272ec227..eefc48a7d2d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -807,6 +807,40 @@ BOOL is_window_unicode( HWND hwnd ) return ret; } +/* see EnableWindow */ +static BOOL enable_window( HWND hwnd, BOOL enable ) +{ + BOOL ret; + + if (is_broadcast(hwnd)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + TRACE( "( %p, %d )\n", hwnd, enable ); + + if (enable) + { + ret = (set_window_style( hwnd, 0, WS_DISABLED ) & WS_DISABLED) != 0; + if (ret) send_message( hwnd, WM_ENABLE, TRUE, 0 ); + } + else + { + send_message( hwnd, WM_CANCELMODE, 0, 0 ); + + ret = (set_window_style( hwnd, WS_DISABLED, 0 ) & WS_DISABLED) != 0; + if (!ret) + { + if (hwnd == get_focus()) + NtUserSetFocus( 0 ); /* A disabled window can't have the focus */ + + send_message( hwnd, WM_ENABLE, FALSE, 0 ); + } + } + return ret; +} + /* see IsWindowEnabled */ BOOL is_window_enabled( HWND hwnd ) { @@ -5056,6 +5090,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) { switch (code) { + case NtUserCallHwndParam_EnableWindow: + return enable_window( hwnd, param ); + case NtUserCallHwndParam_GetClassLongA: return get_class_long( hwnd, param, TRUE ); diff --git a/include/ntuser.h b/include/ntuser.h index 52bc6c12c32..d8228a521e2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -832,6 +832,7 @@ static inline BOOL NtUserIsWindowVisible( HWND hwnd ) /* NtUserCallHwndParam codes, not compatible with Windows */ enum { + NtUserCallHwndParam_EnableWindow, NtUserCallHwndParam_GetClassLongA, NtUserCallHwndParam_GetClassLongW, NtUserCallHwndParam_GetClassLongPtrA, @@ -863,6 +864,11 @@ enum NtUserSpyGetMsgName, }; +static inline BOOL NtUserEnableWindow( HWND hwnd, BOOL enable ) +{ + return NtUserCallHwndParam( hwnd, enable, NtUserCallHwndParam_EnableWindow ); +} + static inline DWORD NtUserGetClassLongA( HWND hwnd, INT offset ) { return NtUserCallHwndParam( hwnd, offset, NtUserCallHwndParam_GetClassLongA );

1 0

Jacek Caban : win32u: Introduce NtUserGetMessagePos.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 38bea949c02dd1116afc4c6d3df095490b803676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38bea949c02dd1116afc4c6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:11:43 2022 +0200 win32u: Introduce NtUserGetMessagePos. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 3 +++ include/ntuser.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index a760a2ca3a4..4d2455fe64e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4641,6 +4641,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetInputState: return get_input_state(); + case NtUserCallNoParam_GetMessagePos: + return get_user_thread_info()->GetMessagePosVal; + case NtUserCallNoParam_ReleaseCapture: return release_capture(); diff --git a/include/ntuser.h b/include/ntuser.h index 6fed7a836e0..5cf82043a2e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -578,6 +578,7 @@ enum NtUserCallNoParam_CreateMenu, NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetInputState, + NtUserCallNoParam_GetMessagePos, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ NtUserExitingThread, @@ -600,6 +601,11 @@ static inline BOOL NtUserGetInputState(void) return NtUserCallNoParam( NtUserCallNoParam_GetInputState ); } +static inline DWORD NtUserGetMessagePos(void) +{ + return NtUserCallNoParam( NtUserCallNoParam_GetMessagePos ); +} + static inline BOOL NtUserReleaseCapture(void) { return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );

1 0