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

Alexandre Julliard : wow64: Patch the Wow64Transition pointer in all loaded modules.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 40673153b4c8e6f6e5637c640a68764619237a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40673153b4c8e6f6e5637c64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:31:41 2021 +0200 wow64: Patch the Wow64Transition pointer in all loaded modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 23 ++++++++++++++++------- dlls/wow64/virtual.c | 6 ++++++ dlls/wow64/wow64_private.h | 1 + 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index feda6bf348c..087bf1aa3ad 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -334,6 +334,17 @@ static DWORD get_syscall_num( const BYTE *syscall ) } +/********************************************************************** + * init_image_mapping + */ +void init_image_mapping( HMODULE module ) +{ + void **ptr = RtlFindExportedRoutineByName( module, "Wow64Transition" ); + + if (ptr) *ptr = pBTCpuGetBopCode(); +} + + /********************************************************************** * init_syscall_table */ @@ -440,7 +451,6 @@ static HMODULE load_cpu_dll(void) */ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { - void **pWow64Transition, **p__wine_syscall_dispatcher; HMODULE module; UNICODE_STRING str; @@ -454,18 +464,17 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex LdrGetDllHandle( NULL, 0, &str, &module ); GET_PTR( LdrSystemDllInitBlock ); - module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; - GET_PTR( Wow64Transition ); - GET_PTR( __wine_syscall_dispatcher ); - init_syscall_table( module, 0, &ntdll_syscall_table ); - module = load_cpu_dll(); GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuProcessInit ); GET_PTR( BTCpuSimulate ); pBTCpuProcessInit(); - *pWow64Transition = *p__wine_syscall_dispatcher = pBTCpuGetBopCode(); + + module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; + init_image_mapping( module ); + init_syscall_table( module, 0, &ntdll_syscall_table ); + *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); init_file_redirects(); return TRUE; diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index b4aabb13c7d..e5759609974 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -257,6 +257,12 @@ NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args ) commit, offset, size_32to64( &size, size32 ), inherit, alloc, protect ); if (NT_SUCCESS(status)) { + SECTION_IMAGE_INFORMATION info; + + if (!NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL )) + { + if (info.Machine == current_machine) init_image_mapping( addr ); + } put_addr( addr32, addr ); put_size( size32, size ); } diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 370ae76a0c4..1a9d05eaf43 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -32,6 +32,7 @@ void * WINAPI Wow64AllocateTemp( SIZE_T size ); void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ); void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ); +extern void init_image_mapping( HMODULE module ) DECLSPEC_HIDDEN; extern void init_file_redirects(void) DECLSPEC_HIDDEN; extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wow64: Add support for multiple syscall tables.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 0afbbabcd9942fba9de1863d5931f9c89eebc492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0afbbabcd9942fba9de1863d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:31:04 2021 +0200 wow64: Add support for multiple syscall tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 66 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 0df1dfc143b..feda6bf348c 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -53,7 +53,14 @@ static const char *syscall_names[] = #undef SYSCALL_ENTRY }; -static unsigned short syscall_map[1024]; +static const SYSTEM_SERVICE_TABLE ntdll_syscall_table = +{ + (ULONG_PTR *)syscall_thunks, + (ULONG_PTR *)syscall_names, + ARRAY_SIZE(syscall_thunks) +}; + +static SYSTEM_SERVICE_TABLE syscall_tables[4]; /* header for Wow64AllocTemp blocks; probably not the right layout */ struct mem_header @@ -330,50 +337,64 @@ static DWORD get_syscall_num( const BYTE *syscall ) /********************************************************************** * init_syscall_table */ -static void init_syscall_table( HMODULE ntdll ) +static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_TABLE *orig_table ) { + static syscall_thunk thunks[2048]; + static ULONG start_pos; + const IMAGE_EXPORT_DIRECTORY *exports; const ULONG *functions, *names; const USHORT *ordinals; - ULONG id, exp_size, exp_pos, wrap_pos; + ULONG id, exp_size, exp_pos, wrap_pos, max_pos = 0; + const char **syscall_names = (const char **)orig_table->CounterTable; - args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); - - exports = RtlImageDirectoryEntryToData( ntdll, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); - ordinals = get_rva( ntdll, exports->AddressOfNameOrdinals ); - functions = get_rva( ntdll, exports->AddressOfFunctions ); - names = get_rva( ntdll, exports->AddressOfNames ); + exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + ordinals = get_rva( module, exports->AddressOfNameOrdinals ); + functions = get_rva( module, exports->AddressOfFunctions ); + names = get_rva( module, exports->AddressOfNames ); for (exp_pos = wrap_pos = 0; exp_pos < exports->NumberOfNames; exp_pos++) { - char *name = get_rva( ntdll, names[exp_pos] ); + char *name = get_rva( module, names[exp_pos] ); int res = -1; if (strncmp( name, "Nt", 2 ) && strncmp( name, "wine", 4 ) && strncmp( name, "__wine", 6 )) continue; /* not a syscall */ - if ((id = get_syscall_num( get_rva( ntdll, functions[ordinals[exp_pos]] ))) == ~0u) + if ((id = get_syscall_num( get_rva( module, functions[ordinals[exp_pos]] ))) == ~0u) continue; /* not a syscall */ - if (wrap_pos < ARRAY_SIZE(syscall_names)) - res = strcmp( name, syscall_names[wrap_pos] ); + if (wrap_pos < orig_table->ServiceLimit) res = strcmp( name, syscall_names[wrap_pos] ); if (!res) /* got a match */ { - if (id < ARRAY_SIZE(syscall_map)) syscall_map[id] = wrap_pos++; - else ERR( "invalid syscall id %04x for %s\n", id, name ); + ULONG table_idx = (id >> 12) & 3, table_pos = id & 0xfff; + if (table_idx == idx) + { + if (start_pos + table_pos < ARRAY_SIZE(thunks)) + { + thunks[start_pos + table_pos] = (syscall_thunk)orig_table->ServiceTable[wrap_pos++]; + max_pos = max( table_pos, max_pos ); + } + else ERR( "invalid syscall id %04x for %s\n", id, name ); + } + else ERR( "wrong syscall table id %04x for %s\n", id, name ); } else if (res > 0) { - FIXME( "no ntdll export for syscall %s\n", syscall_names[wrap_pos] ); + FIXME( "no export for syscall %s\n", syscall_names[wrap_pos] ); wrap_pos++; exp_pos--; /* try again */ } else FIXME( "missing wrapper for syscall %04x %s\n", id, name ); } - for ( ; wrap_pos < ARRAY_SIZE(syscall_thunks); wrap_pos++) - FIXME( "no ntdll export for syscall %s\n", syscall_names[wrap_pos] ); + for ( ; wrap_pos < orig_table->ServiceLimit; wrap_pos++) + FIXME( "no export for syscall %s\n", syscall_names[wrap_pos] ); + + syscall_tables[idx].ServiceTable = (ULONG_PTR *)(thunks + start_pos); + syscall_tables[idx].ServiceLimit = max_pos + 1; + start_pos += max_pos + 1; } @@ -425,6 +446,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); if (!current_machine) current_machine = native_machine; + args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) @@ -435,7 +457,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; GET_PTR( Wow64Transition ); GET_PTR( __wine_syscall_dispatcher ); - init_syscall_table( module ); + init_syscall_table( module, 0, &ntdll_syscall_table ); module = load_cpu_dll(); GET_PTR( BTCpuGetBopCode ); @@ -540,15 +562,17 @@ static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) { NTSTATUS status; + UINT id = num & 0xfff; + const SYSTEM_SERVICE_TABLE *table = &syscall_tables[(num >> 12) & 3]; - if (num >= ARRAY_SIZE( syscall_map ) || !syscall_map[num]) + if (id >= table->ServiceLimit || !table->ServiceTable[id]) { ERR( "unsupported syscall %04x\n", num ); return STATUS_INVALID_SYSTEM_SERVICE; } __TRY { - syscall_thunk thunk = syscall_thunks[syscall_map[num]]; + syscall_thunk thunk = (syscall_thunk)table->ServiceTable[id]; status = thunk( args ); } __EXCEPT( syscall_filter )

1 0

Alexandre Julliard : win32u: Add the infrastructure for building the syscall table.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 33e99ce5f750331a287b033fe98d949011a41f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e99ce5f750331a287b033f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:18:20 2021 +0200 win32u: Add the infrastructure for building the syscall table. With a simple NtGdiFlush() export as example. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/Makefile.in | 8 ++++++ dlls/win32u/main.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 3 ++- 4 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 4147d8586b9..9dce0bc39fd 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1 +1,9 @@ MODULE = win32u.dll +IMPORTS = ntdll winecrt0 +EXTRALIBS = -Wl,--subsystem,unixlib + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wb,--syscall-table,1 + +C_SRCS = \ + main.c \ + syscall.c diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c new file mode 100644 index 00000000000..f0a052be545 --- /dev/null +++ b/dlls/win32u/main.c @@ -0,0 +1,65 @@ +/* + * Win32u kernel interface + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wine/exception.h" +#include "wine/unixlib.h" + +extern void *__wine_syscall_dispatcher DECLSPEC_HIDDEN; + +static unixlib_handle_t win32u_handle; + +void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) +{ + EXCEPTION_RECORD record; + + record.ExceptionCode = EXCEPTION_WINE_STUB; + record.ExceptionFlags = EH_NONCONTINUABLE; + record.ExceptionRecord = NULL; + record.ExceptionAddress = __wine_spec_unimplemented_stub; + record.NumberParameters = 2; + record.ExceptionInformation[0] = (ULONG_PTR)module; + record.ExceptionInformation[1] = (ULONG_PTR)function; + for (;;) RtlRaiseException( &record ); +} + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + LdrDisableThreadCalloutsForDll( inst ); + if (__wine_syscall_dispatcher) break; /* already set through Wow64Transition */ + if (!NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, + &win32u_handle, sizeof(win32u_handle), NULL )) + { + __wine_unix_call( win32u_handle, 0, &__wine_syscall_dispatcher ); + } + break; + } + return TRUE; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c new file mode 100644 index 00000000000..cb9d88a5b92 --- /dev/null +++ b/dlls/win32u/syscall.c @@ -0,0 +1,63 @@ +/* + * Unix interface for Win32 syscalls + * + * Copyright (C) 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winnt.h" +#include "winternl.h" +#include "wine/unixlib.h" + + +/*********************************************************************** + * NtGdiFlush (win32u.@) + */ +BOOL WINAPI NtGdiFlush(void) +{ + return TRUE; +} + +static void * const syscalls[] = +{ + NtGdiFlush, +}; + +static BYTE arguments[ARRAY_SIZE(syscalls)]; + +static SYSTEM_SERVICE_TABLE syscall_table = +{ + (ULONG_PTR *)syscalls, + 0, + ARRAY_SIZE(syscalls), + arguments +}; + +static NTSTATUS init( void *dispatcher ) +{ + return ntdll_init_syscalls( 1, &syscall_table, dispatcher ); +} + +unixlib_entry_t __wine_unix_call_funcs[] = { init }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 57d1871f453..7bb8c334069 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1,3 +1,4 @@ +@ extern -arch=win32 Wow64Transition __wine_syscall_dispatcher @ stub NtBindCompositionSurface @ stub NtCloseCompositionInputSink @ stub NtCompositionInputThread @@ -435,7 +436,7 @@ @ stub NtGdiFillPath @ stub NtGdiFillRgn @ stub NtGdiFlattenPath -@ stub NtGdiFlush +@ stdcall -syscall NtGdiFlush() @ stub NtGdiFontIsLinked @ stub NtGdiForceUFIMapping @ stub NtGdiFrameRgn

1 0

Alexandre Julliard : wow64win: Add the infrastructure for wrapping the win32u syscall table.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 18c512089e3ffc2fd315543cb553a332dbf23ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c512089e3ffc2fd315543c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:24:10 2021 +0200 wow64win: Add the infrastructure for wrapping the win32u syscall table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/Makefile.in | 1 + dlls/wow64win/Makefile.in | 6 ++++ dlls/wow64win/syscall.c | 65 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 27 +++++++++++++++++ dlls/wow64win/wow64win.spec | 2 +- dlls/wow64win/wow64win_private.h | 30 +++++++++++++++++++ 6 files changed, 130 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 9dce0bc39fd..0f76f61b798 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1,4 +1,5 @@ MODULE = win32u.dll +IMPORTLIB = win32u IMPORTS = ntdll winecrt0 EXTRALIBS = -Wl,--subsystem,unixlib diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in index 3107ce5e537..185d8595282 100644 --- a/dlls/wow64win/Makefile.in +++ b/dlls/wow64win/Makefile.in @@ -1 +1,7 @@ MODULE = wow64win.dll +IMPORTS = win32u ntdll winecrt0 + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f200000 + +C_SRCS = \ + syscall.c diff --git a/dlls/wow64win/syscall.c b/dlls/wow64win/syscall.c new file mode 100644 index 00000000000..1d4918a6025 --- /dev/null +++ b/dlls/wow64win/syscall.c @@ -0,0 +1,65 @@ +/* + * WoW64 syscall wrapping + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wow64win_private.h" + +extern BOOL WINAPI NtGdiFlush(void); + +NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) +{ + return NtGdiFlush(); +} + +static void * const win32_syscalls[] = +{ +#define SYSCALL_ENTRY(func) wow64_ ## func, + ALL_WIN32_SYSCALLS +#undef SYSCALL_ENTRY +}; + +static const char * const win32_syscall_names[] = +{ +#define SYSCALL_ENTRY(func) #func, + ALL_WIN32_SYSCALLS +#undef SYSCALL_ENTRY +}; + +SYSTEM_SERVICE_TABLE sdwhwin32 = +{ + (ULONG_PTR *)win32_syscalls, + (ULONG_PTR *)win32_syscall_names, + ARRAY_SIZE(win32_syscalls), + NULL +}; + + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + return TRUE; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h new file mode 100644 index 00000000000..3e4cc0def33 --- /dev/null +++ b/dlls/wow64win/syscall.h @@ -0,0 +1,27 @@ +/* + * WoW64 USER32 syscall definitions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WOW64WIN_SYSCALL_H +#define __WOW64WIN_SYSCALL_H + +#define ALL_WIN32_SYSCALLS \ + SYSCALL_ENTRY( NtGdiFlush ) + +#endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/wow64win.spec b/dlls/wow64win/wow64win.spec index 8ca119ffb34..8939384e2ef 100644 --- a/dlls/wow64win/wow64win.spec +++ b/dlls/wow64win/wow64win.spec @@ -1,2 +1,2 @@ #@ extern sdwhcon -#@ extern sdwhwin32 +@ extern sdwhwin32 diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h new file mode 100644 index 00000000000..466dfe5f6e0 --- /dev/null +++ b/dlls/wow64win/wow64win_private.h @@ -0,0 +1,30 @@ +/* + * WoW64 private definitions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WOW64WIN_PRIVATE_H +#define __WOW64WIN_PRIVATE_H + +#include "syscall.h" + +#define SYSCALL_ENTRY(func) extern NTSTATUS WINAPI wow64_ ## func( UINT *args ) DECLSPEC_HIDDEN; +ALL_WIN32_SYSCALLS +#undef SYSCALL_ENTRY + +#endif /* __WOW64WIN_PRIVATE_H */

1 0

Alexandre Julliard : makefiles: Always link Unix libraries against ntdll.so.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 2781af45d574f05464d1059a54dfce299d836f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2781af45d574f05464d1059a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 11:12:51 2021 +0200 makefiles: Always link Unix libraries against ntdll.so. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 43141a472fa..59857762edd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3365,7 +3365,7 @@ static void output_module( struct makefile *make ) if (native_unix_lib) { - if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + if (strcmp( make->module, "ntdll.dll" )) { strarray_add( &unix_libs, "-lntdll" ); strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" ));

1 0

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetGraphicsMode.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 55849cd42808e54e1a63ef0de4db05640065a968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55849cd42808e54e1a63ef0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 31 13:18:34 2021 +0100 gdi32: Use NtGdiGetAndSetDCDword for SetGraphicsMode. 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/bitblt.c | 9 ++++----- dlls/gdi32/dc.c | 49 +++++++++++++++++++++++-------------------------- dlls/gdi32/gdidc.c | 9 +++++++++ include/ntgdi.h | 1 + 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index dcc2c932453..7f66d2f66fe 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -1019,7 +1019,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { - int oldgMode; + DWORD prev_mode; /* parallelogram coords */ POINT plg[3]; /* rect coords */ @@ -1030,8 +1030,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, double det; /* save actual mode, set GM_ADVANCED */ - oldgMode = SetGraphicsMode(hdcDest,GM_ADVANCED); - if (oldgMode == 0) + if (!NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, GM_ADVANCED, &prev_mode )) return FALSE; memcpy(plg,lpPoint,sizeof(POINT)*3); @@ -1047,7 +1046,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, if (fabs(det) < 1e-5) { - SetGraphicsMode(hdcDest,oldgMode); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, prev_mode, NULL ); return FALSE; } @@ -1084,7 +1083,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, SRCCOPY); /* restore dest DC */ SetWorldTransform(hdcDest,&oldDestXf); - SetGraphicsMode(hdcDest,oldgMode); + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetGraphicsMode, prev_mode, NULL ); return TRUE; } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7e9dff645b1..420754b555e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -806,6 +806,24 @@ INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ) } +static BOOL set_graphics_mode( DC *dc, int mode ) +{ + if (mode == dc->attr->graphics_mode) return TRUE; + if (mode <= 0 || mode > GM_LAST) return FALSE; + + /* One would think that setting the graphics mode to GM_COMPATIBLE + * would also reset the world transformation matrix to the unity + * matrix. However, in Windows, this is not the case. This doesn't + * make a lot of sense to me, but that's the way it is. + */ + dc->attr->graphics_mode = mode; + + /* font metrics depend on the graphics mode */ + NtGdiSelectFont(dc->hSelf, dc->hFont); + return TRUE; +} + + /*********************************************************************** * NtGdiGetAndSetDCDword (win32u.@) */ @@ -848,6 +866,11 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre if (value != CLR_INVALID) dc->attr->pen_color = value; break; + case NtGdiSetGraphicsMode: + if (prev_value) *prev_value = dc->attr->graphics_mode; + ret = set_graphics_mode( dc, value ); + break; + default: WARN( "unknown method %u\n", method ); ret = FALSE; @@ -859,32 +882,6 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre } -/*********************************************************************** - * SetGraphicsMode (GDI32.@) - */ -INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc = get_dc_ptr( hdc ); - - /* One would think that setting the graphics mode to GM_COMPATIBLE - * would also reset the world transformation matrix to the unity - * matrix. However, in Windows, this is not the case. This doesn't - * make a lot of sense to me, but that's the way it is. - */ - if (!dc) return 0; - if ((mode > 0) && (mode <= GM_LAST)) - { - ret = dc->attr->graphics_mode; - dc->attr->graphics_mode = mode; - } - /* font metrics depend on the graphics mode */ - if (ret != mode) NtGdiSelectFont(dc->hSelf, dc->hFont); - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * NtGdiGetTransform (win32u.@) * diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c3c7ad710f2..0be21c75d58 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -436,6 +436,15 @@ INT WINAPI GetGraphicsMode( HDC hdc ) return dc_attr ? dc_attr->graphics_mode : 0; } +/*********************************************************************** + * SetGraphicsMode (GDI32.@) + */ +INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) +{ + DWORD ret; + return NtGdiGetAndSetDCDword( hdc, NtGdiSetGraphicsMode, mode, &ret ) ? ret : 0; +} + /*********************************************************************** * GetArcDirection (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 25ac5ee505f..63f65e04794 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -111,6 +111,7 @@ enum NtGdiSetTextColor, NtGdiSetDCBrushColor, NtGdiSetDCPenColor, + NtGdiSetGraphicsMode, }; enum

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 56104123d9721c4ab99425421275acaf70a3c41e URL: https://source.winehq.org/git/wine.git/?a=commit;h=56104123d9721c4ab9942542… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:26:00 2021 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS. STATUS_MORE_ENTRIES is used for directory enumeration APIs, and signals that a continuation will be returned on the next call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 757983c3f0b..1e018a9fc0b 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -877,7 +877,7 @@ static NTSTATUS enumerate_credentials( void *buff, SIZE_T insize, SIZE_T outsize { if (size >= sizeof(list->size)) list->size = size; iosb->Information = sizeof(list->size); - status = STATUS_MORE_ENTRIES; + status = STATUS_BUFFER_OVERFLOW; } else {

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 33ed41950dd900bf213511e3674d4c47fe7d3323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ed41950dd900bf213511e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:25:59 2021 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW if an insufficient buffer is passed to IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS. STATUS_MORE_ENTRIES is used for directory enumeration APIs, and signals that a continuation will be returned on the next call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d5cf1ae5c4b..757983c3f0b 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -319,7 +319,7 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo { if (offset >= sizeof(query->size)) query->size = offset; offset = sizeof(query->size); - irp->IoStatus.u.Status = STATUS_MORE_ENTRIES; + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; goto err; } }

1 0

Zebediah Figura : kernel32/tests: Add some tests for IOCTL_MOUNTMGR_QUERY_POINTS.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: c342afeff8b47a2f5c3b57db0b9a606df5587470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c342afeff8b47a2f5c3b57db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 30 22:25:56 2021 -0500 kernel32/tests: Add some tests for IOCTL_MOUNTMGR_QUERY_POINTS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 89 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index ed3897a6b94..1670ab69222 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -18,14 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" +#include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" #include "winbase.h" #include "winioctl.h" #include "ntddstor.h" #include "winternl.h" -#include <stdio.h> #include "ddk/ntddcdvd.h" #include "ddk/mountmgr.h" +#include "wine/test.h" #include <pshpack1.h> struct COMPLETE_DVD_LAYER_DESCRIPTOR @@ -1619,6 +1622,87 @@ static void test_GetVolumeInformationByHandle(void) CloseHandle( file ); } +static void test_mountmgr_query_points(void) +{ + char input_buffer[64]; + MOUNTMGR_MOUNT_POINTS *output; + MOUNTMGR_MOUNT_POINT *input = (MOUNTMGR_MOUNT_POINT *)input_buffer; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + output = malloc(1024); + + file = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok(file != INVALID_HANDLE_VALUE, "failed to open mountmgr, error %u\n", GetLastError()); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, NULL, 0, NULL, 0 ); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + memset( input, 0, sizeof(*input) ); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input) - 1, NULL, 0 ); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), NULL, 0 ); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + memset(output, 0xcc, sizeof(*output)); + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) - 1 ); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + todo_wine ok(output->Size == 0xcccccccc, "got size %u\n", output->Size); + ok(output->NumberOfMountPoints == 0xcccccccc, "got count %u\n", output->NumberOfMountPoints); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + memset(output, 0xcc, sizeof(*output)); + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) ); + todo_wine ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + todo_wine ok(io.Status == STATUS_BUFFER_OVERFLOW, "got status %#x\n", io.Status); + todo_wine ok(io.Information == offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got information %#Ix\n", io.Information); + ok(output->Size > offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got size %u\n", output->Size); + todo_wine ok(output->NumberOfMountPoints && output->NumberOfMountPoints != 0xcccccccc, + "got count %u\n", output->NumberOfMountPoints); + + output = realloc(output, output->Size); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, + IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, output->Size ); + ok(!status, "got %#x\n", status); + ok(!io.Status, "got status %#x\n", io.Status); + ok(io.Information == output->Size, "got size %u, information %#Ix\n", output->Size, io.Information); + ok(output->Size > offsetof(MOUNTMGR_MOUNT_POINTS, MountPoints[0]), "got size %u\n", output->Size); + ok(output->NumberOfMountPoints && output->NumberOfMountPoints != 0xcccccccc, + "got count %u\n", output->NumberOfMountPoints); + + CloseHandle( file ); + + free(output); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -1650,4 +1734,5 @@ START_TEST(volume) test_cdrom_ioctl(); test_mounted_folder(); test_GetVolumeInformationByHandle(); + test_mountmgr_query_points(); }

1 0

Anton Baskanov : fonts: Fix dotaccent glyph position in Small Fonts.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: wine Branch: master Commit: 80ef009fc123773ea118f3df57d54f727cab6893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ef009fc123773ea118f3df… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Aug 29 21:06:25 2021 +0700 fonts: Fix dotaccent glyph position in Small Fonts. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/small_fonts.sfd | 2 +- fonts/small_fonts.ttf | Bin 19068 -> 19068 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 28dcee28e12..e8494c8dc8e 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -4638,7 +4638,7 @@ BDFChar: 281 369 5 1 4 0 7 :nRfMOH>QC BDFChar: 282 355 3 1 2 -2 5 JA?\cJ3ZB8 -BDFChar: 283 729 2 0 0 10 10 +BDFChar: 283 729 2 0 0 8 8 J,fQL BDFChar: 284 8470 9 0 8 0 6 `;mo.V#[:kQ[k;#MuWhX diff --git a/fonts/small_fonts.ttf b/fonts/small_fonts.ttf index a35230941a7..0e5e7f4127b 100644 Binary files a/fonts/small_fonts.ttf and b/fonts/small_fonts.ttf differ

1 0