Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-04 03:34:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

trim leading zeros in GetNumberFormat

Browse source 
patch by <zooba at aanet dot com dot au>
See issue #3400 for more details.

svn path=/trunk/; revision=38930
This commit is contained in:
Christoph von Wittich 2009-01-19 09:04:56 +00:00
parent 9a921d3209
commit c1f8a4fdc2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/win32/kernel32/misc/lcformat.c
View file

@ -1013,6 +1013,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags,
WCHAR szNegBuff[8];
const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc;
DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0;
DWORD dwLeadingZeros = 0;
INT iRet;
TRACE("(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", lcid, dwFlags, lpszValue,
@ -1063,7 +1064,11 @@ GetNumberFormatW_Error:
/* Check the number for validity */
while (*szSrc)
{
if (*szSrc >= '0' && *szSrc <= '9')
if (*szSrc == '0' && !(dwState & NF_DIGITS))
{
dwLeadingZeros++;
}
else if ((*szSrc >= '1' && *szSrc <= '9') || (*szSrc == '0' && (dwState & NF_DIGITS)))
{
dwState |= NF_DIGITS;
if (dwState & NF_ISREAL)
@ -1176,7 +1181,7 @@ GetNumberFormatW_Error:
dwGroupCount = lpFormat->Grouping == 32 ? 3 : lpFormat->Grouping;
/* Write the remaining whole number digits, including grouping chars */
while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9')
while (szSrc >= (lpszValue + dwLeadingZeros) && *szSrc >= '0' && *szSrc <= '9')
{
if (dwState & NF_ROUND)
{
@ -1194,7 +1199,7 @@ GetNumberFormatW_Error:
dwState |= NF_DIGITS_OUT;
dwCurrentGroupCount++;
if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount && *szSrc != '-')
if (szSrc >= (lpszValue + dwLeadingZeros) && dwCurrentGroupCount == dwGroupCount && *szSrc != '-')
{
LPWSTR lpszGrp = lpFormat->lpThousandSep + strlenW(lpFormat->lpThousandSep) - 1;