Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-03 20:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32][SDK] SHChangeNotify: Re-work Part 1 (#6898)

Browse source 
Making shell change notification implementation better.
Now recycle bin icon change is working.
JIRA issue: CORE-13950
JIRA issue: CORE-19591
JIRA issue: CORE-11453
- Delete SHSimpleIDListFromPathA/W hacks.
- Translate simple PIDLs (coming from SHSimpleIDListFromPathA/W)
  in CDefView::OnChangeNotify method.
- Add CDefView::LV_RefreshIcons method for SHCNE_UPDATEIMAGE
  change event.
- Rename CDefView::LV_ProdItem method as CDefView::LV_UpdateItem.
- Call SHUpdateRecycleBinIcon in SHFileOperationW function.
- Half-implement SHUpdateRecycleBinIcon.
- Call SHChangeNotify in DeleteExt function.
This commit is contained in:
Katayama Hirofumi MZ 2024-05-17 08:10:15 +09:00 committed by GitHub
parent e0ba2f3372
commit 3285f698fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 99 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
dll/win32/shell32/CDefView.cpp
View file

@ -199,7 +199,9 @@ public:
int LV_AddItem(PCUITEMID_CHILD pidl);
BOOLEAN LV_DeleteItem(PCUITEMID_CHILD pidl);
BOOLEAN LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew);
BOOLEAN LV_ProdItem(PCUITEMID_CHILD pidl);
BOOLEAN LV_UpdateItem(PCUITEMID_CHILD pidl);
void LV_RefreshIcon(INT iItem);
void LV_RefreshIcons();
static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg);
HRESULT FillList();
HRESULT FillFileMenu();
@ -973,6 +975,8 @@ BOOLEAN CDefView::LV_DeleteItem(PCUITEMID_CHILD pidl)
if (nIndex < 0)
return FALSE;
_DoFolderViewCB(SFVM_REMOVINGOBJECT, 0, (LPARAM)pidl);
return m_ListView.DeleteItem(nIndex);
}
@ -1015,7 +1019,7 @@ BOOLEAN CDefView::LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew
return FALSE;
}
BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
BOOLEAN CDefView::LV_UpdateItem(PCUITEMID_CHILD pidl)
{
int nItem;
LVITEMW lvItem;
@ -1028,6 +1032,8 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
if (-1 != nItem)
{
_DoFolderViewCB(SFVM_UPDATINGOBJECT, 0, (LPARAM)pidl);
lvItem.mask = LVIF_IMAGE;
lvItem.iItem = nItem;
lvItem.iSubItem = 0;
@ -1040,6 +1046,31 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
return FALSE;
}
void CDefView::LV_RefreshIcon(INT iItem)
{
ASSERT(m_ListView);
LVITEMW lvItem = { LVIF_IMAGE };
lvItem.iItem = iItem;
lvItem.iImage = I_IMAGECALLBACK;
m_ListView.SetItem(&lvItem);
m_ListView.Update(iItem);
}
void CDefView::LV_RefreshIcons()
{
ASSERT(m_ListView);
for (INT iItem = -1;;)
{
iItem = ListView_GetNextItem(m_ListView, iItem, LVNI_ALL);
if (iItem == -1)
break;
LV_RefreshIcon(iItem);
}
}
INT CALLBACK CDefView::fill_list(LPVOID ptr, LPVOID arg)
{
PITEMID_CHILD pidl = static_cast<PITEMID_CHILD>(ptr);
@ -2311,46 +2342,75 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
return FALSE;
}
BOOL bParent0 = ILIsParentOrSpecialParent(m_pidlParent, Pidls[0]);
BOOL bParent1 = ILIsParentOrSpecialParent(m_pidlParent, Pidls[1]);
TRACE("(%p)(%p,%p,0x%08x)\n", this, Pidls[0], Pidls[1], lParam);
// Translate PIDLs.
// SHSimpleIDListFromPathW creates fake PIDLs (lacking some attributes)
// FIXME: Use SHGetRealIDL
CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidl0(Pidls[0]), pidl1(Pidls[1]);
WCHAR path[MAX_PATH];
if (pidl0 && SHGetPathFromIDListW(pidl0, path) && PathFileExistsW(path))
{
pidl0.Free();
pidl0.Attach(ILCreateFromPathW(path));
}
if (pidl1 && SHGetPathFromIDListW(pidl1, path) && PathFileExistsW(path))
{
pidl1.Free();
pidl1.Attach(ILCreateFromPathW(path));
}
PITEMID_CHILD child0 = NULL, child1 = NULL;
if (ILIsParentOrSpecialParent(m_pidlParent, pidl0))
child0 = ILFindLastID(pidl0);
if (ILIsParentOrSpecialParent(m_pidlParent, pidl1))
child1 = ILFindLastID(pidl1);
lEvent &= ~SHCNE_INTERRUPT;
switch (lEvent)
{
case SHCNE_MKDIR:
case SHCNE_CREATE:
case SHCNE_DRIVEADD:
if (bParent0)
{
if (LV_FindItemByPidl(ILFindLastID(Pidls[0])) == -1)
LV_AddItem(ILFindLastID(Pidls[0]));
else
LV_ProdItem(ILFindLastID(Pidls[0]));
}
if (!child0)
break;
if (LV_FindItemByPidl(child0) < 0)
LV_AddItem(child0);
else
LV_UpdateItem(child0);
break;
case SHCNE_RMDIR:
case SHCNE_DELETE:
case SHCNE_DRIVEREMOVED:
if (bParent0)
LV_DeleteItem(ILFindLastID(Pidls[0]));
if (child0)
LV_DeleteItem(child0);
break;
case SHCNE_RENAMEFOLDER:
case SHCNE_RENAMEITEM:
if (bParent0 && bParent1)
LV_RenameItem(ILFindLastID(Pidls[0]), ILFindLastID(Pidls[1]));
else if (bParent0)
LV_DeleteItem(ILFindLastID(Pidls[0]));
else if (bParent1)
LV_AddItem(ILFindLastID(Pidls[1]));
if (child0 && child1)
LV_RenameItem(child0, child1);
else if (child0)
LV_DeleteItem(child0);
else if (child1)
LV_AddItem(child1);
break;
case SHCNE_UPDATEITEM:
if (bParent0)
LV_RenameItem(ILFindLastID(Pidls[0]), ILFindLastID(Pidls[0]));
if (child0)
LV_UpdateItem(child0);
break;
case SHCNE_UPDATEIMAGE:
case SHCNE_MEDIAINSERTED:
case SHCNE_MEDIAREMOVED:
case SHCNE_ASSOCCHANGED:
LV_RefreshIcons();
break;
case SHCNE_UPDATEDIR:
case SHCNE_ATTRIBUTES:
Refresh();
UpdateStatusbar();
break;
case SHCNE_FREESPACE:
UpdateStatusbar();
break;
}

7
dll/win32/shell32/dialogs/filetypes.cpp
View file

@ -66,7 +66,12 @@ DeleteExt(HWND hwndDlg, LPCWSTR pszExt)
SHDeleteKeyW(HKEY_CLASSES_ROOT, szValue);
// delete ".ext" key
return SHDeleteKeyW(HKEY_CLASSES_ROOT, pszExt) == ERROR_SUCCESS;
BOOL ret = (SHDeleteKeyW(HKEY_CLASSES_ROOT, pszExt) == ERROR_SUCCESS);
// notify
SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_FLUSHNOWAIT, NULL, NULL);
return ret;
}
static inline HICON

1
dll/win32/shell32/folders/CFSFolder.cpp
View file

@ -683,6 +683,7 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW
return S_OK;
}
// This method is typically invoked from SHSimpleIDListFromPathA/W.
HRESULT CFSFolder::_ParseSimple(
_In_ LPOLESTR lpszDisplayName,
_Inout_ WIN32_FIND_DATAW *pFind,

5
dll/win32/shell32/folders/CRecycleBin.cpp
View file

@ -1078,6 +1078,11 @@ EXTERN_C HRESULT WINAPI SHUpdateRecycleBinIcon(void)
{
FIXME("stub\n");
// HACK! This dwItem2 should be the icon index in the system image list that has changed.
// FIXME: Call SHMapPIDLToSystemImageListIndex
DWORD dwItem2 = -1;
SHChangeNotify(SHCNE_UPDATEIMAGE, SHCNF_DWORD, NULL, &dwItem2);
return S_OK;
}

2
dll/win32/shell32/shlfileop.cpp
View file

@ -2061,6 +2061,8 @@ cleanup:
if (lpFileOp->wFunc != FO_DELETE)
destroy_file_list(&flTo);
else if (lpFileOp->fFlags & FOF_ALLOWUNDO)
SHUpdateRecycleBinIcon();
if (ret == ERROR_CANCELLED)
lpFileOp->fAnyOperationsAborted = TRUE;

15
dll/win32/shell32/wine/pidl.c
View file

@ -1113,15 +1113,6 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathA(LPCSTR lpszPath)
wPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpszPath, -1, wPath, len);
}
#ifdef __REACTOS__
// FIXME: Needs folder attribute
if (PathFileExistsW(wPath))
{
pidl = ILCreateFromPathW(wPath);
HeapFree(GetProcessHeap(), 0, wPath);
return pidl;
}
#endif
_ILParsePathW(wPath, NULL, TRUE, &pidl, NULL);
@ -1135,13 +1126,9 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathW(LPCWSTR lpszPath)
LPITEMIDLIST pidl = NULL;
TRACE("%s\n", debugstr_w(lpszPath));
#ifdef __REACTOS__
// FIXME: Needs folder attribute
if (PathFileExistsW(lpszPath))
return ILCreateFromPathW(lpszPath);
#endif
_ILParsePathW(lpszPath, NULL, TRUE, &pidl, NULL);
TRACE("%s %p\n", debugstr_w(lpszPath), pidl);
return pidl;
}

1
sdk/include/psdk/shlobj.h
View file

@ -1323,6 +1323,7 @@ SHCreateShellFolderViewEx(
#define SFVM_SETISFV 39
#define SFVM_GETEXTVIEWS 40 /* undocumented */
#define SFVM_THISIDLIST 41
#define SFVM_UPDATINGOBJECT 43 /* undocumented */
#define SFVM_ADDPROPERTYPAGES 47
#define SFVM_BACKGROUNDENUMDONE 48
#define SFVM_GETNOTIFY 49

1
sdk/include/reactos/undocshell.h
View file

@ -122,6 +122,7 @@ typedef struct _SHCNF_PRINTJOB_INFO
#define SHCNF_PRINTJOBA 0x0004
#define SHCNF_PRINTJOBW 0x0007
HRESULT WINAPI SHUpdateRecycleBinIcon(void);
/****************************************************************************
* Shell Common Dialogs