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

Alexandre Julliard : ntdll: Fix off-by-one buffer size error.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: f5e703042ac6b10e803e7b796ffddabfdd82438c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e703042ac6b10e803e7b79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 16:08:12 2020 +0200 ntdll: Fix off-by-one buffer size error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49262 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3c05c524af..fecb3673d4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2582,7 +2582,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, len = wcslen( name ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - maxlen = max( maxlen, dll_path_maxlen ) + len + sizeof(".so"); + maxlen = max( maxlen, dll_path_maxlen + 1 ) + len + sizeof(".so"); if (!(file = RtlAllocateHeap( GetProcessHeap(), 0, maxlen ))) return STATUS_NO_MEMORY;

1 0

Nikolay Sivov : dwrite: Implement alternate substitution (GSUB lookup 3).
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: d5058fb304b72d6a0a836780ad865c6100d1a4c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5058fb304b72d6a0a836780… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:23 2020 +0300 dwrite: Implement alternate substitution (GSUB lookup 3). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 81b6aaa229..c815165505 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -569,6 +569,14 @@ struct ot_gsub_singlesubst_format2 UINT16 substitutes[1]; }; +struct ot_gsub_altsubst_format1 +{ + UINT16 format; + UINT16 coverage; + UINT16 count; + UINT16 sets[1]; +}; + struct ot_gsub_chaincontext_subst_format1 { UINT16 format; @@ -3256,6 +3264,23 @@ static inline unsigned int dwrite_popcount(unsigned int x) #endif } +static inline unsigned int dwrite_ctz(unsigned int x) +{ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) + return __builtin_ctz(x); +#else + unsigned int c = 32; + x &= - (int) x; + if (x) c--; + if (x & 0x0000ffff) c -= 16; + if (x & 0x00ff00ff) c -= 8; + if (x & 0x0f0f0f0f) c -= 4; + if (x & 0x33333333) c -= 2; + if (x & 0x55555555) c -= 1; + return c; +#endif +} + static inline unsigned int dwrite_log2i(unsigned int x) { #if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) @@ -4505,6 +4530,61 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ return ret; } +static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, + unsigned int subtable_offset) +{ + const struct dwrite_fonttable *gsub = &context->table->table; + UINT16 format, coverage, orig_glyph, glyph; + unsigned int idx, coverage_index, offset; + BOOL ret; + + idx = context->cur; + orig_glyph = glyph = context->u.subst.glyphs[idx]; + + format = table_read_be_word(gsub, subtable_offset); + + if (format == 1) + { + const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); + unsigned int count, shift, alt_index; + + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); + + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + if (coverage_index >= GET_BE_WORD(format1->count)) + return FALSE; + + offset = table_read_be_word(gsub, subtable_offset + + FIELD_OFFSET(struct ot_gsub_altsubst_format1, sets[coverage_index])); + + count = table_read_be_word(gsub, subtable_offset + offset); + if (!count) + return FALSE; + + shift = dwrite_ctz(lookup->mask); + alt_index = (lookup->mask & context->glyph_infos[idx].mask) >> shift; + + if (alt_index > count || !alt_index) + return FALSE; + + glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); + } + else + WARN("Unexpected alternate substitution format %d.\n", format); + + if ((ret = (glyph != orig_glyph))) + { + context->u.subst.glyphs[idx] = glyph; + opentype_set_subst_glyph_props(context, idx, glyph); + context->cur++; + } + + return ret; +} + #define CHAIN_CONTEXT_MAX_LENGTH 64 static BOOL opentype_layout_context_match_input(struct scriptshaping_context *context, unsigned int subtable_offset, @@ -4785,11 +4865,13 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_SINGLE_SUBST: ret = opentype_layout_apply_gsub_single_substitution(context, lookup, subtable_offset); break; + case GSUB_LOOKUP_ALTERNATE_SUBST: + ret = opentype_layout_apply_gsub_alt_substitution(context, lookup, subtable_offset); + break; case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_MULTIPLE_SUBST: - case GSUB_LOOKUP_ALTERNATE_SUBST: case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST:

1 0

Paul Gofman : ntoskrnl.exe: Add KeSignalCallDpcSynchronize() function.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 4921d24627f5f004b94f1212187adeda3f09219a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4921d24627f5f004b94f1212… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 12:50:49 2020 +0300 ntoskrnl.exe: Add KeSignalCallDpcSynchronize() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 46 +++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 48 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1a0cf1c5c2..bfac397011 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -75,6 +75,7 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; static TP_POOL *dpc_call_tp; static TP_CALLBACK_ENVIRON dpc_call_tpe; DECLARE_CRITICAL_SECTION(dpc_call_cs); +static DWORD dpc_call_tls_index; /* tid of the thread running client request */ static DWORD request_thread; @@ -3161,6 +3162,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) KeQueryTickCount( &count ); /* initialize the global KeTickCount */ NtBuildNumber = NtCurrentTeb()->Peb->OSBuildNumber; ntoskrnl_heap = HeapCreate( HEAP_CREATE_ENABLE_EXECUTE, 0, 0 ); + dpc_call_tls_index = TlsAlloc(); break; case DLL_PROCESS_DETACH: if (reserved) break; @@ -4027,6 +4029,8 @@ struct generic_call_dpc_context ULONG *cpu_count_barrier; void *context; ULONG cpu_index; + ULONG current_barrier_flag; + LONG *barrier_passed_count; }; static void WINAPI generic_call_dpc_callback(TP_CALLBACK_INSTANCE *instance, void *context) @@ -4044,7 +4048,9 @@ static void WINAPI generic_call_dpc_callback(TP_CALLBACK_INSTANCE *instance, voi new.Mask = 1 << c->cpu_index; NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)); + TlsSetValue(dpc_call_tls_index, context); c->routine((PKDPC)0xdeadbeef, c->context, c->cpu_count_barrier, c->reverse_barrier); + TlsSetValue(dpc_call_tls_index, NULL); NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &old, sizeof(old)); } @@ -4054,6 +4060,7 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) static struct generic_call_dpc_context *contexts; DEFERRED_REVERSE_BARRIER reverse_barrier; static ULONG last_cpu_count; + LONG barrier_passed_count; ULONG cpu_count_barrier; ULONG i; @@ -4107,6 +4114,7 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) memset(contexts, 0, sizeof(*contexts) * cpu_count); last_cpu_count = cpu_count; + barrier_passed_count = 0; for (i = 0; i < cpu_count; ++i) { @@ -4115,6 +4123,7 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) contexts[i].routine = routine; contexts[i].context = context; contexts[i].cpu_index = i; + contexts[i].barrier_passed_count = &barrier_passed_count; TrySubmitThreadpoolCallback(generic_call_dpc_callback, &contexts[i], &dpc_call_tpe); } @@ -4125,6 +4134,43 @@ void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) LeaveCriticalSection(&dpc_call_cs); } + +BOOLEAN WINAPI KeSignalCallDpcSynchronize(void *barrier) +{ + struct generic_call_dpc_context *context = TlsGetValue(dpc_call_tls_index); + DEFERRED_REVERSE_BARRIER *b = barrier; + LONG curr_flag, comp, done_value; + BOOL first; + + TRACE("barrier %p, context %p.\n", barrier, context); + + if (!context) + { + WARN("Called outside of DPC context.\n"); + return FALSE; + } + + context->current_barrier_flag ^= 0x80000000; + curr_flag = context->current_barrier_flag; + + first = !context->cpu_index; + comp = curr_flag + context->cpu_index; + done_value = curr_flag + b->TotalProcessors; + + if (first) + InterlockedExchange((LONG *)&b->Barrier, comp); + + while (InterlockedCompareExchange((LONG *)&b->Barrier, comp + 1, comp) != done_value) + ; + + InterlockedIncrement(context->barrier_passed_count); + + while (first && InterlockedCompareExchange(context->barrier_passed_count, 0, b->TotalProcessors)) + ; + + return first; +} + void WINAPI KeSignalCallDpcDone(void *barrier) { InterlockedDecrement((LONG *)barrier); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 923ba22529..331b03ba9f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -61,6 +61,7 @@ @ stub KefReleaseSpinLockFromDpcLevel @ stdcall KeGenericCallDpc(ptr ptr) @ stdcall KeSignalCallDpcDone(ptr) +@ stdcall KeSignalCallDpcSynchronize(ptr) @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -fastcall ObfDereferenceObject(ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1b001d7424..8368f8c6e9 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1721,6 +1721,7 @@ void WINAPI KeSetSystemAffinityThread(KAFFINITY); KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity); BOOLEAN WINAPI KeSetTimerEx(KTIMER*,LARGE_INTEGER,LONG,KDPC*); void WINAPI KeSignalCallDpcDone(void*); +BOOLEAN WINAPI KeSignalCallDpcSynchronize(void*); NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Paul Gofman : ntoskrnl.exe: Add KeSignalCallDpcDone() function.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 73d915fd8e3c7389b114f5d8379d126047b906e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d915fd8e3c7389b114f5d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 12:50:47 2020 +0300 ntoskrnl.exe: Add KeSignalCallDpcDone() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c4f2180c4c..2291842a67 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4011,3 +4011,8 @@ BOOLEAN WINAPI KdRefreshDebuggerNotPresent(void) return !KdDebuggerEnabled; } + +void WINAPI KeSignalCallDpcDone(void *barrier) +{ + InterlockedDecrement((LONG *)barrier); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c4ddfb2830..28f8d5e4cd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -59,6 +59,7 @@ @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @ stub KefReleaseSpinLockFromDpcLevel +@ stdcall KeSignalCallDpcDone(ptr) @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -fastcall ObfDereferenceObject(ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c1d083ef01..b11f4d239d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1713,6 +1713,7 @@ KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY); KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity); BOOLEAN WINAPI KeSetTimerEx(KTIMER*,LARGE_INTEGER,LONG,KDPC*); +void WINAPI KeSignalCallDpcDone(void*); NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Nikolay Sivov : dwrite: Reference currently used layout table in context.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 3cf308d1b8dd57d0569d796cdfc206eb08e944c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cf308d1b8dd57d0569d796c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:21 2020 +0300 dwrite: Reference currently used layout table in context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 3 ++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 114 +++++++++++++++++++------------------------ 3 files changed, 54 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cf308d1b8dd57d0569d…

1 0

Paul Gofman : ntoskrnl.exe: Add KeGenericCallDpc() function.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 1adc1b1ecf387bcefea9e4b2204b878f90add394 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1adc1b1ecf387bcefea9e4b2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 27 12:50:48 2020 +0300 ntoskrnl.exe: Add KeGenericCallDpc() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 113 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 7 +++ 3 files changed, 121 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2291842a67..1a0cf1c5c2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -72,6 +72,10 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; #define MAX_SERVICE_NAME 260 +static TP_POOL *dpc_call_tp; +static TP_CALLBACK_ENVIRON dpc_call_tpe; +DECLARE_CRITICAL_SECTION(dpc_call_cs); + /* tid of the thread running client request */ static DWORD request_thread; @@ -3160,6 +3164,10 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) break; case DLL_PROCESS_DETACH: if (reserved) break; + + if (dpc_call_tp) + CloseThreadpool(dpc_call_tp); + HeapDestroy( ntoskrnl_heap ); RtlRemoveVectoredExceptionHandler( handler ); break; @@ -4012,6 +4020,111 @@ BOOLEAN WINAPI KdRefreshDebuggerNotPresent(void) return !KdDebuggerEnabled; } +struct generic_call_dpc_context +{ + DEFERRED_REVERSE_BARRIER *reverse_barrier; + PKDEFERRED_ROUTINE routine; + ULONG *cpu_count_barrier; + void *context; + ULONG cpu_index; +}; + +static void WINAPI generic_call_dpc_callback(TP_CALLBACK_INSTANCE *instance, void *context) +{ + struct generic_call_dpc_context *c = context; + GROUP_AFFINITY old, new; + + TRACE("instance %p, context %p.\n", instance, context); + + NtQueryInformationThread(GetCurrentThread(), ThreadGroupInformation, + &old, sizeof(old), NULL); + + memset(&new, 0, sizeof(new)); + + new.Mask = 1 << c->cpu_index; + NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &new, sizeof(new)); + + c->routine((PKDPC)0xdeadbeef, c->context, c->cpu_count_barrier, c->reverse_barrier); + NtSetInformationThread(GetCurrentThread(), ThreadGroupInformation, &old, sizeof(old)); +} + +void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE routine, void *context) +{ + ULONG cpu_count = KeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS); + static struct generic_call_dpc_context *contexts; + DEFERRED_REVERSE_BARRIER reverse_barrier; + static ULONG last_cpu_count; + ULONG cpu_count_barrier; + ULONG i; + + TRACE("routine %p, context %p.\n", routine, context); + + EnterCriticalSection(&dpc_call_cs); + + if (!dpc_call_tp) + { + if (!(dpc_call_tp = CreateThreadpool(NULL))) + { + ERR("Could not create thread pool.\n"); + LeaveCriticalSection(&dpc_call_cs); + return; + } + + SetThreadpoolThreadMinimum(dpc_call_tp, cpu_count); + SetThreadpoolThreadMaximum(dpc_call_tp, cpu_count); + + memset(&dpc_call_tpe, 0, sizeof(dpc_call_tpe)); + dpc_call_tpe.Version = 1; + dpc_call_tpe.Pool = dpc_call_tp; + } + + reverse_barrier.Barrier = cpu_count; + reverse_barrier.TotalProcessors = cpu_count; + cpu_count_barrier = cpu_count; + + if (contexts) + { + if (last_cpu_count < cpu_count) + { + static struct generic_call_dpc_context *new_contexts; + if (!(new_contexts = heap_realloc(contexts, sizeof(*contexts) * cpu_count))) + { + ERR("No memory.\n"); + LeaveCriticalSection(&dpc_call_cs); + return; + } + contexts = new_contexts; + SetThreadpoolThreadMinimum(dpc_call_tp, cpu_count); + SetThreadpoolThreadMaximum(dpc_call_tp, cpu_count); + } + } + else if (!(contexts = heap_alloc(sizeof(*contexts) * cpu_count))) + { + ERR("No memory.\n"); + LeaveCriticalSection(&dpc_call_cs); + return; + } + + memset(contexts, 0, sizeof(*contexts) * cpu_count); + last_cpu_count = cpu_count; + + for (i = 0; i < cpu_count; ++i) + { + contexts[i].reverse_barrier = &reverse_barrier; + contexts[i].cpu_count_barrier = &cpu_count_barrier; + contexts[i].routine = routine; + contexts[i].context = context; + contexts[i].cpu_index = i; + + TrySubmitThreadpoolCallback(generic_call_dpc_callback, &contexts[i], &dpc_call_tpe); + } + + while (InterlockedCompareExchange((LONG *)&cpu_count_barrier, 0, 0)) + SwitchToThread(); + + LeaveCriticalSection(&dpc_call_cs); +} + void WINAPI KeSignalCallDpcDone(void *barrier) { InterlockedDecrement((LONG *)barrier); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 28f8d5e4cd..923ba22529 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -59,6 +59,7 @@ @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @ stub KefReleaseSpinLockFromDpcLevel +@ stdcall KeGenericCallDpc(ptr ptr) @ stdcall KeSignalCallDpcDone(ptr) @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b11f4d239d..1b001d7424 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -122,6 +122,12 @@ typedef struct _KMUTANT { UCHAR ApcDisable; } KMUTANT, *PKMUTANT, *RESTRICTED_POINTER PRKMUTANT, KMUTEX, *PKMUTEX, *RESTRICTED_POINTER PRKMUTEX; +typedef struct _DEFERRED_REVERSE_BARRIER +{ + ULONG Barrier; + ULONG TotalProcessors; +} DEFERRED_REVERSE_BARRIER; + typedef enum _KWAIT_REASON { Executive, @@ -1686,6 +1692,7 @@ BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*); void WINAPI KeEnterCriticalRegion(void); +void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE,PVOID); ULONG WINAPI KeGetCurrentProcessorNumber(void); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN);

1 0

Nikolay Sivov : dwrite: Use cluster map to apply use feature ranges.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 47272be6aada4b7e41908ab047ac064f3fae4950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47272be6aada4b7e41908ab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:24 2020 +0300 dwrite: Use cluster map to apply use feature ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 ++ dlls/dwrite/dwrite_private.h | 7 +++++++ dlls/dwrite/opentype.c | 32 +++++++++++++++++++++++++++----- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a7186a6815..556191a13d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1251,6 +1251,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.is_sideways = is_sideways; context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; + context.u.pos.clustermap = clustermap; context.glyph_count = glyph_count; context.emsize = emSize; context.measuring_mode = DWRITE_MEASURING_MODE_NATURAL; @@ -1320,6 +1321,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.is_sideways = is_sideways; context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; + context.u.pos.clustermap = clustermap; context.glyph_count = glyph_count; context.emsize = emSize * ppdip; context.measuring_mode = measuring_mode; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ad86422d50..cf3e0f7c12 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -484,6 +484,7 @@ struct scriptshaping_context { const UINT16 *glyphs; const DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + const UINT16 *clustermap; } pos; struct { @@ -494,6 +495,12 @@ struct scriptshaping_context unsigned int capacity; const WCHAR *digits; } subst; + struct + { + UINT16 *glyphs; + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + UINT16 *clustermap; + } buffer; } u; const struct ot_gsubgpos_table *table; /* Either GSUB or GPOS. */ diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c815165505..f687740fa4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4436,18 +4436,40 @@ static unsigned int shaping_features_get_mask(const struct shaping_features *fea return feature->mask; } +static void opentype_layout_get_glyph_range_for_text(struct scriptshaping_context *context, unsigned int start_char, + unsigned int end_char, unsigned int *start_glyph, unsigned int *end_glyph) +{ + *start_glyph = context->u.buffer.clustermap[start_char]; + if (end_char >= context->length - 1) + *end_glyph = context->glyph_count - 1; + else + *end_glyph = context->u.buffer.clustermap[end_char + 1] - 1; +} + 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; + unsigned int f, r, g, start_char, 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 (r = 0, start_char = 0; r < context->user_features.range_count; ++r) { + unsigned int start_glyph, end_glyph; + + if (start_char >= context->length) + break; + + opentype_layout_get_glyph_range_for_text(context, start_char, start_char + context->user_features.range_lengths[r], + &start_glyph, &end_glyph); + start_char += context->user_features.range_lengths[r]; + + if (start_glyph > end_glyph || end_glyph >= context->glyph_count) + continue; + for (f = 0; f < user_features[r]->featureCount; ++f) { mask = shaping_features_get_mask(features, user_features[r]->features[f].nameTag, &shift); @@ -4455,9 +4477,9 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex 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]; + + for (g = start_glyph; g <= end_glyph; ++g) + context->glyph_infos[g].mask = (context->glyph_infos[g].mask & ~mask) | value; } } }

1 0

Nikolay Sivov : dwrite: Handle extension substitution (GSUB lookup 7).
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 3abcf68af994780050cbef5e3d2cdd30c1abc681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3abcf68af994780050cbef5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 10:14:22 2020 +0300 dwrite: Handle extension substitution (GSUB lookup 7). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 255 ++++++++++++++++++++++++++----------------------- 1 file changed, 135 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3abcf68af994780050cb…

1 0

Zebediah Figura : vkd3d-shader: Use the size from struct vkd3d_shader_constant_buffer when declaring push constant buffers.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: d08107da90962b0def92c9f2d62fa1bf94e8dff6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d08107da90962b0def92c9f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:43 2020 -0500 vkd3d-shader: Use the size from struct vkd3d_shader_constant_buffer when declaring push constant buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a3cc5f9..d09e0fd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2029,6 +2029,7 @@ struct vkd3d_push_constant_buffer_binding { struct vkd3d_shader_register reg; struct vkd3d_shader_push_constant_buffer pc; + unsigned int size; }; struct vkd3d_shader_phase @@ -4892,7 +4893,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com const SpvStorageClass storage_class = SpvStorageClassPushConstant; uint32_t vec4_id, length_id, struct_id, pointer_type_id, var_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - unsigned int i, j, count, reg_idx, cb_size; + unsigned int i, j, count, reg_idx; struct vkd3d_symbol reg_symbol; uint32_t *member_ids; @@ -4918,8 +4919,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com if (!cb->reg.type) continue; - cb_size = cb->reg.idx[1].offset; - length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb_size); + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb->size); member_ids[j] = vkd3d_spirv_build_op_type_array(builder, vec4_id, length_id); vkd3d_spirv_build_op_decorate1(builder, member_ids[j], SpvDecorationArrayStride, 16); @@ -4979,6 +4979,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi */ unsigned int cb_size_in_bytes = cb->size * VKD3D_VEC4_SIZE * sizeof(uint32_t); push_cb->reg = *reg; + push_cb->size = cb->size; if (cb_size_in_bytes > push_cb->pc.size) { WARN("Constant buffer size %u exceeds push constant size %u.\n",

1 0

Zebediah Figura : vkd3d-shader: Read constant buffer offsets from the second index.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: 4c993c672a1765d9d9bb353992a0e917689f9b56 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c993c672a1765d9d9bb353… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 14:15:30 2020 -0500 vkd3d-shader: Read constant buffer offsets from the second index. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 10 +++++++++- libs/vkd3d-shader/spirv.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5156074..de6aea3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -646,7 +646,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK) ins->flags |= VKD3DSI_INDEXED_DYNAMIC; - ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[1].offset; + ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[2].offset; ins->declaration.cb.register_space = 0; if (shader_is_sm_5_1(priv)) @@ -1603,6 +1603,14 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } } + else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2) + { + /* SM5.1 places the buffer offset in idx[2]; earlier versions place it + * in idx[1]. Normalize to SM5.1. */ + param->idx[2] = param->idx[1]; + param->idx[1].rel_addr = NULL; + param->idx[1].offset = 0; + } map_register(priv, param); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0d4812b..a3cc5f9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2832,7 +2832,7 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { assert(!reg->idx[0].rel_addr); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } else if (reg->type == VKD3DSPR_IMMCONSTBUFFER) {

1 0