February 2024 - Wine-Commits

Zhiyi Zhang : mf/tests: Add a create_test_topology() helper.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: c1223d0be0d566cc520a1fba2734877537d5058c URL: https://gitlab.winehq.org/wine/wine/-/commit/c1223d0be0d566cc520a1fba273487… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 8 15:24:34 2023 +0800 mf/tests: Add a create_test_topology() helper. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/mf/tests/mf.c | 80 +++++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 902d0ffa8c0..44a6d6bd1af 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4997,6 +4997,48 @@ static void test_sample_grabber_is_mediatype_supported(void) IMFSampleGrabberSinkCallback_Release(grabber_callback); } +/* create a test topology with the specified source and sink */ +static IMFTopology *create_test_topology(IMFMediaSource *source, IMFActivate *sink_activate) +{ + IMFTopologyNode *src_node, *sink_node; + IMFPresentationDescriptor *pd; + IMFTopology *topology = NULL; + IMFStreamDescriptor *sd; + BOOL selected; + HRESULT hr; + + hr = MFCreateTopology(&topology); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopology_AddNode(topology, sink_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopology_AddNode(topology, src_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(selected, "got selected %u.\n", !!selected); + init_source_node(source, -1, src_node, pd, sd); + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate); + ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr); + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER); + ok(hr == S_OK, "Failed to set connect method, hr %#lx.\n", hr); + hr = IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(pd); + IMFTopologyNode_Release(src_node); + IMFTopologyNode_Release(sink_node); + return topology; +} + static void test_sample_grabber_orientation(GUID subtype) { media_type_desc video_rgb32_desc = @@ -5006,17 +5048,13 @@ static void test_sample_grabber_orientation(GUID subtype) }; struct test_grabber_callback *grabber_callback; - IMFTopologyNode *src_node, *sink_node; - IMFPresentationDescriptor *pd; IMFAsyncCallback *callback; IMFActivate *sink_activate; IMFMediaType *output_type; IMFMediaSession *session; - IMFStreamDescriptor *sd; IMFMediaSource *source; IMFTopology *topology; PROPVARIANT propvar; - BOOL selected; HRESULT hr; DWORD res; @@ -5040,30 +5078,6 @@ static void test_sample_grabber_orientation(GUID subtype) hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - - hr = MFCreateTopology(&topology); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFTopology_AddNode(topology, sink_node); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFTopology_AddNode(topology, src_node); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - - hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); - ok(selected, "got selected %u.\n", !!selected); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - init_source_node(source, -1, src_node, pd, sd); - IMFTopologyNode_Release(src_node); - IMFPresentationDescriptor_Release(pd); - IMFStreamDescriptor_Release(sd); - hr = MFCreateMediaType(&output_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_media_type(output_type, video_rgb32_desc, -1); @@ -5071,15 +5085,7 @@ static void test_sample_grabber_orientation(GUID subtype) ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr); IMFMediaType_Release(output_type); - hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)sink_activate); - ok(hr == S_OK, "Failed to set object, hr %#lx.\n", hr); - hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER); - ok(hr == S_OK, "Failed to set connect method, hr %#lx.\n", hr); - IMFTopologyNode_Release(sink_node); - - hr = IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - + topology = create_test_topology(source, sink_activate); hr = IMFMediaSession_SetTopology(session, 0, topology); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFTopology_Release(topology);

1 0

Zhiyi Zhang : mf: Add a session_flush_nodes() helper.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 8173d3b0ab3c620aaaa73b114b22826d2c4c20c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8173d3b0ab3c620aaaa73b114b2282… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 16 15:17:58 2023 +0800 mf: Add a session_flush_nodes() helper. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/mf/session.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d06002481c4..b477f79896f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -912,6 +912,19 @@ static HRESULT session_subscribe_sources(struct media_session *session) return hr; } +static void session_flush_nodes(struct media_session *session) +{ + struct topo_node *node; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == MF_TOPOLOGY_OUTPUT_NODE) + IMFStreamSink_Flush(node->object.sink_stream); + else if (node->type == MF_TOPOLOGY_TRANSFORM_NODE) + IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_COMMAND_FLUSH, 0); + } +} + static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) { struct media_source *source; @@ -2879,7 +2892,6 @@ static void session_set_source_object_state(struct media_session *session, IUnkn struct media_source *src; struct media_sink *sink; enum object_state state; - struct topo_node *node; BOOL changed = FALSE; DWORD i, count; HRESULT hr; @@ -2975,21 +2987,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED)) break; - LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) - { - switch (node->type) - { - case MF_TOPOLOGY_OUTPUT_NODE: - IMFStreamSink_Flush(node->object.sink_stream); - break; - case MF_TOPOLOGY_TRANSFORM_NODE: - IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_COMMAND_FLUSH, 0); - break; - default: - ; - } - } - + session_flush_nodes(session); session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); if (session->presentation.flags & SESSION_FLAG_FINALIZE_SINKS)

1 0

Zhiyi Zhang : mf/tests: Test IMFMediaSession::Start().
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 6b853a9354dfe62df838b255b4af33b423e74642 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b853a9354dfe62df838b255b4af33… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 7 11:52:20 2023 +0800 mf/tests: Test IMFMediaSession::Start(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/mf/tests/mf.c | 960 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 952 insertions(+), 8 deletions(-)

1 0

Yuxuan Shui : dmusic: Fix loading wave data from soundfont.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: fa145fd5177c84c26dd48f9da7bed80609a06179 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa145fd5177c84c26dd48f9da7bed8… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Feb 6 17:28:47 2024 +0000 dmusic: Fix loading wave data from soundfont. --- dlls/dmusic/wave.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index f741cff1418..2c8ccbc2170 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -345,6 +345,7 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDir struct wave *This; IStream *stream = NULL; IDirectMusicObject *iface; + const LARGE_INTEGER zero = { .QuadPart = 0 }; TRACE("(%p, %u, %p)\n", soundfont, index, ret_iface); @@ -368,6 +369,7 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDir if (FAILED(hr = CreateStreamOnHGlobal(NULL, TRUE, &stream))) goto failed; offset = sf_sample->start * format->nBlockAlign / format->nChannels; if (FAILED(hr = IStream_Write(stream, soundfont->sdta + offset, data_size, &data_size))) goto failed; + if (FAILED(hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL))) goto failed; if (FAILED(hr = wave_create(&iface))) goto failed;

1 0

Georg Lehmann : winevulkan: Enable VK_ARM_render_pass_striped.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 05a0da8ab98af4ae0290643d42c5251a73f886a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/05a0da8ab98af4ae0290643d42c525… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sat Feb 3 17:35:51 2024 +0100 winevulkan: Enable VK_ARM_render_pass_striped. --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 182 +++++++++++++++++++++++++++++++++++++++- include/wine/vulkan.h | 45 ++++++++++ 3 files changed, 223 insertions(+), 5 deletions(-)

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.277.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: ea890c4733db5119fdb63b900bb7e5c8d04b5245 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea890c4733db5119fdb63b900bb7e5… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sat Feb 3 17:34:27 2024 +0100 winevulkan: Update to VK spec version 1.3.277. --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/loader_thunks.c | 116 +++- dlls/winevulkan/loader_thunks.h | 90 ++- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan.c | 26 + dlls/winevulkan/vulkan_thunks.c | 1460 ++++++++++++++++++++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.h | 34 +- dlls/winevulkan/winevulkan.json | 2 +- dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 392 +++++++++-- include/wine/vulkan_driver.h | 2 +- 11 files changed, 1938 insertions(+), 193 deletions(-)

1 0

Georg Lehmann : winevulkan: Prepare for VK_KHR_calibrated_timestamps.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: db03d2be88d80195635188cb51507f4c2d9c2b13 URL: https://gitlab.winehq.org/wine/wine/-/commit/db03d2be88d80195635188cb51507f… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sat Feb 3 17:23:52 2024 +0100 winevulkan: Prepare for VK_KHR_calibrated_timestamps. --- dlls/winevulkan/vulkan.c | 65 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 240ba3e8618..282c17f430e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1325,17 +1325,19 @@ static inline uint64_t convert_timestamp(VkTimeDomainEXT host_domain, VkTimeDoma return value; } -VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_count, - const VkCalibratedTimestampInfoEXT *timestamp_infos, - uint64_t *timestamps, uint64_t *max_deviation) +static VkResult wine_vk_get_timestamps(struct wine_device *device, uint32_t timestamp_count, + const VkCalibratedTimestampInfoEXT *timestamp_infos, + uint64_t *timestamps, uint64_t *max_deviation, + VkResult (*get_timestamps)(VkDevice, uint32_t, const VkCalibratedTimestampInfoEXT *, uint64_t *, uint64_t *)) { - struct wine_device *device = wine_device_from_handle(handle); VkCalibratedTimestampInfoEXT* host_timestamp_infos; unsigned int i; VkResult res; - TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation); - if (!(host_timestamp_infos = malloc(sizeof(VkCalibratedTimestampInfoEXT) * timestamp_count))) + if (timestamp_count == 0) + return VK_SUCCESS; + + if (!(host_timestamp_infos = calloc(sizeof(VkCalibratedTimestampInfoEXT), timestamp_count))) return VK_ERROR_OUT_OF_HOST_MEMORY; for (i = 0; i < timestamp_count; i++) @@ -1345,24 +1347,23 @@ VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_c host_timestamp_infos[i].timeDomain = map_to_host_time_domain(timestamp_infos[i].timeDomain); } - res = device->funcs.p_vkGetCalibratedTimestampsEXT(device->host_device, timestamp_count, host_timestamp_infos, - timestamps, max_deviation); - if (res != VK_SUCCESS) - return res; - - for (i = 0; i < timestamp_count; i++) - timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]); + res = get_timestamps(device->host_device, timestamp_count, host_timestamp_infos, timestamps, max_deviation); + if (res == VK_SUCCESS) + { + for (i = 0; i < timestamp_count; i++) + timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]); + } free(host_timestamp_infos); return res; } -VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice handle, - uint32_t *time_domain_count, - VkTimeDomainEXT *time_domains) +static VkResult wine_vk_get_time_domains(struct wine_phys_dev *phys_dev, + uint32_t *time_domain_count, + VkTimeDomainEXT *time_domains, + VkResult (*get_domains)(VkPhysicalDevice, uint32_t *, VkTimeDomainEXT *)) { - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); BOOL supports_device = FALSE, supports_monotonic = FALSE, supports_monotonic_raw = FALSE; const VkTimeDomainEXT performance_counter_domain = get_performance_counter_time_domain(); VkTimeDomainEXT *host_time_domains; @@ -1373,16 +1374,14 @@ VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice ha VkResult res; /* Find out the time domains supported on the host */ - res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->host_physical_device, - &host_time_domain_count, NULL); + res = get_domains(phys_dev->host_physical_device, &host_time_domain_count, NULL); if (res != VK_SUCCESS) return res; if (!(host_time_domains = malloc(sizeof(VkTimeDomainEXT) * host_time_domain_count))) return VK_ERROR_OUT_OF_HOST_MEMORY; - res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->host_physical_device, - &host_time_domain_count, host_time_domains); + res = get_domains(phys_dev->host_physical_device, &host_time_domain_count, host_time_domains); if (res != VK_SUCCESS) { free(host_time_domains); @@ -1432,6 +1431,30 @@ VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice ha return res; } +VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_count, + const VkCalibratedTimestampInfoEXT *timestamp_infos, + uint64_t *timestamps, uint64_t *max_deviation) +{ + struct wine_device *device = wine_device_from_handle(handle); + + TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation); + + return wine_vk_get_timestamps(device, timestamp_count, timestamp_infos, timestamps, max_deviation, + device->funcs.p_vkGetCalibratedTimestampsEXT); +} + +VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice handle, + uint32_t *time_domain_count, + VkTimeDomainEXT *time_domains) +{ + struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); + + TRACE("%p, %p, %p\n", phys_dev, time_domain_count, time_domains); + + return wine_vk_get_time_domains(phys_dev, time_domain_count, time_domains, + phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT); +} + void wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, const VkPhysicalDeviceExternalSemaphoreInfo *info, VkExternalSemaphoreProperties *properties)

1 0

Zhiyi Zhang : mf: Make session_get_node_object() more robust.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: a00b30bfbf499679cb5fc356e5fdb7f9c4334dfb URL: https://gitlab.winehq.org/wine/wine/-/commit/a00b30bfbf499679cb5fc356e5fdb7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 7 17:30:05 2023 +0800 mf: Make session_get_node_object() more robust. It's possible that a state object pointer not in the topology node collection gets passed to session_get_node_object(). Instead of returning the last node when the object is not found, we should return a NULL so that the state of the last node is not changed by mistake. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/mf/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index db742350161..d06002481c4 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2851,10 +2851,10 @@ static struct topo_node *session_get_node_object(struct media_session *session, LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) { if (node->type == node_type && object == node->object.object) - break; + return node; } - return node; + return NULL; } static BOOL session_set_node_object_state(struct media_session *session, IUnknown *object,

1 0

Giovanni Mascellani : d2d1: Compile vertex shaders with D3DCompile().
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 06482e324ca17e7b7081934891b57d9099fba4fd URL: https://gitlab.winehq.org/wine/wine/-/commit/06482e324ca17e7b7081934891b57d… Author: Giovanni Mascellani <giovanni(a)mascellani.eu> Date: Sat Feb 3 14:50:57 2024 +0100 d2d1: Compile vertex shaders with D3DCompile(). --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/device.c | 733 ++++++++++++++++---------------------------------- 2 files changed, 232 insertions(+), 503 deletions(-)

1 0

Paul Gofman : explorer: Don't pop start menu on "undo minimize all windows" systray command.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 5da459f1f2471365bc98078be1a3a1f84ef1a3dd URL: https://gitlab.winehq.org/wine/wine/-/commit/5da459f1f2471365bc98078be1a3a1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 6 10:04:09 2024 -0600 explorer: Don't pop start menu on "undo minimize all windows" systray command. --- dlls/user32/tests/win.c | 5 +++++ programs/explorer/systray.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 26b1f0098dd..1b03e64181a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -13034,6 +13034,7 @@ static void test_WM_NCCALCSIZE(void) } #define TRAY_MINIMIZE_ALL 419 +#define TRAY_MINIMIZE_ALL_UNDO 416 static void test_shell_tray(void) { @@ -13056,6 +13057,10 @@ static void test_shell_tray(void) flush_events( TRUE ); todo_wine ok( IsIconic( hwnd ), "window is not minimized.\n" ); + SendMessageA( traywnd, WM_COMMAND, TRAY_MINIMIZE_ALL_UNDO, 0xdeadbeef ); + flush_events( TRUE ); + ok( !IsIconic( hwnd ), "window is minimized.\n" ); + DestroyWindow(hwnd); } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 99a5a99490d..43187db30b5 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); #define TRAY_MINIMIZE_ALL 419 +#define TRAY_MINIMIZE_ALL_UNDO 416 struct notify_data /* platform-independent format for NOTIFYICONDATA */ { @@ -1064,7 +1065,7 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP case WM_COMMAND: if (HIWORD(wparam) == BN_CLICKED) { - if (LOWORD(wparam) == TRAY_MINIMIZE_ALL) + if (LOWORD(wparam) == TRAY_MINIMIZE_ALL || LOWORD(wparam) == TRAY_MINIMIZE_ALL_UNDO) { FIXME( "Shell command %u is not supported.\n", LOWORD(wparam) ); break;

1 0