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

Alexandre Julliard : include: Use the gcc interlocked functions also on i386 if possible.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: adb45d2294c0b165970a9b7d03713c8bc768ba0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb45d2294c0b165970a9b7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:09:58 2020 +0200 include: Use the gcc interlocked functions also on i386 if possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 85 ++++++++++++++++++++++++------------------------------ include/winternl.h | 1 + 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 1f36782d20..f92d864c78 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2975,71 +2975,63 @@ static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest #endif -#elif defined(__i386__) -# if defined(__GNUC__) && !defined(_NTSYSTEM_) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#elif defined(__GNUC__) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_val_compare_and_swap( dest, compare, xchg ); +#else LONG ret; __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#endif } static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; +#if defined(__i386__) || defined(__x86_64__) __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif return ret; } static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_fetch_and_add( dest, incr ); +#else LONG ret; __asm__ __volatile__( "lock; xaddl %0,(%1)" : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); return ret; +#endif } static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_add_and_fetch( dest, 1 ); +#else return InterlockedExchangeAdd( dest, 1 ) + 1; +#endif } static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_add_and_fetch( dest, -1 ); +#else return InterlockedExchangeAdd( dest, -1 ) - 1; +#endif } -# else /* __GNUC__ */ - -WINBASEAPI LONG WINAPI InterlockedCompareExchange(LONG volatile*,LONG,LONG); -WINBASEAPI LONG WINAPI InterlockedDecrement(LONG volatile*); -WINBASEAPI LONG WINAPI InterlockedExchange(LONG volatile*,LONG); -WINBASEAPI LONG WINAPI InterlockedExchangeAdd(LONG volatile*,LONG); -WINBASEAPI LONG WINAPI InterlockedIncrement(LONG volatile*); - -# endif /* __GNUC__ */ - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return (PVOID)InterlockedCompareExchange( (LONG volatile*)dest, (LONG)xchg, (LONG)compare ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val ); -} - -WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); - -#elif defined(__GNUC__) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} +#ifdef _WIN64 static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { @@ -3051,17 +3043,6 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - LONG ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { PVOID ret; @@ -3073,22 +3054,30 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest return ret; } -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +#else + +static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { - return __sync_fetch_and_add( dest, incr ); + return (PVOID)InterlockedCompareExchange( (LONG volatile*)dest, (LONG)xchg, (LONG)compare ); } -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { - return __sync_add_and_fetch( dest, 1 ); + return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val ); } -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { - return __sync_add_and_fetch( dest, -1 ); + return __sync_val_compare_and_swap( dest, compare, xchg ); } +#else +WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); +#endif + +#endif -#endif /* __i386__ */ +#endif /* __GNUC__ */ #ifdef __WINESRC__ diff --git a/include/winternl.h b/include/winternl.h index 87d0bde295..fec0741204 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3078,6 +3078,7 @@ NTSYSAPI UINT WINAPI RtlEnlargedUnsignedDivide(ULONGLONG,UINT,UINT *); NTSYSAPI LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); NTSYSAPI LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); NTSYSAPI LONGLONG WINAPI RtlExtendedLargeIntegerDivide(LONGLONG,INT,INT *); +NTSYSAPI LONGLONG WINAPI RtlInterlockedCompareExchange64(LONGLONG*,LONGLONG,LONGLONG); NTSYSAPI LONGLONG WINAPI RtlLargeIntegerAdd(LONGLONG,LONGLONG); NTSYSAPI LONGLONG WINAPI RtlLargeIntegerArithmeticShift(LONGLONG,INT); NTSYSAPI ULONGLONG WINAPI RtlLargeIntegerDivide( ULONGLONG,ULONGLONG,ULONGLONG *);

1 0

Alexandre Julliard : ntdll: Use the standard Interlocked* functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 39e4b788d6ca7d1e1ad045059ec7d088fde8a0db URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e4b788d6ca7d1e1ad04505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:04 2020 +0200 ntdll: Use the standard Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 20 +++++++++---------- dlls/ntdll/critsection.c | 28 +++++++++------------------ dlls/ntdll/file.c | 4 ++-- dlls/ntdll/large_int.c | 25 +++++++++++++++++++++++- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/locale.c | 2 +- dlls/ntdll/ntdll_misc.h | 4 ++++ dlls/ntdll/rtl.c | 45 ++++++++++++++++++++++++++++++------------- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/sync.c | 48 +++++++++++++++++++++++----------------------- dlls/ntdll/thread.c | 10 +++++----- dlls/ntdll/threadpool.c | 49 ++++++++++++++++++----------------------------- 13 files changed, 138 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39e4b788d6ca7d1e1ad0…

1 0

Alexandre Julliard : user32: Use the standard Interlocked* functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 5d5b6a1f35c6fee51dcef60818028061f03ce0ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5b6a1f35c6fee51dcef608… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:10 2020 +0200 user32: Use the standard Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 2 +- dlls/user32/input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index d3e78bb473..b6a3b3661f 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -449,7 +449,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) - interlocked_xchg_add( &global_key_state_counter, 1 ); /* force refreshing the key state cache */ + InterlockedIncrement( &global_key_state_counter ); /* force refreshing the key state cache */ return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0325e2ce3d..b7cdbd84ef 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -433,7 +433,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) * (like Adobe Photoshop CS5) expect that changes to the async key state * are also immediately available in other threads. */ if (prev_key_state != key_state_info->state[key]) - counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + counter = InterlockedIncrement( &global_key_state_counter ); key_state_info->time = GetTickCount(); key_state_info->counter = counter;

1 0

Alexandre Julliard : server: Avoid using interlocked functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 2633a5c1ae542f08f127ba737fa59fb03ed6180b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2633a5c1ae542f08f127ba73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:14 2020 +0200 server: Avoid using interlocked functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/change.c b/server/change.c index 6091d21f7f..a8f3329c72 100644 --- a/server/change.c +++ b/server/change.c @@ -88,7 +88,7 @@ struct dir uid_t uid; /* file stat.st_uid */ struct list entry; /* entry in global change notifications list */ unsigned int filter; /* notification filter */ - int notified; /* SIGIO counter */ + volatile int notified; /* SIGIO counter */ int want_data; /* return change data */ int subtree; /* do we want to watch subdirectories? */ struct list change_records; /* data for the change */ @@ -307,7 +307,7 @@ void do_change_notify( int unix_fd ) LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { if (get_unix_fd( dir->fd ) != unix_fd) continue; - interlocked_xchg_add( &dir->notified, 1 ); + dir->notified = 1; break; } } @@ -319,8 +319,9 @@ void sigio_callback(void) LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { - if (interlocked_xchg( &dir->notified, 0 )) - fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); + if (!dir->notified) continue; + dir->notified = 0; + fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); } }

1 0

Alexandre Julliard : libport: Get rid of interlocked functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 7eef40d444b3325f9580ff557afb6bc19c811f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eef40d444b3325f9580ff55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:19 2020 +0200 libport: Get rid of interlocked functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 132 --------------- libs/port/Makefile.in | 1 - libs/port/interlocked.c | 437 ------------------------------------------------ libs/wine/debug.c | 2 +- 4 files changed, 1 insertion(+), 571 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7eef40d444b3325f9580…

1 0

Zebediah Figura : ntoskrnl.exe: Protect relocated pages one at a time.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 22dfb0df10b44d1c21b3d04b59312670c2318431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22dfb0df10b44d1c21b3d04b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 2 20:55:54 2020 -0500 ntoskrnl.exe: Protect relocated pages one at a time. Blindwrite 7's ezplay.sys has sections which are consecutive in memory but not page aligned. Thus changing the protection to PROT_READWRITE one section at a time has the effect that old_prot for all sections but the first is set to PROT_READWRITE (actually, PROT_WRITECOPY), causing us to restore the wrong protection and the driver to crash in its entry point. To fix this, protect and unprotect one page at a time while processing it, i.e. essentially revert 6c0a8c359. To avoid reintroducing bug 28254, protect two pages at a time instead of just one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 01f25b5e2a..d1bdc33653 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3378,16 +3378,13 @@ static inline void *get_rva( HMODULE module, DWORD va ) return (void *)((char *)module + va); } -/* Copied from ntdll with checks for page alignment and characteristics removed */ -static NTSTATUS perform_relocations( void *module, SIZE_T len ) +static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) { IMAGE_NT_HEADERS *nt; char *base; IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_DATA_DIRECTORY *relocs; - const IMAGE_SECTION_HEADER *sec; INT_PTR delta; - ULONG protect_old[96], i; nt = RtlImageNtHeader( module ); base = (char *)nt->OptionalHeader.ImageBase; @@ -3406,19 +3403,6 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) if (!relocs->Size) return STATUS_SUCCESS; if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; - if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) - return STATUS_INVALID_IMAGE_FORMAT; - - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, PAGE_READWRITE, &protect_old[i] ); - } - TRACE( "relocating from %p-%p to %p-%p\n", base, base + len, module, (char *)module + len ); @@ -3428,25 +3412,24 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) while (rel < end - 1 && rel->SizeOfBlock) { + void *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot; + if (rel->VirtualAddress >= len) { WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); return STATUS_ACCESS_VIOLATION; } - rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), - (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + + /* Relocation entries may hang over the end of the page, so we need to + * protect two pages. */ + VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); + VirtualProtect( page, page_size * 2, old_prot, &old_prot ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; } - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, protect_old[i], &protect_old[i] ); - } - return STATUS_SUCCESS; } @@ -3475,7 +3458,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - status = perform_relocations(module, nt->OptionalHeader.SizeOfImage); + status = perform_relocations( module, nt->OptionalHeader.SizeOfImage, info.PageSize ); if (status != STATUS_SUCCESS) goto error;

1 0

Zebediah Figura : ntdll: Export RtlCopyMemoryNonTemporal.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 74f820fccca59b553b802c67731763fa7cb56e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74f820fccca59b553b802c67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 2 20:55:55 2020 -0500 ntdll: Export RtlCopyMemoryNonTemporal. Needed by Blindwrite 7's kernel driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cb6a8ec8c4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -526,6 +526,7 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) +@ stdcall -arch=x86_64 RtlCopyMemoryNonTemporal(ptr ptr long) RtlCopyMemory # @ stub RtlCopyMemoryStreamTo # @ stub RtlCopyOutOfProcessMemoryStreamTo # @ stub RtlCopyRangeList diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7e52751608..14d95a47f8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1002,6 +1002,7 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) +@ stdcall -arch=x86_64 RtlCopyMemoryNonTemporal(ptr ptr long) RtlCopyMemory @ stub RtlCopyRangeList @ stdcall RtlCopySid(long ptr ptr) @ stdcall RtlCopyString(ptr ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b180d11556..60396779fc 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1696,6 +1696,11 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +#ifdef __x86_64__ +void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); +#else +#define RtlCopyMemoryNonTemporal RtlCopyMemory +#endif BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING);

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoIs32bitProcess().
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 0e09d5ea74d1c4a2b780c27a66b227e7a406d9d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e09d5ea74d1c4a2b780c27a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 11:22:02 2020 -0500 ntoskrnl.exe: Implement IoIs32bitProcess(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49088 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + include/ddk/wdm.h | 3 +++ 4 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d1bdc33653..3013fe7eb9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2196,6 +2196,7 @@ static void *create_process_object( HANDLE handle ) process->header.Type = 3; process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ NtQueryInformationProcess( handle, ProcessBasicInformation, &process->info, sizeof(process->info), NULL ); + IsWow64Process( handle, &process->wow64 ); return process; } @@ -3935,6 +3936,17 @@ PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) return irp->Tail.Overlay.Thread->kthread.process; } +#ifdef _WIN64 +/*********************************************************************** + * IoIs32bitProcess (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoIs32bitProcess(IRP *irp) +{ + TRACE("irp %p.\n", irp); + return irp->Tail.Overlay.Thread->kthread.process->wow64; +} +#endif + /*********************************************************************** * RtlIsNtDdiVersionAvailable (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 14d95a47f8..8e3b127b16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -416,6 +416,7 @@ @ stdcall IoInitializeTimer(ptr ptr ptr) @ stdcall IoInvalidateDeviceRelations(ptr long) @ stub IoInvalidateDeviceState +@ stdcall -arch=win64 IoIs32bitProcess(ptr) @ stub IoIsFileOriginRemote @ stub IoIsOperationSynchronous @ stub IoIsSystemThread diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 256e945e6f..23f03c336d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -40,6 +40,7 @@ struct _EPROCESS { DISPATCHER_HEADER header; PROCESS_BASIC_INFORMATION info; + BOOL wow64; }; struct _KTHREAD diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 60396779fc..db8073ebe3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1608,6 +1608,9 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +#ifdef _WIN64 +BOOLEAN WINAPI IoIs32bitProcess(IRP*); +#endif NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING);

1 0

Jacek Caban : riched20: Include wine/asm.h in editstr.h.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 9763f5189f1312c82c98b3ce25cb8100ae4cb420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9763f5189f1312c82c98b3ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 3 14:09:42 2020 +0200 riched20: Include wine/asm.h in editstr.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49068 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 1 - dlls/riched20/txtsrv.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index a65169056e..2c5737f3e9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -43,6 +43,7 @@ #include <textserv.h> #include "usp10.h" +#include "wine/asm.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5992fc0b06..99f446e581 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -25,7 +25,6 @@ #include "richole.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 12761621c4..622d851928 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -27,7 +27,6 @@ #include "tom.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h"

1 0

Nikolay Sivov : dwrite: Add separate structure for top level gsub/gpos offsets.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: b8f1aed6d91d174d29094a7e184d57e713041982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f1aed6d91d174d29094a7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:30 2020 +0300 dwrite: Add separate structure for top level gsub/gpos offsets. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 16 +++++++++------- dlls/dwrite/opentype.c | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5755696875..d89dacb3a4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -434,19 +434,21 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; +struct ot_gsubgpos_table +{ + struct dwrite_fonttable table; + unsigned int script_list; + unsigned int feature_list; + unsigned int lookup_list; +}; + struct scriptshaping_cache { const struct shaping_font_ops *font; void *context; UINT16 upem; - struct - { - struct dwrite_fonttable table; - unsigned int script_list; - unsigned int feature_list; - unsigned int lookup_list; - } gpos; + struct ot_gsubgpos_table gpos; struct { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0307cd5981..66c3398316 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2962,10 +2962,11 @@ void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) cache->gdef.classdef = table_read_be_word(&cache->gdef.table, FIELD_OFFSET(struct gdef_header, classdef)); } -DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD script, +unsigned int opentype_layout_find_script(const struct scriptshaping_cache *cache, unsigned int kind, DWORD script, unsigned int *script_index) { - WORD script_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 script_count; unsigned int i; *script_index = ~0u; @@ -2973,14 +2974,14 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD if (kind != MS_GPOS_TAG) return 0; - script_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list); + script_count = table_read_be_word(&table->table, table->script_list); if (!script_count) return 0; for (i = 0; i < script_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + i * sizeof(struct ot_script_record)); + unsigned int tag = table_read_dword(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + i * sizeof(struct ot_script_record)); if (!tag) continue; @@ -2994,10 +2995,11 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD return 0; } -DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD language, +unsigned int opentype_layout_find_language(const struct scriptshaping_cache *cache, unsigned int kind, DWORD language, unsigned int script_index, unsigned int *language_index) { - WORD table_offset, lang_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 table_offset, lang_count; unsigned int i; *language_index = ~0u; @@ -3005,17 +3007,16 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO if (kind != MS_GPOS_TAG) return 0; - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return 0; - lang_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + lang_count = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys_count)); for (i = 0; i < lang_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + table_offset + + unsigned int tag = table_read_dword(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + i * sizeof(struct ot_langsys_record)); if (tag == language) @@ -3026,7 +3027,7 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO } /* Try 'defaultLangSys' if it's set. */ - if (table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset)) + if (table_read_be_word(&table->table, table->script_list + table_offset)) return ~0u; return 0;

1 0