Sync to Wine-0_9_5:
Vitaliy Margolen <wine-patch(a)kievinfo.com>
- shell32: Create Local AppData for user profile.
Move history and internet tmp files to Local Settings.
- shell32: Update Russian resources.
Michael Jung <mjung(a)iss.tu-darmstadt.de>
- shell32: Helper function for unicode support in folder and file pidls.
- shell32/unixfs: Added unicode support in folder and file pidls.
Modified: trunk/reactos/lib/shell32/pidl.c
Modified: trunk/reactos/lib/shell32/pidl.h
Modified: trunk/reactos/lib/shell32/shell32_Bg.rc
Modified: trunk/reactos/lib/shell32/shell32_De.rc
Modified: trunk/reactos/lib/shell32/shell32_En.rc
Modified: trunk/reactos/lib/shell32/shell32_Es.rc
Modified: trunk/reactos/lib/shell32/shell32_Fi.rc
Modified: trunk/reactos/lib/shell32/shell32_Fr.rc
Modified: trunk/reactos/lib/shell32/shell32_No.rc
Modified: trunk/reactos/lib/shell32/shell32_Pt.rc
Modified: trunk/reactos/lib/shell32/shell32_Ru.rc
Modified: trunk/reactos/lib/shell32/shellpath.c
_____
Modified: trunk/reactos/lib/shell32/pidl.c
--- trunk/reactos/lib/shell32/pidl.c 2006-01-06 20:24:26 UTC (rev
20624)
+++ trunk/reactos/lib/shell32/pidl.c 2006-01-06 20:30:08 UTC (rev
20625)
@@ -1811,15 +1811,21 @@
*/
DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT
uOutSize)
{
- DWORD dwReturn;
+ DWORD dwReturn;
char szTemp[MAX_PATH];
+ FileStructW *pFileStructW = _ILGetFileStructW(pidl);
TRACE("(%p %p %x)\n",pidl,szOut,uOutSize);
- dwReturn = _ILSimpleGetText(pidl, szTemp, uOutSize);
+ if (pFileStructW) {
+ lstrcpynW(szOut, pFileStructW->wszName, uOutSize);
+ dwReturn = lstrlenW(pFileStructW->wszName);
+ } else {
+ dwReturn = _ILSimpleGetText(pidl, szTemp, MAX_PATH);
- if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, MAX_PATH))
- *szOut = 0;
+ if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut,
uOutSize))
+ *szOut = 0;
+ }
TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_w(szOut),dwReturn);
return dwReturn;
@@ -1938,6 +1944,45 @@
return NULL;
}
+/**********************************************************************
********
+ * _ILGetFileStructW [Internal]
+ *
+ * Get pointer the a SHITEMID's FileStructW field if present
+ *
+ * PARAMS
+ * pidl [I] The SHITEMID
+ *
+ * RETURNS
+ * Success: Pointer to pidl's FileStructW field.
+ * Failure: NULL
+ */
+FileStructW* _ILGetFileStructW(LPCITEMIDLIST pidl) {
+ FileStructW *pFileStructW;
+ WORD cbOffset;
+
+ if (!(_ILIsValue(pidl) || _ILIsFolder(pidl)))
+ return NULL;
+
+ cbOffset = *(WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD));
+ pFileStructW = (FileStructW*)((LPBYTE)pidl + cbOffset);
+
+ /* Currently I don't see a fool prove way to figure out if a pidl
is for sure of WinXP
+ * style with a FileStructW member. If we switch all our
shellfolder-implementations to
+ * the new format, this won't be a problem. For now, we do as many
sanity checks as possible. */
+ if (cbOffset & 0x1 || /* FileStructW member is word aligned in the
pidl */
+ /* FileStructW is positioned after FileStruct */
+ cbOffset < sizeof(pidl->mkid.cb) + sizeof(PIDLTYPE) +
sizeof(FileStruct) ||
+ /* There has to be enough space at cbOffset in the pidl to hold
FileStructW and cbOffset */
+ cbOffset > pidl->mkid.cb - sizeof(cbOffset) -
sizeof(FileStructW) ||
+ pidl->mkid.cb != cbOffset + pFileStructW->cbLen)
+ {
+ WARN("Invalid pidl format (cbOffset = %d)!\n", cbOffset);
+ return NULL;
+ }
+
+ return pFileStructW;
+}
+
/***********************************************************************
**
* _ILGetFileDateTime
*
_____
Modified: trunk/reactos/lib/shell32/pidl.h
--- trunk/reactos/lib/shell32/pidl.h 2006-01-06 20:24:26 UTC (rev
20624)
+++ trunk/reactos/lib/shell32/pidl.h 2006-01-06 20:30:08 UTC (rev
20625)
@@ -143,6 +143,20 @@
The second the dos name when needed or just 0x00 */
} FileStruct;
+/* At least on WinXP, this struct is appended with 2-byte-alignment to
FileStruct. There follows
+ * a WORD member after the wszName string, which gives the offset from
the beginning of the PIDL
+ * to the FileStructW member. */
+typedef struct tagFileStructW {
+ WORD cbLen;
+ BYTE dummy1[6];
+ WORD uCreationDate;
+ WORD uCreationTime;
+ WORD uLastAccessDate;
+ WORD uLastAccessTime;
+ BYTE dummy2[4];
+ WCHAR wszName[1];
+} FileStructW;
+
typedef struct tagValueW
{
WCHAR name[1];
@@ -240,6 +254,7 @@
LPSTR _ILGetTextPointer (LPCITEMIDLIST);
LPSTR _ILGetSTextPointer (LPCITEMIDLIST);
IID *_ILGetGUIDPointer (LPCITEMIDLIST pidl);
+FileStructW *_ILGetFileStructW (LPCITEMIDLIST pidl);
/*
* debug helper
_____
Modified: trunk/reactos/lib/shell32/shell32_Bg.rc
--- trunk/reactos/lib/shell32/shell32_Bg.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_Bg.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -190,9 +190,9 @@
IDS_APPDATA "Application Data"
IDS_PRINTHOOD "PrintHood"
IDS_LOCAL_APPDATA "Local Settings\\Application Data"
- IDS_INTERNET_CACHE "Temporary Internet Files"
+ IDS_INTERNET_CACHE "Local Settings\\Temporary Internet
Files"
IDS_COOKIES "Cookies"
- IDS_HISTORY "History"
+ IDS_HISTORY "Local Settings\\History"
IDS_PROGRAM_FILES "Program Files"
IDS_MYPICTURES "My Documents\\My Pictures"
IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files"
_____
Modified: trunk/reactos/lib/shell32/shell32_De.rc
--- trunk/reactos/lib/shell32/shell32_De.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_De.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -190,9 +190,9 @@
IDS_APPDATA "Anwendungsdaten"
IDS_PRINTHOOD "Druckumgebung"
IDS_LOCAL_APPDATA "Lokale Einstellungen\\Anwendungsdaten"
- IDS_INTERNET_CACHE "Temporary Internet Files"
+ IDS_INTERNET_CACHE "Lokale Einstellungen\\Temporary
Internet Files"
IDS_COOKIES "Cookies"
- IDS_HISTORY "Verlauf"
+ IDS_HISTORY "Lokale Einstellungen\\Verlauf"
IDS_PROGRAM_FILES "Programme"
IDS_MYPICTURES "Eigene Dateien\\Eigene Bilder"
IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien"
_____
Modified: trunk/reactos/lib/shell32/shell32_En.rc
--- trunk/reactos/lib/shell32/shell32_En.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_En.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -189,9 +189,9 @@
IDS_APPDATA "Application Data"
IDS_PRINTHOOD "PrintHood"
IDS_LOCAL_APPDATA "Local Settings\\Application Data"
- IDS_INTERNET_CACHE "Temporary Internet Files"
+ IDS_INTERNET_CACHE "Local Settings\\Temporary Internet
Files"
IDS_COOKIES "Cookies"
- IDS_HISTORY "History"
+ IDS_HISTORY "Local Settings\\History"
IDS_PROGRAM_FILES "Program Files"
IDS_MYPICTURES "My Documents\\My Pictures"
IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files"
_____
Modified: trunk/reactos/lib/shell32/shell32_Es.rc
--- trunk/reactos/lib/shell32/shell32_Es.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_Es.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -207,9 +207,9 @@
IDS_APPDATA "Application Data"
IDS_PRINTHOOD "PrintHood"
IDS_LOCAL_APPDATA "Configuraci¾n local\\Datos de
programa"
- IDS_INTERNET_CACHE "Archivos temporales de Internet"
+ IDS_INTERNET_CACHE "Configuraci¾n local\\Archivos
temporales de Internet"
IDS_COOKIES "Cookies"
- IDS_HISTORY "Historial"
+ IDS_HISTORY "Configuraci¾n local\\Historial"
IDS_PROGRAM_FILES "Archivos de programa"
IDS_MYPICTURES "Mis documentos\\Mis imßgenes"
IDS_PROGRAM_FILES_COMMON "Archivos de programa\\Archivos
comunes"
_____
Modified: trunk/reactos/lib/shell32/shell32_Fi.rc
--- trunk/reactos/lib/shell32/shell32_Fi.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_Fi.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -189,9 +189,9 @@
IDS_APPDATA "Ohjelmien Tiedot"
IDS_PRINTHOOD "Tulostinympõrist÷"
IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien
Tiedot"
- IDS_INTERNET_CACHE "Võliaikaiset Internet-tiedostot"
+ IDS_INTERNET_CACHE "Paikalliset Asetukset\\Võliaikaiset
Internet-tiedostot"
IDS_COOKIES "Evõsteet"
- IDS_HISTORY "Historia"
+ IDS_HISTORY "Paikalliset Asetukset\\Historia"
IDS_PROGRAM_FILES "Ohjelmat"
IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot"
IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot"
_____
Modified: trunk/reactos/lib/shell32/shell32_Fr.rc
--- trunk/reactos/lib/shell32/shell32_Fr.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_Fr.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -209,9 +209,9 @@
IDS_APPDATA "Application Data"
IDS_PRINTHOOD "Voisinage d'impression"
IDS_LOCAL_APPDATA "Local Settings\\Application Data"
- IDS_INTERNET_CACHE "Temporary Internet Files"
+ IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files"
IDS_COOKIES "Cookies"
- IDS_HISTORY "Historique"
+ IDS_HISTORY "Local Settings\\Historique"
IDS_PROGRAM_FILES "Program Files"
IDS_MYPICTURES "Mes documents\\Mes images"
IDS_PROGRAM_FILES_COMMON "Program Files\\Fichiers communs"
_____
Modified: trunk/reactos/lib/shell32/shell32_No.rc
--- trunk/reactos/lib/shell32/shell32_No.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_No.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -189,9 +189,9 @@
IDS_APPDATA "Application Data"
IDS_PRINTHOOD "PrintHood"
IDS_LOCAL_APPDATA "Local Settings\\Application Data"
- IDS_INTERNET_CACHE "Temporary Internet Files"
+ IDS_INTERNET_CACHE "Local Settings\\Temporary Internet
Files"
IDS_COOKIES "Cookies"
- IDS_HISTORY "History"
+ IDS_HISTORY "Local Settings\\History"
IDS_PROGRAM_FILES "Program Files"
IDS_MYPICTURES "Mine dokumenter\\Mine bilder"
IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler"
_____
Modified: trunk/reactos/lib/shell32/shell32_Pt.rc
--- trunk/reactos/lib/shell32/shell32_Pt.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_Pt.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -190,9 +190,9 @@
IDS_APPDATA "Application Data"
IDS_PRINTHOOD "PrintHood"
IDS_LOCAL_APPDATA "Configuraþ§es locais\\Dados de
aplicativos"
- IDS_INTERNET_CACHE "Temporary Internet Files"
+ IDS_INTERNET_CACHE "Configuraþ§es locais\\Temporary
Internet Files"
IDS_COOKIES "Cookies"
- IDS_HISTORY "Hist¾rico"
+ IDS_HISTORY "Configuraþ§es locais\\Hist¾rico"
IDS_PROGRAM_FILES "Arquivos de programas"
IDS_MYPICTURES "Meus Documentos\\Minhas Imagens"
IDS_PROGRAM_FILES_COMMON "Arquivos de programas\\Arquivos
comuns"
_____
Modified: trunk/reactos/lib/shell32/shell32_Ru.rc
--- trunk/reactos/lib/shell32/shell32_Ru.rc 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shell32_Ru.rc 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -1,5 +1,6 @@
/*
* Copyright 1998 Juergen Schmied
+ * Copyright 2006 Vitaliy Margolen
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,6 +19,92 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+MENU_001 MENU DISCARDABLE
+BEGIN
+ MENUITEM "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_BIGICON
+ MENUITEM "&?ÕÙÛÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_SMALLICON
+ MENUITEM "&дޱ¯Û", FCIDM_SHVIEW_LISTVIEW
+ MENUITEM "&¤¯õ¯ßݯ", FCIDM_SHVIEW_REPORTVIEW
+END
+
+/*
+ shellview background menu
+*/
+MENU_002 MENU DISCARDABLE
+BEGIN
+ POPUP ""
+ BEGIN
+ POPUP "&¤¯±ý¯?"
+ BEGIN
+ MENUITEM "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_BIGICON
+ MENUITEM "&?ÕÙÛÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_SMALLICON
+ MENUITEM "&дޱ¯Û", FCIDM_SHVIEW_LISTVIEW
+ MENUITEM "&¤¯õ¯ßݯ", FCIDM_SHVIEW_REPORTVIEW
+ END
+ MENUITEM SEPARATOR
+ POPUP "Arrange &Icons"
+ BEGIN
+ MENUITEM "¤¯ &?ýÕÝÞ", 0x30 /* column 0 */
+ MENUITEM "¤¯ &ÊÞ´¾", 0x32 /* column 2 */
+ MENUITEM "¤¯ &ðÓþýÕ¾", 0x31 /* ... */
+ MENUITEM "¤¯ &?Ó?Õ", 0x33
+ MENUITEM SEPARATOR
+ MENUITEM "&?Ô?¯ýÓ?Þ¸Õ±ÛÞ", FCIDM_SHVIEW_AUTOARRANGE
+ END
+ MENUITEM "?&¹¯ÔÝ ?³ ÞÛ¯ÝÛÞ", FCIDM_SHVIEW_SNAPTOGRID
+ MENUITEM SEPARATOR
+ MENUITEM "?&ßݯÔÞ?³", FCIDM_SHVIEW_REFRESH
+ MENUITEM SEPARATOR
+ MENUITEM "&?±?ÓÔÞ?³", FCIDM_SHVIEW_INSERT
+ MENUITEM "?±?ÓÔÞ?³ & ÛÙ¹Û", FCIDM_SHVIEW_INSERTLINK
+ MENUITEM SEPARATOR
+ POPUP "ЯþõÓ?³"
+ BEGIN
+ MENUITEM "&¤Ó´ÛÓ", FCIDM_SHVIEW_NEWFOLDER
+ MENUITEM "&?Ù¹Û", FCIDM_SHVIEW_NEWLINK
+ MENUITEM SEPARATOR
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "ÐÔ¯&Ú±?ÔÓ", FCIDM_SHVIEW_PROPERTIES
+ END
+END
+
+/*
+ shellview item menu
+*/
+MENU_SHV_FILE MENU DISCARDABLE
+BEGIN
+ POPUP ""
+ BEGIN
+ MENUITEM "&¤¯Ô¯õÝÞÛ", FCIDM_SHVIEW_EXPLORE
+ MENUITEM "&??Û¹?³", FCIDM_SHVIEW_OPEN
+ MENUITEM SEPARATOR
+ MENUITEM "&?¹ÕþÓ?³", FCIDM_SHVIEW_CUT
+ MENUITEM "&?¯´Þ¯ÔÓ?³", FCIDM_SHVIEW_COPY
+ MENUITEM SEPARATOR
+ MENUITEM "ЯþõÓ?³ &?¯Ù¹Û", FCIDM_SHVIEW_CREATELINK
+ MENUITEM "&ËõÓÙý?³", FCIDM_SHVIEW_DELETE
+ MENUITEM "¤ÕÕÞ&ýÕݯÔÓ?³", FCIDM_SHVIEW_RENAME
+ MENUITEM SEPARATOR
+ MENUITEM "ÐÔ¯&Ú±?ÔÓ", FCIDM_SHVIEW_PROPERTIES
+ END
+END
+
+SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40,
188, 192
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME |
DS_SETFONT | DS_3DLOOK
+CAPTION "?ßþ¯"
+FONT 8, "MS Shell Dlg"
+{
+ DEFPUSHBUTTON "?Ó", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP
| WS_TABSTOP
+ PUSHBUTTON "??ýÕÝÞ?³", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP
+ LTEXT "", IDD_TITLE, 4, 4, 180, 12
+ LTEXT "", IDD_STATUS, 4, 25, 180, 12
+ CONTROL "", IDD_TREEVIEW, "SysTreeView32",
+ TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
+ WS_BORDER | WS_TABSTOP,
+ 4, 40, 180, 120
+}
+
SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210,
152
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "? %s"
@@ -44,3 +131,75 @@
PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP
PUSHBUTTON "?ß&þ¯...", 12288, 170, 63, 50, 14, WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ /* columns in the shellview */
+ IDS_SHV_COLUMN1 "?ý "
+ IDS_SHV_COLUMN2 "ðÓþýÕ"
+ IDS_SHV_COLUMN3 "ÊÞ´"
+ IDS_SHV_COLUMN4 "?þýÕÝÕÝ"
+ IDS_SHV_COLUMN5 "??Þß¾?¹"
+ IDS_SHV_COLUMN6 "¤¯ÙÝ¹Ú ¯ß·Õý"
+ IDS_SHV_COLUMN7 "Ðԯ߯õݯ"
+ IDS_SHV_COLUMN8 "?ý "
+ IDS_SHV_COLUMN9 "?¯ýýÕÝ?ÓÞÚ"
+ IDS_SHV_COLUMN10 "?ÙÓõÕÙÕ÷"
+ IDS_SHV_COLUMN11 "?¾´´Ó"
+
+ /* special folders */
+ IDS_DESKTOP "ðÓ߯¸ÞÚ ±?¯Ù"
+ IDS_MYCOMPUTER "?¯Ú Û¯ý´³??Õ"
+
+ /* context menus */
+ IDS_VIEW_LARGE "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ"
+ IDS_VIEW_SMALL "&?ÕÙÛÞÕ ?Û¯ÝÛÞ"
+ IDS_VIEW_LIST "&дޱ¯Û"
+ IDS_VIEW_DETAILS "&¤¯õ¯ßݯ"
+ IDS_SELECT "&?¹ßÓ?³"
+ IDS_OPEN "&??Û¹?³"
+
+ IDS_CREATEFOLDER_DENIED "?ÕÔ¯þý¯µÝ¯ ±¯þõÓ?³ ´Ó´Û¾ - ÝÕ?
´¯Ùݯý¯¸ÞÚ."
+ IDS_CREATEFOLDER_CAPTION "?°ÞßÛÓ Ô¯ ÔÕý ±¯þõÓÝÞ ´Ó´ÛÞ"
+ IDS_DELETEITEM_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ ¾õÓÙÕÝÞ ¶ÓÚÙÓ"
+ IDS_DELETEFOLDER_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ ¾õÓÙÕÝÞ ´Ó´ÛÞ"
+ IDS_DELETEITEM_TEXT "ËõÓÙÞ?³ '%1'?"
+ IDS_DELETEMULTIPLE_TEXT "ËõÓÙÞ?³ ²?Þ ¯ß³ÕÛ?¹ (%1?"
+ IDS_OVERWRITEFILE_TEXT "ÃÓýÕÝÞ?³ ¶ÓÚÙ(¹) %1?"
+ IDS_OVERWRITEFILE_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ þÓýÕݹ ¶ÓÚÙÓ"
+
+ /* message box strings */
+ IDS_RESTART_TITLE "¤ÕÕþÓÒ¾þÞ?³"
+ IDS_RESTART_PROMPT "?¹ §¯?Þ?Õ ±Þý¾ÙÞ¯ÔÓ?³ ´ÕÕþÓ´¾±Û
Windows?"
+ IDS_SHUTDOWN_TITLE "?¹ÛÙ?¸Þ?³ ´Þ?ÓÝÞÕ"
+ IDS_SHUTDOWN_PROMPT "?¹ §¯?Þ?Õ þÓÛÞݸÞ?³ Ó߯?¾ ±
Wine?"
+
+ /* shell folder path default values */
+ IDS_PROGRAMS "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯ÒÓýý¹"
+ IDS_PERSONAL "?¯Þ õ¯Û¾ýÕÝ?¹"
+ IDS_FAVORITES "?þßÓÝݯÕ"
+ IDS_STARTUP "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯ÒÓýý¹\\?Ô?¯þÓÒ¾þÛÓ"
+ IDS_RECENT "Recent"
+ IDS_SENDTO "??´ÔÔÞ?³"
+ IDS_STARTMENU "?ÙÓÔÝ¯Õ ýÕÝ?"
+ IDS_MYMUSIC "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯ ý¾þ¹ÛÓ"
+ IDS_MYVIDEO "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯Þ ¶ÞÙ³ý¹"
+ IDS_DESKTOPDIRECTORY "ðÓ߯¸ÞÚ ±?¯Ù"
+ IDS_NETHOOD "NetHood"
+ IDS_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_MYPICTURES "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯Þ Þ±¾ÝÛÞ"
+ IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files"
+ IDS_COMMON_DOCUMENTS "?ߨÞÕ õ¯Û¾ýÕÝ?¹"
+ IDS_ADMINTOOLS "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯Ò
Óýý¹\\Administrative Tools"
+ IDS_COMMON_MUSIC "?ߨÞÕ õ¯Û¾ýÕÝ?¹\\?¯ ý¾þ¹ÛÓ"
+ IDS_COMMON_PICTURES "?ߨÞÕ õ¯Û¾ýÕÝ?¹\\?¯Þ Þ±¾ÝÛÞ"
+ IDS_COMMON_VIDEO "?ߨÞÕ õ¯Û¾ýÕÝ?¹\\?¯Þ ¶ÞÙ³ý¹"
+ IDS_CDBURN_AREA "Local Settings\\Application
Data\\Microsoft\\CD Burning"
+}
_____
Modified: trunk/reactos/lib/shell32/shellpath.c
--- trunk/reactos/lib/shell32/shellpath.c 2006-01-06 20:24:26 UTC
(rev 20624)
+++ trunk/reactos/lib/shell32/shellpath.c 2006-01-06 20:30:08 UTC
(rev 20625)
@@ -1816,6 +1816,8 @@
CSIDL_NETHOOD,
CSIDL_TEMPLATES,
CSIDL_PRINTHOOD,
+ CSIDL_LOCAL_APPDATA,
+ CSIDL_INTERNET_CACHE,
CSIDL_COOKIES,
CSIDL_HISTORY,
CSIDL_MYPICTURES