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

Rémi Bernon : ntoskrnl.exe/tests: Add some IOCTL_HID_(GET|SET)_POLL_FREQUENCY_MSEC tests.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 80fa6850d62714000580238009b1b92f0f760a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fa6850d627140005802380… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 2 12:25:23 2021 +0200 ntoskrnl.exe/tests: Add some IOCTL_HID_(GET|SET)_POLL_FREQUENCY_MSEC tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 8eaf8ee4888..92c6c4ed3eb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2704,6 +2704,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; + ULONG count, poll_freq, out_len; HANDLE file, async_file; BOOL ret, found = FALSE; OBJECT_ATTRIBUTES attr; @@ -2712,7 +2713,6 @@ static void test_hid_device(DWORD report_id, DWORD polled) NTSTATUS status; unsigned int i; HDEVINFO set; - ULONG count; winetest_push_context("id %d%s", report_id, polled ? " poll" : ""); @@ -2797,6 +2797,37 @@ static void test_hid_device(DWORD report_id, DWORD polled) ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); todo_wine ok(count == 16, "HidD_GetNumInputBuffers returned %u\n", count); + if (polled) + { + out_len = sizeof(ULONG); + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); + ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); + todo_wine ok(poll_freq == 5, "got poll_freq %u, expected 5\n", poll_freq); + + out_len = 0; + poll_freq = 50; + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); + ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(out_len == 0, "got out_len %u, expected 0\n", out_len); + + out_len = sizeof(ULONG); + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); + ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); + ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq); + + out_len = sizeof(ULONG); + SetLastError(0xdeadbeef); + ret = sync_ioctl(async_file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); + ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); + ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq); + } + test_hidp(file, report_id, polled); CloseHandle(async_file);

1 0

Alexandre Julliard : wow64: Add thunks for the system information query syscalls.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: e145a06c46a248e4e7e239935a5cbe9231911cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e145a06c46a248e4e7e23993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 14:54:48 2021 +0200 wow64: Add thunks for the system information query syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 210 ++++++++++++++++++++ dlls/wow64/syscall.h | 3 + dlls/wow64/system.c | 525 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 738 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e145a06c46a248e4e7e2…

1 0

Alexandre Julliard : ntdll: Fix the SYSTEM_CACHE_INFORMATION structure definition.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 37ed43a1717fd7a58b8d6733dc65783bd5c57709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ed43a1717fd7a58b8d6733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 14:53:11 2021 +0200 ntdll: Fix the SYSTEM_CACHE_INFORMATION structure definition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 1 - include/winternl.h | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ccce197206b..8bd8b319241 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -869,7 +869,6 @@ static void test_query_cache(void) ULONG expected; INT i; - /* the large SYSTEM_CACHE_INFORMATION on WIN64 is not documented */ expected = sizeof(SYSTEM_CACHE_INFORMATION); for (i = sizeof(buffer); i>= expected; i--) { diff --git a/include/winternl.h b/include/winternl.h index 68aa4afc176..f42261a9797 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2444,15 +2444,15 @@ typedef struct _SYSTEM_HANDLE_INFORMATION_EX /* System Information Class 0x15 */ typedef struct _SYSTEM_CACHE_INFORMATION { - ULONG CurrentSize; - ULONG PeakSize; + SIZE_T CurrentSize; + SIZE_T PeakSize; ULONG PageFaultCount; - ULONG MinimumWorkingSet; - ULONG MaximumWorkingSet; - ULONG unused[4]; -#ifdef _WIN64 - ULONG unknown64[7]; -#endif + SIZE_T MinimumWorkingSet; + SIZE_T MaximumWorkingSet; + SIZE_T CurrentSizeIncludingTransitionInPages; + SIZE_T PeakSizeIncludingTransitionInPages; + ULONG TransitionRePurposeCount; + ULONG Flags; } SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION; /* System Information Class 0x17 */

1 0

Nikolay Sivov : evr: Added MFIsFormatYUV().
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 68d75bbded45d3aa93ff22fd969ed4ecafe9c97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d75bbded45d3aa93ff22fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 13:00:08 2021 +0300 evr: Added MFIsFormatYUV(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- dlls/evr/main.c | 26 ++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 8aea0a607a8..fd96781e903 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -25,4 +25,4 @@ @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat @ stdcall -import MFInitVideoFormat_RGB(ptr long long long) -@ stub MFIsFormatYUV +@ stdcall MFIsFormatYUV(long) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index e843f15c04f..b5bab74c4f6 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -25,6 +25,7 @@ #include "ole2.h" #include "rpcproxy.h" +#include "d3d9.h" #include "evr_private.h" @@ -206,3 +207,28 @@ HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *p return hr; } + +/*********************************************************************** + * MFIsFormatYUV (evr.@) + */ +BOOL WINAPI MFIsFormatYUV(DWORD format) +{ + TRACE("%s.\n", debugstr_an((char *)&format, 4)); + + switch (format) + { + case D3DFMT_UYVY: + case D3DFMT_YUY2: + case MAKEFOURCC('A','Y','U','V'): + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('N','V','1','1'): + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','2','1','0'): + case MAKEFOURCC('Y','2','1','6'): + return TRUE; + default: + return FALSE; + } +} diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d240ebe4456..01edda7bc9b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2722,6 +2722,47 @@ done: DestroyWindow(window); } +static void test_MFIsFormatYUV(void) +{ + static const DWORD formats[] = + { + D3DFMT_UYVY, + D3DFMT_YUY2, + MAKEFOURCC('A','Y','U','V'), + MAKEFOURCC('I','M','C','1'), + MAKEFOURCC('I','M','C','2'), + MAKEFOURCC('Y','V','1','2'), + MAKEFOURCC('N','V','1','1'), + MAKEFOURCC('N','V','1','2'), + MAKEFOURCC('Y','2','1','0'), + MAKEFOURCC('Y','2','1','6'), + }; + static const DWORD unsupported_formats[] = + { + D3DFMT_A8R8G8B8, + MAKEFOURCC('I','Y','U','V'), + MAKEFOURCC('I','4','2','0'), + MAKEFOURCC('Y','V','Y','U'), + MAKEFOURCC('Y','V','U','9'), + MAKEFOURCC('Y','4','1','0'), + MAKEFOURCC('Y','4','1','6'), + }; + unsigned int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + ret = MFIsFormatYUV(formats[i]); + ok(ret, "Unexpected ret %d, format %s.\n", ret, debugstr_an((char *)&formats[i], 4)); + } + + for (i = 0; i < ARRAY_SIZE(unsupported_formats); ++i) + { + ret = MFIsFormatYUV(unsupported_formats[i]); + ok(!ret, "Unexpected ret %d, format %s.\n", ret, debugstr_an((char *)&unsupported_formats[i], 4)); + } +} + START_TEST(evr) { CoInitialize(NULL); @@ -2746,6 +2787,7 @@ START_TEST(evr) test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); + test_MFIsFormatYUV(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 382210ad9e2..bcb5d26121e 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -558,6 +558,7 @@ HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); +BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD height, DWORD d3dformat);

1 0

Zebediah Figura : ws2_32: Move the setsockopt(TCP_NODELAY) implementation to ntdll.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 8c47f02cb53a261f7836a26ffd1aa88c77f0da16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c47f02cb53a261f7836a26f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 30 18:55:40 2021 -0500 ws2_32: Move the setsockopt(TCP_NODELAY) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 + dlls/ws2_32/socket.c | 185 +---------------------------------------------- include/wine/afd.h | 1 + 3 files changed, 6 insertions(+), 183 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 86e415f5dce..0e52db178d8 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -2002,6 +2002,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_TCP_NODELAY: return do_getsockopt( handle, io, IPPROTO_TCP, TCP_NODELAY, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_TCP_NODELAY: + return do_setsockopt( handle, io, IPPROTO_TCP, TCP_NODELAY, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab1578ebed4..f7996410db1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -31,10 +31,6 @@ #include "ws2_32_private.h" -#if defined(linux) && !defined(IP_UNICAST_IF) -#define IP_UNICAST_IF 50 -#endif - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) # define sipx_network sipx_addr.x_net # define sipx_node sipx_addr.x_host.c_host @@ -428,80 +424,6 @@ static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, in #define MAP_OPTION(opt) { WS_##opt, opt } -static const int ws_sock_map[][2] = -{ - MAP_OPTION( SO_DEBUG ), - MAP_OPTION( SO_ACCEPTCONN ), - MAP_OPTION( SO_REUSEADDR ), - MAP_OPTION( SO_KEEPALIVE ), - MAP_OPTION( SO_DONTROUTE ), - MAP_OPTION( SO_BROADCAST ), - MAP_OPTION( SO_LINGER ), - MAP_OPTION( SO_OOBINLINE ), - MAP_OPTION( SO_SNDBUF ), - MAP_OPTION( SO_RCVBUF ), - MAP_OPTION( SO_ERROR ), - MAP_OPTION( SO_TYPE ), -#ifdef SO_RCVTIMEO - MAP_OPTION( SO_RCVTIMEO ), -#endif -#ifdef SO_SNDTIMEO - MAP_OPTION( SO_SNDTIMEO ), -#endif -}; - -static const int ws_tcp_map[][2] = -{ -#ifdef TCP_NODELAY - MAP_OPTION( TCP_NODELAY ), -#endif -}; - -static const int ws_ip_map[][2] = -{ - MAP_OPTION( IP_MULTICAST_IF ), - MAP_OPTION( IP_MULTICAST_TTL ), - MAP_OPTION( IP_MULTICAST_LOOP ), - MAP_OPTION( IP_ADD_MEMBERSHIP ), - MAP_OPTION( IP_DROP_MEMBERSHIP ), - MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ), - MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ), - MAP_OPTION( IP_BLOCK_SOURCE ), - MAP_OPTION( IP_UNBLOCK_SOURCE ), - MAP_OPTION( IP_OPTIONS ), -#ifdef IP_HDRINCL - MAP_OPTION( IP_HDRINCL ), -#endif - MAP_OPTION( IP_TOS ), - MAP_OPTION( IP_TTL ), -#if defined(IP_PKTINFO) - MAP_OPTION( IP_PKTINFO ), -#elif defined(IP_RECVDSTADDR) - { WS_IP_PKTINFO, IP_RECVDSTADDR }, -#endif -#ifdef IP_UNICAST_IF - MAP_OPTION( IP_UNICAST_IF ), -#endif -}; - -static const int ws_ipv6_map[][2] = -{ -#ifdef IPV6_ADD_MEMBERSHIP - MAP_OPTION( IPV6_ADD_MEMBERSHIP ), -#endif -#ifdef IPV6_DROP_MEMBERSHIP - MAP_OPTION( IPV6_DROP_MEMBERSHIP ), -#endif - MAP_OPTION( IPV6_MULTICAST_IF ), - MAP_OPTION( IPV6_MULTICAST_HOPS ), - MAP_OPTION( IPV6_MULTICAST_LOOP ), - MAP_OPTION( IPV6_UNICAST_HOPS ), - MAP_OPTION( IPV6_V6ONLY ), -#ifdef IPV6_UNICAST_IF - MAP_OPTION( IPV6_UNICAST_IF ), -#endif -}; - static const int ws_socktype_map[][2] = { MAP_OPTION( SOCK_DGRAM ), @@ -578,14 +500,6 @@ UINT sock_get_error( int err ) } } -static UINT wsaErrno(void) -{ - int loc_errno = errno; - WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno)); - - return sock_get_error( loc_errno ); -} - static DWORD NtStatusToWSAError( NTSTATUS status ) { static const struct @@ -743,66 +657,6 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) return TRUE; } -/*********************************************************************** - * convert_sockopt() - * - * Converts socket flags from Windows format. - * Return 1 if converted, 0 if not (error). - */ -static int convert_sockopt(INT *level, INT *optname) -{ - unsigned int i; - switch (*level) - { - case WS_SOL_SOCKET: - *level = SOL_SOCKET; - for(i = 0; i < ARRAY_SIZE(ws_sock_map); i++) { - if( ws_sock_map[i][0] == *optname ) - { - *optname = ws_sock_map[i][1]; - return 1; - } - } - FIXME("Unknown SOL_SOCKET optname 0x%x\n", *optname); - break; - case WS_IPPROTO_TCP: - *level = IPPROTO_TCP; - for(i = 0; i < ARRAY_SIZE(ws_tcp_map); i++) { - if ( ws_tcp_map[i][0] == *optname ) - { - *optname = ws_tcp_map[i][1]; - return 1; - } - } - FIXME("Unknown IPPROTO_TCP optname 0x%x\n", *optname); - break; - case WS_IPPROTO_IP: - *level = IPPROTO_IP; - for(i = 0; i < ARRAY_SIZE(ws_ip_map); i++) { - if (ws_ip_map[i][0] == *optname ) - { - *optname = ws_ip_map[i][1]; - return 1; - } - } - FIXME("Unknown IPPROTO_IP optname 0x%x\n", *optname); - break; - case WS_IPPROTO_IPV6: - *level = IPPROTO_IPV6; - for(i = 0; i < ARRAY_SIZE(ws_ipv6_map); i++) { - if (ws_ipv6_map[i][0] == *optname ) - { - *optname = ws_ipv6_map[i][1]; - return 1; - } - } - FIXME("Unknown IPPROTO_IPV6 optname 0x%x\n", *optname); - break; - default: FIXME("Unimplemented or unknown socket level\n"); - } - return 0; -} - int convert_socktype_w2u(int windowssocktype) { unsigned int i; @@ -3219,9 +3073,6 @@ static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optl int WINAPI WS_setsockopt(SOCKET s, int level, int optname, const char *optval, int optlen) { - int fd; - int woptval; - TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), optlen); @@ -3370,13 +3221,12 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, } break; /* case WS_NSPROTO_IPX */ - /* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */ case WS_IPPROTO_TCP: switch(optname) { case WS_TCP_NODELAY: - convert_sockopt(&level, &optname); - break; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); + default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); return SOCKET_ERROR; @@ -3485,37 +3335,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, SetLastError(WSAEINVAL); return SOCKET_ERROR; } /* end switch(level) */ - - /* avoid endianness issues if argument is a 16-bit int */ - if (optval && optlen < sizeof(int)) - { - woptval= *((const INT16 *) optval); - optval= (char*) &woptval; - woptval&= (1 << optlen * 8) - 1; - optlen=sizeof(int); - } - fd = get_sock_fd( s, 0, NULL ); - if (fd == -1) return SOCKET_ERROR; - - if (setsockopt(fd, level, optname, optval, optlen) == 0) - { -#ifdef __APPLE__ - if (level == SOL_SOCKET && optname == SO_REUSEADDR && - setsockopt(fd, level, SO_REUSEPORT, optval, optlen) != 0) - { - SetLastError(wsaErrno()); - release_sock_fd( s, fd ); - return SOCKET_ERROR; - } -#endif - release_sock_fd( s, fd ); - return 0; - } - TRACE("Setting socket error, %d\n", wsaErrno()); - SetLastError(wsaErrno()); - release_sock_fd( s, fd ); - - return SOCKET_ERROR; } diff --git a/include/wine/afd.h b/include/wine/afd.h index c826351ff4c..1c5f8020c2c 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -227,6 +227,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPX_PTYPE WINE_AFD_IOC(282) #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) struct afd_create_params {

1 0

Alexandre Julliard : ntdll: Make wine_nt_to_unix_file_name() and wine_unix_to_nt_file_name() follow NT syscall conventions.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 9bf46d5ce608a97e264681d2637ff3105e42c363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf46d5ce608a97e264681d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 15:54:05 2021 +0200 ntdll: Make wine_nt_to_unix_file_name() and wine_unix_to_nt_file_name() follow NT syscall conventions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 +++++--- dlls/kernel32/path.c | 8 +++++--- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/path.c | 6 ++++-- dlls/ntdll/unix/file.c | 11 +++++------ include/winternl.h | 6 +++--- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ee14bd25119..54af7562321 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1352,7 +1352,7 @@ static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_p static WCHAR *get_dos_file_name( LPCSTR str ) { WCHAR *buffer; - SIZE_T len = strlen(str) + 1; + ULONG len = strlen(str) + 1; len += 8; /* \??\unix prefix */ if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; @@ -1374,11 +1374,13 @@ static WCHAR *get_dos_file_name( LPCSTR str ) static char *get_unix_file_name( LPCWSTR dosW ) { UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; NTSTATUS status; - SIZE_T size = 256; + ULONG size = 256; char *buffer; if (!RtlDosPathNameToNtPathName_U( dosW, &nt_name, NULL, NULL )) return NULL; + InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); for (;;) { if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) @@ -1386,7 +1388,7 @@ static char *get_unix_file_name( LPCWSTR dosW ) RtlFreeUnicodeString( &nt_name ); return NULL; } - status = wine_nt_to_unix_file_name( &nt_name, buffer, &size, FILE_OPEN_IF ); + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); if (status != STATUS_BUFFER_TOO_SMALL) break; RtlFreeHeap( GetProcessHeap(), 0, buffer ); } diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 023dff826d6..957e9fca01d 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -275,11 +275,13 @@ DWORD /*BOOLEAN*/ WINAPI KERNEL32_Wow64EnableWow64FsRedirection( BOOLEAN enable char * CDECL wine_get_unix_file_name( LPCWSTR dosW ) { UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; NTSTATUS status; - SIZE_T size = 256; + ULONG size = 256; char *buffer; if (!RtlDosPathNameToNtPathName_U( dosW, &nt_name, NULL, NULL )) return NULL; + InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); for (;;) { if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) @@ -287,7 +289,7 @@ char * CDECL wine_get_unix_file_name( LPCWSTR dosW ) RtlFreeUnicodeString( &nt_name ); return NULL; } - status = wine_nt_to_unix_file_name( &nt_name, buffer, &size, FILE_OPEN_IF ); + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); if (status != STATUS_BUFFER_TOO_SMALL) break; HeapFree( GetProcessHeap(), 0, buffer ); } @@ -313,7 +315,7 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) UNICODE_STRING nt_name; NTSTATUS status; WCHAR *buffer; - SIZE_T len = strlen(str) + 1; + ULONG len = strlen(str) + 1; if (str[0] != '/') /* relative path name */ { diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index aad7bd89d14..5ac5a16ed44 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1645,5 +1645,5 @@ @ cdecl wine_get_host_version(ptr ptr) # Filesystem -@ cdecl -syscall wine_nt_to_unix_file_name(ptr ptr ptr long) -@ cdecl -syscall wine_unix_to_nt_file_name(str ptr ptr) +@ stdcall -syscall wine_nt_to_unix_file_name(ptr ptr ptr long) +@ stdcall -syscall wine_unix_to_nt_file_name(str ptr ptr) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 53be23fe4ec..131b0e33683 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -606,17 +606,19 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) { char *unix_name; WCHAR *nt_str; - SIZE_T buflen; + ULONG buflen; NTSTATUS status; UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; nt_str = RtlAllocateHeap( GetProcessHeap(), 0, (wcslen(name) + 9) * sizeof(WCHAR) ); wcscpy( nt_str, L"\\??\\unix" ); wcscat( nt_str, name ); RtlInitUnicodeString( &str, nt_str ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); buflen = 3 * wcslen(name) + 1; unix_name = RtlAllocateHeap( GetProcessHeap(), 0, buflen ); - status = wine_nt_to_unix_file_name( &str, unix_name, &buflen, FILE_OPEN_IF ); + status = wine_nt_to_unix_file_name( &attr, unix_name, &buflen, FILE_OPEN_IF ); if (!status || status == STATUS_NO_SUCH_FILE) { buflen = wcslen(name) + 9; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 10cbd64be70..45e444d8576 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3435,17 +3435,16 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U * element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is * returned, but the unix name is still filled in properly. */ -NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, +NTSTATUS WINAPI wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char *nameA, ULONG *size, UINT disposition ) { char *buffer = NULL; NTSTATUS status; UNICODE_STRING redir; - OBJECT_ATTRIBUTES attr; + OBJECT_ATTRIBUTES new_attr = *attr; - InitializeObjectAttributes( &attr, (UNICODE_STRING *)nameW, OBJ_CASE_INSENSITIVE, 0, NULL ); - get_redirect( &attr, &redir ); - status = nt_to_unix_file_name( &attr, &buffer, disposition ); + get_redirect( &new_attr, &redir ); + status = nt_to_unix_file_name( &new_attr, &buffer, disposition ); if (buffer) { @@ -3576,7 +3575,7 @@ NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) /****************************************************************** * wine_unix_to_nt_file_name */ -NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) +NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULONG *size ) { WCHAR *nt_name = NULL; NTSTATUS status; diff --git a/include/winternl.h b/include/winternl.h index f42261a9797..663d8aceaaa 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4508,9 +4508,9 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); /* Wine internal functions */ -NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, - UINT disposition ); -NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ); +NTSYSAPI NTSTATUS WINAPI wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char *nameA, ULONG *size, + UINT disposition ); +NTSYSAPI NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULONG *size ); /***********************************************************************

1 0

Francois Gouget : ntdll/tests: Add some Nt{Query,Set}TimerResolution() tests.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 6015fee5b21870ddd57477843354173d2e7f9696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6015fee5b21870ddd5747784… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 29 17:24:15 2021 +0200 ntdll/tests: Add some Nt{Query,Set}TimerResolution() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index ee683e9a0aa..5f9c49989d8 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -216,6 +216,115 @@ static void test_RtlQueryPerformanceCounter(void) } #endif +#define CHECK_CURRENT_TIMER(expected) \ + do { \ + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution failed %x\n", status); \ + todo_wine ok(cur2 == (expected), "expected new timer resolution %u, got %u\n", (expected), cur2); \ + min2 = min + 10; \ + cur2 = min2 + 1; \ + max2 = cur2 + 1; \ + status = NtQueryTimerResolution(&min2, &max2, &cur2); \ + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed %x\n", status); \ + todo_wine ok(min2 == min, "NtQueryTimerResolution() expected min=%u, got %u\n", min, min2); \ + todo_wine ok(max2 == max, "NtQueryTimerResolution() expected max=%u, got %u\n", max, max2); \ + todo_wine ok(cur2 == expected, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", (expected), cur2); \ + } while (0) + +static void test_TimerResolution(void) +{ + ULONG min, max, cur, min2, max2, cur2, set; + NTSTATUS status; + + status = NtQueryTimerResolution(NULL, &max, &cur); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtQueryTimerResolution(NULL,,) success\n"); + + status = NtQueryTimerResolution(&min, NULL, &cur); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtQueryTimerResolution(,NULL,) success\n"); + + status = NtQueryTimerResolution(&min, &max, NULL); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtQueryTimerResolution(,,NULL) success\n"); + + min = 212121; + cur = min + 1; + max = cur + 1; + status = NtQueryTimerResolution(&min, &max, &cur); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + todo_wine ok(min == 156250 /* 1/64s HPET */ || min == 156001 /* RTC */, + "unexpected minimum timer resolution %u\n", min); + ok(0 < max, "invalid maximum timer resolution, should be 0 < %u\n", max); + todo_wine ok(max <= cur && cur <= min, "invalid timer resolutions, should be %u <= %u <= %u\n", max, cur, min); + + status = NtSetTimerResolution(0, FALSE, NULL); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution(,,NULL) success\n"); + + /* Nothing happens if that pointer is not good */ + status = NtSetTimerResolution(cur - 1, TRUE, NULL); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution() failed %x\n", status); + + min2 = min + 1; + cur2 = min2 + 1; + max2 = cur2 + 1; + status = NtQueryTimerResolution(&min2, &max2, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + todo_wine ok(min2 == min, "NtQueryTimerResolution() expected min=%u, got %u\n", min, min2); + todo_wine ok(max2 == max, "NtQueryTimerResolution() expected max=%u, got %u\n", max, max2); + todo_wine ok(cur2 == cur, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", cur, cur2); + + /* 'fails' until the first valid timer resolution request */ + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_TIMER_RESOLUTION_NOT_SET, "NtSetTimerResolution() failed %x\n", status); + /* and returns the current timer resolution */ + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", cur, cur2); + + + cur2 = 7654321; + status = NtSetTimerResolution(max - 1, TRUE, &cur2); + CHECK_CURRENT_TIMER(max); + + /* Rescinds our timer resolution request */ + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + /* -> the timer resolution was reset to its initial value */ + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", min, cur2); + + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_TIMER_RESOLUTION_NOT_SET, "NtSetTimerResolution() failed %x\n", status); + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", cur, cur2); + + cur2 = 7654321; + status = NtSetTimerResolution(min + 1, TRUE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + /* This works because: + * - Either cur is the minimum (15.6 ms) resolution already, i.e. the + * closest valid value 'set' is rounded to. + * - Or some other application requested a higher timer resolution, cur, + * and any attempt to lower the resolution has no effect until that + * request is rescinded (hopefully after this test is done). + */ + CHECK_CURRENT_TIMER(cur); + + /* The requested resolution may (win7) or may not be rounded */ + cur2 = 7654321; + set = max < cur ? cur - 1 : max; + status = NtSetTimerResolution(set, TRUE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + todo_wine ok(cur2 <= set, "expected new timer resolution %u <= %u\n", cur2, set); + trace("timer resolution: %u(max) <= %u(cur) <= %u(prev) <= %u(min)\n", max, cur2, cur, min); + + cur2 = 7654321; + status = NtSetTimerResolution(cur + 1, TRUE, &cur2); + CHECK_CURRENT_TIMER(cur); /* see min + 1 test */ + + /* Cleanup by rescinding the last request */ + cur2 = 7654321; + status = NtSetTimerResolution(0, FALSE, &cur2); + todo_wine ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); + todo_wine ok(cur2 == cur, "expected requested timer resolution %u, got %u\n", set, cur2); +} + static void test_RtlQueryTimeZoneInformation(void) { RTL_DYNAMIC_TIME_ZONE_INFORMATION tzinfo, tzinfo2; @@ -379,4 +488,5 @@ START_TEST(time) #if defined(__i386__) || defined(__x86_64__) test_RtlQueryPerformanceCounter(); #endif + test_TimerResolution(); }

1 0

Francois Gouget : ntdll: Improve the Nt{Query,Set}TimerResolution() stubs.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: d84e84c12650ce7c6d22ba3105f57b0115030e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d84e84c12650ce7c6d22ba31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 29 17:24:17 2021 +0200 ntdll: Improve the Nt{Query,Set}TimerResolution() stubs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/sync.c | 8 +++--- dlls/ntdll/tests/time.c | 60 ++++++++++++++++++++++---------------------- dlls/ntdll/unix/sync.c | 28 ++++++++++++++++++--- 3 files changed, 58 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d84e84c12650ce7c6d22…

1 0

Hugh McMaster : conhost: Remove duplicate lines from current_config().
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 30edd84929e4defabb31c6e4b193822dacf95455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30edd84929e4defabb31c6e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 2 22:20:20 2021 +1000 conhost: Remove duplicate lines from current_config(). 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/window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 92970b44f0e..3af80383958 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1925,8 +1925,6 @@ static void current_config( struct console *console, struct console_config *conf config->popup_attr = console->active->popup_attr; memcpy( config->color_map, console->active->color_map, sizeof(config->color_map) ); - config->win_height = console->active->win.bottom - console->active->win.top + 1; - config->win_width = console->active->win.right - console->active->win.left + 1; config->cell_width = console->active->font.width; config->cell_height = console->active->font.height; config->font_weight = console->active->font.weight;

1 0

Hugh McMaster : conhost: Set screen buffer height to 150 characters in registry defaults.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: cfb0d152ebe9d18feb990d5396061d8e1217c931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfb0d152ebe9d18feb990d53… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 2 22:20:21 2021 +1000 conhost: Set screen buffer height to 150 characters in registry defaults. This matches the defaults in create_screen_buffer(). 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/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 3af80383958..4033eefa313 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -256,7 +256,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) config->menu_mask = 0; config->popup_attr = 0xF5; config->quick_edit = 0; - config->sb_height = 25; + config->sb_height = 150; config->sb_width = 80; config->attr = 0x000F; config->win_height = 25;

1 0