September 2020 - Wine-Devel

[PATCH 2/2] wbemprox: Report 4095MiB video memory if it overflows.
by Hans Leidekker Sept. 30, 2020

Sept. 30, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> That's what Windows do apparently. Anything with more than 4GiB of VRAM would report less otherwise, confusing the VRAM detection in some games. The Mafia III launcher is trying to open a warning popup with a 8GiB VRAM GPU for instance, as the reported value overflows to 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 43268221936..8daa55eaeb4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3878,8 +3878,9 @@ static enum fill_status fill_videocontroller( struct table *table, const struct hr = IDXGIAdapter_GetDesc( adapter, &desc ); if (SUCCEEDED(hr)) { - vidmem = desc.DedicatedVideoMemory; - name = desc.Description; + if (desc.DedicatedVideoMemory > UINT_MAX) vidmem = 0xfff00000; + else vidmem = desc.DedicatedVideoMemory; + name = desc.Description; } done: -- 2.20.1

1 0

[PATCH 1/2] wbemprox: Set variant type to VT_NULL if BSTR is NULL.
by Hans Leidekker Sept. 30, 2020

Sept. 30, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Mafia III launcher crashes when querying video controllers when it passes the NULL __PATH value through COM marshalling. v2: Don't read the AdapterRAM property, it returns differently on w2008. v3: Fix all BSTR system properties. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 12 ++++++++---- dlls/wbemprox/tests/query.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6ac5ad5b770..525381d88d2 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -946,22 +946,24 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, L"__NAMESPACE" )) + if (!wcsicmp( name, L"__NAMESPACE" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = view->proplist ? NULL : build_namespace(); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, L"__PATH" )) + if (!wcsicmp( name, L"__PATH" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = build_path( view, table_index, result_index, name ); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; @@ -976,22 +978,24 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, L"__RELPATH" )) + if (!wcsicmp( name, L"__RELPATH" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = build_relpath( view, table_index, result_index, name ); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, L"__SERVER" )) + if (!wcsicmp( name, L"__SERVER" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = view->proplist ? NULL : build_servername(); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 74fdfaa9bc8..d1ce42d64cb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1414,6 +1414,13 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); + check_property( obj, L"__PATH", VT_BSTR, CIM_STRING ); + check_property( obj, L"__PROPERTY_COUNT", VT_I4, CIM_SINT32 ); + check_property( obj, L"__RELPATH", VT_BSTR, CIM_STRING ); + check_property( obj, L"__SERVER", VT_BSTR, CIM_STRING ); check_property( obj, L"AdapterCompatibility", VT_BSTR, CIM_STRING ); check_property( obj, L"Availability", VT_I4, CIM_UINT16 ); check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 ); @@ -1432,6 +1439,31 @@ static void test_Win32_VideoController( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT AdapterRAM FROM Win32_VideoController" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_VideoController not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__NAMESPACE", VT_NULL, CIM_STRING ); + check_property( obj, L"__PATH", VT_NULL, CIM_STRING ); + check_property( obj, L"__PROPERTY_COUNT", VT_I4, CIM_SINT32 ); + check_property( obj, L"__RELPATH", VT_NULL, CIM_STRING ); + check_property( obj, L"__SERVER", VT_NULL, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.20.1

1 0

[PATCH] dxgi/tests: Check that the last adapter is always WARP.
by Rémi Bernon Sept. 30, 2020

Sept. 30, 2020

Some games specifically ignore the last adapter from the adapter list, as it's always WARP on Windows. This makes them fail to detect GPUs correctly on Wine, as they drop one of the reported adapters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I also have a patch to add a WARP adapter to the list in wined3d, but I think there's some multi-adapter work under way that will conflict, so I'll wait before sending it. dlls/dxgi/tests/dxgi.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ce1aee5ee3b..589364271b1 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5325,11 +5325,14 @@ static void test_multi_adapter(void) { unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; + DXGI_ADAPTER_DESC1 adapter_desc1; + DXGI_ADAPTER_DESC adapter_desc; DXGI_OUTPUT_DESC old_output_desc, output_desc; DISPLAY_DEVICEW display_device; MONITORINFO monitor_info; DEVMODEW old_mode, mode; IDXGIFactory *factory; + IDXGIAdapter1 *adapter1; IDXGIAdapter *adapter; IDXGIOutput *output; HMONITOR monitor; @@ -5530,6 +5533,35 @@ static void test_multi_adapter(void) IDXGIAdapter_Release(adapter); } + todo_wine ok(adapter_index >= 2, "Unexpected adapter count %u\n", adapter_index); + + hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); + ok(SUCCEEDED(hr), "Failed to get last adapter %u, hr %#x.\n", adapter_index - 1, hr); + + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + + todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), + "Unexpected name for last adapter %s\n", wine_dbgstr_w(adapter_desc.Description)); + ok(adapter_desc.SubSysId == 0x0000, "Expected SubSysId 0x0000, got %#x\n", adapter_desc.SubSysId); + todo_wine ok(adapter_desc.VendorId == 0x1414, "Expected VendorId 0x1414, got %#x\n", adapter_desc.VendorId); + todo_wine ok(adapter_desc.DeviceId == 0x008c, "Expected DeviceId 0x008c, got %#x\n", adapter_desc.DeviceId); + ok(adapter_desc.Revision == 0x0000, "Expected Revision 0x0000, got %#x\n", adapter_desc.Revision); + todo_wine ok(adapter_desc.DedicatedVideoMemory == 0, "Expected DedicatedVideoMemory 0, got %#lx\n", adapter_desc.DedicatedVideoMemory); + ok(adapter_desc.DedicatedSystemMemory == 0, "Expected DedicatedSystemMemory 0, got %#lx\n", adapter_desc.DedicatedSystemMemory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (hr != E_NOINTERFACE) + { + hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); + ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr); + todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, "Expected flags DXGI_ADAPTER_FLAG_SOFTWARE, got %#x\n", adapter_desc1.Flags); + IDXGIAdapter1_Release(adapter1); + } + + IDXGIAdapter_Release(adapter); + IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS); -- 2.28.0

3 3

[PATCH 1/4] ws2_32: Pass Win32 socket types to the server.
by Zebediah Figura Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 39 +--------------- server/sock.c | 105 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 102 insertions(+), 42 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 36215cc6eff..d7802cc9cd8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7601,41 +7601,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, /* convert the socket family, type and protocol */ unixaf = convert_af_w2u(af); unixtype = convert_socktype_w2u(type); - protocol = convert_proto_w2u(protocol); - - /* filter invalid parameters */ - if (protocol < 0) - { - /* the type could not be converted */ - if (type && unixtype < 0) - { - err = WSAESOCKTNOSUPPORT; - goto done; - } - - err = WSAEPROTONOSUPPORT; - goto done; - } - if (unixaf < 0) - { - /* both family and protocol can't be invalid */ - if (protocol <= 0) - { - err = WSAEINVAL; - goto done; - } - - /* family could not be converted and neither socket type */ - if (unixtype < 0 && af >= 0) - { - - err = WSAESOCKTNOSUPPORT; - goto done; - } - - err = WSAEAFNOSUPPORT; - goto done; - } RtlInitUnicodeString(&string, afdW); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); @@ -7647,8 +7612,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return INVALID_SOCKET; } - create_params.family = unixaf; - create_params.type = unixtype; + create_params.family = af; + create_params.type = type; create_params.protocol = protocol; create_params.flags = flags & ~(WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, diff --git a/server/sock.c b/server/sock.c index 3bc4780f943..f0227c59067 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,6 +30,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif #ifdef HAVE_POLL_H # include <poll.h> #endif @@ -51,6 +54,29 @@ # include <linux/rtnetlink.h> #endif +#ifdef HAVE_NETIPX_IPX_H +# include <netipx/ipx.h> +#elif defined(HAVE_LINUX_IPX_H) +# ifdef HAVE_ASM_TYPES_H +# include <asm/types.h> +# endif +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif +# include <linux/ipx.h> +#endif +#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) +# define HAS_IPX +#endif + +#ifdef HAVE_LINUX_IRDA_H +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif +# include <linux/irda.h> +# define HAS_IRDA +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -58,6 +84,7 @@ #include "winerror.h" #define USE_WS_PREFIX #include "winsock2.h" +#include "wsipx.h" #include "wine/afd.h" #include "process.h" @@ -638,12 +665,80 @@ static struct sock *create_socket(void) return sock; } +static int get_unix_family( int family ) +{ + switch (family) + { + case WS_AF_INET: return AF_INET; + case WS_AF_INET6: return AF_INET6; +#ifdef HAS_IPX + case WS_AF_IPX: return AF_IPX; +#endif +#ifdef AF_IRDA + case WS_AF_IRDA: return AF_IRDA; +#endif + case WS_AF_UNSPEC: return AF_UNSPEC; + default: return -1; + } +} + +static int get_unix_type( int type ) +{ + switch (type) + { + case WS_SOCK_DGRAM: return SOCK_DGRAM; + case WS_SOCK_RAW: return SOCK_RAW; + case WS_SOCK_STREAM: return SOCK_STREAM; + default: return -1; + } +} + +static int get_unix_protocol( int protocol ) +{ + if (protocol >= WS_NSPROTO_IPX && protocol <= WS_NSPROTO_IPX + 255) + return protocol; + + switch (protocol) + { + case WS_IPPROTO_ICMP: return IPPROTO_ICMP; + case WS_IPPROTO_IGMP: return IPPROTO_IGMP; + case WS_IPPROTO_IP: return IPPROTO_IP; + case WS_IPPROTO_IPIP: return IPPROTO_IPIP; + case WS_IPPROTO_IPV6: return IPPROTO_IPV6; + case WS_IPPROTO_RAW: return IPPROTO_RAW; + case WS_IPPROTO_TCP: return IPPROTO_TCP; + case WS_IPPROTO_UDP: return IPPROTO_UDP; + default: return -1; + } +} + static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { unsigned int options = 0; - int sockfd; + int sockfd, unix_type, unix_family, unix_protocol; + + unix_family = get_unix_family( family ); + unix_type = get_unix_type( type ); + unix_protocol = get_unix_protocol( protocol ); + + if (unix_protocol < 0) + { + if (type && unix_type < 0) + set_win32_error( WSAESOCKTNOSUPPORT ); + else + set_win32_error( WSAEPROTONOSUPPORT ); + return -1; + } + if (unix_family < 0) + { + if (family >= 0 && unix_type < 0) + set_win32_error( WSAESOCKTNOSUPPORT ); + else + set_win32_error( WSAEAFNOSUPPORT ); + return -1; + } - sockfd = socket( family, type, protocol ); + sockfd = socket( unix_family, unix_type, unix_protocol ); if (sockfd == -1) { if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT ); @@ -653,9 +748,9 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; - sock->proto = protocol; - sock->type = type; - sock->family = family; + sock->proto = unix_protocol; + sock->type = unix_type; + sock->family = unix_family; if (sock->fd) { -- 2.28.0

2 4

[PATCH 1/2] wbemprox: Set variant type to VT_NULL if BSTR is NULL.
by Rémi Bernon Sept. 30, 2020

Sept. 30, 2020

Mafia III launcher crashes when querying video controllers after passing the NULL __PATH value through COM marshalling. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wbemprox/query.c | 1 + dlls/wbemprox/tests/query.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6ac5ad5b770..ad7150e5401 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -962,6 +962,7 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = build_path( view, table_index, result_index, name ); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 74fdfaa9bc8..357b0a8b8e5 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1414,6 +1414,8 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__PATH", VT_BSTR, CIM_STRING ); check_property( obj, L"AdapterCompatibility", VT_BSTR, CIM_STRING ); check_property( obj, L"Availability", VT_I4, CIM_UINT16 ); check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 ); @@ -1432,6 +1434,27 @@ static void test_Win32_VideoController( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT AdapterRAM FROM Win32_VideoController" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_VideoController not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__PATH", VT_NULL, CIM_STRING ); + check_property( obj, L"AdapterRAM", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.28.0

2 5

[PATCH] xactengine3_7: Explicity copy the XACT_RUNTIME_PARAMETERS members
by Alistair Leslie-Hughes Sept. 30, 2020

Sept. 30, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49911 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index e6e4dbb7b35..09e7871c171 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -780,7 +780,16 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pParams); - memcpy(&params, pParams, sizeof(FACTRuntimeParameters)); + memset(&params, 0, sizeof(FACTRuntimeParameters)); + /* Explicitly copy to the FAudio structure as the packing is wrong when using 64 bits */ + params.lookAheadTime = pParams->lookAheadTime; + params.pGlobalSettingsBuffer = pParams->pGlobalSettingsBuffer; + params.globalSettingsBufferSize = pParams->globalSettingsBufferSize; + params.globalSettingsFlags = pParams->globalSettingsFlags; + params.globalSettingsAllocAttributes = pParams->globalSettingsAllocAttributes; + params.pRendererID = (int16_t*)pParams->pRendererID; + params.pXAudio2 = NULL; + params.pMasteringVoice = NULL; /* FIXME: pXAudio2 and pMasteringVoice are pointers to * IXAudio2/IXAudio2MasteringVoice objects. FACT wants pointers to @@ -793,12 +802,10 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, * -flibit */ if (pParams->pXAudio2 != NULL){ - FIXME("pXAudio2 parameter not supported! Falling back to NULL\n"); - params.pXAudio2 = NULL; + FIXME("pXAudio2 parameter not supported!\n"); if (pParams->pMasteringVoice != NULL){ - FIXME("pXAudio2 parameter not supported! Falling back to NULL\n"); - params.pMasteringVoice = NULL; + FIXME("pXAudio2 parameter not supported!\n"); } } -- 2.28.0

1 0

[PATCH 1/5] kernel32/tests: Fix fiber test errors on newer Win10.
by Paul Gofman Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/fiber.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 7501165dc87..db2bd0923b7 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -217,13 +217,12 @@ static void test_FiberLocalStorage(void) SetLastError( 0xdeadbeef ); ret = pFlsSetValue( 128, (void*) 0x217 ); - ok( !ret, "setting fls index 128 (out of bounds) succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, + ok( ret || GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); val = pFlsGetValue( 128 ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_PARAMETER || val == (void *)0x217, "getting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); /* Test index 0 */ @@ -276,7 +275,7 @@ static void test_FiberLocalStorage(void) SetLastError( 0xdeadbeef ); val = pFlsGetValue( fls_2 ); - ok( val == NULL, "fls index %u wrong value %p\n", fls, val ); + ok( val == NULL || val == (void *)0xdeadbabe, "fls index %u wrong value %p\n", fls, val ); ok( GetLastError() == ERROR_SUCCESS, "getting fls index %u failed with error %u\n", fls_2, GetLastError() ); pFlsFree( fls_2 ); -- 2.26.2

2 8

[PATCH v3 2/4] d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Ziqing Hui Sept. 29, 2020

Sept. 29, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Use ReadFile rather than mapping file. dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 78 ++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 5 deletions(-)

2 2

[PATCH] winevulkan: Add --xml argument to make_vulkan
by Liam Middlebrook Sept. 29, 2020

Sept. 29, 2020

This eases development and of Vulkan extensions by allowing developers to locally override the specification XML file used by winevulkan. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4553207d4ae..3c0e4f83bab 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3143,6 +3143,7 @@ def download_vk_xml(filename): def main(): parser = argparse.ArgumentParser() parser.add_argument("-v", "--verbose", action="count", default=0, help="increase output verbosity") + parser.add_argument("-x", "--xml", default=None, type=str, help="path to specification XML file") args = parser.parse_args() if args.verbose == 0: @@ -3154,8 +3155,12 @@ def main(): set_working_directory() - vk_xml = "vk-{0}.xml".format(VK_XML_VERSION) - download_vk_xml(vk_xml) + if args.xml: + vk_xml = args.xml + else: + vk_xml = "vk-{0}.xml".format(VK_XML_VERSION) + download_vk_xml(vk_xml) + registry = VkRegistry(vk_xml) generator = VkGenerator(registry) -- 2.28.0

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.155.
by Liam Middlebrook Sept. 29, 2020

Sept. 29, 2020

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1012d1b9765..4553207d4ae 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.154" +VK_XML_VERSION = "1.2.155" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.28.0

1 0