- Wine-Devel - list.winehq.org

[PATCH] ntdll: Improve the performance of log output.
by Haoyang Chen Sept. 14, 2020

Sept. 14, 2020

1 0

[PATCH] kernel32/tests: Be explicit about LoadLibraryEx() NT6+ flags
by Serge Gautherie Sept. 14, 2020

Sept. 14, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Mostly interesting for ReactOS. --- dlls/kernel32/tests/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 3307382..4238f0b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1054,7 +1054,7 @@ static void test_Loader(void) if (!((ULONG_PTR)hlib_as_data_file & 3) || /* winxp */ (!hlib_as_data_file && GetLastError() == ERROR_INVALID_PARAMETER)) /* w2k3 */ { - win_skip( "LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE not supported\n" ); + win_skip("NT6+ LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE not supported\n"); FreeLibrary(hlib_as_data_file); } else @@ -1082,7 +1082,7 @@ static void test_Loader(void) if (!((ULONG_PTR)hlib_as_data_file & 3) || /* winxp */ (!hlib_as_data_file && GetLastError() == ERROR_INVALID_PARAMETER)) /* w2k3 */ { - win_skip( "LOAD_LIBRARY_AS_IMAGE_RESOURCE not supported\n" ); + win_skip("NT6+ LOAD_LIBRARY_AS_IMAGE_RESOURCE not supported\n"); FreeLibrary(hlib_as_data_file); } else -- 2.10.0.windows.1

2 2

[PATCH v3 3/3] shell32: Implement ShellLinkObject::get_Path.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49591 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/shell32/shelldispatch.c | 15 +++++++++++++-- dlls/shell32/tests/shelldispatch.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 5d2f36f1543..9bb8b48ced6 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -737,9 +737,20 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) { - FIXME("(%p, %p)\n", iface, pbs); + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + WCHAR path[MAX_PATH]; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pbs); + + *pbs = NULL; + + hr = IShellLinkW_GetPath(This->shell_link, path, MAX_PATH, NULL, 0); + if (hr != S_OK) + return hr; + + *pbs = SysAllocString(path); + return hr; } static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index ae1cf086270..33ada2d80cc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1500,7 +1500,7 @@ static void test_ShellLinkObject(void) str = NULL; hr = IShellLinkDual2_get_Path(sld, &str); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ok(!wcscmp(str, empty_path), "got %s (wanted %s)\n", wine_dbgstr_w(str), wine_dbgstr_w(empty_path)); -- 2.28.0

1 0

[PATCH v3 2/3] shell32: Implement FolderItem::get_GetLink.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3: Following Nikolay's comments: - Move ::Constructor from patch #1 to this patch. - Remove copy/paste bug with a superfluous AddRef. - Remove goto. - Use FAILED instead of != S_OK. dlls/shell32/shelldispatch.c | 60 +++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 4 +- 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 05e2cafb9ee..5d2f36f1543 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -883,6 +883,49 @@ static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { ShellLinkObject_get_Target, }; +static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 **link) +{ + HRESULT hr; + ShellLinkObjectImpl *This; + + TRACE("%p\n", item); + + *link = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; + This->ref = 1; + + This->shell_link = NULL; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&This->shell_link); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + + This->persist_file = NULL; + hr = IShellLinkW_QueryInterface(This->shell_link, &IID_IPersistFile, + (LPVOID*)&This->persist_file); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + + hr = IPersistFile_Load(This->persist_file, item->path, STGM_READ); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + + *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; + return S_OK; +} + static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, REFIID riid, LPVOID *ppv) { @@ -1069,10 +1112,23 @@ static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *path) static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, IDispatch **ppid) { - FIXME("(%p,%p)\n", iface, ppid); + IShellLinkDual2 *link; + HRESULT hr; + FolderItemImpl *This = impl_from_FolderItem(iface); + + TRACE("(%p,%p)\n", iface, ppid); *ppid = NULL; - return E_NOTIMPL; + + if (!(This->attributes & SFGAO_LINK)) + return E_NOTIMPL; + + hr = ShellLinkObject_Constructor(This, &link); + if (hr != S_OK) + return hr; + + *ppid = (IDispatch*)link; + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_GetFolder(FolderItem2 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 28b0b186b8e..ae1cf086270 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1492,8 +1492,8 @@ static void test_ShellLinkObject(void) dispatch = NULL; hr = FolderItem_get_GetLink(item, &dispatch); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(dispatch != NULL, "got %p\n", dispatch); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dispatch != NULL, "got %p\n", dispatch); if (dispatch) { sld = (IShellLinkDual2*)dispatch; -- 2.28.0

1 0

[PATCH v3 1/3] shell32: Add ShellLinkObject stubs.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3: Following Nikolay's comments: - Merge tests (patch #2 in v1/2) with this patch. - Don't change cwd in tests. - Use NULL as default value for pointers in tests. - Fix missing assignment in tests. - Move ::Constructor to patch #2 (#3 in v1/2) - Remove .item in ShellLinkObjectImpl. (.persist_file was kept due to its use in ::Release) dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 268 ++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 149 ++++++++++++++++ 3 files changed, 417 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 11a96309e8b..3465a3c8445 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -222,6 +222,7 @@ enum tid_t { FolderItems3_tid, FolderItemVerb_tid, FolderItemVerbs_tid, + IShellLinkDual2_tid, LAST_tid }; diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index c6d1dab7f62..05e2cafb9ee 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -51,7 +51,8 @@ static const IID * const tid_ids[] = &IID_FolderItem2, &IID_FolderItems3, &IID_FolderItemVerb, - &IID_FolderItemVerbs + &IID_FolderItemVerbs, + &IID_IShellLinkDual2 }; static ITypeInfo *typeinfos[LAST_tid]; @@ -102,6 +103,14 @@ typedef struct { BSTR name; } FolderItemVerbImpl; +typedef struct { + IShellLinkDual2 IShellLinkDual2_iface; + LONG ref; + + IShellLinkW *shell_link; + IPersistFile *persist_file; +} ShellLinkObjectImpl; + static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) { return CONTAINING_RECORD(iface, ShellDispatch, IShellDispatch6_iface); @@ -132,6 +141,11 @@ static inline FolderItemVerbImpl *impl_from_FolderItemVerb(FolderItemVerb *iface return CONTAINING_RECORD(iface, FolderItemVerbImpl, FolderItemVerb_iface); } +static inline ShellLinkObjectImpl *impl_from_IShellLinkDual(IShellLinkDual2 *iface) +{ + return CONTAINING_RECORD(iface, ShellLinkObjectImpl, IShellLinkDual2_iface); +} + static HRESULT load_typelib(void) { ITypeLib *tl; @@ -617,6 +631,258 @@ failed: return hr; } +static HRESULT WINAPI ShellLinkObject_QueryInterface(IShellLinkDual2 *iface, REFIID riid, + LPVOID *ppv) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_IShellLinkDual, riid) || + IsEqualIID(&IID_IShellLinkDual2, riid)) + *ppv = &This->IShellLinkDual2_iface; + else + { + WARN("not implemented for %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ShellLinkObject_AddRef(IShellLinkDual2 *iface) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + if (!ref) + { + if (This->persist_file) IPersistFile_Release(This->persist_file); + if (This->shell_link) IShellLinkW_Release(This->shell_link); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ShellLinkObject_GetTypeInfoCount(IShellLinkDual2 *iface, UINT *pctinfo) +{ + TRACE("(%p,%p)\n", iface, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ShellLinkObject_GetTypeInfo(IShellLinkDual2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HRESULT hr; + + TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IShellLinkDual2_tid, ppTInfo); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*ppTInfo); + + return hr; +} + +static HRESULT WINAPI ShellLinkObject_GetIDsOfNames(IShellLinkDual2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + rgDispId); + + hr = get_typeinfo(IShellLinkDual2_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, rgszNames, cNames, rgDispId); + return hr; +} + +static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IShellLinkDual2_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, This, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return hr; +} + +static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Description(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Description(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_WorkingDirectory(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_WorkingDirectory(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Arguments(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Arguments(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Hotkey(IShellLinkDual2 *iface, int *piHK) +{ + FIXME("(%p, %p)\n", iface, piHK); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Hotkey(IShellLinkDual2 *iface, int iHK) +{ + FIXME("(%p, %d)\n", iface, iHK); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_ShowCommand(IShellLinkDual2 *iface, int *piShowCommand) +{ + FIXME("(%p, %p)\n", iface, piShowCommand); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_ShowCommand(IShellLinkDual2 *iface, int iShowCommand) +{ + FIXME("(%p, %d)\n", iface, iShowCommand); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_Resolve(IShellLinkDual2 *iface, int fFlags) +{ + FIXME("(%p, %d)\n", iface, fFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_GetIconLocation(IShellLinkDual2 *iface, BSTR *pbs, + int *piIcon) +{ + FIXME("(%p, %p, %p)\n", iface, pbs, piIcon); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_SetIconLocation(IShellLinkDual2 *iface, BSTR bs, + int iIcon) +{ + FIXME("(%p, %s, %d)\n", iface, debugstr_w(bs), iIcon); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_Save(IShellLinkDual2 *iface, VARIANT vWhere) +{ + FIXME("(%p, %s)\n", iface, debugstr_variant(&vWhere)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Target(IShellLinkDual2 *iface, FolderItem **ppfi) +{ + FIXME("(%p, %p)\n", iface, ppfi); + + return E_NOTIMPL; +} + +static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { + ShellLinkObject_QueryInterface, + ShellLinkObject_AddRef, + ShellLinkObject_Release, + ShellLinkObject_GetTypeInfoCount, + ShellLinkObject_GetTypeInfo, + ShellLinkObject_GetIDsOfNames, + ShellLinkObject_Invoke, + ShellLinkObject_get_Path, + ShellLinkObject_put_Path, + ShellLinkObject_get_Description, + ShellLinkObject_put_Description, + ShellLinkObject_get_WorkingDirectory, + ShellLinkObject_put_WorkingDirectory, + ShellLinkObject_get_Arguments, + ShellLinkObject_put_Arguments, + ShellLinkObject_get_Hotkey, + ShellLinkObject_put_Hotkey, + ShellLinkObject_get_ShowCommand, + ShellLinkObject_put_ShowCommand, + ShellLinkObject_Resolve, + ShellLinkObject_GetIconLocation, + ShellLinkObject_SetIconLocation, + ShellLinkObject_Save, + ShellLinkObject_get_Target, +}; + static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 54957875615..28b0b186b8e 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1408,6 +1408,154 @@ if (0) { /* crashes on winxp/win2k3 */ IShellDispatch_Release(sd); } +static void test_ShellLinkObject(void) +{ + HRESULT hr; + IShellDispatch *sd; + WCHAR path[MAX_PATH], + empty_path[MAX_PATH], + link_path[MAX_PATH]; + VARIANT v; + Folder2 *folder2; + Folder *folder; + FolderItem *item; + IDispatch *dispatch; + IShellLinkW *sl; + IShellLinkDual2* sld; + IPersistFile *pf; + BOOL ret; + BSTR str; + HANDLE file; + int hk; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (void**)&sd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + GetTempPathW(MAX_PATH, path); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(path); + hr = IShellDispatch_NameSpace(sd, v, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + hr = Folder_QueryInterface(folder, &IID_Folder2, (void**)&folder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + Folder_Release(folder); + + hr = Folder2_get_Self(folder2, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + dispatch = (IDispatch*)0xdeadbeef; + hr = FolderItem_get_GetLink(item, &dispatch); + ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + ok(dispatch == NULL, "got %p\n", dispatch); + + FolderItem_Release(item); + + PathCombineW(empty_path, path, L"winetest_empty_file.txt"); + file = CreateFileW(empty_path, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08x\n", GetLastError()); + CloseHandle(file); + + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&sl); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetPath(sl, empty_path); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_GetPath(sl, empty_path, MAX_PATH, NULL, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetDescription(sl, L"description"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetWorkingDirectory(sl, L"working directory"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetArguments(sl, L"arguments"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetHotkey(sl, 1234); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetShowCmd(sl, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellLinkW_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf); + ok(hr == S_OK, "got 0x%08x\n", hr); + + PathCombineW(link_path, path, L"winetest_filled.lnk"); + hr = IPersistFile_Save(pf, link_path, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPersistFile_Release(pf); + IShellLinkW_Release(sl); + + str = SysAllocString(L"winetest_filled.lnk"); + hr = Folder2_ParseName(folder2, str, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + dispatch = NULL; + hr = FolderItem_get_GetLink(item, &dispatch); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(dispatch != NULL, "got %p\n", dispatch); + + if (dispatch) { + sld = (IShellLinkDual2*)dispatch; + + str = NULL; + hr = IShellLinkDual2_get_Path(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, empty_path), "got %s (wanted %s)\n", + wine_dbgstr_w(str), wine_dbgstr_w(empty_path)); + SysFreeString(str); + } + + str = NULL; + hr = IShellLinkDual2_get_Description(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"description"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = NULL; + hr = IShellLinkDual2_get_WorkingDirectory(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"working directory"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = NULL; + hr = IShellLinkDual2_get_Arguments(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"arguments"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + hk = 0; + hr = IShellLinkDual2_get_Hotkey(sld, &hk); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hk == 1234, "got %i\n", hk); + + hk = 0; + hr = IShellLinkDual2_get_ShowCommand(sld, &hk); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hk == 1, "got %i\n", hk); + + IShellLinkDual2_Release(sld); + } + + FolderItem_Release(item); + + ret = DeleteFileW(link_path); + ok(ret, "DeleteFile failed: %08x\n", GetLastError()); + ret = DeleteFileW(empty_path); + ok(ret, "DeleteFile failed: %08x\n", GetLastError()); + + Folder2_Release(folder2); + + IShellDispatch_Release(sd); +} + static void test_ShellExecute(void) { HRESULT hr; @@ -1466,6 +1614,7 @@ START_TEST(shelldispatch) test_ShellWindows(); test_ParseName(); test_Verbs(); + test_ShellLinkObject(); test_ShellExecute(); CoUninitialize(); -- 2.28.0

1 0

[PATCH 2/4] shell32/tests: Add tests for ShellLinkObject.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Not everything is tested yet. I figured more tests can be added as needed, as this patchset is primarily intended to implement get_Path. dlls/shell32/tests/shelldispatch.c | 148 +++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 54957875615..3c1c473dede 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1408,6 +1408,153 @@ if (0) { /* crashes on winxp/win2k3 */ IShellDispatch_Release(sd); } +static void test_ShellLinkObject(void) +{ + HRESULT hr; + IShellDispatch *sd; + WCHAR path[MAX_PATH], orig_dir[MAX_PATH], tempW[MAX_PATH]; + CHAR tempA[MAX_PATH]; + VARIANT v; + Folder2 *folder2; + Folder *folder; + FolderItem *item; + IDispatch *dispatch; + IShellLinkA *sl; + IShellLinkDual2* sld; + IPersistFile *pf; + BOOL ret; + BSTR str; + FILE* fp; + int hk; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (void**)&sd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + GetTempPathW(MAX_PATH, path); + GetCurrentDirectoryW(MAX_PATH, orig_dir); + SetCurrentDirectoryW(path); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(path); + hr = IShellDispatch_NameSpace(sd, v, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + hr = Folder_QueryInterface(folder, &IID_Folder2, (void**)&folder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + Folder_Release(folder); + + hr = Folder2_get_Self(folder2, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + dispatch = (IDispatch*)0xdeadbeef; + hr = FolderItem_get_GetLink(item, &dispatch); + ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + ok(dispatch == NULL, "got %p\n", dispatch); + + FolderItem_Release(item); + + fp = fopen("winetest_empty_file.txt", "w"); + ok(!!fp, "got %p\n", fp); + fclose(fp); + + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (LPVOID*)&sl); + ok(hr == S_OK, "got 0x%08x\n", hr); + GetFullPathNameA("winetest_empty_file.txt", MAX_PATH, tempA, NULL); + hr = IShellLinkA_SetPath(sl, tempA); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkA_SetDescription(sl, "description"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkA_SetWorkingDirectory(sl, "working directory"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkA_SetArguments(sl, "arguments"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkA_SetHotkey(sl, 1234); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkA_SetShowCmd(sl, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersistFile_Save(pf, L"winetest_filled.lnk", TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPersistFile_Release(pf); + IShellLinkA_Release(sl); + + str = SysAllocString(L"winetest_filled.lnk"); + Folder2_ParseName(folder2, str, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + dispatch = (IDispatch*)0xdeadbeef; + hr = FolderItem_get_GetLink(item, &dispatch); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(dispatch && dispatch != (IDispatch*)0xdeadbeef, "got %p\n", dispatch); + + if (dispatch) { + sld = (IShellLinkDual2*)dispatch; + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_Path(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + GetFullPathNameW(L"winetest_empty_file.txt", MAX_PATH, tempW, NULL); + ok(!wcscmp(str, tempW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_Description(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"description"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_WorkingDirectory(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"working directory"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_Arguments(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"arguments"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + hk = 0; + hr = IShellLinkDual2_get_Hotkey(sld, &hk); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hk == 1234, "got %i\n", hk); + + hk = 0; + hr = IShellLinkDual2_get_ShowCommand(sld, &hk); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hk == 1, "got %i\n", hk); + + IShellLinkDual2_Release(sld); + } + + FolderItem_Release(item); + + ret = DeleteFileA("winetest_filled.lnk"); + ok(ret, "DeleteFile failed: %08x\n", GetLastError()); + ret = DeleteFileA("winetest_empty_file.txt"); + ok(ret, "DeleteFile failed: %08x\n", GetLastError()); + + Folder2_Release(folder2); + SetCurrentDirectoryW(orig_dir); + + IShellDispatch_Release(sd); +} + static void test_ShellExecute(void) { HRESULT hr; @@ -1466,6 +1613,7 @@ START_TEST(shelldispatch) test_ShellWindows(); test_ParseName(); test_Verbs(); + test_ShellLinkObject(); test_ShellExecute(); CoUninitialize(); -- 2.28.0

3 3

[PATCH v2 4/4] shell32: Implement ShellLinkObject::get_Path.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49591 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change. dlls/shell32/shelldispatch.c | 15 +++++++++++++-- dlls/shell32/tests/shelldispatch.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 3dcfe0ce626..df0e22191c4 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -738,9 +738,20 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) { - FIXME("(%p, %p)\n", iface, pbs); + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + WCHAR path[MAX_PATH]; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pbs); + + *pbs = NULL; + + hr = IShellLinkW_GetPath(This->shell_link, path, MAX_PATH, NULL, 0); + if (hr != S_OK) + return hr; + + *pbs = SysAllocString(path); + return hr; } static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3c3497abe7f..287f5be3ffc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1499,7 +1499,7 @@ static void test_ShellLinkObject(void) str = (BSTR)0xdeadbeef; hr = IShellLinkDual2_get_Path(sld, &str); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ok(!wcscmp(str, tempW), "got %s (wanted %s)\n", wine_dbgstr_w(str), wine_dbgstr_w(tempW)); -- 2.28.0

1 0

[PATCH v2 3/4] shell32: Implement FolderItem::get_GetLink.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change. dlls/shell32/shelldispatch.c | 17 +++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index f4947c815f1..3dcfe0ce626 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1109,10 +1109,23 @@ static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *path) static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, IDispatch **ppid) { - FIXME("(%p,%p)\n", iface, ppid); + IShellLinkDual2 *link; + HRESULT hr; + FolderItemImpl *This = impl_from_FolderItem(iface); + + TRACE("(%p,%p)\n", iface, ppid); *ppid = NULL; - return E_NOTIMPL; + + if (!(This->attributes & SFGAO_LINK)) + return E_NOTIMPL; + + hr = ShellLinkObject_Constructor(This, &link); + if (hr != S_OK) + return hr; + + *ppid = (IDispatch*)link; + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_GetFolder(FolderItem2 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 899a6b8de76..3c3497abe7f 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1491,8 +1491,8 @@ static void test_ShellLinkObject(void) dispatch = (IDispatch*)0xdeadbeef; hr = FolderItem_get_GetLink(item, &dispatch); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(dispatch && dispatch != (IDispatch*)0xdeadbeef, "got %p\n", dispatch); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dispatch && dispatch != (IDispatch*)0xdeadbeef, "got %p\n", dispatch); if (dispatch) { sld = (IShellLinkDual2*)dispatch; -- 2.28.0

1 0

[PATCH v2 2/4] shell32/tests: Add tests for ShellLinkObject.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: - Use IShellLinkW instead of IShellLinkA. - Fix test failures under w2008 by using IShellLink_GetPath instead of synthesizing the path. Not everything is tested yet. I figured more tests can be added as needed, as this patchset is primarily intended to implement get_Path. dlls/shell32/tests/shelldispatch.c | 149 +++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 54957875615..899a6b8de76 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1408,6 +1408,154 @@ if (0) { /* crashes on winxp/win2k3 */ IShellDispatch_Release(sd); } +static void test_ShellLinkObject(void) +{ + HRESULT hr; + IShellDispatch *sd; + WCHAR path[MAX_PATH], orig_dir[MAX_PATH], tempW[MAX_PATH]; + VARIANT v; + Folder2 *folder2; + Folder *folder; + FolderItem *item; + IDispatch *dispatch; + IShellLinkW *sl; + IShellLinkDual2* sld; + IPersistFile *pf; + BOOL ret; + BSTR str; + FILE* fp; + int hk; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (void**)&sd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + GetTempPathW(MAX_PATH, path); + GetCurrentDirectoryW(MAX_PATH, orig_dir); + SetCurrentDirectoryW(path); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(path); + hr = IShellDispatch_NameSpace(sd, v, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + hr = Folder_QueryInterface(folder, &IID_Folder2, (void**)&folder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + Folder_Release(folder); + + hr = Folder2_get_Self(folder2, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + dispatch = (IDispatch*)0xdeadbeef; + hr = FolderItem_get_GetLink(item, &dispatch); + ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + ok(dispatch == NULL, "got %p\n", dispatch); + + FolderItem_Release(item); + + fp = fopen("winetest_empty_file.txt", "w"); + ok(!!fp, "got %p\n", fp); + fclose(fp); + + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&sl); + ok(hr == S_OK, "got 0x%08x\n", hr); + GetFullPathNameW(L"winetest_empty_file.txt", MAX_PATH, tempW, NULL); + hr = IShellLinkW_SetPath(sl, tempW); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_GetPath(sl, tempW, MAX_PATH, NULL, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetDescription(sl, L"description"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetWorkingDirectory(sl, L"working directory"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetArguments(sl, L"arguments"); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetHotkey(sl, 1234); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellLinkW_SetShowCmd(sl, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellLinkW_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersistFile_Save(pf, L"winetest_filled.lnk", TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPersistFile_Release(pf); + IShellLinkW_Release(sl); + + str = SysAllocString(L"winetest_filled.lnk"); + Folder2_ParseName(folder2, str, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + dispatch = (IDispatch*)0xdeadbeef; + hr = FolderItem_get_GetLink(item, &dispatch); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(dispatch && dispatch != (IDispatch*)0xdeadbeef, "got %p\n", dispatch); + + if (dispatch) { + sld = (IShellLinkDual2*)dispatch; + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_Path(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, tempW), "got %s (wanted %s)\n", + wine_dbgstr_w(str), wine_dbgstr_w(tempW)); + SysFreeString(str); + } + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_Description(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"description"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_WorkingDirectory(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"working directory"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = (BSTR)0xdeadbeef; + hr = IShellLinkDual2_get_Arguments(sld, &str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) { + ok(!wcscmp(str, L"arguments"), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + hk = 0; + hr = IShellLinkDual2_get_Hotkey(sld, &hk); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hk == 1234, "got %i\n", hk); + + hk = 0; + hr = IShellLinkDual2_get_ShowCommand(sld, &hk); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hk == 1, "got %i\n", hk); + + IShellLinkDual2_Release(sld); + } + + FolderItem_Release(item); + + ret = DeleteFileA("winetest_filled.lnk"); + ok(ret, "DeleteFile failed: %08x\n", GetLastError()); + ret = DeleteFileA("winetest_empty_file.txt"); + ok(ret, "DeleteFile failed: %08x\n", GetLastError()); + + Folder2_Release(folder2); + SetCurrentDirectoryW(orig_dir); + + IShellDispatch_Release(sd); +} + static void test_ShellExecute(void) { HRESULT hr; @@ -1466,6 +1614,7 @@ START_TEST(shelldispatch) test_ShellWindows(); test_ParseName(); test_Verbs(); + test_ShellLinkObject(); test_ShellExecute(); CoUninitialize(); -- 2.28.0

1 0

[PATCH v2 1/4] shell32: Add ShellLinkObject stubs.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change. This was done somewhat blindly, copied from other classes in the file. Here are some things that may need to be fixed: - I'm not sure if it should be named ShellLinkObject_* or IShellLinkDual[2]_* - Some of the other classes (ShellDispatch) used QueryInterface in Constructor, while others didn't (FolderItem). I decided not to use it for simplicity. - Should .item be AddRef'd? dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 308 ++++++++++++++++++++++++++++++++++- 2 files changed, 308 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 11a96309e8b..3465a3c8445 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -222,6 +222,7 @@ enum tid_t { FolderItems3_tid, FolderItemVerb_tid, FolderItemVerbs_tid, + IShellLinkDual2_tid, LAST_tid }; diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index c6d1dab7f62..f4947c815f1 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -51,7 +51,8 @@ static const IID * const tid_ids[] = &IID_FolderItem2, &IID_FolderItems3, &IID_FolderItemVerb, - &IID_FolderItemVerbs + &IID_FolderItemVerbs, + &IID_IShellLinkDual2 }; static ITypeInfo *typeinfos[LAST_tid]; @@ -102,6 +103,15 @@ typedef struct { BSTR name; } FolderItemVerbImpl; +typedef struct { + IShellLinkDual2 IShellLinkDual2_iface; + LONG ref; + + FolderItemImpl *item; + IShellLinkW *shell_link; + IPersistFile *persist_file; +} ShellLinkObjectImpl; + static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) { return CONTAINING_RECORD(iface, ShellDispatch, IShellDispatch6_iface); @@ -132,6 +142,11 @@ static inline FolderItemVerbImpl *impl_from_FolderItemVerb(FolderItemVerb *iface return CONTAINING_RECORD(iface, FolderItemVerbImpl, FolderItemVerb_iface); } +static inline ShellLinkObjectImpl *impl_from_IShellLinkDual(IShellLinkDual2 *iface) +{ + return CONTAINING_RECORD(iface, ShellLinkObjectImpl, IShellLinkDual2_iface); +} + static HRESULT load_typelib(void) { ITypeLib *tl; @@ -617,6 +632,297 @@ failed: return hr; } +static HRESULT WINAPI ShellLinkObject_QueryInterface(IShellLinkDual2 *iface, REFIID riid, + LPVOID *ppv) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_IShellLinkDual, riid) || + IsEqualIID(&IID_IShellLinkDual2, riid)) + *ppv = &This->IShellLinkDual2_iface; + else + { + WARN("not implemented for %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ShellLinkObject_AddRef(IShellLinkDual2 *iface) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + if (!ref) + { + if (This->persist_file) IPersistFile_Release(This->persist_file); + if (This->shell_link) IShellLinkW_Release(This->shell_link); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ShellLinkObject_GetTypeInfoCount(IShellLinkDual2 *iface, UINT *pctinfo) +{ + TRACE("(%p,%p)\n", iface, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ShellLinkObject_GetTypeInfo(IShellLinkDual2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HRESULT hr; + + TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IShellLinkDual2_tid, ppTInfo); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*ppTInfo); + + return hr; +} + +static HRESULT WINAPI ShellLinkObject_GetIDsOfNames(IShellLinkDual2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + rgDispId); + + hr = get_typeinfo(IShellLinkDual2_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, rgszNames, cNames, rgDispId); + return hr; +} + +static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IShellLinkDual2_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, This, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return hr; +} + +static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Description(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Description(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_WorkingDirectory(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_WorkingDirectory(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Arguments(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Arguments(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Hotkey(IShellLinkDual2 *iface, int *piHK) +{ + FIXME("(%p, %p)\n", iface, piHK); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Hotkey(IShellLinkDual2 *iface, int iHK) +{ + FIXME("(%p, %d)\n", iface, iHK); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_ShowCommand(IShellLinkDual2 *iface, int *piShowCommand) +{ + FIXME("(%p, %p)\n", iface, piShowCommand); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_ShowCommand(IShellLinkDual2 *iface, int iShowCommand) +{ + FIXME("(%p, %d)\n", iface, iShowCommand); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_Resolve(IShellLinkDual2 *iface, int fFlags) +{ + FIXME("(%p, %d)\n", iface, fFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_GetIconLocation(IShellLinkDual2 *iface, BSTR *pbs, + int *piIcon) +{ + FIXME("(%p, %p, %p)\n", iface, pbs, piIcon); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_SetIconLocation(IShellLinkDual2 *iface, BSTR bs, + int iIcon) +{ + FIXME("(%p, %s, %d)\n", iface, debugstr_w(bs), iIcon); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_Save(IShellLinkDual2 *iface, VARIANT vWhere) +{ + FIXME("(%p, %s)\n", iface, debugstr_variant(&vWhere)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Target(IShellLinkDual2 *iface, FolderItem **ppfi) +{ + FIXME("(%p, %p)\n", iface, ppfi); + + return E_NOTIMPL; +} + +static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { + ShellLinkObject_QueryInterface, + ShellLinkObject_AddRef, + ShellLinkObject_Release, + ShellLinkObject_GetTypeInfoCount, + ShellLinkObject_GetTypeInfo, + ShellLinkObject_GetIDsOfNames, + ShellLinkObject_Invoke, + ShellLinkObject_get_Path, + ShellLinkObject_put_Path, + ShellLinkObject_get_Description, + ShellLinkObject_put_Description, + ShellLinkObject_get_WorkingDirectory, + ShellLinkObject_put_WorkingDirectory, + ShellLinkObject_get_Arguments, + ShellLinkObject_put_Arguments, + ShellLinkObject_get_Hotkey, + ShellLinkObject_put_Hotkey, + ShellLinkObject_get_ShowCommand, + ShellLinkObject_put_ShowCommand, + ShellLinkObject_Resolve, + ShellLinkObject_GetIconLocation, + ShellLinkObject_SetIconLocation, + ShellLinkObject_Save, + ShellLinkObject_get_Target, +}; + +static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 **link) +{ + HRESULT hr; + ShellLinkObjectImpl *This; + + TRACE("%p\n", item); + + *link = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; + This->ref = 1; + + This->item = item; + + This->shell_link = NULL; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&This->shell_link); + if (hr != S_OK) goto free_this; + + This->persist_file = NULL; + IShellLinkW_QueryInterface(This->shell_link, &IID_IPersistFile, + (LPVOID*)&This->persist_file); + if (hr != S_OK) goto free_this; + + hr = IPersistFile_Load(This->persist_file, item->path, STGM_READ); + if (hr != S_OK) goto free_this; + + IShellLinkDual2_AddRef(&This->IShellLinkDual2_iface); + + *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; + return S_OK; + + free_this: + heap_free(This); + return hr; +} + static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, REFIID riid, LPVOID *ppv) { -- 2.28.0

1 0