diff --git a/dll/cpl/console/lang/bg-BG.rc b/dll/cpl/console/lang/bg-BG.rc index ec4e6ec0531..279f5555df1 100644 --- a/dll/cpl/console/lang/bg-BG.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Решетъчни шрифтове" END diff --git a/dll/cpl/console/lang/cs-CZ.rc b/dll/cpl/console/lang/cs-CZ.rc index fcf4b84b5ad..2ae120a64f5 100644 --- a/dll/cpl/console/lang/cs-CZ.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Rastrová písma" END diff --git a/dll/cpl/console/lang/de-DE.rc b/dll/cpl/console/lang/de-DE.rc index 52ac4adf9ee..e029a4bd52a 100644 --- a/dll/cpl/console/lang/de-DE.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Rasterschriften" END diff --git a/dll/cpl/console/lang/en-US.rc b/dll/cpl/console/lang/en-US.rc index 04a9dfaa6ca..9d37e6f598d 100644 --- a/dll/cpl/console/lang/en-US.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END diff --git a/dll/cpl/console/lang/es-ES.rc b/dll/cpl/console/lang/es-ES.rc index 1e1f35a1055..7d683b12d3e 100644 --- a/dll/cpl/console/lang/es-ES.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Fuentes Raster" END diff --git a/dll/cpl/console/lang/fr-FR.rc b/dll/cpl/console/lang/fr-FR.rc index 9235e95796f..a69cf879225 100644 --- a/dll/cpl/console/lang/fr-FR.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Polices Raster" END diff --git a/dll/cpl/console/lang/he-IL.rc b/dll/cpl/console/lang/he-IL.rc index ef5e9e8b049..e7d8c8984d1 100644 --- a/dll/cpl/console/lang/he-IL.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END diff --git a/dll/cpl/console/lang/id-ID.rc b/dll/cpl/console/lang/id-ID.rc index c0ac60c2a61..1d43fe6fbe0 100644 --- a/dll/cpl/console/lang/id-ID.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Font Raster" END diff --git a/dll/cpl/console/lang/it-IT.rc b/dll/cpl/console/lang/it-IT.rc index 58a758add8a..5e32a50a743 100644 --- a/dll/cpl/console/lang/it-IT.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END diff --git a/dll/cpl/console/lang/no-NO.rc b/dll/cpl/console/lang/no-NO.rc index b7a0805317b..209f72160eb 100644 --- a/dll/cpl/console/lang/no-NO.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END diff --git a/dll/cpl/console/lang/pl-PL.rc b/dll/cpl/console/lang/pl-PL.rc index d494dbebe72..a5359590dc5 100644 --- a/dll/cpl/console/lang/pl-PL.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Czcionki rastrowe" END diff --git a/dll/cpl/console/lang/ro-RO.rc b/dll/cpl/console/lang/ro-RO.rc index 85e9ccab53b..ea173538266 100644 --- a/dll/cpl/console/lang/ro-RO.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Fonturi rastre" END diff --git a/dll/cpl/console/lang/ru-RU.rc b/dll/cpl/console/lang/ru-RU.rc index ea17a083001..643f48f96ec 100644 --- a/dll/cpl/console/lang/ru-RU.rc +++ b/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 10-01-07 5:00\nSYSTEM32 10-01-07 5:00" IDS_RASTERFONTS "Растровые шрифты" END diff --git a/dll/cpl/console/lang/sk-SK.rc b/dll/cpl/console/lang/sk-SK.rc index e5f2b8c59b6..5aae8f516d9 100644 --- a/dll/cpl/console/lang/sk-SK.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Rasterové písma" END diff --git a/dll/cpl/console/lang/uk-UA.rc b/dll/cpl/console/lang/uk-UA.rc index b253a85f169..4a96456e583 100644 --- a/dll/cpl/console/lang/uk-UA.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Растрові шрифти" END diff --git a/dll/cpl/console/lang/zh-CN.rc b/dll/cpl/console/lang/zh-CN.rc index 76660cc1e4e..4c663226924 100644 --- a/dll/cpl/console/lang/zh-CN.rc +++ b/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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" IDS_RASTERFONTS "Raster 字体" END diff --git a/dll/cpl/console/layout.c b/dll/cpl/console/layout.c index 41ebd6d0bbe..761b45609d9 100644 --- a/dll/cpl/console/layout.c +++ b/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 10-01-99 5:00a\n") \ - _T("SYSTEM32 10-01-99 5:00a\n") \ - _T("README TXT 26926 10-01-99 5:00a\n") \ - _T("WINDOWS BMP 46080 10-01-99 5:00a\n") \ - _T("NOTEPAD EXE 337232 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"); -/* -const TCHAR szPreviewText[] = \ - _T("C:\\ReactOS> dir \n") \ - _T("02-18-13 05:00a system \n") \ - _T("02-18-13 05:00a 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 10-01-99 5:00\nSYSTEM32 10-01-99 5:00" + _T("SYSTEM 03-03-13 5:00a\n") \ + _T("SYSTEM32 03-03-13 5:00a\n") \ + _T("readme txt 1739 03-03-13 5:00a\n") \ + _T("explorer exe 3329536 03-03-13 5:00a\n") \ + _T("vgafonts cab 18736 03-03-13 5:00a\n") \ + _T("setuplog txt 313 03-03-13 5:00a\n") \ + _T("win ini 7005 03-03-13 5:00a\n"); VOID diff --git a/dll/cpl/console/resource.h b/dll/cpl/console/resource.h index 48e800ba8f3..8f54e9649c0 100644 --- a/dll/cpl/console/resource.h +++ b/dll/cpl/console/resource.h @@ -86,5 +86,4 @@ #define IDC_STATIC_COLOR16 627 // String IDs -#define IDS_SCREEN_TEXT 700 -#define IDS_RASTERFONTS 701 +#define IDS_RASTERFONTS 700 diff --git a/win32ss/user/consrv/conoutput.c b/win32ss/user/consrv/conoutput.c index 74914dae19f..003762da5ff 100644 --- a/win32ss/user/consrv/conoutput.c +++ b/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; diff --git a/win32ss/user/consrv/console.c b/win32ss/user/consrv/console.c index 6d28fa7035e..ce1469015e4 100644 --- a/win32ss/user/consrv/console.c +++ b/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; diff --git a/win32ss/user/consrv/guiconsole.c b/win32ss/user/consrv/guiconsole.c index 7c963e04b7e..15e7a0f0369 100644 --- a/win32ss/user/consrv/guiconsole.c +++ b/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, diff --git a/win32ss/user/consrv/handle.c b/win32ss/user/consrv/handle.c index 28b8d4d3698..4228daf92cc 100644 --- a/win32ss/user/consrv/handle.c +++ b/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; diff --git a/win32ss/user/consrv/settings.c b/win32ss/user/consrv/settings.c index 766a690f685..1c603585902 100644 --- a/win32ss/user/consrv/settings.c +++ b/win32ss/user/consrv/settings.c @@ -142,8 +142,6 @@ ConSrvOpenUserSettings(DWORD ProcessId, * i.e. %SystemRoot%__ */ - 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