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

Jacek Caban : win32u: Move NtUserClientToScreen implementation from user32.
by Alexandre Julliard 14 Apr '22

14 Apr '22

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 NtUserGetMessagePos.
by Alexandre Julliard 14 Apr '22

14 Apr '22

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

Jacek Caban : winex11: Directly use win32u for user functions in mouse.c.
by Alexandre Julliard 14 Apr '22

14 Apr '22

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 14 Apr '22

14 Apr '22

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

Zhiyi Zhang : ieframe: Enable visual styles.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: dca8e2561d1495e09cfb582bf49ad814a6f32967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca8e2561d1495e09cfb582b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 14 15:26:11 2022 +0800 ieframe: Enable visual styles. ieframe.dll uses manifest at ID 123. However, IEWinMain() is not called from rundll32.exe or Control_RunDLL() so the manifest needs to be activated in IEWinMain(). This allows iexplore.exe to enable theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.manifest | 16 ++++++++++++++++ dlls/ieframe/ieframe.rc | 3 +++ dlls/ieframe/iexplore.c | 33 ++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/ieframe.manifest b/dlls/ieframe/ieframe.manifest new file mode 100644 index 00000000000..c8fd3eb4dce --- /dev/null +++ b/dlls/ieframe/ieframe.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Ieframe" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index aed8483e4ce..eb05a98dbc4 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -108,6 +108,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: ieframe.manifest */ +123 RT_MANIFEST ieframe.manifest + /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 27b72a64fa7..1616d4d7f84 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1125,10 +1125,13 @@ static void release_dde(void) */ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { + BOOL embedding = FALSE, nohome = FALSE, manager = FALSE, activated = FALSE; MSG msg; HRESULT hres; - BOOL embedding = FALSE, nohome = FALSE, manager = FALSE; - DWORD reg_cookie; + HANDLE context = INVALID_HANDLE_VALUE; + DWORD reg_cookie, ret = 1; + ULONG_PTR context_cookie; + ACTCTXW actctx; static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; @@ -1138,6 +1141,15 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) CoInitialize(NULL); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = ieframe_instance; + actctx.lpResourceName = MAKEINTRESOURCEW(123); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(context, &context_cookie); + init_dde(); while (*cmdline) @@ -1173,17 +1185,13 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) if (FAILED(hres)) { ERR("failed to register CLSID_InternetExplorer%s: %08lx\n", manager ? "Manager" : "", hres); - CoUninitialize(); - ExitProcess(1); + goto done; } if (!embedding) { if(!create_ie_window(nohome, cmdline)) - { - CoUninitialize(); - ExitProcess(1); - } + goto done; } /* run the message loop for this thread */ @@ -1196,8 +1204,11 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) CoRevokeClassObject(reg_cookie); release_dde(); + ret = 0; +done: CoUninitialize(); - - ExitProcess(0); - return 0; + if (activated) + DeactivateActCtx(0, context_cookie); + ReleaseActCtx(context); + ExitProcess(ret); }

1 0

Gabriel Ivăncescu : jscript: Handle NULL return pointers in all constructors.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: c464c1bd4781ca650a5397ff6a2cfd574c1877f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c464c1bd4781ca650a5397ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:38 2022 +0300 jscript: Handle NULL return pointers in all constructors. Instead of crashing. 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/activex.c | 3 ++- dlls/jscript/array.c | 4 ++++ dlls/jscript/bool.c | 3 +++ dlls/jscript/date.c | 6 ++++-- dlls/jscript/enumerator.c | 3 ++- dlls/jscript/function.c | 3 ++- dlls/jscript/number.c | 11 ++++++----- dlls/jscript/set.c | 4 ++++ dlls/jscript/string.c | 9 ++++++--- dlls/jscript/tests/api.js | 15 +++++++++++++++ dlls/jscript/vbarray.c | 4 +++- 11 files changed, 51 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 5d79d2b0b82..a74f6acb529 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -181,7 +181,8 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, return E_NOTIMPL; } - *r = jsval_disp(disp); + if(r) *r = jsval_disp(disp); + else IDispatch_Release(disp); return S_OK; } diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index dcabc0dfb71..ee725792830 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1374,6 +1374,8 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, u if(n < 0 || !is_int32(n)) return JS_E_INVALID_LENGTH; + if(!r) + return S_OK; hres = create_array(ctx, n, &obj); if(FAILED(hres)) @@ -1383,6 +1385,8 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, u return S_OK; } + if(!r) + return S_OK; hres = create_array(ctx, argc, &obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index a230855d452..3a4aa9c9199 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -151,6 +151,9 @@ static HRESULT BoolConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un case DISPATCH_CONSTRUCT: { jsdisp_t *bool; + if(!r) + return S_OK; + hres = create_bool(ctx, value, &bool); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index e482c4a4a02..bc09f05d4b9 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2248,7 +2248,8 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, un if(FAILED(hres)) return hres; - *r = jsval_number(n); + if(r) + *r = jsval_number(n); return S_OK; } @@ -2403,7 +2404,8 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un } } - *r = jsval_obj(&date->dispex); + if(r) *r = jsval_obj(&date->dispex); + else jsdisp_release(&date->dispex); return S_OK; case INVOKE_FUNC: { diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 94eb9f209bc..f82263eaf26 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -300,7 +300,8 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD fla if(FAILED(hres)) return hres; - *r = jsval_obj(obj); + if(r) *r = jsval_obj(obj); + else jsdisp_release(obj); break; } default: diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 03c541c5d2a..12511bbaaa6 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -1008,7 +1008,8 @@ static HRESULT FunctionConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags if(FAILED(hres)) return hres; - *r = jsval_disp(ret); + if(r) *r = jsval_disp(ret); + else IDispatch_Release(ret); break; } default: diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 472acd0d4b2..be733fb5af5 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -554,11 +554,12 @@ static HRESULT NumberConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, n = 0; } - hres = create_number(ctx, n, &obj); - if(FAILED(hres)) - return hres; - - *r = jsval_obj(obj); + if(r) { + hres = create_number(ctx, n, &obj); + if(FAILED(hres)) + return hres; + *r = jsval_obj(obj); + } break; } default: diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 7973d4216df..8098d76cb2f 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -114,6 +114,8 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns case DISPATCH_CONSTRUCT: TRACE("\n"); + if(!r) + return S_OK; if(!(set = heap_alloc_zero(sizeof(*set)))) return E_OUTOFMEMORY; @@ -461,6 +463,8 @@ static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns case DISPATCH_CONSTRUCT: TRACE("\n"); + if(!r) + return S_OK; if(!(map = heap_alloc_zero(sizeof(*map)))) return E_OUTOFMEMORY; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0b2e69538f0..e73b9e8b52f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1644,7 +1644,8 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, str = jsstr_empty(); } - *r = jsval_string(str); + if(r) *r = jsval_string(str); + else jsstr_release(str); break; } case DISPATCH_CONSTRUCT: { @@ -1659,8 +1660,10 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, str = jsstr_empty(); } - hres = create_string(ctx, str, &ret); - if (SUCCEEDED(hres)) *r = jsval_obj(ret); + if(r) { + hres = create_string(ctx, str, &ret); + if(SUCCEEDED(hres)) *r = jsval_obj(ret); + } jsstr_release(str); return hres; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fe336d46ba9..1efc0239cc3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -287,6 +287,8 @@ ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); +Object(); +new Object(); obj = new Object(); ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); @@ -296,28 +298,37 @@ ok(!Object.hasOwnProperty('isPrototypeOf'), "Object.hasOwnProperty('isPrototypeO ok(!parseFloat.hasOwnProperty('call'), "parseFloat.hasOwnProperty('call') is true"); ok(!Function.hasOwnProperty('call'), "Function.hasOwnProperty('call') is true"); +Array(); +new Array(); obj = new Array(); ok(Array.prototype.hasOwnProperty('sort'), "Array.prototype.hasOwnProperty('sort') is false"); ok(Array.prototype.hasOwnProperty('length'), "Array.prototype.hasOwnProperty('length') is false"); ok(!obj.hasOwnProperty('sort'), "obj.hasOwnProperty('sort') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is true"); +Boolean(); +new Boolean(); obj = new Boolean(false); ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); ok(!Boolean.hasOwnProperty('toString'), "Boolean.hasOwnProperty('toString') is true"); ok(Boolean.prototype.hasOwnProperty('toString'), "Boolean.prototype.hasOwnProperty('toString') is false"); +Date(); +new Date(); obj = new Date(); ok(!obj.hasOwnProperty('getTime'), "obj.hasOwnProperty('getTime') is true"); ok(!Date.hasOwnProperty('getTime'), "Date.hasOwnProperty('getTime') is true"); ok(Date.prototype.hasOwnProperty('getTime'), "Date.prototype.hasOwnProperty('getTime') is false"); ok(!("now" in Date), "now found in Date"); +Number(); +new Number(); obj = new Number(); ok(!obj.hasOwnProperty('toFixed'), "obj.hasOwnProperty('toFixed') is true"); ok(!Number.hasOwnProperty('toFixed'), "Number.hasOwnProperty('toFixed') is true"); ok(Number.prototype.hasOwnProperty('toFixed'), "Number.prototype.hasOwnProperty('toFixed') is false"); +/x/; obj = /x/; ok(!obj.hasOwnProperty('exec'), "obj.hasOwnProperty('exec') is true"); ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); @@ -325,6 +336,8 @@ ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +String(); +new String(); obj = new String(); ok(!obj.hasOwnProperty('charAt'), "obj.hasOwnProperty('charAt') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is false"); @@ -3127,6 +3140,8 @@ ok(String.length == 1, "String.length = " + String.length); var tmp = createArray(); ok(getVT(tmp) == "VT_ARRAY|VT_VARIANT", "getVT(createArray()) = " + getVT(tmp)); ok(getVT(VBArray(tmp)) == "VT_ARRAY|VT_VARIANT", "getVT(VBArray(tmp)) = " + getVT(VBArray(tmp))); +VBArray(tmp); +new VBArray(tmp); tmp = new VBArray(tmp); tmp = new VBArray(VBArray(createArray())); ok(tmp.dimensions() == 2, "tmp.dimensions() = " + tmp.dimensions()); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 987d71444ee..d55e90d0bbf 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -291,11 +291,13 @@ static HRESULT VBArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, if(argc<1 || !is_variant(argv[0]) || V_VT(get_variant(argv[0])) != (VT_ARRAY|VT_VARIANT)) return JS_E_VBARRAY_EXPECTED; - return jsval_copy(argv[0], r); + return r ? jsval_copy(argv[0], r) : S_OK; case DISPATCH_CONSTRUCT: if(argc<1 || !is_variant(argv[0]) || V_VT(get_variant(argv[0])) != (VT_ARRAY|VT_VARIANT)) return JS_E_VBARRAY_EXPECTED; + if(!r) + return S_OK; hres = alloc_vbarray(ctx, NULL, &vbarray); if(FAILED(hres))

1 0

Gabriel Ivăncescu : jscript: Move Set below Map.
by Alexandre Julliard 14 Apr '22

14 Apr '22

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

Gabriel Ivăncescu : jscript: Iterate through the map in a helper function.
by Alexandre Julliard 14 Apr '22

14 Apr '22

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

Gabriel Ivăncescu : jscript: Set a map entry using a helper function.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 477026a55bab993ccd17056d096fd924f9c88c1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=477026a55bab993ccd17056d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:41 2022 +0300 jscript: Set a map entry using 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 | 67 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 8946dbbd966..640bf44b5f4 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -127,6 +127,42 @@ static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry) release_map_entry(entry); } +static HRESULT set_map_entry(MapInstance *map, jsval_t key, jsval_t value, jsval_t *r) +{ + struct jsval_map_entry *entry; + HRESULT hres; + + if((entry = get_map_entry(map, key))) { + jsval_t val; + hres = jsval_copy(value, &val); + if(FAILED(hres)) + return hres; + + jsval_release(entry->value); + entry->value = val; + }else { + if(!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY; + + hres = jsval_copy(key, &entry->key); + if(SUCCEEDED(hres)) { + hres = jsval_copy(value, &entry->value); + if(FAILED(hres)) + jsval_release(entry->key); + } + if(FAILED(hres)) { + heap_free(entry); + return hres; + } + grab_map_entry(entry); + wine_rb_put(&map->map, &entry->key, &entry->entry); + list_add_tail(&map->entries, &entry->list_entry); + map->size++; + } + + if(r) *r = jsval_undefined(); + return S_OK; +} + static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, jsval_t *argv, jsval_t *r) { struct jsval_map_entry *entry; @@ -243,7 +279,6 @@ static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar { jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); jsval_t value = argc >= 2 ? argv[1] : jsval_undefined(); - struct jsval_map_entry *entry; MapInstance *map; HRESULT hres; @@ -253,35 +288,7 @@ static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar TRACE("%p (%s %s)\n", map, debugstr_jsval(key), debugstr_jsval(value)); - if((entry = get_map_entry(map, key))) { - jsval_t val; - hres = jsval_copy(value, &val); - if(FAILED(hres)) - return hres; - - jsval_release(entry->value); - entry->value = val; - }else { - if(!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY; - - hres = jsval_copy(key, &entry->key); - if(SUCCEEDED(hres)) { - hres = jsval_copy(value, &entry->value); - if(FAILED(hres)) - jsval_release(entry->key); - } - if(FAILED(hres)) { - heap_free(entry); - return hres; - } - grab_map_entry(entry); - wine_rb_put(&map->map, &entry->key, &entry->entry); - list_add_tail(&map->entries, &entry->list_entry); - map->size++; - } - - if(r) *r = jsval_undefined(); - return S_OK; + return set_map_entry(map, key, value, r); } static HRESULT Map_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Gabriel Ivăncescu : jscript: Pass the Map object to the callback when iterating.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 399f8b6f0653275ac0068b58ef08ce9d223f4adb URL: https://source.winehq.org/git/wine.git/?a=commit;h=399f8b6f0653275ac0068b58… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:42 2022 +0300 jscript: Pass the Map object to the 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 | 3 ++- dlls/mshtml/tests/documentmode.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 640bf44b5f4..dd6829d9b6d 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -179,11 +179,12 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j } LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { - jsval_t args[2], v; + jsval_t args[3], v; if(entry->deleted) continue; args[0] = entry->value; 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); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 28450f721bb..ed41ac1d7a7 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -995,7 +995,7 @@ sync_test("map_obj", function() { var calls = []; i = 0; - r = s.forEach(function(value, key) { + r = s.forEach(function(value, key, map) { if(isNaN(test_keys[i])) { ok(isNaN(key), "key = " + key + " expected NaN"); ok(isNaN(value), "value = " + value + " expected NaN"); @@ -1003,6 +1003,7 @@ sync_test("map_obj", function() { ok(key === test_keys[i], "key = " + key + " expected " + test_keys[i]); ok(value === key + 1, "value = " + value); } + ok(map === s, "map = " + map); i++; }); ok(i === test_keys.length, "i = " + i);

1 0