lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-06 05:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[NETSHELL][SHELL32] Make NetShell PIDL format more Windows compatible (#7183)

Browse Source 
- The PIDL format needs to be Windows compatible so that wlanwiz can get the connection GUID.
- SHELL32::ILIsEqual cannot deem PIDL formats it does not understand as invalid.
- DefView must ask the folder when comparing PIDLs.
This commit is contained in:
Whindmar Saksit
2024-08-08 22:00:03 +02:00
committed by GitHub
parent 5d96ba9217
commit ea60890961
7 changed files with 144 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dll/shellext/netshell/enumlist.cpp
View File

@@ -9,9 +9,13 @@
PNETCONIDSTRUCT ILGetConnData(PCITEMID_CHILD pidl)
{
if (!pidl || !pidl->mkid.cb || pidl->mkid.abID[0] != 0x99)
return NULL;
return (PNETCONIDSTRUCT)(&pidl->mkid.abID[0]);
if (pidl && pidl->mkid.cb >= 2 + sizeof(NETCONIDSTRUCT))
{
PNETCONIDSTRUCT pData = (PNETCONIDSTRUCT)pidl->mkid.abID;
if (pData->Signature == NETCONIDSTRUCT_SIG)
return pData;
}
return NULL;
}
PWCHAR ILGetConnName(PCITEMID_CHILD pidl)
@@ -48,17 +52,21 @@ PITEMID_CHILD ILCreateNetConnectItem(INetConnection * pItem)
/* Allocate enough memory for the trailing id which will indicate that this is a simple id */
pidl = static_cast<LPITEMIDLIST>(SHAlloc(size + sizeof(SHITEMID)));
if (!pidl)
goto end;
pidl->mkid.cb = (WORD)size;
pidl->mkid.abID[0] = 0x99;
((PNETCONIDSTRUCT)(pidl->mkid.abID))->Signature = NETCONIDSTRUCT_SIG;
/* Copy the connection properties */
pnetid = ILGetConnData(pidl);
memset(pnetid->Unknown, 0, sizeof(pnetid->Unknown));
pnetid->clsidThisObject = pProperties->clsidThisObject;
pnetid->guidId = pProperties->guidId;
pnetid->Status = pProperties->Status;
pnetid->MediaType = pProperties->MediaType;
pnetid->dwCharacter = pProperties->dwCharacter;
pnetid->uNameOffset = sizeof(NETCONIDSTRUCT);
pnetid->uDeviceNameOffset = pnetid->uNameOffset + (wcslen(pProperties->pszwName) + 1) * sizeof(WCHAR);
pnetid->uDeviceNameOffset = ULONG(pnetid->uNameOffset + (wcslen(pProperties->pszwName) + 1) * sizeof(WCHAR));
pwchName = ILGetConnName(pidl);
wcscpy(pwchName, pProperties->pszwName);
@@ -68,7 +76,7 @@ PITEMID_CHILD ILCreateNetConnectItem(INetConnection * pItem)
/* Set the trailing id to null */
memset((void*)((ULONG_PTR)pidl + size), 0, sizeof(SHITEMID));
end:
NcFreeNetconProperties(pProperties);
return pidl;