wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Jacek Caban : win32u: Reset thread info in NtUserSetThreadDesktop.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: bd604c80eae78c04335c026e5dcc2374ef3618aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd604c80eae78c04335c026e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 13:15:27 2022 +0100 win32u: Reset thread info in NtUserSetThreadDesktop. 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/user32.spec | 2 +- dlls/user32/user_private.h | 9 +------ dlls/user32/winstation.c | 19 ------------- dlls/win32u/input.c | 1 + dlls/win32u/ntuser_private.h | 64 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 1 + dlls/win32u/winstation.c | 10 ++++++- include/ntuser.h | 30 --------------------- 8 files changed, 77 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd604c80eae78c04335c…

1 0

Jacek Caban : win32u: Move GetInputState implementation from user32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 308ca7f6b1163a40724339b7f0d53034bf6a1073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=308ca7f6b1163a40724339b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 13:10:51 2022 +0100 win32u: Move GetInputState 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/input.c | 13 +------------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 19 +++++++++++++++++++ dlls/win32u/sysparams.c | 15 +++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 7 +++++++ 8 files changed, 52 insertions(+), 13 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 9d7b24c7b82..99f6bcb159b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -450,18 +450,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) */ BOOL WINAPI GetInputState(void) { - DWORD ret; - - check_for_events( QS_INPUT ); - - SERVER_START_REQ( get_queue_status ) - { - req->clear_bits = 0; - wine_server_call( req ); - ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); - } - SERVER_END_REQ; - return ret; + return NtUserCallNoParam( NtUserGetInputState ); } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 0dc41e7730c..ca71850e86f 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1150,6 +1150,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallNoParam, NtUserCallOneParam, NtUserCallTwoParam, NtUserChangeDisplaySettings, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index d91931768c0..b576660c8a5 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -159,6 +159,25 @@ DWORD WINAPI NtUserGetQueueStatus( UINT flags ) return ret; } +/*********************************************************************** + * get_input_state + */ +DWORD get_input_state(void) +{ + DWORD ret; + + check_for_events( QS_INPUT ); + + SERVER_START_REQ( get_queue_status ) + { + req->clear_bits = 0; + wine_server_call( req ); + ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); + } + SERVER_END_REQ; + return ret; +} + /*********************************************************************** * get_locale_kbd_layout */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6d1d6689bfe..816ce5ecded 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4483,6 +4483,21 @@ static BOOL message_beep( UINT i ) return TRUE; } +/*********************************************************************** + * NtUserCallOneParam (win32u.@) + */ +ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) +{ + switch(code) + { + case NtUserGetInputState: + return get_input_state(); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} + /*********************************************************************** * NtUserCallOneParam (win32u.@) */ diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 15efb8d9645..03e37e14f0b 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -778,7 +778,7 @@ @ stub NtUserCallHwndSafe @ stub NtUserCallMsgFilter @ stub NtUserCallNextHookEx -@ stub NtUserCallNoParam +@ stdcall NtUserCallNoParam(long) @ stdcall NtUserCallOneParam(long long) @ stdcall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 4630813cdd2..fa87db16829 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -192,6 +192,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, @@ -248,6 +249,7 @@ extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; /* input.c */ extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; +extern DWORD get_input_state(void) DECLSPEC_HIDDEN; /* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 8e39953c782..44b7e267a06 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -701,6 +701,12 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) return unix_funcs->pNtUserActivateKeyboardLayout( layout, flags ); } +ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserCallNoParam( code ); +} + ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) { if (!unix_funcs) return 0; diff --git a/include/ntuser.h b/include/ntuser.h index fa32370a90a..029da87c7b2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -49,6 +49,12 @@ struct enum_display_monitor_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 +/* NtUserCallNoParam codes, not compatible with Windows */ +enum +{ + NtUserGetInputState, +}; + /* NtUserCallOneParam codes, not compatible with Windows */ enum { @@ -133,6 +139,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); +ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ); ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ); ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd,

1 0

Jacek Caban : win32u: Move NtUserGetQueueStatus implementation from user32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: a4245969f13c0cc4d08f908c2e8ccf2788b0fb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4245969f13c0cc4d08f908c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 13:10:38 2022 +0100 win32u: Move NtUserGetQueueStatus 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/input.c | 26 -------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 31 +++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 9 files changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b3329eb3c07..9d7b24c7b82 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -445,32 +445,6 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) } -/*********************************************************************** - * GetQueueStatus (USER32.@) - */ -DWORD WINAPI GetQueueStatus( UINT flags ) -{ - DWORD ret; - - if (flags & ~(QS_ALLINPUT | QS_ALLPOSTMESSAGE | QS_SMRESULT)) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } - - check_for_events( flags ); - - SERVER_START_REQ( get_queue_status ) - { - req->clear_bits = flags; - wine_server_call( req ); - ret = MAKELONG( reply->changed_bits & flags, reply->wake_bits & flags ); - } - SERVER_END_REQ; - return ret; -} - - /*********************************************************************** * GetInputState (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 47a5db3bd8f..a677132361a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -365,7 +365,7 @@ @ stdcall GetProgmanWindow () @ stdcall GetPropA(long str) @ stdcall GetPropW(long wstr) -@ stdcall GetQueueStatus(long) +@ stdcall GetQueueStatus(long) NtUserGetQueueStatus @ stdcall GetRawInputBuffer(ptr ptr long) @ stdcall GetRawInputData(ptr long ptr ptr long) @ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index ea8d32d62f9..e332a03b0db 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1064,6 +1064,7 @@ static const struct user_driver_funcs lazy_load_driver = .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, /* windowing functions */ + .pMsgWaitForMultipleObjectsEx = nulldrv_MsgWaitForMultipleObjectsEx, .pScrollDC = nulldrv_ScrollDC, /* system parameters */ .pSystemParametersInfo = nulldrv_SystemParametersInfo, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index e7fbcfcbf47..0dc41e7730c 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1162,6 +1162,7 @@ static struct unix_funcs unix_funcs = NtUserGetKeyNameText, NtUserGetKeyboardLayoutList, NtUserGetPriorityClipboardFormat, + NtUserGetQueueStatus, NtUserGetUpdatedClipboardFormats, NtUserIsClipboardFormatAvailable, NtUserMapVirtualKeyEx, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 328546c9f77..d91931768c0 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -128,6 +128,37 @@ BOOL get_cursor_pos( POINT *pt ) return ret; } +static void check_for_events( UINT flags ) +{ + if (user_driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, flags, 0 ) == WAIT_TIMEOUT) + flush_window_surfaces( TRUE ); +} + +/*********************************************************************** + * NtUserGetQueueStatus (win32u.@) + */ +DWORD WINAPI NtUserGetQueueStatus( UINT flags ) +{ + DWORD ret; + + if (flags & ~(QS_ALLINPUT | QS_ALLPOSTMESSAGE | QS_SMRESULT)) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + + check_for_events( flags ); + + SERVER_START_REQ( get_queue_status ) + { + req->clear_bits = flags; + wine_server_call( req ); + ret = MAKELONG( reply->changed_bits & flags, reply->wake_bits & flags ); + } + SERVER_END_REQ; + return ret; +} + /*********************************************************************** * get_locale_kbd_layout */ diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index fb2fcb3f293..15efb8d9645 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -981,7 +981,7 @@ @ stub NtUserGetProcessUIContextInformation @ stdcall -syscall NtUserGetProcessWindowStation() @ stdcall -syscall NtUserGetProp(long wstr) -@ stub NtUserGetQueueStatus +@ stdcall NtUserGetQueueStatus(long) @ stub NtUserGetQueueStatusReadonly @ stub NtUserGetRawInputBuffer @ stub NtUserGetRawInputData diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 29c8a6d719f..4630813cdd2 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -208,6 +208,7 @@ struct unix_funcs INT (WINAPI *pNtUserGetKeyNameText)( LONG lparam, WCHAR *buffer, INT size ); UINT (WINAPI *pNtUserGetKeyboardLayoutList)( INT size, HKL *layouts ); INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count ); + DWORD (WINAPI *pNtUserGetQueueStatus)( UINT flags ); BOOL (WINAPI *pNtUserGetUpdatedClipboardFormats)( UINT *formats, UINT size, UINT *out_size ); BOOL (WINAPI *pNtUserIsClipboardFormatAvailable)( UINT format ); UINT (WINAPI *pNtUserMapVirtualKeyEx)( UINT code, UINT type, HKL layout ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 8d2b553ba7b..8e39953c782 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -777,6 +777,12 @@ INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ) return unix_funcs->pNtUserGetPriorityClipboardFormat( list, count ); } +DWORD WINAPI NtUserGetQueueStatus( UINT flags ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserGetQueueStatus( flags ); +} + BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) { if (!unix_funcs) return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index dd16d11dcb8..fa32370a90a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -176,6 +176,7 @@ INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str ); ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ); +DWORD WINAPI NtUserGetQueueStatus( UINT flags ); ULONG WINAPI NtUserGetSystemDpiForProcess( HANDLE process ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size );

1 0

Jacek Caban : win32u: Move window surfaces list from user32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: a8b0b07c45c9cac0066c2b4311123d0a9774c7ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b0b07c45c9cac0066c2b43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 13:10:20 2022 +0100 win32u: Move window surfaces list 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/win.c | 33 ++++----------------------------- dlls/win32u/sysparams.c | 12 ++++++++++-- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/window.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 3 +++ 5 files changed, 63 insertions(+), 31 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 70c3521ab1d..8a0a91ff4fb 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -41,16 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); static DWORD process_layout = ~0u; -static struct list window_surfaces = LIST_INIT( window_surfaces ); - -static CRITICAL_SECTION surfaces_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &surfaces_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": surfaces_section") } -}; -static CRITICAL_SECTION surfaces_section = { &critsect_debug, -1, 0, 0, 0, 0 }; /**********************************************************************/ @@ -730,11 +720,9 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su */ void register_window_surface( struct window_surface *old, struct window_surface *new ) { - if (old == new) return; - EnterCriticalSection( &surfaces_section ); - if (old && old != &dummy_surface) list_remove( &old->entry ); - if (new && new != &dummy_surface) list_add_tail( &window_surfaces, &new->entry ); - LeaveCriticalSection( &surfaces_section ); + if (old == &dummy_surface) old = NULL; + if (new == &dummy_surface) new = NULL; + NtUserCallTwoParam( (UINT_PTR)old, (UINT_PTR)new, NtUserRegisterWindowSurface ); } @@ -745,20 +733,7 @@ void register_window_surface( struct window_surface *old, struct window_surface */ void flush_window_surfaces( BOOL idle ) { - static DWORD last_idle; - DWORD now; - struct window_surface *surface; - - EnterCriticalSection( &surfaces_section ); - now = GetTickCount(); - if (idle) last_idle = now; - /* if not idle, we only flush if there's evidence that the app never goes idle */ - else if ((int)(now - last_idle) < 50) goto done; - - LIST_FOR_EACH_ENTRY( surface, &window_surfaces, struct window_surface, entry ) - surface->funcs->flush( surface ); -done: - LeaveCriticalSection( &surfaces_section ); + NtUserCallOneParam( idle, NtUserFlushWindowSurfaces ); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index ae9b4f73cfb..6d1d6689bfe 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4504,10 +4504,14 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return HandleToUlong( get_sys_color_pen(arg) ); case NtUserGetSystemMetrics: return get_system_metrics( arg ); - case NtUserGetDeskPattern: - return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); case NtUserMessageBeep: return message_beep( arg ); + /* temporary exports */ + case NtUserFlushWindowSurfaces: + flush_window_surfaces( arg ); + return 0; + case NtUserGetDeskPattern: + return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); default: FIXME( "invalid code %u\n", code ); return 0; @@ -4529,6 +4533,10 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) ); case NtUserMonitorFromRect: return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); + /* temporary exports */ + case NtUserRegisterWindowSurface: + register_window_surface( (struct window_surface *)arg1, (struct window_surface *)arg2 ); + return 0; default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index cd50b48feec..29c8a6d719f 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -260,6 +260,11 @@ extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDE extern HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; extern HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; +/* window.c */ +extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; +extern void register_window_surface( struct window_surface *old, + struct window_surface *new ) DECLSPEC_HIDDEN; + extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; extern NTSTATUS callbacks_init( void *args ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e880594d98c..439f51e986f 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -23,11 +23,52 @@ #pragma makedep unix #endif +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "win32u_private.h" #include "wine/server.h" +static struct list window_surfaces = LIST_INIT( window_surfaces ); +static pthread_mutex_t surfaces_lock = PTHREAD_MUTEX_INITIALIZER; + +/******************************************************************* + * register_window_surface + * + * Register a window surface in the global list, possibly replacing another one. + */ +void register_window_surface( struct window_surface *old, struct window_surface *new ) +{ + if (old == new) return; + pthread_mutex_lock( &surfaces_lock ); + if (old) list_remove( &old->entry ); + if (new) list_add_tail( &window_surfaces, &new->entry ); + pthread_mutex_unlock( &surfaces_lock ); +} + +/******************************************************************* + * flush_window_surfaces + * + * Flush pending output from all window surfaces. + */ +void flush_window_surfaces( BOOL idle ) +{ + static DWORD last_idle; + DWORD now; + struct window_surface *surface; + + pthread_mutex_lock( &surfaces_lock ); + now = NtGetTickCount(); + if (idle) last_idle = now; + /* if not idle, we only flush if there's evidence that the app never goes idle */ + else if ((int)(now - last_idle) < 50) goto done; + + LIST_FOR_EACH_ENTRY( surface, &window_surfaces, struct window_surface, entry ) + surface->funcs->flush( surface ); +done: + pthread_mutex_unlock( &surfaces_lock ); +} /*********************************************************************** * NtUserGetProp (win32u.@) diff --git a/include/ntuser.h b/include/ntuser.h index a115f7c9259..dd16d11dcb8 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -61,6 +61,7 @@ enum NtUserMessageBeep, NtUserRealizePalette, /* temporary exports */ + NtUserFlushWindowSurfaces, NtUserGetDeskPattern, }; @@ -71,6 +72,8 @@ enum NtUserGetSystemMetricsForDpi, NtUserMirrorRgn, NtUserMonitorFromRect, + /* temporary exports */ + NtUserRegisterWindowSurface, }; /* color index used to retrieve system 55aa brush */

1 0

Sven Baars : rsaenh: Properly destroy hashes created by CPCreateHash() (Valgrind).
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: f0987134b44bbac43ac21efc2d973bd4022fc375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0987134b44bbac43ac21efc… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Feb 15 12:45:47 2022 +0100 rsaenh: Properly destroy hashes created by CPCreateHash() (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index c913c0c71ee..d03f647832e 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -594,13 +594,14 @@ static BOOL copy_hmac_info(PHMAC_INFO *dst, const HMAC_INFO *src) { * Destructor for hash objects * * PARAMS - * pCryptHash [I] Pointer to the hash object to be destroyed. + * pCryptHash [I] Pointer to the hash object to be destroyed. * Will be invalid after function returns! */ static void destroy_hash(OBJECTHDR *pObject) { CRYPTHASH *pCryptHash = (CRYPTHASH*)pObject; - + + BCryptDestroyHash(pCryptHash->hash_handle); free_hmac_info(pCryptHash->pHMACInfo); free_data_blob(&pCryptHash->tpPRFParams.blobLabel); free_data_blob(&pCryptHash->tpPRFParams.blobSeed); @@ -708,6 +709,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + pCryptHash->hash_handle = NULL; } break; @@ -719,6 +721,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { default: finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + pCryptHash->hash_handle = NULL; } } @@ -2211,6 +2214,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, pCryptHash->hProv = hProv; pCryptHash->dwState = RSAENH_HASHSTATE_HASHING; pCryptHash->pHMACInfo = NULL; + pCryptHash->hash_handle = NULL; pCryptHash->dwHashSize = peaAlgidInfo->dwDefaultLen >> 3; init_data_blob(&pCryptHash->tpPRFParams.blobLabel); init_data_blob(&pCryptHash->tpPRFParams.blobSeed);

1 0

Sven Baars : rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: bb4c43de94720357bbabac489963df006c1783a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4c43de94720357bbabac48… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Feb 15 12:45:46 2022 +0100 rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 20 ++++++++++---------- dlls/rsaenh/implglue.h | 14 +++++--------- dlls/rsaenh/rsaenh.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 9d90ad70f53..d98a08b2f31 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -32,8 +32,8 @@ /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); - -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) + +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) { BCRYPT_ALG_HANDLE provider; NTSTATUS status; @@ -74,27 +74,27 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + status = BCryptCreateHash(provider, hash_handle, NULL, 0, NULL, 0, 0); BCryptCloseAlgorithmProvider(provider, 0); return !status; } -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) { - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); + BCryptHashData(hash_handle, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) { - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); + BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(hash_handle); return TRUE; } -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) { - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + return !BCryptDuplicateHash(src_hash_handle, dest_hash_handle, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 9be642e9b60..06fa3f4430a 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,10 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -typedef union tagHASH_CONTEXT { - BCRYPT_HASH_HANDLE bcrypt_hash; -} HASH_CONTEXT; - typedef union tagKEY_CONTEXT { rc2_key rc2; des_key des; @@ -42,12 +38,12 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, + BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a4deb80b0e1..c913c0c71ee 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -58,7 +58,7 @@ typedef struct tagCRYPTHASH HCRYPTPROV hProv; DWORD dwHashSize; DWORD dwState; - HASH_CONTEXT context; + BCRYPT_HASH_HANDLE hash_handle; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; @@ -627,8 +627,8 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -642,7 +642,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { return TRUE; default: - return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context); + return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->hash_handle); } } @@ -664,7 +664,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); break; case CALG_MAC: @@ -677,7 +677,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); } } @@ -699,15 +699,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(&pCryptHash->context, + update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } break; @@ -718,7 +718,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } } @@ -2371,7 +2371,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(pSrcHash->hash_handle, &pDestHash->hash_handle); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed);

1 0

Connor McAdams : wined3d: Fix comment in wined3d_texture_vk_download_data().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 0dcdfae29a671a3fbaaae1b2299324d9c51d1faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dcdfae29a671a3fbaaae1b2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Feb 14 12:59:42 2022 -0500 wined3d: Fix comment in wined3d_texture_vk_download_data(). For download, vkCmdCopyImageToBuffer() is used, not vkCmdCopyBufferToImage(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e1f20887840..18925338285 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4953,7 +4953,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, return; } - /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ + /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyImageToBuffer() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); if (!dst_bo_addr->buffer_object)

1 0

Nikolay Sivov : winepulse: Use FAILED() instead of non-zero result check.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 820c77319db2ad097f900f07c7596e125c7e615d URL: https://source.winehq.org/git/wine.git/?a=commit;h=820c77319db2ad097f900f07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:50:47 2022 +0300 winepulse: Use FAILED() instead of non-zero result check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e18d8a..e3d5ea91cf5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -344,7 +344,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); - if (hr) { + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; }

1 0

Francois Gouget : ntdll: Fix the spelling of SystemPrioritySeparation.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: fae276c44a921a6107fddd458e7ed0f45f1d0336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fae276c44a921a6107fddd45… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 15 03:34:59 2022 +0100 ntdll: Fix the spelling of SystemPrioritySeparation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 5be28856920..81fd5f45665 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1624,7 +1624,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemContextSwitchInformation = 36, SystemRegistryQuotaInformation = 37, SystemExtendServiceTableInformation = 38, - SystemPrioritySeperation = 39, + SystemPrioritySeparation = 39, SystemVerifierAddDriverInformation = 40, SystemVerifierRemoveDriverInformation = 41, SystemProcessorIdleInformation = 42,

1 0

Zebediah Figura : wined3d: Use wined3d_context_copy_bo_address() to download buffer ranges.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 57c58c46bb43e825baf49b21263c615ad83962f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c58c46bb43e825baf49b21… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:20 2022 -0600 wined3d: Use wined3d_context_copy_bo_address() to download buffer ranges. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 56 +++++---------------------------------------------- 1 file changed, 5 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bc6d9a67d6e..cab93ccc4e3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -43,8 +43,6 @@ struct wined3d_buffer_ops struct wined3d_context *context, unsigned int location); void (*buffer_unload_location)(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location); - void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); }; static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) @@ -139,14 +137,6 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc wined3d_buffer_invalidate_range(buffer, location, 0, 0); } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) -{ - const struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(buffer_gl->b.buffer_object); - - wined3d_context_gl_bind_bo(context_gl, bo_gl->binding, bo_gl->id); -} - static GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) { if (!bind_flags) @@ -628,10 +618,13 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, } else { + dst.buffer_object = NULL; + dst.addr = buffer->resource.heap_memory; + src.buffer_object = buffer->buffer_object; + src.addr = NULL; range.offset = 0; range.size = buffer->resource.size; - buffer->buffer_ops->buffer_download_ranges(buffer, context, - buffer->resource.heap_memory, 0, 1, &range); + wined3d_context_copy_bo_address(context, &dst, &src, 1, &range); } break; @@ -1351,17 +1344,10 @@ static void wined3d_buffer_no3d_unload_location(struct wined3d_buffer *buffer, TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); } -static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - FIXME("Not implemented.\n"); -} - static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { wined3d_buffer_no3d_prepare_location, wined3d_buffer_no3d_unload_location, - wined3d_buffer_no3d_download_ranges, }; HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wined3d_device *device, @@ -1419,35 +1405,10 @@ static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer, } } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(buffer->buffer_object); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_range *range; - - TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", - buffer, context, data, data_offset, range_count, ranges); - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glGetBufferSubData(bo_gl->binding, bo_gl->b.buffer_offset + range->offset, - range->size, (BYTE *)data + range->offset - data_offset)); - } - checkGLcall("buffer download"); -} - static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_prepare_location, wined3d_buffer_gl_unload_location, - wined3d_buffer_gl_download_ranges, }; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, @@ -1597,17 +1558,10 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, } } -static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - FIXME("Not implemented.\n"); -} - static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { wined3d_buffer_vk_prepare_location, wined3d_buffer_vk_unload_location, - wined3d_buffer_vk_download_ranges, }; HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device,

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