[PATCH 1/2] hlink/tests: Add tests for navigating from a string reference.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: use test.winehq.org instead of www.winehq.org v4: disable failing tests on Wine dlls/hlink/tests/hlink.c | 79 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 12 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 50f61d57f7e..c19de13ca81 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -67,6 +67,9 @@ DEFINE_EXPECT(GetClassID); DEFINE_EXPECT(Save); DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); +DEFINE_EXPECT(HBC_QueryInterface_IMarshal); +DEFINE_EXPECT(HBC_QueryInterface_IdentityUnmarshal); +DEFINE_EXPECT(HBC_QueryInterface_IUnknown); DEFINE_EXPECT(HBC_GetObject); DEFINE_EXPECT(HBC_UpdateHlink); @@ -77,8 +80,16 @@ DEFINE_EXPECT(HT_GetFriendlyName); DEFINE_EXPECT(HLF_UpdateHlink); +DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +static const WCHAR winehq_urlW[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; +static const WCHAR winehq_404W[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','f','a','k','e','u','r','l',0}; + static void test_HlinkIsShortcut(void) { UINT i; @@ -627,9 +638,6 @@ static void test_HlinkParseDisplayName(void) IBindCtx *bctx; HRESULT hres; - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR invalid_urlW[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; static const WCHAR clsid_nameW[] = {'c','l','s','i','d',':', '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8', @@ -829,12 +837,17 @@ static HRESULT WINAPI HlinkBrowseContext_QueryInterface( { *ppv = NULL; - if(IsEqualGUID(&IID_IHlinkHistory, riid)) { + if (IsEqualGUID(&IID_IHlinkHistory, riid)) CHECK_EXPECT(HBC_QueryInterface_IHlinkHistory); - return E_NOINTERFACE; - } + else if (IsEqualGUID(&IID_IMarshal, riid)) + CHECK_EXPECT2(HBC_QueryInterface_IMarshal); + else if (IsEqualGUID(&CLSID_IdentityUnmarshal, riid)) + CHECK_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + else if (IsEqualGUID(&IID_IUnknown, riid)) + CHECK_EXPECT(HBC_QueryInterface_IUnknown); + else + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); - ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -859,9 +872,17 @@ static IMoniker Moniker; static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IMoniker *pimk, BOOL fBindIfRootRegistered, IUnknown **ppiunk) { + IBindCtx *bctx; + WCHAR *name; + CHECK_EXPECT(HBC_GetObject); - ok(pimk == &Moniker, "pimk != &Moniker\n"); + CreateBindCtx(0, &bctx); + IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + ok(!lstrcmpW(winehq_urlW, name) || !lstrcmpW(winehq_404W, name), "got unexpected url\n"); + CoTaskMemFree(name); + IBindCtx_Release(bctx); + ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); *ppiunk = NULL; return S_FALSE; @@ -1205,10 +1226,6 @@ static HRESULT WINAPI Moniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther static HRESULT WINAPI Moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { - static const WCHAR winehq_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; - CHECK_EXPECT2(GetDisplayName); ok(pbc != NULL, "pbc == NULL\n"); @@ -2206,6 +2223,44 @@ static void test_Hlink_Navigate(void) CHECK_CALLED(HT_Navigate); todo_wine CHECK_CALLED(HT_GetFriendlyName); +if (0) { /* these currently open a browser window on wine */ + /* Test from string */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); + + /* MSDN claims browse context and bind context can't be null, but they can */ + SET_EXPECT(HBC_GetObject); + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, &HlinkBrowseContext); + todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); +} + + /* these open a browser window, so mark them interactive only */ + if (winetest_interactive) + { + /* both parameters null */ + hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + todo_wine ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + + /* try basic test with valid URL */ + SET_EXPECT(HBC_GetObject); + SET_EXPECT(HBC_QueryInterface_IHlinkHistory); + SET_EXPECT(HBC_QueryInterface_IMarshal); + SET_EXPECT(HBC_QueryInterface_IdentityUnmarshal); + SET_EXPECT(HBC_QueryInterface_IUnknown); + hres = HlinkNavigateToStringReference(winehq_urlW, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Expected S_OK, got %08x\n", hres); + todo_wine CHECK_CALLED(HBC_GetObject); + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); + todo_wine CHECK_CALLED(HBC_QueryInterface_IMarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IdentityUnmarshal); + todo_wine CHECK_CALLED(HBC_QueryInterface_IUnknown); + } + else + skip("interactive IHlink_Navigate tests\n"); + IHlink_Release(hlink); IBindCtx_Release(pbc); _bctx = NULL; -- 2.15.0
Query it for an IHlinkTarget object. Also, use ShellExecute() only if the parameter is NULL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/hlink/link.c | 43 ++++++++++++++++++++++----------------- dlls/hlink/tests/hlink.c | 53 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 27 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index f5da0b49a7d..983765cefea 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -486,25 +486,33 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (SUCCEEDED(r)) { - IBindCtx *bcxt; + IBindCtx *bcxt = NULL; IUnknown *unk = NULL; IHlinkTarget *target; - CreateBindCtx(0, &bcxt); - - RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); - - r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk); - if (r == S_OK) - { - r = IUnknown_QueryInterface(unk, &IID_IHlinkTarget, (void**)&target); - IUnknown_Release(unk); - } - if (r == S_OK) + if (phbc) { - IHlinkTarget_SetBrowseContext(target, phbc); - r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); - IHlinkTarget_Release(target); + r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); + if (r == S_FALSE) + { + CreateBindCtx(0, &bcxt); + RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); + r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk); + } + if (r == S_OK) + { + r = IUnknown_QueryInterface(unk, &IID_IHlinkTarget, (void **)&target); + IUnknown_Release(unk); + } + if (r == S_OK) + { + if (bcxt) IHlinkTarget_SetBrowseContext(target, phbc); + r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); + IHlinkTarget_Release(target); + } + + RevokeBindStatusCallback(bcxt, pbsc); + if (bcxt) IBindCtx_Release(bcxt); } else { @@ -516,12 +524,9 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, { ShellExecuteW(NULL, szOpen, target, NULL, NULL, SW_SHOW); CoTaskMemFree(target); + r = DRAGDROP_S_DROP; } } - - RevokeBindStatusCallback(bcxt, pbsc); - - IBindCtx_Release(bcxt); IMoniker_Release(mon); } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index c19de13ca81..835062433cc 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -73,6 +73,7 @@ DEFINE_EXPECT(HBC_QueryInterface_IUnknown); DEFINE_EXPECT(HBC_GetObject); DEFINE_EXPECT(HBC_UpdateHlink); +DEFINE_EXPECT(HT_QueryInterface_IHlinkTarget); DEFINE_EXPECT(HT_SetBrowseContext); DEFINE_EXPECT(HT_GetBrowseContext); DEFINE_EXPECT(HT_Navigate); @@ -868,6 +869,8 @@ static HRESULT WINAPI HlinkBrowseContext_Register(IHlinkBrowseContext *iface, return E_NOTIMPL; } +static IUnknown *HBC_object; + static IMoniker Moniker; static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IMoniker *pimk, BOOL fBindIfRootRegistered, IUnknown **ppiunk) @@ -884,8 +887,9 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, IBindCtx_Release(bctx); ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); - *ppiunk = NULL; - return S_FALSE; + + *ppiunk = HBC_object; + return HBC_object ? S_OK : S_FALSE; } static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister) @@ -995,6 +999,7 @@ static IHlinkBrowseContext HlinkBrowseContext = { &HlinkBrowseContextVtbl }; static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkTarget, riid)) { + CHECK_EXPECT(HT_QueryInterface_IHlinkTarget); *ppv = iface; return S_OK; } @@ -2188,6 +2193,8 @@ static void test_Hlink_Navigate(void) ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); _bctx = pbc; + HBC_object = NULL; + SET_EXPECT(Reduce); SET_EXPECT(Enum); SET_EXPECT(IsSystemMoniker); @@ -2205,6 +2212,7 @@ static void test_Hlink_Navigate(void) SET_EXPECT(HBC_GetObject); SET_EXPECT(Reduce); SET_EXPECT(BindToObject); + SET_EXPECT(HT_QueryInterface_IHlinkTarget); SET_EXPECT(HT_GetBrowseContext); SET_EXPECT(HT_SetBrowseContext); SET_EXPECT(HBC_QueryInterface_IHlinkHistory); @@ -2213,36 +2221,65 @@ static void test_Hlink_Navigate(void) hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); ok(hres == S_OK, "Navigate failed: %08x\n", hres); CHECK_CALLED(IsSystemMoniker); - todo_wine CHECK_CALLED(GetDisplayName); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(HBC_GetObject); todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); + CHECK_CALLED(HT_QueryInterface_IHlinkTarget); todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); todo_wine CHECK_CALLED(HT_GetFriendlyName); + /* Test with valid return from HlinkBrowseContext::GetObject */ + HBC_object = (IUnknown *)&HlinkTarget; + + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + SET_EXPECT(HBC_GetObject); + SET_EXPECT(HT_QueryInterface_IHlinkTarget); + SET_EXPECT(HT_Navigate); + SET_EXPECT(HT_GetFriendlyName); + hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); + ok(hres == S_OK, "Navigate failed: %08x\n", hres); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HT_QueryInterface_IHlinkTarget); + CHECK_CALLED(HT_Navigate); + todo_wine CHECK_CALLED(HT_GetFriendlyName); + + HBC_object = NULL; + if (0) { /* these currently open a browser window on wine */ /* Test from string */ SET_EXPECT(HBC_GetObject); hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HBC_GetObject); /* MSDN claims browse context and bind context can't be null, but they can */ SET_EXPECT(HBC_GetObject); hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, &HlinkBrowseContext); todo_wine ok(hres == INET_E_OBJECT_NOT_FOUND, "Expected INET_E_OBJECT_NOT_FOUND, got %08x\n", hres); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HBC_GetObject); } /* these open a browser window, so mark them interactive only */ if (winetest_interactive) { /* both parameters null */ + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + hres = IHlink_Navigate(hlink, 0, NULL, NULL, NULL); + ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + + /* same, from string */ hres = HlinkNavigateToStringReference(winehq_404W, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); - todo_wine ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); + ok(hres == DRAGDROP_S_DROP, "Expected DRAGDROP_S_DROP, got %08x\n", hres); /* try basic test with valid URL */ SET_EXPECT(HBC_GetObject); @@ -2252,7 +2289,7 @@ if (0) { /* these currently open a browser window on wine */ SET_EXPECT(HBC_QueryInterface_IUnknown); hres = HlinkNavigateToStringReference(winehq_urlW, NULL, NULL, 0, NULL, 0, pbc, NULL, &HlinkBrowseContext); ok(hres == S_OK, "Expected S_OK, got %08x\n", hres); - todo_wine CHECK_CALLED(HBC_GetObject); + CHECK_CALLED(HBC_GetObject); todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); todo_wine CHECK_CALLED(HBC_QueryInterface_IMarshal); todo_wine CHECK_CALLED(HBC_QueryInterface_IdentityUnmarshal); -- 2.15.0
participants (1)
-
Zebediah Figura