wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Jacek Caban : win32u: Move NtUserCheckMenuItem implementation from user32.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: a4d6198ac597b0cfd1f0a89ba71e12ea772352ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4d6198ac597b0cfd1f0a89b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:53:09 2022 +0200 win32u: Move NtUserCheckMenuItem implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 43 ------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 106 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 24 +++++++++- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++++ include/ntuser.h | 1 + 10 files changed, 143 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d6198ac597b0cfd1f0…

1 0

Jacek Caban : win32u: Move CreatePopupMenu implementation from user32.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 72d53fda590126acb8cee72cb1fd208946d55d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72d53fda590126acb8cee72c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:51 2022 +0200 win32u: Move CreatePopupMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 10 ++-------- dlls/win32u/menu.c | 5 +++-- dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- include/ntuser.h | 12 ++++++------ 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 185d596fbb8..6d506e21c3c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4158,13 +4158,7 @@ BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags, */ HMENU WINAPI CreatePopupMenu(void) { - HMENU hmenu; - POPUPMENU *menu; - - if (!(hmenu = CreateMenu())) return 0; - menu = MENU_GetMenu( hmenu ); - menu->wFlags |= MF_POPUP; - return hmenu; + return NtUserCreateMenu( TRUE ); } @@ -4213,7 +4207,7 @@ BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, */ HMENU WINAPI CreateMenu(void) { - return NtUserCreateMenu(); + return NtUserCreateMenu( FALSE ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 6ae55e5cee1..2b1a5c97ac1 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -116,8 +116,8 @@ HMENU get_menu( HWND hwnd ) return UlongToHandle( get_window_long( hwnd, GWLP_ID )); } -/* see CreateMenu */ -HMENU create_menu(void) +/* see CreateMenu and CreatePopupMenu */ +HMENU create_menu( BOOL is_popup ) { POPUPMENU *menu; HMENU handle; @@ -125,6 +125,7 @@ HMENU create_menu(void) if (!(menu = calloc( 1, sizeof(*menu) ))) return 0; menu->FocusedItem = NO_SELECTED_ITEM; menu->refcount = 1; + if (is_popup) menu->wFlags |= MF_POPUP; if (!(handle = alloc_user_handle( &menu->obj, NTUSER_OBJ_MENU ))) free( menu ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4d2455fe64e..f6cbda9fa20 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4632,9 +4632,6 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) { switch(code) { - case NtUserCallNoParam_CreateMenu: - return HandleToUlong( create_menu() ); - case NtUserCallNoParam_GetDesktopWindow: return HandleToUlong( get_desktop_window() ); @@ -4679,6 +4676,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_CreateCursorIcon: return HandleToUlong( alloc_cursoricon_handle( arg )); + case NtUserCallOneParam_CreateMenu: + return HandleToUlong( create_menu( arg ) ); + case NtUserCallOneParam_DispatchMessageA: return dispatch_message( (const MSG *)arg, TRUE ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 20d0e4ac5b1..89b717c695d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -353,7 +353,7 @@ extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECL extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; /* menu.c */ -extern HMENU create_menu(void) DECLSPEC_HIDDEN; +extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN; extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; /* message.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 34b4462f7fe..47b174bc065 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -577,7 +577,6 @@ HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ); /* NtUserCallNoParam codes, not compatible with Windows */ enum { - NtUserCallNoParam_CreateMenu, NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetInputState, NtUserCallNoParam_GetMessagePos, @@ -588,11 +587,6 @@ enum NtUserUpdateClipboard, }; -static inline HMENU NtUserCreateMenu(void) -{ - return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_CreateMenu )); -} - static inline HWND NtUserGetDesktopWindow(void) { return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetDesktopWindow )); @@ -618,6 +612,7 @@ enum { NtUserCallOneParam_BeginDeferWindowPos, NtUserCallOneParam_CreateCursorIcon, + NtUserCallOneParam_CreateMenu, NtUserCallOneParam_DispatchMessageA, NtUserCallOneParam_EnableDC, NtUserCallOneParam_EnableThunkLock, @@ -651,6 +646,11 @@ static inline HICON NtUserCreateCursorIcon( BOOL is_icon ) return UlongToHandle( NtUserCallOneParam( is_icon, NtUserCallOneParam_CreateCursorIcon )); } +static inline HMENU NtUserCreateMenu( BOOL is_popup ) +{ + return UlongToHandle( NtUserCallOneParam( is_popup, NtUserCallOneParam_CreateMenu )); +} + static inline LRESULT NtUserDispatchMessageA( const MSG *msg ) { return NtUserCallOneParam( (UINT_PTR)msg, NtUserCallOneParam_DispatchMessageA );

1 0

Jacek Caban : win32u: Move NtUserTranslateMessage implementation from user32.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 6ea417b2d5a6c2d589578f1e9f958af64eb6f0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea417b2d5a6c2d589578f1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:36 2022 +0200 win32u: Move NtUserTranslateMessage implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 46 +---------------------------------- dlls/user32/user_main.c | 2 ++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 2 ++ 9 files changed, 72 insertions(+), 46 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 51f183fdbc0..611f603fc1e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -45,7 +45,6 @@ #include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); -WINE_DECLARE_DEBUG_CHANNEL(key); /* Message class descriptor */ @@ -848,50 +847,7 @@ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG pmsg ) */ BOOL WINAPI TranslateMessage( const MSG *msg ) { - UINT message; - WCHAR wp[8]; - BYTE state[256]; - INT len; - - if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE; - if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE; - - TRACE_(key)("Translating key %s (%04lX), scancode %04x\n", - SPY_GetVKeyName(msg->wParam), msg->wParam, HIWORD(msg->lParam)); - - switch (msg->wParam) - { - case VK_PACKET: - message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; - TRACE_(key)("PostMessageW(%p,%s,%04x,%08x)\n", - msg->hwnd, SPY_GetMsgName(message, msg->hwnd), HIWORD(msg->lParam), LOWORD(msg->lParam)); - PostMessageW( msg->hwnd, message, HIWORD(msg->lParam), LOWORD(msg->lParam)); - return TRUE; - - case VK_PROCESSKEY: - return ImmTranslateMessage(msg->hwnd, msg->message, msg->wParam, msg->lParam); - } - - NtUserGetKeyboardState( state ); - len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, ARRAY_SIZE(wp), 0); - if (len == -1) - { - message = (msg->message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR; - TRACE_(key)("-1 -> PostMessageW(%p,%s,%04x,%08lx)\n", - msg->hwnd, SPY_GetMsgName(message, msg->hwnd), wp[0], msg->lParam); - PostMessageW( msg->hwnd, message, wp[0], msg->lParam ); - } - else if (len > 0) - { - INT i; - - message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; - TRACE_(key)("%d -> PostMessageW(%p,%s,<x>,%08lx) for <x> in %s\n", len, msg->hwnd, - SPY_GetMsgName(message, msg->hwnd), msg->lParam, debugstr_wn(wp, len)); - for (i = 0; i < len; i++) - PostMessageW( msg->hwnd, message, wp[i], msg->lParam ); - } - return TRUE; + return NtUserTranslateMessage( msg, 0 ); } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f99e773d6f4..c477d0325d3 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "imm.h" +#include "ddk/imm.h" #include "controls.h" #include "user_private.h" @@ -164,6 +165,7 @@ static const struct user_callbacks user_funcs = EndMenu, HideCaret, ImmProcessKey, + ImmTranslateMessage, SetSystemMenu, ShowCaret, free_menu_items, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index d5538848a4f..b7b3d9d87b9 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1209,6 +1209,7 @@ static struct unix_funcs unix_funcs = NtUserSystemParametersInfo, NtUserSystemParametersInfoForDpi, NtUserToUnicodeEx, + NtUserTranslateMessage, NtUserUnregisterClass, NtUserUnregisterHotKey, NtUserUpdateLayeredWindow, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 36bafccc9a4..644e91aed4f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -36,6 +36,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); +WINE_DECLARE_DEBUG_CHANNEL(key); WINE_DECLARE_DEBUG_CHANNEL(relay); #define MAX_WINPROC_RECURSION 64 @@ -2879,3 +2880,59 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa } return 0; } + +/*********************************************************************** + * NtUserTranslateMessage (win32u.@) + */ +BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ) +{ + UINT message; + WCHAR wp[8]; + BYTE state[256]; + INT len; + + if (flags) FIXME( "unsupported flags %x\n", flags ); + + if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE; + if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE; + + TRACE_(key)( "Translating key %s (%04lX), scancode %04x\n", + debugstr_vkey_name( msg->wParam ), msg->wParam, HIWORD(msg->lParam) ); + + switch (msg->wParam) + { + case VK_PACKET: + message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; + TRACE_(key)( "PostMessageW(%p,%s,%04x,%08x)\n", msg->hwnd, + debugstr_msg_name( message, msg->hwnd ), + HIWORD(msg->lParam), LOWORD(msg->lParam) ); + NtUserPostMessage( msg->hwnd, message, HIWORD(msg->lParam), LOWORD(msg->lParam) ); + return TRUE; + + case VK_PROCESSKEY: + return user_callbacks && user_callbacks->pImmTranslateMessage( msg->hwnd, msg->message, + msg->wParam, msg->lParam ); + } + + NtUserGetKeyboardState( state ); + len = NtUserToUnicodeEx( msg->wParam, HIWORD(msg->lParam), state, wp, ARRAY_SIZE(wp), 0, + NtUserGetKeyboardLayout(0) ); + if (len == -1) + { + message = msg->message == WM_KEYDOWN ? WM_DEADCHAR : WM_SYSDEADCHAR; + TRACE_(key)( "-1 -> PostMessageW(%p,%s,%04x,%08lx)\n", + msg->hwnd, debugstr_msg_name( message, msg->hwnd ), wp[0], msg->lParam ); + NtUserPostMessage( msg->hwnd, message, wp[0], msg->lParam ); + } + else if (len > 0) + { + INT i; + + message = msg->message == WM_KEYDOWN ? WM_CHAR : WM_SYSCHAR; + TRACE_(key)( "%d -> PostMessageW(%p,%s,<x>,%08lx) for <x> in %s\n", len, msg->hwnd, + debugstr_msg_name(message, msg->hwnd), msg->lParam, debugstr_wn(wp, len) ); + for (i = 0; i < len; i++) + NtUserPostMessage( msg->hwnd, message, wp[i], msg->lParam ); + } + return TRUE; +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 5aee58fa1e3..57cf60681e2 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,6 +38,7 @@ struct user_callbacks BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pHideCaret)( HWND hwnd ); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); + BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); BOOL (WINAPI *pSetSystemMenu)( HWND hwnd, HMENU menu ); BOOL (WINAPI *pShowCaret)( HWND hwnd ); void (CDECL *free_menu_items)( void *ptr ); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index cf419668789..ee9dc094ab6 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1282,7 +1282,7 @@ @ stub NtUserTransformPoint @ stub NtUserTransformRect @ stub NtUserTranslateAccelerator -@ stub NtUserTranslateMessage +@ stdcall NtUserTranslateMessage(ptr long) @ stub NtUserUndelegateInput @ stdcall -syscall NtUserUnhookWinEvent(long) @ stdcall -syscall NtUserUnhookWindowsHookEx(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 69ddcc83c47..20d0e4ac5b1 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -283,6 +283,7 @@ struct unix_funcs UINT winini, UINT dpi ); INT (WINAPI *pNtUserToUnicodeEx)( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); + BOOL (WINAPI *pNtUserTranslateMessage)( const MSG *msg, UINT flags ); BOOL (WINAPI *pNtUserUnregisterClass)( UNICODE_STRING *name, HINSTANCE instance, struct client_menu_name *client_menu_name ); BOOL (WINAPI *pNtUserUnregisterHotKey)( HWND hwnd, INT id ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index b5c2b49ce79..77120efd0b3 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1186,6 +1186,12 @@ INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, return unix_funcs->pNtUserToUnicodeEx( virt, scan, state, str, size, flags, layout ); } +BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserTranslateMessage( msg, flags ); +} + BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, struct client_menu_name *client_menu_name ) { diff --git a/include/ntuser.h b/include/ntuser.h index 5cf82043a2e..34b4462f7fe 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -559,6 +559,8 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UIN BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ); INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); +INT WINAPI NtUserTranslateAccelerator( HWND hwnd, HACCEL accel, MSG *msg ); +BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ); BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK hEventHook ); BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ); BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance,

1 0

Jacek Caban : winex11: Directly use win32u in more places.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 262831bc63dca2d63171aa98d19e8f2566907dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=262831bc63dca2d63171aa98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:20 2022 +0200 winex11: Directly use win32u in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 24 ++++++++++++------------ dlls/winex11.drv/display.c | 5 +++-- dlls/winex11.drv/keyboard.c | 18 +++++++++--------- dlls/winex11.drv/vulkan.c | 4 ++-- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 10 ++++++++++ dlls/winex11.drv/xrandr.c | 2 +- 7 files changed, 39 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=262831bc63dca2d63171…

1 0

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

15 Apr '22

Module: wine Branch: master Commit: 21c37e8f957a8433e5bf78b0ff10b56959cbf22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c37e8f957a8433e5bf78b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:52:02 2022 +0200 winex11: Directly use win32u for user functions in event.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 169 +++++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 7 ++ 2 files changed, 92 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21c37e8f957a8433e5bf…

1 0

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

15 Apr '22

Module: wine Branch: master Commit: dddb84433222c5623b295db6542b8944467c1288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dddb84433222c5623b295db6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:51:46 2022 +0200 winex11: Directly use win32u for user functions in settings.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index ec8a01fbc58..1e711354c07 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -192,16 +192,19 @@ void init_registry_display_settings(void) { DEVMODEW dm = {.dmSize = sizeof(dm)}; DISPLAY_DEVICEW dd = {sizeof(dd)}; + UNICODE_STRING device_name; DWORD i = 0; LONG ret; - while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + while (!NtUserEnumDisplayDevices( NULL, i++, &dd, 0 )) { + RtlInitUnicodeString( &device_name, dd.DeviceName ); + /* Skip if the device already has registry display settings */ - if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + if (NtUserEnumDisplaySettings( &device_name, ENUM_REGISTRY_SETTINGS, &dm, 0 )) continue; - if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + if (!NtUserEnumDisplaySettings( &device_name, ENUM_CURRENT_SETTINGS, &dm, 0 )) { ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); continue; @@ -211,8 +214,8 @@ void init_registry_display_settings(void) wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, dm.dmDisplayFrequency, dm.u1.s2.dmPosition.x, dm.u1.s2.dmPosition.y); - ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, - CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + ret = NtUserChangeDisplaySettings( &device_name, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL ); if (ret != DISP_CHANGE_SUCCESSFUL) ERR("Failed to save registry display settings for %s, returned %d.\n", wine_dbgstr_w(dd.DeviceName), ret); @@ -360,7 +363,7 @@ BOOL get_primary_adapter(WCHAR *name) DWORD i; dd.cb = sizeof(dd); - for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + for (i = 0; !NtUserEnumDisplayDevices( NULL, i, &dd, 0 ); ++i) { if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) { @@ -627,9 +630,10 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, INT display_idx, display_count = 0; DISPLAY_DEVICEW display_device; LONG ret = DISP_CHANGE_FAILED; + UNICODE_STRING device_name; display_device.cb = sizeof(display_device); - for (display_idx = 0; EnumDisplayDevicesW(NULL, display_idx, &display_device, 0); ++display_idx) + for (display_idx = 0; !NtUserEnumDisplayDevices( NULL, display_idx, &display_device, 0 ); ++display_idx) ++display_count; displays = heap_calloc(display_count, sizeof(*displays)); @@ -638,7 +642,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (!EnumDisplayDevicesW(NULL, display_idx, &display_device, 0)) + if (NtUserEnumDisplayDevices( NULL, display_idx, &display_device, 0 )) goto done; if (!handler.get_id(display_device.DeviceName, &displays[display_idx].id)) @@ -647,11 +651,13 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, goto done; } + RtlInitUnicodeString( &device_name, display_device.DeviceName ); + if (!dev_mode) { memset(&registry_mode, 0, sizeof(registry_mode)); registry_mode.dmSize = sizeof(registry_mode); - if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_REGISTRY_SETTINGS, &registry_mode, 0)) + if (!NtUserEnumDisplaySettings( &device_name, ENUM_REGISTRY_SETTINGS, &registry_mode, 0 )) goto done; displays[display_idx].desired_mode = registry_mode; @@ -663,7 +669,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, { memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); - if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) + if (!NtUserEnumDisplaySettings( &device_name, ENUM_CURRENT_SETTINGS, &current_mode, 0 )) goto done; displays[display_idx].desired_mode.dmFields |= DM_POSITION; @@ -674,7 +680,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, { memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); - if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) + if (!NtUserEnumDisplaySettings( &device_name, ENUM_CURRENT_SETTINGS, &current_mode, 0 )) goto done; displays[display_idx].desired_mode = current_mode;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: c1a2218f38d3d79aebcdd07bca45c83c62394e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a2218f38d3d79aebcdd07b… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Apr 15 11:35:49 2022 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index af378ce917f..18aefbf28bb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-03-23 08:26+0200\n" +"PO-Revision-Date: 2022-04-15 11:35+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3995,10 +3995,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Negalima modifikuoti nerašomos savybės „|“" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "„Šis“ nėra atvaizdžio objektas" +msgstr "„Šis“ nėra | objektas" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value"

1 0

Huw Davies : wineoss: Move release_capture_buffer to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 2bb465fca1fdbeb91f6e44718102a83d4f8478bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bb465fca1fdbeb91f6e4471… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:58 2022 +0100 wineoss: Move release_capture_buffer to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 32 +++++--------------------------- dlls/wineoss.drv/oss.c | 29 +++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index cc9d22d21d0..80bac1d9ceb 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1349,37 +1349,15 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct oss_stream *stream = This->stream; + struct release_capture_buffer_params params; TRACE("(%p)->(%u)\n", This, done); - oss_lock(stream); - - if(!done){ - stream->getbuf_last = 0; - oss_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(stream->getbuf_last != done){ - oss_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } - - stream->written_frames += done; - stream->held_frames -= done; - stream->lcl_offs_frames += done; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->getbuf_last = 0; - - oss_unlock(stream); + params.stream = This->stream; + params.done = done; + OSS_CALL(release_capture_buffer, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 2e811f9b424..f1994295618 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1048,6 +1048,34 @@ static NTSTATUS get_capture_buffer(void *args) return oss_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); } +static NTSTATUS release_capture_buffer(void *args) +{ + struct release_capture_buffer_params *params = args; + struct oss_stream *stream = params->stream; + UINT32 done = params->done; + + oss_lock(stream); + + if(!done){ + stream->getbuf_last = 0; + return oss_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->getbuf_last != done) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + stream->written_frames += done; + stream->held_frames -= done; + stream->lcl_offs_frames += done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1248,6 +1276,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_render_buffer, release_render_buffer, get_capture_buffer, + release_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ca6d1d69de3..2f0884b9ac5 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -140,6 +140,13 @@ struct get_capture_buffer_params UINT64 *qpcpos; }; +struct release_capture_buffer_params +{ + struct oss_stream *stream; + UINT32 done; + HRESULT result; +}; + struct is_format_supported_params { const char *device; @@ -199,6 +206,7 @@ enum oss_funcs oss_get_render_buffer, oss_release_render_buffer, oss_get_capture_buffer, + oss_release_capture_buffer, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size,

1 0

Huw Davies : wineoss: Move get_capture_buffer to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: c35189de91c75881ccc7d6d5e970503ac5e552af URL: https://source.winehq.org/git/wine.git/?a=commit;h=c35189de91c75881ccc7d6d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:57 2022 +0100 wineoss: Move get_capture_buffer to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 71 ++++++--------------------------------------- dlls/wineoss.drv/oss.c | 67 ++++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 12 ++++++++ 3 files changed, 88 insertions(+), 62 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index d719922c2b7..cc9d22d21d0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1321,8 +1321,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct oss_stream *stream = This->stream; - SIZE_T size; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1335,67 +1334,15 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - oss_lock(stream); - - if(stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(stream->held_frames < stream->period_frames){ - *frames = 0; - oss_unlock(stream); - return AUDCLNT_S_BUFFER_EMPTY; - } - - *flags = 0; - - *frames = stream->period_frames; - - if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ - UINT32 chunk_bytes, offs_bytes, frames_bytes; - if(stream->tmp_buffer_frames < *frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - oss_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = *frames; - } - - *data = stream->tmp_buffer; - chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * - stream->fmt->nBlockAlign; - offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; - frames_bytes = *frames * stream->fmt->nBlockAlign; - memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); - memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, - frames_bytes - chunk_bytes); - }else - *data = stream->local_buffer + - stream->lcl_offs_frames * stream->fmt->nBlockAlign; - - stream->getbuf_last = *frames; - - if(devpos) - *devpos = stream->written_frames; - if(qpcpos){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - oss_unlock(stream); + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; + OSS_CALL(get_capture_buffer, &params); - return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 4a568f51667..2e811f9b424 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -982,6 +982,72 @@ static NTSTATUS release_render_buffer(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct oss_stream *stream = params->stream; + UINT64 *devpos = params->devpos, *qpcpos = params->qpcpos; + UINT32 *frames = params->frames; + UINT *flags = params->flags; + BYTE **data = params->data; + SIZE_T size; + + oss_lock(stream); + + if(stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->held_frames < stream->period_frames){ + *frames = 0; + return oss_unlock_result(stream, &params->result, AUDCLNT_S_BUFFER_EMPTY); + } + + *flags = 0; + + *frames = stream->period_frames; + + if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ + UINT32 chunk_bytes, offs_bytes, frames_bytes; + if(stream->tmp_buffer_frames < *frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = *frames; + } + + *data = stream->tmp_buffer; + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * + stream->fmt->nBlockAlign; + offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + frames_bytes = *frames * stream->fmt->nBlockAlign; + memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); + memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, + frames_bytes - chunk_bytes); + }else + *data = stream->local_buffer + + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *frames; + + if(devpos) + *devpos = stream->written_frames; + if(qpcpos){ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return oss_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1181,6 +1247,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = timer_loop, get_render_buffer, release_render_buffer, + get_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index e7c3a91691d..ca6d1d69de3 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -129,6 +129,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct oss_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + UINT *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct is_format_supported_params { const char *device; @@ -187,6 +198,7 @@ enum oss_funcs oss_timer_loop, oss_get_render_buffer, oss_release_render_buffer, + oss_get_capture_buffer, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size,

1 0

Huw Davies : wineoss: Move release_render_buffer to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: bc839279b820f576d9db460e064c748d7ffef977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc839279b820f576d9db460e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:56 2022 +0100 wineoss: Move release_render_buffer to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 74 ++++----------------------------------------- dlls/wineoss.drv/oss.c | 59 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++ 3 files changed, 74 insertions(+), 68 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 491e4fc5d16..d719922c2b7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -919,18 +919,6 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1268,70 +1256,20 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return params.result; } -static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 written_frames) -{ - UINT32 write_offs_frames = - (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; - UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; - UINT32 chunk_frames = stream->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; - - if(written_bytes <= chunk_bytes){ - memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); - }else{ - memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(stream->local_buffer, buffer + chunk_bytes, - written_bytes - chunk_bytes); - } -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct oss_stream *stream = This->stream; - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - oss_lock(stream); - - if(!written_frames){ - stream->getbuf_last = 0; - oss_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - oss_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } - - if(stream->getbuf_last >= 0) - buffer = stream->local_buffer + stream->fmt->nBlockAlign * - ((stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames); - else - buffer = stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, written_frames); - - if(stream->getbuf_last < 0) - oss_wrap_buffer(stream, buffer, written_frames); - - stream->held_frames += written_frames; - stream->written_frames += written_frames; - stream->getbuf_last = 0; - - oss_unlock(stream); + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; + OSS_CALL(release_render_buffer, &params); - return S_OK; + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9c45aa082b4..4a568f51667 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -924,6 +924,64 @@ static NTSTATUS get_render_buffer(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 written_frames) +{ + UINT32 write_offs_frames = + (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + UINT32 chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; + + if(written_bytes <= chunk_bytes){ + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); + }else{ + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, + written_bytes - chunk_bytes); + } +} + +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct oss_stream *stream = params->stream; + UINT32 written_frames = params->written_frames; + UINT flags = params->flags; + BYTE *buffer; + + oss_lock(stream); + + if(!written_frames){ + stream->getbuf_last = 0; + return oss_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->fmt->nBlockAlign * + ((stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames); + else + buffer = stream->tmp_buffer; + + if(flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, written_frames); + + if(stream->getbuf_last < 0) + oss_wrap_buffer(stream, buffer, written_frames); + + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1122,6 +1180,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, timer_loop, get_render_buffer, + release_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 0d83a03d64f..e7c3a91691d 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -121,6 +121,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct oss_stream *stream; + UINT32 written_frames; + UINT flags; + HRESULT result; +}; + struct is_format_supported_params { const char *device; @@ -178,6 +186,7 @@ enum oss_funcs oss_reset, oss_timer_loop, oss_get_render_buffer, + oss_release_render_buffer, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size,

1 0

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 April 2022