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

[PATCH 1/5] wined3d: Map resources through wined3d_device_context_ops.
by Zebediah Figura 13 Apr '21

13 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 22 +++++++++++++++------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/wined3d_private.h | 9 +++++---- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 32ea900e27d..bb11851c1be 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2279,9 +2279,11 @@ static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) op->sub_resource_idx, op->map_desc, op->box, op->flags); } -HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) +static HRESULT wined3d_cs_map(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, + unsigned int flags) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_map *op; HRESULT hr; @@ -2289,7 +2291,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, * increasing the map count would be visible to applications. */ wined3d_not_from_cs(cs); - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2298,7 +2300,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, op->flags = flags; op->hr = &hr; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2312,20 +2314,22 @@ static void wined3d_cs_exec_unmap(struct wined3d_cs *cs, const void *data) *op->hr = resource->resource_ops->resource_sub_resource_unmap(resource, op->sub_resource_idx); } -HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx) +static HRESULT wined3d_cs_unmap(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_unmap *op; HRESULT hr; wined3d_not_from_cs(cs); - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; op->hr = &hr; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2790,6 +2794,8 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_st_submit, wined3d_cs_st_finish, wined3d_cs_st_push_constants, + wined3d_cs_map, + wined3d_cs_unmap, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2911,6 +2917,8 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_submit, wined3d_cs_mt_finish, wined3d_cs_mt_push_constants, + wined3d_cs_map, + wined3d_cs_unmap, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f2dc9ad095..6c937fa79b2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -376,14 +376,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i flags = wined3d_resource_sanitise_map_flags(resource, flags); wined3d_resource_wait_idle(resource); - return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags); + return resource->device->cs->c.ops->map(&resource->device->cs->c, resource, sub_resource_idx, map_desc, box, flags); } HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); - return wined3d_cs_unmap(resource->device->cs, resource, sub_resource_idx); + return resource->device->cs->c.ops->unmap(&resource->device->cs->c, resource, sub_resource_idx); } void CDECL wined3d_resource_preload(struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34ec814685c..26d3efda24d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4686,6 +4686,11 @@ struct wined3d_device_context_ops void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); + HRESULT (*map)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, + unsigned int flags); + HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx); }; struct wined3d_device_context @@ -4755,10 +4760,6 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; -HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; -HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, - unsigned int sub_resource_idx) DECLSPEC_HIDDEN; static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { -- 2.30.2

3 11

[PATCH] wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT
by Andrew Sheldon 13 Apr '21

13 Apr '21

Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7287b333f97..0a3c547e7a9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -514,6 +514,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34ec814685c..af7237ae4f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,6 +2903,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, + CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, -- 2.26.3

2 1

[PATCH] d2d1: Remove unnecessary return statements.
by Nikolay Sivov 13 Apr '21

13 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b65727d3a32..5f081a1c12d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -639,7 +639,7 @@ static void STDMETHODCALLTYPE d2d_factory_mt_Enter(ID2D1Multithread *iface) TRACE("%p.\n", iface); - return EnterCriticalSection(&factory->cs); + EnterCriticalSection(&factory->cs); } static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) @@ -648,7 +648,7 @@ static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) TRACE("%p.\n", iface); - return LeaveCriticalSection(&factory->cs); + LeaveCriticalSection(&factory->cs); } static BOOL STDMETHODCALLTYPE d2d_factory_st_GetMultithreadProtected(ID2D1Multithread *iface) -- 2.30.2

2 1

[PATCH] winemac.drv: Fix setting DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag on adapters.
by Piotr Caban 13 Apr '21

13 Apr '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[tools] testbot/Janitor: Round the file age down when purging.
by Francois Gouget 13 Apr '21

13 Apr '21

There is not much point in rounding to nearest and rounding down is simpler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Obsolete files will stay around an extra 12 hours on average. That shouldn't make any difference. --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 35a7e5d4f..c68920e7c 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -269,7 +269,7 @@ if (opendir(my $dh, "$DataDir/staging")) $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; - my $Age = int((-M $FileName) + 0.5); + my $Age = int(-M $FileName); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # FIXME: There are still some obsolete unexpired 31 characters session ids. @@ -326,7 +326,7 @@ if (opendir(my $dh, "$DataDir/latest")) $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); + my $Age = int(-M $FileName); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() -- 2.20.1

1 0

[tools] testbot/web: Left-align the text in the legend box.
by Francois Gouget 13 Apr '21

13 Apr '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is probably a bit more readable than centered text. --- testbot/web/Stats.pl | 2 +- testbot/web/admin/VMDetails.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index bf7f9baf3..803fc59f9 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -421,7 +421,7 @@ sub GenerateFooter($) print "<p></p><div class='CollectionBlock'><table>\n"; print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; - print "<tbody><tr><td class='Record'>\n"; + print "<tbody><tr><td>\n"; print "<p>The <b>Job rate</b> and <b>Task rate</b> show the average hourly rate at which jobs / tasks are submitted to the TestBot. The <b>Revert rate</b> shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.</p>\n"; print "<p>The <b>Busy time</b> indicates how long the TestBot had at least one pending task and the <b>Busy %</b> shows how much of the wall clock time this represents. Note that the busy percentage and average <b>Job completion</b> times can be optimized by balancing the load on the different VM hosts.</p>\n"; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 27ffd2f38..19983c643 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -72,7 +72,7 @@ sub GenerateFooter($) my ($self) = @_; print "<p></p><div class='CollectionBlock'><table>\n"; print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; - print "<tbody><tr><td class='Record'>\n"; + print "<tbody><tr><td>\n"; print "<p>The <b>Missions</b> syntax is <i>mission1:mission2:...|mission3|...</i> where <i>mission1</i> and <i>mission2</i> will be run in the same task, and <i>mission3</i> in a separate task.<br>\n"; print "Each mission is composed of a build and options separated by commas: <i>build,option1=value,option2,...</i>. The value can be omitted for boolean options and defaults to true.<br>\n"; -- 2.20.1

1 0

[tools] winetest/build-index: Streamline the build check.
by Francois Gouget 13 Apr '21

13 Apr '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-index | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 2d25f2cb3..a469dfb6d 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -218,10 +218,12 @@ my @too_old; opendir(DIR, "data") or die "could not open the 'data' directory: $!"; foreach my $build (readdir(DIR)) { - next if ($build =~ /^(\.\.?|index\.html|errors\.html|tests)$/); if ($build !~ /^[0-9a-f]{40}$/) { - error("'data/$build' is not a valid build directory\n"); + if ($build !~ /^(\.\.?|errors\.html|index\.html|tests)$/) + { + error("'data/$build' is not a valid build directory\n"); + } next; } next unless -f "data/$build/index.html"; -- 2.20.1

1 0

[tools] winetest/gather: Fix the name of a generated file in a comment.
by Francois Gouget 13 Apr '21

13 Apr '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index a0a6d378f..a3a0a6533 100755 --- a/winetest/gather +++ b/winetest/gather @@ -905,7 +905,7 @@ EOF # -# Write the data/BUILD/totals.txt file +# Write the data/BUILD/total.txt file # This provides the statistics for the main index page. # -- 2.20.1

1 0

[PATCH 1/7] mfplay: Partially implement SetMediaItem().
by Nikolay Sivov 13 Apr '21

13 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 138 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 132 insertions(+), 6 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0c72395ab1e..7360042ee54 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -28,8 +29,12 @@ #include "wine/debug.h" +#include "initguid.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +DEFINE_GUID(_MF_TOPO_MEDIA_ITEM, 0x6c1bb4df, 0x59ba, 0x4020, 0x85, 0x0c, 0x35, 0x79, 0xa2, 0x7a, 0xe2, 0x51); + static const WCHAR eventclassW[] = L"MediaPlayerEventCallbackClass"; static LONG startup_refcount; @@ -549,6 +554,14 @@ static const IMFPMediaItemVtbl media_item_vtbl = media_item_GetMetadata, }; +static struct media_item *unsafe_impl_from_IMFPMediaItem(IMFPMediaItem *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (IMFPMediaItemVtbl *)&media_item_vtbl); + return CONTAINING_RECORD(iface, struct media_item, IMFPMediaItem_iface); +} + static HRESULT create_media_item(IMFPMediaPlayer *player, DWORD_PTR user_data, struct media_item **item) { struct media_item *object; @@ -822,11 +835,106 @@ static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *if return E_NOTIMPL; } -static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item) +static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) { - FIXME("%p, %p.\n", iface, item); + IMFMediaTypeHandler *handler; + HRESULT hr; - return E_NOTIMPL; + if (SUCCEEDED(hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler))) + { + hr = IMFMediaTypeHandler_GetMajorType(handler, major); + IMFMediaTypeHandler_Release(handler); + } + + return hr; +} + +static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) +{ + IMFTopologyNode *src_node, *sink_node; + IMFActivate *sar_activate; + IMFStreamDescriptor *sd; + IMFTopology *topology; + unsigned int idx; + BOOL selected; + HRESULT hr; + GUID major; + + if (FAILED(hr = MFCreateTopology(&topology))) + return hr; + + /* FIXME: handle user sinks */ + + /* Use first stream if none selected. */ + if (player->output_window) + { + FIXME("Video streams are not handled.\n"); + } + + /* Set up audio branches for all selected streams. */ + + idx = 0; + while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) + { + if (selected && SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + { + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node))) + { + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + + IMFTopology_AddNode(topology, src_node); + } + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node))) + { + if (SUCCEEDED(MFCreateAudioRendererActivate(&sar_activate))) + { + IMFTopologyNode_SetObject(sink_node, (IUnknown *)sar_activate); + IMFActivate_Release(sar_activate); + } + + IMFTopology_AddNode(topology, sink_node); + } + + if (src_node && sink_node) + IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + + if (src_node) + IMFTopologyNode_Release(src_node); + if (sink_node) + IMFTopologyNode_Release(sink_node); + } + + IMFStreamDescriptor_Release(sd); + } + + *out = topology; + + return S_OK; +} + +static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item_iface) +{ + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + struct media_item *item = unsafe_impl_from_IMFPMediaItem(item_iface); + IMFTopology *topology; + HRESULT hr; + + TRACE("%p, %p.\n", iface, item_iface); + + if (item->player != iface) + return E_INVALIDARG; + + if (FAILED(hr = media_item_create_topology(player, item, &topology))) + return hr; + + IMFTopology_SetUnknown(topology, &_MF_TOPO_MEDIA_ITEM, (IUnknown *)item_iface); + hr = IMFMediaSession_SetTopology(player->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); + IMFTopology_Release(topology); + + return hr; } static HRESULT WINAPI media_player_ClearMediaItem(IMFPMediaPlayer *iface) @@ -1267,6 +1375,8 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba MFP_MEDIAPLAYER_STATE state; MFP_EVENT_TYPE event_type; HRESULT hr, event_status; + IMFPMediaItem *item = NULL; + IMFTopology *topology; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; @@ -1274,6 +1384,12 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent_GetType(session_event, &session_event_type); IMFMediaEvent_GetStatus(session_event, &event_status); + if (SUCCEEDED(IMFMediaSession_GetFullTopology(player->session, MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology))) + { + IMFTopology_GetUnknown(topology, &_MF_TOPO_MEDIA_ITEM, &IID_IMFPMediaItem, (void **)&item); + IMFTopology_Release(topology); + } + switch (session_event_type) { case MESessionStarted: @@ -1302,17 +1418,27 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba /* FIXME: set pMediaItem */ media_player_queue_event(player, event); - IUnknown_Release(&event->IUnknown_iface); + + break; + + case MESessionTopologySet: + + media_event_create(player, MFP_EVENT_TYPE_MEDIAITEM_SET, event_status, &event); + event->u.generic.item = item; + if (event->u.generic.item) + IMFPMediaItem_AddRef(event->u.generic.item); + media_player_queue_event(player, event); break; default: ; } + if (item) + IMFPMediaItem_Release(item); + if (event) - { IUnknown_Release(&event->IUnknown_iface); - } IMFMediaSession_BeginGetEvent(player->session, &player->session_events_callback, NULL); IMFMediaEvent_Release(session_event); -- 2.30.2

2 13

[PATCH] ntdll: Initialize nt_name before using it.
by Zhiyi Zhang 13 Apr '21

13 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50979 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 28d2be0b770..6819342987c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1484,6 +1484,7 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; + init_unicode_string( &nt_name, *image ); loadorder = get_load_order( &nt_name ); status = open_main_image( *image, module, &main_image_info, loadorder ); if (status != STATUS_DLL_NOT_FOUND) return status; -- 2.27.0

1 0