From a4013255d71c1ea2ffe350855f6c24f5c4160b85 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 25 Jun 2026 10:36:36 +0900 Subject: [PATCH] [IMM32] Fix C4334 and C4267 warnings (#9211) Kill the warnings. JIRA issue: CORE-19268 Add type casts to DWORD. --- win32ss/user/imm32/candidate.c | 2 +- win32ss/user/imm32/imemenu.c | 2 +- win32ss/user/imm32/install.c | 8 ++++---- win32ss/user/imm32/keymsg.c | 2 +- win32ss/user/imm32/win3.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/win32ss/user/imm32/candidate.c b/win32ss/user/imm32/candidate.c index 8b512bd04c5..01ea0fed180 100644 --- a/win32ss/user/imm32/candidate.c +++ b/win32ss/user/imm32/candidate.c @@ -458,6 +458,6 @@ ImmSetCandidateWindow( ImmUnlockIMC(hIMC); Imm32MakeIMENotify(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS, - IMN_SETCANDIDATEPOS, (1 << (BYTE)lpCandidate->dwIndex)); + IMN_SETCANDIDATEPOS, (DWORD)(1 << (BYTE)lpCandidate->dwIndex)); return TRUE; } diff --git a/win32ss/user/imm32/imemenu.c b/win32ss/user/imm32/imemenu.c index 5b14059dd16..636512b260e 100644 --- a/win32ss/user/imm32/imemenu.c +++ b/win32ss/user/imm32/imemenu.c @@ -127,7 +127,7 @@ Imm32WriteHBitmapToNode( break; default: nodeExtraSize = sizeof(BITMAPINFOHEADER); - nodeExtraSize += (1 << pBmih->biBitCount) * sizeof(RGBQUAD); + nodeExtraSize += ((DWORD)(1 << pBmih->biBitCount)) * sizeof(RGBQUAD); break; } diff --git a/win32ss/user/imm32/install.c b/win32ss/user/imm32/install.c index 37e9ff4e0c0..adad2f6d271 100644 --- a/win32ss/user/imm32/install.c +++ b/win32ss/user/imm32/install.c @@ -281,13 +281,13 @@ Imm32WriteImeLayout( goto Failure; /* Write "Ime File" */ - cbData = (wcslen(pchFileTitle) + 1) * sizeof(WCHAR); + cbData = (DWORD)((wcslen(pchFileTitle) + 1) * sizeof(WCHAR)); lError = RegSetValueExW(hkeyIME, L"Ime File", 0, REG_SZ, (LPBYTE)pchFileTitle, cbData); if (IS_ERROR_UNEXPECTEDLY(lError)) goto Failure; /* Write "Layout Text" */ - cbData = (wcslen(pszLayoutText) + 1) * sizeof(WCHAR); + cbData = (DWORD)((wcslen(pszLayoutText) + 1) * sizeof(WCHAR)); lError = RegSetValueExW(hkeyIME, L"Layout Text", 0, REG_SZ, (LPBYTE)pszLayoutText, cbData); if (IS_ERROR_UNEXPECTEDLY(lError)) goto Failure; @@ -302,7 +302,7 @@ Imm32WriteImeLayout( } /* Write "Layout File" */ - cbData = (wcslen(pszLayoutFile) + 1) * sizeof(WCHAR); + cbData = (DWORD)((wcslen(pszLayoutFile) + 1) * sizeof(WCHAR)); lError = RegSetValueExW(hkeyIME, L"Layout File", 0, REG_SZ, (LPBYTE)pszLayoutFile, cbData); if (IS_ERROR_UNEXPECTEDLY(lError)) goto Failure; @@ -337,7 +337,7 @@ Imm32WriteImeLayout( #undef MAX_PRELOAD /* Write the IME key to the preload number */ - cbData = (wcslen(szImeKey) + 1) * sizeof(WCHAR); + cbData = (DWORD)((wcslen(szImeKey) + 1) * sizeof(WCHAR)); lError = RegSetValueExW(hkeyPreload, szPreloadNumber, 0, REG_SZ, (LPBYTE)szImeKey, cbData); RegCloseKey(hkeyPreload); return lError == ERROR_SUCCESS; diff --git a/win32ss/user/imm32/keymsg.c b/win32ss/user/imm32/keymsg.c index 1784c1b337b..f0e3360c8b1 100644 --- a/win32ss/user/imm32/keymsg.c +++ b/win32ss/user/imm32/keymsg.c @@ -403,7 +403,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA return 0; /* Out of range */ } - dwSize = acbData[bAnsiAPI * 7 + dwCommand - 1]; + dwSize = (DWORD)acbData[bAnsiAPI * 7 + dwCommand - 1]; if (pData && IsBadWritePtr(pData, dwSize)) { ERR("\n"); diff --git a/win32ss/user/imm32/win3.c b/win32ss/user/imm32/win3.c index 1a6655c4d14..d2b15a3b8cb 100644 --- a/win32ss/user/imm32/win3.c +++ b/win32ss/user/imm32/win3.c @@ -1456,7 +1456,7 @@ WINNLSTranslateMessageJ( LPARAM lParam = pCurrent->lParam; for (DWORD iCandForm = 0; iCandForm < MAX_CANDIDATEFORM; ++iCandForm) { - if (!(lParam & (1 << iCandForm))) + if (!(lParam & (DWORD)(1 << iCandForm))) continue; CandForm.dwIndex = iCandForm;