ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wordpad: Fixed the font size validation for the toolbar's combobox.

This commit is contained in:
Dylan Smith 2008-06-17 21:19:11 -04:00 committed by Alexandre Julliard
parent 536edd7bfc
commit 6fab4754d7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/wordpad/wordpad.c
View File

@ -219,20 +219,22 @@ static void set_caption(LPCWSTR wszNewFileName)
static BOOL validate_endptr(LPCSTR endptr, BOOL units)
{
if(!endptr || !*endptr)
if(!endptr)
return FALSE;
if(!*endptr)
return TRUE;
while(*endptr == ' ')
endptr++;
if(!units)
return *endptr != '\0';
return *endptr == '\0';
/* FIXME: Allow other units and convert between them */
if(!lstrcmpA(endptr, units_cmA))
endptr += 2;
return *endptr != '\0';
return *endptr == '\0';
}
static BOOL number_from_string(LPCWSTR string, float *num, BOOL units)
@ -246,7 +248,7 @@ static BOOL number_from_string(LPCWSTR string, float *num, BOOL units)
errno = 0;
ret = strtod(buffer, &endptr);
if((ret == 0 && errno != 0) || endptr == buffer || validate_endptr(endptr, units))
if((ret == 0 && errno != 0) || endptr == buffer || !validate_endptr(endptr, units))
{
return FALSE;
} else
@ -1795,7 +1797,8 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam)
if(lstrcmpW(sizeBuffer, (LPWSTR)endEdit->szText))
{
float size = 0;
if(number_from_string((LPWSTR)endEdit->szText, &size, FALSE))
if(number_from_string((LPWSTR)endEdit->szText, &size, FALSE)
&& size > 0)
{
set_size(size);
} else