Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 22:52:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] Don't use deprecated StrNCpy function but use the string-safe StringCchCopy instead. Also fix a copy-paste error in the _countofs.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-02-04 01:56:11 +01:00
parent b7c3398f95
commit 04498f3eb5
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
base/shell/explorer/syspager.cpp
View file

@ -107,8 +107,8 @@ private:
Info(InternalIconData * source) Info(InternalIconData * source)
{ {
pSource = source; pSource = source;
StrNCpy(szInfo, source->szInfo, _countof(szInfo)); StringCchCopy(szInfo, _countof(szInfo), source->szInfo);
StrNCpy(szInfoTitle, source->szInfoTitle, _countof(szInfoTitle)); StringCchCopy(szInfoTitle, _countof(szInfoTitle), source->szInfoTitle);
uIcon = source->dwInfoFlags & NIIF_ICON_MASK; uIcon = source->dwInfoFlags & NIIF_ICON_MASK;
if (source->dwInfoFlags == NIIF_USER) if (source->dwInfoFlags == NIIF_USER)
uIcon = reinterpret_cast<WPARAM>(source->hIcon); uIcon = reinterpret_cast<WPARAM>(source->hIcon);
@ -775,8 +775,8 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData)
if (iconData->uFlags & NIF_INFO) if (iconData->uFlags & NIF_INFO)
{ {
// NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always.
StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo);
StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle);
notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->dwInfoFlags = iconData->dwInfoFlags;
notifyItem->uTimeout = iconData->uTimeout; notifyItem->uTimeout = iconData->uTimeout;
} }
@ -913,8 +913,8 @@ BOOL CNotifyToolbar::UpdateButton(_In_ CONST NOTIFYICONDATA *iconData)
if (iconData->uFlags & NIF_INFO) if (iconData->uFlags & NIF_INFO)
{ {
// NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always.
StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo);
StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle);
notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->dwInfoFlags = iconData->dwInfoFlags;
notifyItem->uTimeout = iconData->uTimeout; notifyItem->uTimeout = iconData->uTimeout;
} }