Francois Gouget : shell32: CSIDL_MYDOCUMENTS is now a synonym for CSIDL_PERSONAL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a9f9676046a69907fe00c5ead51d98a3cca48521
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a9f9676046a69907fe00c5ead5...

Author: Francois Gouget 
Date:   Tue Sep 18 00:40:56 2007 +0200

shell32: CSIDL_MYDOCUMENTS is now a synonym for CSIDL_PERSONAL.

---

dlls/shell32/tests/shellpath.c |   12 ++++++------
 include/shlobj.h               |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 2821b4f..8c237df 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -35,6 +35,11 @@
 #include "shlwapi.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
 #define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) )
 #endif
@@ -129,7 +134,7 @@ static const struct shellExpectedValues optionalShellValues[] = {
  { CSIDL_ADMINTOOLS, PT_FOLDER },
  { CSIDL_COMMON_APPDATA, PT_FOLDER },
  { CSIDL_LOCAL_APPDATA, PT_FOLDER },
- { CSIDL_MYDOCUMENTS, PT_FOLDER },
+ { OLD_CSIDL_MYDOCUMENTS, PT_FOLDER },
  { CSIDL_MYMUSIC, PT_FOLDER },
  { CSIDL_MYPICTURES, PT_FOLDER },
  { CSIDL_MYVIDEO, PT_FOLDER },
@@ -194,11 +199,6 @@ static void loadShell32(void)
 #define CSIDL_PROFILES		0x003e
 #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 */
 static const char *getFolderName(int folder)
 {
diff --git a/include/shlobj.h b/include/shlobj.h
index 5e88bb4..77e09cc 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1076,7 +1076,7 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF
 #define CSIDL_SENDTO		0x0009
 #define CSIDL_BITBUCKET		0x000a
 #define CSIDL_STARTMENU		0x000b
-#define CSIDL_MYDOCUMENTS	0x000c
+#define CSIDL_MYDOCUMENTS	CSIDL_PERSONAL
 #define CSIDL_MYMUSIC		0x000d
 #define CSIDL_MYVIDEO		0x000e
 #define CSIDL_DESKTOPDIRECTORY	0x0010