- Wine-Commits - list.winehq.org

Giovanni Mascellani : include: Document vkd3d_acquire_vk_queue() and vkd3d_release_vk_queue().
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: vkd3d Branch: master Commit: b2a1f6b5e4f59fbc7f91ada7e565639dcf4e8e7f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b2a1f6b5e4f59fbc7f91ada7e5656… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 5 13:26:20 2023 +0200 include: Document vkd3d_acquire_vk_queue() and vkd3d_release_vk_queue(). --- include/vkd3d.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index f36d9043..3adce97b 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -207,7 +207,42 @@ VKD3D_API VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); VKD3D_API struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); VKD3D_API uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); + +/** + * Acquire the Vulkan queue backing a command queue. + * + * While a queue is acquired by the client, it is locked so that + * neither the vkd3d library nor other threads can submit work to + * it. For that reason it should be released as soon as possible with + * vkd3d_release_vk_queue(). The lock is not reentrant, so the same + * queue must not be acquired more than once by the same thread. + * + * Work submitted through the Direct3D 12 API exposed by vkd3d is not + * always immediately submitted to the Vulkan queue; sometimes it is + * kept in another internal queue, which might not necessarily be + * empty at the time vkd3d_acquire_vk_queue() is called. For this + * reason, work submitted directly to the Vulkan queue might appear to + * the Vulkan driver as being submitted before other work submitted + * though the Direct3D 12 API. If this is not desired, it is + * recommended to synchronize work submission using an ID3D12Fence + * object, by submitting to the queue a signal operation after all the + * Direct3D 12 work is submitted and waiting for it before calling + * vkd3d_acquire_vk_queue(). + * + * \since 1.0 + */ VKD3D_API VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); + +/** + * Release the Vulkan queue backing a command queue. + * + * This must be paired to an earlier corresponding + * vkd3d_acquire_vk_queue(). After this function is called, the Vulkan + * queue returned by vkd3d_acquire_vk_queue() must not be used any + * more. + * + * \since 1.0 + */ VKD3D_API void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); VKD3D_API HRESULT vkd3d_create_image_resource(ID3D12Device *device,

1 0

Giovanni Mascellani : demos: Use a fence to synchronize D3D12 and Vulkan work.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: vkd3d Branch: master Commit: 2a3413e0f01524f2068bce12100906eb2200c965 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a3413e0f01524f2068bce1210090… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 5 13:56:32 2023 +0200 demos: Use a fence to synchronize D3D12 and Vulkan work. --- demos/demo_xcb.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 5ebe0ff9..f71e89f6 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -113,6 +113,9 @@ struct demo_swapchain VkDevice vk_device; ID3D12CommandQueue *command_queue; + ID3D12Fence *present_fence; + unsigned long long present_count; + uint32_t current_buffer; unsigned int buffer_count; ID3D12Resource *buffers[1]; @@ -529,6 +532,17 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c } swapchain->buffer_count = image_count; free(vk_images); + + if (FAILED(ID3D12Device_CreateFence(d3d12_device, 0, 0, &IID_ID3D12Fence, (void **)&swapchain->present_fence))) + { + for (i = 0; i < image_count; ++i) + { + ID3D12Resource_Release(swapchain->buffers[i]); + } + free(swapchain); + goto fail; + } + swapchain->present_count = 0; ID3D12Device_Release(d3d12_device); ID3D12CommandQueue_AddRef(swapchain->command_queue = command_queue); @@ -574,6 +588,12 @@ static inline void demo_swapchain_present(struct demo_swapchain *swapchain) present_desc.pImageIndices = &swapchain->current_buffer; present_desc.pResults = NULL; + /* Synchronize vkd3d_acquire_vk_queue() with the Direct3D 12 work + * already submitted to the command queue. */ + ++swapchain->present_count; + ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->present_fence, swapchain->present_count); + ID3D12Fence_SetEventOnCompletion(swapchain->present_fence, swapchain->present_count, NULL); + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); vkQueuePresentKHR(vk_queue, &present_desc); vkd3d_release_vk_queue(swapchain->command_queue); @@ -589,6 +609,7 @@ static inline void demo_swapchain_destroy(struct demo_swapchain *swapchain) unsigned int i; ID3D12CommandQueue_Release(swapchain->command_queue); + ID3D12Fence_Release(swapchain->present_fence); for (i = 0; i < swapchain->buffer_count; ++i) { ID3D12Resource_Release(swapchain->buffers[i]);

1 0

Jacek Caban : wow64win: Fix NULL buffer handling in wow64_NtUserBuildHimcList.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 79895921723b043246e8b14b5059f322e665764d URL: https://gitlab.winehq.org/wine/wine/-/commit/79895921723b043246e8b14b5059f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 21:18:01 2023 +0200 wow64win: Fix NULL buffer handling in wow64_NtUserBuildHimcList. Fixes win32u tests on wow64. --- dlls/wow64win/user.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 73854225b7f..8e2853ca0b5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1186,11 +1186,12 @@ NTSTATUS WINAPI wow64_NtUserBuildHimcList( UINT *args ) UINT32 *buffer32 = get_ptr( &args ); UINT *size = get_ptr( &args ); - HIMC *buffer; + HIMC *buffer = NULL; ULONG i; NTSTATUS status; - if (!(buffer = Wow64AllocateTemp( count * sizeof(*buffer) ))) return STATUS_NO_MEMORY; + if (buffer32 && !(buffer = Wow64AllocateTemp( count * sizeof(*buffer) ))) + return STATUS_NO_MEMORY; if ((status = NtUserBuildHimcList( thread_id, count, buffer, size ))) return status;

1 0

Fabian Maurer : kerberos: Avoid potentially uninitialized variable (clang-scan).
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: f841045b2d72ac7d70c60cb40311293998590e13 URL: https://gitlab.winehq.org/wine/wine/-/commit/f841045b2d72ac7d70c60cb4031129… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Dec 15 18:24:37 2022 +0100 kerberos: Avoid potentially uninitialized variable (clang-scan). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kerberos/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 45cf494aa70..8d9b59b58d4 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -305,7 +305,7 @@ static NTSTATUS copy_tickets_to_client( struct ticket_list *list, KERB_QUERY_TKT static NTSTATUS kerberos_fill_ticket_list( struct ticket_list *list ) { - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; krb5_error_code err; krb5_context ctx; krb5_cccol_cursor cursor = NULL;

1 0

Alex Henrie : include: Add IsReparseTagNameSurrogate.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: b87dcee5ea6683e8b474e4db4221a267b84131b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b87dcee5ea6683e8b474e4db4221a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 5 22:40:30 2023 -0600 include: Add IsReparseTagNameSurrogate. Based on a patch by Erich E. Hoover. --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 26be0ccaec5..f431753e46a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2483,6 +2483,8 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) #define IO_REPARSE_TAG_ONEDRIVE __MSABI_LONG(0x80000021) #define IO_REPARSE_TAG_GVFS_TOMBSTONE __MSABI_LONG(0xA0000022) +#define IsReparseTagNameSurrogate(x) ((x) & 0x20000000) + /* * File formats definitions */

1 0

Alex Henrie : include: Add REPARSE_(GUID_)DATA_BUFFER and related constants.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 33b7e4806f44b781cd9b8c9a90ca305c7709368f URL: https://gitlab.winehq.org/wine/wine/-/commit/33b7e4806f44b781cd9b8c9a90ca30… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 5 21:52:16 2023 -0600 include: Add REPARSE_(GUID_)DATA_BUFFER and related constants. Based on a patch by Erich E. Hoover. --- include/ddk/ntifs.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index bd4bd58be26..cedd54a66fe 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -30,6 +30,8 @@ #define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)3) #define PHCM_MAX ((char)3) +#define SYMLINK_FLAG_RELATIVE 0x00000001 + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -138,6 +140,54 @@ typedef struct _FS_FILTER_CALLBACKS PFS_FILTER_COMPLETION_CALLBACK PostReleaseForModifiedPageWriter; } FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; +typedef struct _REPARSE_DATA_BUFFER +{ + ULONG ReparseTag; + USHORT ReparseDataLength; + USHORT Reserved; + union + { + struct + { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + ULONG Flags; + WCHAR PathBuffer[1]; + } SymbolicLinkReparseBuffer; + + struct + { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + WCHAR PathBuffer[1]; + } MountPointReparseBuffer; + + struct + { + UCHAR DataBuffer[1]; + } GenericReparseBuffer; + + } DUMMYUNIONNAME; +} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; + +typedef struct _REPARSE_GUID_DATA_BUFFER +{ + DWORD ReparseTag; + WORD ReparseDataLength; + WORD Reserved; + GUID ReparseGuid; + struct + { + BYTE DataBuffer[1]; + } GenericReparseBuffer; +} REPARSE_GUID_DATA_BUFFER, *PREPARSE_GUID_DATA_BUFFER; + +#define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer) + BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); DEVICE_OBJECT * WINAPI IoGetAttachedDevice(DEVICE_OBJECT*); PEPROCESS WINAPI IoGetRequestorProcess(IRP*);

1 0

Jacek Caban : include: Don't force named VARIANT members when __STDC__ is defined.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: e68d6c16741a42cd4c27a6a9fa5683fdd053ae4d URL: https://gitlab.winehq.org/wine/wine/-/commit/e68d6c16741a42cd4c27a6a9fa5683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:36:39 2023 +0200 include: Don't force named VARIANT members when __STDC__ is defined. --- dlls/oleaut32/tests/usrmarshal.c | 24 +++++++++--------------- dlls/oleaut32/usrmarshal.c | 12 ++++++------ include/oaidl.idl | 2 +- include/oleauto.h | 4 ++-- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 6559cdcd865..fee8097fac8 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -30,12 +30,6 @@ #include "wine/test.h" -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) -# define V_U2(A) ((A)->n1.n2) -#else -# define V_U2(A) (*(A)) -#endif - typedef struct { IUnknown IUnknown_iface; @@ -870,9 +864,9 @@ static DWORD *check_variant_header(DWORD *wirev, VARIANT *v, ULONG size) ok(header->clSize == (size + 7) >> 3, "wv[0] %08lx, expected %08lx\n", header->clSize, (size + 7) >> 3); ok(header->rpcReserved == 0, "wv[1] %08lx\n", header->rpcReserved); ok(header->vt == V_VT(v), "vt %04x expected %04x\n", header->vt, V_VT(v)); - ok(header->wReserved1 == V_U2(v).wReserved1, "res1 %04x expected %04x\n", header->wReserved1, V_U2(v).wReserved1); - ok(header->wReserved2 == V_U2(v).wReserved2, "res2 %04x expected %04x\n", header->wReserved2, V_U2(v).wReserved2); - ok(header->wReserved3 == V_U2(v).wReserved3, "res3 %04x expected %04x\n", header->wReserved3, V_U2(v).wReserved3); + ok(header->wReserved1 == v->wReserved1, "res1 %04x expected %04x\n", header->wReserved1, v->wReserved1); + ok(header->wReserved2 == v->wReserved2, "res2 %04x expected %04x\n", header->wReserved2, v->wReserved2); + ok(header->wReserved3 == v->wReserved3, "res3 %04x expected %04x\n", header->wReserved3, v->wReserved3); switch_is = V_VT(v); if(switch_is & VT_ARRAY) @@ -938,9 +932,9 @@ static void test_marshal_VARIANT(void) /* check_variant_header tests wReserved[123], so initialize to unique values. * (Could probably also do this by setting the variant to a known DECIMAL.) */ - V_U2(&v).wReserved1 = 0x1234; - V_U2(&v).wReserved2 = 0x5678; - V_U2(&v).wReserved3 = 0x9abc; + v.wReserved1 = 0x1234; + v.wReserved2 = 0x5678; + v.wReserved3 = 0x9abc; /* Variants have an alignment of 8 */ rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 1, &v); @@ -1306,9 +1300,9 @@ static void test_marshal_VARIANT(void) /* check_variant_header tests wReserved[123], so initialize to unique values. * (Could probably also do this by setting the variant to a known DECIMAL.) */ - V_U2(&v2).wReserved1 = 0x0123; - V_U2(&v2).wReserved2 = 0x4567; - V_U2(&v2).wReserved3 = 0x89ab; + v2.wReserved1 = 0x0123; + v2.wReserved2 = 0x4567; + v2.wReserved3 = 0x89ab; stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index eed0f3ac0aa..25bce3155bf 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -400,9 +400,9 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header->clSize = 0; /* fixed up at the end */ header->rpcReserved = 0; header->vt = V_VT(pvar); - header->wReserved1 = pvar->n1.n2.wReserved1; - header->wReserved2 = pvar->n1.n2.wReserved2; - header->wReserved3 = pvar->n1.n2.wReserved3; + header->wReserved1 = pvar->wReserved1; + header->wReserved2 = pvar->wReserved2; + header->wReserved3 = pvar->wReserved3; header->switch_is = V_VT(pvar); if(header->switch_is & VT_ARRAY) header->switch_is &= ~VT_TYPEMASK; @@ -566,9 +566,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe } V_VT(pvar) = header->vt; - pvar->n1.n2.wReserved1 = header->wReserved1; - pvar->n1.n2.wReserved2 = header->wReserved2; - pvar->n1.n2.wReserved3 = header->wReserved3; + pvar->wReserved1 = header->wReserved1; + pvar->wReserved2 = header->wReserved2; + pvar->wReserved3 = header->wReserved3; if(header->vt & VT_ARRAY) { diff --git a/include/oaidl.idl b/include/oaidl.idl index 37da734baf7..eb8b28e3b5a 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -142,7 +142,7 @@ const USHORT FADF_CREATEVECTOR = 0x2000; /* This array is a vector */ /* Variant */ -cpp_quote("#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)") +cpp_quote("#ifdef NONAMELESSUNION") cpp_quote("#define __VARIANT_NAME_1 n1") cpp_quote("#define __VARIANT_NAME_2 n2") cpp_quote("#define __VARIANT_NAME_3 n3") diff --git a/include/oleauto.h b/include/oleauto.h index 657986e399f..5d5b8bbd371 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -112,7 +112,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG */ /* Macros for accessing the fields of the VARIANT type */ -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) +#ifdef NONAMELESSUNION #define V_VT(A) ((A)->n1.n2.vt) #define V_UNION(A,B) ((A)->n1.n2.n3.B) #define V_RECORD(A) (V_UNION(A,brecVal).pvRecord) @@ -140,7 +140,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG #define V_CYREF(A) V_UNION(A,pcyVal) #define V_DATE(A) V_UNION(A,date) #define V_DATEREF(A) V_UNION(A,pdate) -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) +#ifdef NONAMELESSUNION #define V_DECIMAL(A) ((A)->n1.decVal) #else #define V_DECIMAL(A) ((A)->decVal)

1 0

Eric Pouech : dbghelp: Use nameless union/structs.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 5f9119447cfeab79e9ff25d2a198765cfecedeb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f9119447cfeab79e9ff25d2a19876… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jul 6 08:53:22 2023 +0200 dbghelp: Use nameless union/structs. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/cpu_x86_64.c | 58 +++++++++++++++++++++++------------------------ dlls/dbghelp/dwarf.c | 10 ++++---- 2 files changed, 33 insertions(+), 35 deletions(-)

1 0

Jacek Caban : oleaut32: Don't use __tagBRECORD type.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: b6c5bae7cc1c2a81a9a1c64d46a0037eb30183ca URL: https://gitlab.winehq.org/wine/wine/-/commit/b6c5bae7cc1c2a81a9a1c64d46a003… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:40:06 2023 +0200 oleaut32: Don't use __tagBRECORD type. --- dlls/oleaut32/variant.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 85fef3113b6..fa4492b968a 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -585,11 +585,11 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) case VT_RECORD: case VT_RECORD | VT_BYREF: { - struct __tagBRECORD* pBr = &V_UNION(pVarg,brecVal); - if (pBr->pRecInfo) + IRecordInfo *rec_info = V_RECORDINFO(pVarg); + if (rec_info) { - IRecordInfo_RecordClear(pBr->pRecInfo, pBr->pvRecord); - IRecordInfo_Release(pBr->pRecInfo); + IRecordInfo_RecordClear(rec_info, V_RECORD(pVarg)); + IRecordInfo_Release(rec_info); } break; } @@ -645,11 +645,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) } else if (V_VT(pVarg) == VT_RECORD) { - struct __tagBRECORD* pBr = &V_UNION(pVarg,brecVal); - if (pBr->pRecInfo) + IRecordInfo *rec_info = V_RECORDINFO(pVarg); + if (rec_info) { - IRecordInfo_RecordClear(pBr->pRecInfo, pBr->pvRecord); - IRecordInfo_Release(pBr->pRecInfo); + IRecordInfo_RecordClear(rec_info, V_RECORD(pVarg)); + IRecordInfo_Release(rec_info); } } else if (V_VT(pVarg) == VT_DISPATCH || @@ -669,31 +669,28 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) */ static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, const VARIANT *src) { - struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); - const struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + IRecordInfo *src_info = V_RECORDINFO(src); HRESULT hr = S_OK; ULONG size; - if (!src_rec->pRecInfo) + if (!src_info) { - if (src_rec->pvRecord) return E_INVALIDARG; + if (V_RECORD(src)) return E_INVALIDARG; return S_OK; } - hr = IRecordInfo_GetSize(src_rec->pRecInfo, &size); + hr = IRecordInfo_GetSize(src_info, &size); if (FAILED(hr)) return hr; /* Windows does not use RecordCreate() here, memory should be allocated in compatible way so RecordDestroy() could free it later. */ - dest_rec->pvRecord = CoTaskMemAlloc(size); - if (!dest_rec->pvRecord) return E_OUTOFMEMORY; + V_RECORD(dest) = CoTaskMemAlloc(size); + if (!V_RECORD(dest)) return E_OUTOFMEMORY; if (size) - memset(dest_rec->pvRecord, 0, size); + memset(V_RECORD(dest), 0, size); - dest_rec->pRecInfo = src_rec->pRecInfo; - IRecordInfo_AddRef(src_rec->pRecInfo); - - return IRecordInfo_RecordCopy(src_rec->pRecInfo, src_rec->pvRecord, dest_rec->pvRecord); + IRecordInfo_AddRef(V_RECORDINFO(dest) = src_info); + return IRecordInfo_RecordCopy(src_info, V_RECORD(src), V_RECORD(dest)); } /******************************************************************************

1 0

Jacek Caban : oleaut32: Use macros to access variant members.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 28f3128d24cc3a98c9d3514bfd9082e5813faf3c URL: https://gitlab.winehq.org/wine/wine/-/commit/28f3128d24cc3a98c9d3514bfd9082… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:41:02 2023 +0200 oleaut32: Use macros to access variant members. --- dlls/oleaut32/usrmarshal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index ae4d11b7a0c..eed0f3ac0aa 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -399,11 +399,11 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header->clSize = 0; /* fixed up at the end */ header->rpcReserved = 0; - header->vt = pvar->n1.n2.vt; + header->vt = V_VT(pvar); header->wReserved1 = pvar->n1.n2.wReserved1; header->wReserved2 = pvar->n1.n2.wReserved2; header->wReserved3 = pvar->n1.n2.wReserved3; - header->switch_is = pvar->n1.n2.vt; + header->switch_is = V_VT(pvar); if(header->switch_is & VT_ARRAY) header->switch_is &= ~VT_TYPEMASK; @@ -418,7 +418,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, Pos += 4; if((header->vt & VT_TYPEMASK) != VT_VARIANT) { - memcpy(Pos, pvar->n1.n2.n3.byref, type_size); + memcpy(Pos, V_BYREF(pvar), type_size); Pos += type_size; } else @@ -432,7 +432,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(Pos, pvar, type_size); else - memcpy(Pos, &pvar->n1.n2.n3, type_size); + memcpy(Pos, &V_UI8(pvar), type_size); Pos += type_size; } @@ -561,11 +561,11 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe else if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(pvar, Pos, type_size); else - memcpy(&pvar->n1.n2.n3, Pos, type_size); + memcpy(&V_UI8(pvar), Pos, type_size); Pos += type_size; } - pvar->n1.n2.vt = header->vt; + V_VT(pvar) = header->vt; pvar->n1.n2.wReserved1 = header->wReserved1; pvar->n1.n2.wReserved2 = header->wReserved2; pvar->n1.n2.wReserved3 = header->wReserved3; @@ -621,7 +621,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar) TRACE("%#lx, %p.\n", *pFlags, pvar); TRACE("vt=%04x\n", V_VT(pvar)); - if (vt & VT_BYREF) ref = pvar->n1.n2.n3.byref; + if (vt & VT_BYREF) ref = V_BYREF(pvar); VariantClear(pvar); if (!ref) return;

1 0