Akihiro Sagawa : msstyles: Avoid using isspace() for WCHARs.
Alexandre Julliard
julliard at winehq.org
Wed May 17 15:58:29 CDT 2017
Module: wine
Branch: master
Commit: 9abd3b9622c1102934a57eb5196a774dbf2c8d33
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abd3b9622c1102934a57eb5196a774dbf2c8d33
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Wed May 17 21:35:46 2017 +0900
msstyles: Avoid using isspace() for WCHARs.
Found with Coccinelle.
Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/uxtheme/msstyles.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index e62b95d..16cfbf5 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -1175,19 +1175,24 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd,
return TRUE;
}
+static inline BOOL isSpace(WCHAR c)
+{
+ return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
+}
+
static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize) {
LPCWSTR cur = lpStringStart;
LPCWSTR start;
LPCWSTR end;
- while(cur < lpStringEnd && (isspace(*cur) || *cur == ',')) cur++;
+ while(cur < lpStringEnd && (isSpace(*cur) || *cur == ',')) cur++;
if(cur >= lpStringEnd) {
return FALSE;
}
start = cur;
while(cur < lpStringEnd && *cur != ',') cur++;
end = cur;
- while(isspace(*end)) end--;
+ while(isSpace(*end)) end--;
lstrcpynW(lpBuff, start, min(buffSize, end-start+1));
More information about the wine-cvs
mailing list