July 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d v4 1/5] vkd3d-shader: Allocate the $Params buffer in hlsl_ctx_init().
by Zebediah Figura 22 Jul '21

22 Jul '21

For clarity. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: No change. libs/vkd3d-shader/hlsl.c | 3 +++ libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 15 ++------------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0b8c660c..bc593f82 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1664,6 +1664,9 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->globals_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, hlsl_strdup(ctx, "$Globals"), NULL, ctx->location))) return false; + if (!(ctx->params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, + hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) + return false; ctx->cur_buffer = ctx->globals_buffer; return true; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b62e7818..e0045acf 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -456,7 +456,7 @@ struct hlsl_ctx struct list extern_vars; struct list buffers; - struct hlsl_buffer *cur_buffer, *globals_buffer; + struct hlsl_buffer *cur_buffer, *globals_buffer, *params_buffer; struct list types; struct rb_tree functions; const struct hlsl_ir_function_decl *cur_function; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6336ddfc..778d9dff 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1142,27 +1142,16 @@ static void calculate_buffer_offset(struct hlsl_ir_var *var) static void allocate_buffers(struct hlsl_ctx *ctx) { - struct hlsl_buffer *buffer, *params_buffer; + struct hlsl_buffer *buffer; struct hlsl_ir_var *var; uint32_t index = 0; - if (!(params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, - hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) - return; - - /* The $Globals and $Params buffers should be allocated first, before all - * explicit buffers. */ - list_remove(&params_buffer->entry); - list_add_head(&ctx->buffers, &params_buffer->entry); - list_remove(&ctx->globals_buffer->entry); - list_add_head(&ctx->buffers, &ctx->globals_buffer->entry); - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform) { if (var->is_param) - var->buffer = params_buffer; + var->buffer = ctx->params_buffer; calculate_buffer_offset(var); } -- 2.32.0

6 14

[PATCH vkd3d] vkd3d: Do not call vkCmdPushConstants() with a count of zero (KHRONOS_validation).
by Zebediah Figura 22 Jul '21

22 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 60c4b37c..bfb52cde 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4149,8 +4149,9 @@ static void d3d12_command_list_set_root_constants(struct d3d12_command_list *lis const struct d3d12_root_constant *c; c = root_signature_get_32bit_constants(root_signature, index); - VK_CALL(vkCmdPushConstants(list->vk_command_buffer, root_signature->vk_pipeline_layout, - c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data)); + if (count) + VK_CALL(vkCmdPushConstants(list->vk_command_buffer, root_signature->vk_pipeline_layout, + c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data)); } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3D12GraphicsCommandList2 *iface, -- 2.32.0

3 2

[PATCH 1/5] winegstreamer: Inline query_duration() into wg_parser_connect().
by Anton Baskanov 22 Jul '21

22 Jul '21

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/wg_parser.c | 44 ++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0d59297a026..acea68ad27d 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1496,26 +1496,6 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) return ret; } -static LONGLONG query_duration(GstPad *pad) -{ - gint64 duration, byte_length; - - if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) - return duration / 100; - - WARN("Failed to query time duration; trying to convert from byte length.\n"); - - /* To accurately get a duration for the stream, we want to only consider the - * length of that stream. Hence, query for the pad duration, instead of - * using the file duration. */ - if (gst_pad_query_duration(pad, GST_FORMAT_BYTES, &byte_length) - && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) - return duration / 100; - - ERR("Failed to query duration.\n"); - return 0; -} - static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_size) { GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", @@ -1552,6 +1532,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s for (i = 0; i < parser->stream_count; ++i) { struct wg_parser_stream *stream = parser->streams[i]; + gint64 duration, byte_length; while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); @@ -1565,7 +1546,28 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s * avidemux, wavparse, qtdemux) in practice record duration before * fixing caps, so as a heuristic, wait until we get caps before trying * to query for duration. */ - stream->duration = query_duration(stream->their_src); + if (gst_pad_query_duration(stream->their_src, GST_FORMAT_TIME, &duration)) + { + stream->duration = duration / 100; + } + else + { + WARN("Failed to query time duration; trying to convert from byte length.\n"); + + /* To accurately get a duration for the stream, we want to only consider the + * length of that stream. Hence, query for the pad duration, instead of + * using the file duration. */ + if (gst_pad_query_duration(stream->their_src, GST_FORMAT_BYTES, &byte_length) + && gst_pad_query_convert(stream->their_src, GST_FORMAT_BYTES, byte_length, + GST_FORMAT_TIME, &duration)) + { + stream->duration = duration / 100; + } + else + { + ERR("Failed to query duration.\n"); + } + } } pthread_mutex_unlock(&parser->mutex); -- 2.25.1

2 9

[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