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

Alexandre Julliard : ntdll: Implement SystemTimeAdjustmentInformation class.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 75e2f79b684f70e7184592db16d819b778d575ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=75e2f79b684f70e7184592db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 11:49:18 2020 +0200 ntdll: Implement SystemTimeAdjustmentInformation class. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 13 +++++++++++++ dlls/ntdll/tests/info.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 6 ++++++ 3 files changed, 59 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 03bf45d0a0..978919146c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2937,6 +2937,19 @@ NTSTATUS WINAPI NtQuerySystemInformation( FIXME("info_class SYSTEM_INTERRUPT_INFORMATION\n"); } break; + case SystemTimeAdjustmentInformation: + { + SYSTEM_TIME_ADJUSTMENT_QUERY query = { 156250, 156250, TRUE }; + + len = sizeof(query); + if (Length == len) + { + if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; + else memcpy( SystemInformation, &query, len ); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + } + break; case SystemKernelDebuggerInformation: { SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 23d18b3983..f923cc7743 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -23,6 +23,7 @@ #include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); @@ -76,6 +77,7 @@ static BOOL InitFunctionPtrs(void) } NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); @@ -740,6 +742,40 @@ static void test_query_interrupt(void) HeapFree( GetProcessHeap(), 0, sii); } +static void test_time_adjustment(void) +{ + SYSTEM_TIME_ADJUSTMENT_QUERY query; + SYSTEM_TIME_ADJUSTMENT adjust; + NTSTATUS status; + ULONG len; + + memset( &query, 0xcc, sizeof(query) ); + status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query), &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len ); + ok( query.TimeAdjustmentDisabled == TRUE || query.TimeAdjustmentDisabled == FALSE, + "wrong value %x\n", query.TimeAdjustmentDisabled ); + + status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)-1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); + ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len ); + + status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)+1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); + ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len ); + + adjust.TimeAdjustment = query.TimeAdjustment; + adjust.TimeAdjustmentDisabled = query.TimeAdjustmentDisabled; + status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust) ); + ok( status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD, "got %08x\n", status ); + status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)-1 ); + todo_wine + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); + status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)+1 ); + todo_wine + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status ); +} + static void test_query_kerndebug(void) { NTSTATUS status; @@ -2632,6 +2668,10 @@ START_TEST(info) trace("Starting test_query_interrupt()\n"); test_query_interrupt(); + /* 0x1c SystemTimeAdjustmentInformation */ + trace("Starting test_time_adjustment()\n"); + test_time_adjustment(); + /* 0x23 SystemKernelDebuggerInformation */ trace("Starting test_query_kerndebug()\n"); test_query_kerndebug(); diff --git a/include/winternl.h b/include/winternl.h index 14455946ba..edcbc5ca13 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1624,6 +1624,12 @@ typedef struct _SYSTEM_REGISTRY_QUOTA_INFORMATION { PVOID Reserved1; } SYSTEM_REGISTRY_QUOTA_INFORMATION, *PSYSTEM_REGISTRY_QUOTA_INFORMATION; +typedef struct _SYSTEM_TIME_ADJUSTMENT_QUERY { + ULONG TimeAdjustment; + ULONG TimeIncrement; + BOOLEAN TimeAdjustmentDisabled; +} SYSTEM_TIME_ADJUSTMENT_QUERY, *PSYSTEM_TIME_ADJUSTMENT_QUERY; + typedef struct _SYSTEM_TIME_ADJUSTMENT { ULONG TimeAdjustment; BOOLEAN TimeAdjustmentDisabled;

1 0

Alexandre Julliard : kernel32: Move Get/SetSystemTimeAdjustment to kernelbase.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 4ccc3e52852447198a8b81fc91472bfa3b614914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccc3e52852447198a8b81fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 12:01:17 2020 +0200 kernel32: Move Get/SetSystemTimeAdjustment to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/time.c | 47 ----------------------------------------- dlls/kernelbase/file.c | 30 ++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 ++-- 4 files changed, 34 insertions(+), 51 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 72a09c53c8..0324e90201 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -832,7 +832,7 @@ @ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) @ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall -import GetSystemTime(ptr) -@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) +@ stdcall -import GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall -import GetSystemTimeAsFileTime(ptr) @ stdcall -import GetSystemTimePreciseAsFileTime(ptr) @ stdcall -import GetSystemTimes(ptr ptr ptr) @@ -1445,7 +1445,7 @@ @ stdcall -import SetSystemFileCacheSize(long long long) @ stdcall SetSystemPowerState(long long) @ stdcall -import SetSystemTime(ptr) -@ stdcall SetSystemTimeAdjustment(long long) +@ stdcall -import SetSystemTimeAdjustment(long long) @ stdcall SetTapeParameters(ptr long ptr) @ stdcall SetTapePosition(ptr long long long long long) @ stdcall SetTermsrvAppInstallMode(long) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 127f341adc..4b959684c6 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -56,53 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; -/*********************************************************************** - * GetSystemTimeAdjustment (KERNEL32.@) - * - * Get the period between clock interrupts and the amount the clock - * is adjusted each interrupt so as to keep it in sync with an external source. - * - * PARAMS - * lpTimeAdjustment [out] The clock adjustment per interrupt in 100's of nanoseconds. - * lpTimeIncrement [out] The time between clock interrupts in 100's of nanoseconds. - * lpTimeAdjustmentDisabled [out] The clock synchronisation has been disabled. - * - * RETURNS - * TRUE. - * - * BUGS - * Only the special case of disabled time adjustments is supported. - */ -BOOL WINAPI GetSystemTimeAdjustment( PDWORD lpTimeAdjustment, PDWORD lpTimeIncrement, - PBOOL lpTimeAdjustmentDisabled ) -{ - *lpTimeAdjustment = 0; - *lpTimeIncrement = 10000000 / sysconf(_SC_CLK_TCK); - *lpTimeAdjustmentDisabled = TRUE; - return TRUE; -} - - -/*********************************************************************** - * SetSystemTimeAdjustment (KERNEL32.@) - * - * Enables or disables the timing adjustments to the system's clock. - * - * PARAMS - * dwTimeAdjustment [in] Number of units to add per clock interrupt. - * bTimeAdjustmentDisabled [in] Adjustment mode. - * - * RETURNS - * Success: TRUE. - * Failure: FALSE. - */ -BOOL WINAPI SetSystemTimeAdjustment( DWORD dwTimeAdjustment, BOOL bTimeAdjustmentDisabled ) -{ - /* Fake function for now... */ - FIXME("(%08x,%d): stub !\n", dwTimeAdjustment, bTimeAdjustmentDisabled); - return TRUE; -} - /********************************************************************* * GetCalendarInfoA (KERNEL32.@) * diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 905029066e..cc79284520 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3861,6 +3861,23 @@ void WINAPI DECLSPEC_HOTPATCH GetSystemTime( SYSTEMTIME *systime ) } +/*********************************************************************** + * GetSystemTimeAdjustment (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetSystemTimeAdjustment( DWORD *adjust, DWORD *increment, BOOL *disabled ) +{ + SYSTEM_TIME_ADJUSTMENT_QUERY st; + ULONG len; + + if (!set_ntstatus( NtQuerySystemInformation( SystemTimeAdjustmentInformation, &st, sizeof(st), &len ))) + return FALSE; + *adjust = st.TimeAdjustment; + *increment = st.TimeIncrement; + *disabled = st.TimeAdjustmentDisabled; + return TRUE; +} + + /*********************************************************************** * GetSystemTimeAsFileTime (kernelbase.@) */ @@ -3918,6 +3935,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetSystemTime( const SYSTEMTIME *systime ) } +/*********************************************************************** + * SetSystemTimeAdjustment (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetSystemTimeAdjustment( DWORD adjust, BOOL disabled ) +{ + SYSTEM_TIME_ADJUSTMENT st; + + st.TimeAdjustment = adjust; + st.TimeAdjustmentDisabled = disabled; + return set_ntstatus( NtSetSystemInformation( SystemTimeAdjustmentInformation, &st, sizeof(st) )); +} + + /********************************************************************* * SystemTimeToFileTime (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1500229969..15f43db65d 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -695,7 +695,7 @@ @ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) kernel32.GetSystemPreferredUILanguages # @ stub GetSystemStateRootFolder @ stdcall GetSystemTime(ptr) -@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall GetSystemTimeAsFileTime(ptr) @ stdcall GetSystemTimePreciseAsFileTime(ptr) @ stdcall GetSystemTimes(ptr ptr ptr) @@ -1477,7 +1477,7 @@ @ stdcall SetStdHandleEx(long long ptr) @ stdcall SetSystemFileCacheSize(long long long) @ stdcall SetSystemTime(ptr) -@ stdcall SetSystemTimeAdjustment(long long) kernel32.SetSystemTimeAdjustment +@ stdcall SetSystemTimeAdjustment(long long) @ stdcall SetThreadContext(long ptr) @ stdcall SetThreadDescription(ptr wstr) @ stdcall SetThreadErrorMode(long ptr)

1 0

Alexandre Julliard : kernel32: Move the *PreferredUILanguages functions to kernelbase and ntdll.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 6bed2b427b0e6302ea6bdb24b5a2ee7a06a687f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bed2b427b0e6302ea6bdb24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 12:42:14 2020 +0200 kernel32: Move the *PreferredUILanguages functions to kernelbase and ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 12 ++-- dlls/kernel32/locale.c | 133 ---------------------------------------- dlls/kernel32/tests/locale.c | 66 ++++++++++++++++++-- dlls/kernelbase/kernelbase.spec | 12 ++-- dlls/kernelbase/locale.c | 58 ++++++++++++++++++ dlls/ntdll/locale.c | 99 ++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 6 ++ include/winnls.h | 3 + include/winternl.h | 6 ++ 9 files changed, 245 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bed2b427b0e6302ea6b…

1 0

Alexandre Julliard : ntdll: Silence a va_start compiler warning.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 9b8fabf4b0203a87dbf5f2019f6f1b9b8008e406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b8fabf4b0203a87dbf5f201… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 14:31:35 2020 +0200 ntdll: Silence a va_start compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 3336d6390f..362c68e5e0 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -567,7 +567,7 @@ ULONG WINAPI EtwTraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, US /****************************************************************************** * EtwTraceMessage (NTDLL.@) */ -ULONG WINAPIV EtwTraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, ... ) +ULONG WINAPIV EtwTraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, /*USHORT*/ ULONG number, ... ) { __ms_va_list valist; ULONG ret;

1 0

Zebediah Figura : wine.inf: Install some driver libraries in the system32/drivers subdirectory.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: cfa4282119e67f43207395fa8053d6b65e2a4af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfa4282119e67f43207395fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 21 18:32:56 2020 -0500 wine.inf: Install some driver libraries in the system32/drivers subdirectory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e4f3d74886..0a43cc779c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2612,11 +2612,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,hidclass.sys,- 12,,http.sys,- 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,scsiport.sys,- 12,,tdi.sys,- +12,,usbd.sys,- 12,,winebus.sys,- 12,,winehid.sys,- 12,,wineusb.sys,- @@ -2665,11 +2668,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,hidclass.sys 12,,http.sys 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys +12,,scsiport.sys 12,,tdi.sys +12,,usbd.sys 12,,winebus.sys 12,,winehid.sys 12,,wineusb.sys

1 0

Daniel Lehman : vcruntime140_1: Use return address from catch block routine if not provided by catch block info.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 2f5ea32377fc977ef14282c276020fba58799235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f5ea32377fc977ef14282c2… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu May 21 20:51:30 2020 -0700 vcruntime140_1: Use return address from catch block routine if not provided by catch block info. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 4cc6897223..e1a39c0662 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -603,7 +603,8 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, (ULONG_PTR)rva_to_ptr(ci.handler, dispatch->ImageBase); catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; - catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( + if (ci.ret_addr) + catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( ci.ret_addr + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); }

1 0

Nikolay Sivov : dwrite: Propagate feature mask to lookups collected from it.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 7780d7856be3ea3d272b32036b73fac610aa8b2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7780d7856be3ea3d272b3203… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:05 2020 +0300 dwrite: Propagate feature mask to lookups collected from it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 + dlls/dwrite/opentype.c | 144 ++++++++++++++++++++++++++++++++----------- 2 files changed, 111 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7780d7856be3ea3d272b…

1 0

Nikolay Sivov : dwrite: Keep track of shaping stage feature applies to.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: b8625c7f035deddcc3129d76627c54b6faabd3ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8625c7f035deddcc3129d76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:06 2020 +0300 dwrite: Keep track of shaping stage feature applies to. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/opentype.c | 117 +++++++++++++++++++++++++------------------ dlls/dwrite/shape.c | 2 + 3 files changed, 71 insertions(+), 50 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3145daba4b..ef48ec18c4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -528,6 +528,7 @@ struct shaping_feature unsigned int default_value; unsigned int mask; unsigned int shift; + unsigned int stage; }; struct shaping_features @@ -535,6 +536,7 @@ struct shaping_features struct shaping_feature *features; size_t count; size_t capacity; + unsigned int stage; }; extern void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index d2a9318da8..1cb61027b4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4131,14 +4131,57 @@ static int lookups_sorting_compare(const void *a, const void *b) return left->index < right->index ? -1 : left->index > right->index ? 1 : 0; }; +static void opentype_layout_add_lookups(const struct ot_feature_list *feature_list, UINT16 total_lookup_count, + struct ot_gsubgpos_table *table, struct shaping_feature *feature, struct lookups *lookups) +{ + UINT16 feature_offset, lookup_count; + unsigned int i, j; + + /* Feature wasn't found */ + if (feature->index == 0xffff) + return; + + /* FIXME: skip non-global ones for now. */ + if (!(feature->flags & FEATURE_GLOBAL)) + return; + + feature_offset = GET_BE_WORD(feature_list->features[feature->index].offset); + + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookup_count)); + if (!lookup_count) + return; + + if (!dwrite_array_reserve((void **)&lookups->lookups, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->lookups))) + { + return; + } + + for (i = 0; i < lookup_count; ++i) + { + UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookuplist_index[i])); + + if (lookup_index >= total_lookup_count) + continue; + + j = lookups->count; + lookups->lookups[j].index = lookup_index; + lookups->lookups[j].mask = feature->mask; + lookups->count++; + } +} + static void opentype_layout_collect_lookups(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features, struct ot_gsubgpos_table *table, struct lookups *lookups) { UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; + unsigned int last_num_lookups = 0, stage; struct shaping_feature *feature; - unsigned int i, j, l, next_bit; + unsigned int i, j, next_bit; unsigned int global_bit_shift = 1; unsigned int global_bit_mask = 1; UINT16 feature_index; @@ -4235,51 +4278,37 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex } } - /* Collect lookups for all given features. */ - for (i = 0; i < features->count; ++i) + for (stage = 0; stage <= features->stage; ++stage) { - UINT16 feature_offset, lookup_count; - - feature = &features->features[i]; - - /* Feature wasn't found */ - if (feature->index == 0xffff) - continue; - - /* FIXME: skip non-global ones for now. */ - if (!(feature->flags & FEATURE_GLOBAL)) - continue; - - feature_offset = GET_BE_WORD(feature_list->features[feature->index].offset); - - 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->lookups, &lookups->capacity, lookups->count + lookup_count, - sizeof(*lookups->lookups))) + for (i = 0; i < features->count; ++i) { - return; + if (features->features[i].stage == stage) + opentype_layout_add_lookups(feature_list, total_lookup_count, table, &features->features[i], lookups); } - for (l = 0; l < lookup_count; ++l) + /* Sort and merge lookups for current stage. */ + if (last_num_lookups < lookups->count) { - UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + qsort(lookups->lookups + last_num_lookups, lookups->count - last_num_lookups, sizeof(*lookups->lookups), + lookups_sorting_compare); - if (lookup_index >= total_lookup_count) - continue; - - j = lookups->count; - lookups->lookups[j].index = lookup_index; - lookups->lookups[j].mask = feature->mask; - lookups->count++; + j = last_num_lookups; + for (i = j + 1; i < lookups->count; ++i) + { + if (lookups->lookups[i].index != lookups->lookups[j].index) + { + lookups->lookups[++j] = lookups->lookups[i]; + } + else + { + lookups->lookups[j].mask |= lookups->lookups[i].mask; + } + } + lookups->count = j + 1; } - } - /* Sort lookups. */ - qsort(lookups->lookups, lookups->count, sizeof(*lookups->lookups), lookups_sorting_compare); + last_num_lookups = lookups->count; + } } void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, @@ -4291,13 +4320,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); for (i = 0; i < lookups.count; ++i) - { - /* Skip duplicates. */ - if (i && lookups.lookups[i].index == lookups.lookups[i - 1].index) - continue; - opentype_layout_apply_gpos_lookup(context, lookups.lookups[i].index); - } heap_free(lookups.lookups); } @@ -4607,13 +4630,7 @@ HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *contex opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); for (i = 0; i < lookups.count; ++i) - { - /* Skip duplicates. */ - if (i && lookups.lookups[i].index == lookups.lookups[i - 1].index) - continue; - opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.lookups[i].index); - } heap_free(lookups.lookups); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index df680373a2..0f88ad4821 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -213,6 +213,7 @@ static void shape_add_feature_full(struct shaping_features *features, unsigned i features->features[i].flags = flags; features->features[i].max_value = value; features->features[i].default_value = flags & FEATURE_GLOBAL ? value : 0; + features->features[i].stage = features->stage; features->count++; } @@ -267,6 +268,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s features->features[j].flags ^= FEATURE_GLOBAL; features->features[j].max_value = max(features->features[j].max_value, features->features[i].max_value); } + features->features[j].stage = min(features->features[j].stage, features->features[i].stage); } } features->count = j + 1;

1 0

Nikolay Sivov : dwrite: Set per-glyph feature mask.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 8962f82210b2cdc733ce3eee1c257f846bb54a9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8962f82210b2cdc733ce3eee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:07 2020 +0300 dwrite: Set per-glyph feature mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 18 ++++++++++++++-- dlls/dwrite/dwrite_private.h | 6 ++++++ dlls/dwrite/opentype.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/shape.c | 3 +++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 98e1ef4a0d..62258ec441 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1259,6 +1259,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; + context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * max_glyph_count); script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; scriptprops = &dwritescripts_properties[script]; @@ -1268,6 +1269,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, text_props, glyph_props); done: + heap_free(context.glyph_infos); heap_free(string); return hr; @@ -1284,6 +1286,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 struct scriptshaping_context context; struct dwrite_fontface *font_obj; unsigned int i, script; + HRESULT hr; TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, @@ -1327,8 +1330,13 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; + context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + + hr = shape_get_positions(&context, scriptprops->scripttags); - return shape_get_positions(&context, scriptprops->scripttags); + heap_free(context.glyph_infos); + + return hr; } static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWriteTextAnalyzer2 *iface, @@ -1344,6 +1352,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite DWRITE_MEASURING_MODE measuring_mode; struct dwrite_fontface *font_obj; unsigned int i, script; + HRESULT hr; TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, @@ -1389,8 +1398,13 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; + context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + + hr = shape_get_positions(&context, scriptprops->scripttags); - return shape_get_positions(&context, scriptprops->scripttags); + heap_free(context.glyph_infos); + + return hr; } static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ef48ec18c4..afa4bce91d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -461,6 +461,11 @@ struct scriptshaping_cache } gdef; }; +struct shaping_glyph_info +{ + unsigned int mask; +}; + struct scriptshaping_context { struct scriptshaping_cache *cache; @@ -493,6 +498,7 @@ struct scriptshaping_context unsigned int range_count; } user_features; unsigned int global_mask; + struct shaping_glyph_info *glyph_infos; unsigned int glyph_count; float emsize; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1cb61027b4..cb1743c5cc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4311,6 +4311,53 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex } } +static int feature_search_compare(const void *a, const void* b) +{ + unsigned int tag = *(unsigned int *)a; + const struct shaping_feature *feature = b; + + return tag < feature->tag ? -1 : tag > feature->tag ? 1 : 0; +} + +static unsigned int shaping_features_get_mask(const struct shaping_features *features, unsigned int tag, unsigned int *shift) +{ + struct shaping_feature *feature; + + feature = bsearch(&tag, features->features, features->count, sizeof(*features->features), feature_search_compare); + + if (!feature || feature->index == 0xffff) + return 0; + + *shift = feature->shift; + return feature->mask; +} + +static void opentype_layout_set_glyph_masks(struct scriptshaping_context *context, const struct shaping_features *features) +{ + const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; + unsigned int f, r, g, start_glyph = 0, mask, shift, value; + + for (g = 0; g < context->glyph_count; ++g) + context->glyph_infos[g].mask = context->global_mask; + + /* FIXME: set shaper masks */ + + for (r = 0; r < context->user_features.range_count; ++r) + { + for (f = 0; f < user_features[r]->featureCount; ++f) + { + mask = shaping_features_get_mask(features, user_features[r]->features[f].nameTag, &shift); + if (!mask) + continue; + + value = (user_features[r]->features[f].parameter << shift) & mask; + for (g = 0; g < context->user_features.range_lengths[r]; ++g) + context->glyph_infos[g + start_glyph].mask = (context->glyph_infos[g + start_glyph].mask & ~mask) | value; + start_glyph += context->user_features.range_lengths[r]; + } + } +} + void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { @@ -4319,6 +4366,8 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); + opentype_layout_set_glyph_masks(context, features); + for (i = 0; i < lookups.count; ++i) opentype_layout_apply_gpos_lookup(context, lookups.lookups[i].index); @@ -4629,6 +4678,8 @@ HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *contex opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); + opentype_layout_set_glyph_masks(context, features); + for (i = 0; i < lookups.count; ++i) opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.lookups[i].index); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 0f88ad4821..18afb2212b 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -370,7 +370,10 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i if (!context->is_sideways) { if (context->is_rtl) + { shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','a')); + shape_add_feature_full(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), 0, 1); + } else { shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','a'));

1 0

Nikolay Sivov : dwrite: Silence warning for name entries with platform 3/encoding 10.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: bb91e877b3d06d17c6da45b020ec3b79ac4a72a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb91e877b3d06d17c6da45b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 13:58:08 2020 +0300 dwrite: Silence warning for name entries with platform 3/encoding 10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index cb1743c5cc..35b02d5573 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -778,7 +778,7 @@ typedef struct { enum TT_NAME_WINDOWS_ENCODING_ID { TT_NAME_WINDOWS_ENCODING_SYMBOL = 0, - TT_NAME_WINDOWS_ENCODING_UCS2, + TT_NAME_WINDOWS_ENCODING_UNICODE_BMP, TT_NAME_WINDOWS_ENCODING_SJIS, TT_NAME_WINDOWS_ENCODING_PRC, TT_NAME_WINDOWS_ENCODING_BIG5, @@ -787,7 +787,7 @@ enum TT_NAME_WINDOWS_ENCODING_ID TT_NAME_WINDOWS_ENCODING_RESERVED1, TT_NAME_WINDOWS_ENCODING_RESERVED2, TT_NAME_WINDOWS_ENCODING_RESERVED3, - TT_NAME_WINDOWS_ENCODING_UCS4 + TT_NAME_WINDOWS_ENCODING_UNICODE_FULL }; enum TT_NAME_MAC_ENCODING_ID @@ -1972,7 +1972,8 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT switch (encoding) { case TT_NAME_WINDOWS_ENCODING_SYMBOL: - case TT_NAME_WINDOWS_ENCODING_UCS2: + case TT_NAME_WINDOWS_ENCODING_UNICODE_BMP: + case TT_NAME_WINDOWS_ENCODING_UNICODE_FULL: break; case TT_NAME_WINDOWS_ENCODING_SJIS: codepage = 932;

1 0