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

urlmon: Fixed IUriBuilderFactory declaration.

This commit is contained in:
Jacek Caban 2011-01-03 23:48:18 +01:00 committed by Alexandre Julliard
parent 3a59137b09
commit d34bbb2b52
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9090,23 +9090,23 @@ static void test_IUriBuilderFactory(void) {
if(SUCCEEDED(hr)) { if(SUCCEEDED(hr)) {
builder = (void*) 0xdeadbeef; 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", ok(hr == E_INVALIDARG, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG); hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder);
builder = (void*) 0xdeadbeef; 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", ok(hr == E_INVALIDARG, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG); hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); 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", ok(hr == E_POINTER, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_POINTER); hr, E_POINTER);
builder = NULL; 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", ok(hr == S_OK, "Error: CreateInitializedIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, S_OK); hr, S_OK);
if(SUCCEEDED(hr)) { if(SUCCEEDED(hr)) {
@ -9114,9 +9114,6 @@ static void test_IUriBuilderFactory(void) {
LPCWSTR result; LPCWSTR result;
DWORD result_len; DWORD result_len;
/* Seems microsoft had a bit of mixup naming this function. It
* returns an uninitialized IUriBuilder.
*/
hr = IUriBuilder_GetIUri(builder, &tmp); hr = IUriBuilder_GetIUri(builder, &tmp);
ok(hr == S_OK, "Error: GetIUri returned 0x%08x, expected 0x%08x.\n", ok(hr == S_OK, "Error: GetIUri returned 0x%08x, expected 0x%08x.\n",
hr, S_OK); hr, S_OK);
@ -9129,23 +9126,23 @@ static void test_IUriBuilderFactory(void) {
if(builder) IUriBuilder_Release(builder); if(builder) IUriBuilder_Release(builder);
builder = (void*) 0xdeadbeef; 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", ok(hr == E_INVALIDARG, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG); hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder);
builder = (void*) 0xdeadbeef; 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", ok(hr == E_INVALIDARG, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_INVALIDARG); hr, E_INVALIDARG);
ok(!builder, "Error: Expected 'builder' to be NULL, but was %p.\n", builder); 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", ok(hr == E_POINTER, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, E_POINTER); hr, E_POINTER);
builder = NULL; 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", ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n",
hr, S_OK); hr, S_OK);
if(SUCCEEDED(hr)) { if(SUCCEEDED(hr)) {

20
dlls/urlmon/uri.c
View File

@ -5007,10 +5007,10 @@ static ULONG WINAPI UriBuilderFactory_Release(IUriBuilderFactory *iface)
return ref; return ref;
} }
static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilderFactory *iface, static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *iface,
DWORD dwFlags, DWORD dwFlags,
DWORD_PTR dwReserved, DWORD_PTR dwReserved,
IUriBuilder **ppIUriBuilder) IUriBuilder **ppIUriBuilder)
{ {
Uri *This = impl_from_IUriBuilderFactory(iface); Uri *This = impl_from_IUriBuilderFactory(iface);
TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); 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); return CreateIUriBuilder(NULL, 0, 0, ppIUriBuilder);
} }
static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *iface, static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilderFactory *iface,
DWORD dwFlags, DWORD dwFlags,
DWORD_PTR dwReserved, DWORD_PTR dwReserved,
IUriBuilder **ppIUriBuilder) IUriBuilder **ppIUriBuilder)
{ {
Uri *This = impl_from_IUriBuilderFactory(iface); Uri *This = impl_from_IUriBuilderFactory(iface);
TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
@ -5049,8 +5049,8 @@ static const IUriBuilderFactoryVtbl UriBuilderFactoryVtbl = {
UriBuilderFactory_QueryInterface, UriBuilderFactory_QueryInterface,
UriBuilderFactory_AddRef, UriBuilderFactory_AddRef,
UriBuilderFactory_Release, UriBuilderFactory_Release,
UriBuilderFactory_CreateInitializedIUriBuilder, UriBuilderFactory_CreateIUriBuilder,
UriBuilderFactory_CreateIUriBuilder UriBuilderFactory_CreateInitializedIUriBuilder
}; };
static Uri* create_uri_obj(void) { static Uri* create_uri_obj(void) {

12
include/urlmon.idl
View File

@ -1839,16 +1839,16 @@ cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**)
] ]
interface IUriBuilderFactory : IUnknown interface IUriBuilderFactory : IUnknown
{ {
HRESULT CreateInitializedIUriBuilder(
[in] DWORD dwFlags,
[in] DWORD_PTR dwReserved,
[out] IUriBuilder **ppIUriBuilder);
HRESULT CreateIUriBuilder( HRESULT CreateIUriBuilder(
[in] DWORD dwFlags, [in] DWORD dwFlags,
[in] DWORD_PTR dwReserved, [in] DWORD_PTR dwReserved,
[out] IUriBuilder **ppIUriBuilder); [out] IUriBuilder **ppIUriBuilder);
};
HRESULT CreateInitializedIUriBuilder(
[in] DWORD dwFlags,
[in] DWORD_PTR dwReserved,
[out] IUriBuilder **ppIUriBuilder);
}
/***************************************************************************** /*****************************************************************************
* IInternetProtocolEx interface * IInternetProtocolEx interface