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

Nikolay Sivov : dwrite: Implement single substitution lookup (GSUB lookup 1).
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: a6be9579196f8c625017a73c536e73f426b0f93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6be9579196f8c625017a73c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:34 2020 +0300 dwrite: Implement single substitution lookup (GSUB lookup 1). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++ dlls/dwrite/dwrite_private.h | 6 ++ dlls/dwrite/opentype.c | 165 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 164 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index bc5c54f21e..5ee057028f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1252,6 +1252,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.length = length; context.is_rtl = is_rtl; context.is_sideways = is_sideways; + context.u.subst.glyphs = glyphs; + context.u.subst.glyph_props = glyph_props; + context.u.subst.max_glyph_count = max_glyph_count; + context.glyph_count = g; context.language_tag = get_opentype_language(locale); script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7a8ce1e499..28ac05a1c1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -478,6 +478,12 @@ struct scriptshaping_context const UINT16 *glyphs; const DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; } pos; + struct + { + UINT16 *glyphs; + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + unsigned int max_glyph_count; + } subst; } u; unsigned int glyph_count; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b5947a8960..e1bfee097b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -507,6 +507,18 @@ enum gpos_lookup_type GPOS_LOOKUP_EXTENSION_POSITION = 9, }; +enum gsub_lookup_type +{ + GSUB_LOOKUP_SINGLE_SUBST = 1, + GSUB_LOOKUP_MULTIPLE_SUBST = 2, + GSUB_LOOKUP_ALTERNATE_SUBST = 3, + GSUB_LOOKUP_LIGATURE_SUBST = 4, + GSUB_LOOKUP_CONTEXTUAL_SUBST = 5, + GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST = 6, + GSUB_LOOKUP_EXTENSION_SUBST = 7, + GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST = 8, +}; + enum gpos_value_format { GPOS_VALUE_X_PLACEMENT = 0x1, @@ -528,13 +540,28 @@ enum OPENTYPE_PLATFORM_ID OPENTYPE_PLATFORM_CUSTOM }; -struct ot_gpos_extensionpos_format1 +struct ot_gsubgpos_extensionpos_format1 { - WORD format; - WORD lookup_type; + UINT16 format; + UINT16 lookup_type; DWORD extension_offset; }; +struct ot_gsub_singlesubst_format1 +{ + UINT16 format; + UINT16 coverage; + short delta; +}; + +struct ot_gsub_singlesubst_format2 +{ + UINT16 format; + UINT16 coverage; + UINT16 count; + UINT16 substitutes[1]; +}; + struct ot_feature { WORD feature_params; @@ -740,12 +767,6 @@ typedef struct { #include "poppack.h" -enum gsub_lookup_type -{ - GSUB_LOOKUP_SINGLE_SUBST = 1, - GSUB_LOOKUP_EXTENSION_SUBST = 7, -}; - enum TT_NAME_WINDOWS_ENCODING_ID { TT_NAME_WINDOWS_ENCODING_SYMBOL = 0, @@ -3286,7 +3307,23 @@ static unsigned int opentype_layout_get_gpos_subtable(const struct scriptshaping FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) { - const struct ot_gpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + const struct ot_gsubgpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + lookup_offset + subtable_offset, sizeof(*format1)); + subtable_offset += GET_BE_DWORD(format1->extension_offset); + } + + return lookup_offset + subtable_offset; +} + +static unsigned int opentype_layout_get_gsub_subtable(const struct scriptshaping_cache *cache, + unsigned int lookup_offset, unsigned int subtable) +{ + UINT16 lookup_type = table_read_be_word(&cache->gsub.table, lookup_offset); + unsigned int subtable_offset = table_read_be_word(&cache->gsub.table, lookup_offset + + FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); + if (lookup_type == GSUB_LOOKUP_EXTENSION_SUBST) + { + const struct ot_gsubgpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gsub.table, lookup_offset + subtable_offset, sizeof(*format1)); subtable_offset += GET_BE_DWORD(format1->extension_offset); } @@ -3971,7 +4008,7 @@ static void opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont lookup_type = GET_BE_WORD(lookup_table->lookup_type); if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) { - const struct ot_gpos_extensionpos_format1 *extension = table_read_ensure(&cache->gpos.table, + const struct ot_gsubgpos_extensionpos_format1 *extension = table_read_ensure(&cache->gpos.table, lookup.offset + GET_BE_WORD(lookup_table->subtable[0]), sizeof(*extension)); WORD format; @@ -4157,9 +4194,115 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, heap_free(lookups.indexes); } +static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct lookup *lookup) +{ + struct scriptshaping_cache *cache = iter->context->cache; + UINT16 format, coverage; + unsigned int i; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gsub_subtable(cache, lookup->offset, i); + UINT16 glyph = iter->context->u.subst.glyphs[iter->pos]; + unsigned int coverage_index; + + format = table_read_be_word(&cache->gsub.table, subtable_offset); + + coverage = table_read_be_word(&cache->gsub.table, subtable_offset + + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); + + if (format == 1) + { + const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(&cache->gsub.table, subtable_offset, + sizeof(*format1)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + continue; + + iter->context->u.subst.glyphs[iter->pos] = glyph + GET_BE_WORD(format1->delta); + break; + } + else if (format == 2) + { + UINT16 count = table_read_be_word(&cache->gsub.table, subtable_offset + + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); + const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(&cache->gsub.table, subtable_offset, + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) + continue; + + iter->context->u.subst.glyphs[iter->pos] = GET_BE_WORD(format2->substitutes[coverage_index]); + break; + } + else + WARN("Unknown single substitution format %u.\n", format); + } + + return FALSE; +} + static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, unsigned int glyph_count, int lookup_index) { + struct ot_gsubgpos_table *table = &context->cache->gsub; + const struct ot_lookup_table *lookup_table; + struct glyph_iterator iter; + struct lookup lookup; + WORD lookup_type; + + lookup.offset = table_read_be_word(&table->table, table->lookup_list + FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index])); + if (!lookup.offset) + return; + + lookup.offset += table->lookup_list; + + if (!(lookup_table = table_read_ensure(&table->table, lookup.offset, sizeof(*lookup_table)))) + return; + + lookup.subtable_count = GET_BE_WORD(lookup_table->subtable_count); + if (!lookup.subtable_count) + return; + + lookup_type = GET_BE_WORD(lookup_table->lookup_type); + lookup.flags = GET_BE_WORD(lookup_table->flags); + + glyph_iterator_init(context, lookup.flags, first_glyph, glyph_count, &iter); + + while (iter.pos < first_glyph + iter.len) + { + BOOL ret; + + if (!glyph_iterator_match(&iter)) + { + ++iter.pos; + continue; + } + + switch (lookup_type) + { + case GSUB_LOOKUP_SINGLE_SUBST: + ret = opentype_layout_apply_gsub_single_substitution(&iter, &lookup); + break; + case GSUB_LOOKUP_MULTIPLE_SUBST: + case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: + case GSUB_LOOKUP_ALTERNATE_SUBST: + case GSUB_LOOKUP_LIGATURE_SUBST: + case GSUB_LOOKUP_CONTEXTUAL_SUBST: + case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: + WARN("Unimplemented lookup %d.\n", lookup_type); + break; + default: + WARN("Unknown lookup type %u.\n", lookup_type); + return; + } + + /* Some lookups update position after making changes. */ + if (!ret) + ++iter.pos; + } } HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index,

1 0

Jacek Caban : winegcc: Make mingw a separated platform from msvc.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 2dee9b98747cbbfe05641e7056d8cf4f908bdad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dee9b98747cbbfe05641e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:20:26 2020 +0200 winegcc: Make mingw a separated platform from msvc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 2 +- tools/winegcc/utils.h | 1 + tools/winegcc/winegcc.c | 24 +++++++++++++----------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index cc5d67977f..0fe9b04b00 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -273,7 +273,7 @@ static char* try_lib_path(const char* dir, const char* pre, static file_type guess_lib_type(enum target_platform platform, const char* dir, const char* library, const char *suffix, char** file) { - if (platform != PLATFORM_WINDOWS && platform != PLATFORM_CYGWIN) + if (platform != PLATFORM_WINDOWS && platform != PLATFORM_MINGW && platform != PLATFORM_CYGWIN) { /* Unix shared object */ if ((*file = try_lib_path(dir, "lib", library, ".so", file_so))) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index cb4778fa09..9c70011a90 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -49,6 +49,7 @@ enum target_platform PLATFORM_ANDROID, PLATFORM_SOLARIS, PLATFORM_WINDOWS, + PLATFORM_MINGW, PLATFORM_CYGWIN }; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 95797e6b63..2be8b508fb 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -181,14 +181,15 @@ static const struct enum target_platform platform; } platform_names[] = { - { "macos", PLATFORM_APPLE }, - { "darwin", PLATFORM_APPLE }, - { "android", PLATFORM_ANDROID }, - { "solaris", PLATFORM_SOLARIS }, - { "cygwin", PLATFORM_CYGWIN }, - { "mingw32", PLATFORM_WINDOWS }, - { "windows", PLATFORM_WINDOWS }, - { "winnt", PLATFORM_WINDOWS } + { "macos", PLATFORM_APPLE }, + { "darwin", PLATFORM_APPLE }, + { "android", PLATFORM_ANDROID }, + { "solaris", PLATFORM_SOLARIS }, + { "cygwin", PLATFORM_CYGWIN }, + { "mingw32", PLATFORM_MINGW }, + { "windows-gnu", PLATFORM_MINGW }, + { "windows", PLATFORM_WINDOWS }, + { "winnt", PLATFORM_MINGW } }; struct options @@ -258,7 +259,7 @@ static enum target_platform build_platform = PLATFORM_SOLARIS; #elif defined(__CYGWIN__) static enum target_platform build_platform = PLATFORM_CYGWIN; #elif defined(_WIN32) -static enum target_platform build_platform = PLATFORM_WINDOWS; +static enum target_platform build_platform = PLATFORM_MINGW; #else static enum target_platform build_platform = PLATFORM_UNSPECIFIED; #endif @@ -487,6 +488,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) break; case PLATFORM_WINDOWS: + case PLATFORM_MINGW: case PLATFORM_CYGWIN: if (opts->shared || opts->win16_app) { @@ -729,7 +731,7 @@ static void compile(struct options* opts, const char* lang) break; } - if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN) + if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW) goto no_compat_defines; if (opts->processor != proc_cpp) @@ -1043,7 +1045,7 @@ static void build(struct options* opts) int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; int fake_module = 0; - int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN); + int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW); unsigned int j; /* NOTE: for the files array we'll use the following convention:

1 0

Jacek Caban : winegcc: Add entry symbol underscore when building linker command.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 346cbb6f266f2e3aa1559981404dfc57dc738e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=346cbb6f266f2e3aa1559981… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:19:23 2020 +0200 winegcc: Add entry symbol underscore when building linker command. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d38ca97488..a5bc0f4576 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1185,14 +1185,9 @@ static void build(struct options* opts) if (!opts->entry_point) { if (opts->subsystem && !strcmp( opts->subsystem, "native" )) - entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_DriverEntry(a)8" : "DriverEntry"; + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry(a)8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) - { - if (opts->unicode_app) - entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_wmainCRTStartup" : "wmainCRTStartup"; - else - entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_mainCRTStartup" : "mainCRTStartup"; - } + entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; else if (!is_pe && !opts->shared && opts->unicode_app) entry_point = "__wine_spec_exe_wentry"; } @@ -1297,7 +1292,10 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); - if (is_pe && entry_point) strarray_add(link_args, strmake("-Wl,--entry,%s", entry_point)); + if (is_pe && entry_point) + strarray_add(link_args, strmake("-Wl,--entry,%s%s", + is_pe && opts->target_cpu == CPU_x86 ? "_" : "", + entry_point)); strarray_add(link_args, spec_o_name);

1 0

Nikolay Sivov : comctl32/propsheet: Use wide string literals.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 30db9fa830702d9e3975bd58799c0b15b6557047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30db9fa830702d9e3975bd58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:11:58 2020 +0300 comctl32/propsheet: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 05ab4aa48d..1604b9e961 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -139,8 +139,7 @@ typedef struct * Defines and global variables */ -static const WCHAR PropSheetInfoStr[] = - {'P','r','o','p','e','r','t','y','S','h','e','e','t','I','n','f','o',0 }; +static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -546,7 +545,6 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, { WCHAR szTitle[256]; const WCHAR *pTitle; - static const WCHAR pszNull[] = { '(','n','u','l','l',')',0 }; if (IS_INTRESOURCE( lppsp->pszTitle )) { @@ -555,7 +553,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, else if (*p) pTitle = p; else - pTitle = pszNull; + pTitle = L"(null)"; } else pTitle = lppsp->pszTitle;

1 0

Zebediah Figura : quartz/vmr9: Forbid setting the video clipping window while connected.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: a54597fd7812c3602f1c8084cc2d38675249fb6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a54597fd7812c3602f1c8084… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:01 2020 -0500 quartz/vmr9: Forbid setting the video clipping window while connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 0bd37fe7f1..54e9b53afb 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3234,7 +3234,7 @@ static void test_clipping_window(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 06e545eedf..52cc80eca4 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1846,23 +1846,30 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon return E_NOTIMPL; } -static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND hwnd) +static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND window) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, hwnd); + TRACE("filter %p, window %p.\n", filter, window); - if (!IsWindow(hwnd)) + if (!IsWindow(window)) { - WARN("Invalid window %p, returning E_INVALIDARG.\n", hwnd); + WARN("Invalid window %p, returning E_INVALIDARG.\n", window); return E_INVALIDARG; } - EnterCriticalSection(&This->renderer.filter.csFilter); - This->hWndClippingWindow = hwnd; - if (This->renderer.sink.pin.peer) - VMR9_maybe_init(This, FALSE, &This->renderer.sink.pin.mt); - LeaveCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.csFilter); + + if (filter->renderer.sink.pin.peer) + { + LeaveCriticalSection(&filter->renderer.filter.csFilter); + WARN("Attempt to set the clipping window while connected; returning VFW_E_WRONG_STATE.\n"); + return VFW_E_WRONG_STATE; + } + + filter->hWndClippingWindow = window; + + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; }

1 0

Alexandre Julliard : gdi32: Return 0 char width for missing glyphs.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: aa90ed6df69791c03219cd1cdcf82da9ec5af4c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa90ed6df69791c03219cd1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:07:28 2020 +0200 gdi32: Return 0 char width for missing glyphs. Fixes a test failure with Emoji font: font.c:7147: Test failed: Noto Color Emoji: mismatched widths 2145357798/1.33654768e+008 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31ad56706a..f68198df8b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8414,8 +8414,10 @@ static BOOL CDECL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastC GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, &abc, 0, NULL, &identity ); - buffer[c - firstChar] = abc.abcA + abc.abcB + abc.abcC; + if (get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, &abc, 0, NULL, &identity ) == GDI_ERROR) + buffer[c - firstChar] = 0; + else + buffer[c - firstChar] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &freetype_cs ); return TRUE;

1 0

Zebediah Figura : quartz/vmr9: Do not call VMR9_maybe_init() in vmr_start_stream().
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 1cb4b642f39b246a00b7affcf1f44caa6881ce7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cb4b642f39b246a00b7affc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:02 2020 -0500 quartz/vmr9: Do not call VMR9_maybe_init() in vmr_start_stream(). We have already connected if we got here, and we can only have failed to allocate surfaces if we had no clipping window, which cannot have changed in the meantime. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 52cc80eca4..113cb7cea4 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -484,8 +484,6 @@ static void vmr_start_stream(struct strmbase_renderer *iface) TRACE("(%p)\n", This); - if (This->renderer.sink.pin.peer) - VMR9_maybe_init(This, TRUE, &This->renderer.sink.pin.mt); IVMRImagePresenter9_StartPresenting(This->presenter, This->cookie); SetWindowPos(This->baseControlWindow.hwnd, NULL, This->source_rect.left,

1 0

Nikolay Sivov : dwrite: Add separate structure for top level gsub/gpos offsets.
by Alexandre Julliard May 4, 2020

May 4, 2020

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

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoIs32bitProcess().
by Alexandre Julliard May 4, 2020

May 4, 2020

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

1 0

Zebediah Figura : ntoskrnl.exe: Protect relocated pages one at a time.
by Alexandre Julliard May 4, 2020

May 4, 2020

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

1 0