February 2022 - Wine-commits

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 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: 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 NtUserGetAsyncKeyState implementation from user32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: d6ae45b53085feaa8e59ef9f809751d8f9b68f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ae45b53085feaa8e59ef9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 13:15:56 2022 +0100 win32u: Move NtUserGetAsyncKeyState 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/hook.c | 2 +- dlls/user32/input.c | 89 +++++--------------------------------------- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 60 +++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 14 +++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 4 ++ 13 files changed, 101 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6ae45b53085feaa8e59…

1 0

Alexandre Julliard : api-ms-*: Forward to cfgmgr32 instead of setupapi.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: c239f38db44118235f6450ea6f111d0ee1d7f38a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c239f38db44118235f6450ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:38:59 2022 +0100 api-ms-*: Forward to cfgmgr32 instead of setupapi. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 30 +++++++++++----------- .../api-ms-win-devices-config-l1-1-1.spec | 30 +++++++++++----------- tools/make_specfiles | 1 - 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index 59004c997f7..87d0e9fd903 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -3,33 +3,33 @@ @ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode -@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) cfgmgr32.CM_Get_Child @ stub CM_Get_Class_PropertyW @ stub CM_Get_Class_Property_Keys -@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) cfgmgr32.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) cfgmgr32.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) cfgmgr32.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) cfgmgr32.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) cfgmgr32.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) cfgmgr32.CM_Get_Device_ID_Size @ stub CM_Get_Device_Interface_ListW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) cfgmgr32.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW -@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling -@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stdcall CM_Get_Parent(ptr long long) cfgmgr32.CM_Get_Parent +@ stdcall CM_Get_Sibling(ptr long long) cfgmgr32.CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) cfgmgr32.CM_Locate_DevNodeW @ stub CM_Open_Class_KeyW -@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) cfgmgr32.CM_Open_DevNode_Key @ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW -@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) cfgmgr32.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW @ stub CM_Set_Device_Interface_PropertyW diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index e10352eda59..46ef2754e7b 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -3,34 +3,34 @@ @ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode -@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) cfgmgr32.CM_Get_Child @ stub CM_Get_Class_PropertyW @ stub CM_Get_Class_Property_Keys -@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) cfgmgr32.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) cfgmgr32.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) cfgmgr32.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) cfgmgr32.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) cfgmgr32.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) cfgmgr32.CM_Get_Device_ID_Size @ stub CM_Get_Device_Interface_ListW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) cfgmgr32.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW -@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling -@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stdcall CM_Get_Parent(ptr long long) cfgmgr32.CM_Get_Parent +@ stdcall CM_Get_Sibling(ptr long long) cfgmgr32.CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) cfgmgr32.CM_Locate_DevNodeW @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW -@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) cfgmgr32.CM_Open_DevNode_Key @ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW -@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) cfgmgr32.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW @ stub CM_Set_Device_Interface_PropertyW diff --git a/tools/make_specfiles b/tools/make_specfiles index 157337ee01a..07fb263ed65 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -101,7 +101,6 @@ my @dll_groups = "xinput9_1_0", ], [ - "setupapi", "cfgmgr32", "api-ms-win-devices-config-l1-1-0", "api-ms-win-devices-config-l1-1-1",

1 0

Alexandre Julliard : api-ms-*: Forward to sechost instead of advapi32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 23791eb11d8cd65655d0f62dc0fa511be3eab22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=23791eb11d8cd65655d0f62d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:55:46 2022 +0100 api-ms-*: Forward to sechost instead of advapi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 26 ++++++++--------- .../api-ms-win-eventing-consumer-l1-1-0.spec | 6 ++-- .../api-ms-win-eventing-controller-l1-1-0.spec | 12 ++++---- .../api-ms-win-security-audit-l1-1-1.spec | 2 +- .../api-ms-win-security-credentials-l1-1-0.spec | 34 +++++++++++----------- .../api-ms-win-security-lsalookup-l1-1-0.spec | 4 +-- .../api-ms-win-security-lsalookup-l1-1-1.spec | 4 +-- .../api-ms-win-security-lsapolicy-l1-1-0.spec | 28 +++++++++--------- .../api-ms-win-security-sddl-l1-1-0.spec | 8 ++--- .../api-ms-win-service-core-l1-1-0.spec | 6 ++-- .../api-ms-win-service-core-l1-1-1.spec | 10 +++---- .../api-ms-win-service-management-l1-1-0.spec | 12 ++++---- .../api-ms-win-service-management-l2-1-0.spec | 16 +++++----- .../api-ms-win-service-private-l1-1-1.spec | 4 +-- .../api-ms-win-service-winsvc-l1-1-0.spec | 28 +++++++++--------- .../api-ms-win-service-winsvc-l1-2-0.spec | 28 +++++++++--------- tools/make_specfiles | 19 +++++++----- 17 files changed, 125 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23791eb11d8cd65655d0…

1 0

Alexandre Julliard : api-ms-*: Forward to cryptsp instead of advapi32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: b331ffcded6cb7b9e66f3f7ae6756ddaa5af5263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b331ffcded6cb7b9e66f3f7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 17:33:10 2022 +0100 api-ms-*: Forward to cryptsp instead of advapi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-security-cryptoapi-l1-1-0.spec | 78 +++++++++++----------- tools/make_specfiles | 5 +- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec index 357af4c79d1..6c1a412f534 100644 --- a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec @@ -1,39 +1,39 @@ -@ stdcall CryptAcquireContextA(ptr str str long long) advapi32.CryptAcquireContextA -@ stdcall CryptAcquireContextW(ptr wstr wstr long long) advapi32.CryptAcquireContextW -@ stdcall CryptContextAddRef(long ptr long) advapi32.CryptContextAddRef -@ stdcall CryptCreateHash(long long long long ptr) advapi32.CryptCreateHash -@ stdcall CryptDecrypt(long long long long ptr ptr) advapi32.CryptDecrypt -@ stdcall CryptDeriveKey(long long long long ptr) advapi32.CryptDeriveKey -@ stdcall CryptDestroyHash(long) advapi32.CryptDestroyHash -@ stdcall CryptDestroyKey(long) advapi32.CryptDestroyKey -@ stdcall CryptDuplicateHash(long ptr long ptr) advapi32.CryptDuplicateHash -@ stdcall CryptDuplicateKey(long ptr long ptr) advapi32.CryptDuplicateKey -@ stdcall CryptEncrypt(long long long long ptr ptr long) advapi32.CryptEncrypt -@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesA -@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesW -@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersA -@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersW -@ stdcall CryptExportKey(long long long long ptr ptr) advapi32.CryptExportKey -@ stdcall CryptGenKey(long long long ptr) advapi32.CryptGenKey -@ stdcall CryptGenRandom(long long ptr) advapi32.CryptGenRandom -@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderA -@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderW -@ stdcall CryptGetHashParam(long long ptr ptr long) advapi32.CryptGetHashParam -@ stdcall CryptGetKeyParam(long long ptr ptr long) advapi32.CryptGetKeyParam -@ stdcall CryptGetProvParam(long long ptr ptr long) advapi32.CryptGetProvParam -@ stdcall CryptGetUserKey(long long ptr) advapi32.CryptGetUserKey -@ stdcall CryptHashData(long ptr long long) advapi32.CryptHashData -@ stdcall CryptHashSessionKey(long long long) advapi32.CryptHashSessionKey -@ stdcall CryptImportKey(long ptr long long long ptr) advapi32.CryptImportKey -@ stdcall CryptReleaseContext(long long) advapi32.CryptReleaseContext -@ stdcall CryptSetHashParam(long long ptr long) advapi32.CryptSetHashParam -@ stdcall CryptSetKeyParam(long long ptr long) advapi32.CryptSetKeyParam -@ stdcall CryptSetProvParam(long long ptr long) advapi32.CryptSetProvParam -@ stdcall CryptSetProviderA(str long) advapi32.CryptSetProviderA -@ stdcall CryptSetProviderExA(str long ptr long) advapi32.CryptSetProviderExA -@ stdcall CryptSetProviderExW(wstr long ptr long) advapi32.CryptSetProviderExW -@ stdcall CryptSetProviderW(wstr long) advapi32.CryptSetProviderW -@ stdcall CryptSignHashA(long long str long ptr ptr) advapi32.CryptSignHashA -@ stdcall CryptSignHashW(long long wstr long ptr ptr) advapi32.CryptSignHashW -@ stdcall CryptVerifySignatureA(long ptr long long str long) advapi32.CryptVerifySignatureA -@ stdcall CryptVerifySignatureW(long ptr long long wstr long) advapi32.CryptVerifySignatureW +@ stdcall CryptAcquireContextA(ptr str str long long) cryptsp.CryptAcquireContextA +@ stdcall CryptAcquireContextW(ptr wstr wstr long long) cryptsp.CryptAcquireContextW +@ stdcall CryptContextAddRef(long ptr long) cryptsp.CryptContextAddRef +@ stdcall CryptCreateHash(long long long long ptr) cryptsp.CryptCreateHash +@ stdcall CryptDecrypt(long long long long ptr ptr) cryptsp.CryptDecrypt +@ stdcall CryptDeriveKey(long long long long ptr) cryptsp.CryptDeriveKey +@ stdcall CryptDestroyHash(long) cryptsp.CryptDestroyHash +@ stdcall CryptDestroyKey(long) cryptsp.CryptDestroyKey +@ stdcall CryptDuplicateHash(long ptr long ptr) cryptsp.CryptDuplicateHash +@ stdcall CryptDuplicateKey(long ptr long ptr) cryptsp.CryptDuplicateKey +@ stdcall CryptEncrypt(long long long long ptr ptr long) cryptsp.CryptEncrypt +@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) cryptsp.CryptEnumProviderTypesA +@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) cryptsp.CryptEnumProviderTypesW +@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) cryptsp.CryptEnumProvidersA +@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) cryptsp.CryptEnumProvidersW +@ stdcall CryptExportKey(long long long long ptr ptr) cryptsp.CryptExportKey +@ stdcall CryptGenKey(long long long ptr) cryptsp.CryptGenKey +@ stdcall CryptGenRandom(long long ptr) cryptsp.CryptGenRandom +@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) cryptsp.CryptGetDefaultProviderA +@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) cryptsp.CryptGetDefaultProviderW +@ stdcall CryptGetHashParam(long long ptr ptr long) cryptsp.CryptGetHashParam +@ stdcall CryptGetKeyParam(long long ptr ptr long) cryptsp.CryptGetKeyParam +@ stdcall CryptGetProvParam(long long ptr ptr long) cryptsp.CryptGetProvParam +@ stdcall CryptGetUserKey(long long ptr) cryptsp.CryptGetUserKey +@ stdcall CryptHashData(long ptr long long) cryptsp.CryptHashData +@ stdcall CryptHashSessionKey(long long long) cryptsp.CryptHashSessionKey +@ stdcall CryptImportKey(long ptr long long long ptr) cryptsp.CryptImportKey +@ stdcall CryptReleaseContext(long long) cryptsp.CryptReleaseContext +@ stdcall CryptSetHashParam(long long ptr long) cryptsp.CryptSetHashParam +@ stdcall CryptSetKeyParam(long long ptr long) cryptsp.CryptSetKeyParam +@ stdcall CryptSetProvParam(long long ptr long) cryptsp.CryptSetProvParam +@ stdcall CryptSetProviderA(str long) cryptsp.CryptSetProviderA +@ stdcall CryptSetProviderExA(str long ptr long) cryptsp.CryptSetProviderExA +@ stdcall CryptSetProviderExW(wstr long ptr long) cryptsp.CryptSetProviderExW +@ stdcall CryptSetProviderW(wstr long) cryptsp.CryptSetProviderW +@ stdcall CryptSignHashA(long long str long ptr ptr) cryptsp.CryptSignHashA +@ stdcall CryptSignHashW(long long wstr long ptr ptr) cryptsp.CryptSignHashW +@ stdcall CryptVerifySignatureA(long ptr long long str long) cryptsp.CryptVerifySignatureA +@ stdcall CryptVerifySignatureW(long ptr long long wstr long) cryptsp.CryptVerifySignatureW diff --git a/tools/make_specfiles b/tools/make_specfiles index a374867f938..8f83034f160 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,7 +123,6 @@ my @dll_groups = "api-ms-win-eventlog-legacy-l1-1-0", "api-ms-win-perf-legacy-l1-1-0", "api-ms-win-security-base-private-l1-1-1", - "api-ms-win-security-cryptoapi-l1-1-0", "api-ms-win-security-lsalookup-ansi-l2-1-0", "api-ms-win-security-provider-l1-1-0", "api-ms-win-security-systemfunctions-l1-1-0", @@ -150,6 +149,10 @@ my @dll_groups = "api-ms-win-service-winsvc-l1-1-0", "api-ms-win-service-winsvc-l1-2-0", ], + [ + "cryptsp", + "api-ms-win-security-cryptoapi-l1-1-0", + ], [ "authz", "ext-ms-win-authz-context-l1-1-0",

1 0

Zebediah Figura : wined3d: Move struct wined3d_buffer_ops to buffer.c.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: a2653a94557c50d2d36e94af5eb1c0b400194119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2653a94557c50d2d36e94af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:17 2022 -0600 wined3d: Move struct wined3d_buffer_ops to buffer.c. 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 | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 902ab720396..bb8f9753468 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -37,6 +37,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ +struct wined3d_buffer_ops +{ + BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_unload_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); + 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) { if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0e4f0cdfaf..51a7c2ffb10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5122,18 +5122,6 @@ enum wined3d_buffer_conversion_type CONV_POSITIONT, }; -struct wined3d_buffer_ops -{ - BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_unload_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); - 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); -}; - struct wined3d_buffer { struct wined3d_resource resource;

1 0

Zebediah Figura : wined3d: Pass a wined3d_range array to wined3d_context_copy_bo_address().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 9f8b5670e4fc85ecdbc54330f98c56c0a082ec70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f8b5670e4fc85ecdbc54330… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:18 2022 -0600 wined3d: Pass a wined3d_range array to wined3d_context_copy_bo_address(). 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/adapter_gl.c | 5 ++- dlls/wined3d/adapter_vk.c | 84 ++++++++++++++++++++++++------------------ dlls/wined3d/buffer.c | 27 +++++--------- dlls/wined3d/context_gl.c | 39 +++++++++++++------- dlls/wined3d/directx.c | 9 ++++- dlls/wined3d/texture.c | 6 ++- dlls/wined3d/view.c | 10 ++++- dlls/wined3d/wined3d_private.h | 14 ++++--- 8 files changed, 114 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f8b5670e4fc85ecdbc5…

1 0

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

15 Feb '22

Module: wine Branch: master Commit: bf5ae2a3a0fbc1ce6b1a53737014d9efc23deee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf5ae2a3a0fbc1ce6b1a5373… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:19 2022 -0600 wined3d: Use wined3d_context_copy_bo_address() to upload 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 | 92 ++++++++------------------------------------------- 1 file changed, 13 insertions(+), 79 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cc5b7bf6c33..bc6d9a67d6e 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_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); 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); }; @@ -516,6 +514,7 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) { unsigned int i, j, range_idx, start, end, vertex_count; + struct wined3d_bo_address src, dst; BYTE *data; if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) @@ -564,8 +563,11 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - buffer->buffer_ops->buffer_upload_ranges(buffer, context, - data, 0, buffer->modified_areas, buffer->maps); + dst.buffer_object = buffer->buffer_object; + dst.addr = NULL; + src.buffer_object = NULL; + src.addr = data; + wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps); heap_free(data); } @@ -585,6 +587,7 @@ static void wined3d_buffer_unload_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_bo_address src, dst; struct wined3d_range range; TRACE("buffer %p, context %p, location %s.\n", @@ -641,9 +644,13 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, memset(buffer->resource.heap_memory, 0, buffer->resource.size); } + dst.buffer_object = buffer->buffer_object; + dst.addr = NULL; + src.buffer_object = NULL; + src.addr = buffer->resource.heap_memory; + if (!buffer->conversion_map) - buffer->buffer_ops->buffer_upload_ranges(buffer, context, - buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); + wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); break; @@ -1344,12 +1351,6 @@ 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_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - FIXME("Not implemented.\n"); -} - 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) { @@ -1360,7 +1361,6 @@ static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { wined3d_buffer_no3d_prepare_location, wined3d_buffer_no3d_unload_location, - wined3d_buffer_no3d_upload_ranges, wined3d_buffer_no3d_download_ranges, }; @@ -1419,23 +1419,6 @@ static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer, } } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - struct wined3d_bo_address src, dst; - - TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", - buffer, context, data, data_offset, range_count, ranges); - - dst.buffer_object = buffer->buffer_object; - dst.addr = 0; - src.buffer_object = NULL; - src.addr = (uint8_t *)data - data_offset; - - wined3d_context_copy_bo_address(context, &dst, &src, range_count, ranges); -} - /* 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) @@ -1464,7 +1447,6 @@ static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_prepare_location, wined3d_buffer_gl_unload_location, - wined3d_buffer_gl_upload_ranges, wined3d_buffer_gl_download_ranges, }; @@ -1615,53 +1597,6 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, } } -static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - struct wined3d_context_vk *context_vk = wined3d_context_vk(context); - struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address src, dst; - const struct wined3d_range *range; - struct wined3d_bo_vk *dst_bo; - unsigned int i = range_count; - uint32_t flags; - void *map_ptr; - - if (!range_count) - return; - - dst.buffer_object = buffer->buffer_object; - dst.addr = NULL; - - flags = WINED3D_MAP_WRITE; - if (!ranges->offset && ranges->size == resource->size) - flags |= WINED3D_MAP_DISCARD; - - dst_bo = wined3d_bo_vk(buffer->buffer_object); - if (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(flags & WINED3D_MAP_DISCARD) - && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id)) - { - src.buffer_object = 0; - src.addr = (uint8_t *)data - data_offset; - wined3d_context_copy_bo_address(context, &dst, &src, range_count, ranges); - return; - } - - if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) - { - FIXME("Failed to map buffer.\n"); - return; - } - - while (i--) - { - range = &ranges[i]; - memcpy((uint8_t *)map_ptr + range->offset, (uint8_t *)data + range->offset - data_offset, range->size); - } - - wined3d_context_unmap_bo_address(context, &dst, range_count, ranges); -} - 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) { @@ -1672,7 +1607,6 @@ static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { wined3d_buffer_vk_prepare_location, wined3d_buffer_vk_unload_location, - wined3d_buffer_vk_upload_ranges, wined3d_buffer_vk_download_ranges, };

1 0