Skip to content

W
wine-winehq
Commit d34bbb2b authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

urlmon: Fixed IUriBuilderFactory declaration.

parent 3a59137b
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 24 deletions
dlls/urlmon/tests/uri.c
View file @ d34bbb2b
......@@ -9090,23 +9090,23 @@ static void test_IUriBuilderFactory(void) {
if(SUCCEEDED(hr)) {
builder = (void*) 0xdeadbeef;
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 10, 0, &builder);
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 10, 0, &builder);
ok(hr == E_INVALIDARG, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder);
builder = (void*) 0xdeadbeef;
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 10, &builder);
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 10, &builder);
ok(hr == E_INVALIDARG, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder);
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, NULL);
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, NULL);
ok(hr == E_POINTER, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_POINTER);
builder = NULL;
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, &builder);
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, &builder);
ok(hr == S_OK, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
if(SUCCEEDED(hr)) {
......@@ -9114,9 +9114,6 @@ static void test_IUriBuilderFactory(void) {
LPCWSTR result;
DWORD result_len;
/* Seems microsoft had a bit of mixup naming this function. It
* returns an uninitialized IUriBuilder.
*/
hr = IUriBuilder_GetIUri(builder, &tmp);
ok(hr == S_OK, "Error: GetIUri returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
......@@ -9129,23 +9126,23 @@ static void test_IUriBuilderFactory(void) {
if(builder) IUriBuilder_Release(builder);
builder = (void*) 0xdeadbeef;
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 10, 0, &builder);
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 10, 0, &builder);
ok(hr == E_INVALIDARG, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder);
builder = (void*) 0xdeadbeef;
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 10, &builder);
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 10, &builder);
ok(hr == E_INVALIDARG, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder);
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, NULL);
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, NULL);
ok(hr == E_POINTER, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_POINTER);
builder = NULL;
hr = IUriBuilderFactory_CreateIUriBuilder(factory, 0, 0, &builder);
hr = IUriBuilderFactory_CreateInitializedIUriBuilder(factory, 0, 0, &builder);
ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, S_OK);
if(SUCCEEDED(hr)) {
......
dlls/urlmon/uri.c
View file @ d34bbb2b
......@@ -5007,10 +5007,10 @@ static ULONG WINAPI UriBuilderFactory_Release(IUriBuilderFactory *iface)
return ref;
}
static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilderFactory *iface,
DWORD dwFlags,
DWORD_PTR dwReserved,
IUriBuilder **ppIUriBuilder)
static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *iface,
DWORD dwFlags,
DWORD_PTR dwReserved,
IUriBuilder **ppIUriBuilder)
{
Uri *This = impl_from_IUriBuilderFactory(iface);
TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
......@@ -5026,10 +5026,10 @@ static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilder
return CreateIUriBuilder(NULL, 0, 0, ppIUriBuilder);
}
static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *iface,
DWORD dwFlags,
DWORD_PTR dwReserved,
IUriBuilder **ppIUriBuilder)
static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilderFactory *iface,
DWORD dwFlags,
DWORD_PTR dwReserved,
IUriBuilder **ppIUriBuilder)
{
Uri *This = impl_from_IUriBuilderFactory(iface);
TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
......@@ -5049,8 +5049,8 @@ static const IUriBuilderFactoryVtbl UriBuilderFactoryVtbl = {
UriBuilderFactory_QueryInterface,
UriBuilderFactory_AddRef,
UriBuilderFactory_Release,
UriBuilderFactory_CreateInitializedIUriBuilder,
UriBuilderFactory_CreateIUriBuilder
UriBuilderFactory_CreateIUriBuilder,
UriBuilderFactory_CreateInitializedIUriBuilder
};
static Uri* create_uri_obj(void) {
......
include/urlmon.idl
View file @ d34bbb2b
......@@ -1839,16 +1839,16 @@ cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**)
]
interface IUriBuilderFactory : IUnknown
{
HRESULT CreateInitializedIUriBuilder(
HRESULT CreateIUriBuilder(
[in] DWORD dwFlags,
[in] DWORD_PTR dwReserved,
[out] IUriBuilder **ppIUriBuilder);
HRESULT CreateIUriBuilder(
HRESULT CreateInitializedIUriBuilder(
[in] DWORD dwFlags,
[in] DWORD_PTR dwReserved,
[out] IUriBuilder **ppIUriBuilder);
};
}
/*****************************************************************************
* IInternetProtocolEx interface
......
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