August 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Make release_builtin_module() static.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 18408b18f3ebd9630a02f0bd16864f5e5118b71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=18408b18f3ebd9630a02f0bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 16:26:31 2021 +0200 ntdll: Make release_builtin_module() static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 61c290c156d..7d89d99d120 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -229,7 +229,6 @@ extern void virtual_set_force_exec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; -extern NTSTATUS release_builtin_module( void *module ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; extern NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f055be94238..63b322a0c68 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -615,7 +615,7 @@ static void add_builtin_module( void *module, void *handle ) /*********************************************************************** * release_builtin_module */ -NTSTATUS release_builtin_module( void *module ) +static void release_builtin_module( void *module ) { struct builtin_module *builtin; @@ -630,9 +630,8 @@ NTSTATUS release_builtin_module( void *module ) free( builtin->unix_name ); free( builtin ); } - return STATUS_SUCCESS; + break; } - return STATUS_INVALID_PARAMETER; }

1 0

Alexandre Julliard : ntdll: Don't try to load .so dlls for a different machine.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: ccd9008d8d0a33769d8b328d5bc6775f940ef0bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccd9008d8d0a33769d8b328d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 16:42:09 2021 +0200 ntdll: Don't try to load .so dlls for a different machine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 55fc73d2d06..5f1cbda51a9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1286,12 +1286,14 @@ static NTSTATUS open_builtin_pe_file( const char *name, OBJECT_ATTRIBUTES *attr, * open_builtin_so_file */ static NTSTATUS open_builtin_so_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) + SECTION_IMAGE_INFORMATION *image_info, + WORD machine, BOOL prefer_native ) { NTSTATUS status; int fd; *module = NULL; + if (machine != current_machine) return STATUS_DLL_NOT_FOUND; if ((fd = open( name, O_RDONLY )) == -1) return STATUS_DLL_NOT_FOUND; if (check_library_arch( fd )) @@ -1362,7 +1364,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; /* now as a program */ @@ -1376,7 +1378,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1393,11 +1395,10 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); - if (status != STATUS_DLL_NOT_FOUND) goto done; status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) { @@ -1406,7 +1407,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T } if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1777,7 +1778,7 @@ static void load_ntdll(void) if (status == STATUS_DLL_NOT_FOUND) { sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); - status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); + status = open_builtin_so_file( name, &attr, &module, &info, current_machine, FALSE ); } if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); else if (status) fatal_error( "failed to load %s error %x\n", name, status );

1 0

Alexandre Julliard : ntdll: Load the Unix dll at the same time as the PE one, but don't map it yet.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: c29f6504747c3a80135085a7ae9ac470d2950c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29f6504747c3a80135085a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 16:55:21 2021 +0200 ntdll: Load the Unix dll at the same time as the PE one, but don't map it yet. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 17 +++++++++-------- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 33 ++++++++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5f1cbda51a9..f5135a19f40 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1121,21 +1121,17 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr if (!entry) { - if (!name) return STATUS_DLL_NOT_FOUND; - if (!(handle = dlopen( name, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; + if (!name || !handle) return STATUS_DLL_NOT_FOUND; if (!(nt = dlsym( handle, "__wine_spec_nt_header" )) || !(entry = dlsym( handle, "__wine_init_unix_lib" ))) - { - dlclose( handle ); - set_builtin_unix_info( module, NULL, NULL, NULL ); return STATUS_INVALID_IMAGE_FORMAT; - } + TRACE( "loaded %s for %p\n", debugstr_a(name), module ); unix_module = (void *)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); map_so_dll( nt, unix_module ); fixup_ntdll_imports( name, unix_module ); - set_builtin_unix_info( module, NULL, handle, entry ); + set_builtin_unix_entry( module, entry ); } init_func = entry; return init_func( module, reason, ptr_in, ptr_out ); @@ -1417,8 +1413,13 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T done: if (status >= 0 && ext) { + void *handle; + strcpy( ext, ".so" ); - set_builtin_unix_info( *module, ptr, NULL, NULL ); + if ((handle = dlopen( ptr, RTLD_NOW ))) + { + if (set_builtin_unix_handle( *module, ptr, handle )) dlclose( handle ); + } } free( file ); return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7d89d99d120..0fce580b120 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -231,7 +231,8 @@ extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; -extern NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) DECLSPEC_HIDDEN; +extern NTSTATUS set_builtin_unix_handle( void *module, const char *name, void *handle ) DECLSPEC_HIDDEN; +extern NTSTATUS set_builtin_unix_entry( void *module, void *entry ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_len ) DECLSPEC_HIDDEN; extern void *get_native_context( CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 63b322a0c68..ee1f331d778 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -682,9 +682,9 @@ NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, /*********************************************************************** - * set_builtin_unix_info + * set_builtin_unix_handle */ -NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) +NTSTATUS set_builtin_unix_handle( void *module, const char *name, void *handle ) { sigset_t sigset; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -696,10 +696,8 @@ NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, vo if (builtin->module != module) continue; if (!builtin->unix_handle) { - free( builtin->unix_name ); - builtin->unix_name = name ? strdup( name ) : NULL; + builtin->unix_name = strdup( name ); builtin->unix_handle = handle; - builtin->unix_entry = entry; status = STATUS_SUCCESS; } else status = STATUS_IMAGE_ALREADY_LOADED; @@ -710,6 +708,31 @@ NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, vo } +/*********************************************************************** + * set_builtin_unix_entry + */ +NTSTATUS set_builtin_unix_entry( void *module, void *entry ) +{ + sigset_t sigset; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + struct builtin_module *builtin; + + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) + { + if (builtin->module != module) continue; + if (builtin->unix_handle) + { + builtin->unix_entry = entry; + status = STATUS_SUCCESS; + } + break; + } + server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + return status; +} + + /*********************************************************************** * free_ranges_lower_bound *

1 0

Alexandre Julliard : ntdll: Add a Wine-specific NtQueryVirtualMemory() query to retrieve the Unix call table.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: d91d05b80a4f7ccd7447c4514e5f8298bfcb177b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91d05b80a4f7ccd7447c451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 17:56:14 2021 +0200 ntdll: Add a Wine-specific NtQueryVirtualMemory() query to retrieve the Unix call table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 41 ++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 4 +++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index ee1f331d778..3532f5c8746 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -657,6 +657,29 @@ void *get_builtin_so_handle( void *module ) } +/*********************************************************************** + * get_builtin_unix_funcs + */ +NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) +{ + const char *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; + sigset_t sigset; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + struct builtin_module *builtin; + + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) + { + if (builtin->module != module) continue; + *funcs = dlsym( builtin->unix_handle, ptr_name ); + status = STATUS_SUCCESS; + break; + } + server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + return status; +} + + /*********************************************************************** * get_builtin_unix_info */ @@ -4289,6 +4312,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, MEMORY_INFORMATION_CLASS info_class, PVOID buffer, SIZE_T len, SIZE_T *res_len ) { + NTSTATUS status; + TRACE("(%p, %p, info_class=%d, %p, %ld, %p)\n", process, addr, info_class, buffer, len, res_len); @@ -4311,13 +4336,27 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, if (handle) { - NTSTATUS status = get_builtin_init_funcs( handle, buffer, len, res_len ); + status = get_builtin_init_funcs( handle, buffer, len, res_len ); release_builtin_module( module ); return status; } } return STATUS_INVALID_HANDLE; + case MemoryWineUnixFuncs: + case MemoryWineUnixWow64Funcs: + if (len != sizeof(UINT64)) return STATUS_INFO_LENGTH_MISMATCH; + if (process == GetCurrentProcess()) + { + void *module = (void *)addr; + void *funcs = NULL; + + status = get_builtin_unix_funcs( module, info_class == MemoryWineUnixWow64Funcs, &funcs ); + if (!status) *(UINT64 *)buffer = (UINT_PTR)funcs; + return status; + } + return STATUS_INVALID_HANDLE; + default: FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", process, addr, info_class, buffer, len, res_len); diff --git a/include/winternl.h b/include/winternl.h index 075b1863f72..41bc56d186d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1919,7 +1919,9 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryBasicInformationCapped, MemoryPhysicalContiguityInformation, #ifdef __WINESRC__ - MemoryWineImageInitFuncs = 1000 + MemoryWineImageInitFuncs = 1000, + MemoryWineUnixFuncs, + MemoryWineUnixWow64Funcs, #endif } MEMORY_INFORMATION_CLASS;

1 0

Alexandre Julliard : ntdll: Add a custom type for the Unix functions table handle.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 572817948a9dbd47e781f987538fe506ee362968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=572817948a9dbd47e781f987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 18:07:08 2021 +0200 ntdll: Add a custom type for the Unix functions table handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/virtual.c | 4 ++-- include/winternl.h | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f5135a19f40..f1a2b9f5a79 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1141,7 +1141,7 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr /*********************************************************************** * __wine_unix_call */ -NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ) +NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) { return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args ); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3532f5c8746..372447eb8af 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4345,14 +4345,14 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryWineUnixFuncs: case MemoryWineUnixWow64Funcs: - if (len != sizeof(UINT64)) return STATUS_INFO_LENGTH_MISMATCH; + if (len != sizeof(unixlib_handle_t)) return STATUS_INFO_LENGTH_MISMATCH; if (process == GetCurrentProcess()) { void *module = (void *)addr; void *funcs = NULL; status = get_builtin_unix_funcs( module, info_class == MemoryWineUnixWow64Funcs, &funcs ); - if (!status) *(UINT64 *)buffer = (UINT_PTR)funcs; + if (!status) *(unixlib_handle_t *)buffer = (UINT_PTR)funcs; return status; } return STATUS_INVALID_HANDLE; diff --git a/include/winternl.h b/include/winternl.h index 41bc56d186d..562a35a83a1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4612,11 +4612,12 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) #ifdef __WINESRC__ +typedef NTSTATUS (*unixlib_entry_t)( void *args ); +typedef UINT64 unixlib_handle_t; + /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); -extern NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ); - -typedef NTSTATUS (*unixlib_entry_t)( void *args ); +extern NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

Alexandre Julliard : wow64: Add thunks for the Unix library syscalls.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 8347c686e9fd3a6a72f4e5c59b0712956648b6e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8347c686e9fd3a6a72f4e5c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 18:09:33 2021 +0200 wow64: Add thunks for the Unix library syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6ae3cc13861..bdd9a6b6ea7 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -262,6 +262,19 @@ NTSTATUS WINAPI wow64___wine_dbg_write( UINT *args ) } +/********************************************************************** + * wow64___wine_unix_call + */ +NTSTATUS WINAPI wow64___wine_unix_call( UINT *args ) +{ + unixlib_handle_t handle = get_ulong64( &args ); + unsigned int code = get_ulong( &args ); + void *args_ptr = get_ptr( &args ); + + return __wine_unix_call( handle, code, args_ptr ); +} + + /********************************************************************** * wow64_wine_server_call */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 6ae43e0e8ef..2df0323b36f 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -245,6 +245,7 @@ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( __wine_dbg_write ) \ + SYSCALL_ENTRY( __wine_unix_call ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_server_fd_to_handle ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 9659557b64a..b4aabb13c7d 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -364,8 +364,13 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) } case MemoryWineImageInitFuncs: + case MemoryWineUnixWow64Funcs: return STATUS_INVALID_INFO_CLASS; + case MemoryWineUnixFuncs: + status = NtQueryVirtualMemory( handle, addr, MemoryWineUnixWow64Funcs, ptr, len, &res_len ); + break; + default: FIXME( "unsupported class %u\n", class ); return STATUS_INVALID_INFO_CLASS;

1 0

Alexandre Julliard : winepulse.drv: Convert the Unix call initialization to NtQueryVirtualMemory().
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 4303e753137d0b44cff4f9261d10ef86d57016f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4303e753137d0b44cff4f926… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 18:02:39 2021 +0200 winepulse.drv: Convert the Unix call initialization to NtQueryVirtualMemory(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 9 ++++--- dlls/winepulse.drv/pulse.c | 59 +++++++++++++++++++++---------------------- dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 67a42de97f9..ab4cccd7242 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); -static UINT64 pulse_handle; +static unixlib_handle_t pulse_handle; #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -82,10 +82,13 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(dll); - if (__wine_init_unix_lib(dll, reason, NULL, &pulse_handle)) + if (NtQueryVirtualMemory( GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &pulse_handle, sizeof(pulse_handle), NULL )) + return FALSE; + if (__wine_unix_call(pulse_handle, process_attach, NULL)) return FALSE; } else if (reason == DLL_PROCESS_DETACH) { - __wine_init_unix_lib(dll, reason, NULL, NULL); + __wine_unix_call(pulse_handle, process_detach, NULL); if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); CloseHandle(pulse_thread); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 55579ecda80..2e6ad4848eb 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -178,6 +178,32 @@ static int pulse_poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, return r; } +static NTSTATUS pulse_process_attach(void *args) +{ + pthread_mutexattr_t attr; + + pthread_mutexattr_init(&attr); + pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); + + if (pthread_mutex_init(&pulse_mutex, &attr) != 0) + pthread_mutex_init(&pulse_mutex, NULL); + + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_process_detach(void *args) +{ + if (pulse_ctx) + { + pa_context_disconnect(pulse_ctx); + pa_context_unref(pulse_ctx); + } + if (pulse_ml) + pa_mainloop_quit(pulse_ml, 0); + + return STATUS_SUCCESS; +} + static NTSTATUS pulse_main_loop(void *args) { struct main_loop_params *params = args; @@ -1929,8 +1955,10 @@ static NTSTATUS pulse_is_started(void *args) return STATUS_SUCCESS; } -static const unixlib_entry_t unix_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { + pulse_process_attach, + pulse_process_detach, pulse_main_loop, pulse_create_stream, pulse_release_stream, @@ -1953,32 +1981,3 @@ static const unixlib_entry_t unix_funcs[] = pulse_test_connect, pulse_is_started, }; - -NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) -{ - pthread_mutexattr_t attr; - - switch (reason) - { - case DLL_PROCESS_ATTACH: - pthread_mutexattr_init(&attr); - pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); - - if (pthread_mutex_init(&pulse_mutex, &attr) != 0) - pthread_mutex_init(&pulse_mutex, NULL); - - *(UINT64 *)ptr_out = (UINT_PTR)&unix_funcs; - break; - case DLL_PROCESS_DETACH: - if (pulse_ctx) - { - pa_context_disconnect(pulse_ctx); - pa_context_unref(pulse_ctx); - } - if (pulse_ml) - pa_mainloop_quit(pulse_ml, 0); - - } - - return STATUS_SUCCESS; -} diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 9e7af57b716..98639e7705f 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -187,6 +187,8 @@ struct is_started_params enum unix_funcs { + process_attach, + process_detach, main_loop, create_stream, release_stream,

1 0

Jacek Caban : gdi32: Store virtual resolution and size in DC_ATTR.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: ec4297f1e7eefe74d3e3ec90d243eaebdc285882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4297f1e7eefe74d3e3ec90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 10 07:37:39 2021 +0100 gdi32: Store virtual resolution and size in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 6 ++---- dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 2 -- include/ntgdi.h | 2 ++ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3cd3f72d4da..93decc58926 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -428,8 +428,8 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->wnd_ext = dcs->attr->wnd_ext; dc->attr->vport_org = dcs->attr->vport_org; dc->attr->vport_ext = dcs->attr->vport_ext; - dc->virtual_res = dcs->virtual_res; - dc->virtual_size = dcs->virtual_size; + dc->attr->virtual_res = dcs->attr->virtual_res; + dc->attr->virtual_size = dcs->attr->virtual_size; if (dcs->hClipRgn) { @@ -550,8 +550,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->xformWorld2Vport = dc->xformWorld2Vport; newdc->xformVport2World = dc->xformVport2World; newdc->vport2WorldValid = dc->vport2WorldValid; - newdc->virtual_res = dc->virtual_res; - newdc->virtual_size = dc->virtual_size; /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 0c440908beb..d5d82c8aef9 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); static SIZE get_dc_virtual_size( DC *dc ) { - SIZE ret = dc->virtual_size; + SIZE ret = dc->attr->virtual_size; if (!ret.cx) { @@ -43,7 +43,7 @@ static SIZE get_dc_virtual_size( DC *dc ) static SIZE get_dc_virtual_res( DC *dc ) { - SIZE ret = dc->virtual_res; + SIZE ret = dc->attr->virtual_res; if (!ret.cx) { @@ -630,10 +630,10 @@ BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res, dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - dc->virtual_res.cx = horz_res; - dc->virtual_res.cy = vert_res; - dc->virtual_size.cx = horz_size; - dc->virtual_size.cy = vert_size; + dc->attr->virtual_res.cx = horz_res; + dc->attr->virtual_res.cy = vert_res; + dc->attr->virtual_size.cx = horz_size; + dc->attr->virtual_size.cy = vert_size; release_dc_ptr( dc ); return TRUE; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index de7ed17369f..62e6e5101ee 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -80,8 +80,6 @@ typedef struct tagDC BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ - SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ - SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ diff --git a/include/ntgdi.h b/include/ntgdi.h index a1e9c123799..d2b5576d316 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -136,6 +136,8 @@ typedef struct DC_ATTR SIZE wnd_ext; /* window extent */ POINT vport_org; /* viewport origin */ SIZE vport_ext; /* viewport extent */ + SIZE virtual_res; + SIZE virtual_size; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Handle metafiles directly in SetViewportExtEx.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 93b57dba6dedcc1b42b6c8edbbb8e6e4d3f0a46c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93b57dba6dedcc1b42b6c8ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 10 07:37:40 2021 +0100 gdi32: Handle metafiles directly in SetViewportExtEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++++ dlls/gdi32/mapping.c | 30 ++++++++---------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 1 + 10 files changed, 36 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 6b843b5a641..13d4a491faa 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -220,23 +220,15 @@ BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) +BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT cx, INT cy ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetViewportExtEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETVIEWPORTEXTEX emr; - BOOL ret; emr.emr.iType = EMR_SETVIEWPORTEXTEX; emr.emr.nSize = sizeof(emr); emr.szlExtent.cx = cx; emr.szlExtent.cy = cy; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetViewportExtEx( next, cx, cy, size ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 5b764c523b5..b77c538aa75 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -110,7 +110,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 0b2a81b4184..6918dd76c9b 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -129,7 +129,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetTextColor, /* pSetTextColor */ - EMFDRV_SetViewportExtEx, /* pSetViewportExtEx */ + NULL, /* pSetViewportExtEx */ EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ EMFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0d23b254128..f74b45a6f98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -98,6 +98,7 @@ extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -164,5 +165,6 @@ extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index fa947d56b79..52258a4f71f 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -476,6 +476,25 @@ BOOL WINAPI GetViewportExtEx( HDC hdc, SIZE *size ) return TRUE; } +/*********************************************************************** + * SetViewportExtEx (GDI32.@) + */ +BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetViewportExtEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetViewportExtEx( dc_attr, x, y )) return FALSE; + + if (size) *size = dc_attr->vport_ext; + if (dc_attr->map_mode != MM_ISOTROPIC && dc_attr->map_mode != MM_ANISOTROPIC) return TRUE; + if (!x || !y) return FALSE; + dc_attr->vport_ext.cx = x; + dc_attr->vport_ext.cy = y; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetViewportOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index d5d82c8aef9..29eed8da843 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -172,17 +172,6 @@ BOOL set_map_mode( DC *dc, int mode ) BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) { - DC *dc = get_nulldrv_dc( dev ); - - if (size) - *size = dc->attr->vport_ext; - - if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; - if (!cx || !cy) return FALSE; - dc->attr->vport_ext.cx = cx; - dc->attr->vport_ext.cy = cy; - if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); - DC_UpdateXforms( dc ); return TRUE; } @@ -370,20 +359,17 @@ void lp_to_dp( DC *dc, POINT *points, INT count ) /*********************************************************************** - * SetViewportExtEx (GDI32.@) + * NtGdiComputeXformCoefficients (win32u.@) */ -BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) +BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) { - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetViewportExtEx ); - ret = physdev->funcs->pSetViewportExtEx( physdev, x, y, size ); - release_dc_ptr( dc ); - } - return ret; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + DC_UpdateXforms( dc ); + release_dc_ptr( dc ); + return TRUE; } diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index fe89b0b6d5e..20d12a5ada6 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -95,9 +95,9 @@ BOOL METADC_SetMapMode( HDC hdc, INT mode ) return metadc_param1( hdc, META_SETMAPMODE, mode ); } -BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ); + return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); } BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 2406f737362..7eec8eb9d70 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -194,7 +194,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetPixel */ MFDRV_SetTextColor, /* pSetTextColor */ - MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ + NULL, /* pSetViewportExtEx */ MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ MFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 74015babb30..f478508bc4b 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -99,7 +99,6 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/include/ntgdi.h b/include/ntgdi.h index d2b5576d316..e3600aa8c79 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -153,6 +153,7 @@ BOOL WINAPI NtGdiBeginPath( HDC hdc ); BOOL WINAPI NtGdiCancelDC( HDC hdc ); BOOL WINAPI NtGdiCloseFigure( HDC hdc ); INT WINAPI NtGdiCombineRgn( HRGN dest, HRGN src1, HRGN src2, INT mode ); +BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ); HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, UINT bpp, const void *bits ); HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen );

1 0

Jacek Caban : gdi32: Handle metafiles directly in SetViewportOrgEx.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 16eaffff06dcf5f506cbeacfd4bf252752e9b82b URL: https://source.winehq.org/git/wine.git/?a=commit;h=16eaffff06dcf5f506cbeacf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 10 07:37:41 2021 +0100 gdi32: Handle metafiles directly in SetViewportOrgEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 25 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 13d4a491faa..5c4440afc17 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -250,23 +250,15 @@ BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) return ret; } -BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetViewportOrgEx ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETVIEWPORTORGEX emr; - BOOL ret; emr.emr.iType = EMR_SETVIEWPORTORGEX; emr.emr.nSize = sizeof(emr); emr.ptlOrigin.x = x; emr.ptlOrigin.y = y; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetViewportOrgEx( next, x, y, pt ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index b77c538aa75..a5e310787a1 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -110,7 +110,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 6918dd76c9b..c70af9f7cf5 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -130,7 +130,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetViewportExtEx */ - EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ + NULL, /* pSetViewportOrgEx */ EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ EMFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ EMFDRV_SetWorldTransform, /* pSetWorldTransform */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f74b45a6f98..5d6b308e85c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,6 +99,7 @@ extern BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSPEC_HIDDEN; extern BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -166,5 +167,6 @@ extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDE extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 52258a4f71f..026fde6a028 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -506,6 +506,23 @@ BOOL WINAPI GetViewportOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * SetViewportOrgEx (GDI32.@) + */ +BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, POINT *point ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetViewportOrgEx( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetViewportOrgEx( dc_attr, x, y )) return FALSE; + + if (point) *point = dc_attr->vport_org; + dc_attr->vport_org.x = x; + dc_attr->vport_org.y = y; + return NtGdiComputeXformCoefficients( hdc ); +} + /*********************************************************************** * GetWorldTransform (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 29eed8da843..65e47f8e998 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -177,14 +177,6 @@ BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { - DC *dc = get_nulldrv_dc( dev ); - - if (pt) - *pt = dc->attr->vport_org; - - dc->attr->vport_org.x = x; - dc->attr->vport_org.y = y; - DC_UpdateXforms( dc ); return TRUE; } @@ -373,24 +365,6 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ) } -/*********************************************************************** - * SetViewportOrgEx (GDI32.@) - */ -BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) -{ - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetViewportOrgEx ); - ret = physdev->funcs->pSetViewportOrgEx( physdev, x, y, pt ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetWindowExtEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 20d12a5ada6..16184129b7d 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -100,9 +100,9 @@ BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); } -BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ); + return metadc_param2( hdc, META_SETVIEWPORTORG, x, y ); } BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 7eec8eb9d70..959ea48c9e0 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -195,7 +195,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetPixel */ MFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetViewportExtEx */ - MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ + NULL, /* pSetViewportOrgEx */ MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ MFDRV_SetWindowOrgEx, /* pSetWindowOrgEx */ NULL, /* pSetWorldTransform */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index f478508bc4b..4c9c5534597 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -99,7 +99,6 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst,

1 0