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

Aric Stewart : usp10: Add Tamil script.
by Alexandre Julliard 03 Jun '11

03 Jun '11

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

1 0

Aric Stewart : usp10: Add Telugu script.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: af02c0e29c0b2af9ea2468c106492ba34bccb495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af02c0e29c0b2af9ea2468c10… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:55 2011 -0500 usp10: Add Telugu script. --- dlls/usp10/shape.c | 105 ++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/tests/usp10.c | 11 +++++ dlls/usp10/usp10.c | 11 ++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 127 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af02c0e29c0b2af9ea246…

1 0

Aric Stewart : usp10: Add Kannada script.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 20f5613e61ce600cbce7871c63ca66aa393f47aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f5613e61ce600cbce7871c6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:04 2011 -0500 usp10: Add Kannada script. --- dlls/usp10/shape.c | 98 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 9 ++++ dlls/usp10/usp10.c | 11 ++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 119 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20f5613e61ce600cbce78…

1 0

Aric Stewart : ups10: Add Malayalam script.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 8d83e5d370bb9689bf51a8fb193f14f023d6bf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d83e5d370bb9689bf51a8fb1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:09 2011 -0500 ups10: Add Malayalam script. --- dlls/usp10/shape.c | 75 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 10 ++++++ dlls/usp10/usp10.c | 11 ++++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 97 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d83e5d370bb9689bf51a…

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

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 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 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 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

Daniel Scharrer : include: Include math.h in d3dvec.inl as it uses sqrt().
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: cbe42036231a07d11f0ef6ba374d01aefa9b6a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe42036231a07d11f0ef6ba3… Author: Daniel Scharrer <dscharrer(a)gmail.com> Date: Thu Jun 2 19:46:23 2011 +0200 include: Include math.h in d3dvec.inl as it uses sqrt(). --- include/d3dvec.inl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3dvec.inl b/include/d3dvec.inl index 9418dd2..96f669b 100644 --- a/include/d3dvec.inl +++ b/include/d3dvec.inl @@ -19,6 +19,8 @@ #ifndef __WINE_D3DVEC_INL #define __WINE_D3DVEC_INL +#include <math.h> + /*** constructors ***/ inline _D3DVECTOR::_D3DVECTOR(D3DVALUE f)

1 0