Aric Stewart : gdi32: ABC value signs remain the same despite any changes in layout direction or viewport .
Alexandre Julliard
julliard at winehq.org
Thu Sep 12 14:55:21 CDT 2013
Module: wine
Branch: master
Commit: 3f4ef58b0fdb771ffacb64812c32aa625892a16f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4ef58b0fdb771ffacb64812c32aa625892a16f
Author: Aric Stewart <aric at codeweavers.com>
Date: Thu Sep 12 13:01:56 2013 -0500
gdi32: ABC value signs remain the same despite any changes in layout direction or viewport.
---
dlls/gdi32/font.c | 19 +++++----
dlls/gdi32/tests/font.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 104 insertions(+), 10 deletions(-)
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 68b2713..7fd5bd3 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2700,9 +2700,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar,
{
/* convert device units to logical */
for( i = firstChar; i <= lastChar; i++, abc++ ) {
- abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA);
- abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB);
- abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC);
+ abc->abcA = width_to_LP(dc, abc->abcA);
+ abc->abcB = width_to_LP(dc, abc->abcB);
+ abc->abcC = width_to_LP(dc, abc->abcC);
}
}
@@ -2752,9 +2752,9 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count,
{
/* convert device units to logical */
for( i = 0; i < count; i++, abc++ ) {
- abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA);
- abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB);
- abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC);
+ abc->abcA = width_to_LP(dc, abc->abcA);
+ abc->abcB = width_to_LP(dc, abc->abcB);
+ abc->abcC = width_to_LP(dc, abc->abcC);
}
}
@@ -3352,11 +3352,12 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT a
if (ret)
{
/* convert device units to logical */
+ FLOAT scale = fabs( dc->xformVport2World.eM11 );
for (i = first; i <= last; i++, abcf++)
{
- abcf->abcfA = abc[i - first].abcA * dc->xformVport2World.eM11;
- abcf->abcfB = abc[i - first].abcB * dc->xformVport2World.eM11;
- abcf->abcfC = abc[i - first].abcC * dc->xformVport2World.eM11;
+ abcf->abcfA = abc[i - first].abcA * scale;
+ abcf->abcfB = abc[i - first].abcB * scale;
+ abcf->abcfC = abc[i - first].abcC * scale;
}
}
HeapFree( GetProcessHeap(), 0, abc );
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 11299f3..99c5eef 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1113,17 +1113,50 @@ static int CALLBACK create_font_proc(const LOGFONT *lpelfe,
return 1;
}
+static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, ABC *base_abci, ABC *base_abcw, ABCFLOAT *base_abcf, INT todo)
+{
+ ABC abc[1];
+ ABCFLOAT abcf[1];
+ BOOL ret = FALSE;
+
+ ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc);
+ ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description);
+ ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description);
+ if (todo) todo_wine ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description);
+ else ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description);
+ if (todo) todo_wine ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description);
+ else ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description);
+
+ ret = pGetCharABCWidthsW(hdc, 'i', 'i', abc);
+ ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description);
+ ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description);
+ if (todo) todo_wine ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description);
+ else ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description);
+ if (todo) todo_wine ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description);
+ else ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's should be unchanged\n", description);
+
+ ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf);
+ ok(ret, "%s: GetCharABCWidthsFloatW should have succeeded\n", description);
+ ok (abcf->abcfB > 0.0, "%s: abcfB should be positive\n", description);
+ if (todo) todo_wine ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description);
+ else ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's should be unchanged\n", description);
+ if (todo) todo_wine ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description);
+ else ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description);
+}
+
static void test_GetCharABCWidths(void)
{
- static const WCHAR str[] = {'a',0};
+ static const WCHAR str[] = {'i',0};
BOOL ret;
HDC hdc;
LOGFONTA lf;
HFONT hfont;
ABC abc[1];
+ ABC abcw[1];
ABCFLOAT abcf[1];
WORD glyphs[1];
DWORD nb;
+ HWND hwnd;
static const struct
{
UINT first;
@@ -1266,6 +1299,66 @@ static void test_GetCharABCWidths(void)
}
ReleaseDC(NULL, hdc);
+
+ memset(&lf, 0, sizeof(lf));
+ strcpy(lf.lfFaceName, "Tahoma");
+ lf.lfHeight = 20;
+
+ trace("ABC sign test for a varity of transforms:\n");
+ hfont = CreateFontIndirectA(&lf);
+ hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100,
+ 0, 0, 0, NULL);
+ hdc = GetDC(hwnd);
+ SetMapMode(hdc, MM_ANISOTROPIC);
+ SelectObject(hdc, hfont);
+
+ nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0);
+ ok(nb == 1, "GetGlyphIndicesW should have returned 1\n");
+
+ ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc);
+ ok(ret, "GetCharABCWidthsI should have succeeded\n");
+ ret = pGetCharABCWidthsW(hdc, 'i', 'i', abcw);
+ ok(ret, "GetCharABCWidthsI should have succeeded\n");
+ ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf);
+ ok(ret, "GetCharABCWidthsFloatW should have succeeded\n");
+
+ ABCWidths_helper("LTR", hdc, glyphs, abc, abcw, abcf, 0);
+ SetWindowExtEx(hdc, -1, -1, NULL);
+ SetGraphicsMode(hdc, GM_COMPATIBLE);
+ ABCWidths_helper("LTR -1 compatible", hdc, glyphs, abc, abcw, abcf, 0);
+ SetGraphicsMode(hdc, GM_ADVANCED);
+ ABCWidths_helper("LTR -1 advanced", hdc, glyphs, abc, abcw, abcf, 1);
+ SetWindowExtEx(hdc, 1, 1, NULL);
+ SetGraphicsMode(hdc, GM_COMPATIBLE);
+ ABCWidths_helper("LTR 1 compatible", hdc, glyphs, abc, abcw, abcf, 0);
+ SetGraphicsMode(hdc, GM_ADVANCED);
+ ABCWidths_helper("LTR 1 advanced", hdc, glyphs, abc, abcw, abcf, 0);
+
+ ReleaseDC(hwnd, hdc);
+ DestroyWindow(hwnd);
+
+ trace("RTL layout\n");
+ hwnd = CreateWindowEx(WS_EX_LAYOUTRTL, "static", "", WS_POPUP, 0,0,100,100,
+ 0, 0, 0, NULL);
+ hdc = GetDC(hwnd);
+ SetMapMode(hdc, MM_ANISOTROPIC);
+ SelectObject(hdc, hfont);
+
+ ABCWidths_helper("RTL", hdc, glyphs, abc, abcw, abcf, 0);
+ SetWindowExtEx(hdc, -1, -1, NULL);
+ SetGraphicsMode(hdc, GM_COMPATIBLE);
+ ABCWidths_helper("RTL -1 compatible", hdc, glyphs, abc, abcw, abcf, 0);
+ SetGraphicsMode(hdc, GM_ADVANCED);
+ ABCWidths_helper("RTL -1 advanced", hdc, glyphs, abc, abcw, abcf, 0);
+ SetWindowExtEx(hdc, 1, 1, NULL);
+ SetGraphicsMode(hdc, GM_COMPATIBLE);
+ ABCWidths_helper("RTL 1 compatible", hdc, glyphs, abc, abcw, abcf, 0);
+ SetGraphicsMode(hdc, GM_ADVANCED);
+ ABCWidths_helper("RTL 1 advanced", hdc, glyphs, abc, abcw, abcf, 1);
+
+ ReleaseDC(hwnd, hdc);
+ DestroyWindow(hwnd);
+ DeleteObject(hfont);
}
static void test_text_extents(void)
More information about the wine-cvs
mailing list