Andrew Nguyen : shlwapi: Change a magic HRESULT value to the appropriate name.
Alexandre Julliard
julliard at winehq.org
Mon Jan 25 11:21:15 CST 2010
Module: wine
Branch: master
Commit: b2b8770b020f18dc6be384d313bc68cf599d41e5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b8770b020f18dc6be384d313bc68cf599d41e5
Author: Andrew Nguyen <arethusa26 at gmail.com>
Date: Mon Jan 25 06:44:45 2010 -0600
shlwapi: Change a magic HRESULT value to the appropriate name.
---
dlls/shlwapi/tests/url.c | 13 +++++++------
dlls/shlwapi/url.c | 9 +++++----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index b69ab00..2205e09 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -27,6 +27,7 @@
#include "winreg.h"
#include "shlwapi.h"
#include "wininet.h"
+#include "intshcut.h"
/* ################ */
static HMODULE hShlwapi;
@@ -1013,17 +1014,17 @@ static const struct parse_url_test_t {
{"http://www.winehq.org/",S_OK,4,URL_SCHEME_HTTP},
{"https://www.winehq.org/",S_OK,5,URL_SCHEME_HTTPS},
{"ftp://www.winehq.org/",S_OK,3,URL_SCHEME_FTP},
- {"test.txt?test=c:/dir",0x80041001},
- {"test.txt",0x80041001},
+ {"test.txt?test=c:/dir",URL_E_INVALID_SYNTAX},
+ {"test.txt",URL_E_INVALID_SYNTAX},
{"xxx://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN},
{"1xx://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN},
{"-xx://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN},
{"xx0://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN},
- {"x://www.winehq.org/",0x80041001},
- {"xx$://www.winehq.org/",0x80041001},
- {"htt?p://www.winehq.org/",0x80041001},
+ {"x://www.winehq.org/",URL_E_INVALID_SYNTAX},
+ {"xx$://www.winehq.org/",URL_E_INVALID_SYNTAX},
+ {"htt?p://www.winehq.org/",URL_E_INVALID_SYNTAX},
{"ab-://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN},
- {" http://www.winehq.org/",0x80041001},
+ {" http://www.winehq.org/",URL_E_INVALID_SYNTAX},
};
static void test_ParseURL(void)
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index d1b6e26..d266069 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -33,6 +33,7 @@
#include "winternl.h"
#define NO_SHLWAPI_STREAM
#include "shlwapi.h"
+#include "intshcut.h"
#include "wine/debug.h"
HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD);
@@ -157,8 +158,8 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y)
ptr++;
if (*ptr != ':' || ptr <= x+1) {
- y->pszProtocol = NULL;
- return 0x80041001;
+ y->pszProtocol = NULL;
+ return URL_E_INVALID_SYNTAX;
}
y->pszProtocol = x;
@@ -191,8 +192,8 @@ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y)
ptr++;
if (*ptr != ':' || ptr <= x+1) {
- y->pszProtocol = NULL;
- return 0x80041001;
+ y->pszProtocol = NULL;
+ return URL_E_INVALID_SYNTAX;
}
y->pszProtocol = x;
More information about the wine-cvs
mailing list