ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Implemented IUriBuilder_{Get/Set}IUri.

This commit is contained in:
Thomas Mullaly 2010-09-08 19:29:56 -04:00 committed by Alexandre Julliard
parent d56e62a1cf
commit d95d6b5d1b
2 changed files with 175 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
dlls/urlmon/tests/uri.c
View File

@ -6566,7 +6566,7 @@ static void test_IUriBuilder_CreateInvalidArgs(void) {
ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
if(SUCCEEDED(hr)) {
hr = IUriBuilder_SetIUri(builder, test);
todo_wine { ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); }
ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
/* No longer returns E_NOTIMPL, since a IUri has been set and hasn't been modified. */
uri = NULL;
@ -6795,11 +6795,9 @@ static void test_IUriBuilder_GetFragment(IUriBuilder *builder, const uri_builder
*/
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
received = (void*) 0xdeadbeef;
@ -6906,11 +6904,9 @@ static void test_IUriBuilder_GetHost(IUriBuilder *builder, const uri_builder_tes
*/
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
received = (void*) 0xdeadbeef;
@ -7017,11 +7013,9 @@ static void test_IUriBuilder_GetPassword(IUriBuilder *builder, const uri_builder
*/
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
received = (void*) 0xdeadbeef;
@ -7128,11 +7122,9 @@ static void test_IUriBuilder_GetPath(IUriBuilder *builder, const uri_builder_tes
*/
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
received = (void*) 0xdeadbeef;
@ -7231,11 +7223,9 @@ static void test_IUriBuilder_GetPort(IUriBuilder *builder, const uri_builder_tes
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
hr = IUriBuilder_GetPort(builder, &has_port, &received);
@ -7326,11 +7316,9 @@ static void test_IUriBuilder_GetQuery(IUriBuilder *builder, const uri_builder_te
*/
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
received = (void*) 0xdeadbeef;
@ -7437,11 +7425,9 @@ static void test_IUriBuilder_GetSchemeName(IUriBuilder *builder, const uri_build
*/
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
received = (void*) 0xdeadbeef;
@ -7548,11 +7534,9 @@ static void test_IUriBuilder_GetUserName(IUriBuilder *builder, const uri_builder
*/
IUri *uri = NULL;
hr = IUriBuilder_GetIUri(builder, &uri);
todo_wine {
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
}
ok(hr == S_OK,
"Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",
hr, S_OK, test_index);
if(SUCCEEDED(hr)) {
if(!uri) {
received = (void*) 0xdeadbeef;
@ -7708,7 +7692,7 @@ static void test_IUriBuilder_HasBeenModified(void) {
hr = pCreateIUriBuilder(NULL, 0, 0, &builder);
ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
if(SUCCEEDED(hr)) {
static const WCHAR hostW[] = {'w','i','n','e','h','q','.','c','o','m',0};
static const WCHAR hostW[] = {'g','o','o','g','l','e','.','c','o','m',0};
IUri *uri = NULL;
BOOL received;
@ -7731,11 +7715,12 @@ static void test_IUriBuilder_HasBeenModified(void) {
hr = pCreateUri(http_urlW, 0, 0, &uri);
ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
if(SUCCEEDED(hr)) {
LPCWSTR prop;
DWORD len = -1;
hr = IUriBuilder_SetIUri(builder, uri);
todo_wine {
ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
}
ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
hr = IUriBuilder_HasBeenModified(builder, &received);
todo_wine {
@ -7744,6 +7729,71 @@ static void test_IUriBuilder_HasBeenModified(void) {
}
if(SUCCEEDED(hr))
todo_wine { ok(received == FALSE, "Error: Expected received to be FALSE.\n"); }
/* Test what happens with you call SetIUri with the same IUri again. */
hr = IUriBuilder_SetHost(builder, hostW);
ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
hr = IUriBuilder_HasBeenModified(builder, &received);
todo_wine {
ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
}
if(SUCCEEDED(hr))
todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); }
hr = IUriBuilder_SetIUri(builder, uri);
ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
/* IUriBuilder already had 'uri' as it's IUri property and so Windows doesn't
* reset any of the changes that were made to the IUriBuilder.
*/
hr = IUriBuilder_HasBeenModified(builder, &received);
todo_wine {
ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
}
if(SUCCEEDED(hr))
todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); }
hr = IUriBuilder_GetHost(builder, &len, &prop);
ok(hr == S_OK, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
if(SUCCEEDED(hr)) {
ok(!lstrcmpW(prop, hostW), "Error: Expected %s but got %s instead.\n",
wine_dbgstr_w(hostW), wine_dbgstr_w(prop));
ok(len == lstrlenW(hostW), "Error: Expected len to be %d, but was %d instead.\n",
lstrlenW(hostW), len);
}
hr = IUriBuilder_SetIUri(builder, NULL);
ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
hr = IUriBuilder_SetHost(builder, hostW);
ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
hr = IUriBuilder_HasBeenModified(builder, &received);
todo_wine {
ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
}
if(SUCCEEDED(hr))
todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); }
hr = IUriBuilder_SetIUri(builder, NULL);
ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%09x.\n", hr, S_OK);
hr = IUriBuilder_HasBeenModified(builder, &received);
todo_wine {
ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
}
if(SUCCEEDED(hr))
todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); }
hr = IUriBuilder_GetHost(builder, &len, &prop);
ok(hr == S_OK, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
if(SUCCEEDED(hr)) {
ok(!lstrcmpW(prop, hostW), "Error: Expected %s but got %s instead.\n",
wine_dbgstr_w(hostW), wine_dbgstr_w(prop));
ok(len == lstrlenW(hostW), "Error: Expected len to %d, but was %d instead.\n",
lstrlenW(hostW), len);
}
}
if(uri) IUri_Release(uri);
}
@ -7772,21 +7822,15 @@ static void test_IUriBuilder_IUriProperty(void) {
orig_count = get_refcnt(uri);
hr = IUriBuilder_SetIUri(builder, uri);
cur_count = get_refcnt(uri);
if(SUCCEEDED(hr)) {
todo_wine {
ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n",
orig_count+1, cur_count);
}
}
if(SUCCEEDED(hr))
ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n",
orig_count+1, cur_count);
hr = IUriBuilder_SetIUri(builder, NULL);
cur_count = get_refcnt(uri);
if(SUCCEEDED(hr)) {
todo_wine {
ok(cur_count == orig_count, "Error: Expected uri ref count to be %d, but was %d instead.\n",
orig_count, cur_count);
}
}
if(SUCCEEDED(hr))
ok(cur_count == orig_count, "Error: Expected uri ref count to be %d, but was %d instead.\n",
orig_count, cur_count);
}
if(uri) IUri_Release(uri);
}

77
dlls/urlmon/uri.c
View File

@ -3343,6 +3343,44 @@ static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LP
#define URI(x) ((IUri*) &(x)->lpIUriVtbl)
#define URIBUILDER(x) ((IUriBuilder*) &(x)->lpIUriBuilderVtbl)
static void reset_builder(UriBuilder *builder) {
if(builder->uri)
IUri_Release(URI(builder->uri));
builder->uri = NULL;
heap_free(builder->fragment);
builder->fragment = NULL;
builder->fragment_len = 0;
heap_free(builder->host);
builder->host = NULL;
builder->host_len = 0;
heap_free(builder->password);
builder->password = NULL;
builder->password_len = 0;
heap_free(builder->path);
builder->path = NULL;
builder->path_len = 0;
heap_free(builder->query);
builder->query = NULL;
builder->query_len = 0;
heap_free(builder->scheme);
builder->scheme = NULL;
builder->scheme_len = 0;
heap_free(builder->username);
builder->username = NULL;
builder->username_len = 0;
builder->has_port = FALSE;
builder->port = 0;
builder->modified_props = 0;
}
#define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface)
static HRESULT WINAPI Uri_QueryInterface(IUri *iface, REFIID riid, void **ppv)
@ -4471,15 +4509,46 @@ static HRESULT WINAPI UriBuilder_GetIUri(IUriBuilder *iface, IUri **ppIUri)
if(!ppIUri)
return E_POINTER;
FIXME("(%p)->(%p)\n", This, ppIUri);
return E_NOTIMPL;
if(This->uri) {
IUri *uri = URI(This->uri);
IUri_AddRef(uri);
*ppIUri = uri;
} else
*ppIUri = NULL;
return S_OK;
}
static HRESULT WINAPI UriBuilder_SetIUri(IUriBuilder *iface, IUri *pIUri)
{
UriBuilder *This = URIBUILDER_THIS(iface);
FIXME("(%p)->(%p)\n", This, pIUri);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, pIUri);
if(pIUri) {
Uri *uri;
if((uri = get_uri_obj(pIUri))) {
/* Only reset the builder if it's Uri isn't the same as
* the Uri passed to the function.
*/
if(This->uri != uri) {
reset_builder(This);
This->uri = uri;
if(uri->has_port)
This->port = uri->port;
IUri_AddRef(pIUri);
}
} else {
FIXME("(%p)->(%p) Unknown IUri types not supported yet.\n", This, pIUri);
return E_NOTIMPL;
}
} else if(This->uri)
/* Only reset the builder if it's Uri isn't NULL. */
reset_builder(This);
return S_OK;
}
static HRESULT WINAPI UriBuilder_GetFragment(IUriBuilder *iface, DWORD *pcchFragment, LPCWSTR *ppwzFragment)