ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: CSIDL_MYDOCUMENTS is now a synonym for CSIDL_PERSONAL.

This commit is contained in:
Francois Gouget 2007-09-18 00:40:56 +02:00 committed by Alexandre Julliard
parent 9114bc1bd8
commit a9f9676046
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/shell32/tests/shellpath.c
View File

@ -35,6 +35,11 @@
#include "shlwapi.h" #include "shlwapi.h"
#include "wine/test.h" #include "wine/test.h"
/* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want
* here is its original value.
*/
#define OLD_CSIDL_MYDOCUMENTS 0x000c
#ifndef ARRAY_SIZE #ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) ) #define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) )
#endif #endif
@ -129,7 +134,7 @@ static const struct shellExpectedValues optionalShellValues[] = {
{ CSIDL_ADMINTOOLS, PT_FOLDER }, { CSIDL_ADMINTOOLS, PT_FOLDER },
{ CSIDL_COMMON_APPDATA, PT_FOLDER }, { CSIDL_COMMON_APPDATA, PT_FOLDER },
{ CSIDL_LOCAL_APPDATA, PT_FOLDER }, { CSIDL_LOCAL_APPDATA, PT_FOLDER },
{ CSIDL_MYDOCUMENTS, PT_FOLDER }, { OLD_CSIDL_MYDOCUMENTS, PT_FOLDER },
{ CSIDL_MYMUSIC, PT_FOLDER }, { CSIDL_MYMUSIC, PT_FOLDER },
{ CSIDL_MYPICTURES, PT_FOLDER }, { CSIDL_MYPICTURES, PT_FOLDER },
{ CSIDL_MYVIDEO, PT_FOLDER }, { CSIDL_MYVIDEO, PT_FOLDER },
@ -194,11 +199,6 @@ static void loadShell32(void)
#define CSIDL_PROFILES 0x003e #define CSIDL_PROFILES 0x003e
#endif #endif
/* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want
* here is its original value.
*/
#define OLD_CSIDL_MYDOCUMENTS 0x000c
/* A couple utility printing functions */ /* A couple utility printing functions */
static const char *getFolderName(int folder) static const char *getFolderName(int folder)
{ {

2
include/shlobj.h
View File

@ -1076,7 +1076,7 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF
#define CSIDL_SENDTO 0x0009 #define CSIDL_SENDTO 0x0009
#define CSIDL_BITBUCKET 0x000a #define CSIDL_BITBUCKET 0x000a
#define CSIDL_STARTMENU 0x000b #define CSIDL_STARTMENU 0x000b
#define CSIDL_MYDOCUMENTS 0x000c #define CSIDL_MYDOCUMENTS CSIDL_PERSONAL
#define CSIDL_MYMUSIC 0x000d #define CSIDL_MYMUSIC 0x000d
#define CSIDL_MYVIDEO 0x000e #define CSIDL_MYVIDEO 0x000e
#define CSIDL_DESKTOPDIRECTORY 0x0010 #define CSIDL_DESKTOPDIRECTORY 0x0010