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

Alexandre Julliard : ntdll: Use x18 for the TEB on ARM64.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 7f088b0b1387a3b54c438b839046afadf7948ef5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f088b0b1387a3b54c438b839046af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 29 23:09:59 2023 +0200 ntdll: Use x18 for the TEB on ARM64. --- dlls/ntdll/ntdll.spec | 3 +-- dlls/ntdll/signal_arm64.c | 10 ---------- dlls/ntdll/unix/loader.c | 7 ------- dlls/ntdll/unix/signal_arm64.c | 24 ------------------------ include/winnt.h | 12 ++++++++++++ 5 files changed, 13 insertions(+), 43 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4ae544cdbb4..80277005672 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -196,7 +196,7 @@ @ stdcall -syscall NtCreateTransaction(ptr long ptr ptr long long long long ptr ptr) @ stdcall -syscall NtCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) # @ stub NtCreateWaitablePort -@ stdcall -arch=i386,arm64 NtCurrentTeb() +@ stdcall -arch=i386 NtCurrentTeb() @ stdcall -syscall NtDebugActiveProcess(long long) @ stdcall -syscall NtDebugContinue(long ptr long) @ stdcall -syscall NtDelayExecution(long ptr) @@ -1704,7 +1704,6 @@ @ extern -private __wine_syscall_dispatcher @ extern -private __wine_unix_call_dispatcher @ extern -private __wine_unixlib_handle -@ extern -arch=arm64 __wine_current_teb # Debugging @ stdcall -norelay __wine_dbg_write(ptr long) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 231660367b7..a19aa2f54b0 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(threadname); -TEB * (* WINAPI __wine_current_teb)(void) = NULL; - typedef struct _SCOPE_TABLE { ULONG Count; @@ -1548,12 +1546,4 @@ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0xf000; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" ); -/********************************************************************** - * NtCurrentTeb (NTDLL.@) - */ -TEB * WINAPI NtCurrentTeb(void) -{ - return __wine_current_teb(); -} - #endif /* __aarch64__ */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dba8e2f614e..380ff18696f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1834,13 +1834,6 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( __wine_unixlib_handle ); *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; *p__wine_unixlib_handle = (UINT_PTR)unix_call_funcs; -#ifdef __aarch64__ - { - void **p__wine_current_teb; - GET_FUNC( __wine_current_teb ); - *p__wine_current_teb = NtCurrentTeb; - } -#endif #undef GET_FUNC } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index f232ecf92a9..dd492fef8fe 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1694,22 +1694,6 @@ __ASM_GLOBAL_FUNC( signal_exit_thread, * __wine_syscall_dispatcher */ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - /* FIXME: use x18 directly instead */ - "stp x0, x1, [sp, #-96]!\n\t" - "stp x2, x3, [sp, #16]\n\t" - "stp x4, x5, [sp, #32]\n\t" - "stp x6, x7, [sp, #48]\n\t" - "stp x8, x9, [sp, #64]\n\t" - "str x30, [sp, #80]\n\t" - "bl " __ASM_NAME("NtCurrentTeb") "\n\t" - "mov x18, x0\n\t" - "ldp x2, x3, [sp, #16]\n\t" - "ldp x4, x5, [sp, #32]\n\t" - "ldp x6, x7, [sp, #48]\n\t" - "ldp x8, x9, [sp, #64]\n\t" - "ldr x30, [sp, #80]\n\t" - "ldp x0, x1, [sp], #96\n\t" - "ldr x10, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "stp x18, x19, [x10, #0x90]\n\t" "stp x20, x21, [x10, #0xa0]\n\t" @@ -1822,14 +1806,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, * __wine_unix_call_dispatcher */ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, - /* FIXME: use x18 directly instead */ - "stp x0, x1, [sp, #-32]!\n\t" - "stp x2, x30,[sp, #16]\n\t" - "bl " __ASM_NAME("NtCurrentTeb") "\n\t" - "mov x18, x0\n\t" - "ldp x2, x30,[sp, #16]\n\t" - "ldp x0, x1, [sp], #32\n\t" - "ldr x10, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "stp x18, x19, [x10, #0x90]\n\t" "stp x20, x21, [x10, #0xa0]\n\t" diff --git a/include/winnt.h b/include/winnt.h index 66746d7f6ae..1a7f65776a7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2398,6 +2398,18 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)_MoveFromCoprocessor(15, 0, 13, 0, 2); } +#elif defined(__aarch64__) && defined(__MINGW32__) +register struct _TEB *__wine_current_teb __asm__("x18"); +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + return __wine_current_teb; +} +#elif defined(__aarch64__) && defined(_MSC_VER) +#pragma intrinsic(__getReg) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + return (struct _TEB *)__getReg(18); +} #elif defined(__GNUC__) extern struct _TEB * WINAPI NtCurrentTeb(void) __attribute__((pure)); #else

1 0

Alexandre Julliard : ntdll: Use nameless unions/structs for loader data.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 65edf1925f8bea18b2eadfba83d3494e62ab2690 URL: https://gitlab.winehq.org/wine/wine/-/commit/65edf1925f8bea18b2eadfba83d349… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 10:54:51 2023 +0200 ntdll: Use nameless unions/structs for loader data. --- dlls/ntdll/actctx.c | 9 ++++----- dlls/ntdll/loader.c | 12 +++++------- dlls/ntdll/locale.c | 2 -- dlls/ntdll/resource.c | 24 +++++++++++------------- dlls/ntdll/thread.c | 1 - dlls/ntdll/unix/loader.c | 14 ++++++-------- 6 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index e2adbd3394c..73f852f2547 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -28,7 +28,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "winternl.h" #include "ddk/wdm.h" #include "ntdll_misc.h" @@ -2942,7 +2941,7 @@ static NTSTATUS find_first_manifest_resource_in_module( HANDLE hModule, const WC if (!resdir->NumberOfIdEntries) return STATUS_RESOURCE_NAME_NOT_FOUND; entry_base = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); entry = entry_base + resdir->NumberOfNamedEntries; - *resname = (const WCHAR *)(ULONG_PTR)entry->u.Id; + *resname = (const WCHAR *)(ULONG_PTR)entry->Id; return STATUS_SUCCESS; } @@ -3285,14 +3284,14 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit if (!open_nt_file( &handle, &path_us )) { - io.u.Status = get_manifest_in_manifest_file(acl, &sxs_ai, path_us.Buffer, file, TRUE, handle); + io.Status = get_manifest_in_manifest_file(acl, &sxs_ai, path_us.Buffer, file, TRUE, handle); NtClose( handle ); } - else io.u.Status = STATUS_NO_SUCH_FILE; + else io.Status = STATUS_NO_SUCH_FILE; RtlFreeHeap( GetProcessHeap(), 0, file ); RtlFreeUnicodeString( &path_us ); - return io.u.Status; + return io.Status; } static NTSTATUS lookup_assembly(struct actctx_loader* acl, diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b6bf9264f08..c8e85970604 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -25,8 +25,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winnt.h" #include "winioctl.h" @@ -1057,8 +1055,8 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP DWORD protect_old; thunk_list = get_rva( module, (DWORD)descr->FirstThunk ); - if (descr->u.OriginalFirstThunk) - import_list = get_rva( module, (DWORD)descr->u.OriginalFirstThunk ); + if (descr->OriginalFirstThunk) + import_list = get_rva( module, (DWORD)descr->OriginalFirstThunk ); else import_list = thunk_list; @@ -2134,7 +2132,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, if (id) wm->id = *id; if (image_info->LoaderFlags) wm->ldr.Flags |= LDR_COR_IMAGE; - if (image_info->u.s.ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; + if (image_info->ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; wm->system = system; set_security_cookie( *module, map_size ); @@ -2352,7 +2350,7 @@ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info if (current_machine == IMAGE_FILE_MACHINE_AMD64 && has_chpe_metadata( file, info )) return TRUE; /* support 32-bit IL-only images on 64-bit */ if (!info->ImageContainsCode) return TRUE; - if (info->u.s.ComPlusNativeReady) return TRUE; + if (info->ComPlusNativeReady) return TRUE; return is_com_ilonly( file, info ); } @@ -4188,7 +4186,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR #elif defined(__arm__) entry = (void **)&context->R0; #elif defined(__aarch64__) - entry = (void **)&context->u.s.X0; + entry = (void **)&context->X0; #endif if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index f18181210aa..a5777117cfa 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include <stdarg.h> #include <string.h> #include <stdlib.h> diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index d8654a6d851..f1c6e04141f 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -29,8 +29,6 @@ #include <stdlib.h> #include <sys/types.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -84,8 +82,8 @@ static const IMAGE_RESOURCE_DIRECTORY *find_first_entry( const IMAGE_RESOURCE_DI for (pos = 0; pos < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; pos++) { - if (!entry[pos].u2.s2.DataIsDirectory == !want_dir) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + if (!entry[pos].DataIsDirectory == !want_dir) + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); } return NULL; } @@ -108,17 +106,17 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u.Id == id) + if (entry[pos].Id == id) { - if (!entry[pos].u2.s2.DataIsDirectory == !want_dir) + if (!entry[pos].DataIsDirectory == !want_dir) { TRACE("root %p dir %p id %04x ret %p\n", - root, dir, id, (const char*)root + entry[pos].u2.s2.OffsetToDirectory); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + root, dir, id, (const char*)root + entry[pos].OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); } break; } - if (entry[pos].u.Id > id) max = pos - 1; + if (entry[pos].Id > id) max = pos - 1; else min = pos + 1; } TRACE("root %p dir %p id %04x not found\n", root, dir, id ); @@ -147,15 +145,15 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ while (min <= max) { pos = (min + max) / 2; - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].u.s.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].NameOffset); res = wcsncmp( name, str->NameString, str->Length ); if (!res && namelen == str->Length) { - if (!entry[pos].u2.s2.DataIsDirectory == !want_dir) + if (!entry[pos].DataIsDirectory == !want_dir) { TRACE("root %p dir %p name %s ret %p\n", - root, dir, debugstr_w(name), (const char*)root + entry[pos].u2.s2.OffsetToDirectory); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + root, dir, debugstr_w(name), (const char*)root + entry[pos].OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); } break; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b0b61419e37..8e5c6ef47dc 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,7 +23,6 @@ #include <limits.h> #include <sys/types.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 380ff18696f..5b8b6962b4a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -80,8 +80,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winnt.h" #include "winbase.h" @@ -423,8 +421,8 @@ static void fixup_so_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int d for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++) { - void *ptr = root + entry->u2.s2.OffsetToDirectory; - if (entry->u2.s2.DataIsDirectory) fixup_so_resources( ptr, root, delta ); + void *ptr = root + entry->OffsetToDirectory; + if (entry->DataIsDirectory) fixup_so_resources( ptr, root, delta ); else fixup_rva_dwords( &((IMAGE_RESOURCE_DATA_ENTRY *)ptr)->OffsetToData, delta, 1 ); } } @@ -931,11 +929,11 @@ static NTSTATUS map_so_dll( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ) while (imports->Name) { - fixup_rva_dwords( &imports->u.OriginalFirstThunk, delta, 1 ); + fixup_rva_dwords( &imports->OriginalFirstThunk, delta, 1 ); fixup_rva_dwords( &imports->Name, delta, 1 ); fixup_rva_dwords( &imports->FirstThunk, delta, 1 ); - if (imports->u.OriginalFirstThunk) - fixup_rva_names( (UINT_PTR *)(addr + imports->u.OriginalFirstThunk), delta ); + if (imports->OriginalFirstThunk) + fixup_rva_names( (UINT_PTR *)(addr + imports->OriginalFirstThunk), delta ); if (imports->FirstThunk) fixup_rva_names( (UINT_PTR *)(addr + imports->FirstThunk), delta ); imports++; @@ -1694,7 +1692,7 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO if (!status) { status = virtual_map_module( mapping, module, &size, info, 0, machine ); - if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH && info->u.s.ComPlusNativeReady) + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH && info->ComPlusNativeReady) { info->Machine = native_machine; status = STATUS_SUCCESS;

1 0

Alexandre Julliard : ntdll: Use nameless unions/structs for CPU-related data.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: c3352feb83b8e22e0afc0a8d35bf0f570e89dd90 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3352feb83b8e22e0afc0a8d35bf0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 10:57:02 2023 +0200 ntdll: Use nameless unions/structs for CPU-related data. --- dlls/ntdll/exception.c | 10 ++--- dlls/ntdll/heap.c | 1 - dlls/ntdll/rtl.c | 52 ++++++++++++------------ dlls/ntdll/tests/time.c | 20 +++++----- dlls/ntdll/time.c | 3 +- dlls/ntdll/unix/system.c | 101 +++++++++++++++++++++++------------------------ dlls/ntdll/unix/thread.c | 46 +++++++++++---------- 7 files changed, 111 insertions(+), 122 deletions(-)

1 0

Alexandre Julliard : ntdll: Use nameless unions/structs for IO_STATUS_BLOCK.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: d5f23441ad460844f552d301680e061dd1a5e90a URL: https://gitlab.winehq.org/wine/wine/-/commit/d5f23441ad460844f552d301680e06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 11:00:04 2023 +0200 ntdll: Use nameless unions/structs for IO_STATUS_BLOCK. --- dlls/ntdll/sync.c | 1 - dlls/ntdll/tests/threadpool.c | 4 +-- dlls/ntdll/threadpool.c | 7 ++--- dlls/ntdll/unix/cdrom.c | 3 +- dlls/ntdll/unix/file.c | 65 +++++++++++++++++++++--------------------- dlls/ntdll/unix/serial.c | 3 +- dlls/ntdll/unix/sync.c | 7 ++--- dlls/ntdll/unix/tape.c | 3 +- dlls/ntdll/unix/unix_private.h | 8 ------ 9 files changed, 42 insertions(+), 59 deletions(-)

1 0

Jinoh Kang : ntdll: Don't hard-code DLL manifest resource ID when looking up dependency assembly.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: d0d472bb3e8680e286e404a73fceb29cebe85b73 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0d472bb3e8680e286e404a73fceb2… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon May 29 21:18:42 2023 +0900 ntdll: Don't hard-code DLL manifest resource ID when looking up dependency assembly. This allows any manifest resource IDs (e.g., ISOLATIONAWARE_MANIFEST_RESOURCE_ID) to be recognized when looking up the assembly manifest of a dependency. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18889 --- dlls/kernel32/tests/actctx.c | 63 +++++++++++++++++++++----------------------- dlls/ntdll/actctx.c | 27 +++++++++++++++++-- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 3c1c29f2ded..c6796a1ac64 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3754,7 +3754,6 @@ struct multiple_manifest_test struct manifest_res_spec manifest_inline; /* optional */ const struct manifest_res_spec *manifests; /* optional */ DWORD expected_error; - BOOL is_todo_wine; }; #define subtest_manifest_res(d,e,t,l) subtest_manifest_res_(__LINE__,d,e,t,l) @@ -3853,7 +3852,6 @@ static DWORD subtest_manifest_res_(int line, const char *manifest_exe, const cha ok_(__FILE__, line)(handle != NULL, "CreateActCtxA returned %p (error %lu)\n", handle, err); ReleaseActCtx(handle); } - todo_wine_if(test_data->is_todo_wine) ok_(__FILE__, line)(err == test_data->expected_error, "expected error %lu, got %lu\n", test_data->expected_error, err); @@ -3917,54 +3915,54 @@ static void test_manifest_resources(void) }; struct multiple_manifest_test tests[] = { /* Test well-known manifest resource IDs */ - { { (char *)CREATEPROCESS_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS, FALSE }, - { { (char *)ISOLATIONAWARE_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS, TRUE }, + { { (char *)CREATEPROCESS_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS }, + { { (char *)ISOLATIONAWARE_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS }, + { { (char *)ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS }, /* Test remaining reserved manifest resource IDs */ - { { (char *)4 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)5 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)6 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)7 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)8 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)9 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)10 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)11 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)12 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)13 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)14 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)15 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS, TRUE }, + { { (char *)4 }, NULL, ERROR_SUCCESS }, + { { (char *)5 }, NULL, ERROR_SUCCESS }, + { { (char *)6 }, NULL, ERROR_SUCCESS }, + { { (char *)7 }, NULL, ERROR_SUCCESS }, + { { (char *)8 }, NULL, ERROR_SUCCESS }, + { { (char *)9 }, NULL, ERROR_SUCCESS }, + { { (char *)10 }, NULL, ERROR_SUCCESS }, + { { (char *)11 }, NULL, ERROR_SUCCESS }, + { { (char *)12 }, NULL, ERROR_SUCCESS }, + { { (char *)13 }, NULL, ERROR_SUCCESS }, + { { (char *)14 }, NULL, ERROR_SUCCESS }, + { { (char *)15 }, NULL, ERROR_SUCCESS }, + { { (char *)MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID }, NULL, ERROR_SUCCESS }, /* Test arbitrary resource IDs */ - { { (char *)0x1234 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)0x89ab }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)0xffff }, NULL, ERROR_SUCCESS, TRUE }, + { { (char *)0x1234 }, NULL, ERROR_SUCCESS }, + { { (char *)0x89ab }, NULL, ERROR_SUCCESS }, + { { (char *)0xffff }, NULL, ERROR_SUCCESS }, /* Test arbitrary LANGID */ - { { (char *)2, MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT) }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)2, MAKELANGID(LANG_FRENCH,SUBLANG_DEFAULT) }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)2, 0x1234 }, NULL, ERROR_SUCCESS, TRUE }, - { { (char *)2, 0xffff }, NULL, ERROR_SUCCESS, TRUE }, + { { (char *)2, MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT) }, NULL, ERROR_SUCCESS }, + { { (char *)2, MAKELANGID(LANG_FRENCH,SUBLANG_DEFAULT) }, NULL, ERROR_SUCCESS }, + { { (char *)2, 0x1234 }, NULL, ERROR_SUCCESS }, + { { (char *)2, 0xffff }, NULL, ERROR_SUCCESS }, /* Test multiple manifest resources coexisting inside a module */ - { { (char *)2, 0 }, wrong_manifest_resources_numbered, ERROR_SUCCESS, TRUE }, + { { (char *)2, 0 }, wrong_manifest_resources_numbered, ERROR_SUCCESS }, { { (char *)2, 0, wrong_manifest1 }, correct_manifest_resources_numbered, - ERROR_SXS_CANT_GEN_ACTCTX, FALSE }, + ERROR_SXS_CANT_GEN_ACTCTX }, /* Test that smaller resource ID takes precedence regardless of language ID */ { { (char *)2, MAKELANGID(LANG_INVARIANT,SUBLANG_NEUTRAL) }, - wrong_manifest_resources_gte_3, ERROR_SUCCESS, TRUE }, + wrong_manifest_resources_gte_3, ERROR_SUCCESS }, { { (char *)2, MAKELANGID(LANG_INVARIANT,SUBLANG_NEUTRAL), wrong_manifest1 }, - correct_manifest_resources_gte_3, ERROR_SXS_CANT_GEN_ACTCTX, FALSE }, + correct_manifest_resources_gte_3, ERROR_SXS_CANT_GEN_ACTCTX }, /* Test multiple manifest resources (ID / name) coexisting inside a module */ - { { (char *)2, 0 }, wrong_manifest_resources_named, ERROR_SUCCESS, TRUE }, + { { (char *)2, 0 }, wrong_manifest_resources_named, ERROR_SUCCESS }, { { (char *)2, 0, wrong_manifest1 }, - correct_manifest_resources_named, ERROR_SXS_CANT_GEN_ACTCTX, FALSE }, + correct_manifest_resources_named, ERROR_SXS_CANT_GEN_ACTCTX }, /* Test name-only RT_MANIFEST resources */ - { { NULL }, correct_manifest_resources_named, ERROR_SXS_CANT_GEN_ACTCTX, FALSE }, + { { NULL }, correct_manifest_resources_named, ERROR_SXS_CANT_GEN_ACTCTX }, }; size_t i; @@ -4093,7 +4091,6 @@ static void subtest_valid_manifest_resources_locale(LANGID actctx_lang) test.manifests = specs; test.expected_error = ERROR_SUCCESS; - test.is_todo_wine = TRUE; err = subtest_manifest_res(manifest_exe, manifest_dll, &test, actctx_lang); if (winetest_debug > 1 && err != ERROR_SUCCESS) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index a2e159c76ae..e2adbd3394c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2929,6 +2929,24 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_ALERT ); } +static NTSTATUS find_first_manifest_resource_in_module( HANDLE hModule, const WCHAR **resname ) +{ + static const LDR_RESOURCE_INFO manifest_res_info = { RT_MANIFEST }; + const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry_base, *entry; + const IMAGE_RESOURCE_DIRECTORY *resdir; + NTSTATUS status; + + status = LdrFindResourceDirectory_U( hModule, &manifest_res_info, 1, &resdir ); + if (status != STATUS_SUCCESS) return status; + + if (!resdir->NumberOfIdEntries) return STATUS_RESOURCE_NAME_NOT_FOUND; + entry_base = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); + entry = entry_base + resdir->NumberOfNamedEntries; + *resname = (const WCHAR *)(ULONG_PTR)entry->u.Id; + + return STATUS_SUCCESS; +} + static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai, LPCWSTR filename, LPCWSTR directory, BOOL shared, HANDLE hModule, LPCWSTR resname, ULONG lang ) @@ -2951,6 +2969,12 @@ static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assemb hModule, debugstr_w(filename) ); } + if (!resname) + { + status = find_first_manifest_resource_in_module( hModule, &resname ); + if (status != STATUS_SUCCESS) return status; + } + info.Type = RT_MANIFEST; info.Language = lang; if (!((ULONG_PTR)resname >> 16)) @@ -3330,8 +3354,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, - (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); + status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, NULL, 0 ); NtClose( file ); if (status == STATUS_SUCCESS) break;

1 0

Zhiyi Zhang : gdiplus/tests: Add pen custom line cap record and play back tests.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: f76caee6e733c25b8cec414e39a5f8aa11916363 URL: https://gitlab.winehq.org/wine/wine/-/commit/f76caee6e733c25b8cec414e39a5f8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun May 14 15:34:24 2023 +0800 gdiplus/tests: Add pen custom line cap record and play back tests. --- dlls/gdiplus/tests/metafile.c | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index aa844a62ff9..ceca8e4a9bb 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3874,6 +3874,131 @@ static void test_setclippath(void) expect(Ok, stat); } +static const emfplus_record pen_dc_records[] = +{ + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypePen << 8 }, + { EmfPlusRecordTypeObject, (ObjectTypePath << 8) | 1 }, + { EmfPlusRecordTypeDrawPath, 1 }, + { EMR_SAVEDC, 0, 1 }, + { EMR_SETICMMODE, 0, 1 }, + { EMR_BITBLT, 0, 1 }, + { EMR_RESTOREDC, 0, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static const emfplus_record pen_bitmap_records[] = +{ + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypePen << 8 }, + { EmfPlusRecordTypeObject, (ObjectTypePath << 8) | 1 }, + { EmfPlusRecordTypeDrawPath, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_pen(void) +{ + static const GpPointF dst_points[3] = {{0.0, 0.0}, {100.0, 0.0}, {0.0, 100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + GpMetafile *metafile, *clone_metafile; + GpPath *draw_path, *line_cap_path; + GpCustomLineCap *custom_line_cap; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpBitmap *bitmap; + GpStatus stat; + ARGB color; + GpPen *pen; + BOOL ret; + HDC hdc; + + /* Record */ + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage *)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &draw_path); + expect(Ok, stat); + stat = GdipAddPathLine(draw_path, 25, 25, 25, 75); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff0000, 1.0f, UnitPixel, &pen); + expect(Ok, stat); + stat = GdipCreatePath(FillModeAlternate, &line_cap_path); + expect(Ok, stat); + stat = GdipAddPathRectangle(line_cap_path, 5.0, 5.0, 10.0, 10.0); + expect(Ok, stat); + stat = GdipCreateCustomLineCap(NULL, line_cap_path, LineCapCustom, 0.0, &custom_line_cap); + expect(Ok, stat); + stat = GdipSetPenCustomStartCap(pen, custom_line_cap); + expect(Ok, stat); + stat = GdipSetPenCustomEndCap(pen, custom_line_cap); + expect(Ok, stat); + stat = GdipDeleteCustomLineCap(custom_line_cap); + expect(Ok, stat); + stat = GdipDeletePath(line_cap_path); + expect(Ok, stat); + + stat = GdipDrawPath(graphics, pen, draw_path); + expect(Ok, stat); + + stat = GdipDeletePen(pen); + expect(Ok, stat); + stat = GdipDeletePath(draw_path); + expect(Ok, stat); + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + sync_metafile(&metafile, "pen.emf"); + GdipCloneImage((GpImage *)metafile, (GpImage **)&clone_metafile); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, pen_dc_records, "pen record"); + + ret = DeleteEnhMetaFile(hemf); + ok(ret != 0, "Failed to delete enhmetafile.\n"); + stat = GdipDisposeImage((GpImage *)metafile); + expect(Ok, stat); + + /* Play back */ + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage *)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(clone_metafile, graphics, pen_bitmap_records, "pen playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 10, 10, &color); + expect(Ok, stat); + todo_wine + expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 40, 90, &color); + expect(Ok, stat); + todo_wine + expect(0xffff0000, color); + + stat = GdipDisposeImage((GpImage *)clone_metafile); + expect(Ok, stat); + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + stat = GdipDisposeImage((GpImage *)bitmap); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3934,6 +4059,7 @@ START_TEST(metafile) test_offsetclip(); test_resetclip(); test_setclippath(); + test_pen(); GdiplusShutdown(gdiplusToken); }

1 0

Zhiyi Zhang : gdiplus: Support recording pen custom start line cap.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: abdd45c41a3f5a31815f2627eb6d3de2dfa9d342 URL: https://gitlab.winehq.org/wine/wine/-/commit/abdd45c41a3f5a31815f2627eb6d3d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 28 16:44:20 2023 +0800 gdiplus: Support recording pen custom start line cap. --- dlls/gdiplus/metafile.c | 223 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 208 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 90ef39e34d6..26f17ad6182 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -46,6 +46,12 @@ HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); typedef ARGB EmfPlusARGB; +typedef struct EmfPlusPointF +{ + float X; + float Y; +} EmfPlusPointF; + typedef struct EmfPlusRecordHeader { WORD Type; @@ -177,6 +183,12 @@ enum PenDataFlags PenDataCustomEndCap = 0x1000 }; +enum CustomLineCapData +{ + CustomLineCapDataFillPath = 0x1, + CustomLineCapDataLinePath = 0x2, +}; + typedef struct EmfPlusTransformMatrix { REAL TransformMatrix[6]; @@ -287,14 +299,20 @@ typedef struct EmfPlusBrush } BrushData; } EmfPlusBrush; -typedef struct EmfPlusPen -{ - DWORD Version; - DWORD Type; - /* EmfPlusPenData */ - /* EmfPlusBrush */ - BYTE data[1]; -} EmfPlusPen; +typedef struct EmfPlusCustomLineCapArrowData +{ + REAL Width; + REAL Height; + REAL MiddleInset; + BOOL FillState; + DWORD LineStartCap; + DWORD LineEndCap; + DWORD LineJoin; + REAL LineMiterLimit; + REAL WidthScale; + EmfPlusPointF FillHotSpot; + EmfPlusPointF LineHotSpot; +} EmfPlusCustomLineCapArrowData; typedef struct EmfPlusPath { @@ -307,6 +325,55 @@ typedef struct EmfPlusPath BYTE data[1]; } EmfPlusPath; +typedef struct EmfPlusCustomLineCapDataFillPath +{ + INT FillPathLength; + /* EmfPlusPath */ + BYTE FillPath[1]; +} EmfPlusCustomLineCapDataFillPath; + +typedef struct EmfPlusCustomLineCapDataLinePath +{ + INT LinePathLength; + /* EmfPlusPath */ + BYTE LinePath[1]; +} EmfPlusCustomLineCapDataLinePath; + +typedef struct EmfPlusCustomLineCapData +{ + DWORD CustomLineCapDataFlags; + DWORD BaseCap; + REAL BaseInset; + DWORD StrokeStartCap; + DWORD StrokeEndCap; + DWORD StrokeJoin; + REAL StrokeMiterLimit; + REAL WidthScale; + EmfPlusPointF FillHotSpot; + EmfPlusPointF LineHotSpot; + /* EmfPlusCustomLineCapDataFillPath */ + /* EmfPlusCustomLineCapDataLinePath */ + BYTE OptionalData[1]; +} EmfPlusCustomLineCapData; + +typedef struct EmfPlusCustomLineCap +{ + DWORD Version; + DWORD Type; + /* EmfPlusCustomLineCapArrowData */ + /* EmfPlusCustomLineCapData */ + BYTE CustomLineCapData[1]; +} EmfPlusCustomLineCap; + +typedef struct EmfPlusPen +{ + DWORD Version; + DWORD Type; + /* EmfPlusPenData */ + /* EmfPlusBrush */ + BYTE data[1]; +} EmfPlusPen; + typedef struct EmfPlusRegionNodePath { DWORD RegionNodePathLength; @@ -416,12 +483,6 @@ typedef struct EmfPlusPoint short Y; } EmfPlusPoint; -typedef struct EmfPlusPointF -{ - float X; - float Y; -} EmfPlusPointF; - typedef struct EmfPlusDrawImage { EmfPlusRecordHeader Header; @@ -1055,6 +1116,127 @@ static void METAFILE_FillBrushData(GDIPCONST GpBrush *brush, EmfPlusBrush *data) } } +static void METAFILE_PrepareCustomLineCapData(GDIPCONST GpCustomLineCap *cap, DWORD *ret_cap_size, + DWORD *ret_cap_data_size, DWORD *ret_path_size) +{ + DWORD cap_size, path_size = 0; + + /* EmfPlusCustomStartCapData */ + cap_size = FIELD_OFFSET(EmfPlusCustomStartCapData, data); + /* -> EmfPlusCustomLineCap */ + cap_size += FIELD_OFFSET(EmfPlusCustomLineCap, CustomLineCapData); + /* -> EmfPlusCustomLineCapArrowData */ + if (cap->type == CustomLineCapTypeAdjustableArrow) + cap_size += sizeof(EmfPlusCustomLineCapArrowData); + /* -> EmfPlusCustomLineCapData */ + else + { + /* -> EmfPlusCustomLineCapOptionalData */ + cap_size += FIELD_OFFSET(EmfPlusCustomLineCapData, OptionalData); + if (cap->fill) + /* -> EmfPlusCustomLineCapDataFillPath */ + cap_size += FIELD_OFFSET(EmfPlusCustomLineCapDataFillPath, FillPath); + else + /* -> EmfPlusCustomLineCapDataLinePath */ + cap_size += FIELD_OFFSET(EmfPlusCustomLineCapDataLinePath, LinePath); + + /* -> EmfPlusPath in EmfPlusCustomLineCapDataFillPath and EmfPlusCustomLineCapDataLinePath */ + path_size = FIELD_OFFSET(EmfPlusPath, data); + path_size += sizeof(PointF) * cap->pathdata.Count; + path_size += sizeof(BYTE) * cap->pathdata.Count; + path_size = (path_size + 3) & ~3; + + cap_size += path_size; + } + + *ret_cap_size = cap_size; + *ret_cap_data_size = cap_size - FIELD_OFFSET(EmfPlusCustomStartCapData, data); + *ret_path_size = path_size; +} + +static void METAFILE_FillCustomLineCapData(GDIPCONST GpCustomLineCap *cap, BYTE *ptr, + REAL line_miter_limit, DWORD data_size, DWORD path_size) +{ + EmfPlusCustomStartCapData *cap_data; + EmfPlusCustomLineCap *line_cap; + DWORD i; + + cap_data = (EmfPlusCustomStartCapData *)ptr; + cap_data->CustomStartCapSize = data_size; + i = FIELD_OFFSET(EmfPlusCustomStartCapData, data); + + line_cap = (EmfPlusCustomLineCap *)(ptr + i); + line_cap->Version = VERSION_MAGIC2; + line_cap->Type = cap->type; + i += FIELD_OFFSET(EmfPlusCustomLineCap, CustomLineCapData); + + if (cap->type == CustomLineCapTypeAdjustableArrow) + { + EmfPlusCustomLineCapArrowData *arrow_data; + GpAdjustableArrowCap *arrow_cap; + + arrow_data = (EmfPlusCustomLineCapArrowData *)(ptr + i); + arrow_cap = (GpAdjustableArrowCap *)cap; + arrow_data->Width = arrow_cap->width; + arrow_data->Height = arrow_cap->height; + arrow_data->MiddleInset = arrow_cap->middle_inset; + arrow_data->FillState = arrow_cap->cap.fill; + arrow_data->LineStartCap = arrow_cap->cap.strokeStartCap; + arrow_data->LineEndCap = arrow_cap->cap.strokeEndCap; + arrow_data->LineJoin = arrow_cap->cap.join; + arrow_data->LineMiterLimit = line_miter_limit; + arrow_data->WidthScale = arrow_cap->cap.scale; + arrow_data->FillHotSpot.X = 0; + arrow_data->FillHotSpot.Y = 0; + arrow_data->LineHotSpot.X = 0; + arrow_data->LineHotSpot.Y = 0; + } + else + { + EmfPlusCustomLineCapData *line_cap_data = (EmfPlusCustomLineCapData *)(ptr + i); + EmfPlusPath *path; + + if (cap->fill) + line_cap_data->CustomLineCapDataFlags = CustomLineCapDataFillPath; + else + line_cap_data->CustomLineCapDataFlags = CustomLineCapDataLinePath; + line_cap_data->BaseCap = cap->basecap; + line_cap_data->BaseInset = cap->inset; + line_cap_data->StrokeStartCap = cap->strokeStartCap; + line_cap_data->StrokeEndCap = cap->strokeEndCap; + line_cap_data->StrokeJoin = cap->join; + line_cap_data->StrokeMiterLimit = line_miter_limit; + line_cap_data->WidthScale = cap->scale; + line_cap_data->FillHotSpot.X = 0; + line_cap_data->FillHotSpot.Y = 0; + line_cap_data->LineHotSpot.X = 0; + line_cap_data->LineHotSpot.Y = 0; + i += FIELD_OFFSET(EmfPlusCustomLineCapData, OptionalData); + + if (cap->fill) + { + EmfPlusCustomLineCapDataFillPath *fill_path = (EmfPlusCustomLineCapDataFillPath *)(ptr + i); + fill_path->FillPathLength = path_size; + i += FIELD_OFFSET(EmfPlusCustomLineCapDataFillPath, FillPath); + } + else + { + EmfPlusCustomLineCapDataLinePath *line_path = (EmfPlusCustomLineCapDataLinePath *)(ptr + i); + line_path->LinePathLength = path_size; + i += FIELD_OFFSET(EmfPlusCustomLineCapDataLinePath, LinePath); + } + + path = (EmfPlusPath *)(ptr + i); + path->Version = VERSION_MAGIC2; + path->PathPointCount = cap->pathdata.Count; + path->PathPointFlags = 0; + i += FIELD_OFFSET(EmfPlusPath, data); + memcpy(ptr + i, cap->pathdata.Points, cap->pathdata.Count * sizeof(PointF)); + i += cap->pathdata.Count * sizeof(PointF); + memcpy(ptr + i, cap->pathdata.Types, cap->pathdata.Count * sizeof(BYTE)); + } +} + static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GDIPCONST GpBrush *brush, DWORD *id) { EmfPlusObject *object_record; @@ -4562,6 +4744,7 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *id) { + DWORD custom_start_cap_size = 0, custom_start_cap_data_size = 0, custom_start_cap_path_size = 0; DWORD i, data_flags, pen_data_size, brush_size; EmfPlusObject *object_record; EmfPlusPenData *pen_data; @@ -4626,7 +4809,10 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i /* TODO: Add support for PenDataCompoundLine */ if (pen->customstart) { - FIXME("ignoring custom start cup\n"); + data_flags |= PenDataCustomStartCap; + METAFILE_PrepareCustomLineCapData(pen->customstart, &custom_start_cap_size, + &custom_start_cap_data_size, &custom_start_cap_path_size); + pen_data_size += custom_start_cap_size; } if (pen->customend) { @@ -4719,6 +4905,13 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i *(REAL*)(pen_data->OptionalData + i) = pen->align; i += sizeof(DWORD); } + if (data_flags & PenDataCustomStartCap) + { + METAFILE_FillCustomLineCapData(pen->customstart, pen_data->OptionalData + i, + pen->miterlimit, custom_start_cap_data_size, + custom_start_cap_path_size); + i += custom_start_cap_size; + } METAFILE_FillBrushData(pen->brush, (EmfPlusBrush*)(object_record->ObjectData.pen.data + pen_data_size));

1 0

Zhiyi Zhang : gdiplus: Support recording pen custom end line cap.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 78261ecb98443dd07426afb7e5cacd5ecf979c95 URL: https://gitlab.winehq.org/wine/wine/-/commit/78261ecb98443dd07426afb7e5cacd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 28 16:45:51 2023 +0800 gdiplus: Support recording pen custom end line cap. --- dlls/gdiplus/metafile.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 26f17ad6182..92c818afbac 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4745,6 +4745,7 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *id) { DWORD custom_start_cap_size = 0, custom_start_cap_data_size = 0, custom_start_cap_path_size = 0; + DWORD custom_end_cap_size = 0, custom_end_cap_data_size = 0, custom_end_cap_path_size = 0; DWORD i, data_flags, pen_data_size, brush_size; EmfPlusObject *object_record; EmfPlusPenData *pen_data; @@ -4816,7 +4817,10 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i } if (pen->customend) { - FIXME("ignoring custom end cup\n"); + data_flags |= PenDataCustomEndCap; + METAFILE_PrepareCustomLineCapData(pen->customend, &custom_end_cap_size, + &custom_end_cap_data_size, &custom_end_cap_path_size); + pen_data_size += custom_end_cap_size; } stat = METAFILE_PrepareBrushData(pen->brush, &brush_size); @@ -4912,6 +4916,13 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i custom_start_cap_path_size); i += custom_start_cap_size; } + if (data_flags & PenDataCustomEndCap) + { + METAFILE_FillCustomLineCapData(pen->customend, pen_data->OptionalData + i, + pen->miterlimit, custom_end_cap_data_size, + custom_end_cap_path_size); + i += custom_end_cap_size; + } METAFILE_FillBrushData(pen->brush, (EmfPlusBrush*)(object_record->ObjectData.pen.data + pen_data_size));

1 0

Zhiyi Zhang : gdiplus: Support playing back pen custom start line cap.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: fea3a7447aba49b2f7f6c5e53b581b60b96539f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/fea3a7447aba49b2f7f6c5e53b581b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 3 22:36:13 2023 +0800 gdiplus: Support playing back pen custom start line cap. --- dlls/gdiplus/metafile.c | 124 +++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/metafile.c | 1 - 2 files changed, 123 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 92c818afbac..9d209e81983 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2340,6 +2340,122 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si return status; } +static GpStatus metafile_deserialize_custom_line_cap(const BYTE *record_data, UINT data_size, GpCustomLineCap **cap) +{ + EmfPlusCustomStartCapData *custom_cap_data = (EmfPlusCustomStartCapData *)record_data; + EmfPlusCustomLineCap *line_cap; + GpStatus status; + UINT offset; + + *cap = NULL; + + if (data_size < FIELD_OFFSET(EmfPlusCustomStartCapData, data)) + return InvalidParameter; + if (data_size < FIELD_OFFSET(EmfPlusCustomStartCapData, data) + custom_cap_data->CustomStartCapSize) + return InvalidParameter; + offset = FIELD_OFFSET(EmfPlusCustomStartCapData, data); + line_cap = (EmfPlusCustomLineCap *)(record_data + offset); + + if (data_size < offset + FIELD_OFFSET(EmfPlusCustomLineCap, CustomLineCapData)) + return InvalidParameter; + offset += FIELD_OFFSET(EmfPlusCustomLineCap, CustomLineCapData); + + if (line_cap->Type == CustomLineCapTypeAdjustableArrow) + { + EmfPlusCustomLineCapArrowData *arrow_data; + GpAdjustableArrowCap *arrow_cap; + + arrow_data = (EmfPlusCustomLineCapArrowData *)(record_data + offset); + + if (data_size < offset + sizeof(EmfPlusCustomLineCapArrowData)) + return InvalidParameter; + + if ((status = GdipCreateAdjustableArrowCap(arrow_data->Height, arrow_data->Width, + arrow_data->FillState, &arrow_cap))) + return status; + + if ((status = GdipSetAdjustableArrowCapMiddleInset(arrow_cap, arrow_data->MiddleInset))) + goto arrow_cap_failed; + if ((status = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap *)arrow_cap, arrow_data->LineStartCap, arrow_data->LineEndCap))) + goto arrow_cap_failed; + if ((status = GdipSetCustomLineCapStrokeJoin((GpCustomLineCap *)arrow_cap, arrow_data->LineJoin))) + goto arrow_cap_failed; + if ((status = GdipSetCustomLineCapWidthScale((GpCustomLineCap *)arrow_cap, arrow_data->WidthScale))) + goto arrow_cap_failed; + + *cap = (GpCustomLineCap *)arrow_cap; + return Ok; + + arrow_cap_failed: + GdipDeleteCustomLineCap((GpCustomLineCap *)arrow_cap); + return status; + } + else + { + GpPath *path, *fill_path = NULL, *stroke_path = NULL; + EmfPlusCustomLineCapData *line_cap_data; + GpCustomLineCap *line_cap = NULL; + GpStatus status; + + line_cap_data = (EmfPlusCustomLineCapData *)(record_data + offset); + + if (data_size < offset + FIELD_OFFSET(EmfPlusCustomLineCapData, OptionalData)) + return InvalidParameter; + offset += FIELD_OFFSET(EmfPlusCustomLineCapData, OptionalData); + + if (line_cap_data->CustomLineCapDataFlags == CustomLineCapDataFillPath) + { + EmfPlusCustomLineCapDataFillPath *fill_path = (EmfPlusCustomLineCapDataFillPath *)(record_data + offset); + + if (data_size < offset + FIELD_OFFSET(EmfPlusCustomLineCapDataFillPath, FillPath)) + return InvalidParameter; + if (data_size < offset + fill_path->FillPathLength) + return InvalidParameter; + + offset += FIELD_OFFSET(EmfPlusCustomLineCapDataFillPath, FillPath); + } + else + { + EmfPlusCustomLineCapDataLinePath *line_path = (EmfPlusCustomLineCapDataLinePath *)(record_data + offset); + + if (data_size < offset + FIELD_OFFSET(EmfPlusCustomLineCapDataLinePath, LinePath)) + return InvalidParameter; + if (data_size < offset + line_path->LinePathLength) + return InvalidParameter; + + offset += FIELD_OFFSET(EmfPlusCustomLineCapDataLinePath, LinePath); + } + + if ((status = metafile_deserialize_path(record_data + offset, data_size - offset, &path))) + return status; + + if (line_cap_data->CustomLineCapDataFlags == CustomLineCapDataFillPath) + fill_path = path; + else + stroke_path = path; + + if ((status = GdipCreateCustomLineCap(fill_path, stroke_path, line_cap_data->BaseCap, + line_cap_data->BaseInset, &line_cap))) + goto default_cap_failed; + if ((status = GdipSetCustomLineCapStrokeCaps(line_cap, line_cap_data->StrokeStartCap, line_cap_data->StrokeEndCap))) + goto default_cap_failed; + if ((status = GdipSetCustomLineCapStrokeJoin(line_cap, line_cap_data->StrokeJoin))) + goto default_cap_failed; + if ((status = GdipSetCustomLineCapWidthScale(line_cap, line_cap_data->WidthScale))) + goto default_cap_failed; + + GdipDeletePath(path); + *cap = line_cap; + return Ok; + + default_cap_failed: + if (line_cap) + GdipDeleteCustomLineCap(line_cap); + GdipDeletePath(path); + return status; + } +} + static GpStatus metafile_get_pen_brush_data_offset(EmfPlusPen *data, UINT data_size, DWORD *ret) { EmfPlusPenData *pendata = (EmfPlusPenData *)data->data; @@ -2446,6 +2562,7 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d { EmfPlusPen *data = (EmfPlusPen *)record_data; EmfPlusPenData *pendata = (EmfPlusPenData *)data->data; + GpCustomLineCap *custom_line_cap; GpBrush *brush; DWORD offset; GpPen *pen; @@ -2542,7 +2659,12 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d if (pendata->PenDataFlags & PenDataCustomStartCap) { EmfPlusCustomStartCapData *startcap = (EmfPlusCustomStartCapData *)((BYTE *)pendata + offset); - FIXME("PenDataCustomStartCap is not supported.\n"); + if ((status = metafile_deserialize_custom_line_cap((BYTE *)startcap, data_size, &custom_line_cap)) != Ok) + goto penfailed; + status = GdipSetPenCustomStartCap(pen, custom_line_cap); + GdipDeleteCustomLineCap(custom_line_cap); + if (status != Ok) + goto penfailed; offset += FIELD_OFFSET(EmfPlusCustomStartCapData, data) + startcap->CustomStartCapSize; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index ceca8e4a9bb..4e4277d4d1f 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3983,7 +3983,6 @@ static void test_pen(void) stat = GdipBitmapGetPixel(bitmap, 10, 10, &color); expect(Ok, stat); - todo_wine expect(0xffff0000, color); stat = GdipBitmapGetPixel(bitmap, 40, 90, &color);

1 0

Zhiyi Zhang : gdiplus: Support playing back pen custom end line cap.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: f9e77ad77c14cce80c5e57fb30c3a121ee369d21 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9e77ad77c14cce80c5e57fb30c3a1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun May 14 15:23:04 2023 +0800 gdiplus: Support playing back pen custom end line cap. Fix Cafe Stella (SteamID: 1829980) Flowchart crashes once there are 2 things on it. --- dlls/gdiplus/metafile.c | 7 ++++++- dlls/gdiplus/tests/metafile.c | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 9d209e81983..4880211ad87 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2671,7 +2671,12 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d if (pendata->PenDataFlags & PenDataCustomEndCap) { EmfPlusCustomEndCapData *endcap = (EmfPlusCustomEndCapData *)((BYTE *)pendata + offset); - FIXME("PenDataCustomEndCap is not supported.\n"); + if ((status = metafile_deserialize_custom_line_cap((BYTE *)endcap, data_size, &custom_line_cap)) != Ok) + goto penfailed; + status = GdipSetPenCustomEndCap(pen, custom_line_cap); + GdipDeleteCustomLineCap(custom_line_cap); + if (status != Ok) + goto penfailed; offset += FIELD_OFFSET(EmfPlusCustomEndCapData, data) + endcap->CustomEndCapSize; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 4e4277d4d1f..f6a9f5e54a8 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3987,7 +3987,6 @@ static void test_pen(void) stat = GdipBitmapGetPixel(bitmap, 40, 90, &color); expect(Ok, stat); - todo_wine expect(0xffff0000, color); stat = GdipDisposeImage((GpImage *)clone_metafile);

1 0