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

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

May 30, 2023

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 loader data.
by Alexandre Julliard May 30, 2023

May 30, 2023

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 : include: Don't align the stack for PE builds.
by Alexandre Julliard May 30, 2023

May 30, 2023

Module: wine Branch: master Commit: 62173699c38453777c7d5638ed2e779790506b75 URL: https://gitlab.winehq.org/wine/wine/-/commit/62173699c38453777c7d5638ed2e77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 12:11:51 2023 +0200 include: Don't align the stack for PE builds. --- include/msvcrt/corecrt.h | 9 +++------ include/windef.h | 23 +++++++++-------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index bec9c8911c2..02f3c2f8a09 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -82,7 +82,7 @@ #define __has_attribute(x) 0 #endif -#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(__MINGW32__) # undef __stdcall # ifdef __i386__ # ifdef __GNUC__ @@ -100,16 +100,13 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__CYGWIN__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ -#endif /* __stdcall */ - -#ifndef _MSC_VER # undef __cdecl # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -120,7 +117,7 @@ # else # define __cdecl __stdcall # endif -#endif +#endif /* _MSC_VER || __MINGW32__ */ #ifndef WINAPIV # if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) diff --git a/include/windef.h b/include/windef.h index cb7eb1179c8..827e9f92a26 100644 --- a/include/windef.h +++ b/include/windef.h @@ -54,7 +54,7 @@ extern "C" { # endif #endif -#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(__MINGW32__) # undef __stdcall # ifdef __i386__ # ifdef __GNUC__ @@ -72,16 +72,13 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__CYGWIN__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ -#endif /* __stdcall */ - -#ifndef _MSC_VER # undef __cdecl # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -92,15 +89,13 @@ extern "C" { # else # define __cdecl __stdcall # endif -#endif - -#if !defined(_MSC_VER) && !defined(__fastcall) -# define __fastcall __stdcall -#endif - -#if (!defined(_MSC_VER) || !defined(__clang__)) && !defined(__thiscall) -# define __thiscall __stdcall -#endif +# ifndef __fastcall +# define __fastcall __stdcall +# endif +# ifndef __thiscall +# define __thiscall __stdcall +# endif +#endif /* _MSC_VER || __MINGW32__ */ #ifndef __ms_va_list # if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)

1 0

Alexandre Julliard : ntdll: Use x18 for the TEB on ARM64.
by Alexandre Julliard May 30, 2023

May 30, 2023

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

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

May 29, 2023

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

Jinoh Kang : ntdll: Move ACTCTX lpResourceName validation to RtlCreateActivationContext.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: d992e2d0aa8b59b6213c0b29ac45147a7ae10d2b URL: https://gitlab.winehq.org/wine/wine/-/commit/d992e2d0aa8b59b6213c0b29ac4514… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon May 29 21:18:42 2023 +0900 ntdll: Move ACTCTX lpResourceName validation to RtlCreateActivationContext. This prevents passing NULL resource name to get_manifest_in_module(). --- dlls/kernel32/tests/actctx.c | 2 -- dlls/ntdll/actctx.c | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 98cb346fded..040003c2430 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3804,7 +3804,6 @@ static void test_manifest_resource_name_omitted(void) handle = CreateActCtxW(&ctx); err = GetLastError(); ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxW shall fail\n"); - todo_wine ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); len = GetModuleFileNameW(NULL, pathbuf, ARRAY_SIZE(pathbuf)); @@ -3828,7 +3827,6 @@ static void test_manifest_resource_name_omitted(void) handle = CreateActCtxW(&ctx); err = GetLastError(); ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxW shall fail\n"); - todo_wine ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 54167a2db67..a2e159c76ae 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2951,8 +2951,6 @@ static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assemb hModule, debugstr_w(filename) ); } - if (!resname) return STATUS_INVALID_PARAMETER; - info.Type = RT_MANIFEST; info.Language = lang; if (!((ULONG_PTR)resname >> 16)) @@ -5232,6 +5230,9 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL)) return STATUS_INVALID_PARAMETER; + if ((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && !pActCtx->lpResourceName) + return STATUS_INVALID_PARAMETER; + if (!(actctx = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*actctx) ))) return STATUS_NO_MEMORY;

1 0

Jinoh Kang : kernel32/tests: Test loading assembly manifest resource inside dependencies.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 2f78a8f2bb580da92fc9d1c7a3c1e2abf233d93d URL: https://gitlab.winehq.org/wine/wine/-/commit/2f78a8f2bb580da92fc9d1c7a3c1e2… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon May 29 21:18:42 2023 +0900 kernel32/tests: Test loading assembly manifest resource inside dependencies. --- dlls/kernel32/tests/actctx.c | 422 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 422 insertions(+)

1 0

Jacek Caban : win32u: Don't return full OUTLINETEXTMETRICW from __wine_get_file_outline_text_metric.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: da4663d6402bd9f0b23ecd31700a654b034074b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/da4663d6402bd9f0b23ecd31700a65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 27 18:27:42 2023 +0200 win32u: Don't return full OUTLINETEXTMETRICW from __wine_get_file_outline_text_metric. --- dlls/gdi32/text.c | 46 ++++++++++++++++++++++---------------------- dlls/win32u/font.c | 7 +++++-- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++- dlls/win32u/wrappers.c | 5 +++-- include/ntgdi.h | 4 ++-- 6 files changed, 36 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 3dd50491e08..2ebfea586e4 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2669,10 +2669,11 @@ static BOOL create_fot( const WCHAR *resource, const WCHAR *font_file, const str BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, const WCHAR *resource_file, const WCHAR *font_file, const WCHAR *font_path ) { + WCHAR path[MAX_PATH], face_name[128]; struct fontdir fontdir = { 0 }; UNICODE_STRING nt_name; - OUTLINETEXTMETRICW otm; - WCHAR path[MAX_PATH]; + TEXTMETRICW otm; + UINT em_square; BOOL ret; TRACE("(%ld, %s, %s, %s)\n", hidden, debugstr_w(resource_file), @@ -2689,10 +2690,10 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, const WCHAR *resource_fil if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) goto done; } else if (!RtlDosPathNameToNtPathName_U( font_file, &nt_name, NULL, NULL )) goto done; - ret = __wine_get_file_outline_text_metric( nt_name.Buffer, &otm ); + ret = __wine_get_file_outline_text_metric( nt_name.Buffer, &otm, &em_square, face_name ); RtlFreeUnicodeString( &nt_name ); if (!ret) goto done; - if (!(otm.otmTextMetrics.tmPitchAndFamily & TMPF_TRUETYPE)) goto done; + if (!(otm.tmPitchAndFamily & TMPF_TRUETYPE)) goto done; fontdir.num_of_resources = 1; fontdir.res_id = 0; @@ -2700,32 +2701,31 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, const WCHAR *resource_fil fontdir.dfSize = sizeof(fontdir); strcpy( fontdir.dfCopyright, "Wine fontdir" ); fontdir.dfType = 0x4003; /* 0x0080 set if private */ - fontdir.dfPoints = otm.otmEMSquare; + fontdir.dfPoints = em_square; fontdir.dfVertRes = 72; fontdir.dfHorizRes = 72; - fontdir.dfAscent = otm.otmTextMetrics.tmAscent; - fontdir.dfInternalLeading = otm.otmTextMetrics.tmInternalLeading; - fontdir.dfExternalLeading = otm.otmTextMetrics.tmExternalLeading; - fontdir.dfItalic = otm.otmTextMetrics.tmItalic; - fontdir.dfUnderline = otm.otmTextMetrics.tmUnderlined; - fontdir.dfStrikeOut = otm.otmTextMetrics.tmStruckOut; - fontdir.dfWeight = otm.otmTextMetrics.tmWeight; - fontdir.dfCharSet = otm.otmTextMetrics.tmCharSet; + fontdir.dfAscent = otm.tmAscent; + fontdir.dfInternalLeading = otm.tmInternalLeading; + fontdir.dfExternalLeading = otm.tmExternalLeading; + fontdir.dfItalic = otm.tmItalic; + fontdir.dfUnderline = otm.tmUnderlined; + fontdir.dfStrikeOut = otm.tmStruckOut; + fontdir.dfWeight = otm.tmWeight; + fontdir.dfCharSet = otm.tmCharSet; fontdir.dfPixWidth = 0; - fontdir.dfPixHeight = otm.otmTextMetrics.tmHeight; - fontdir.dfPitchAndFamily = otm.otmTextMetrics.tmPitchAndFamily; - fontdir.dfAvgWidth = otm.otmTextMetrics.tmAveCharWidth; - fontdir.dfMaxWidth = otm.otmTextMetrics.tmMaxCharWidth; - fontdir.dfFirstChar = otm.otmTextMetrics.tmFirstChar; - fontdir.dfLastChar = otm.otmTextMetrics.tmLastChar; - fontdir.dfDefaultChar = otm.otmTextMetrics.tmDefaultChar; - fontdir.dfBreakChar = otm.otmTextMetrics.tmBreakChar; + fontdir.dfPixHeight = otm.tmHeight; + fontdir.dfPitchAndFamily = otm.tmPitchAndFamily; + fontdir.dfAvgWidth = otm.tmAveCharWidth; + fontdir.dfMaxWidth = otm.tmMaxCharWidth; + fontdir.dfFirstChar = otm.tmFirstChar; + fontdir.dfLastChar = otm.tmLastChar; + fontdir.dfDefaultChar = otm.tmDefaultChar; + fontdir.dfBreakChar = otm.tmBreakChar; fontdir.dfWidthBytes = 0; fontdir.dfDevice = 0; fontdir.dfFace = FIELD_OFFSET( struct fontdir, szFaceName ); fontdir.dfReserved = 0; - WideCharToMultiByte( CP_ACP, 0, (WCHAR *)otm.otmpFamilyName, -1, - fontdir.szFaceName, LF_FACESIZE, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, face_name, -1, fontdir.szFaceName, LF_FACESIZE, NULL, NULL ); if (hidden) fontdir.dfType |= 0x80; return create_fot( resource_file, font_file, &fontdir ); diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index cdac88836b9..c8187e9d07b 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -6341,7 +6341,8 @@ DWORD WINAPI NtGdiGetGlyphOutline( HDC hdc, UINT ch, UINT format, GLYPHMETRICS * /********************************************************************** * __wine_get_file_outline_text_metric (win32u.@) */ -BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTMETRICW *otm ) +BOOL WINAPI __wine_get_file_outline_text_metric( const WCHAR *path, TEXTMETRICW *otm, + UINT *em_square, WCHAR *face_name ) { struct gdi_font *font = NULL; @@ -6351,7 +6352,9 @@ BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTME font->lf.lfHeight = 100; if (!font_funcs->load_font( font )) goto done; if (!font_funcs->set_outline_text_metrics( font )) goto done; - *otm = font->otm; + *otm = font->otm.otmTextMetrics; + *em_square = font->otm.otmEMSquare; + wcscpy( face_name, (const WCHAR *)font->otm.otmpFamilyName ); free_gdi_font( font ); return TRUE; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c90505e7d17..178329d6858 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1325,4 +1325,4 @@ # gdi32 @ cdecl __wine_get_icm_profile(long long ptr ptr) -@ cdecl __wine_get_file_outline_text_metric(wstr ptr) +@ stdcall __wine_get_file_outline_text_metric(wstr ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3b181fe3121..e7e77bf2427 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -35,7 +35,8 @@ struct unix_funcs { /* Wine-specific functions */ - BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); + BOOL (WINAPI *get_file_outline_text_metric)( const WCHAR *path, TEXTMETRICW *otm, + UINT *em_square, WCHAR *face_name ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); }; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 9e013c64b59..23dccd55bf1 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -30,10 +30,11 @@ BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCH return unix_funcs->get_icm_profile( hdc, allow_default, size, filename ); } -BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTMETRICW *otm ) +BOOL WINAPI __wine_get_file_outline_text_metric( const WCHAR *path, TEXTMETRICW *otm, + UINT *em_square, WCHAR *face_name ) { if (!unix_funcs) return FALSE; - return unix_funcs->get_file_outline_text_metric( path, otm ); + return unix_funcs->get_file_outline_text_metric( path, otm, em_square, face_name ); } BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ) diff --git a/include/ntgdi.h b/include/ntgdi.h index e1c5008e4e9..1ac8e0110e2 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -485,7 +485,7 @@ NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER /* Wine extensions */ extern BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); -extern BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, - OUTLINETEXTMETRICW *otm ); +BOOL WINAPI __wine_get_file_outline_text_metric( const WCHAR *path, TEXTMETRICW *otm, + UINT *em_square, WCHAR *face_name ); #endif /* _NTGDI_ */

1 0

Jacek Caban : win32u: Extend NtGdiSetDIBitsToDeviceInternal for SetDIBits implementation.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 3dbe180ea554ee6156c206936ced87f3a6b7b2da URL: https://gitlab.winehq.org/wine/wine/-/commit/3dbe180ea554ee6156c206936ced87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 27 18:42:09 2023 +0200 win32u: Extend NtGdiSetDIBitsToDeviceInternal for SetDIBits implementation. --- dlls/gdi32/dc.c | 15 +++++++++++++++ dlls/win32u/dib.c | 29 +++++++---------------------- dlls/win32u/gdiobj.c | 1 - dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 3 --- dlls/win32u/wrappers.c | 8 -------- dlls/winex11.drv/bitblt.c | 4 +++- 7 files changed, 25 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 9a33e343f94..368a38db788 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1970,6 +1970,21 @@ BOOL WINAPI GdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int *(DWORD *)&blend_function, 0 /* FIXME */ ); } +/****************************************************************************** + * SetDIBits (GDI32.@) + * + * Sets pixels in a bitmap using colors from DIB. + */ +INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, + UINT lines, const void *bits, const BITMAPINFO *info, + UINT coloruse ) +{ + /* Wine-specific: pass hbitmap to NtGdiSetDIBitsToDeviceInternal */ + return NtGdiSetDIBitsToDeviceInternal( hdc, 0, 0, 0, 0, 0, 0, + startscan, lines, bits, info, coloruse, + 0, 0, FALSE, hbitmap ); +} + /*********************************************************************** * SetDIBitsToDevice (GDI32.@) */ diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index 64f96b268c9..7b6b364fb71 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -655,27 +655,10 @@ INT WINAPI NtGdiStretchDIBitsInternal( HDC hdc, INT xDst, INT yDst, INT widthDst } -/****************************************************************************** - * SetDIBits [GDI32.@] - * - * Sets pixels in a bitmap using colors from DIB. - * - * PARAMS - * hdc [I] Handle to device context - * hbitmap [I] Handle to bitmap - * startscan [I] Starting scan line - * lines [I] Number of scan lines - * bits [I] Array of bitmap bits - * info [I] Address of structure with data - * coloruse [I] Type of color indexes to use - * - * RETURNS - * Success: Number of scan lines copied - * Failure: 0 - */ -INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, - UINT coloruse ) +/* Sets pixels in a bitmap using colors from DIB, see SetDIBits */ +static int set_di_bits( HDC hdc, HBITMAP hbitmap, UINT startscan, + UINT lines, LPCVOID bits, const BITMAPINFO *info, + UINT coloruse ) { BITMAPOBJ *bitmap; char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -913,6 +896,8 @@ INT WINAPI NtGdiSetDIBitsToDeviceInternal( HDC hdc, INT xDest, INT yDest, DWORD INT ret = 0; DC *dc; + if (xform) return set_di_bits( hdc, xform, startscan, lines, bits, bmi, coloruse ); + if (!bits) return 0; if (!bitmapinfo_from_user_bitmapinfo( info, bmi, coloruse, TRUE )) { @@ -1468,7 +1453,7 @@ HBITMAP WINAPI NtGdiCreateDIBitmapInternal( HDC hdc, INT width, INT height, DWOR { if (init & CBM_INIT) { - if (SetDIBits( hdc, handle, 0, height, bits, data, coloruse ) == 0) + if (set_di_bits( hdc, handle, 0, height, bits, data, coloruse ) == 0) { NtGdiDeleteObjectApp( handle ); handle = 0; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index be8d3099a49..22cd7dd03ba 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1030,7 +1030,6 @@ BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca ) static struct unix_funcs unix_funcs = { - SetDIBits, __wine_get_file_outline_text_metric, __wine_get_icm_profile, __wine_send_input, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 219442c30eb..c90505e7d17 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1324,6 +1324,5 @@ @ cdecl __wine_send_input(long ptr ptr) # gdi32 -@ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_icm_profile(long long ptr ptr) @ cdecl __wine_get_file_outline_text_metric(wstr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7b09ff9aa37..3b181fe3121 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -35,9 +35,6 @@ struct unix_funcs { /* Wine-specific functions */ - INT (WINAPI *pSetDIBits)( HDC hdc, HBITMAP hbitmap, UINT startscan, - UINT lines, const void *bits, const BITMAPINFO *info, - UINT coloruse ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 0327416e018..9e013c64b59 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -24,14 +24,6 @@ static const struct unix_funcs *unix_funcs; -INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, - UINT lines, const void *bits, const BITMAPINFO *info, - UINT coloruse ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pSetDIBits( hdc, hbitmap, startscan, lines, bits, info, coloruse ); -} - BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ) { if (!unix_funcs) return FALSE; diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 10388a1cc8f..19fc0b0887c 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1497,7 +1497,9 @@ Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const BITMAPIN { if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) memcpy( src_info->bmiColors, default_colortable, sizeof(default_colortable) ); - SetDIBits( hdc, dib, 0, abs(info->bmiHeader.biHeight), bits->ptr, src_info, coloruse ); + NtGdiSetDIBitsToDeviceInternal( hdc, 0, 0, 0, 0, 0, 0, 0, + abs(info->bmiHeader.biHeight), bits->ptr, src_info, coloruse, + 0, 0, FALSE, dib ); /* SetDIBits */ dst_bits.free = NULL; dst_bits.is_copy = TRUE; err = put_pixmap_image( pixmap, vis, dst_info, &dst_bits );

1 0

Jinoh Kang : kernel32/tests: Test setting lpResourceName to NULL for CreateActCtxW.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: b9507d0e5fd6d9f711105e6bb194d425d9666766 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9507d0e5fd6d9f711105e6bb194d4… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon May 29 21:18:42 2023 +0900 kernel32/tests: Test setting lpResourceName to NULL for CreateActCtxW. --- dlls/kernel32/tests/actctx.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index d64bba5e87d..98cb346fded 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3779,6 +3779,59 @@ static void test_manifest_in_module(void) ReleaseActCtx(handle); } +static void test_manifest_resource_name_omitted(void) +{ + WCHAR pathbuf[MAX_PATH]; + HANDLE handle; + ACTCTXW ctx; + DWORD err, len; + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID; + ctx.hModule = GetModuleHandleW(NULL); + handle = CreateActCtxW(&ctx); + err = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxW shall fail\n"); + todo_wine + ok(err == ERROR_RESOURCE_TYPE_NOT_FOUND, "got %lu\n", err); + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + ctx.hModule = GetModuleHandleW(NULL); + ctx.lpResourceName = NULL; + handle = CreateActCtxW(&ctx); + err = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxW shall fail\n"); + todo_wine + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); + + len = GetModuleFileNameW(NULL, pathbuf, ARRAY_SIZE(pathbuf)); + ok(len > 0 && len < ARRAY_SIZE(pathbuf), "GetModuleFileNameW returned error %lu\n", GetLastError()); + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = pathbuf; + ctx.dwFlags = 0; + handle = CreateActCtxW(&ctx); + err = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxW shall fail\n"); + todo_wine + ok(err == ERROR_RESOURCE_TYPE_NOT_FOUND, "got %lu\n", err); + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = pathbuf; + ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + ctx.lpResourceName = NULL; + handle = CreateActCtxW(&ctx); + err = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxW shall fail\n"); + todo_wine + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); +} + START_TEST(actctx) { int argc; @@ -3806,6 +3859,7 @@ START_TEST(actctx) } test_manifest_in_module(); + test_manifest_resource_name_omitted(); test_actctx(); test_create_fail(); test_CreateActCtx();

1 0