March 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Implement RtlAddProcessTrustLabelAce().
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: d5468b9cac157bd57c081f2ca90186f8ccfe75fc URL: https://gitlab.winehq.org/wine/wine/-/commit/d5468b9cac157bd57c081f2ca90186… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 1 11:06:06 2023 +0100 ntdll: Implement RtlAddProcessTrustLabelAce(). --- dlls/ntdll/ntdll.spec | 5 +++-- dlls/ntdll/sec.c | 21 +++++++++++++++------ include/winnt.h | 8 ++++++++ include/winternl.h | 1 + 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3117e4c9b72..b0186eb7641 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -482,10 +482,11 @@ @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub RtlAddCompoundAce -@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) -# @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) +@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) +@ stdcall RtlAddProcessTrustLabelAce(ptr long long ptr long long) +# @ stub RtlAddRange @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 56f18423ad6..51308384ee8 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1478,22 +1478,31 @@ NTSTATUS WINAPI RtlAddMandatoryAce( IN DWORD dwAceType, IN PSID pSid) { - static const DWORD valid_flags = SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | - SYSTEM_MANDATORY_LABEL_NO_READ_UP | - SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP; - TRACE("(%p, %lu, 0x%08lx, 0x%08lx, %lu, %p)\n", pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, dwAceType, pSid); if (dwAceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) return STATUS_INVALID_PARAMETER; - - if (dwMandatoryFlags & ~valid_flags) + if (dwMandatoryFlags & ~SYSTEM_MANDATORY_LABEL_VALID_MASK) return STATUS_INVALID_PARAMETER; return add_access_ace(pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, pSid, dwAceType); } +/************************************************************************** + * RtlAddProcessTrustLabelAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddProcessTrustLabelAce( ACL *acl, DWORD revision, DWORD flags, + PSID sid, DWORD type, DWORD mask ) +{ + TRACE( "%p %lx %lx %p %lx %lx\n", acl, revision, flags, sid, type, mask ); + + if (type != SYSTEM_PROCESS_TRUST_LABEL_ACE_TYPE) return STATUS_INVALID_PARAMETER; + if (mask & ~SYSTEM_PROCESS_TRUST_LABEL_VALID_MASK) return STATUS_INVALID_PARAMETER; + + return add_access_ace( acl, revision, flags, mask, sid, type ); +} + /****************************************************************************** * RtlValidAcl [NTDLL.@] */ diff --git a/include/winnt.h b/include/winnt.h index 04c2e96d1e1..17dce6e84e5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4848,6 +4848,12 @@ typedef struct _SYSTEM_MANDATORY_LABEL_ACE { DWORD SidStart; } SYSTEM_MANDATORY_LABEL_ACE,*PSYSTEM_MANDATORY_LABEL_ACE; +typedef struct _SYSTEM_PROCESS_TRUST_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_PROCESS_TRUST_LABEL_ACE, *PSYSTEM_PROCESS_TRUST_LABEL_ACE; + typedef struct _ACCESS_ALLOWED_OBJECT_ACE { ACE_HEADER Header; ACCESS_MASK Mask; @@ -4948,6 +4954,8 @@ typedef struct _SYSTEM_ALARM_CALLBACK_OBJECT_ACE { #define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 #define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 #define SYSTEM_MANDATORY_LABEL_VALID_MASK 0x7 +#define SYSTEM_PROCESS_TRUST_LABEL_VALID_MASK 0x00ffffff +#define SYSTEM_PROCESS_TRUST_NOCONSTRAINT_MASK 0xffffffff typedef enum tagSID_NAME_USE { SidTypeUser = 1, diff --git a/include/winternl.h b/include/winternl.h index 93bd32e3786..95abf79812b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4259,6 +4259,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddProcessTrustLabelAce(PACL,DWORD,DWORD,PSID,DWORD,DWORD); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSYSAPI PVOID WINAPI RtlAddressInSectionTable(const IMAGE_NT_HEADERS*,HMODULE,DWORD);

1 0

Alexandre Julliard : server: Fix another buffer overflow compiler warning.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: 14967933eca40e1cb021a05b6b2e4190f042cb28 URL: https://gitlab.winehq.org/wine/wine/-/commit/14967933eca40e1cb021a05b6b2e41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 1 11:20:15 2023 +0100 server: Fix another buffer overflow compiler warning. --- server/mapping.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index ed81a718bbe..f14ee11cc62 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1192,7 +1192,6 @@ DECL_HANDLER(map_view) { struct mapping *mapping = NULL; struct memory_view *view; - data_size_t namelen = 0; if (!req->size || (req->base & page_mask) || req->base + req->size < req->base) /* overflow */ { @@ -1211,6 +1210,8 @@ DECL_HANDLER(map_view) if (!req->mapping) /* image mapping for a .so dll */ { + data_size_t namelen = 0; + if (get_req_data_size() > sizeof(view->image)) namelen = get_req_data_size() - sizeof(view->image); if (!(view = mem_alloc( sizeof(struct memory_view) + namelen * sizeof(WCHAR) ))) return; memset( view, 0, sizeof(*view) ); @@ -1243,13 +1244,13 @@ DECL_HANDLER(map_view) goto done; } - if ((view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) + if ((view = mem_alloc( sizeof(*view) ))) { view->base = req->base; view->size = req->size; view->start = req->start; view->flags = mapping->flags; - view->namelen = namelen; + view->namelen = 0; view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL;

1 0

Alex Henrie : server: Annotate allocation functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: f3e1d897ca5f7d686e9a148871b8d9e2ee9931b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3e1d897ca5f7d686e9a148871b8d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 27 12:56:55 2023 -0700 server: Annotate allocation functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- server/file.h | 2 +- server/object.h | 6 +++--- server/unicode.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/file.h b/server/file.h index 0ffe0e2c8dc..210fcec5e78 100644 --- a/server/file.h +++ b/server/file.h @@ -102,7 +102,7 @@ extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void allow_fd_caching( struct fd *fd ); extern void set_fd_signaled( struct fd *fd, int signaled ); -extern char *dup_fd_name( struct fd *root, const char *name ); +extern char *dup_fd_name( struct fd *root, const char *name ) __WINE_DEALLOC(free) __WINE_MALLOC; extern void get_nt_name( struct fd *fd, struct unicode_str *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry ); diff --git a/server/object.h b/server/object.h index f156f1d2f13..dfdd691601f 100644 --- a/server/object.h +++ b/server/object.h @@ -139,12 +139,12 @@ struct wait_queue_entry struct thread_wait *wait; }; -extern void *mem_alloc( size_t size ); /* malloc wrapper */ -extern void *memdup( const void *data, size_t len ); +extern void *mem_alloc( size_t size ) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(free) __WINE_MALLOC; +extern void *memdup( const void *data, size_t len ) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(free); extern void *alloc_object( const struct object_ops *ops ); extern void namespace_add( struct namespace *namespace, struct object_name *ptr ); extern const WCHAR *get_object_name( struct object *obj, data_size_t *len ); -extern WCHAR *default_get_full_name( struct object *obj, data_size_t *ret_len ); +extern WCHAR *default_get_full_name( struct object *obj, data_size_t *ret_len ) __WINE_DEALLOC(free) __WINE_MALLOC; extern void dump_object_name( struct object *obj ); extern struct object *lookup_named_object( struct object *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left ); diff --git a/server/unicode.h b/server/unicode.h index e031d6ef0cf..951100564cd 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -28,7 +28,7 @@ extern int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ); extern unsigned int hash_strW( const WCHAR *str, data_size_t len, unsigned int hash_size ); -extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ); +extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ) __WINE_DEALLOC(free) __WINE_MALLOC; extern int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ); extern int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] ); extern struct fd *load_intl_file(void);

1 0

Alex Henrie : ntoskrnl: Add ExGetPreviousMode and test.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: b9627b996f0a9680c95c6d705449a5925334d9f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9627b996f0a9680c95c6d705449a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 27 21:17:42 2023 -0700 ntoskrnl: Add ExGetPreviousMode and test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54378 --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 1 + include/ddk/wdm.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cc30750a160..2d506402036 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4566,6 +4566,12 @@ NTSTATUS WINAPI KdEnableDebugger(void) return STATUS_DEBUGGER_INACTIVE; } +KPROCESSOR_MODE WINAPI ExGetPreviousMode(void) +{ + TRACE("\n"); + return PsIsSystemThread((PETHREAD)KeGetCurrentThread()) ? KernelMode : UserMode; +} + #ifdef __x86_64__ void WINAPI KfRaiseIrql(KIRQL new, KIRQL *old) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2447d01458d..0b694b08de0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -154,7 +154,7 @@ @ stub ExGetCurrentProcessorCounts @ stub ExGetCurrentProcessorCpuUsage @ stdcall ExGetExclusiveWaiterCount(ptr) -@ stub ExGetPreviousMode +@ stdcall ExGetPreviousMode() @ stdcall ExGetSharedWaiterCount(ptr) @ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) @ stdcall ExInitializePagedLookasideList(ptr ptr ptr long long long long) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d293889c823..d55ad846ef7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -454,6 +454,7 @@ static void test_current_thread(BOOL is_system) ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); ok(PsIsSystemThread((PETHREAD)KeGetCurrentThread()) == is_system, "unexpected system thread\n"); + ok(ExGetPreviousMode() == is_system ? KernelMode : UserMode, "previous mode is not correct\n"); if (!is_system) { ok(create_caller_thread == KeGetCurrentThread(), "thread is not create caller thread\n"); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 321b07b84fa..bf240f4fe53 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1683,6 +1683,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); void WINAPI ExDeletePagedLookasideList(PPAGED_LOOKASIDE_LIST); NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); +KPROCESSOR_MODE WINAPI ExGetPreviousMode(void); ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT);

1 0

Philip Gruebele : dwrite: Pass correct font key when adding glyph to cache.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: 7eb1ac5143b08f24f5ecf07fe6599077eca347df URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb1ac5143b08f24f5ecf07fe65990… Author: Philip Gruebele <philipg(a)audiophilleo.com> Date: Wed Mar 1 12:19:15 2023 +0200 dwrite: Pass correct font key when adding glyph to cache. Without this fix, the font cache was filling up with lots of duplicate entries, and getting cache misses, thereby causing font-intensive applications to be very slow (e.g. AvalonEdit). This fix provides 30x speed increase when processing glyphs. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5e1fb1c8cbf..9dce26a17c2 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -98,7 +98,7 @@ static struct cache_entry * fontface_get_cache_entry(struct dwrite_fontface *fon fontface_release_cache_entry(old_entry); } - if (wine_rb_put(&fontface->cache.tree, &key, &entry->entry) == -1) + if (wine_rb_put(&fontface->cache.tree, key, &entry->entry) == -1) { WARN("Failed to add cache entry.\n"); free(entry);

1 0

Adrian Thiele : mfreadwrite/tests: Check refcount of device manager after release.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: eeb25932c7544497b93b3096e79944a9732eeb97 URL: https://gitlab.winehq.org/wine/wine/-/commit/eeb25932c7544497b93b3096e79944… Author: Adrian Thiele <adrian.thiele(a)live.de> Date: Wed Mar 1 16:54:15 2023 +0100 mfreadwrite/tests: Check refcount of device manager after release. --- dlls/mfreadwrite/tests/mfplat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 83091b59380..4b7600b5113 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1372,6 +1372,7 @@ static void test_reader_d3d9(void) HWND window; HRESULT hr; UINT token; + ULONG refcount; window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -1404,7 +1405,9 @@ static void test_reader_d3d9(void) IMFSourceReader_Release(reader); - IDirect3DDeviceManager9_Release(d3d9_manager); + refcount = IDirect3DDeviceManager9_Release(d3d9_manager); + todo_wine ok(!refcount, "Unexpected refcount %lu.\n", refcount); + IDirect3DDevice9_Release(d3d9_device); done:

1 0

Adrian Thiele : mfreadwrite/reader: Release device manager in source_reader_release.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: 0d4f63b34cd6f2f8c544714d67d31d93092d210f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4f63b34cd6f2f8c544714d67d31d… Author: Adrian Thiele <adrian.thiele(a)live.de> Date: Wed Mar 1 16:59:50 2023 +0100 mfreadwrite/reader: Release device manager in source_reader_release. --- dlls/mfreadwrite/reader.c | 2 ++ dlls/mfreadwrite/tests/mfplat.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 5296e77f3c3..e21f4e10fa9 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -211,6 +211,8 @@ static ULONG source_reader_release(struct source_reader *reader) if (!refcount) { + if (reader->device_manager) + IUnknown_Release(reader->device_manager); if (reader->async_callback) IMFSourceReaderCallback_Release(reader->async_callback); if (reader->descriptor) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 4b7600b5113..50d9d866a2c 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1406,7 +1406,7 @@ static void test_reader_d3d9(void) IMFSourceReader_Release(reader); refcount = IDirect3DDeviceManager9_Release(d3d9_manager); - todo_wine ok(!refcount, "Unexpected refcount %lu.\n", refcount); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); IDirect3DDevice9_Release(d3d9_device);

1 0

Mohamad Al-Jaf : widl: Use "i4" / "u4" for LONG parameterized type signature.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: e427e893fc90d34925db56c5a01a62e0f8591a4a URL: https://gitlab.winehq.org/wine/wine/-/commit/e427e893fc90d34925db56c5a01a62… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 23 02:52:43 2023 -0500 widl: Use "i4" / "u4" for LONG parameterized type signature. --- tools/widl/typetree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index ee71a7a2899..e867ea4d26f 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -212,6 +212,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t { case TYPE_BASIC_INT: case TYPE_BASIC_INT32: + case TYPE_BASIC_LONG: n += strappend(buf, len, pos + n, type_basic_get_sign(type) <= 0 ? "i4" : "u4"); return n; case TYPE_BASIC_INT64: @@ -232,7 +233,6 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t return n; case TYPE_BASIC_INT16: case TYPE_BASIC_INT3264: - case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_WCHAR:

1 0

Mohamad Al-Jaf : widl: Use "i2" / "u2" for INT16 parameterized type signature.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: ef43048c65f2615cc7e43c2487e7a7b1cc77e333 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef43048c65f2615cc7e43c2487e7a7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Feb 23 02:59:54 2023 -0500 widl: Use "i2" / "u2" for INT16 parameterized type signature. --- tools/widl/typetree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e867ea4d26f..290f9fffeb5 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -210,6 +210,9 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t case TYPE_BASIC: switch (type_basic_get_type(type)) { + case TYPE_BASIC_INT16: + n += strappend(buf, len, pos + n, type_basic_get_sign(type) <= 0 ? "i2" : "u2"); + return n; case TYPE_BASIC_INT: case TYPE_BASIC_INT32: case TYPE_BASIC_LONG: @@ -231,7 +234,6 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t case TYPE_BASIC_BYTE: n += strappend(buf, len, pos + n, "u1"); return n; - case TYPE_BASIC_INT16: case TYPE_BASIC_INT3264: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER:

1 0

Rémi Bernon : widl: Use "g16" for GUID parameterized type signature.
by Alexandre Julliard 01 Mar '23

01 Mar '23

Module: wine Branch: master Commit: a375ff9e65f4d67ef90495889468023658a583a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a375ff9e65f4d67ef9049588946802… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 28 17:39:48 2023 +0100 widl: Use "g16" for GUID parameterized type signature. --- tools/widl/typetree.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 290f9fffeb5..87ab7d2134c 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -198,6 +198,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t return n; case TYPE_ALIAS: if (!strcmp(type->name, "boolean")) n += strappend(buf, len, pos + n, "b1"); + else if (!strcmp(type->name, "GUID")) n += strappend(buf, len, pos + n, "g16"); else if (!strcmp(type->name, "HSTRING")) n += strappend(buf, len, pos + n, "string"); else n += append_type_signature(buf, len, pos + n, type->details.alias.aliasee.type); return n;

1 0