January 2019 - Wine-Commits

Nikolay Sivov : ntdll: Make LdrFindResource_U() and LdrFindResourceDirectory_U() patchable.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 9b90cfc2817e171e7a9698605deecc3438712af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b90cfc2817e171e7a969860… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:58:09 2019 +0300 ntdll: Make LdrFindResource_U() and LdrFindResourceDirectory_U() patchable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 0d5172a..0322a92 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -259,7 +259,7 @@ done: /********************************************************************** * LdrFindResourceDirectory_U (NTDLL.@) */ -NTSTATUS WINAPI LdrFindResourceDirectory_U( HMODULE hmod, const LDR_RESOURCE_INFO *info, +NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrFindResourceDirectory_U( HMODULE hmod, const LDR_RESOURCE_INFO *info, ULONG level, const IMAGE_RESOURCE_DIRECTORY **dir ) { const void *res; @@ -287,7 +287,7 @@ NTSTATUS WINAPI LdrFindResourceDirectory_U( HMODULE hmod, const LDR_RESOURCE_INF /********************************************************************** * LdrFindResource_U (NTDLL.@) */ -NTSTATUS WINAPI LdrFindResource_U( HMODULE hmod, const LDR_RESOURCE_INFO *info, +NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrFindResource_U( HMODULE hmod, const LDR_RESOURCE_INFO *info, ULONG level, const IMAGE_RESOURCE_DATA_ENTRY **entry ) { const void *res;

1 0

Nikolay Sivov : dwrite/tests: Some more tests for ComputeGlyphOrigins().
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 3795100bf7b7bd53ba1b62e1b8b04dc79a8a0310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3795100bf7b7bd53ba1b62e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:24 2019 +0300 dwrite/tests: Some more tests for ComputeGlyphOrigins(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3f41289..3e736c8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8038,17 +8038,73 @@ static void test_HasKerningPairs(void) ok(ref == 0, "factory not released, %u\n", ref); } +static void get_expected_glyph_origins(D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *run, + D2D1_POINT_2F *origins) +{ + unsigned int i; + + if (run->bidiLevel & 1) + { + DWRITE_GLYPH_METRICS glyph_metrics[2]; + DWRITE_FONT_METRICS metrics; + float advance; + HRESULT hr; + + hr = IDWriteFontFace_GetDesignGlyphMetrics(run->fontFace, run->glyphIndices, run->glyphCount, glyph_metrics, FALSE); + ok(hr == S_OK, "Failed to get glyph metrics, hr %#x.\n", hr); + + IDWriteFontFace_GetMetrics(run->fontFace, &metrics); + + advance = run->fontEmSize * glyph_metrics[0].advanceWidth / metrics.designUnitsPerEm; + + baseline_origin.x -= advance; + + for (i = 0; i < run->glyphCount; ++i) + { + origins[i].x = baseline_origin.x - run->glyphOffsets[i].advanceOffset; + origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + + baseline_origin.x -= run->glyphAdvances[i]; + } + } + else + { + for (i = 0; i < run->glyphCount; ++i) + { + origins[i].x = baseline_origin.x + run->glyphOffsets[i].advanceOffset; + origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + + baseline_origin.x += run->glyphAdvances[i]; + } + } +} + static void test_ComputeGlyphOrigins(void) { + static const struct origins_test + { + D2D1_POINT_2F baseline_origin; + float advances[2]; + DWRITE_GLYPH_OFFSET offsets[2]; + unsigned int bidi_level; + } + origins_tests[] = + { + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } } }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } } }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 1 }, + }; IDWriteFactory4 *factory; DWRITE_GLYPH_RUN run; HRESULT hr; - D2D1_POINT_2F origins[2]; + D2D1_POINT_2F origins[2], expected_origins[2]; D2D1_POINT_2F baseline_origin; - UINT16 glyphs[2]; + UINT16 glyphs[2] = { 0 }; FLOAT advances[2]; DWRITE_MATRIX m; ULONG ref; + unsigned int i, j; + IDWriteFontFace *fontface; factory = create_factory_iid(&IID_IDWriteFactory4); if (!factory) { @@ -8056,6 +8112,35 @@ static void test_ComputeGlyphOrigins(void) return; } + fontface = create_fontface((IDWriteFactory *)factory); + + for (i = 0; i < ARRAY_SIZE(origins_tests); ++i) + { + run.fontFace = fontface; + run.fontEmSize = 32.0f; + run.glyphCount = 2; + run.glyphIndices = glyphs; + run.glyphAdvances = origins_tests[i].advances; + run.glyphOffsets = origins_tests[i].offsets; + run.isSideways = FALSE; + run.bidiLevel = origins_tests[i].bidi_level; + + get_expected_glyph_origins(origins_tests[i].baseline_origin, &run, expected_origins); + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins_(factory, &run, origins_tests[i].baseline_origin, origins); + ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); + for (j = 0; j < run.glyphCount; ++j) + { + todo_wine_if(run.bidiLevel & 1) + ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), + "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, + expected_origins[j].x, expected_origins[j].y); + } + } + + IDWriteFontFace_Release(fontface); + advances[0] = 10.0f; advances[1] = 20.0f;

1 0

Nikolay Sivov : dwrite: Validate font data when retrieving supported unicode ranges data.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 2dcb3c7451a2f804b8f1fda058fa24db862a9afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dcb3c7451a2f804b8f1fda0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:25 2019 +0300 dwrite: Validate font data when retrieving supported unicode ranges data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 11 ++- dlls/dwrite/font.c | 36 ++++------ dlls/dwrite/opentype.c | 159 ++++++++++++++++++++++++++++--------------- 3 files changed, 127 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dcb3c7451a2f804b8f1…

1 0

Nikolay Sivov : dwrite: Validate 'CPAL' data before using it.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 1c99186c8838c698ba9179faf741a5b7883675e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c99186c8838c698ba9179fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:27 2019 +0300 dwrite: Validate 'CPAL' data before using it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 +++-- dlls/dwrite/font.c | 5 ++-- dlls/dwrite/opentype.c | 67 ++++++++++++++++++++++---------------------- 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9f8c941..6eac1f4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -227,9 +227,10 @@ extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLoca extern HRESULT opentype_get_font_facename(struct file_stream_desc*,WCHAR*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; -extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; -extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; +extern unsigned int opentype_get_cpal_palettecount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; +extern unsigned int opentype_get_cpal_paletteentrycount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *table, unsigned int palette, + unsigned int first_entry_index, unsigned int entry_count, DWRITE_COLOR_F *entries) DECLSPEC_HIDDEN; extern BOOL opentype_has_vertical_variants(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern DWRITE_CONTAINER_TYPE opentype_analyze_container_type(void const *, UINT32) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5c0b2a4..2c51674 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -385,9 +385,10 @@ static const struct dwrite_fonttable *get_fontface_gasp(struct dwrite_fontface * return &fontface->gasp; } -static const void* get_fontface_cpal(struct dwrite_fontface *fontface) +static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface *fontface) { - return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_CPAL_TAG, &fontface->cpal); + get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_CPAL_TAG, &fontface->cpal); + return &fontface->cpal; } static const void* get_fontface_colr(struct dwrite_fontface *fontface) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 291b41b..647ac99 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -843,25 +843,17 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP }; /* CPAL table */ -struct CPAL_Header_0 +struct cpal_header_0 { USHORT version; - USHORT numPaletteEntries; - USHORT numPalette; - USHORT numColorRecords; - ULONG offsetFirstColorRecord; - USHORT colorRecordIndices[1]; + USHORT num_palette_entries; + USHORT num_palettes; + USHORT num_color_records; + ULONG offset_first_color_record; + USHORT color_record_indices[1]; }; -/* for version == 1, this comes after full CPAL_Header_0 */ -struct CPAL_SubHeader_1 -{ - ULONG offsetPaletteTypeArray; - ULONG offsetPaletteLabelArray; - ULONG offsetPaletteEntryLabelArray; -}; - -struct CPAL_ColorRecord +struct cpal_color_record { BYTE blue; BYTE green; @@ -2005,37 +1997,46 @@ done: return flags; } -UINT32 opentype_get_cpal_palettecount(const void *cpal) +unsigned int opentype_get_cpal_palettecount(const struct dwrite_fonttable *cpal) { - const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; - return header ? GET_BE_WORD(header->numPalette) : 0; + return table_read_be_word(cpal, FIELD_OFFSET(struct cpal_header_0, num_palettes)); } -UINT32 opentype_get_cpal_paletteentrycount(const void *cpal) +unsigned int opentype_get_cpal_paletteentrycount(const struct dwrite_fonttable *cpal) { - const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; - return header ? GET_BE_WORD(header->numPaletteEntries) : 0; + return table_read_be_word(cpal, FIELD_OFFSET(struct cpal_header_0, num_palette_entries)); } -HRESULT opentype_get_cpal_entries(const void *cpal, UINT32 palette, UINT32 first_entry_index, UINT32 entry_count, - DWRITE_COLOR_F *entries) +HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *cpal, unsigned int palette, + unsigned int first_entry_index, unsigned int entry_count, DWRITE_COLOR_F *entries) { - const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; - const struct CPAL_ColorRecord *records; - UINT32 palettecount, entrycount, i; + unsigned int num_palettes, num_palette_entries, i; + const struct cpal_color_record *records; + const struct cpal_header_0 *header; + + header = table_read_ensure(cpal, 0, sizeof(*header)); + + if (!cpal->exists || !header) + return DWRITE_E_NOCOLOR; - if (!header) return DWRITE_E_NOCOLOR; + num_palettes = GET_BE_WORD(header->num_palettes); + if (palette >= num_palettes) + return DWRITE_E_NOCOLOR; - palettecount = GET_BE_WORD(header->numPalette); - if (palette >= palettecount) + header = table_read_ensure(cpal, 0, FIELD_OFFSET(struct cpal_header_0, color_record_indices[palette])); + if (!header) return DWRITE_E_NOCOLOR; - entrycount = GET_BE_WORD(header->numPaletteEntries); - if (first_entry_index + entry_count > entrycount) + num_palette_entries = GET_BE_WORD(header->num_palette_entries); + if (first_entry_index + entry_count > num_palette_entries) return E_INVALIDARG; - records = (const struct CPAL_ColorRecord*)((BYTE*)cpal + GET_BE_DWORD(header->offsetFirstColorRecord)); - first_entry_index += GET_BE_WORD(header->colorRecordIndices[palette]); + records = table_read_ensure(cpal, GET_BE_DWORD(header->offset_first_color_record), + sizeof(*records) * GET_BE_WORD(header->num_color_records)); + if (!records) + return DWRITE_E_NOCOLOR; + + first_entry_index += GET_BE_WORD(header->color_record_indices[palette]); for (i = 0; i < entry_count; i++) { entries[i].u1.r = records[first_entry_index + i].red / 255.0f;

1 0

Nikolay Sivov : include: Fix a typo in D2D1_WINDOW_STATE values.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 34eb4ab4c661e5e72d95fe8ec52dddae686afd11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34eb4ab4c661e5e72d95fe8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 22:14:48 2019 +0300 include: Fix a typo in D2D1_WINDOW_STATE values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index c9fb8f0..08487fa 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -274,8 +274,8 @@ typedef enum D2D1_FEATURE_LEVEL typedef enum D2D1_WINDOW_STATE { - D2D1_WINDOW_STATE_NONE = 0x0000000, - D2D1_WINDOW_STATE_OCCLUDED = 0x0000001, + D2D1_WINDOW_STATE_NONE = 0, + D2D1_WINDOW_STATE_OCCLUDED = 1, D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, } D2D1_WINDOW_STATE;

1 0

Nikolay Sivov : dwrite: Validate 'gasp' data before accessing it.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 471611b575a4de0896ffc41c30ff005e4689433c URL: https://source.winehq.org/git/wine.git/?a=commit;h=471611b575a4de0896ffc41c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:26 2019 +0300 dwrite: Validate 'gasp' data before accessing it. 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/font.c | 42 +++++++++++++++++------------------------- dlls/dwrite/opentype.c | 43 ++++++++++++++++++++++++++++++++----------- 3 files changed, 50 insertions(+), 37 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 52e7a18..9f8c941 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -254,7 +254,7 @@ enum gasp_flags { GASP_SYMMETRIC_SMOOTHING = 0x0008, }; -extern WORD opentype_get_gasp_flags(const WORD*,UINT32,INT) DECLSPEC_HIDDEN; +extern unsigned int opentype_get_gasp_flags(const struct dwrite_fonttable *gasp, float emsize) DECLSPEC_HIDDEN; /* BiDi helpers */ extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5c287ea..5c0b2a4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -379,11 +379,10 @@ static const void* get_fontface_vdmx(struct dwrite_fontface *fontface) return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_VDMX_TAG, &fontface->vdmx); } -static const void* get_fontface_gasp(struct dwrite_fontface *fontface, UINT32 *size) +static const struct dwrite_fonttable *get_fontface_gasp(struct dwrite_fontface *fontface) { - const void *ptr = get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_GASP_TAG, &fontface->gasp); - *size = fontface->gasp.size; - return ptr; + get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_GASP_TAG, &fontface->gasp); + return &fontface->gasp; } static const void* get_fontface_cpal(struct dwrite_fontface *fontface) @@ -687,7 +686,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace4 *iface, } static DWRITE_RENDERING_MODE fontface_renderingmode_from_measuringmode(DWRITE_MEASURING_MODE measuring, - FLOAT ppem, WORD gasp) + float ppem, unsigned int gasp) { DWRITE_RENDERING_MODE mode = DWRITE_RENDERING_MODE_DEFAULT; @@ -718,10 +717,8 @@ static HRESULT WINAPI dwritefontface_GetRecommendedRenderingMode(IDWriteFontFace FLOAT ppdip, DWRITE_MEASURING_MODE measuring, IDWriteRenderingParams *params, DWRITE_RENDERING_MODE *mode) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); - const WORD *ptr; - UINT32 size; + unsigned int flags; FLOAT ppem; - WORD gasp; TRACE("(%p)->(%.2f %.2f %d %p %p)\n", This, emSize, ppdip, measuring, params, mode); @@ -741,9 +738,8 @@ static HRESULT WINAPI dwritefontface_GetRecommendedRenderingMode(IDWriteFontFace return S_OK; } - ptr = get_fontface_gasp(This, &size); - gasp = opentype_get_gasp_flags(ptr, size, ppem); - *mode = fontface_renderingmode_from_measuringmode(measuring, ppem, gasp); + flags = opentype_get_gasp_flags(get_fontface_gasp(This), ppem); + *mode = fontface_renderingmode_from_measuringmode(measuring, ppem, flags); return S_OK; } @@ -1097,10 +1093,8 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac DWRITE_GRID_FIT_MODE *gridfitmode) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); + unsigned int flags; FLOAT emthreshold; - const WORD *ptr; - UINT32 size; - WORD gasp; TRACE("(%p)->(%.2f %.2f %.2f %p %d %d %d %p %p %p)\n", This, emSize, dpiX, dpiY, m, is_sideways, threshold, measuringmode, params, renderingmode, gridfitmode); @@ -1131,14 +1125,13 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac emthreshold = threshold == DWRITE_OUTLINE_THRESHOLD_ANTIALIASED ? RECOMMENDED_OUTLINE_AA_THRESHOLD : RECOMMENDED_OUTLINE_A_THRESHOLD; - ptr = get_fontface_gasp(This, &size); - gasp = opentype_get_gasp_flags(ptr, size, emSize); + flags = opentype_get_gasp_flags(get_fontface_gasp(This), emSize); if (*renderingmode == DWRITE_RENDERING_MODE_DEFAULT) { if (emSize >= emthreshold) *renderingmode = DWRITE_RENDERING_MODE_OUTLINE; else - *renderingmode = fontface_renderingmode_from_measuringmode(measuringmode, emSize, gasp); + *renderingmode = fontface_renderingmode_from_measuringmode(measuringmode, emSize, flags); } if (*gridfitmode == DWRITE_GRID_FIT_MODE_DEFAULT) { @@ -1147,7 +1140,8 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac else if (measuringmode == DWRITE_MEASURING_MODE_GDI_CLASSIC || measuringmode == DWRITE_MEASURING_MODE_GDI_NATURAL) *gridfitmode = DWRITE_GRID_FIT_MODE_ENABLED; else - *gridfitmode = (gasp & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT)) ? DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; + *gridfitmode = flags & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT) ? + DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; } return S_OK; @@ -1229,10 +1223,8 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac IDWriteRenderingParams *params, DWRITE_RENDERING_MODE1 *rendering_mode, DWRITE_GRID_FIT_MODE *gridfit_mode) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); + unsigned int flags; FLOAT emthreshold; - const WORD *ptr; - UINT32 size; - WORD gasp; TRACE("(%p)->(%.2f %.2f %.2f %p %d %d %d %p %p %p)\n", This, emSize, dpiX, dpiY, m, is_sideways, threshold, measuring_mode, params, rendering_mode, gridfit_mode); @@ -1263,14 +1255,13 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac emthreshold = threshold == DWRITE_OUTLINE_THRESHOLD_ANTIALIASED ? RECOMMENDED_OUTLINE_AA_THRESHOLD : RECOMMENDED_OUTLINE_A_THRESHOLD; - ptr = get_fontface_gasp(This, &size); - gasp = opentype_get_gasp_flags(ptr, size, emSize); + flags = opentype_get_gasp_flags(get_fontface_gasp(This), emSize); if (*rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT) { if (emSize >= emthreshold) *rendering_mode = DWRITE_RENDERING_MODE1_OUTLINE; else - *rendering_mode = fontface_renderingmode_from_measuringmode(measuring_mode, emSize, gasp); + *rendering_mode = fontface_renderingmode_from_measuringmode(measuring_mode, emSize, flags); } if (*gridfit_mode == DWRITE_GRID_FIT_MODE_DEFAULT) { @@ -1279,7 +1270,8 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac else if (measuring_mode == DWRITE_MEASURING_MODE_GDI_CLASSIC || measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL) *gridfit_mode = DWRITE_GRID_FIT_MODE_ENABLED; else - *gridfit_mode = (gasp & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT)) ? DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; + *gridfit_mode = flags & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT) ? + DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; } return S_OK; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0e0de87..291b41b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -292,6 +292,20 @@ typedef struct { BYTE bitDepth; BYTE flags; } CBLCBitmapSizeTable; + +struct gasp_range +{ + WORD max_ppem; + WORD flags; +}; + +struct gasp_header +{ + WORD version; + WORD num_ranges; + struct gasp_range ranges[1]; +}; + #include "poppack.h" enum OS2_FSSELECTION { @@ -1959,25 +1973,32 @@ BOOL opentype_get_vdmx_size(const void *data, INT emsize, UINT16 *ascent, UINT16 return FALSE; } -WORD opentype_get_gasp_flags(const WORD *ptr, UINT32 size, INT emsize) +unsigned int opentype_get_gasp_flags(const struct dwrite_fonttable *gasp, float emsize) { - WORD num_recs, version; + unsigned int version, num_ranges, i; + const struct gasp_header *table; WORD flags = 0; - if (!ptr) + if (!gasp->exists) return 0; - version = GET_BE_WORD( *ptr++ ); - num_recs = GET_BE_WORD( *ptr++ ); - if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) { - ERR("unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs); + num_ranges = table_read_be_word(gasp, FIELD_OFFSET(struct gasp_header, num_ranges)); + + table = table_read_ensure(gasp, 0, FIELD_OFFSET(struct gasp_header, ranges[num_ranges])); + if (!table) + return 0; + + version = GET_BE_WORD(table->version); + if (version > 1) + { + ERR("Unsupported gasp table format version %u.\n", version); goto done; } - while (num_recs--) { - flags = GET_BE_WORD( *(ptr + 1) ); - if (emsize <= GET_BE_WORD( *ptr )) break; - ptr += 2; + for (i = 0; i < num_ranges; ++i) + { + flags = GET_BE_WORD(table->ranges[i].flags); + if (emsize <= GET_BE_WORD(table->ranges[i].max_ppem)) break; } done:

1 0

Nikolay Sivov : dwrite/analyzer: Preserve inter-cluster spacing when apply spacing properties.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: efb1aef93f4c7e756c59b62e17006007440e1333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efb1aef93f4c7e756c59b62e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:23 2019 +0300 dwrite/analyzer: Preserve inter-cluster spacing when apply spacing properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 209 +++++++++++++++++++------------------------ dlls/dwrite/tests/analyzer.c | 158 ++++++++++++++++++++++++-------- 2 files changed, 215 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=efb1aef93f4c7e756c59…

1 0

Zebediah Figura : msi: Get rid of the get_row() view operation.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 7c28a1dbddc012d497988f638b7ecb70e75b17c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c28a1dbddc012d497988f63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 26 16:58:59 2019 -0600 msi: Get rid of the get_row() view operation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/alter.c | 10 ---------- dlls/msi/create.c | 1 - dlls/msi/delete.c | 1 - dlls/msi/distinct.c | 1 - dlls/msi/drop.c | 1 - dlls/msi/insert.c | 1 - dlls/msi/msipriv.h | 6 ------ dlls/msi/select.c | 13 ------------- dlls/msi/storages.c | 10 ---------- dlls/msi/streams.c | 10 ---------- dlls/msi/table.c | 1 - dlls/msi/update.c | 1 - dlls/msi/where.c | 13 ------------- 13 files changed, 69 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 96ff284..d1a481e 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -61,15 +61,6 @@ static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return ERROR_FUNCTION_FAILED; } -static UINT ALTER_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSIALTERVIEW *av = (MSIALTERVIEW*)view; - - TRACE("%p %d %p\n", av, row, rec ); - - return av->table->ops->get_row(av->table, row, rec); -} - static UINT ITERATE_columns(MSIRECORD *row, LPVOID param) { (*(UINT *)param)++; @@ -225,7 +216,6 @@ static const MSIVIEWOPS alter_ops = { ALTER_fetch_int, ALTER_fetch_stream, - ALTER_get_row, NULL, NULL, NULL, diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 2777954..3c00b70 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -131,7 +131,6 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, - NULL, CREATE_execute, CREATE_close, CREATE_get_dimensions, diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 81bd9d7..e2e0e34 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -173,7 +173,6 @@ static const MSIVIEWOPS delete_ops = NULL, NULL, NULL, - NULL, DELETE_execute, DELETE_close, DELETE_get_dimensions, diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index e102adb..5bd5bf8 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -256,7 +256,6 @@ static const MSIVIEWOPS distinct_ops = NULL, NULL, NULL, - NULL, DISTINCT_execute, DISTINCT_close, DISTINCT_get_dimensions, diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 89fac9d..60a9202 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -101,7 +101,6 @@ static const MSIVIEWOPS drop_ops = NULL, NULL, NULL, - NULL, DROP_execute, DROP_close, DROP_get_dimensions, diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index f1185ee..ed913c0 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -327,7 +327,6 @@ static const MSIVIEWOPS insert_ops = NULL, NULL, NULL, - NULL, INSERT_execute, INSERT_close, INSERT_get_dimensions, diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e9c000d..3ff5ac2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -243,12 +243,6 @@ typedef struct tagMSIVIEWOPS UINT (*fetch_stream)( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ); /* - * get_row - gets values from a row - * - */ - UINT (*get_row)( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ); - - /* * set_int - set the integer value at {row, col} * This function has undefined behaviour if the column does not contain * integers. diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 91765c8..99339c2 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -90,18 +90,6 @@ static UINT SELECT_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IS return sv->table->ops->fetch_stream( sv->table, row, col, stm ); } -static UINT SELECT_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSISELECTVIEW *sv = (MSISELECTVIEW *)view; - - TRACE("%p %d %p\n", sv, row, rec ); - - if( !sv->table ) - return ERROR_FUNCTION_FAILED; - - return msi_view_get_row(sv->db, view, row, rec); -} - static UINT SELECT_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; @@ -325,7 +313,6 @@ static const MSIVIEWOPS select_ops = { SELECT_fetch_int, SELECT_fetch_stream, - SELECT_get_row, NULL, NULL, SELECT_set_row, diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index ad020de..9e161c9 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -115,15 +115,6 @@ static UINT STORAGES_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, I return ERROR_INVALID_DATA; } -static UINT STORAGES_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; - - FIXME("%p %d %p\n", sv, row, rec); - - return ERROR_CALL_NOT_IMPLEMENTED; -} - static UINT STORAGES_set_string( struct tagMSIVIEW *view, UINT row, UINT col, const WCHAR *val, int len ) { ERR("Cannot modify primary key.\n"); @@ -425,7 +416,6 @@ static const MSIVIEWOPS storages_ops = { STORAGES_fetch_int, STORAGES_fetch_stream, - STORAGES_get_row, NULL, STORAGES_set_string, STORAGES_set_row, diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index ae45c1d..2d458ad 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -110,15 +110,6 @@ static UINT STREAMS_set_string( struct tagMSIVIEW *view, UINT row, UINT col, con return ERROR_FUNCTION_FAILED; } -static UINT STREAMS_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - - TRACE("%p %d %p\n", sv, row, rec); - - return msi_view_get_row( sv->db, view, row, rec ); -} - static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; @@ -347,7 +338,6 @@ static const MSIVIEWOPS streams_ops = { STREAMS_fetch_int, STREAMS_fetch_stream, - STREAMS_get_row, NULL, STREAMS_set_string, STREAMS_set_row, diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a5de8cc..f26ab9f 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2124,7 +2124,6 @@ static const MSIVIEWOPS table_ops = { TABLE_fetch_int, TABLE_fetch_stream, - TABLE_get_row, TABLE_set_int, TABLE_set_string, TABLE_set_row, diff --git a/dlls/msi/update.c b/dlls/msi/update.c index e61342d..af629d2 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -204,7 +204,6 @@ static const MSIVIEWOPS update_ops = NULL, NULL, NULL, - NULL, UPDATE_execute, UPDATE_close, UPDATE_get_dimensions, diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 6a10a04..eaadac4 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -259,18 +259,6 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return table->view->ops->fetch_stream( table->view, rows[table->table_index], col, stm ); } -static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view; - - TRACE("%p %d %p\n", wv, row, rec ); - - if (!wv->tables) - return ERROR_FUNCTION_FAILED; - - return msi_view_get_row( wv->db, view, row, rec ); -} - static UINT WHERE_set_int(struct tagMSIVIEW *view, UINT row, UINT col, int val) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; @@ -1108,7 +1096,6 @@ static const MSIVIEWOPS where_ops = { WHERE_fetch_int, WHERE_fetch_stream, - WHERE_get_row, WHERE_set_int, WHERE_set_string, WHERE_set_row,

1 0

Zhiyi Zhang : msacm32: Reference count local drivers.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: bbdf6d5e21cfe1ef5e317d01978310bac614e6a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbdf6d5e21cfe1ef5e317d01… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Jan 26 16:20:10 2019 +0800 msacm32: Reference count local drivers. One local driver can be assigned to multiple driver ids. When releasing the driver id, check if the reference count of a local driver is one before actually releasing the local driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46520 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/internal.c | 12 +++++++++++- dlls/msacm32/wineacm.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index aad071e..7d324a8 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -737,12 +737,17 @@ static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; static PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv) { PWINE_ACMLOCALDRIVER pNextACMLocalDriver; + LONG ref; if (paldrv->pACMInstList) { ERR("local driver instances still present after closing all drivers - memory leak\n"); return NULL; } + ref = InterlockedDecrement(&paldrv->ref); + if (ref) + return paldrv; + if (paldrv == MSACM_pFirstACMLocalDriver) MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv; if (paldrv == MSACM_pLastACMLocalDriver) @@ -883,7 +888,11 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri /* look up previous instance of local driver module */ for (paldrv = MSACM_pFirstACMLocalDriver; paldrv; paldrv = paldrv->pNextACMLocalDrv) { - if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) return paldrv; + if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) + { + InterlockedIncrement(&paldrv->ref); + return paldrv; + } } paldrv = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER)); @@ -892,6 +901,7 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri paldrv->hModule = hModule; paldrv->lpDrvProc = lpDriverProc; paldrv->pACMInstList = NULL; + paldrv->ref = 1; paldrv->pNextACMLocalDrv = NULL; paldrv->pPrevACMLocalDrv = MSACM_pLastACMLocalDriver; diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index 406e01b..98d1ab5 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -52,6 +52,7 @@ typedef struct _WINE_ACMLOCALDRIVER PWINE_ACMLOCALDRIVERINST pACMInstList; PWINE_ACMLOCALDRIVER pNextACMLocalDrv; PWINE_ACMLOCALDRIVER pPrevACMLocalDrv; + LONG ref; } WINE_ACMLOCALDRIVER; typedef struct _WINE_ACMLOCALDRIVERINST

1 0

Orhan Kavrakoğlu : crypt32: Add CryptImportPublicKeyInfoEx2 stub.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 7ab111aabbc24454d54691651667b9583fe2d377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ab111aabbc24454d5469165… Author: Orhan Kavrakoğlu <aibok42(a)gmail.com> Date: Fri Jan 25 21:13:54 2019 +0300 crypt32: Add CryptImportPublicKeyInfoEx2 stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46516 Signed-off-by: Orhan Kavrakoğlu <aibok42(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/encode.c | 10 ++++++++++ include/wincrypt.h | 3 +++ 3 files changed, 14 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index fc32570..1815a1d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -142,6 +142,7 @@ @ stub CryptImportPKCS8 @ stdcall CryptImportPublicKeyInfo(long long ptr ptr) @ stdcall CryptImportPublicKeyInfoEx(long long ptr long long ptr ptr) +@ stdcall CryptImportPublicKeyInfoEx2(long ptr long ptr ptr) @ stdcall CryptInitOIDFunctionSet(str long) @ stdcall CryptInstallOIDFunctionAddress(ptr long str long ptr long) @ stub CryptLoadSip diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9d052b6..16a50dc 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -5065,3 +5065,13 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } + +BOOL WINAPI CryptImportPublicKeyInfoEx2(DWORD dwCertEncodingType, + PCERT_PUBLIC_KEY_INFO pInfo, DWORD dwFlags, void *pvAuxInfo, + BCRYPT_KEY_HANDLE *phKey) +{ + FIXME_(crypt)("(%d, %p, %08x, %p, %p): stub\n", dwCertEncodingType, pInfo, + dwFlags, pvAuxInfo, phKey); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} diff --git a/include/wincrypt.h b/include/wincrypt.h index a1b1305..d68c955 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4461,6 +4461,9 @@ BOOL WINAPI CryptImportPublicKeyInfo(HCRYPTPROV hCryptProv, BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey); +BOOL WINAPI CryptImportPublicKeyInfoEx2(DWORD dwCertEncodingType, + PCERT_PUBLIC_KEY_INFO pInfo, DWORD dwFlags, void *pvAuxInfo, + BCRYPT_KEY_HANDLE *phKey); BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, DWORD dwFlags, void *pvReserved, HCRYPTPROV_OR_NCRYPT_KEY_HANDLE *phCryptProv, DWORD *pdwKeySpec,

1 0