Thomas Mullaly : shlwapi: Improved UrlGetPart support when parsing host names.
Alexandre Julliard
julliard at winehq.org
Mon Mar 28 14:21:59 CDT 2011
Module: wine
Branch: master
Commit: 65d3eab864adac58022af2c6af5f5b31a96f764f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d3eab864adac58022af2c6af5f5b31a96f764f
Author: Thomas Mullaly <tmullaly at codeweavers.com>
Date: Thu Mar 17 12:24:26 2011 -0400
shlwapi: Improved UrlGetPart support when parsing host names.
---
dlls/shlwapi/tests/url.c | 4 ++++
dlls/shlwapi/url.c | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index 0a4dcb3..5a035ac 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -56,6 +56,8 @@ static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD);
static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923";
static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923";
static const char* TEST_URL_3 = "http://foo:bar@localhost:21/internal.php?query=x&return=y";
+static const char* TEST_URL_4 = "http://foo:bar@google.*.com:21/internal.php?query=x&return=y";
+
static const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0};
static const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0};
@@ -690,6 +692,8 @@ static void test_UrlGetPart(void)
test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http");
test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y");
+ test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com");
+
test_url_part(file_url, URL_PART_HOSTNAME, 0, "h o s t");
test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org");
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index 6b469e2..b8c51a4 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -2049,7 +2049,8 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type)
if (isalnumW(*start) ||
(*start == '-') ||
(*start == '.') ||
- (*start == ' ') ) {
+ (*start == ' ') ||
+ (*start == '*') ) {
start++;
(*size)++;
}
More information about the wine-cvs
mailing list