Dylan Smith : wordpad: Fixed the font size validation for the toolbar' s combobox.
Alexandre Julliard
julliard at winehq.org
Fri Jun 20 06:22:28 CDT 2008
Module: wine
Branch: master
Commit: 6fab4754d7e09738aafdb9cb218f814ff3c0a71d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fab4754d7e09738aafdb9cb218f814ff3c0a71d
Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date: Tue Jun 17 21:19:11 2008 -0400
wordpad: Fixed the font size validation for the toolbar's combobox.
---
programs/wordpad/wordpad.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 04fc878..29dc755 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -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
More information about the wine-cvs
mailing list