- Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Move NtUserEnableMouseInPointer from user32.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 738425185f3901d192249f18950c6a7a51cd2ad5 URL: https://gitlab.winehq.org/wine/wine/-/commit/738425185f3901d192249f18950c6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 win32u: Move NtUserEnableMouseInPointer from user32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53847 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51537 --- dlls/user32/input.c | 11 ----------- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 12 ++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 7 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c5387cf9212..3b0a13842c8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -495,17 +495,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout ) } -/*********************************************************************** - * EnableMouseInPointer (USER32.@) - */ -BOOL WINAPI EnableMouseInPointer(BOOL enable) -{ - FIXME("(%#x) stub\n", enable); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) { SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1628c7ca74a..f0e32c633d8 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -205,7 +205,7 @@ @ stdcall EditWndProc(long long long long) EditWndProcA @ stdcall EmptyClipboard() NtUserEmptyClipboard @ stdcall EnableMenuItem(long long long) NtUserEnableMenuItem -@ stdcall EnableMouseInPointer(long) +@ stdcall EnableMouseInPointer(long) NtUserEnableMouseInPointer @ stdcall EnableNonClientDpiScaling(long) @ stdcall -import EnableScrollBar(long long long) NtUserEnableScrollBar @ stdcall EnableWindow(long long) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 5656d5eb28f..95362fbef1f 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2153,6 +2153,18 @@ void toggle_caret( HWND hwnd ) if (ret && !hidden) display_caret( hwnd, &r ); } + +/********************************************************************** + * NtUserEnableMouseInPointer (win32u.@) + */ +BOOL WINAPI NtUserEnableMouseInPointer( BOOL enable ) +{ + FIXME( "enable %u stub!\n", enable ); + RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + HWND get_shell_window(void) { HWND hwnd = 0; diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 32812a3d881..a0fba9f8045 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -145,6 +145,7 @@ static void * const syscalls[] = NtUserDrawIconEx, NtUserEmptyClipboard, NtUserEnableMenuItem, + NtUserEnableMouseInPointer, NtUserEnableScrollBar, NtUserEndDeferWindowPosEx, NtUserEndMenu, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c3ed3c0559a..6f3b2c31577 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -861,7 +861,7 @@ @ stub NtUserEnableChildWindowDpiMessage @ stub NtUserEnableIAMAccess @ stdcall -syscall NtUserEnableMenuItem(long long long) -@ stub NtUserEnableMouseInPointer +@ stdcall -syscall NtUserEnableMouseInPointer(long) @ stub NtUserEnableMouseInPointerForWindow @ stub NtUserEnableMouseInputForCursorSuppression @ stub NtUserEnableNonClientDpiScaling diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index ecf79f69cce..5c5de66cd3c 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -131,6 +131,7 @@ SYSCALL_ENTRY( NtUserDrawIconEx ) \ SYSCALL_ENTRY( NtUserEmptyClipboard ) \ SYSCALL_ENTRY( NtUserEnableMenuItem ) \ + SYSCALL_ENTRY( NtUserEnableMouseInPointer ) \ SYSCALL_ENTRY( NtUserEnableScrollBar ) \ SYSCALL_ENTRY( NtUserEndDeferWindowPosEx ) \ SYSCALL_ENTRY( NtUserEndMenu ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 4ce8c94c1af..5520a28a018 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1629,6 +1629,13 @@ NTSTATUS WINAPI wow64_NtUserEnableMenuItem( UINT *args ) return NtUserEnableMenuItem( handle, id, flags ); } +NTSTATUS WINAPI wow64_NtUserEnableMouseInPointer( UINT *args ) +{ + UINT enable = get_ulong( &args ); + + return NtUserEnableMouseInPointer( enable ); +} + NTSTATUS WINAPI wow64_NtUserEnableScrollBar( UINT *args ) { HWND hwnd = get_handle( &args );

1 0

Rémi Bernon : win32u/tests: Test NtUserEnableMouseInPointer syscall.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 9443bde57d6a75f4f3fde05cf9252e7fdd9a136f URL: https://gitlab.winehq.org/wine/wine/-/commit/9443bde57d6a75f4f3fde05cf9252e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 win32u/tests: Test NtUserEnableMouseInPointer syscall. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53847 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51537 --- dlls/win32u/tests/win32u.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 87419f6fadb..0187d52ea9d 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "ntuser.h" - static void test_NtUserEnumDisplayDevices(void) { NTSTATUS ret; @@ -822,6 +821,43 @@ static void test_inter_process_child( HWND hwnd ) PostMessageA( hwnd, WM_USER, 0, 0 ); } +static void test_NtUserEnableMouseInPointer_process( const char *arg ) +{ + DWORD enable = strtoul( arg, 0, 10 ); + BOOL ret; + + ret = NtUserEnableMouseInPointer( enable ); + todo_wine + ok( ret, "NtUserEnableMouseInPointer failed, error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnableMouseInPointer( !enable ); + ok( !ret, "NtUserEnableMouseInPointer succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_ACCESS_DENIED, "got error %lu\n", GetLastError() ); + + ret = NtUserEnableMouseInPointer( enable ); + todo_wine + ok( ret, "NtUserEnableMouseInPointer failed, error %lu\n", GetLastError() ); +} + +static void test_NtUserEnableMouseInPointer( char **argv, BOOL enable ) +{ + STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION info = {0}; + char cmdline[MAX_PATH * 2]; + BOOL ret; + + sprintf( cmdline, "%s %s NtUserEnableMouseInPointer %u", argv[0], argv[1], enable ); + ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); + if (!ret) return; + + wait_child_process( info.hProcess ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); +} + START_TEST(win32u) { char **argv; @@ -837,6 +873,14 @@ START_TEST(win32u) return; } + if (argc > 3 && !strcmp( argv[2], "NtUserEnableMouseInPointer" )) + { + winetest_push_context( "enable %s", argv[3] ); + test_NtUserEnableMouseInPointer_process( argv[3] ); + winetest_pop_context(); + return; + } + test_NtUserEnumDisplayDevices(); test_window_props(); test_class(); @@ -851,4 +895,7 @@ START_TEST(win32u) test_NtUserCloseWindowStation(); test_NtUserDisplayConfigGetDeviceInfo(); + + test_NtUserEnableMouseInPointer( argv, FALSE ); + test_NtUserEnableMouseInPointer( argv, TRUE ); }

1 0

Rémi Bernon : win32u: Stub NtUserGetPointerInfoList syscall.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 45e6dfc19249ceb506c4610d8abd206a11943bc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/45e6dfc19249ceb506c4610d8abd20… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 26 12:38:35 2023 +0100 win32u: Stub NtUserGetPointerInfoList syscall. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53847 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51537 --- dlls/win32u/input.c | 11 +++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 809bd7bbbc9..36f7404b296 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2174,6 +2174,17 @@ BOOL WINAPI NtUserIsMouseInPointerEnabled(void) return FALSE; } +/********************************************************************** + * NtUserGetPointerInfoList (win32u.@) + */ +BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_PTR unk0, UINT_PTR unk1, SIZE_T size, + UINT32 *entry_count, UINT32 *pointer_count, void *pointer_info ) +{ + FIXME( "id %#x, type %#x, unk0 %#zx, unk1 %#zx, size %#zx, entry_count %p, pointer_count %p, pointer_info %p stub!\n", + id, (int)type, unk0, unk1, (size_t)size, entry_count, pointer_count, pointer_info ); + RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} HWND get_shell_window(void) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3e3c5aba58c..9020aa01126 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -193,6 +193,7 @@ static void * const syscalls[] = NtUserGetMouseMovePointsEx, NtUserGetObjectInformation, NtUserGetOpenClipboardWindow, + NtUserGetPointerInfoList, NtUserGetPriorityClipboardFormat, NtUserGetProcessDpiAwarenessContext, NtUserGetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 0c4d4a3971d..6e1a0a51175 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -971,7 +971,7 @@ @ stub NtUserGetPointerDeviceRects @ stub NtUserGetPointerDevices @ stub NtUserGetPointerFrameTimes -@ stub NtUserGetPointerInfoList +@ stdcall -syscall NtUserGetPointerInfoList(long long long long long ptr ptr ptr) @ stub NtUserGetPointerInputTransform @ stub NtUserGetPointerProprietaryId @ stub NtUserGetPointerType diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index ca491f2a6b1..4977013c595 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -179,6 +179,7 @@ SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \ + SYSCALL_ENTRY( NtUserGetPointerInfoList ) \ SYSCALL_ENTRY( NtUserGetPriorityClipboardFormat ) \ SYSCALL_ENTRY( NtUserGetProcessDpiAwarenessContext ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7afd0ca0ffe..2ce82907a88 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2246,6 +2246,20 @@ NTSTATUS WINAPI wow64_NtUserGetOpenClipboardWindow( UINT *args ) return HandleToUlong( NtUserGetOpenClipboardWindow() ); } +NTSTATUS WINAPI wow64_NtUserGetPointerInfoList( UINT *args ) +{ + UINT id = get_ulong( &args ); + UINT type = get_ulong( &args ); + UINT unk0 = get_ulong( &args ); + UINT unk1 = get_ulong( &args ); + UINT size = get_ulong( &args ); + void *entry_count = get_ptr( &args ); + void *pointer_count = get_ptr( &args ); + void *pointer_info = get_ptr( &args ); + + return NtUserGetPointerInfoList( id, type, unk0, unk1, size, entry_count, pointer_count, pointer_info ); +} + NTSTATUS WINAPI wow64_NtUserGetPriorityClipboardFormat( UINT *args ) { UINT *list = get_ptr( &args );

1 0

Rémi Bernon : include: Declare some NtUser pointer related syscalls.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 3cf7b6b41ae759ddf7e991e12542dfb94feee889 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cf7b6b41ae759ddf7e991e12542df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 12:19:33 2022 +0100 include: Declare some NtUser pointer related syscalls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53847 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51537 --- include/ntuser.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ntuser.h b/include/ntuser.h index 7bbe7037f20..3b821f0c9fe 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -701,6 +701,7 @@ BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, DWORD WINAPI NtUserDrawMenuBarTemp( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font ); BOOL WINAPI NtUserEmptyClipboard(void); BOOL WINAPI NtUserEnableMenuItem( HMENU handle, UINT id, UINT flags ); +BOOL WINAPI NtUserEnableMouseInPointer( BOOL ); BOOL WINAPI NtUserEnableScrollBar( HWND hwnd, UINT bar, UINT flags ); BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async ); BOOL WINAPI NtUserEndMenu(void); @@ -760,6 +761,8 @@ int WINAPI NtUserGetMouseMovePointsEx( UINT size, MOUSEMOVEPOINT *ptin, MOUS BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); HWND WINAPI NtUserGetOpenClipboardWindow(void); +BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_PTR, UINT_PTR, SIZE_T size, + UINT32 *entry_count, UINT32 *pointer_count, void *pointer_info ); INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str ); @@ -789,6 +792,7 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs HICON WINAPI NtUserInternalGetWindowIcon( HWND hwnd, UINT type ); INT WINAPI NtUserInternalGetWindowText( HWND hwnd, WCHAR *text, INT count ); BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); +BOOL WINAPI NtUserIsMouseInPointerEnabled(void); BOOL WINAPI NtUserInvalidateRect( HWND hwnd, const RECT *rect, BOOL erase ); BOOL WINAPI NtUserInvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase ); BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id );

1 0

Alistair Leslie-Hughes : secur32: QueryContextAttributesW check for valid object before use.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: cbddd3930b4b186c7f0034e67abfbfcf18f423b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbddd3930b4b186c7f0034e67abfbf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 12:37:09 2023 +1100 secur32: QueryContextAttributesW check for valid object before use. --- dlls/secur32/schannel.c | 4 ++-- dlls/secur32/tests/schannel.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6b5df3520a7..6b4be497f30 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1149,8 +1149,8 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( TRACE("context_handle %p, attribute %#lx, buffer %p\n", context_handle, attribute, buffer); - if (!context_handle) return SEC_E_INVALID_HANDLE; - ctx = schan_get_object(context_handle->dwLower, SCHAN_HANDLE_CTX); + if (!context_handle || !(ctx = schan_get_object(context_handle->dwLower, SCHAN_HANDLE_CTX))) + return SEC_E_INVALID_HANDLE; switch(attribute) { diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index f0b0b20b08a..5153c9b4a1e 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1529,6 +1529,10 @@ static void test_communication(void) done: DeleteSecurityContext(&context); + + status = QueryContextAttributesW(&context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + ok(status == SEC_E_INVALID_HANDLE, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) got %08lx\n", status); + FreeCredentialsHandle(&cred_handle); CertFreeCertificateContext(cert);

1 0

Paul Gofman : ntdll: Add stub for NtQueryInformationProcess( ProcessHandleTable ).
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 1b1f8d914e4d47a2d9c0e2ee1f919d8beb6b0368 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b1f8d914e4d47a2d9c0e2ee1f919d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 30 17:14:33 2023 -0600 ntdll: Add stub for NtQueryInformationProcess( ProcessHandleTable ). --- dlls/ntdll/unix/process.c | 6 ++++++ include/winternl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index ca153a30bf2..4b9c42467e7 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1343,6 +1343,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else if (!handle) ret = STATUS_INVALID_HANDLE; else { + FIXME( "ProcessHandleCount (%p,%p,0x%08x,%p) stub\n", handle, info, (int)size, ret_len ); memset(info, 0, 4); len = 4; } @@ -1355,6 +1356,11 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class } break; + case ProcessHandleTable: + FIXME( "ProcessHandleTable (%p,%p,0x%08x,%p) stub\n", handle, info, (int)size, ret_len ); + len = 0; + break; + case ProcessAffinityMask: len = sizeof(ULONG_PTR); if (size == len) diff --git a/include/winternl.h b/include/winternl.h index a7f82073ad5..de5630ecf49 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1574,6 +1574,7 @@ typedef enum _PROCESSINFOCLASS { ProcessConsoleHostProcess = 49, ProcessWindowInformation = 50, ProcessHandleInformation = 51, + ProcessHandleTable = 58, ProcessPowerThrottlingState = 77, ProcessLeapSecondInformation = 97, MaxProcessInfoClass,

1 0

Alistair Leslie-Hughes : secur32: Trace fContextReq consistently.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: f9c244f2db6559bee64f64db992d2de4fc7b27a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9c244f2db6559bee64f64db992d2d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 13:47:51 2023 +1100 secur32: Trace fContextReq consistently. 0108:trace:secur32:InitializeSecurityContextA 25528220 00000000 (null) 0x0008c13c 0 16 ... 0108:trace:secur32:schan_InitializeSecurityContextA 25528220 00000000 (null) 573756 0 16 ... 0108:trace:secur32:schan_InitializeSecurityContextW 25528220 00000000 (null) 0x0008c13c 0 16 ... --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6b4be497f30..05994ed0753 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1030,7 +1030,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( SECURITY_STATUS ret; SEC_WCHAR *target_name = NULL; - TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08lx %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);

1 0

Zebediah Figura : include: Add more definitions to difxapi.h.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: f954fb881cf668ea9361591eb2d2488be1fdbf0f URL: https://gitlab.winehq.org/wine/wine/-/commit/f954fb881cf668ea9361591eb2d248… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 12:41:24 2023 -0600 include: Add more definitions to difxapi.h. --- include/difxapi.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/difxapi.h b/include/difxapi.h index ad57b0f5bce..3e0284509e2 100644 --- a/include/difxapi.h +++ b/include/difxapi.h @@ -23,6 +23,19 @@ extern "C" { #endif +#define ERROR_DEPENDENT_APPLICATIONS_EXIST 0xe0000300 +#define ERROR_NO_DEVICE_ID 0xe0000301 +#define ERROR_DRIVER_PACKAGE_NOT_IN_STORE 0xe0000302 +#define ERROR_MISSING_FILE 0xe0000303 +#define ERROR_INVALID_CATALOG_DATA 0xe0000304 + +#define DRIVER_PACKAGE_REPAIR 0x00000001 +#define DRIVER_PACKAGE_SILENT 0x00000002 +#define DRIVER_PACKAGE_FORCE 0x00000004 +#define DRIVER_PACKAGE_ONLY_IF_DEVICE_PRESENT 0x00000008 +#define DRIVER_PACKAGE_LEGACY_MODE 0x00000010 +#define DRIVER_PACKAGE_DELETE_FILES 0x00000020 + typedef struct _INSTALLERINFO_A { PSTR pApplicationId;

1 0

Zebediah Figura : include: Fix the definition of DIFXAPILOGCALLBACK_* functions.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 855bb76b734b5324c3e84f8d7ee04f3350af9670 URL: https://gitlab.winehq.org/wine/wine/-/commit/855bb76b734b5324c3e84f8d7ee04f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 12:41:07 2023 -0600 include: Fix the definition of DIFXAPILOGCALLBACK_* functions. These have cdecl convention, not stdcall. --- include/difxapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/difxapi.h b/include/difxapi.h index 21d43c90de6..ad57b0f5bce 100644 --- a/include/difxapi.h +++ b/include/difxapi.h @@ -49,8 +49,8 @@ typedef enum _DIFXAPI_LOG DIFXAPI_ERROR, } DIFXAPI_LOG; -typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); -typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID); +typedef void (__cdecl *DIFXAPILOGCALLBACK_A)(DIFXAPI_LOG, DWORD, const char *, void *); +typedef void (__cdecl *DIFXAPILOGCALLBACK_W)(DIFXAPI_LOG, DWORD, const WCHAR *, void *); typedef VOID (CALLBACK *DIFXLOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); typedef VOID (CALLBACK *DIFXLOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID);

1 0

Zebediah Figura : winepulse: Include mult.c in pulse.c.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: b8e912f795d1f7dd4938663fe5f902a09dd977dd URL: https://gitlab.winehq.org/wine/wine/-/commit/b8e912f795d1f7dd4938663fe5f902… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 15:08:27 2023 -0600 winepulse: Include mult.c in pulse.c. Originally meant to address the fact that mult_alaw_sample() and mult_ulaw_sample() were exported without being hidden, but this file is only used from pulse.c, and is relatively quite simple, so just make them static and use the preprocessor instead of linking. --- dlls/winepulse.drv/Makefile.in | 1 - dlls/winepulse.drv/{mult.c => mult.h} | 9 ++------- dlls/winepulse.drv/pulse.c | 5 ++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index d938aac052e..7a78f4e854e 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -6,5 +6,4 @@ UNIX_CFLAGS = $(PULSE_CFLAGS) C_SRCS = \ mmdevdrv.c \ - mult.c \ pulse.c diff --git a/dlls/winepulse.drv/mult.c b/dlls/winepulse.drv/mult.h similarity index 99% rename from dlls/winepulse.drv/mult.c rename to dlls/winepulse.drv/mult.h index 26b5e83c9ca..58f516a0d4d 100644 --- a/dlls/winepulse.drv/mult.c +++ b/dlls/winepulse.drv/mult.h @@ -20,11 +20,6 @@ #include <windef.h> -#if 0 -#pragma makedep unix -#endif - - /********************************************************************** * A-law and u-law sample manipulation functions * Multiply with the given volume (vol must be between 0...1 inclusive) @@ -32,7 +27,7 @@ * These were taken from PulseAudio's sources but adjusted to directly * fit our usage (since we use floats directly) so they should be exact. */ -UINT8 mult_alaw_sample(UINT8 sample, float vol) +static UINT8 mult_alaw_sample(UINT8 sample, float vol) { static const float decode_to_13bits_float[1 << 8] = { @@ -708,7 +703,7 @@ UINT8 mult_alaw_sample(UINT8 sample, float vol) return encode[(int)(vol * decode_to_13bits_float[sample]) + ARRAY_SIZE(encode) / 2]; } -UINT8 mult_ulaw_sample(UINT8 sample, float vol) +static UINT8 mult_ulaw_sample(UINT8 sample, float vol) { static const float decode_to_14bits_float[1 << 8] = { diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 41d988e692b..9446feb452c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -44,6 +44,8 @@ #include "../mmdevapi/unixlib.h" +#include "mult.h" + WINE_DEFAULT_DEBUG_CHANNEL(pulse); enum phys_device_bus_type { @@ -117,9 +119,6 @@ static const REFERENCE_TIME DefaultPeriod = 100000; static pthread_mutex_t pulse_mutex; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; -UINT8 mult_alaw_sample(UINT8, float); -UINT8 mult_ulaw_sample(UINT8, float); - static void pulse_lock(void) { pthread_mutex_lock(&pulse_mutex);

1 0