August 2021 - Wine-Commits - list.winehq.org

Alex Henrie : wlanapi: Add WlanHostedNetworkQueryProperty stub.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 2c4601b6eed90ec69082adc556b0cfff70d868dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c4601b6eed90ec69082adc5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:48 2021 -0600 wlanapi: Add WlanHostedNetworkQueryProperty stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51469 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 11 +++++++++++ dlls/wlanapi/wlanapi.spec | 1 + include/wlanapi.h | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index d54cc1463ba..bbe560bcd8d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -172,6 +172,17 @@ DWORD WINAPI WlanQueryInterface(HANDLE handle, const GUID *guid, WLAN_INTF_OPCOD return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI WlanHostedNetworkQueryProperty(HANDLE handle, WLAN_HOSTED_NETWORK_OPCODE opcode, + DWORD *data_size, void **data, + WLAN_OPCODE_VALUE_TYPE *opcode_type, void *reserved) +{ + FIXME("(%p, 0x%x, %p, %p, %p, %p) stub\n", + handle, opcode, data_size, data, opcode_type, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 1c21ab5a2ea..8931112fcf8 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -14,6 +14,7 @@ @ stub WlanGetProfileCustomUserData @ stub WlanGetProfileList @ stub WlanGetSecuritySettings +@ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/wlanapi.h b/include/wlanapi.h index a3288d7778b..10f7cae0f61 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -187,6 +187,14 @@ typedef struct _WLAN_AVAILABLE_NETWORK_LIST WLAN_AVAILABLE_NETWORK Network[1]; } WLAN_AVAILABLE_NETWORK_LIST, *PWLAN_AVAILABLE_NETWORK_LIST; +typedef enum _WLAN_HOSTED_NETWORK_OPCODE +{ + wlan_hosted_network_opcode_connection_settings, + wlan_hosted_network_opcode_security_settings, + wlan_hosted_network_opcode_station_profile, + wlan_hosted_network_opcode_enable +} WLAN_HOSTED_NETWORK_OPCODE, *PWLAN_HOSTED_NETWORK_OPCODE; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Alex Henrie : wlanapi: Add WlanHostedNetworkQuerySecondaryKey stub.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: acb88df0113e1a637ee0b5bd6e645c00ebf92b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb88df0113e1a637ee0b5bd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:49 2021 -0600 wlanapi: Add WlanHostedNetworkQuerySecondaryKey stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 10 ++++++++++ dlls/wlanapi/wlanapi.spec | 1 + include/wlanapi.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index bbe560bcd8d..a865d39f40d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -183,6 +183,16 @@ DWORD WINAPI WlanHostedNetworkQueryProperty(HANDLE handle, WLAN_HOSTED_NETWORK_O return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanHostedNetworkQuerySecondaryKey(HANDLE handle, DWORD *key_size, unsigned char *key, + BOOL *passphrase, BOOL *persistent, + WLAN_HOSTED_NETWORK_REASON *error, void *reserved) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %p) stub\n", + handle, key_size, key, passphrase, persistent, error, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 8931112fcf8..c0ea019ba58 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -15,6 +15,7 @@ @ stub WlanGetProfileList @ stub WlanGetSecuritySettings @ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) +@ stdcall WlanHostedNetworkQuerySecondaryKey(ptr ptr ptr ptr ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/wlanapi.h b/include/wlanapi.h index 10f7cae0f61..80de128a60f 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -195,6 +195,39 @@ typedef enum _WLAN_HOSTED_NETWORK_OPCODE wlan_hosted_network_opcode_enable } WLAN_HOSTED_NETWORK_OPCODE, *PWLAN_HOSTED_NETWORK_OPCODE; +typedef enum _WLAN_HOSTED_NETWORK_REASON +{ + wlan_hosted_network_reason_success = 0, + wlan_hosted_network_reason_unspecified, + wlan_hosted_network_reason_bad_parameters, + wlan_hosted_network_reason_service_shutting_down, + wlan_hosted_network_reason_insufficient_resources, + wlan_hosted_network_reason_elevation_required, + wlan_hosted_network_reason_read_only, + wlan_hosted_network_reason_persistence_failed, + wlan_hosted_network_reason_crypt_error, + wlan_hosted_network_reason_impersonation, + wlan_hosted_network_reason_stop_before_start, + wlan_hosted_network_reason_interface_available, + wlan_hosted_network_reason_interface_unavailable, + wlan_hosted_network_reason_miniport_stopped, + wlan_hosted_network_reason_miniport_started, + wlan_hosted_network_reason_incompatible_connection_started, + wlan_hosted_network_reason_incompatible_connection_stopped, + wlan_hosted_network_reason_user_action, + wlan_hosted_network_reason_client_abort, + wlan_hosted_network_reason_ap_start_failed, + wlan_hosted_network_reason_peer_arrived, + wlan_hosted_network_reason_peer_departed, + wlan_hosted_network_reason_peer_timeout, + wlan_hosted_network_reason_gp_denied, + wlan_hosted_network_reason_service_unavailable, + wlan_hosted_network_reason_device_change, + wlan_hosted_network_reason_properties_change, + wlan_hosted_network_reason_virtual_station_blocking_use, + wlan_hosted_network_reason_service_available_on_virtual_station +} WLAN_HOSTED_NETWORK_REASON, *PWLAN_HOSTED_NETWORK_REASON; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Zebediah Figura : ws2_32: Move gethostname() to the Unix library.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: c1c3691bed231380b3b632a038f7f3cb8d7f5929 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c3691bed231380b3b632a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:43 2021 -0500 ws2_32: Move gethostname() to the Unix library. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 16 +++++++++------- dlls/ws2_32/unixlib.c | 10 ++++++++++ dlls/ws2_32/ws2_32_private.h | 1 + 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index c65e6b9674e..48e7e062d7f 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -913,6 +913,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) { struct WS_hostent *host = NULL; char hostname[100]; + int ret; TRACE( "%s\n", debugstr_a(name) ); @@ -922,9 +923,9 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) return NULL; } - if (gethostname( hostname, 100 ) == -1) + if ((ret = unix_funcs->gethostname( hostname, 100 ))) { - SetLastError( WSAENOBUFS ); + SetLastError( ret ); return NULL; } @@ -973,7 +974,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) int WINAPI WS_gethostname( char *name, int namelen ) { char buf[256]; - int len; + int len, ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -983,9 +984,9 @@ int WINAPI WS_gethostname( char *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) ) != 0) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } @@ -1009,6 +1010,7 @@ int WINAPI WS_gethostname( char *name, int namelen ) int WINAPI GetHostNameW( WCHAR *name, int namelen ) { char buf[256]; + int ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -1018,9 +1020,9 @@ int WINAPI GetHostNameW( WCHAR *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) )) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 2a5fcd1b60d..cde73198c16 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -30,6 +30,7 @@ #include <errno.h> #include <pthread.h> #include <stdarg.h> +#include <unistd.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -789,11 +790,20 @@ static int CDECL unix_gethostbyname( const char *name, struct WS_hostent *const #endif +static int CDECL unix_gethostname( char *name, int len ) +{ + if (!gethostname( name, len )) + return 0; + return errno_from_unix( errno ); +} + + static const struct unix_funcs funcs = { unix_getaddrinfo, unix_gethostbyaddr, unix_gethostbyname, + unix_gethostname, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 38454e1a9ba..973f24a10a9 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -203,6 +203,7 @@ struct unix_funcs int (CDECL *gethostbyaddr)( const void *addr, int len, int family, struct WS(hostent) *host, unsigned int *size ); int (CDECL *gethostbyname)( const char *name, struct WS(hostent) *host, unsigned int *size ); + int (CDECL *gethostname)( char *name, int len ); }; extern const struct unix_funcs *unix_funcs;

1 0

Rémi Bernon : hidclass.sys: Use call_minidriver for IOCTL_HID_GET_INPUT_REPORT.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: a6435b3ddaa653354441c8728695048b8edf7bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6435b3ddaa653354441c872… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:02 2021 +0200 hidclass.sys: Use call_minidriver for IOCTL_HID_GET_INPUT_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 61126571ac6..3a577aabfbd 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -193,18 +193,11 @@ static DWORD CALLBACK hid_device_thread(void *args) { while(1) { - KEVENT event; - - KeInitializeEvent(&event, NotificationEvent, FALSE); - packet->reportBufferLen = report_size; packet->reportId = 0; - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, - NULL, 0, packet, sizeof(*packet), TRUE, &event, &irp_status); - - if (IoCallDriver(ext->u.pdo.parent_fdo, irp) == STATUS_PENDING) - KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, + sizeof(*packet), &irp_status ); if (irp_status.Status == STATUS_SUCCESS) {

1 0

Alexandre Julliard : ntdll: Avoid some duplicate async definitions.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 460755a007cdbb2cd7e702c67cc4d2b9e6049828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460755a007cdbb2cd7e702c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 17:22:35 2021 +0200 ntdll: Avoid some duplicate async definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 21 --------------------- dlls/ntdll/unix/socket.c | 20 -------------------- dlls/ntdll/unix/unix_private.h | 21 +++++++++++++++++++++ 3 files changed, 21 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 45e444d8576..9b9d9e92716 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -135,9 +135,6 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define MAX_DOS_DRIVES 26 -#define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) -#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) - /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH #undef EXT2_IOC_GETFLAGS @@ -4680,24 +4677,6 @@ struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE return io; } -static async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, - PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) -{ - async_data_t async; - async.handle = wine_server_obj_handle( handle ); - async.user = wine_server_client_ptr( user ); - async.iosb = wine_server_client_ptr( io ); - async.event = wine_server_obj_handle( event ); - async.apc = wine_server_client_ptr( apc ); - async.apc_context = wine_server_client_ptr( apc_context ); - return async; -} - -static NTSTATUS wait_async( HANDLE handle, BOOL alertable ) -{ - return NtWaitForSingleObject( handle, alertable, NULL ); -} - /* callback for irp async I/O completion */ static NTSTATUS irp_completion( void *user, ULONG_PTR *info, NTSTATUS status ) { diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index cc8d1426bb5..83b2fe504ab 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -96,26 +96,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); -#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) - -static async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, - PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) -{ - async_data_t async; - async.handle = wine_server_obj_handle( handle ); - async.user = wine_server_client_ptr( user ); - async.iosb = wine_server_client_ptr( io ); - async.event = wine_server_obj_handle( event ); - async.apc = wine_server_client_ptr( apc ); - async.apc_context = wine_server_client_ptr( apc_context ); - return async; -} - -static NTSTATUS wait_async( HANDLE handle, BOOL alertable ) -{ - return NtWaitForSingleObject( handle, alertable, NULL ); -} - union unix_sockaddr { struct sockaddr addr; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a51b04fb3c8..134b50a7f7d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -85,6 +85,9 @@ static const SIZE_T signal_stack_size = 0x10000 - 0x3800; static const SIZE_T kernel_stack_size = 0x20000; static const LONG teb_offset = 0x2000; +#define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) +#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) + /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; @@ -333,6 +336,24 @@ static inline void mutex_unlock( pthread_mutex_t *mutex ) if (!process_exiting) pthread_mutex_unlock( mutex ); } +static inline async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) +{ + async_data_t async; + async.handle = wine_server_obj_handle( handle ); + async.user = wine_server_client_ptr( user ); + async.iosb = wine_server_client_ptr( io ); + async.event = wine_server_obj_handle( event ); + async.apc = wine_server_client_ptr( apc ); + async.apc_context = wine_server_client_ptr( apc_context ); + return async; +} + +static inline NTSTATUS wait_async( HANDLE handle, BOOL alertable ) +{ + return NtWaitForSingleObject( handle, alertable, NULL ); +} + #ifdef _WIN64 typedef TEB32 WOW_TEB; static inline TEB64 *NtCurrentTeb64(void) { return NULL; }

1 0

Arkadiusz Hiler : dinput/tests: Make overlapped format tests more robust.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 5cb70e73f070def227f47bb307c1d5a483fc898c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb70e73f070def227f47bb3… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Aug 5 13:55:29 2021 +0300 dinput/tests: Make overlapped format tests more robust. Both Acquire() and event processing with DirectInput seem to be asynchronous. In most cases we can just keep hammering GetDeviceData() until the event gets processed. Things get pretty racy around Acquire() though. If we fire event right after the device is acquired we can find ourselves in one of the three situations: 1. Event happened after acquiring has completed - the wait will suffice. 2. Event happened before acquiring did any real work - the device will pick up the state as if the event was processed, but there's nothing in GetDeviceData(). Because of that we cannot fail on wait. 3. Event happened somewhere in the middle of acquiring - we ended up both missing the event for GetDeviceData() and we have outdated state. Sending event again will register as if the button was not already pressed. This change covers all three scenarios. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/device.c | 73 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 6307957b6e2..b21a02dfe56 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -343,11 +343,54 @@ static void pump_messages(void) } } +#define wait_for_device_data_and_discard(device) wait_for_device_data_and_discard_(__LINE__, device) +static BOOL wait_for_device_data_and_discard_(int line, IDirectInputDeviceA *device) +{ + DWORD cnt; + HRESULT hr; + DWORD start_time; + + pump_messages(); + + start_time = GetTickCount(); + do + { + cnt = 10; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), NULL, &cnt, 0); + ok_(__FILE__, line)(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceData() failed: %08x\n", hr); + ok_(__FILE__, line)(cnt == 0 || cnt == 1, "Unexpected number of events: %d\n", cnt); + } while (cnt != 1 && (GetTickCount() - start_time < 500)); + + return cnt == 1; +} + +#define acquire_and_wait(device, valid_dik) acquire_and_wait_(__LINE__, device, valid_dik) +static void acquire_and_wait_(int line, IDirectInputDeviceA *device, DWORD valid_dik) +{ + HRESULT hr; + int tries = 2; + + hr = IDirectInputDevice_Acquire(device); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + + do + { + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE, 0); + } while (!wait_for_device_data_and_discard(device) && tries--); + + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); + ok_(__FILE__, line)(wait_for_device_data_and_discard(device), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); +} + void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; struct overlapped_state state; IDirectInputDeviceA *keyboard = NULL; + DIPROPDWORD dp; + + SetFocus(hwnd); hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &keyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -355,15 +398,21 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped slider - default value 0 */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_slider_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 10; + hr = IDirectInputDevice_SetProperty(keyboard, DIPROP_BUFFERSIZE, &dp.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -377,7 +426,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); hr = IDirectInputDevice_Unacquire(keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); @@ -385,15 +435,13 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped pov - default value - 0xFFFFFFFF */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_pov_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -407,7 +455,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); if (keyboard) IUnknown_Release(keyboard); }

1 0

Paul Gofman : jscript: Fix use after free in Object_defineProperty().
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: a439f7202a9c8f06deb43f81d0f8704caf408162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a439f7202a9c8f06deb43f81… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 5 01:28:49 2021 +0300 jscript: Fix use after free in Object_defineProperty(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index c8c0572c839..169b47caea4 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -470,11 +470,15 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl }else { hres = JS_E_OBJECT_EXPECTED; } - jsstr_release(name_str); + if(FAILED(hres)) + { + jsstr_release(name_str); return hres; + } hres = jsdisp_define_property(obj, name, &prop_desc); + jsstr_release(name_str); release_property_descriptor(&prop_desc); if(SUCCEEDED(hres) && r) *r = jsval_obj(jsdisp_addref(obj));

1 0

Hugh McMaster : conhost: Copy font properties to the new screen buffer.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 3bf6b278826f951f5d2004d991170dd8bc7fbede URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf6b278826f951f5d2004d9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 5 13:57:14 2021 +0200 conhost: Copy font properties to the new screen buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 061f09989eb..ecfdd082a81 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -68,6 +68,7 @@ static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) if (screen_buffer->console->active == screen_buffer) screen_buffer->console->active = NULL; wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer->font.face_name ); free( screen_buffer->data ); free( screen_buffer ); } @@ -85,8 +86,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->font.weight = FW_NORMAL; - screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; if (console->active) { @@ -96,15 +95,22 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; screen_buffer->attr = console->active->attr; screen_buffer->popup_attr = console->active->attr; + screen_buffer->font = console->active->font; + + if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; + memcpy( screen_buffer->font.face_name, console->active->font.face_name, + screen_buffer->font.face_len ); } else { - screen_buffer->max_width = width; - screen_buffer->max_height = height; - screen_buffer->win.right = width - 1; - screen_buffer->win.bottom = height - 1; - screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; - screen_buffer->popup_attr = 0xf5; + screen_buffer->max_width = width; + screen_buffer->max_height = height; + screen_buffer->win.right = width - 1; + screen_buffer->win.bottom = height - 1; + screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; + screen_buffer->popup_attr = 0xf5; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))

1 0

Nikolay Sivov : gdi32: Use documented structure layout for EMF-to-WMF embedding records.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 0dab1e414a91fc78f9c5ff7c825bd3eafc33b829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dab1e414a91fc78f9c5ff7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 4 19:08:34 2021 +0300 gdi32: Use documented structure layout for EMF-to-WMF embedding records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/metafile.c | 10 ++++------ dlls/gdi32/ntgdi_private.h | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 25ffcff93bf..b12db98d9e6 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2804,7 +2804,7 @@ static HENHMETAFILE extract_emf_from_comment( const BYTE *buf, UINT mf_size ) chunk = (emf_in_wmf_comment *)(mr->rdParm + 2); if (mr->rdFunction != META_ESCAPE || mr->rdParm[0] != MFCOMMENT) goto done; - if (chunk->magic != WMFC_MAGIC) goto done; + if (chunk->comment_id != WMFC_MAGIC) goto done; if (!emf_bits) { diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index b0428960b50..6b4df5680ba 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1096,13 +1096,11 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; - chunk->magic = WMFC_MAGIC; - chunk->unk04 = 1; - chunk->unk06 = 0; - chunk->unk08 = 0; - chunk->unk0a = 1; + chunk->comment_id = WMFC_MAGIC; + chunk->comment_type = 0x1; + chunk->version = 0x00010000; chunk->checksum = 0; /* We fixup the first chunk's checksum before returning from GetWinMetaFileBits */ - chunk->unk0e = 0; + chunk->flags = 0; chunk->num_chunks = (size + max_chunk_size - 1) / max_chunk_size; chunk->chunk_size = max_chunk_size; chunk->remaining_size = size; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 5f3f88f870c..d256a356d01 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -462,13 +462,11 @@ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; #include <pshpack2.h> typedef struct { - DWORD magic; /* WMFC */ - WORD unk04; /* 1 */ - WORD unk06; /* 0 */ - WORD unk08; /* 0 */ - WORD unk0a; /* 1 */ + DWORD comment_id; /* WMFC */ + DWORD comment_type; /* Always 0x00000001 */ + DWORD version; /* Always 0x00010000 */ WORD checksum; - DWORD unk0e; /* 0 */ + DWORD flags; /* Always 0 */ DWORD num_chunks; DWORD chunk_size; DWORD remaining_size;

1 0

Alex Henrie : ws2_32: Hook up IPV6_HOPLIMIT.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 71d1bb60f10405fd57e1419d90ed41f6246e9d2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d1bb60f10405fd57e1419d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 23:08:38 2021 -0600 ws2_32: Hook up IPV6_HOPLIMIT. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 30 +++++++++++++++++++++++++++++- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 7 ------- include/wine/afd.h | 2 ++ 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 9dc697ea959..9b43de17b29 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -39,7 +39,8 @@ #include <sys/socket.h> #endif #ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> +# define __APPLE_USE_RFC_3542 +# include <netinet/in.h> #endif #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> @@ -452,6 +453,25 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } break; + case IPPROTO_IPV6: + switch (cmsg_unix->cmsg_type) + { +#if defined(IPV6_HOPLIMIT) + case IPV6_HOPLIMIT: + { + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_HOPLIMIT, ptr, &ctlsize, + CMSG_DATA(cmsg_unix), sizeof(INT) ); + if (!ptr) goto error; + break; + } +#endif /* IPV6_HOPLIMIT */ + + default: + FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); + break; + } + break; + default: FIXME("Unhandled message header level %d\n", cmsg_unix->cmsg_level); break; @@ -1882,6 +1902,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, in_buffer, in_size ); +#ifdef IPV6_RECVHOPLIMIT + case IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, in_buffer, in_size ); +#endif + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b52e0d37e90..4babd888473 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -314,6 +314,7 @@ static inline const char *debugstr_sockopt(int level, int optname) { DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_HOPLIMIT); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); @@ -1925,6 +1926,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_DONTFRAG: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_DONTFRAG, optval, optlen ); + case WS_IPV6_HOPLIMIT: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT, optval, optlen ); + case WS_IPV6_MULTICAST_HOPS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); @@ -3131,6 +3135,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DROP_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen ); + case WS_IPV6_HOPLIMIT: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT, optval, optlen ); + case WS_IPV6_MULTICAST_HOPS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3aaacfea281..12c1a859336 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2028,28 +2028,21 @@ static void test_ipv6_cmsg(void) memset(control, 0, sizeof(control)); msg.Control.len = sizeof(control); rc = setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&on, sizeof(on)); -todo_wine ok(!rc, "failed to set IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); state = 0; count = sizeof(state); rc = getsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (char *)&state, (INT *)&count); -todo_wine ok(!rc, "failed to get IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); -todo_wine ok(state == 1, "expected 1, got %u\n", state); rc = send(client, payload, sizeof(payload), 0); ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); -todo_wine ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); -todo_wine ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); -todo_wine ok(header->cmsg_len == sizeof(*header) + sizeof(INT), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); -todo_wine ok(*hop_limit >= 32, "expected at least 32, got %i\n", *hop_limit); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); diff --git a/include/wine/afd.h b/include/wine/afd.h index 1c5f8020c2c..0be0678606d 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -228,6 +228,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES WINE_AFD_IOC(283) #define IOCTL_AFD_WINE_GET_TCP_NODELAY WINE_AFD_IOC(284) #define IOCTL_AFD_WINE_SET_TCP_NODELAY WINE_AFD_IOC(285) +#define IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(286) +#define IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(287) struct afd_create_params {

1 0