Hans Leidekker : shell32: Add support for CSIDL_PROGRAM_FILESX86 and CSIDL_PROGRAM_FILES_COMMONX86.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Fri Sep 10 17:30:23 2010 +0200

shell32: Add support for CSIDL_PROGRAM_FILESX86 and CSIDL_PROGRAM_FILES_COMMONX86.

---

 dlls/shell32/shell32_En.rc |    2 ++
 dlls/shell32/shellpath.c   |   14 ++++++++------
 dlls/shell32/shresdef.h    |    2 ++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc
index d8cd66d..ce7d63d 100644
--- a/dlls/shell32/shell32_En.rc
+++ b/dlls/shell32/shell32_En.rc
@@ -274,8 +274,10 @@ STRINGTABLE
 	IDS_COOKIES                 "Cookies"
 	IDS_HISTORY                 "Local Settings\\History"
 	IDS_PROGRAM_FILES           "Program Files"
+	IDS_PROGRAM_FILESX86        "Program Files (x86)"
 	IDS_MYPICTURES              "My Pictures"
 	IDS_PROGRAM_FILES_COMMON    "Program Files\\Common Files"
+	IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files"
 	IDS_COMMON_DOCUMENTS        "Documents"
 	IDS_ADMINTOOLS              "Start Menu\\Programs\\Administrative Tools"
 	IDS_COMMON_MUSIC            "Music"
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 6083b45..8daa875 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -767,6 +767,7 @@ static const WCHAR Common_DesktopW[] = {'C','o','m','m','o','n',' ','D','e','s',
 static const WCHAR Common_DocumentsW[] = {'C','o','m','m','o','n',' ','D','o','c','u','m','e','n','t','s','\0'};
 static const WCHAR Common_FavoritesW[] = {'C','o','m','m','o','n',' ','F','a','v','o','r','i','t','e','s','\0'};
 static const WCHAR CommonFilesDirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r','\0'};
+static const WCHAR CommonFilesDirX86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'};
 static const WCHAR CommonMusicW[] = {'C','o','m','m','o','n','M','u','s','i','c','\0'};
 static const WCHAR CommonPicturesW[] = {'C','o','m','m','o','n','P','i','c','t','u','r','e','s','\0'};
 static const WCHAR Common_ProgramsW[] = {'C','o','m','m','o','n',' ','P','r','o','g','r','a','m','s','\0'};
@@ -787,6 +788,7 @@ static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'};
 static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'};
 static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'};
 static const WCHAR ProgramFilesDirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r','\0'};
+static const WCHAR ProgramFilesDirX86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'};
 static const WCHAR ProgramsW[] = {'P','r','o','g','r','a','m','s','\0'};
 static const WCHAR RecentW[] = {'R','e','c','e','n','t','\0'};
 static const WCHAR ResourcesW[] = {'R','e','s','o','u','r','c','e','s','\0'};
@@ -1037,9 +1039,9 @@ static const CSIDL_DATA CSIDL_Data[] =
         NULL
     },
     { /* 0x2a - CSIDL_PROGRAM_FILESX86 */
-        CSIDL_Type_NonExistent,
-        NULL,
-        NULL
+        CSIDL_Type_CurrVer,
+        ProgramFilesDirX86W,
+        MAKEINTRESOURCEW(IDS_PROGRAM_FILESX86)
     },
     { /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */
         CSIDL_Type_CurrVer,
@@ -1047,9 +1049,9 @@ static const CSIDL_DATA CSIDL_Data[] =
         MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON)
     },
     { /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */
-        CSIDL_Type_NonExistent,
-        NULL,
-        NULL
+        CSIDL_Type_CurrVer,
+        CommonFilesDirX86W,
+        MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMONX86)
     },
     { /* 0x2d - CSIDL_COMMON_TEMPLATES */
         CSIDL_Type_AllUsers,
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index b8a456b..9261fe3 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -90,6 +90,8 @@
 #define IDS_COMMON_PICTURES         69
 #define IDS_COMMON_VIDEO            70
 #define IDS_CDBURN_AREA             71
+#define IDS_PROGRAM_FILESX86        72
+#define IDS_PROGRAM_FILES_COMMONX86 73
 
 #define IDS_CREATEFOLDER_DENIED     128
 #define IDS_CREATEFOLDER_CAPTION    129