wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Nikolay Sivov : dwrite: Fix vector transformation in GetGlyphOrientationTransform().
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 42ed6ddd303c01d54709ab9d4b8b69f1e1184b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ed6ddd303c01d54709ab9d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:12:29 2015 +0300 dwrite: Fix vector transformation in GetGlyphOrientationTransform(). --- dlls/dwrite/analyzer.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 62893e6..eedb41d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1507,22 +1507,8 @@ static HRESULT WINAPI dwritetextanalyzer2_GetGlyphOrientationTransform(IDWriteTe /* shift components represent transform necessary to get from original point to rotated one in new coordinate system */ if ((originX != 0.0 || originY != 0.0) && angle != DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES) { - const DWRITE_MATRIX *p; - - switch (angle) { - case DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES: - angle = DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES; - break; - case DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES: - angle = DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES; - break; - default: - ; - } - - p = &transforms[angle]; - m->dx = originX - (p->m11 * originX + p->m12 * originY); - m->dy = originY - (p->m21 * originX + p->m22 * originY); + m->dx = originX - (m->m11 * originX + m->m21 * originY); + m->dy = originY - (m->m12 * originX + m->m22 * originY); } return S_OK;

1 0

Nikolay Sivov : dwrite: Round advances returned from GetGdiCompatibleGlyphPlacements().
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 2132a060ead591ee2ce70296282e2076ec2de214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2132a060ead591ee2ce702962… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:11:54 2015 +0300 dwrite: Round advances returned from GetGdiCompatibleGlyphPlacements(). --- dlls/dwrite/analyzer.c | 16 ++++---- dlls/dwrite/tests/analyzer.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3417109..62893e6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -21,6 +21,8 @@ #define COBJMACROS +#include <math.h> + #include "dwrite_private.h" #include "scripts.h" @@ -1066,7 +1068,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWriteTextAnalyzer2 *iface, WCHAR const* text, UINT16 const* clustermap, DWRITE_SHAPING_TEXT_PROPERTIES* props, UINT32 text_len, UINT16 const* glyphs, DWRITE_SHAPING_GLYPH_PROPERTIES const* glyph_props, - UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, FLOAT pixels_per_dip, + UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, FLOAT ppdip, DWRITE_MATRIX const* transform, BOOL use_gdi_natural, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT *advances, DWRITE_GLYPH_OFFSET *offsets) @@ -1077,7 +1079,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite UINT32 i; TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), - clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, pixels_per_dip, + clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, feature_ranges, advances, offsets); @@ -1090,7 +1092,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } - hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, pixels_per_dip, transform, &metrics); + hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, ppdip, transform, &metrics); if (FAILED(hr)) { IDWriteFontFace1_Release(fontface1); WARN("failed to get compat metrics, 0x%08x\n", hr); @@ -1099,12 +1101,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite for (i = 0; i < glyph_count; i++) { INT32 a; - hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emSize, pixels_per_dip, + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emSize, ppdip, transform, use_gdi_natural, is_sideways, 1, &glyphs[i], &a); if (FAILED(hr)) - a = 0; - - advances[i] = get_scaled_advance_width(a, emSize, &metrics); + advances[i] = 0.0; + else + advances[i] = floorf(a * emSize * ppdip / metrics.designUnitsPerEm + 0.5f) / ppdip; offsets[i].advanceOffset = 0.0; offsets[i].ascenderOffset = 0.0; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index a3eaa38..402787f 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -22,6 +22,8 @@ #include <assert.h> #include <stdio.h> +#include <limits.h> +#include <math.h> #include "initguid.h" #include "windows.h" @@ -1878,6 +1880,93 @@ todo_wine { IDWriteTextAnalyzer1_Release(analyzer1); } +static inline BOOL float_eq(FLOAT left, FLOAT right) +{ + int x = *(int *)&left; + int y = *(int *)&right; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + return abs(x - y) <= 8; +} + +static void test_GetGdiCompatibleGlyphPlacements(void) +{ + static const WCHAR strW[] = {'A',0}; + DWRITE_SHAPING_GLYPH_PROPERTIES glyphprops[1]; + DWRITE_SHAPING_TEXT_PROPERTIES textprops[1]; + DWRITE_SCRIPT_ANALYSIS sa = { 0 }; + IDWriteTextAnalyzer *analyzer; + IDWriteFontFace *fontface; + UINT16 clustermap[1]; + HRESULT hr; + UINT32 count; + UINT16 glyphs[1]; + FLOAT advance; + DWRITE_GLYPH_OFFSET offsets[1]; + DWRITE_FONT_METRICS fontmetrics; + FLOAT emsize; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fontface = create_fontface(); + + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + + count = 0; + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, strW, 1, fontface, + FALSE, FALSE, &sa, NULL, NULL, NULL, NULL, 0, 1, clustermap, + textprops, glyphs, glyphprops, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + for (emsize = 12.0; emsize <= 20.0; emsize += 1.0) { + FLOAT compatadvance, expected, ppdip; + DWRITE_GLYPH_METRICS metrics; + + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, strW, clustermap, + textprops, 1, glyphs, glyphprops, count, fontface, emsize, FALSE, FALSE, + &sa, NULL, NULL, NULL, 0, &advance, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance > 0.0, "got %f\n", advance); + + /* 1 ppdip, no transform */ + ppdip = 1.0; + hr = IDWriteFontFace_GetGdiCompatibleGlyphMetrics(fontface, emsize, ppdip, NULL, FALSE, + glyphs, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + expected = floorf(metrics.advanceWidth * emsize * ppdip / fontmetrics.designUnitsPerEm + 0.5f) / ppdip; + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, strW, + clustermap, textprops, 1, glyphs, glyphprops, count, fontface, emsize, + ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, &compatadvance, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(compatadvance == expected, "%.0f: got advance %f, expected %f, natural %f\n", emsize, + compatadvance, expected, advance); + + /* 1.2 ppdip, no transform */ + ppdip = 1.2; + hr = IDWriteFontFace_GetGdiCompatibleGlyphMetrics(fontface, emsize, ppdip, NULL, FALSE, + glyphs, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + expected = floorf(metrics.advanceWidth * emsize * ppdip / fontmetrics.designUnitsPerEm + 0.5f) / ppdip; + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, strW, + clustermap, textprops, 1, glyphs, glyphprops, count, fontface, emsize, + ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, &compatadvance, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(float_eq(compatadvance, expected), "%.0f: got advance %f, expected %f, natural %f\n", emsize, + compatadvance, expected, advance); + } + + IDWriteFontFace_Release(fontface); + IDWriteTextAnalyzer_Release(analyzer); +} + START_TEST(analyzer) { HRESULT hr; @@ -1904,6 +1993,7 @@ START_TEST(analyzer) test_ApplyCharacterSpacing(); test_GetGlyphOrientationTransform(); test_GetBaseline(); + test_GetGdiCompatibleGlyphPlacements(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/tests: Some tests for CreateGdiCompatibleTextLayout ().
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: a92390f707202352c12c6bc7f301bfe5c6bbbb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a92390f707202352c12c6bc7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:11:25 2015 +0300 dwrite/tests: Some tests for CreateGdiCompatibleTextLayout(). --- dlls/dwrite/tests/layout.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a2a5d39..1494d59 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -785,6 +785,16 @@ static void test_CreateTextLayout(void) IDWriteFactory_Release(factory); } +static DWRITE_MATRIX layoutcreate_transforms[] = { + { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 }, + { 1.0, 0.0, 0.0, 1.0, 0.3, 0.2 }, + { 1.0, 0.0, 0.0, 1.0,-0.3,-0.2 }, + + { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, + { 1.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, + { 1.0, 2.0, 0.5, 1.0, 0.0, 0.0 }, +}; + static void test_CreateGdiCompatibleTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -793,6 +803,7 @@ static void test_CreateGdiCompatibleTextLayout(void) IDWriteFactory *factory; FLOAT dimension; HRESULT hr; + int i; factory = create_factory(); @@ -839,6 +850,24 @@ static void test_CreateGdiCompatibleTextLayout(void) ok(dimension == 100.0, "got %f\n", dimension); IDWriteTextLayout_Release(layout); + + /* negative, zero ppdip */ + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, -1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 0.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + /* transforms */ + for (i = 0; i < sizeof(layoutcreate_transforms)/sizeof(layoutcreate_transforms[0]); i++) { + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 1.0, + &layoutcreate_transforms[i], FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + } + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Properly pass measuring mode to renderer.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: e68c6389b13af107f81952d61bf850b48d43c592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68c6389b13af107f81952d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:10:54 2015 +0300 dwrite: Properly pass measuring mode to renderer. --- dlls/dwrite/layout.c | 32 ++++++++++++--------- dlls/dwrite/tests/layout.c | 71 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e68c6389b13af107f8195…

1 0

Sebastian Lackner : configure: Do not assume gcc strength reduce bug when cross-compiling.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 2498bc17d270310b6e615a7e3521bd8738f26ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2498bc17d270310b6e615a7e3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 01:57:37 2015 +0200 configure: Do not assume gcc strength reduce bug when cross-compiling. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 64dedf5..0472c80 100755 --- a/configure +++ b/configure @@ -13832,7 +13832,7 @@ if ${ac_cv_c_gcc_strength_bug+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - ac_cv_c_gcc_strength_bug="yes" + ac_cv_c_gcc_strength_bug="no" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 3eaec29..9aab130 100644 --- a/configure.ac +++ b/configure.ac @@ -1797,7 +1797,7 @@ then for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]]; L[[i]] = 4; return (Array[[1]] != -2 || L[[2]] != 3)]])], - [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) ) + [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="no"]) ) if test "$ac_cv_c_gcc_strength_bug" = "yes" then EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 3cf58187e441a06a493dfcd3a84dfd7026fd13ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf58187e441a06a493dfcd3a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 15 21:32:32 2015 +0300 po: Update Finnish translation. --- po/fi.po | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/po/fi.po b/po/fi.po index 3c1a2ac..1b86d7a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13474,16 +13474,12 @@ msgid "Command history" msgstr "Komentohistoria" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Puskurivyöhyke" +msgstr "P&uskurin koko:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Poista toistuvat" +msgstr "P&oista toistuvat" #: wineconsole.rc:74 msgid "Popup menu" @@ -13495,25 +13491,19 @@ msgstr "&Control" #: wineconsole.rc:76 msgid "S&hift" -msgstr "&Shift" +msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Sulje konsoli" +msgstr "Konsoli" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Pikamuokkaus" +msgstr "Pika&muokkaustila" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Tehokäyttäjä" +msgstr "&Lisäystila" #: wineconsole.rc:88 msgid "&Font"

1 0

Nikolay Sivov : dwrite: Partial implementation of GetGdiCompatibleGlyphMetrics().
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: a3f2b6b8566de7c2c32db621c00d485fff39daa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f2b6b8566de7c2c32db621c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 19:59:46 2015 +0300 dwrite: Partial implementation of GetGdiCompatibleGlyphMetrics(). --- dlls/dwrite/font.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9b7a50f..74023c3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -600,14 +600,48 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleMetrics(IDWriteFontFace2 *i return hr; } -static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFace2 *iface, FLOAT emSize, FLOAT pixels_per_dip, - DWRITE_MATRIX const *transform, BOOL use_gdi_natural, UINT16 const *glyph_indices, UINT32 glyph_count, +static inline int round_metric(FLOAT metric) +{ + return (int)floorf(metric + 0.5f); +} + +static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFace2 *iface, FLOAT emSize, FLOAT ppdip, + DWRITE_MATRIX const *m, BOOL use_gdi_natural, UINT16 const *glyphs, UINT32 glyph_count, DWRITE_GLYPH_METRICS *metrics, BOOL is_sideways) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%f %f %p %d %p %u %p %d): stub\n", This, emSize, pixels_per_dip, transform, use_gdi_natural, glyph_indices, + FLOAT scale; + HRESULT hr; + UINT32 i; + + TRACE("(%p)->(%.2f %.2f %p %d %p %u %p %d)\n", This, emSize, ppdip, m, use_gdi_natural, glyphs, glyph_count, metrics, is_sideways); - return E_NOTIMPL; + + if (m && memcmp(m, &identity, sizeof(*m))) + FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + + scale = emSize * ppdip / This->metrics.designUnitsPerEm; + + for (i = 0; i < glyph_count; i++) { + DWRITE_GLYPH_METRICS *ret = metrics + i; + DWRITE_GLYPH_METRICS design; + + hr = IDWriteFontFace2_GetDesignGlyphMetrics(iface, glyphs + i, 1, &design, is_sideways); + if (FAILED(hr)) + return hr; + +#define SCALE_METRIC(x) ret->x = round_metric(round_metric((design.x) * scale) / scale) + SCALE_METRIC(leftSideBearing); + SCALE_METRIC(advanceWidth); + SCALE_METRIC(rightSideBearing); + SCALE_METRIC(topSideBearing); + SCALE_METRIC(advanceHeight); + SCALE_METRIC(bottomSideBearing); + SCALE_METRIC(verticalOriginY); +#undef SCALE_METRIC + } + + return S_OK; } static void WINAPI dwritefontface1_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -617,11 +651,6 @@ static void WINAPI dwritefontface1_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FO *metrics = This->metrics; } -static inline int round_metric(FLOAT metric) -{ - return (int)floorf(metric + 0.5f); -} - static HRESULT WINAPI dwritefontface1_GetGdiCompatibleMetrics(IDWriteFontFace2 *iface, FLOAT em_size, FLOAT pixels_per_dip, const DWRITE_MATRIX *m, DWRITE_FONT_METRICS1 *metrics) { @@ -733,6 +762,7 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF BOOL is_sideways, UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); + FLOAT scale; HRESULT hr; UINT32 i; @@ -742,14 +772,13 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform is not supported, %s\n", debugstr_matrix(m)); - for (i = 0; i < glyph_count; i++) { - FLOAT scale; + scale = em_size * ppdip / This->metrics.designUnitsPerEm; + for (i = 0; i < glyph_count; i++) { hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); if (FAILED(hr)) return hr; - scale = em_size * ppdip / This->metrics.designUnitsPerEm; #define SCALE_METRIC(x) x = round_metric(round_metric((x) * scale) / scale) SCALE_METRIC(advances[i]); #undef SCALE_METRIC

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 0bc85e0aff1fb9fd24ce6df497c79dc6f22b7653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc85e0aff1fb9fd24ce6df49… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 16 00:36:18 2015 +0900 po: Update Japanese translation. --- po/ja.po | 390 +++++++++++++++------------------------------------------------ 1 file changed, 89 insertions(+), 301 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bc85e0aff1fb9fd24ce6…

1 0

Piotr Caban : shell32: Fix SHELL_execute code that removes quote arround file name.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 943ead502295793f608ad65eb0ca144ba67546ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ead502295793f608ad65eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 17:34:09 2015 +0200 shell32: Fix SHELL_execute code that removes quote arround file name. --- dlls/shell32/shlexec.c | 11 +++++------ dlls/shell32/tests/shlexec.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 2505981..3196149 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1592,14 +1592,13 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) wszApplicationName = HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); *wszApplicationName = '\0'; } - else if (*sei_tmp.lpFile == '\"') + else if (*sei_tmp.lpFile == '\"' && sei_tmp.lpFile[(len = strlenW(sei_tmp.lpFile))-1] == '\"') { - DWORD l = strlenW(sei_tmp.lpFile+1); - if(l >= dwApplicationNameLen) dwApplicationNameLen = l+1; + if(len-1 >= dwApplicationNameLen) dwApplicationNameLen = len; wszApplicationName = HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen*sizeof(WCHAR)); - memcpy(wszApplicationName, sei_tmp.lpFile+1, (l+1)*sizeof(WCHAR)); - if (wszApplicationName[l-1] == '\"') - wszApplicationName[l-1] = '\0'; + memcpy(wszApplicationName, sei_tmp.lpFile+1, len*sizeof(WCHAR)); + if(len > 2) + wszApplicationName[len-2] = '\0'; TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName)); } else { DWORD l = strlenW(sei_tmp.lpFile)+1; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3b245a..3d95b41 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -905,6 +905,8 @@ static filename_tests_t filename_tests[]= {NULL, "%s\\masked file.shlexec", 0x0, 33}, /* Test if quoting prevents the masking */ {NULL, "%s\\masked file.shlexec", 0x40, 33}, + /* Test with incorrect quote */ + {NULL, "\"%s\\masked file.shlexec", 0x0, SE_ERR_FNF}, {NULL, NULL, 0} }; @@ -2114,6 +2116,15 @@ static void test_exes(void) { win_skip("Skipping shellexecute of file with unassociated extension\n"); } + + /* test combining executable and parameters */ + sprintf(filename, "%s shlexec \"%s\" Exec", argv0, child_file); + rc = shell_execute(NULL, filename, NULL, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + + sprintf(filename, "\"%s\" shlexec \"%s\" Exec", argv0, child_file); + rc = shell_execute(NULL, filename, NULL, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); } typedef struct

1 0

Piotr Caban : shell32: Handle executable with space in path in SHELL_execute.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 663f9f4b217a50cb5c6c1a6f94f348e047bc2747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663f9f4b217a50cb5c6c1a6f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 17:34:05 2015 +0200 shell32: Handle executable with space in path in SHELL_execute. --- dlls/shell32/shlexec.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 9865005..2505981 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1554,7 +1554,6 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) */ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { - static const WCHAR wSpace[] = {' ',0}; static const WCHAR wWww[] = {'w','w','w',0}; static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0}; static const DWORD unsupportedFlags = @@ -1763,7 +1762,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; - len = lstrlenW(wszApplicationName) + 1; + len = lstrlenW(wszApplicationName) + 3; if (sei_tmp.lpParameters[0]) len += 1 + lstrlenW(wszParameters); if (len > wcmdLen) @@ -1771,10 +1770,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) wcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); wcmdLen = len; } - strcpyW(wcmd, wszApplicationName); + wcmd[0] = '\"'; + len = lstrlenW(wszApplicationName); + memcpy(wcmd+1, wszApplicationName, len * sizeof(WCHAR)); + len++; + wcmd[len++] = '\"'; if (sei_tmp.lpParameters[0]) { - strcatW(wcmd, wSpace); - strcatW(wcmd, wszParameters); + wcmd[len++] = ' '; + strcpyW(wcmd+len, wszParameters); } retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei);

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015