- Wine-Commits - list.winehq.org

Giovanni Mascellani : vkd3d: Do not synchronize with the geometry shader stage if it's not enabled.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: vkd3d Branch: master Commit: a54187f3c9c9ad4a5d1357721104f28c498ac112 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a54187f3c9c9ad4a5d1357721104f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 3 23:55:03 2024 +0200 vkd3d: Do not synchronize with the geometry shader stage if it's not enabled. --- libs/vkd3d/command.c | 20 +++++++++++++------- libs/vkd3d/device.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6e37209c..06721aec 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2025,7 +2025,8 @@ static void d3d12_command_list_invalidate_root_parameters(struct d3d12_command_l static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, unsigned int stencil_state, const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info, - VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) + VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout, + struct d3d12_device *device) { bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); VkPipelineStageFlags queue_shader_stages = 0; @@ -2035,8 +2036,9 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, queue_shader_stages |= VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT - | VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + if (device->vk_info.geometry_shaders) + queue_shader_stages |= VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT; } if (vk_queue_flags & VK_QUEUE_COMPUTE_BIT) queue_shader_stages |= VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT; @@ -2054,7 +2056,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, { if (resource->present_state != D3D12_RESOURCE_STATE_PRESENT) return vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, - resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); + resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout, device); *access_mask = VK_ACCESS_MEMORY_READ_BIT; *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; @@ -2251,7 +2253,8 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, 0, - resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, + &dst_stage_mask, &barrier.newLayout, list->device)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -4277,13 +4280,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } if (!vk_barrier_parameters_from_d3d12_resource_state(state_before, stencil_state_before, - resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, vk_info, &src_access_mask, + &src_stage_mask, &layout_before, list->device)) { FIXME("Unhandled state %#x.\n", state_before); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(state_after, stencil_state_after, - resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, vk_info, &dst_access_mask, + &dst_stage_mask, &layout_after, list->device)) { FIXME("Unhandled state %#x.\n", state_after); continue; @@ -4303,7 +4308,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, - resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, vk_info, &access_mask, + &stage_mask, &image_layout, list->device); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 45a24b0f..674e46fe 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1643,6 +1643,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = physical_device_info->properties2.properties.limits; vulkan_info->sparse_properties = physical_device_info->properties2.properties.sparseProperties; + vulkan_info->geometry_shaders = physical_device_info->features2.features.geometryShader; vulkan_info->sparse_binding = features->sparseBinding; vulkan_info->sparse_residency_3d = features->sparseResidencyImage3D; vulkan_info->rasterization_stream = physical_device_info->xfb_properties.transformFeedbackRasterizationStreamSelect; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 09bbc29a..226b71fe 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -146,6 +146,7 @@ struct vkd3d_vulkan_info bool rasterization_stream; bool transform_feedback_queries; + bool geometry_shaders; bool uav_read_without_format;

1 0

Giovanni Mascellani : vkd3d: Do not request VK_EXT_debug_marker if debug is disabled.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: vkd3d Branch: master Commit: 3254eff3282ff06776aead60d2182dcd74247861 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3254eff3282ff06776aead60d2182… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 3 23:33:16 2024 +0200 vkd3d: Do not request VK_EXT_debug_marker if debug is disabled. Because it requires VK_EXT_debug_report. --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c27a96e2..5352fe38 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -92,7 +92,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(EXT_4444_FORMATS, EXT_4444_formats), VK_EXTENSION(EXT_CALIBRATED_TIMESTAMPS, EXT_calibrated_timestamps), VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), - VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), + VK_DEBUG_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), VK_EXTENSION(EXT_DESCRIPTOR_INDEXING, EXT_descriptor_indexing), VK_EXTENSION(EXT_FRAGMENT_SHADER_INTERLOCK, EXT_fragment_shader_interlock),

1 0

Giovanni Mascellani : tests: Mark some root signature unbounded range failures as todo on MoltenVK.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: vkd3d Branch: master Commit: 3ad4d984ad8a228d2081d87f01ffe7854163812b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3ad4d984ad8a228d2081d87f01ffe… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 3 23:18:47 2024 +0200 tests: Mark some root signature unbounded range failures as todo on MoltenVK. --- tests/d3d12.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a4b20696..fcdf844d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2985,7 +2985,13 @@ static void test_create_root_signature(void) descriptor_ranges[1].RegisterSpace = 0; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 16; hr = create_root_signature(device, &root_signature_desc, &root_signature); + /* This and similar tests later currently fail with E_FAIL when + * VK_EXT_descriptor_indexing is not available. This check happens before + * detecting the overlap that would trigger E_INVALIDARG. We still check + * that we're seeing a failure. */ + todo_if(binding_tier <= D3D12_RESOURCE_BINDING_TIER_2) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); /* A bounded range overlapping an unbounded one, mapped to the same * register space, but a different type. */ @@ -3004,7 +3010,9 @@ static void test_create_root_signature(void) descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; descriptor_ranges[1].NumDescriptors = UINT_MAX; hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo_if(binding_tier <= D3D12_RESOURCE_BINDING_TIER_2) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); /* And unbounded range overlapping a bounded one, mapped to the same * register space and type. */ @@ -3012,7 +3020,9 @@ static void test_create_root_signature(void) descriptor_ranges[1].BaseShaderRegister = 0; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 15; hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo_if(binding_tier <= D3D12_RESOURCE_BINDING_TIER_2) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);

1 0

Eric Pouech : quartz: Fix result in put_FullScreenMode().
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 1d42cf12747a6d80ee7d84c70d7e0bbca00ee4fc URL: https://gitlab.winehq.org/wine/wine/-/commit/1d42cf12747a6d80ee7d84c70d7e0b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 10:54:08 2024 +0200 quartz: Fix result in put_FullScreenMode(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/videorenderer.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4039939f0d9..b4c79b17310 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2972,7 +2972,7 @@ static void test_control_delegation(void) ok(val == OAFALSE, "Got fullscreen %lu\n", val); hr = IVideoWindow_put_FullScreenMode(window, OAFALSE); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IFilterGraph2_RemoveFilter(graph, renderer); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e6735367cb3..bbd34678dfd 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -291,6 +291,9 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG f FIXME("filter %p, fullscreen %ld.\n", filter, fullscreen); + if (fullscreen == filter->FullScreenMode) + return S_FALSE; + if (fullscreen) { filter->saved_style = GetWindowLongW(window, GWL_STYLE);

1 0

Eric Pouech : quartz: Always expose that non fullscreen mode is supported and active.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 6fd8e30c69a127222b444a9da1f58f63ec40dfe0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fd8e30c69a127222b444a9da1f58f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 10:28:03 2024 +0200 quartz: Always expose that non fullscreen mode is supported and active. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/filtergraph.c | 7 +++++++ dlls/quartz/tests/vmr7.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4696d5ced01..cc66b17c75b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4504,6 +4504,11 @@ static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, LONG * if (hr == S_OK) hr = IVideoWindow_get_FullScreenMode(pVideoWindow, FullScreenMode); + if (hr == E_NOTIMPL) + { + *FullScreenMode = OAFALSE; + hr = S_OK; + } LeaveCriticalSection(&This->cs); @@ -4524,6 +4529,8 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG F if (hr == S_OK) hr = IVideoWindow_put_FullScreenMode(pVideoWindow, FullScreenMode); + if (hr == E_NOTIMPL && FullScreenMode == OAFALSE) + hr = S_FALSE; LeaveCriticalSection(&This->cs); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b7f36134bcd..58753242108 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2473,10 +2473,10 @@ static void test_video_window(void) l = 0xdeadbeef; hr = IVideoWindow_get_FullScreenMode(window, &l); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(l == OAFALSE, "Got fullscreenmode %ld.\n", l); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(l == OAFALSE, "Got fullscreenmode %ld.\n", l); hr = IVideoWindow_put_FullScreenMode(window, l); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IFilterGraph2_Release(graph); IVideoWindow_Release(window);

1 0

Eric Pouech : quartz/tests: Add new tests about fullscreen handling.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: faa5cade4a0db7a0a9af1896942dc4a8f8b3e238 URL: https://gitlab.winehq.org/wine/wine/-/commit/faa5cade4a0db7a0a9af1896942dc4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 09:14:50 2024 +0200 quartz/tests: Add new tests about fullscreen handling. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 8 ++++++++ dlls/quartz/tests/vmr7.c | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c3dcfb803c2..4039939f0d9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2966,6 +2966,14 @@ static void test_control_delegation(void) hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + val = 0xdeadbeef; + hr = IVideoWindow_get_FullScreenMode(window, &val); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(val == OAFALSE, "Got fullscreen %lu\n", val); + + hr = IVideoWindow_put_FullScreenMode(window, OAFALSE); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_RemoveFilter(graph, renderer); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 028f14838c3..b7f36134bcd 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2466,6 +2466,18 @@ static void test_video_window(void) hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height); todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#lx.\n", hr); + IVideoWindow_Release(window); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + l = 0xdeadbeef; + hr = IVideoWindow_get_FullScreenMode(window, &l); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(l == OAFALSE, "Got fullscreenmode %ld.\n", l); + hr = IVideoWindow_put_FullScreenMode(window, l); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + IFilterGraph2_Release(graph); IVideoWindow_Release(window); IOverlay_Release(overlay);

1 0

Rémi Bernon : winemac: Move layered window mapping to macdrv_UpdateLayeredWindow.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: c7287cc73499a53077a510bcdae9885547c8d031 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7287cc73499a53077a510bcdae988… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 11 11:44:12 2024 +0200 winemac: Move layered window mapping to macdrv_UpdateLayeredWindow. --- dlls/winemac.drv/window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a3c13659360..012189249a4 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1925,10 +1925,6 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if ((*window_surface = surface)) window_surface_add_ref(surface); - /* Since layered attributes are now set, can now show the window */ - if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) - show_window(data); - release_win_data(data); return TRUE; @@ -1944,6 +1940,10 @@ void macdrv_UpdateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if ((data = get_win_data(hwnd))) { + /* Since layered attributes are now set, can now show the window */ + if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) + show_window(data); + /* The ULW flags are a superset of the LWA flags. */ sync_window_opacity(data, color_key, 255, TRUE, flags); release_win_data(data);

1 0

Rémi Bernon : win32u: Move WM_WINE_DESKTOP_RESIZED into driver internal messages range.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 6eac284201b4f8b2ecf78ad5623bf0fcebcd57bb URL: https://gitlab.winehq.org/wine/wine/-/commit/6eac284201b4f8b2ecf78ad5623bf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 13 10:35:15 2024 +0200 win32u: Move WM_WINE_DESKTOP_RESIZED into driver internal messages range. It is otherwise ignored and not passed to the drivers WindowMessage callback. Fixes: b89c9c60d50cf21650331d1528ff965c319a1217 --- include/ntuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntuser.h b/include/ntuser.h index 10afabfdc60..bd11567290f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -504,10 +504,10 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_UPDATEWINDOWSTATE, - WM_WINE_DESKTOP_RESIZED, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_CLIPCURSOR = 0x80001ff0, /* internal driver notification messages */ WM_WINE_SETCURSOR, + WM_WINE_DESKTOP_RESIZED, WM_WINE_LAST_DRIVER_MSG = 0x80001fff };

1 0

Eric Pouech : quartz/tests: Fix typo in tests.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 5fb9b19218dacd70366d15cf82f13fec3ec8a3e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fb9b19218dacd70366d15cf82f13f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 11:49:04 2024 +0200 quartz/tests: Fix typo in tests. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index df1db0cfed6..c3dcfb803c2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -46,7 +46,7 @@ static WCHAR *create_file(const WCHAR *name, const char *data, DWORD size) ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %lu.\n", wine_dbgstr_w(pathW), GetLastError()); WriteFile(file, data, size, &written, NULL); - ok(written = size, "Failed to write file data, error %lu.\n", GetLastError()); + ok(written == size, "Failed to write file data, error %lu.\n", GetLastError()); CloseHandle(file); return pathW;

1 0

Rémi Bernon : wineandroid: Remove unnecessary visible_rect initialization.
by Alexandre Julliard June 13, 2024

June 13, 2024

Module: wine Branch: master Commit: 10e4a6819c0e3905f4179f6ffe2003f1a62bc97e URL: https://gitlab.winehq.org/wine/wine/-/commit/10e4a6819c0e3905f4179f6ffe2003… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 10:01:35 2024 +0200 wineandroid: Remove unnecessary visible_rect initialization. --- dlls/wineandroid.drv/window.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 6d05af575f3..ea2c8935d2c 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1150,16 +1150,12 @@ BOOL ANDROID_WindowPosChanging( HWND hwnd, UINT swp_flags, const RECT *window_re hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), (int)NtUserGetWindowLongW( hwnd, GWL_STYLE ), swp_flags ); - if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return TRUE; + if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return TRUE; /* use default surface */ - *visible_rect = *window_rect; - - /* create the window surface if necessary */ - - if (data->parent) goto done; - if (swp_flags & SWP_HIDEWINDOW) goto done; - if (is_argb_surface( data->surface )) goto done; - if (!get_surface_rect( visible_rect, &surface_rect )) goto done; + if (data->parent) goto done; /* use default surface */ + if (swp_flags & SWP_HIDEWINDOW) goto done; /* use default surface */ + if (is_argb_surface( data->surface )) goto done; /* use default surface */ + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; /* use default surface */ if (data->surface) {

1 0