wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Dmitry Timoshkov : crypt32: pwszContainerName or pwszProvName could be NULL in CRYPT_KEY_PROV_INFO.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 0e30815636613a9b7bdfb5ab8a11524c801cb39f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e30815636613a9b7bdfb5ab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 21 13:02:41 2020 +0800 crypt32: pwszContainerName or pwszProvName could be NULL in CRYPT_KEY_PROV_INFO. Make behaviour of CRYPT_FixKeyProvInfoPointers match CRYPT_CopyKeyProvInfo, and fix reading CRYPT_KEY_PROV_INFO certificate property from the store. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 48eaac082e..488b84001c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -525,13 +525,19 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) DWORD i, containerLen, provNameLen; LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); - info->pwszContainerName = (LPWSTR)data; - containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - data += containerLen; + if (info->pwszContainerName) + { + info->pwszContainerName = (LPWSTR)data; + containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); + data += containerLen; + } - info->pwszProvName = (LPWSTR)data; - provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - data += provNameLen; + if (info->pwszProvName) + { + info->pwszProvName = (LPWSTR)data; + provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + data += provNameLen; + } if (info->cProvParam) {

1 0

Alexandre Julliard : kernel32: Use the user shared data to implement GetTickCount().
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: cd215bb49bc240cdce5415c80264f8daa557636a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd215bb49bc240cdce5415c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:07:02 2020 +0200 kernel32: Use the user shared data to implement GetTickCount(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 62 ++++++++++++------------------------------------- dlls/ntdll/tests/time.c | 2 -- 2 files changed, 15 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 47da788bee..5d27fc7ac3 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -38,9 +38,6 @@ #elif defined(HAVE_MACHINE_LIMITS_H) #include <machine/limits.h> #endif -#ifdef __APPLE__ -# include <mach/mach_time.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -49,49 +46,21 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" +#include "ddk/wdm.h" #include "kernel_private.h" #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(time); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + static inline void longlong_to_filetime( LONGLONG t, FILETIME *ft ) { ft->dwLowDateTime = (DWORD)t; ft->dwHighDateTime = (DWORD)(t >> 32); } -#define TICKSPERSEC 10000000 -#define TICKSPERMSEC 10000 - -/* return a monotonic time counter, in Win32 ticks */ -static inline ULONGLONG monotonic_counter(void) -{ - LARGE_INTEGER counter; - -#ifdef __APPLE__ - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info( &timebase ); -#ifdef HAVE_MACH_CONTINUOUS_TIME - if (&mach_continuous_time != NULL) - return mach_continuous_time() * timebase.numer / timebase.denom / 100; -#endif - return mach_absolute_time() * timebase.numer / timebase.denom / 100; -#elif defined(HAVE_CLOCK_GETTIME) - struct timespec ts; -#ifdef CLOCK_MONOTONIC_RAW - if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) - return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; -#endif - if (!clock_gettime( CLOCK_MONOTONIC, &ts )) - return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; -#endif - - NtQueryPerformanceCounter( &counter, NULL ); - return counter.QuadPart; -} - /*********************************************************************** * GetSystemTimeAdjustment (KERNEL32.@) @@ -394,24 +363,23 @@ BOOL WINAPI GetSystemTimes(LPFILETIME lpIdleTime, LPFILETIME lpKernelTime, LPFIL */ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) { - return monotonic_counter() / TICKSPERMSEC; + ULONG high, low; + + do + { + high = user_shared_data->u.TickCount.High1Time; + low = user_shared_data->u.TickCount.LowPart; + } + while (high != user_shared_data->u.TickCount.High2Time); + /* note: we ignore TickCountMultiplier */ + return (ULONGLONG)high << 32 | low; } /*********************************************************************** * GetTickCount (KERNEL32.@) - * - * Get the number of milliseconds the system has been running. - * - * PARAMS - * None. - * - * RETURNS - * The current tick count. - * - * NOTES - * The value returned will wrap around every 2^32 milliseconds. */ DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) { - return monotonic_counter() / TICKSPERMSEC; + /* note: we ignore TickCountMultiplier */ + return user_shared_data->u.TickCount.LowPart; } diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 1628af8df2..99bddd4fec 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -185,8 +185,6 @@ static void test_user_shared_data_time(void) t3 = GetTickCount(); } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ - /* FIXME: not always in order, but should be close */ - todo_wine_if(t1 > t2 && t1 - t2 < 50) ok(t1 <= t2, "USD TickCount / GetTickCount are out of order: %s %s\n", wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); ok(t2 <= t3, "USD TickCount / GetTickCount are out of order: %s %s\n",

1 0

Alexandre Julliard : kernelbase: Use the user shared data to implement GetTickCount().
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 8ca9e0b1abba7640e288df7b55b60903bc52fc9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca9e0b1abba7640e288df7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:06:22 2020 +0200 kernelbase: Use the user shared data to implement GetTickCount(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/sync.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index de80e24551..1f1a65fc85 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -725,8 +725,8 @@ # @ stub GetThreadSelectedCpuSets @ stdcall GetThreadTimes(long ptr ptr ptr ptr) @ stdcall GetThreadUILanguage() -@ stdcall GetTickCount() kernel32.GetTickCount -@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetTickCount() +@ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA @ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) kernel32.GetTimeFormatEx @ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 6c2242e30d..99706277da 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + /* check if current version is NT or Win95 */ static inline BOOL is_version_nt(void) { @@ -126,6 +128,34 @@ static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING ***********************************************************************/ +/****************************************************************************** + * GetTickCount (kernelbase.@) + */ +ULONG WINAPI DECLSPEC_HOTPATCH GetTickCount(void) +{ + /* note: we ignore TickCountMultiplier */ + return user_shared_data->u.TickCount.LowPart; +} + + +/****************************************************************************** + * GetTickCount64 (kernelbase.@) + */ +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) +{ + ULONG high, low; + + do + { + high = user_shared_data->u.TickCount.High1Time; + low = user_shared_data->u.TickCount.LowPart; + } + while (high != user_shared_data->u.TickCount.High2Time); + /* note: we ignore TickCountMultiplier */ + return (ULONGLONG)high << 32 | low; +} + + static HANDLE normalize_handle_if_console( HANDLE handle ) { static HANDLE wait_event;

1 0

Alexandre Julliard : kernelbase: Move WaitOnAddress implementation to sync.c.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 6a1667fab428764eeaba38ac9b5cb1813c5cffda URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1667fab428764eeaba38ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 16:03:52 2020 +0200 kernelbase: Move WaitOnAddress implementation to sync.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/main.c | 15 --------------- dlls/kernelbase/sync.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 9aa6473994..f1edf8614e 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -200,21 +200,6 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2) return FALSE; } -/*********************************************************************** - * WaitOnAddress (KERNELBASE.@) - */ -BOOL WINAPI WaitOnAddress(volatile void *addr, void *cmp, SIZE_T size, DWORD timeout) -{ - LARGE_INTEGER to; - - if (timeout != INFINITE) - { - to.QuadPart = -(LONGLONG)timeout * 10000; - return set_ntstatus( RtlWaitOnAddress( (const void *)addr, cmp, size, &to )); - } - return set_ntstatus( RtlWaitOnAddress( (const void *)addr, cmp, size, NULL )); -} - HRESULT WINAPI QISearch(void *base, const QITAB *table, REFIID riid, void **obj) { const QITAB *ptr; diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index c0db4679e9..6c2242e30d 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -286,6 +286,22 @@ DWORD WINAPI DECLSPEC_HOTPATCH WaitForMultipleObjectsEx( DWORD count, const HAND } +/*********************************************************************** + * WaitOnAddress (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH WaitOnAddress( volatile void *addr, void *cmp, SIZE_T size, DWORD timeout ) +{ + LARGE_INTEGER to; + + if (timeout != INFINITE) + { + to.QuadPart = -(LONGLONG)timeout * 10000; + return set_ntstatus( RtlWaitOnAddress( (const void *)addr, cmp, size, &to )); + } + return set_ntstatus( RtlWaitOnAddress( (const void *)addr, cmp, size, NULL )); +} + + /*********************************************************************** * Events ***********************************************************************/

1 0

Alexandre Julliard : ntdll: Use the user shared data to implement RtlQueryUnbiasedInterruptTime().
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 9b12068c6c8ba656e8ca768227b1a970877d4730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b12068c6c8ba656e8ca7682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:07:20 2020 +0200 ntdll: Use the user shared data to implement RtlQueryUnbiasedInterruptTime(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 2 -- dlls/ntdll/time.c | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index f50d4b4d70..1628af8df2 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -222,8 +222,6 @@ static void test_user_shared_data_time(void) pRtlQueryUnbiasedInterruptTime(&t3); } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ - /* FIXME: not always in order, but should be close */ - todo_wine_if(t1 > t2 && t1 - t2 < 50 * TICKSPERMSEC) ok(t1 <= t2, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); ok(t2 <= t3 || broken(t2 == t3 + 82410089070) /* w864 has some weird offset on testbot */, diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 06854c020d..f900b55d83 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -47,6 +47,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -1128,11 +1129,21 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old */ BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG *time) { + ULONG high, low; + if (!time) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); return FALSE; } - *time = monotonic_counter(); + + do + { + high = user_shared_data->InterruptTime.High1Time; + low = user_shared_data->InterruptTime.LowPart; + } + while (high != user_shared_data->InterruptTime.High2Time); + /* FIXME: should probably subtract InterruptTimeBias */ + *time = (ULONGLONG)high << 32 | low; return TRUE; }

1 0

Alexandre Julliard : ntdll: Use the user shared data to implement NtGetTickCount().
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: cc5953048e570155deb791b9e9e738a0508c2032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5953048e570155deb791b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 18:55:54 2020 +0200 ntdll: Use the user shared data to implement NtGetTickCount(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index b42a621aa2..06854c020d 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -44,6 +44,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "wine/exception.h" @@ -577,9 +578,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceFrequency( LARGE_INTEGER *frequ * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONG WINAPI NtGetTickCount(void) +ULONG WINAPI DECLSPEC_HOTPATCH NtGetTickCount(void) { - return monotonic_counter() / TICKSPERMSEC; + /* note: we ignore TickCountMultiplier */ + return user_shared_data->u.TickCount.LowPart; } /* calculate the mday of dst change date, so that for instance Sun 5 Oct 2007

1 0

Alexandre Julliard : ntdll: Centralize initialization of the user shared data.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 0936606c383744daa8be046db72e8e888522ce21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0936606c383744daa8be046d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 15:38:28 2020 +0200 ntdll: Centralize initialization of the user shared data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 55 +++-------------------------- dlls/ntdll/tests/info.c | 1 - dlls/ntdll/thread.c | 93 +++++++++++++++++++++++++++++++++---------------- dlls/ntdll/version.c | 6 ---- 4 files changed, 67 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0936606c383744daa8be…

1 0

Alexandre Julliard : ntdll: Add some more CPU feature flags.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: ab350866e414e8c603dee7007e43f2813bd66e4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab350866e414e8c603dee700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 15:14:46 2020 +0200 ntdll: Add some more CPU feature flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 34 +++++++++++++++++++++++++++++++--- include/winnt.h | 4 ++++ include/winternl.h | 15 +++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2076806573..51f8cdb190 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1091,6 +1091,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if(regs2[3] & (1 << 3 )) info->FeatureSet |= CPU_FEATURE_PSE; if(regs2[3] & (1 << 4 )) info->FeatureSet |= CPU_FEATURE_TSC; + if(regs2[3] & (1 << 6 )) info->FeatureSet |= CPU_FEATURE_PAE; if(regs2[3] & (1 << 8 )) info->FeatureSet |= CPU_FEATURE_CX8; if(regs2[3] & (1 << 11)) info->FeatureSet |= CPU_FEATURE_SEP; if(regs2[3] & (1 << 12)) info->FeatureSet |= CPU_FEATURE_MTRR; @@ -1100,6 +1101,9 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if(regs2[3] & (1 << 24)) info->FeatureSet |= CPU_FEATURE_FXSR; if(regs2[3] & (1 << 25)) info->FeatureSet |= CPU_FEATURE_SSE; if(regs2[3] & (1 << 26)) info->FeatureSet |= CPU_FEATURE_SSE2; + if(regs2[2] & (1 << 0 )) info->FeatureSet |= CPU_FEATURE_SSE3; + if(regs2[2] & (1 << 13)) info->FeatureSet |= CPU_FEATURE_CX128; + if(regs2[2] & (1 << 27)) info->FeatureSet |= CPU_FEATURE_XSAVE; user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 4) & 1; @@ -1112,8 +1116,11 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] >> 27) & 1; user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] >> 13) & 1; - if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24))) /* has SSE2 and FXSAVE/FXRSTOR */ - user_shared_data->ProcessorFeatures[PF_SSE_DAZ_MODE_AVAILABLE] = have_sse_daz_mode(); + if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24)) && have_sse_daz_mode()) /* has SSE2 and FXSAVE/FXRSTOR */ + { + info->FeatureSet |= CPU_FEATURE_DAZ; + user_shared_data->ProcessorFeatures[PF_SSE_DAZ_MODE_AVAILABLE] = TRUE; + } if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) { @@ -1134,7 +1141,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 31) & 1; user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 27) & 1; - if (regs2[3] >> 31) info->FeatureSet |= CPU_FEATURE_3DNOW; + if (regs2[2] & (1 << 2)) info->FeatureSet |= CPU_FEATURE_VIRT; + if (regs2[3] & (1 << 20)) info->FeatureSet |= CPU_FEATURE_NX; + if (regs2[3] & (1 << 27)) info->FeatureSet |= CPU_FEATURE_TSC; + if (regs2[3] & (1u << 31)) info->FeatureSet |= CPU_FEATURE_3DNOW; } } else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL) @@ -1147,6 +1157,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Revision |= ((regs2[0] >> 4 ) & 0xf) << 8; /* model */ info->Revision |= regs2[0] & 0xf; /* stepping */ + if(regs2[2] & (1 << 5)) info->FeatureSet |= CPU_FEATURE_VIRT; if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS; user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 5) & 1; @@ -1156,6 +1167,8 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) do_cpuid(0x80000001, regs2); /* get vendor features */ user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 27) & 1; + if (regs2[3] & (1 << 20)) info->FeatureSet |= CPU_FEATURE_NX; + if (regs2[3] & (1 << 27)) info->FeatureSet |= CPU_FEATURE_TSC; } } else @@ -1248,9 +1261,15 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (!_stricmp(line, "features")) { if (strstr(value, "vfpv3")) + { + info->FeatureSet |= CPU_FEATURE_ARM_VFP_32; user_shared_data->ProcessorFeatures[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = TRUE; + } if (strstr(value, "neon")) + { + info->FeatureSet |= CPU_FEATURE_ARM_NEON; user_shared_data->ProcessorFeatures[PF_ARM_NEON_INSTRUCTIONS_AVAILABLE] = TRUE; + } continue; } } @@ -1268,7 +1287,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) valsize = sizeof(value); if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0)) + { + info->FeatureSet |= CPU_FEATURE_ARM_VFP_32; user_shared_data->ProcessorFeatures[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = value; + } #else FIXME("CPU Feature detection not implemented.\n"); #endif @@ -1316,9 +1338,15 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (!_stricmp(line, "Features")) { if (strstr(value, "crc32")) + { + info->FeatureSet |= CPU_FEATURE_ARM_V8_CRC32; user_shared_data->ProcessorFeatures[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = TRUE; + } if (strstr(value, "aes")) + { + info->FeatureSet |= CPU_FEATURE_ARM_V8_CRYPTO; user_shared_data->ProcessorFeatures[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = TRUE; + } continue; } } diff --git a/include/winnt.h b/include/winnt.h index 99c3793346..1f0a7e344e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -924,6 +924,10 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 #define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 #define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 +#define PF_RDTSCP_INSTRUCTION_AVAILABLE 32 +#define PF_RDPID_INSTRUCTION_AVAILABLE 33 +#define PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE 34 +#define PF_MONITORX_INSTRUCTION_AVAILABLE 35 /* Execution state flags */ diff --git a/include/winternl.h b/include/winternl.h index ed8b28ea1f..14455946ba 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1368,6 +1368,21 @@ typedef struct _SYSTEM_CPU_INFORMATION { #define CPU_FEATURE_SSE2 0x00010000 /* SSE2 extensions (XMMI64) */ #define CPU_FEATURE_DS 0x00020000 /* Debug Store */ #define CPU_FEATURE_HTT 0x00040000 /* Hyper Threading Technology */ +#define CPU_FEATURE_SSE3 0x00080000 /* SSE3 extensions */ +#define CPU_FEATURE_CX128 0x00100000 /* cmpxchg16b instruction */ +#define CPU_FEATURE_XSAVE 0x00800000 /* XSAVE instructions */ +#define CPU_FEATURE_2NDLEV 0x04000000 /* Second-level address translation */ +#define CPU_FEATURE_VIRT 0x08000000 /* Virtualization support */ +#define CPU_FEATURE_RDFS 0x10000000 /* RDFSBASE etc. instructions */ +#define CPU_FEATURE_NX 0x20000000 /* Data execution prevention */ + +/* FIXME: following values are made up, actual flags are unknown */ +#define CPU_FEATURE_PAE 0x00200000 +#define CPU_FEATURE_DAZ 0x00400000 +#define CPU_FEATURE_ARM_VFP_32 0x00000001 +#define CPU_FEATURE_ARM_NEON 0x00000002 +#define CPU_FEATURE_ARM_V8_CRC32 0x00000004 +#define CPU_FEATURE_ARM_V8_CRYPTO 0x00000008 /* System Information Class 0x02 */

1 0

Alexandre Julliard : ntdll: Make the windows directory a global variable.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: ca13f489e18fb1f7944e3bdcfdfc4a810bf80994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca13f489e18fb1f7944e3bdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 12:40:08 2020 +0200 ntdll: Make the windows directory a global variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 6 +++--- dlls/ntdll/env.c | 2 -- dlls/ntdll/loader.c | 6 ++++-- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 3 +-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 6ae34cb416..af9499c404 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3189,11 +3189,11 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit if (!ai->arch || !ai->name || !ai->public_key) return STATUS_NO_SUCH_FILE; if (!(path = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(manifest_dirW) + - wcslen(user_shared_data->NtSystemRoot) * sizeof(WCHAR) ))) + wcslen(windows_dir) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - wcscpy( path, user_shared_data->NtSystemRoot ); - memcpy( path + wcslen(path), manifest_dirW, sizeof(manifest_dirW) ); + wcscpy( path, windows_dir ); + wcscat( path, manifest_dirW ); if (!RtlDosPathNameToNtPathName_U( path, &path_us, NULL, NULL )) { diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index f81f500bcb..f8b243154b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -50,8 +50,6 @@ static const UNICODE_STRING null_str = { 0, 0, NULL }; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); -static const WCHAR windows_dir[] = {'C',':','\\','w','i','n','d','o','w','s',0}; - static BOOL first_prefix_start; /* first ever process start in this prefix? */ static inline SIZE_T get_env_length( const WCHAR *env ) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6e41b37ad8..3c05c524af 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -69,6 +69,8 @@ typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *) const struct unix_funcs *unix_funcs = NULL; +/* windows directory */ +const WCHAR windows_dir[] = {'C',':','\\','w','i','n','d','o','w','s',0}; /* system directory with trailing backslash */ const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\',0}; @@ -2870,7 +2872,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) goto done; } - needed = (wcslen(user_shared_data->NtSystemRoot) * sizeof(WCHAR) + + needed = (wcslen(windows_dir) * sizeof(WCHAR) + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + nameW.Length + 2*sizeof(WCHAR)); if (!(*fullname = p = RtlAllocateHeap( GetProcessHeap(), 0, needed ))) @@ -2878,7 +2880,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) status = STATUS_NO_MEMORY; goto done; } - wcscpy( p, user_shared_data->NtSystemRoot ); + wcscpy( p, windows_dir ); p += wcslen(p); memcpy( p, winsxsW, sizeof(winsxsW) ); p += ARRAY_SIZE( winsxsW ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4321347e72..9e1f6e20fc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -144,6 +144,7 @@ extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY FARPROC origfun, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; +extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; extern const WCHAR syswow64_dir[] DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 238a63aad0..3345a9c515 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -54,7 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); struct _KUSER_SHARED_DATA *user_shared_data = NULL; static size_t user_shared_data_size; -static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; @@ -275,7 +274,7 @@ TEB *thread_init(void) } user_shared_data = addr; user_shared_data_size = size; - memcpy( user_shared_data->NtSystemRoot, default_windirW, sizeof(default_windirW) ); + wcscpy( user_shared_data->NtSystemRoot, windows_dir ); /* allocate and initialize the PEB and initial TEB */

1 0

Alexandre Julliard : include: Update the KUSER_SHARED_DATA structure.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: db88a3ec5a566f08b1f93be0b08720cca2f29d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db88a3ec5a566f08b1f93be0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:05:26 2020 +0200 include: Update the KUSER_SHARED_DATA structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 137 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 96 insertions(+), 41 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index db8073ebe3..707eca0b32 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1170,52 +1170,107 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE #define NX_SUPPORT_POLICY_OPTIN 2 #define NX_SUPPORT_POLICY_OPTOUT 3 -#define MAX_WOW64_SHARED_ENTRIES 16 +#define XSTATE_LEGACY_FLOATING_POINT 0 +#define XSTATE_LEGACY_SSE 1 +#define XSTATE_GSSE 2 + +#define XSTATE_MASK_LEGACY_FLOATING_POINT (1 << XSTATE_LEGACY_FLOATING_POINT) +#define XSTATE_MASK_LEGACY_SSE (1 << XSTATE_LEGACY_SSE) +#define XSTATE_MASK_LEGACY (XSTATE_MASK_LEGACY_FLOATING_POINT | XSTATE_MASK_LEGACY_SSE) +#define XSTATE_MASK_GSSE (1 << XSTATE_GSSE) + +#define MAXIMUM_XSTATE_FEATURES 64 + +typedef struct _XSTATE_FEATURE +{ + ULONG Offset; + ULONG Size; +} XSTATE_FEATURE, *PXSTATE_FEATURE; + +typedef struct _XSTATE_CONFIGURATION +{ + ULONG64 EnabledFeatures; + ULONG Size; + ULONG OptimizedSave:1; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; +} XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; typedef struct _KUSER_SHARED_DATA { - ULONG TickCountLowDeprecated; - ULONG TickCountMultiplier; - volatile KSYSTEM_TIME InterruptTime; - volatile KSYSTEM_TIME SystemTime; - volatile KSYSTEM_TIME TimeZoneBias; - USHORT ImageNumberLow; - USHORT ImageNumberHigh; - WCHAR NtSystemRoot[260]; - ULONG MaxStackTraceDepth; - ULONG CryptoExponent; - ULONG TimeZoneId; - ULONG LargePageMinimum; - ULONG Reserved2[7]; - NT_PRODUCT_TYPE NtProductType; - BOOLEAN ProductTypeIsValid; - ULONG NtMajorVersion; - ULONG NtMinorVersion; - BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; - ULONG Reserved1; - ULONG Reserved3; - volatile ULONG TimeSlip; - ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; - LARGE_INTEGER SystemExpirationDate; - ULONG SuiteMask; - BOOLEAN KdDebuggerEnabled; - UCHAR NXSupportPolicy; - volatile ULONG ActiveConsoleId; - volatile ULONG DismountCount; - ULONG ComPlusPackage; - ULONG LastSystemRITEventTickCount; - ULONG NumberOfPhysicalPages; - BOOLEAN SafeBootMode; - ULONG TraceLogging; - ULONGLONG TestRetInstruction; - ULONG SystemCall; - ULONG SystemCallReturn; - ULONGLONG SystemCallPad[3]; + ULONG TickCountLowDeprecated; /* 0x000 */ + ULONG TickCountMultiplier; /* 0x004 */ + volatile KSYSTEM_TIME InterruptTime; /* 0x008 */ + volatile KSYSTEM_TIME SystemTime; /* 0x014 */ + volatile KSYSTEM_TIME TimeZoneBias; /* 0x020 */ + USHORT ImageNumberLow; /* 0x02c */ + USHORT ImageNumberHigh; /* 0x02e */ + WCHAR NtSystemRoot[260]; /* 0x030 */ + ULONG MaxStackTraceDepth; /* 0x238 */ + ULONG CryptoExponent; /* 0x23c */ + ULONG TimeZoneId; /* 0x240 */ + ULONG LargePageMinimum; /* 0x244 */ + ULONG AitSamplingValue; /* 0x248 */ + ULONG AppCompatFlag; /* 0x24c */ + ULONGLONG RNGSeedVersion; /* 0x250 */ + ULONG GlobalValidationRunLevel; /* 0x258 */ + volatile ULONG TimeZoneBiasStamp; /* 0x25c */ + ULONG NtBuildNumber; /* 0x260 */ + NT_PRODUCT_TYPE NtProductType; /* 0x264 */ + BOOLEAN ProductTypeIsValid; /* 0x268 */ + USHORT NativeProcessorArchitecture; /* 0x26a */ + ULONG NtMajorVersion; /* 0x26c */ + ULONG NtMinorVersion; /* 0x270 */ + BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; /* 0x274 */ + ULONG Reserved1; /* 0x2b4 */ + ULONG Reserved3; /* 0x2b8 */ + volatile ULONG TimeSlip; /* 0x2bc */ + ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; /* 0x2c0 */ + ULONG BootId; /* 0x2c4 */ + LARGE_INTEGER SystemExpirationDate; /* 0x2c8 */ + ULONG SuiteMask; /* 0x2d0 */ + BOOLEAN KdDebuggerEnabled; /* 0x2d4 */ + UCHAR NXSupportPolicy; /* 0x2d5 */ + volatile ULONG ActiveConsoleId; /* 0x2d8 */ + volatile ULONG DismountCount; /* 0x2dc */ + ULONG ComPlusPackage; /* 0x2e0 */ + ULONG LastSystemRITEventTickCount; /* 0x2e4 */ + ULONG NumberOfPhysicalPages; /* 0x2e8 */ + BOOLEAN SafeBootMode; /* 0x2ec */ + UCHAR VirtualizationFlags; /* 0x2ed */ + ULONG TraceLogging; /* 0x2f0 */ + ULONGLONG TestRetInstruction; /* 0x2f8 */ + ULONG SystemCall; /* 0x300 */ + ULONG SystemCallReturn; /* 0x304 */ + ULONGLONG SystemCallPad[3]; /* 0x308 */ union { - volatile KSYSTEM_TIME TickCount; + volatile KSYSTEM_TIME TickCount; /* 0x320 */ volatile ULONG64 TickCountQuad; } DUMMYUNIONNAME; - ULONG Cookie; - ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; + ULONG Cookie; /* 0x330 */ + LONGLONG ConsoleSessionForegroundProcessId; /* 0x338 */ + ULONGLONG TimeUpdateLock; /* 0x340 */ + ULONGLONG BaselineSystemTimeQpc; /* 0x348 */ + ULONGLONG BaselineInterruptTimeQpc; /* 0x350 */ + ULONGLONG QpcSystemTimeIncrement; /* 0x358 */ + ULONGLONG QpcInterruptTimeIncrement; /* 0x360 */ + UCHAR QpcSystemTimeIncrementShift; /* 0x368 */ + UCHAR QpcInterruptTimeIncrementShift; /* 0x369 */ + USHORT UnparkedProcessorCount; /* 0x36a */ + ULONG EnclaveFeatureMask[4]; /* 0x36c */ + ULONG TelemetryCoverageRound; /* 0x37c */ + USHORT UserModeGlobalLogger[16]; /* 0x380 */ + ULONG HeapTracingPid[2]; /* 0x390 */ + ULONG CritSecTracingPid[2]; /* 0x398 */ + ULONG ImageFileExecutionOptions; /* 0x3a0 */ + ULONG LangGenerationCount; /* 0x3a4 */ + ULONG ActiveProcessorAffinity; /* 0x3a8 */ + volatile ULONGLONG InterruptTimeBias; /* 0x3b0 */ + volatile ULONGLONG QpcBias; /* 0x3b8 */ + ULONG ActiveProcessorCount; /* 0x3c0 */ + volatile UCHAR ActiveGroupCount; /* 0x3c4 */ + USHORT QpcData; /* 0x3c6 */ + LARGE_INTEGER TimeZoneBiasEffectiveStart; /* 0x3c8 */ + LARGE_INTEGER TimeZoneBiasEffectiveEnd; /* 0x3d0 */ + XSTATE_CONFIGURATION XState; /* 0x3d8 */ } KSHARED_USER_DATA, *PKSHARED_USER_DATA; typedef enum _MEMORY_CACHING_TYPE {

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020