ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartest.

This commit is contained in:
André Hentschel 2013-06-24 22:01:51 +02:00 committed by Alexandre Julliard
parent ca77d6c1da
commit 18690c833a
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/oleaut32/tests/vartest.c
View File

@ -57,8 +57,6 @@ static WCHAR sz12_true[32];
#define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \
if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; }
/* Have IRecordInfo data type? */
static int HAVE_OLEAUT32_RECORD = 0;
/* Have I8/UI8 data type? */ /* Have I8/UI8 data type? */
static int HAVE_OLEAUT32_I8 = 0; static int HAVE_OLEAUT32_I8 = 0;
@ -127,8 +125,6 @@ static void init(void)
if (!HAVE_OLEAUT32_I8) if (!HAVE_OLEAUT32_I8)
skip("No support for I8 and UI8 data types\n"); skip("No support for I8 and UI8 data types\n");
HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo);
#undef HAVE_FUNC #undef HAVE_FUNC
} }
@ -404,8 +400,7 @@ static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags)
extraFlags == (VT_ARRAY|VT_BYREF))) extraFlags == (VT_ARRAY|VT_BYREF)))
ret = 1; /* ok */ ret = 1; /* ok */
if ((vt == VT_RECORD && !HAVE_OLEAUT32_RECORD) || if (!HAVE_OLEAUT32_I8 && (vt == VT_I8 || vt == VT_UI8))
((vt == VT_I8 || vt == VT_UI8) && !HAVE_OLEAUT32_I8))
ret = 0; /* Old versions of oleaut32 */ ret = 0; /* Old versions of oleaut32 */
return ret; return ret;
} }
@ -2042,7 +2037,6 @@ static void test_VarNot(void)
hExpected = S_OK; hExpected = S_OK;
break; break;
case VT_RECORD: case VT_RECORD:
if (HAVE_OLEAUT32_RECORD)
hExpected = DISP_E_TYPEMISMATCH; hExpected = DISP_E_TYPEMISMATCH;
break; break;
case VT_UNKNOWN: case VT_BSTR: case VT_DISPATCH: case VT_ERROR: case VT_UNKNOWN: case VT_BSTR: case VT_DISPATCH: case VT_ERROR: