Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ca469de6
Commit
ca469de6
authored
Oct 24, 2013
by
André Hentschel
Committed by
Alexandre Julliard
Oct 28, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32/tests: Fix vartest tests compilation with __WINESRC__ defined.
parent
03f62709
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
Makefile.in
dlls/oleaut32/tests/Makefile.in
+0
-1
vartest.c
dlls/oleaut32/tests/vartest.c
+6
-6
No files found.
dlls/oleaut32/tests/Makefile.in
View file @
ca469de6
TESTDLL
=
oleaut32.dll
IMPORTS
=
oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
EXTRADEFS
=
-U__WINESRC__
-DWINE_STRICT_PROTOTYPES
-DWINE_NO_NAMELESS_EXTENSION
-DWIDL_C_INLINE_WRAPPERS
C_SRCS
=
\
dispatch.c
\
...
...
dlls/oleaut32/tests/vartest.c
View file @
ca469de6
...
...
@@ -28,7 +28,7 @@
#include "windef.h"
#include "winbase.h"
#include "winsock.h"
#include "winsock
2
.h"
#include "wine/test.h"
#include "winuser.h"
#include "wingdi.h"
...
...
@@ -116,7 +116,7 @@ static void init(void)
if
(
bstr
)
memcpy
(
&
sz12_false
[
2
],
bstr
,
SysStringByteLen
(
bstr
)
+
sizeof
(
WCHAR
));
SysFreeString
(
bstr
);
hOleaut32
=
GetModuleHandle
(
"oleaut32.dll"
);
hOleaut32
=
GetModuleHandle
A
(
"oleaut32.dll"
);
has_i8
=
GetProcAddress
(
hOleaut32
,
"VarI8FromI1"
)
!=
NULL
;
if
(
!
has_i8
)
skip
(
"No support for I8 and UI8 data types
\n
"
);
...
...
@@ -5366,7 +5366,7 @@ static void test_VarCat(void)
static
const
WCHAR
sz12_date
[]
=
{
'1'
,
'2'
,
'9'
,
'/'
,
'3'
,
'0'
,
'/'
,
'1'
,
'9'
,
'8'
,
'0'
,
'\0'
};
static
const
WCHAR
sz12_date_broken
[]
=
{
'1'
,
'2'
,
'9'
,
'/'
,
'3'
,
'0'
,
'/'
,
'8'
,
'0'
,
'\0'
};
static
const
WCHAR
sz_empty
[]
=
{
'\0'
};
T
CHAR
orig_date_format
[
128
];
CHAR
orig_date_format
[
128
];
VARTYPE
leftvt
,
rightvt
,
resultvt
;
HRESULT
hres
;
HRESULT
expected_error_num
;
...
...
@@ -5375,8 +5375,8 @@ static void test_VarCat(void)
/* Set date format for testing */
lcid
=
LOCALE_USER_DEFAULT
;
GetLocaleInfo
(
lcid
,
LOCALE_SSHORTDATE
,
orig_date_format
,
128
);
SetLocaleInfo
(
lcid
,
LOCALE_SSHORTDATE
,
"M/d/yyyy"
);
GetLocaleInfo
A
(
lcid
,
LOCALE_SSHORTDATE
,
orig_date_format
,
128
);
SetLocaleInfo
A
(
lcid
,
LOCALE_SSHORTDATE
,
"M/d/yyyy"
);
VariantInit
(
&
left
);
VariantInit
(
&
right
);
...
...
@@ -5697,7 +5697,7 @@ static void test_VarCat(void)
"VarCat: EMPTY concat with EMPTY did not return empty VT_BSTR
\n
"
);
/* Restore original date format settings */
SetLocaleInfo
(
lcid
,
LOCALE_SSHORTDATE
,
orig_date_format
);
SetLocaleInfo
A
(
lcid
,
LOCALE_SSHORTDATE
,
orig_date_format
);
VariantClear
(
&
left
);
VariantClear
(
&
right
);
...
...
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