Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
5a290897
Commit
5a290897
authored
22 years ago
by
Bill Medland
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Correct GetNumberFormatA for zero decimals and for zero grouping.
parent
04b10544
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/kernel/tests/locale.c
+18
-0
18 additions, 0 deletions
dlls/kernel/tests/locale.c
ole/ole2nls.c
+4
-1
4 additions, 1 deletion
ole/ole2nls.c
with
22 additions
and
1 deletion
dlls/kernel/tests/locale.c
+
18
−
0
View file @
5a290897
...
...
@@ -285,6 +285,7 @@ void TestGetNumberFormat()
int
ret
,
error
,
cmp
;
char
buffer
[
BUFFER_SIZE
],
Expected
[
BUFFER_SIZE
],
input
[
BUFFER_SIZE
];
LCID
lcid
;
NUMBERFMTA
format
;
lcid
=
MAKELCID
(
MAKELANGID
(
LANG_ENGLISH
,
SUBLANG_ENGLISH_US
),
SORT_DEFAULT
);
...
...
@@ -319,6 +320,23 @@ LCID lcid;
cmp
=
strncmp
(
Expected
,
buffer
,
BUFFER_SIZE
);
ok
(
cmp
==
0
,
"GetNumberFormat got %s instead of %s"
,
buffer
,
Expected
);
eq
(
ret
,
strlen
(
Expected
)
+
1
,
"GetNumberFormat"
,
"%d"
);
/* If the number of decimals is zero there should be no decimal
* separator.
* If the grouping size is zero there should be no grouping symbol
*/
format
.
NumDigits
=
0
;
format
.
LeadingZero
=
0
;
format
.
Grouping
=
0
;
format
.
NegativeOrder
=
0
;
format
.
lpDecimalSep
=
"."
;
format
.
lpThousandSep
=
","
;
strcpy
(
Expected
,
"123456789"
);
memset
(
buffer
,
'x'
,
sizeof
(
buffer
)
/
sizeof
(
buffer
[
0
])
);
ret
=
GetNumberFormatA
(
0
,
0
,
"123456789.0"
,
&
format
,
buffer
,
sizeof
(
buffer
));
cmp
=
strncmp
(
Expected
,
buffer
,
sizeof
(
buffer
));
ok
(
cmp
==
0
,
"GetNumberFormat got %s instead of %s"
,
buffer
,
Expected
);
}
...
...
This diff is collapsed.
Click to expand it.
ole/ole2nls.c
+
4
−
1
View file @
5a290897
...
...
@@ -2230,6 +2230,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
sprintf
(
sNumberDigits
,
"%d"
,
lpFormat
->
NumDigits
);
strcpy
(
sDecimalSymbol
,
lpFormat
->
lpDecimalSep
);
sprintf
(
sDigitsInGroup
,
"%d;0"
,
lpFormat
->
Grouping
);
/* Win95-WinME only allow 0-9 for grouping, no matter what MSDN says. */
strcpy
(
sDigitGroupSymbol
,
lpFormat
->
lpThousandSep
);
sprintf
(
sILZero
,
"%d"
,
lpFormat
->
LeadingZero
);
sprintf
(
sNegNumber
,
"%d"
,
lpFormat
->
NegativeOrder
);
...
...
@@ -2275,6 +2276,8 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
nStep
=
nCounter
=
i
=
j
=
0
;
nRuleIndex
=
1
;
nGrouping
=
OLE_GetGrouping
(
sRule
,
nRuleIndex
);
if
(
nGrouping
==
0
)
/* If the first grouping is zero */
nGrouping
=
nNumberDecimal
;
/* Don't do grouping */
/* Here, we will loop until we reach the end of the string.
* An internal counter (j) is used in order to know when to
...
...
@@ -2343,7 +2346,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
for
(
i
=
0
;
i
<
j
;
i
++
)
memcpy
(
sNumber
+
nCounter
+
i
+
strlen
(
sDecimalSymbol
),
sDigitsAfterDecimal
+
i
,
1
);
memcpy
(
sNumber
+
nCounter
+
i
+
strlen
(
sDecimalSymbol
),
"
\0
"
,
1
);
memcpy
(
sNumber
+
nCounter
+
i
+
(
i
?
strlen
(
sDecimalSymbol
)
:
0
)
,
"
\0
"
,
1
);
/* Is it a negative number */
if
(
bNegative
==
TRUE
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment