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

Nikolay Sivov : mf/tests: Add some tests for EVR stream services.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: d3b9ff2efd49addf2a4a19d7505b0170dcfc81b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3b9ff2efd49addf2a4a19d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 20:37:53 2021 +0300 mf/tests: Add some tests for EVR stream services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c8c7e0569cc..4b894df1de0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4273,6 +4273,7 @@ static void test_evr(void) check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, FALSE); check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); @@ -4423,7 +4424,15 @@ static void test_evr(void) /* Stream uses an allocator. */ check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, TRUE); check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); - +todo_wine { + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(stream_sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); +} hr = MFGetService((IUnknown *)stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

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

Aug. 2, 2021

Module: wine Branch: master Commit: b1669e3a4ca084d3bf314ecda52d7259dbe042b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1669e3a4ca084d3bf314ecd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 30 18:55:39 2021 -0500 ws2_32: Move the getsockopt(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 | 19 ++++++------------- include/wine/afd.h | 1 + 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 7fc41ff9f1a..86e415f5dce 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1999,6 +1999,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } #endif + case IOCTL_AFD_WINE_GET_TCP_NODELAY: + return do_getsockopt( handle, io, IPPROTO_TCP, TCP_NODELAY, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7da975167ee..ab1578ebed4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1880,7 +1880,6 @@ static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) INT WINAPI WS_getsockopt(SOCKET s, INT level, INT optname, char *optval, INT *optlen) { - int fd; INT ret = 0; TRACE("(socket %04lx, %s, optval %s, optlen %p (%d))\n", s, @@ -2186,19 +2185,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, switch(optname) { case WS_TCP_NODELAY: - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - release_sock_fd( s, fd ); - return ret; + return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_NODELAY, optval, optlen ); + + default: + FIXME( "unrecognized TCP option %#x\n", optname ); + SetLastError( WSAENOPROTOOPT ); + return -1; } - FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); - return SOCKET_ERROR; case WS_IPPROTO_IP: switch(optname) diff --git a/include/wine/afd.h b/include/wine/afd.h index 6e601f60095..c826351ff4c 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -226,6 +226,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPX_PTYPE WINE_AFD_IOC(281) #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) struct afd_create_params {

1 0

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

Aug. 2, 2021

Module: wine Branch: master Commit: 3e09e2506899107eb832f173ad4356421ae3c3e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e09e2506899107eb832f173… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 30 18:55:38 2021 -0500 ws2_32: Move the getsockopt(IRLMP_ENUMDEVICES) 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 | 43 ++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 60 +----------------------------------------------- include/wine/afd.h | 1 + 3 files changed, 45 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index a63209e6ae6..7fc41ff9f1a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1956,6 +1956,49 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } #endif +#ifdef HAS_IRDA +#define MAX_IRDA_DEVICES 10 + case IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES: + { + char buffer[offsetof( struct irda_device_list, dev[MAX_IRDA_DEVICES] )]; + struct irda_device_list *unix_list = (struct irda_device_list *)buffer; + socklen_t len = sizeof(buffer); + DEVICELIST *ws_list = out_buffer; + int fd, needs_close = FALSE; + NTSTATUS status; + unsigned int i; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, SOL_IRLMP, IRLMP_ENUMDEVICES, buffer, &len ); + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + + io->Information = offsetof( DEVICELIST, unix_list->len ); + if (out_size < io->Information) + return STATUS_BUFFER_TOO_SMALL; + + TRACE( "IRLMP_ENUMDEVICES: got %u devices:\n", unix_list->len ); + ws_list->numDevice = unix_list->len; + for (i = 0; i < unix_list->len; ++i) + { + const struct irda_device_info *unix_dev = &unix_list->dev[i]; + IRDA_DEVICE_INFO *ws_dev = &ws_list->Device[i]; + + TRACE( "saddr %#08x, daddr %#08x, info %s, hints 0x%02x%02x\n", + unix_dev->saddr, unix_dev->daddr, unix_dev->info, unix_dev->hints[0], unix_dev->hints[1] ); + memcpy( ws_dev->irdaDeviceID, &unix_dev->daddr, sizeof(unix_dev->daddr) ); + memcpy( ws_dev->irdaDeviceName, unix_dev->info, sizeof(unix_dev->info) ); + ws_dev->irdaDeviceHints1 = unix_dev->hints[0]; + ws_dev->irdaDeviceHints2 = unix_dev->hints[1]; + ws_dev->irdaCharSet = unix_dev->charset; + } + return STATUS_SUCCESS; + } +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index da45734803c..7da975167ee 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2169,75 +2169,17 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, }/* end switch(optname) */ } /* end case WS_NSPROTO_IPX */ -#ifdef HAS_IRDA -#define MAX_IRDA_DEVICES 10 - case WS_SOL_IRLMP: switch(optname) { case WS_IRLMP_ENUMDEVICES: - { - char buf[sizeof(struct irda_device_list) + - (MAX_IRDA_DEVICES - 1) * sizeof(struct irda_device_info)]; - int res; - socklen_t len = sizeof(buf); + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES, optval, optlen ); - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - res = getsockopt( fd, SOL_IRLMP, IRLMP_ENUMDEVICES, buf, &len ); - release_sock_fd( s, fd ); - if (res < 0) - { - SetLastError(wsaErrno()); - return SOCKET_ERROR; - } - else - { - struct irda_device_list *src = (struct irda_device_list *)buf; - DEVICELIST *dst = (DEVICELIST *)optval; - INT needed = sizeof(DEVICELIST); - unsigned int i; - - if (src->len > 0) - needed += (src->len - 1) * sizeof(IRDA_DEVICE_INFO); - if (*optlen < needed) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - *optlen = needed; - TRACE("IRLMP_ENUMDEVICES: %d devices found:\n", src->len); - dst->numDevice = src->len; - for (i = 0; i < src->len; i++) - { - TRACE("saddr = %08x, daddr = %08x, info = %s, hints = %02x%02x\n", - src->dev[i].saddr, src->dev[i].daddr, - src->dev[i].info, src->dev[i].hints[0], - src->dev[i].hints[1]); - memcpy( dst->Device[i].irdaDeviceID, - &src->dev[i].daddr, - sizeof(dst->Device[i].irdaDeviceID) ) ; - memcpy( dst->Device[i].irdaDeviceName, - src->dev[i].info, - sizeof(dst->Device[i].irdaDeviceName) ) ; - memcpy( &dst->Device[i].irdaDeviceHints1, - &src->dev[i].hints[0], - sizeof(dst->Device[i].irdaDeviceHints1) ) ; - memcpy( &dst->Device[i].irdaDeviceHints2, - &src->dev[i].hints[1], - sizeof(dst->Device[i].irdaDeviceHints2) ) ; - dst->Device[i].irdaCharSet = src->dev[i].charset; - } - return 0; - } - } default: FIXME("IrDA optname:0x%x\n", optname); return SOCKET_ERROR; } break; /* case WS_SOL_IRLMP */ -#undef MAX_IRDA_DEVICES -#endif /* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */ case WS_IPPROTO_TCP: diff --git a/include/wine/afd.h b/include/wine/afd.h index 4db6525a7d8..6e601f60095 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -225,6 +225,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_V6ONLY WINE_AFD_IOC(280) #define IOCTL_AFD_WINE_GET_IPX_PTYPE WINE_AFD_IOC(281) #define IOCTL_AFD_WINE_SET_IPX_PTYPE WINE_AFD_IOC(282) +#define IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES WINE_AFD_IOC(283) struct afd_create_params {

1 0

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

Aug. 2, 2021

Module: wine Branch: master Commit: ce1c5ffcaec30af65551a5783bd500f6d02163f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce1c5ffcaec30af65551a578… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 30 18:55:36 2021 -0500 ws2_32: Move the getsockopt(IPX_PTYPE) 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 | 22 ++++++++++++++++++++++ dlls/ws2_32/socket.c | 27 ++++----------------------- include/wine/afd.h | 1 + 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 24090c1a17b..c2cbaff24e1 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1922,6 +1922,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; } +#ifdef SOL_IPX + case IOCTL_AFD_WINE_GET_IPX_PTYPE: + return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size ); +#elif defined(SO_DEFAULT_HEADERS) + case IOCTL_AFD_WINE_GET_IPX_PTYPE: + { + int fd, needs_close = FALSE; + struct ipx value; + socklen_t len = sizeof(value); + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, 0, SO_DEFAULT_HEADERS, &value, &len ); + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + *(DWORD *)out_buffer = value.ipx_pt; + return STATUS_SUCCESS; + } +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a28c25ec697..71b5e9a8658 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2158,7 +2158,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; } /* end switch(optname) */ }/* end case WS_SOL_SOCKET */ -#ifdef HAS_IPX + case WS_NSPROTO_IPX: { struct WS_sockaddr_ipx addr; @@ -2166,27 +2166,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, int namelen; switch(optname) { - case WS_IPX_PTYPE: - if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; -#ifdef SOL_IPX - if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (socklen_t *)optlen) == -1) - { - ret = SOCKET_ERROR; - } -#else - { - struct ipx val; - socklen_t len=sizeof(struct ipx); - if(getsockopt(fd, 0, SO_DEFAULT_HEADERS, &val, &len) == -1 ) - ret = SOCKET_ERROR; - else - *optval = (int)val.ipx_pt; - } -#endif - TRACE("ptype: %d (fd: %d)\n", *(int*)optval, fd); - release_sock_fd( s, fd ); - return ret; - case WS_IPX_ADDRESS: /* * On a Win2000 system with one network card there are usually @@ -2217,12 +2196,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, *(int*)optval = 1; /* As noted under IPX_ADDRESS we have just one card. */ return 0; + case WS_IPX_PTYPE: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPX_PTYPE, optval, optlen ); + default: FIXME("IPX optname:%x\n", optname); return SOCKET_ERROR; }/* end switch(optname) */ } /* end case WS_NSPROTO_IPX */ -#endif #ifdef HAS_IRDA #define MAX_IRDA_DEVICES 10 diff --git a/include/wine/afd.h b/include/wine/afd.h index 9a1edb1fda6..6630a6402fc 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -223,6 +223,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF WINE_AFD_IOC(278) #define IOCTL_AFD_WINE_GET_IPV6_V6ONLY WINE_AFD_IOC(279) #define IOCTL_AFD_WINE_SET_IPV6_V6ONLY WINE_AFD_IOC(280) +#define IOCTL_AFD_WINE_GET_IPX_PTYPE WINE_AFD_IOC(281) struct afd_create_params {

1 0

Jacek Caban : gdi32: Use ntgdi names for GetDeviceGammaRamp and SetDeviceGammaRamp.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 42851bd13b8611f45ef88391bac04f0b038e715d URL: https://source.winehq.org/git/wine.git/?a=commit;h=42851bd13b8611f45ef88391… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 10:03:17 2021 +0200 gdi32: Use ntgdi names for GetDeviceGammaRamp and SetDeviceGammaRamp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 20 ++++++++++---------- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1faf83b3201..afa4247cf9e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1081,17 +1081,17 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) } /*********************************************************************** - * GetDeviceGammaRamp (GDI32.@) + * NtGdiGetDeviceGammaRamp (win32u.@) */ -BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) +BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hDC ); + DC *dc = get_dc_ptr( hdc ); - TRACE("%p, %p\n", hDC, ptr); + TRACE("%p, %p\n", hdc, ptr); if( dc ) { - if (GetObjectType( hDC ) != OBJ_MEMDC) + if (GetObjectType( hdc ) != OBJ_MEMDC) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); @@ -1181,17 +1181,17 @@ static BOOL check_gamma_ramps(void *ptr) } /*********************************************************************** - * SetDeviceGammaRamp (GDI32.@) + * NtGdiSetDeviceGammaRamp (win32u.@) */ -BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) +BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hDC ); + DC *dc = get_dc_ptr( hdc ); - TRACE("%p, %p\n", hDC, ptr); + TRACE( "%p, %p\n", hdc, ptr ); if( dc ) { - if (GetObjectType( hDC ) != OBJ_MEMDC) + if (GetObjectType( hdc ) != OBJ_MEMDC) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6b1d0952bf2..5995396abe7 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -275,7 +275,7 @@ @ stdcall GetDIBColorTable(long long long ptr) @ stdcall GetDIBits(long long long long ptr ptr long) @ stdcall GetDeviceCaps(long long) -@ stdcall GetDeviceGammaRamp(long ptr) +@ stdcall GetDeviceGammaRamp(long ptr) NtGdiGetDeviceGammaRamp @ stub GetETM # @ stub GetEUDCTimeStamp # @ stub GetEUDCTimeStampExW @@ -488,7 +488,7 @@ @ stdcall SetDIBColorTable(long long long ptr) @ stdcall SetDIBits(long long long long ptr ptr long) @ stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) -@ stdcall SetDeviceGammaRamp(long ptr) +@ stdcall SetDeviceGammaRamp(long ptr) NtGdiSetDeviceGammaRamp @ stdcall SetEnhMetaFileBits(long ptr) @ stub SetFontEnumeration @ stdcall SetGraphicsMode(long long)

1 0

Alexandre Julliard : wow64: Add a thunk for the wine_server_call() syscall.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 8fed1c68098f521492d2bd28679745733f22238e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fed1c68098f521492d2bd28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 16:11:21 2021 +0200 wow64: Add a thunk for the wine_server_call() syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 20 ++++++++++++++++++++ dlls/wow64/syscall.c | 25 +++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + 3 files changed, 46 insertions(+) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 419575c2ede..dd5814f431b 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -21,6 +21,8 @@ #ifndef __WOW64_STRUCT32_H #define __WOW64_STRUCT32_H +#include "wine/server.h" + typedef struct { ULONG Length; @@ -633,4 +635,22 @@ typedef struct SYSTEM_THREAD_INFORMATION32 ti[1]; } SYSTEM_PROCESS_INFORMATION32; +struct __server_iovec32 +{ + ULONG ptr; + data_size_t size; +}; + +struct __server_request_info32 +{ + union + { + union generic_request req; + union generic_reply reply; + } u; + unsigned int data_count; + ULONG reply_data; + struct __server_iovec32 data[__SERVER_MAX_DATA]; +}; + #endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 29d358595b0..2fd9f309b1b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -242,6 +242,31 @@ NTSTATUS WINAPI wow64_NtSetDefaultUILanguage( UINT *args ) } +/********************************************************************** + * wow64_wine_server_call + */ +NTSTATUS WINAPI wow64_wine_server_call( UINT *args ) +{ + struct __server_request_info32 *req32 = get_ptr( &args ); + + unsigned int i; + NTSTATUS status; + struct __server_request_info req; + + req.u.req = req32->u.req; + req.data_count = req32->data_count; + for (i = 0; i < req.data_count; i++) + { + req.data[i].ptr = ULongToPtr( req32->data[i].ptr ); + req.data[i].size = req32->data[i].size; + } + req.reply_data = ULongToPtr( req32->reply_data ); + status = wine_server_call( &req ); + req32->u.reply = req.u.reply; + return status; +} + + /********************************************************************** * get_syscall_num */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 765456a8ab7..782a7a78c18 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -235,6 +235,7 @@ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ + SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_unix_to_nt_file_name ) #endif /* __WOW64_SYSCALL_H */

1 0

Nikolay Sivov : include: Add IMFVideoProcessorControl3 definition.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 1c2b728ae34bbbb05cac4d9cc5384261588db746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2b728ae34bbbb05cac4d9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 13:05:52 2021 +0300 include: Add IMFVideoProcessorControl3 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 5b16c08bb90..62e0ca3025a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1231,6 +1231,48 @@ interface IMFVideoProcessorControl2 : IMFVideoProcessorControl ); } +typedef enum _MFVideoSphericalFormat +{ + MFVideoSphericalFormat_Unsupported, + MFVideoSphericalFormat_Equirectangular, +} MFVideoSphericalFormat; + +typedef enum MFVideoSphericalProjectionMode +{ + MFVideoSphericalProjectionMode_Spherical, + MFVideoSphericalProjectionMode_Flat, +} MFVideoSphericalProjectionMode; + +[ + object, + uuid(2424b3f2-eb23-40f1-91aa-74bddeea0883), + local +] +interface IMFVideoProcessorControl3 : IMFVideoProcessorControl2 +{ + HRESULT GetNaturalOutputType( + [out] IMFMediaType **media_type + ); + + HRESULT EnableSphericalVideoProcessing( + [in] BOOL enable, + [in] MFVideoSphericalFormat format, + [in] MFVideoSphericalProjectionMode projection_mode + ); + + HRESULT SetSphericalVideoProperties( + [in] float x, + [in] float y, + [in] float z, + [in] float w, + [in] float fov + ); + + HRESULT SetOutputDevice( + [in] IUnknown *output_device + ); +} + [ object, uuid(2347d60b-3fb5-480c-8803-8df3adcd3ef0),

1 0

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

Aug. 2, 2021

Module: wine Branch: master Commit: 55c761540dc7cf96904fabc407e439c03b0eb15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=55c761540dc7cf96904fabc4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 30 18:55:37 2021 -0500 ws2_32: Move the setsockopt(IPX_PTYPE) 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 | 12 ++++++++++++ dlls/ws2_32/socket.c | 40 +--------------------------------------- include/wine/afd.h | 1 + 3 files changed, 14 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c2cbaff24e1..a63209e6ae6 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1925,6 +1925,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef SOL_IPX case IOCTL_AFD_WINE_GET_IPX_PTYPE: return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPX_PTYPE: + return do_setsockopt( handle, io, SOL_IPX, IPX_TYPE, in_buffer, in_size ); #elif defined(SO_DEFAULT_HEADERS) case IOCTL_AFD_WINE_GET_IPX_PTYPE: { @@ -1942,6 +1945,15 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc *(DWORD *)out_buffer = value.ipx_pt; return STATUS_SUCCESS; } + + case IOCTL_AFD_WINE_SET_IPX_PTYPE: + { + struct ipx value = {0}; + + /* FIXME: should we retrieve SO_DEFAULT_HEADERS first and modify it? */ + value.ipx_pt = *(DWORD *)in_buffer; + return do_setsockopt( handle, io, 0, SO_DEFAULT_HEADERS, &value, sizeof(value) ); + } #endif default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 71b5e9a8658..da45734803c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -825,42 +825,6 @@ convert_socktype_u2w(int unixsocktype) { return -1; } -static int set_ipx_packettype(int sock, int ptype) -{ -#ifdef HAS_IPX - int fd = get_sock_fd( sock, 0, NULL ), ret = 0; - TRACE("trying to set IPX_PTYPE: %d (fd: %d)\n", ptype, fd); - - if (fd == -1) return SOCKET_ERROR; - - /* We try to set the ipx type on ipx socket level. */ -#ifdef SOL_IPX - if(setsockopt(fd, SOL_IPX, IPX_TYPE, &ptype, sizeof(ptype)) == -1) - { - ERR("IPX: could not set ipx option type; expect weird behaviour\n"); - ret = SOCKET_ERROR; - } -#else - { - struct ipx val; - /* Should we retrieve val using a getsockopt call and then - * set the modified one? */ - val.ipx_pt = ptype; - setsockopt(fd, 0, SO_DEFAULT_HEADERS, &val, sizeof(struct ipx)); - } -#endif - release_sock_fd( sock, fd ); - return ret; -#else - WARN("IPX support is not enabled, can't set packet type\n"); - return SOCKET_ERROR; -#endif -} - -/* ----------------------------------- API ----- - * - * Init / cleanup / error checking. - */ /*********************************************************************** * WSAStartup (WS2_32.115) @@ -3453,12 +3417,11 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, } break; /* case WS_SOL_SOCKET */ -#ifdef HAS_IPX case WS_NSPROTO_IPX: switch(optname) { case WS_IPX_PTYPE: - return set_ipx_packettype(s, *(int*)optval); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPX_PTYPE, optval, optlen ); case WS_IPX_FILTERPTYPE: /* Sets the receive filter packet type, at the moment we don't support it */ @@ -3471,7 +3434,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return SOCKET_ERROR; } break; /* case WS_NSPROTO_IPX */ -#endif /* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */ case WS_IPPROTO_TCP: diff --git a/include/wine/afd.h b/include/wine/afd.h index 6630a6402fc..4db6525a7d8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -224,6 +224,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_V6ONLY WINE_AFD_IOC(279) #define IOCTL_AFD_WINE_SET_IPV6_V6ONLY WINE_AFD_IOC(280) #define IOCTL_AFD_WINE_GET_IPX_PTYPE WINE_AFD_IOC(281) +#define IOCTL_AFD_WINE_SET_IPX_PTYPE WINE_AFD_IOC(282) struct afd_create_params {

1 0

Alexandre Julliard : wow64: Add thunks for the wine_nt_to_unix_file_name and wine_unix_to_nt_file_name syscalls.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 580ad3898be1dc4f69134218118d561fec35f210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580ad3898be1dc4f69134218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 15:57:08 2021 +0200 wow64: Add thunks for the wine_nt_to_unix_file_name and wine_unix_to_nt_file_name syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 29 +++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 +++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 05c8a97de0c..dab9827165f 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -856,3 +856,32 @@ NTSTATUS WINAPI wow64_NtWriteFileGather( UINT *args ) put_iosb( io32, &io ); return status; } + + +/********************************************************************** + * wow64_wine_nt_to_unix_file_name + */ +NTSTATUS WINAPI wow64_wine_nt_to_unix_file_name( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + char *nameA = get_ptr( &args ); + ULONG *size = get_ptr( &args ); + UINT disposition = get_ulong( &args ); + + struct object_attr64 attr; + + return wine_nt_to_unix_file_name( objattr_32to64_redirect( &attr, attr32 ), nameA, size, disposition ); +} + + +/********************************************************************** + * wow64_wine_unix_to_nt_file_name + */ +NTSTATUS WINAPI wow64_wine_unix_to_nt_file_name( UINT *args ) +{ + const char *name = get_ptr( &args ); + WCHAR *buffer = get_ptr( &args ); + ULONG *size = get_ptr( &args ); + + return wine_unix_to_nt_file_name( name, buffer, size ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 161acb83188..765456a8ab7 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -233,6 +233,8 @@ SYSCALL_ENTRY( NtWriteFile ) \ SYSCALL_ENTRY( NtWriteFileGather ) \ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ - SYSCALL_ENTRY( NtYieldExecution ) + SYSCALL_ENTRY( NtYieldExecution ) \ + SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ + SYSCALL_ENTRY( wine_unix_to_nt_file_name ) #endif /* __WOW64_SYSCALL_H */

1 0

Francois Gouget : kernelbase/tests: Fix the Sleep() test for non-default timer resolutions.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: e9e8561fa8127a354390cc49442d0b029c693014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e8561fa8127a354390cc49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 29 17:24:12 2021 +0200 kernelbase/tests: Fix the Sleep() test for non-default timer resolutions. Also defend against timer resolution changes during the test. Reduce the test duration a bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51533 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/sync.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 50ce62602b0..8127b4238b9 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -19,10 +19,14 @@ */ #include <stdarg.h> +#include <stdlib.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> -#include <stdlib.h> #include <winerror.h> +#include <winternl.h> #include "wine/test.h" @@ -176,7 +180,9 @@ static void test_Sleep(void) { LARGE_INTEGER frequency; LARGE_INTEGER t1, t2; - double elapsed_time; + double elapsed_time, min, max; + ULONG dummy, r1, r2; + NTSTATUS status; BOOL ret; int i; @@ -186,15 +192,30 @@ static void test_Sleep(void) ret = QueryPerformanceCounter(&t1); ok(ret, "QueryPerformanceCounter failed\n"); - for (i = 0; i < 100; i++) { + /* Get the timer resolution before... */ + r1 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r1); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + + for (i = 0; i < 50; i++) { Sleep(1); } ret = QueryPerformanceCounter(&t2); ok(ret, "QueryPerformanceCounter failed\n"); + /* ...and after in case some other process changes it during this test */ + r2 = 156250; + status = NtQueryTimerResolution(&dummy, &dummy, &r2); + todo_wine ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed (%x)\n", status); + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; - todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 4.0, "got %f\n", elapsed_time); + min = 50.0 * (r1 < r2 ? r1 : r2) / 10000000.0; + max = 50.0 * (r1 < r2 ? r2 : r1) / 10000000.0; + + /* Add an extra 1s to account for potential scheduling delays */ + todo_wine ok(0.9 * min <= elapsed_time && elapsed_time <= 1.0 + max, + "got %f, expected between %f and %f\n", elapsed_time, min, max); } START_TEST(sync)

1 0