pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug #1109

Browse source 
Ozkan Sezer      2011-01-26 12:33:42 PST

I got warnings from SDL_windowskeyboard.c when I compiled for win64.
This commit is contained in:
Sam Lantinga 2011-01-27 08:40:06 -08:00
parent e2a13f8922
commit 1bdfc84ec9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video/windows/SDL_windowskeyboard.c
View file

@ -534,7 +534,7 @@ IME_GetId(SDL_VideoData *videodata, UINT uIndex)
return dwRet[uIndex]; return dwRet[uIndex];
hklprev = hkl; hklprev = hkl;
dwLang = ((DWORD)hkl & 0xffff); dwLang = ((DWORD_PTR)hkl & 0xffff);
if (videodata->ime_uiless && LANG() == LANG_CHT) { if (videodata->ime_uiless && LANG() == LANG_CHT) {
dwRet[0] = IMEID_CHT_VER_VISTA; dwRet[0] = IMEID_CHT_VER_VISTA;
dwRet[1] = 0; dwRet[1] = 0;
@ -781,7 +781,7 @@ IME_GetCandidateList(HIMC himc, SDL_VideoData *videodata)
UINT cchars = 0; UINT cchars = 0;
for (; i < videodata->ime_candcount; ++i) { for (; i < videodata->ime_candcount; ++i) {
UINT len = SDL_wcslen((LPWSTR)((DWORD)cand_list + cand_list->dwOffset[i])) + 1; UINT len = SDL_wcslen((LPWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i])) + 1;
if (len + cchars > maxcandchar) { if (len + cchars > maxcandchar) {
if (i > cand_list->dwSelection) if (i > cand_list->dwSelection)
break; break;
@ -801,7 +801,7 @@ IME_GetCandidateList(HIMC himc, SDL_VideoData *videodata)
} }
SDL_memset(&videodata->ime_candidates, 0, sizeof(videodata->ime_candidates)); SDL_memset(&videodata->ime_candidates, 0, sizeof(videodata->ime_candidates));
for (i = page_start, j = 0; (DWORD)i < cand_list->dwCount && j < (int)videodata->ime_candpgsize; i++, j++) { for (i = page_start, j = 0; (DWORD)i < cand_list->dwCount && j < (int)videodata->ime_candpgsize; i++, j++) {
LPCWSTR candidate = (LPCWSTR)((DWORD)cand_list + cand_list->dwOffset[i]); LPCWSTR candidate = (LPCWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i]);
IME_AddCandidate(videodata, j, candidate); IME_AddCandidate(videodata, j, candidate);
} }
if (PRIMLANG() == LANG_KOREAN || (PRIMLANG() == LANG_CHT && !IME_GetId(videodata, 0))) if (PRIMLANG() == LANG_KOREAN || (PRIMLANG() == LANG_CHT && !IME_GetId(videodata, 0)))