wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Jacek Caban : win32u: Use syscall interface for winpos functions.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 9639d0d6dbd73543a32c97776ed20b4832850af2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9639d0d6dbd73543a32c97776ed20b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 19:43:17 2022 +0200 win32u: Use syscall interface for winpos functions. --- dlls/win32u/gdiobj.c | 5 ---- dlls/win32u/syscall.c | 5 ++++ dlls/win32u/win32u.spec | 10 ++++---- dlls/win32u/win32u_private.h | 7 ----- dlls/win32u/wrappers.c | 33 ------------------------ dlls/wow64win/syscall.h | 5 ++++ dlls/wow64win/user.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+), 50 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserCreateWindowEx and NtUserDestroyWindow.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: d50112b4b6e82782d3924a8dbd443f82f64e510d URL: https://gitlab.winehq.org/wine/wine/-/commit/d50112b4b6e82782d3924a8dbd443f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 18:49:53 2022 +0200 win32u: Use syscall interface for NtUserCreateWindowEx and NtUserDestroyWindow. --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 6 ------ dlls/win32u/wrappers.c | 18 ------------------ dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index d4c9a1a3861..b3db2b11531 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1136,10 +1136,8 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, - NtUserCreateWindowEx, NtUserDeferWindowPosAndBand, NtUserDestroyMenu, - NtUserDestroyWindow, NtUserDrawCaptionTemp, NtUserDrawMenuBarTemp, NtUserEnableMenuItem, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d04e4dc2cf3..02a845f1a48 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -127,11 +127,13 @@ static void * const syscalls[] = NtUserCreateCaret, NtUserCreateDesktopEx, NtUserCreateInputContext, + NtUserCreateWindowEx, NtUserCreateWindowStation, NtUserDeleteMenu, NtUserDestroyAcceleratorTable, NtUserDestroyCursor, NtUserDestroyInputContext, + NtUserDestroyWindow, NtUserDisableThreadIme, NtUserDispatchMessage, NtUserDragDetect, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 555aaecdfb5..9d9bec9dfb8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -814,7 +814,7 @@ @ stdcall -syscall NtUserCreateInputContext(ptr) @ stub NtUserCreateLocalMemHandle @ stub NtUserCreatePalmRejectionDelayZone -@ stdcall NtUserCreateWindowEx(long ptr ptr ptr long long long long long long long long ptr long long long long) +@ stdcall -syscall NtUserCreateWindowEx(long ptr ptr ptr long long long long long long long long ptr long long long long) @ stub NtUserCreateWindowGroup @ stdcall -syscall NtUserCreateWindowStation(ptr long long long long long long) @ stub NtUserCtxDisplayIOCtl @@ -834,7 +834,7 @@ @ stdcall -syscall NtUserDestroyInputContext(long) @ stdcall NtUserDestroyMenu(long) @ stub NtUserDestroyPalmRejectionDelayZone -@ stdcall NtUserDestroyWindow(long) +@ stdcall -syscall NtUserDestroyWindow(long) @ stub NtUserDisableImmersiveOwner @ stub NtUserDisableProcessWindowFiltering @ stdcall -syscall NtUserDisableThreadIme(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c7aac2edd75..392c167bf95 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -186,16 +186,10 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); - HWND (WINAPI *pNtUserCreateWindowEx)( DWORD ex_style, UNICODE_STRING *class_name, - UNICODE_STRING *version, UNICODE_STRING *window_name, - DWORD style, INT x, INT y, INT width, INT height, - HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ); HDWP (WINAPI *pNtUserDeferWindowPosAndBand)( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ); BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle ); - BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); BOOL (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ); DWORD (WINAPI *pNtUserDrawMenuBarTemp)( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index f4847d06480..a3e617fe75f 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,18 +725,6 @@ NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER return unix_funcs->pNtGdiDdDDISetVidPnSourceOwner( desc ); } -HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, - UNICODE_STRING *version, UNICODE_STRING *window_name, - DWORD style, INT x, INT y, INT width, INT height, - HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCreateWindowEx( ex_style, class_name, version, window_name, - style, x, y, width, height, parent, menu, - instance, params, flags, cbtc, unk, ansi ); -} - HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ) @@ -752,12 +740,6 @@ BOOL WINAPI NtUserDestroyMenu( HMENU handle ) return unix_funcs->pNtUserDestroyMenu( handle ); } -BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserDestroyWindow( hwnd ); -} - BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 95ceeb9e16d..7125838dd35 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -114,11 +114,13 @@ SYSCALL_ENTRY( NtUserCreateCaret ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateInputContext ) \ + SYSCALL_ENTRY( NtUserCreateWindowEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ SYSCALL_ENTRY( NtUserDeleteMenu ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserDestroyCursor ) \ SYSCALL_ENTRY( NtUserDestroyInputContext ) \ + SYSCALL_ENTRY( NtUserDestroyWindow ) \ SYSCALL_ENTRY( NtUserDisableThreadIme ) \ SYSCALL_ENTRY( NtUserDispatchMessage ) \ SYSCALL_ENTRY( NtUserDragDetect ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index a3e880c46ed..20648a6620f 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -411,6 +411,38 @@ NTSTATUS WINAPI wow64_NtUserCreateInputContext( UINT *args ) return HandleToUlong( NtUserCreateInputContext( client_ptr )); } +NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args ) +{ + DWORD ex_style = get_ulong( &args ); + UNICODE_STRING32 *class_name32 = get_ptr( &args ); + UNICODE_STRING32 *version32 = get_ptr( &args ); + UNICODE_STRING32 *window_name32 = get_ptr( &args ); + DWORD style = get_ulong( &args ); + int x = get_ulong( &args ); + int y = get_ulong( &args ); + int width = get_ulong( &args ); + int height = get_ulong( &args ); + HWND parent = get_handle( &args ); + HMENU menu = get_handle( &args ); + HINSTANCE instance = get_handle( &args ); + void *params = get_ptr( &args ); + DWORD flags = get_ulong( &args ); + void *cbtc = get_ptr( &args ); + DWORD unk = get_ulong( &args ); + BOOL ansi = get_ulong( &args ); + + UNICODE_STRING class_name, version, window_name; + HWND ret; + + ret = NtUserCreateWindowEx( ex_style, + unicode_str_32to64( &class_name, class_name32), + unicode_str_32to64( &version, version32 ), + unicode_str_32to64( &window_name, window_name32 ), + style, x, y, width, height, parent, menu, + instance, params, flags, cbtc, unk, ansi ); + return HandleToUlong( ret ); +} + NTSTATUS WINAPI wow64_NtUserCreateWindowStation( UINT *args ) { OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); @@ -458,6 +490,13 @@ NTSTATUS WINAPI wow64_NtUserDestroyInputContext( UINT *args ) return NtUserDestroyInputContext( handle ); } +NTSTATUS WINAPI wow64_NtUserDestroyWindow( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + + return NtUserDestroyWindow( hwnd ); +} + NTSTATUS WINAPI wow64_NtUserDisableThreadIme( UINT *args ) { DWORD thread_id = get_ulong( &args );

1 0

Jacek Caban : win32u: Use syscall interface for NtUserDisableThreadIme.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 43c851c796b06ed54fe093b859134063d457ba27 URL: https://gitlab.winehq.org/wine/wine/-/commit/43c851c796b06ed54fe093b8591340… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 22:25:16 2022 +0200 win32u: Use syscall interface for NtUserDisableThreadIme. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index f7df8f88cb6..d4c9a1a3861 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1140,7 +1140,6 @@ static struct unix_funcs unix_funcs = NtUserDeferWindowPosAndBand, NtUserDestroyMenu, NtUserDestroyWindow, - NtUserDisableThreadIme, NtUserDrawCaptionTemp, NtUserDrawMenuBarTemp, NtUserEnableMenuItem, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 92077671eb6..d04e4dc2cf3 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -132,6 +132,7 @@ static void * const syscalls[] = NtUserDestroyAcceleratorTable, NtUserDestroyCursor, NtUserDestroyInputContext, + NtUserDisableThreadIme, NtUserDispatchMessage, NtUserDragDetect, NtUserDrawIconEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c0ad2866b48..555aaecdfb5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -837,7 +837,7 @@ @ stdcall NtUserDestroyWindow(long) @ stub NtUserDisableImmersiveOwner @ stub NtUserDisableProcessWindowFiltering -@ stdcall NtUserDisableThreadIme(long) +@ stdcall -syscall NtUserDisableThreadIme(long) @ stub NtUserDiscardPointerFrameMessages @ stdcall -syscall NtUserDispatchMessage(ptr) @ stub NtUserDisplayConfigGetDeviceInfo diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 722bee43944..c7aac2edd75 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -196,7 +196,6 @@ struct unix_funcs UINT flags, UINT unk1, UINT unk2 ); BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle ); BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); - BOOL (WINAPI *pNtUserDisableThreadIme)( DWORD thread_id ); BOOL (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ); DWORD (WINAPI *pNtUserDrawMenuBarTemp)( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 9694c203fcb..f4847d06480 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -758,12 +758,6 @@ BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) return unix_funcs->pNtUserDestroyWindow( hwnd ); } -BOOL WINAPI NtUserDisableThreadIme( DWORD thread_id ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserDisableThreadIme( thread_id ); -} - BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 7bdf8dd32cd..95ceeb9e16d 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -119,6 +119,7 @@ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserDestroyCursor ) \ SYSCALL_ENTRY( NtUserDestroyInputContext ) \ + SYSCALL_ENTRY( NtUserDisableThreadIme ) \ SYSCALL_ENTRY( NtUserDispatchMessage ) \ SYSCALL_ENTRY( NtUserDragDetect ) \ SYSCALL_ENTRY( NtUserDrawIconEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 8c971154448..a3e880c46ed 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -458,6 +458,13 @@ NTSTATUS WINAPI wow64_NtUserDestroyInputContext( UINT *args ) return NtUserDestroyInputContext( handle ); } +NTSTATUS WINAPI wow64_NtUserDisableThreadIme( UINT *args ) +{ + DWORD thread_id = get_ulong( &args ); + + return NtUserDisableThreadIme( thread_id ); +} + NTSTATUS WINAPI wow64_NtUserDispatchMessage( UINT *args ) { const MSG32 *msg32 = get_ptr( &args );

1 0

Jacek Caban : win32u: Use syscall interface for more input functions.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 8ecb3aa5cc3a061b978d645a807a35884749415a URL: https://gitlab.winehq.org/wine/wine/-/commit/8ecb3aa5cc3a061b978d645a807a35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 22:19:14 2022 +0200 win32u: Use syscall interface for more input functions. --- dlls/win32u/gdiobj.c | 8 ----- dlls/win32u/syscall.c | 8 +++++ dlls/win32u/win32u.spec | 16 ++++----- dlls/win32u/win32u_private.h | 8 ----- dlls/win32u/wrappers.c | 48 --------------------------- dlls/wow64win/syscall.h | 8 +++++ dlls/wow64win/user.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 102 insertions(+), 72 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for cursor icon functions.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 399dfc2580b2a124d8711b15b6e11fdae49ff910 URL: https://gitlab.winehq.org/wine/wine/-/commit/399dfc2580b2a124d8711b15b6e11f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 21:53:49 2022 +0200 win32u: Use syscall interface for cursor icon functions. --- dlls/win32u/gdiobj.c | 7 ---- dlls/win32u/syscall.c | 7 ++++ dlls/win32u/win32u.spec | 14 +++---- dlls/win32u/win32u_private.h | 10 ----- dlls/win32u/wrappers.c | 45 ---------------------- dlls/wow64win/syscall.h | 7 ++++ dlls/wow64win/user.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 109 insertions(+), 69 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more sysparams functions.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: b20f39858c0eaf8300681637b6eab1055aa2c48a URL: https://gitlab.winehq.org/wine/wine/-/commit/b20f39858c0eaf8300681637b6eab1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 17:24:44 2022 +0200 win32u: Use syscall interface for more sysparams functions. --- dlls/win32u/gdiobj.c | 6 ---- dlls/win32u/syscall.c | 6 ++++ dlls/win32u/sysparams.c | 5 +++- dlls/win32u/win32u.spec | 12 ++++---- dlls/win32u/win32u_private.h | 17 ----------- dlls/win32u/wrappers.c | 40 -------------------------- dlls/wow64win/syscall.h | 6 ++++ dlls/wow64win/user.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 89 insertions(+), 70 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for clipboard functions.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: b1ffc6ca74e40d9d0f6e258572b5177cb469d249 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1ffc6ca74e40d9d0f6e258572b517… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 13:05:00 2022 +0200 win32u: Use syscall interface for clipboard functions. --- dlls/win32u/gdiobj.c | 11 ----- dlls/win32u/syscall.c | 11 +++++ dlls/win32u/win32u.spec | 22 ++++----- dlls/win32u/win32u_private.h | 12 ----- dlls/win32u/wrappers.c | 67 -------------------------- dlls/wow64win/syscall.h | 11 +++++ dlls/wow64win/user.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 142 insertions(+), 101 deletions(-)

1 0

Francois Gouget : dinput/tests: Add a trailing linefeed to some ok() calls.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 1bf88f860e4eb5cd91a9280d173bc58ac9888824 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bf88f860e4eb5cd91a9280d173bc5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:08:54 2022 +0200 dinput/tests: Add a trailing linefeed to some ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput/tests/joystick8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e73330815a0..90d7182a1fa 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1682,8 +1682,8 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); - ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld", state.lX ); - ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld", state.lY ); + ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld\n", state.lX ); + ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld\n", state.lY ); check_member( state, expect_state_abs[1], "%ld", lZ ); check_member( state, expect_state_abs[1], "%ld", lRx ); check_member( state, expect_state_abs[1], "%ld", rgdwPOV[0] );

1 0

Francois Gouget : include: Add some SPI_ constants.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 04c7ff2c2f0d611ef37c125b554c993605794847 URL: https://gitlab.winehq.org/wine/wine/-/commit/04c7ff2c2f0d611ef37c125b554c99… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:04:12 2022 +0200 include: Add some SPI_ constants. They pop up in some failure messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/winuser.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index d2262b6d70a..b17f30debd3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2502,6 +2502,10 @@ typedef struct tagDROPSTRUCT #define SPI_SETPENVISUALIZATION 0x201F #define SPI_GETPENARBITRATIONTYPE 0x2020 #define SPI_SETPENARBITRATIONTYPE 0x2021 +#define SPI_GETCARETTIMEOUT 0x2022 +#define SPI_SETCARETTIMEOUT 0x2023 +#define SPI_GETHANDEDNESS 0x2024 +#define SPI_SETHANDEDNESS 0x2025 #define FE_FONTSMOOTHINGSTANDARD 0x0001 #define FE_FONTSMOOTHINGCLEARTYPE 0x0002

1 0

Francois Gouget : ws2_32/tests: Add comments to help identify the hint test indices.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 5d8d9cd63d46380a74dd7fc09b38fb6e80d44b48 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d8d9cd63d46380a74dd7fc09b38fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:01:11 2022 +0200 ws2_32/tests: Add comments to help identify the hint test indices. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ws2_32/tests/protocol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 0b14543606a..fac3cf57077 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1572,7 +1572,7 @@ static const struct addr_hint_tests } hinttests[] = { - {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0}, + {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0}, /* 0 */ {AF_UNSPEC, SOCK_STREAM, IPPROTO_UDP, 0}, {AF_UNSPEC, SOCK_STREAM, IPPROTO_IPV6,0}, {AF_UNSPEC, SOCK_DGRAM, IPPROTO_TCP, 0}, @@ -1582,7 +1582,7 @@ hinttests[] = {AF_INET, SOCK_STREAM, IPPROTO_UDP, 0}, {AF_INET, SOCK_STREAM, IPPROTO_IPV6,0}, {AF_INET, SOCK_DGRAM, IPPROTO_TCP, 0}, - {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0}, + {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0}, /* 10 */ {AF_INET, SOCK_DGRAM, IPPROTO_IPV6,0}, {AF_UNSPEC, 0, IPPROTO_TCP, 0}, {AF_UNSPEC, 0, IPPROTO_UDP, 0}, @@ -1592,7 +1592,7 @@ hinttests[] = {AF_INET, 0, IPPROTO_TCP, 0}, {AF_INET, 0, IPPROTO_UDP, 0}, {AF_INET, 0, IPPROTO_IPV6,0}, - {AF_INET, SOCK_STREAM, 0, 0}, + {AF_INET, SOCK_STREAM, 0, 0}, /* 20 */ {AF_INET, SOCK_DGRAM, 0, 0}, {AF_UNSPEC, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT}, {AF_UNSPEC, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT}, @@ -1602,7 +1602,7 @@ hinttests[] = {AF_INET, 999, IPPROTO_IPV6,WSAESOCKTNOSUPPORT}, {AF_UNSPEC, SOCK_STREAM, 999, 0}, {AF_UNSPEC, SOCK_STREAM, 999, 0}, - {AF_INET, SOCK_DGRAM, 999, 0}, + {AF_INET, SOCK_DGRAM, 999, 0}, /* 30 */ {AF_INET, SOCK_DGRAM, 999, 0}, };

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022