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
93acfeb7
Commit
93acfeb7
authored
Mar 05, 2006
by
Robert Shearman
Committed by
Alexandre Julliard
Mar 06, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut: Fix VarFormat for VT_NULL variants.
parent
7406cc21
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
vartest.c
dlls/oleaut32/tests/vartest.c
+0
-2
varformat.c
dlls/oleaut32/varformat.c
+3
-0
No files found.
dlls/oleaut32/tests/vartest.c
View file @
93acfeb7
...
...
@@ -1785,10 +1785,8 @@ static void test_VarFormat(void)
/* VT_NULL */
V_VT
(
&
in
)
=
VT_NULL
;
hres
=
pVarFormat
(
&
in
,
NULL
,
fd
,
fw
,
0
,
&
out
);
todo_wine
{
ok
(
hres
==
S_OK
,
"VarFormat failed with 0x%08lx
\n
"
,
hres
);
ok
(
out
==
NULL
,
"expected NULL formatted string
\n
"
);
}
/* Invalid args */
hres
=
pVarFormat
(
&
in
,
NULL
,
fd
,
fw
,
flags
,
NULL
);
...
...
dlls/oleaut32/varformat.c
View file @
93acfeb7
...
...
@@ -2007,6 +2007,9 @@ HRESULT WINAPI VarFormatFromTokens(LPVARIANT pVarIn, LPOLESTR lpszFormat,
if
(
!
pVarIn
||
!
rgbTok
)
return
E_INVALIDARG
;
if
(
V_VT
(
pVarIn
)
==
VT_NULL
)
return
S_OK
;
if
(
*
rgbTok
==
FMT_TO_STRING
||
header
->
type
==
FMT_TYPE_GENERAL
)
{
/* According to MSDN, general format acts somewhat like the 'Str'
...
...
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