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

Alexandre Julliard : ntdll: Make the windows directory a global variable.
by Alexandre Julliard May 21, 2020

May 21, 2020

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 May 21, 2020

May 21, 2020

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

Alexandre Julliard : wineboot: Use wide character string literals.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: c42b415fabfc7b4428c1790b1bddc08e5a79f1ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c42b415fabfc7b4428c1790b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 13:36:06 2020 +0200 wineboot: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 366 ++++++++++++------------------------------- 1 file changed, 104 insertions(+), 262 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c42b415fabfc7b4428c1…

1 0

Alistair Leslie-Hughes : loader: http.sys belongs in the driver directory.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: 0c68a1510e2236cc4b57330aec04eacae8cab224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c68a1510e2236cc4b57330a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 21 11:44:58 2020 +1000 loader: http.sys belongs in the driver directory. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e602546da8..e4f3d74886 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,http.sys,- 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- @@ -2664,6 +2665,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,http.sys 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys

1 0

Alexandre Julliard : ntdll: Centralize initialization of the user shared data.
by Alexandre Julliard May 21, 2020

May 21, 2020

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

Jacek Caban : configure: Remove no longer needed -Wno-incompatible-library-redeclaration.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: 267e61fd188b33bf83d89b09a2ed0f63916a527e URL: https://source.winehq.org/git/wine.git/?a=commit;h=267e61fd188b33bf83d89b09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 01:46:18 2020 +0200 configure: Remove no longer needed -Wno-incompatible-library-redeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 31 ------------------------------- configure.ac | 2 -- 2 files changed, 33 deletions(-) diff --git a/configure b/configure index f695e0fb00..ccda743c99 100755 --- a/configure +++ b/configure @@ -10417,37 +10417,6 @@ $as_echo "$ac_cv_crosscflags__Wlogical_op" >&6; } if test "x$ac_cv_crosscflags__Wlogical_op" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wlogical-op" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wincompatible-library-redeclaration" >&5 -$as_echo_n "checking whether the cross-compiler supports -Wincompatible-library-redeclaration... " >&6; } -if ${ac_cv_crosscflags__Wincompatible_library_redeclaration+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -ac_wine_try_cflags_saved_cc=$CC -ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Wincompatible-library-redeclaration" -CC="$CROSSCC" -ac_exeext=".exe" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int __cdecl mainCRTStartup(void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_crosscflags__Wincompatible_library_redeclaration=yes -else - ac_cv_crosscflags__Wincompatible_library_redeclaration=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -CC=$ac_wine_try_cflags_saved_cc -ac_exeext=$ac_wine_try_cflags_saved_exeext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wincompatible_library_redeclaration" >&5 -$as_echo "$ac_cv_crosscflags__Wincompatible_library_redeclaration" >&6; } -if test "x$ac_cv_crosscflags__Wincompatible_library_redeclaration" = xyes; then : - EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration" -fi case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-omit-frame-pointer" >&5 diff --git a/configure.ac b/configure.ac index 4c3f1b9de5..d81f5cc88c 100644 --- a/configure.ac +++ b/configure.ac @@ -1092,8 +1092,6 @@ then WINE_TRY_CROSSCFLAGS([-Wwrite-strings]) WINE_TRY_CROSSCFLAGS([-Wpointer-arith]) WINE_TRY_CROSSCFLAGS([-Wlogical-op]) - WINE_TRY_CROSSCFLAGS([-Wincompatible-library-redeclaration], - [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration"]) case $host_cpu in *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;;

1 0

Alexandre Julliard : kernelbase: Move WaitOnAddress implementation to sync.c.
by Alexandre Julliard May 21, 2020

May 21, 2020

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

Nikolay Sivov : dwrite: Set feature indices before collecting lookups.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: 093d6966be963fea9a9ca090ac6714e3f74458d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=093d6966be963fea9a9ca090… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:46 2020 +0300 dwrite: Set feature indices before collecting lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 60 ++++++++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0b863147af..db3543d79e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -508,6 +508,7 @@ extern struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_font struct shaping_feature { unsigned int tag; + unsigned int index; }; struct shaping_features diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f22cd7469b..411b3df855 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4099,6 +4099,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex { UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; + UINT16 feature_index; unsigned int i, j, l; /* ScriptTable offset. */ @@ -4132,42 +4133,57 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature_list) return; - /* Collect lookups for all given features. */ for (i = 0; i < features->count; ++i) { + BOOL found = FALSE; + for (j = 0; j < script_feature_count; ++j) { - UINT16 feature_index = table_read_be_word(&table->table, table->script_list + table_offset + + feature_index = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_index[j])); if (feature_index >= total_feature_count) continue; - if (feature_list->features[feature_index].tag == features->features[i].tag) { - WORD feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); - WORD lookup_count; + found = TRUE; + features->features[i].index = feature_index; + break; + } + } - lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookup_count)); - if (!lookup_count) - continue; + if (!found) + features->features[i].index = 0xffff; + } - if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, - sizeof(*lookups->indexes))) - { - return; - } + /* Collect lookups for all given features. */ + for (i = 0; i < features->count; ++i) + { + feature_index = features->features[i].index; + if (feature_index != 0xffff) + { + UINT16 feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); + UINT16 lookup_count; - for (l = 0; l < lookup_count; ++l) - { - UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookup_count)); + if (!lookup_count) + continue; + + if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->indexes))) + { + return; + } + + for (l = 0; l < lookup_count; ++l) + { + UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); - if (lookup_index >= total_lookup_count) - continue; + if (lookup_index >= total_lookup_count) + continue; - lookups->indexes[lookups->count++] = lookup_index; - } + lookups->indexes[lookups->count++] = lookup_index; } } }

1 0

Hans Leidekker : wbemprox: Get the operating system serial number from the registry.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: f516a23041b3871625764611321250f977fe750a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f516a23041b3871625764611… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 18 09:49:40 2020 +0200 wbemprox: Get the operating system serial number from the registry. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5af47a0ddc..ddd12d6ebc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -243,7 +243,7 @@ static const struct column col_operatingsystem[] = { L"OSProductSuite", CIM_UINT32 }, { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, - { L"SerialNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, { L"SuiteMask", CIM_UINT32 }, @@ -3360,6 +3360,27 @@ static WCHAR *get_osname( const WCHAR *caption ) memcpy( ret + len, partitionW, sizeof(partitionW) ); return ret; } +static WCHAR *get_osserialnumber(void) +{ + HKEY hkey = 0; + DWORD size, type; + WCHAR *ret = NULL; + + if (!RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, L"ProductId", NULL, &type, NULL, &size ) && type == REG_SZ && + (ret = heap_alloc( size + sizeof(WCHAR) ))) + { + size += sizeof(WCHAR); + if (RegQueryValueExW( hkey, L"ProductId", NULL, NULL, (BYTE *)ret, &size )) + { + heap_free( ret ); + ret = NULL; + } + } + if (hkey) RegCloseKey( hkey ); + if (!ret) return heap_strdupW( L"12345-OEM-1234567-12345" ); + return ret; +} static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { WCHAR *ret = heap_alloc( 33 * sizeof(WCHAR) ); @@ -3414,7 +3435,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; - rec->serialnumber = L"12345-OEM-1234567-12345"; + rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */

1 0

Nikolay Sivov : dwrite: Remove feature duplicates before applying them.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: 2aaa6d1af98cd3b1f50339a17a0b7fff82334770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aaa6d1af98cd3b1f50339a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:45 2020 +0300 dwrite: Remove feature duplicates before applying them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 0372d739b5..82ad3a2a1e 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -210,6 +210,27 @@ static void shape_add_feature(struct shaping_features *features, unsigned int ta features->features[features->count++].tag = tag; } +static int features_sorting_compare(const void *a, const void *b) +{ + const struct shaping_feature *left = a, *right = b; + return left->tag != right->tag ? (left->tag < right->tag ? -1 : 1) : 0; +}; + +static void shape_merge_features(struct shaping_features *features) +{ + unsigned int j = 0, i; + + /* Sort and merge duplicates. */ + qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); + + for (i = 1; i < features->count; ++i) + { + if (features->features[i].tag != features->features[j].tag) + features->features[++j] = features->features[i]; + } + features->count = j + 1; +} + HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) { static const unsigned int common_features[] = @@ -239,6 +260,8 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigne shape_add_feature(&features, horizontal_features[i]); } + shape_merge_features(&features); + /* Resolve script tag to actually supported script. */ if (cache->gpos.table.data) { @@ -322,6 +345,8 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i shape_add_feature(&features, horizontal_features[i]); } + shape_merge_features(&features); + /* Resolve script tag to actually supported script. */ if (cache->gsub.table.data) {

1 0