Dmitry Timoshkov : gdi32: Move get_glyph_indices near its caller test_font_charset.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 14478b8ba2913747971b5bb8634aa044fa8af0f6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=14478b8ba2913747971b5bb863...

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Tue Feb 20 16:35:19 2007 +0800

gdi32: Move get_glyph_indices near its caller test_font_charset.

---

 dlls/gdi32/tests/font.c |  166 +++++++++++++++++++++++-----------------------
 1 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index f491459..0a9f8d3 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -821,89 +821,6 @@ static void test_GetOutlineTextMetrics(void)
     ReleaseDC(0, hdc);
 }
 
-static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count, BOOL unicode)
-{
-    HDC hdc;
-    LOGFONTA lf;
-    HFONT hfont, hfont_old;
-    CHARSETINFO csi;
-    FONTSIGNATURE fs;
-    INT cs;
-    DWORD i, ret;
-    char name[64];
-
-    assert(count <= 128);
-
-    memset(&lf, 0, sizeof(lf));
-
-    lf.lfCharSet = charset;
-    lf.lfHeight = 10;
-    lstrcpyA(lf.lfFaceName, "Arial");
-    SetLastError(0xdeadbeef);
-    hfont = CreateFontIndirectA(&lf);
-    ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError());
-
-    hdc = GetDC(0);
-    hfont_old = SelectObject(hdc, hfont);
-
-    cs = GetTextCharsetInfo(hdc, &fs, 0);
-    ok(cs == charset, "expected %d, got %d\n", charset, cs);
-
-    SetLastError(0xdeadbeef);
-    ret = GetTextFace(hdc, sizeof(name), name);
-    ok(ret, "GetTextFace error %u\n", GetLastError());
-
-    if (charset == SYMBOL_CHARSET)
-    {
-        ok(strcmp("Arial", name), "face name should NOT be Arial\n");
-        ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n");
-    }
-    else
-    {
-        ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name);
-        ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n");
-    }
-
-    if (!TranslateCharsetInfo((DWORD *)cs, &csi, TCI_SRCCHARSET))
-    {
-        trace("Can't find codepage for charset %d\n", cs);
-        ReleaseDC(0, hdc);
-        return FALSE;
-    }
-    ok(csi.ciACP == code_page, "expected %d, got %d\n", code_page, csi.ciACP);
-
-    if (unicode)
-    {
-        char ansi_buf[128];
-        WCHAR unicode_buf[128];
-
-        for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128);
-
-        MultiByteToWideChar(code_page, 0, ansi_buf, count, unicode_buf, count);
-
-        SetLastError(0xdeadbeef);
-        ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0);
-        ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError());
-    }
-    else
-    {
-        char ansi_buf[128];
-
-        for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128);
-
-        SetLastError(0xdeadbeef);
-        ret = pGetGlyphIndicesA(hdc, ansi_buf, count, idx, 0);
-        ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError());
-    }
-
-    SelectObject(hdc, hfont_old);
-    DeleteObject(hfont);
-
-    ReleaseDC(0, hdc);
-
-    return TRUE;
-}
-
 static void testJustification(HDC hdc, PSTR str, RECT *clientArea)
 {
     INT         x, y,
@@ -1033,6 +950,89 @@ static void test_SetTextJustification(void)
     DestroyWindow(hwnd);
 }
 
+static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count, BOOL unicode)
+{
+    HDC hdc;
+    LOGFONTA lf;
+    HFONT hfont, hfont_old;
+    CHARSETINFO csi;
+    FONTSIGNATURE fs;
+    INT cs;
+    DWORD i, ret;
+    char name[64];
+
+    assert(count <= 128);
+
+    memset(&lf, 0, sizeof(lf));
+
+    lf.lfCharSet = charset;
+    lf.lfHeight = 10;
+    lstrcpyA(lf.lfFaceName, "Arial");
+    SetLastError(0xdeadbeef);
+    hfont = CreateFontIndirectA(&lf);
+    ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError());
+
+    hdc = GetDC(0);
+    hfont_old = SelectObject(hdc, hfont);
+
+    cs = GetTextCharsetInfo(hdc, &fs, 0);
+    ok(cs == charset, "expected %d, got %d\n", charset, cs);
+
+    SetLastError(0xdeadbeef);
+    ret = GetTextFace(hdc, sizeof(name), name);
+    ok(ret, "GetTextFace error %u\n", GetLastError());
+
+    if (charset == SYMBOL_CHARSET)
+    {
+        ok(strcmp("Arial", name), "face name should NOT be Arial\n");
+        ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n");
+    }
+    else
+    {
+        ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name);
+        ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n");
+    }
+
+    if (!TranslateCharsetInfo((DWORD *)cs, &csi, TCI_SRCCHARSET))
+    {
+        trace("Can't find codepage for charset %d\n", cs);
+        ReleaseDC(0, hdc);
+        return FALSE;
+    }
+    ok(csi.ciACP == code_page, "expected %d, got %d\n", code_page, csi.ciACP);
+
+    if (unicode)
+    {
+        char ansi_buf[128];
+        WCHAR unicode_buf[128];
+
+        for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128);
+
+        MultiByteToWideChar(code_page, 0, ansi_buf, count, unicode_buf, count);
+
+        SetLastError(0xdeadbeef);
+        ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0);
+        ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError());
+    }
+    else
+    {
+        char ansi_buf[128];
+
+        for (i = 0; i < count; i++) ansi_buf[i] = (BYTE)(i + 128);
+
+        SetLastError(0xdeadbeef);
+        ret = pGetGlyphIndicesA(hdc, ansi_buf, count, idx, 0);
+        ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError());
+    }
+
+    SelectObject(hdc, hfont_old);
+    DeleteObject(hfont);
+
+    ReleaseDC(0, hdc);
+
+    return TRUE;
+}
+
 static void test_font_charset(void)
 {
     static struct charset_data