- Wine-Commits - list.winehq.org

Sven Baars : ntdll/tests: Update some more todos that succeed with the new wow64 architecture.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 1663454c4b1aa0fe11c163d2bb9691a8cb024167 URL: https://gitlab.winehq.org/wine/wine/-/commit/1663454c4b1aa0fe11c163d2bb9691… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Jul 11 16:22:59 2023 +0200 ntdll/tests: Update some more todos that succeed with the new wow64 architecture. --- dlls/ntdll/tests/info.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 877978b6b3c..ed3e0360c86 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -37,7 +37,6 @@ static NTSTATUS (WINAPI * pNtMapViewOfSection)(HANDLE,HANDLE,PVOID*,ULONG_PTR,SI static NTSTATUS (WINAPI * pNtUnmapViewOfSection)(HANDLE,PVOID); static NTSTATUS (WINAPI * pNtClose)(HANDLE); static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); -static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); static DEP_SYSTEM_POLICY_TYPE (WINAPI * pGetSystemDEPPolicy)(void); static NTSTATUS (WINAPI * pNtOpenThread)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID *); @@ -49,6 +48,7 @@ static HANDLE (WINAPI * pDbgUiGetThreadDebugObject)(void); static void (WINAPI * pDbgUiSetThreadDebugObject)(HANDLE); static BOOL is_wow64; +static BOOL old_wow64; /* one_before_last_pid is used to be able to compare values of a still running process with the output of the test_query_process_times and test_query_process_handlecount tests. @@ -102,8 +102,18 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(DbgUiGetThreadDebugObject); NTDLL_GET_PROC(DbgUiSetThreadDebugObject); - pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); - if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + + if (is_wow64) + { + TEB64 *teb64 = ULongToPtr( NtCurrentTeb()->GdiBatchCount ); + + if (teb64) + { + PEB64 *peb64 = ULongToPtr(teb64->Peb); + old_wow64 = !peb64->LdrData; + } + } pGetSystemDEPPolicy = (void *)GetProcAddress(hkernel32, "GetSystemDEPPolicy"); pGetLogicalProcessorInformationEx = (void *) GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); @@ -183,7 +193,7 @@ static void test_query_basic(void) (void *)sbi.HighestUserAddress, (void *)sbi2.HighestUserAddress); #else ok( sbi.HighestUserAddress == (void *)0x7ffeffff, "wrong limit %p\n", sbi.HighestUserAddress); - todo_wine_if( is_wow64 ) + todo_wine_if( old_wow64 ) ok( sbi2.HighestUserAddress == (is_wow64 ? (void *)0xfffeffff : (void *)0x7ffeffff), "wrong limit %p\n", sbi.HighestUserAddress); #endif @@ -206,7 +216,7 @@ static void test_query_basic(void) broken(status == STATUS_INVALID_INFO_CLASS) || broken(status == STATUS_NOT_IMPLEMENTED), "failed %lx\n", status ); if (!status || status == STATUS_INFO_LENGTH_MISMATCH) - todo_wine_if( is_wow64 ) + todo_wine_if( old_wow64 ) ok( !status == !is_wow64, "got wrong status %lx wow64 %u\n", status, is_wow64 ); if (!status) {

1 0

Zebediah Figura : wined3d: Move struct wined3d_sampler_vk to wined3d_vk.h.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 80667b9f3c50619a7ae9edf19401a4782c771a6a URL: https://gitlab.winehq.org/wine/wine/-/commit/80667b9f3c50619a7ae9edf19401a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:25:13 2022 -0600 wined3d: Move struct wined3d_sampler_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 21 ++------------------- dlls/wined3d/wined3d_vk.h | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 022d12dba26..f293ef04624 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4325,25 +4325,6 @@ void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - -struct wined3d_sampler_vk -{ - struct wined3d_sampler s; - - VkDescriptorImageInfo vk_image_info; - uint64_t command_buffer_id; -}; - -static inline struct wined3d_sampler_vk *wined3d_sampler_vk(struct wined3d_sampler *sampler) -{ - return CONTAINING_RECORD(sampler, struct wined3d_sampler_vk, s); -} - -void wined3d_sampler_vk_init(struct wined3d_sampler_vk *sampler_vk, - struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; - struct wined3d_vertex_declaration_element { const struct wined3d_format *format; @@ -4795,6 +4776,8 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_vk.h" + struct wined3d_buffer_vk { struct wined3d_buffer b; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index c8705790ad9..deb855fe55c 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -842,4 +842,21 @@ void wined3d_texture_vk_make_generic(struct wined3d_texture_vk *texture_vk, BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +struct wined3d_sampler_vk +{ + struct wined3d_sampler s; + + VkDescriptorImageInfo vk_image_info; + uint64_t command_buffer_id; +}; + +static inline struct wined3d_sampler_vk *wined3d_sampler_vk(struct wined3d_sampler *sampler) +{ + return CONTAINING_RECORD(sampler, struct wined3d_sampler_vk, s); +} + +void wined3d_sampler_vk_init(struct wined3d_sampler_vk *sampler_vk, + struct wined3d_device *device, const struct wined3d_sampler_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_buffer_vk to wined3d_vk.h.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 97548eb4c9d4dca33fca5adc79322396a337d719 URL: https://gitlab.winehq.org/wine/wine/-/commit/97548eb4c9d4dca33fca5adc793223… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:26:01 2022 -0600 wined3d: Move struct wined3d_buffer_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 21 --------------------- dlls/wined3d/wined3d_vk.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f293ef04624..e058d4ef9cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -112,7 +112,6 @@ static inline const char *wined3d_get_line(const char **ptr, const char *end) struct wined3d_fragment_pipe_ops; struct wined3d_adapter; -struct wined3d_buffer_vk; struct wined3d_context; struct wined3d_context_vk; struct wined3d_gl_info; @@ -4778,26 +4777,6 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined #include "wined3d_vk.h" -struct wined3d_buffer_vk -{ - struct wined3d_buffer b; - - VkDescriptorBufferInfo buffer_info; - uint32_t bind_mask; -}; - -static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer) -{ - return CONTAINING_RECORD(buffer, struct wined3d_buffer_vk, b); -} - -void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, - struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN; -const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN; -HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device, - const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; - static inline void wined3d_resource_vk_barrier(struct wined3d_resource *resource, struct wined3d_context_vk *context_vk, uint32_t bind_mask) { diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index deb855fe55c..6514ece2068 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -25,6 +25,7 @@ #define VK_NO_PROTOTYPES #include "wine/vulkan.h" +struct wined3d_buffer_vk; struct wined3d_device_vk; #define VK_INSTANCE_FUNCS() \ @@ -859,4 +860,24 @@ void wined3d_sampler_vk_init(struct wined3d_sampler_vk *sampler_vk, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +struct wined3d_buffer_vk +{ + struct wined3d_buffer b; + + VkDescriptorBufferInfo buffer_info; + uint32_t bind_mask; +}; + +static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_vk, b); +} + +void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN; +const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN; +HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device, + const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_shader_resource_view_vk to wined3d_vk.h.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 06b958d5d3b10f96cd6a0c9b4739ebb445b619c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/06b958d5d3b10f96cd6a0c9b4739eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:27:52 2022 -0600 wined3d: Move struct wined3d_shader_resource_view_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 43 ++---------------------------------------- dlls/wined3d/wined3d_vk.h | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e6aaeed9adf..aedfc3f789f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4869,47 +4869,6 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - -struct wined3d_view_vk -{ - struct wined3d_bo_user bo_user; - union - { - VkBufferView vk_buffer_view; - VkDescriptorImageInfo vk_image_info; - } u; - uint64_t command_buffer_id; -}; - -struct wined3d_shader_resource_view_vk -{ - struct wined3d_shader_resource_view v; - struct wined3d_view_vk view_vk; -}; - -static inline struct wined3d_shader_resource_view_vk *wined3d_shader_resource_view_vk( - struct wined3d_shader_resource_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_vk, v); -} - -static inline void wined3d_shader_resource_view_vk_barrier(struct wined3d_shader_resource_view_vk *srv_vk, - struct wined3d_context_vk *context_vk, uint32_t bind_mask) -{ - wined3d_resource_vk_barrier(srv_vk->v.resource, context_vk, bind_mask); -} - -void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resource_view_vk *srv_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_vk_update_buffer(struct wined3d_shader_resource_view_vk *view_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_vk_update_layout(struct wined3d_shader_resource_view_vk *srv_vk, - VkImageLayout layout) DECLSPEC_HIDDEN; - struct wined3d_unordered_access_view { LONG refcount; @@ -4954,6 +4913,8 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +#include "wined3d_vk.h" + struct wined3d_unordered_access_view_vk { struct wined3d_unordered_access_view v; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 36d832130ba..d2067d5f9fb 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -925,4 +925,43 @@ HRESULT wined3d_rendertarget_view_vk_init(struct wined3d_rendertarget_view_vk *v const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +struct wined3d_view_vk +{ + struct wined3d_bo_user bo_user; + union + { + VkBufferView vk_buffer_view; + VkDescriptorImageInfo vk_image_info; + } u; + uint64_t command_buffer_id; +}; + +struct wined3d_shader_resource_view_vk +{ + struct wined3d_shader_resource_view v; + struct wined3d_view_vk view_vk; +}; + +static inline struct wined3d_shader_resource_view_vk *wined3d_shader_resource_view_vk( + struct wined3d_shader_resource_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_vk, v); +} + +static inline void wined3d_shader_resource_view_vk_barrier(struct wined3d_shader_resource_view_vk *srv_vk, + struct wined3d_context_vk *context_vk, uint32_t bind_mask) +{ + wined3d_resource_vk_barrier(srv_vk->v.resource, context_vk, bind_mask); +} + +void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resource_view_vk *srv_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_vk_update_buffer(struct wined3d_shader_resource_view_vk *view_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_vk_update_layout(struct wined3d_shader_resource_view_vk *srv_vk, + VkImageLayout layout) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_device_vk to wined3d_vk.h.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 37752cb6f7c45710d69cb8531bdaabce046ea594 URL: https://gitlab.winehq.org/wine/wine/-/commit/37752cb6f7c45710d69cb8531bdaab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:21:17 2022 -0600 wined3d: Move struct wined3d_device_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 125 +---------------------------------------- dlls/wined3d/wined3d_vk.h | 123 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 124 deletions(-)

1 0

Zebediah Figura : wined3d: Move struct wined3d_texture_vk to wined3d_vk.h.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 0559f440d6055b72fb3b10a352a10b7f97dcd2c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0559f440d6055b72fb3b10a352a10b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:24:27 2022 -0600 wined3d: Move struct wined3d_texture_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 33 ++------------------------------- dlls/wined3d/wined3d_vk.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6540a2ced8..022d12dba26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3715,8 +3715,6 @@ void wined3d_allocator_cleanup(struct wined3d_allocator *allocator) DECLSPEC_HID bool wined3d_allocator_init(struct wined3d_allocator *allocator, size_t pool_count, const struct wined3d_allocator_ops *allocator_ops) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - struct wined3d_device_gl { struct wined3d_device d; @@ -4191,7 +4189,6 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; -void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) DECLSPEC_HIDDEN; struct gl_texture { @@ -4268,34 +4265,6 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -struct wined3d_texture_vk -{ - struct wined3d_texture t; - - struct wined3d_image_vk image; - enum VkImageLayout layout; - uint32_t bind_mask; - - VkDescriptorImageInfo default_image_info; -}; - -static inline struct wined3d_texture_vk *wined3d_texture_vk(struct wined3d_texture *texture) -{ - return CONTAINING_RECORD(texture, struct wined3d_texture_vk, t); -} - -void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, - struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN; -const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wined3d_texture_vk *texture_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -HRESULT wined3d_texture_vk_init(struct wined3d_texture_vk *texture_vk, struct wined3d_device *device, - const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, - uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void wined3d_texture_vk_make_generic(struct wined3d_texture_vk *texture_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; - struct wined3d_renderbuffer_entry { struct list entry; @@ -4356,6 +4325,8 @@ void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_vk.h" + struct wined3d_sampler_vk { struct wined3d_sampler s; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index e88608c6d36..c8705790ad9 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -249,6 +249,7 @@ VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPE VkPipelineStageFlags vk_pipeline_stage_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN; +void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; struct wined3d_bo_vk @@ -813,4 +814,32 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, void wined3d_device_vk_uav_clear_state_init(struct wined3d_device_vk *device_vk) DECLSPEC_HIDDEN; void wined3d_device_vk_uav_clear_state_cleanup(struct wined3d_device_vk *device_vk) DECLSPEC_HIDDEN; +struct wined3d_texture_vk +{ + struct wined3d_texture t; + + struct wined3d_image_vk image; + enum VkImageLayout layout; + uint32_t bind_mask; + + VkDescriptorImageInfo default_image_info; +}; + +static inline struct wined3d_texture_vk *wined3d_texture_vk(struct wined3d_texture *texture) +{ + return CONTAINING_RECORD(texture, struct wined3d_texture_vk, t); +} + +void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, + struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN; +const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wined3d_texture_vk *texture_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +HRESULT wined3d_texture_vk_init(struct wined3d_texture_vk *texture_vk, struct wined3d_device *device, + const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, + uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_texture_vk_make_generic(struct wined3d_texture_vk *texture_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Sven Baars : ntdll: Test against the correct limit in get_extended_params().
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 235e3e522e8776791e54541c7cdb2be1482424db URL: https://gitlab.winehq.org/wine/wine/-/commit/235e3e522e8776791e54541c7cdb2b… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Jul 11 15:21:08 2023 +0200 ntdll: Test against the correct limit in get_extended_params(). --- dlls/ntdll/unix/virtual.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 21b4e9b4dba..392ac4d9966 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4353,6 +4353,10 @@ static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, U case MemExtendedParameterAddressRequirements: { MEM_ADDRESS_REQUIREMENTS *r = parameters[i].Pointer; + ULONG_PTR limit; + + if (is_wow64()) limit = (ULONG_PTR)get_wow_user_space_limit(); + else limit = (ULONG_PTR)user_space_limit; if (r->Alignment) { @@ -4366,7 +4370,7 @@ static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, U if (r->LowestStartingAddress) { *limit_low = (ULONG_PTR)r->LowestStartingAddress; - if (*limit_low >= (ULONG_PTR)user_space_limit || (*limit_low & granularity_mask)) + if (*limit_low >= limit || (*limit_low & granularity_mask)) { WARN( "Invalid limit %p.\n", r->LowestStartingAddress ); return STATUS_INVALID_PARAMETER; @@ -4375,7 +4379,7 @@ static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, U if (r->HighestEndingAddress) { *limit_high = (ULONG_PTR)r->HighestEndingAddress; - if (*limit_high > (ULONG_PTR)user_space_limit || + if (*limit_high > limit || *limit_high <= *limit_low || ((*limit_high + 1) & (page_mask - 1))) {

1 0

Jinoh Kang : riched20: Don't call ME_UpdateRepaint inside set_selection().
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: ac5110131493b8b05795e8825285e41ca40ab6f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac5110131493b8b05795e8825285e4… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jul 1 13:36:17 2023 +0900 riched20: Don't call ME_UpdateRepaint inside set_selection(). This partially reverts c5daf6a30f21 (riched20: Call ME_UpdateRepaint instead of editor_ensure_visible in set_selection.) Fixes: c5daf6a30f21acd20263692b278acba49e014cc1 --- dlls/riched20/editor.c | 3 ++- dlls/riched20/tests/txtsrv.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5cf43f4e29a..201c4435453 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2148,9 +2148,10 @@ int set_selection( ME_TextEditor *editor, int to, int from ) if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); - ME_UpdateRepaint( editor, FALSE ); + editor_ensure_visible( editor, &editor->pCursors[0] ); if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); + ME_Repaint( editor ); ME_SendSelChange( editor ); return end; diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index ec2997cb2df..adb36642f4f 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1303,7 +1303,6 @@ static void test_set_selection_message( void ) ok( hr == S_OK, "got %08lx\n", hr ); CHECK_CALLED(ITextHostImpl_TxViewChange); - todo_wine ok(en_change_sent == 0, "got %d\n", en_change_sent); todo_wine ok(en_selchange_sent == 0, "got %d\n", en_selchange_sent); @@ -1322,7 +1321,6 @@ static void test_set_selection_message( void ) ok( hr == S_OK, "got %08lx\n", hr ); CHECK_CALLED(ITextHostImpl_TxViewChange); - todo_wine ok(en_change_sent == 0, "got %d\n", en_change_sent); ok(en_selchange_sent == 0, "got %d\n", en_selchange_sent); @@ -1353,7 +1351,6 @@ static void test_set_selection_message( void ) ok( hr == S_OK, "got %08lx\n", hr ); CHECK_CALLED(ITextHostImpl_TxViewChange); - todo_wine ok(en_change_sent == 0, "got %d\n", en_change_sent); ok(en_selchange_sent == 1, "got %d\n", en_selchange_sent); @@ -1371,7 +1368,6 @@ static void test_set_selection_message( void ) ok( hr == S_OK, "got %08lx\n", hr ); CHECK_CALLED(ITextHostImpl_TxViewChange); - todo_wine ok(en_change_sent == 0, "got %d\n", en_change_sent); ok(en_selchange_sent == 0, "got %d\n", en_selchange_sent);

1 0

Alistair Leslie-Hughes : widl: Remove unnecessary null check (Coverity).
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: f1b9150451723a003a18dc64f2d43d95b5cb1fae URL: https://gitlab.winehq.org/wine/wine/-/commit/f1b9150451723a003a18dc64f2d43d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 13:19:44 2023 +1000 widl: Remove unnecessary null check (Coverity). --- tools/widl/header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b7497e215d5..624d38094f9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -168,7 +168,7 @@ static void write_fields(FILE *h, var_list_t *fields, enum name_type name_type) if (!fields) return; LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) { - if (!v || !v->declspec.type) continue; + if (!v->declspec.type) continue; switch(type_get_type_detect_alias(v->declspec.type)) { case TYPE_STRUCT: @@ -185,7 +185,7 @@ static void write_fields(FILE *h, var_list_t *fields, enum name_type name_type) LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) { expr_t *contract = get_attrp(v->attrs, ATTR_CONTRACT); - if (!v || !v->declspec.type) continue; + if (!v->declspec.type) continue; if (contract) write_apicontract_guard_start(h, contract); indent(h, 0);

1 0

Jinoh Kang : riched20/tests: Add tests for change notifications caused by EM_SETSEL{,EX}.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: c35926e49825f7a3d48ba826085fe1ae3d2a7e27 URL: https://gitlab.winehq.org/wine/wine/-/commit/c35926e49825f7a3d48ba826085fe1… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jul 1 13:35:03 2023 +0900 riched20/tests: Add tests for change notifications caused by EM_SETSEL{,EX}. --- dlls/riched20/tests/txtsrv.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 63d622a6755..ec2997cb2df 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -424,6 +424,8 @@ static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWOR static int en_vscroll_sent; static int en_update_sent; +static int en_change_sent; +static int en_selchange_sent; static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, void *data ) { ITextHostTestImpl *This = impl_from_ITextHost(iface); @@ -438,6 +440,15 @@ static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, en_update_sent++; ok( !data, "got %p\n", data ); break; + case EN_CHANGE: + en_change_sent++; + todo_wine + ok( data != NULL, "got %p\n", data ); + break; + case EN_SELCHANGE: + en_selchange_sent++; + ok( data != NULL, "got %p\n", data ); + break; } return S_OK; } @@ -1268,25 +1279,105 @@ static void test_set_selection_message( void ) { ITextServices *txtserv; ITextHost *host; + CHARRANGE range; LRESULT result; HRESULT hr; if (!init_texthost(&txtserv, &host)) return; + ITextServices_TxSetText(txtserv, L""); + + if (winetest_debug > 1) trace("TxSendMessage EM_SETEVENTMASK"); + + hr = ITextServices_TxSendMessage( txtserv, EM_SETEVENTMASK, 0, ENM_CHANGE | ENM_SELCHANGE, &result ); + ok( hr == S_OK, "got %08lx\n", hr ); + + if (winetest_debug > 1) trace("TxSendMessage EM_SETSEL 0 20"); + CLEAR_COUNTER(ITextHostImpl_TxViewChange); + en_change_sent = 0; + en_selchange_sent = 0; + hr = ITextServices_TxSendMessage(txtserv, EM_SETSEL, 0, 20, &result); ok( hr == S_OK, "got %08lx\n", hr ); + CHECK_CALLED(ITextHostImpl_TxViewChange); + todo_wine + ok(en_change_sent == 0, "got %d\n", en_change_sent); + todo_wine + ok(en_selchange_sent == 0, "got %d\n", en_selchange_sent); + + hr = ITextServices_TxSendMessage(txtserv, EM_EXGETSEL, 0, (LPARAM)&range, &result); ok( hr == S_OK, "got %08lx\n", hr ); trace("getsel: %lu, %lu\n", range.cpMin, range.cpMax); + + if (winetest_debug > 1) trace("TxSendMessage EM_SETSELEX 0 20"); + + CLEAR_COUNTER(ITextHostImpl_TxViewChange); + en_change_sent = 0; + en_selchange_sent = 0; + + range.cpMin = 0; + range.cpMax = 20; + hr = ITextServices_TxSendMessage(txtserv, EM_EXSETSEL, 0, (LPARAM)&range, &result); + ok( hr == S_OK, "got %08lx\n", hr ); + + CHECK_CALLED(ITextHostImpl_TxViewChange); + todo_wine + ok(en_change_sent == 0, "got %d\n", en_change_sent); + ok(en_selchange_sent == 0, "got %d\n", en_selchange_sent); + + if (winetest_debug > 1) trace("TxSetText"); CLEAR_COUNTER(ITextHostImpl_TxViewChange); + en_change_sent = 0; + en_selchange_sent = 0; + + hr = ITextServices_TxSendMessage(txtserv, EM_EXGETSEL, 0, (LPARAM)&range, &result); ok( hr == S_OK, "got %08lx\n", hr ); trace("getsel: %lu, %lu\n", range.cpMin, range.cpMax); + ITextServices_TxSetText(txtserv, lorem); + + hr = ITextServices_TxSendMessage(txtserv, EM_EXGETSEL, 0, (LPARAM)&range, &result); ok( hr == S_OK, "got %08lx\n", hr ); trace("getsel: %lu, %lu\n", range.cpMin, range.cpMax); + CHECK_CALLED(ITextHostImpl_TxViewChange); + ok(en_change_sent == 1, "got %d\n", en_change_sent); + todo_wine + ok(en_selchange_sent == 0, "got %d\n", en_selchange_sent); + + if (winetest_debug > 1) trace("TxSendMessage EM_SETSEL 0 20"); CLEAR_COUNTER(ITextHostImpl_TxViewChange); + en_change_sent = 0; + en_selchange_sent = 0; + hr = ITextServices_TxSendMessage(txtserv, EM_SETSEL, 0, 20, &result); ok( hr == S_OK, "got %08lx\n", hr ); + + CHECK_CALLED(ITextHostImpl_TxViewChange); + todo_wine + ok(en_change_sent == 0, "got %d\n", en_change_sent); + ok(en_selchange_sent == 1, "got %d\n", en_selchange_sent); + + hr = ITextServices_TxSendMessage(txtserv, EM_EXGETSEL, 0, (LPARAM)&range, &result); ok( hr == S_OK, "got %08lx\n", hr ); trace("getsel: %lu, %lu\n", range.cpMin, range.cpMax); + + if (winetest_debug > 1) trace("TxSendMessage EM_SETSELEX 0 20"); + + CLEAR_COUNTER(ITextHostImpl_TxViewChange); + en_change_sent = 0; + en_selchange_sent = 0; + + range.cpMin = 0; + range.cpMax = 20; + hr = ITextServices_TxSendMessage(txtserv, EM_EXSETSEL, 0, (LPARAM)&range, &result); + ok( hr == S_OK, "got %08lx\n", hr ); + CHECK_CALLED(ITextHostImpl_TxViewChange); + todo_wine + ok(en_change_sent == 0, "got %d\n", en_change_sent); + ok(en_selchange_sent == 0, "got %d\n", en_selchange_sent); + + hr = ITextServices_TxSendMessage(txtserv, EM_EXGETSEL, 0, (LPARAM)&range, &result); ok( hr == S_OK, "got %08lx\n", hr ); trace("getsel: %lu, %lu\n", range.cpMin, range.cpMax); + + if (winetest_debug > 1) trace("release interfaces"); ITextServices_Release( txtserv ); ITextHost_Release( host );

1 0