minor correction after previous patch and minor tidy-up.

This commit is contained in:
Ozkan Sezer 2021-12-01 01:40:24 +03:00
parent 70c5e91d0f
commit 662ea5abe4

View file

@ -321,13 +321,13 @@ static VOID _wmChar(WINDATA *pWinData, MPARAM mp1, MPARAM mp2)
if ((ulFlags & KC_CHAR) != 0) { if ((ulFlags & KC_CHAR) != 0) {
#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H) #if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
char *acUTF8 = SDL_iconv_string("UTF-8", "", (char *)&ulCharCode, 1); char *utf8 = SDL_iconv_string("UTF-8", "", (char *)&ulCharCode, 1);
SDL_SendKeyboardText((acUTF8 != NULL)? acUTF8 : (char *)&ulCharCode); SDL_SendKeyboardText((utf8 && *utf8) ? utf8 : (char *)&ulCharCode);
SDL_free(acUTF8); SDL_free(utf8);
#else #else
CHAR acUTF8[4]; char utf8[4];
LONG lRC = StrUTF8(1, acUTF8, sizeof(acUTF8), (PSZ)&ulCharCode, 1); int rc = StrUTF8(1, utf8, sizeof(utf8), (char *)&ulCharCode, 1);
SDL_SendKeyboardText((lRC > 0)? acUTF8 : (PSZ)&ulCharCode); SDL_SendKeyboardText((rc > 0) ? utf8 : (char *) &ulCharCode);
#endif #endif
} }
} }