Author: gadamopoulos
Date: Mon Aug 7 10:09:30 2017
New Revision: 75500
URL: http://svn.reactos.org/svn/reactos?rev=75500&view=rev
Log:
[SHELL32] -Restore some code I incorrectly removed in r75360. CORE-13564
Modified:
trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp
Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp?rev=75500&r1=75499&r2=75500&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1]
Mon Aug 7 10:09:30 2017
@@ -85,6 +85,44 @@
// CComPtr fDesktopEnumerator;
// CComPtr fCommonDesktopEnumerator;
public:
+
+ void AddItemsFromClassicStartMenuKey(HKEY hKeyRoot)
+ {
+ DWORD dwResult;
+ HKEY hkey;
+ DWORD j = 0, dwVal, Val, dwType, dwIID;
+ LONG r;
+ WCHAR iid[50];
+ LPITEMIDLIST pidl;
+
+ dwResult = RegOpenKeyExW(hKeyRoot, ClassicStartMenuW, 0, KEY_READ,
&hkey);
+ if (dwResult != ERROR_SUCCESS)
+ return;
+
+ while(1)
+ {
+ dwVal = sizeof(Val);
+ dwIID = sizeof(iid) / sizeof(WCHAR);
+
+ r = RegEnumValueW(hkey, j++, iid, &dwIID, NULL, &dwType,
(LPBYTE)&Val, &dwVal);
+ if (r != ERROR_SUCCESS)
+ break;
+
+ if (Val == 0 && dwType == REG_DWORD)
+ {
+ pidl = _ILCreateGuidFromStrW(iid);
+ if (pidl != NULL)
+ {
+ if (!HasItemWithCLSID(pidl))
+ AddToEnumList(pidl);
+ else
+ SHFree(pidl);
+ }
+ }
+ }
+ RegCloseKey(hkey);
+ }
+
HRESULT WINAPI Initialize(DWORD dwFlags,IEnumIDList * pRegEnumerator,
IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator)
{
BOOL ret = TRUE;
@@ -112,6 +150,8 @@
SHFree(pidl);
}
}
+ AddItemsFromClassicStartMenuKey(HKEY_LOCAL_MACHINE);
+ AddItemsFromClassicStartMenuKey(HKEY_CURRENT_USER);
}
/* Enumerate the items in the two fs folders */
