October 2009 - Wine-Commits

Juan Lang : netapi32: Improve a trace.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 45ae94dddc0667dbea2f3f4eaca08ab14f691dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ae94dddc0667dbea2f3f4ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 8 09:34:04 2009 -0700 netapi32: Improve a trace. --- dlls/netapi32/netapi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 8847e24..12218fc 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -97,7 +97,7 @@ NET_API_STATUS WINAPI NetServerEnumEx( */ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) { - FIXME("stub (%p, %d, %p)\n", servername, level, bufptr); + FIXME("stub (%s, %d, %p)\n", debugstr_w(servername), level, bufptr); return ERROR_ACCESS_DENIED; }

1 0

Andrew Eikum : mshtml: Fix typo in TRACE.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 1c27f252250728086db62340d5631f4da67be80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c27f252250728086db62340d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 9 17:37:13 2009 -0500 mshtml: Fix typo in TRACE. --- dlls/mshtml/secmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index be56e5d..c71bb4b 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -76,7 +76,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); const WCHAR *url; - TRACE("%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + TRACE("(%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW;

1 0

Paul Vriens : ddraw/tests: Don't crash on older ddraw.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 72fab20ffe0d7f713a78c4cbee8d6ef87ca16c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fab20ffe0d7f713a78c4cbe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 10 10:06:32 2009 +0200 ddraw/tests: Don't crash on older ddraw. --- dlls/ddraw/tests/ddrawmodes.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 7ea4d53..bd8bec7 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -149,9 +149,14 @@ static void test_DirectDrawEnumerateA(void) ret = pDirectDrawEnumerateA((LPDDENUMCALLBACKA)0xdeadbeef, NULL); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with callback that crashes. */ - ret = pDirectDrawEnumerateA(crash_callbackA, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + if (pDirectDrawEnumerateExA) + { + /* Test with callback that crashes. */ + ret = pDirectDrawEnumerateA(crash_callbackA, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + } + else + win_skip("Test would crash on older ddraw\n"); /* Test with valid callback parameter and NULL context parameter. */ trace("Calling DirectDrawEnumerateA with test_nullcontext_callbackA callback and NULL context.\n"); @@ -185,7 +190,9 @@ static void test_DirectDrawEnumerateW(void) /* Test with NULL callback parameter. */ ret = pDirectDrawEnumerateW(NULL, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + ok(ret == DDERR_INVALIDPARAMS || + ret == DDERR_UNSUPPORTED, /* Older ddraw */ + "Expected DDERR_INVALIDPARAMS or DDERR_UNSUPPORTED, got %d\n", ret); /* Test with invalid callback parameter. */ ret = pDirectDrawEnumerateW((LPDDENUMCALLBACKW)0xdeadbeef, NULL);

1 0

Paul Vriens : shell32/tests: Fix test failure on Cyrillic locales.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 7a0430d0e8bd1e1266e20f655ab03e223b26bb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0430d0e8bd1e1266e20f655… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 11 10:21:26 2009 +0200 shell32/tests: Fix test failure on Cyrillic locales. --- dlls/shell32/tests/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index cbd6025..33d1a94 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -48,8 +48,8 @@ "Expected %d, got %d\n", ret, retval) static CHAR CURR_DIR[MAX_PATH]; -static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00c4,'\0','\0'}; - /* "c:\Ä", or "c:\A" with diaeresis */ +static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00ae,'\0','\0'}; + /* "c:\®" can be used in all codepages */ /* Double-null termination needed for pFrom field of SHFILEOPSTRUCT */ static HMODULE hshell32;

1 0

Michael Stefaniuc : windowscodecs: Remove redundant NULL check before HeapFree (Smatch).
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 13ad5d17250e5e5822ab3a99122f9bef4c8ae08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ad5d17250e5e5822ab3a991… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 10 01:05:10 2009 +0200 windowscodecs: Remove redundant NULL check before HeapFree (Smatch). --- dlls/windowscodecs/pngformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 6aaca6b..3334d76 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -860,7 +860,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, /* set up setjmp/longjmp error handling */ if (setjmp(png_jmpbuf(This->png_ptr))) { - if (row_pointers) HeapFree(GetProcessHeap(), 0, row_pointers); + HeapFree(GetProcessHeap(), 0, row_pointers); return E_FAIL; }

1 0

Andrew Eikum : mshtml: Fix typo in WARN.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: be4178928b2d49121837719eaddee094c88908a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4178928b2d49121837719ea… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 9 15:38:32 2009 -0500 mshtml: Fix typo in WARN. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d7fe4a9..8ed0108 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -647,7 +647,7 @@ static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) hres = CreateURLMoniker(NULL, wine_url, mon); if(FAILED(hres)) - WARN("CreateURLMonikrer failed: %08x\n", hres); + WARN("CreateURLMoniker failed: %08x\n", hres); return hres; }

1 0

Andrey Turkin : ntdll: Run TLS callbacks in zero-sized TLS directories.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 7aeaa0338c6e1e313463da8dbad7fc2e9b32304c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aeaa0338c6e1e313463da8db… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Oct 10 15:09:02 2009 +0400 ntdll: Run TLS callbacks in zero-sized TLS directories. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 71d7ecd..42c4225 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -845,7 +845,7 @@ static NTSTATUS alloc_process_tls(void) IMAGE_DIRECTORY_ENTRY_TLS, &size ))) continue; size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; - if (!size) continue; + if (!size && !dir->AddressOfCallBacks) continue; tls_total_size += size; tls_module_count++; }

1 0

Andrey Turkin : advapi32: Ignore invalid MultipleTrusteeOperation values in SetEntriesInAcl.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 7de9f842e55bc00f48650e8ba7e262abf3ba701b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de9f842e55bc00f48650e8ba… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Oct 10 17:52:09 2009 +0400 advapi32: Ignore invalid MultipleTrusteeOperation values in SetEntriesInAcl. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bff68a3..24c48c8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3484,7 +3484,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, pEntries[i].Trustee.TrusteeForm, pEntries[i].Trustee.TrusteeType, pEntries[i].Trustee.ptstrName); - if (pEntries[i].Trustee.MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) + if (pEntries[i].Trustee.MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE) { WARN("bad multiple trustee operation %d for trustee %d\n", pEntries[i].Trustee.MultipleTrusteeOperation, i); ret = ERROR_INVALID_PARAMETER; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dfcd45b..1a2e39d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2528,11 +2528,19 @@ static void test_SetEntriesInAcl(void) ExplicitAccess.grfAccessPermissions = KEY_WRITE; ExplicitAccess.grfAccessMode = GRANT_ACCESS; ExplicitAccess.grfInheritance = NO_INHERITANCE; - ExplicitAccess.Trustee.pMultipleTrustee = NULL; - ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID; - ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; ExplicitAccess.Trustee.ptstrName = EveryoneSid; + ExplicitAccess.Trustee.MultipleTrusteeOperation = 0xDEADBEEF; + ExplicitAccess.Trustee.pMultipleTrustee = (PVOID)0xDEADBEEF; + res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(NewAcl != NULL, "returned acl was NULL\n"); + LocalFree(NewAcl); + + ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + ExplicitAccess.Trustee.pMultipleTrustee = NULL; + ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); ok(NewAcl != NULL, "returned acl was NULL\n");

1 0

Jacek Caban : mshtml: Moved QueryService call to hlink_frame_navigate.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 4aa48041fafaff23751be52edfd0f212ddd18ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa48041fafaff23751be52ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 11 21:11:03 2009 +0200 mshtml: Moved QueryService call to hlink_frame_navigate. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 43 +++++++++++++++++++++++++---------------- dlls/mshtml/nsio.c | 20 +----------------- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2f9e1e5..4a10fea 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -607,7 +607,7 @@ BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); -void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); void call_property_onchanged(ConnectionPoint*,DISPID); HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 267168f..7c7376d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1160,14 +1160,27 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis } } -void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, - LPCWSTR uri, nsIInputStream *post_data_stream, DWORD hlnf) +HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, + nsIInputStream *post_data_stream, DWORD hlnf) { + IHlinkFrame *hlink_frame; + IServiceProvider *sp; BSCallback *callback; IBindCtx *bindctx; IMoniker *mon; IHlink *hlink; - HRESULT hr; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(doc->doc_obj->client, &IID_IServiceProvider, + (void**)&sp); + if(FAILED(hres)) + return hres; + + hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, + (void**)&hlink_frame); + IServiceProvider_Release(sp); + if(FAILED(hres)) + return hres; callback = &create_channelbsc(NULL)->bsc; @@ -1178,21 +1191,15 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, debugstr_an(callback->post_data, callback->post_data_len)); } - hr = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); - if (FAILED(hr)) { - IBindStatusCallback_Release(STATUSCLB(callback)); - return; - } + hres = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); + if(SUCCEEDED(hres)) + hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, + &IID_IHlink, (LPVOID*)&hlink); - hr = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); - if (FAILED(hr)) { - IBindCtx_Release(bindctx); - IBindStatusCallback_Release(STATUSCLB(callback)); - return; - } + if(SUCCEEDED(hres)) + hres = CreateURLMoniker(NULL, url, &mon); - hr = CreateURLMoniker(NULL, uri, &mon); - if (SUCCEEDED(hr)) { + if(SUCCEEDED(hres)) { IHlink_SetMonikerReference(hlink, 0, mon, NULL); if(hlnf & HLNF_OPENINNEWWINDOW) { @@ -1200,11 +1207,13 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ } - IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); + hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); IMoniker_Release(mon); } + IHlinkFrame_Release(hlink_frame); IBindCtx_Release(bindctx); IBindStatusCallback_Release(STATUSCLB(callback)); + return hres; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8ed0108..f10db48 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -128,7 +128,6 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) static BOOL before_async_open(nsChannel *channel, NSContainer *container) { HTMLDocumentObj *doc = container->doc; - IServiceProvider *service_provider; DWORD hlnf = 0; LPCWSTR uri; HRESULT hres; @@ -154,23 +153,8 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) if(!hlnf && !exec_shldocvw_67(doc, uri)) return FALSE; - hres = IOleClientSite_QueryInterface(doc->client, &IID_IServiceProvider, - (void**)&service_provider); - if(SUCCEEDED(hres)) { - IHlinkFrame *hlink_frame; - - hres = IServiceProvider_QueryService(service_provider, &IID_IHlinkFrame, - &IID_IHlinkFrame, (void**)&hlink_frame); - IServiceProvider_Release(service_provider); - if(SUCCEEDED(hres)) { - hlink_frame_navigate(&doc->basedoc, hlink_frame, uri, channel->post_data_stream, hlnf); - IHlinkFrame_Release(hlink_frame); - - return FALSE; - } - } - - return TRUE; + hres = hlink_frame_navigate(&doc->basedoc, uri, channel->post_data_stream, hlnf); + return hres != S_OK; } #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface)

1 0

Jacek Caban : mshtml: Added IHTMLLocation::put_href implementation.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 47c27742d046f8a5c3da94613c541a17cbedf257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c27742d046f8a5c3da94613… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 11 21:11:35 2009 +0200 mshtml: Added IHTMLLocation::put_href implementation. --- dlls/mshtml/htmllocation.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 25 +++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 45899b4..891e7b8 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -134,8 +134,15 @@ static HRESULT WINAPI HTMLLocation_Invoke(IHTMLLocation *iface, DISPID dispIdMem static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->window || !This->window->doc) { + FIXME("No document available\n"); + return E_FAIL; + } + + return navigate_url(This->window->doc, v); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4a10fea..44a816e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -608,6 +608,7 @@ BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); +HRESULT navigate_url(HTMLDocumentNode*,OLECHAR*); void call_property_onchanged(ConnectionPoint*,DISPID); HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 7c7376d..92d95fc 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" #define UTF16_STR "utf-16" +static WCHAR emptyW[] = {0}; + typedef struct { const nsIInputStreamVtbl *lpInputStreamVtbl; @@ -1217,3 +1219,26 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, IBindStatusCallback_Release(STATUSCLB(callback)); return hres; } + +HRESULT navigate_url(HTMLDocumentNode *doc, OLECHAR *url) +{ + OLECHAR *translated_url = NULL; + HRESULT hres; + + if(!url) + url = emptyW; + + if(doc->basedoc.doc_obj->hostui) { + hres = IDocHostUIHandler_TranslateUrl(doc->basedoc.doc_obj->hostui, 0, url, + &translated_url); + if(hres == S_OK) + url = translated_url; + } + + hres = hlink_frame_navigate(&doc->basedoc, url, NULL, 0); + if(FAILED(hres)) + FIXME("hlink_frame_navigate failed: %08x\n", hres); + + CoTaskMemFree(translated_url); + return hres; +} diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index e02951f..79d7786 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -148,6 +148,7 @@ DEFINE_EXPECT(EnableModeless_FALSE); DEFINE_EXPECT(Frame_EnableModeless_TRUE); DEFINE_EXPECT(Frame_EnableModeless_FALSE); DEFINE_EXPECT(Frame_GetWindow); +DEFINE_EXPECT(TranslateUrl); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -665,6 +666,7 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB DWORD site_data = 0xdeadbeef; hres = IHlink_GetTargetFrameName(pihlNavigate, &frame_name); + todo_wine ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); ok(frame_name == NULL, "frame_name = %p\n", frame_name); @@ -676,6 +678,7 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data); ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); ok(site == NULL, "site = %p\n, expected NULL\n", site); + todo_wine ok(site_data == 0xdeadbeef, "site_data = %x\n", site_data); } @@ -2107,8 +2110,13 @@ static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, ID static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(TranslateUrl); + ok(!dwTranslate, "dwTranslate = %x\n", dwTranslate); + ok(!strcmp_wa(pchURLIn, "about:blank"), "pchURLIn = %s\n", wine_dbgstr_w(pchURLIn)); + ok(ppchURLOut != NULL, "ppchURLOut == NULL\n"); + ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut); + + return S_FALSE; } static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *iface, IDataObject *pDO, @@ -2997,6 +3005,34 @@ static void test_Persist(IUnknown *unk, IMoniker *mon) } } +static void test_put_href(IUnknown *unk) +{ + IHTMLLocation *location; + IHTMLDocument2 *doc; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + + location = NULL; + hres = IHTMLDocument2_get_location(doc, &location); + IHTMLDocument2_Release(doc); + ok(hres == S_OK, "get_location failed: %08x\n", hres); + ok(location != NULL, "location == NULL\n"); + + SET_EXPECT(TranslateUrl); + SET_EXPECT(Navigate); + str = a2bstr("about:blank"); + hres = IHTMLLocation_put_href(location, str); + SysFreeString(str); + ok(hres == S_OK, "put_href failed: %08x\n", hres); + CHECK_CALLED(TranslateUrl); + CHECK_CALLED(Navigate); + + IHTMLLocation_Release(location); +} + static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { 0, OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ @@ -4118,6 +4154,8 @@ static void test_HTMLDocument_http(void) test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_put_href(unk); + test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE); test_IsDirty(unk, S_FALSE);

1 0