[2/2] shell32: Don't translate the shell folder paths.
Francois Gouget
fgouget at free.fr
Mon Jan 23 08:58:14 CST 2012
Some are not meant to be translated anyway (e.g. 'Program Files') and others only partially (e.g. 'Program Files\Common Files'). For rest the path forward is to only translate them in the GUI using desktop.ini files.
The execptions are the folders that we usually symlink to an actual host folder as we cannot use a desktop.ini file in these cases.
---
Hopefully this faithfully implements what was suggested in:
http://www.winehq.org/pipermail/wine-devel/2012-January/093847.html
Let me know if I misunderstood the original intent.
dlls/shell32/shell32.rc | 43 ---------------
dlls/shell32/shellpath.c | 132 ++++++++++++++++++++++++++++-----------------
dlls/shell32/shresdef.h | 44 ---------------
3 files changed, 82 insertions(+), 137 deletions(-)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 0b0a5cb..a1d7a81 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -196,54 +196,11 @@ the folder?"
IDS_RUNDLG_BROWSE_FILTER_ALL "All files (*.*)"
/* shell folder path default values */
- IDS_PROGRAMS "Start Menu\\Programs"
IDS_PERSONAL "My Documents"
- IDS_FAVORITES "Favorites"
- IDS_STARTUP "Start Menu\\Programs\\StartUp"
- IDS_RECENT "Recent"
- IDS_SENDTO "SendTo"
- IDS_STARTMENU "Start Menu"
IDS_MYMUSIC "My Music"
IDS_MYVIDEOS "My Videos"
IDS_DESKTOPDIRECTORY "#msgctxt#directory#Desktop"
- IDS_NETHOOD "NetHood"
- IDS_TEMPLATES "Templates"
- IDS_APPDATA "Application Data"
- IDS_PRINTHOOD "PrintHood"
- IDS_LOCAL_APPDATA "Local Settings\\Application Data"
- IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files"
- 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"
- IDS_COMMON_PICTURES "Pictures"
- IDS_COMMON_VIDEOS "Videos"
- IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning"
- IDS_CONTACTS "Contacts"
- IDS_LINKS "Links"
- IDS_PHOTO_ALBUMS "Pictures\\Slide Shows"
- IDS_PLAYLISTS "Music\\Playlists"
- IDS_PUBLIC_DOWNLOADS "Downloads"
- IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer"
- IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Libraries"
- IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones"
- IDS_SAMPLE_MUSIC "Music\\Sample Music"
- IDS_SAMPLE_PICTURES "Pictures\\Sample Pictures"
- IDS_SAMPLE_PLAYLISTS "Music\\Sample Playlists"
- IDS_SAMPLE_VIDEOS "Videos\\Sample Videos"
- IDS_SAVED_GAMES "Saved Games"
- IDS_SAVED_SEARCHES "Searches"
- IDS_USER_PROFILES "Users"
- IDS_COMMON_OEM_LINKS "OEM Links"
- IDS_DOCUMENTS "Documents"
- IDS_DOWNLOADS "Downloads"
- IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow"
IDS_NEWFOLDER "New Folder"
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 9f75a5d..5620226 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -757,6 +757,8 @@ VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath)
static const WCHAR szCurrentVersion[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\0'};
static const WCHAR Administrative_ToolsW[] = {'A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'};
static const WCHAR AppDataW[] = {'A','p','p','D','a','t','a','\0'};
+static const WCHAR AppData_LocalLowW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','L','o','w','\0'};
+static const WCHAR Application_DataW[] = {'A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'};
static const WCHAR CacheW[] = {'C','a','c','h','e','\0'};
static const WCHAR CD_BurningW[] = {'C','D',' ','B','u','r','n','i','n','g','\0'};
static const WCHAR Common_Administrative_ToolsW[] = {'C','o','m','m','o','n',' ','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'};
@@ -776,27 +778,57 @@ static const WCHAR CommonVideoW[] = {'C','o','m','m','o','n','V','i','d','e','o'
static const WCHAR ContactsW[] = {'C','o','n','t','a','c','t','s','\0'};
static const WCHAR CookiesW[] = {'C','o','o','k','i','e','s','\0'};
static const WCHAR DesktopW[] = {'D','e','s','k','t','o','p','\0'};
+static const WCHAR DocumentsW[] = {'D','o','c','u','m','e','n','t','s','\0'};
+static const WCHAR DownloadsW[] = {'D','o','w','n','l','o','a','d','s','\0'};
static const WCHAR FavoritesW[] = {'F','a','v','o','r','i','t','e','s','\0'};
static const WCHAR FontsW[] = {'F','o','n','t','s','\0'};
static const WCHAR HistoryW[] = {'H','i','s','t','o','r','y','\0'};
+static const WCHAR LinksW[] = {'L','i','n','k','s','\0'};
static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'};
+static const WCHAR Local_Settings_Application_DataW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'};
+static const WCHAR Local_Settings_CD_BurningW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\\','M','i','c','r','o','s','o','f','t','\\','C','D',' ','B','u','r','n','i','n','g','\0'};
+static const WCHAR Local_Settings_HistoryW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','H','i','s','t','o','r','y','\0'};
+static const WCHAR Local_Settings_Temporary_Internet_FilesW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','T','e','m','p','o','r','a','r','y',' ','I','n','t','e','r','n','e','t',' ','F','i','l','e','s','\0'};
+static const WCHAR Microsoft_Windows_GameExplorerW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p','l','o','r','e','r','\0'};
+static const WCHAR Microsoft_Windows_LibrariesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','L','i','b','r','a','r','i','e','s','\0'};
+static const WCHAR Microsoft_Windows_RingtonesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','R','i','n','g','t','o','n','e','s','\0'};
+static const WCHAR MusicW[] = {'M','u','s','i','c','\0'};
+static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'};
+static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'};
+static const WCHAR Music_Sample_PlaylistsW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','P','l','a','y','l','i','s','t','s','\0'};
+static const WCHAR My_DocumentsW[] = {'M','y',' ','D','o','c','u','m','e','n','t','s','\0'};
static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'};
static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'};
static const WCHAR My_VideosW[] = {'M','y',' ','V','i','d','e','o','s','\0'};
static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'};
+static const WCHAR OEM_LinksW[] = {'O','E','M',' ','L','i','n','k','s','\0'};
static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'};
+static const WCHAR PicturesW[] = {'P','i','c','t','u','r','e','s','\0'};
+static const WCHAR Pictures_Sample_PicturesW[] = {'P','i','c','t','u','r','e','s','\\','S','a','m','p','l','e',' ','P','i','c','t','u','r','e','s','\0'};
+static const WCHAR Pictures_Slide_ShowsW[] = {'P','i','c','t','u','r','e','s','\\','S','l','i','d','e',' ','S','h','o','w','s','\0'};
static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'};
+static const WCHAR Program_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s','\0'};
+static const WCHAR Program_Files_Common_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s','\\','C','o','m','m','o','n',' ','F','i','l','e','s','\0'};
+static const WCHAR Program_Files_x86W[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s',' ','(','x','8','6',')','\0'};
+static const WCHAR Program_Files_x86_Common_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s',' ','(','x','8','6',')','\\','C','o','m','m','o','n',' ','F','i','l','e','s','\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'};
+static const WCHAR Saved_GamesW[] = {'S','a','v','e','d',' ','G','a','m','e','s','\0'};
+static const WCHAR SearchesW[] = {'S','e','a','r','c','h','e','s','\0'};
static const WCHAR SendToW[] = {'S','e','n','d','T','o','\0'};
static const WCHAR StartUpW[] = {'S','t','a','r','t','U','p','\0'};
static const WCHAR Start_MenuW[] = {'S','t','a','r','t',' ','M','e','n','u','\0'};
+static const WCHAR Start_Menu_ProgramsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\0'};
+static const WCHAR Start_Menu_Admin_ToolsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'};
+static const WCHAR Start_Menu_StartupW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','U','p','\0'};
static const WCHAR TemplatesW[] = {'T','e','m','p','l','a','t','e','s','\0'};
static const WCHAR UsersW[] = {'U','s','e','r','s','\0'};
static const WCHAR UsersPublicW[] = {'U','s','e','r','s','\\','P','u','b','l','i','c','\0'};
+static const WCHAR VideosW[] = {'V','i','d','e','o','s','\0'};
+static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S','a','m','p','l','e',' ','V','i','d','e','o','s','\0'};
static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'};
static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'};
static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'};
@@ -848,7 +880,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Programs,
CSIDL_Type_User,
ProgramsW,
- MAKEINTRESOURCEW(IDS_PROGRAMS)
+ Start_Menu_ProgramsW
},
{ /* 0x03 - CSIDL_CONTROLS (.CPL files) */
&FOLDERID_ControlPanelFolder,
@@ -872,25 +904,25 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Favorites,
CSIDL_Type_User,
FavoritesW,
- MAKEINTRESOURCEW(IDS_FAVORITES)
+ FavoritesW
},
{ /* 0x07 - CSIDL_STARTUP */
&FOLDERID_Startup,
CSIDL_Type_User,
StartUpW,
- MAKEINTRESOURCEW(IDS_STARTUP)
+ Start_Menu_StartupW
},
{ /* 0x08 - CSIDL_RECENT */
&FOLDERID_Recent,
CSIDL_Type_User,
RecentW,
- MAKEINTRESOURCEW(IDS_RECENT)
+ RecentW
},
{ /* 0x09 - CSIDL_SENDTO */
&FOLDERID_SendTo,
CSIDL_Type_User,
SendToW,
- MAKEINTRESOURCEW(IDS_SENDTO)
+ SendToW
},
{ /* 0x0a - CSIDL_BITBUCKET - Recycle Bin */
&FOLDERID_RecycleBinFolder,
@@ -902,7 +934,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_StartMenu,
CSIDL_Type_User,
Start_MenuW,
- MAKEINTRESOURCEW(IDS_STARTMENU)
+ Start_MenuW
},
{ /* 0x0c - CSIDL_MYDOCUMENTS */
&GUID_NULL,
@@ -950,7 +982,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_NetHood,
CSIDL_Type_User,
NetHoodW,
- MAKEINTRESOURCEW(IDS_NETHOOD)
+ NetHoodW
},
{ /* 0x14 - CSIDL_FONTS */
&FOLDERID_Fonts,
@@ -962,25 +994,25 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Templates,
CSIDL_Type_User,
TemplatesW,
- MAKEINTRESOURCEW(IDS_TEMPLATES)
+ TemplatesW
},
{ /* 0x16 - CSIDL_COMMON_STARTMENU */
&FOLDERID_CommonStartMenu,
CSIDL_Type_AllUsers,
Common_Start_MenuW,
- MAKEINTRESOURCEW(IDS_STARTMENU)
+ Start_MenuW
},
{ /* 0x17 - CSIDL_COMMON_PROGRAMS */
&FOLDERID_CommonPrograms,
CSIDL_Type_AllUsers,
Common_ProgramsW,
- MAKEINTRESOURCEW(IDS_PROGRAMS)
+ Start_Menu_ProgramsW
},
{ /* 0x18 - CSIDL_COMMON_STARTUP */
&FOLDERID_CommonStartup,
CSIDL_Type_AllUsers,
Common_StartUpW,
- MAKEINTRESOURCEW(IDS_STARTUP)
+ Start_Menu_StartupW
},
{ /* 0x19 - CSIDL_COMMON_DESKTOPDIRECTORY */
&FOLDERID_PublicDesktop,
@@ -992,19 +1024,19 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_RoamingAppData,
CSIDL_Type_User,
AppDataW,
- MAKEINTRESOURCEW(IDS_APPDATA)
+ AppDataW
},
{ /* 0x1b - CSIDL_PRINTHOOD */
&FOLDERID_PrintHood,
CSIDL_Type_User,
PrintHoodW,
- MAKEINTRESOURCEW(IDS_PRINTHOOD)
+ PrintHoodW
},
{ /* 0x1c - CSIDL_LOCAL_APPDATA */
&FOLDERID_LocalAppData,
CSIDL_Type_User,
Local_AppDataW,
- MAKEINTRESOURCEW(IDS_LOCAL_APPDATA)
+ Local_AppDataW
},
{ /* 0x1d - CSIDL_ALTSTARTUP */
&GUID_NULL,
@@ -1022,31 +1054,31 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Favorites,
CSIDL_Type_AllUsers,
Common_FavoritesW,
- MAKEINTRESOURCEW(IDS_FAVORITES)
+ FavoritesW
},
{ /* 0x20 - CSIDL_INTERNET_CACHE */
&FOLDERID_InternetCache,
CSIDL_Type_User,
CacheW,
- MAKEINTRESOURCEW(IDS_INTERNET_CACHE)
+ Local_Settings_Temporary_Internet_FilesW
},
{ /* 0x21 - CSIDL_COOKIES */
&FOLDERID_Cookies,
CSIDL_Type_User,
CookiesW,
- MAKEINTRESOURCEW(IDS_COOKIES)
+ CookiesW
},
{ /* 0x22 - CSIDL_HISTORY */
&FOLDERID_History,
CSIDL_Type_User,
HistoryW,
- MAKEINTRESOURCEW(IDS_HISTORY)
+ Local_Settings_HistoryW
},
{ /* 0x23 - CSIDL_COMMON_APPDATA */
&FOLDERID_ProgramData,
CSIDL_Type_AllUsers,
Common_AppDataW,
- MAKEINTRESOURCEW(IDS_APPDATA)
+ AppDataW
},
{ /* 0x24 - CSIDL_WINDOWS */
&FOLDERID_Windows,
@@ -1064,7 +1096,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_ProgramFiles,
CSIDL_Type_CurrVer,
ProgramFilesDirW,
- MAKEINTRESOURCEW(IDS_PROGRAM_FILES)
+ Program_FilesW
},
{ /* 0x27 - CSIDL_MYPICTURES */
&FOLDERID_Pictures,
@@ -1088,43 +1120,43 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_ProgramFilesX86,
CSIDL_Type_CurrVer,
ProgramFilesDirX86W,
- MAKEINTRESOURCEW(IDS_PROGRAM_FILESX86)
+ Program_Files_x86W
},
{ /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */
&FOLDERID_ProgramFilesCommon,
CSIDL_Type_CurrVer,
CommonFilesDirW,
- MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON)
+ Program_Files_Common_FilesW
},
{ /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */
&FOLDERID_ProgramFilesCommonX86,
CSIDL_Type_CurrVer,
CommonFilesDirX86W,
- MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMONX86)
+ Program_Files_x86_Common_FilesW
},
{ /* 0x2d - CSIDL_COMMON_TEMPLATES */
&FOLDERID_CommonTemplates,
CSIDL_Type_AllUsers,
Common_TemplatesW,
- MAKEINTRESOURCEW(IDS_TEMPLATES)
+ TemplatesW
},
{ /* 0x2e - CSIDL_COMMON_DOCUMENTS */
&FOLDERID_PublicDocuments,
CSIDL_Type_AllUsers,
Common_DocumentsW,
- MAKEINTRESOURCEW(IDS_COMMON_DOCUMENTS)
+ DocumentsW
},
{ /* 0x2f - CSIDL_COMMON_ADMINTOOLS */
&FOLDERID_CommonAdminTools,
CSIDL_Type_AllUsers,
Common_Administrative_ToolsW,
- MAKEINTRESOURCEW(IDS_ADMINTOOLS)
+ Start_Menu_Admin_ToolsW
},
{ /* 0x30 - CSIDL_ADMINTOOLS */
&FOLDERID_AdminTools,
CSIDL_Type_User,
Administrative_ToolsW,
- MAKEINTRESOURCEW(IDS_ADMINTOOLS)
+ Start_Menu_Admin_ToolsW
},
{ /* 0x31 - CSIDL_CONNECTIONS */
&FOLDERID_ConnectionsFolder,
@@ -1154,19 +1186,19 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_PublicMusic,
CSIDL_Type_AllUsers,
CommonMusicW,
- MAKEINTRESOURCEW(IDS_COMMON_MUSIC)
+ MusicW
},
{ /* 0x36 - CSIDL_COMMON_PICTURES */
&FOLDERID_PublicPictures,
CSIDL_Type_AllUsers,
CommonPicturesW,
- MAKEINTRESOURCEW(IDS_COMMON_PICTURES)
+ PicturesW
},
{ /* 0x37 - CSIDL_COMMON_VIDEO */
&FOLDERID_PublicVideos,
CSIDL_Type_AllUsers,
CommonVideoW,
- MAKEINTRESOURCEW(IDS_COMMON_VIDEOS)
+ VideosW
},
{ /* 0x38 - CSIDL_RESOURCES */
&FOLDERID_ResourceDir,
@@ -1184,13 +1216,13 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_CommonOEMLinks,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_COMMON_OEM_LINKS)
+ OEM_LinksW
},
{ /* 0x3b - CSIDL_CDBURN_AREA */
&FOLDERID_CDBurning,
CSIDL_Type_User,
CD_BurningW,
- MAKEINTRESOURCEW(IDS_CDBURN_AREA)
+ Local_Settings_CD_BurningW
},
{ /* 0x3c unassigned */
&GUID_NULL,
@@ -1238,7 +1270,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Contacts,
CSIDL_Type_User,
ContactsW,
- MAKEINTRESOURCEW(IDS_CONTACTS)
+ ContactsW
},
{ /* 0x44 */
&FOLDERID_DeviceMetadataStore,
@@ -1250,7 +1282,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&GUID_NULL,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_DOCUMENTS)
+ DocumentsW
},
{ /* 0x46 */
&FOLDERID_DocumentsLibrary,
@@ -1262,7 +1294,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Downloads,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_DOWNLOADS)
+ DownloadsW
},
{ /* 0x48 */
&FOLDERID_Games,
@@ -1298,13 +1330,13 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Links,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_LINKS)
+ LinksW
},
{ /* 0x4e */
&FOLDERID_LocalAppDataLow,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_LOCAL_APPDATA_LOW)
+ AppData_LocalLowW
},
{ /* 0x4f */
&FOLDERID_MusicLibrary,
@@ -1322,7 +1354,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_PhotoAlbums,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_PHOTO_ALBUMS)
+ Pictures_Slide_ShowsW
},
{ /* 0x52 */
&FOLDERID_PicturesLibrary,
@@ -1334,7 +1366,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_Playlists,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_PLAYLISTS)
+ Music_PlaylistsW
},
{ /* 0x54 */
&FOLDERID_ProgramFilesX64,
@@ -1358,25 +1390,25 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_PublicDownloads,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_PUBLIC_DOWNLOADS)
+ DownloadsW
},
{ /* 0x58 */
&FOLDERID_PublicGameTasks,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_PUBLIC_GAME_TASKS)
+ Microsoft_Windows_GameExplorerW
},
{ /* 0x59 */
&FOLDERID_PublicLibraries,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_PUBLIC_LIBRARIES)
+ Microsoft_Windows_LibrariesW
},
{ /* 0x5a */
&FOLDERID_PublicRingtones,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_PUBLIC_RINGTONES)
+ Microsoft_Windows_RingtonesW
},
{ /* 0x5b */
&FOLDERID_QuickLaunch,
@@ -1400,37 +1432,37 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_SampleMusic,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_SAMPLE_MUSIC)
+ Music_Sample_MusicW
},
{ /* 0x5f */
&FOLDERID_SamplePictures,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_SAMPLE_PICTURES)
+ Pictures_Sample_PicturesW
},
{ /* 0x60 */
&FOLDERID_SamplePlaylists,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_SAMPLE_PLAYLISTS)
+ Music_Sample_PlaylistsW
},
{ /* 0x61 */
&FOLDERID_SampleVideos,
CSIDL_Type_AllUsers,
NULL,
- MAKEINTRESOURCEW(IDS_SAMPLE_VIDEOS)
+ Videos_Sample_VideosW
},
{ /* 0x62 */
&FOLDERID_SavedGames,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_SAVED_GAMES)
+ Saved_GamesW
},
{ /* 0x63 */
&FOLDERID_SavedSearches,
CSIDL_Type_User,
NULL,
- MAKEINTRESOURCEW(IDS_SAVED_SEARCHES)
+ SearchesW
},
{ /* 0x64 */
&FOLDERID_SEARCH_CSC,
@@ -1490,7 +1522,7 @@ static const CSIDL_DATA CSIDL_Data[] =
&FOLDERID_UserProfiles,
CSIDL_Type_CurrVer,
UsersW,
- MAKEINTRESOURCEW(IDS_USER_PROFILES)
+ UsersW
},
{ /* 0x6e */
&FOLDERID_UserProgramFiles,
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index ad3d2a2..6df123b 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -63,55 +63,11 @@
#define IDS_SHUTDOWN_TITLE 42
#define IDS_SHUTDOWN_PROMPT 43
-#define IDS_PROGRAMS 45
#define IDS_PERSONAL 46
-#define IDS_FAVORITES 47
-#define IDS_STARTUP 48
-#define IDS_RECENT 49
-#define IDS_SENDTO 50
-#define IDS_STARTMENU 51
#define IDS_MYMUSIC 52
#define IDS_MYVIDEOS 53
#define IDS_DESKTOPDIRECTORY 54
-#define IDS_NETHOOD 55
-#define IDS_TEMPLATES 56
-#define IDS_APPDATA 57
-#define IDS_PRINTHOOD 58
-#define IDS_LOCAL_APPDATA 59
-#define IDS_INTERNET_CACHE 60
-#define IDS_COOKIES 61
-#define IDS_HISTORY 62
-#define IDS_PROGRAM_FILES 63
#define IDS_MYPICTURES 64
-#define IDS_PROGRAM_FILES_COMMON 65
-#define IDS_COMMON_DOCUMENTS 66
-#define IDS_ADMINTOOLS 67
-#define IDS_COMMON_MUSIC 68
-#define IDS_COMMON_PICTURES 69
-#define IDS_COMMON_VIDEOS 70
-#define IDS_CDBURN_AREA 71
-#define IDS_PROGRAM_FILESX86 72
-#define IDS_PROGRAM_FILES_COMMONX86 73
-#define IDS_CONTACTS 74
-#define IDS_LINKS 75
-#define IDS_PHOTO_ALBUMS 76
-#define IDS_PICTURES_LIBRARY 77
-#define IDS_PLAYLISTS 78
-#define IDS_PUBLIC_DOWNLOADS 79
-#define IDS_PUBLIC_GAME_TASKS 84
-#define IDS_PUBLIC_LIBRARIES 85
-#define IDS_PUBLIC_RINGTONES 86
-#define IDS_SAMPLE_MUSIC 87
-#define IDS_SAMPLE_PICTURES 88
-#define IDS_SAMPLE_PLAYLISTS 89
-#define IDS_SAMPLE_VIDEOS 90
-#define IDS_SAVED_GAMES 91
-#define IDS_SAVED_SEARCHES 92
-#define IDS_USER_PROFILES 93
-#define IDS_COMMON_OEM_LINKS 94
-#define IDS_DOCUMENTS 95
-#define IDS_DOWNLOADS 96
-#define IDS_LOCAL_APPDATA_LOW 97
#define IDS_CREATEFOLDER_DENIED 128
#define IDS_CREATEFOLDER_CAPTION 129
--
1.7.7.3
More information about the wine-patches
mailing list