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
a2791a09
Commit
a2791a09
authored
Jun 08, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix handling of 'c' format for non-date variants in VarTokenizeFormatString.
parent
d77c7d10
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
varformat.c
dlls/oleaut32/tests/varformat.c
+1
-0
varformat.c
dlls/oleaut32/varformat.c
+1
-1
No files found.
dlls/oleaut32/tests/varformat.c
View file @
a2791a09
...
...
@@ -328,6 +328,7 @@ static void test_VarFormat(void)
VARFMT
(
VT_I4
,
V_I4
,
1
,
"000###"
,
S_OK
,
"000001"
);
VARFMT
(
VT_I4
,
V_I4
,
1
,
"#00##00#0"
,
S_OK
,
"00000001"
);
VARFMT
(
VT_I4
,
V_I4
,
1
,
"1#####0000"
,
S_OK
,
"10001"
);
VARFMT
(
VT_I4
,
V_I4
,
1
,
"##abcdefghijklmnopqrstuvwxyz"
,
S_OK
,
"1abcdefghijklmnopqrstuvwxyz"
);
VARFMT
(
VT_I4
,
V_I4
,
100000
,
"#,###,###,###"
,
S_OK
,
"100,000"
);
VARFMT
(
VT_I4
,
V_I4
,
1
,
"0,000,000,000"
,
S_OK
,
"0,000,000,001"
);
VARFMT
(
VT_I4
,
V_I4
,
123456789
,
"#,#.#"
,
S_OK
,
"123,456,789."
);
...
...
dlls/oleaut32/varformat.c
View file @
a2791a09
...
...
@@ -852,7 +852,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
*
pOut
++
=
FMT_DATE_AMPM_UPPER
;
TRACE
(
"AM/PM
\n
"
);
}
else
if
(
*
pFormat
==
'c'
||
*
pFormat
==
'C'
)
else
if
(
(
*
pFormat
==
'c'
||
*
pFormat
==
'C'
)
&&
COULD_BE
(
FMT_TYPE_DATE
)
)
{
/* Date formats: General date format
* Other formats: Literal
...
...
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