Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RSHELL]

Browse source 
[NBTSHELL]
[NTOBJSHEX]
* Fix prototypes of GetAttributesOf and GetUIObjectOf to conform with the specialized IDLIST subtypes.

[PSDK]
* Fix the declaration of PCITEMID_CHILD to make the "const" attribute affect the contents, and not the pointers themselves.

In preparation for whenever CORE-8441 happens.

svn path=/trunk/; revision=66414
This commit is contained in:
David Quintana 2015-02-22 18:26:58 +00:00
parent a91859ea46
commit cdd19990f6
6 changed files with 68 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/shell/rshell/CMergedFolder.cpp
View file

@ -595,7 +595,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::CreateViewObject(
HRESULT STDMETHODCALLTYPE CMergedFolder::GetAttributesOf(
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
SFGAOF *rgfInOut)
{
LocalPidlInfo info;
@ -627,7 +627,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::GetAttributesOf(
HRESULT STDMETHODCALLTYPE CMergedFolder::GetUIObjectOf(
HWND hwndOwner,
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
REFIID riid,
UINT *prgfInOut,
void **ppvOut)

4
reactos/base/shell/rshell/CMergedFolder.h
View file

@ -132,13 +132,13 @@ public:
virtual HRESULT STDMETHODCALLTYPE GetAttributesOf(
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
SFGAOF *rgfInOut);
virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf(
HWND hwndOwner,
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
REFIID riid,
UINT *prgfInOut,
void **ppvOut);

8
reactos/dll/shellext/netshell/shfldr_netconnect.cpp
View file

@ -46,8 +46,8 @@ class CNetworkConnections final :
virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut);
virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut);
virtual HRESULT WINAPI GetAttributesOf (UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut);
virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut);
virtual HRESULT WINAPI GetAttributesOf (UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut);
virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut);
virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet);
virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut);
@ -356,7 +356,7 @@ HRESULT WINAPI CNetworkConnections::CreateViewObject(
* ISF_NetConnect_fnGetAttributesOf
*/
HRESULT WINAPI CNetworkConnections::GetAttributesOf(
UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut)
UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut)
{
//IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr = S_OK;
@ -412,7 +412,7 @@ HRESULT IContextMenuImpl_Constructor(REFIID riid, LPCITEMIDLIST apidl, LPVOID *
}
HRESULT WINAPI CNetworkConnections::GetUIObjectOf(
HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid,
HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid,
UINT * prgfInOut, LPVOID * ppvOut)
{
IUnknown *pObj = NULL;

119
reactos/dll/shellext/ntobjshex/ntobjns.cpp
View file

@ -54,7 +54,7 @@ static HRESULT MakeVariantString(VARIANT * pv, PCWSTR string)
return S_OK;
}
static HRESULT GetFullName(LPCITEMIDLIST pidl, DWORD uFlags, PWSTR strName, DWORD cchName)
static HRESULT GetFullName(PCIDLIST_ABSOLUTE pidl, DWORD uFlags, PWSTR strName, DWORD cchName)
{
CComPtr<IShellFolder> psfDesktop;
STRRET str;
@ -75,42 +75,42 @@ class CNtObjectFolderContextMenu :
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IContextMenu
{
LPCITEMIDLIST pcidlFolder;
LPCITEMIDLIST pcidlChild;
UINT idFirst;
PCIDLIST_ABSOLUTE m_pcidlFolder;
PCITEMID_CHILD m_pcidlChild;
UINT m_idFirst;
public:
CNtObjectFolderContextMenu() :
pcidlFolder(NULL),
pcidlChild(NULL),
idFirst(0)
m_pcidlFolder(NULL),
m_pcidlChild(NULL),
m_idFirst(0)
{
}
virtual ~CNtObjectFolderContextMenu()
{
if (pcidlFolder)
ILFree((LPITEMIDLIST) pcidlFolder);
if (pcidlChild)
ILFree((LPITEMIDLIST) pcidlChild);
if (m_pcidlFolder)
ILFree((LPITEMIDLIST) m_pcidlFolder);
if (m_pcidlChild)
ILFree((LPITEMIDLIST) m_pcidlChild);
}
HRESULT Initialize(LPITEMIDLIST parent, UINT cidl, LPCITEMIDLIST *apidl)
HRESULT Initialize(PCIDLIST_ABSOLUTE parent, UINT cidl, PCUITEMID_CHILD_ARRAY apidl)
{
pcidlFolder = ILClone(parent);
m_pcidlFolder = ILClone(parent);
if (cidl != 1)
return E_FAIL;
pcidlChild = ILClone(apidl[0]);
return E_INVALIDARG;
m_pcidlChild = ILClone(apidl[0]);
return S_OK;
}
// IContextMenu
virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
{
idFirst = idCmdFirst;
m_idFirst = idCmdFirst;
const NtPidlEntry * entry = (NtPidlEntry *) pcidlChild;
const NtPidlEntry * entry = (NtPidlEntry *) m_pcidlChild;
if ((entry->objectType == DIRECTORY_OBJECT) ||
(entry->objectType == SYMBOLICLINK_OBJECT))
@ -146,14 +146,14 @@ public:
}
}
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst - idFirst);
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst - m_idFirst);
}
virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
{
if (LOWORD(lpici->lpVerb) == idFirst || !lpici->lpVerb)
if (LOWORD(lpici->lpVerb) == m_idFirst || !lpici->lpVerb)
{
LPITEMIDLIST fullPidl = ILCombine(pcidlFolder, pcidlChild);
LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild);
SHELLEXECUTEINFO sei = { 0 };
sei.cbSize = sizeof(sei);
@ -169,9 +169,9 @@ public:
return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError());
}
else if (LOWORD(lpici->lpVerb) == (idFirst + 1))
else if (LOWORD(lpici->lpVerb) == (m_idFirst + 1))
{
LPITEMIDLIST fullPidl = ILCombine(pcidlFolder, pcidlChild);
LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild);
SHELLEXECUTEINFO sei = { 0 };
sei.cbSize = sizeof(sei);
@ -192,7 +192,7 @@ public:
virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax)
{
if (idCmd == idFirst)
if (idCmd == m_idFirst)
{
if (uType == GCS_VERBW)
{
@ -200,7 +200,7 @@ public:
return S_OK;
}
}
else if (idCmd == (idFirst + 1))
else if (idCmd == (m_idFirst + 1))
{
if (uType == GCS_VERBW)
{
@ -224,31 +224,31 @@ class CNtObjectFolderExtractIcon :
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IExtractIconW
{
LPCITEMIDLIST pcidlFolder;
LPCITEMIDLIST pcidlChild;
PCIDLIST_ABSOLUTE m_pcidlFolder;
PCITEMID_CHILD m_pcidlChild;
public:
CNtObjectFolderExtractIcon() :
pcidlFolder(NULL),
pcidlChild(NULL)
m_pcidlFolder(NULL),
m_pcidlChild(NULL)
{
}
virtual ~CNtObjectFolderExtractIcon()
{
if (pcidlFolder)
ILFree((LPITEMIDLIST) pcidlFolder);
if (pcidlChild)
ILFree((LPITEMIDLIST) pcidlChild);
if (m_pcidlFolder)
ILFree((LPITEMIDLIST) m_pcidlFolder);
if (m_pcidlChild)
ILFree((LPITEMIDLIST) m_pcidlChild);
}
HRESULT Initialize(LPITEMIDLIST parent, UINT cidl, LPCITEMIDLIST *apidl)
HRESULT Initialize(PCIDLIST_ABSOLUTE parent, UINT cidl, PCUITEMID_CHILD_ARRAY apidl)
{
pcidlFolder = ILClone(parent);
m_pcidlFolder = ILClone(parent);
if (cidl != 1)
return E_FAIL;
pcidlChild = ILClone(apidl[0]);
m_pcidlChild = ILClone(apidl[0]);
return S_OK;
}
@ -259,32 +259,39 @@ public:
INT *piIndex,
UINT *pwFlags)
{
const NtPidlEntry * entry = (NtPidlEntry *) pcidlChild;
const NtPidlEntry * entry = (NtPidlEntry *) m_pcidlChild;
if (entry->magic != NT_OBJECT_PIDL_MAGIC)
return E_FAIL;
UINT flags = 0;
#define GIL_CHECKSHIELD 0x0200
#define GIL_SHIELD 0x0200
if (uFlags & GIL_CHECKSHIELD && !(entry->objectInformation.GrantedAccess & STANDARD_RIGHTS_READ))
flags |= GIL_SHIELD;
switch (entry->objectType)
{
case DIRECTORY_OBJECT:
case SYMBOLICLINK_OBJECT:
GetModuleFileNameW(g_hInstance, szIconFile, cchMax);
*piIndex = -((uFlags & GIL_OPENICON) ? IDI_NTOBJECTDIROPEN : IDI_NTOBJECTDIR);
*pwFlags = 0;
*pwFlags = flags;
return S_OK;
case DEVICE_OBJECT:
GetModuleFileNameW(g_hInstance, szIconFile, cchMax);
*piIndex = -IDI_NTOBJECTDEVICE;
*pwFlags = 0;
*pwFlags = flags;
return S_OK;
case PORT_OBJECT:
GetModuleFileNameW(g_hInstance, szIconFile, cchMax);
*piIndex = -IDI_NTOBJECTPORT;
*pwFlags = 0;
*pwFlags = flags;
return S_OK;
default:
GetModuleFileNameW(g_hInstance, szIconFile, cchMax);
*piIndex = -IDI_NTOBJECTITEM;
*pwFlags = 0;
*pwFlags = flags;
return S_OK;
}
}
@ -358,7 +365,7 @@ public:
return S_OK;
}
HRESULT FindPidlInList(LPCITEMIDLIST pcidl, NtPidlEntry ** pinfo)
HRESULT FindPidlInList(PCUITEMID_CHILD pcidl, NtPidlEntry ** pinfo)
{
HRESULT hr;
@ -522,15 +529,15 @@ public:
return CompareIDs(lParam, first, pcidl2);
}
ULONG ConvertAttributes(OBJECT_TYPE Type, ULONG Attributes, PULONG inMask)
ULONG ConvertAttributes(NtPidlEntry * entry, PULONG inMask)
{
ULONG mask = inMask ? *inMask : 0xFFFFFFFF;
ULONG flags = 0;
ULONG flags = SFGAO_HASPROPSHEET | SFGAO_CANLINK;
if (Type == DIRECTORY_OBJECT)
if (entry->objectType == DIRECTORY_OBJECT)
flags |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE;
if (Type == SYMBOLICLINK_OBJECT)
if (entry->objectType == SYMBOLICLINK_OBJECT)
flags |= SFGAO_LINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE;
return flags & mask;
@ -707,7 +714,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::ParseDisplayName(
*pchEaten = lstrlenW(info->entryName);
if (pdwAttributes)
*pdwAttributes = m_PidlManager->ConvertAttributes(info->objectType, info->objectInformation.Attributes, pdwAttributes);
*pdwAttributes = m_PidlManager->ConvertAttributes(info, pdwAttributes);
return S_OK;
}
@ -808,7 +815,7 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::CreateViewObject(
HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetAttributesOf(
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
SFGAOF *rgfInOut)
{
NtPidlEntry * info;
@ -824,35 +831,23 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetAttributesOf(
for (int i = 0; i < (int) cidl; i++)
{
LPCITEMIDLIST pidl = apidl[i];
PCUITEMID_CHILD pidl = apidl[i];
hr = m_PidlManager->FindPidlInList(pidl, &info);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
// Update attributes.
*rgfInOut = m_PidlManager->ConvertAttributes(info->objectType, info->objectInformation.Attributes, rgfInOut);
*rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut);
}
return S_OK;
}
HRESULT CALLBACK ContextMenuCallback(
_In_opt_ IShellFolder *psf,
_In_opt_ HWND hwnd,
_In_opt_ IDataObject *pdtobj,
UINT uMsg,
WPARAM wParam,
LPARAM lParam
)
{
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetUIObjectOf(
HWND hwndOwner,
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
REFIID riid,
UINT *prgfInOut,
void **ppvOut)

4
reactos/dll/shellext/ntobjshex/ntobjns.h
View file

@ -69,13 +69,13 @@ public:
virtual HRESULT STDMETHODCALLTYPE GetAttributesOf(
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
SFGAOF *rgfInOut);
virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf(
HWND hwndOwner,
UINT cidl,
LPCITEMIDLIST *apidl,
PCUITEMID_CHILD_ARRAY apidl,
REFIID riid,
UINT *prgfInOut,
void **ppvOut);

2
reactos/include/psdk/shtypes.idl
View file

@ -35,7 +35,7 @@ typedef struct _ITEMIDLIST
} ITEMIDLIST,*LPITEMIDLIST;
typedef const ITEMIDLIST *LPCITEMIDLIST;
typedef LPITEMIDLIST PITEMID_CHILD;
typedef const PITEMID_CHILD PCITEMID_CHILD;
typedef LPCITEMIDLIST PCITEMID_CHILD;
typedef LPCITEMIDLIST PCUITEMID_CHILD;
typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY;
typedef LPITEMIDLIST PIDLIST_RELATIVE;