Module: wine Branch: master Commit: 0f4891ff53b85215d92e6057e32a207ae5e3d223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4891ff53b85215d92e6057e3... Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Nov 12 09:48:47 2016 +0100 wordpad: Use return value of LoadStringW() instead of calling lstrlenW(). Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index f0a7d14..89bcac1 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -107,20 +107,16 @@ static void DoLoadStrings(void) HINSTANCE hInstance = GetModuleHandleW(0); - LoadStringW(hInstance, STRING_RICHTEXT_FILES_RTF, p, MAX_STRING_LEN); - p += lstrlenW(p) + 1; + p += 1 + LoadStringW(hInstance, STRING_RICHTEXT_FILES_RTF, p, MAX_STRING_LEN); lstrcpyW(p, files_rtf); p += lstrlenW(p) + 1; - LoadStringW(hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); - p += lstrlenW(p) + 1; + p += 1 + LoadStringW(hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); lstrcpyW(p, files_txt); p += lstrlenW(p) + 1; - LoadStringW(hInstance, STRING_TEXT_FILES_UNICODE_TXT, p, MAX_STRING_LEN); - p += lstrlenW(p) + 1; + p += 1 + LoadStringW(hInstance, STRING_TEXT_FILES_UNICODE_TXT, p, MAX_STRING_LEN); lstrcpyW(p, files_txt); p += lstrlenW(p) + 1; - LoadStringW(hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); - p += lstrlenW(p) + 1; + p += 1 + LoadStringW(hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); lstrcpyW(p, files_all); p += lstrlenW(p) + 1; *p = '\0';