June 2008 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Make test_SetForegroundWindow() the last message test.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: bb4e7832b4338d8c1431b28d150ae95ab45c0d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4e7832b4338d8c1431b28d1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 17:48:08 2008 +0900 user32: Make test_SetForegroundWindow() the last message test. --- dlls/user32/tests/msg.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f2f335f..390aca4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10840,9 +10840,12 @@ START_TEST(msg) test_sys_menu(); test_dialog_messages(); test_nullCallback(); - test_SetForegroundWindow(); test_dbcs_wm_char(); test_menu_messages(); + /* keep it the last test, under Windows it tends to break the tests + * which rely on active/foreground windows being correct. + */ + test_SetForegroundWindow(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent)

1 0

Paul Vriens : shell32/tests: Skip some tests if functions are not available .
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 732a07957df8474c85ec7ed4791fdf1699a9c6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732a07957df8474c85ec7ed47… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 24 12:08:26 2008 +0200 shell32/tests: Skip some tests if functions are not available. --- dlls/shell32/tests/shellpath.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index a6bbcae..a1cf2d3 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -478,11 +478,14 @@ static void testShellValues(const struct shellExpectedValues testEntries[], { BYTE type; - type = testSHGetFolderLocation(optional, testEntries[i].folder); - ok(type == testEntries[i].pidlType || optional, - "%s has type %d (0x%02x), expected %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type, - testEntries[i].pidlType, testEntries[i].pidlType); + if (pSHGetFolderLocation) + { + type = testSHGetFolderLocation(optional, testEntries[i].folder); + ok(type == testEntries[i].pidlType || optional, + "%s has type %d (0x%02x), expected %d (0x%02x)\n", + getFolderName(testEntries[i].folder), type, type, + testEntries[i].pidlType, testEntries[i].pidlType); + } type = testSHGetSpecialFolderLocation(optional, testEntries[i].folder); ok(type == testEntries[i].pidlType || optional, "%s has type %d (0x%02x), expected %d (0x%02x)\n", @@ -576,12 +579,15 @@ static void testPersonal(void) /* The pidl may be a real folder, or a virtual directory, or a drive if the * home directory is set to the root directory of a drive. */ - type = testSHGetFolderLocation(FALSE, CSIDL_PERSONAL); - ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE, - "CSIDL_PERSONAL returned invalid type 0x%02x, " - "expected PT_FOLDER or PT_GUID\n", type); - if (type == PT_FOLDER) - testSHGetFolderPath(FALSE, CSIDL_PERSONAL); + if (pSHGetFolderLocation) + { + type = testSHGetFolderLocation(FALSE, CSIDL_PERSONAL); + ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE, + "CSIDL_PERSONAL returned invalid type 0x%02x, " + "expected PT_FOLDER or PT_GUID\n", type); + if (type == PT_FOLDER) + testSHGetFolderPath(FALSE, CSIDL_PERSONAL); + } type = testSHGetSpecialFolderLocation(FALSE, CSIDL_PERSONAL); ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE, "CSIDL_PERSONAL returned invalid type 0x%02x, " @@ -898,6 +904,10 @@ START_TEST(shellpath) doChild(myARGV[2]); else { + /* Report missing functions once */ + if (!pSHGetFolderLocation) + skip("SHGetFolderLocation is not available\n"); + /* first test various combinations of parameters: */ testApiParameters();

1 0

Zhangrong Huang : kernel32: Add locale script tag resources.
by Alexandre Julliard 24 Jun '08

24 Jun '08

1 0

Dmitry Timoshkov : gdi32: Perform correct glyph scaling even if font metrics haven't been cached yet .
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 0d6dcc1e4e17463de39f9ab267096dc7142ef863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6dcc1e4e17463de39f9ab26… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 16:15:48 2008 +0900 gdi32: Perform correct glyph scaling even if font metrics haven't been cached yet. --- dlls/gdi32/freetype.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fe7d2d5..95b260a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4353,8 +4353,12 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } /* Scaling factor */ - if (font->aveWidth && font->potm) + if (font->aveWidth) { + TEXTMETRICW tm; + + WineEngGetTextMetrics(font, &tm); + widthRatio = (double)font->aveWidth; widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; }

1 0

Dmitry Timoshkov : gdi32: Add a test for outline text metrics.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 6f7457d8adaf67b457154a45deef21d5b5a87c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7457d8adaf67b457154a45d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 16:13:31 2008 +0900 gdi32: Add a test for outline text metrics. --- dlls/gdi32/tests/font.c | 301 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 289 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f7457d8adaf67b457154…

1 0

Dmitry Timoshkov : gdi32: Indent a block of code using 4 spaces instead of 5.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: e02168791ea7e94827065313d13ac23ab1326f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02168791ea7e94827065313d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 16:13:07 2008 +0900 gdi32: Indent a block of code using 4 spaces instead of 5. --- dlls/gdi32/freetype.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f9df27b..fe7d2d5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3300,14 +3300,13 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) ret = alloc_font(); - memcpy(&ret->font_desc.matrix, &dc->xformWorld2Vport, sizeof(FMAT2)); - ret->font_desc.lf = lf; - ret->font_desc.can_use_bitmap = can_use_bitmap; - calc_hash(&ret->font_desc); - hflist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hflist)); - hflist->hfont = hfont; - list_add_head(&ret->hfontlist, &hflist->entry); - + memcpy(&ret->font_desc.matrix, &dc->xformWorld2Vport, sizeof(FMAT2)); + ret->font_desc.lf = lf; + ret->font_desc.can_use_bitmap = can_use_bitmap; + calc_hash(&ret->font_desc); + hflist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hflist)); + hflist->hfont = hfont; + list_add_head(&ret->hfontlist, &hflist->entry); /* If lfFaceName is "Symbol" then Windows fixes up lfCharSet to SYMBOL_CHARSET so that Symbol gets picked irrespective of the

1 0

Dmitry Timoshkov : gdi32: Scale outline font metrics.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: b2fa21e4bb1178bb643df1a70cbac940a4371ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2fa21e4bb1178bb643df1a70… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 16:12:50 2008 +0900 gdi32: Scale outline font metrics. --- dlls/gdi32/freetype.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e185544..f9df27b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4921,6 +4921,55 @@ static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm) #undef SCALE_Y } +static void scale_outline_font_metrics(const GdiFont *font, OUTLINETEXTMETRICW *potm) +{ + double scale_x, scale_y; + + if (font->aveWidth) + { + scale_x = (double)font->aveWidth; + scale_x /= (double)font->potm->otmTextMetrics.tmAveCharWidth; + } + else + scale_x = font->scale_y; + + scale_x *= fabs(font->font_desc.matrix.eM11); + scale_y = font->scale_y * fabs(font->font_desc.matrix.eM22); + + scale_font_metrics(font, &potm->otmTextMetrics); + +#define SCALE_X(x) (x) = GDI_ROUND((double)(x) * (scale_x)) +#define SCALE_Y(y) (y) = GDI_ROUND((double)(y) * (scale_y)) + + SCALE_Y(potm->otmAscent); + SCALE_Y(potm->otmDescent); + SCALE_Y(potm->otmLineGap); + SCALE_Y(potm->otmsCapEmHeight); + SCALE_Y(potm->otmsXHeight); + SCALE_Y(potm->otmrcFontBox.top); + SCALE_Y(potm->otmrcFontBox.bottom); + SCALE_X(potm->otmrcFontBox.left); + SCALE_X(potm->otmrcFontBox.right); + SCALE_Y(potm->otmMacAscent); + SCALE_Y(potm->otmMacDescent); + SCALE_Y(potm->otmMacLineGap); + SCALE_X(potm->otmptSubscriptSize.x); + SCALE_Y(potm->otmptSubscriptSize.y); + SCALE_X(potm->otmptSubscriptOffset.x); + SCALE_Y(potm->otmptSubscriptOffset.y); + SCALE_X(potm->otmptSuperscriptSize.x); + SCALE_Y(potm->otmptSuperscriptSize.y); + SCALE_X(potm->otmptSuperscriptOffset.x); + SCALE_Y(potm->otmptSuperscriptOffset.y); + SCALE_Y(potm->otmsStrikeoutSize); + SCALE_Y(potm->otmsStrikeoutPosition); + SCALE_Y(potm->otmsUnderscoreSize); + SCALE_Y(potm->otmsUnderscorePosition); + +#undef SCALE_X +#undef SCALE_Y +} + /************************************************************* * WineEngGetTextMetrics * @@ -4977,7 +5026,7 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, if(cbSize >= font->potm->otmSize) { memcpy(potm, font->potm, font->potm->otmSize); - scale_font_metrics(font, &potm->otmTextMetrics); + scale_outline_font_metrics(font, potm); } LeaveCriticalSection( &freetype_cs ); return font->potm->otmSize; @@ -5214,7 +5263,7 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, if(potm && needed <= cbSize) { memcpy(potm, font->potm, font->potm->otmSize); - scale_font_metrics(font, &potm->otmTextMetrics); + scale_outline_font_metrics(font, potm); } end:

1 0

Dmitry Timoshkov : gdi32: Don' t return cached glyph metrics if a custom transformation was requested.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 433c3cfeecbd518be6f54d572defbfd9b3601ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=433c3cfeecbd518be6f54d572… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 16:12:32 2008 +0900 gdi32: Don't return cached glyph metrics if a custom transformation was requested. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 01c9530..e185544 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4327,8 +4327,13 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, font->gm = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm, font->gmsize * sizeof(GM*)); } else { - if(format == GGO_METRICS && font->gm[original_index / GM_BLOCK_SIZE] != NULL && FONT_GM(font,original_index)->init ) { + if (format == GGO_METRICS && font->gm[original_index / GM_BLOCK_SIZE] != NULL && + FONT_GM(font,original_index)->init && (!lpmat || is_identity_MAT2(lpmat))) + { *lpgm = FONT_GM(font,original_index)->gm; + TRACE("cached: %u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, + wine_dbgstr_point(&lpgm->gmptGlyphOrigin), + lpgm->gmCellIncX, lpgm->gmCellIncY); LeaveCriticalSection( &freetype_cs ); return 1; /* FIXME */ }

1 0

Dmitry Timoshkov : gdi32: Don' t cache glyph metrics if they have a custom transformation.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 7ef471220ddf7b88d1737092376a7e6cb2e0613a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef471220ddf7b88d17370923… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 16:12:14 2008 +0900 gdi32: Don't cache glyph metrics if they have a custom transformation. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4782d66..01c9530 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4473,7 +4473,12 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmptGlyphOrigin.x = left >> 6; lpgm->gmptGlyphOrigin.y = top >> 6; - if(format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) + TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, + wine_dbgstr_point(&lpgm->gmptGlyphOrigin), + lpgm->gmCellIncX, lpgm->gmCellIncY); + + if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) && + (!lpmat || is_identity_MAT2(lpmat))) /* don't cache custom transforms */ { FONT_GM(font,original_index)->gm = *lpgm; FONT_GM(font,original_index)->adv = adv;

1 0

Dmitry Timoshkov : gdi32: Apply the custom transform to a glyph only if it' s not an identity one.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 8cdca3980acc01f6be996647a593079613c1e21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdca3980acc01f6be996647a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 24 16:11:57 2008 +0900 gdi32: Apply the custom transform to a glyph only if it's not an identity one. --- dlls/gdi32/freetype.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5a37170..4782d66 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4265,6 +4265,12 @@ static inline BOOL is_identity_FMAT2(const FMAT2 *matrix) return !memcmp(matrix, &identity, sizeof(FMAT2)); } +static inline BOOL is_identity_MAT2(const MAT2 *matrix) +{ + static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; + return !memcmp(matrix, &identity, sizeof(MAT2)); +} + /************************************************************* * WineEngGetGlyphOutline * @@ -4411,7 +4417,8 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } /* Extra transformation specified by caller */ - if (lpmat) { + if (lpmat && !is_identity_MAT2(lpmat)) + { FT_Matrix extraMat; extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); extraMat.xy = FT_FixedFromFIXED(lpmat->eM21);

1 0