Mercurial > sdl-ios-xcode

diff src/video/windows/SDL_windowskeyboard.c @ 5110:d68e9722ff4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug #1109 Ozkan Sezer 2011-01-26 12:33:42 PST I got warnings from SDL_windowskeyboard.c when I compiled for win64.
author Sam Lantinga <slouken@libsdl.org>
date Thu, 27 Jan 2011 08:40:06 -0800
parents 327f181542f1
children fb424691cfc7
line wrap: on
line diff
--- a/src/video/windows/SDL_windowskeyboard.c	Thu Jan 27 07:05:13 2011 -0800
+++ b/src/video/windows/SDL_windowskeyboard.c	Thu Jan 27 08:40:06 2011 -0800
@@ -534,7 +534,7 @@
         return dwRet[uIndex];
 
     hklprev = hkl;
-    dwLang = ((DWORD)hkl & 0xffff);
+    dwLang = ((DWORD_PTR)hkl & 0xffff);
     if (videodata->ime_uiless && LANG() == LANG_CHT) {
         dwRet[0] = IMEID_CHT_VER_VISTA;
         dwRet[1] = 0;
@@ -781,7 +781,7 @@
                     UINT cchars = 0;
 
                     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 (i > cand_list->dwSelection)
                                 break;
@@ -801,7 +801,7 @@
                 }
                 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++) {
-                    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);
                 }
                 if (PRIMLANG() == LANG_KOREAN || (PRIMLANG() == LANG_CHT && !IME_GetId(videodata, 0)))