Skip to content

W
wine-cw
Commit 90738c34 authored by Thomas Mullaly's avatar Thomas Mullaly Committed by Alexandre Julliard
Browse files
Options

urlmon: Implemented CoInternetCombineUrlEx.

parent 4d9d4b10
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 14 deletions
dlls/urlmon/tests/uri.c
View file @ 90738c34
......@@ -5201,6 +5201,14 @@ static const uri_builder_remove_test uri_builder_remove_tests[] = {
}
};
typedef struct _uri_combine_str_property {
const char *value;
HRESULT expected;
BOOL todo;
const char *broken_value;
const char *value_ex;
} uri_combine_str_property;
typedef struct _uri_combine_test {
const char *base_uri;
DWORD base_create_flags;
......@@ -5210,8 +5218,8 @@ typedef struct _uri_combine_test {
HRESULT expected;
BOOL todo;
uri_str_property str_props[URI_STR_PROPERTY_COUNT];
uri_dword_property dword_props[URI_DWORD_PROPERTY_COUNT];
uri_combine_str_property str_props[URI_STR_PROPERTY_COUNT];
uri_dword_property dword_props[URI_DWORD_PROPERTY_COUNT];
} uri_combine_test;
static const uri_combine_test uri_combine_tests[] = {
......@@ -5572,16 +5580,16 @@ static const uri_combine_test uri_combine_tests[] = {
"zip://test.com/cool/../cool/test",0,
URL_DONT_SIMPLIFY,S_OK,FALSE,
{
{"zip://test.com/cool/test",S_OK},
{"zip://test.com/cool/test",S_OK,FALSE,NULL,"zip://test.com/cool/../cool/test"},
{"test.com",S_OK},
{"zip://test.com/cool/test",S_OK},
{"zip://test.com/cool/test",S_OK,FALSE,NULL,"zip://test.com/cool/../cool/test"},
{"test.com",S_OK},
{"",S_FALSE},
{"",S_FALSE},
{"test.com",S_OK},
{"",S_FALSE},
{"/cool/test",S_OK},
{"/cool/test",S_OK},
{"/cool/test",S_OK,FALSE,NULL,"/cool/../cool/test"},
{"/cool/test",S_OK,FALSE,NULL,"/cool/../cool/test"},
{"",S_FALSE},
/* The resulting IUri has the same Raw URI as the relative URI (only IE 8).
* On IE 7 it reduces the path in the Raw URI.
......@@ -5632,12 +5640,12 @@ static const uri_combine_test uri_combine_tests[] = {
"http://test.com/test#%30test",0,
URL_DONT_UNESCAPE_EXTRA_INFO,S_OK,FALSE,
{
{"http://test.com/test#0test",S_OK},
{"http://test.com/test#0test",S_OK,FALSE,NULL,"http://test.com/test#%30test"},
{"test.com",S_OK},
{"http://test.com/test#0test",S_OK},
{"http://test.com/test#0test",S_OK,FALSE,NULL,"http://test.com/test#%30test"},
{"test.com",S_OK},
{"",S_FALSE},
{"#0test",S_OK},
{"#0test",S_OK,FALSE,NULL,"#%30test"},
{"test.com",S_OK},
{"",S_FALSE},
{"/test",S_OK},
......@@ -9034,7 +9042,7 @@ static void test_CoInternetCombineIUri(void) {
DWORD j;
for(j = 0; j < sizeof(uri_combine_tests[i].str_props)/sizeof(uri_combine_tests[i].str_props[0]); ++j) {
uri_str_property prop = uri_combine_tests[i].str_props[j];
uri_combine_str_property prop = uri_combine_tests[i].str_props[j];
BSTR received;
hr = IUri_GetPropertyBSTR(result, j, &received, 0);
......@@ -9289,6 +9297,7 @@ static void test_CoInternetCombineIUri_Pluggable(void) {
static void test_CoInternetCombineUrlEx(void) {
HRESULT hr;
IUri *base, *result;
DWORD i;
base = NULL;
hr = pCreateUri(http_urlW, 0, 0, &base);
......@@ -9317,6 +9326,91 @@ static void test_CoInternetCombineUrlEx(void) {
ok(hr == E_POINTER, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x.\n",
hr, E_POINTER);
if(base) IUri_Release(base);
for(i = 0; i < sizeof(uri_combine_tests)/sizeof(uri_combine_tests[0]); ++i) {
LPWSTR baseW = a2w(uri_combine_tests[i].base_uri);
hr = pCreateUri(baseW, uri_combine_tests[i].base_create_flags, 0, &base);
ok(SUCCEEDED(hr), "Error: CreateUri returned 0x%08x on uri_combine_tests[%d].\n", hr, i);
if(SUCCEEDED(hr)) {
LPWSTR relativeW = a2w(uri_combine_tests[i].relative_uri);
hr = pCoInternetCombineUrlEx(base, relativeW, uri_combine_tests[i].combine_flags,
&result, 0);
if(uri_combine_tests[i].todo) {
todo_wine {
ok(hr == uri_combine_tests[i].expected,
"Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n",
hr, uri_combine_tests[i].expected, i);
}
} else {
ok(hr == uri_combine_tests[i].expected,
"Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n",
hr, uri_combine_tests[i]. expected, i);
}
if(SUCCEEDED(hr)) {
DWORD j;
for(j = 0; j < sizeof(uri_combine_tests[i].str_props)/sizeof(uri_combine_tests[i].str_props[0]); ++j) {
uri_combine_str_property prop = uri_combine_tests[i].str_props[j];
BSTR received;
LPCSTR value = (prop.value_ex) ? prop.value_ex : prop.value;
hr = IUri_GetPropertyBSTR(result, j, &received, 0);
if(prop.todo) {
todo_wine {
ok(hr == prop.expected,
"Error: IUri_GetPropertyBSTR returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].str_props[%d].\n",
hr, prop.expected, i, j);
}
todo_wine {
ok(!strcmp_aw(value, received) ||
broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)),
"Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n",
value, wine_dbgstr_w(received), i, j);
}
} else {
ok(hr == prop.expected,
"Error: IUri_GetPropertyBSTR returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].str_props[%d].\n",
hr, prop.expected, i, j);
ok(!strcmp_aw(value, received) ||
broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)),
"Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n",
value, wine_dbgstr_w(received), i, j);
}
SysFreeString(received);
}
for(j = 0; j < sizeof(uri_combine_tests[i].dword_props)/sizeof(uri_combine_tests[i].dword_props[0]); ++j) {
uri_dword_property prop = uri_combine_tests[i].dword_props[j];
DWORD received;
hr = IUri_GetPropertyDWORD(result, j+Uri_PROPERTY_DWORD_START, &received, 0);
if(prop.todo) {
todo_wine {
ok(hr == prop.expected,
"Error: IUri_GetPropertyDWORD returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].dword_props[%d].\n",
hr, prop.expected, i, j);
}
todo_wine {
ok(prop.value == received, "Error: Expected %d, but got %d instead on uri_combine_tests[%d].dword_props[%d].\n",
prop.value, received, i, j);
}
} else {
ok(hr == prop.expected,
"Error: IUri_GetPropertyDWORD returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].dword_props[%d].\n",
hr, prop.expected, i, j);
ok(prop.value == received, "Error: Expected %d, but got %d instead on uri_combine_tests[%d].dword_props[%d].\n",
prop.value, received, i, j);
}
}
}
if(result) IUri_Release(result);
heap_free(relativeW);
}
if(base) IUri_Release(base);
heap_free(baseW);
}
}
START_TEST(uri) {
......
dlls/urlmon/uri.c
View file @ 90738c34
......@@ -39,6 +39,8 @@
#define RAW_URI_FORCE_PORT_DISP 0x1
#define RAW_URI_CONVERT_TO_DOS_PATH 0x2
#define COMBINE_URI_FORCE_FLAG_USE 0x1
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}};
......@@ -5717,7 +5719,7 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len,
return S_OK;
}
static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result) {
static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, DWORD extras) {
Uri *ret;
HRESULT hr;
parse_data data;
......@@ -5744,8 +5746,15 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result)
return E_OUTOFMEMORY;
}
if(extras & COMBINE_URI_FORCE_FLAG_USE) {
if(flags & URL_DONT_SIMPLIFY)
create_flags |= Uri_CREATE_NO_CANONICALIZE;
if(flags & URL_DONT_UNESCAPE_EXTRA_INFO)
create_flags |= Uri_CREATE_NO_DECODE_EXTRA_INFO;
}
ret->raw_uri = data.uri;
hr = canonicalize_uri(&data, ret, 0);
hr = canonicalize_uri(&data, ret, create_flags);
if(FAILED(hr)) {
IUri_Release(URI(ret));
*result = NULL;
......@@ -6007,7 +6016,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d
}
}
return combine_uri(base, relative, dwCombineFlags, ppCombinedUri);
return combine_uri(base, relative, dwCombineFlags, ppCombinedUri, 0);
}
/***********************************************************************
......@@ -6016,6 +6025,10 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d
HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags,
IUri **ppCombinedUri, DWORD_PTR dwReserved)
{
IUri *relative;
Uri *base;
HRESULT hr;
TRACE("(%p %s %x %p %x) stub\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags,
ppCombinedUri, (DWORD)dwReserved);
......@@ -6032,5 +6045,22 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW
return E_INVALIDARG;
}
return E_NOTIMPL;
base = get_uri_obj(pBaseUri);
if(!base) {
*ppCombinedUri = NULL;
FIXME("(%p %s %x %p %x) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl),
dwCombineFlags, ppCombinedUri, (DWORD)dwReserved);
return E_NOTIMPL;
}
hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE, 0, &relative);
if(FAILED(hr)) {
*ppCombinedUri = NULL;
return hr;
}
hr = combine_uri(base, get_uri_obj(relative), dwCombineFlags, ppCombinedUri, COMBINE_URI_FORCE_FLAG_USE);
IUri_Release(relative);
return hr;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment