wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Austin English : imm32: Add a stub for ImmEnumInputContext.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 8f85b054290e805e5830c8f9c838d543392c7366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f85b054290e805e5830c8f9c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 2 16:53:13 2011 -0500 imm32: Add a stub for ImmEnumInputContext. --- dlls/imm32/imm.c | 10 ++++++++++ dlls/imm32/imm32.spec | 2 +- include/imm.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3122115..cc68305 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2821,3 +2821,13 @@ BOOL WINAPI ImmDisableTextFrameService(DWORD idThread) FIXME("Stub\n"); return FALSE; } + +/*********************************************************************** + * ImmEnumInputContext(IMM32.@) + */ + +BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam) +{ + FIXME("Stub\n"); + return FALSE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 0d05362..03f64a5 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -12,7 +12,7 @@ @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME @ stdcall ImmDisableTextFrameService(long) -@ stub ImmEnumInputContext +@ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) @ stdcall ImmEscapeA(long long long ptr) diff --git a/include/imm.h b/include/imm.h index 57658de..eff9887 100644 --- a/include/imm.h +++ b/include/imm.h @@ -127,6 +127,8 @@ typedef struct _tagCOMPOSITIONFORM RECT rcArea; } COMPOSITIONFORM, *LPCOMPOSITIONFORM; +typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); + /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008 @@ -482,6 +484,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); HIMC WINAPI ImmCreateContext(void); BOOL WINAPI ImmDestroyContext(HIMC hIMC); BOOL WINAPI ImmDisableIME(DWORD idThread); +BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); #define ImmEnumRegisterWord WINELIB_NAME_AW(ImmEnumRegisterWord)

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in tab tests.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 16945559420182a53d6405e61bc3949d15cdb914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16945559420182a53d6405e61… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Thu Jun 2 17:31:30 2011 +0200 comctl32/tests: Removed sign comparison warning in tab tests. --- dlls/comctl32/tests/tab.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 7f5bbb7..c82f128 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1254,7 +1254,7 @@ static void test_removeimage(void) static void test_delete_selection(void) { HWND hTab; - DWORD ret; + INT ret; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4); ok(hTab != NULL, "Failed to create tab control\n"); @@ -1312,8 +1312,8 @@ static void test_TCM_SETITEMEXTRA(void) static void test_TCS_OWNERDRAWFIXED(void) { - LPARAM lparam, lparam2; - ULONG_PTR itemdata; + LPARAM lparam; + ULONG_PTR itemdata, itemdata2; TCITEMA item; HWND hTab; BOOL ret; @@ -1338,7 +1338,7 @@ static void test_TCS_OWNERDRAWFIXED(void) itemdata = 0; memset(&itemdata, 0xde, 4); - ok(g_drawitem.itemData == itemdata, "got %lx, expected %lx\n", g_drawitem.itemData, itemdata); + ok(g_drawitem.itemData == itemdata, "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); @@ -1368,7 +1368,8 @@ static void test_TCS_OWNERDRAWFIXED(void) ShowWindow(hTab, SW_SHOW); RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW); - ok(*(ULONG_PTR*)g_drawitem.itemData == lparam, "got %lx, expected %lx\n", g_drawitem.itemData, lparam); + memset(&itemdata, 0xde, sizeof(ULONG_PTR)); + ok(*(ULONG_PTR*)g_drawitem.itemData == itemdata, "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); @@ -1397,11 +1398,11 @@ static void test_TCS_OWNERDRAWFIXED(void) ShowWindow(hTab, SW_SHOW); RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW); - lparam = 0; - memset(&lparam, 0xde, 4); - memset(&lparam2, 0xde, sizeof(LPARAM)-1); - ok(g_drawitem.itemData == lparam || broken(g_drawitem.itemData == lparam2) /* win98 */, - "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, lparam); + itemdata = itemdata2 = 0; + memset(&itemdata, 0xde, 4); + memset(&itemdata2, 0xde, sizeof(LPARAM)-1); + ok(g_drawitem.itemData == itemdata || broken(g_drawitem.itemData == itemdata2) /* win98 */, + "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); }

1 0

Aric Stewart : usp10/tests: Add Malayalam shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 687b030c85bb94bbb7e65c90f5f56685fa989ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687b030c85bb94bbb7e65c90f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:56 2011 -0500 usp10/tests: Add Malayalam shaping test. --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cc4c1bf..20772d6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -824,6 +824,17 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Malayalam */ + static const WCHAR test_malayalam[] = {0x0d2e, 0x0d32, 0x0d2f, 0x0d3e, 0x0d33, 0x0d02}; + static const shapeTest_char malayalam_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{2,{0,0}},{4,{0,0}},{4,{0,0}}}; + static const shapeTest_glyph malayalam_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -976,6 +987,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Kartika", 23, test_malayalam[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_malayalam, 6, &Control, &State, 0, 6, malayalam_c, malayalam_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Telugu shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e3f92669ed701bab5b405ef329bc1c3d2e22426f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f92669ed701bab5b405ef32… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:51 2011 -0500 usp10/tests: Add Telugu shaping test. --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 497932c..cc4c1bf 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -813,6 +813,17 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Telugu */ + static const WCHAR test_telugu[] = {0x0c24, 0x0c46, 0x0c32, 0x0c41, 0x0c17, 0x0c41}; + static const shapeTest_char telugu_c[] = {{0,{0,0}},{0,{0,0}},{2,{0,0}},{2,{0,0}},{4,{0,0}},{4,{0,0}}}; + static const shapeTest_glyph telugu_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -957,6 +968,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Gautami", 21, test_telugu[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_telugu, 6, &Control, &State, 0, 6, telugu_c, telugu_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Tamil shape test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: bdb3a5326994ee835378c9975708725a79ecd89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb3a5326994ee835378c9975… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:44 2011 -0500 usp10/tests: Add Tamil shape test. --- dlls/usp10/tests/usp10.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 322710c..497932c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -804,6 +804,15 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Tamil */ + static const WCHAR test_tamil[] = {0x0ba4, 0x0bae, 0x0bbf, 0x0bb4, 0x0bcd}; + static const shapeTest_char tamil_c[] = {{0,{0,0}},{1,{0,0}},{1,{0,0}},{3,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph tamil_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -940,6 +949,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Latha", 20, test_tamil[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_tamil, 5, &Control, &State, 0, 4, tamil_c, tamil_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Oriya shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: ee45ab66baac1d9b8af5d78e7b1ef9ce4a1d229d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee45ab66baac1d9b8af5d78e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:39 2011 -0500 usp10/tests: Add Oriya shaping test. --- dlls/usp10/tests/usp10.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7d12ce9..322710c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -795,6 +795,15 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Oriya */ + static const WCHAR test_oriya[] = {0x0b13, 0x0b21, 0x0b3c, 0x0b3f, 0x0b06}; + static const shapeTest_char oriya_c[] = {{0,{0,0}},{1,{0,0}},{1,{0,0}},{1,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph oriya_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -923,6 +932,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Kalinga", 19, test_oriya[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_oriya, 5, &Control, &State, 0, 4, oriya_c, oriya_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Gujarati shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: a1795cfc9a61896054409f75b9ba09005d32e506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1795cfc9a61896054409f75b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:32 2011 -0500 usp10/tests: Add Gujarati shaping test. --- dlls/usp10/tests/usp10.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5a8a1b4..7d12ce9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -783,6 +783,18 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Gujarati */ + static const WCHAR test_gujarati[] = {0x0a97, 0x0ac1, 0x0a9c, 0x0ab0, 0x0abe, 0x0aa4, 0x0ac0}; + static const shapeTest_char gujarati_c[] = {{0,{0,0}},{0,{0,0}},{2,{0,0}},{3,{0,0}},{3,{0,0}},{5,{0,0}},{5,{0,0}}}; + static const shapeTest_glyph gujarati_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -903,6 +915,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Shruti", 18, test_gujarati[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_gujarati, 7, &Control, &State, 0, 7, gujarati_c, gujarati_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Gurmukhi shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 856b272635ab76188a5404d096d092e52f50785b URL: http://source.winehq.org/git/wine.git/?a=commit;h=856b272635ab76188a5404d09… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:26 2011 -0500 usp10/tests: Add Gurmukhi shaping test. --- dlls/usp10/tests/usp10.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e0e6e3e..5a8a1b4 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -771,6 +771,18 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Gurmukhi */ + static const WCHAR test_gurmukhi[] = {0x0a17, 0x0a41, 0x0a30, 0x0a2e, 0x0a41, 0x0a16, 0x0a40}; + static const shapeTest_char gurmukhi_c[] = {{0,{0,0}},{0,{0,0}},{2,{0,0}},{3,{0,0}},{3,{0,0}},{5,{0,0}},{5,{0,0}}}; + static const shapeTest_glyph gurmukhi_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -883,6 +895,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Raavi", 17, test_gurmukhi[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_gurmukhi, 7, &Control, &State, 0, 7, gurmukhi_c, gurmukhi_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Bengali shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: bd07f675719c41c595a2255707cc0199d9b7cae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd07f675719c41c595a225570… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:20 2011 -0500 usp10/tests: Add Bengali shaping test. --- dlls/usp10/tests/usp10.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 835a938..e0e6e3e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -761,6 +761,16 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Bengali */ + static const WCHAR test_bengali[] = {0x09ac, 0x09be, 0x0982, 0x09b2, 0x09be}; + static const shapeTest_char bengali_c[] = {{0,{0,0}},{0,{0,0}},{0,{0,0}},{3,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph bengali_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -865,6 +875,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Vrinda", 16, test_bengali[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_bengali, 5, &Control, &State, 0, 5, bengali_c, bengali_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Devanagari shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: adfd870ba659b09593c5679839b60f20485b4e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfd870ba659b09593c567983… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:14 2011 -0500 usp10/tests: Add Devanagari shaping test. --- dlls/usp10/tests/usp10.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 53f572e..835a938 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -748,6 +748,19 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Devanagari */ + static const WCHAR test_devanagari[] = {0x0926, 0x0947, 0x0935, 0x0928, 0x093e, 0x0917, 0x0930, 0x0940}; + static const shapeTest_char devanagari_c[] = {{0,{0,0}},{0,{0,0}},{2,{0,0}},{3,{0,0}},{3,{0,0}},{5,{0,0}},{6,{0,0}},{6,{0,0}}}; + static const shapeTest_glyph devanagari_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -844,6 +857,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Mangal", 15, test_devanagari[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_devanagari, 8, &Control, &State, 0, 8, devanagari_c, devanagari_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
81
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 June 2011