Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOBJSHEX] StringCbCopy*() need sizeof(), not _countof() (#2066)

Browse source 
And use explicit StringCbCopyW().
This commit is contained in:
Serge Gautherie 2019-11-20 15:41:08 +01:00 committed by Hermès BÉLUSCA - MAÏTO
parent f8821421a4
commit f5ab9cb723
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/shellext/ntobjshex/foldercommon.h
View file

@ -179,7 +179,7 @@ public:
WCHAR path[MAX_PATH];
StringCbCopyW(path, _countof(path), m_NtPath);
StringCbCopyW(path, sizeof(path), m_NtPath);
PathAppendW(path, info->entryName);
LPITEMIDLIST first = ILCloneFirst(pidl);
@ -635,7 +635,7 @@ public:
{
m_shellPidl = ILClone(pidl);
StringCbCopy(m_NtPath, _countof(m_NtPath), L"\\");
StringCbCopyW(m_NtPath, sizeof(m_NtPath), L"\\");
return S_OK;
}

8
dll/shellext/ntobjshex/ntobjfolder.cpp
View file

@ -148,7 +148,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::ResolveSymLink(
if (link.Buffer[1] == L':' && isalphaW(link.Buffer[0]))
{
StringCbCopyNW(path, _countof(path), link.Buffer, link.Length);
StringCbCopyNW(path, sizeof(path), link.Buffer, link.Length);
CComPtr<IShellFolder> psfDesktop;
hr = SHGetDesktopFolder(&psfDesktop);
@ -158,7 +158,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::ResolveSymLink(
return psfDesktop->ParseDisplayName(NULL, NULL, path, NULL, fullPidl, NULL);
}
StringCbCopyW(path, _countof(path), L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{845B0FB2-66E0-416B-8F91-314E23F7C12D}");
StringCbCopyW(path, sizeof(path), L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{845B0FB2-66E0-416B-8F91-314E23F7C12D}");
PathAppend(path, link.Buffer);
CComPtr<IShellFolder> psfDesktop;
@ -202,7 +202,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
{
m_shellPidl = ILClone(pidl);
StringCbCopy(m_NtPath, _countof(m_NtPath), L"\\");
StringCbCopyW(m_NtPath, sizeof(m_NtPath), L"\\");
return S_OK;
}
@ -212,7 +212,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PC
{
m_shellPidl = ILClone(pidl);
StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath);
StringCbCopyW(m_NtPath, sizeof(m_NtPath), ntPath);
return S_OK;
}

4
dll/shellext/ntobjshex/regfolder.cpp
View file

@ -141,7 +141,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
m_shellPidl = ILClone(pidl);
m_hRoot = NULL;
StringCbCopy(m_NtPath, _countof(m_NtPath), L"");
StringCbCopyW(m_NtPath, sizeof(m_NtPath), L"");
return S_OK;
}
@ -150,7 +150,7 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(PCIDLIST_ABSOLUTE pidl, PC
m_shellPidl = ILClone(pidl);
m_hRoot = hRoot;
StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath);
StringCbCopyW(m_NtPath, sizeof(m_NtPath), ntPath);
return S_OK;
}