June 2022 - Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore: Add ILegacyIAccessibleProvider implementation for MSAA providers.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 28c7a4d1a57c520d918ae3dfe884154784ef2e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=28c7a4d1a57c520d918ae3df… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon May 23 15:22:16 2022 -0400 uiautomationcore: Add ILegacyIAccessibleProvider implementation for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 57 ++++++++++ dlls/uiautomationcore/uia_provider.c | 167 ++++++++++++++++++++++++++++- 2 files changed, 222 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28c7a4d1a57c520d918a…

1 0

Rémi Bernon : dinput/tests: Run keyboard info tests for every dinput version.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: cda4596cadac856933a7f23fac366a20447888d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda4596cadac856933a7f23f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 13:39:46 2022 +0200 dinput/tests: Run keyboard info tests for every dinput version. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/device8.c | 51 ++++++++++++++-------- dlls/dinput/tests/keyboard.c | 101 ------------------------------------------- 2 files changed, 34 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cda4596cadac856933a7…

1 0

Rémi Bernon : dinput: Fix DIPROP_FFGAIN mouse and keyboard tests.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: d4ea5f98c3e93eef756ddd035baf707c5e877e2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ea5f98c3e93eef756ddd03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 2 15:44:04 2022 +0200 dinput: Fix DIPROP_FFGAIN mouse and keyboard tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 2 +- dlls/dinput/tests/device8.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 9e7cb20453c..f4bdce51633 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1394,9 +1394,9 @@ static HRESULT WINAPI dinput_device_set_property( IDirectInputDevice8W *iface, c case (DWORD_PTR)DIPROP_FFGAIN: { const DIPROPDWORD *value = (const DIPROPDWORD *)header; - if (!impl->vtbl->send_device_gain) return DIERR_UNSUPPORTED; impl->device_gain = value->dwData; if (!is_exclusively_acquired( impl )) return DI_OK; + if (!impl->vtbl->send_device_gain) return DI_OK; return impl->vtbl->send_device_gain( iface, impl->device_gain ); } case (DWORD_PTR)DIPROP_AXISMODE: diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 7bd3600df61..a5c647713f2 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1745,14 +1745,14 @@ static void test_mouse_info(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_KEYNAME returned %#lx\n", hr ); - prop_range.diph.dwHow = DIPH_DEVICE; - prop_range.diph.dwObj = 0; + prop_dword.diph.dwHow = DIPH_DEVICE; + prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); @@ -2080,14 +2080,14 @@ static void test_keyboard_info(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_RANGE returned %#lx\n", hr ); - prop_range.diph.dwHow = DIPH_DEVICE; - prop_range.diph.dwObj = 0; + prop_dword.diph.dwHow = DIPH_DEVICE; + prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#lx\n", hr ); res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON );

1 0

Rémi Bernon : dinput/tests: Add some broken joystick axis results.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 6a95003b8b3acc0394f273bd4d5cbdc6fd6e4271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a95003b8b3acc0394f273bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 18:15:04 2022 +0200 dinput/tests: Add some broken joystick axis results. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- 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 c706276f146..e73330815a0 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 ); - check_member( state, expect_state_abs[1], "%ld", lX ); - check_member( state, expect_state_abs[1], "%ld", lY ); + 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 ); 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

Paul Gofman : ws2_32: Make wait in WS2_recv_base() alertable.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 95a8bec9f183eb3adb6517869743d049a4d2b54f URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a8bec9f183eb3adb651786… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 26 16:35:02 2022 -0500 ws2_32: Make wait in WS2_recv_base() alertable. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 75 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 70 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9be7190062f..9cc75aacf20 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -959,7 +959,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * IOCTL_AFD_WINE_RECVMSG, &params, sizeof(params), NULL, 0 ); if (status == STATUS_PENDING && !overlapped) { - if (WaitForSingleObject( event, INFINITE ) == WAIT_FAILED) + if (wait_event_alertable( event ) == WAIT_FAILED) return -1; status = piosb->u.Status; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 80d458b650d..af4226e6258 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6747,21 +6747,58 @@ static void test_WSASendTo(void) ok(ret_addr.sin_port, "expected nonzero port\n"); } +struct recv_thread_apc_param +{ + SOCKET sock; + unsigned int apc_count; +}; + +static void WINAPI recv_thread_apc_func(ULONG_PTR param) +{ + struct recv_thread_apc_param *p = (struct recv_thread_apc_param *)param; + int ret; + + ++p->apc_count; + + ret = send(p->sock, "test", 4, 0); + ok(ret == 4, "got %d.\n", ret); +} + +struct recv_thread_param +{ + SOCKET sock; + BOOL overlapped; +}; + static DWORD WINAPI recv_thread(LPVOID arg) { - SOCKET sock = *(SOCKET *)arg; + struct recv_thread_param *p = arg; + SOCKET sock = p->sock; char buffer[32]; WSABUF wsa; WSAOVERLAPPED ov; DWORD flags = 0; + DWORD len; + int ret; wsa.buf = buffer; wsa.len = sizeof(buffer); - ov.hEvent = WSACreateEvent(); - WSARecv(sock, &wsa, 1, NULL, &flags, &ov, NULL); + if (p->overlapped) + { + ov.hEvent = WSACreateEvent(); + WSARecv(sock, &wsa, 1, NULL, &flags, &ov, NULL); - WaitForSingleObject(ov.hEvent, 1000); - WSACloseEvent(ov.hEvent); + WaitForSingleObject(ov.hEvent, 1000); + WSACloseEvent(ov.hEvent); + } + else + { + SetLastError(0xdeadbeef); + ret = WSARecv(sock, &wsa, 1, &len, &flags, NULL, NULL); + ok(!ret, "got ret %d.\n", ret); + ok(WSAGetLastError() == 0, "got error %d.\n", WSAGetLastError()); + ok(len == 4, "got len %lu.\n", len); + } return 0; } @@ -6775,11 +6812,14 @@ static void WINAPI io_completion(DWORD error, DWORD transferred, WSAOVERLAPPED * static void test_WSARecv(void) { SOCKET src, dest, server = INVALID_SOCKET; + struct recv_thread_apc_param apc_param; + struct recv_thread_param recv_param; char buf[20]; WSABUF bufs[2]; WSAOVERLAPPED ov; DWORD bytesReturned, flags, id; struct sockaddr_in addr; + unsigned int apc_count; int iret, len; DWORD dwret; BOOL bret; @@ -6799,10 +6839,20 @@ static void test_WSARecv(void) ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; + + apc_count = 0; + dwret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(dwret, "QueueUserAPC returned %lu\n", dwret); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned == 2, "Expected 2, got %ld\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); + + ok(!apc_count, "got apc_count %u.\n", apc_count); + SleepEx(0, TRUE); + ok(apc_count == 1, "got apc_count %u.\n", apc_count); + SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); @@ -6895,10 +6945,23 @@ static void test_WSARecv(void) if (dest == INVALID_SOCKET) goto end; send(src, "test message", sizeof("test message"), 0); - thread = CreateThread(NULL, 0, recv_thread, &dest, 0, &id); + recv_param.sock = dest; + recv_param.overlapped = TRUE; + thread = CreateThread(NULL, 0, recv_thread, &recv_param, 0, &id); WaitForSingleObject(thread, 3000); CloseHandle(thread); + recv_param.overlapped = FALSE; + thread = CreateThread(NULL, 0, recv_thread, &recv_param, 0, &id); + apc_param.apc_count = 0; + apc_param.sock = src; + dwret = QueueUserAPC(recv_thread_apc_func, thread, (ULONG_PTR)&apc_param); + ok(dwret, "QueueUserAPC returned %lu\n", dwret); + WaitForSingleObject(thread, 3000); + ok(apc_param.apc_count == 1, "got apc_count %u.\n", apc_param.apc_count); + + CloseHandle(thread); + memset(&ov, 0, sizeof(ov)); ov.hEvent = event; ResetEvent(event);

1 0

Paul Gofman : ws2_32: Make wait in select() alertable.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: dfdfba263809b358d7b3738e125ee69fcd996ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfdfba263809b358d7b3738e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 24 18:17:59 2022 -0500 ws2_32: Make wait in select() alertable. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 10 +++++++++- dlls/ws2_32/tests/sock.c | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 964724b36e7..9be7190062f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -551,6 +551,14 @@ static HANDLE get_sync_event(void) return data->sync_event; } +static DWORD wait_event_alertable( HANDLE event ) +{ + DWORD ret; + + while ((ret = WaitForSingleObjectEx( event, INFINITE, TRUE )) == WAIT_IO_COMPLETION) + ; + return ret; +} BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { @@ -2769,7 +2777,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, IOCTL_AFD_POLL, params, params_size, params, params_size ); if (status == STATUS_PENDING) { - if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) + if (wait_event_alertable( sync_event ) == WAIT_FAILED) { free( read_input ); free( params ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 22e414e02ec..80d458b650d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -202,6 +202,11 @@ static void tcp_socketpair(SOCKET *src, SOCKET *dst) tcp_socketpair_flags(src, dst, WSA_FLAG_OVERLAPPED); } +static void WINAPI apc_func(ULONG_PTR apc_count) +{ + ++*(unsigned int *)apc_count; +} + /* Set the linger timeout to zero and close the socket. This will trigger an * RST on the connection on Windows as well as on Unix systems. */ static void close_with_rst(SOCKET s) @@ -3613,6 +3618,7 @@ static void test_select(void) select_thread_params thread_params; HANDLE thread_handle; DWORD ticks, id, old_protect; + unsigned int apc_count; unsigned int maxfd, i; char *page_pair; @@ -3716,14 +3722,24 @@ static void test_select(void) FD_ZERO(&readfds); FD_SET(fdRead, &readfds); + apc_count = 0; + ret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(ret, "QueueUserAPC returned %d\n", ret); ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); ok(!ret, "select returned %d\n", ret); + ok(apc_count == 1, "got apc_count %d.\n", apc_count); FD_ZERO(&writefds); FD_SET(fdWrite, &writefds); + apc_count = 0; + ret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(ret, "QueueUserAPC returned %d\n", ret); ret = select(fdWrite+1, NULL, &writefds, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + ok(!apc_count, "APC was called\n"); + SleepEx(0, TRUE); + ok(apc_count == 1, "got apc_count %d.\n", apc_count); /* select the same socket twice */ writefds.fd_count = 2;

1 0

Connor McAdams : include: Add ILegacyIAccessibleProvider interface definition.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 1989d144c8fa9efd2915fda943152905c585b666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1989d144c8fa9efd2915fda9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 10 13:59:49 2022 -0400 include: Add ILegacyIAccessibleProvider interface definition. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 170b0c76de1..c4aa258b5af 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -151,4 +151,35 @@ library UIA HRESULT GetFocus([out, retval] IRawElementProviderFragment **pRetVal); } + + [ + object, + uuid(e44c3566-915d-4070-99c6-047bff5a08f5), + pointer_default(unique), + oleautomation + ] + interface ILegacyIAccessibleProvider : IUnknown + { + HRESULT Select(long flagsSelect); + HRESULT DoDefaultAction(); + HRESULT SetValue(LPCWSTR szValue); + HRESULT GetIAccessible([out, retval] IAccessible **ppAccessible); + + [propget] HRESULT ChildId([out, retval] int *pRetVal); + [propget] HRESULT Name([out, retval] BSTR *pszName); + [propget] HRESULT Value([out, retval] BSTR *pszValue); + [propget] HRESULT Description([out, retval] BSTR *pszDescription); + [propget] HRESULT Role([out, retval] DWORD *pdwRole); + [propget] HRESULT State([out, retval] DWORD *pdwState); + [propget] HRESULT Help([out, retval] BSTR *pszHelp); + [propget] HRESULT KeyboardShortcut([out, retval] BSTR *pszKeyboardShortcut); + /* + * FIXME: Current versions of Windows SDK use + * SAFEARRAY(IRawElementProviderSimple *) instead of + * SAFEARRAY(VARIANT). The new type is currently unsupported + * in widl, we should switch to it when it is. + */ + HRESULT GetSelection([out, retval] SAFEARRAY(VARIANT) *pvarSelectedChildren); + [propget] HRESULT DefaultAction([out, retval] BSTR *pszDefaultAction); + } }

1 0

Rémi Bernon : kernel32: Cleanup and simplify (Global|Local)Handle.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: a3a2688585a6f9d79446542aec2eae3fc1abb77d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3a2688585a6f9d79446542a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 9 14:06:14 2022 +0200 kernel32: Cleanup and simplify (Global|Local)Handle. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 91 ++++++++++++---------------------------------------- 1 file changed, 21 insertions(+), 70 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 2dac1555d8e..3ba9e139171 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -236,64 +236,10 @@ BOOL WINAPI GlobalUnlock( HGLOBAL handle ) /*********************************************************************** * GlobalHandle (KERNEL32.@) - * - * Get the handle associated with the pointer to a global memory block. - * - * RETURNS - * Handle: Success - * NULL: Failure */ HGLOBAL WINAPI GlobalHandle( const void *ptr ) { - struct mem_entry *mem; - HGLOBAL handle; - ULONG flags; - - TRACE_(globalmem)( "ptr %p\n", ptr ); - - if (!ptr) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - RtlLockHeap( GetProcessHeap() ); - __TRY - { - handle = 0; - - /* note that if ptr is a pointer to a block allocated by */ - /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ - /* will fail. */ - if ((ptr = unsafe_ptr_from_HLOCAL( (HLOCAL)ptr ))) - { - if (!RtlGetUserInfoHeap( GetProcessHeap(), HEAP_NO_SERIALIZE, (void *)ptr, &handle, &flags )) - { - SetLastError( ERROR_INVALID_HANDLE ); - handle = 0; - } - break; - } - else handle = (HGLOBAL)ptr; - - /* Now test handle either passed in or retrieved from pointer */ - if ((mem = unsafe_mem_from_HLOCAL( handle ))) - { - if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, mem->ptr )) /* obj(-handle) valid arena? */ - break; /* valid moveable block */ - } - handle = 0; - SetLastError( ERROR_INVALID_HANDLE ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_HANDLE ); - handle = 0; - } - __ENDTRY - RtlUnlockHeap( GetProcessHeap() ); - - return handle; + return LocalHandle( ptr ); } /*********************************************************************** @@ -438,23 +384,28 @@ UINT WINAPI LocalFlags( HLOCAL handle ) /*********************************************************************** * LocalHandle (KERNEL32.@) - * - * Get the handle associated with the pointer to a local memory block. - * - * RETURNS - * Handle: Success - * NULL: Failure - * - * NOTES - * Windows memory management does not provide a separate local heap - * and global heap. */ -HLOCAL WINAPI LocalHandle( - LPCVOID ptr /* [in] Address of local memory block */ -) { - return GlobalHandle( ptr ); -} +HLOCAL WINAPI LocalHandle( const void *ptr ) +{ + HLOCAL handle; + ULONG flags; + + TRACE_(globalmem)( "ptr %p\n", ptr ); + if (!ptr) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + if (!RtlGetUserInfoHeap( GetProcessHeap(), 0, (void *)ptr, &handle, &flags )) + { + SetLastError( ERROR_INVALID_HANDLE ); + return 0; + } + + return handle; +} /*********************************************************************** * LocalShrink (KERNEL32.@)

1 0

Zebediah Figura : user32: Store the device path as a simple string pointer.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 5d63f809c98dc2733a25d5d55f9a5d942aad5158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d63f809c98dc2733a25d5d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 12:23:27 2022 -0500 user32: Store the device path as a simple string pointer. --- dlls/user32/rawinput.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e7ff854e3b5..3750332c0cf 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); struct device { - SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; + WCHAR *path; HANDLE file; HANDLE handle; RID_DEVICE_INFO info; @@ -103,11 +103,11 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, struct device *device = NULL; RID_DEVICE_INFO info; IO_STATUS_BLOCK io; + WCHAR *path, *pos; NTSTATUS status; UINT32 handle; DWORD i, size; HANDLE file; - WCHAR *pos; SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) @@ -123,16 +123,19 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, } detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); + path = wcsdup( detail->DevicePath ); + free( detail ); + if (!path) return NULL; /* upper case everything but the GUID */ - for (pos = detail->DevicePath; *pos && *pos != '{'; pos++) *pos = towupper(*pos); + for (pos = path; *pos && *pos != '{'; pos++) *pos = towupper(*pos); - file = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + file = CreateFileW( path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (file == INVALID_HANDLE_VALUE) { - ERR("Failed to open device file %s, error %lu.\n", debugstr_w(detail->DevicePath), GetLastError()); - free(detail); + ERR( "Failed to open device file %s, error %lu.\n", debugstr_w(path), GetLastError() ); + free( path ); return NULL; } @@ -199,16 +202,16 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, if (device) { - TRACE("Updating device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); + TRACE( "Updating device %#x / %s.\n", handle, debugstr_w(path) ); free(device->data); CloseHandle(device->file); - free(device->detail); + free( device->path ); } else if (array_reserve((void **)&rawinput_devices, &rawinput_devices_max, rawinput_devices_count + 1, sizeof(*rawinput_devices))) { device = &rawinput_devices[rawinput_devices_count++]; - TRACE("Adding device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); + TRACE( "Adding device %#x / %s.\n", handle, debugstr_w(path) ); } else { @@ -216,7 +219,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, goto fail; } - device->detail = detail; + device->path = path; device->file = file; device->handle = ULongToHandle(handle); device->info = info; @@ -227,7 +230,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, fail: free( preparsed ); CloseHandle( file ); - free( detail ); + free( path ); return NULL; } @@ -258,7 +261,7 @@ void rawinput_update_device_list(void) { free(rawinput_devices[idx].data); CloseHandle(rawinput_devices[idx].file); - free(rawinput_devices[idx].detail); + free( rawinput_devices[idx].path ); } rawinput_devices_count = 0; @@ -762,8 +765,8 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT switch (command) { case RIDI_DEVICENAME: - if ((len = wcslen(device->detail->DevicePath) + 1) <= data_len && data) - memcpy(data, device->detail->DevicePath, len * sizeof(WCHAR)); + if ((len = wcslen( device->path ) + 1) <= data_len && data) + memcpy( data, device->path, len * sizeof(WCHAR) ); *data_size = len; break;

1 0

Jinoh Kang : comctl32: Fix integer overflow in DPA_Search.
by Alexandre Julliard June 10, 2022

June 10, 2022

Module: wine Branch: master Commit: 58571710ba7421bc2fee5c912157d16a90a1c7b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58571710ba7421bc2fee5c91… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 12 20:54:29 2022 +0900 comctl32: Fix integer overflow in DPA_Search. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/comctl32/dpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index b8d23f6cafa..aa9a045e516 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -859,7 +859,7 @@ INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart, r = hdpa->nItemCount - 1; lpPtr = hdpa->ptrs; while (r >= l) { - x = (l + r) / 2; + x = l + (r - l) / 2; n = (pfnCompare)(pFind, lpPtr[x], lParam); if (n == 0) return x;

1 0