Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
18690c83
Commit
18690c83
authored
Jun 24, 2013
by
André Hentschel
Committed by
Alexandre Julliard
Jun 25, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartest.
parent
ca77d6c1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
vartest.c
dlls/oleaut32/tests/vartest.c
+2
-8
No files found.
dlls/oleaut32/tests/vartest.c
View file @
18690c83
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment