December 2022 - Wine-Commits

Jacek Caban : winevulkan: Use VK_EXT_external_memory_host extension to map memory on wow64.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 2084f8bc104d3a40ef4b9eb06d9723e68215f2d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2084f8bc104d3a40ef4b9eb06d9723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 20 16:25:13 2022 +0100 winevulkan: Use VK_EXT_external_memory_host extension to map memory on wow64. --- dlls/winevulkan/make_vulkan | 2 + dlls/winevulkan/vulkan.c | 211 +++++++++++++++++++++++++++++++++++++-- dlls/winevulkan/vulkan_private.h | 4 + dlls/winevulkan/vulkan_thunks.c | 8 +- dlls/winevulkan/vulkan_thunks.h | 2 + 5 files changed, 216 insertions(+), 11 deletions(-)

1 0

Jacek Caban : winevulkan: Wrap VkDeviceMemory.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: bbdad7474a2eed3f10b44b36a260660981375291 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbdad7474a2eed3f10b44b36a26066… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 18 02:38:27 2022 +0100 winevulkan: Wrap VkDeviceMemory. --- dlls/winevulkan/make_vulkan | 5 + dlls/winevulkan/vulkan.c | 49 ++++- dlls/winevulkan/vulkan_private.h | 10 + dlls/winevulkan/vulkan_thunks.c | 434 ++++++++++++++++++++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.h | 3 + 5 files changed, 467 insertions(+), 34 deletions(-)

1 0

Jacek Caban : winevulkan: Fix handling pointers to pointer-size variables in 32-bit thunks.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: feab1634eec3b04f43dc636cffa51c6fbb040128 URL: https://gitlab.winehq.org/wine/wine/-/commit/feab1634eec3b04f43dc636cffa51c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 19:34:13 2022 +0100 winevulkan: Fix handling pointers to pointer-size variables in 32-bit thunks. --- dlls/winevulkan/make_vulkan | 6 +++++- dlls/winevulkan/vulkan_thunks.c | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 45418e362c5..6932befc719 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1320,7 +1320,7 @@ class VkVariable(object): if self.const: cast_type += "const " - if self.pointer_array or ((self.is_dynamic_array() or self.is_static_array()) and self.is_pointer_size()): + if self.pointer_array or ((self.is_pointer() or self.is_static_array()) and self.is_pointer_size()): cast_type += "PTR32 *" else: cast_type += self.type @@ -1693,6 +1693,8 @@ class VkParam(VkVariable): elif self.is_struct(): return " convert_{0}_{3}_to_{5}host({4}{1}, &{2}_host);\n".format( self.type, self.value(prefix, conv), self.name, win_type, ctx_param, wrap_part) + elif self.is_pointer_size() and self.type != "size_t": + return " {0}_host = UlongToPtr(*{1});\n".format(self.name, self.value(prefix, conv)) else: return " {0}_host = *{1};\n".format(self.name, self.value(prefix, conv)) else: @@ -1704,6 +1706,8 @@ class VkParam(VkVariable): ref_part = "" if self.optional else "&" return " convert_{0}_host_to_{3}({4}{2}_host, {1});\n".format( self.type, self.value(prefix, conv), self.name, win_type, ref_part) + elif self.is_pointer_size() and self.type != "size_t": + return " *{0} = PtrToUlong({1}_host);\n".format(self.value(prefix, conv), self.name) else: return " *{0} = {1}_host;\n".format(self.value(prefix, conv), self.name) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index dad8991e095..c1dccdf37e4 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -32518,9 +32518,9 @@ static NTSTATUS thunk32_vkCreateDevice(void *args) init_conversion_context(&ctx); convert_VkDeviceCreateInfo_win32_to_host(&ctx, (const VkDeviceCreateInfo32 *)UlongToPtr(params->pCreateInfo), &pCreateInfo_host); - pDevice_host = *(VkDevice *)UlongToPtr(params->pDevice); + pDevice_host = UlongToPtr(*(PTR32 *)UlongToPtr(params->pDevice)); params->result = wine_vkCreateDevice((VkPhysicalDevice)UlongToPtr(params->physicalDevice), &pCreateInfo_host, (const VkAllocationCallbacks *)UlongToPtr(params->pAllocator), &pDevice_host, UlongToPtr(params->client_ptr)); - *(VkDevice *)UlongToPtr(params->pDevice) = pDevice_host; + *(PTR32 *)UlongToPtr(params->pDevice) = PtrToUlong(pDevice_host); free_conversion_context(&ctx); return STATUS_SUCCESS; } @@ -32803,9 +32803,9 @@ static NTSTATUS thunk32_vkCreateInstance(void *args) init_conversion_context(&ctx); convert_VkInstanceCreateInfo_win32_to_host(&ctx, (const VkInstanceCreateInfo32 *)UlongToPtr(params->pCreateInfo), &pCreateInfo_host); - pInstance_host = *(VkInstance *)UlongToPtr(params->pInstance); + pInstance_host = UlongToPtr(*(PTR32 *)UlongToPtr(params->pInstance)); params->result = wine_vkCreateInstance(&pCreateInfo_host, (const VkAllocationCallbacks *)UlongToPtr(params->pAllocator), &pInstance_host, UlongToPtr(params->client_ptr)); - *(VkInstance *)UlongToPtr(params->pInstance) = pInstance_host; + *(PTR32 *)UlongToPtr(params->pInstance) = PtrToUlong(pInstance_host); free_conversion_context(&ctx); return STATUS_SUCCESS; } @@ -36366,9 +36366,9 @@ static NTSTATUS thunk32_vkGetDeviceQueue(void *args) TRACE("%#x, %u, %u, %#x\n", params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); - pQueue_host = *(VkQueue *)UlongToPtr(params->pQueue); + pQueue_host = UlongToPtr(*(PTR32 *)UlongToPtr(params->pQueue)); wine_vkGetDeviceQueue((VkDevice)UlongToPtr(params->device), params->queueFamilyIndex, params->queueIndex, &pQueue_host); - *(VkQueue *)UlongToPtr(params->pQueue) = pQueue_host; + *(PTR32 *)UlongToPtr(params->pQueue) = PtrToUlong(pQueue_host); return STATUS_SUCCESS; } @@ -36398,9 +36398,9 @@ static NTSTATUS thunk32_vkGetDeviceQueue2(void *args) TRACE("%#x, %#x, %#x\n", params->device, params->pQueueInfo, params->pQueue); convert_VkDeviceQueueInfo2_win32_to_host((const VkDeviceQueueInfo232 *)UlongToPtr(params->pQueueInfo), &pQueueInfo_host); - pQueue_host = *(VkQueue *)UlongToPtr(params->pQueue); + pQueue_host = UlongToPtr(*(PTR32 *)UlongToPtr(params->pQueue)); wine_vkGetDeviceQueue2((VkDevice)UlongToPtr(params->device), &pQueueInfo_host, &pQueue_host); - *(VkQueue *)UlongToPtr(params->pQueue) = pQueue_host; + *(PTR32 *)UlongToPtr(params->pQueue) = PtrToUlong(pQueue_host); return STATUS_SUCCESS; } @@ -38515,9 +38515,9 @@ static NTSTATUS thunk32_vkGetPipelineCacheData(void *args) TRACE("%#x, 0x%s, %#x, %#x\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); - pDataSize_host = *(size_t *)UlongToPtr(params->pDataSize); + pDataSize_host = *(PTR32 *)UlongToPtr(params->pDataSize); params->result = wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkGetPipelineCacheData(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->device, params->pipelineCache, &pDataSize_host, (void *)UlongToPtr(params->pData)); - *(size_t *)UlongToPtr(params->pDataSize) = pDataSize_host; + *(PTR32 *)UlongToPtr(params->pDataSize) = pDataSize_host; return STATUS_SUCCESS; } @@ -39082,9 +39082,9 @@ static NTSTATUS thunk32_vkGetShaderInfoAMD(void *args) TRACE("%#x, 0x%s, %#x, %#x, %#x, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); - pInfoSize_host = *(size_t *)UlongToPtr(params->pInfoSize); + pInfoSize_host = *(PTR32 *)UlongToPtr(params->pInfoSize); params->result = wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->device, params->pipeline, params->shaderStage, params->infoType, &pInfoSize_host, (void *)UlongToPtr(params->pInfo)); - *(size_t *)UlongToPtr(params->pInfoSize) = pInfoSize_host; + *(PTR32 *)UlongToPtr(params->pInfoSize) = pInfoSize_host; return STATUS_SUCCESS; } @@ -39208,9 +39208,9 @@ static NTSTATUS thunk32_vkGetValidationCacheDataEXT(void *args) TRACE("%#x, 0x%s, %#x, %#x\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); - pDataSize_host = *(size_t *)UlongToPtr(params->pDataSize); + pDataSize_host = *(PTR32 *)UlongToPtr(params->pDataSize); params->result = wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->device, params->validationCache, &pDataSize_host, (void *)UlongToPtr(params->pData)); - *(size_t *)UlongToPtr(params->pDataSize) = pDataSize_host; + *(PTR32 *)UlongToPtr(params->pDataSize) = pDataSize_host; return STATUS_SUCCESS; }

1 0

Jacek Caban : winevulkan: Don't try to unwrap missing optional handle struct members.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 60085e46872f423d66cf7732ca142cb6da1ea246 URL: https://gitlab.winehq.org/wine/wine/-/commit/60085e46872f423d66cf7732ca142c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 12:46:41 2022 +0100 winevulkan: Don't try to unwrap missing optional handle struct members. --- dlls/winevulkan/make_vulkan | 22 +++++++++++++++------- dlls/winevulkan/vulkan_thunks.c | 12 ++++++------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6932befc719..38ba92ba944 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1452,10 +1452,13 @@ class VkMember(VkVariable): # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) elif self.is_handle() and self.needs_unwrapping(): + handle = self.type_info["data"] if direction == Direction.OUTPUT: LOGGER.err("OUTPUT parameter {0}.{1} cannot be unwrapped".format(self.type, self.name)) + elif self.optional: + return "{0}{1} = {2} ? {3} : 0;\n".format(output, self.name, + self.value(input, conv), handle.driver_handle(self.value(input, conv))) else: - handle = self.type_info["data"] return "{0}{1} = {2};\n".format(output, self.name, handle.driver_handle(self.value(input, conv))) elif self.is_generic_handle(): if direction == Direction.OUTPUT: @@ -1849,14 +1852,19 @@ class VkParam(VkVariable): p = self.value(params_prefix, conv) if unwrap: + unwrap_handle = None if self.object_type != None and self.type == "uint64_t": - return "wine_vk_unwrap_handle({0}{1}, {0}{2})".format(params_prefix, self.object_type, self.name) + unwrap_handle = "wine_vk_unwrap_handle({0}{1}, {0}{2})".format( + params_prefix, self.object_type, self.name) - # We need to pass the native handle to the native Vulkan calls and - # the wine driver's handle to calls which are wrapped by the driver. - driver_handle = self.handle.driver_handle(p) if self.is_handle() else None - if driver_handle: - return driver_handle + elif self.is_handle(): + # We need to pass the native handle to the native Vulkan calls and + # the wine driver's handle to calls which are wrapped by the driver. + unwrap_handle = self.handle.driver_handle(p) + if unwrap_handle: + if self.optional: + unwrap_handle = "{0}{1} ? {2} : 0".format(params_prefix, self.name, unwrap_handle) + return unwrap_handle return p diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c1dccdf37e4..48ac57124ff 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -23416,7 +23416,7 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_host(const V out->sType = in->sType; out->pNext = in->pNext; - out->surface = wine_surface_from_handle(in->surface)->driver_surface; + out->surface = in->surface ? wine_surface_from_handle(in->surface)->driver_surface : 0; } #endif /* _WIN64 */ @@ -23426,7 +23426,7 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const V out->sType = in->sType; out->pNext = NULL; - out->surface = wine_surface_from_handle(in->surface)->driver_surface; + out->surface = in->surface ? wine_surface_from_handle(in->surface)->driver_surface : 0; if (in->pNext) FIXME("Unexpected pNext\n"); } @@ -38314,7 +38314,7 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); - params->result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); + params->result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->surface ? wine_surface_from_handle(params->surface)->driver_surface : 0, params->pSurfaceFormatCount, params->pSurfaceFormats); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -38332,7 +38332,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) TRACE("%#x, 0x%s, %#x, %#x\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); - params->result = wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, (uint32_t *)UlongToPtr(params->pSurfaceFormatCount), (VkSurfaceFormatKHR *)UlongToPtr(params->pSurfaceFormats)); + params->result = wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->phys_dev, params->surface ? wine_surface_from_handle(params->surface)->driver_surface : 0, (uint32_t *)UlongToPtr(params->pSurfaceFormatCount), (VkSurfaceFormatKHR *)UlongToPtr(params->pSurfaceFormats)); return STATUS_SUCCESS; } @@ -38343,7 +38343,7 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); - params->result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); + params->result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->surface ? wine_surface_from_handle(params->surface)->driver_surface : 0, params->pPresentModeCount, params->pPresentModes); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -38361,7 +38361,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) TRACE("%#x, 0x%s, %#x, %#x\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); - params->result = wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, (uint32_t *)UlongToPtr(params->pPresentModeCount), (VkPresentModeKHR *)UlongToPtr(params->pPresentModes)); + params->result = wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->phys_dev, params->surface ? wine_surface_from_handle(params->surface)->driver_surface : 0, (uint32_t *)UlongToPtr(params->pPresentModeCount), (VkPresentModeKHR *)UlongToPtr(params->pPresentModes)); return STATUS_SUCCESS; }

1 0

Ivo Ivanov : winebus.sys: Search for added devices by devnode path in process_monitor_event().
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 74bea389418bf54dfc4c4800bf68fafef532cddc URL: https://gitlab.winehq.org/wine/wine/-/commit/74bea389418bf54dfc4c4800bf68fa… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Oct 22 06:39:58 2022 +0300 winebus.sys: Search for added devices by devnode path in process_monitor_event(). Fixes process_monitor_event() failing to remove already added devices. --- dlls/winebus.sys/bus_udev.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 21a70d0829b..71b9ef84530 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -260,16 +260,6 @@ static struct base_device *find_device_from_fd(int fd) return NULL; } -static struct base_device *find_device_from_udev(struct udev_device *dev) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (impl->udev_device == dev) return impl; - - return NULL; -} - static void hidraw_device_destroy(struct unix_device *iface) { struct hidraw_device *impl = hidraw_impl_from_unix_device(iface); @@ -1745,7 +1735,7 @@ static void process_monitor_event(struct udev_monitor *monitor) udev_add_device(dev, -1); else { - impl = find_device_from_udev(dev); + impl = find_device_from_devnode(udev_device_get_devnode(dev)); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); }

1 0

Alex Henrie : include: Define __stat64.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: ce7375725a0f48af2d1d65b33434f8e367deec67 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce7375725a0f48af2d1d65b33434f8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 22:01:35 2022 -0700 include: Define __stat64. Needed to compile Tera Term. --- include/msvcrt/sys/stat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index b09494fb158..29d75feb86b 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -196,6 +196,8 @@ extern "C" { # endif #endif +#define __stat64 _stat64 + _ACRTIMP int __cdecl _fstat32(int, struct _stat32*); _ACRTIMP int __cdecl _fstat32i64(int, struct _stat32i64*); _ACRTIMP int __cdecl _fstat64(int,struct _stat64*);

1 0

Piotr Caban : winspool: Use providor for WritePrinter implementation.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 9c939184f3891fabb9b1fc45fe4462d654357e77 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c939184f3891fabb9b1fc45fe4462… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 18:01:48 2022 +0100 winspool: Use providor for WritePrinter implementation. --- dlls/localspl/provider.c | 102 +++++++++++++++++++++++++++++++------------- dlls/winspool.drv/info.c | 108 +++++++---------------------------------------- 2 files changed, 87 insertions(+), 123 deletions(-)

1 0

Piotr Caban : winspool: Use providor for print jobs implementation.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: e164b8cefb9dfbf0af5b83e176a386eb2c490d6b URL: https://gitlab.winehq.org/wine/wine/-/commit/e164b8cefb9dfbf0af5b83e176a386… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 23 19:28:39 2022 +0100 winspool: Use providor for print jobs implementation. --- dlls/winspool.drv/cups.c | 281 +----------------- dlls/winspool.drv/info.c | 699 +++++++-------------------------------------- dlls/winspool.drv/wspool.h | 9 - 3 files changed, 99 insertions(+), 890 deletions(-)

1 0

Piotr Caban : localspl: Fix error handling in ScheduleJob.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: a04bf6e8a85916ab1546a9dedff634362ef2fdcd URL: https://gitlab.winehq.org/wine/wine/-/commit/a04bf6e8a85916ab1546a9dedff634… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 10:21:34 2022 +0100 localspl: Fix error handling in ScheduleJob. --- dlls/localspl/provider.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index fd7827e1f28..68ff0c23dff 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3281,9 +3281,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) NULL, OPEN_EXISTING, 0, NULL); if (hf == INVALID_HANDLE_VALUE) { + WARN("can't open spool file: %s\n", debugstr_w(job->filename)); DeleteFileW(job->filename); free_job(job); LeaveCriticalSection(&printer->info->jobs_cs); + return FALSE; } /* TODO: use print processor */

1 0

Piotr Caban : localspl: Return error if cups port handle is used from different threads.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: e687ebd3631878d12d00b642d39010f5f38b3028 URL: https://gitlab.winehq.org/wine/wine/-/commit/e687ebd3631878d12d00b642d39010… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 09:47:07 2022 +0100 localspl: Return error if cups port handle is used from different threads. --- dlls/localspl/localmon.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index ce0b7c9caea..e1e7153600d 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -66,6 +66,7 @@ typedef struct { struct list entry; DWORD type; HANDLE hfile; + DWORD thread_id; INT64 doc_handle; WCHAR nameW[1]; } port_t; @@ -516,6 +517,8 @@ static BOOL WINAPI localmon_StartDocPort(HANDLE hport, WCHAR *printer_name, if (port->doc_handle) return TRUE; + port->thread_id = GetCurrentThreadId(); + params.type = port->type; params.port = port->nameW; params.document_title = doc_info ? doc_info->pDocName : NULL; @@ -561,6 +564,13 @@ static BOOL WINAPI localmon_WritePort(HANDLE hport, BYTE *buf, DWORD size, return FALSE; } + if (port->type == PORT_IS_CUPS && port->thread_id != GetCurrentThreadId()) + { + FIXME("used from other thread\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + params.doc = port->doc_handle; params.buf = buf; params.size = size; @@ -585,6 +595,13 @@ static BOOL WINAPI localmon_EndDocPort(HANDLE hport) if (!port->doc_handle) return TRUE; + if (port->type == PORT_IS_CUPS && port->thread_id != GetCurrentThreadId()) + { + FIXME("used from other thread\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + params.doc = port->doc_handle; port->doc_handle = 0; return UNIX_CALL(end_doc, &params);

1 0