November 2022 - Wine-Commits

Rémi Bernon : user32: Add GetPointerTouchInfo(History) stubs.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 8818fff766590d9150bf01076109634a86f27751 URL: https://gitlab.winehq.org/wine/wine/-/commit/8818fff766590d9150bf0107610963… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 31 16:05:46 2022 +0200 user32: Add GetPointerTouchInfo(History) stubs. Preventing Bloons TD 6 from crashing on touchscreen input. --- dlls/user32/input.c | 14 ++++++++++++++ dlls/user32/user32.spec | 2 ++ 2 files changed, 16 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 4bd5785ff9b..34e3a620cc5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -756,3 +756,17 @@ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT count, SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOL WINAPI GetPointerTouchInfo( UINT32 id, POINTER_TOUCH_INFO *info ) +{ + FIXME( "id %u, info %p stub!\n", id, info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +BOOL WINAPI GetPointerTouchInfoHistory( UINT32 id, UINT32 *count, POINTER_TOUCH_INFO *info ) +{ + FIXME( "id %u, count %p, info %p stub!\n", id, count, info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 256e4c33e1c..88684c29506 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -360,6 +360,8 @@ @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) @ stdcall GetPointerType(long ptr) +@ stdcall GetPointerTouchInfo(long ptr) +@ stdcall GetPointerTouchInfoHistory(long ptr ptr) @ stdcall GetPriorityClipboardFormat(ptr long) NtUserGetPriorityClipboardFormat @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr)

1 0

Alex Henrie : include: Add wspiapi.h.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 6cf63877c5a8b1e090b222648213e6a3c15b0290 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cf63877c5a8b1e090b222648213e6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 23:04:48 2022 -0700 include: Add wspiapi.h. Needed to compile Tera Term. --- include/Makefile.in | 1 + include/wspiapi.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 0fc34cbdf7c..62904d8d2a0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -931,6 +931,7 @@ SOURCES = \ wshisotp.h \ wsipx.h \ wsnwlink.h \ + wspiapi.h \ wtsapi32.h \ wtypes.idl \ wuapi.idl \ diff --git a/include/wspiapi.h b/include/wspiapi.h new file mode 100644 index 00000000000..7aa034e753a --- /dev/null +++ b/include/wspiapi.h @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WSPIAPI_H_ +#define _WSPIAPI_H_ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#endif /* _WSPIAPI_H_ */

1 0

Gabriel Ivăncescu : mshtml/tests: Implement IServiceProvider and few other interfaces needed for navigation.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 7359226ad1d4e56ffbd733de197cf7097d5619a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7359226ad1d4e56ffbd733de197cf7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 14 19:53:26 2022 +0200 mshtml/tests: Implement IServiceProvider and few other interfaces needed for navigation. This is to allow to test events and things related to navigating to a new page. Otherwise, native IE will open a new IE process with the destination. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 964 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 964 insertions(+)

1 0

Rémi Bernon : user32: Move touch related functions to input.c.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 8da21e083b9feb6618c8073c64da15e9545910cf URL: https://gitlab.winehq.org/wine/wine/-/commit/8da21e083b9feb6618c8073c64da15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 16:47:16 2021 +0200 user32: Move touch related functions to input.c. --- dlls/user32/input.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 29 -------------- dlls/user32/user32.spec | 2 + dlls/user32/win.c | 50 ----------------------- 4 files changed, 105 insertions(+), 79 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index bb7477ed482..4bd5785ff9b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -653,3 +653,106 @@ LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_siz return header_size == sizeof(RAWINPUTHEADER) ? 0 : -1; } + +/***************************************************************************** + * CloseTouchInputHandle (USER32.@) + */ +BOOL WINAPI CloseTouchInputHandle( HTOUCHINPUT handle ) +{ + FIXME( "handle %p stub!\n", handle ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetTouchInputInfo (USER32.@) + */ +BOOL WINAPI GetTouchInputInfo( HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size ) +{ + FIXME( "handle %p, count %u, ptr %p, size %u stub!\n", handle, count, ptr, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/********************************************************************** + * IsTouchWindow (USER32.@) + */ +BOOL WINAPI IsTouchWindow( HWND hwnd, ULONG *flags ) +{ + FIXME( "hwnd %p, flags %p stub!\n", hwnd, flags ); + return FALSE; +} + +/***************************************************************************** + * RegisterTouchWindow (USER32.@) + */ +BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags ) +{ + FIXME( "hwnd %p, flags %#lx stub!\n", hwnd, flags ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * UnregisterTouchWindow (USER32.@) + */ +BOOL WINAPI UnregisterTouchWindow( HWND hwnd ) +{ + FIXME( "hwnd %p stub!\n", hwnd ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI CloseGestureInfoHandle( HGESTUREINFO handle ) +{ + FIXME( "handle %p stub!\n", handle ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI GetGestureExtraArgs( HGESTUREINFO handle, UINT count, BYTE *args ) +{ + FIXME( "handle %p, count %u, args %p stub!\n", handle, count, args ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI GetGestureInfo( HGESTUREINFO handle, GESTUREINFO *ptr ) +{ + FIXME( "handle %p, ptr %p stub!\n", handle, ptr ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureConfig (USER32.@) + */ +BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, + GESTURECONFIG *config, UINT size ) +{ + FIXME( "handle %p, reserved %#lx, flags %#lx, count %p, config %p, size %u stub!\n", + hwnd, reserved, flags, count, config, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/********************************************************************** + * SetGestureConfig (USER32.@) + */ +BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT count, + GESTURECONFIG *config, UINT size ) +{ + FIXME( "handle %p, reserved %#lx, count %u, config %p, size %u stub!\n", + hwnd, reserved, count, config, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 24adcc62b9c..879e8b32a0f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -440,35 +440,6 @@ BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) return TRUE; } -/***************************************************************************** - * GetGestureConfig (USER32.@) - */ -BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, GESTURECONFIG *config, UINT size ) -{ - FIXME("(%p %08lx %08lx %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** - * SetGestureConfig [USER32.@] - */ -BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) -{ - FIXME("(%p %08lx %u %p %u): stub\n", hwnd, reserved, id, config, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** - * IsTouchWindow [USER32.@] - */ -BOOL WINAPI IsTouchWindow( HWND hwnd, PULONG flags ) -{ - FIXME("(%p %p): stub\n", hwnd, flags); - return FALSE; -} - /********************************************************************** * IsWindowRedirectedForPrint [USER32.@] */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4f15b4c06e5..256e4c33e1c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -76,6 +76,7 @@ @ stdcall CloseClipboard() NtUserCloseClipboard @ stdcall CloseDesktop(long) NtUserCloseDesktop @ stdcall CloseTouchInputHandle(long) +@ stdcall CloseGestureInfoHandle(long) @ stdcall CloseWindow(long) @ stdcall CloseWindowStation(long) NtUserCloseWindowStation @ stdcall CopyAcceleratorTableA(long ptr long) @@ -304,6 +305,7 @@ @ stdcall GetFocus() @ stdcall GetForegroundWindow() NtUserGetForegroundWindow @ stdcall GetGestureConfig(long long long ptr ptr long) +@ stdcall GetGestureExtraArgs(long long ptr) @ stdcall GetGestureInfo(long ptr) @ stdcall GetGUIThreadInfo(long ptr) NtUserGetGUIThreadInfo @ stdcall GetGuiResources(long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3750d4b9643..383de818172 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1479,56 +1479,6 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) #endif /* _WIN64 */ -/***************************************************************************** - * RegisterTouchWindow (USER32.@) - */ -BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) -{ - FIXME("(%p %08lx): stub\n", hwnd, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * UnregisterTouchWindow (USER32.@) - */ -BOOL WINAPI UnregisterTouchWindow(HWND hwnd) -{ - FIXME("(%p): stub\n", hwnd); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * CloseTouchInputHandle (USER32.@) - */ -BOOL WINAPI CloseTouchInputHandle(HTOUCHINPUT handle) -{ - FIXME("(%p): stub\n", handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * GetTouchInputInfo (USER32.@) - */ -BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size) -{ - FIXME("(%p %u %p %u): stub\n", handle, count, ptr, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * GetGestureInfo (USER32.@) - */ -BOOL WINAPI GetGestureInfo(HGESTUREINFO handle, PGESTUREINFO ptr) -{ - FIXME("(%p %p): stub\n", handle, ptr); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /***************************************************************************** * GetWindowDisplayAffinity (USER32.@) */

1 0

Rémi Bernon : ntdll: Delay loading unixlibs until the functions are requested.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 34099bba6cbb65de37403819fb65635338bb41a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/34099bba6cbb65de37403819fb6563… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 11:55:51 2022 +0100 ntdll: Delay loading unixlibs until the functions are requested. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53909 --- dlls/ntdll/unix/virtual.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3367913d4e2..5dd482c0dbb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -98,6 +98,7 @@ struct builtin_module unsigned int refcount; void *handle; void *module; + char *unix_path; void *unix_handle; }; @@ -583,6 +584,7 @@ static void add_builtin_module( void *module, void *handle ) builtin->handle = handle; builtin->module = module; builtin->refcount = 1; + builtin->unix_path = NULL; builtin->unix_handle = NULL; list_add_tail( &builtin_modules, &builtin->entry ); } @@ -603,6 +605,7 @@ void release_builtin_module( void *module ) list_remove( &builtin->entry ); if (builtin->handle) dlclose( builtin->handle ); if (builtin->unix_handle) dlclose( builtin->unix_handle ); + free( builtin->unix_path ); free( builtin ); } break; @@ -652,6 +655,8 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; + if (builtin->unix_path && !builtin->unix_handle) + builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW ); if (builtin->unix_handle) { *funcs = dlsym( builtin->unix_handle, ptr_name ); @@ -669,26 +674,19 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun */ NTSTATUS load_builtin_unixlib( void *module, const char *name ) { - void *handle; sigset_t sigset; - NTSTATUS status = STATUS_DLL_NOT_FOUND; + NTSTATUS status = STATUS_SUCCESS; struct builtin_module *builtin; - if (!(handle = dlopen( name, RTLD_NOW ))) return status; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - if (!builtin->unix_handle) - { - builtin->unix_handle = handle; - status = STATUS_SUCCESS; - } + if (!builtin->unix_path) builtin->unix_path = strdup( name ); else status = STATUS_IMAGE_ALREADY_LOADED; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); - if (status) dlclose( handle ); return status; }

1 0

Jacek Caban : winevulkan: Don't try to convert ignored VkWriteDescriptorSet members.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 1e3d0c863c4dda57122a3e5ceecc705209e91d69 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e3d0c863c4dda57122a3e5ceecc70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 22:54:22 2022 +0100 winevulkan: Don't try to convert ignored VkWriteDescriptorSet members. Fixes crash in wined3d_unordered_access_view_vk_clear(). --- dlls/winevulkan/make_vulkan | 41 ++++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan_thunks.c | 4 ++-- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 75121c8eef6..45948088fec 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -267,6 +267,25 @@ STRUCT_CHAIN_CONVERSIONS = { "VkInstanceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"], } +# Some struct members are conditionally ignored and callers are free to leave them uninitialized. +# We can't deduce that from XML, so we allow expressing it here. +MEMBER_LENGTH_EXPRESSIONS = { + "VkWriteDescriptorSet": { + "pImageInfo": + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM ? {len} : 0", + "pBufferInfo": + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC ? {len} : 0", + } +} class Direction(Enum): """ Parameter direction: input, output, input_output. """ @@ -1129,12 +1148,16 @@ class VkVariable(object): parent = var.struct.members len += len_str - if not len_str in parent: - return len + if len_str in parent: + var = parent[parent.index(len_str)] + if var.is_pointer(): + len = "*" + len + + if isinstance(self.parent, VkStruct) and self.parent.name in MEMBER_LENGTH_EXPRESSIONS: + exprs = MEMBER_LENGTH_EXPRESSIONS[self.parent.name] + if self.name in exprs: + len = exprs[self.name].format(struct=prefix, len=len) - var = parent[parent.index(len_str)] - if var.is_pointer(): - len = "*" + len return len def is_const(self): @@ -1786,12 +1809,12 @@ class VkStruct(Sequence): structextends = struct.attrib.get("structextends") structextends = structextends.split(",") if structextends else [] - members = [] + s = VkStruct(name, [], returnedonly, structextends, union=union) for member in struct.findall("member"): - vk_member = VkMember.from_xml(member, returnedonly, members) - members.append(vk_member) + vk_member = VkMember.from_xml(member, returnedonly, s) + s.members.append(vk_member) - return VkStruct(name, members, returnedonly, structextends, union=union) + return s @staticmethod def decouple_structs(structs): diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 6b45146fb88..d853986c9d5 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3327,8 +3327,8 @@ static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_ out->dstArrayElement = in->dstArrayElement; out->descriptorCount = in->descriptorCount; out->descriptorType = in->descriptorType; - out->pImageInfo = convert_VkDescriptorImageInfo_array_win32_to_host(ctx, in->pImageInfo, in->descriptorCount); - out->pBufferInfo = convert_VkDescriptorBufferInfo_array_win32_to_host(ctx, in->pBufferInfo, in->descriptorCount); + out->pImageInfo = convert_VkDescriptorImageInfo_array_win32_to_host(ctx, in->pImageInfo, in->descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER || in->descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER || in->descriptorType == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE || in->descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE || in->descriptorType == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT || in->descriptorType == VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM || in->descriptorType == VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM ? in->descriptorCount : 0); + out->pBufferInfo = convert_VkDescriptorBufferInfo_array_win32_to_host(ctx, in->pBufferInfo, in->descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER || in->descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER || in->descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC || in->descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC ? in->descriptorCount : 0); out->pTexelBufferView = in->pTexelBufferView; } #endif /* USE_STRUCT_CONVERSION */

1 0

Piotr Caban : localspl: Use CRT allocation functions.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 897ab8c6ec8986f5b8c54bd108951ecfc53eab60 URL: https://gitlab.winehq.org/wine/wine/-/commit/897ab8c6ec8986f5b8c54bd108951e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 13:59:06 2022 +0100 localspl: Use CRT allocation functions. --- dlls/localspl/localmon.c | 19 ++++++++-------- dlls/localspl/provider.c | 56 ++++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 38 deletions(-)

1 0

Piotr Caban : localspl: Use wcslen instead of lstrlenW.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 685e2fda08bd217b6f85d512c5642dddd4daa9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/685e2fda08bd217b6f85d512c5642d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 13:53:29 2022 +0100 localspl: Use wcslen instead of lstrlenW. --- dlls/localspl/localmon.c | 6 ++--- dlls/localspl/provider.c | 70 ++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 38 deletions(-)

1 0

Jacek Caban : winevulkan: Move need for output member copy check to needs_conversion.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 85f9960147e97362f5c5be9561aef17d84f5ebde URL: https://gitlab.winehq.org/wine/wine/-/commit/85f9960147e97362f5c5be9561aef1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 11 19:51:36 2022 +0100 winevulkan: Move need for output member copy check to needs_conversion. --- dlls/winevulkan/make_vulkan | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 45948088fec..3257481b746 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1956,19 +1956,7 @@ class VkStruct(Sequence): # so that we have a chance to allocate buffers if e.needs_conversion(conv, True, Direction.OUTPUT, is_const, check_extensions=False): return True - elif not needs_output_copy and not is_const: - for m in e: - if m.name in ["sType", "pNext"]: - continue - # pointers will be handled by needs_conversion, but if we have any other non-const - # member, we may need to copy output - if not m.is_pointer() and not m.is_const(): - needs_output_copy = True - break - # if output needs any copy and we need input conversion, then we also need output conversion - if needs_output_copy and self.needs_extensions_conversion(conv, Direction.INPUT): - return True return False def needs_conversion(self, conv, unwrap, direction, is_const, check_extensions=True): @@ -1982,6 +1970,8 @@ class VkStruct(Sequence): if direction == Direction.OUTPUT and self.name == "VkImageCompressionControlEXT": return False + needs_output_copy = False + for m in self.members: if self.name == m.type: continue @@ -2011,6 +2001,15 @@ class VkStruct(Sequence): if m.needs_conversion(conv, unwrap, direction, is_const): return True + # pointers will be handled by needs_conversion, but if we have any other non-const + # member, we may need to copy output + if direction == Direction.OUTPUT and not m.is_pointer() and not is_const and not m.is_const(): + needs_output_copy = True + + # if output needs any copy and we need input conversion, then we also need output conversion + if needs_output_copy and self.needs_conversion(conv, unwrap, Direction.INPUT, check_extensions): + return True + return check_extensions and self.needs_extensions_conversion(conv, direction) def needs_alloc(self, conv, unwrap):

1 0

Piotr Caban : winspool.drv: Use CRT allocation functions.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 788f6b1b6a16f5203e472aa89b306f019ac07d1c URL: https://gitlab.winehq.org/wine/wine/-/commit/788f6b1b6a16f5203e472aa89b306f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 19:48:03 2022 +0100 winspool.drv: Use CRT allocation functions. --- dlls/winspool.drv/info.c | 612 +++++++++++++++++++++-------------------------- 1 file changed, 275 insertions(+), 337 deletions(-)

1 0