August 2010 - Wine-Commits - list.winehq.org

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetPassword.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 6a3d61bcf83b78926cba17d858f93ef181ceec07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3d61bcf83b78926cba17d85… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Aug 19 23:32:08 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetPassword. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 13 +++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 0610d42..b2ad104 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5350,6 +5350,20 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == E_POINTER, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); + + hr = IUriBuilder_GetPassword(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + received = (void*) 0xdeadbeef; + hr = IUriBuilder_GetPassword(builder, NULL, &received); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!received, "Error: Expected received to be NULL, but was %p instead.\n", received); + len = -1; + hr = IUriBuilder_GetPassword(builder, &len, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); } if(builder) IUriBuilder_Release(builder); } @@ -5568,6 +5582,113 @@ static void test_IUriBuilder_GetHost(IUriBuilder *builder, const uri_builder_tes } } +static void test_IUriBuilder_GetPassword(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + DWORD i; + LPCWSTR received = NULL; + DWORD len = -1; + const uri_builder_property *prop = NULL; + + /* Check if the property was set earlier. */ + for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_PASSWORD) + prop = &(test->properties[i]); + } + + if(prop) { + /* Use expected_value unless it's NULL, then use value. */ + LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; + hr = IUriBuilder_GetPassword(builder, &len, &received); + if(prop->todo) { + todo_wine { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } + } else { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + /* The property wasn't set earlier, so it should return whatever + * the base IUri contains (if anything). + */ + 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); + } + if(SUCCEEDED(hr)) { + BOOL has_prop = FALSE; + BSTR expected = NULL; + + hr = IUri_GetPassword(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_GetPassword to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + has_prop = hr == S_OK; + + hr = IUriBuilder_GetPassword(builder, &len, &received); + if(has_prop) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!lstrcmpW(expected, received), + "Error: Expected %s but got %s instead on uri_builder_tests[%d].\n", + wine_dbgstr_w(expected), wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlenW(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlenW(expected), len, test_index); + } + } + } else { + todo_wine { + ok(hr == S_FALSE, + "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_FALSE, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } + } + } + SysFreeString(expected); + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -5624,6 +5745,7 @@ static void test_IUriBuilder(void) { /* Test the "Get*" functions. */ test_IUriBuilder_GetFragment(builder, &test, i); test_IUriBuilder_GetHost(builder, &test, i); + test_IUriBuilder_GetPassword(builder, &test, i); test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index eed0417..28f0e18 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4235,6 +4235,19 @@ static HRESULT WINAPI UriBuilder_GetHost(IUriBuilder *iface, DWORD *pcchHost, LP static HRESULT WINAPI UriBuilder_GetPassword(IUriBuilder *iface, DWORD *pcchPassword, LPCWSTR *ppwzPassword) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pcchPassword, ppwzPassword); + + if(!pcchPassword) { + if(ppwzPassword) + *ppwzPassword = NULL; + return E_POINTER; + } + + if(!ppwzPassword) { + *pcchPassword = 0; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pcchPassword, ppwzPassword); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetPath.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: f25b83fa351508614682bb2e197ac34342b6baf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25b83fa351508614682bb2e1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Aug 19 23:46:25 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetPath. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 13 +++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b2ad104..47f7e20 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5364,6 +5364,20 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == E_POINTER, "Error: IUriBuilder_GetPassword returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); + + hr = IUriBuilder_GetPath(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + received = (void*) 0xdeadbeef; + hr = IUriBuilder_GetPath(builder, NULL, &received); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!received, "Error: Expected received to be NULL, but was %p instead.\n", received); + len = -1; + hr = IUriBuilder_GetPath(builder, &len, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); } if(builder) IUriBuilder_Release(builder); } @@ -5689,6 +5703,113 @@ static void test_IUriBuilder_GetPassword(IUriBuilder *builder, const uri_builder } } +static void test_IUriBuilder_GetPath(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + DWORD i; + LPCWSTR received = NULL; + DWORD len = -1; + const uri_builder_property *prop = NULL; + + /* Check if the property was set earlier. */ + for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_PATH) + prop = &(test->properties[i]); + } + + if(prop) { + /* Use expected_value unless it's NULL, then use value. */ + LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; + hr = IUriBuilder_GetPath(builder, &len, &received); + if(prop->todo) { + todo_wine { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } + } else { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + /* The property wasn't set earlier, so it should return whatever + * the base IUri contains (if anything). + */ + 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); + } + if(SUCCEEDED(hr)) { + BOOL has_prop = FALSE; + BSTR expected = NULL; + + hr = IUri_GetPath(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_GetPath to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + has_prop = hr == S_OK; + + hr = IUriBuilder_GetPath(builder, &len, &received); + if(has_prop) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!lstrcmpW(expected, received), + "Error: Expected %s but got %s instead on uri_builder_tests[%d].\n", + wine_dbgstr_w(expected), wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlenW(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlenW(expected), len, test_index); + } + } + } else { + todo_wine { + ok(hr == S_FALSE, + "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_FALSE, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } + } + } + SysFreeString(expected); + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -5746,6 +5867,7 @@ static void test_IUriBuilder(void) { test_IUriBuilder_GetFragment(builder, &test, i); test_IUriBuilder_GetHost(builder, &test, i); test_IUriBuilder_GetPassword(builder, &test, i); + test_IUriBuilder_GetPath(builder, &test, i); test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 28f0e18..bd7df7d 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4255,6 +4255,19 @@ static HRESULT WINAPI UriBuilder_GetPassword(IUriBuilder *iface, DWORD *pcchPass static HRESULT WINAPI UriBuilder_GetPath(IUriBuilder *iface, DWORD *pcchPath, LPCWSTR *ppwzPath) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pcchPath, ppwzPath); + + if(!pcchPath) { + if(ppwzPath) + *ppwzPath = NULL; + return E_POINTER; + } + + if(!ppwzPath) { + *pcchPath = 0; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pcchPath, ppwzPath); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetPort.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: d36d4aa71257c757d3ff59a73ade5f569168c960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36d4aa71257c757d3ff59a73… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 20 00:40:58 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetPort. --- dlls/urlmon/tests/uri.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 13 ++++++ 2 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 47f7e20..722db05 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5323,7 +5323,8 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { LPCWSTR received = (void*) 0xdeadbeef; - DWORD len = -1; + DWORD len = -1, port = -1; + BOOL set = -1; hr = IUriBuilder_GetFragment(builder, NULL, NULL); ok(hr == E_POINTER, "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x.\n", @@ -5378,6 +5379,18 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == E_POINTER, "Error: IUriBuilder_GetPath returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); + + hr = IUriBuilder_GetPort(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + hr = IUriBuilder_GetPort(builder, NULL, &port); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!port, "Error: Expected port to be 0, but was %d instead.\n", port); + hr = IUriBuilder_GetPort(builder, &set, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!set, "Error: Expected set to be FALSE, but was %d instead.\n", set); } if(builder) IUriBuilder_Release(builder); } @@ -5810,6 +5823,87 @@ static void test_IUriBuilder_GetPath(IUriBuilder *builder, const uri_builder_tes } } +static void test_IUriBuilder_GetPort(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + BOOL has_port = FALSE; + DWORD received = -1; + + if(test->port_prop.change) { + DWORD expected = test->port_prop.value; + + hr = IUriBuilder_GetPort(builder, &has_port, &received); + if(test->port_prop.todo) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(has_port == test->port_prop.set, + "Error: Expected has_port to be %d but was %d instead on uri_builder_tests[%d].\n", + test->port_prop.set, has_port, test_index); + } + todo_wine { + ok(received == expected, + "Error: Expected received to be %d, but was %d instead on uri_builder_tests[%d].\n", + expected, received, test_index); + } + } + } else { + ok(hr == S_OK, + "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + ok(has_port == test->port_prop.set, + "Error: Expected has_port to be %d, but was %d instead on uri_builder_tests[%d].\n", + test->port_prop.set, has_port, test_index); + ok(received == test->port_prop.value, + "Error: Expected port to be %d, but was %d instead on uri_builder_tests[%d].\n", + test->port_prop.value, received, test_index); + } + } else { + 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); + } + if(SUCCEEDED(hr)) { + DWORD expected; + BOOL got_port = FALSE; + + hr = IUri_GetPort(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_Port to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + got_port = hr == S_OK; + + hr = IUriBuilder_GetPort(builder, &has_port, &received); + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!has_port, + "Error: Expected has_port to be FALSE but was TRUE instead on uri_builder_tests[%d].\n", + test_index); + } + todo_wine { + ok(received == expected, + "Error: Expected received to be %d, but was %d instead on uri_builder_tests[%d].\n", + expected, received, test_index); + } + } + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -5868,6 +5962,7 @@ static void test_IUriBuilder(void) { test_IUriBuilder_GetHost(builder, &test, i); test_IUriBuilder_GetPassword(builder, &test, i); test_IUriBuilder_GetPath(builder, &test, i); + test_IUriBuilder_GetPort(builder, &test, i); test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index bd7df7d..4f90526 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4275,6 +4275,19 @@ static HRESULT WINAPI UriBuilder_GetPath(IUriBuilder *iface, DWORD *pcchPath, LP static HRESULT WINAPI UriBuilder_GetPort(IUriBuilder *iface, BOOL *pfHasPort, DWORD *pdwPort) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pfHasPort, pdwPort); + + if(!pfHasPort) { + if(pdwPort) + *pdwPort = 0; + return E_POINTER; + } + + if(!pdwPort) { + *pfHasPort = FALSE; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pfHasPort, pdwPort); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetSchemeName.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: a9433c140264753936a16e843b4491e034f0771a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9433c140264753936a16e843… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 20 11:30:51 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetSchemeName. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 13 +++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index f904d0e..d125a43 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5405,6 +5405,20 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == E_POINTER, "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); + + hr = IUriBuilder_GetSchemeName(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + received = (void*) 0xdeadbeef; + hr = IUriBuilder_GetSchemeName(builder, NULL, &received); + ok(hr == E_POINTER, "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!received, "Error: Expected received to be NULL, but was %p instead.\n", received); + len = -1; + hr = IUriBuilder_GetSchemeName(builder, &len, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); } if(builder) IUriBuilder_Release(builder); } @@ -6025,6 +6039,113 @@ static void test_IUriBuilder_GetQuery(IUriBuilder *builder, const uri_builder_te } } +static void test_IUriBuilder_GetSchemeName(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + DWORD i; + LPCWSTR received = NULL; + DWORD len = -1; + const uri_builder_property *prop = NULL; + + /* Check if the property was set earlier. */ + for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_SCHEME_NAME) + prop = &(test->properties[i]); + } + + if(prop) { + /* Use expected_value unless it's NULL, then use value. */ + LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; + hr = IUriBuilder_GetSchemeName(builder, &len, &received); + if(prop->todo) { + todo_wine { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } + } else { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + /* The property wasn't set earlier, so it should return whatever + * the base IUri contains (if anything). + */ + 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); + } + if(SUCCEEDED(hr)) { + BOOL has_prop = FALSE; + BSTR expected = NULL; + + hr = IUri_GetSchemeName(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_GetSchemeName to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + has_prop = hr == S_OK; + + hr = IUriBuilder_GetSchemeName(builder, &len, &received); + if(has_prop) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!lstrcmpW(expected, received), + "Error: Expected %s but got %s instead on uri_builder_tests[%d].\n", + wine_dbgstr_w(expected), wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlenW(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlenW(expected), len, test_index); + } + } + } else { + todo_wine { + ok(hr == S_FALSE, + "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_FALSE, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } + } + } + SysFreeString(expected); + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -6085,6 +6206,7 @@ static void test_IUriBuilder(void) { test_IUriBuilder_GetPath(builder, &test, i); test_IUriBuilder_GetPort(builder, &test, i); test_IUriBuilder_GetQuery(builder, &test, i); + test_IUriBuilder_GetSchemeName(builder, &test, i); test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 5837153..0466e81 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4315,6 +4315,19 @@ static HRESULT WINAPI UriBuilder_GetQuery(IUriBuilder *iface, DWORD *pcchQuery, static HRESULT WINAPI UriBuilder_GetSchemeName(IUriBuilder *iface, DWORD *pcchSchemeName, LPCWSTR *ppwzSchemeName) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pcchSchemeName, ppwzSchemeName); + + if(!pcchSchemeName) { + if(ppwzSchemeName) + *ppwzSchemeName = NULL; + return E_POINTER; + } + + if(!ppwzSchemeName) { + *pcchSchemeName = 0; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pcchSchemeName, ppwzSchemeName); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetUserName.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: dc18401f85e84f218525102955d0fac4009a1a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc18401f85e84f21852510295… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 20 11:36:08 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetUserName. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 13 +++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index d125a43..cadc20a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5419,6 +5419,20 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == E_POINTER, "Error: IUriBuilder_GetSchemeName returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); + + hr = IUriBuilder_GetUserName(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetUserName returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + received = (void*) 0xdeadbeef; + hr = IUriBuilder_GetUserName(builder, NULL, &received); + ok(hr == E_POINTER, "Error: IUriBuilder_GetUserName returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!received, "Error: Expected received to be NULL, but was %p instead.\n", received); + len = -1; + hr = IUriBuilder_GetUserName(builder, &len, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetUserName returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); } if(builder) IUriBuilder_Release(builder); } @@ -6146,6 +6160,113 @@ static void test_IUriBuilder_GetSchemeName(IUriBuilder *builder, const uri_build } } +static void test_IUriBuilder_GetUserName(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + DWORD i; + LPCWSTR received = NULL; + DWORD len = -1; + const uri_builder_property *prop = NULL; + + /* Check if the property was set earlier. */ + for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_USER_NAME) + prop = &(test->properties[i]); + } + + if(prop) { + /* Use expected_value unless it's NULL, then use value. */ + LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; + hr = IUriBuilder_GetUserName(builder, &len, &received); + if(prop->todo) { + todo_wine { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetUserName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } + } else { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetUserName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + /* The property wasn't set earlier, so it should return whatever + * the base IUri contains (if anything). + */ + 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); + } + if(SUCCEEDED(hr)) { + BOOL has_prop = FALSE; + BSTR expected = NULL; + + hr = IUri_GetUserName(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_GetUserName to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + has_prop = hr == S_OK; + + hr = IUriBuilder_GetUserName(builder, &len, &received); + if(has_prop) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetUserName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!lstrcmpW(expected, received), + "Error: Expected %s but got %s instead on uri_builder_tests[%d].\n", + wine_dbgstr_w(expected), wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlenW(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlenW(expected), len, test_index); + } + } + } else { + todo_wine { + ok(hr == S_FALSE, + "Error: IUriBuilder_GetUserName returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_FALSE, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } + } + } + SysFreeString(expected); + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -6207,6 +6328,7 @@ static void test_IUriBuilder(void) { test_IUriBuilder_GetPort(builder, &test, i); test_IUriBuilder_GetQuery(builder, &test, i); test_IUriBuilder_GetSchemeName(builder, &test, i); + test_IUriBuilder_GetUserName(builder, &test, i); test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0466e81..3355a97 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4335,6 +4335,19 @@ static HRESULT WINAPI UriBuilder_GetSchemeName(IUriBuilder *iface, DWORD *pcchSc static HRESULT WINAPI UriBuilder_GetUserName(IUriBuilder *iface, DWORD *pcchUserName, LPCWSTR *ppwzUserName) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pcchUserName, ppwzUserName); + + if(!pcchUserName) { + if(ppwzUserName) + *ppwzUserName = NULL; + return E_POINTER; + } + + if(!ppwzUserName) { + *pcchUserName = 0; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pcchUserName, ppwzUserName); return E_NOTIMPL; }

1 0

Andrew Eikum : oleaut32: Implement ITypeInfo2::ReleaseFuncDesc.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 3f13a07b47fedeec0190adfcacdf8c502c9ed461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f13a07b47fedeec0190adfca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 20 14:58:53 2010 -0500 oleaut32: Implement ITypeInfo2::ReleaseFuncDesc. --- dlls/oleaut32/typelib2.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index d1b48ff..71fd434 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3540,6 +3540,19 @@ static HRESULT WINAPI ITypeInfo2_fnGetContainingTypeLib( return S_OK; } +static void release_typedesc(TYPEDESC *tdesc) +{ + while (tdesc) { + TYPEDESC *next; + if (tdesc->vt == VT_USERDEFINED) + next = NULL; + else + next = tdesc->u.lptdesc; + HeapFree(GetProcessHeap(), 0, tdesc); + tdesc = next; + } +} + /****************************************************************************** * ITypeInfo2_ReleaseTypeAttr {OLEAUT32} * @@ -3563,7 +3576,28 @@ static void WINAPI ITypeInfo2_fnReleaseFuncDesc( ITypeInfo2* iface, FUNCDESC* pFuncDesc) { - FIXME("(%p,%p), stub!\n", iface, pFuncDesc); + int i; + + TRACE("(%p,%p)\n", iface, pFuncDesc); + + HeapFree(GetProcessHeap(), 0, pFuncDesc->lprgscode); + + if (pFuncDesc->lprgelemdescParam) { + for (i = 0; i < pFuncDesc->cParams; ++i) { + if (pFuncDesc->lprgelemdescParam[i].tdesc.vt != VT_USERDEFINED) + release_typedesc(pFuncDesc->lprgelemdescParam[i].tdesc.u.lptdesc); + + HeapFree(GetProcessHeap(), 0, pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex); + } + HeapFree(GetProcessHeap(), 0, pFuncDesc->lprgelemdescParam); + } + + HeapFree(GetProcessHeap(), 0, pFuncDesc->elemdescFunc.u.paramdesc.pparamdescex); + + if (pFuncDesc->elemdescFunc.tdesc.vt != VT_USERDEFINED) + release_typedesc(pFuncDesc->elemdescFunc.tdesc.u.lptdesc); + + HeapFree(GetProcessHeap(), 0, pFuncDesc); } /******************************************************************************

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetHost.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: b5950a4a10066a49bbee936bcb14b42be20e9bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5950a4a10066a49bbee936bc… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Aug 19 21:07:07 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetHost. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 13 +++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 994b6d4..0610d42 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5336,6 +5336,20 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == E_POINTER, "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); + + hr = IUriBuilder_GetHost(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + received = (void*) 0xdeadbeef; + hr = IUriBuilder_GetHost(builder, NULL, &received); + ok(hr == E_POINTER, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!received, "Error: Expected received to be NULL, but was %p instead.\n", received); + len = -1; + hr = IUriBuilder_GetHost(builder, &len, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); } if(builder) IUriBuilder_Release(builder); } @@ -5447,6 +5461,113 @@ static void test_IUriBuilder_GetFragment(IUriBuilder *builder, const uri_builder } } +static void test_IUriBuilder_GetHost(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + DWORD i; + LPCWSTR received = NULL; + DWORD len = -1; + const uri_builder_property *prop = NULL; + + /* Check if the property was set earlier. */ + for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_HOST) + prop = &(test->properties[i]); + } + + if(prop) { + /* Use expected_value unless it's NULL, then use value. */ + LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; + hr = IUriBuilder_GetHost(builder, &len, &received); + if(prop->todo) { + todo_wine { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } + } else { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + /* The property wasn't set earlier, so it should return whatever + * the base IUri contains (if anything). + */ + 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); + } + if(SUCCEEDED(hr)) { + BOOL has_prop = FALSE; + BSTR expected = NULL; + + hr = IUri_GetHost(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_GetHost to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + has_prop = hr == S_OK; + + hr = IUriBuilder_GetHost(builder, &len, &received); + if(has_prop) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!lstrcmpW(expected, received), + "Error: Expected %s but got %s instead on uri_builder_tests[%d].\n", + wine_dbgstr_w(expected), wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlenW(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlenW(expected), len, test_index); + } + } + } else { + todo_wine { + ok(hr == S_FALSE, + "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_FALSE, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } + } + } + SysFreeString(expected); + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -5502,6 +5623,7 @@ static void test_IUriBuilder(void) { /* Test the "Get*" functions. */ test_IUriBuilder_GetFragment(builder, &test, i); + test_IUriBuilder_GetHost(builder, &test, i); test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 52b4271..eed0417 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4215,6 +4215,19 @@ static HRESULT WINAPI UriBuilder_GetFragment(IUriBuilder *iface, DWORD *pcchFrag static HRESULT WINAPI UriBuilder_GetHost(IUriBuilder *iface, DWORD *pcchHost, LPCWSTR *ppwzHost) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pcchHost, ppwzHost); + + if(!pcchHost) { + if(ppwzHost) + *ppwzHost = NULL; + return E_POINTER; + } + + if(!ppwzHost) { + *pcchHost = 0; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pcchHost, ppwzHost); return E_NOTIMPL; }

1 0

Alexandre Julliard : gdi32/tests: Fix the GetObject last error check for most Windows versions.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: abafd9f1c73d11eadd249e1eddff0c2328ea97d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abafd9f1c73d11eadd249e1ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 23 11:11:16 2010 +0200 gdi32/tests: Fix the GetObject last error check for most Windows versions. --- dlls/gdi32/tests/gdiobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 7302134..6367071 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -85,7 +85,7 @@ static void test_gdi_objects(void) hp = SelectObject(hdc, GetStockObject(BLACK_PEN)); SetLastError(0); i = GetObjectA(hp, (INT_PTR)buff, (LPVOID)sizeof(buff)); - ok (!i && GetLastError() == ERROR_NOACCESS, + ok (!i && (GetLastError() == 0 || GetLastError() == ERROR_NOACCESS), "GetObject(invalid buff), expected 0, ERROR_NOACCESS, got %d, %u\n", i, GetLastError());

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetQuery.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 8f7428e1efd60083b82cb14659b938091dc826b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7428e1efd60083b82cb1465… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 20 00:46:58 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetQuery. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 13 +++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 722db05..f904d0e 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5391,6 +5391,20 @@ static void test_IUriBuilder_GetInvalidArgs(void) { ok(hr == E_POINTER, "Error: IUriBuilder_GetPort returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); ok(!set, "Error: Expected set to be FALSE, but was %d instead.\n", set); + + hr = IUriBuilder_GetQuery(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + received = (void*) 0xdeadbeef; + hr = IUriBuilder_GetQuery(builder, NULL, &received); + ok(hr == E_POINTER, "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!received, "Error: Expected received to be NULL, but was %p instead.\n", received); + len = -1; + hr = IUriBuilder_GetQuery(builder, &len, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); } if(builder) IUriBuilder_Release(builder); } @@ -5904,6 +5918,113 @@ static void test_IUriBuilder_GetPort(IUriBuilder *builder, const uri_builder_tes } } +static void test_IUriBuilder_GetQuery(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + DWORD i; + LPCWSTR received = NULL; + DWORD len = -1; + const uri_builder_property *prop = NULL; + + /* Check if the property was set earlier. */ + for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_QUERY) + prop = &(test->properties[i]); + } + + if(prop) { + /* Use expected_value unless it's NULL, then use value. */ + LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; + hr = IUriBuilder_GetQuery(builder, &len, &received); + if(prop->todo) { + todo_wine { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } + } else { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + /* The property wasn't set earlier, so it should return whatever + * the base IUri contains (if anything). + */ + 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); + } + if(SUCCEEDED(hr)) { + BOOL has_prop = FALSE; + BSTR expected = NULL; + + hr = IUri_GetQuery(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_GetQuery to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + has_prop = hr == S_OK; + + hr = IUriBuilder_GetQuery(builder, &len, &received); + if(has_prop) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!lstrcmpW(expected, received), + "Error: Expected %s but got %s instead on uri_builder_tests[%d].\n", + wine_dbgstr_w(expected), wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlenW(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlenW(expected), len, test_index); + } + } + } else { + todo_wine { + ok(hr == S_FALSE, + "Error: IUriBuilder_GetQuery returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_FALSE, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } + } + } + SysFreeString(expected); + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -5963,6 +6084,7 @@ static void test_IUriBuilder(void) { test_IUriBuilder_GetPassword(builder, &test, i); test_IUriBuilder_GetPath(builder, &test, i); test_IUriBuilder_GetPort(builder, &test, i); + test_IUriBuilder_GetQuery(builder, &test, i); test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4f90526..5837153 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4295,6 +4295,19 @@ static HRESULT WINAPI UriBuilder_GetPort(IUriBuilder *iface, BOOL *pfHasPort, DW static HRESULT WINAPI UriBuilder_GetQuery(IUriBuilder *iface, DWORD *pcchQuery, LPCWSTR *ppwzQuery) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pcchQuery, ppwzQuery); + + if(!pcchQuery) { + if(ppwzQuery) + *ppwzQuery = NULL; + return E_POINTER; + } + + if(!ppwzQuery) { + *pcchQuery = 0; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pcchQuery, ppwzQuery); return E_NOTIMPL; }

1 0

Frédéric Delanoy : Latest stable wine version is 1.2
by Jeremy Newman Aug. 23, 2010

Aug. 23, 2010

Module: website Branch: master Commit: 0f76e00bbf352fd131ed061d77eaa6322c064e3a URL: http://source.winehq.org/git/website.git/?a=commit;h=0f76e00bbf352fd131ed06… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 21 09:54:45 2010 +0200 Latest stable wine version is 1.2 --- templates/de/download/deblenny.template | 2 +- templates/pl/download/deblenny.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/download/deblenny.template b/templates/de/download/deblenny.template index fa75a3f..d4bd1e5 100644 --- a/templates/de/download/deblenny.template +++ b/templates/de/download/deblenny.template @@ -17,7 +17,7 @@ eigenes Repository für Downloads der aktuell verfügbaren Betapakete.</ in regelmäßigen Abständen <a href="http://wiki.winehq.org/Regression">Regressions</a> erleiden, wodurch eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn der aktuell -stabile Release von Wine (zur Zeit Wine 1.0.1) bei dir funktioniert, willst du diese Betapakete +stabile Release von Wine (zur Zeit Wine 1.2) bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. Dieses Repository enthält Pakete für i386 und amd64 Architektur. diff --git a/templates/pl/download/deblenny.template b/templates/pl/download/deblenny.template index ac75b95..0e070dc 100644 --- a/templates/pl/download/deblenny.template +++ b/templates/pl/download/deblenny.template @@ -8,7 +8,7 @@ Wine dla Debian Lenny, Squeeze i Sid Dystrybucje bazujące na Debianie używają specjalnego narzędzia zwanego APT do zarządzania paczkami. APT jest zdolne automagicznie zainstalować wszystkie potrzebne zależności dla paczki z programem, jak również utrzymywać zawsze najnowsze wersje paczki, poprzez przeszukiwanie czegoś, co jest znane pod nazwą repozytoria APT. Dystrybucje bazujące na Debianie mają swoje własne repozytoria programów, które zawiera w sobie Wine, jednakże my utrzymujemy nasze własne repozytorium najnowszych dostępnych paczek beta, które można tutaj pobrać. Uwaga: To są paczki beta -Te paczki są paczkami beta. Oznacza to, że okresowo mogą cierpieć z powodu <a href="http://wiki.winehq.org/Regression">regresji</a>, a aktualizacja do nich może popsuć funkcjonalność Wine. Jeżeli w twoim przypadku ostatnie stabilne wydanie Wine (aktualnie Wine 1.0.1) +Te paczki są paczkami beta. Oznacza to, że okresowo mogą cierpieć z powodu <a href="http://wiki.winehq.org/Regression">regresji</a>, a aktualizacja do nich może popsuć funkcjonalność Wine. Jeżeli w twoim przypadku ostatnie stabilne wydanie Wine (aktualnie Wine 1.2) działa, to nie musisz używać paczek beta. To repozytorium zawiera paczki dla procesora o architekturze i386 i amd64.

1 0