December 2011 - Wine-commits

Aric Stewart : usp10: Add Deseret script.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 095276073c5fe8b24fc0369e2ab549ef30bd452a URL: http://source.winehq.org/git/wine.git/?a=commit;h=095276073c5fe8b24fc0369e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 17 21:27:02 2011 -0600 usp10: Add Deseret script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e889ba8..fcbf92c 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -711,6 +711,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "brai", "", NULL, NULL}, {{ no_features, 0}, NULL, "", "", NULL, NULL}, {{ no_features, 0}, NULL, "", "", NULL, NULL}, + {{ no_features, 0}, NULL, "dsrt", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 64cbb30..9651000 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -168,6 +168,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define ogam_tag MS_MAKE_TAG('o','g','a','m') #define runr_tag MS_MAKE_TAG('r','u','n','r') #define brai_tag MS_MAKE_TAG('b','r','a','i') +#define dsrt_tag MS_MAKE_TAG('d','s','r','t') static void test_ScriptItemize( void ) { @@ -434,6 +435,11 @@ static void test_ScriptItemize( void ) static const itemTest t441[3] = {{{0,0,0,0,0},0,0,0,0,0,FALSE},{{0,0,0,0,0},2,0,0,0,0,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; static const itemTest t442[4] = {{{0,0,0,0,0},0,0,0,2,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},2,0,0,2,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + /* Deseret */ + static const WCHAR test45[] = {0xd801,0xdc19,0xd801,0xdc32,0xd801,0xdc4c,0xd801,0xdc3c,0xd801,0xdc32,0xd801,0xdc4b,0xd801,0xdc2f,0xd801,0xdc4c,0xd801,0xdc3b,0xd801,0xdc32,0xd801,0xdc4a,0xd801,0xdc28}; + static const itemTest t451[2] = {{{0,0,0,0,0},0,0,0,0,dsrt_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0},24,0,0,0,-1,FALSE}}; + static const itemTest t452[2] = {{{0,0,0,0,0},0,0,0,2,dsrt_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0},24,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -511,6 +517,7 @@ static void test_ScriptItemize( void ) test_items_ok(test42,6,NULL,NULL,1,t421,FALSE,0); test_items_ok(test43,7,NULL,NULL,1,t431,FALSE,0); test_items_ok(test44,4,NULL,NULL,2,t441,FALSE,0); + test_items_ok(test45,24,NULL,NULL,1,t451,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -562,6 +569,7 @@ static void test_ScriptItemize( void ) test_items_ok(test42,6,&Control,&State,1,t421,FALSE,0); test_items_ok(test43,7,&Control,&State,1,t431,FALSE,0); test_items_ok(test44,4,&Control,&State,2,t441,FALSE,0); + test_items_ok(test45,24,&Control,&State,1,t451,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -613,6 +621,7 @@ static void test_ScriptItemize( void ) test_items_ok(test42,6,&Control,&State,1,t422,FALSE,0); test_items_ok(test43,7,&Control,&State,1,t432,FALSE,0); test_items_ok(test44,4,&Control,&State,2,t442,FALSE,0); + test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -665,6 +674,7 @@ static void test_ScriptItemize( void ) test_items_ok(test42,6,&Control,&State,1,t422,FALSE,0); test_items_ok(test43,7,&Control,&State,1,t432,FALSE,0); test_items_ok(test44,4,&Control,&State,2,t442,FALSE,0); + test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 7a32937..a05f7b6 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -287,6 +287,9 @@ static const scriptRange scriptRanges[] = { { Script_Kana ,0xff65, 0xff9f, 0, 0}, { Script_Hangul ,0xffa0, 0xffdf, 0, 0}, { Script_Ideograph ,0xffe0, 0xffef, 0, 0}, + /* Plane - 1 */ + /* Deseret: U+10400–U+1044F */ + { Script_Deseret, 0x10400, 0x1044F, 0, 0}, /* END */ { SCRIPT_UNDEFINED, 0, 0, 0} }; @@ -601,6 +604,10 @@ static const scriptData scriptInformation[] = { {0, 0, 0, 0, 0, DEFAULT_CHARSET, 0, 1, 0, 0, 0, 0, 1, 0, 0}, 0x00000000, {0}}, + {{Script_Deseret, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('d','s','r','t'), + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -642,7 +649,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[68].props, &scriptInformation[69].props, &scriptInformation[70].props, &scriptInformation[71].props, &scriptInformation[72].props, &scriptInformation[73].props, - &scriptInformation[74].props + &scriptInformation[74].props, &scriptInformation[75].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index f310011..1d88ee1 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -109,6 +109,8 @@ /* Unicode Chapter 16 */ #define Script_Surrogates 73 #define Script_Private 74 +/* Unicode Chapter 13 : Plane 1 */ +#define Script_Deseret 75 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Osmanya script.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 88c6b7ef003dd93738c7a5245e9d57b09496a4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c6b7ef003dd93738c7a5245… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 17 21:27:15 2011 -0600 usp10: Add Osmanya script. --- dlls/usp10/shape.c | 2 ++ dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 13 ++++++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index fcbf92c..b234b11 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -712,6 +712,8 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "", "", NULL, NULL}, {{ no_features, 0}, NULL, "", "", NULL, NULL}, {{ no_features, 0}, NULL, "dsrt", "", NULL, NULL}, + {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, + {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 9651000..69083b3 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -169,6 +169,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define runr_tag MS_MAKE_TAG('r','u','n','r') #define brai_tag MS_MAKE_TAG('b','r','a','i') #define dsrt_tag MS_MAKE_TAG('d','s','r','t') +#define osma_tag MS_MAKE_TAG('o','s','m','a') static void test_ScriptItemize( void ) { @@ -440,6 +441,11 @@ static void test_ScriptItemize( void ) static const itemTest t451[2] = {{{0,0,0,0,0},0,0,0,0,dsrt_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0},24,0,0,0,-1,FALSE}}; static const itemTest t452[2] = {{{0,0,0,0,0},0,0,0,2,dsrt_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0},24,0,0,0,-1,FALSE}}; + /* Osmanya */ + static const WCHAR test46[] = {0xd801,0xdc8b,0xd801,0xdc98,0xd801,0xdc88,0xd801,0xdc91,0xd801,0xdc9b,0xd801,0xdc92,0xd801,0xdc95,0xd801,0xdc80}; + static const itemTest t461[2] = {{{0,0,0,0,0},0,0,0,0,osma_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0},16,0,0,0,-1,FALSE}}; + static const itemTest t462[2] = {{{0,0,0,0,0},0,0,0,2,osma_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0},16,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -518,6 +524,7 @@ static void test_ScriptItemize( void ) test_items_ok(test43,7,NULL,NULL,1,t431,FALSE,0); test_items_ok(test44,4,NULL,NULL,2,t441,FALSE,0); test_items_ok(test45,24,NULL,NULL,1,t451,FALSE,0); + test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -570,6 +577,7 @@ static void test_ScriptItemize( void ) test_items_ok(test43,7,&Control,&State,1,t431,FALSE,0); test_items_ok(test44,4,&Control,&State,2,t441,FALSE,0); test_items_ok(test45,24,&Control,&State,1,t451,FALSE,0); + test_items_ok(test46,16,&Control,&State,1,t461,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -622,6 +630,7 @@ static void test_ScriptItemize( void ) test_items_ok(test43,7,&Control,&State,1,t432,FALSE,0); test_items_ok(test44,4,&Control,&State,2,t442,FALSE,0); test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); + test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -675,6 +684,7 @@ static void test_ScriptItemize( void ) test_items_ok(test43,7,&Control,&State,1,t432,FALSE,0); test_items_ok(test44,4,&Control,&State,2,t442,FALSE,0); test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); + test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a05f7b6..2a5cb1c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -290,6 +290,8 @@ static const scriptRange scriptRanges[] = { /* Plane - 1 */ /* Deseret: U+10400–U+1044F */ { Script_Deseret, 0x10400, 0x1044F, 0, 0}, + /* Osmanya: U+10480–U+104AF */ + { Script_Osmanya, 0x10480, 0x104AF, Script_Osmanya_Numeric, 0}, /* END */ { SCRIPT_UNDEFINED, 0, 0, 0} }; @@ -608,6 +610,14 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('d','s','r','t'), {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {{Script_Osmanya, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('o','s','m','a'), + {'E','b','r','i','m','a'}}, + {{Script_Osmanya_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('o','s','m','a'), + {'E','b','r','i','m','a'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -649,7 +659,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[68].props, &scriptInformation[69].props, &scriptInformation[70].props, &scriptInformation[71].props, &scriptInformation[72].props, &scriptInformation[73].props, - &scriptInformation[74].props, &scriptInformation[75].props + &scriptInformation[74].props, &scriptInformation[75].props, + &scriptInformation[76].props, &scriptInformation[77].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 1d88ee1..6c93ba6 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -111,6 +111,8 @@ #define Script_Private 74 /* Unicode Chapter 13 : Plane 1 */ #define Script_Deseret 75 +#define Script_Osmanya 76 +#define Script_Osmanya_Numeric 77 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Mathematical Alphanumeric Symbols script.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 00588673c6d0861ac9f5db7d9d66e88f2b47db54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00588673c6d0861ac9f5db7d9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 19 07:25:17 2011 -0600 usp10: Add Mathematical Alphanumeric Symbols script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b234b11..c238d09 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -714,6 +714,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "dsrt", "", NULL, NULL}, {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, + {{ no_features, 0}, NULL, "math", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 69083b3..2e05f48 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -170,6 +170,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define brai_tag MS_MAKE_TAG('b','r','a','i') #define dsrt_tag MS_MAKE_TAG('d','s','r','t') #define osma_tag MS_MAKE_TAG('o','s','m','a') +#define math_tag MS_MAKE_TAG('m','a','t','h') static void test_ScriptItemize( void ) { @@ -446,6 +447,11 @@ static void test_ScriptItemize( void ) static const itemTest t461[2] = {{{0,0,0,0,0},0,0,0,0,osma_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0},16,0,0,0,-1,FALSE}}; static const itemTest t462[2] = {{{0,0,0,0,0},0,0,0,2,osma_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0},16,0,0,0,-1,FALSE}}; + /* Mathematical Alphanumeric Symbols */ + static const WCHAR test47[] = {0xd835,0xdc00,0xd835,0xdc35,0xd835,0xdc6a,0xd835,0xdc9f,0xd835,0xdcd4,0xd835,0xdd09,0xd835,0xdd3e,0xd835,0xdd73,0xd835,0xdda8,0xd835,0xdddd,0xd835,0xde12,0xd835,0xde47,0xd835,0xde7c}; + static const itemTest t471[2] = {{{0,0,0,0,0},0,0,0,0,math_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0},26,0,0,0,-1,FALSE}}; + static const itemTest t472[2] = {{{0,0,0,0,0},0,0,0,2,math_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0},26,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -525,6 +531,7 @@ static void test_ScriptItemize( void ) test_items_ok(test44,4,NULL,NULL,2,t441,FALSE,0); test_items_ok(test45,24,NULL,NULL,1,t451,FALSE,0); test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); + test_items_ok(test47,26,NULL,NULL,1,t471,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -578,6 +585,7 @@ static void test_ScriptItemize( void ) test_items_ok(test44,4,&Control,&State,2,t441,FALSE,0); test_items_ok(test45,24,&Control,&State,1,t451,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t461,FALSE,0); + test_items_ok(test47,26,&Control,&State,1,t471,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -631,6 +639,7 @@ static void test_ScriptItemize( void ) test_items_ok(test44,4,&Control,&State,2,t442,FALSE,0); test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); + test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -685,6 +694,7 @@ static void test_ScriptItemize( void ) test_items_ok(test44,4,&Control,&State,2,t442,FALSE,0); test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); + test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2a5cb1c..4f532f5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -292,6 +292,8 @@ static const scriptRange scriptRanges[] = { { Script_Deseret, 0x10400, 0x1044F, 0, 0}, /* Osmanya: U+10480–U+104AF */ { Script_Osmanya, 0x10480, 0x104AF, Script_Osmanya_Numeric, 0}, + /* Mathematical Alphanumeric Symbols: U+1D400–U+1D7FF */ + { Script_MathAlpha, 0x1D400, 0x1D7FF, 0, 0}, /* END */ { SCRIPT_UNDEFINED, 0, 0, 0} }; @@ -618,6 +620,10 @@ static const scriptData scriptInformation[] = { {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','s','m','a'), {'E','b','r','i','m','a'}}, + {{Script_MathAlpha, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('m','a','t','h'), + {'C','a','m','b','r','i','a',' ','M','a','t','h'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -660,7 +666,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[70].props, &scriptInformation[71].props, &scriptInformation[72].props, &scriptInformation[73].props, &scriptInformation[74].props, &scriptInformation[75].props, - &scriptInformation[76].props, &scriptInformation[77].props + &scriptInformation[76].props, &scriptInformation[77].props, + &scriptInformation[78].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 6c93ba6..ea04324 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -113,6 +113,8 @@ #define Script_Deseret 75 #define Script_Osmanya 76 #define Script_Osmanya_Numeric 77 +/* Unicode Chapter 15 : Plane 1 */ +#define Script_MathAlpha 78 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Jacek Caban : jscript: Store type information in statement nodes.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 42aefd424d79698305c65403ffaeb9cf53bff36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42aefd424d79698305c65403f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 14:58:19 2011 +0100 jscript: Store type information in statement nodes. --- dlls/jscript/engine.h | 20 ++++++ dlls/jscript/parser.y | 170 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 132 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42aefd424d79698305c65…

1 0

Jacek Caban : jscript: Use bytecode for block statement implementation.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: f6023c428aa82381323a1c05c9ad980387c3e66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6023c428aa82381323a1c05c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 14:58:42 2011 +0100 jscript: Use bytecode for block statement implementation. --- dlls/jscript/compile.c | 76 ++++++++++++++++++++++++++++++++++++++---- dlls/jscript/engine.c | 80 ++++++++++++++++++++++++++----------------- dlls/jscript/engine.h | 19 ++++++---- dlls/jscript/parser.y | 3 +- dlls/jscript/tests/lang.js | 4 ++ 5 files changed, 134 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6023c428aa82381323a1…

1 0

Jacek Caban : jscript: Use bytecode for execution main code block in exec_source.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 2f3e27f09a9810fc32a9f8cf14f6ee11a3c3c284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3e27f09a9810fc32a9f8cf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 14:59:12 2011 +0100 jscript: Use bytecode for execution main code block in exec_source. --- dlls/jscript/compile.c | 7 +++++-- dlls/jscript/engine.c | 19 +++++++------------ dlls/jscript/engine.h | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0c9ce64..5306f8b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -931,7 +931,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, BOOL do_ret, return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK; } -HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned *ret_off) +HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL compile_block, unsigned *ret_off) { HRESULT hres; @@ -942,7 +942,10 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned return hres; *ret_off = parser->compiler->code_off; - hres = compile_statement(parser->compiler, stat); + if(compile_block && stat->next) + hres = compile_block_statement(parser->compiler, stat); + else + hres = compile_statement(parser->compiler, stat); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2311ea0..61ed5c5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -513,8 +513,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so function_declaration_t *func; parser_ctx_t *prev_parser; var_list_t *var; - VARIANT val, tmp; - statement_t *stat; + VARIANT val; exec_ctx_t *prev_ctx; return_type_t rt; HRESULT hres = S_OK; @@ -560,15 +559,11 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so memset(&rt, 0, sizeof(rt)); rt.type = RT_NORMAL; - for(stat = source->statement; stat; stat = stat->next) { - hres = stat_eval(script, stat, &rt, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&val); - val = tmp; - if(rt.type != RT_NORMAL) - break; + if(source->statement) { + if(source->statement->instr_off == -1) + hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off); + if(SUCCEEDED(hres)) + hres = compiled_statement_eval(script, source->statement, &rt, &val); } script->exec_ctx = prev_ctx; @@ -3005,7 +3000,7 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ TRACE("\n"); if(stat->instr_off == -1) { - hres = compile_subscript_stat(exec_ctx->parser, stat, &stat->instr_off); + hres = compile_subscript_stat(exec_ctx->parser, stat, FALSE, &stat->instr_off); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bcba203..93ab007 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -590,4 +590,4 @@ typedef struct { } property_value_expression_t; HRESULT compile_subscript(parser_ctx_t*,expression_t*,BOOL,unsigned*) DECLSPEC_HIDDEN; -HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,unsigned*) DECLSPEC_HIDDEN; +HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Use compiler for handling expression statements.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: ccba279b89bcf76973adf9f7b251cffa1919b7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccba279b89bcf76973adf9f7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 14:59:34 2011 +0100 jscript: Use compiler for handling expression statements. --- dlls/jscript/compile.c | 19 +++++++ dlls/jscript/engine.c | 136 ++++++++++++++++++++++-------------------------- dlls/jscript/engine.h | 3 +- dlls/jscript/parser.y | 2 +- 4 files changed, 83 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccba279b89bcf76973adf…

1 0

Jacek Caban : jscript: Use compiler for handling if statement.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: cf2fc11e318cfd165a5224a4b393dc57d72096aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2fc11e318cfd165a5224a4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 14:59:51 2011 +0100 jscript: Use compiler for handling if statement. --- dlls/jscript/compile.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 29 ----------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b46ea59..9fdce33 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -882,6 +882,47 @@ static HRESULT compile_expression_statement(compiler_ctx_t *ctx, expression_stat return S_OK; } +/* ECMA-262 3rd Edition 12.5 */ +static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat) +{ + unsigned jmp_else, jmp_end; + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp_else = push_instr(ctx, OP_jmp_z); + if(jmp_else == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, stat->if_stat); + if(FAILED(hres)) + return hres; + + jmp_end = push_instr(ctx, OP_jmp); + if(jmp_end == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, jmp_else)->arg1.uint = ctx->code_off; + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + + if(stat->else_stat) { + hres = compile_statement(ctx, stat->else_stat); + if(FAILED(hres)) + return hres; + }else { + /* FIXME: We could sometimes avoid it */ + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + } + + instr_ptr(ctx, jmp_end)->arg1.uint = ctx->code_off; + return S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -889,6 +930,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_block_statement(ctx, ((block_statement_t*)stat)->stat_list); case STAT_EXPR: return compile_expression_statement(ctx, (expression_statement_t*)stat); + case STAT_IF: + return compile_if_statement(ctx, (if_statement_t*)stat); default: return compile_interp_fallback(ctx, stat); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 664af86..6ca10b3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -712,35 +712,6 @@ HRESULT empty_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t return S_OK; } -/* ECMA-262 3rd Edition 12.5 */ -HRESULT if_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - if_statement_t *stat = (if_statement_t*)_stat; - VARIANT_BOOL b; - VARIANT v; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &v); - if(FAILED(hres)) - return hres; - - hres = to_boolean(&v, &b); - VariantClear(&v); - if(FAILED(hres)) - return hres; - - if(b) - hres = stat_eval(ctx, stat->if_stat, rt, ret); - else if(stat->else_stat) - hres = stat_eval(ctx, stat->else_stat, rt, ret); - else - V_VT(ret) = VT_EMPTY; - - return hres; -} - /* ECMA-262 3rd Edition 12.6.2 */ HRESULT while_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 804713e..ebca7db 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -400,7 +400,6 @@ typedef struct { HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT var_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT empty_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT if_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT for_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT forin_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index adbcb6e..925b12d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -843,7 +843,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, for_statement_eval, forin_statement_eval, - if_statement_eval, + compiled_statement_eval, labelled_statement_eval, return_statement_eval, switch_statement_eval,

1 0

Jacek Caban : jscript: Use compiler for hanling empty statements.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 7c3160ae0240534dcedc45349d6193ca3d63acd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3160ae0240534dcedc45349… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 15:00:06 2011 +0100 jscript: Use compiler for hanling empty statements. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 9 --------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9fdce33..09384bc 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -928,6 +928,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) switch(stat->type) { case STAT_BLOCK: return compile_block_statement(ctx, ((block_statement_t*)stat)->stat_list); + case STAT_EMPTY: + return push_instr(ctx, OP_undefined) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ case STAT_EXPR: return compile_expression_statement(ctx, (expression_statement_t*)stat); case STAT_IF: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6ca10b3..2dc1b29 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -703,15 +703,6 @@ HRESULT var_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } -/* ECMA-262 3rd Edition 12.3 */ -HRESULT empty_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) -{ - TRACE("\n"); - - V_VT(ret) = VT_EMPTY; - return S_OK; -} - /* ECMA-262 3rd Edition 12.6.2 */ HRESULT while_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ebca7db..0fae5fb 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -399,7 +399,6 @@ typedef struct { HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT var_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT empty_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT for_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT forin_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 925b12d..085b819 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -839,7 +839,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, break_statement_eval, continue_statement_eval, - empty_statement_eval, + compiled_statement_eval, compiled_statement_eval, for_statement_eval, forin_statement_eval,

1 0

Henri Verbeet : ddraw/tests: Introduce some functions for comparing floating-point vectors.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 2db8688185ca594d8864548b521493b7b953f316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db8688185ca594d8864548b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 15:16:49 2011 +0100 ddraw/tests: Introduce some functions for comparing floating-point vectors. --- dlls/ddraw/tests/d3d.c | 157 ++++++++++++++++++++++++----------------------- 1 files changed, 80 insertions(+), 77 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f44e31e..962bfad 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -23,6 +23,7 @@ #define COBJMACROS #include "wine/test.h" +#include <limits.h> #include "initguid.h" #include "ddraw.h" #include "d3d.h" @@ -68,10 +69,6 @@ typedef struct char callback_name_strings[MAX_ENUMERATION_COUNT][100]; } D3D7ELifetimeTest; -/* To compare bad floating point numbers. Not the ideal way to do it, - * but it should be enough for here */ -#define comparefloat(a, b) ( (((a) - (b)) < 0.0001) && (((a) - (b)) > -0.0001) ) - static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN); typedef struct _VERTEX @@ -85,6 +82,36 @@ typedef struct _TVERTEX float rhw; } TVERTEX, *LPTVERTEX; +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec3(VERTEX *vec, float x, float y, float z, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps); +} + +static BOOL compare_vec4(TVERTEX *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->rhw, w, ulps); +} static void init_function_pointers(void) { @@ -516,6 +543,16 @@ static void ProcessVerticesTest(void) rc = IDirect3DVertexBuffer7_Unlock(lpVBufSrc); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc); + memset(&vp, 0, sizeof(vp)); + vp.dwX = 64; + vp.dwY = 64; + vp.dwWidth = 128; + vp.dwHeight = 128; + vp.dvMinZ = 0.0f; + vp.dvMaxZ = 1.0f; + rc = IDirect3DDevice7_SetViewport(lpD3DDevice, &vp); + ok(SUCCEEDED(rc), "Failed to set viewport, hr %#x.\n", rc); + rc = IDirect3DVertexBuffer7_ProcessVertices(lpVBufDest1, D3DVOP_TRANSFORM, 0, 4, lpVBufSrc, 0, lpD3DDevice, 0); ok(rc==D3D_OK , "IDirect3DVertexBuffer::ProcessVertices returned: %x\n", rc); @@ -527,29 +564,18 @@ static void ProcessVerticesTest(void) if(!out) goto out; /* Check the results */ - ok( comparefloat(out[0].x, 128.0 ) && - comparefloat(out[0].y, 128.0 ) && - comparefloat(out[0].z, 0.0 ) && - comparefloat(out[0].rhw, 1.0 ), - "Output 0 vertex is (%f , %f , %f , %f)\n", out[0].x, out[0].y, out[0].z, out[0].rhw); - - ok( comparefloat(out[1].x, 256.0 ) && - comparefloat(out[1].y, 0.0 ) && - comparefloat(out[1].z, 1.0 ) && - comparefloat(out[1].rhw, 1.0 ), - "Output 1 vertex is (%f , %f , %f , %f)\n", out[1].x, out[1].y, out[1].z, out[1].rhw); - - ok( comparefloat(out[2].x, 0.0 ) && - comparefloat(out[2].y, 256.0 ) && - comparefloat(out[2].z, 0.5 ) && - comparefloat(out[2].rhw, 1.0 ), - "Output 2 vertex is (%f , %f , %f , %f)\n", out[2].x, out[2].y, out[2].z, out[2].rhw); - - ok( comparefloat(out[3].x, 192.0 ) && - comparefloat(out[3].y, 192.0 ) && - comparefloat(out[3].z, 0.25 ) && - comparefloat(out[3].rhw, 1.0 ), - "Output 3 vertex is (%f , %f , %f , %f)\n", out[3].x, out[3].y, out[3].z, out[3].rhw); + ok(compare_vec4(&out[0], +1.280e+2f, +1.280e+2f, +0.000e+0f, +1.000e+0f, 4096), + "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n", + out[0].x, out[0].y, out[0].z, out[0].rhw); + ok(compare_vec4(&out[1], +1.920e+2f, +6.400e+1f, +1.000e+0f, +1.000e+0f, 4096), + "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n", + out[1].x, out[1].y, out[1].z, out[1].rhw); + ok(compare_vec4(&out[2], +6.400e+1f, +1.920e+2f, +5.000e-1f, +1.000e+0f, 4096), + "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n", + out[2].x, out[2].y, out[2].z, out[2].rhw); + ok(compare_vec4(&out[3], +1.600e+2f, +1.600e+2f, +2.500e-1f, +1.000e+0f, 4096), + "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n", + out[3].x, out[3].y, out[3].z, out[3].rhw); rc = IDirect3DVertexBuffer7_Unlock(lpVBufDest1); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc); @@ -562,10 +588,9 @@ static void ProcessVerticesTest(void) * so let's check for it: If the output vertex buffer has to RHW value, * The RHW value of the last vertex is written into the next vertex */ - ok( comparefloat(out2[4].x, 1.0 ) && - comparefloat(out2[4].y, 0.0 ) && - comparefloat(out2[4].z, 0.0 ), - "Output 4 vertex is (%f , %f , %f)\n", out2[4].x, out2[4].y, out2[4].z); + ok(compare_vec3(&out2[4], +1.000e+0f, +0.000e+0f, +0.000e+0f, 4096), + "Got unexpected vertex 4 {%.8e, %.8e, %.8e}.\n", + out2[4].x, out2[4].y, out2[4].z); rc = IDirect3DVertexBuffer7_Unlock(lpVBufDest2); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc); @@ -591,29 +616,18 @@ static void ProcessVerticesTest(void) if(!out) goto out; /* Check the results */ - ok( comparefloat(out[0].x, 133.0 ) && - comparefloat(out[0].y, 70.0 ) && - comparefloat(out[0].z, -2.0 ) && - comparefloat(out[0].rhw, 1.0 ), - "Output 0 vertex is (%f , %f , %f , %f)\n", out[0].x, out[0].y, out[0].z, out[0].rhw); - - ok( comparefloat(out[1].x, 256.0 ) && - comparefloat(out[1].y, 5.0 ) && - comparefloat(out[1].z, 4.0 ) && - comparefloat(out[1].rhw, 1.0 ), - "Output 1 vertex is (%f , %f , %f , %f)\n", out[1].x, out[1].y, out[1].z, out[1].rhw); - - ok( comparefloat(out[2].x, 10.0 ) && - comparefloat(out[2].y, 135.0 ) && - comparefloat(out[2].z, 1.0 ) && - comparefloat(out[2].rhw, 1.0 ), - "Output 2 vertex is (%f , %f , %f , %f)\n", out[1].x, out[1].y, out[1].z, out[1].rhw); - - ok( comparefloat(out[3].x, 194.5 ) && - comparefloat(out[3].y, 102.5 ) && - comparefloat(out[3].z, -0.5 ) && - comparefloat(out[3].rhw, 1.0 ), - "Output 3 vertex is (%f , %f , %f , %f)\n", out[3].x, out[3].y, out[3].z, out[3].rhw); + ok(compare_vec4(&out[0], +1.330e+2f, +7.000e+1f, -2.000e+0f, +1.000e+0f, 4096), + "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n", + out[0].x, out[0].y, out[0].z, out[0].rhw); + ok(compare_vec4(&out[1], +2.560e+2f, +5.000e+0f, +4.000e+0f, +1.000e+0f, 4096), + "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n", + out[1].x, out[1].y, out[1].z, out[1].rhw); + ok(compare_vec4(&out[2], +1.000e+1f, +1.350e+2f, +1.000e+0f, +1.000e+0f, 4096), + "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n", + out[2].x, out[2].y, out[2].z, out[2].rhw); + ok(compare_vec4(&out[3], +1.945e+2f, +1.025e+2f, -5.000e-1f, +1.000e+0f, 4096), + "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n", + out[3].x, out[3].y, out[3].z, out[3].rhw); rc = IDirect3DVertexBuffer7_Unlock(lpVBufDest1); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc); @@ -648,29 +662,18 @@ static void ProcessVerticesTest(void) ok(rc==D3D_OK, "IDirect3DDevice7_SetViewport failed\n"); /* Check the results */ - ok( comparefloat(out[0].x, 256.0 ) && /* X coordinate is cut at the surface edges */ - comparefloat(out[0].y, 70.0 ) && - comparefloat(out[0].z, -2.0 ) && - comparefloat(out[0].rhw, (1.0 / 3.0)), - "Output 0 vertex is (%f , %f , %f , %f)\n", out[0].x, out[0].y, out[0].z, out[0].rhw); - - ok( comparefloat(out[1].x, 256.0 ) && - comparefloat(out[1].y, 78.125000 ) && - comparefloat(out[1].z, -2.750000 ) && - comparefloat(out[1].rhw, 0.125000 ), - "Output 1 vertex is (%f , %f , %f , %f)\n", out[1].x, out[1].y, out[1].z, out[1].rhw); - - ok( comparefloat(out[2].x, 256.0 ) && - comparefloat(out[2].y, 44.000000 ) && - comparefloat(out[2].z, 0.400000 ) && - comparefloat(out[2].rhw, 0.400000 ), - "Output 2 vertex is (%f , %f , %f , %f)\n", out[2].x, out[2].y, out[2].z, out[2].rhw); - - ok( comparefloat(out[3].x, 256.0 ) && - comparefloat(out[3].y, 81.818184 ) && - comparefloat(out[3].z, -3.090909 ) && - comparefloat(out[3].rhw, 0.363636 ), - "Output 3 vertex is (%f , %f , %f , %f)\n", out[3].x, out[3].y, out[3].z, out[3].rhw); + ok(compare_vec4(&out[0], +2.560e+2f, +7.000e+1f, -2.000e+0f, +3.333e-1f, 4096), + "Got unexpected vertex 0 {%.8e, %.8e, %.8e, %.8e}.\n", + out[0].x, out[0].y, out[0].z, out[0].rhw); + ok(compare_vec4(&out[1], +2.560e+2f, +7.813e+1f, -2.750e+0f, +1.250e-1f, 4096), + "Got unexpected vertex 1 {%.8e, %.8e, %.8e, %.8e}.\n", + out[1].x, out[1].y, out[1].z, out[1].rhw); + ok(compare_vec4(&out[2], +2.560e+2f, +4.400e+1f, +4.000e-1f, +4.000e-1f, 4096), + "Got unexpected vertex 2 {%.8e, %.8e, %.8e, %.8e}.\n", + out[2].x, out[2].y, out[2].z, out[2].rhw); + ok(compare_vec4(&out[3], +2.560e+2f, +8.182e+1f, -3.091e+0f, +3.636e-1f, 4096), + "Got unexpected vertex 3 {%.8e, %.8e, %.8e, %.8e}.\n", + out[3].x, out[3].y, out[3].z, out[3].rhw); rc = IDirect3DVertexBuffer7_Unlock(lpVBufDest1); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Unlock returned: %x\n", rc);

1 0