June 2011 - Wine-Commits - list.winehq.org

Aric Stewart : usp10/tests: Add Gurmukhi shaping test.
by Alexandre Julliard June 3, 2011

June 3, 2011

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 Devanagari shaping test.
by Alexandre Julliard June 3, 2011

June 3, 2011

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

Aric Stewart : usp10/tests: Add Gujarati shaping test.
by Alexandre Julliard June 3, 2011

June 3, 2011

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 Bengali shaping test.
by Alexandre Julliard June 3, 2011

June 3, 2011

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: Add Oriya script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: bafc5f0f30a98fe82abd5c6b48235d2c55939267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafc5f0f30a98fe82abd5c6b4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:43 2011 -0500 usp10: Add Oriya script. --- dlls/usp10/shape.c | 121 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 9 +++ dlls/usp10/usp10.c | 11 ++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 142 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bafc5f0f30a98fe82abd5…

1 0

Aric Stewart : usp10: Add Gurmukhi script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: fdf2ab5bfa551fc4e28f401ce37038092337e14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf2ab5bfa551fc4e28f401ce… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:30 2011 -0500 usp10: Add Gurmukhi script. --- dlls/usp10/shape.c | 115 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 11 ++++ dlls/usp10/usp10.c | 11 ++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 138 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdf2ab5bfa551fc4e28f4…

1 0

Aric Stewart : usp10: Add Bengali script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 19857ec45b2ca4cc3590e349801f4d56628179a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19857ec45b2ca4cc3590e3498… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:23 2011 -0500 usp10: Add Bengali script. --- dlls/usp10/shape.c | 132 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 10 +++ dlls/usp10/usp10.c | 15 +++++- dlls/usp10/usp10_internal.h | 3 + 4 files changed, 159 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19857ec45b2ca4cc3590e…

1 0

Aric Stewart : usp10: Add Devanagari script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: b8aad9d3cdaeb0b919a1865b1877d3b1b1d304c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aad9d3cdaeb0b919a1865b1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:17 2011 -0500 usp10: Add Devanagari script. --- dlls/usp10/shape.c | 259 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 10 ++ dlls/usp10/usp10.c | 15 +++- dlls/usp10/usp10_internal.h | 3 + 4 files changed, 286 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8aad9d3cdaeb0b919a18…

1 0

Aric Stewart : usp10: Add Gujarati script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 858ecd1c54a3ee5da2a072dfb93ecd5009cb45ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=858ecd1c54a3ee5da2a072dfb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:37 2011 -0500 usp10: Add Gujarati script. --- dlls/usp10/shape.c | 59 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 11 ++++++++ dlls/usp10/usp10.c | 14 +++++++++- dlls/usp10/usp10_internal.h | 3 ++ 4 files changed, 86 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=858ecd1c54a3ee5da2a07…

1 0

Matteo Bruni : wined3d: Mark some texture formats as filterable.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 6647c8f72dad6b7dd5e6e6a837b16cf67b77857d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6647c8f72dad6b7dd5e6e6a83… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 2 00:13:08 2011 +0200 wined3d: Mark some texture formats as filterable. --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 25c0512..8f48e46 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -693,11 +693,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B2G3R3_UNORM, GL_R3_G3_B2, GL_R3_G3_B2, 0, GL_RGB, GL_UNSIGNED_BYTE_3_3_2, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B4G4R4X4_UNORM, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0, @@ -738,7 +738,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_L4A4_UNORM, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE4_ALPHA4, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 2, - 0, + WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, &convert_l4a4_unorm}, /* Bump mapping stuff */ {WINED3DFMT_R8G8_SNORM, GL_RGB8, GL_RGB8, 0,

1 0