Commit ae379a44 authored by Paul Rupe's avatar Paul Rupe Committed by Alexandre Julliard

Add CSIDL_PROFILES. Improved logging for non-existent CSIDL values.

parent 3e919318
......@@ -995,6 +995,11 @@ static const CSIDL_DATA CSIDL_Data[] =
0, 0, /* FIXME */
NULL,
NULL,
},
{ /* CSIDL_PROFILES */
0, 0, /* FIXME */
NULL,
NULL,
}
};
#undef HKCU
......@@ -1017,14 +1022,15 @@ BOOL WINAPI SHGetSpecialFolderPathA (
TRACE("%p,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
if ((folder > CSIDL_COMPUTERSNEARME) || (CSIDL_Data[folder].hRootKey == 0))
if ((folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) ||
(CSIDL_Data[folder].hRootKey == 0))
{
ERR("folder unknown or not allowed\n");
ERR("folder 0x%04lx unknown or not allowed\n", folder);
return FALSE;
}
if (CSIDL_Data[folder].hRootKey == (HKEY)1)
{
FIXME("folder unknown, please add.\n");
FIXME("folder 0x%04lx unknown, please add.\n", folder);
return FALSE;
}
......
......@@ -566,6 +566,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation(HWND, INT, LPITEMIDLIST *);
#define CSIDL_COMMON_OEM_LINKS 0x003a
#define CSIDL_CDBURN_AREA 0x003b
#define CSIDL_COMPUTERSNEARME 0x003d
#define CSIDL_PROFILES 0x003e
#define CSIDL_FOLDER_MASK 0x00ff
#define CSIDL_FLAG_PER_USER_INIT 0x0800
#define CSIDL_FLAG_NO_ALIAS 0x1000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment