Author: janderwald Date: Sun Nov 25 23:41:28 2007 New Revision: 30759
URL: http://svn.reactos.org/svn/reactos?rev=30759&view=rev Log: - implement SHCreateDataObject - fix prototype of CIDLData_CreateFromIDArray - remove CIDLData_CreateFromIDArray from undocshell.h as its now documented in shlobj.h
Modified: trunk/reactos/dll/win32/shell32/dataobject.c trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/undocshell.h
Modified: trunk/reactos/dll/win32/shell32/dataobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobjec... ============================================================================== --- trunk/reactos/dll/win32/shell32/dataobject.c (original) +++ trunk/reactos/dll/win32/shell32/dataobject.c Sun Nov 25 23:41:28 2007 @@ -451,3 +451,17 @@ TRACE("(%p)->(apidl=%p cidl=%u)\n",dto, apidl, cidl); return (LPDATAOBJECT)dto; } + +/************************************************************************* + * SHCreateDataObject [SHELL32.@] + * + */ + +HRESULT WINAPI SHCreateDataObject(LPCITEMIDLIST pidlFolder, UINT cidl, LPCITEMIDLIST* apidl, IDataObject *pdtInner, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IDataObject)) + { + return CIDLData_CreateFromIDArray(pidlFolder, cidl, apidl, ppv); + } + return E_FAIL; +}
Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord.... ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Sun Nov 25 23:41:28 2007 @@ -1816,9 +1816,9 @@ */ HRESULT WINAPI CIDLData_CreateFromIDArray( LPCITEMIDLIST pidlFolder, - DWORD cpidlFiles, + UINT cpidlFiles, LPCITEMIDLIST *lppidlFiles, - LPDATAOBJECT *ppdataObject) + IDataObject **ppdataObject) { UINT i; HWND hwnd = 0; /*FIXME: who should be hwnd of owner? set to desktop */
Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshel... ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h Sun Nov 25 23:41:28 2007 @@ -350,12 +350,6 @@
BOOL WINAPI DAD_ShowDragImage(BOOL bShow);
-HRESULT WINAPI CIDLData_CreateFromIDArray( - LPCITEMIDLIST pidlFolder, - DWORD cpidlFiles, - LPCITEMIDLIST *lppidlFiles, - LPDATAOBJECT *ppdataObject); - /**************************************************************************** * Path Manipulation Routines */