From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/oleaut32/tests/vartest.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index eb1639e3990..bcbb4ad7571 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -548,6 +548,13 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT VariantClear( &result ); }
+static void test_var_call2_commutative( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT,LPVARIANT), + VARIANT *left, VARIANT *right, VARIANT *expected ) +{ + test_var_call2( line, func, left, right, expected ); + test_var_call2( line, func, right, left, expected ); +} + #define test_bstr_var(a,b) _test_bstr_var(__LINE__,a,b) static void _test_bstr_var(unsigned line, const VARIANT *v, const WCHAR *str) { @@ -6023,7 +6030,7 @@ static HRESULT (WINAPI *pVarMul)(LPVARIANT,LPVARIANT,LPVARIANT); V_VT(&left) = VT_##vt1; V_##vt1(&left) = val1; \ V_VT(&right) = VT_##vt2; V_##vt2(&right) = val2; \ V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \ - test_var_call2( __LINE__, pVarMul, &left, &right, &exp ) + test_var_call2_commutative( __LINE__, pVarMul, &left, &right, &exp )
static void test_VarMul(void) {
From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bcbb4ad7571..e42bd54cdc7 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5891,7 +5891,7 @@ static HRESULT (WINAPI *pVarEqv)(LPVARIANT,LPVARIANT,LPVARIANT); V_VT(&left) = VT_##vt1; V_##vt1(&left) = val1; \ V_VT(&right) = VT_##vt2; V_##vt2(&right) = val2; \ V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \ - test_var_call2( __LINE__, pVarEqv, &left, &right, &exp ) + test_var_call2_commutative( __LINE__, pVarEqv, &left, &right, &exp )
static void test_VarEqv(void) {
From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index e42bd54cdc7..310f24586ec 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -4416,7 +4416,7 @@ static HRESULT (WINAPI *pVarXor)(LPVARIANT,LPVARIANT,LPVARIANT); V_VT(&left) = VT_##vt1; V_##vt1(&left) = val1; \ V_VT(&right) = VT_##vt2; V_##vt2(&right) = val2; \ V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \ - test_var_call2( __LINE__, pVarXor, &left, &right, &exp ) + test_var_call2_commutative( __LINE__, pVarXor, &left, &right, &exp )
#define VARXORCY(vt1,val1,val2,rvt,rval) \ V_VT(&left) = VT_##vt1; V_##vt1(&left) = val1; \
From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/oleaut32/tests/vartest.c | 45 ++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 16 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 310f24586ec..2cc63d94091 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -55,6 +55,8 @@ static WCHAR sz12_true[32]; /* Has I8/UI8 data type? */ static BOOL has_i8;
+static BOOL is_win; + /* When comparing floating point values we cannot expect an exact match * because the rounding errors depend on the exact algorithm. */ @@ -432,6 +434,8 @@ static void init(void) BSTR bstr; HRESULT res;
+ is_win = !strcmp(winetest_platform, "windows"); + res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); ok(res == S_OK && bstr[0], "Expected localized string for 'True'\n"); /* lstrcpyW / lstrcatW do not work on win95 */ @@ -6794,7 +6798,16 @@ static HRESULT (WINAPI *pVarAnd)(LPVARIANT,LPVARIANT,LPVARIANT); V_VT(&left) = VT_##vt1; V_##vt1(&left) = val1; \ V_VT(&right) = VT_##vt2; V_##vt2(&right) = val2; \ V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \ - test_var_call2( __LINE__, pVarAnd, &left, &right, &exp ) + test_var_call2_commutative( __LINE__, pVarAnd, &left, &right, &exp ) + +#define VARAND_TODOCOMM(vt1,val1,vt2,val2,rvt,rval) \ + V_VT(&left) = VT_##vt1; V_##vt1(&left) = val1; \ + V_VT(&right) = VT_##vt2; V_##vt2(&right) = val2; \ + V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \ + if (is_win) \ + test_var_call2_commutative( __LINE__, pVarAnd, &left, &right, &exp ); \ + else \ + test_var_call2( __LINE__, pVarAnd, &left, &right, &exp ); \
#define VARANDCY(vt1,val1,val2,rvt,rval) \ V_VT(&left) = VT_##vt1; V_##vt1(&left) = val1; \ @@ -6977,35 +6990,35 @@ static void test_VarAnd(void) VARAND(NULL,0,NULL,0,NULL,0); VARAND(NULL,1,NULL,0,NULL,0); VARAND(NULL,0,I1,0,I4,0); - VARAND(NULL,0,I1,1,NULL,0); + VARAND_TODOCOMM(NULL,0,I1,1,NULL,0); VARAND(NULL,0,UI1,0,UI1,0); - VARAND(NULL,0,UI1,1,NULL,0); + VARAND_TODOCOMM(NULL,0,UI1,1,NULL,0); VARAND(NULL,0,I2,0,I2,0); - VARAND(NULL,0,I2,1,NULL,0); + VARAND_TODOCOMM(NULL,0,I2,1,NULL,0); VARAND(NULL,0,UI2,0,I4,0); - VARAND(NULL,0,UI2,1,NULL,0); + VARAND_TODOCOMM(NULL,0,UI2,1,NULL,0); VARAND(NULL,0,I4,0,I4,0); - VARAND(NULL,0,I4,1,NULL,0); + VARAND_TODOCOMM(NULL,0,I4,1,NULL,0); VARAND(NULL,0,UI4,0,I4,0); - VARAND(NULL,0,UI4,1,NULL,0); + VARAND_TODOCOMM(NULL,0,UI4,1,NULL,0); if (has_i8) { VARAND(NULL,0,I8,0,I8,0); - VARAND(NULL,0,I8,1,NULL,0); + VARAND_TODOCOMM(NULL,0,I8,1,NULL,0); VARAND(NULL,0,UI8,0,I4,0); - VARAND(NULL,0,UI8,1,NULL,0); + VARAND_TODOCOMM(NULL,0,UI8,1,NULL,0); } VARAND(NULL,0,INT,0,I4,0); - VARAND(NULL,0,INT,1,NULL,0); + VARAND_TODOCOMM(NULL,0,INT,1,NULL,0); VARAND(NULL,0,UINT,0,I4,0); - VARAND(NULL,0,UINT,1,NULL,0); - VARAND(NULL,0,BOOL,0,BOOL,0); - VARAND(NULL,0,BOOL,1,NULL,0); + VARAND_TODOCOMM(NULL,0,UINT,1,NULL,0); + VARAND_TODOCOMM(NULL,0,BOOL,0,BOOL,0); + VARAND_TODOCOMM(NULL,0,BOOL,1,NULL,0); VARAND(NULL,0,R4,0,I4,0); - VARAND(NULL,0,R4,1,NULL,0); + VARAND_TODOCOMM(NULL,0,R4,1,NULL,0); VARAND(NULL,0,R8,0,I4,0); - VARAND(NULL,0,R8,1,NULL,0); - VARAND(NULL,0,BSTR,false_str,BOOL,0); + VARAND_TODOCOMM(NULL,0,R8,1,NULL,0); + VARAND_TODOCOMM(NULL,0,BSTR,false_str,BOOL,0); VARAND(NULL,0,BSTR,true_str,NULL,VARIANT_FALSE); VARANDCY(NULL,0,10000,NULL,0); VARANDCY(NULL,0,0,I4,0);
-
Nikolay Sivov -
Nikolay Sivov (＠nsivov)