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

Jacek Caban : gdi32: Use SetPixel for SetPixelV implementation.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: e7b9a16bc2d3beb457c219be7878cded46b738c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b9a16bc2d3beb457c219be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:51:51 2021 +0200 gdi32: Use SetPixel for SetPixelV implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/painting.c | 16 ---------------- dlls/gdi32/tests/metafile.c | 1 - 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0bfc48f3fcc..74280bc34b5 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -70,6 +70,14 @@ COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color ) return NtGdiSetPixel( hdc, x, y, color ); } +/*********************************************************************** + * SetPixelV (GDI32.@) + */ +BOOL WINAPI SetPixelV( HDC hdc, INT x, INT y, COLORREF color ) +{ + return SetPixel( hdc, x, y, color ) != CLR_INVALID; +} + /*********************************************************************** * LineTo (GDI32.@) */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 1e03a2046d9..21c3c853998 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -415,22 +415,6 @@ COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ) return ret; } -/*********************************************************************** - * SetPixelV (GDI32.@) - */ -BOOL WINAPI SetPixelV( HDC hdc, INT x, INT y, COLORREF color ) -{ - PHYSDEV physdev; - DC * dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pSetPixel ); - physdev->funcs->pSetPixel( physdev, x, y, color ); - release_dc_ptr( dc ); - return TRUE; -} - /*********************************************************************** * GetPixel (GDI32.@) */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index d310eb47fa2..5f626e83901 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3231,7 +3231,6 @@ static void test_emf_SetPixel(void) ok(c == CLR_INVALID, "c = %x\n", c); ret = SetPixelV(hdc, 5, 5, RGB(1,2,3)); - todo_wine ok(!ret, "ret = %x\n", ret); c = GetPixel(hdc, 5, 5);

1 0

Francois Gouget : oleaut32/tests: Show the input string when VarFormatCurrency() fails.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: b0a7a6527c57d6c0b2266fb70f66f01f975162b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0a7a6527c57d6c0b2266fb7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 23 13:19:12 2021 +0200 oleaut32/tests: Show the input string when VarFormatCurrency() fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d1951b85a61..55190574ca9 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -639,14 +639,14 @@ static void test_VarFormatCurrency(void) V_VT(&in) = VT_BSTR; V_BSTR(&in) = str; hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#x for %s\n", hr, wine_dbgstr_w(str)); ok(lstrcmpW(str, str2), "Expected different string.\n"); SysFreeString(str2); V_VT(&in) = VT_BSTR | VT_BYREF; V_BSTRREF(&in) = &str; hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#x for %s\n", hr, wine_dbgstr_w(str)); ok(lstrcmpW(str, str2), "Expected different string.\n"); SysFreeString(str);

1 0

Alexandre Julliard : wow64: Add thunks for the mutant syscalls.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 2b0931182b49d31db9987080cdcea872ca5c817b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b0931182b49d31db9987080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 16:48:03 2021 +0200 wow64: Add thunks for the mutant syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 ++++ 2 files changed, 72 insertions(+) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index d61eed0a22d..2ca7764c3cd 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -62,6 +62,27 @@ NTSTATUS WINAPI wow64_NtCreateEvent( UINT *args ) } +/********************************************************************** + * wow64_NtCreateMutant + */ +NTSTATUS WINAPI wow64_NtCreateMutant( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + BOOLEAN owned = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateMutant( &handle, access, objattr_32to64( &attr, attr32 ), owned ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenEvent */ @@ -82,6 +103,26 @@ NTSTATUS WINAPI wow64_NtOpenEvent( UINT *args ) } +/********************************************************************** + * wow64_NtOpenMutant + */ +NTSTATUS WINAPI wow64_NtOpenMutant( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenMutant( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtPulseEvent */ @@ -109,6 +150,33 @@ NTSTATUS WINAPI wow64_NtQueryEvent( UINT *args ) } +/********************************************************************** + * wow64_NtQueryMutant + */ +NTSTATUS WINAPI wow64_NtQueryMutant( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + MUTANT_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtQueryMutant( handle, class, info, len, retlen ); +} + + +/********************************************************************** + * wow64_NtReleaseMutant + */ +NTSTATUS WINAPI wow64_NtReleaseMutant( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_count = get_ptr( &args ); + + return NtReleaseMutant( handle, prev_count ); +} + + /********************************************************************** * wow64_NtResetEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index df9da2261bb..8481db2a587 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -28,16 +28,20 @@ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ SYSCALL_ENTRY( NtCreateEvent ) \ + SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtOpenMutant ) \ SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ SYSCALL_ENTRY( NtQueryEvent ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ + SYSCALL_ENTRY( NtQueryMutant ) \ + SYSCALL_ENTRY( NtReleaseMutant ) \ SYSCALL_ENTRY( NtResetEvent ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \

1 0

Alexandre Julliard : wow64: Add thunks for the keyed event syscalls.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: fb5eae4a70bca9f37afbe0e15b61ddf3e56fc815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5eae4a70bca9f37afbe0e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 17:04:11 2021 +0200 wow64: Add thunks for the keyed event syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 6 ++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index c6c5e1d374d..596e90bc71d 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -74,6 +74,27 @@ NTSTATUS WINAPI wow64_NtCreateEvent( UINT *args ) } +/********************************************************************** + * wow64_NtCreateKeyedEvent + */ +NTSTATUS WINAPI wow64_NtCreateKeyedEvent( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + ULONG flags = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateKeyedEvent( &handle, access, objattr_32to64( &attr, attr32 ), flags ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtCreateMutant */ @@ -158,6 +179,26 @@ NTSTATUS WINAPI wow64_NtOpenEvent( UINT *args ) } +/********************************************************************** + * wow64_NtOpenKeyedEvent + */ +NTSTATUS WINAPI wow64_NtOpenKeyedEvent( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenKeyedEvent( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenMutant */ @@ -290,6 +331,20 @@ NTSTATUS WINAPI wow64_NtQueryTimer( UINT *args ) } +/********************************************************************** + * wow64_NtReleaseKeyedEvent + */ +NTSTATUS WINAPI wow64_NtReleaseKeyedEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + void *key = get_ptr( &args ); + BOOLEAN alertable = get_ulong( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtReleaseKeyedEvent( handle, key, alertable, timeout ); +} + + /********************************************************************** * wow64_NtReleaseMutant */ @@ -355,3 +410,17 @@ NTSTATUS WINAPI wow64_NtSetTimer( UINT *args ) return NtSetTimer( handle, when, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), resume, period, state ); } + + +/********************************************************************** + * wow64_NtWaitForKeyedEvent + */ +NTSTATUS WINAPI wow64_NtWaitForKeyedEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + const void *key = get_ptr( &args ); + BOOLEAN alertable = get_ulong( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtWaitForKeyedEvent( handle, key, alertable, timeout ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index f348ecfe1d9..db2b386fe24 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -29,6 +29,7 @@ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ SYSCALL_ENTRY( NtCreateEvent ) \ + SYSCALL_ENTRY( NtCreateKeyedEvent ) \ SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtCreateSemaphore ) \ SYSCALL_ENTRY( NtCreateTimer ) \ @@ -36,6 +37,7 @@ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtOpenKeyedEvent ) \ SYSCALL_ENTRY( NtOpenMutant ) \ SYSCALL_ENTRY( NtOpenSemaphore ) \ SYSCALL_ENTRY( NtOpenTimer ) \ @@ -48,12 +50,14 @@ SYSCALL_ENTRY( NtQueryMutant ) \ SYSCALL_ENTRY( NtQuerySemaphore ) \ SYSCALL_ENTRY( NtQueryTimer ) \ + SYSCALL_ENTRY( NtReleaseKeyedEvent ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ SYSCALL_ENTRY( NtReleaseSemaphore ) \ SYSCALL_ENTRY( NtResetEvent ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEvent ) \ - SYSCALL_ENTRY( NtSetTimer ) + SYSCALL_ENTRY( NtSetTimer ) \ + SYSCALL_ENTRY( NtWaitForKeyedEvent ) #endif /* __WOW64_SYSCALL_H */

1 0

Zebediah Figura : wined3d: Separate a helper to update Vulkan UAV counter bindings.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 17d39ff067555f9af77b53f0b8d65af4c69d1652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d39ff067555f9af77b53f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 11:50:43 2021 -0500 wined3d: Separate a helper to update Vulkan UAV counter bindings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 1c7f268df25..23c249c682c 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2762,6 +2762,28 @@ static bool wined3d_shader_descriptor_writes_vk_add_uav_write(struct wined3d_sha return true; } +static bool wined3d_shader_descriptor_writes_vk_add_uav_counter_write( + struct wined3d_shader_descriptor_writes_vk *writes, struct wined3d_context_vk *context_vk, + enum wined3d_pipeline pipeline, VkDescriptorSet vk_descriptor_set, + const struct wined3d_state *state, const struct wined3d_shader_resource_binding *binding) +{ + struct wined3d_unordered_access_view_vk *uav_vk; + struct wined3d_unordered_access_view *uav; + + if (!(uav = state->unordered_access_view[pipeline][binding->resource_idx])) + { + FIXME("NULL unordered access view counters not implemented.\n"); + return false; + } + + uav_vk = wined3d_unordered_access_view_vk(uav); + if (!uav_vk->vk_counter_view) + return false; + + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, + VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, NULL, NULL, &uav_vk->vk_counter_view); +} + 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) { @@ -2770,8 +2792,6 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; - struct wined3d_unordered_access_view_vk *uav_vk; - struct wined3d_unordered_access_view *uav; VkDescriptorSetLayout vk_set_layout; VkPipelineLayout vk_pipeline_layout; VkPipelineBindPoint vk_bind_point; @@ -2833,16 +2853,8 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con break; case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: - if (!(uav = state->unordered_access_view[pipeline][binding->resource_idx])) - { - FIXME("NULL unordered access view counters not implemented.\n"); - return false; - } - - uav_vk = wined3d_unordered_access_view_vk(uav); - if (!uav_vk->vk_counter_view || !wined3d_shader_descriptor_writes_vk_add_write(writes, - vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, - NULL, NULL, &uav_vk->vk_counter_view)) + if (!wined3d_shader_descriptor_writes_vk_add_uav_counter_write(writes, + context_vk, pipeline, vk_descriptor_set, state, binding)) return false; break;

1 0

Zebediah Figura : wined3d: Separate a helper to update Vulkan UAV bindings.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: fd6a67436b84396a5007aa046f97bb8aac59b277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6a67436b84396a5007aa04… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 11:50:42 2021 -0500 wined3d: Separate a helper to update Vulkan UAV bindings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 83 +++++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 9b114f762c3..1c7f268df25 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2716,6 +2716,52 @@ static bool wined3d_shader_descriptor_writes_vk_add_srv_write(struct wined3d_sha return true; } +static bool wined3d_shader_descriptor_writes_vk_add_uav_write(struct wined3d_shader_descriptor_writes_vk *writes, + struct wined3d_context_vk *context_vk, enum wined3d_pipeline pipeline, VkDescriptorSet vk_descriptor_set, + const struct wined3d_state *state, const struct wined3d_shader_resource_binding *binding) +{ + struct wined3d_unordered_access_view_vk *uav_vk; + struct wined3d_unordered_access_view *uav; + const VkDescriptorImageInfo *image_info; + struct wined3d_resource *resource; + struct wined3d_view_vk *view_vk; + VkBufferView *buffer_view; + VkDescriptorType type; + + if (!(uav = state->unordered_access_view[pipeline][binding->resource_idx])) + { + FIXME("NULL unordered access views not implemented.\n"); + return false; + } + resource = uav->resource; + + uav_vk = wined3d_unordered_access_view_vk(uav); + view_vk = &uav_vk->view_vk; + if (resource->type == WINED3D_RTYPE_BUFFER) + { + image_info = NULL; + buffer_view = &view_vk->u.vk_buffer_view; + type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + } + else + { + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (view_vk->u.vk_image_info.imageView) + image_info = &view_vk->u.vk_image_info; + else + image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + buffer_view = NULL; + type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + } + + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, type, NULL, image_info, buffer_view)) + return false; + wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk); + 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) { @@ -2726,16 +2772,11 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_shader_resource_bindings *bindings; struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_unordered_access_view *uav; - const VkDescriptorImageInfo *image_info; VkDescriptorSetLayout vk_set_layout; VkPipelineLayout vk_pipeline_layout; - struct wined3d_resource *resource; VkPipelineBindPoint vk_bind_point; VkDescriptorSet vk_descriptor_set; - struct wined3d_view_vk *view_vk; struct wined3d_sampler *sampler; - VkBufferView *buffer_view; - VkDescriptorType type; VkResult vr; size_t i; @@ -2786,37 +2827,9 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con break; case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV: - if (!(uav = state->unordered_access_view[pipeline][binding->resource_idx])) - { - FIXME("NULL unordered access views not implemented.\n"); - return false; - } - resource = uav->resource; - - uav_vk = wined3d_unordered_access_view_vk(uav); - view_vk = &uav_vk->view_vk; - if (resource->type == WINED3D_RTYPE_BUFFER) - { - image_info = NULL; - buffer_view = &view_vk->u.vk_buffer_view; - type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - } - else - { - struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(resource)); - - if (view_vk->u.vk_image_info.imageView) - image_info = &view_vk->u.vk_image_info; - else - image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); - buffer_view = NULL; - type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - } - - if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, - binding->binding_idx, type, NULL, image_info, buffer_view)) + if (!wined3d_shader_descriptor_writes_vk_add_uav_write(writes, + context_vk, pipeline, vk_descriptor_set, state, binding)) return false; - wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk); break; case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER:

1 0

Ziqing Hui : d2d1/tests: Add tests for standard effect properties.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 5ee5d7bbf3b3313af90e3f8a75d5e313c3d6072c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee5d7bbf3b3313af90e3f8a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 22 08:44:23 2021 +0800 d2d1/tests: Add tests for standard effect properties. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 81 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 72 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1ee4941da99..72487692abf 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,13 +9680,30 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { + unsigned int i, min_inputs, max_inputs; + D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; ID2D1Effect *effect; + BOOL cached; + CLSID clsid; HRESULT hr; + const struct effect_test + { + const CLSID *clsid; + UINT32 min_inputs; + UINT32 max_inputs; + } + effect_tests[] = + { + {&CLSID_D2D12DAffineTransform, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1, 1}, + {&CLSID_D2D1Composite, 1, 0xffffffff}, + }; + if (!init_test_context(&ctx, d3d11)) return; @@ -9699,17 +9716,63 @@ static void test_effect(BOOL d3d11) hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ID2D1Effect_GetOutput(effect, &image_b); - ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); - ID2D1Image_Release(image_b); - ID2D1Image_Release(image_a); + for (i = 0; i < ARRAY_SIZE(effect_tests); ++i) + { + const struct effect_test *test = effect_tests + i; + + winetest_push_context("Test %u", i); + + hr = ID2D1DeviceContext_CreateEffect(context, test->clsid, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Effect_GetOutput(effect, &image_b); + ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + ID2D1Image_Release(image_b); + ID2D1Image_Release(image_a); + + todo_wine + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, + D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(IsEqualGUID(&clsid, test->clsid), "Got unexpected clsid %s, expected %s.\n", + debugstr_guid(&clsid), debugstr_guid(test->clsid)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED, + D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(cached == FALSE, "Got unexpected cached %d.\n", cached); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION, + D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %u.\n", precision); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MIN_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(min_inputs == test->min_inputs, "Got unexpected min inputs %u, expected %u.\n", + min_inputs, test->min_inputs); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MAX_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&max_inputs, sizeof(max_inputs)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n", + max_inputs, test->max_inputs); + } + + ID2D1Effect_Release(effect); + winetest_pop_context(); + } - ID2D1Effect_Release(effect); ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx);

1 0

Hugh McMaster : conhost: Copy Character Attributes (colors) to the new screen buffer.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: b17eb271120b95e5307549a083080542097f7028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b17eb271120b95e5307549a0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 22 23:36:19 2021 +1000 conhost: Copy Character Attributes (colors) to the new screen buffer. CreateConsoleScreenBuffer() copies the Character Attributes (colors) to the new screen buffer when called. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 +++--- programs/conhost/conhost.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9fa0ce06854..5f9342ffd44 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1047,7 +1047,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); CloseHandle(hConOut2); - todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); @@ -1068,7 +1068,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); CloseHandle(hConOut2); - todo_wine ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " + ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, attr); todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); @@ -1092,7 +1092,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); CloseHandle(hConOut2); - todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7db1261d3be..805df880897 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -85,7 +85,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->attr = 0x07; screen_buffer->popup_attr = 0xf5; screen_buffer->font.weight = FW_NORMAL; screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -96,6 +95,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->max_height = console->active->max_height; screen_buffer->win.right = console->active->win.right - console->active->win.left; screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + screen_buffer->attr = console->active->attr; } else { @@ -103,6 +103,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->max_height = height; screen_buffer->win.right = width - 1; screen_buffer->win.bottom = height - 1; + screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for CreatePolyPolygonRgn implementation.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: 607733af0e02312e17a72d9bda64ed881207f38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=607733af0e02312e17a72d9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:49:00 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for CreatePolyPolygonRgn implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 10 ++++++++++ dlls/gdi32/painting.c | 4 ++++ dlls/gdi32/region.c | 9 --------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index e614a9d6a52..84ed2377954 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -281,6 +281,16 @@ HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *dat return NtGdiExtCreateRegion( xform, count, data ); } +/*********************************************************************** + * CreatePolyPolygonRgn (GDI32.@) + */ +HRGN WINAPI CreatePolyPolygonRgn( const POINT *points, const INT *counts, INT count, INT mode ) +{ + ULONG ret = NtGdiPolyPolyDraw( ULongToHandle(mode), points, (const UINT *)counts, + count, NtGdiPolyPolygonRgn ); + return ULongToHandle( ret ); +} + /*********************************************************************** * CreateRectRgnIndirect (GDI32.@) * diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index f9fa18c4de0..803b9797736 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -585,6 +585,10 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts ULONG ret; DC *dc; + if (function == NtGdiPolyPolygonRgn) + return HandleToULong( create_polypolygon_region( points, (const INT *)counts, count, + HandleToULong(hdc), NULL )); + if (!(dc = get_dc_ptr( hdc ))) return FALSE; update_dc( dc ); diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 502ce108a8f..4df48209de5 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2692,12 +2692,3 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn; } - - -/*********************************************************************** - * CreatePolyPolygonRgn (GDI32.@) - */ -HRGN WINAPI CreatePolyPolygonRgn( const POINT *pts, const INT *count, INT nbpolygons, INT mode ) -{ - return create_polypolygon_region( pts, count, nbpolygons, mode, NULL ); -}

1 0

Zebediah Figura : wined3d: Implement constant buffer offsetting for Vulkan.
by Alexandre Julliard July 23, 2021

July 23, 2021

Module: wine Branch: master Commit: f838d5a2b9589de49b656434227ece434df2391c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f838d5a2b9589de49b656434… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 11:50:45 2021 -0500 wined3d: Implement constant buffer offsetting for Vulkan. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0d38b9eb5ea..4b1bea38370 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2652,19 +2652,21 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d static bool wined3d_shader_descriptor_writes_vk_add_cbv_write(struct wined3d_shader_descriptor_writes_vk *writes, struct wined3d_context_vk *context_vk, VkDescriptorSet vk_descriptor_set, const struct wined3d_state *state, - const struct wined3d_shader_resource_binding *binding) + const struct wined3d_shader_resource_binding *binding, VkDescriptorBufferInfo *buffer_info) { + const struct wined3d_constant_buffer_state *cb_state = &state->cb[binding->shader_type][binding->resource_idx]; 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)) + if (!(buffer = cb_state->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); + *buffer_info = *wined3d_buffer_vk_get_buffer_info(buffer_vk); + buffer_info->offset += cb_state->offset; + buffer_info->range = min(cb_state->size, buffer_info->range); 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; @@ -2803,6 +2805,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, enum wined3d_pipeline pipeline) { struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; + VkDescriptorBufferInfo buffers[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; 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_shader_resource_binding *binding; @@ -2849,8 +2852,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 (!wined3d_shader_descriptor_writes_vk_add_cbv_write(writes, - context_vk, vk_descriptor_set, state, binding)) + if (!wined3d_shader_descriptor_writes_vk_add_cbv_write(writes, context_vk, vk_descriptor_set, + state, binding, &buffers[binding->shader_type][binding->resource_idx])) return false; break;

1 0