May 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : shell32: Implement FolderItemVerbs::Item().
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: bf41160c656b351a750a9e765b36bbe17276c66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf41160c656b351a750a9e765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 10 22:45:52 2015 +0300 shell32: Implement FolderItemVerbs::Item(). --- dlls/shell32/shelldispatch.c | 100 +++++++++++++++++++++++++++++++------ dlls/shell32/tests/shelldispatch.c | 39 ++++++++++++++- 2 files changed, 121 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 650b7d3..f5eca28 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -74,13 +74,17 @@ typedef struct { FolderItemVerbs FolderItemVerbs_iface; LONG ref; - IContextMenu *menu; + IContextMenu *contextmenu; + HMENU hMenu; LONG count; } FolderItemVerbsImpl; typedef struct { FolderItemVerb FolderItemVerb_iface; LONG ref; + + IContextMenu *contextmenu; + BSTR name; } FolderItemVerbImpl; static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) @@ -209,7 +213,11 @@ static ULONG WINAPI FolderItemVerbImpl_Release(FolderItemVerb *iface) TRACE("(%p), new refcount=%i\n", iface, ref); if (!ref) + { + IContextMenu_Release(This->contextmenu); + SysFreeString(This->name); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -280,8 +288,12 @@ static HRESULT WINAPI FolderItemVerbImpl_get_Parent(FolderItemVerb *iface, IDisp static HRESULT WINAPI FolderItemVerbImpl_get_Name(FolderItemVerb *iface, BSTR *name) { - FIXME("(%p, %p)\n", iface, name); - return E_NOTIMPL; + FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); + + TRACE("(%p, %p)\n", iface, name); + + *name = SysAllocString(This->name); + return *name ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI FolderItemVerbImpl_DoIt(FolderItemVerb *iface) @@ -304,11 +316,11 @@ static FolderItemVerbVtbl folderitemverbvtbl = { FolderItemVerbImpl_DoIt }; -static HRESULT FolderItemVerb_Constructor(FolderItemVerb **verb) +static HRESULT FolderItemVerb_Constructor(IContextMenu *contextmenu, BSTR name, FolderItemVerb **verb) { FolderItemVerbImpl *This; - *verb = NULL; + TRACE("%p, %s\n", contextmenu, debugstr_w(name)); This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbImpl)); if (!This) @@ -316,6 +328,9 @@ static HRESULT FolderItemVerb_Constructor(FolderItemVerb **verb) This->FolderItemVerb_iface.lpVtbl = &folderitemverbvtbl; This->ref = 1; + This->contextmenu = contextmenu; + IContextMenu_AddRef(contextmenu); + This->name = name; *verb = &This->FolderItemVerb_iface; return S_OK; @@ -365,7 +380,8 @@ static ULONG WINAPI FolderItemVerbsImpl_Release(FolderItemVerbs *iface) if (!ref) { - IContextMenu_Release(This->menu); + IContextMenu_Release(This->contextmenu); + DestroyMenu(This->hMenu); HeapFree(GetProcessHeap(), 0, This); } @@ -430,6 +446,9 @@ static HRESULT WINAPI FolderItemVerbsImpl_get_Count(FolderItemVerbs *iface, LONG TRACE("(%p, %p)\n", iface, count); + if (!count) + return E_INVALIDARG; + *count = This->count; return S_OK; } @@ -448,8 +467,56 @@ static HRESULT WINAPI FolderItemVerbsImpl_get_Parent(FolderItemVerbs *iface, IDi static HRESULT WINAPI FolderItemVerbsImpl_Item(FolderItemVerbs *iface, VARIANT index, FolderItemVerb **verb) { - FIXME("(%p, %s, %p)\n", iface, debugstr_variant(&index), verb); - return FolderItemVerb_Constructor(verb); + FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); + MENUITEMINFOW info; + HRESULT hr; + VARIANT v; + BSTR name; + + TRACE("(%p, %s, %p)\n", iface, debugstr_variant(&index), verb); + + if (!verb) + return E_INVALIDARG; + + *verb = NULL; + + VariantInit(&v); + VariantCopyInd(&v, &index); + + hr = VariantChangeType(&v, &v, 0, VT_I4); + if (FAILED(hr)) + { + FIXME("failed to coerce to VT_I4, %s\n", debugstr_variant(&v)); + return hr; + } + + if (V_I4(&v) > This->count) + return S_OK; + + if (V_I4(&v) == This->count) + name = SysAllocStringLen(NULL, 0); + else + { + /* get item name */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING; + if (!GetMenuItemInfoW(This->hMenu, V_I4(&v), TRUE, &info)) + return E_FAIL; + + name = SysAllocStringLen(NULL, info.cch); + if (name) + { + info.dwTypeData = name; + info.cch++; + GetMenuItemInfoW(This->hMenu, V_I4(&v), TRUE, &info); + } + } + + if (!name) + return E_OUTOFMEMORY; + + return FolderItemVerb_Constructor(This->contextmenu, name, verb); } static HRESULT WINAPI FolderItemVerbsImpl__NewEnum(FolderItemVerbs *iface, IUnknown **ret) @@ -480,7 +547,6 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) LPCITEMIDLIST child; LPITEMIDLIST pidl; HRESULT hr; - HMENU menu; This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbsImpl)); if (!This) @@ -488,7 +554,6 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) This->FolderItemVerbs_iface.lpVtbl = &folderitemverbsvtbl; This->ref = 1; - This->count = 0; /* build context menu for this path */ hr = SHParseDisplayName(path, NULL, &pidl, 0, NULL); @@ -500,17 +565,20 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) if (FAILED(hr)) goto failed; - hr = IShellFolder_GetUIObjectOf(folder, NULL, 1, &child, &IID_IContextMenu, NULL, (void**)&This->menu); + hr = IShellFolder_GetUIObjectOf(folder, NULL, 1, &child, &IID_IContextMenu, NULL, (void**)&This->contextmenu); IShellFolder_Release(folder); if (FAILED(hr)) goto failed; - menu = CreatePopupMenu(); - hr = IContextMenu_QueryContextMenu(This->menu, menu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); - if (SUCCEEDED(hr)) - This->count = GetMenuItemCount(menu); - DestroyMenu(menu); + This->hMenu = CreatePopupMenu(); + hr = IContextMenu_QueryContextMenu(This->contextmenu, This->hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + if (FAILED(hr)) + { + FolderItemVerbs_Release(&This->FolderItemVerbs_iface); + return hr; + } + This->count = GetMenuItemCount(This->hMenu); *verbs = &This->FolderItemVerbs_iface; return S_OK; diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 167972b..f9d92ee 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -747,13 +747,15 @@ static void test_Verbs(void) { FolderItemVerbs *verbs; WCHAR pathW[MAX_PATH]; + FolderItemVerb *verb; IShellDispatch *sd; FolderItem *item; Folder2 *folder2; Folder *folder; HRESULT hr; - LONG count; + LONG count, i; VARIANT v; + BSTR str; hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void**)&sd); @@ -778,15 +780,48 @@ if (0) { /* crashes on some systems */ hr = FolderItem_Verbs(item, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); } - hr = FolderItem_Verbs(item, &verbs); ok(hr == S_OK, "got 0x%08x\n", hr); +if (0) { /* crashes on winxp/win2k3 */ + hr = FolderItemVerbs_get_Count(verbs, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} count = 0; hr = FolderItemVerbs_get_Count(verbs, &count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(count > 0, "got count %d\n", count); +if (0) { /* crashes on winxp/win2k3 */ + V_VT(&v) = VT_I4; + V_I4(&v) = 0; + hr = FolderItemVerbs_Item(verbs, v, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + /* there's always one item more, so you can access [0,count], + instead of actual [0,count) */ + for (i = 0; i <= count; i++) { + V_VT(&v) = VT_I4; + V_I4(&v) = i; + hr = FolderItemVerbs_Item(verbs, v, &verb); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = FolderItemVerb_get_Name(verb, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(str != NULL, "%d: name %s\n", i, wine_dbgstr_w(str)); + if (i == count) + ok(str[0] == 0, "%d: got teminating item %s\n", i, wine_dbgstr_w(str)); + + SysFreeString(str); + FolderItemVerb_Release(verb); + } + + V_VT(&v) = VT_I4; + V_I4(&v) = count+1; + verb = NULL; + hr = FolderItemVerbs_Item(verbs, v, &verb); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(verb == NULL, "got %p\n", verb); + FolderItem_Release(item); IShellDispatch_Release(sd); }

1 0

Nikolay Sivov : shell32: Added FolderItemVerb stub.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 8f72117f19d8966b2543897df243474e6dda0aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f72117f19d8966b2543897df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 10 21:37:00 2015 +0300 shell32: Added FolderItemVerb stub. --- dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 168 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 168 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 938387b..492f79f 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -235,6 +235,7 @@ enum tid_t { IShellFolderViewDual3_tid, Folder3_tid, FolderItem2_tid, + FolderItemVerb_tid, FolderItemVerbs_tid, LAST_tid }; diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 66603ad..650b7d3 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -48,6 +48,7 @@ static const IID * const tid_ids[] = &IID_IShellFolderViewDual3, &IID_Folder3, &IID_FolderItem2, + &IID_FolderItemVerb, &IID_FolderItemVerbs }; static ITypeInfo *typeinfos[LAST_tid]; @@ -77,6 +78,11 @@ typedef struct { LONG count; } FolderItemVerbsImpl; +typedef struct { + FolderItemVerb FolderItemVerb_iface; + LONG ref; +} FolderItemVerbImpl; + static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) { return CONTAINING_RECORD(iface, ShellDispatch, IShellDispatch6_iface); @@ -97,6 +103,11 @@ static inline FolderItemVerbsImpl *impl_from_FolderItemVerbs(FolderItemVerbs *if return CONTAINING_RECORD(iface, FolderItemVerbsImpl, FolderItemVerbs_iface); } +static inline FolderItemVerbImpl *impl_from_FolderItemVerb(FolderItemVerb *iface) +{ + return CONTAINING_RECORD(iface, FolderItemVerbImpl, FolderItemVerb_iface); +} + static HRESULT load_typelib(void) { ITypeLib *tl; @@ -155,6 +166,161 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) return S_OK; } +/* FolderItemVerb */ +static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface, + REFIID riid, void **ppv) +{ + FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); + + TRACE("(%p,%p,%p)\n", iface, riid, ppv); + + *ppv = NULL; + + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_FolderItemVerb, riid)) + *ppv = &This->FolderItemVerb_iface; + else + { + FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI FolderItemVerbImpl_AddRef(FolderItemVerb *iface) +{ + FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI FolderItemVerbImpl_Release(FolderItemVerb *iface) +{ + FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI FolderItemVerbImpl_GetTypeInfoCount(FolderItemVerb *iface, UINT *pctinfo) +{ + TRACE("(%p,%p)\n", iface, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI FolderItemVerbImpl_GetTypeInfo(FolderItemVerb *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HRESULT hr; + + TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(FolderItemVerb_tid, ppTInfo); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*ppTInfo); + return hr; +} + +static HRESULT WINAPI FolderItemVerbImpl_GetIDsOfNames(FolderItemVerb *iface, + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + rgDispId); + + hr = get_typeinfo(FolderItemVerb_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, rgszNames, cNames, rgDispId); + return hr; +} + +static HRESULT WINAPI FolderItemVerbImpl_Invoke(FolderItemVerb *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(FolderItemVerb_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return hr; +} + +static HRESULT WINAPI FolderItemVerbImpl_get_Application(FolderItemVerb *iface, IDispatch **disp) +{ + FIXME("(%p, %p)\n", iface, disp); + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemVerbImpl_get_Parent(FolderItemVerb *iface, IDispatch **disp) +{ + FIXME("(%p, %p)\n", iface, disp); + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemVerbImpl_get_Name(FolderItemVerb *iface, BSTR *name) +{ + FIXME("(%p, %p)\n", iface, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemVerbImpl_DoIt(FolderItemVerb *iface) +{ + FIXME("(%p)\n", iface); + return E_NOTIMPL; +} + +static FolderItemVerbVtbl folderitemverbvtbl = { + FolderItemVerbImpl_QueryInterface, + FolderItemVerbImpl_AddRef, + FolderItemVerbImpl_Release, + FolderItemVerbImpl_GetTypeInfoCount, + FolderItemVerbImpl_GetTypeInfo, + FolderItemVerbImpl_GetIDsOfNames, + FolderItemVerbImpl_Invoke, + FolderItemVerbImpl_get_Application, + FolderItemVerbImpl_get_Parent, + FolderItemVerbImpl_get_Name, + FolderItemVerbImpl_DoIt +}; + +static HRESULT FolderItemVerb_Constructor(FolderItemVerb **verb) +{ + FolderItemVerbImpl *This; + + *verb = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->FolderItemVerb_iface.lpVtbl = &folderitemverbvtbl; + This->ref = 1; + + *verb = &This->FolderItemVerb_iface; + return S_OK; +} + /* FolderItemVerbs */ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface, REFIID riid, void **ppv) @@ -283,7 +449,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_get_Parent(FolderItemVerbs *iface, IDi static HRESULT WINAPI FolderItemVerbsImpl_Item(FolderItemVerbs *iface, VARIANT index, FolderItemVerb **verb) { FIXME("(%p, %s, %p)\n", iface, debugstr_variant(&index), verb); - return E_NOTIMPL; + return FolderItemVerb_Constructor(verb); } static HRESULT WINAPI FolderItemVerbsImpl__NewEnum(FolderItemVerbs *iface, IUnknown **ret)

1 0

Nikolay Sivov : shell32: Implement FolderItemVerbs_get_Count().
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 77c2892d87cef744203d9fc6ef4b8b16e331dd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c2892d87cef744203d9fc6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 10 21:34:58 2015 +0300 shell32: Implement FolderItemVerbs_get_Count(). --- dlls/shell32/shelldispatch.c | 62 ++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shelldispatch.c | 2 -- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 2b4342f..66603ad 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -72,6 +72,9 @@ typedef struct { typedef struct { FolderItemVerbs FolderItemVerbs_iface; LONG ref; + + IContextMenu *menu; + LONG count; } FolderItemVerbsImpl; static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) @@ -195,7 +198,10 @@ static ULONG WINAPI FolderItemVerbsImpl_Release(FolderItemVerbs *iface) TRACE("(%p), new refcount=%i\n", iface, ref); if (!ref) + { + IContextMenu_Release(This->menu); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -254,8 +260,12 @@ static HRESULT WINAPI FolderItemVerbsImpl_Invoke(FolderItemVerbs *iface, static HRESULT WINAPI FolderItemVerbsImpl_get_Count(FolderItemVerbs *iface, LONG *count) { - FIXME("(%p, %p)\n", iface, count); - return E_NOTIMPL; + FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); + + TRACE("(%p, %p)\n", iface, count); + + *count = This->count; + return S_OK; } static HRESULT WINAPI FolderItemVerbsImpl_get_Application(FolderItemVerbs *iface, IDispatch **disp) @@ -297,11 +307,14 @@ static FolderItemVerbsVtbl folderitemverbsvtbl = { FolderItemVerbsImpl__NewEnum }; -static HRESULT FolderItemVerbs_Constructor(FolderItemVerbs **verbs) +static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) { FolderItemVerbsImpl *This; - - *verbs = NULL; + IShellFolder *folder; + LPCITEMIDLIST child; + LPITEMIDLIST pidl; + HRESULT hr; + HMENU menu; This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbsImpl)); if (!This) @@ -309,9 +322,35 @@ static HRESULT FolderItemVerbs_Constructor(FolderItemVerbs **verbs) This->FolderItemVerbs_iface.lpVtbl = &folderitemverbsvtbl; This->ref = 1; + This->count = 0; + + /* build context menu for this path */ + hr = SHParseDisplayName(path, NULL, &pidl, 0, NULL); + if (FAILED(hr)) + goto failed; + + hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, &child); + CoTaskMemFree(pidl); + if (FAILED(hr)) + goto failed; + + hr = IShellFolder_GetUIObjectOf(folder, NULL, 1, &child, &IID_IContextMenu, NULL, (void**)&This->menu); + IShellFolder_Release(folder); + if (FAILED(hr)) + goto failed; + + menu = CreatePopupMenu(); + hr = IContextMenu_QueryContextMenu(This->menu, menu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + if (SUCCEEDED(hr)) + This->count = GetMenuItemCount(menu); + DestroyMenu(menu); *verbs = &This->FolderItemVerbs_iface; return S_OK; + +failed: + HeapFree(GetProcessHeap(), 0, This); + return hr; } static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, @@ -570,12 +609,23 @@ static HRESULT WINAPI FolderItemImpl_get_Type(FolderItem2 *iface, BSTR *pbs) static HRESULT WINAPI FolderItemImpl_Verbs(FolderItem2 *iface, FolderItemVerbs **verbs) { + HRESULT hr; + BSTR path; + TRACE("(%p, %p)\n", iface, verbs); if (!verbs) return E_INVALIDARG; - return FolderItemVerbs_Constructor(verbs); + *verbs = NULL; + + hr = FolderItem2_get_Path(iface, &path); + if (FAILED(hr)) + return hr; + + hr = FolderItemVerbs_Constructor(path, verbs); + SysFreeString(path); + return hr; } static HRESULT WINAPI FolderItemImpl_InvokeVerb(FolderItem2 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 4295311..167972b 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -784,10 +784,8 @@ if (0) { /* crashes on some systems */ count = 0; hr = FolderItemVerbs_get_Count(verbs, &count); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(count > 0, "got count %d\n", count); -} FolderItem_Release(item); IShellDispatch_Release(sd);

1 0

Nikolay Sivov : shell32: Added FolderItemVerbs stub.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 540171bc91908a4d059a1038662111340ca49586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540171bc91908a4d059a10386… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 10 21:02:55 2015 +0300 shell32: Added FolderItemVerbs stub. --- dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 186 +++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 51 ++++++++++ 3 files changed, 232 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 18503eb..938387b 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -235,6 +235,7 @@ enum tid_t { IShellFolderViewDual3_tid, Folder3_tid, FolderItem2_tid, + FolderItemVerbs_tid, LAST_tid }; diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 6e13123..2b4342f 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -47,7 +47,8 @@ static const IID * const tid_ids[] = &IID_IShellDispatch6, &IID_IShellFolderViewDual3, &IID_Folder3, - &IID_FolderItem2 + &IID_FolderItem2, + &IID_FolderItemVerbs }; static ITypeInfo *typeinfos[LAST_tid]; @@ -68,6 +69,11 @@ typedef struct { VARIANT dir; } FolderItemImpl; +typedef struct { + FolderItemVerbs FolderItemVerbs_iface; + LONG ref; +} FolderItemVerbsImpl; + static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) { return CONTAINING_RECORD(iface, ShellDispatch, IShellDispatch6_iface); @@ -83,6 +89,11 @@ static inline FolderItemImpl *impl_from_FolderItem(FolderItem2 *iface) return CONTAINING_RECORD(iface, FolderItemImpl, FolderItem2_iface); } +static inline FolderItemVerbsImpl *impl_from_FolderItemVerbs(FolderItemVerbs *iface) +{ + return CONTAINING_RECORD(iface, FolderItemVerbsImpl, FolderItemVerbs_iface); +} + static HRESULT load_typelib(void) { ITypeLib *tl; @@ -141,6 +152,168 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) return S_OK; } +/* FolderItemVerbs */ +static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface, + REFIID riid, void **ppv) +{ + FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); + + TRACE("(%p,%p,%p)\n", iface, riid, ppv); + + *ppv = NULL; + + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_FolderItemVerbs, riid)) + *ppv = &This->FolderItemVerbs_iface; + else + { + FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI FolderItemVerbsImpl_AddRef(FolderItemVerbs *iface) +{ + FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI FolderItemVerbsImpl_Release(FolderItemVerbs *iface) +{ + FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI FolderItemVerbsImpl_GetTypeInfoCount(FolderItemVerbs *iface, UINT *pctinfo) +{ + TRACE("(%p,%p)\n", iface, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI FolderItemVerbsImpl_GetTypeInfo(FolderItemVerbs *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HRESULT hr; + + TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(FolderItemVerbs_tid, ppTInfo); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*ppTInfo); + return hr; +} + +static HRESULT WINAPI FolderItemVerbsImpl_GetIDsOfNames(FolderItemVerbs *iface, + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + rgDispId); + + hr = get_typeinfo(FolderItemVerbs_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, rgszNames, cNames, rgDispId); + return hr; +} + +static HRESULT WINAPI FolderItemVerbsImpl_Invoke(FolderItemVerbs *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(FolderItemVerbs_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return hr; +} + +static HRESULT WINAPI FolderItemVerbsImpl_get_Count(FolderItemVerbs *iface, LONG *count) +{ + FIXME("(%p, %p)\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemVerbsImpl_get_Application(FolderItemVerbs *iface, IDispatch **disp) +{ + FIXME("(%p, %p)\n", iface, disp); + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemVerbsImpl_get_Parent(FolderItemVerbs *iface, IDispatch **disp) +{ + FIXME("(%p, %p)\n", iface, disp); + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemVerbsImpl_Item(FolderItemVerbs *iface, VARIANT index, FolderItemVerb **verb) +{ + FIXME("(%p, %s, %p)\n", iface, debugstr_variant(&index), verb); + return E_NOTIMPL; +} + +static HRESULT WINAPI FolderItemVerbsImpl__NewEnum(FolderItemVerbs *iface, IUnknown **ret) +{ + FIXME("(%p, %p)\n", iface, ret); + return E_NOTIMPL; +} + +static FolderItemVerbsVtbl folderitemverbsvtbl = { + FolderItemVerbsImpl_QueryInterface, + FolderItemVerbsImpl_AddRef, + FolderItemVerbsImpl_Release, + FolderItemVerbsImpl_GetTypeInfoCount, + FolderItemVerbsImpl_GetTypeInfo, + FolderItemVerbsImpl_GetIDsOfNames, + FolderItemVerbsImpl_Invoke, + FolderItemVerbsImpl_get_Count, + FolderItemVerbsImpl_get_Application, + FolderItemVerbsImpl_get_Parent, + FolderItemVerbsImpl_Item, + FolderItemVerbsImpl__NewEnum +}; + +static HRESULT FolderItemVerbs_Constructor(FolderItemVerbs **verbs) +{ + FolderItemVerbsImpl *This; + + *verbs = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbsImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->FolderItemVerbs_iface.lpVtbl = &folderitemverbsvtbl; + This->ref = 1; + + *verbs = &This->FolderItemVerbs_iface; + return S_OK; +} + static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, REFIID riid, LPVOID *ppv) { @@ -395,13 +568,14 @@ static HRESULT WINAPI FolderItemImpl_get_Type(FolderItem2 *iface, BSTR *pbs) return E_NOTIMPL; } -static HRESULT WINAPI FolderItemImpl_Verbs(FolderItem2 *iface, - FolderItemVerbs **ppfic) +static HRESULT WINAPI FolderItemImpl_Verbs(FolderItem2 *iface, FolderItemVerbs **verbs) { - FIXME("(%p,%p)\n", iface, ppfic); + TRACE("(%p, %p)\n", iface, verbs); - *ppfic = NULL; - return E_NOTIMPL; + if (!verbs) + return E_INVALIDARG; + + return FolderItemVerbs_Constructor(verbs); } static HRESULT WINAPI FolderItemImpl_InvokeVerb(FolderItem2 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 851d775..4295311 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -743,6 +743,56 @@ static void test_ParseName(void) IShellDispatch_Release(sd); } +static void test_Verbs(void) +{ + FolderItemVerbs *verbs; + WCHAR pathW[MAX_PATH]; + IShellDispatch *sd; + FolderItem *item; + Folder2 *folder2; + Folder *folder; + HRESULT hr; + LONG count; + VARIANT v; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (void**)&sd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + GetTempPathW(sizeof(pathW)/sizeof(pathW[0]), pathW); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(pathW); + 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); + Folder2_Release(folder2); + +if (0) { /* crashes on some systems */ + hr = FolderItem_Verbs(item, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + + hr = FolderItem_Verbs(item, &verbs); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = FolderItemVerbs_get_Count(verbs, &count); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count > 0, "got count %d\n", count); +} + + FolderItem_Release(item); + IShellDispatch_Release(sd); +} + START_TEST(shelldispatch) { HRESULT r; @@ -758,6 +808,7 @@ START_TEST(shelldispatch) test_ShellFolderViewDual(); test_ShellWindows(); test_ParseName(); + test_Verbs(); CoUninitialize(); }

1 0

Nikolay Sivov : shell32: Partially implement SHGetKnownFolderIDList().
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 80d28abdc8cadb6dc5e35c36c2d9f71eddff50f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d28abdc8cadb6dc5e35c36c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 21:46:56 2015 +0300 shell32: Partially implement SHGetKnownFolderIDList(). --- dlls/shell32/shellpath.c | 44 ++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shellpath.c | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 331db1f..42f34a2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5727,8 +5727,48 @@ HRESULT WINAPI KnownFolderManager_Constructor( IUnknown *punk, REFIID riid, void HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PIDLIST_ABSOLUTE *pidl) { - FIXME("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); - return E_NOTIMPL; + TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); + + if (!pidl) + return E_INVALIDARG; + + if (flags) + FIXME("unsupported flags: 0x%08x\n", flags); + + if (token) + FIXME("user token is not used.\n"); + + *pidl = NULL; + if (IsEqualIID(rfid, &FOLDERID_Desktop)) + *pidl = _ILCreateDesktop(); + else if (IsEqualIID(rfid, &FOLDERID_RecycleBinFolder)) + *pidl = _ILCreateBitBucket(); + else if (IsEqualIID(rfid, &FOLDERID_ComputerFolder)) + *pidl = _ILCreateMyComputer(); + else if (IsEqualIID(rfid, &FOLDERID_PrintersFolder)) + *pidl = _ILCreatePrinters(); + else if (IsEqualIID(rfid, &FOLDERID_ControlPanelFolder)) + *pidl = _ILCreateControlPanel(); + else if (IsEqualIID(rfid, &FOLDERID_NetworkFolder)) + *pidl = _ILCreateNetwork(); + else if (IsEqualIID(rfid, &FOLDERID_Documents)) + *pidl = _ILCreateMyDocuments(); + else + { + DWORD attributes = 0; + WCHAR *pathW; + HRESULT hr; + + hr = SHGetKnownFolderPath(rfid, flags, token, &pathW); + if (FAILED(hr)) + return hr; + + hr = SHILCreateFromPathW(pathW, pidl, &attributes); + CoTaskMemFree(pathW); + return hr; + } + + return *pidl ? S_OK : E_FAIL; } HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG flags, HANDLE hToken, diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ec21ce7..6b5ed76 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -102,6 +102,7 @@ static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR); static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pPathYetAnotherMakeUniqueName)(PWSTR, PCWSTR, PCWSTR, PCWSTR); +static HRESULT (WINAPI *pSHGetKnownFolderIDList)(REFKNOWNFOLDERID, DWORD, HANDLE, PIDLIST_ABSOLUTE*); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; @@ -209,6 +210,7 @@ static void loadShell32(void) GET_PROC(SHFileOperationA) GET_PROC(SHGetMalloc) GET_PROC(PathYetAnotherMakeUniqueName) + GET_PROC(SHGetKnownFolderIDList) ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); if (pSHGetMalloc) @@ -2728,6 +2730,38 @@ if (0) ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); } +static void test_SHGetKnownFolderIDList(void) +{ + PIDLIST_ABSOLUTE pidl; + HRESULT hr; + + if (!pSHGetKnownFolderIDList) + { + win_skip("SHGetKnownFolderIDList is not available.\n"); + return; + } + + hr = pSHGetKnownFolderIDList(NULL, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + +if (0) { /* crashes on native */ + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(NULL, 0, NULL, &pidl); +} + /* not a known folder */ + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&IID_IUnknown, 0, NULL, &pidl); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(pidl == NULL, "got %p\n", pidl); + + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, &pidl); + ok(hr == S_OK, "got 0x%08x\n", hr); + CoTaskMemFree(pidl); +} + START_TEST(shellpath) { if (!init()) return; @@ -2757,5 +2791,6 @@ START_TEST(shellpath) test_knownFolders(); test_DoEnvironmentSubst(); test_PathYetAnotherMakeUniqueName(); + test_SHGetKnownFolderIDList(); } }

1 0

Nikolay Sivov : shell32: Forward couple of IKnownFolder methods to regular API equivalents.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 594e0b674f997af1d12bf75e67ac5c1dc723f630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594e0b674f997af1d12bf75e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 13:31:34 2015 +0300 shell32: Forward couple of IKnownFolder methods to regular API equivalents. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 34 ++++++++++++++++++++++++++++------ include/shlobj.h | 26 +++++++++++++++++--------- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f168ed7..ed34919 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -379,6 +379,7 @@ @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) @ stdcall SHGetKnownFolderIDList(ptr long ptr ptr) +@ stdcall SHGetKnownFolderItem(ptr long long ptr ptr) @ stdcall SHGetKnownFolderPath(ptr long ptr ptr) @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 354b23a..5753bb6 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5103,12 +5103,13 @@ static HRESULT WINAPI knownfolder_GetCategory( static HRESULT WINAPI knownfolder_GetShellItem( IKnownFolder *iface, - DWORD dwFlags, + DWORD flags, REFIID riid, void **ppv) { - FIXME("0x%08x, %s, %p\n", dwFlags, debugstr_guid(riid), ppv); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); + TRACE("(%p, 0x%08x, %s, %p)\n", knownfolder, flags, debugstr_guid(riid), ppv); + return SHGetKnownFolderItem(&knownfolder->id, flags, NULL, riid, ppv); } static HRESULT get_known_folder_path( @@ -5275,11 +5276,12 @@ static HRESULT WINAPI knownfolder_SetPath( static HRESULT WINAPI knownfolder_GetIDList( IKnownFolder *iface, - DWORD dwFlags, + DWORD flags, PIDLIST_ABSOLUTE *ppidl) { - FIXME("0x%08x, %p\n", dwFlags, ppidl); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); + TRACE("(%p, 0x%08x, %p)\n", knownfolder, flags, ppidl); + return SHGetKnownFolderIDList(&knownfolder->id, flags, NULL, ppidl); } static HRESULT WINAPI knownfolder_GetFolderType( @@ -5717,6 +5719,26 @@ HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE return E_NOTIMPL; } +HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG flags, HANDLE hToken, + REFIID riid, void **ppv) +{ + PIDLIST_ABSOLUTE pidl; + HRESULT hr; + + TRACE("%s, 0x%08x, %p, %s, %p\n", debugstr_guid(rfid), flags, hToken, debugstr_guid(riid), ppv); + + hr = SHGetKnownFolderIDList(rfid, flags, hToken, &pidl); + if (FAILED(hr)) + { + *ppv = NULL; + return hr; + } + + hr = SHCreateItemFromIDList(pidl, riid, ppv); + CoTaskMemFree(pidl); + return hr; +} + static void register_system_knownfolders(void) { int i; diff --git a/include/shlobj.h b/include/shlobj.h index 9025a73..c40be95 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -42,6 +42,21 @@ extern "C" { DECLARE_HANDLE(HPSXA); #endif +typedef enum +{ + KF_FLAG_DEFAULT = 0x00000000, + KF_FLAG_SIMPLE_IDLIST = 0x00000100, + KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200, + KF_FLAG_DEFAULT_PATH = 0x00000400, + KF_FLAG_INIT = 0x00000800, + KF_FLAG_NO_ALIAS = 0x00001000, + KF_FLAG_DONT_UNEXPAND = 0x00002000, + KF_FLAG_DONT_VERIFY = 0x00004000, + KF_FLAG_CREATE = 0x00008000, + KF_FLAG_NO_APPCONTAINER_REDIRECTION = 0x00010000, + KF_FLAG_ALIAS_ONLY = 0x80000000 +} KNOWN_FOLDER_FLAG; + UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); @@ -62,6 +77,8 @@ HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); #define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir) +HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID,DWORD,HANDLE,PIDLIST_ABSOLUTE*); +HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID,KNOWN_FOLDER_FLAG,HANDLE,REFIID,void**); HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); @@ -92,15 +109,6 @@ BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); BOOL WINAPI SignalFileOpen(PCIDLIST_ABSOLUTE); BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); -#define KF_FLAG_SIMPLE_IDLIST 0x00000100 -#define KF_FLAG_NOT_PARENT_RELATIVE 0x00000200 -#define KF_FLAG_DEFAULT_PATH 0x00000400 -#define KF_FLAG_INIT 0x00000800 -#define KF_FLAG_NO_ALIAS 0x00001000 -#define KF_FLAG_DONT_UNEXPAND 0x00002000 -#define KF_FLAG_DONT_VERIFY 0x00004000 -#define KF_FLAG_CREATE 0x00008000 - #define SHFMT_ERROR __MSABI_LONG(0xFFFFFFFF) /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL __MSABI_LONG(0xFFFFFFFE) /* Last format was cancelled */ #define SHFMT_NOFORMAT __MSABI_LONG(0xFFFFFFFD) /* Drive is not formattable */

1 0

Nikolay Sivov : kernel32: Implement GetDynamicTimeZoneInformation().
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 2c98d5b90cf4d1026a80a3279c8bae65cfca539c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c98d5b90cf4d1026a80a3279… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 17:34:10 2015 +0300 kernel32: Implement GetDynamicTimeZoneInformation(). --- dlls/kernel32/tests/time.c | 30 ++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 14 ++++++++++---- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/time.c | 39 +++++++++++++++++++++++++++++++-------- include/winternl.h | 14 ++++++++++++++ 5 files changed, 86 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c98d5b90cf4d1026a80a…

1 0

Alexandre Julliard : shell32/tests: Avoid duplicate const.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: ed700d16f7d69e257b7744870696283b6a122e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed700d16f7d69e257b7744870… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 11 14:52:07 2015 +0900 shell32/tests: Avoid duplicate const. --- dlls/shell32/tests/shelldispatch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 8e2e399..fe25eb4 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -394,7 +394,7 @@ static void test_dispatch_typeinfo(IDispatch *disp, REFIID *riid) static void test_ShellFolderViewDual(void) { - static const REFIID shelldisp_riids[] = { + static const IID *shelldisp_riids[] = { &IID_IShellDispatch6, &IID_IShellDispatch5, &IID_IShellDispatch4, @@ -556,12 +556,12 @@ todo_wine { ok(ret == 0, "got %d\n", ret); } else { - static const REFIID browser_riids[] = { + static const IID *browser_riids[] = { &IID_IWebBrowser2, &IID_NULL }; - static const REFIID viewdual_riids[] = { + static const IID *viewdual_riids[] = { &IID_IShellFolderViewDual3, &IID_NULL };

1 0

Andrew Eikum : dsound: Don't set very low limits on HW buffers.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: ff25b25a494aef6d55679dfaefd63d63fe0cf5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff25b25a494aef6d55679dfae… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 8 11:18:12 2015 -0500 dsound: Don't set very low limits on HW buffers. --- dlls/dsound/dsound.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index f77d2ea..7b93455 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -375,8 +375,8 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; device->drvcaps.dwMaxHwMixingAllBuffers = 16; - device->drvcaps.dwMaxHwMixingStaticBuffers = 1; - device->drvcaps.dwMaxHwMixingStreamingBuffers = 1; + device->drvcaps.dwMaxHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; + device->drvcaps.dwMaxHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers; device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers; @@ -814,14 +814,8 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds dscaps->dwMaxHwMixingStaticBuffers = This->device->drvcaps.dwMaxHwMixingStaticBuffers; dscaps->dwMaxHwMixingStreamingBuffers = This->device->drvcaps.dwMaxHwMixingStreamingBuffers; dscaps->dwFreeHwMixingAllBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; - - if (This->device->drvcaps.dwFreeHwMixingAllBuffers > 0) { - dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers; - dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers; - } else { - dscaps->dwFreeHwMixingStaticBuffers = 0; - dscaps->dwFreeHwMixingStreamingBuffers = 0; - } + dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; + dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; dscaps->dwMaxHw3DAllBuffers = This->device->drvcaps.dwMaxHw3DAllBuffers; dscaps->dwMaxHw3DStaticBuffers = This->device->drvcaps.dwMaxHw3DStaticBuffers;

1 0

Francois Gouget : kernel32/tests: Silence some loader and locale traces that generate too many lines.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 5ea2bdda5dd43cc75b71e3512937a63be1b69de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea2bdda5dd43cc75b71e3512… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:46:30 2015 +0200 kernel32/tests: Silence some loader and locale traces that generate too many lines. --- dlls/kernel32/tests/loader.c | 3 ++- dlls/kernel32/tests/locale.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4922035..0f9ac38 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1411,7 +1411,8 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + if (winetest_debug > 1) + trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 95e0ac6..e2ec152 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3137,8 +3137,9 @@ static void test_ConvertDefaultLocale(void) static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName, DWORD dwFlags, LONG_PTR lParam) { - trace("%08x, %s, %s, %08x, %08lx\n", - lgrpid, lpszNum, lpszName, dwFlags, lParam); + if (winetest_debug > 1) + trace("%08x, %s, %s, %08x, %08lx\n", + lgrpid, lpszNum, lpszName, dwFlags, lParam); ok(pIsValidLanguageGroup(lgrpid, dwFlags) == TRUE, "Enumerated grp %d not valid (flags %d)\n", lgrpid, dwFlags); @@ -3187,7 +3188,8 @@ static void test_EnumSystemLanguageGroupsA(void) static BOOL CALLBACK enum_func( LPWSTR name, DWORD flags, LPARAM lparam ) { - trace( "%s %x\n", wine_dbgstr_w(name), flags ); + if (winetest_debug > 1) + trace( "%s %x\n", wine_dbgstr_w(name), flags ); return TRUE; } @@ -3212,7 +3214,8 @@ static void test_EnumSystemLocalesEx(void) static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, LONG_PTR lParam) { - trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); + if (winetest_debug > 1) + trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); /* invalid locale enumerated on some platforms */ if (lcid == 0) @@ -3293,7 +3296,8 @@ static void test_SetLocaleInfoA(void) static BOOL CALLBACK luilocale_proc1A(LPSTR value, LONG_PTR lParam) { - trace("%s %08lx\n", value, lParam); + if (winetest_debug > 1) + trace("%s %08lx\n", value, lParam); return(TRUE); }

1 0