=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartest.
Alexandre Julliard
julliard at winehq.org
Tue Jun 25 14:41:24 CDT 2013
Module: wine
Branch: master
Commit: 18690c833ac477dc210e334071d8c576eb5b538f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=18690c833ac477dc210e334071d8c576eb5b538f
Author: André Hentschel <nerv at dawncrow.de>
Date: Mon Jun 24 22:01:51 2013 +0200
oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartest.
---
dlls/oleaut32/tests/vartest.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 247e08e..9b2d4e8 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -57,8 +57,6 @@ static WCHAR sz12_true[32];
#define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \
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? */
static int HAVE_OLEAUT32_I8 = 0;
@@ -127,8 +125,6 @@ static void init(void)
if (!HAVE_OLEAUT32_I8)
skip("No support for I8 and UI8 data types\n");
- HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo);
-
#undef HAVE_FUNC
}
@@ -404,8 +400,7 @@ static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags)
extraFlags == (VT_ARRAY|VT_BYREF)))
ret = 1; /* ok */
- if ((vt == VT_RECORD && !HAVE_OLEAUT32_RECORD) ||
- ((vt == VT_I8 || vt == VT_UI8) && !HAVE_OLEAUT32_I8))
+ if (!HAVE_OLEAUT32_I8 && (vt == VT_I8 || vt == VT_UI8))
ret = 0; /* Old versions of oleaut32 */
return ret;
}
@@ -2042,8 +2037,7 @@ static void test_VarNot(void)
hExpected = S_OK;
break;
case VT_RECORD:
- if (HAVE_OLEAUT32_RECORD)
- hExpected = DISP_E_TYPEMISMATCH;
+ hExpected = DISP_E_TYPEMISMATCH;
break;
case VT_UNKNOWN: case VT_BSTR: case VT_DISPATCH: case VT_ERROR:
hExpected = DISP_E_TYPEMISMATCH;
More information about the wine-cvs
mailing list