Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[OLEAUT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=67205
This commit is contained in:
Amine Khaldi 2015-04-15 18:10:02 +00:00
parent e8f37aa2ae
commit b2c305e446
3 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rostests/winetests/oleaut32/typelib.c
View file

@ -5600,7 +5600,7 @@ static void test_dep(void) {
ok(hr == S_OK, "got: %x\n", hr); ok(hr == S_OK, "got: %x\n", hr);
hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt);
todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr);
ITypeInfo_Release(ptInfo); ITypeInfo_Release(ptInfo);
if(ptInfoExt) if(ptInfoExt)

31
rostests/winetests/oleaut32/vartest.c
View file

@ -299,16 +299,14 @@ static void init(void)
HRESULT res; HRESULT res;
res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr);
ok(res == S_OK && (lstrlenW(bstr) > 0), ok(res == S_OK && bstr[0], "Expected localized string for 'True'\n");
"Expected localized string for 'True'\n");
/* lstrcpyW / lstrcatW do not work on win95 */ /* lstrcpyW / lstrcatW do not work on win95 */
memcpy(sz12_true, sz12, sizeof(sz12)); memcpy(sz12_true, sz12, sizeof(sz12));
if (bstr) memcpy(&sz12_true[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); if (bstr) memcpy(&sz12_true[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR));
SysFreeString(bstr); SysFreeString(bstr);
res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr);
ok(res == S_OK && (lstrlenW(bstr) > 0), ok(res == S_OK && bstr[0], "Expected localized string for 'False'\n");
"Expected localized string for 'False'\n");
memcpy(sz12_false, sz12, sizeof(sz12)); memcpy(sz12_false, sz12, sizeof(sz12));
if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR));
SysFreeString(bstr); SysFreeString(bstr);
@ -337,12 +335,6 @@ static void setdec64(DECIMAL* dec, BYTE scl, BYTE sgn, ULONG hi32, ULONG mid32,
S1(U1(*dec)).Lo32 = lo32; S1(U1(*dec)).Lo32 = lo32;
} }
static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 )
{
while (*str1 && (*str1 == *str2)) { str1++; str2++; }
return *str1 - *str2;
}
/* return the string text of a given variant type */ /* return the string text of a given variant type */
static char vtstr_buffer[16][256]; static char vtstr_buffer[16][256];
static int vtstr_current=0; static int vtstr_current=0;
@ -1395,11 +1387,11 @@ static void test_VarParseNumFromStr(void)
/* VB oct char bigger than 7 */ /* VB oct char bigger than 7 */
CONVERT("&o128", NUMPRS_HEX_OCT); CONVERT("&o128", NUMPRS_HEX_OCT);
/* EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0);
Native versions 2.x of oleaut32 allow this to succeed: later versions and Wine don't EXPECTRGB(0,1);
EXPECTFAIL; EXPECTRGB(1,2);
EXPECTRGB(0,FAILDIG); EXPECTRGB(3,FAILDIG);
*/
/** NUMPRS_PARENS **/ /** NUMPRS_PARENS **/
/* Empty parens = error */ /* Empty parens = error */
@ -6063,7 +6055,6 @@ static void test_VarAnd(void)
else if (leftvt == VT_I4 || rightvt == VT_I4 || else if (leftvt == VT_I4 || rightvt == VT_I4 ||
leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_UINT || rightvt == VT_UINT ||
leftvt == VT_INT || rightvt == VT_INT || leftvt == VT_INT || rightvt == VT_INT ||
leftvt == VT_UINT || rightvt == VT_UINT ||
leftvt == VT_R4 || rightvt == VT_R4 || leftvt == VT_R4 || rightvt == VT_R4 ||
leftvt == VT_R8 || rightvt == VT_R8 || leftvt == VT_R8 || rightvt == VT_R8 ||
leftvt == VT_CY || rightvt == VT_CY || leftvt == VT_CY || rightvt == VT_CY ||
@ -7407,10 +7398,10 @@ static void test_VarPow(void)
hres = pVarPow(&cy, &right, &result); hres = pVarPow(&cy, &right, &result);
if (hres == S_OK) if (hres == S_OK)
{ {
ok(hres == S_OK && V_VT(&result) == VT_R8, ok(V_VT(&result) == VT_R8,
"VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n",
S_OK, hres, vtstr(V_VT(&result))); S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), ok(EQ_DOUBLE(V_R8(&result), 4.0),
"VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0); "VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0);
} }
else else
@ -7444,10 +7435,10 @@ static void test_VarPow(void)
hres = pVarPow(&dec, &right, &result); hres = pVarPow(&dec, &right, &result);
if (hres == S_OK) if (hres == S_OK)
{ {
ok(hres == S_OK && V_VT(&result) == VT_R8, ok(V_VT(&result) == VT_R8,
"VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n",
S_OK, hres, vtstr(V_VT(&result))); S_OK, hres, vtstr(V_VT(&result)));
ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), ok(EQ_DOUBLE(V_R8(&result), 4.0),
"VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0);
} }
else else

2
rostests/winetests/oleaut32/vartype.c
View file

@ -6463,7 +6463,7 @@ static void test_recinfo(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok(testcopy.bstr == NULL, "got %p\n", testcopy.bstr); ok(testcopy.bstr == NULL, "got %p\n", testcopy.bstr);
/* now destination contains inteface pointer */ /* now the destination contains the interface pointer */
memset(&testcopy, 0, sizeof(testcopy)); memset(&testcopy, 0, sizeof(testcopy));
testcopy.disp = &dispatch.IDispatch_iface; testcopy.disp = &dispatch.IDispatch_iface;
dispatch.ref = 10; dispatch.ref = 10;