Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

return "file not found" error values instead of E_INVALIDARG if _ILCreateFromPathA() failed to find files

Browse source 
svn path=/trunk/; revision=9131
This commit is contained in:
Martin Fuchs 2004-04-13 20:54:05 +00:00
parent ecef0f56e1
commit 23a76b4fa1
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/lib/shell32/shfldr_desktop.c
View file

@ -235,6 +235,9 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
len = lstrlenA(szPath);
WideCharToMultiByte(CP_ACP, 0, lpszDisplayName, -1, szPath + len, MAX_PATH - len, NULL, NULL);
pidlTemp = _ILCreateFromPathA(szPath);
if (!pidlTemp)
hr = 0x80070002L; /* file not found */
} else {
pidlTemp = _ILCreateMyComputer();
}

19
reactos/lib/shell32/shfldr_fs.c
View file

@ -354,7 +354,9 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface,
/* get the pidl */
pidlTemp = _ILCreateFromPathA(szPath);
if (pidlTemp) {
if (!pidlTemp)
hr = 0x80070002L; /* file not found */
else {
if (szNext && *szNext) {
/* try to analyse the next element */
hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes);
@ -748,8 +750,11 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, HWND hwnd
szDest[MAX_PATH - 1] = 0;
TRACE ("src=%s dest=%s\n", szSrc, szDest);
if (MoveFileA (szSrc, szDest)) {
if (pPidlOut)
if (pPidlOut) {
*pPidlOut = _ILCreateFromPathA(szDest);
if (!*pPidlOut)
return 0x80070002L; /* file not found */
}
SHChangeNotify (bIsFolder ? SHCNE_RENAMEFOLDER : SHCNE_RENAMEITEM, SHCNF_PATHA, szSrc, szDest);
return S_OK;
}
@ -977,9 +982,15 @@ static HRESULT WINAPI ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCST
bRes = CreateDirectoryA (lpstrNewDir, NULL);
if (bRes) {
SHChangeNotify (SHCNE_MKDIR, SHCNF_PATHA, lpstrNewDir, NULL);
if (ppidlOut)
*ppidlOut = _ILCreateFromPathA(lpstrNewDir);
hres = S_OK;
if (ppidlOut) {
*ppidlOut = _ILCreateFromPathA(lpstrNewDir);
if (!*ppidlOut)
hres = 0x80070002L; /* file not found */
}
} else {
char lpstrText[128 + MAX_PATH];
char lpstrTempText[128];