Rob Shearman : shlwapi: Use an error code instead of -1 for signalling prefix not being found in URL_GuessScheme .

Alexandre Julliard julliard at winehq.org
Tue Sep 30 11:16:47 CDT 2008


Module: wine
Branch: master
Commit: 80b5b74f1583aaa3caed3a34dc93e6f5a1a1e489
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=80b5b74f1583aaa3caed3a34dc93e6f5a1a1e489

Author: Rob Shearman <robertshearman at gmail.com>
Date:   Tue Sep 30 13:55:13 2008 +0100

shlwapi: Use an error code instead of -1 for signalling prefix not being found in URL_GuessScheme.

---

 dlls/shlwapi/url.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index febf6a7..e6289a5 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -1589,7 +1589,7 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut)
 	index++;
     }
     RegCloseKey(newkey);
-    return -1;
+    return E_FAIL;
 }
 
 static HRESULT URL_ApplyDefault(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut)
@@ -1652,7 +1652,7 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DW
     if (res1) {
 	/* no scheme in input, need to see if we need to guess */
 	if (dwFlags & URL_APPLY_GUESSSCHEME) {
-	    if ((ret = URL_GuessScheme(pszIn, pszOut, pcchOut)) != -1)
+	    if ((ret = URL_GuessScheme(pszIn, pszOut, pcchOut)) != E_FAIL)
 		return ret;
 	}
     }




More information about the wine-cvs mailing list