this time I'll get it in the right mailing list
Chris Green
chris_e_green at yahoo.com
Tue Oct 9 18:17:28 CDT 2001
Index: include/shlobj.h
===================================================================
RCS file: /home/wine/wine/include/shlobj.h,v
retrieving revision 1.47
diff -u -3 -p -r1.47 shlobj.h
--- include/shlobj.h 2000/09/26 00:00:59 1.47
+++ include/shlobj.h 2001/10/09 21:53:39
@@ -461,6 +461,9 @@ HRESULT WINAPI SHGetSpecialFolderLocatio
#define CSIDL_SENDTO 0x0009
#define CSIDL_BITBUCKET 0x000a
#define CSIDL_STARTMENU 0x000b
+#define CSIDL_MYDOCUMENTS 0x000c
+#define CSIDL_MYMUSIC 0x000d
+#define CSIDL_MYVIDEO 0x000e
#define CSIDL_DESKTOPDIRECTORY 0x0010
#define CSIDL_DRIVES 0x0011
#define CSIDL_NETWORK 0x0012
@@ -473,6 +476,7 @@ HRESULT WINAPI SHGetSpecialFolderLocatio
#define CSIDL_COMMON_DESKTOPDIRECTORY 0x0019
#define CSIDL_APPDATA 0x001a
#define CSIDL_PRINTHOOD 0x001b
+#define CSIDL_LOCAL_APPDATA 0x001c
#define CSIDL_ALTSTARTUP 0x001d
#define CSIDL_COMMON_ALTSTARTUP 0x001e
#define CSIDL_COMMON_FAVORITES 0x001f
@@ -494,8 +498,17 @@ HRESULT WINAPI SHGetSpecialFolderLocatio
#define CSIDL_COMMON_ADMINTOOLS 0x002f
#define CSIDL_ADMINTOOLS 0x0030
#define CSIDL_CONNECTIONS 0x0031
+#define CSIDL_COMMON_MUSIC 0x0035
+#define CSIDL_COMMON_PICTURES 0x0036
+#define CSIDL_COMMON_VIDEO 0x0037
+#define CSIDL_RESOURCES 0x0038
+#define CSIDL_RESOURCES_LOCALIZED 0x0039
+#define CSIDL_COMMON_OEM_LINKS 0x003a
+#define CSIDL_CDBURN_AREA 0x003b
+#define CSIDL_COMPUTERSNEARME 0x003d
#define CSIDL_FOLDER_MASK 0x00ff
-
+#define CSIDL_FLAG_PER_USER_INIT 0x0800
+#define CSIDL_FLAG_NO_ALIAS 0x1000
#define CSIDL_FLAG_DONT_VERIFY 0x4000
#define CSIDL_FLAG_CREATE 0x8000
Index: dlls/shell32/shellpath.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellpath.c,v
retrieving revision 1.56
diff -u -3 -p -r1.56 shellpath.c
--- dlls/shell32/shellpath.c 2001/08/16 18:49:57 1.56
+++ dlls/shell32/shellpath.c 2001/10/09 21:53:41
@@ -660,7 +660,7 @@ static const CSIDL_DATA CSIDL_Data[] =
"Desktop",
"Desktop"
},
- { /* CSIDL_INTERNET (??) */
+ { /* CSIDL_INTERNET */
0, 1, /* FIXME */
NULL,
NULL,
@@ -715,22 +715,22 @@ static const CSIDL_DATA CSIDL_Data[] =
"Start Menu",
"Start Menu"
},
- { /* not known */
- 0, 0,
+ { /* CSIDL_MYDOCUMENTS */
+ 0, 1, /* FIXME */
NULL,
NULL,
},
- { /* not known */
- 0, 0,
+ { /* CSIDL_MYMUSIC */
+ 0, 1, /* FIXME */
NULL,
NULL,
},
- { /* not known */
- 0, 0,
+ { /* CSIDL_MYVIDEO */
+ 0, 1, /* FIXME */
NULL,
NULL,
},
- { /* not known */
+ { /* unassigned */
0, 0,
NULL,
NULL,
@@ -795,8 +795,8 @@ static const CSIDL_DATA CSIDL_Data[] =
"PrintHood",
"PrintHood"
},
- { /* not known */
- 0, 0,
+ { /* CSIDL_LOCAL_APPDATA */
+ 0, 0, /* FIXME */
NULL,
NULL,
},
@@ -904,6 +904,66 @@ static const CSIDL_DATA CSIDL_Data[] =
0, 1, /* FIXME */
NULL,
NULL
+ },
+ { /* unassigned 32*/
+ 0, 0,
+ NULL,
+ NULL,
+ },
+ { /* unassigned 33*/
+ 0, 0,
+ NULL,
+ NULL,
+ },
+ { /* unassigned 34*/
+ 0, 0,
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_COMMON_MUSIC */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_COMMON_PICTURES */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_COMMON_VIDEO */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_RESOURCES */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_RESOURCES_LOCALIZED */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_COMMON_OEM_LINKS */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_CDBURN_AREA */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
+ },
+ { /* unassigned 3C */
+ 0, 0,
+ NULL,
+ NULL,
+ },
+ { /* CSIDL_COMPUTERSNEARME */
+ 0, 0, /* FIXME */
+ NULL,
+ NULL,
}
};
#undef HKCU
@@ -926,7 +986,7 @@ BOOL WINAPI SHGetSpecialFolderPathA (
TRACE("0x%04x,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
- if ((folder > CSIDL_CONNECTIONS) || (CSIDL_Data[folder].hRootKey == 0))
+ if ((folder > CSIDL_COMPUTERSNEARME) || (CSIDL_Data[folder].hRootKey == 0))
{
ERR("folder unknown or not allowed\n");
return FALSE;
_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com
More information about the wine-patches
mailing list