August 2020 - Wine-Devel - list.winehq.org

[PATCH 1/7] include: Update _XSTATE_CONFIGURATION structure definition.
by Paul Gofman May 27, 2021

May 27, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/ddk/wdm.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9fcb1387012..b8bb7bd971f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1207,16 +1207,24 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE typedef struct _XSTATE_FEATURE { - ULONG Offset; - ULONG Size; + ULONG Offset; + ULONG Size; } XSTATE_FEATURE, *PXSTATE_FEATURE; typedef struct _XSTATE_CONFIGURATION { - ULONG64 EnabledFeatures; - ULONG Size; - ULONG OptimizedSave:1; - XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledFeatures; + ULONG64 EnabledVolatileFeatures; + ULONG Size; + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + + ULONG64 EnabledSupervisorFeatures; + ULONG64 AlignedFeatures; + ULONG AllFeatureSize; + ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledUserVisibleSupervisorFeatures; } XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; typedef struct _KUSER_SHARED_DATA { -- 2.26.2

3 16

[PATCH] user32: Keep toplevel minimized windows offscreen if they're already.
by Gabriel Ivăncescu Feb. 4, 2021

Feb. 4, 2021

Some applications (e.g. Lego Worlds) use (-32000,-32000) to determine whether a window is minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 8 +++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 843da89..19a0db2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11593,6 +11593,58 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + wp.flags = WPF_SETMINPOSITION; + wp.showCmd = SW_NORMAL; + wp.ptMinPosition.x = wp.ptMinPosition.y = 100; + wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100; + wp.rcNormalPosition = orig; + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + ShowWindow(hwnd, SW_MINIMIZE); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + ret = SetWindowPos(hwnd, NULL, 100, 100, 151, 151, SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "failed to set window pos, error %u\n", GetLastError()); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); + ok(rect.left == -32000 && rect.top == -32000, "got window rect %s\n", wine_dbgstr_rect(&rect)); + + ShowWindow(hwnd, SW_SHOWNORMAL); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); + ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b45b74c..3ccd939 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1688,6 +1688,14 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC } if (!(pWinpos->flags & SWP_NOMOVE)) { + /* If the window is toplevel minimized off-screen, force keep it there */ + if ((wndPtr->dwStyle & WS_MINIMIZE) && + wndPtr->window_rect.left <= -32000 && wndPtr->window_rect.top <= -32000 && + (!wndPtr->parent || wndPtr->parent == GetDesktopWindow())) + { + pWinpos->x = -32000; + pWinpos->y = -32000; + } new_window_rect->left = pWinpos->x; new_window_rect->top = pWinpos->y; new_window_rect->right += pWinpos->x - old_window_rect->left; -- 2.21.0

3 3

Re: widl: Set name return value (passed by reference) in the alias case alias case in get_user_type.
by Alexandre Julliard Nov. 22, 2020

Nov. 22, 2020

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > So, I admit I don't really know this code, but looking at it (triggered > by a warning issued by GCC development versions), I noticed that this > variable passed by reference is not initialized here. It's initialized when we return a type, and it doesn't need to be initialized on NULL return. The code is correct, but you could probably set the variable to NULL in the caller to silence the warning. -- Alexandre Julliard julliard(a)winehq.org

2 1

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

[PATCH] xaudio2: Avoid redefining several F3DAudio related constants.
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

I noticed a bunch of compiler warnings like the following issued by GCC 10: In file included from ../xaudio2_7/x3daudio.c:29: .../include/F3DAudio.h:69: warning: "SPEAKER_2POINT1" redefined ../../include/x3daudio.h:127: note: this is the location of the previous definition Our own include/x3daudio.h tries to prevent that via #ifndef _SPEAKER_POSITIONS_ #define _SPEAKER_POSITIONS_ However, current it is included *before* the system provided F3DAudio.h, so this safety net falls short. Fixed thusly by changing the order of these two include files so that the system provided one comes first. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/xaudio2_7/x3daudio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index 240cd5c101..6f16ba3470 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -20,15 +20,13 @@ #include "config.h" #include <stdarg.h> - +#include <F3DAudio.h> #include "windef.h" #include "winbase.h" #include "x3daudio.h" #include "wine/debug.h" -#include <F3DAudio.h> - #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #endif -- 2.25.0

2 4

Broken again (was: [PATCH] ntdll: Replicate InterlockedCompareExchange64 to the Unix library.)
by Gerald Pfeifer Sept. 27, 2020

Sept. 27, 2020

Sadly, after being fine for those two months since commit 0c14b1a962573ee125940f2008c646befe597226 Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 00:38:02 2020 +0200 ntdll: Replicate InterlockedCompareExchange64 to the Unix library. This fixes the build on FreeBSD/i386 with GCC 9. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> went in, this is now broken again with GCC 9. It broke between Wine 5.15 and 5.16. Alexandre, does the following ring a bell? gcc9 -c -o enum_jobs.o enum_jobs.c -I. -I../../include -I../../include/msvcrt -D __WINESRC__ -D_UCRT -D_REENTRANT -fno-PIC -fasynchronous-unwind-tables -fno-builtin -fshort-wchar -Wall -pipe -fcf-protection=none -fno-stack-protector -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wno-packed-not-aligned -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith -Wlogical-op -fno-omit-frame-pointer -isystem /home/gerald/11-i386/include -O2 -pipe -fstack-protector-strong -Wl,-rpath=/home/gerald/11-i386/lib/gcc9 -isystem /home/gerald/11-i386/include -fno-strict-aliasing unix/server.o: In function `remove_fd_from_cache': server.c:(.text+0x2d0): undefined reference to `RtlInterlockedCompareExchange64' unix/server.o: In function `add_fd_to_cache': server.c:(.text+0x5da): undefined reference to `RtlInterlockedCompareExchange64' unix/server.o: In function `server_get_unix_fd': server.c:(.text+0xae3): undefined reference to `RtlInterlockedCompareExchange64' server.c:(.text+0xc00): undefined reference to `RtlInterlockedCompareExchange64' collect2: error: ld returned 1 exit status winegcc: /home/gerald/11-i386/bin/gcc9 failed gmake[2]: *** [Makefile:1454: ntdll.so] Error 2 Gerald On Sun, 7 Jun 2020, Gerald Pfeifer wrote: > Between Wine 5.9 and 5.10 many ntdll functions moved to the Unix > library. Make the implementation of InterlockedCompareExchange64 via > RtlInterlockedCompareExchange64 available there as well for targets > without __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8. > > This fixes the build on FreeBSD/i386 with GCC 9. > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/ntdll/unix/unix_private.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h > index a422fd825e..a0485b411d 100644 > --- a/dlls/ntdll/unix/unix_private.h > +++ b/dlls/ntdll/unix/unix_private.h > @@ -23,6 +23,10 @@ > > #include "unixlib.h" > > +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 > +#define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp) > +#endif > + > struct debug_info > { > unsigned int str_pos; /* current position in strings buffer */ >

2 4

[PATCH] oleaut32: ITypeInfo_ReleaseFuncDesc_Proxy handle NULL parameter
by Alistair Leslie-Hughes Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/usrmarshal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 163b48f6f4..07dabde174 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1905,6 +1905,9 @@ void CALLBACK ITypeInfo_ReleaseFuncDesc_Proxy( SHORT param; TRACE("(%p, %p)\n", This, pFuncDesc); + if (!pFuncDesc) + return; + for(param = 0; param < pFuncDesc->cParams; param++) free_embedded_elemdesc(pFuncDesc->lprgelemdescParam + param); if(param) -- 2.28.0

3 2

[PATCH 1/3] server: Report named pipe device files as type "File".
by Zebediah Figura Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/om.c | 10 ++++------ server/named_pipe.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 29c777e91e6..916ac8cbe76 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1227,9 +1227,8 @@ static BOOL compare_unicode_string( const UNICODE_STRING *string, const WCHAR *e && !wcsnicmp( string->Buffer, expect, string->Length / sizeof(WCHAR) ); } -#define test_object_type(a,b) _test_object_type(__LINE__,a,b,FALSE) -#define test_object_type_todo(a,b) _test_object_type(__LINE__,a,b,TRUE) -static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name, BOOL todo ) +#define test_object_type(a,b) _test_object_type(__LINE__,a,b) +static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name ) { char buffer[1024]; UNICODE_STRING *str = (UNICODE_STRING *)buffer, expect; @@ -1243,8 +1242,7 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length, "unexpected len %u\n", len ); - todo_wine_if (todo) - ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); + ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); } #define test_object_name(a,b,c) _test_object_name(__LINE__,a,b,c) @@ -1463,7 +1461,7 @@ static void test_query_object(void) ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); test_object_name( handle, L"\\Device\\NamedPipe", TRUE ); - test_object_type_todo( handle, L"File" ); + test_object_type( handle, L"File" ); test_file_info( handle ); pNtClose( handle ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b259abb8de4..e7e5436c0e5 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -273,7 +273,7 @@ static const struct object_ops named_pipe_device_file_ops = { sizeof(struct named_pipe_device_file), /* size */ named_pipe_device_file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ -- 2.27.0

3 4

[PATCH v2 1/3] ws2_32: Extend WS_EnterSingleProtocolW
by Robin Ebert Sept. 12, 2020

Sept. 12, 2020

WS_EnterSingleProtocol needs to handle addressfamily as the WSAPROTOCOL_INFOW struct differs among different addressfamilies. This renders the old WS_EnumProtocols implementation useless resulting in missing WS_EnumProtocolsA and WS_EnumProtocolsW implementations. Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- v2: Report not supported error in WS_EnumProtocols --- dlls/ws2_32/socket.c | 225 +++++++++++++++++++++++++++++-------------- 1 file changed, 151 insertions(+), 74 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4d2afa94..c67527d0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2158,23 +2158,20 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR } /***************************************************************************** - * WS_EnterSingleProtocolW [internal] + * WS_AF_INET_EnterSingleProtocolW [internal] * * enters the protocol information of one given protocol into the given * buffer. * + * HANDLES AF_INET + * * RETURNS * TRUE if a protocol was entered into the buffer. * - * BUGS - * - only implemented for IPX, SPX, SPXII, TCP, UDP - * - there is no check that the operating system supports the returned - * protocols */ -static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +static BOOL WS_AF_INET_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) { - memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); - info->iProtocol = protocol; + info->iAddressFamily = WS_AF_INET; switch (protocol) { @@ -2187,7 +2184,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x10; info->iSocketType = WS_SOCK_STREAM; @@ -2203,7 +2199,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x10; info->iSocketType = WS_SOCK_DGRAM; @@ -2211,6 +2206,85 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) strcpyW( info->szProtocol, NameUdpW ); break; + default: + FIXME("unknown Protocol <0x%08x>\n", protocol); + return FALSE; + } + return TRUE; +} +/***************************************************************************** + * WS_AF_INET6_EnterSingleProtocolW [internal] + * + * enters the protocol information of one given protocol into the given + * buffer. + * + * HANDLES AF_INET6 + * + * RETURNS + * TRUE if a protocol was entered into the buffer. + * + */ +static BOOL WS_AF_INET6_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +{ + info->iAddressFamily = WS_AF_INET6; + + switch (protocol) + { + case WS_IPPROTO_TCP: + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | + XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | + XP1_GUARANTEED_DELIVERY; + info->ProviderId = ProviderIdIP; + info->dwCatalogEntryId = 0x3ec; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; + info->ProtocolChain.ChainLen = 1; + info->iVersion = 2; + info->iMaxSockAddr = 0x1c; + info->iMinSockAddr = 0x1c; + info->iSocketType = WS_SOCK_STREAM; + strcpyW( info->szProtocol, NameTcpW ); + break; + + case WS_IPPROTO_UDP: + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | + XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | + XP1_CONNECTIONLESS; + info->ProviderId = ProviderIdIP; + info->dwCatalogEntryId = 0x3ea; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; + info->ProtocolChain.ChainLen = 1; + info->iVersion = 2; + info->iMaxSockAddr = 0x1c; + info->iMinSockAddr = 0x1c; + info->iSocketType = WS_SOCK_DGRAM; + info->dwMessageSize = 0xffbb; + strcpyW( info->szProtocol, NameUdpW ); + break; + + default: + FIXME("unknown Protocol <0x%08x>\n", protocol); + return FALSE; + } + return TRUE; +} +/***************************************************************************** + * WS_AF_IPX_EnterSingleProtocolW [internal] + * + * enters the protocol information of one given protocol into the given + * buffer. + * + * HANDLES AF_IPX + * + * RETURNS + * TRUE if a protocol was entered into the buffer. + * + */ +static BOOL WS_AF_IPX_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +{ + info->iAddressFamily = WS_AF_IPX; + + switch (protocol) + { case WS_NSPROTO_IPX: info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | @@ -2220,7 +2294,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; info->iSocketType = WS_SOCK_DGRAM; @@ -2238,7 +2311,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; info->iSocketType = WS_SOCK_SEQPACKET; @@ -2255,7 +2327,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; info->iSocketType = WS_SOCK_SEQPACKET; @@ -2269,85 +2340,94 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) } return TRUE; } - /***************************************************************************** - * WS_EnterSingleProtocolA [internal] + * WS_EnterSingleProtocolW [internal] * - * see function WS_EnterSingleProtocolW + * enters the protocol information of one given protocol into the given + * buffer. * + * RETURNS + * count of returned WSAPROTOCOL_INFOW structs + * + * BUGS + * - only implemented for IPX, SPX, SPXII, TCP, UDP + * - there is no check that the operating system supports the returned + * protocols */ -static BOOL WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) +static INT WS_EnterSingleProtocolW( INT address_family, INT protocol, WSAPROTOCOL_INFOW info[], INT* info_size ) { - WSAPROTOCOL_INFOW infow; - INT ret; - memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); + if(address_family) + { + memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); + info->iProtocol = protocol; - ret = WS_EnterSingleProtocolW( protocol, &infow ); - if (ret) + switch (address_family) + { + case WS_AF_INET: + WS_AF_INET_EnterSingleProtocolW(protocol, info); + break; + case WS_AF_INET6: + WS_AF_INET6_EnterSingleProtocolW(protocol, info); + break; + case WS_AF_IPX: + WS_AF_IPX_EnterSingleProtocolW(protocol, info); + break; + default: + FIXME("unhandled addressfamily <0x%08x>\n", address_family); + return 0; + } + return 1; + } + else { - /* convert the structure from W to A */ - memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); - WideCharToMultiByte( CP_ACP, 0, infow.szProtocol, -1, - info->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); + FIXME("Unspecified address_family not implemented yet\n"); + return 0; } - - return ret; } -static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +/***************************************************************************** + * WS_EnterSingleProtocolA [internal] + * + * see function WS_EnterSingleProtocolW + * + */ +static INT WS_EnterSingleProtocolA( INT addressfamily, INT protocol, WSAPROTOCOL_INFOA* info , INT* info_size) { - INT i = 0, items = 0; - DWORD size = 0; - union _info - { - LPWSAPROTOCOL_INFOA a; - LPWSAPROTOCOL_INFOW w; - } info; - info.w = buffer; + WSAPROTOCOL_INFOW* infow; + INT ret, i; - if (!protocols) protocols = valid_protocols; + infow = HeapAlloc(GetProcessHeap(), 0, sizeof(WSAPROTOCOL_INFOW) * *info_size); - while (protocols[i]) + ret = WS_EnterSingleProtocolW( addressfamily, protocol, infow, info_size ); + if (ret) { - if(supported_protocol(protocols[i++])) - items++; + for(i = 0; i < ret; i++) + { + /* convert the structure from W to A */ + memcpy( &info[i], &infow[i], FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); + WideCharToMultiByte( CP_ACP, 0, infow[i].szProtocol, -1, + info[i].szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); + } } - size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); - - TRACE("unicode %d, protocols %p, buffer %p, length %p %d, items %d, required %d\n", - unicode, protocols, buffer, len, len ? *len : 0, items, size); + HeapFree(GetProcessHeap(), 0, infow); - if (*len < size || !buffer) - { - *len = size; - SetLastError(WSAENOBUFS); - return SOCKET_ERROR; - } + return ret; +} - for (i = items = 0; protocols[i]; i++) - { - if (!supported_protocol(protocols[i])) continue; - if (unicode) - { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] )) - items++; - } - else - { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] )) - items++; - } - } - return items; +static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +{ + FIXME("Not implemented\n"); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; } static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { NTSTATUS status; int address_family; - int socket_type; int protocol; + int buffer_size = 1; *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); memset(buffer, 0, *size); @@ -2359,7 +2439,6 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i if (!status) { address_family = convert_af_u2w(reply->family); - socket_type = convert_socktype_u2w(reply->type); protocol = convert_proto_u2w(reply->protocol); } } @@ -2373,12 +2452,9 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i } if (unicode) - WS_EnterSingleProtocolW( protocol, buffer); + WS_EnterSingleProtocolW( address_family, protocol, buffer, &buffer_size); else - WS_EnterSingleProtocolA( protocol, (WSAPROTOCOL_INFOA *)buffer); - buffer->iAddressFamily = address_family; - buffer->iSocketType = socket_type; - buffer->iProtocol = protocol; + WS_EnterSingleProtocolA( address_family, protocol, (WSAPROTOCOL_INFOA *)buffer, &buffer_size); return TRUE; } @@ -7578,6 +7654,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, { int autoproto = protocol; WSAPROTOCOL_INFOW infow; + int infow_size = 1; /* default to the first valid protocol */ if (!autoproto) @@ -7585,7 +7662,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, else if(IS_IPX_PROTO(autoproto)) autoproto = WS_NSPROTO_IPX; - if (WS_EnterSingleProtocolW(autoproto, &infow)) + if (WS_EnterSingleProtocolW(af, autoproto, &infow, &infow_size)) { type = infow.iSocketType; -- 2.20.1

4 5

[PATCH] comctl32/listview: Add Get/SetSelectedColumn() support
by Eric Wheeler Sept. 8, 2020

Sept. 8, 2020

In some programs using listview with columns, the first column of the listbox will select but is not editable and the remaining columns do not respond to clicking. When clicking one of the checkboxes in the column nothing happens and you get these two errors in the console: 0118:err:listview:LISTVIEW_WindowProc unknown msg 108c wp=00000004 lp=00000000 0118:err:listview:LISTVIEW_WindowProc unknown msg 10ae wp=00000000 lp=00000000 We find that include/commctrl.h defines these as follows: #define LVM_SETSELECTEDCOLUMN (LVM_FIRST + 140) /* 108c is 0x1000 + 140 */ #define LVM_GETSELECTEDCOLUMN (LVM_FIRST + 174) /* 10ae is 0x1000 + 174 */ Changes: * These defines were removed from the TODO seciton * An INT was added to the LISTVIEW_INFO structure to track the selected column * LISTVIEW_WindowProc() case statements were added to handle the mapping. Fixes: https://forum.winehq.org/viewtopic.php?f=8&t=34287 Signed-off-by: Eric Wheeler <wine(a)linux.ewheeler.net> diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dba16d1..92e8faa 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -99,7 +99,6 @@ * -- LVM_GETINSERTMARKRECT * -- LVM_GETNUMBEROFWORKAREAS * -- LVM_GETOUTLINECOLOR, LVM_SETOUTLINECOLOR - * -- LVM_GETSELECTEDCOLUMN, LVM_SETSELECTEDCOLUMN * -- LVM_GETISEARCHSTRINGW, LVM_GETISEARCHSTRINGA * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO @@ -248,6 +247,7 @@ typedef struct tagLISTVIEW_INFO /* columns */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ BOOL colRectsDirty; /* trigger column rectangles requery from header */ + INT iSelectedColumn; /* for use with Set/GetSelectedColumn() */ /* item metrics */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ @@ -11465,7 +11465,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_GETOUTLINECOLOR: */ - /* case LVM_GETSELECTEDCOLUMN: */ + case LVM_GETSELECTEDCOLUMN: + return infoPtr->iSelectedColumn; case LVM_GETSELECTEDCOUNT: return LISTVIEW_GetSelectedCount(infoPtr); @@ -11638,7 +11639,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SETOUTLINECOLOR: */ - /* case LVM_SETSELECTEDCOLUMN: */ + case LVM_SETSELECTEDCOLUMN: + infoPtr->iSelectedColumn = (INT)wParam; + return TRUE; case LVM_SETSELECTIONMARK: return LISTVIEW_SetSelectionMark(infoPtr, (INT)lParam);

2 8