January 2014 - Wine-commits

Dmitry Timoshkov : windowscodecs: Move the aggregation check from object constructors to class factory.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d03f65a51fd4977f7875d87a6dffe5769caa8e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03f65a51fd4977f7875d87a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 20:18:11 2014 +0900 windowscodecs: Move the aggregation check from object constructors to class factory. --- dlls/windowscodecs/bmpdecode.c | 14 ++++----- dlls/windowscodecs/bmpencode.c | 6 ++-- dlls/windowscodecs/clsfactory.c | 8 ++++-- dlls/windowscodecs/converter.c | 6 ++-- dlls/windowscodecs/gifformat.c | 26 ++++++++--------- dlls/windowscodecs/icnsformat.c | 8 ++---- dlls/windowscodecs/icoformat.c | 8 ++---- dlls/windowscodecs/imgfactory.c | 8 ++---- dlls/windowscodecs/jpegformat.c | 16 ++++------- dlls/windowscodecs/metadatahandler.c | 12 ++++---- dlls/windowscodecs/pngformat.c | 20 ++++++------- dlls/windowscodecs/proxy.c | 2 +- dlls/windowscodecs/tgaformat.c | 6 ++-- dlls/windowscodecs/tiffformat.c | 16 ++++------- dlls/windowscodecs/wincodecs_private.h | 49 ++++++++++++++++---------------- 15 files changed, 89 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d03f65a51fd4977f7875d…

1 0

Alexandre Julliard : user32/tests: Protect the global message sequence with a critical section.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 70009d053c803ecdc7a3d54d14003b68a5d1fb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70009d053c803ecdc7a3d54d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 13:31:10 2014 +0100 user32/tests: Protect the global message sequence with a critical section. --- dlls/user32/tests/msg.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f9398ee..dffaa8d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1723,6 +1723,7 @@ static BOOL after_end_dialog, test_def_id, paint_loop_done; static int sequence_cnt, sequence_size; static struct recvd_message* sequence; static int log_all_parent_messages; +static CRITICAL_SECTION sequence_cs; /* user32 functions */ static HWND (WINAPI *pGetAncestor)(HWND,UINT); @@ -1813,7 +1814,8 @@ static void add_message_(int line, const struct recvd_message *msg) { struct recvd_message *seq; - if (!sequence) + EnterCriticalSection( &sequence_cs ); + if (!sequence) { sequence_size = 10; sequence = HeapAlloc( GetProcessHeap(), 0, sequence_size * sizeof(*sequence) ); @@ -1825,7 +1827,7 @@ static void add_message_(int line, const struct recvd_message *msg) } assert(sequence); - seq = &sequence[sequence_cnt]; + seq = &sequence[sequence_cnt++]; seq->hwnd = msg->hwnd; seq->message = msg->message; seq->flags = msg->flags; @@ -1834,6 +1836,7 @@ static void add_message_(int line, const struct recvd_message *msg) seq->line = line; seq->descr = msg->descr; seq->output[0] = 0; + LeaveCriticalSection( &sequence_cs ); if (msg->descr) { @@ -1918,8 +1921,6 @@ static void add_message_(int line, const struct recvd_message *msg) sprintf( seq->output + strlen(seq->output), " (flags %x)", msg->flags ); } } - - sequence_cnt++; } /* try to make sure pending X events have been processed before continuing */ @@ -1940,9 +1941,11 @@ static void flush_events(void) static void flush_sequence(void) { + EnterCriticalSection( &sequence_cs ); HeapFree(GetProcessHeap(), 0, sequence); sequence = 0; sequence_cnt = sequence_size = 0; + LeaveCriticalSection( &sequence_cs ); } static void dump_sequence(const struct message *expected, const char *context, const char *file, int line) @@ -14290,6 +14293,7 @@ START_TEST(msg) return; } + InitializeCriticalSection( &sequence_cs ); init_procs(); hModuleImm32 = LoadLibraryA("imm32.dll"); @@ -14402,4 +14406,5 @@ START_TEST(msg) GetLastError() == 0xdeadbeef, /* Win9x */ "unexpected error %d\n", GetLastError()); } + DeleteCriticalSection( &sequence_cs ); }

1 0

Alexandre Julliard : gdi32/tests: Update a few more failing DIB cases.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 36301db4d3b7dcb544e32d9da3f69288ecc74f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36301db4d3b7dcb544e32d9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 20:10:41 2014 +0100 gdi32/tests: Update a few more failing DIB cases. --- dlls/gdi32/tests/dib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d23fba5..6e0fccd 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1127,12 +1127,12 @@ static const char *sha1_graphics_1[] = "4842a30dd7fdf38ddc3ddec85c08efe13a0e2e0b", "cc76db6da5ba1776f20240a5ad97a26a9cdf96b0", "014f477664a7f4ce4a948d6359a2707119afc8e2", - "1ee4e951743efc8764249fbc7adecefbfec0428e", + "74d01690e344bc22e7a0478e7a09ccd92354c486", "9ab50a663b74577b656e9849484a909d7ac52eeb", "128eefd2ee043d59dc37918065f687e378e5ca95", - "c642abc651f525332d9d635049646d309e877839", + "d7e2daab98ce1f698c4bfedfc01c0d79fcb76b8e", "8d34215487088b5d4ef63062270ce25c2862643d", - "3dc3075b0c87fdcaabbbae8928303fb2358c15c2", + "826562eb11a0d0bba77fa21245f7406a194e9225", "bbae6f0659e095a42b420082079663f937065813", "bbabe686a6955402c90530e7c67f1428868369b3", NULL

1 0

Alexandre Julliard : shell32: Avoid a duplicate const.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 26f8ac8fae3ad60afd979e18ae71315209108ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f8ac8fae3ad60afd979e18a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 13:49:42 2014 +0100 shell32: Avoid a duplicate const. --- dlls/shell32/shelldispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 52a365b..7b5de8b 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -49,7 +49,7 @@ enum tid_t { }; static ITypeLib *typelib; -static const REFIID tid_ids[] = +static const IID * const tid_ids[] = { &IID_NULL, &IID_IShellDispatch5,

1 0

Piotr Caban : msvcp110: Make locale::facet::Incref and Decref virtual.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 866b616d1b296642f0db484b1131b4ee4bdeb49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=866b616d1b296642f0db484b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:54:09 2014 +0100 msvcp110: Make locale::facet::Incref and Decref virtual. --- dlls/msvcp110/msvcp110.spec | 12 +- dlls/msvcp90/locale.c | 655 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 623 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=866b616d1b296642f0db4…

1 0

Piotr Caban : msvcp110: Add locale::_Init implementation.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: f3abe0bd7f70ade54fc63a206327180878078308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3abe0bd7f70ade54fc63a206… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:54:52 2014 +0100 msvcp110: Add locale::_Init implementation. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp90/locale.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0fbb08e..a12b20e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1467,8 +1467,8 @@ @ cdecl -arch=arm ?_Init(a)ios_base@std@@IAAXXZ(ptr) ios_base__Init @ thiscall -arch=i386 ?_Init(a)ios_base@std@@IAEXXZ(ptr) ios_base__Init @ cdecl -arch=win64 ?_Init(a)ios_base@std@@IEAAXXZ(ptr) ios_base__Init -@ stub -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z -@ stub -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z +@ cdecl -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z(long) locale__Init_ref +@ cdecl -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z(long) locale__Init_ref @ extern ?_Init_cnt(a)Init@ios_base(a)std@@0HA ios_base_Init__Init_cnt # extern ?_Init_cnt(a)_UShinit@std@@0HA @ extern ?_Init_cnt(a)_Winit@std@@0HA _Winit__Init_cnt diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c58862f..b35eaf5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9845,6 +9845,27 @@ locale__Locimp* __cdecl locale__Init(void) return global_locale; } +/* ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z */ +/* ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z */ +locale__Locimp* __cdecl locale__Init_ref(MSVCP_bool inc_ref) +{ + locale__Locimp *ret; + _Lockit lock; + + TRACE("(%x)\n", inc_ref); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + if(inc_ref && global_locale) { + call_locale_facet__Incref(&global_locale->facet); + _Lockit_dtor(&lock); + return global_locale; + } + + ret = locale__Init(); + _Lockit_dtor(&lock); + return ret; +} + /* ??0locale(a)std@@QAE(a)ABV01@0H(a)Z */ /* ??0locale(a)std@@QEAA(a)AEBV01@0H(a)Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16)

1 0

Akihiro Sagawa : gdi32/tests: Add more GetCharABCWidths tests for rotated font.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: b8f22f475586bda13a4b348695ddf3d520bdfa17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f22f475586bda13a4b34869… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:56 2014 +0900 gdi32/tests: Add more GetCharABCWidths tests for rotated font. --- dlls/gdi32/tests/font.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 54e32ad..28bec52 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1300,7 +1300,7 @@ static void test_GetCharABCWidths(void) memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); - lf.lfHeight = 20; + lf.lfHeight = 200; hfont = CreateFontIndirectA(&lf); /* test empty glyph's metrics */ @@ -1312,10 +1312,35 @@ static void test_GetCharABCWidths(void) ok(ret, "GetCharABCWidthsW should have succeeded\n"); ok(abcw[0].abcB == 1, "got %u\n", abcw[0].abcB); + /* 1) prepare unrotated font metrics */ + ret = pGetCharABCWidthsW(hdc, 'a', 'a', abcw); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); + DeleteObject(SelectObject(hdc, hfont)); + + /* 2) get rotated font metrics */ + lf.lfEscapement = lf.lfOrientation = 900; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); + + /* 3) compare ABC results */ + todo_wine { + ok(match_off_by_1(abcw[0].abcA, abc[0].abcA, FALSE), + "got %d, expected %d (A)\n", abc[0].abcA, abcw[0].abcA); + ok(match_off_by_1(abcw[0].abcB, abc[0].abcB, FALSE), + "got %d, expected %d (B)\n", abc[0].abcB, abcw[0].abcB); + ok(match_off_by_1(abcw[0].abcC, abc[0].abcC, FALSE), + "got %d, expected %d (C)\n", abc[0].abcC, abcw[0].abcC); + } + DeleteObject(SelectObject(hdc, hfont)); ReleaseDC(NULL, hdc); trace("ABC sign test for a variety of transforms:\n"); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; hfont = CreateFontIndirectA(&lf); hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL);

1 0

Akihiro Sagawa : gdi32: Fix ABC metrics for rotated font.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: f6bc356860a1ea2e5b4aed43e38ddf8b7d24a8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bc356860a1ea2e5b4aed43e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:58 2014 +0900 gdi32: Fix ABC metrics for rotated font. --- dlls/gdi32/freetype.c | 18 ++++++++++++++++-- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f8b365b..3cc8dd8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6438,6 +6438,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmCellIncY = 0; origin_x = left; origin_y = top; + abc->abcA = origin_x >> 6; + abc->abcB = metrics.width >> 6; } else { INT xc, yc; FT_Vector vec; @@ -6534,6 +6536,19 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMatUnrotated); adv = pFT_MulFix(vec.x, em_scale) * 2; } + + vec.x = metrics.horiBearingX; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + abc->abcA = vec.x >> 6; + + vec.x = metrics.width; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + if (vec.x >= 0) + abc->abcB = vec.x >> 6; + else + abc->abcB = -vec.x >> 6; } width = (right - left) >> 6; @@ -6542,8 +6557,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmBlackBoxY = height ? height : 1; gm.gmptGlyphOrigin.x = origin_x >> 6; gm.gmptGlyphOrigin.y = origin_y >> 6; - abc->abcA = left >> 6; - abc->abcB = gm.gmBlackBoxX; + if (!abc->abcB) abc->abcB = 1; abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", gm.gmBlackBoxX, gm.gmBlackBoxY, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 28bec52..e05cfea 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1325,14 +1325,12 @@ static void test_GetCharABCWidths(void) ok(ret, "GetCharABCWidthsW should have succeeded\n"); /* 3) compare ABC results */ - todo_wine { ok(match_off_by_1(abcw[0].abcA, abc[0].abcA, FALSE), "got %d, expected %d (A)\n", abc[0].abcA, abcw[0].abcA); ok(match_off_by_1(abcw[0].abcB, abc[0].abcB, FALSE), "got %d, expected %d (B)\n", abc[0].abcB, abcw[0].abcB); ok(match_off_by_1(abcw[0].abcC, abc[0].abcC, FALSE), "got %d, expected %d (C)\n", abc[0].abcC, abcw[0].abcC); - } DeleteObject(SelectObject(hdc, hfont)); ReleaseDC(NULL, hdc);

1 0

Akihiro Sagawa : gdi32/tests: Add tests for vertical writing metrics.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: a221654aaee6ff112da03b9d25c742344a47f58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a221654aaee6ff112da03b9d2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:59 2014 +0900 gdi32/tests: Add tests for vertical writing metrics. --- dlls/gdi32/tests/font.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e05cfea..bea7f28 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5229,13 +5229,98 @@ static void check_vertical_font(const char *name, BOOL *installed, BOOL *selecte ReleaseDC(NULL, hdc); } +static void check_vertical_metrics(const char *face) +{ + LOGFONTA lf; + HFONT hfont, hfont_prev; + HDC hdc; + DWORD ret; + GLYPHMETRICS rgm, vgm; + const UINT code = 0x5EAD, height = 1000; + WORD idx; + ABC abc; + OUTLINETEXTMETRICA otm; + USHORT numOfLongVerMetrics; + + hdc = GetDC(NULL); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, face); + lf.lfHeight = -height; + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfEscapement = lf.lfOrientation = 900; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &rgm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + ret = GetCharABCWidthsW(hdc, code, code, &abc); + ok(ret, "GetCharABCWidthsW failed\n"); + DeleteObject(SelectObject(hdc, hfont_prev)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "@"); + strcat(lf.lfFaceName, face); + lf.lfHeight = -height; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &vgm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + + memset(&otm, 0, sizeof(otm)); + otm.otmSize = sizeof(otm); + ret = GetOutlineTextMetricsA(hdc, sizeof(otm), &otm); + ok(ret != 0, "GetOutlineTextMetricsA failed\n"); + ret = GetGlyphIndicesW(hdc, (LPCWSTR)&code, 1, &idx, 0); + ok(ret != 0, "GetGlyphIndicesW failed\n"); + + if (GetFontData(hdc, MS_MAKE_TAG('v','h','e','a'), sizeof(SHORT) * 17, + &numOfLongVerMetrics, sizeof(numOfLongVerMetrics)) != GDI_ERROR) { + int offset; + SHORT topSideBearing; + numOfLongVerMetrics = GET_BE_WORD(numOfLongVerMetrics); + if (numOfLongVerMetrics > idx) + offset = idx * 2 + 1; + else + offset = numOfLongVerMetrics * 2 + (idx - numOfLongVerMetrics); + ret = GetFontData(hdc, MS_MAKE_TAG('v','m','t','x'), offset * sizeof(SHORT), + &topSideBearing, sizeof(SHORT)); + ok(ret != GDI_ERROR, "GetFontData(vmtx) failed\n"); + topSideBearing = GET_BE_WORD(topSideBearing); + ok(match_off_by_1(vgm.gmptGlyphOrigin.x, + MulDiv(topSideBearing, height, otm.otmEMSquare), FALSE), + "expected %d, got %d\n", + MulDiv(topSideBearing, height, otm.otmEMSquare), vgm.gmptGlyphOrigin.x); + } + else + { + todo_wine + ok(vgm.gmptGlyphOrigin.x == rgm.gmptGlyphOrigin.x + vgm.gmCellIncX + otm.otmDescent, + "got %d, expected rgm.origin.x(%d) + vgm.cellIncX(%d) + descent(%d)\n", + vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); + } + + todo_wine + ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, + "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", + (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); +} + static void test_vertical_font(void) { char ttf_name[MAX_PATH]; - int num; + int num, i; BOOL ret, installed, selected; GLYPHMETRICS gm; WORD hgi, vgi; + const char* face_list[] = { + "@WineTestVertical", /* has vmtx table */ + "@Ume Gothic", /* doesn't have vmtx table */ + "@MS UI Gothic", /* has vmtx table, available on native */ + }; if (!pAddFontResourceExA || !pRemoveFontResourceExA || !pGetGlyphIndicesW) { @@ -5268,6 +5353,16 @@ static void test_vertical_font(void) ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi); + for (i = 0; i < sizeof(face_list)/sizeof(face_list[0]); i++) { + const char* face = face_list[i]; + if (!is_truetype_font_installed(face)) { + skip("%s is not installed\n", face); + continue; + } + trace("Testing %s...\n", face); + check_vertical_metrics(&face[1]); + } + ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());

1 0

Akihiro Sagawa : gdi32: Improve vertical writing metrics.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: f6475ace5fc812749beefc8fc17add8c4281bc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6475ace5fc812749beefc8fc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:30:01 2014 +0900 gdi32: Improve vertical writing metrics. --- dlls/gdi32/freetype.c | 44 ++++++++++++++------------------------------ dlls/gdi32/tests/font.c | 2 -- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3cc8dd8..722a211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6443,6 +6443,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } else { INT xc, yc; FT_Vector vec; + FT_Pos lsb; left = right = 0; @@ -6468,41 +6469,24 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = bottom & -64; top = (top + 63) & -64; - if (tategaki) + if (tategaki && (font->potm || get_outline_text_metrics(font))) { - for(xc = 0; xc < 2; xc++) - { - for(yc = 0; yc < 2; yc++) - { - if (vertical_metrics) - { - vec.x = metrics.vertBearingY + xc * metrics.height; - vec.y = metrics.horiBearingX - yc * (metrics.vertBearingX * 2); - } - else - { - vec.x = metrics.horiBearingY - xc * metrics.height; - vec.y = metrics.horiBearingX + yc * metrics.width; - } - - TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); - pFT_Vector_Transform(&vec, &transMat); - if(xc == 0 && yc == 0) { - origin_x = vec.x; - origin_y = vec.y; - } else { - if(vec.x < origin_x) origin_x = vec.x; - if(vec.y > origin_y) origin_y = vec.y; - } - } - } - origin_x = origin_x & -64; - origin_y = (origin_y + 63) & -64; + if (vertical_metrics) + lsb = metrics.horiBearingY + metrics.vertBearingY; + else + lsb = metrics.vertAdvance + (font->potm->otmDescent << 6); + vec.x = lsb; + vec.y = font->potm->otmDescent << 6; + TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); + pFT_Vector_Transform(&vec, &transMat); + origin_x = (vec.x + left) & -64; + origin_y = (vec.y + top + 63) & -64; } else { origin_x = left; origin_y = top; + lsb = metrics.horiBearingX; } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); @@ -6537,7 +6521,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, adv = pFT_MulFix(vec.x, em_scale) * 2; } - vec.x = metrics.horiBearingX; + vec.x = lsb; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); abc->abcA = vec.x >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bea7f28..7e93f9d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5294,13 +5294,11 @@ static void check_vertical_metrics(const char *face) } else { - todo_wine ok(vgm.gmptGlyphOrigin.x == rgm.gmptGlyphOrigin.x + vgm.gmCellIncX + otm.otmDescent, "got %d, expected rgm.origin.x(%d) + vgm.cellIncX(%d) + descent(%d)\n", vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); } - todo_wine ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent);

1 0