May 2018 - Wine-devel - list.winehq.org

[PATCH 6/7] shell32: Remove source files when using cut in the context menu.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 77 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index f84ce31..9fdddee 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -300,6 +300,64 @@ static void DoDelete(ContextMenu *This) } /************************************************************************** + * SetDropEffect + * + * Set the drop effect in a IDataObject object + */ +static void SetDropEffect(IDataObject *dataobject, DWORD value) +{ + FORMATETC formatetc; + STGMEDIUM medium; + DWORD *effect; + + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW), TYMED_HGLOBAL); + + medium.tymed = TYMED_HGLOBAL; + medium.pUnkForRelease = NULL; + medium.u.hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD)); + if (!medium.u.hGlobal) return; + + effect = GlobalLock(medium.u.hGlobal); + if (!effect) + { + ReleaseStgMedium(&medium); + return; + } + *effect = value; + GlobalUnlock(effect); + + IDataObject_SetData(dataobject, &formatetc, &medium, FALSE); + ReleaseStgMedium(&medium); +} + +/************************************************************************** + * GetDropEffect + * + * Get the drop effect from a IDataObject object + */ +static void GetDropEffect(IDataObject *dataobject, DWORD *value) +{ + FORMATETC formatetc; + STGMEDIUM medium; + DWORD *effect; + + *value = DROPEFFECT_NONE; + + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW), TYMED_HGLOBAL); + + if (SUCCEEDED(IDataObject_GetData(dataobject, &formatetc, &medium))) + { + effect = GlobalLock(medium.u.hGlobal); + if (effect) + { + *value = *effect; + GlobalUnlock(effect); + } + ReleaseStgMedium(&medium); + } +} + +/************************************************************************** * DoCopyOrCut * * copies the currently selected items into the clipboard @@ -312,6 +370,7 @@ static void DoCopyOrCut(ContextMenu *This, HWND hwnd, BOOL cut) if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->parent, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject, 0, (void**)&dataobject))) { + SetDropEffect(dataobject, cut ? DROPEFFECT_MOVE : DROPEFFECT_COPY); OleSetClipboard(dataobject); IDataObject_Release(dataobject); } @@ -1199,11 +1258,19 @@ static BOOL DoPaste(ContextMenu *This) /* do the copy/move */ if (psfhlpdst && psfhlpsrc) { - if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) - bSuccess = TRUE; - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); - */ + DWORD dropEffect; + GetDropEffect(pda, &dropEffect); + + if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) + { + if (dropEffect == DROPEFFECT_MOVE) + { + if (SUCCEEDED(ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, (LPCITEMIDLIST*)apidl, FALSE))) + bSuccess = TRUE; + } + else + bSuccess = TRUE; + } } if(psfhlpdst) ISFHelper_Release(psfhlpdst); if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); -- 1.9.1

1 0

[PATCH 5/7] shell32: Add parameter to ISFHelper::DeleteItems to allow deleting files without confirmation.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/recyclebin.c | 6 +++--- dlls/shell32/shellfolder.h | 4 ++-- dlls/shell32/shfldr_fs.c | 3 ++- dlls/shell32/shfldr_unixfs.c | 7 ++++--- dlls/shell32/shlview.c | 2 +- dlls/shell32/shlview_cmenu.c | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 0d80e63..66c5cc2 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -182,7 +182,7 @@ static void DoErase(RecycleBinMenu *This) ISFHelper *helper; IShellFolder2_QueryInterface(This->folder,&IID_ISFHelper,(void**)&helper); if(helper) - ISFHelper_DeleteItems(helper,This->cidl,(LPCITEMIDLIST*)This->apidl); + ISFHelper_DeleteItems(helper, This->cidl, (LPCITEMIDLIST *)This->apidl, TRUE); } static void DoRestore(RecycleBinMenu *This) @@ -815,10 +815,10 @@ static HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, B } static HRESULT WINAPI RecycleBin_DeleteItems(ISFHelper * iface, UINT cidl, - LPCITEMIDLIST * apidl) + LPCITEMIDLIST * apidl, BOOL confirm) { TRACE("(%p,%u,%p)\n",iface,cidl,apidl); - return erase_items(GetActiveWindow(),apidl,cidl,TRUE); + return erase_items(GetActiveWindow(), apidl, cidl, confirm); } static HRESULT WINAPI RecycleBin_CopyItems(ISFHelper * iface, diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h index 942e0e7..b8083a2 100644 --- a/dlls/shell32/shellfolder.h +++ b/dlls/shell32/shellfolder.h @@ -48,7 +48,7 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown) /*** ISFHelper methods ***/ STDMETHOD(GetUniqueName)(THIS_ LPWSTR lpName, UINT uLen) PURE; STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCWSTR lpName, LPITEMIDLIST * ppidlOut) PURE; - STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; + STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST *apidl, BOOL confirm) PURE; STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE; }; #undef INTERFACE @@ -61,7 +61,7 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown) /*** ISFHelper methods ***/ #define ISFHelper_GetUniqueName(p,a,b) (p)->lpVtbl->GetUniqueName(p,a,b) #define ISFHelper_AddFolder(p,a,b,c) (p)->lpVtbl->AddFolder(p,a,b,c) -#define ISFHelper_DeleteItems(p,a,b) (p)->lpVtbl->DeleteItems(p,a,b) +#define ISFHelper_DeleteItems(p,a,b,c) (p)->lpVtbl->DeleteItems(p,a,b,c) #define ISFHelper_CopyItems(p,a,b,c) (p)->lpVtbl->CopyItems(p,a,b,c) #endif diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 66150f4..32178be 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1225,7 +1225,7 @@ static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, const LPCITEMIDLIS * deletes items in folder */ static HRESULT WINAPI -ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) +ISFHelper_fnDeleteItems (ISFHelper *iface, UINT cidl, LPCITEMIDLIST *apidl, BOOL confirm) { IGenericSFImpl *This = impl_from_ISFHelper(iface); UINT i; @@ -1250,6 +1250,7 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) op.wFunc = FO_DELETE; op.pFrom = wszPathsList; op.fFlags = FOF_ALLOWUNDO; + if (!confirm) op.fFlags |= FOF_NOCONFIRMATION; if (SHFileOperationW(&op)) { WARN("SHFileOperation failed\n"); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 732a103..a2ca852 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1942,7 +1942,7 @@ static HRESULT WINAPI SFHelper_AddFolder(ISFHelper* iface, HWND hwnd, LPCWSTR pw * be converted, S_FALSE is returned. In such situation DeleteItems will try to delete * the files using syscalls */ -static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LPCITEMIDLIST *apidl) +static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LPCITEMIDLIST *apidl, BOOL confirm) { char szAbsolute[FILENAME_MAX], *pszRelative; LPWSTR wszPathsList, wszListPos; @@ -1984,6 +1984,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP op.wFunc = FO_DELETE; op.pFrom = wszPathsList; op.fFlags = FOF_ALLOWUNDO; + if (!confirm) op.fFlags |= FOF_NOCONFIRMATION; if (SHFileOperationW(&op)) { WARN("SHFileOperationW failed\n"); @@ -2022,7 +2023,7 @@ static HRESULT UNIXFS_delete_with_syscalls(UnixFolder *This, UINT cidl, const LP return S_OK; } -static HRESULT WINAPI SFHelper_DeleteItems(ISFHelper* iface, UINT cidl, LPCITEMIDLIST* apidl) +static HRESULT WINAPI SFHelper_DeleteItems(ISFHelper *iface, UINT cidl, LPCITEMIDLIST *apidl, BOOL confirm) { UnixFolder *This = impl_from_ISFHelper(iface); char szAbsolute[FILENAME_MAX], *pszRelative; @@ -2033,7 +2034,7 @@ static HRESULT WINAPI SFHelper_DeleteItems(ISFHelper* iface, UINT cidl, LPCITEMI TRACE("(%p)->(%d %p)\n", This, cidl, apidl); - hr = UNIXFS_delete_with_shfileop(This, cidl, apidl); + hr = UNIXFS_delete_with_shfileop(This, cidl, apidl, confirm); if (hr == S_FALSE) hr = UNIXFS_delete_with_syscalls(This, cidl, apidl); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c0c027f..9f23bfe 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1577,7 +1577,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn } /* perform the item deletion */ - ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems); + ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST *)pItems, TRUE); ISFHelper_Release(psfhlp); /* free pidl array memory */ diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index c9b2ebf..f84ce31 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -294,7 +294,7 @@ static void DoDelete(ContextMenu *This) IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&helper); if (helper) { - ISFHelper_DeleteItems(helper, This->cidl, (LPCITEMIDLIST*)This->apidl); + ISFHelper_DeleteItems(helper, This->cidl, (LPCITEMIDLIST *)This->apidl, TRUE); ISFHelper_Release(helper); } } -- 1.9.1

1 0

[PATCH 4/7] shell32: Add support for setting/getting PREFERREDDROPEFFECT in IDataObject.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/clipboard.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/dataobject.c | 24 +++++++++++++++++++++--- dlls/shell32/shell32_main.h | 2 ++ 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index 82df534..9c6f284 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -38,6 +38,8 @@ #include <stdarg.h> #include <string.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -214,3 +216,41 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return hGlobal; } + +HGLOBAL RenderPREFERREDDROPEFFECT (DWORD value) +{ + DWORD *pEffect; + HGLOBAL hGlobal; + + TRACE("(%d)\n", value); + + hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD)); + if(!hGlobal) return hGlobal; + + pEffect = GlobalLock(hGlobal); + if (pEffect) + { + *pEffect = value; + GlobalUnlock(hGlobal); + } + + return hGlobal; +} + +HRESULT GetPREFERREDDROPEFFECT (STGMEDIUM *pmedium, DWORD *value) +{ + DWORD *pEffect; + BOOL result = E_OUTOFMEMORY; + + TRACE("(%p, %p)\n", pmedium, value); + + pEffect = GlobalLock(pmedium->u.hGlobal); + if (pEffect) + { + *value = *pEffect; + result = S_OK; + GlobalUnlock(pmedium->u.hGlobal); + } + + return result; +} diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index ab72055..85278be 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -196,7 +196,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) */ /* number of supported formats */ -#define MAX_FORMATS 4 +#define MAX_FORMATS 5 typedef struct { @@ -208,12 +208,13 @@ typedef struct LPITEMIDLIST pidl; LPITEMIDLIST * apidl; UINT cidl; + DWORD dropEffect; FORMATETC pFormatEtc[MAX_FORMATS]; UINT cfShellIDList; UINT cfFileNameA; UINT cfFileNameW; - + UINT cfDropEffect; } IDataObjectImpl; static inline IDataObjectImpl *impl_from_IDataObject(IDataObject *iface) @@ -313,6 +314,10 @@ static HRESULT WINAPI IDataObject_fnGetData(IDataObject *iface, LPFORMATETC pfor if (This->cidl < 1) return(E_UNEXPECTED); pmedium->u.hGlobal = RenderFILENAMEW(This->pidl, This->apidl, This->cidl); } + else if (pformatetcIn->cfFormat == This->cfDropEffect) + { + pmedium->u.hGlobal = RenderPREFERREDDROPEFFECT(This->dropEffect); + } else { FIXME("-- expected clipformat not implemented\n"); @@ -367,7 +372,17 @@ static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(IDataObject *iface, LP static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) { IDataObjectImpl *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); + + FIXME("(%p)->(%p, %p, %u): semi-stub\n", This, pformatetc, pmedium, fRelease); + + if (pformatetc->cfFormat == This->cfDropEffect) + { + if (pmedium->tymed == TYMED_HGLOBAL) + return GetPREFERREDDROPEFFECT(pmedium, &This->dropEffect); + else + return DV_E_TYMED; + } + return E_NOTIMPL; } @@ -440,14 +455,17 @@ IDataObject* IDataObject_Constructor(HWND hwndOwner, dto->pidl = ILClone(pMyPidl); dto->apidl = _ILCopyaPidl(apidl, cidl); dto->cidl = cidl; + dto->dropEffect = 0; dto->cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); dto->cfFileNameA = RegisterClipboardFormatA(CFSTR_FILENAMEA); dto->cfFileNameW = RegisterClipboardFormatW(CFSTR_FILENAMEW); + dto->cfDropEffect = RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW); InitFormatEtc(dto->pFormatEtc[0], dto->cfShellIDList, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[1], CF_HDROP, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[2], dto->cfFileNameA, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[3], dto->cfFileNameW, TYMED_HGLOBAL); + InitFormatEtc(dto->pFormatEtc[4], dto->cfDropEffect, TYMED_HGLOBAL); } TRACE("(%p)->(apidl=%p cidl=%u)\n",dto, apidl, cidl); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index d1b0e01..fa2a549 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -141,6 +141,8 @@ HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECL HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; +HGLOBAL RenderPREFERREDDROPEFFECT (DWORD value) DECLSPEC_HIDDEN; +HRESULT GetPREFERREDDROPEFFECT (STGMEDIUM *pmedium, DWORD *value) DECLSPEC_HIDDEN; /* Change Notification */ void InitChangeNotifications(void) DECLSPEC_HIDDEN; -- 1.9.1

1 0

[PATCH 3/7] shell32: Implement insert/paste for item context menus.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shell32.rc | 1 + dlls/shell32/shlview_cmenu.c | 64 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 084b052..f885b7c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -99,6 +99,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ut", FCIDM_SHVIEW_CUT MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "&Paste", FCIDM_SHVIEW_INSERT MENUITEM SEPARATOR MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK MENUITEM "&Delete", FCIDM_SHVIEW_DELETE diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 42770c7..c9b2ebf 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -64,6 +64,8 @@ typedef struct BOOL desktop; } ContextMenu; +static BOOL DoPaste(ContextMenu *This); + static inline ContextMenu *impl_from_IContextMenu3(IContextMenu3 *iface) { return CONTAINING_RECORD(iface, ContextMenu, IContextMenu3_iface); @@ -142,6 +144,30 @@ static ULONG WINAPI ContextMenu_Release(IContextMenu3 *iface) return ref; } +static BOOL CheckClipboard(void) +{ + IDataObject *pda; + BOOL ret = FALSE; + + if (SUCCEEDED(OleGetClipboard(&pda))) + { + STGMEDIUM medium; + FORMATETC formatetc; + + /* Set the FORMATETC structure*/ + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLISTW), TYMED_HGLOBAL); + + /* Get the pidls from IDataObject */ + if (SUCCEEDED(IDataObject_GetData(pda, &formatetc, &medium))) + { + ReleaseStgMedium(&medium); + ret = TRUE; + } + IDataObject_Release(pda); + } + return ret; +} + static HRESULT WINAPI ItemMenu_QueryContextMenu( IContextMenu3 *iface, HMENU hmenu, @@ -152,6 +178,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( { ContextMenu *This = impl_from_IContextMenu3(iface); INT uIDMax; + DWORD attr = SFGAO_CANRENAME; TRACE("(%p)->(%p %d 0x%x 0x%x 0x%x )\n", This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -188,6 +215,9 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); + if (This->apidl && This->cidl == 1) + IShellFolder_GetAttributesOf(This->parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); + if(uFlags & ~CMF_CANRENAME) RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); else @@ -198,16 +228,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( if (!This->apidl || This->cidl > 1) enable |= MFS_DISABLED; else - { - DWORD attr = SFGAO_CANRENAME; - - IShellFolder_GetAttributesOf(This->parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; - } EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, enable); } + if ((attr & (SFGAO_FILESYSTEM|SFGAO_FOLDER)) != (SFGAO_FILESYSTEM|SFGAO_FOLDER) || !CheckClipboard()) + RemoveMenu(hmenu, FCIDM_SHVIEW_INSERT + idCmdFirst, MF_BYCOMMAND); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst); } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); @@ -780,6 +808,10 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("Verb FCIDM_SHVIEW_CUT\n"); DoCopyOrCut(This, lpcmi->hwnd, TRUE); break; + case FCIDM_SHVIEW_INSERT: + TRACE("Verb FCIDM_SHVIEW_INSERT\n"); + DoPaste(This); + break; case FCIDM_SHVIEW_PROPERTIES: TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); DoOpenProperties(This, lpcmi->hwnd); @@ -811,6 +843,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c static const WCHAR exploreW[] = {'e','x','p','l','o','r','e',0}; static const WCHAR cutW[] = {'c','u','t',0}; static const WCHAR copyW[] = {'c','o','p','y',0}; + static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR linkW[] = {'l','i','n','k',0}; static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; @@ -844,6 +877,9 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c case FCIDM_SHVIEW_COPY: cmdW = copyW; break; + case FCIDM_SHVIEW_INSERT: + cmdW = pasteW; + break; case FCIDM_SHVIEW_CREATELINK: cmdW = linkW; break; @@ -1142,8 +1178,22 @@ static BOOL DoPaste(ContextMenu *This) if (psfFrom) { /* get source and destination shellfolder */ - ISFHelper *psfhlpdst, *psfhlpsrc; - IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + ISFHelper *psfhlpdst = NULL, *psfhlpsrc = NULL; + + /* when using an item context menu we first need to bind to the selected folder */ + if (This->apidl) + { + IShellFolder *folder; + + if (SUCCEEDED(IShellFolder_BindToObject(This->parent, This->apidl[0], NULL, &IID_IShellFolder, (LPVOID*)&folder))) + { + IShellFolder_QueryInterface(folder, &IID_ISFHelper, (void**)&psfhlpdst); + IShellFolder_Release(folder); + } + } + else + IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); /* do the copy/move */ -- 1.9.1

1 0

[PATCH] include: Make ARRAY_SIZE() available in wine/test.h
by Michael Stefaniuc 25 May '18

25 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Let the controversy begin! dlls/advapi32/tests/cred.c | 2 -- dlls/advapi32/tests/eventlog.c | 2 -- dlls/advapi32/tests/registry.c | 1 - dlls/advapi32/tests/security.c | 2 -- dlls/comctl32/tests/button.c | 1 - dlls/comdlg32/tests/filedlg.c | 2 -- dlls/d2d1/tests/d2d1.c | 4 ---- dlls/d3d10core/tests/device.c | 4 ---- dlls/d3d11/tests/d3d11.c | 4 ---- dlls/d3d8/tests/device.c | 2 -- dlls/d3d9/tests/d3d9ex.c | 2 -- dlls/d3d9/tests/device.c | 2 -- dlls/d3d9/tests/stateblock.c | 2 -- dlls/d3d9/tests/visual.c | 2 -- dlls/d3dx9_36/tests/effect.c | 2 -- dlls/d3dx9_36/tests/math.c | 2 -- dlls/d3dx9_36/tests/mesh.c | 2 -- dlls/ddraw/tests/ddraw1.c | 4 ---- dlls/ddraw/tests/ddraw2.c | 4 ---- dlls/ddraw/tests/ddraw4.c | 4 ---- dlls/ddraw/tests/ddraw7.c | 4 ---- dlls/dmcompos/tests/dmcompos.c | 2 -- dlls/dmime/tests/dmime.c | 2 -- dlls/dmloader/tests/loader.c | 2 -- dlls/dmstyle/tests/dmstyle.c | 2 -- dlls/dwrite/tests/analyzer.c | 2 -- dlls/dwrite/tests/font.c | 2 -- dlls/dwrite/tests/layout.c | 2 -- dlls/dxgi/tests/device.c | 4 ---- dlls/shell32/tests/shellpath.c | 4 ---- dlls/shell32/tests/shlfolder.c | 2 -- dlls/user32/tests/cursoricon.c | 2 -- dlls/usp10/tests/usp10.c | 4 ---- dlls/xmllite/tests/reader.c | 2 -- include/wine/test.h | 2 ++ 35 files changed, 2 insertions(+), 86 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 90454c7ab8..01e2a5efa3 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -27,8 +27,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static BOOL (WINAPI *pCredDeleteA)(LPCSTR,DWORD,DWORD); static BOOL (WINAPI *pCredEnumerateA)(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); static VOID (WINAPI *pCredFree)(PVOID); diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3f4c00914f..d613c95315 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -32,8 +32,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 17b83cb057..9d248685ca 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -32,7 +32,6 @@ #include "winerror.h" #include "aclapi.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) #define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) static HKEY hkey_main; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 35fd032a84..925e6fa806 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -36,8 +36,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #ifndef PROCESS_QUERY_LIMITED_INFORMATION #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 #endif diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 05fa303918..db8d2b0156 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -28,7 +28,6 @@ #include "msg.h" #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16)) -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index fd78a64e13..aedb18a192 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1026,8 +1026,6 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, return FALSE; } -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static void test_extension_helper(OPENFILENAMEA* ofn, const char *filter, const char *expected_filename) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8299ceb7d4..26c81e660e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,10 +26,6 @@ #include "dwrite.h" #include "wincodec.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct resource_readback { ID3D10Resource *resource; diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 50521bda44..819285ee22 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -26,10 +26,6 @@ #include "wine/heap.h" #include "wine/test.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define BITS_NNAN 0xffc00000 #define BITS_NAN 0x7fc00000 #define BITS_NINF 0xff800000 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 09301c7e0e..f6f4fe3a55 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28,10 +28,6 @@ #include "wine/heap.h" #include "wine/test.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define BITS_NNAN 0xffc00000 #define BITS_NAN 0x7fc00000 #define BITS_NINF 0xff800000 diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5fa0d59e60..6bae783644 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -28,8 +28,6 @@ #include <d3d8.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec3 { float x, y, z; diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d210b8baed..63b7c5a46d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -26,8 +26,6 @@ #include <initguid.h> #include <d3d9.h> -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static HMODULE d3d9_handle = 0; static DEVMODEW registry_mode; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0eba7662bf..bd1890f45c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -27,8 +27,6 @@ #include <d3d9.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec3 { float x, y, z; diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index aec698a58e..0983cf7b4f 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -21,8 +21,6 @@ #include <d3d9.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static DWORD texture_stages; /* ============================ State Testing Framework ========================== */ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d0c77953f4..835c8377e4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -34,8 +34,6 @@ #include <d3d9.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec2 { float x, y; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a75b67c7f6..4f26b63a13 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -41,8 +41,6 @@ static float get_nan(void) #define NAN get_nan() #endif -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr)) - /* helper functions */ static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) { diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index b687e5d6dd..e433b1f50e 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -23,8 +23,6 @@ #include "d3dx9.h" #include <math.h> -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 6ebd5b8215..3fcd65ffbb 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -42,8 +42,6 @@ static inline float __port_nan(void) #define admitted_error 0.0001f -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) - #define compare_vertex_sizes(type, exp) \ got=D3DXGetFVFVertexSize(type); \ ok(got==exp, "Expected: %d, Got: %d\n", exp, got); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb0858f253..c767d3a38d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -29,10 +29,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index c2b438cf2a..794f90b940 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -31,10 +31,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9c4c5a3e5b..172d99d167 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -31,10 +31,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fb14409079..35a45c0345 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -32,10 +32,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 27cea9e336..3419eca3b3 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -26,8 +26,6 @@ #include <dmusici.h> #include <dmusicf.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static BOOL missing_dmcompos(void) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7108b0906b..62d8422162 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -27,8 +27,6 @@ #include <audioclient.h> #include <guiddef.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static BOOL missing_dmime(void) { IDirectMusicSegment8 *dms; diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 46e46d4baf..13b575e120 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -24,8 +24,6 @@ #include <dmusicf.h> #include "wine/test.h" -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index ed12315a19..9d247812ca 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -26,8 +26,6 @@ #include <dmusici.h> #include <dmusicf.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static BOOL missing_dmstyle(void) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 93ee152c23..77369a7ef9 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -31,8 +31,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static IDWriteFactory *factory; static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 44a81a199e..f21aecdd5d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -33,8 +33,6 @@ #include "wine/heap.h" #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c2dd273c6c..652f6b78ac 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -29,8 +29,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b18ee5904f..d9ffa50f78 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -23,10 +23,6 @@ #include "d3d11.h" #include "wine/test.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - enum frame_latency { DEFAULT_FRAME_LATENCY = 3, diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f6674313f8..613c4eb15d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -43,10 +43,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) ) -#endif - /* from pidl.h, not included here: */ #ifndef PT_CPL /* Guess, Win7 uses this for CSIDL_CONTROLS */ #define PT_CPL 0x01 /* no path */ diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 4ce9a4efba..6460fd9381 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -44,8 +44,6 @@ DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36); DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0xaa,0x00,0x4a,0xe8,0x37); -#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) ) - static IMalloc *ppM; static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5099c08d70..95a6878e9a 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1053,8 +1053,6 @@ static const DWORD biSize_tests[] = { 0xffffffff }; -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) { BITMAP bm; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f548b5792c..aa26997112 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -31,10 +31,6 @@ #include <windows.h> #include <usp10.h> -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - typedef struct _itemTest { char todo_flag[6]; int iCharPos; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 975724ab18..41adad1598 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -32,8 +32,6 @@ #include "wine/test.h" #include "wine/heap.h" -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str) diff --git a/include/wine/test.h b/include/wine/test.h index e3e4bcf77b..476b4d9847 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -130,6 +130,8 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #ifdef NONAMELESSUNION # define U(x) (x).u # define U1(x) (x).u1 -- 2.14.3

2 5

[PATCH] configure: Make it possible to disable winetest.
by Francois Gouget 24 May '18

24 May '18

This avoids needlessly copying all the test binaries if they are not going to be used. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- configure.ac | 1 + tools/makedep.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 312c235bb1d..20c23dbfe3b 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ dnl **** Command-line arguments **** AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support])) AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) +AC_ARG_ENABLE(winetest, AS_HELP_STRING([--disable-winetest],[do not build winetest])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]), diff --git a/tools/makedep.c b/tools/makedep.c index 207c41e8578..46062b871a2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -137,6 +137,7 @@ static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; static struct strarray disabled_dirs; +static int enable_winetest = 1; static const char *root_src_dir; static const char *tools_dir; static const char *tools_ext; @@ -3283,7 +3284,7 @@ static void output_test_module( struct makefile *make ) output_filename( tools_path( make, "winegcc" )); output( "\n" ); - if (!make->disabled) + if (enable_winetest && !make->disabled) output( "all: %s/%s\n", top_obj_dir_path( make, "programs/winetest" ), testres ); output( "%s/%s: %s%s\n", top_obj_dir_path( make, "programs/winetest" ), testres, obj_dir_path( make, stripped ), dll_ext ); @@ -4231,6 +4232,7 @@ int main( int argc, char *argv[] ) if (argc == 1) { disabled_dirs = get_expanded_make_var_array( top_makefile, "DISABLED_SUBDIRS" ); + enable_winetest = !strarray_exists( &disabled_dirs, "programs/winetest" ); top_makefile->subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" ); top_makefile->submakes = xmalloc( top_makefile->subdirs.count * sizeof(*top_makefile->submakes) ); -- 2.17.0

1 0

[PATCH] ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF getsockopt options by two.
by Alistair Leslie-Hughes 24 May '18

24 May '18

From: Sebastian Lackner <sebastian(a)fds-team.de> man 7 socket ... SO_SNDBUF/SO_RCVBUF Sets or gets the maximum socket send buffer in bytes. The kernel doubles this value (to allow space for bookkeeping overhead) ... Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 8 ++++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 914df17..3954964 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3813,6 +3813,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, SetLastError(wsaErrno()); ret = SOCKET_ERROR; } + #ifdef __linux__ + else if (optname == SO_RCVBUF || optname == SO_SNDBUF) + { + /* For SO_RCVBUF / SO_SNDBUF, the Linux kernel always sets twice the value. + * Divide by two to ensure applications do not get confused by the result. */ + *(int *)optval /= 2; + } + #endif release_sock_fd( s, fd ); return ret; case WS_SO_ACCEPTCONN: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6dd1491..76506ca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1458,7 +1458,7 @@ static void test_set_getsockopt(void) value = 0xdeadbeef; err = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&value, &size); ok( !err, "getsockopt(SO_SNDBUF) failed error: %u\n", WSAGetLastError() ); - todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + ok( value == 4096, "expected 4096, got %u\n", value ); /* SO_RCVBUF */ value = 4096; @@ -1468,7 +1468,7 @@ static void test_set_getsockopt(void) value = 0xdeadbeef; err = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&value, &size); ok( !err, "getsockopt(SO_RCVBUF) failed error: %u\n", WSAGetLastError() ); - todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + ok( value == 4096, "expected 4096, got %u\n", value ); /* SO_LINGER */ for( i = 0; i < sizeof(linger_testvals)/sizeof(LINGER);i++) { -- 1.9.1

3 2

[PATCH 1/4] configure: Check for libvkd3d.
by Józef Kucia 24 May '18

24 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configure.ac b/configure.ac index 312c235bb1df..e088643aad0a 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -1855,6 +1856,26 @@ fi WINE_NOTICE_WITH(vulkan,[test "x$ac_cv_lib_soname_vulkan" = "x"], [libvulkan ${notice_platform}development files not found, Vulkan won't be supported.]) +dnl **** Check for vkd3d **** +if test "x$with_vkd3d" != "xno" +then + WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,,) + + if test "x$VKD3D_LIBS" = "x" + then + VKD3D_CFLAGS="" + VKD3D_LIBS="" + else + WINE_CHECK_SONAME(vkd3d,vkd3d_create_device,,,[$VKD3D_LIBS]) + fi +fi + +if test "x$ac_cv_lib_soname_vkd3d" = "x" +then + WINE_NOTICE([vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported.]) + enable_d3d12=${enable_d3d12:-no} +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") -- 2.16.1

2 6

[PATCH vkd3d 1/7] Update AUTHORS.
by Józef Kucia 24 May '18

24 May '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3d0c470046bd..1991bdf8081d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,3 @@ Henri Verbeet Józef Kucia +Sven Hesse -- 2.16.1

2 13

[PATCH 4/6] winmm: Synchronize player status and API calls.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)

2 1