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

Rémi Bernon : qasf: Register ASF Reader filter media type.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 4608e1e1257a377cd554a0e885368e3feb7d286f URL: https://gitlab.winehq.org/wine/wine/-/commit/4608e1e1257a377cd554a0e885368e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:48:59 2022 +0200 qasf: Register ASF Reader filter media type. --- dlls/qasf/qasf.rgs | 15 +++++++++++++++ dlls/qasf/version.rc | 3 +++ 2 files changed, 18 insertions(+) diff --git a/dlls/qasf/qasf.rgs b/dlls/qasf/qasf.rgs new file mode 100644 index 00000000000..de0d3e425ed --- /dev/null +++ b/dlls/qasf/qasf.rgs @@ -0,0 +1,15 @@ +HKCR +{ + NoRemove 'Media Type' + { + '{e436eb83-524f-11ce-9f53-0020af0ba770}' + { + '{6b6d0801-9ada-11d0-a520-00a0d10129c0}' + { + val '0' = s '0,4,,3026b275' + val '1' = s '0,4,,d129e2d6' + val 'Source Filter' = s '{187463a0-5bb7-11d3-acbe-0080c75e246e}' + } + } + } +} diff --git a/dlls/qasf/version.rc b/dlls/qasf/version.rc index dab46194395..70ec03ad6b1 100644 --- a/dlls/qasf/version.rc +++ b/dlls/qasf/version.rc @@ -24,3 +24,6 @@ #define WINE_PRODUCTVERSION_STR "9.0.0.4503" #include "wine/wine_common_ver.rc" + +/* @makedep: qasf.rgs */ +1 WINE_REGISTRY qasf.rgs

1 0

Jacek Caban : win32u: Use a client copy of windows hook lparam when calling hook procs.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: caad1672782a20c813bc07daead13348263fea37 URL: https://gitlab.winehq.org/wine/wine/-/commit/caad1672782a20c813bc07daead133… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 16 12:35:09 2022 +0200 win32u: Use a client copy of windows hook lparam when calling hook procs. Instead of leaking kernel pointers. --- dlls/user32/hook.c | 38 +++++++++++++- dlls/user32/user_private.h | 2 +- dlls/win32u/defwnd.c | 6 +-- dlls/win32u/hook.c | 116 +++++++++++++++++++++++++++++++++---------- dlls/win32u/input.c | 6 +-- dlls/win32u/message.c | 28 ++++++----- dlls/win32u/tests/win32u.c | 1 - dlls/win32u/win32u_private.h | 3 +- dlls/win32u/window.c | 10 ++-- include/ntuser.h | 2 +- 10 files changed, 157 insertions(+), 55 deletions(-)

1 0

Jacek Caban : wow64win: Implement NtUserCallWindowsHook thunk.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 57d66ecc5ff2d7fd78628c74d81c4e6c1a4469c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/57d66ecc5ff2d7fd78628c74d81c4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 16 13:23:21 2022 +0200 wow64win: Implement NtUserCallWindowsHook thunk. --- dlls/wow64win/user.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 248 insertions(+), 3 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 0432d55ec9c..178b609e508 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -145,6 +145,15 @@ typedef struct DWORD dwExStyle; } CREATESTRUCT32; +typedef struct +{ + LONG lResult; + LONG lParam; + LONG wParam; + DWORD message; + ULONG hwnd; +} CWPRETSTRUCT32; + typedef struct { ULONG hwnd; @@ -179,6 +188,56 @@ typedef struct ULONG itemData; } DRAWITEMSTRUCT32; +typedef struct +{ + ULONG lParam; + ULONG wParam; + UINT message; + ULONG hwnd; +} CWPSTRUCT32; + +typedef struct +{ + POINT pt; + ULONG hwnd; + UINT wHitTestCode; + ULONG dwExtraInfo; + DWORD mouseData; +} MOUSEHOOKSTRUCTEX32; + +typedef struct +{ + POINT pt; + DWORD mouseData; + DWORD flags; + DWORD time; + ULONG dwExtraInfo; +} MSLLHOOKSTRUCT32; + +typedef struct +{ + DWORD vkCode; + DWORD scanCode; + DWORD flags; + DWORD time; + ULONG dwExtraInfo; +} KBDLLHOOKSTRUCT32; + +typedef struct +{ + UINT message; + UINT paramL; + UINT paramH; + DWORD time; + ULONG hwnd; +} EVENTMSG32; + +typedef struct +{ + BOOL fMouse; + ULONG hWndActive; +} CBTACTIVATESTRUCT32; + typedef struct { UINT CtlType; @@ -241,7 +300,7 @@ static MSG *msg_32to64( MSG *msg, const MSG32 *msg32 ) return msg; } -static MSG32 *msg_64to32( MSG *msg, MSG32 *msg32 ) +static MSG32 *msg_64to32( const MSG *msg, MSG32 *msg32 ) { if (!msg32) return NULL; @@ -358,6 +417,19 @@ static PAINTSTRUCT *paintstruct_32to64( PAINTSTRUCT *ps, const PAINTSTRUCT32 *ps return ps; } +static MOUSEHOOKSTRUCTEX32 *mousehookstruct_64to32( const MOUSEHOOKSTRUCTEX *hook, + MOUSEHOOKSTRUCTEX32 *hook32 ) +{ + if (!hook) return NULL; + + hook32->pt = hook->pt; + hook32->hwnd = HandleToUlong( hook->hwnd ); + hook32->wHitTestCode = hook->wHitTestCode; + hook32->dwExtraInfo = hook->dwExtraInfo; + hook32->mouseData = hook->mouseData; + return hook32; +} + static NTSTATUS dispatch_callback( ULONG id, void *args, ULONG len ) { void *ret_ptr; @@ -444,10 +516,183 @@ static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) return NtCallbackReturn( &result, sizeof(result), status ); } +static UINT hook_lparam_64to32( struct win_hook_params *params, const void *lp, void *lp32 ) +{ + if (!params->lparam_size) return 0; + + switch (params->id) + { + case WH_SYSMSGFILTER: + case WH_MSGFILTER: + case WH_GETMESSAGE: + msg_64to32( lp, lp32 ); + return sizeof(MSG32); + + case WH_CBT: + switch (params->code) + { + case HCBT_CREATEWND: + if (lp) + { + const CREATESTRUCTW *cs = lp; + CREATESTRUCT32 *cs32 = lp32; + createstruct_64to32( cs, cs32 ); + cs32->lpszName = PtrToUlong( cs->lpszName ); + cs32->lpszClass = PtrToUlong( cs->lpszClass ); + } + return sizeof(CREATESTRUCT32); + + case HCBT_ACTIVATE: + if (lp) + { + const CBTACTIVATESTRUCT *cbt = lp; + CBTACTIVATESTRUCT32 *cbt32 = lp32; + cbt32->fMouse = cbt->fMouse; + cbt32->hWndActive = HandleToUlong( cbt->hWndActive ); + } + return sizeof(CBTACTIVATESTRUCT32); + + case HCBT_CLICKSKIPPED: + mousehookstruct_64to32( lp, lp32 ); + return sizeof(MOUSEHOOKSTRUCTEX32); + } + break; + + case WH_CALLWNDPROC: + if (lp) + { + const CWPSTRUCT *cwp = lp; + CWPSTRUCT32 *cwp32 = lp32; + cwp32->lParam = cwp->lParam; + cwp32->wParam = cwp->wParam; + cwp32->message = cwp->message; + cwp32->hwnd = HandleToUlong( cwp->hwnd ); + } + return sizeof(CWPSTRUCT32); + + case WH_CALLWNDPROCRET: + if (lp) + { + const CWPRETSTRUCT *cwpret = lp; + CWPRETSTRUCT32 *cwpret32 = lp32; + cwpret32->lResult = cwpret->lResult; + cwpret32->lParam = cwpret->lParam; + cwpret32->wParam = cwpret->wParam; + cwpret32->message = cwpret->message; + cwpret32->hwnd = HandleToUlong( cwpret->hwnd ); + } + return sizeof(CWPRETSTRUCT32); + + case WH_MOUSE: + mousehookstruct_64to32( lp, lp32 ); + return sizeof(MOUSEHOOKSTRUCTEX32); + + case WH_MOUSE_LL: + if (lp) + { + const MSLLHOOKSTRUCT *hook = lp; + MSLLHOOKSTRUCT32 *hook32 = lp32; + hook32->pt = hook->pt; + hook32->mouseData = hook->mouseData; + hook32->flags = hook->flags; + hook32->time = hook->time; + hook32->dwExtraInfo = hook->dwExtraInfo; + } + return sizeof(MSLLHOOKSTRUCT32); + + case WH_KEYBOARD_LL: + if (lp) + { + const KBDLLHOOKSTRUCT *hook = lp; + KBDLLHOOKSTRUCT32 *hook32 = lp32; + hook32->vkCode = hook->vkCode; + hook32->scanCode = hook->scanCode; + hook32->flags = hook->flags; + hook32->time = hook->time; + hook32->dwExtraInfo = hook->dwExtraInfo; + } + return sizeof(KBDLLHOOKSTRUCT32); + + case WH_JOURNALRECORD: + if (lp) + { + const EVENTMSG *event = lp; + EVENTMSG32 *event32 = lp32; + + event32->message = event->message; + event32->paramL = event->paramL; + event32->paramH = event->paramH; + event32->time = event->time; + event32->hwnd = HandleToUlong( event->hwnd ); + } + return sizeof(EVENTMSG32); + } + + if (lp) memcpy( lp32, lp, params->lparam_size ); + return params->lparam_size; +} + static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct win_hook_params *params = arg; + struct + { + ULONG proc; + ULONG handle; + DWORD pid; + DWORD tid; + int id; + int code; + ULONG wparam; + ULONG lparam; + UINT lparam_size; + BOOL prev_unicode; + BOOL next_unicode; + } *params32; + void *ret_lparam = (void *)params->lparam; + UINT lparam32_size = 0, module_size, size32; + void *ret_ptr; + ULONG ret_len; + NTSTATUS ret; + + lparam32_size = hook_lparam_64to32( params, NULL, NULL ); + module_size = size - params->lparam_size - sizeof(*params); + + size32 = sizeof(*params32) + lparam32_size + module_size; + if (!(params32 = Wow64AllocateTemp( size32 ))) return 0; + params32->proc = (UINT_PTR)params->proc; + params32->handle = HandleToUlong( params->handle ); + params32->pid = params->pid; + params32->tid = params->tid; + params32->id = params->id; + params32->code = params->code; + params32->wparam = params->wparam; + params32->lparam = params->lparam_size ? 0 : params->lparam; + params32->lparam_size = lparam32_size; + params32->prev_unicode = params->prev_unicode; + params32->next_unicode = params->next_unicode; + if (lparam32_size) hook_lparam_64to32( params, params + 1, params32 + 1 ); + if (module_size) + memcpy( (char *)(params32 + 1) + params32->lparam_size, + (const char *)params + size - module_size, module_size ); + + ret = Wow64KiUserCallbackDispatcher( NtUserCallWindowsHook, params32, size32, &ret_ptr, &ret_len ); + + switch (params->id) + { + case WH_SYSMSGFILTER: + case WH_MSGFILTER: + case WH_GETMESSAGE: + msg_32to64( (MSG *)(params + 1), (const MSG32 *)(params32 + 1) ); + if (ret_lparam) + { + memcpy( ret_lparam, params + 1, params->lparam_size ); + return ret; + } + return NtCallbackReturn( params + 1, params->lparam_size, ret ); + } + + return ret; } static NTSTATUS WINAPI wow64_NtUserCopyImage( void *arg, ULONG size )

1 0

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

16 Aug '22

Module: wine Branch: master Commit: 6d8b1887a5e84dbda6c2abf778583d8397ab7dec URL: https://gitlab.winehq.org/wine/wine/-/commit/6d8b1887a5e84dbda6c2abf778583d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 16 14:22:21 2022 +0200 wow64win: Implement more user callbacks. --- dlls/user32/user_main.c | 25 ++++++++--- dlls/win32u/font.c | 4 +- dlls/win32u/message.c | 1 + dlls/wow64win/user.c | 115 +++++++++++++++++++++++++++++++++++++++++++++--- include/ntuser.h | 3 +- 5 files changed, 134 insertions(+), 14 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index bc817089e46..f16f8e04464 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -125,8 +125,17 @@ static NTSTATUS WINAPI User32DrawScrollBar( const struct draw_scroll_bar_params static NTSTATUS WINAPI User32DrawText( const struct draw_text_params *params, ULONG size ) { + RECT rect = params->rect; + int ret; + size -= FIELD_OFFSET( struct draw_text_params, str ); - return DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), params->rect, params->flags ); + ret = DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), &rect, params->flags ); + if (params->ret_rect) + { + *params->ret_rect = rect; + return ret; + } + return NtCallbackReturn( &rect, sizeof(rect), ret ); } static NTSTATUS WINAPI User32ImmProcessKey( const struct imm_process_key_params *params, ULONG size ) @@ -180,12 +189,16 @@ static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) static NTSTATUS WINAPI User32UnpackDDEMessage( const struct unpack_dde_message_params *params, ULONG size ) { - struct unpack_dde_message_result *result = params->result; - result->wparam = params->wparam; - result->lparam = params->lparam; + struct unpack_dde_message_result result = { .wparam = params->wparam, .lparam = params->lparam }; + size -= FIELD_OFFSET( struct unpack_dde_message_params, data ); - return unpack_dde_message( params->hwnd, params->message, &result->wparam, &result->lparam, - params->data, size ); + if (!unpack_dde_message( params->hwnd, params->message, &result.wparam, &result.lparam, + params->data, size )) + return FALSE; + + if (params->result) *params->result = result; + else NtCallbackReturn( &result, sizeof(result), TRUE ); + return TRUE; } static const void *kernel_callback_table[NtUserCallCount] = diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 5ea89c9220e..e26c7bfa316 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -6610,10 +6610,12 @@ INT WINAPI DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT *rect, UINT fla size = FIELD_OFFSET( struct draw_text_params, str[count] ); if (!(params = malloc( size ))) return 0; params->hdc = hdc; - params->rect = rect; + params->rect = *rect; + params->ret_rect = rect; params->flags = flags; if (count) memcpy( params->str, str, count * sizeof(WCHAR) ); ret = KeUserModeCallback( NtUserDrawText, params, size, &ret_ptr, &ret_len ); + if (ret_len == sizeof(*rect)) *rect = *(const RECT *)ret_ptr; free( params ); return ret; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 24e6dcf368c..f4f134e213b 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2009,6 +2009,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, params->lparam = info.msg.lParam; if (size) memcpy( params->data, buffer, size ); ret = KeUserModeCallback( NtUserUnpackDDEMessage, params, len, &ret_ptr, &len ); + if (len == sizeof(result)) result = *(struct unpack_dde_message_result *)ret_ptr; free( params ); if (!ret) continue; /* ignore it */ info.msg.wParam = result.wparam; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 178b609e508..bb17e034eb2 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -287,6 +287,39 @@ struct win_proc_params32 ULONG procW; }; +struct win_event_hook_params32 +{ + DWORD event; + ULONG hwnd; + LONG object_id; + LONG child_id; + ULONG handle; + DWORD tid; + DWORD time; + ULONG proc; + WCHAR module[MAX_PATH]; +}; + +struct draw_text_params32 +{ + ULONG hdc; + int count; + RECT rect; + ULONG ret_rect; + UINT flags; + WCHAR str[1]; +}; + +struct unpack_dde_message_params32 +{ + ULONG result; + ULONG hwnd; + UINT message; + LONG wparam; + LONG lparam; + char data[1]; +}; + static MSG *msg_32to64( MSG *msg, const MSG32 *msg32 ) { if (!msg32) return NULL; @@ -480,8 +513,22 @@ static NTSTATUS WINAPI wow64_NtUserCallSendAsyncCallback( void *arg, ULONG size static NTSTATUS WINAPI wow64_NtUserCallWinEventHook( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct win_event_hook_params *params = arg; + struct win_event_hook_params32 params32; + + params32.event = params->event; + params32.hwnd = HandleToUlong( params->hwnd ); + params32.object_id = params->object_id; + params32.child_id = params->child_id; + params32.handle = HandleToUlong( params->handle ); + params32.tid = params->tid; + params32.time = params->time; + params32.proc = PtrToUlong( params->proc ); + + size -= FIELD_OFFSET( struct win_event_hook_params, module ); + if (size) memcpy( params32.module, params->module, size ); + return dispatch_callback( NtUserCallWinEventHook, &params32, + FIELD_OFFSET( struct win_event_hook_params32, module ) + size); } static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) @@ -766,8 +813,31 @@ static NTSTATUS WINAPI wow64_NtUserDrawScrollBar( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct draw_text_params *params = arg; + struct draw_text_params32 *params32; + RECT *rect_ptr = params->ret_rect; + ULONG ret_len, len; + void *ret_ptr; + NTSTATUS ret; + + len = (size - FIELD_OFFSET( struct draw_text_params, str )) / sizeof(WCHAR); + if (!(params32 = Wow64AllocateTemp( FIELD_OFFSET( struct draw_text_params32, str[len] )))) + return 0; + + params32->hdc = HandleToUlong( params->hdc ); + params32->count = params->count; + params32->rect = params->rect; + params32->ret_rect = 0; + params32->flags = params->flags; + if (len) memcpy( params32->str, params->str, len * sizeof(WCHAR) ); + + ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params, size, &ret_ptr, &ret_len ); + if (ret_len == sizeof(RECT) && rect_ptr) + { + *rect_ptr = *(const RECT *)ret_ptr; + return ret; + } + return NtCallbackReturn( ret_ptr, ret_len, ret ); } static NTSTATUS WINAPI wow64_NtUserFreeCachedClipboardData( void *arg, ULONG size ) @@ -874,8 +944,41 @@ static NTSTATUS WINAPI wow64_NtUserRenderSynthesizedFormat( void *arg, ULONG siz static NTSTATUS WINAPI wow64_NtUserUnpackDDEMessage( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct unpack_dde_message_params *params = arg; + struct unpack_dde_message_params32 *params32; + struct unpack_dde_message_result result; + struct + { + LONG wparam; + LONG lparam; + } *result32; + void *ret_ptr; + ULONG ret_len; + + size -= FIELD_OFFSET( struct unpack_dde_message_params, data ); + if (!(params32 = Wow64AllocateTemp( FIELD_OFFSET( struct unpack_dde_message_params32, data[size] )))) + return 0; + + params32->result = 0; + params32->hwnd = HandleToUlong( params->hwnd ); + params32->message = params->message; + params32->wparam = params->wparam; + params32->lparam = params->lparam; + if (size) memcpy( params32->data, params->data, size ); + size = FIELD_OFFSET( struct unpack_dde_message_params32, data[size] ); + + if (!Wow64KiUserCallbackDispatcher( NtUserUnpackDDEMessage, params32, size, &ret_ptr, &ret_len )) + return FALSE; + if (ret_len == sizeof(*result32)) + { + result32 = ret_ptr; + result.wparam = result32->wparam; + result.lparam = result32->lparam; + } + + if (!params->result) NtCallbackReturn( &result, sizeof(result), TRUE ); + *params->result = result; + return TRUE; } static NTSTATUS WINAPI wow64_NtUserCallFreeIcon( void *arg, ULONG size ) diff --git a/include/ntuser.h b/include/ntuser.h index 7c375e43999..326d0371998 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -184,7 +184,8 @@ struct draw_text_params { HDC hdc; int count; - RECT *rect; /* FIXME: Use NtCallbackReturn instead */ + RECT rect; + RECT *ret_rect; /* FIXME: Use NtCallbackReturn instead */ UINT flags; WCHAR str[1]; };

1 0

Jacek Caban : wow64win: Fix NtUserGetMouseMovePointsEx thunk.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: fbcc124e0daba6ff3f649fae856b0b19138a30ef URL: https://gitlab.winehq.org/wine/wine/-/commit/fbcc124e0daba6ff3f649fae856b0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 16 14:43:24 2022 +0200 wow64win: Fix NtUserGetMouseMovePointsEx thunk. --- dlls/wow64win/user.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index bb17e034eb2..8fb70c39fb5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -119,6 +119,14 @@ typedef struct } DUMMYUNIONNAME; } INPUT32; +typedef struct +{ + int x; + int y; + DWORD time; + ULONG dwExtraInfo; +} MOUSEMOVEPOINT32; + typedef struct { UINT32 hdc; @@ -2107,12 +2115,45 @@ NTSTATUS WINAPI wow64_NtUserGetMessage( UINT *args ) NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args ) { UINT size = get_ulong( &args ); - MOUSEMOVEPOINT *ptin = get_ptr( &args ); - MOUSEMOVEPOINT *ptout = get_ptr( &args ); + MOUSEMOVEPOINT32 *ptin32 = get_ptr( &args ); + MOUSEMOVEPOINT32 *ptout32 = get_ptr( &args ); int count = get_ulong( &args ); DWORD resolution = get_ulong( &args ); - return NtUserGetMouseMovePointsEx( size, ptin, ptout, count, resolution ); + MOUSEMOVEPOINT ptin[64], ptout[64]; + int ret, i; + + if (size != sizeof(MOUSEMOVEPOINT32) || count < 0 || count > ARRAYSIZE( ptin )) + { + RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + return -1; + } + + if (!ptin32 || (!ptout32 && count)) + { + set_last_error32( ERROR_NOACCESS ); + return -1; + } + + for (i = 0; i < count; i++) + { + ptin[i].x = ptin32[i].x; + ptin[i].y = ptin32[i].y; + ptin[i].time = ptin32[i].time; + ptin[i].dwExtraInfo = ptin32[i].dwExtraInfo; + } + + ret = NtUserGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), ptin, ptout, count, resolution ); + + for (i = 0; i < ret; i++) + { + ptout32[i].x = ptout[i].x; + ptout32[i].y = ptout[i].y; + ptout32[i].time = ptout[i].time; + ptout32[i].dwExtraInfo = ptout[i].dwExtraInfo; + } + + return ret; } NTSTATUS WINAPI wow64_NtUserGetObjectInformation( UINT *args )

1 0

Jacek Caban : wow64win: Return class atom from NtUserGetClassInfoEx thunk.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 876a35fb294d80d999a58dd1ac80ecf6139c1aa4 URL: https://gitlab.winehq.org/wine/wine/-/commit/876a35fb294d80d999a58dd1ac80ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 16 14:45:11 2022 +0200 wow64win: Return class atom from NtUserGetClassInfoEx thunk. --- dlls/wow64win/user.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 8fb70c39fb5..5474abd76da 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1759,11 +1759,12 @@ NTSTATUS WINAPI wow64_NtUserGetClassInfoEx( UINT *args ) struct client_menu_name client_name; UNICODE_STRING name; WNDCLASSEXW wc; + ATOM ret; wc.cbSize = sizeof(wc); - if (!NtUserGetClassInfoEx( instance, unicode_str_32to64( &name, name32 ), &wc, - &client_name, ansi )) - return FALSE; + if (!(ret = NtUserGetClassInfoEx( instance, unicode_str_32to64( &name, name32 ), &wc, + &client_name, ansi ))) + return 0; wc32->style = wc.style; wc32->lpfnWndProc = PtrToUlong( wc.lpfnWndProc ); @@ -1777,7 +1778,7 @@ NTSTATUS WINAPI wow64_NtUserGetClassInfoEx( UINT *args ) wc32->lpszClassName = PtrToUlong( wc.lpszClassName ); wc32->hIconSm = HandleToUlong( wc.hIconSm ); client_menu_name_64to32( &client_name, client_name32 ); - return TRUE; + return ret; } NTSTATUS WINAPI wow64_NtUserGetClassName( UINT *args )

1 0

Davide Beatrici : winealsa: Drop "alsa_" prefix in unixlib enum, apply it to the functions instead.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 9213faf99676ba943962dc91cb2946438d6786ab URL: https://gitlab.winehq.org/wine/wine/-/commit/9213faf99676ba943962dc91cb2946… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Aug 10 00:18:30 2022 +0200 winealsa: Drop "alsa_" prefix in unixlib enum, apply it to the functions instead. --- dlls/winealsa.drv/alsa.c | 242 +++++++++++++++++++++---------------------- dlls/winealsa.drv/alsamidi.c | 20 ++-- dlls/winealsa.drv/mmdevdrv.c | 8 +- dlls/winealsa.drv/unixlib.h | 80 +++++++------- 4 files changed, 175 insertions(+), 175 deletions(-)

1 0

Davide Beatrici : winealsa: Move common unixlib.h content into mmdevapi.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 19baa29565a8433c41f3c4a59c0c7ff838b6d46f URL: https://gitlab.winehq.org/wine/wine/-/commit/19baa29565a8433c41f3c4a59c0c7f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Aug 10 00:19:38 2022 +0200 winealsa: Move common unixlib.h content into mmdevapi. --- dlls/mmdevapi/unixlib.h | 281 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/unixlib.h | 263 +---------------------------------------- 2 files changed, 282 insertions(+), 262 deletions(-)

1 0

Davide Beatrici : mmdevapi: Integrate winepulse's additions in unixlib.h.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: e29dc33aebf4e1d4e30fd158b69338331edd3f65 URL: https://gitlab.winehq.org/wine/wine/-/commit/e29dc33aebf4e1d4e30fd158b69338… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Aug 10 22:48:37 2022 +0200 mmdevapi: Integrate winepulse's additions in unixlib.h. --- dlls/mmdevapi/unixlib.h | 31 ++++++++++++++++++++++++++++++- dlls/winealsa.drv/alsa.c | 14 ++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 2 ++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h index d17439ebd73..163272c4398 100644 --- a/dlls/mmdevapi/unixlib.h +++ b/dlls/mmdevapi/unixlib.h @@ -1,4 +1,5 @@ /* + * Copyright 2021 Jacek Caban for CodeWeavers * Copyright 2022 Huw Davies * * This library is free software; you can redistribute it and/or @@ -27,6 +28,11 @@ struct endpoint unsigned int device; }; +struct main_loop_params +{ + HANDLE event; +}; + struct get_endpoint_ids_params { EDataFlow flow; @@ -39,6 +45,7 @@ struct get_endpoint_ids_params struct create_stream_params { + const char *name; const char *device; EDataFlow flow; AUDCLNT_SHAREMODE share; @@ -47,6 +54,7 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; + UINT32 *channel_count; stream_handle *stream; }; @@ -110,7 +118,7 @@ struct get_capture_buffer_params struct release_capture_buffer_params { stream_handle stream; - UINT32 done; + BOOL done; HRESULT result; }; @@ -132,6 +140,15 @@ struct get_mix_format_params HRESULT result; }; +struct get_device_period_params +{ + const char *device; + EDataFlow flow; + HRESULT result; + REFERENCE_TIME *def_period; + REFERENCE_TIME *min_period; +}; + struct get_buffer_size_params { stream_handle stream; @@ -170,6 +187,7 @@ struct get_frequency_params struct get_position_params { stream_handle stream; + BOOL device; HRESULT result; UINT64 *pos; UINT64 *qpctime; @@ -190,6 +208,12 @@ struct set_event_handle_params HRESULT result; }; +struct test_connect_params +{ + const char *name; + HRESULT result; +}; + struct is_started_params { stream_handle stream; @@ -251,6 +275,9 @@ struct midi_notify_wait_params enum unix_funcs { + process_attach, + process_detach, + main_loop, get_endpoint_ids, create_stream, release_stream, @@ -264,6 +291,7 @@ enum unix_funcs release_capture_buffer, is_format_supported, get_mix_format, + get_device_period, get_buffer_size, get_latency, get_current_padding, @@ -272,6 +300,7 @@ enum unix_funcs get_position, set_volumes, set_event_handle, + test_connect, is_started, get_prop_value, midi_release, diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 3274bae70be..fb688fe61c6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2431,6 +2431,9 @@ static NTSTATUS alsa_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { + NULL, + NULL, + NULL, alsa_get_endpoint_ids, alsa_create_stream, alsa_release_stream, @@ -2444,6 +2447,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, + NULL, alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, @@ -2452,6 +2456,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_get_position, alsa_set_volumes, alsa_set_event_handle, + NULL, alsa_is_started, alsa_get_prop_value, alsa_midi_release, @@ -2493,6 +2498,7 @@ static NTSTATUS alsa_wow64_create_stream(void *args) { struct { + PTR32 name; PTR32 device; EDataFlow flow; AUDCLNT_SHAREMODE share; @@ -2501,10 +2507,12 @@ static NTSTATUS alsa_wow64_create_stream(void *args) REFERENCE_TIME period; PTR32 fmt; HRESULT result; + PTR32 channel_count; PTR32 stream; } *params32 = args; struct create_stream_params params = { + .name = ULongToPtr(params32->name), .device = ULongToPtr(params32->device), .flow = params32->flow, .share = params32->share, @@ -2512,6 +2520,7 @@ static NTSTATUS alsa_wow64_create_stream(void *args) .duration = params32->duration, .period = params32->period, .fmt = ULongToPtr(params32->fmt), + .channel_count = ULongToPtr(params32->channel_count), .stream = ULongToPtr(params32->stream) }; alsa_create_stream(&params); @@ -2837,6 +2846,9 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { + NULL, + NULL, + NULL, alsa_wow64_get_endpoint_ids, alsa_wow64_create_stream, alsa_wow64_release_stream, @@ -2850,6 +2862,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_release_capture_buffer, alsa_wow64_is_format_supported, alsa_wow64_get_mix_format, + NULL, alsa_wow64_get_buffer_size, alsa_wow64_get_latency, alsa_wow64_get_current_padding, @@ -2858,6 +2871,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_wow64_get_position, alsa_wow64_set_volumes, alsa_wow64_set_event_handle, + NULL, alsa_is_started, alsa_wow64_get_prop_value, alsa_midi_release, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b77c6e7418b..d5cce1b9f4d 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -746,6 +746,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, dump_fmt(fmt); + params.name = NULL; params.device = This->alsa_name; params.flow = This->dataflow; params.share = mode; @@ -753,6 +754,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; + params.channel_count = NULL; params.stream = &stream; ALSA_CALL(create_stream, &params);

1 0

Zebediah Figura : d3d8/tests: Add tests for D3DLOCK_NO_DIRTY_UPDATE with vertex buffers.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: ae05de2c4f7815c2093c5036dce20577fa3149c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae05de2c4f7815c2093c5036dce205… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 6 17:13:06 2022 -0500 d3d8/tests: Add tests for D3DLOCK_NO_DIRTY_UPDATE with vertex buffers. --- dlls/d3d8/tests/visual.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 068a29f3847..b51760544c4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5941,6 +5941,93 @@ done: DestroyWindow(window); } +static void test_buffer_no_dirty_update(void) +{ + unsigned int refcount, colour; + IDirect3DVertexBuffer8 *vb; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + BYTE *data; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0xff00ff00}, + + {{ 1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.1f}, 0xff00ff00}, + }, + red_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xffff0000}, + }; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(green_quad), 0, 0, D3DPOOL_MANAGED, &vb); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(vb, 0, 0, &data, 0); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + memcpy(data, red_quad, sizeof(red_quad)); + hr = IDirect3DVertexBuffer8_Unlock(vb); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(vb, 0, 0, &data, D3DLOCK_NO_DIRTY_UPDATE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + memcpy(data, green_quad, sizeof(green_quad)); + hr = IDirect3DVertexBuffer8_Unlock(vb); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*green_quad)); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x0000ff00, 1), "Got unexpected colour 0x%08x.\n", colour); + + IDirect3DVertexBuffer8_Release(vb); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + static void test_3dc_formats(void) { static const char ati1n_data[] = @@ -11942,6 +12029,7 @@ START_TEST(visual) volume_dxtn_test(); volume_v16u16_test(); add_dirty_rect_test(); + test_buffer_no_dirty_update(); test_3dc_formats(); test_fog_interpolation(); test_negative_fixedfunction_fog();

1 0