Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[cfinck] 28948: Merge 28463, 28946 and 28947 (Character Map shortcut in the start menu)
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 18:24:22 2007 New Revision: 28948 URL: http://svn.reactos.org/svn/reactos?rev=28948&view=rev Log: Merge 28463, 28946 and 28947 (Character Map shortcut in the start menu) Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Sat Sep 8 18:24:22 2007 @@ -611,6 +611,12 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); } + /* Creacte System Tools subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE); + } + /* Create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc Sat Sep 8 18:24:22 2007 @@ -215,6 +215,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Instalátor" IDS_UNKNOWN_ERROR "Neznámá chyba" IDS_REGISTERING_COMPONENTS "Registruji souèásti..." @@ -240,6 +246,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc Sat Sep 8 18:24:22 2007 @@ -216,6 +216,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "Systemprogramme" + IDS_CMT_CHARMAP "Zeichentabelle" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unbekannter Fehler" IDS_REGISTERING_COMPONENTS "Registriere Komponenten..." @@ -241,6 +247,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "Zeichentabelle.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ÅãêáôÜóôáóç ôïõ ReactOS" IDS_UNKNOWN_ERROR "¢ãíùóôï óöÜëìá" IDS_REGISTERING_COMPONENTS "Êáôá÷þñçóç óôïé÷åßùí óôï ìçôñþï..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "Character Map" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc Sat Sep 8 18:24:22 2007 @@ -237,6 +237,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -262,6 +268,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "Capture d'écran.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "Table des Caractères.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc Sat Sep 8 18:24:22 2007 @@ -229,6 +229,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Telepítõ" IDS_UNKNOWN_ERROR "Hiba lépett fel, de nemtudni annak okát" IDS_REGISTERING_COMPONENTS "Komponensek regisztrációja..." @@ -254,6 +260,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc Sat Sep 8 18:24:22 2007 @@ -215,6 +215,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Setup ReactOS" IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" IDS_REGISTERING_COMPONENTS "Meregister komponen..." @@ -240,6 +246,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc Sat Sep 8 18:24:22 2007 @@ -208,6 +208,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." @@ -233,6 +239,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc Sat Sep 8 18:24:22 2007 @@ -220,6 +220,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." @@ -245,6 +251,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc Sat Sep 8 18:24:22 2007 @@ -220,6 +220,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Ustawienia ReactOS" IDS_UNKNOWN_ERROR "Nieznany b³¹d" IDS_REGISTERING_COMPONENTS "Rejestracja sk³adników..." @@ -245,6 +251,7 @@ IDS_SHORT_SNAP "Zrzut ekranu.lnk" IDS_SHORT_SOLITAIRE "RosPasjans.lnk" IDS_SHORT_WINEMINE "ROSaper.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc Sat Sep 8 18:24:22 2007 @@ -198,6 +198,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "Ñëóæåáíûå" + IDS_CMT_CHARMAP "Òàáëèöà ñèìâîëîâ" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåèçâåñòíàÿ îøèáêà" IDS_REGISTERING_COMPONENTS "Ðåãèñòðàöèÿ êîìïîíåíòîâ..." @@ -223,6 +229,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Ïàñüÿíñ.lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" + IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc Sat Sep 8 18:24:22 2007 @@ -206,6 +206,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåâ³äîìà ïîìèëêà" IDS_REGISTERING_COMPONENTS "Ðåºñòðàö³ÿ êîìïîíåíò³â..." @@ -231,6 +237,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc Sat Sep 8 18:24:22 2007 @@ -205,6 +205,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -230,6 +236,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h Sat Sep 8 18:24:22 2007 @@ -89,6 +89,7 @@ #define IDS_ACCESSORIES 3200 #define IDS_GAMES 3201 +#define IDS_SYS_TOOLS 3202 #define IDS_CMT_CMD 3210 #define IDS_CMT_EXPLORER 3211 @@ -102,6 +103,7 @@ #define IDS_CMT_SCREENSHOT 3221 #define IDS_CMT_DOWNLOADER 3222 #define IDS_CMT_DEVMGMT 3223 +#define IDS_CMT_CHARMAP 3224 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -125,6 +127,7 @@ #define IDS_SHORT_SNAP 3410 #define IDS_SHORT_SOLITAIRE 3411 #define IDS_SHORT_WINEMINE 3412 +#define IDS_SHORT_CHARMAP 3413 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

1 0

[cfinck] 28947: Forgot to change the names of the actual .lnk files
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 18:17:36 2007 New Revision: 28947 URL: http://svn.reactos.org/svn/reactos?rev=28947&view=rev Log: Forgot to change the names of the actual .lnk files Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Sat Sep 8 18:17:36 2007 @@ -247,7 +247,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_CHARMAP "Zeichentabelle.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Sat Sep 8 18:17:36 2007 @@ -248,7 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Sat Sep 8 18:17:36 2007 @@ -248,7 +248,7 @@ IDS_SHORT_SNAP "Capture d'écran.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_CHARMAP "Table des Caractères.lnk" END STRINGTABLE

1 0

[cfinck] 28946: - Change "CharMap" to "Character Map" in the english translation - Translate "System Tools" and "Character Map" to german
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 18:10:01 2007 New Revision: 28946 URL: http://svn.reactos.org/svn/reactos?rev=28946&view=rev Log: - Change "CharMap" to "Character Map" in the english translation - Translate "System Tools" and "Character Map" to german Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Sat Sep 8 18:10:01 2007 @@ -216,8 +216,8 @@ STRINGTABLE BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" + IDS_SYS_TOOLS "Systemprogramme" + IDS_CMT_CHARMAP "Zeichentabelle" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Sat Sep 8 18:10:01 2007 @@ -218,7 +218,7 @@ STRINGTABLE BEGIN IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" + IDS_CMT_CHARMAP "Character Map" END STRINGTABLE

1 0

[janderwald] 28945: - add input.dll baseaddress
by janderwald＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: janderwald Date: Sat Sep 8 17:27:10 2007 New Revision: 28945 URL: http://svn.reactos.org/svn/reactos?rev=28945&view=rev Log: - add input.dll baseaddress Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=289… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sat Sep 8 17:27:10 2007 @@ -14,6 +14,7 @@ <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> + <property name="BASEADDRESS_INPUT" value ="0x5e400000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> <property name="BASEADDRESS_NETID" value="0x5f660000" /> <property name="BASEADDRESS_MAPI32" value="0x62250000" />

1 0

[janderwald] 28944: - add input.dll baseaddress
by janderwald＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: janderwald Date: Sat Sep 8 17:27:09 2007 New Revision: 28944 URL: http://svn.reactos.org/svn/reactos?rev=28944&view=rev Log: - add input.dll baseaddress Modified: trunk/reactos/dll/cpl/input/input.rbuild Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Sep 8 17:27:09 2007 @@ -1,4 +1,4 @@ -<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="input.dll"> +<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll"> <importlibrary definition="input.def" /> <include base="input">.</include> <define name="UNICODE" />

1 0

[cwittich] 28943: handle CachedMode->dmSize
by cwittich＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cwittich Date: Sat Sep 8 16:13:49 2007 New Revision: 28943 URL: http://svn.reactos.org/svn/reactos?rev=28943&view=rev Log: handle CachedMode->dmSize Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 16:13:49 2007 @@ -2998,9 +2998,9 @@ ASSERT(CachedMode != NULL); - RtlCopyMemory(pDevMode, CachedMode, pDevMode->dmSize); + RtlCopyMemory(pDevMode, CachedMode, min(pDevMode->dmSize, CachedMode->dmSize)); RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra); - RtlCopyMemory(pDevMode + pDevMode->dmSize, CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); + RtlCopyMemory(pDevMode + min(pDevMode->dmSize, CachedMode->dmSize), CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); return TRUE; }

1 0

[fireball] 28942: - Get rid of NTLPC configuration var completely.
by fireball＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: fireball Date: Sat Sep 8 16:07:45 2007 New Revision: 28942 URL: http://svn.reactos.org/svn/reactos?rev=28942&view=rev Log: - Get rid of NTLPC configuration var completely. Modified: trunk/reactos/base/system/smss/smss.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/base/system/smss/smss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.rbui… ============================================================================== --- trunk/reactos/base/system/smss/smss.rbuild (original) +++ trunk/reactos/base/system/smss/smss.rbuild Sat Sep 8 16:07:45 2007 @@ -3,9 +3,6 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> - <if property="NTLPC" value="1"> - <define name="NTLPC" /> - </if> <library>nt</library> <library>smlib</library> <library>ntdll</library> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Sat Sep 8 16:07:45 2007 @@ -80,11 +80,6 @@ <property name="NSWPAT" value="0" />  -<property name="NTLPC" value="1" /> - -<!-- Whether to compile with the KD protocol. This will disable support for KDBG as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS. This is currently not fully working, and requires kdcom from Windows 2003 or

1 0

[fireball] 28941: - NTLPC always 1 now, remove deprecated code - Unlock SMSS: authors are clearly known, history of smss goes to the beginnings of the project. Code needs cleaning up (headers, formatting).
by fireball＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: fireball Date: Sat Sep 8 16:02:52 2007 New Revision: 28941 URL: http://svn.reactos.org/svn/reactos?rev=28941&view=rev Log: - NTLPC always 1 now, remove deprecated code - Unlock SMSS: authors are clearly known, history of smss goes to the beginnings of the project. Code needs cleaning up (headers, formatting). Modified: trunk/reactos/base/system/smss/client.c (props changed) trunk/reactos/base/system/smss/debug.c (props changed) trunk/reactos/base/system/smss/init.c (props changed) trunk/reactos/base/system/smss/initdosdev.c (props changed) trunk/reactos/base/system/smss/initenv.c (props changed) trunk/reactos/base/system/smss/initobdir.c (props changed) trunk/reactos/base/system/smss/initpage.c (props changed) trunk/reactos/base/system/smss/initrun.c (props changed) trunk/reactos/base/system/smss/initss.c (props changed) trunk/reactos/base/system/smss/smapi.c (contents, props changed) trunk/reactos/base/system/smss/smapiquery.c (props changed) Propchange: trunk/reactos/base/system/smss/client.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/debug.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initdosdev.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initenv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initobdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initpage.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initrun.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initss.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c (original) +++ trunk/reactos/base/system/smss/smapi.c Sat Sep 8 16:02:52 2007 @@ -249,21 +249,14 @@ } } DPRINT("SM: %s: before NtAcceptConnectPort\n", __FUNCTION__); -#if defined(NTLPC) + Status = NtAcceptConnectPort (ClientDataApiPort, Context, (PPORT_MESSAGE) Request, Accept, NULL, NULL); -#else /* ReactOS LPC */ - Status = NtAcceptConnectPort (ClientDataApiPort, - SmApiPort, // ROS LPC requires the listen port here - Context, - Accept, - NULL, - NULL); -#endif + if(Accept) { if(!NT_SUCCESS(Status)) @@ -280,25 +273,6 @@ __FUNCTION__, Status); return Status; } -#if !defined(NTLPC) /* ReactOS LPC */ - DPRINT("SM: %s: server side comm port thread (ROS LPC)\n", __FUNCTION__); - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - FALSE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE) SmpApiConnectedThread, - ClientDataApiPort, - ClientDataApiPortThread, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: Unable to create server thread (Status=0x%08lx)\n", - __FUNCTION__, Status); - return Status; - } -#endif } Status = STATUS_SUCCESS; } @@ -390,17 +364,11 @@ 0, 0, 0, -#ifdef NTLPC - (PTHREAD_START_ROUTINE)SmpApiConnectedThread, - &SmApiPort, -#else - (PTHREAD_START_ROUTINE)SmpApiThread, - (PVOID)SmApiPort, -#endif + (PTHREAD_START_ROUTINE)SmpApiConnectedThread, + &SmApiPort, NULL, NULL); -#ifdef NTLPC // // On NT LPC, we need a second thread to handle incoming connections // generated by incoming requests, otherwise the thread handling @@ -417,7 +385,6 @@ &SmApiPort, NULL, NULL); -#endif return(Status); } Propchange: trunk/reactos/base/system/smss/smapi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/smapiquery.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[jimtabor] 28940: Fix bootcd problem and found another one.
by jimtabor＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: jimtabor Date: Sat Sep 8 15:57:40 2007 New Revision: 28940 URL: http://svn.reactos.org/svn/reactos?rev=28940&view=rev Log: Fix bootcd problem and found another one. Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Sat Sep 8 15:57:40 2007 @@ -5,10 +5,10 @@ /* GDI logical bitmap object */ typedef struct _BITMAPOBJ { - HGDIOBJ hHmgr; - PVOID pvEntry; - ULONG lucExcLock; - ULONG Tid; +// HGDIOBJ hHmgr; +// PVOID pvEntry; +// ULONG lucExcLock; +// ULONG Tid; SURFOBJ SurfObj; FLONG flHooks;

1 0

[cfinck] 28939: - Merge 28587:28928 (only the stuff from the base/shell/explorer folder) - "Restart" button and corresponding translations - Merge 28938 - German translation changes in Explorer and Shell32
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 15:39:46 2007 New Revision: 28939 URL: http://svn.reactos.org/svn/reactos?rev=28939&view=rev Log: - Merge 28587:28928 (only the stuff from the base/shell/explorer folder) - "Restart" button and corresponding translations - Merge 28938 - German translation changes in Explorer and Shell32 Added: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/res/restart.ico - copied unchanged from r28928, trunk/reactos/base/shell/explorer/res/restart.ico Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Èçõîä..." IDS_SHUTDOWN "Èçêëþ÷âàíå..." + IDS_RESTART "Restart..." IDS_LAUNCH "Èçïúëíÿâàíå..." IDS_START_HELP "Ïîìîù" IDS_SEARCH_FILES "Òúðñåíå" @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc Sat Sep 8 15:39:46 2007 @@ -327,6 +327,7 @@ IDS_START "Kvh©Kvix ZvwjKv" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "eÜ Kiv..." + IDS_RESTART "Restart..." IDS_LAUNCH "cwiPvjbv..." IDS_START_HELP "mvnvh¨" IDS_SEARCH_FILES "AbymÜvb..." @@ -394,3 +395,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "¿ªÊ¼" IDS_LOGOFF "×¢Ïú..." IDS_SHUTDOWN "¹Ø±Õ..." + IDS_RESTART "Restart..." IDS_LAUNCH "ÔËÐÐ..." IDS_START_HELP "°ïÖú" IDS_SEARCH_FILES "ËÑË÷..." Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Odhlásit se..." IDS_SHUTDOWN "Vypnout..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spustit..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Hledat" @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc Sat Sep 8 15:39:46 2007 @@ -336,6 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." + IDS_RESTART "Neu starten..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." @@ -403,3 +404,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "Turn Off..." + IDS_RESTART "Restart..." IDS_LAUNCH "Run..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Search..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc Sat Sep 8 15:39:46 2007 @@ -57,7 +57,7 @@ END POPUP "&Tools" BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS + MENUITEM "&Opciones", ID_TOOLS_OPTIONS END POPUP "A&yuda" BEGIN @@ -312,9 +312,10 @@ STRINGTABLE DISCARDABLE BEGIN IDS_TITLE "ReactOS Explorer" - IDS_START "Iniciar" + IDS_START "Inicio" IDS_LOGOFF "Salir..." IDS_SHUTDOWN "Apagar..." + IDS_RESTART "Reiniciar..." IDS_LAUNCH "Ejecutar..." IDS_START_HELP "Ayuda" IDS_SEARCH_FILES "Buscar..." @@ -331,7 +332,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_STARTMENU "Menú Inicio" - IDS_MINIMIZE_ALL "mimimizar todas las ventanas" + IDS_MINIMIZE_ALL "Mimimizar todas las ventanas" IDS_DESKTOP_NUM "Escritorio %d" IDS_VOLUME "Volumen" IDS_ITEMS_CUR "Objetos Actuales" @@ -382,3 +383,5 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc Sat Sep 8 15:39:46 2007 @@ -329,6 +329,7 @@ IDS_START "Démarrer" IDS_LOGOFF "Se déconnecter..." IDS_SHUTDOWN "Arrêter..." + IDS_RESTART "Redémarrer..." IDS_LAUNCH "Exécuter..." IDS_START_HELP "Aide" IDS_SEARCH_FILES "Rechercher..." @@ -396,3 +397,5 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc Sat Sep 8 15:39:46 2007 @@ -332,6 +332,7 @@ IDS_START "Ýíáñîç" IDS_LOGOFF "Áðïóýíäåóç..." IDS_SHUTDOWN "Ôåñìáôéóìüò..." + IDS_RESTART "Restart..." IDS_LAUNCH "ÅêôÝëåóç..." IDS_START_HELP "ÂïÞèåéá" IDS_SEARCH_FILES "ÁíáæÞôçóç..." @@ -399,3 +400,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Kijelentkezés..." IDS_SHUTDOWN "Kikapcsolás..." + IDS_RESTART "Restart..." IDS_LAUNCH "Futtatás..." IDS_START_HELP "Súgó" IDS_SEARCH_FILES "Keresés..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Mulai" IDS_LOGOFF "Keluar..." IDS_SHUTDOWN "Matikan..." + IDS_RESTART "Restart..." IDS_LAUNCH "Jalankan..." IDS_START_HELP "Bantuan" IDS_SEARCH_FILES "Cari..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc Sat Sep 8 15:39:46 2007 @@ -294,6 +294,7 @@ IDS_START "Start" IDS_LOGOFF "Disconnetti..." IDS_SHUTDOWN "Chiudi sessione..." + IDS_RESTART "Restart..." IDS_LAUNCH "Esegui..." IDS_START_HELP "Guida" IDS_SEARCH_FILES "Cerca..." @@ -361,3 +362,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "½À°Ä" IDS_LOGOFF "OIt..." IDS_SHUTDOWN "Vbg_E..." + IDS_RESTART "Restart..." IDS_LAUNCH "t@C¼ðwèµÄÀs..." IDS_START_HELP "wv" IDS_SEARCH_FILES "t@CâtH_..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Afmelden..." IDS_SHUTDOWN "Uitschakelen..." + IDS_RESTART "Restart..." IDS_LAUNCH "Uitvoeren..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Zoeken..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Logg av..." IDS_SHUTDOWN "Slå av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kjør..." IDS_START_HELP "Hjelp" IDS_SEARCH_FILES "Søk..." @@ -398,3 +399,4 @@ #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc Sat Sep 8 15:39:46 2007 @@ -49,10 +49,10 @@ POPUP "&Okna" BEGIN MENUITEM "Nowe &okno", ID_WINDOW_NEW - MENUITEM "&Kaskada\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&Kaskadowo\tShift+F5", ID_WINDOW_CASCADE MENUITEM "&S¹siaduj¹co poziomo", ID_WINDOW_TILE_HORZ MENUITEM "S¹siaduj¹co &pionowo\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "&Autorozmieszczenie", ID_WINDOW_AUTOSORT + MENUITEM "&Autorozmieszczanie", ID_WINDOW_AUTOSORT MENUITEM "Rozmieæ wed³ug &nazwy", ID_WINDOW_ARRANGE END POPUP "&Narzêdzia" @@ -62,8 +62,8 @@ POPUP "Pomo&c" BEGIN MENUITEM "Explorer &FAQ", ID_EXPLORER_FAQ - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER - MENUITEM "ReactOS - I&nformacje", ID_ABOUT_WINDOWS + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS - i&nformacje", ID_ABOUT_WINDOWS END END @@ -74,7 +74,7 @@ MENUITEM "&W³aciwoci", ID_DESKTOPBAR_SETTINGS MENUITEM "Mened¿er &zadañ", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER END END @@ -82,7 +82,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Otwórz regulacje g³onoci", ID_TRAY_VOLUME + MENUITEM "&Otwórz regulacjê g³onoci", ID_TRAY_VOLUME MENUITEM "&Ustaw w³aciwoci audio", ID_VOLUME_PROPERTIES END END @@ -96,7 +96,7 @@ MENUITEM "&Konfiguruj powiadomienia", ID_CONFIG_NOTIFYAREA MENUITEM "Ustaw &datê/godzinê", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER END END @@ -125,8 +125,8 @@ POPUP "Pomo&c" BEGIN MENUITEM "Explorer &FAQ", ID_EXPLORER_FAQ - MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER - MENUITEM "ReactOS - I&nformacje", ID_ABOUT_WINDOWS + MENUITEM "ReactOS Explorer - &informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS - i&nformacje", ID_ABOUT_WINDOWS END END @@ -156,7 +156,7 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Szukaj programu w menu start" +CAPTION "Szukaj programu w Menu Start" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Filtry:",IDC_STATIC,7,9,18,8 @@ -279,7 +279,7 @@ IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Explorer - &Informacje" +CAPTION "ReactOS Explorer - &informacje" FONT 10, "MS Sans Serif" BEGIN LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 @@ -345,7 +345,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STARTMENU "Menu start" + IDS_STARTMENU "Menu Start" IDS_MINIMIZE_ALL "Minimalizuj wszystko" IDS_DESKTOP_NUM "Pulpit %d" IDS_VOLUME "G³onoæ" @@ -358,7 +358,7 @@ IDS_NOTIFY_AUTOHIDE "autoukrywanie" IDS_SHOW_HIDDEN_ICONS "Poka¿ ukryte ikony" IDS_HIDE_ICONS "Ukryj ikony" - IDS_TERMINATE "Zakoñcz dzia³anie ROS Explorer" + IDS_TERMINATE "Zakoñcz dzia³anie ReactOS Explorer" END STRINGTABLE DISCARDABLE @@ -374,7 +374,7 @@ IDS_SEARCH_PRG "Znajd program..." IDS_ALL_USERS "Wszyscy\\" IDS_SEARCH "Szukaj" - IDS_ABOUT_EXPLORER "ReactOS Explorer - &Informacje" + IDS_ABOUT_EXPLORER "ReactOS Explorer - &informacje" IDS_LAUNCH_MANY_PROGRAMS "Zaznaczy³e wiêcej ni¿ jeden program.\nCzy chcesz uruchomiæ je jednoczenie?" IDS_DESKTOPBAR_SETTINGS "W³aciwoci pulpitu" Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc Sat Sep 8 15:39:46 2007 @@ -98,6 +98,7 @@ IDS_START "Iniciar" IDS_LOGOFF "Terminar sessão..." IDS_SHUTDOWN "Desligar..." + IDS_RESTART "Restart..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" IDS_SEARCH_FILES "Procurar..." @@ -165,3 +166,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc Sat Sep 8 15:39:46 2007 @@ -134,6 +134,7 @@ IDS_START "Începe" IDS_LOGOFF "Închide sesiunea ..." IDS_SHUTDOWN "Oprire calculator ..." + IDS_RESTART "Restart..." IDS_LAUNCH "Pornire ..." IDS_START_HELP "Ajutor" IDS_SEARCH_FILES "Cãutare Files..." @@ -243,3 +244,4 @@ #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc Sat Sep 8 15:39:46 2007 @@ -330,6 +330,7 @@ IDS_START "Ïóñê" IDS_LOGOFF "Âûõîä èç ñèñòåìû..." IDS_SHUTDOWN "Âûêëþ÷åíèå..." + IDS_RESTART "Ïåðåçàãðóçêà..." IDS_LAUNCH "Âûïîëíèòü..." IDS_START_HELP "Ñïðàâêà" IDS_SEARCH_FILES "Ïîèñê..." @@ -398,3 +399,5 @@ #endif // not APSTUDIO_INVOKED + + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc Sat Sep 8 15:39:46 2007 @@ -340,6 +340,7 @@ IDS_START "tart" IDS_LOGOFF "Odhlási..." IDS_SHUTDOWN "Vypnú..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spusti..." IDS_START_HELP "Pomocník" IDS_SEARCH_FILES "H¾ada..." @@ -407,3 +408,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc Sat Sep 8 15:39:46 2007 @@ -325,6 +325,7 @@ IDS_START "Start" IDS_LOGOFF "Logga ut..." IDS_SHUTDOWN "Stäng av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kör..." IDS_START_HELP "Hjälp" IDS_SEARCH_FILES "Sök..." @@ -392,3 +393,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc Sat Sep 8 15:39:46 2007 @@ -328,8 +328,9 @@ BEGIN IDS_TITLE "Ïðîâ³äíèê ReactOS" IDS_START "Ïóñê" - IDS_LOGOFF "Âèõ³ä ³ç ñèñòåìè..." + IDS_LOGOFF "Çàâåðøåííÿ ñåàíñó..." IDS_SHUTDOWN "Âèìêíåííÿ..." + IDS_RESTART "Ïåðåçàâàíòàæåííÿ..." IDS_LAUNCH "Âèêîíàòè..." IDS_START_HELP "Äîâ³äêà" IDS_SEARCH_FILES "Ïîøóê..." @@ -397,3 +398,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp Sat Sep 8 15:39:46 2007 @@ -402,6 +402,7 @@ _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER, icon_size); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF, icon_size); _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN, icon_size); + _icons[ICID_RESTART] = Icon(ICID_RESTART, IDI_RESTART, icon_size); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS, icon_size); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE, icon_size); _icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN, icon_size); Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc Sat Sep 8 15:39:46 2007 @@ -152,6 +152,7 @@ IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" +IDI_RESTART ICON DISCARDABLE "res/restart.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" @@ -244,3 +245,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h Sat Sep 8 15:39:46 2007 @@ -81,6 +81,7 @@ ICID_COMPUTER, ICID_LOGOFF, ICID_SHUTDOWN, + ICID_RESTART, ICID_BOOKMARK, ICID_MINIMIZE, ICID_CONTROLPAN, Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h Sat Sep 8 15:39:46 2007 @@ -48,6 +48,7 @@ #define IDS_SHOW_HIDDEN_ICONS 43 #define IDS_HIDE_ICONS 44 #define IDS_TERMINATE 45 +#define IDS_RESTART 46 #define IDI_REACTOS 100 #define IDI_EXPLORER 101 #define IDI_STARTMENU 102 @@ -123,6 +124,7 @@ #define IDI_NETCONNS 175 #define IDI_ADMIN 176 #define IDI_RECENT 178 +#define IDI_RESTART 179 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h Sat Sep 8 15:39:46 2007 @@ -59,6 +59,7 @@ #define IDC_SEARCH_PROGRAM 0x1016 #define IDC_SEARCH 0x1017 #define IDC_TERMINATE 0x1018 +#define IDC_RESTART 0x1019 #define IDC_FIRST_MENU 0x3000 Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp Sat Sep 8 15:39:46 2007 @@ -1752,20 +1752,22 @@ #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) + if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) +#else + if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff"))) +#endif + AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); + +#ifdef _ROS_ + AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART); +#endif + +#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCLOSE)) #else - if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff"))) -#endif - AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); - - -#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) - if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) -#else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); - #ifndef _ROS_ AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE); @@ -1940,9 +1942,15 @@ case IDC_SHUTDOWN: CloseStartMenu(id); - ShowExitWindowsDialog(g_Globals._hwndDesktopBar); - break; - + ShowExitWindowsDialog(g_Globals._hwndDesktop); + break; + + case IDC_RESTART: + CloseStartMenu(id); + ShowRestartDialog(g_Globals._hwndDesktop, EWX_REBOOT); + /* An alternative way to do restart without shell32 help */ + //launch_file(_hwnd, TEXT("shutdown.exe"), SW_HIDE, TEXT("-r")); + break; // settings menu @@ -2149,6 +2157,15 @@ MessageBox(hwndOwner, TEXT("ExitWindowsDialog() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); } +void StartMenuHandler::ShowRestartDialog(HWND hwndOwner, UINT flags) +{ + static DynamicFct<RESTARTWINDOWSDLG> RestartDlg(TEXT("SHELL32"), 59); + + if (RestartDlg) + (*RestartDlg)(hwndOwner, (LPWSTR)L"You selected restart.\n\n", flags); + else + MessageBox(hwndOwner, TEXT("RestartDlg() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); +} void SettingsMenu::AddEntries() { Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h Sat Sep 8 15:39:46 2007 @@ -348,6 +348,7 @@ static void ShowLaunchDialog(HWND hwndOwner); static void ShowLogoffDialog(HWND hwndOwner); + static void ShowRestartDialog(HWND hwndOwner, UINT flags); static void ShowSearchDialog(); static void ShowSearchComputer(); }; Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc Sat Sep 8 15:39:46 2007 @@ -169,10 +169,10 @@ IDS_OVERWRITEFILE_CAPTION "Bestätigung: Datei überschreiben" /* message box strings */ - IDS_RESTART_TITLE "Neustarten" - IDS_RESTART_PROMPT "Möchten Sie, dass ein simulierter Windows Neustart durchgeführt wird ?" - IDS_SHUTDOWN_TITLE "Anhalten" - IDS_SHUTDOWN_PROMPT "Möchten Sie die aktuelle ReactOS Sitzung beenden ?" + IDS_RESTART_TITLE "Neu starten" + IDS_RESTART_PROMPT "Möchten Sie das System neu starten?" + IDS_SHUTDOWN_TITLE "Herunterfahren" + IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" /* shell folder path default values */ IDS_PROGRAMS "Startmenü\\Programme"

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007