September 2022 - Wine-Commits

Jacek Caban : winevulkan: Separate PE and Unix VkInstance structs.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 9a7a2ab2d9f8cfebc57ad7cbffce54c245a4c538 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a7a2ab2d9f8cfebc57ad7cbffce54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 23:20:04 2022 +0200 winevulkan: Separate PE and Unix VkInstance structs. --- dlls/winevulkan/loader.c | 29 +++++++++++++++++++---- dlls/winevulkan/loader_thunks.c | 8 ------- dlls/winevulkan/loader_thunks.h | 1 + dlls/winevulkan/make_vulkan | 10 ++++---- dlls/winevulkan/vulkan.c | 51 +++++++++++++++++++++------------------- dlls/winevulkan/vulkan_loader.h | 5 ++++ dlls/winevulkan/vulkan_private.h | 16 +++++++++---- dlls/winevulkan/vulkan_thunks.c | 8 +++---- 8 files changed, 77 insertions(+), 51 deletions(-)

1 0

Jacek Caban : winevulkan: Separate PE and Unix VkQueue structs.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 59d13f3d358f0f3c5695c9528fed3e051b2fc8ef URL: https://gitlab.winehq.org/wine/wine/-/commit/59d13f3d358f0f3c5695c9528fed3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 01:19:45 2022 +0200 winevulkan: Separate PE and Unix VkQueue structs. --- dlls/winevulkan/loader.c | 7 ++++++- dlls/winevulkan/make_vulkan | 6 ++++-- dlls/winevulkan/vulkan.c | 21 ++++++++++++--------- dlls/winevulkan/vulkan_loader.h | 6 ++++++ dlls/winevulkan/vulkan_private.h | 12 +++++++++--- dlls/winevulkan/vulkan_thunks.c | 32 ++++++++++++++++---------------- 6 files changed, 53 insertions(+), 31 deletions(-)

1 0

Jacek Caban : winevulkan: Separate PE and Unix VkDevice structs.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: a6dc349aad6abe190b68bdf79c4cca067e054407 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6dc349aad6abe190b68bdf79c4cca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 1 14:33:59 2022 +0200 winevulkan: Separate PE and Unix VkDevice structs. --- dlls/winevulkan/loader.c | 42 +++- dlls/winevulkan/loader_thunks.c | 18 -- dlls/winevulkan/loader_thunks.h | 1 + dlls/winevulkan/make_vulkan | 40 +-- dlls/winevulkan/vulkan.c | 54 ++-- dlls/winevulkan/vulkan_loader.h | 6 +- dlls/winevulkan/vulkan_private.h | 14 +- dlls/winevulkan/vulkan_thunks.c | 532 +++++++++++++++++++-------------------- 8 files changed, 370 insertions(+), 337 deletions(-)

1 0

Jacek Caban : winevulkan: Wrap VkCommandPool on PE side.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 19326ff94ce937e5373ab2eb8e07e0e9600ef72b URL: https://gitlab.winehq.org/wine/wine/-/commit/19326ff94ce937e5373ab2eb8e07e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 16:09:51 2022 +0200 winevulkan: Wrap VkCommandPool on PE side. --- dlls/winevulkan/loader.c | 34 ++++++++++++++++++++++++++++++++++ dlls/winevulkan/loader_thunks.c | 19 ------------------- dlls/winevulkan/loader_thunks.h | 1 + dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 18 +++++++++++------- dlls/winevulkan/vulkan_loader.h | 10 ++++++++++ dlls/winevulkan/vulkan_private.h | 9 +++------ 7 files changed, 61 insertions(+), 34 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 221a62a5680..ce5d2314169 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -491,6 +491,40 @@ void WINAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *alloca free(device); } +VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkCommandPool *ret) +{ + struct vkCreateCommandPool_params params; + struct vk_command_pool *cmd_pool; + VkResult result; + + if (!(cmd_pool = malloc(sizeof(*cmd_pool)))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + cmd_pool->unix_handle = 0; + + params.device = device; + params.pCreateInfo = create_info; + params.pAllocator = allocator; + params.pCommandPool = ret; + params.client_ptr = cmd_pool; + result = vk_unix_call(unix_vkCreateCommandPool, &params); + if (!cmd_pool->unix_handle) + free(cmd_pool); + return result; +} + +void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const VkAllocationCallbacks *allocator) +{ + struct vk_command_pool *cmd_pool = command_pool_from_handle(handle); + struct vkDestroyCommandPool_params params; + + params.device = device; + params.commandPool = handle; + params.pAllocator = allocator; + vk_unix_call(unix_vkDestroyCommandPool, &params); + free(cmd_pool); +} + static BOOL WINAPI call_vulkan_debug_report_callback( struct wine_vk_debug_report_params *params, ULONG size ) { return params->user_callback(params->flags, params->object_type, params->object_handle, params->location, diff --git a/dlls/winevulkan/loader_thunks.c b/dlls/winevulkan/loader_thunks.c index cb4ea68a8b4..32626c27eab 100644 --- a/dlls/winevulkan/loader_thunks.c +++ b/dlls/winevulkan/loader_thunks.c @@ -1999,16 +1999,6 @@ VkResult WINAPI vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo return vk_unix_call(unix_vkCreateBufferView, &params); } -VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool) -{ - struct vkCreateCommandPool_params params; - params.device = device; - params.pCreateInfo = pCreateInfo; - params.pAllocator = pAllocator; - params.pCommandPool = pCommandPool; - return vk_unix_call(unix_vkCreateCommandPool, &params); -} - VkResult WINAPI vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { struct vkCreateComputePipelines_params params; @@ -2441,15 +2431,6 @@ void WINAPI vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const vk_unix_call(unix_vkDestroyBufferView, &params); } -void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator) -{ - struct vkDestroyCommandPool_params params; - params.device = device; - params.commandPool = commandPool; - params.pAllocator = pAllocator; - vk_unix_call(unix_vkDestroyCommandPool, &params); -} - void WINAPI vkDestroyCuFunctionNVX(VkDevice device, VkCuFunctionNVX function, const VkAllocationCallbacks *pAllocator) { struct vkDestroyCuFunctionNVX_params params; diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index b42496e3655..410041ef51c 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -2066,6 +2066,7 @@ struct vkCreateCommandPool_params const VkCommandPoolCreateInfo *pCreateInfo; const VkAllocationCallbacks *pAllocator; VkCommandPool *pCommandPool; + void *client_ptr; }; struct vkCreateComputePipelines_params diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a1cb6452f25..068e140a738 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -201,10 +201,10 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE, "extra_param" : "client_ptr"}, "vkCreateComputePipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, "vkCreateGraphicsPipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, - "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 558b09c310a..652beb7b4e0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -63,8 +63,8 @@ static const struct vulkan_funcs *vk_funcs; #define WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, client_handle, native_handle, object) \ wine_vk_add_handle_mapping((instance), (uintptr_t)(client_handle), (uintptr_t)(native_handle), &(object)->mapping) -#define WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, native_handle) \ - wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (native_handle), &(object)->mapping) +#define WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, client_handle, native_handle, object) \ + wine_vk_add_handle_mapping((instance), (uintptr_t)(client_handle), (native_handle), &(object)->mapping) static void wine_vk_add_handle_mapping(struct wine_instance *instance, uint64_t wrapped_handle, uint64_t native_handle, struct wine_vk_mapping *mapping) { @@ -1148,6 +1148,7 @@ NTSTATUS wine_vkCreateCommandPool(void *args) const VkCommandPoolCreateInfo *info = params->pCreateInfo; const VkAllocationCallbacks *allocator = params->pAllocator; VkCommandPool *command_pool = params->pCommandPool; + struct vk_command_pool *handle = params->client_ptr; struct wine_cmd_pool *object; VkResult res; @@ -1165,8 +1166,11 @@ NTSTATUS wine_vkCreateCommandPool(void *args) if (res == VK_SUCCESS) { - WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, object, object->command_pool); - *command_pool = wine_cmd_pool_to_handle(object); + object->handle = (uintptr_t)handle; + handle->unix_handle = (uintptr_t)object; + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, object->handle, + object->command_pool, object); + *command_pool = object->handle; } else { @@ -1575,7 +1579,7 @@ NTSTATUS wine_vkCreateWin32SurfaceKHR(void *args) object->surface = vk_funcs->p_wine_get_native_surface(object->driver_surface); - WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->surface); + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->surface, object); *surface = wine_surface_to_handle(object); @@ -1689,7 +1693,7 @@ NTSTATUS wine_vkCreateDebugUtilsMessengerEXT(void *args) return res; } - WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->debug_messenger); + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->debug_messenger, object); *messenger = wine_debug_utils_messenger_to_handle(object); return VK_SUCCESS; @@ -1753,7 +1757,7 @@ NTSTATUS wine_vkCreateDebugReportCallbackEXT(void *args) return res; } - WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->debug_callback); + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->debug_callback, object); *callback = wine_debug_report_callback_to_handle(object); return VK_SUCCESS; diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index bf99cf57694..fdf6d3d1699 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -78,6 +78,16 @@ struct VkDevice_T struct VkQueue_T queues[1]; }; +struct vk_command_pool +{ + UINT64 unix_handle; +}; + +static inline struct vk_command_pool *command_pool_from_handle(VkCommandPool handle) +{ + return (struct vk_command_pool *)(uintptr_t)handle; +} + struct vulkan_func { const char *name; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 99907252e2d..5f7642d5f6d 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -157,6 +157,7 @@ static inline struct wine_queue *wine_queue_from_handle(VkQueue handle) struct wine_cmd_pool { + VkCommandPool handle; VkCommandPool command_pool; struct list command_buffers; @@ -166,12 +167,8 @@ struct wine_cmd_pool static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool handle) { - return (struct wine_cmd_pool *)(uintptr_t)handle; -} - -static inline VkCommandPool wine_cmd_pool_to_handle(struct wine_cmd_pool *cmd_pool) -{ - return (VkCommandPool)(uintptr_t)cmd_pool; + struct vk_command_pool *client_ptr = command_pool_from_handle(handle); + return (struct wine_cmd_pool *)(uintptr_t)client_ptr->unix_handle; } struct wine_debug_utils_messenger

1 0

Rémi Bernon : include: Add WMV encoder / decoder DMO class ids to wmcodecdsp.idl.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 56d75c134cde751bf80f013a7ec5d64c57b56ba4 URL: https://gitlab.winehq.org/wine/wine/-/commit/56d75c134cde751bf80f013a7ec5d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 5 11:30:17 2022 +0200 include: Add WMV encoder / decoder DMO class ids to wmcodecdsp.idl. --- include/wmcodecdsp.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 87e545c838c..066cb0550de 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -68,3 +68,18 @@ coclass AACMFTEncoder {} uuid(98230571-0087-4204-b020-3282538e57d3) ] coclass CColorConvertDMO {} + +[ + uuid(d23b90d0-144f-46bd-841d-59e4eb19dc59) +] +coclass CWMV9EncMediaObject {} + +[ + uuid(82d353df-90bd-4382-8bc2-3f6192b76e34) +] +coclass CWMVDecMediaObject {} + +[ + uuid(7e320092-596a-41b2-bbeb-175d10504eb6) +] +coclass CWMVXEncMediaObject {}

1 0

Rémi Bernon : include: Add more WMV media subtypes to wmcodecdsp.idl.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 1f9ece9e32c1195e81f8e19cdbba5831cf2b7c11 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f9ece9e32c1195e81f8e19cdbba58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 5 12:58:11 2022 +0200 include: Add more WMV media subtypes to wmcodecdsp.idl. --- include/wmcodecdsp.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 066cb0550de..5769b0e011e 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -28,6 +28,14 @@ cpp_quote("DEFINE_GUID(MEDIASUBTYPE_V216,0x36313256,0x0000,0x0010,0x80,0x00,0x00 cpp_quote("DEFINE_GUID(MEDIASUBTYPE_V410,0x30313456,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("DEFINE_GUID(MEDIASUBTYPE_Y41T,0x54313459,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("DEFINE_GUID(MEDIASUBTYPE_Y42T,0x54323459,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMV1,0x31564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMV2,0x32564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMV3,0x33564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMVA,0x41564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMVP,0x50564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMVR,0x52564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WVC1,0x31435657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WVP2,0x32505657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a)

1 0

Rémi Bernon : include: Declare AudioResamplerMediaObject and MP3DecMediaObject class ids in mfidl.idl.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: e74fd23832acb1778b4026267e6b56cf0c479509 URL: https://gitlab.winehq.org/wine/wine/-/commit/e74fd23832acb1778b4026267e6b56… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 5 11:30:17 2022 +0200 include: Declare AudioResamplerMediaObject and MP3DecMediaObject class ids in mfidl.idl. --- include/mfidl.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/mfidl.idl b/include/mfidl.idl index c42fba77fbe..94bf1a2036c 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1663,7 +1663,8 @@ cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420a51a3, 0xd605, 0x430c, 0xb4, cpp_quote("EXTERN_GUID(CLSID_MSVPxDecoder, 0xe3aaf548, 0xc9a4, 0x4c6e, 0x23, 0x4d, 0x5a, 0xda, 0x37, 0x4b, 0x00, 0x00);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") - +cpp_quote("EXTERN_GUID(CLSID_AudioResamplerMediaObject, 0xf447b69e, 0x1884, 0x4a7e, 0x80, 0x55, 0x34, 0x6f, 0x74, 0xd6, 0xed, 0xb3);") +cpp_quote("EXTERN_GUID(CLSID_MP3DecMediaObject, 0xbbeea841, 0x0a63, 0x4f52, 0xa7, 0xab, 0xa9, 0xb3, 0xa8, 0x4e, 0xd3, 0x8a);") cpp_quote("EXTERN_GUID(CLSID_WMADecMediaObject, 0x2eeb4adf, 0x4578, 0x4d10, 0xbc, 0xa7, 0xbb, 0x95, 0x5f, 0x56, 0x32, 0x0a);") cpp_quote("EXTERN_GUID(CLSID_HttpSchemePlugin, 0x44cb442b, 0x9da9, 0x49df, 0xb3, 0xfd, 0x02, 0x37, 0x77, 0xb1, 0x6e, 0x50);")

1 0

Rémi Bernon : include: Remove unnecessary semicolons from wmcodecdsp.idl.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: f4970d8e3bc97315e92de5b22f86c8da6dae95d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4970d8e3bc97315e92de5b22f86c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 5 12:32:32 2022 +0200 include: Remove unnecessary semicolons from wmcodecdsp.idl. --- include/wmcodecdsp.idl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 0846b08382c..87e545c838c 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -52,19 +52,19 @@ coclass CMSMPEGDecoderMFT {} [ uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a) ] -coclass CWMADecMediaObject {}; +coclass CWMADecMediaObject {} [ uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) ] -coclass CWMAEncMediaObject {}; +coclass CWMAEncMediaObject {} [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -coclass AACMFTEncoder {}; +coclass AACMFTEncoder {} [ uuid(98230571-0087-4204-b020-3282538e57d3) ] -coclass CColorConvertDMO {}; +coclass CColorConvertDMO {}

1 0

Robert Wilhelm : scrrun: Test whether IFolder_get_Path() returns an absolute path.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 4e360e8d428a383ff49546e91701a1bd43ffcc7d URL: https://gitlab.winehq.org/wine/wine/-/commit/4e360e8d428a383ff49546e91701a1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Sep 5 20:35:19 2022 +0200 scrrun: Test whether IFolder_get_Path() returns an absolute path. --- dlls/scrrun/tests/filesystem.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 59f5859c556..98652ecf523 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -27,6 +27,7 @@ #include "olectl.h" #include "oleauto.h" #include "dispex.h" +#include "shlwapi.h" #include "wine/test.h" @@ -927,7 +928,9 @@ static void test_BuildPath(void) static void test_GetFolder(void) { - WCHAR buffW[MAX_PATH]; + static const WCHAR dir[] = L"test_dir"; + + WCHAR buffW[MAX_PATH], temp_path[MAX_PATH], prev_path[MAX_PATH]; IFolder *folder; HRESULT hr; BSTR str; @@ -959,6 +962,22 @@ static void test_GetFolder(void) SysFreeString(str); test_provideclassinfo(folder, &CLSID_Folder); IFolder_Release(folder); + + GetCurrentDirectoryW(MAX_PATH, prev_path); + GetTempPathW(MAX_PATH, temp_path); + SetCurrentDirectoryW(temp_path); + ok(CreateDirectoryW(dir, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir)); + str = SysAllocString(dir); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + SysFreeString(str); + hr = IFolder_get_Path(folder, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!PathIsRelativeW(str), "path %s is relative.\n", wine_dbgstr_w(str)); + SysFreeString(str); + IFolder_Release(folder); + RemoveDirectoryW(dir); + SetCurrentDirectoryW(prev_path); } static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG count, int line)

1 0

Nikolay Sivov : dwrite: Handle higher planes characters in line breaking logic.
by Alexandre Julliard Sept. 6, 2022

Sept. 6, 2022

Module: wine Branch: master Commit: 28efff385528864a88bc30c5a12ccbc976a31c3c URL: https://gitlab.winehq.org/wine/wine/-/commit/28efff385528864a88bc30c5a12ccb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 6 07:26:01 2022 +0300 dwrite: Handle higher planes characters in line breaking logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 161 +++++++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 73 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 6c3dc7e40d1..5489efa93b8 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -732,8 +732,16 @@ static HRESULT analyze_script(struct text_source_context *context, IDWriteTextAn return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); } -struct linebreaking_state { +struct break_index +{ + unsigned int index; + UINT8 length; +}; + +struct linebreaking_state +{ DWRITE_LINE_BREAKPOINT *breakpoints; + struct break_index *breaks; UINT32 count; }; @@ -804,19 +812,36 @@ static BOOL has_strong_condition(DWRITE_BREAK_CONDITION old_condition, DWRITE_BR static inline void set_break_condition(UINT32 pos, enum BreakConditionLocation location, DWRITE_BREAK_CONDITION condition, struct linebreaking_state *state) { - if (location == BreakConditionBefore) { - if (has_strong_condition(state->breakpoints[pos].breakConditionBefore, condition)) + unsigned int index = state->breaks[pos].index; + + if (location == BreakConditionBefore) + { + if (has_strong_condition(state->breakpoints[index].breakConditionBefore, condition)) return; - state->breakpoints[pos].breakConditionBefore = condition; - if (pos > 0) - state->breakpoints[pos-1].breakConditionAfter = condition; + state->breakpoints[index].breakConditionBefore = condition; + if (pos) + { + --pos; + + index = state->breaks[pos].index; + if (state->breaks[pos].length > 1) index++; + + state->breakpoints[index].breakConditionAfter = condition; + } } - else { - if (has_strong_condition(state->breakpoints[pos].breakConditionAfter, condition)) + else + { + if (state->breaks[pos].length > 1) index++; + + if (has_strong_condition(state->breakpoints[index].breakConditionAfter, condition)) return; - state->breakpoints[pos].breakConditionAfter = condition; + state->breakpoints[index].breakConditionAfter = condition; + if (pos + 1 < state->count) - state->breakpoints[pos+1].breakConditionBefore = condition; + { + index = state->breaks[pos + 1].index; + state->breakpoints[index].breakConditionBefore = condition; + } } } @@ -826,43 +851,72 @@ BOOL lb_is_newline_char(WCHAR ch) return c == b_LF || c == b_NL || c == b_CR || c == b_BK; } -static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_BREAKPOINT *breakpoints) +static HRESULT analyze_linebreaks(IDWriteTextAnalysisSource *source, UINT32 position, + UINT32 length, DWRITE_LINE_BREAKPOINT *breakpoints) { + struct text_source_context context; struct linebreaking_state state; + struct break_index *breaks; + unsigned int count, index; short *break_class; - int i, j; + int i = 0, j; + HRESULT hr; - if (!(break_class = calloc(count, sizeof(*break_class)))) - return E_OUTOFMEMORY; + if (FAILED(hr = text_source_context_init(&context, source, position, length))) return hr; - state.breakpoints = breakpoints; - state.count = count; + if (!(breaks = calloc(length, sizeof(*breaks)))) + return E_OUTOFMEMORY; - for (i = 0; i < count; i++) + if (!(break_class = calloc(length, sizeof(*break_class)))) { - break_class[i] = get_table_entry_32(wine_linebreak_table, text[i]); + free(breaks); + return E_OUTOFMEMORY; + } - breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_NEUTRAL; - breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_NEUTRAL; - breakpoints[i].isWhitespace = !!iswspace(text[i]); - breakpoints[i].isSoftHyphen = text[i] == 0x00ad /* Unicode Soft Hyphen */; - breakpoints[i].padding = 0; + count = index = 0; + while (!text_source_get_next_u32_char(&context)) + { + break_class[count] = get_table_entry_32(wine_linebreak_table, context.ch); + breaks[count].length = text_source_get_char_length(&context); + breaks[count].index = index; /* LB1 - resolve some classes. TODO: use external algorithms for these classes. */ - switch (break_class[i]) + switch (break_class[count]) { case b_AI: case b_SA: case b_SG: case b_XX: - break_class[i] = b_AL; + break_class[count] = b_AL; break; case b_CJ: - break_class[i] = b_NS; + break_class[count] = b_NS; break; } + + breakpoints[index].breakConditionBefore = DWRITE_BREAK_CONDITION_NEUTRAL; + breakpoints[index].breakConditionAfter = DWRITE_BREAK_CONDITION_NEUTRAL; + breakpoints[index].isWhitespace = context.ch < 0xffff ? !!iswspace(context.ch) : 0; + breakpoints[index].isSoftHyphen = context.ch == 0x00ad /* Unicode Soft Hyphen */; + breakpoints[index].padding = 0; + ++index; + + if (breaks[count].length > 1) + { + breakpoints[index] = breakpoints[index - 1]; + /* Never break in surrogate pairs. */ + breakpoints[index - 1].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + breakpoints[index].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + ++index; + } + + ++count; } + state.breakpoints = breakpoints; + state.breaks = breaks; + state.count = count; + /* LB2 - never break at the start */ set_break_condition(0, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); /* LB3 - always break at the end. */ @@ -1193,6 +1247,8 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B } free(break_class); + free(breaks); + return S_OK; } @@ -1332,64 +1388,23 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeNumberSubstitution(IDWriteTextAn } static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnalyzer2 *iface, - IDWriteTextAnalysisSource* source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink* sink) + IDWriteTextAnalysisSource *source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink *sink) { - DWRITE_LINE_BREAKPOINT *breakpoints = NULL; - WCHAR *buff = NULL; - const WCHAR *text; + DWRITE_LINE_BREAKPOINT *breakpoints; HRESULT hr; - UINT32 len; TRACE("%p, %u, %u, %p.\n", source, position, length, sink); - if (length == 0) + if (!length) return S_OK; - /* get some, check for length */ - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); - if (FAILED(hr)) return hr; - - if (len < length) { - UINT32 read; - - if (!(buff = calloc(length, sizeof(*buff)))) - return E_OUTOFMEMORY; - if (text) - memcpy(buff, text, len*sizeof(WCHAR)); - read = len; - - while (read < length && text) { - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position+read, &text, &len); - if (FAILED(hr)) - goto done; - if (!text) - break; - memcpy(&buff[read], text, min(len, length-read)*sizeof(WCHAR)); - read += len; - } - - text = buff; - } - if (!(breakpoints = calloc(length, sizeof(*breakpoints)))) - { - hr = E_OUTOFMEMORY; - goto done; - } - - hr = analyze_linebreaks(text, length, breakpoints); - if (FAILED(hr)) - goto done; + return E_OUTOFMEMORY; - hr = IDWriteTextAnalysisSink_SetLineBreakpoints(sink, position, length, breakpoints); + if (SUCCEEDED(hr = analyze_linebreaks(source, position, length, breakpoints))) + hr = IDWriteTextAnalysisSink_SetLineBreakpoints(sink, position, length, breakpoints); -done: free(breakpoints); - free(buff); return hr; }

1 0