September 2022 - Wine-Commits

Rémi Bernon : winegstreamer: Leave async reader callback_cs on calloc error.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 5bc7ad1c34dd5115a28e7d96e072b1acd2d9db74 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bc7ad1c34dd5115a28e7d96e072b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 10:53:02 2022 +0200 winegstreamer: Leave async reader callback_cs on calloc error. --- dlls/winegstreamer/wm_asyncreader.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 6f4aa303d82..1be7e493f99 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -287,15 +287,13 @@ static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_ { struct async_op *op; - EnterCriticalSection(&reader->callback_cs); - if (!(op = calloc(1, sizeof(*op)))) return E_OUTOFMEMORY; op->type = type; op->new_context = context; + EnterCriticalSection(&reader->callback_cs); list_add_tail(&reader->async_ops, &op->entry); - LeaveCriticalSection(&reader->callback_cs); WakeConditionVariable(&reader->callback_cv);

1 0

Rémi Bernon : winegstreamer: Leave WM reader CS on invalid output format.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 2a321ce324d84a2c143c96548b851375e48253ba URL: https://gitlab.winehq.org/wine/wine/-/commit/2a321ce324d84a2c143c96548b8513… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 14:41:20 2022 +0200 winegstreamer: Leave WM reader CS on invalid output format. --- dlls/winegstreamer/wm_reader.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 6c15413bba6..156f9d79446 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1764,6 +1764,7 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, struct output_props *props = unsafe_impl_from_IWMOutputMediaProps(props_iface); struct wg_format format, pref_format; struct wm_stream *stream; + HRESULT hr = S_OK; int i; strmbase_dump_media_type(&props->mt); @@ -1786,18 +1787,15 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, if (pref_format.major_type != format.major_type) { /* R.U.S.E sets the type of the wrong stream, apparently by accident. */ - LeaveCriticalSection(&reader->cs); - WARN("Major types don't match; returning NS_E_INCOMPATIBLE_FORMAT.\n"); - return NS_E_INCOMPATIBLE_FORMAT; + hr = NS_E_INCOMPATIBLE_FORMAT; } - - switch (pref_format.major_type) + else switch (pref_format.major_type) { case WG_MAJOR_TYPE_AUDIO: if (format.u.audio.format == WG_AUDIO_FORMAT_UNKNOWN) - return NS_E_AUDIO_CODEC_NOT_INSTALLED; - if (format.u.audio.channels > pref_format.u.audio.channels) - return NS_E_AUDIO_CODEC_NOT_INSTALLED; + hr = NS_E_AUDIO_CODEC_NOT_INSTALLED; + else if (format.u.audio.channels > pref_format.u.audio.channels) + hr = NS_E_AUDIO_CODEC_NOT_INSTALLED; break; case WG_MAJOR_TYPE_VIDEO: @@ -1805,16 +1803,23 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, if (format.u.video.format == video_formats[i]) break; if (i == ARRAY_SIZE(video_formats)) - return NS_E_INVALID_OUTPUT_FORMAT; - - if (pref_format.u.video.width != format.u.video.width) - return NS_E_INVALID_OUTPUT_FORMAT; - if (pref_format.u.video.height != format.u.video.height) - return NS_E_INVALID_OUTPUT_FORMAT; + hr = NS_E_INVALID_OUTPUT_FORMAT; + else if (pref_format.u.video.width != format.u.video.width) + hr = NS_E_INVALID_OUTPUT_FORMAT; + else if (pref_format.u.video.height != format.u.video.height) + hr = NS_E_INVALID_OUTPUT_FORMAT; break; default: - return NS_E_INCOMPATIBLE_FORMAT; + hr = NS_E_INCOMPATIBLE_FORMAT; + break; + } + + if (FAILED(hr)) + { + WARN("Unsupported media type, returning %#lx.\n", hr); + LeaveCriticalSection(&reader->cs); + return hr; } stream->format = format;

1 0

Rémi Bernon : winegstreamer: Move open_stream / close_stream helpers around.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: b600c85dae420b36695a02327b45e87747873842 URL: https://gitlab.winehq.org/wine/wine/-/commit/b600c85dae420b36695a02327b45e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 19:19:38 2022 +0200 winegstreamer: Move open_stream / close_stream helpers around. --- dlls/winegstreamer/wm_asyncreader.c | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 1be7e493f99..bd7e58713f4 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -247,25 +247,7 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) return 0; } -static HRESULT open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) -{ - IWMReaderCallback_AddRef((reader->callback = callback)); - reader->context = context; - - reader->running = true; - if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) - { - IWMReaderCallback_Release(reader->callback); - reader->running = false; - reader->callback = NULL; - reader->context = NULL; - return E_OUTOFMEMORY; - } - - return S_OK; -} - -static void close_stream(struct async_reader *reader) +static void async_reader_close(struct async_reader *reader) { struct async_op *op, *next; @@ -283,6 +265,24 @@ static void close_stream(struct async_reader *reader) } } +static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback *callback, void *context) +{ + IWMReaderCallback_AddRef((reader->callback = callback)); + reader->context = context; + + reader->running = true; + if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) + { + IWMReaderCallback_Release(reader->callback); + reader->running = false; + reader->callback = NULL; + reader->context = NULL; + return E_OUTOFMEMORY; + } + + return S_OK; +} + static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context) { struct async_op *op; @@ -345,7 +345,7 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, } if (SUCCEEDED(hr = wm_reader_open_file(&reader->reader, url)) - && FAILED(hr = open_stream(reader, callback, context))) + && FAILED(hr = async_reader_open(reader, callback, context))) wm_reader_close(&reader->reader); LeaveCriticalSection(&reader->reader.cs); @@ -362,7 +362,7 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) EnterCriticalSection(&reader->reader.cs); async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL); - close_stream(reader); + async_reader_close(reader); hr = wm_reader_close(&reader->reader); if (reader->callback) @@ -825,7 +825,7 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, } if (SUCCEEDED(hr = wm_reader_open_stream(&reader->reader, stream)) - && FAILED(hr = open_stream(reader, callback, context))) + && FAILED(hr = async_reader_open(reader, callback, context))) wm_reader_close(&reader->reader); LeaveCriticalSection(&reader->reader.cs); @@ -1686,7 +1686,7 @@ static void async_reader_destroy(struct wm_reader *iface) LeaveCriticalSection(&reader->callback_cs); WakeConditionVariable(&reader->callback_cv); - close_stream(reader); + async_reader_close(reader); reader->callback_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&reader->callback_cs);

1 0

Rémi Bernon : winegstreamer: Release callback and context in async_reader_close.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 8f482eba139b89805e34a2d2985109f17f625352 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f482eba139b89805e34a2d2985109… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 19:21:01 2022 +0200 winegstreamer: Release callback and context in async_reader_close. --- dlls/winegstreamer/wm_asyncreader.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index bd7e58713f4..2a2b7310293 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -263,24 +263,29 @@ static void async_reader_close(struct async_reader *reader) list_remove(&op->entry); free(op); } + + if (reader->callback) + IWMReaderCallback_Release(reader->callback); + reader->callback = NULL; + reader->context = NULL; } static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback *callback, void *context) { + HRESULT hr = E_OUTOFMEMORY; + IWMReaderCallback_AddRef((reader->callback = callback)); reader->context = context; reader->running = true; if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) - { - IWMReaderCallback_Release(reader->callback); - reader->running = false; - reader->callback = NULL; - reader->context = NULL; - return E_OUTOFMEMORY; - } + goto error; return S_OK; + +error: + async_reader_close(reader); + return hr; } static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context) @@ -365,9 +370,6 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) async_reader_close(reader); hr = wm_reader_close(&reader->reader); - if (reader->callback) - IWMReaderCallback_Release(reader->callback); - reader->callback = NULL; LeaveCriticalSection(&reader->reader.cs); @@ -1693,9 +1695,6 @@ static void async_reader_destroy(struct wm_reader *iface) wm_reader_close(&reader->reader); - if (reader->callback) - IWMReaderCallback_Release(reader->callback); - wm_reader_cleanup(&reader->reader); free(reader); }

1 0

Rémi Bernon : winegstreamer: Avoid waiting for callback thread on allocation failure.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 1b8590f47a7716a15bfc514b6597da7ea7ab89ad URL: https://gitlab.winehq.org/wine/wine/-/commit/1b8590f47a7716a15bfc514b6597da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 10:21:23 2022 +0200 winegstreamer: Avoid waiting for callback thread on allocation failure. --- dlls/winegstreamer/wm_asyncreader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 2a2b7310293..a5ab2167ab3 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -366,10 +366,11 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) EnterCriticalSection(&reader->reader.cs); - async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL); - async_reader_close(reader); - - hr = wm_reader_close(&reader->reader); + if (SUCCEEDED(hr = async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL))) + { + async_reader_close(reader); + hr = wm_reader_close(&reader->reader); + } LeaveCriticalSection(&reader->reader.cs);

1 0

Stefan Dösinger : wined3d: Tell vkd3d_shader about dual source blending.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 64effe6df7975a4d7942ed30ccd99da026582097 URL: https://gitlab.winehq.org/wine/wine/-/commit/64effe6df7975a4d7942ed30ccd99d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 5 11:50:01 2022 +0300 wined3d: Tell vkd3d_shader about dual source blending. Dual source blending implies an additional shader output, which needs to be declared. This improves WoT on high graphics settings on MoltenVK. --- dlls/wined3d/context_vk.c | 8 +++++++- dlls/wined3d/shader_spirv.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b738e97b6cf..db1840d29e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3422,6 +3422,8 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + const struct wined3d_blend_state *b = state->blend_state; + bool dual_source_blend = b && b->dual_source; struct wined3d_rendertarget_view *dsv; struct wined3d_rendertarget_view *rtv; struct wined3d_buffer_vk *buffer_vk; @@ -3433,8 +3435,12 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c bool invalidate_ds = false; if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)) - || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER) + || dual_source_blend != context_vk->c.last_was_dual_source_blend) + { context_vk->c.shader_update_mask |= (1u << WINED3D_SHADER_TYPE_PIXEL); + context_vk->c.last_was_dual_source_blend = dual_source_blend; + } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) context_vk->c.shader_update_mask |= (1u << WINED3D_SHADER_TYPE_VERTEX); if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY))) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1f89e3d3ef5..42be7541d67 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -57,6 +57,7 @@ struct shader_spirv_compile_arguments { uint32_t alpha_swizzle; unsigned int sample_count; + bool dual_source_blending; } fs; } u; }; @@ -147,6 +148,7 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu args->u.fs.alpha_swizzle |= 1u << i; } args->u.fs.sample_count = sample_count; + args->u.fs.dual_source_blending = state->blend_state && state->blend_state->dual_source; break; default: @@ -177,6 +179,8 @@ static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_a shader_parameter->data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; shader_parameter->u.immediate_constant.u.u32 = compile_args->u.fs.sample_count; + args->spirv_target.dual_source_blending = compile_args->u.fs.dual_source_blending; + args->spirv_target.parameter_count = 1; args->spirv_target.parameters = shader_parameter;

1 0

Rémi Bernon : winegstreamer: Query IWMReaderCallbackAdvanced interface in Open.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 04c5aeadafea5c9fa67b8d9fb6087eb0a5f24990 URL: https://gitlab.winehq.org/wine/wine/-/commit/04c5aeadafea5c9fa67b8d9fb6087e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 13:59:06 2022 +0200 winegstreamer: Query IWMReaderCallbackAdvanced interface in Open. And release it on Close. --- dlls/winegstreamer/wm_asyncreader.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index a5ab2167ab3..f3e2209881a 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -46,6 +46,7 @@ struct async_reader IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IReferenceClock IReferenceClock_iface; + IWMReaderCallbackAdvanced *callback_advanced; IWMReaderCallback *callback; void *context; @@ -70,8 +71,9 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) return (time.QuadPart * 1000) / reader->clock_frequency.QuadPart * 10000; } -static void callback_thread_run(struct async_reader *reader, IWMReaderCallbackAdvanced *callback_advanced) +static void callback_thread_run(struct async_reader *reader) { + IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; IWMReaderCallback *callback = reader->callback; REFERENCE_TIME start_time; struct wm_stream *stream; @@ -173,17 +175,10 @@ static void callback_thread_run(struct async_reader *reader, IWMReaderCallbackAd static DWORD WINAPI async_reader_callback_thread(void *arg) { struct async_reader *reader = arg; - IWMReaderCallback *callback = reader->callback; - IWMReaderCallbackAdvanced *callback_advanced; static const DWORD zero; struct list *entry; HRESULT hr = S_OK; - if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, - &IID_IWMReaderCallbackAdvanced, (void **)&callback_advanced))) - callback_advanced = NULL; - TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr); - IWMReaderCallback_OnStatus(reader->callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); @@ -209,7 +204,7 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) EnterCriticalSection(&reader->callback_cs); if (SUCCEEDED(hr)) - callback_thread_run(reader, callback_advanced); + callback_thread_run(reader); break; } @@ -238,9 +233,6 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, INFINITE); } - if (callback_advanced) - IWMReaderCallbackAdvanced_Release(callback_advanced); - LeaveCriticalSection(&reader->callback_cs); TRACE("Reader is stopping; exiting.\n"); @@ -264,6 +256,10 @@ static void async_reader_close(struct async_reader *reader) free(op); } + if (reader->callback_advanced) + IWMReaderCallbackAdvanced_Release(reader->callback_advanced); + reader->callback_advanced = NULL; + if (reader->callback) IWMReaderCallback_Release(reader->callback); reader->callback = NULL; @@ -277,6 +273,13 @@ static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback IWMReaderCallback_AddRef((reader->callback = callback)); reader->context = context; + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, &IID_IWMReaderCallbackAdvanced, + (void **)&reader->callback_advanced))) + { + WARN("Failed to retrieve IWMReaderCallbackAdvanced interface, hr %#lx\n", hr); + reader->callback_advanced = NULL; + } + reader->running = true; if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) goto error;

1 0

Rémi Bernon : winegstreamer: Avoid leaking async ops on release or multiple close.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 31aa91c914a4591ea263456cbdf42769963cecfa URL: https://gitlab.winehq.org/wine/wine/-/commit/31aa91c914a4591ea263456cbdf427… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 20 22:15:33 2022 +0200 winegstreamer: Avoid leaking async ops on release or multiple close. --- dlls/winegstreamer/wm_asyncreader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 92c6ba88392..6f4aa303d82 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -267,12 +267,20 @@ static HRESULT open_stream(struct async_reader *reader, IWMReaderCallback *callb static void close_stream(struct async_reader *reader) { + struct async_op *op, *next; + if (reader->callback_thread) { WaitForSingleObject(reader->callback_thread, INFINITE); CloseHandle(reader->callback_thread); reader->callback_thread = NULL; } + + LIST_FOR_EACH_ENTRY_SAFE(op, next, &reader->async_ops, struct async_op, entry) + { + list_remove(&op->entry); + free(op); + } } static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context)

1 0

Rémi Bernon : winegstreamer: Rename async reader stream_thread to callback_thread.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: e5bf17d919f1e86bc25bae5ade1f7a7111f0e8fd URL: https://gitlab.winehq.org/wine/wine/-/commit/e5bf17d919f1e86bc25bae5ade1f7a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Aug 20 17:20:14 2022 +0200 winegstreamer: Rename async reader stream_thread to callback_thread. --- dlls/winegstreamer/wm_asyncreader.c | 97 +++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 48 deletions(-)

1 0

Alexandre Julliard : version/tests: Mark a test that fails on Wow64 as todo.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 0038d5adba0893cce915729b29a4f42b39909538 URL: https://gitlab.winehq.org/wine/wine/-/commit/0038d5adba0893cce915729b29a4f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 17:47:26 2022 +0200 version/tests: Mark a test that fails on Wow64 as todo. --- dlls/version/tests/install.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index a4625cffa43..19e81b620d1 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -26,6 +26,8 @@ #include "winver.h" #include "shlobj.h" +static BOOL is_wow64; + static void test_find_file(void) { DWORD ret; @@ -247,16 +249,19 @@ static void test_find_file(void) dwCur=MAX_PATH; dwOut=MAX_PATH; ret = VerFindFileA(VFFF_ISSHAREDFILE, "regedit.exe", NULL, NULL, curdir, &dwCur, outBuf, &dwOut); + todo_wine_if (is_wow64) ok(ret & VFF_CURNEDEST, "Wrong return value got %lx expected VFF_CURNEDEST set\n", ret); dwCur=MAX_PATH; dwOut=MAX_PATH; ret = VerFindFileA(VFFF_ISSHAREDFILE, "regedit.exe", NULL, empty, curdir, &dwCur, outBuf, &dwOut); + todo_wine_if (is_wow64) ok(ret & VFF_CURNEDEST, "Wrong return value got %lx expected VFF_CURNEDEST set\n", ret); dwCur=MAX_PATH; dwOut=MAX_PATH; ret = VerFindFileA(VFFF_ISSHAREDFILE, "regedit.exe", NULL, appdir, curdir, &dwCur, outBuf, &dwOut); + todo_wine_if (is_wow64) ok(ret & VFF_CURNEDEST, "Wrong return value got %lx expected VFF_CURNEDEST set\n", ret); /* nonexistent filename */ @@ -346,6 +351,13 @@ static void test_install_file(void) START_TEST(install) { +#ifndef _WIN64 + BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); + + if ((pIsWow64Process = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), "IsWow64Process" ))) + pIsWow64Process( GetCurrentProcess(), &is_wow64 ); +#endif + test_find_file(); test_install_file(); }

1 0