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

Akihiro Sagawa : ieframe: Allow STGM_WRITE in IPropertyStorage::Open.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: b1281f9cf89fa50c36fbd7a8b3acbb4475ef9a77 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1281f9cf89fa50c36fbd7a8b3acbb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 12 19:45:46 2022 +0900 ieframe: Allow STGM_WRITE in IPropertyStorage::Open. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ieframe/intshcut.c | 5 +++++ dlls/ieframe/tests/intshcut.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 8938a2d9c71..e1dda3f6c1c 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -718,9 +718,14 @@ static HRESULT WINAPI PropertySetStorage_Open( DWORD grfMode, IPropertyStorage **ppprstg) { + const DWORD STGM_ACCESS_MASK = 0x0000000f; InternetShortcut *This = impl_from_IPropertySetStorage(iface); TRACE("(%s, 0x%lx, %p)\n", debugstr_guid(rfmtid), grfMode, ppprstg); + /* ole32 doesn't like STGM_WRITE */ + if ((grfMode & STGM_ACCESS_MASK) == STGM_WRITE) + grfMode = (grfMode & ~STGM_ACCESS_MASK) | STGM_READWRITE; + /* Note: The |STGM_SHARE_EXCLUSIVE is to cope with a bug in the implementation. Should be fixed in ole32. */ return IPropertySetStorage_Open(This->property_set_storage, rfmtid, diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 5d9baa7cd9f..b5487491414 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -236,7 +236,7 @@ static void test_ReadAndWriteProperties(void) /* Test with STGM_WRITE */ hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_WRITE, &pPropStgWrite); - todo_wine ok(hr == S_OK, "Unable to get an IPropertyStorage for writing, hr=0x%lx\n", hr); + ok(hr == S_OK, "Unable to get an IPropertyStorage for writing, hr=0x%lx\n", hr); if (hr == S_OK) {

1 0

Gabriel Ivăncescu : mshtml: Implement window.location setter with a hook.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: e275b2197b23996172c112877c85c9b4459c0611 URL: https://gitlab.winehq.org/wine/wine/-/commit/e275b2197b23996172c112877c85c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:29 2022 +0300 mshtml: Implement window.location setter with a hook. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3ab42af0fa4..c3267e1e4ca 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3619,24 +3619,6 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); switch(id) { - case DISPID_IHTMLWINDOW2_LOCATION: { - HTMLLocation *location; - HRESULT hres; - - if(!(wFlags & DISPATCH_PROPERTYPUT)) - break; - - TRACE("forwarding to location.href\n"); - - hres = get_location(window, &location); - if(FAILED(hres)) - return hres; - - hres = IDispatchEx_InvokeEx(&location->dispex.IDispatchEx_iface, DISPID_VALUE, lcid, - wFlags, pdp, pvarRes, pei, pspCaller); - IHTMLLocation_Release(&location->IHTMLLocation_iface); - return hres; - } case DISPID_IHTMLWINDOW2_SETTIMEOUT: case DISPID_IHTMLWINDOW3_SETTIMEOUT: { VARIANT args[2]; @@ -3912,8 +3894,34 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) ensure_doc_nsevent_handler(This->doc, NULL, eid); } +static HRESULT IHTMLWindow2_location_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + HTMLLocation *location; + HRESULT hres; + + if(!(flags & DISPATCH_PROPERTYPUT)) + return S_FALSE; + + TRACE("forwarding to location.href\n"); + + hres = get_location(This, &location); + if(FAILED(hres)) + return hres; + + hres = IDispatchEx_InvokeEx(&location->dispex.IDispatchEx_iface, DISPID_VALUE, 0, flags, dp, res, ei, caller); + IHTMLLocation_Release(&location->IHTMLLocation_iface); + return hres; +} + static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { + static const dispex_hook_t window2_hooks[] = { + {DISPID_IHTMLWINDOW2_LOCATION, IHTMLWindow2_location_hook}, + {DISPID_UNKNOWN} + }; + if(compat_mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLWindow7_tid, NULL); else @@ -3922,6 +3930,8 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IWineHTMLWindowPrivate_tid, NULL); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); + dispex_info_add_interface(info, IHTMLWindow3_tid, NULL); + dispex_info_add_interface(info, IHTMLWindow2_tid, window2_hooks); EventTarget_init_dispex_info(info, compat_mode); } @@ -3948,8 +3958,6 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { }; static const tid_t HTMLWindow_iface_tids[] = { - IHTMLWindow2_tid, - IHTMLWindow3_tid, IHTMLWindow4_tid, IHTMLWindow6_tid, 0

1 0

Jacek Caban : win32u: Use NtUserCallMessage for passing packed winproc result.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: 40dbc84913a7767b7d7db1b93811e19a41f55c8d URL: https://gitlab.winehq.org/wine/wine/-/commit/40dbc84913a7767b7d7db1b93811e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 13:01:38 2022 +0200 win32u: Use NtUserCallMessage for passing packed winproc result. --- dlls/user32/message.c | 2 +- dlls/user32/winproc.c | 9 +++------ dlls/win32u/message.c | 39 +++++++++++++++++++++++++++++++-------- dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- include/ntuser.h | 13 +++++++------ 6 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2cbdd761fe9..f6431e0c28a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -700,7 +700,7 @@ BOOL WINAPI SendMessageCallbackW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa */ BOOL WINAPI ReplyMessage( LRESULT result ) { - return NtUserReplyMessage( result, NULL ); + return NtUserReplyMessage( result ); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index cc59a290ca5..2c0aaf03da5 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1236,7 +1236,6 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) char stack_buffer[128]; void *buffer; LRESULT result; - MSG msg; if (size > sizeof(*params)) { @@ -1253,13 +1252,11 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) return 0; params->result = &result; - msg.hwnd = params->hwnd; - msg.message = params->msg; - msg.wParam = params->wparam; - msg.lParam = params->lparam; + dispatch_win_proc_params( params ); - NtUserReplyMessage( result, &msg ); + NtUserMessageCall( params->hwnd, params->msg, params->wparam, params->lparam, + (void *)result, NtUserWinProcResult, FALSE ); if (buffer != stack_buffer && buffer != params + 1) HeapFree( GetProcessHeap(), 0, buffer ); } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 746238bfc5c..6506a201559 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1069,18 +1069,37 @@ static void reply_message( struct received_message_info *info, LRESULT result, M * * Send a reply to a sent message and update thread receive info. */ -BOOL reply_message_result( LRESULT result, MSG *msg ) +BOOL reply_message_result( LRESULT result ) { struct user_thread_info *thread_info = get_user_thread_info(); struct received_message_info *info = thread_info->receive_info; if (!info) return FALSE; - reply_message( info, result, msg ); - if (msg) - { - thread_info->receive_info = info->prev; - thread_info->client_info.receive_flags = info->prev ? info->prev->flags : ISMEX_NOSEND; - } + reply_message( info, result, NULL ); + return TRUE; +} + +/*********************************************************************** + * reply_winproc_result + * + * Send a reply to a sent message and update thread receive info. + */ +static BOOL reply_winproc_result( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam ) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + struct received_message_info *info = thread_info->receive_info; + MSG msg; + + if (!info) return FALSE; + + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wparam; + msg.lParam = lparam; + reply_message( info, result, &msg ); + + thread_info->receive_info = info->prev; + thread_info->client_info.receive_flags = info->prev ? info->prev->flags : ISMEX_NOSEND; return TRUE; } @@ -1877,7 +1896,8 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, info.msg.lParam, (info.type != MSG_ASCII), FALSE, WMCHAR_MAP_RECVMESSAGE, needs_unpack, buffer, size ); if (thread_info->receive_info == &info) - reply_message_result( result, &info.msg ); + reply_winproc_result( result, info.msg.hwnd, info.msg.message, + info.msg.wParam, info.msg.lParam ); /* if some PM_QS* flags were specified, only handle sent messages from now on */ if (HIWORD(flags) && !changed_mask) flags = PM_QS_SENDMESSAGE | LOWORD(flags); @@ -2965,6 +2985,9 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa case NtUserClipboardWindowProc: return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam ); + case NtUserWinProcResult: + return reply_winproc_result( (LRESULT)result_info, hwnd, msg, wparam, lparam ); + case NtUserGetDispatchParams: if (!hwnd) return FALSE; if (init_window_call_params( result_info, hwnd, msg, wparam, lparam, diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 33ff35eb21a..99495349246 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5027,6 +5027,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_MessageBeep: return message_beep( arg ); + case NtUserCallOneParam_ReplyMessage: + return reply_message_result( arg ); + case NtUserCallOneParam_SetCaretBlinkTime: return set_caret_blink_time( arg ); @@ -5063,9 +5066,6 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code case NtUserCallTwoParam_MonitorFromRect: return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); - case NtUserCallTwoParam_ReplyMessage: - return reply_message_result( arg1, (MSG *)arg2 ); - case NtUserCallTwoParam_SetCaretPos: return set_caret_pos( arg1, arg2 ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index fbd6c4fccad..ba6479a5426 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -300,7 +300,7 @@ extern void track_mouse_menu_bar( HWND hwnd, INT ht, int x, int y ) DECLSPEC_HID /* message.c */ extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN; -extern BOOL reply_message_result( LRESULT result, MSG *msg ) DECLSPEC_HIDDEN; +extern BOOL reply_message_result( LRESULT result ) DECLSPEC_HIDDEN; extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, UINT flags ) DECLSPEC_HIDDEN; extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, diff --git a/include/ntuser.h b/include/ntuser.h index f5555056078..053f60b8d1e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -300,6 +300,7 @@ enum NtUserSpyGetMsgName = 0x3002, NtUserSpyEnter = 0x0303, NtUserSpyExit = 0x0304, + NtUserWinProcResult = 0x0305, }; /* NtUserThunkedMenuItemInfo codes */ @@ -941,6 +942,7 @@ enum NtUserCallOneParam_IsWindowRectFullScreen, NtUserCallOneParam_MessageBeep, NtUserCallOneParam_RealizePalette, + NtUserCallOneParam_ReplyMessage, NtUserCallOneParam_SetCaretBlinkTime, NtUserCallOneParam_SetProcessDefaultLayout, /* temporary exports */ @@ -1051,6 +1053,11 @@ static inline UINT NtUserRealizePalette( HDC hdc ) return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_RealizePalette ); } +static inline BOOL NtUserReplyMessage( LRESULT result ) +{ + return NtUserCallOneParam( result, NtUserCallOneParam_ReplyMessage ); +} + static inline UINT NtUserSetProcessDefaultLayout( DWORD layout ) { return NtUserCallOneParam( layout, NtUserCallOneParam_SetProcessDefaultLayout ); @@ -1063,7 +1070,6 @@ enum NtUserCallTwoParam_GetMonitorInfo, NtUserCallTwoParam_GetSystemMetricsForDpi, NtUserCallTwoParam_MonitorFromRect, - NtUserCallTwoParam_ReplyMessage, NtUserCallTwoParam_SetCaretPos, NtUserCallTwoParam_SetIconParam, NtUserCallTwoParam_UnhookWindowsHook, @@ -1094,11 +1100,6 @@ static inline HMONITOR NtUserMonitorFromRect( const RECT *rect, DWORD flags ) return UlongToHandle( ret ); } -static inline BOOL NtUserReplyMessage( LRESULT result, MSG *msg ) -{ - return NtUserCallTwoParam( result, (UINT_PTR)msg, NtUserCallTwoParam_ReplyMessage ); -} - static inline BOOL NtUserSetCaretPos( int x, int y ) { return NtUserCallTwoParam( x, y, NtUserCallTwoParam_SetCaretPos );

1 0

Jacek Caban : wow64win: Implement more user thunks.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: eee0a5fd3803e38166b4ebb3b5a98d56612b9daf URL: https://gitlab.winehq.org/wine/wine/-/commit/eee0a5fd3803e38166b4ebb3b5a98d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 13:07:48 2022 +0200 wow64win: Implement more user thunks. --- dlls/wow64win/user.c | 191 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 170 insertions(+), 21 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1f4acc04e2a..1ad8674a08e 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -30,6 +30,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); +typedef struct +{ + DWORD cbSize; + DWORD fMask; + DWORD dwStyle; + UINT cyMax; + ULONG hbrBack; + DWORD dwContextHelpID; + ULONG dwMenuData; +} MENUINFO32; + typedef struct { UINT cbSize; @@ -505,8 +516,41 @@ NTSTATUS WINAPI wow64_NtUserCallHwndParam( UINT *args ) DWORD_PTR param = get_ulong( &args ); DWORD code = get_ulong( &args ); - FIXME( "%p %Ix %lu\n", hwnd, param, code ); - return 0; + switch (code) + { + case NtUserCallHwndParam_GetScrollInfo: + { + struct + { + int bar; + ULONG info; + } *info32 = UlongToPtr( param ); + struct get_scroll_info_params info; + + info.bar = info32->bar; + info.info = UlongToPtr( info32->info ); + return NtUserCallHwndParam( hwnd, (UINT_PTR)&info, code ); + } + + case NtUserCallHwndParam_MapWindowPoints: + { + struct + { + ULONG hwnd_to; + ULONG points; + UINT count; + } *params32 = UlongToPtr( param ); + struct map_window_points_params params; + + params.hwnd_to = UlongToHandle( params32->hwnd_to ); + params.points = UlongToPtr( params32->points ); + params.count = params32->count; + return NtUserCallHwndParam( hwnd, (UINT_PTR)&params, code ); + } + + default: + return NtUserCallHwndParam( hwnd, param, code ); + } } NTSTATUS WINAPI wow64_NtUserCallMsgFilter( UINT *args ) @@ -543,8 +587,7 @@ NTSTATUS WINAPI wow64_NtUserCallOneParam( UINT *args ) ULONG_PTR arg = get_ulong( &args ); ULONG code = get_ulong( &args ); - FIXME( "%Ix %lu\n", arg, code ); - return 0; + return NtUserCallOneParam( arg, code ); } NTSTATUS WINAPI wow64_NtUserCallTwoParam( UINT *args ) @@ -553,8 +596,33 @@ NTSTATUS WINAPI wow64_NtUserCallTwoParam( UINT *args ) ULONG_PTR arg2 = get_ulong( &args ); ULONG code = get_ulong( &args ); - FIXME( "%Ix %Ix %lu\n", arg1, arg2, code ); - return 0; + switch (code) + { + case NtUserCallTwoParam_GetMenuInfo: + { + MENUINFO32 *info32 = UlongToPtr( arg2 ); + MENUINFO info; + + if (!info32 || info32->cbSize != sizeof(*info32)) + { + set_last_error32( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + info.cbSize = sizeof(info); + info.fMask = info32->fMask; + if (!NtUserCallTwoParam( arg1, (UINT_PTR)&info, code )) return FALSE; + if (info.fMask & MIM_BACKGROUND) info32->hbrBack = HandleToUlong( info.hbrBack ); + if (info.fMask & MIM_HELPID) info32->dwContextHelpID = info.dwContextHelpID; + if (info.fMask & MIM_MAXHEIGHT) info32->cyMax = info.cyMax; + if (info.fMask & MIM_MENUDATA) info32->dwMenuData = info.dwMenuData; + if (info.fMask & MIM_STYLE) info32->dwStyle = info.dwStyle; + return TRUE; + } + + default: + return NtUserCallTwoParam( arg1, arg2, code ); + } } NTSTATUS WINAPI wow64_NtUserChangeClipboardChain( UINT *args ) @@ -1767,10 +1835,57 @@ NTSTATUS WINAPI wow64_NtUserHiliteMenuItem( UINT *args ) return NtUserHiliteMenuItem( hwnd, handle, item, hilite ); } +struct user_client_procs32 +{ + ULONG pButtonWndProc; + ULONG pComboWndProc; + ULONG pDefWindowProc; + ULONG pDefDlgProc; + ULONG pEditWndProc; + ULONG pListBoxWndProc; + ULONG pMDIClientWndProc; + ULONG pScrollBarWndProc; + ULONG pStaticWndProc; + ULONG pImeWndProc; + ULONG pDesktopWndProc; + ULONG pIconTitleWndProc; + ULONG pPopupMenuWndProc; + ULONG pMessageWndProc; +}; + +static struct user_client_procs *user_client_procs_32to64( struct user_client_procs *procs, + const struct user_client_procs32 *procs32 ) +{ + if (!procs32) return NULL; + + procs->pButtonWndProc = UlongToPtr( procs32->pButtonWndProc ); + procs->pComboWndProc = UlongToPtr( procs32->pComboWndProc ); + procs->pDefWindowProc = UlongToPtr( procs32->pDefWindowProc ); + procs->pDefDlgProc = UlongToPtr( procs32->pDefDlgProc ); + procs->pEditWndProc = UlongToPtr( procs32->pEditWndProc ); + procs->pListBoxWndProc = UlongToPtr( procs32->pListBoxWndProc ); + procs->pMDIClientWndProc = UlongToPtr( procs32->pMDIClientWndProc ); + procs->pScrollBarWndProc = UlongToPtr( procs32->pScrollBarWndProc ); + procs->pStaticWndProc = UlongToPtr( procs32->pStaticWndProc ); + procs->pImeWndProc = UlongToPtr( procs32->pImeWndProc ); + procs->pDesktopWndProc = UlongToPtr( procs32->pDesktopWndProc ); + procs->pIconTitleWndProc = UlongToPtr( procs32->pIconTitleWndProc ); + procs->pPopupMenuWndProc = UlongToPtr( procs32->pPopupMenuWndProc ); + procs->pMessageWndProc = UlongToPtr( procs32->pMessageWndProc ); + return procs; +} + NTSTATUS WINAPI wow64_NtUserInitializeClientPfnArrays( UINT *args ) { - FIXME( "\n" ); - return STATUS_NOT_SUPPORTED; + const struct user_client_procs32 *procsA32 = get_ptr( &args ); + const struct user_client_procs32 *procsW32 = get_ptr( &args ); + void *workers = get_ptr( &args ); + HINSTANCE user_module = get_ptr( &args ); + + struct user_client_procs procsA, procsW; + return NtUserInitializeClientPfnArrays( user_client_procs_32to64( &procsA, procsA32 ), + user_client_procs_32to64( &procsW, procsW32 ), + workers, user_module ); } NTSTATUS WINAPI wow64_NtUserInternalGetWindowIcon( UINT *args ) @@ -2209,10 +2324,53 @@ NTSTATUS WINAPI wow64_NtUserSetCursorIconData( UINT *args ) HCURSOR cursor = get_handle( &args ); UNICODE_STRING32 *module32 = get_ptr( &args ); UNICODE_STRING32 *res_name32 = get_ptr( &args ); - void *desc = get_ptr( &args ); + struct + { + UINT flags; + UINT num_steps; + UINT num_frames; + UINT delay; + ULONG frames; + ULONG frame_seq; + ULONG frame_rates; + ULONG rsrc; + } *desc32 = get_ptr( &args ); + struct + { + UINT width; + UINT height; + ULONG color; + ULONG alpha; + ULONG mask; + POINT hotspot; + } *frames32 = UlongToPtr( desc32->frames ); - FIXME( "%p %p %p %p\n", cursor, module32, res_name32, desc ); - return 0; + UNICODE_STRING module, res_name; + struct cursoricon_desc desc; + UINT i, num_frames; + + num_frames = max( desc32->num_frames, 1 ); + if (!(desc.frames = Wow64AllocateTemp( num_frames * sizeof(*desc.frames) ))) return FALSE; + desc.flags = desc32->flags; + desc.num_steps = desc32->num_steps; + desc.num_frames = desc32->num_frames; + desc.delay = desc32->delay; + desc.frame_seq = UlongToPtr( desc32->frame_seq ); + desc.frame_rates = UlongToPtr( desc32->frame_rates ); + desc.rsrc = UlongToPtr( desc32->rsrc ); + + for (i = 0; i < num_frames; i++) + { + desc.frames[i].width = frames32[i].width; + desc.frames[i].height = frames32[i].height; + desc.frames[i].color = UlongToHandle( frames32[i].color ); + desc.frames[i].alpha = UlongToHandle( frames32[i].alpha ); + desc.frames[i].mask = UlongToHandle( frames32[i].mask ); + desc.frames[i].hotspot = frames32[i].hotspot; + } + + return NtUserSetCursorIconData( cursor, unicode_str_32to64( &module, module32 ), + unicode_str_32to64( &res_name, res_name32), &desc ); } NTSTATUS WINAPI wow64_NtUserSetCursorPos( UINT *args ) @@ -2625,16 +2783,7 @@ NTSTATUS WINAPI wow64_NtUserSystemParametersInfoForDpi( UINT *args ) NTSTATUS WINAPI wow64_NtUserThunkedMenuInfo( UINT *args ) { HMENU menu = get_handle( &args ); - const struct - { - DWORD cbSize; - DWORD fMask; - DWORD dwStyle; - UINT cyMax; - ULONG hbrBack; - DWORD dwContextHelpID; - ULONG dwMenuData; - } *info32 = get_ptr( &args ); + MENUINFO32 *info32 = get_ptr( &args ); MENUINFO info; if (info32)

1 0

Jacek Caban : wow64win: Implement more user callbacks.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: 3606a163d5a21741d0e01769e307182ddd729640 URL: https://gitlab.winehq.org/wine/wine/-/commit/3606a163d5a21741d0e01769e30718… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 15:04:59 2022 +0200 wow64win: Implement more user callbacks. --- dlls/wow64win/user.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 153 insertions(+), 16 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1ad8674a08e..7c6abd5bef6 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -210,14 +210,42 @@ static NTSTATUS dispatch_callback( ULONG id, void *args, ULONG len ) static NTSTATUS WINAPI wow64_NtUserCallEnumDisplayMonitor( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct enum_display_monitor_params *params = arg; + struct + { + ULONG proc; + ULONG monitor; + ULONG hdc; + RECT rect; + ULONG lparam; + } params32; + + params32.proc = PtrToUlong( params->proc ); + params32.monitor = HandleToUlong( params->monitor ); + params32.hdc = HandleToUlong( params->hdc ); + params32.rect = params->rect; + params32.lparam = params->lparam; + return dispatch_callback( NtUserCallEnumDisplayMonitor, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserCallSendAsyncCallback( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct send_async_params *params = arg; + struct + { + ULONG callback; + ULONG hwnd; + UINT msg; + ULONG data; + ULONG result; + } params32; + + params32.callback = PtrToUlong( params->callback ); + params32.hwnd = HandleToUlong( params->hwnd ); + params32.msg = params->msg; + params32.data = params->data; + params32.result = params->result; + return dispatch_callback( NtUserCallSendAsyncCallback, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserCallWinEventHook( void *arg, ULONG size ) @@ -240,14 +268,71 @@ static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserCopyImage( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct copy_image_params *params = arg; + struct + { + ULONG hwnd; + UINT type; + INT dx; + INT dy; + UINT flags; + } params32; + + params32.hwnd = HandleToUlong( params->hwnd ); + params32.type = params->type; + params32.dx = params->dx; + params32.dy = params->dy; + params32.flags = params->flags; + return dispatch_callback( NtUserCopyImage, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserDrawScrollBar( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct draw_scroll_bar_params *params = arg; + struct + { + ULONG hwnd; + ULONG hdc; + INT bar; + UINT hit_test; + struct + { + ULONG win; + INT bar; + INT thumb_pos; + INT thumb_val; + BOOL vertical; + enum SCROLL_HITTEST hit_test; + } tracking_info; + BOOL arrows; + BOOL interior; + RECT rect; + UINT enable_flags; + INT arrow_size; + INT thumb_pos; + INT thumb_size; + BOOL vertical; + } params32; + + params32.hwnd = HandleToUlong( params->hwnd ); + params32.hdc = HandleToUlong( params->hdc ); + params32.bar = params->bar; + params32.hit_test = params->hit_test; + params32.tracking_info.win = HandleToUlong( params->tracking_info.win ); + params32.tracking_info.bar = params->tracking_info.bar; + params32.tracking_info.thumb_pos = params->tracking_info.thumb_pos; + params32.tracking_info.thumb_val = params->tracking_info.thumb_val; + params32.tracking_info.vertical = params->tracking_info.vertical; + params32.tracking_info.hit_test = params->tracking_info.hit_test; + params32.arrows = params->arrows; + params32.interior = params->interior; + params32.rect = params->rect; + params32.enable_flags = params->enable_flags; + params32.arrow_size = params->arrow_size; + params32.thumb_pos = params->thumb_pos; + params32.thumb_size = params->thumb_size; + params32.vertical = params->vertical; + return dispatch_callback( NtUserDrawScrollBar, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) @@ -258,14 +343,34 @@ static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserFreeCachedClipboardData( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct free_cached_data_params *params = arg; + struct + { + UINT format; + ULONG handle; + } params32; + + params32.format = params->format; + params32.handle = HandleToUlong( params->handle ); + return dispatch_callback( NtUserFreeCachedClipboardData, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserImmProcessKey( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct imm_process_key_params *params = arg; + struct + { + ULONG hwnd; + ULONG hkl; + UINT vkey; + ULONG key_data; + } params32; + + params32.hwnd = HandleToUlong( params->hwnd ); + params32.hkl = HandleToUlong( params->hkl ); + params32.vkey = params->vkey; + params32.key_data = params->key_data; + return dispatch_callback( NtUserImmProcessKey, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserImmTranslateMessage( void *arg, ULONG size ) @@ -286,8 +391,24 @@ static NTSTATUS WINAPI wow64_NtUserLoadDriver( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserLoadImage( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct load_image_params *params = arg; + struct + { + ULONG hinst; + ULONG name; + UINT type; + INT dx; + INT dy; + UINT flags; + } params32; + + params32.hinst = PtrToUlong( params->hinst ); + params32.name = PtrToUlong( params->name ); + params32.type = params->type; + params32.dx = params->dx; + params32.dy = params->dy; + params32.flags = params->flags; + return dispatch_callback( NtUserLoadImage, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserLoadSysMenu( void *arg, ULONG size ) @@ -297,8 +418,24 @@ static NTSTATUS WINAPI wow64_NtUserLoadSysMenu( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserPostDDEMessage( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct post_dde_message_params *params = arg; + struct + { + ULONG hwnd; + UINT msg; + LONG wparam; + LONG lparam; + DWORD dest_tid; + DWORD type; + } params32; + + params32.hwnd = HandleToUlong( params->hwnd ); + params32.msg = params->msg; + params32.wparam = params->wparam; + params32.lparam = params->lparam; + params32.dest_tid = params->dest_tid; + params32.type = params->type; + return dispatch_callback( NtUserPostDDEMessage, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserRenderSynthesizedFormat( void *arg, ULONG size )

1 0

Jacek Caban : wow64win: Handle bitmaps and pens in wow64_NtGdiExtGetObjectW.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: c3c82bd96a399c90f548639ce8f879a4b0c5c601 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3c82bd96a399c90f548639ce8f879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 15:17:24 2022 +0200 wow64win: Handle bitmaps and pens in wow64_NtGdiExtGetObjectW. --- dlls/wow64win/gdi.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 4d98a1b9b13..f13ed3da1f0 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -27,6 +27,35 @@ #include "ntgdi.h" #include "wow64win_private.h" +typedef struct +{ + INT bmType; + INT bmWidth; + INT bmHeight; + INT bmWidthBytes; + WORD bmPlanes; + WORD bmBitsPixel; + ULONG bmBits; +} BITMAP32; + +typedef struct +{ + DWORD elpPenStyle; + DWORD elpWidth; + UINT elpBrushStyle; + COLORREF elpColor; + ULONG elpHatch; + DWORD elpNumEntries; + DWORD elpStyleEntry[1]; +} EXTLOGPEN32; + + +static DWORD gdi_handle_type( HGDIOBJ obj ) +{ + unsigned int handle = HandleToUlong( obj ); + return handle & NTGDI_HANDLE_TYPE_MASK; +} + NTSTATUS WINAPI wow64_NtGdiAddFontMemResourceEx( UINT *args ) { void *ptr = get_ptr( &args ); @@ -334,7 +363,91 @@ NTSTATUS WINAPI wow64_NtGdiExtGetObjectW( UINT *args ) INT count = get_ulong( &args ); void *buffer = get_ptr( &args ); - return NtGdiExtGetObjectW( handle, count, buffer ); + switch (gdi_handle_type( handle )) + { + case NTGDI_OBJ_BITMAP: + { + BITMAP32 *bitmap32 = buffer; + struct + { + BITMAP32 dsBm; + BITMAPINFOHEADER dsBmih; + DWORD dsBitfields[3]; + ULONG dshSection; + DWORD dsOffset; + } *dib32 = buffer; + DIBSECTION dib; + int ret; + + if (buffer) + { + if (count < sizeof(*bitmap32)) return 0; + count = count < sizeof(*dib32) ? sizeof(BITMAP) : sizeof(DIBSECTION); + } + + if (!(ret = NtGdiExtGetObjectW( handle, count, buffer ? &dib : NULL ))) return 0; + + if (bitmap32) + { + bitmap32->bmType = dib.dsBm.bmType; + bitmap32->bmWidth = dib.dsBm.bmWidth; + bitmap32->bmHeight = dib.dsBm.bmHeight; + bitmap32->bmWidthBytes = dib.dsBm.bmWidthBytes; + bitmap32->bmPlanes = dib.dsBm.bmPlanes; + bitmap32->bmBitsPixel = dib.dsBm.bmBitsPixel; + bitmap32->bmBits = PtrToUlong( dib.dsBm.bmBits ); + } + if (ret != sizeof(dib)) return sizeof(*bitmap32); + + if (dib32) + { + dib32->dsBmih = dib.dsBmih; + dib32->dsBitfields[0] = dib.dsBitfields[0]; + dib32->dsBitfields[1] = dib.dsBitfields[1]; + dib32->dsBitfields[2] = dib.dsBitfields[2]; + dib32->dshSection = HandleToUlong( dib.dshSection ); + dib32->dsOffset = dib.dsOffset; + } + return sizeof(*dib32); + } + + case NTGDI_OBJ_PEN: + case NTGDI_OBJ_EXTPEN: + { + EXTLOGPEN32 *pen32 = buffer; + EXTLOGPEN *pen = NULL; + + if (count == sizeof(LOGPEN) || (buffer && !HIWORD( buffer ))) + return NtGdiExtGetObjectW( handle, count, buffer ); + + if (pen32 && count && !(pen = Wow64AllocateTemp( count + sizeof(ULONG) ))) return 0; + count = NtGdiExtGetObjectW( handle, count + sizeof(ULONG), pen ); + + if (count == sizeof(LOGPEN)) + { + if (buffer) memcpy( buffer, pen, count ); + } + else if (count) + { + if (pen32) + { + pen32->elpPenStyle = pen->elpPenStyle; + pen32->elpWidth = pen->elpWidth; + pen32->elpBrushStyle = pen->elpBrushStyle; + pen32->elpColor = pen->elpColor; + pen32->elpHatch = pen->elpHatch; + pen32->elpNumEntries = pen->elpNumEntries; + } + count -= FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ); + if (count && pen32) memcpy( pen32->elpStyleEntry, pen->elpStyleEntry, count ); + count += FIELD_OFFSET( EXTLOGPEN32, elpStyleEntry ); + } + return count; + } + + default: + return NtGdiExtGetObjectW( handle, count, buffer ); + } } NTSTATUS WINAPI wow64_NtGdiFlattenPath( UINT *args )

1 0

Jacek Caban : wow64win: Fix NULL msg handling in wow64_NtUserPeekMessage.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: c5d8ebe7abc145b28c9a36ed4cd674a5501b02d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5d8ebe7abc145b28c9a36ed4cd674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 15:32:40 2022 +0200 wow64win: Fix NULL msg handling in wow64_NtUserPeekMessage. --- dlls/wow64win/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 551ba44ccd9..6aecdacda39 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2209,7 +2209,7 @@ NTSTATUS WINAPI wow64_NtUserPeekMessage( UINT *args ) UINT flags = get_ulong( &args ); MSG msg; - if (!NtUserPeekMessage( &msg, hwnd, first, last, flags )) return FALSE; + if (!NtUserPeekMessage( msg32 ? &msg : NULL, hwnd, first, last, flags )) return FALSE; msg_64to32( &msg, msg32 ); return TRUE; }

1 0

Paul Gofman : ntdll: Remove redundant assignment in fixup_icmp_over_dgram().
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: a91cc08975432279a470d604703ba0b224b6378e URL: https://gitlab.winehq.org/wine/wine/-/commit/a91cc08975432279a470d604703ba0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 9 15:24:13 2022 -0500 ntdll: Remove redundant assignment in fixup_icmp_over_dgram(). --- dlls/ntdll/unix/socket.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index bf5907aafc1..f8ed9f6f854 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -711,7 +711,6 @@ static ssize_t fixup_icmp_over_dgram( struct msghdr *hdr, union unix_sockaddr *u icmp_h->checksum = chksum( (BYTE *)icmp_h, recv_len - sizeof(ip_h) ); } } - ip_h.checksum = 0; ip_h.checksum = chksum( (BYTE *)&ip_h, sizeof(ip_h) ); memcpy( buf, &ip_h, min( sizeof(ip_h), buf_len ));

1 0

Gabriel Ivăncescu : mshtml: Forward Document's Invoke to InvokeEx.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: 4cc16ada4b96c53a9a4d2383298373fd5a273827 URL: https://gitlab.winehq.org/wine/wine/-/commit/4cc16ada4b96c53a9a4d2383298373… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:29 2022 +0300 mshtml: Forward Document's Invoke to InvokeEx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 38 +++++++++++++++++++++----------------- dlls/mshtml/tests/htmldoc.c | 10 ++++++++++ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0cf19388481..3cbd229f19e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4912,20 +4912,8 @@ static HRESULT WINAPI DocDispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMemb TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - switch(dispIdMember) { - case DISPID_READYSTATE: - TRACE("DISPID_READYSTATE\n"); - - if(!(wFlags & DISPATCH_PROPERTYGET)) - return E_INVALIDARG; - - V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = This->window->readystate; - return S_OK; - } - - return IDispatchEx_Invoke(This->dispex, dispIdMember, riid, lcid, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) @@ -4945,10 +4933,26 @@ static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID { HTMLDocument *This = impl_from_IDispatchEx(iface); - if(This->window && id == DISPID_IHTMLDOCUMENT2_LOCATION && (wFlags & DISPATCH_PROPERTYPUT)) - return IDispatchEx_InvokeEx(&This->window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, - lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(This->window) { + switch(id) { + case DISPID_READYSTATE: + TRACE("DISPID_READYSTATE\n"); + + if(!(wFlags & DISPATCH_PROPERTYGET)) + return E_INVALIDARG; + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = This->window->readystate; + return S_OK; + case DISPID_IHTMLDOCUMENT2_LOCATION: + if(!(wFlags & DISPATCH_PROPERTYPUT)) + break; + return IDispatchEx_InvokeEx(&This->window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, + lcid, wFlags, pdp, pvarRes, pei, pspCaller); + default: + break; + } + } return IDispatchEx_InvokeEx(This->dispex, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ff050863b6f..7764f256ab0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5364,6 +5364,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) { IHTMLDocument2 *htmldoc; DISPPARAMS dispparams; + IDispatchEx *dispex; IHTMLElement *elem; BSTR state; VARIANT out; @@ -5437,6 +5438,15 @@ static void _test_readyState(unsigned line, IUnknown *unk) ok_(__FILE__,line) (V_VT(&out) == VT_I4, "V_VT(out)=%d\n", V_VT(&out)); ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%ld, expected %d\n", V_I4(&out), load_state%5); + hres = IHTMLDocument2_QueryInterface(htmldoc, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "QueryInterface(IID_IDispatchEx) failed: %08lx\n", hres); + hres = IDispatchEx_InvokeEx(dispex, DISPID_READYSTATE, 0, DISPATCH_PROPERTYGET, &dispparams, &out, NULL, NULL); + ok(hres == S_OK, "InvokeEx(DISPID_READYSTATE) failed: %08lx\n", hres); + IDispatchEx_Release(dispex); + + ok_(__FILE__,line) (V_VT(&out) == VT_I4, "V_VT(out)=%d\n", V_VT(&out)); + ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%ld, expected %d\n", V_I4(&out), load_state%5); + test_doscroll((IUnknown*)htmldoc); IHTMLDocument2_Release(htmldoc);

1 0

Gabriel Ivăncescu : mshtml: Implement window.setTimeout with a hook.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: 8dbdded67366fce7e1e459570d99e90a72cf52cd URL: https://gitlab.winehq.org/wine/wine/-/commit/8dbdded67366fce7e1e459570d99e9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:29 2022 +0300 mshtml: Implement window.setTimeout with a hook. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 56 ++++++++++++++++++++++------------------------ dlls/mshtml/tests/events.c | 26 ++++++++++++++++++++- 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c3267e1e4ca..0043fb79731 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3614,34 +3614,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { HTMLWindow *This = impl_from_IDispatchEx(iface); - HTMLInnerWindow *window = This->inner_window; - - TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - - switch(id) { - case DISPID_IHTMLWINDOW2_SETTIMEOUT: - case DISPID_IHTMLWINDOW3_SETTIMEOUT: { - VARIANT args[2]; - DISPPARAMS dp = {args, NULL, 2, 0}; - - /* - * setTimeout calls should use default value 0 for the second argument if only one is provided, - * but IDL file does not reflect that. We fixup arguments here instead. - */ - if(!(wFlags & DISPATCH_METHOD) || pdp->cArgs != 1 || pdp->cNamedArgs) - break; - - TRACE("Fixing args\n"); - - V_VT(args) = VT_I4; - V_I4(args) = 0; - args[1] = *pdp->rgvarg; - return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, - wFlags, &dp, pvarRes, pei, pspCaller); - } - } - - return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return IDispatchEx_InvokeEx(&This->inner_window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) @@ -3915,12 +3888,37 @@ static HRESULT IHTMLWindow2_location_hook(DispatchEx *dispex, WORD flags, DISPPA return hres; } +static HRESULT IHTMLWindow3_setTimeout_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + /* + * setTimeout calls should use default value 0 for the second argument if only one is provided, + * but IDL file does not reflect that. We fixup arguments here instead. + */ + if(!(flags & DISPATCH_METHOD) || dp->cArgs != 1 || dp->cNamedArgs) + return S_FALSE; + + TRACE("Fixing args\n"); + + V_VT(args) = VT_I4; + V_I4(args) = 0; + args[1] = dp->rgvarg[0]; + return dispex_call_builtin(dispex, DISPID_IHTMLWINDOW3_SETTIMEOUT, &new_dp, res, ei, caller); +} + static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { static const dispex_hook_t window2_hooks[] = { {DISPID_IHTMLWINDOW2_LOCATION, IHTMLWindow2_location_hook}, {DISPID_UNKNOWN} }; + static const dispex_hook_t window3_hooks[] = { + {DISPID_IHTMLWINDOW3_SETTIMEOUT, IHTMLWindow3_setTimeout_hook}, + {DISPID_UNKNOWN} + }; if(compat_mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLWindow7_tid, NULL); @@ -3930,7 +3928,7 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IWineHTMLWindowPrivate_tid, NULL); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); - dispex_info_add_interface(info, IHTMLWindow3_tid, NULL); + dispex_info_add_interface(info, IHTMLWindow3_tid, window3_hooks); dispex_info_add_interface(info, IHTMLWindow2_tid, window2_hooks); EventTarget_init_dispex_info(info, compat_mode); } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 95ed071bf78..c5210e721d2 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2523,11 +2523,35 @@ static void test_submit(IHTMLDocument2 *doc) static void test_timeout(IHTMLDocument2 *doc) { + VARIANT expr, var, args[2]; + DISPPARAMS dp = { args, NULL, 2, 0 }; IHTMLWindow3 *win3; - VARIANT expr, var; + IDispatch *disp; + UINT argerr; LONG id; HRESULT hres; + /* First try the IHTMLWindow2 DISPIDs via IDispatch, since they're not exposed */ + hres = IHTMLWindow2_QueryInterface(window, &IID_IDispatch, (void**)&disp); + ok(hres == S_OK, "Could not get IDispatch iface: %08lx\n", hres); + + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(L""); + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 1; + V_VT(&var) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_IHTMLWINDOW2_SETINTERVAL, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, &var, NULL, &argerr); + todo_wine + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke(DISPID_IHTMLWINDOW2_SETINTERVAL) returned: %08lx\n", hres); + + hres = IDispatch_Invoke(disp, DISPID_IHTMLWINDOW2_SETTIMEOUT, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, &var, NULL, &argerr); + todo_wine + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke(DISPID_IHTMLWINDOW2_SETTIMEOUT) returned: %08lx\n", hres); + SysFreeString(V_BSTR(&args[1])); + IDispatch_Release(disp); + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow3, (void**)&win3); ok(hres == S_OK, "Could not get IHTMLWindow3 iface: %08lx\n", hres);

1 0