urlmon: Fixed IUriBuilderFactory declaration.
diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index fd9099c..44f438f 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -9090,23 +9090,23 @@
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 @@
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 @@
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)) {
diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c
index 825c6c5..7f8a441 100644
--- a/dlls/urlmon/uri.c
+++ b/dlls/urlmon/uri.c
@@ -5007,10 +5007,10 @@
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 @@
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 @@
UriBuilderFactory_QueryInterface,
UriBuilderFactory_AddRef,
UriBuilderFactory_Release,
- UriBuilderFactory_CreateInitializedIUriBuilder,
- UriBuilderFactory_CreateIUriBuilder
+ UriBuilderFactory_CreateIUriBuilder,
+ UriBuilderFactory_CreateInitializedIUriBuilder
};
static Uri* create_uri_obj(void) {
diff --git a/include/urlmon.idl b/include/urlmon.idl
index d2a46a0..240b6a7 100644
--- a/include/urlmon.idl
+++ b/include/urlmon.idl
@@ -1839,16 +1839,16 @@
]
interface IUriBuilderFactory : IUnknown
{
- HRESULT CreateInitializedIUriBuilder(
- [in] DWORD dwFlags,
- [in] DWORD_PTR dwReserved,
- [out] IUriBuilder **ppIUriBuilder);
-
HRESULT CreateIUriBuilder(
[in] DWORD dwFlags,
[in] DWORD_PTR dwReserved,
[out] IUriBuilder **ppIUriBuilder);
-};
+
+ HRESULT CreateInitializedIUriBuilder(
+ [in] DWORD dwFlags,
+ [in] DWORD_PTR dwReserved,
+ [out] IUriBuilder **ppIUriBuilder);
+}
/*****************************************************************************
* IInternetProtocolEx interface
