Jacek Caban : shlwapi: Properly handle ParseURL errors in UrlGetPart[AW].
Alexandre Julliard
julliard at winehq.org
Mon Oct 19 09:56:09 CDT 2009
Module: wine
Branch: master
Commit: a34ed0f6eeee7477ec0e3db40f634d05065a196e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34ed0f6eeee7477ec0e3db40f634d05065a196e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun Oct 18 21:48:57 2009 +0200
shlwapi: Properly handle ParseURL errors in UrlGetPart[AW].
---
dlls/shlwapi/url.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index f031297..66c88a6 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -2141,6 +2141,7 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut,
BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)
{
PARSEDURLA base;
+ HRESULT hres;
TRACE("%s\n", debugstr_a(lpstrPath));
@@ -2148,8 +2149,8 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)
/* get protocol */
base.cbSize = sizeof(base);
- ParseURLA(lpstrPath, &base);
- return (base.nScheme != URL_SCHEME_INVALID);
+ hres = ParseURLA(lpstrPath, &base);
+ return hres == S_OK && (base.nScheme != URL_SCHEME_INVALID);
}
/*************************************************************************
@@ -2160,6 +2161,7 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)
BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath)
{
PARSEDURLW base;
+ HRESULT hres;
TRACE("%s\n", debugstr_w(lpstrPath));
@@ -2167,8 +2169,8 @@ BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath)
/* get protocol */
base.cbSize = sizeof(base);
- ParseURLW(lpstrPath, &base);
- return (base.nScheme != URL_SCHEME_INVALID);
+ hres = ParseURLW(lpstrPath, &base);
+ return hres == S_OK && (base.nScheme != URL_SCHEME_INVALID);
}
/*************************************************************************
More information about the wine-cvs
mailing list