- wine-devel - winehq.org

[PATCH 1/6] wined3d: Separate a helper to update Vulkan CBV bindings.
by Zebediah Figura 22 Jul '21

22 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index d1a113d1f81..77c32b2efc1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2650,6 +2650,28 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d } } +static bool wined3d_context_vk_update_cbv_binding(struct wined3d_context_vk *context_vk, + struct wined3d_shader_descriptor_writes_vk *writes, VkDescriptorSet vk_descriptor_set, + const struct wined3d_state *state, const struct wined3d_shader_resource_binding *binding) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const VkDescriptorBufferInfo *buffer_info; + struct wined3d_buffer_vk *buffer_vk; + struct wined3d_buffer *buffer; + + if (!(buffer = state->cb[binding->shader_type][binding->resource_idx].buffer)) + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, &device_vk->null_resources_vk.buffer_info, NULL, NULL); + + buffer_vk = wined3d_buffer_vk(buffer); + buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) + return false; + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + return true; +} + static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, enum wined3d_pipeline pipeline) { @@ -2661,10 +2683,8 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_unordered_access_view *uav; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; const VkDescriptorImageInfo *image_info; - struct wined3d_buffer_vk *buffer_vk; VkDescriptorSetLayout vk_set_layout; VkPipelineLayout vk_pipeline_layout; struct wined3d_resource *resource; @@ -2672,7 +2692,6 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkDescriptorSet vk_descriptor_set; struct wined3d_view_vk *view_vk; struct wined3d_sampler *sampler; - struct wined3d_buffer *buffer; VkBufferView *buffer_view; VkDescriptorType type; VkResult vr; @@ -2713,20 +2732,8 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con switch (binding->shader_descriptor_type) { case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: - if (!(buffer = state->cb[binding->shader_type][binding->resource_idx].buffer)) - { - if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, - binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, - &device_vk->null_resources_vk.buffer_info, NULL, NULL)) - return false; - break; - } - buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); - if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, - binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) + if (!wined3d_context_vk_update_cbv_binding(context_vk, writes, vk_descriptor_set, state, binding)) return false; - wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); break; case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: -- 2.32.0

3 7

[PATCH 1/2] mfmediaengine: Handle Play() when called before topology is set.
by Nikolay Sivov 22 Jul '21

22 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index bd3fd04aabd..a555d0dad99 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -84,6 +84,8 @@ enum media_engine_flags FLAGS_ENGINE_FIRST_FRAME = 0x2000, FLAGS_ENGINE_IS_ENDED = 0x4000, FLAGS_ENGINE_NEW_FRAME = 0x8000, + FLAGS_ENGINE_SOURCE_PENDING = 0x10000, + FLAGS_ENGINE_PLAY_PENDING = 0x20000, }; struct vec3 @@ -1181,9 +1183,18 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return hr; } +static void media_engine_start_playback(struct media_engine *engine) +{ + PROPVARIANT var; + + var.vt = VT_EMPTY; + IMFMediaSession_Start(engine->session, &GUID_NULL, &var); +} + static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_engine *engine = impl_from_load_handler_IMFAsyncCallback(iface); + unsigned int start_playback; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; IUnknown *object = NULL; @@ -1194,6 +1205,9 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, engine->network_state = MF_MEDIA_ENGINE_NETWORK_LOADING; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADSTART, 0, 0); + start_playback = engine->flags & FLAGS_ENGINE_PLAY_PENDING; + media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING | FLAGS_ENGINE_PLAY_PENDING, FALSE); + if (FAILED(hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object))) WARN("Failed to create source object, hr %#x.\n", hr); @@ -1210,6 +1224,8 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, if (SUCCEEDED(hr)) { engine->network_state = MF_MEDIA_ENGINE_NETWORK_IDLE; + if (start_playback) + media_engine_start_playback(engine); } else { @@ -1387,6 +1403,9 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) &IID_IPropertyStore, (void **)&props); hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, &engine->load_handler, NULL); + if (SUCCEEDED(hr)) + media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING, TRUE); + if (props) IPropertyStore_Release(props); } @@ -1723,7 +1742,6 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) { struct media_engine *engine = impl_from_IMFMediaEngine(iface); - PROPVARIANT var; TRACE("%p.\n", iface); @@ -1736,8 +1754,10 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); - var.vt = VT_EMPTY; - IMFMediaSession_Start(engine->session, &GUID_NULL, &var); + if (!(engine->flags & FLAGS_ENGINE_SOURCE_PENDING)) + media_engine_start_playback(engine); + else + media_engine_set_flag(engine, FLAGS_ENGINE_PLAY_PENDING, TRUE); media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); } -- 2.30.2

1 1

[PATCH 4/4] include: Add IN6_IS_ADDR_LINKLOCAL() and IN6_IS_ADDR_SITELOCAL().
by Huw Davies 22 Jul '21

22 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/ws2ipdef.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index fc465804962..2f9d4f663ad 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -323,6 +323,16 @@ static inline BOOLEAN WS(IN6_IS_ADDR_UNSPECIFIED) ( const IN6_ADDR *a ) (a->s6_words[7] == 0)); } +static inline BOOLEAN WS(IN6_IS_ADDR_LINKLOCAL) ( const IN6_ADDR *a ) +{ + return ((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0x80)); +} + +static inline BOOLEAN WS(IN6_IS_ADDR_SITELOCAL) ( const IN6_ADDR *a ) +{ + return ((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0xc0)); +} + #ifdef __cplusplus } #endif -- 2.25.1

1 0

[PATCH 3/4] iphlpapi: Retrieve the IPv4 addresses using an export rather than a helper.
by Huw Davies 22 Jul '21

22 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6e1d95ab321..b2d597fd9ab 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -76,6 +76,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); +DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); static const NPI_MODULEID *ip_module_id( USHORT family ) { @@ -350,7 +351,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c if (!(pairs = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; ptr = (SOCKADDR_IN6 *)&pairs[dst_count]; - if ((ret = getIPAddrTable( &table, GetProcessHeap(), 0 ))) + if ((ret = AllocateAndGetIpAddrTableFromStack( &table, FALSE, GetProcessHeap(), 0 ))) { HeapFree( GetProcessHeap(), 0, pairs ); return ret; -- 2.25.1

1 0

[PATCH 2/4] iphlpapi: Implement AllocateAndGetIpAddrTableFromStack() on top of GetIpAddrTable().
by Huw Davies 22 Jul '21

22 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 76 ++++++++++++++++------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8442bc2b4a9..6e1d95ab321 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -139,48 +139,6 @@ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask IpMask, DWORD IfIndex, PULONG N return ERROR_NOT_SUPPORTED; } -static int IpAddrTableNumericSorter(const void *a, const void *b) -{ - int ret = 0; - - if (a && b) - ret = ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; - return ret; -} - -/****************************************************************** - * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) - * - * Get interface-to-IP address mapping table. - * Like GetIpAddrTable(), but allocate the returned table from heap. - * - * PARAMS - * ppIpAddrTable [Out] pointer into which the MIB_IPADDRTABLE is - * allocated and returned. - * bOrder [In] whether to sort the table - * heap [In] heap from which the table is allocated - * flags [In] flags to HeapAlloc - * - * RETURNS - * ERROR_INVALID_PARAMETER if ppIpAddrTable is NULL, other error codes on - * failure, NO_ERROR on success. - */ -DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, - BOOL bOrder, HANDLE heap, DWORD flags) -{ - DWORD ret; - - TRACE("ppIpAddrTable %p, bOrder %d, heap %p, flags 0x%08x\n", - ppIpAddrTable, bOrder, heap, flags); - ret = getIPAddrTable(ppIpAddrTable, heap, flags); - if (!ret && bOrder) - qsort((*ppIpAddrTable)->table, (*ppIpAddrTable)->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); - TRACE("returning %d\n", ret); - return ret; -} - - /****************************************************************** * CancelIPChangeNotify (IPHLPAPI.@) * @@ -2189,6 +2147,40 @@ err: } +/****************************************************************** + * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) + * + * Get interface-to-IP address mapping table. + * Like GetIpAddrTable(), but allocate the returned table from heap. + * + * PARAMS + * table [Out] pointer into which the MIB_IPADDRTABLE is + * allocated and returned. + * sort [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * + */ +DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ) +{ + DWORD err, size = FIELD_OFFSET(MIB_IPADDRTABLE, table[2]), attempt; + + TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags ); + + for (attempt = 0; attempt < 5; attempt++) + { + *table = HeapAlloc( heap, flags, size ); + if (!*table) return ERROR_NOT_ENOUGH_MEMORY; + + err = GetIpAddrTable( *table, &size, sort ); + if (!err) break; + HeapFree( heap, flags, *table ); + if (err != ERROR_INSUFFICIENT_BUFFER) break; + } + + return err; +} + /****************************************************************** * GetIpForwardTable (IPHLPAPI.@) * -- 2.25.1

1 0

[PATCH 1/4] iphlpapi: Implement GetIpAddrTable() on top of nsi.
by Huw Davies 22 Jul '21

22 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 103 ++++++++++++++++----------------- dlls/iphlpapi/tests/iphlpapi.c | 2 + 2 files changed, 51 insertions(+), 54 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 93d9b0440dd..8442bc2b4a9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -148,19 +148,6 @@ static int IpAddrTableNumericSorter(const void *a, const void *b) return ret; } -static int IpAddrTableLoopbackSorter(const void *a, const void *b) -{ - const MIB_IPADDRROW *left = a, *right = b; - int ret = 0; - - if (isIfIndexLoopback(left->dwIndex)) - ret = 1; - else if (isIfIndexLoopback(right->dwIndex)) - ret = -1; - - return ret; -} - /****************************************************************** * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) * @@ -2131,6 +2118,10 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) return ERROR_SUCCESS; } +static int ipaddrrow_cmp( const void *a, const void *b ) +{ + return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; +} /****************************************************************** * GetIpAddrTable (IPHLPAPI.@) @@ -2138,59 +2129,63 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) * Get interface-to-IP address mapping table. * * PARAMS - * pIpAddrTable [Out] buffer for mapping table - * pdwSize [In/Out] length of output buffer - * bOrder [In] whether to sort the table + * table [Out] buffer for mapping table + * size [In/Out] length of output buffer + * sort [In] whether to sort the table * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h * - * NOTES - * If pdwSize is less than required, the function will return - * ERROR_INSUFFICIENT_BUFFER, and *pdwSize will be set to the required byte - * size. - * If bOrder is true, the returned table will be sorted by the next hop and - * an assortment of arbitrary parameters. */ -DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL bOrder) +DWORD WINAPI GetIpAddrTable( MIB_IPADDRTABLE *table, ULONG *size, BOOL sort ) { - DWORD ret; + DWORD err, count, needed, i, loopback, row_num = 0; + struct nsi_ipv4_unicast_key *keys; + struct nsi_ip_unicast_rw *rw; - TRACE("pIpAddrTable %p, pdwSize %p, bOrder %d\n", pIpAddrTable, pdwSize, - (DWORD)bOrder); - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - PMIB_IPADDRTABLE table; + TRACE( "table %p, size %p, sort %d\n", table, size, sort ); + if (!size) return ERROR_INVALID_PARAMETER; + + err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, (void **)&keys, sizeof(*keys), + (void **)&rw, sizeof(*rw), NULL, 0, NULL, 0, &count, 0 ); + if (err) return err; - ret = getIPAddrTable(&table, GetProcessHeap(), 0); - if (ret == NO_ERROR) + needed = FIELD_OFFSET( MIB_IPADDRTABLE, table[count] ); + + if (!table || *size < needed) { - ULONG size = FIELD_OFFSET(MIB_IPADDRTABLE, table[table->dwNumEntries]); + *size = needed; + err = ERROR_INSUFFICIENT_BUFFER; + goto err; + } - if (!pIpAddrTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - *pdwSize = size; - memcpy(pIpAddrTable, table, size); - /* sort by numeric IP value */ - if (bOrder) - qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); - /* sort ensuring loopback interfaces are in the end */ - else - qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableLoopbackSorter); - ret = NO_ERROR; - } - HeapFree(GetProcessHeap(), 0, table); + table->dwNumEntries = count; + + for (loopback = 0; loopback < 2; loopback++) /* Move the loopback addresses to the end */ + { + for (i = 0; i < count; i++) + { + MIB_IPADDRROW *row = table->table + row_num; + + if (!!loopback != (keys[i].luid.Info.IfType == MIB_IF_TYPE_LOOPBACK)) continue; + + row->dwAddr = keys[i].addr.WS_s_addr; + ConvertInterfaceLuidToIndex( &keys[i].luid, &row->dwIndex ); + ConvertLengthToIpv4Mask( rw[i].on_link_prefix, &row->dwMask ); + row->dwBCastAddr = 1; + row->dwReasmSize = 0xffff; + row->unused1 = 0; + row->wType = MIB_IPADDR_PRIMARY; + row_num++; + } } - } - TRACE("returning %d\n", ret); - return ret; + + if (sort) qsort( table->table, count, sizeof(MIB_IPADDRROW), ipaddrrow_cmp ); +err: + NsiFreeTable( keys, rw, NULL, NULL ); + + return err; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1deac9b64f1..51566034f51 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -203,6 +203,8 @@ static void testGetIpAddrTable(void) for (i = 0; i < buf->dwNumEntries; i++) { ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); + ok (buf->table[i].dwBCastAddr == 1, "Test[%d]: got %08x\n", i, buf->table[i].dwBCastAddr); + ok (buf->table[i].dwReasmSize == 0xffff, "Test[%d]: got %08x\n", i, buf->table[i].dwReasmSize); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); } -- 2.25.1

1 0

[PATCH 11/11] gdi32: Use NtGdiPolyPolyDraw for PolyBezierTo implementation.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +-------- dlls/gdi32/enhmfdrv/graphics.c | 53 +++++++++++++++++++--------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 14 +++++++++ dlls/gdi32/painting.c | 48 +++++++----------------------- 5 files changed, 56 insertions(+), 74 deletions(-)

2 1

[PATCH 10/11] gdi32: Use NtGdiPolyPolyDraw for PolylineTo implementation.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/painting.c | 35 ++++++++++------------------------ 5 files changed, 36 insertions(+), 39 deletions(-)

2 1

[PATCH 09/11] gdi32: Use NtGdiPolyPolyDraw for PolyBezier implementation.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +---------- dlls/gdi32/enhmfdrv/graphics.c | 11 +++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 14 +++++++++++ dlls/gdi32/painting.c | 46 ++++++++-------------------------- 5 files changed, 37 insertions(+), 49 deletions(-)

2 1

[PATCH 08/11] gdi32: Remove no longer used Polygon and Polyline driver entry points.
by Jacek Caban 22 Jul '21

22 Jul '21

2 1

[PATCH 07/11] gdi32: Use NtGdiPolyPolyDraw for Polyline implementation.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 ++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 ++++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 35 +++++++++------------------- 10 files changed, 37 insertions(+), 47 deletions(-)

2 1

[PATCH 06/11] gdi32: Use NtGdiPolyPolyDraw for PolyPolyline implementation.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------ dlls/gdi32/enhmfdrv/graphics.c | 36 ++++++++++++++++++++-------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 +++++++++++++ dlls/gdi32/painting.c | 26 ++++++------------------ 5 files changed, 44 insertions(+), 48 deletions(-)

2 1

[PATCH 05/11] gdi32: Use NtGdiPolyPolyDraw for Polygon implementation.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 14 +++++++------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 20 -------------------- 11 files changed, 34 insertions(+), 49 deletions(-)

2 1

[PATCH 04/11] winex11: Don't use pPolygon graphics driver entry point.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 4 +++- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 4 insertions(+), 3 deletions(-)

2 1

[PATCH 03/11] gdi32: Use NtGdiPolyPolyDraw for PolyPolygon implementation.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I left bounding rect update out of the driver for now, I think it will be better to move them when the transition will be more complete. dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 12 ++++++++++-- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 ++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 10 +++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/painting.c | 29 ++++++++++++++++++---------- include/ntgdi.h | 10 ++++++++++ 10 files changed, 73 insertions(+), 30 deletions(-)

2 1

[PATCH 02/11] gdi32/tests: Add a test for double-free on repeated calls to Delete[Enh]MetaFile.
by Jacek Caban 22 Jul '21

22 Jul '21

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)

2 1

[PATCH 01/11] gdi32: Use free_gdi_handle directly for NtGdiDeleteClientObj.
by Jacek Caban 22 Jul '21

22 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] mshtml: Do not lock document mode in create_document_event().
by Paul Gofman 22 Jul '21

22 Jul '21

Event may be created before the document is loaded. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 17f5fb35b71..5b040c4df62 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2334,7 +2334,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), event_id); + event = alloc_event(nsevent, doc->document_mode, event_id); if(!event) return E_OUTOFMEMORY; -- 2.31.1

2 3

[PATCH vkd3d 1/2] tests: Use multiple stream output slots in test_line_tessellation().
by Conor McCarthy 22 Jul '21

22 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 04c1e2c8..ee9b55fe 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28194,7 +28194,7 @@ static void test_line_tessellation(void) D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; D3D12_QUERY_HEAP_DESC query_heap_desc; - D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv[2]; D3D12_INPUT_LAYOUT_DESC input_layout; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; @@ -28361,10 +28361,10 @@ static void test_line_tessellation(void) static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = { {0, "SV_POSITION", 0, 0, 4, 0}, - {0, "COLOR", 0, 0, 4, 0}, - {0, "PRIMITIVE_ID", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 4, 1}, + {0, "PRIMITIVE_ID", 0, 0, 4, 1}, }; - unsigned int strides[] = {48}; + unsigned int strides[] = {16, 32}; static const struct { struct vec4 position; @@ -28450,13 +28450,17 @@ static void test_line_tessellation(void) so_buffer = create_default_buffer(context.device, 4096, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); - sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); - sobv.SizeInBytes = 1024; - sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + for (i = 0; i < ARRAY_SIZE(sobv); ++i) + { + sobv[i].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer) + i * 2048; + sobv[i].SizeInBytes = 1024; + sobv[i].BufferFilledSizeLocation = sobv[i].BufferLocation + sobv[i].SizeInBytes; + } ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0); - ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 2, sobv); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); @@ -28493,19 +28497,21 @@ static void test_line_tessellation(void) get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_data) / 3 ; ++i) { - data = get_readback_data(&rb, i, 0, 0, 3 * sizeof(*data)); + data = get_readback_data(&rb, i, 0, 0, sizeof(*data)); expected = &expected_data[3 * i + 0]; ok(compare_vec4(data, expected, 1), "Got position {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); - ++data; + data = get_readback_data(&rb, i + 2048 / (2 * sizeof(*data)), 0, 0, 2 * sizeof(*data)); expected = &expected_data[3 * i + 1]; bug_if(is_nvidia_device(context.device)) + todo_if(i != 6) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 2]; + todo ok(compare_vec4(data, expected, 1), "Got primitive ID {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); -- 2.32.0

3 3

[PATCH vkd3d 1/2] vkd3d: Introduce a pipeline state helper function for uav counter cleanup.
by Conor McCarthy 22 Jul '21

22 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4537e319..c60478be 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1190,6 +1190,18 @@ static void d3d12_pipeline_state_destroy_graphics(struct d3d12_pipeline_state *s } } +static void d3d12_pipeline_state_uav_counter_cleanup(struct d3d12_pipeline_state *state, struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + if (state->vk_set_layout) + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); + if (state->vk_pipeline_layout) + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); + + vkd3d_free(state->uav_counters); +} + static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); @@ -1209,12 +1221,7 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState else if (d3d12_pipeline_state_is_compute(state)) VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); - if (state->vk_set_layout) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); - if (state->vk_pipeline_layout) - VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); - - vkd3d_free(state->uav_counters); + d3d12_pipeline_state_uav_counter_cleanup(state, device); vkd3d_free(state); @@ -1574,22 +1581,14 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st vk_pipeline_layout, &state->u.compute.vk_pipeline))) { WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); - if (state->vk_set_layout) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); - if (state->vk_pipeline_layout) - VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); - vkd3d_free(state->uav_counters); + d3d12_pipeline_state_uav_counter_cleanup(state, device); return hr; } if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) { VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); - if (state->vk_set_layout) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); - if (state->vk_pipeline_layout) - VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); - vkd3d_free(state->uav_counters); + d3d12_pipeline_state_uav_counter_cleanup(state, device); return hr; } -- 2.32.0

2 2

[PATCH vkd3d v2 1/6] vkd3d-shader: Find bindings for descriptor arrays.
by Conor McCarthy 22 Jul '21

22 Jul '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 22 ++++++++++------------ tests/d3d12.c | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bd231124..6576aca4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2463,9 +2463,10 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, - bool is_uav_counter) + bool is_uav_counter, unsigned int *binding_base_idx) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; + unsigned int register_last = (range->last == ~0u) ? range->first : range->last; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2519,6 +2520,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor range->first, range->space, current->binding.count); } + *binding_base_idx = current->register_index; return current->binding; } if (shader_interface->uav_counter_count) @@ -2541,18 +2543,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor continue; if (current->type != descriptor_type || current->register_space != range->space - || current->register_index != range->first) + || current->register_index > range->first + || current->binding.count <= register_last - current->register_index) continue; - if (current->binding.count != 1) - { - FIXME("Descriptor arrays are not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, - "Descriptor binding for type %#x, space %u, register %u, " - "shader type %#x has unsupported ‘count’ %u.", - descriptor_type, range->space, range->first, compiler->shader_type, current->binding.count); - } - + *binding_base_idx = current->register_index; return current->binding; } if (shader_interface->binding_count) @@ -2566,6 +2561,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor } done: + *binding_base_idx = range->first; binding.set = 0; binding.count = 1; binding.binding = compiler->binding_idx++; @@ -2586,8 +2582,10 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxb enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { struct vkd3d_shader_descriptor_binding binding; + unsigned int binding_base_idx; /* Value not used. */ - binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, resource_type, is_uav_counter); + binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, + resource_type, is_uav_counter, &binding_base_idx); vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 3892c1db..a84a8e28 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34103,6 +34103,7 @@ static void test_resource_arrays(void) get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(input_buffers) + i)); } + todo context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); if (!context.pipeline_state) -- 2.31.1

2 10

[PATCH vkd3d v2] vkd3d-shader: Implement DEQ instruction.
by Conor McCarthy 22 Jul '21

22 Jul '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Source modifiers and immediate constants are not supported. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 5 +++++ libs/vkd3d-shader/spirv.c | 10 ++++++++-- libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 8 ++++++++ tests/d3d12.c | 4 ++-- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b81ac976..e57cc413 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -310,6 +310,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, + VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, @@ -1011,6 +1012,7 @@ static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, } /* + * d -> VKD3D_DATA_DOUBLE * f -> VKD3D_DATA_FLOAT * i -> VKD3D_DATA_INT * u -> VKD3D_DATA_UINT @@ -1247,6 +1249,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_IMM_ATOMIC_UMIN, VKD3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, + {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", @@ -1338,6 +1341,8 @@ static enum vkd3d_data_type map_data_type(char t) { switch (t) { + case 'd': + return VKD3D_DATA_DOUBLE; case 'f': return VKD3D_DATA_FLOAT; case 'i': diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 65834696..33e664cf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3308,6 +3308,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co enum vkd3d_shader_component_type component_type; struct vkd3d_shader_register_info reg_info; unsigned int component_count; + unsigned int write_mask32; uint32_t type_id, val_id; if (reg->type == VKD3DSPR_IMMCONST) @@ -3320,14 +3321,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); } + assert(reg_info.component_type != VKD3D_SHADER_COMPONENT_DOUBLE); vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + write_mask32 = (reg->data_type == VKD3D_DATA_DOUBLE) ? vkd3d_write_mask_32_from_64(write_mask) : write_mask; + /* Intermediate value (no storage class). */ if (reg_info.storage_class == SpvStorageClassMax) { val_id = reg_info.id; } - else if (component_count == 1) + else if (vkd3d_write_mask_component_count(write_mask32) == 1) { return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); } @@ -3339,7 +3343,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); + val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask32); if (component_type != reg_info.component_type) { @@ -7066,6 +7070,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co switch (instruction->handler_idx) { + case VKD3DSIH_DEQ: case VKD3DSIH_EQ: op = SpvOpFOrdEqual; break; case VKD3DSIH_GE: op = SpvOpFOrdGreaterThanEqual; break; case VKD3DSIH_IEQ: op = SpvOpIEqual; break; @@ -9249,6 +9254,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_UDIV: vkd3d_dxbc_compiler_emit_udiv(compiler, instruction); break; + case VKD3DSIH_DEQ: case VKD3DSIH_EQ: case VKD3DSIH_GE: case VKD3DSIH_IEQ: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9f8cf020..d06c18d9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -103,6 +103,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFAULT */ "default", /* VKD3DSIH_DEFB */ "defb", /* VKD3DSIH_DEFI */ "defi", + /* VKD3DSIH_DEQ */ "deq", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DP2 */ "dp2", /* VKD3DSIH_DP2ADD */ "dp2add", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 033d8f07..f5d22c5c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -190,6 +190,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFAULT, VKD3DSIH_DEFB, VKD3DSIH_DEFI, + VKD3DSIH_DEQ, VKD3DSIH_DIV, VKD3DSIH_DP2, VKD3DSIH_DP2ADD, @@ -1032,6 +1033,13 @@ static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int co return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } +static inline unsigned int vkd3d_write_mask_32_from_64(unsigned int write_mask64) +{ + unsigned int write_mask32 = (write_mask64 | (write_mask64 << 1)) + & (VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_2); + return write_mask32 | (write_mask32 << 1); +} + static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, unsigned int idx) { diff --git a/tests/d3d12.c b/tests/d3d12.c index 55148615..a59f4c8d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9879,8 +9879,8 @@ static void test_shader_instructions(void) {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true}, {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true, true}, {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true, true}, - {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true, true}, - {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true, true}, + {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true}, + {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true}, {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true}, {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true}, -- 2.31.1

2 1

Fwd: TestBot job 94380 results: [PATCH] dbghelp: use a buffer ring instead of single buffer for fetch_buffer
by Eric Pouech 22 Jul '21

22 Jul '21

Marvin reports an existing bug in dbghelp tests, not related to this patch there's a fix for that very bug in v2 patch series for dbghelp I've sent last week Alexandre, any progress / comments on those? A+ On Thu, 22 Jul 2021 at 09:59, Marvin <testbot(a)winehq.org> wrote: > VM Status Failures Command > debiant2 failed 2 > debiant2 failed 1 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=94380 > > > === debiant2 (32 bit report) === > > dbghelp: > dbghelp.c:116: Test failed: got wrong name EntryPoint > > === debiant2 (32 bit Chinese:China report) === > > dbghelp: > dbghelp.c:116: Test failed: got wrong name EntryPoint > > === debiant2 (32 bit WoW report) === > > dbghelp: > dbghelp.c:116: Test failed: got wrong name EntryPoint > -- -- Eric Pouech

1 0

[PATCH] dbghelp: Reimplement SymGetLineFromAddrW64
by Alistair Leslie-Hughes 22 Jul '21

22 Jul '21

There is an issue with copy_line_W64_from_64 where converting to unicode the string would be truncated. This issue is caused by the use of the pointer return by fetch_buffer, in this cause both arguments passed to MultiByteToWideChar would be the same pointer. SymGetLineFromAddrW64 - Call SymGetLineFromAddr64 - returns il64->Filename = fetch_buffer; - Call copy_line_W64_from_64 - Line->Filename = fetch_buffer; - Calls MultiByteToWideChar (.., il64->Filename, .. Line->Filename..) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 69 ++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..c701a973c2a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1528,6 +1528,38 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun return FALSE; } +static BOOL symt_fill_func_line_info_w(const struct module* module, const struct symt_function* func, + DWORD64 addr, IMAGEHLP_LINEW64* line) +{ + struct line_info* dli = NULL; + BOOL found = FALSE; + int i; + + assert(func->symt.tag == SymTagFunction); + + for (i=vector_length(&func->vlines)-1; i>=0; i--) + { + dli = vector_at(&func->vlines, i); + if (!dli->is_source_file) + { + if (found || dli->u.pc_offset > addr) continue; + line->LineNumber = dli->line_number; + line->Address = dli->u.pc_offset; + line->Key = dli; + found = TRUE; + continue; + } + if (found) + { + WCHAR *dospath = wine_get_dos_file_name(source_get(module, dli->u.source_file)); + wcscpy(line->FileName, dospath); + HeapFree( GetProcessHeap(), 0, dospath ); + return TRUE; + } + } + return FALSE; +} + /*********************************************************************** * SymGetSymNext64 (DBGHELP.@) */ @@ -1587,22 +1619,6 @@ static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) l64->Address = l32->Address; } -/****************************************************************** - * copy_line_W64_from_32 (internal) - * - */ -static void copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) -{ - unsigned len; - - l64w->Key = l64->Key; - l64w->LineNumber = l64->LineNumber; - len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); - if ((l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, l64w->FileName, len); - l64w->Address = l64->Address; -} - /****************************************************************** * copy_line_32_from_64 (internal) * @@ -1666,12 +1682,23 @@ BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINEW64 Line) { - IMAGEHLP_LINE64 il64; + struct module_pair pair; + struct symt_ht* symt; - il64.SizeOfStruct = sizeof(il64); - if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) - return FALSE; - copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); + TRACE("%p %s %p %p\n", hProcess, wine_dbgstr_longlong(dwAddr), pdwDisplacement, Line); + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, dwAddr, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + if ((symt = symt_find_nearest(pair.effective, dwAddr)) == NULL) return FALSE; + + if (symt->symt.tag != SymTagFunction) return FALSE; + if (!symt_fill_func_line_info_w(pair.effective, (struct symt_function*)symt, + dwAddr, Line)) return FALSE; + *pdwDisplacement = dwAddr - Line->Address; return TRUE; } -- 2.30.2

2 1

[PATCH] widl: Improve temp file creation and error logging
by Andrew Boyarshin 22 Jul '21

22 Jul '21

* Make temp file names more descriptive. * Add a way to identify failing mkstemps by using specialized log messages for each call to mkstemps. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- First part of the 199498 patch split into 2 separate patches. --- tools/widl/parser.l | 15 +++++++++++---- tools/widl/widl.c | 9 ++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4d3b9d683e82..278042520585 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -536,6 +536,7 @@ int do_import(char *fname) struct imports *import; int ptr = import_stack_ptr; int ret, fd; + char *base_fname = dup_basename(fname, ".idl"); import = first_import; while (import && strcmp(import->name, fname)) @@ -564,9 +565,15 @@ int do_import(char *fname) input_name = path; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xmalloc( strlen(base_fname) + 15); + + strcpy( name, base_fname ); + strcat( name, "_import.XXXXXX" ); + + free(base_fname); + if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an import temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) @@ -605,9 +612,9 @@ static void switch_to_acf(void) acf_name = NULL; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xstrdup( "widl_acf.XXXXXX" ); if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an ACF temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b40745a49f8e..b3b60da00169 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -967,13 +967,16 @@ int main(int argc,char *argv[]) { FILE *output; int fd; - char *name = xmalloc( strlen(header_name) + 8 ); + char *base_input_name = dup_basename(input_name, ".idl"); + char *name = xmalloc(strlen(base_input_name) + 8); - strcpy( name, header_name ); + strcpy( name, base_input_name ); strcat( name, ".XXXXXX" ); + free(base_input_name); + if ((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate a root temp name from %s\n", name); temp_name = name; if (!(output = fdopen(fd, "wt"))) -- 2.32.0.windows.1

1 0

[PATCH 1/4] cryptnet: Specify half of the remaining timeout for each CRL if CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG was specified.
by Zebediah Figura 22 Jul '21

22 Jul '21

Instead of wasting the whole timeout on the first CRL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 06c468bd655..565302957d6 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1539,22 +1539,24 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * if (urlArray) { - DWORD j, retrievalFlags = 0, startTime, endTime, timeout; + DWORD j, retrievalFlags = 0, timeout = 0; BOOL ret; ret = CRYPT_GetUrlFromCRLDistPointsExt(value, urlArray, &cbUrlArray, NULL, NULL); if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; + if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && pRevPara && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) - { - startTime = GetTickCount(); - endTime = startTime + pRevPara->dwUrlRetrievalTimeout; timeout = pRevPara->dwUrlRetrievalTimeout; - } - else - endTime = timeout = 0; + + /* Yes, this is a weird algorithm, but the documentation for + * CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT specifies this, and + * tests seem to bear it out for CertVerifyRevocation() as well. */ + if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) + timeout /= 2; + if (!ret) error = GetLastError(); /* continue looping if one was offline; break if revoked or timed out */ @@ -1568,19 +1570,17 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * if (ret) { error = verify_cert_revocation_with_crl_online(cert, crl, pTime, pRevStatus); - if (!error && timeout) - { - DWORD time = GetTickCount(); - - if ((int)(endTime - time) <= 0) - error = ERROR_TIMEOUT; - else - timeout = endTime - time; - } CertFreeCRLContext(crl); } else + { + /* We don't check the current time here. This may result in + * less accurate timeouts, but this too seems to be true of + * Windows. */ + if (GetLastError() == ERROR_TIMEOUT) + timeout /= 2; error = CRYPT_E_REVOCATION_OFFLINE; + } } CryptMemFree(urlArray); } -- 2.30.2

1 3

[PATCH 1/6] ws2_32/tests: Add more tests for bind() and getsockname().
by Zebediah Figura 22 Jul '21

22 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 149 +++++++++++++++++++++++++++++++++------ dlls/ws2_32/tests/sock.c | 84 ++++++++++++++++++++++ 2 files changed, 211 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 4b8796157aa..32daab0beab 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1414,9 +1414,14 @@ static void test_get_events(void) static void test_bind(void) { + const struct sockaddr_in6 bind_addr6 = {.sin6_family = AF_INET6, .sin6_addr.s6_words = {0, 0, 0, 0, 0, 0, 0, htons(1)}}; + const struct sockaddr_in6 invalid_addr6 = {.sin6_family = AF_INET6, .sin6_addr.s6_words = {htons(0x0100)}}; const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; - struct afd_bind_params params = {0}; + static const size_t params6_size = offsetof(struct afd_bind_params, addr) + sizeof(struct sockaddr_in6); + static const size_t params4_size = offsetof(struct afd_bind_params, addr) + sizeof(struct sockaddr_in); + struct afd_bind_params *params = malloc(params6_size); + struct sockaddr_in6 addr6, addr6_2; struct sockaddr_in addr, addr2; struct hostent *host; IO_STATUS_BLOCK io; @@ -1427,47 +1432,48 @@ static void test_bind(void) event = CreateEventW(NULL, TRUE, FALSE, NULL); memset(&addr, 0xcc, sizeof(addr)); + memset(params, 0, params6_size); s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - params.addr.sa_family = 0xdead; + params->addr.sa_family = 0xdead; ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params) - 1, &addr, sizeof(addr)); + params, params4_size - 1, &addr, sizeof(addr)); ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, offsetof(struct afd_bind_params, addr.sa_data), &addr, sizeof(addr)); + params, offsetof(struct afd_bind_params, addr.sa_data), &addr, sizeof(addr)); ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, offsetof(struct afd_bind_params, addr.sa_data) - 1, &addr, sizeof(addr)); + params, offsetof(struct afd_bind_params, addr.sa_data) - 1, &addr, sizeof(addr)); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - memcpy(&params.addr, &invalid_addr, sizeof(invalid_addr)); + memcpy(&params->addr, &invalid_addr, sizeof(invalid_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); ok(io.Status == STATUS_INVALID_ADDRESS_COMPONENT, "got %#x\n", io.Status); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr) - 1); + params, params4_size, &addr, sizeof(addr) - 1); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1485,16 +1491,16 @@ static void test_bind(void) ok(!memcmp(&addr, &addr2, sizeof(addr)), "addresses didn't match\n"); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - memcpy(&params.addr, &addr2, sizeof(addr2)); + memcpy(&params->addr, &addr2, sizeof(addr2)); memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s2, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1508,11 +1514,11 @@ static void test_bind(void) s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1539,11 +1545,11 @@ static void test_bind(void) s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - ((struct sockaddr_in *)&params.addr)->sin_addr.s_addr = in_addr; + ((struct sockaddr_in *)&params->addr)->sin_addr.s_addr = in_addr; memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1563,7 +1569,106 @@ static void test_bind(void) } } + /* test IPv6 */ + + s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + ok(s != -1, "failed to create IPv6 socket\n"); + + params->addr.sa_family = 0xdead; + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size - 1, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, offsetof(struct afd_bind_params, addr) + sizeof(struct sockaddr_in6_old), &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, offsetof(struct afd_bind_params, addr.sa_data), &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, offsetof(struct afd_bind_params, addr.sa_data) - 1, &addr6, sizeof(addr6)); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memcpy(&params->addr, &invalid_addr6, sizeof(invalid_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); + ret = WaitForSingleObject(event, 0); + todo_wine ok(!ret, "got %#x\n", ret); + todo_wine ok(io.Status == STATUS_INVALID_ADDRESS_COMPONENT, "got %#x\n", io.Status); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6) - 1); + todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size - 1, &addr6, sizeof(addr6) - 1); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(struct sockaddr_in6_old)); + todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + memset(&io, 0xcc, sizeof(io)); + memset(&addr6, 0xcc, sizeof(addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); + ret = WaitForSingleObject(event, 0); + todo_wine + { + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == sizeof(addr6), "got %#Ix\n", io.Information); + ok(addr6.sin6_family == AF_INET6, "got family %u\n", addr6.sin6_family); + ok(!memcmp(&addr6.sin6_addr, &bind_addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); + ok(!addr6.sin6_flowinfo, "got flow info %#x\n", addr6.sin6_flowinfo); + } + ok(addr6.sin6_port, "expected nonzero port\n"); + + /* getsockname() returns EINVAL here. Possibly the socket name is cached (in shared memory?) */ + memset(&addr6_2, 0xcc, sizeof(addr6_2)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, + IOCTL_AFD_GETSOCKNAME, NULL, 0, &addr6_2, sizeof(addr6_2)); + ok(!ret, "got %#x\n", ret); + todo_wine ok(!memcmp(&addr6, &addr6_2, sizeof(addr6)), "addresses didn't match\n"); + + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); + + s2 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + + memcpy(&params->addr, &addr6_2, sizeof(addr6_2)); + memset(&io, 0xcc, sizeof(io)); + memset(&addr6, 0xcc, sizeof(addr6)); + ret = NtDeviceIoControlFile((HANDLE)s2, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); + ret = WaitForSingleObject(event, 0); + ok(!ret, "got %#x\n", ret); + ok(io.Status == STATUS_SHARING_VIOLATION, "got %#x\n", io.Status); + ok(!io.Information, "got %#Ix\n", io.Information); + + closesocket(s2); + closesocket(s); + CloseHandle(event); + free(params); } static void test_getsockname(void) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e7bd3b8fe15..f5c5acf161e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -26,6 +26,7 @@ #include <winsock2.h> #include <windows.h> #include <winternl.h> +#include <iphlpapi.h> #include <ws2tcpip.h> #include <wsipx.h> #include <wsnwlink.h> @@ -3779,9 +3780,13 @@ static void test_getsockname(void) ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); + memset(&sa_get, 0, sizeof(sa_get)); ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); ok(!ret, "got %d\n", ret); ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + ok(sa_get.sin_family == AF_INET, "got family %#x\n", sa_get.sin_family); + ok(sa_get.sin_port != 0, "got zero port\n"); + ok(sa_get.sin_addr.s_addr == INADDR_ANY, "got addr %08x\n", sa_get.sin_addr.s_addr); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); @@ -10566,6 +10571,8 @@ static void test_bind(void) { const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + IP_ADAPTER_ADDRESSES *adapters = NULL, *adapter; + ULONG ip_addrs_size = 0; struct sockaddr addr; SOCKET s, s2; int ret, len; @@ -10625,6 +10632,83 @@ static void test_bind(void) ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* win <7 */, "got error %u\n", WSAGetLastError()); closesocket(s); + + ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &ip_addrs_size); + ok(ret == ERROR_BUFFER_OVERFLOW, "got error %u\n", ret); + adapters = malloc(ip_addrs_size); + ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &ip_addrs_size); + ok(!ret, "got error %u\n", ret); + + for (adapter = adapters; adapter != NULL; adapter = adapter->Next) + { + const IP_ADAPTER_UNICAST_ADDRESS *unicast_addr; + + for (unicast_addr = adapter->FirstUnicastAddress; unicast_addr != NULL; unicast_addr = unicast_addr->Next) + { + short family = unicast_addr->Address.lpSockaddr->sa_family; + + s = socket(family, SOCK_STREAM, IPPROTO_TCP); + ok(s != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = bind(s, unicast_addr->Address.lpSockaddr, unicast_addr->Address.iSockaddrLength); + ok(!ret, "got error %u\n", WSAGetLastError()); + + closesocket(s); + + if (family == AF_INET6) + { + struct sockaddr_in6 addr6, ret_addr6; + + memcpy(&addr6, unicast_addr->Address.lpSockaddr, sizeof(addr6)); + + ok(unicast_addr->Address.iSockaddrLength == sizeof(struct sockaddr_in6), + "got unexpected length %u\n", unicast_addr->Address.iSockaddrLength); + + s = socket(family, SOCK_STREAM, IPPROTO_TCP); + ok(s != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = bind(s, unicast_addr->Address.lpSockaddr, sizeof(struct sockaddr_in6_old)); + todo_wine_if (!addr6.sin6_scope_id) + { + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + } + + addr6.sin6_scope_id = 0xabacab; + ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + + addr6.sin6_scope_id = 0; + ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); + todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + + memcpy(&addr6, unicast_addr->Address.lpSockaddr, sizeof(addr6)); + + len = sizeof(struct sockaddr_in6_old); + ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); + ok(ret == -1, "expected failure\n"); + todo_wine_if (addr6.sin6_scope_id) + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + len = sizeof(ret_addr6); + memset(&ret_addr6, 0, sizeof(ret_addr6)); + ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); + todo_wine_if (addr6.sin6_scope_id) + { + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr6.sin6_family == AF_INET6, "got family %u\n", ret_addr6.sin6_family); + ok(ret_addr6.sin6_port != 0, "expected nonzero port\n"); + ok(!memcmp(&ret_addr6.sin6_addr, &addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); + ok(ret_addr6.sin6_scope_id == addr6.sin6_scope_id, "got scope %u\n", ret_addr6.sin6_scope_id); + } + + closesocket(s); + } + } + } + + free(adapters); } /* Test calling methods on a socket which is currently connecting. */ -- 2.30.2

2 7

[PATCH] dinput: Use SUCCEEDED instead of !FAILED
by Michael Stefaniuc 21 Jul '21

21 Jul '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/ansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 390b2f56581..cbc9dbc9733 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -174,7 +174,7 @@ static HRESULT diactionformat_atow( const DIACTIONFORMATA *in, DIACTIONFORMATW * out->dwDataSize = in->dwDataSize; out->dwNumActions = in->dwNumActions; - for (i = 0; i < out->dwNumActions && !FAILED(hr); ++i) + for (i = 0; i < out->dwNumActions && SUCCEEDED(hr); ++i) { out->rgoAction[i].uAppData = in->rgoAction[i].uAppData; out->rgoAction[i].dwSemantic = in->rgoAction[i].dwSemantic; -- 2.31.1

1 0

[PATCH 1/3] oleaut32: Setting sThousand to a non-breaking space also matches regular spaces.
by Francois Gouget 21 Jul '21

21 Jul '21

As the test_VarParseNumFromStrMisc() tests show the converse is not true. Note also that the " 1 000" test was failing as expected because in the French locale Wine was not recognizing regular spaces as thousands separators. Now it does and Wine incorrectly allows them before the first digit, just like it does for the English tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51450 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 32 +++++++++++++------------------- dlls/oleaut32/variant.c | 10 +++++++++- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d3a1a2e3a31..50af05e47cc 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1916,7 +1916,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Trailing thousands separators are allowed as usual */ - todo_wine_if(spaces[i] == ' ') EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(3,FAILDIG); } @@ -1949,7 +1948,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Non-breaking space and regular spaces work */ - todo_wine_if(i == 0) EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -1965,34 +1963,31 @@ static void test_VarParseNumFromStrFr(void) /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1 001,0", NUMPRS_THOUSANDS); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(4,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,0); - todo_wine ok(np.cDig == 4, "Expected cDig = 4, got %d\n", np.cDig); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,0); - todo_wine EXPECTRGB(2,0); - todo_wine EXPECTRGB(3,1); + EXPECT2(1,0); + EXPECTRGB(2,0); + EXPECTRGB(3,1); EXPECTRGB(4,FAILDIG); /* With flag, consecutive thousands separators are allowed */ CONVERT("1 000", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, thousands separators can be sprinkled at random */ CONVERT("1 00 0 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, but leading thousands separators are not allowed */ CONVERT(" 1 000", NUMPRS_THOUSANDS); - EXPECTFAIL; + todo_wine EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(1,FAILDIG); @@ -2039,7 +2034,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine_if(i==0) EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2067,12 +2062,11 @@ static void test_VarParseNumFromStrFr(void) /* Thousands flag can also be used with currency */ WCONVERT(L"1 234,5 \x20ac", NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL); - todo_wine EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,2); - todo_wine EXPECTRGB(2,3); - todo_wine EXPECTRGB(3,4); - todo_wine EXPECTRGB(4,5); + EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); + EXPECT2(1,2); + EXPECTRGB(2,3); + EXPECTRGB(3,4); + EXPECTRGB(4,5); EXPECTRGB(5,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 208d5b63c8f..fbcc8ce693f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1615,6 +1615,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla DWORD dwState = B_EXPONENT_START|B_INEXACT_ZEROS; int iMaxDigits = ARRAY_SIZE(rgbTmp); int cchUsed = 0; + OLECHAR cDigitSeparator2; TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); @@ -1634,6 +1635,10 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla return DISP_E_TYPEMISMATCH; VARIANT_GetLocalisedNumberChars(&chars, lcid, dwFlags); + /* Setting the thousands separator to a non-breaking space implies regular + * spaces are allowed too. But the converse is not true. + */ + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; /* First consume all the leading symbols and space from the string */ while (1) @@ -1674,6 +1679,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; chars.cDigitSeparator = chars.cCurrencyDigitSeparator; + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; } else if (pNumprs->dwInFlags & NUMPRS_PARENS && *lpszStr == '(' && !(pNumprs->dwOutFlags & NUMPRS_PARENS)) @@ -1781,7 +1787,9 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla cchUsed++; } } - else if (*lpszStr == chars.cDigitSeparator && pNumprs->dwInFlags & NUMPRS_THOUSANDS) + else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++; -- 2.20.1

1 2

[PATCH 1/3] include: Add D2D13DPerspectiveTransform definitions.
by Ziqing Hui 21 Jul '21

21 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/d2d1effects.idl | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index ee1dbe94728..5dde46cbb6a 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") +cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") +cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") typedef enum D2D1_BORDER_MODE { @@ -44,3 +45,26 @@ typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff } D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE; + +typedef enum D2D1_3DPERSPECTIVETRANSFORM_PROP +{ + D2D1_3DPERSPECTIVETRANSFORM_PROP_INTERPOLATION_MODE = 0x0, + D2D1_3DPERSPECTIVETRANSFORM_PROP_BORDER_MODE = 0x1, + D2D1_3DPERSPECTIVETRANSFORM_PROP_DEPTH = 0x2, + D2D1_3DPERSPECTIVETRANSFORM_PROP_PERSPECTIVE_ORIGIN = 0x3, + D2D1_3DPERSPECTIVETRANSFORM_PROP_LOCAL_OFFSET = 0x4, + D2D1_3DPERSPECTIVETRANSFORM_PROP_GLOBAL_OFFSET = 0x5, + D2D1_3DPERSPECTIVETRANSFORM_PROP_ROTATION_ORIGIN = 0x6, + D2D1_3DPERSPECTIVETRANSFORM_PROP_ROTATION = 0x7, + D2D1_3DPERSPECTIVETRANSFORM_PROP_FORCE_DWORD = 0xffffffff +} D2D1_3DPERSPECTIVETRANSFORM_PROP; + +typedef enum D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE +{ + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE; -- 2.25.1

2 3

[PATCH] gdi32: Fix double-free on repeated calls to Delete[Enh]MetaFile.
by Daniel Lehman 21 Jul '21

21 Jul '21

2 2

[PATCH 1/2] mf/session: Add a helper to send events while completing commands.
by Nikolay Sivov 21 Jul '21

21 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 91d8f0cac87..80cc8ab7135 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -826,6 +826,13 @@ static void session_command_complete(struct media_session *session) } } +static void session_command_complete_with_event(struct media_session *session, MediaEventType event, + HRESULT status, const PROPVARIANT *param) +{ + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event, &GUID_NULL, status, param); + session_command_complete(session); +} + static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) { struct media_source *source; @@ -863,9 +870,7 @@ static void session_start(struct media_session *session, const GUID *time_format session_command_complete(session); break; default: - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStarted, &GUID_NULL, - MF_E_INVALIDREQUEST, NULL); - session_command_complete(session); + session_command_complete_with_event(session, MESessionStarted, MF_E_INVALIDREQUEST, NULL); break; } } @@ -911,8 +916,7 @@ static void session_set_paused(struct media_session *session, unsigned int state if (state != ~0u) session->state = state; if (SUCCEEDED(status)) session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, status, NULL); - session_command_complete(session); + session_command_complete_with_event(session, MESessionPaused, status, NULL); } static void session_set_closed(struct media_session *session, HRESULT status) @@ -920,8 +924,7 @@ static void session_set_closed(struct media_session *session, HRESULT status) session->state = SESSION_STATE_CLOSED; if (SUCCEEDED(status)) session_set_caps(session, session->caps & ~(MFSESSIONCAP_START | MFSESSIONCAP_SEEK)); - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, status, NULL); - session_command_complete(session); + session_command_complete_with_event(session, MESessionClosed, status, NULL); } static void session_pause(struct media_session *session) @@ -1007,8 +1010,7 @@ static void session_stop(struct media_session *session) hr = S_OK; /* fallthrough */ default: - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); - session_command_complete(session); + session_command_complete_with_event(session, MESessionStopped, hr, NULL); break; } } @@ -1077,9 +1079,7 @@ static void session_clear_topologies(struct media_session *session) hr = MF_E_INVALIDREQUEST; else session_clear_queued_topologies(session); - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared, - &GUID_NULL, hr, NULL); - session_command_complete(session); + session_command_complete_with_event(session, MESessionTopologiesCleared, hr, NULL); } static struct media_source *session_get_media_source(struct media_session *session, IMFMediaSource *source) -- 2.30.2

1 1

[PATCH] advapi32: Link to msvcrt.dll.
by Jacek Caban 21 Jul '21

21 Jul '21

Some applications expect msvcrt.dll to be pulled by system DLLs. On Windows, loading advapi32 causes msvcrt.dll to be loaded. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51465 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/advapi32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2] oleaut32/tests: Fix the Swiss franc and Moroccan dirham tests.
by Francois Gouget 21 Jul '21

21 Jul '21

Windows <= 8.1 uses an obsolete currency symbol for the Swiss Franc and Windows 8.1 incorrectly doubled the right-to-left mark in the Moroccan dirham. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Add a pair of todo_wine. The Swiss franc is a nice easy to read example of a three-character currency symbol while the Moroccan dirham is an example of a very long currency symbol (shows that Wine's cCurrencyLocal + cCurrencyLocal2 approach is impractical). --- dlls/oleaut32/tests/vartest.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c0c20dcf10f..eb799035425 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2164,14 +2164,26 @@ static void test_VarParseNumFromStrMisc(void) lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); - EXPECT2(3,FAILDIG); + /* Windows <= 8.1 uses an old currency symbol: "fr. 5" */ + todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); + if (hres == S_OK) + { + todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); + EXPECT2(3,FAILDIG); + } /* 5 Moroccan dirham */ lcid = MAKELCID(MAKELANGID(LANG_ARABIC,SUBLANG_ARABIC_MOROCCO),SORT_DEFAULT); WCONVERT(L"5\x62f.\x645.\x200f", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); - EXPECT2(5,FAILDIG); + /* Windows 8.1 incorrectly doubles the right-to-left mark: + * "\x62f.\x645.\x200f\x200f 5" + */ + todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); + if (hres == S_OK) + { + todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); + EXPECT2(5,FAILDIG); + } /* Test Arabic numerals in an Arabic locale */ -- 2.20.1

1 0

[PATCH] oleaut32/tests: Fix the Swiss franc and Moroccan dirham tests.
by Francois Gouget 21 Jul '21

21 Jul '21

Windows <= 8.1 uses an obsolete currency symbol for the Swiss Franc and Windows 8.1 incorrectly doubled the right-to-left mark in the Moroccan dirham. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The Swiss franc is a nice easy to read example of a three-character currency symbol while the Moroccan dirham is an example of a very long currency symbol (shows that Wine's cCurrencyLocal + cCurrencyLocal2 approach is impractical). --- dlls/oleaut32/tests/vartest.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c0c20dcf10f..df018c007d4 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2164,14 +2164,26 @@ static void test_VarParseNumFromStrMisc(void) lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); - EXPECT2(3,FAILDIG); + /* Windows <= 8.1 uses an old currency symbol: "fr. 5" */ + ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); + if (hres == S_OK) + { + todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,4,0,0); + EXPECT2(3,FAILDIG); + } /* 5 Moroccan dirham */ lcid = MAKELCID(MAKELANGID(LANG_ARABIC,SUBLANG_ARABIC_MOROCCO),SORT_DEFAULT); WCONVERT(L"5\x62f.\x645.\x200f", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); - EXPECT2(5,FAILDIG); + /* Windows 8.1 incorrectly doubles the right-to-left mark: + * "\x62f.\x645.\x200f\x200f 5" + */ + ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); + if (hres == S_OK) + { + todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); + EXPECT2(5,FAILDIG); + } /* Test Arabic numerals in an Arabic locale */ -- 2.20.1

2 2

[PATCH v2 10/10] gdi32: Use NtGdiAngleArc for AngleArc implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 6 ++---- 7 files changed, 24 insertions(+), 22 deletions(-)

2 1

[PATCH v2 09/10] gdi32: Use NtGdiRectangle for Rectangle implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------- dlls/gdi32/enhmfdrv/graphics.c | 59 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 15 +++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 7 ++-- 8 files changed, 62 insertions(+), 45 deletions(-)

2 1

[PATCH v2 08/10] gdi32: Use NtGdiRoundRect for RoundRect implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 15 +------- dlls/gdi32/enhmfdrv/graphics.c | 62 ++++++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 22 ++++++++++++ dlls/gdi32/mfdrv/graphics.c | 10 +++--- dlls/gdi32/mfdrv/init.c | 13 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +-- dlls/gdi32/painting.c | 8 ++--- 8 files changed, 89 insertions(+), 49 deletions(-)

2 1

[PATCH v2 07/10] gdi32: Use NtGdiEllipse for Ellipse implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------- dlls/gdi32/enhmfdrv/graphics.c | 59 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 15 +++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++-- dlls/gdi32/mfdrv/init.c | 11 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 3 +- dlls/gdi32/painting.c | 7 ++-- 8 files changed, 73 insertions(+), 45 deletions(-)

2 1

[PATCH v2 06/10] gdi32: Handle EMFs directly in arc functions.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 60 +++---------------------------- dlls/gdi32/enhmfdrv/graphics.c | 66 ++++++++++++++++++++++++---------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 28 +++++++++++++++ 4 files changed, 83 insertions(+), 74 deletions(-)

2 1

[PATCH v2 05/10] gdi32: Store graphics mode in DC_ATTR.
by Jacek Caban 21 Jul '21

21 Jul '21

2 1

[PATCH v2 04/10] gdi32: Handle EMFs directly in MoveToEx.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 7 ++++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++++ 6 files changed, 11 insertions(+), 17 deletions(-)

2 1

[PATCH v2 03/10] gdi32: Use DC_ATTR for GetCurrentPositionEx implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 13 ------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/tests/metafile.c | 3 +++ 3 files changed, 14 insertions(+), 13 deletions(-)

2 1

[PATCH v2 02/10] gdi32: Handle EMFs recording directly in LineTo implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/graphics.c | 28 +++++++++++++++------------- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 12 ++++++++++-- dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/objects.c | 2 +- include/ntgdi.h | 1 + 7 files changed, 45 insertions(+), 28 deletions(-)

2 1

[PATCH v2 01/10] gdi32/tests: Silence noisy traces.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 112 +++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 47 deletions(-)

2 1

[PATCH] oleaut32/tests: Remove unneeded casts in vartest.
by Francois Gouget 21 Jul '21

21 Jul '21

The error codes are already defined with an HRESULT cast so there is no need to cast them again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index df018c007d4..3822bb62dec 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1288,8 +1288,8 @@ static HRESULT convert_str( const char *str, INT dig, ULONG flags, static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, INT d, INT e, INT f ) { - ok_(__FILE__,line)(hres == (HRESULT)S_OK, "returned %08x\n", hres); - if (hres == (HRESULT)S_OK) + ok_(__FILE__,line)(hres == S_OK, "returned %08x\n", hres); + if (hres == S_OK) { ok_(__FILE__,line)(np->cDig == a, "Expected cDig = %d, got %d\n", a, np->cDig); ok_(__FILE__,line)(np->dwInFlags == b, "Expected dwInFlags = 0x%x, got 0x%x\n", b, np->dwInFlags); @@ -1306,7 +1306,7 @@ static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULON #define CONVERT(str,flags) CONVERTN(str,sizeof(rgb),flags) #define EXPECT(a,b,c,d,e,f) expect_NumFromStr( __LINE__, hres, &np, a, b, c, d, e, f ) #define EXPECTRGB(a,b) ok(rgb[a] == b, "Digit[%d], expected %d, got %d\n", a, b, rgb[a]) -#define EXPECTFAIL ok(hres == (HRESULT)DISP_E_TYPEMISMATCH, "Call succeeded, hres = %08x\n", hres) +#define EXPECTFAIL ok(hres == DISP_E_TYPEMISMATCH, "Call succeeded, hres = %08x\n", hres) #define EXPECT2(a,b) EXPECTRGB(0,a); EXPECTRGB(1,b) static void test_VarParseNumFromStrEn(void) @@ -2202,10 +2202,10 @@ static HRESULT (WINAPI *pVarNumFromParseNum)(NUMPARSE*,BYTE*,ULONG,VARIANT*); np.cDig = (a); np.dwInFlags = (b); np.dwOutFlags = (c); np.cchUsed = (d); \ np.nBaseShift = (e); np.nPwr10 = (f); hres = pVarNumFromParseNum(&np, rgb, bits, &vOut) static const char *szFailOverflow = "Expected overflow, hres = %08x\n"; -#define EXPECT_OVERFLOW ok(hres == (HRESULT)DISP_E_OVERFLOW, szFailOverflow, hres) +#define EXPECT_OVERFLOW ok(hres == DISP_E_OVERFLOW, szFailOverflow, hres) static const char *szFailOk = "Call failed, hres = %08x\n"; -#define EXPECT_OK ok(hres == (HRESULT)S_OK, szFailOk, hres); \ - if (hres == (HRESULT)S_OK) +#define EXPECT_OK ok(hres == S_OK, szFailOk, hres); \ + if (hres == S_OK) #define EXPECT_TYPE(typ) ok(V_VT(&vOut) == typ,"Expected Type = " #typ ", got %d\n", V_VT(&vOut)) #define EXPECT_I1(val) EXPECT_OK { EXPECT_TYPE(VT_I1); \ ok(V_I1(&vOut) == val, "Expected i1 = %d, got %d\n", (signed char)val, V_I1(&vOut)); } -- 2.20.1

1 0

[PATCH 4/4 v2] msvcrt: Introduce fenv_encode helper in all runtime versions.
by Piotr Caban 21 Jul '21

21 Jul '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-)

1 0

[PATCH 3/4 v2] msvcrt: Don't set x87 control word in x86_64 fesetenv.
by Piotr Caban 21 Jul '21

21 Jul '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH 2/4 v2] msvcrt: Introduce fenv_decode helper in all runtime versions.
by Piotr Caban 21 Jul '21

21 Jul '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4 v2] msvcrt: Use _MCW_RC rounding mask in fesetround and fegetround.
by Piotr Caban 21 Jul '21

21 Jul '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel