wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Jacek Caban : wow64win: Implement more user callbacks.
by Alexandre Julliard 13 Aug '22

13 Aug '22

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: Implement more user thunks.
by Alexandre Julliard 13 Aug '22

13 Aug '22

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 : win32u: Use NtUserCallMessage for passing packed winproc result.
by Alexandre Julliard 13 Aug '22

13 Aug '22

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

Robert Wilhelm : wshom: Use signed type for ExitCode in IWshShell3::Run().
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: 484f028338f3a3ff26c2a8a0da17daed8d433c59 URL: https://gitlab.winehq.org/wine/wine/-/commit/484f028338f3a3ff26c2a8a0da17da… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Aug 11 22:03:16 2022 +0200 wshom: Use signed type for ExitCode in IWshShell3::Run(). DWORD is unsigned and will be converted to VT_UI4 variant when used from VBScript. But VT_UI4 is no VBScript data type and should not be used as retval. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 6 ++++-- dlls/wshom.ocx/tests/wshom.c | 15 ++++++++------- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index e04844458b1..41913dcadd5 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1329,7 +1329,7 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) return ret; } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, int *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; @@ -1384,9 +1384,11 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { + DWORD code; WaitForSingleObject(info.hProcess, INFINITE); - GetExitCodeProcess(info.hProcess, exit_code); + GetExitCodeProcess(info.hProcess, &code); CloseHandle(info.hProcess); + *exit_code = code; } else *exit_code = 0; diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 0e30ea9ed9a..4867843678a 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -81,7 +81,8 @@ static void test_wshshell(void) EXCEPINFO ei; VARIANT arg, res, arg2; BSTR str, ret; - DWORD retval, attrs; + int retval; + DWORD attrs; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -227,19 +228,19 @@ static void test_wshshell(void) retval = 10; hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); - ok(retval == 10, "Unexpected retval %lu.\n", retval); + ok(retval == 10, "Unexpected retval %d.\n", retval); retval = 10; hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); - ok(retval == 10, "Unexpected retval %lu.\n", retval); + ok(retval == 10, "Unexpected retval %d.\n", retval); retval = 10; V_VT(&arg2) = VT_ERROR; V_ERROR(&arg2) = 0; hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#lx.\n", hr); - ok(retval == 10, "Unexpected retval %lu.\n", retval); + ok(retval == 10, "Unexpected retval %d.\n", retval); SysFreeString(str); V_VT(&arg2) = VT_BOOL; @@ -249,14 +250,14 @@ static void test_wshshell(void) str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str); retval = 0xdeadbeef; str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str); GetSystemDirectoryW(path, ARRAY_SIZE(path)); @@ -280,7 +281,7 @@ static void test_wshshell(void) str = SysAllocString(buf); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str); DeleteFileW(path2); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 00391d52838..a0175bb1604 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -528,7 +528,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] DWORD* out_ExitCode); + [out, retval] int* out_ExitCode); [id(0x03e9)] HRESULT Popup( diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index 8d4a8f03e17..c69362d6fac 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -528,7 +528,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] DWORD* out_ExitCode); + [out, retval] int* out_ExitCode); [id(0x03e9)] HRESULT Popup(

1 0

Jeremy Newman : Wine-Bugs has moved over to Mailman v3
by Alexandre Julliard 12 Aug '22

12 Aug '22

Module: website Branch: master Commit: 0cec2716a9c887a0ce8d096e2ea214612ba5b3d8 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/0cec2716a9c887a0ce8d096e2e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 12 10:30:41 2022 -0500 Wine-Bugs has moved over to Mailman v3 --- templates/en/forums.template | 4 ++-- templates/fr/forums.template | 4 ++-- templates/ko/forums.template | 4 ++-- templates/nl/forums.template | 4 ++-- templates/pl/forums.template | 4 ++-- templates/pt/forums.template | 4 ++-- templates/tr/forums.template | 4 ++-- templates/zh-cn/forums.template | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 648a35ee..5f96768b 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -85,8 +85,8 @@ You can set your subscription to not send you email, or send as a digest. <li> <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Un-)Subscribe</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">Archive</a>] A high traffic (100/day) read-only list for monitoring activity on the <a href="https://bugs.winehq.org/">Bug Tracking Database</a>. </li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index 66e719a9..774a2f35 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -56,8 +56,8 @@ Voici les plus utiles pour les utilisateurs : <li> <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Dés-)inscription</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">Archive</a>] Une liste haut trafic (100 messages par jour) en lecture seule pour la surveillances des activités sur la <a href="//bugs.winehq.org/">base de données de suivi de bogues</a>. </li> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index 35637b3c..a3dcc8e9 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -73,8 +73,8 @@ href="https://www.winehq.org/mailman3/postorius/lists/?all-lists">웹 페이지< </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">구독/해지</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">메시지 기록</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">구독/해지</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">메시지 기록</a>] <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> <a href="//bugs.winehq.org/">버그 추적 데이터베이스</a>의 활동을 알려 주는 읽기 전용 메일링 리스트입니다. 메시지 전송 빈도: 1일에 100여통(높음) diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 02296331..54e55901 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -71,8 +71,8 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam. <li> <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">In- uitschrijven</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archief</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">In- uitschrijven</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">Archief</a>] Een drukke lijst (100/dag) die alle activiteit op de <a href="//bugs.winehq.org/">Bug Tracking Database</a> laat zien. </li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 1f6ecfec..2087e4bd 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -67,8 +67,8 @@ oprogramowanie listy mailingowej. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archiwum</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Wy-/Za-)pisz</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">Archiwum</a>] <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> Wysoki ruch (100/dziennie) lista tylko-do-odczytu do monitorowania aktywności <a href="//bugs.winehq.org/">bazy danych śledzącej błędy</a>. diff --git a/templates/pt/forums.template b/templates/pt/forums.template index f044ec53..4151864f 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -68,8 +68,8 @@ do contrário o seu email será tratado como um possível spam pelo software da </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Arquivo</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Des-)Inscrever</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">Arquivo</a>] <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> Uma lista de alto tráfego (100/dia) de somente leitura para monitorar a atividade na <a href="//bugs.winehq.org/">Banco de Dados de Bugs</a>. diff --git a/templates/tr/forums.template b/templates/tr/forums.template index c1652b31..55b8607e 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -62,8 +62,8 @@ </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Arşiv</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">Abone ol/iptal et</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">Arşiv</a>] <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> <a href="//bugs.winehq.org/">Hata İzleme Veritabanı</a> üzerinde etkinliği takip etmek için kullanılan yüksek trafikli (100/gün) salt okunur bir liste. </li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 1a2dbf1f..3c62b4c8 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -62,8 +62,8 @@ <li> <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">存档</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">（取消）订阅</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs@winehq.org/">存档</a>] 一个大流量（100封/天）的只读列表，用于监听 <a href="//bugs.winehq.org/">Bug Tracking Database</a> 的活动。 </li>

1 0

Zhiyi Zhang : winegstreamer: Trace mf_media_type_from_wg_format_{audio|video}().
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: b5becc2ee8b70753b9fc538cfdd92c2b4be5911c URL: https://gitlab.winehq.org/wine/wine/-/commit/b5becc2ee8b70753b9fc538cfdd92c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 1 17:39:20 2022 +0800 winegstreamer: Trace mf_media_type_from_wg_format_{audio|video}(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 55f9ae6323d..d6620c0d08a 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -435,6 +435,7 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * } } + FIXME("Unknown audio format %#x.\n", format->u.audio.format); return NULL; } @@ -478,6 +479,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * } } + FIXME("Unknown video format %#x.\n", format->u.video.format); return NULL; }

1 0

Zhiyi Zhang : winegstreamer: Always check the return value from mf_media_type_from_wg_format().
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: 6f8990b4318b25709cd90f6e10e8f3fdaa89c4c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f8990b4318b25709cd90f6e10e8f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 1 17:19:48 2022 +0800 winegstreamer: Always check the return value from mf_media_type_from_wg_format(). mf_media_type_from_wg_format() may return NULL. Fix Airborne Kingdom crash at start because WG_AUDIO_FORMAT_UNKNOWN is passed to mf_media_type_from_wg_format(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index f07b83f413e..43beb71838a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -879,6 +879,12 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) IMFMediaType *base_type = mf_media_type_from_wg_format(&format); GUID base_subtype; + if (!base_type) + { + hr = MF_E_INVALIDMEDIATYPE; + goto done; + } + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); stream_types[0] = base_type; @@ -911,8 +917,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_AUDIO_FORMAT_F32LE, }; - stream_types[0] = mf_media_type_from_wg_format(&format); - type_count = 1; + if ((stream_types[0] = mf_media_type_from_wg_format(&format))) + type_count = 1; for (i = 0; i < ARRAY_SIZE(audio_types); i++) { @@ -921,7 +927,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) continue; new_format = format; new_format.u.audio.format = audio_types[i]; - stream_types[type_count++] = mf_media_type_from_wg_format(&new_format); + if ((stream_types[type_count] = mf_media_type_from_wg_format(&new_format))) + type_count++; } } else

1 0

Nikolay Sivov : mfreadwrite/writer: Create output stream if it wasn't provided.
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: 4244b4b138b35ede1653731b4dc54a0edb091bbd URL: https://gitlab.winehq.org/wine/wine/-/commit/4244b4b138b35ede1653731b4dc54a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 16:03:39 2022 +0300 mfreadwrite/writer: Create output stream if it wasn't provided. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 13 +++++++++++++ dlls/mfreadwrite/writer.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index c36e1a7e04d..95f615767d5 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1291,6 +1291,18 @@ done: DestroyWindow(window); } +static void test_sink_writer(void) +{ + IMFSinkWriter *writer; + HRESULT hr; + + hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, &writer); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); +} + START_TEST(mfplat) { HRESULT hr; @@ -1304,6 +1316,7 @@ START_TEST(mfplat) test_source_reader(); test_source_reader_from_media_source(); test_reader_d3d9(); + test_sink_writer(); hr = MFShutdown(); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index a3f77c4415b..f4bd08b8cda 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -289,6 +289,9 @@ HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream, CLSID clsid; HRESULT hr; + if (!url && !bytestream) + return E_INVALIDARG; + if (FAILED(hr = sink_writer_get_sink_factory_class(url, attributes, &clsid))) return hr; if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSinkClassFactory, (void **)&factory))) @@ -297,8 +300,18 @@ HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream, return hr; } + if (bytestream) + IMFByteStream_AddRef(bytestream); + else if (FAILED(hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_DELETE_IF_EXIST, 0, url, &bytestream))) + { + WARN("Failed to create output file stream, hr %#lx.\n", hr); + IMFSinkClassFactory_Release(factory); + return hr; + } + hr = IMFSinkClassFactory_CreateMediaSink(factory, bytestream, NULL, NULL, &sink); IMFSinkClassFactory_Release(factory); + IMFByteStream_Release(bytestream); if (FAILED(hr)) { WARN("Failed to create a sink, hr %#lx.\n", hr);

1 0

Nikolay Sivov : mfreadwrite/writer: Create archive sink automatically when writer is created from url/bytestream.
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: aaebf839f701655361b612cf6e238f80a21d3e8e URL: https://gitlab.winehq.org/wine/wine/-/commit/aaebf839f701655361b612cf6e238f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 12:07:41 2022 +0300 mfreadwrite/writer: Create archive sink automatically when writer is created from url/bytestream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/Makefile.in | 2 +- dlls/mfreadwrite/mf_private.h | 4 +- dlls/mfreadwrite/reader.c | 6 +- dlls/mfreadwrite/writer.c | 127 +++++++++++++++++++++++++++++++++++------- 4 files changed, 115 insertions(+), 24 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 440d5ba96cd..552ba6d2638 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite -IMPORTS = mfuuid uuid mfplat ole32 +IMPORTS = mfuuid uuid mfplat ole32 kernelbase EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mfreadwrite/mf_private.h b/dlls/mfreadwrite/mf_private.h index 4e23ab7b3e0..7d8172a383a 100644 --- a/dlls/mfreadwrite/mf_private.h +++ b/dlls/mfreadwrite/mf_private.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *attributes, - REFIID riid, void **out) DECLSPEC_HIDDEN; +extern HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *stream, + IMFAttributes *attributes, REFIID riid, void **out) DECLSPEC_HIDDEN; extern HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attributes, REFIID riid, void **out) DECLSPEC_HIDDEN; diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 76348458fac..aac59deba76 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2594,6 +2594,10 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassF { return create_source_reader_from_url(url, attributes, &IID_IMFSourceReader, out); } + else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) + { + return create_sink_writer_from_url(url, NULL, attributes, riid, out); + } FIXME("Unsupported %s.\n", debugstr_guid(clsid)); @@ -2621,7 +2625,7 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteCla hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSink, (void **)&sink); if (stream) - hr = create_sink_writer_from_stream(stream, attributes, riid, out); + hr = create_sink_writer_from_url(NULL, stream, attributes, riid, out); else if (sink) hr = create_sink_writer_from_sink(sink, attributes, riid, out); diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index 1f33c0791ec..a3f77c4415b 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -22,6 +22,8 @@ #include "mfapi.h" #include "mfidl.h" #include "mfreadwrite.h" +#include "pathcch.h" +#include "wine/mfinternal.h" #include "mf_private.h" #include "wine/debug.h" @@ -196,24 +198,6 @@ HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attribut return hr; } -HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *attributes, - REFIID riid, void **out) -{ - struct sink_writer *object; - HRESULT hr; - - object = malloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - object->IMFSinkWriter_iface.lpVtbl = &sink_writer_vtbl; - object->refcount = 1; - - hr = IMFSinkWriter_QueryInterface(&object->IMFSinkWriter_iface, riid, out); - IMFSinkWriter_Release(&object->IMFSinkWriter_iface); - return hr; -} - /*********************************************************************** * MFCreateSinkWriterFromMediaSink (mfreadwrite.@) */ @@ -224,13 +208,116 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } +static HRESULT sink_writer_get_sink_factory_class(const WCHAR *url, IMFAttributes *attributes, CLSID *clsid) +{ + static const struct extension_map + { + const WCHAR *ext; + const GUID *guid; + } ext_map[] = + { + { L".mp4", &MFTranscodeContainerType_MPEG4 }, + { L".mp3", &MFTranscodeContainerType_MP3 }, + { L".wav", &MFTranscodeContainerType_WAVE }, + { L".avi", &MFTranscodeContainerType_AVI }, + }; + static const struct + { + const GUID *container; + const CLSID *clsid; + } class_map[] = + { + { &MFTranscodeContainerType_MPEG4, &CLSID_MFMPEG4SinkClassFactory }, + { &MFTranscodeContainerType_MP3, &CLSID_MFMP3SinkClassFactory }, + { &MFTranscodeContainerType_WAVE, &CLSID_MFWAVESinkClassFactory }, + { &MFTranscodeContainerType_AVI, &CLSID_MFAVISinkClassFactory }, + }; + const WCHAR *extension; + GUID container; + unsigned int i; + + if (url) + { + if (!attributes || FAILED(IMFAttributes_GetGUID(attributes, &MF_TRANSCODE_CONTAINERTYPE, &container))) + { + const struct extension_map *map = NULL; + + if (FAILED(PathCchFindExtension(url, PATHCCH_MAX_CCH, &extension))) return E_INVALIDARG; + if (!extension || !*extension) return E_INVALIDARG; + + for (i = 0; i < ARRAY_SIZE(ext_map); ++i) + { + map = &ext_map[i]; + + if (!wcsicmp(map->ext, extension)) + break; + } + + if (!map) + { + WARN("Couldn't find container type for extension %s.\n", debugstr_w(extension)); + return E_INVALIDARG; + } + + container = *map->guid; + } + } + else + { + if (!attributes) return E_INVALIDARG; + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_TRANSCODE_CONTAINERTYPE, &container))) return E_INVALIDARG; + } + + for (i = 0; i < ARRAY_SIZE(class_map); ++i) + { + if (IsEqualGUID(&container, &class_map[i].container)) + { + *clsid = *class_map[i].clsid; + return S_OK; + } + } + + WARN("Couldn't find factory class for container %s.\n", debugstr_guid(&container)); + return E_INVALIDARG; +} + +HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, + REFIID riid, void **out) +{ + IMFSinkClassFactory *factory; + IMFMediaSink *sink; + CLSID clsid; + HRESULT hr; + + if (FAILED(hr = sink_writer_get_sink_factory_class(url, attributes, &clsid))) return hr; + + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSinkClassFactory, (void **)&factory))) + { + WARN("Failed to create a sink factory, hr %#lx.\n", hr); + return hr; + } + + hr = IMFSinkClassFactory_CreateMediaSink(factory, bytestream, NULL, NULL, &sink); + IMFSinkClassFactory_Release(factory); + if (FAILED(hr)) + { + WARN("Failed to create a sink, hr %#lx.\n", hr); + return hr; + } + + hr = create_sink_writer_from_sink(sink, attributes, riid, out); + IMFMediaSink_Release(sink); + + return hr; +} + /*********************************************************************** * MFCreateSinkWriterFromURL (mfreadwrite.@) */ HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, IMFSinkWriter **writer) { - FIXME("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); + TRACE("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); - return E_NOTIMPL; + return create_sink_writer_from_url(url, bytestream, attributes, &IID_IMFSinkWriter, (void **)writer); }

1 0

Nikolay Sivov : mf: Add archive sink creation exported functions.
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: 8aca379966a9064a7f0abab34ef909e0a9f2b05b URL: https://gitlab.winehq.org/wine/wine/-/commit/8aca379966a9064a7f0abab34ef909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 10:50:23 2022 +0300 mf: Add archive sink creation exported functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.spec | 9 +++-- include/Makefile.in | 1 + include/mfidl.idl | 11 ++++++ include/wine/mfinternal.idl | 54 ++++++++++++++++++++++++++++ libs/mfuuid/mfuuid.c | 1 + 6 files changed, 158 insertions(+), 3 deletions(-)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2022