Skip to content

Commit 4cf350a

Browse files
katahiromzkatahiromz
authored
[IMM32] Use ANSI_NULL and UNICODE_NULL (reactos#8109)
Coding style fix. JIRA issue: CORE-19268 - Use ANSI_NULL for '\0'. - Use UNICODE_NULL for L'\0'.
1 parent 5b94656 commit 4cf350a

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎win32ss/user/imm32/compstr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Imm32CompStrAnsiToWide(LPCSTR psz, DWORD cb, LPWSTR lpBuf, DWORD dwBufLen, UINT
4444
DWORD ret = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, psz, cb / sizeof(CHAR),
4545
lpBuf, dwBufLen / sizeof(WCHAR));
4646
if (lpBuf && (ret + 1) * sizeof(WCHAR) <= dwBufLen)
47-
lpBuf[ret] = 0;
47+
lpBuf[ret] = UNICODE_NULL;
4848
return ret * sizeof(WCHAR);
4949
}
5050

@@ -54,7 +54,7 @@ Imm32CompStrWideToAnsi(LPCWSTR psz, DWORD cb, LPSTR lpBuf, DWORD dwBufLen, UINT
5454
DWORD ret = WideCharToMultiByte(uCodePage, 0, psz, cb / sizeof(WCHAR),
5555
lpBuf, dwBufLen / sizeof(CHAR), NULL, NULL);
5656
if (lpBuf && (ret + 1) * sizeof(CHAR) <= dwBufLen)
57-
lpBuf[ret] = 0;
57+
lpBuf[ret] = ANSI_NULL;
5858
return ret * sizeof(CHAR);
5959
}
6060

‎win32ss/user/imm32/ime.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ ImmGetDescriptionA(
657657
cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeDescription, (INT)cch,
658658
lpszDescription, uBufLen, NULL, NULL);
659659
if (uBufLen)
660-
lpszDescription[cch] = 0;
660+
lpszDescription[cch] = ANSI_NULL;
661661
return (UINT)cch;
662662
}
663663

@@ -707,7 +707,7 @@ ImmGetIMEFileNameA(
707707
{
708708
ERR("\n");
709709
if (uBufLen > 0)
710-
lpszFileName[0] = 0;
710+
lpszFileName[0] = ANSI_NULL;
711711
return 0;
712712
}
713713

@@ -721,7 +721,7 @@ ImmGetIMEFileNameA(
721721
if (cch > uBufLen - 1)
722722
cch = uBufLen - 1;
723723

724-
lpszFileName[cch] = 0;
724+
lpszFileName[cch] = ANSI_NULL;
725725
return (UINT)cch;
726726
}
727727

@@ -743,7 +743,7 @@ ImmGetIMEFileNameW(
743743
{
744744
ERR("\n");
745745
if (uBufLen > 0)
746-
lpszFileName[0] = 0;
746+
lpszFileName[0] = UNICODE_NULL;
747747
return 0;
748748
}
749749

@@ -756,7 +756,7 @@ ImmGetIMEFileNameW(
756756
if (cch > uBufLen - 1)
757757
cch = uBufLen - 1;
758758

759-
lpszFileName[cch] = 0;
759+
lpszFileName[cch] = UNICODE_NULL;
760760
return (UINT)cch;
761761
}
762762

@@ -884,7 +884,7 @@ ImmEscapeA(
884884
szW[_countof(szW) - 1] = UNICODE_NULL; /* Avoid buffer overrun */
885885
WideCharToMultiByte(pImeDpi->uCodePage, 0, szW, -1,
886886
lpData, MAX_IMM_FILENAME, NULL, NULL);
887-
((LPSTR)lpData)[MAX_IMM_FILENAME - 1] = 0;
887+
((LPSTR)lpData)[MAX_IMM_FILENAME - 1] = ANSI_NULL; // Avoid buffer overrun
888888
}
889889
break;
890890

@@ -964,7 +964,7 @@ ImmEscapeW(
964964
ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szA, hKL);
965965
if (ret)
966966
{
967-
szA[_countof(szA) - 1] = 0;
967+
szA[_countof(szA) - 1] = ANSI_NULL; // Avoid buffer overrun
968968
MultiByteToWideChar(pImeDpi->uCodePage, MB_PRECOMPOSED,
969969
szA, -1, lpData, MAX_IMM_FILENAME);
970970
((LPWSTR)lpData)[MAX_IMM_FILENAME - 1] = UNICODE_NULL; /* Avoid buffer overrun */
@@ -975,7 +975,7 @@ ImmEscapeW(
975975
case IME_ESC_HANJA_MODE:
976976
WideCharToMultiByte(pImeDpi->uCodePage, 0,
977977
lpData, -1, szA, _countof(szA), NULL, NULL);
978-
szA[_countof(szA) - 1] = 0;
978+
szA[_countof(szA) - 1] = ANSI_NULL; // Avoid buffer overrun
979979
ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szA, hKL);
980980
break;
981981

‎win32ss/user/imm32/imemenu.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Imm32ImeMenuAnsiToWide(
6868
pItemW->dwItemData = pItemA->dwItemData;
6969
ret = MultiByteToWideChar(uCodePage, 0, pItemA->szString, -1,
7070
pItemW->szString, _countof(pItemW->szString));
71-
pItemW->szString[_countof(pItemW->szString) - 1] = UNICODE_NULL;
71+
pItemW->szString[_countof(pItemW->szString) - 1] = UNICODE_NULL; // Avoid buffer overrun
7272
return !!ret;
7373
}
7474

@@ -90,7 +90,7 @@ Imm32ImeMenuWideToAnsi(
9090
pItemA->hbmpItem = pItemW->hbmpItem;
9191
ret = WideCharToMultiByte(uCodePage, 0, pItemW->szString, -1,
9292
pItemA->szString, _countof(pItemA->szString), NULL, NULL);
93-
pItemA->szString[_countof(pItemA->szString) - 1] = ANSI_NULL;
93+
pItemA->szString[_countof(pItemA->szString) - 1] = ANSI_NULL; // Avoid buffer overrun
9494
return !!ret;
9595
}
9696

‎win32ss/user/imm32/regword.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ ImmGetRegisterWordStyleA(
263263
NULL, NULL);
264264
if (cchA > _countof(pDestA->szDescription) - 1)
265265
cchA = _countof(pDestA->szDescription) - 1;
266-
pDestA->szDescription[cchA] = 0;
266+
pDestA->szDescription[cchA] = ANSI_NULL;
267267
}
268268
}
269269

@@ -325,7 +325,7 @@ ImmGetRegisterWordStyleW(
325325
pDestW->szDescription, _countof(pDestW->szDescription));
326326
if (cchW > _countof(pDestW->szDescription) - 1)
327327
cchW = _countof(pDestW->szDescription) - 1;
328-
pDestW->szDescription[cchW] = 0;
328+
pDestW->szDescription[cchW] = UNICODE_NULL;
329329
}
330330
}
331331

‎win32ss/user/imm32/utils.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ LPWSTR Imm32WideFromAnsi(UINT uCodePage, LPCSTR pszA)
100100
if (IS_NULL_UNEXPECTEDLY(pszW))
101101
return NULL;
102102
cch = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, pszA, cch, pszW, cch + 1);
103-
pszW[cch] = 0;
103+
pszW[cch] = UNICODE_NULL;
104104
return pszW;
105105
}
106106

@@ -112,7 +112,7 @@ LPSTR Imm32AnsiFromWide(UINT uCodePage, LPCWSTR pszW)
112112
if (IS_NULL_UNEXPECTEDLY(pszA))
113113
return NULL;
114114
cchA = WideCharToMultiByte(uCodePage, 0, pszW, cchW, pszA, cchA, NULL, NULL);
115-
pszA[cchA] = 0;
115+
pszA[cchA] = ANSI_NULL;
116116
return pszA;
117117
}
118118

@@ -170,7 +170,7 @@ VOID LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW)
170170
plfW->lfFaceName, _countof(plfW->lfFaceName));
171171
if (cch > _countof(plfW->lfFaceName) - 1)
172172
cch = _countof(plfW->lfFaceName) - 1;
173-
plfW->lfFaceName[cch] = 0;
173+
plfW->lfFaceName[cch] = UNICODE_NULL;
174174
}
175175

176176
VOID LogFontWideToAnsi(const LOGFONTW *plfW, LPLOGFONTA plfA)
@@ -182,7 +182,7 @@ VOID LogFontWideToAnsi(const LOGFONTW *plfW, LPLOGFONTA plfA)
182182
plfA->lfFaceName, _countof(plfA->lfFaceName), NULL, NULL);
183183
if (cch > _countof(plfA->lfFaceName) - 1)
184184
cch = _countof(plfA->lfFaceName) - 1;
185-
plfA->lfFaceName[cch] = 0;
185+
plfA->lfFaceName[cch] = ANSI_NULL;
186186
}
187187

188188
static PVOID FASTCALL DesktopPtrToUser(PVOID ptr)
@@ -504,7 +504,7 @@ Imm32ReconvertWideFromAnsi(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc,
504504
pchDest = (LPWSTR)((LPBYTE)pDest + pDest->dwStrOffset);
505505
cchDest = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, pchSrc, pSrc->dwStrLen,
506506
pchDest, cchDest);
507-
pchDest[cchDest] = 0;
507+
pchDest[cchDest] = UNICODE_NULL;
508508

509509
TRACE("cbDest: 0x%X\n", cbDest);
510510
return cbDest;
@@ -569,7 +569,7 @@ Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc,
569569
pchDest = (LPSTR)pDest + pDest->dwStrOffset;
570570
cchDest = WideCharToMultiByte(uCodePage, 0, pchSrc, pSrc->dwStrLen,
571571
pchDest, cchDest, NULL, NULL);
572-
pchDest[cchDest] = 0;
572+
pchDest[cchDest] = ANSI_NULL;
573573

574574
TRACE("cchDest: 0x%X\n", cchDest);
575575
return cbDest;

0 commit comments

Comments
 (0)