Martin Fuchs <martin-fuchs@gmx.net>
Return "file not found" error values instead of E_INVALIDARG if
_ILCreateFromPathA() failed to find files.

reactos/lib/shell32

diff -u -r1.21 -r1.22
--- pidl.c	29 Jun 2004 13:40:40 -0000	1.21
+++ pidl.c	20 Sep 2004 17:42:57 -0000	1.22
@@ -1604,19 +1604,21 @@

     return pidl;
 }
 

-LPITEMIDLIST _ILCreateFromPathA(LPCSTR szPath)

+HRESULT _ILCreateFromPathA(LPCSTR szPath, LPITEMIDLIST* ppidl)

 {
 	HANDLE hFile;
 	WIN32_FIND_DATAA stffile;

-	LPITEMIDLIST pidl = NULL;
-	

+

 	hFile = FindFirstFileA(szPath, &stffile);

-	if (hFile != INVALID_HANDLE_VALUE) 
-	{
-	  pidl = _ILCreateFromFindDataA(&stffile);
-	  FindClose(hFile);
-	}
-	return pidl;

+
+	if (hFile == INVALID_HANDLE_VALUE)
+		return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
+
+	FindClose(hFile);
+
+	*ppidl = _ILCreateFromFindDataA(&stffile);
+
+	return S_OK;

 }
 
 LPITEMIDLIST _ILCreateDrive( LPCSTR lpszNew)

reactos/lib/shell32

diff -u -r1.6 -r1.7
--- pidl.h	9 Apr 2004 20:24:24 -0000	1.6
+++ pidl.h	20 Sep 2004 17:42:57 -0000	1.7
@@ -199,7 +199,7 @@

 /* Commonly used PIDLs representing file system objects. */
 LPITEMIDLIST	_ILCreateDesktop	(void);
 LPITEMIDLIST	_ILCreateFromFindDataA(WIN32_FIND_DATAA *stffile);

-LPITEMIDLIST	_ILCreateFromPathA	(LPCSTR szPath);

+HRESULT		_ILCreateFromPathA	(LPCSTR szPath, LPITEMIDLIST* ppidl);

 
 /* Other helpers */
 LPITEMIDLIST	_ILCreateMyComputer	(void);

reactos/lib/shell32

diff -u -r1.10 -r1.11
--- shfldr_desktop.c	20 Sep 2004 09:18:52 -0000	1.10
+++ shfldr_desktop.c	20 Sep 2004 17:42:57 -0000	1.11
@@ -197,7 +197,7 @@

     WCHAR szElement[MAX_PATH];
     LPCWSTR szNext = NULL;
     LPITEMIDLIST pidlTemp = NULL;

-    HRESULT hr = E_INVALIDARG;

+    HRESULT hr = S_OK;

     char szPath[MAX_PATH];
     DWORD len;
     CLSID clsid;

@@ -234,10 +234,7 @@

 	    PathAddBackslashA(szPath);
 	    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 */

+	    hr = _ILCreateFromPathA(szPath, &pidlTemp);

 	} else {
 	    pidlTemp = _ILCreateMyComputer();
 	}

@@ -245,13 +242,12 @@

 	szNext = NULL;
     }
 

-    if (pidlTemp) {

+    if (SUCCEEDED(hr) && pidlTemp) {

 	if (szNext && *szNext) {
 	    hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes);
 	} else {

-	    hr = S_OK;

 	    if (pdwAttributes && *pdwAttributes) {

-		SHELL32_GetItemAttributes (_IShellFolder_ (This), pidlTemp, pdwAttributes);

+		hr = SHELL32_GetItemAttributes (_IShellFolder_ (This), pidlTemp, pdwAttributes);

 	    }
 	}
     }

reactos/lib/shell32

diff -u -r1.9 -r1.10
--- shfldr_fs.c	20 Sep 2004 09:18:52 -0000	1.9
+++ shfldr_fs.c	20 Sep 2004 17:42:57 -0000	1.10
@@ -353,24 +353,22 @@

 	WideCharToMultiByte(CP_ACP, 0, szElement, -1, szPath + len, MAX_PATH - len, NULL, NULL);
 
 	/* get the pidl */

-	pidlTemp = _ILCreateFromPathA(szPath);
-	if (!pidlTemp)
-	    hr = 0x80070002L;   /* file not found */
-	else {

+	hr = _ILCreateFromPathA(szPath, &pidlTemp);
+
+	if (SUCCEEDED(hr)) {

 	    if (szNext && *szNext) {
 		/* try to analyse the next element */
 		hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes);
 	    } else {
 		/* it's the last element */
 		if (pdwAttributes && *pdwAttributes) {

-		    SHELL32_GetItemAttributes (_IShellFolder_ (This), pidlTemp, pdwAttributes);

+		    hr = SHELL32_GetItemAttributes (_IShellFolder_ (This), pidlTemp, pdwAttributes);

 		}

-		hr = S_OK;

 	    }
 	}
     }
 

-    if (!hr)

+    if (SUCCEEDED(hr))

 	*ppidl = pidlTemp;
     else
 	*ppidl = NULL;

@@ -750,14 +748,16 @@

     szDest[MAX_PATH - 1] = 0;
     TRACE ("src=%s dest=%s\n", szSrc, szDest);
     if (MoveFileA (szSrc, szDest)) {

-	if (pPidlOut) {
-	    *pPidlOut = _ILCreateFromPathA(szDest);
-	    if (!*pPidlOut)
-	        return 0x80070002L;   /* file not found */
-	}

+	HRESULT hr = S_OK;
+
+	if (pPidlOut)
+	    hr = _ILCreateFromPathA(szDest, pPidlOut);
+

 	SHChangeNotify (bIsFolder ? SHCNE_RENAMEFOLDER : SHCNE_RENAMEITEM, SHCNF_PATHA, szSrc, szDest);

+

 	return S_OK;
     }

+

     return E_FAIL;
 }
 

@@ -984,12 +984,8 @@

 
 	hres = S_OK;
 

-	if (ppidlOut) {
-    	    *ppidlOut = _ILCreateFromPathA(lpstrNewDir);
-
-	    if (!*ppidlOut)
-		hres = 0x80070002L;   /* file not found */
-	}

+	if (ppidlOut)
+    	    hres = _ILCreateFromPathA(lpstrNewDir, ppidlOut);

     } else {
 	char lpstrText[128 + MAX_PATH];
 	char lpstrTempText[128];