21e6012226
The HRESULT S_FALSE does not indicate an error: - return E_INVALIDARG instead of S_FALSE - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) instead of S_FALSE Also extended/fixed the corresponding ctest
66 lines
1.1 KiB
C
66 lines
1.1 KiB
C
|
|
/*
|
|
#define DEFINE_UNICODE FALSE
|
|
#define _PATH_SEPARATOR_CHR '\\'
|
|
#define PATH_CCH_ADD_SEPARATOR PathCchAddBackslashA
|
|
*/
|
|
|
|
#if DEFINE_UNICODE
|
|
|
|
HRESULT PATH_CCH_ADD_SEPARATOR(PWSTR pszPath, size_t cchPath)
|
|
{
|
|
size_t pszPathLength;
|
|
|
|
if (!pszPath)
|
|
return E_INVALIDARG;
|
|
|
|
pszPathLength = lstrlenW(pszPath);
|
|
|
|
if (pszPath[pszPathLength - 1] == _PATH_SEPARATOR_CHR)
|
|
return S_FALSE;
|
|
|
|
if (cchPath > (pszPathLength + 1))
|
|
{
|
|
pszPath[pszPathLength] = _PATH_SEPARATOR_CHR;
|
|
pszPath[pszPathLength + 1] = '\0';
|
|
|
|
return S_OK;
|
|
}
|
|
|
|
return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
|
|
}
|
|
|
|
#else
|
|
|
|
HRESULT PATH_CCH_ADD_SEPARATOR(PSTR pszPath, size_t cchPath)
|
|
{
|
|
size_t pszPathLength;
|
|
|
|
if (!pszPath)
|
|
return E_INVALIDARG;
|
|
|
|
pszPathLength = lstrlenA(pszPath);
|
|
|
|
if (pszPath[pszPathLength - 1] == _PATH_SEPARATOR_CHR)
|
|
return S_FALSE;
|
|
|
|
if (cchPath > (pszPathLength + 1))
|
|
{
|
|
pszPath[pszPathLength] = _PATH_SEPARATOR_CHR;
|
|
pszPath[pszPathLength + 1] = '\0';
|
|
|
|
return S_OK;
|
|
}
|
|
|
|
return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
|
|
}
|
|
|
|
#endif
|
|
|
|
/*
|
|
#undef DEFINE_UNICODE
|
|
#undef _PATH_SEPARATOR_CHR
|
|
#undef PATH_CCH_ADD_SEPARATOR
|
|
*/
|
|
|