Index: dll/win32/kernel32/misc/lcformat.c =================================================================== --- dll/win32/kernel32/misc/lcformat.c (revision 48489) +++ dll/win32/kernel32/misc/lcformat.c (working copy) @@ -1039,6 +1039,7 @@ 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%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), @@ -1080,8 +1081,12 @@ /* 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) dwDecimals++; @@ -1193,7 +1198,7 @@ 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) { @@ -1211,7 +1216,7 @@ 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;