[CONSOLE.DLL]

Use a new unique sample text for fonts and colors overview.

[CONSRV]
Remove few DPRINTs.

svn path=/branches/ros-csrss/; revision=58419

dll/cpl/console/lang/bg-BG.rc

@@ -143,6 +143,5 @@ BEGIN
 	IDS_CPLNAME "Конзола"
 	IDS_CPLDESCRIPTION "Настройка на конзолата."
 	IDS_APPLY_SHORTCUT_ALL "Промяна на &препратката, запуснала този прозорец"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Решетъчни шрифтове"
 END

dll/cpl/console/lang/cs-CZ.rc

@@ -141,6 +141,5 @@ BEGIN
 	IDS_CPLNAME "Konzole"
 	IDS_CPLDESCRIPTION "Nastavit vlastnosti konzole."
 	IDS_APPLY_SHORTCUT_ALL "Změnit zá&stupce, který spustil toto okno"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Rastrová písma"
 END

dll/cpl/console/lang/de-DE.rc

@@ -143,6 +143,5 @@ BEGIN
 	IDS_CPLNAME "Konsole"
 	IDS_CPLDESCRIPTION "Konfiguriert die Konsoleneigenschaften."
 	IDS_APPLY_SHORTCUT_ALL "Modifiziere die &Verknüpfung, die das Fenster startete"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Rasterschriften"
 END

dll/cpl/console/lang/en-US.rc

@@ -143,6 +143,5 @@ BEGIN
 	IDS_CPLNAME "Console"
 	IDS_CPLDESCRIPTION "Configures console properties."
 	IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Raster Fonts"
 END

dll/cpl/console/lang/es-ES.rc

@@ -140,6 +140,5 @@ BEGIN
 	IDS_CPLNAME "Consola"
 	IDS_CPLDESCRIPTION "Configurar propiedades de la consola."
 	IDS_APPLY_SHORTCUT_ALL "Modificar &atajo que comienza esta ventana"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Fuentes Raster"
 END

dll/cpl/console/lang/fr-FR.rc

@@ -143,6 +143,5 @@ BEGIN
 	IDS_CPLNAME "Console"
 	IDS_CPLDESCRIPTION "Configurer les propriétés de la console."
 	IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Polices Raster"
 END

dll/cpl/console/lang/he-IL.rc

@@ -144,6 +144,5 @@ BEGIN
 	IDS_CPLNAME "שורת הפקודה"
 	IDS_CPLDESCRIPTION "Configures console properties."
 	IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Raster Fonts"
 END

dll/cpl/console/lang/id-ID.rc

@@ -143,6 +143,5 @@ BEGIN
 	IDS_CPLNAME "Konsol"
 	IDS_CPLDESCRIPTION "Konfigurasi properti konsol."
 	IDS_APPLY_SHORTCUT_ALL "Modifikasi &jalan pintas yang memulai jendela ini"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Font Raster"
 END

dll/cpl/console/lang/it-IT.rc

@@ -143,6 +143,5 @@ BEGIN
 	IDS_CPLNAME "Console"
 	IDS_CPLDESCRIPTION "Configura le proprietà della console."
 	IDS_APPLY_SHORTCUT_ALL "Modifica il collegamento che ha attivato questa finestra"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Raster Fonts"
 END

dll/cpl/console/lang/no-NO.rc

@@ -143,6 +143,5 @@ BEGIN
 	IDS_CPLNAME "Konsoll"
 	IDS_CPLDESCRIPTION "Konfigurere Konsoll innstillinger."
 	IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Raster Fonts"
 END

dll/cpl/console/lang/pl-PL.rc

@@ -142,6 +142,5 @@ BEGIN
 	IDS_CPLNAME "Konsola"
 	IDS_CPLDESCRIPTION "Konfiguruje właściwości konsoli."
 	IDS_APPLY_SHORTCUT_ALL "Zmodyfikuj skrót, który wywołał to okno"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Czcionki rastrowe"
 END

dll/cpl/console/lang/ro-RO.rc

@@ -144,6 +144,5 @@ BEGIN
 	IDS_CPLNAME             "Linie de comandă"
 	IDS_CPLDESCRIPTION      "Configurarea proprietăților pentru programe linie de comandă."
 	IDS_APPLY_SHORTCUT_ALL  "Modifică &scurtătura care a pornit aplicația"
-	IDS_SCREEN_TEXT         "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS         "Fonturi rastre"
 END

dll/cpl/console/lang/ru-RU.rc

@@ -137,6 +137,5 @@ BEGIN
 	IDS_CPLNAME "Командная строка"
 	IDS_CPLDESCRIPTION "Настройка командной строки."
 	IDS_APPLY_SHORTCUT_ALL "&Изменить ярлык, которым было запущено это окно"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-07     5:00\nSYSTEM32      <DIR>     10-01-07     5:00"
 	IDS_RASTERFONTS "Растровые шрифты"
 END

dll/cpl/console/lang/sk-SK.rc

@@ -139,6 +139,5 @@ BEGIN
 	IDS_CPLNAME "Konzola"
 	IDS_CPLDESCRIPTION "Nastavuje vlastnosti Konzoly."
 	IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Rasterové písma"
 END

dll/cpl/console/lang/uk-UA.rc

@@ -144,6 +144,5 @@ BEGIN
 	IDS_CPLNAME "Консоль"
 	IDS_CPLDESCRIPTION "Настроювання властивостей консолі."
 	IDS_APPLY_SHORTCUT_ALL "Зміна &ярлика, який запустив це вікно"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Растрові шрифти"
 END

dll/cpl/console/lang/zh-CN.rc

@@ -142,6 +142,5 @@ BEGIN
 	IDS_CPLNAME "控制台"
 	IDS_CPLDESCRIPTION "配置控制台属性。"
 	IDS_APPLY_SHORTCUT_ALL "修改启动此窗口的快捷方式(&S)"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 	IDS_RASTERFONTS "Raster 字体"
 END

dll/cpl/console/layout.c

@@ -8,31 +8,15 @@
 
 #include "console.h"
 
-// TODO: Use ReactOS output
+const TCHAR szPreviewText[] =
-const TCHAR szPreviewText[] = \
     _T("C:\\ReactOS> dir                       \n") \
-    _T("SYSTEM       <DIR>     10-01-99   5:00a\n") \
+    _T("SYSTEM       <DIR>      03-03-13  5:00a\n") \
-    _T("SYSTEM32     <DIR>     10-01-99   5:00a\n") \
+    _T("SYSTEM32     <DIR>      03-03-13  5:00a\n") \
-    _T("README   TXT     26926 10-01-99   5:00a\n") \
+    _T("readme   txt       1739 03-03-13  5:00a\n") \
-    _T("WINDOWS  BMP     46080 10-01-99   5:00a\n") \
+    _T("explorer exe    3329536 03-03-13  5:00a\n") \
-    _T("NOTEPAD  EXE    337232 10-01-99   5:00a\n") \
+    _T("vgafonts cab      18736 03-03-13  5:00a\n") \
-    _T("CLOCK    AVI     39594 10-01-99   5:00p\n") \
+    _T("setuplog txt        313 03-03-13  5:00a\n") \
-    _T("WIN      INI      7005 10-01-99   5:00a\n");
+    _T("win      ini       7005 03-03-13  5:00a\n");
-/*
-const TCHAR szPreviewText[] = \
-    _T("C:\\ReactOS> dir                       \n") \
-    _T("02-18-13  05:00a  <DIR>    system      \n") \
-    _T("02-18-13  05:00a  <DIR>    system32    \n") \
-    _T("02-18-13  05:00a     26926 readme.txt  \n") \
-    _T("02-18-13  05:00a   3321856 explorer.exe\n") \
-    _T("02-18-13  05:00a       256 setuplog.   \n") \
-    _T("02-18-13  05:00a     18736 vgafonts.cab\n") \
-    _T("02-18-13  05:00a       256 win.ini     \n") \
-    _T("README   TXT     26926 10-01-99   5:00a\n") \
-    _T("CLOCK    AVI     39594 10-01-99   5:00p\n") \
-    _T("WIN      INI      7005 10-01-99   5:00a\n");
-*/
-// IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99     5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
 
 
 VOID

dll/cpl/console/resource.h

@@ -86,5 +86,4 @@
 #define IDC_STATIC_COLOR16              627
 
 // String IDs
-#define IDS_SCREEN_TEXT                 700
+#define IDS_RASTERFONTS                 700
-#define IDS_RASTERFONTS                 701

win32ss/user/consrv/conoutput.c

@@ -66,8 +66,6 @@ ConSrvCreateScreenBuffer(IN OUT PCONSOLE Console,
                          IN USHORT ScreenAttrib,
                          IN USHORT PopupAttrib)
 {
-    DPRINT("ConSrvCreateScreenBuffer\n");
-
     if (Console == NULL || Buffer == NULL)
         return STATUS_INVALID_PARAMETER;
 

win32ss/user/consrv/console.c

@@ -521,7 +521,6 @@ CSR_API(SrvOpenConsole)
 
     RtlEnterCriticalSection(&ProcessData->HandleTableLock);
 
-    DPRINT1("SrvOpenConsole - Checkpoint 1\n");
     DPRINT1("ProcessData = 0x%p ; ProcessData->Console = 0x%p\n", ProcessData, ProcessData->Console);
 
     if (ProcessData->Console)
@@ -532,9 +531,9 @@ CSR_API(SrvOpenConsole)
         PCONSOLE Console = ProcessData->Console;
         Object_t *Object;
 
-        DPRINT1("SrvOpenConsole - Checkpoint 2\n");
+        DPRINT1("SrvOpenConsole - Checkpoint 1\n");
         EnterCriticalSection(&Console->Lock);
-        DPRINT1("SrvOpenConsole - Checkpoint 3\n");
+        DPRINT1("SrvOpenConsole - Checkpoint 2\n");
 
         if (OpenConsoleRequest->HandleType == HANDLE_OUTPUT)
         {
@@ -632,7 +631,6 @@ CSR_API(SrvAllocConsole)
 
     /* Set the Property Dialog Handler */
     ProcessData->PropDispatcher = AllocConsoleRequest->PropDispatcher;
-    DPRINT("CONSRV: PropDispatcher address: %x\n", ProcessData->PropDispatcher);
 
     /* Set the Ctrl Dispatcher */
     ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher;
@@ -734,7 +732,6 @@ CSR_API(SrvAttachConsole)
 
     /* Set the Property Dialog Handler */
     TargetProcessData->PropDispatcher = AttachConsoleRequest->PropDispatcher;
-    DPRINT("CONSRV: PropDispatcher address: %x\n", TargetProcessData->PropDispatcher);
 
     /* Set the Ctrl Dispatcher */
     TargetProcessData->CtrlDispatcher = AttachConsoleRequest->CtrlDispatcher;

win32ss/user/consrv/guiconsole.c

@@ -1800,7 +1800,6 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
                                         (PVOID)Console);
             if (NULL != NewWindow)
             {
-                DPRINT1("CreateWindowExW succeeded\n");
                 SetConsoleWndConsoleLeaderCID(Console);
                 SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1);
 
@@ -1818,7 +1817,6 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
                     SendMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)Console->hIconSm);
                 }
 
-                DPRINT1("Show window\n");
                 ShowWindow(NewWindow, (int)wParam);
             }
             return (LRESULT)NewWindow;
@@ -2132,7 +2130,6 @@ GuiInitConsole(PCONSOLE Console,
     if (IconPath)
     {
         HICON hIcon = NULL, hIconSm = NULL;
-        DPRINT1("Extracting icons\n");
         PrivateExtractIconExW(IconPath,
                               IconIndex,
                               &hIcon,

win32ss/user/consrv/handle.c

@@ -745,7 +745,6 @@ ConSrvConnect(IN PCSR_PROCESS CsrProcess,
 
     /* Set the Property Dialog Handler */
     ProcessData->PropDispatcher = ConnectInfo->PropDispatcher;
-    DPRINT("CONSRV: PropDispatcher address: %x\n", ProcessData->PropDispatcher);
 
     /* Set the Ctrl Dispatcher */
     ProcessData->CtrlDispatcher = ConnectInfo->CtrlDispatcher;

win32ss/user/consrv/settings.c

@@ -142,8 +142,6 @@ ConSrvOpenUserSettings(DWORD ProcessId,
      *     i.e. %SystemRoot%_<some_path>_<some_app.exe>
      */
 
-    DPRINT1("ConSrvOpenUserSettings entered\n");
-
     /* Open the registry key where we saved the console properties */
     if (!OpenUserRegistryPathPerProcessId(ProcessId, &hKey, samDesired))
     {
@@ -209,7 +207,7 @@ ConSrvReadUserSettings(IN OUT PCONSOLE_INFO ConsoleInfo,
                                 &hKey, KEY_READ,
                                 FALSE))
     {
-        DPRINT1("ConSrvOpenUserSettings failed\n");
+        DPRINT("ConSrvOpenUserSettings failed\n");
         return FALSE;
     }
 
@@ -426,8 +424,6 @@ VOID
 ConSrvGetDefaultSettings(IN OUT PCONSOLE_INFO ConsoleInfo,
                          IN DWORD ProcessId)
 {
-    DPRINT1("ConSrvGetDefaultSettings(0x%p)\n", ConsoleInfo);
-
     if (ConsoleInfo == NULL) return;
 
 /// HKCU,"Console","LoadConIme",0x00010003,1