marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Also scan HKEY_CURRENT_USER for shell namespace extensions in 

MyComputer.
oldstable
Michael Jung 2005-11-23 15:17:22 +01:00 committed by Alexandre Julliard
parent ae8a912605
commit b2647030c4
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/shell32/shfldr_mycomp.c
View File

@ -274,6 +274,7 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags)
WCHAR wszDriveName[] = {'A', ':', '\\', '\0'}; WCHAR wszDriveName[] = {'A', ':', '\\', '\0'};
DWORD dwDrivemap = GetLogicalDrives(); DWORD dwDrivemap = GetLogicalDrives();
HKEY hkey; HKEY hkey;
UINT i;
while (ret && wszDriveName[0]<='Z') while (ret && wszDriveName[0]<='Z')
{ {
@ -284,32 +285,34 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags)
} }
TRACE("-- (%p)-> enumerate (mycomputer shell extensions)\n",list); TRACE("-- (%p)-> enumerate (mycomputer shell extensions)\n",list);
if (ret && !RegOpenKeyExW(HKEY_LOCAL_MACHINE, MyComputer_NameSpaceW, for (i=0; i<2; i++) {
0, KEY_READ, &hkey)) if (ret && !RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER,
{ MyComputer_NameSpaceW, 0, KEY_READ, &hkey))
WCHAR iid[50];
int i=0;
while (ret)
{ {
DWORD size; WCHAR iid[50];
LONG r; int i=0;
size = sizeof(iid) / sizeof(iid[0]); while (ret)
r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL);
if (ERROR_SUCCESS == r)
{ {
/* FIXME: shell extensions, shouldn't the type be DWORD size;
* PT_SHELLEXT? */ LONG r;
ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid));
i++; size = sizeof(iid) / sizeof(iid[0]);
r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL);
if (ERROR_SUCCESS == r)
{
/* FIXME: shell extensions, shouldn't the type be
* PT_SHELLEXT? */
ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid));
i++;
}
else if (ERROR_NO_MORE_ITEMS == r)
break;
else
ret = FALSE;
} }
else if (ERROR_NO_MORE_ITEMS == r) RegCloseKey(hkey);
break;
else
ret = FALSE;
} }
RegCloseKey(hkey);
} }
} }
return ret; return ret;