Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ROS-CSRSS]

Browse source 
Fix compilation with MSVC. In particular initialization of structures variables (due to MSVC-C-compilation dumbass convention).

svn path=/branches/ros-csrss/; revision=58756
This commit is contained in:
Hermès Bélusca-Maïto 2013-04-14 14:49:30 +00:00
parent 2fe3337b09
commit f51caa6299
33 changed files with 178 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dll/cpl/console/console.c
View file

@ -97,8 +97,10 @@ InitConsoleDefaults(PCONSOLE_PROPS pConInfo)
pConInfo->ci.QuickEdit = FALSE;
pConInfo->ci.InsertMode = TRUE;
// pConInfo->ci.InputBufferSize;
pConInfo->ci.ScreenBufferSize = (COORD){80, 300};
pConInfo->ci.ConsoleSize = (COORD){80, 25 };
pConInfo->ci.ScreenBufferSize.X = 80;
pConInfo->ci.ScreenBufferSize.Y = 300;
pConInfo->ci.ConsoleSize.X = 80;
pConInfo->ci.ConsoleSize.Y = 25;
pConInfo->ci.CursorBlinkOn = TRUE;
pConInfo->ci.ForceCursorOff = FALSE;
pConInfo->ci.CursorSize = CSR_DEFAULT_CURSOR_SIZE;
@ -118,7 +120,8 @@ InitConsoleDefaults(PCONSOLE_PROPS pConInfo)
GuiInfo->UseRasterFonts = TRUE;
GuiInfo->AutoPosition = TRUE;
GuiInfo->WindowOrigin = (POINT){0, 0};
GuiInfo->WindowOrigin.x = 0;
GuiInfo->WindowOrigin.y = 0;
memcpy(pConInfo->ci.Colors, s_Colors, sizeof(s_Colors));
}

24
dll/cpl/console/layout.c
View file

@ -292,9 +292,12 @@ LayoutProc(HWND hwndDlg,
}
}
pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight};
pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight};
GuiInfo->WindowOrigin = (POINT){left, top};
pConInfo->ci.ScreenBufferSize.X = swidth;
pConInfo->ci.ScreenBufferSize.Y = sheight;
pConInfo->ci.ConsoleSize.X = wwidth;
pConInfo->ci.ConsoleSize.Y = wheight;
GuiInfo->WindowOrigin.x = left;
GuiInfo->WindowOrigin.y = top;
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
}
break;
@ -339,9 +342,12 @@ LayoutProc(HWND hwndDlg,
wheight = sheight;
}
pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight};
pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight};
GuiInfo->WindowOrigin = (POINT){left, top};
pConInfo->ci.ScreenBufferSize.X = swidth;
pConInfo->ci.ScreenBufferSize.Y = sheight;
pConInfo->ci.ConsoleSize.X = wwidth;
pConInfo->ci.ConsoleSize.Y = wheight;
GuiInfo->WindowOrigin.x = left;
GuiInfo->WindowOrigin.y = top;
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
}
break;
@ -356,7 +362,8 @@ LayoutProc(HWND hwndDlg,
left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE);
top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE);
GuiInfo->WindowOrigin = (POINT){left, top};
GuiInfo->WindowOrigin.x = left;
GuiInfo->WindowOrigin.y = top;
SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE);
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE);
@ -365,7 +372,8 @@ LayoutProc(HWND hwndDlg,
}
else if (res == BST_UNCHECKED)
{
GuiInfo->WindowOrigin = (POINT){UINT_MAX, UINT_MAX};
GuiInfo->WindowOrigin.x = UINT_MAX;
GuiInfo->WindowOrigin.y = UINT_MAX;
SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE);

8
dll/win32/kernel32/client/console/console.c
View file

@ -535,7 +535,8 @@ SetConsoleDisplayMode(HANDLE hConsoleOutput,
SetDisplayModeRequest->OutputHandle = hConsoleOutput;
SetDisplayModeRequest->DisplayMode = dwFlags;
SetDisplayModeRequest->NewSBDim = (COORD){0, 0};
SetDisplayModeRequest->NewSBDim.X = 0;
SetDisplayModeRequest->NewSBDim.Y = 0;
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
@ -1113,7 +1114,8 @@ GetLargestConsoleWindowSize(HANDLE hConsoleOutput)
PCONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest = &ApiMessage.Data.GetLargestWindowSizeRequest;
GetLargestWindowSizeRequest->OutputHandle = hConsoleOutput;
GetLargestWindowSizeRequest->Size = (COORD){0, 0};
GetLargestWindowSizeRequest->Size.X = 0;
GetLargestWindowSizeRequest->Size.Y = 0;
Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
@ -2238,7 +2240,7 @@ DWORD
WINAPI
GetConsoleInputExeNameW(DWORD nBufferLength, LPWSTR lpBuffer)
{
int lenName = lstrlenW(InputExeName);
ULONG lenName = lstrlenW(InputExeName);
if (nBufferLength == 0)
{

2
include/reactos/subsys/win/conmsg.h
View file

@ -143,7 +143,7 @@ typedef struct _CONSOLE_CONNECTION_INFO
typedef struct
{
USHORT nMaxIds;
ULONG nMaxIds;
ULONG nProcessIdsTotal;
PDWORD pProcessIds;
} CONSOLE_GETPROCESSLIST, *PCONSOLE_GETPROCESSLIST;

5
win32ss/user/consrv/conoutput.c
View file

@ -115,7 +115,8 @@ ConSrvCreateScreenBuffer(IN OUT PCONSOLE Console,
{
ClearLineBuffer(*Buffer);
}
(*Buffer)->CursorPosition = (COORD){0, 0};
(*Buffer)->CursorPosition.X = 0;
(*Buffer)->CursorPosition.Y = 0;
(*Buffer)->Mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT;
(*Buffer)->DisplayMode = DisplayMode;
@ -1394,7 +1395,7 @@ CSR_API(SrvCreateConsoleScreenBuffer)
PCONSOLE Console;
PCONSOLE_SCREEN_BUFFER Buff;
COORD ScreenBufferSize = (COORD){80, 25};
COORD ScreenBufferSize = {80, 25};
USHORT ScreenAttrib = DEFAULT_SCREEN_ATTRIB;
USHORT PopupAttrib = DEFAULT_POPUP_ATTRIB;
ULONG DisplayMode = CONSOLE_WINDOWED_MODE;

9
win32ss/user/consrv/console.c
View file

@ -348,9 +348,10 @@ LoadShellLinkConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
{
#define PATH_SEPARATOR L'\\'
BOOL RetVal = FALSE;
LPWSTR LinkName = NULL;
SIZE_T Length = 0;
BOOL RetVal = FALSE;
HRESULT hRes = S_OK;
LPWSTR LinkName = NULL;
SIZE_T Length = 0;
if ((ConsoleStartInfo->dwStartupFlags & STARTF_TITLEISLINKNAME) == 0)
return FALSE;
@ -379,7 +380,7 @@ LoadShellLinkConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
return FALSE;
/* 3- It may be a link. Try to retrieve some properties */
HRESULT hRes = CoInitialize(NULL);
hRes = CoInitialize(NULL);
if (SUCCEEDED(hRes))
{
/* Get a pointer to the IShellLink interface */

3
win32ss/user/consrv/frontends/gui/guisettings.c
View file

@ -198,7 +198,8 @@ GuiConsoleGetDefaultSettings(IN OUT PGUI_CONSOLE_INFO TermInfo,
TermInfo->ShowWindow = SW_SHOWNORMAL;
TermInfo->AutoPosition = TRUE;
TermInfo->WindowOrigin = (POINT){0, 0};
TermInfo->WindowOrigin.x = 0;
TermInfo->WindowOrigin.y = 0;
/*
* 2. Overwrite them with the ones stored in HKCU\Console.

27
win32ss/user/consrv/frontends/gui/guiterm.c
View file

@ -226,7 +226,8 @@ GuiConsoleHandleSysMenuCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM
LPWSTR WindowTitle = NULL;
SIZE_T Length = 0;
Console->dwSelectionCursor = (COORD){0, 0};
Console->dwSelectionCursor.X = 0;
Console->dwSelectionCursor.Y = 0;
Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor;
Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS;
GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor);
@ -251,7 +252,8 @@ GuiConsoleHandleSysMenuCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM
case ID_SYSTEM_EDIT_SELECTALL:
{
Console->Selection.dwSelectionAnchor = (COORD){0, 0};
Console->Selection.dwSelectionAnchor.X = 0;
Console->Selection.dwSelectionAnchor.Y = 0;
Console->dwSelectionCursor.X = Console->ConsoleSize.X - 1;
Console->dwSelectionCursor.Y = Console->ConsoleSize.Y - 1;
GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor);
@ -768,7 +770,8 @@ GuiConsoleHandleKey(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM l
case VK_HOME:
{
Interpreted = TRUE;
Console->dwSelectionCursor = (COORD){0, 0};
Console->dwSelectionCursor.X = 0;
Console->dwSelectionCursor.Y = 0;
break;
}
@ -1911,11 +1914,17 @@ GuiInit(VOID)
}
/* Initialize the console window class */
ghDefaultIcon = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON,
GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON),
LR_SHARED);
ghDefaultIconSm = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
ghDefaultIcon = LoadImageW(ConSrvDllInstance,
MAKEINTRESOURCEW(IDI_TERMINAL),
IMAGE_ICON,
GetSystemMetrics(SM_CXICON),
GetSystemMetrics(SM_CYICON),
LR_SHARED);
ghDefaultIconSm = LoadImageW(ConSrvDllInstance,
MAKEINTRESOURCEW(IDI_TERMINAL),
IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON),
GetSystemMetrics(SM_CYSMICON),
LR_SHARED);
ghDefaultCursor = LoadCursorW(NULL, IDC_ARROW);
wc.cbSize = sizeof(WNDCLASSEXW);
@ -2042,7 +2051,7 @@ GuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG Cur
ScrollWindowEx(GuiData->hWindow,
0,
-(ScrolledLines * GuiData->CharHeight),
-(int)(ScrolledLines * GuiData->CharHeight),
&ScrollRect,
NULL,
NULL,

4
win32ss/user/consrv/frontends/gui/guiterm.rc
View file

@ -10,7 +10,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
// #define REACTOS_STR_ORIGINAL_FILENAME "consrv.dll"
// #include <reactos/version.rc>
// IDI_CONSOLE ICON DISCARDABLE "res/terminal.ico"
IDI_CONSOLE ICON DISCARDABLE "frontends/gui/res/terminal.ico"
// IDI_TERMINAL ICON DISCARDABLE "res/terminal.ico"
IDI_TERMINAL ICON DISCARDABLE "frontends/gui/res/terminal.ico"
#include "rsrc.rc"

5
win32ss/user/consrv/frontends/gui/lang/bg-BG.rc
View file

@ -17,6 +17,8 @@ BEGIN
IDS_FIND "Търсене..."
IDS_DEFAULTS "Подразбирани"
IDS_PROPERTIES "Свойства"
/*
IDS_SCROLLHERE "Прелистване тук"
IDS_SCROLLTOP "Прелистване до горе"
IDS_SCROLLBOTTOM "Прелистване до долу"
@ -24,6 +26,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Долна страница"
IDS_SCROLLUP "Прелистване нагоре"
IDS_SCROLLDOWN "Прелистване надолу"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc
View file

@ -17,6 +17,8 @@ BEGIN
IDS_FIND "Najít..."
IDS_DEFAULTS "Výchozí"
IDS_PROPERTIES "Vlastnosti"
/*
IDS_SCROLLHERE "Posunout sem"
IDS_SCROLLTOP "Posunout na začátek"
IDS_SCROLLBOTTOM "Posunout na konec"
@ -24,6 +26,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "O stránku níže"
IDS_SCROLLUP "Posunout nahoru"
IDS_SCROLLDOWN "Posunout dolů"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/de-DE.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "Suchen..."
IDS_DEFAULTS "Standardwerte"
IDS_PROPERTIES "Eigenschaften"
/*
IDS_SCROLLHERE "Hier scrollen"
IDS_SCROLLTOP "Ganz nach oben scrollen"
IDS_SCROLLBOTTOM "Ganz nach unten scrollen"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Seite nach unten"
IDS_SCROLLUP "Nach oben scrollen"
IDS_SCROLLDOWN "Nach unten scrollen"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/el-GR.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "Εύρεση..."
IDS_DEFAULTS "Προεπιλογή"
IDS_PROPERTIES "Ιδιότητες"
/*
IDS_SCROLLHERE "Κύλιση εδώ"
IDS_SCROLLTOP "Αρχή"
IDS_SCROLLBOTTOM "Τέλος"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Επόμενη σελίδα"
IDS_SCROLLUP "Κύλιση πάνω"
IDS_SCROLLDOWN "Κύλιση κάτω"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/en-US.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "Find..."
IDS_DEFAULTS "Defaults"
IDS_PROPERTIES "Properties"
/*
IDS_SCROLLHERE "Scroll here"
IDS_SCROLLTOP "Scroll top"
IDS_SCROLLBOTTOM "Scroll bottom"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Page down"
IDS_SCROLLUP "Scroll up"
IDS_SCROLLDOWN "Scroll down"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/es-ES.rc
View file

@ -16,6 +16,8 @@ BEGIN
IDS_FIND "Buscar..."
IDS_DEFAULTS "Por defecto"
IDS_PROPERTIES "Propiedades"
/*
IDS_SCROLLHERE "Desplazar aquí"
IDS_SCROLLTOP "Desplazar hasta arriba"
IDS_SCROLLBOTTOM "Desplazar hasta abajo"
@ -23,6 +25,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Bajar página"
IDS_SCROLLUP "Desplazar arriba"
IDS_SCROLLDOWN "Desplazar abajo"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/fr-FR.rc
View file

@ -13,6 +13,8 @@ BEGIN
IDS_FIND "Trouver..."
IDS_DEFAULTS "Défauts"
IDS_PROPERTIES "Propriétés"
/*
IDS_SCROLLHERE "Défiler ici"
IDS_SCROLLTOP "Défiler tout en haut"
IDS_SCROLLBOTTOM "Défiler tout en bas"
@ -20,6 +22,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Page suivante"
IDS_SCROLLUP "Défiler en haut"
IDS_SCROLLDOWN "Défiler en bas"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/he-IL.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "מצא..."
IDS_DEFAULTS "ברירת מחדל"
IDS_PROPERTIES "מאפיינים"
/*
IDS_SCROLLHERE "גלול לכאן"
IDS_SCROLLTOP "גלול למעלה"
IDS_SCROLLBOTTOM "גלול למטה"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "עמוד מטה"
IDS_SCROLLUP "גלול מעלה"
IDS_SCROLLDOWN "גלול מטה"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/id-ID.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "Cari..."
IDS_DEFAULTS "Standar"
IDS_PROPERTIES "Properti"
/*
IDS_SCROLLHERE "Gulung ke Sini"
IDS_SCROLLTOP "Gulung ke Atas"
IDS_SCROLLBOTTOM "Gulung ke Bawah"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Halaman Turun"
IDS_SCROLLUP "Gulung Naik"
IDS_SCROLLDOWN "Gulung Turun"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/it-IT.rc
View file

@ -20,6 +20,8 @@ BEGIN
IDS_FIND "Trova..."
IDS_DEFAULTS "Impostazioni predefinite"
IDS_PROPERTIES "Proprietà"
/*
IDS_SCROLLHERE "Scorri qui"
IDS_SCROLLTOP "Scorri in cima"
IDS_SCROLLBOTTOM "Scorri in fondo"
@ -27,6 +29,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Pagina giù"
IDS_SCROLLUP "Scorri sù"
IDS_SCROLLDOWN "Scorri giù"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/ja-JP.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "検索..."
IDS_DEFAULTS "規定値"
IDS_PROPERTIES "プロパティ"
/*
IDS_SCROLLHERE "ここにスクロール"
IDS_SCROLLTOP "一番上にスクロール"
IDS_SCROLLBOTTOM "一番下にスクロール"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Page down"
IDS_SCROLLUP "上にスクロール"
IDS_SCROLLDOWN "下にスクロール"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/no-NO.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "Finn..."
IDS_DEFAULTS "Standard"
IDS_PROPERTIES "Egenskaper"
/*
IDS_SCROLLHERE "Rull her"
IDS_SCROLLTOP "Rull til toppen"
IDS_SCROLLBOTTOM "Rull knapp"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Side ned"
IDS_SCROLLUP "Rull opp"
IDS_SCROLLDOWN "Rull ned"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/pl-PL.rc
View file

@ -19,6 +19,8 @@ BEGIN
IDS_FIND "Znajdź..."
IDS_DEFAULTS "Ustawienia domyślne"
IDS_PROPERTIES "Właściwości"
/*
IDS_SCROLLHERE "Przewiń tutaj"
IDS_SCROLLTOP "Przewiń na początek"
IDS_SCROLLBOTTOM "Przewiń na koniec"
@ -26,6 +28,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Następna strona"
IDS_SCROLLUP "Przewiń do góry"
IDS_SCROLLDOWN "Przewiń na dół"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/pt-BR.rc
View file

@ -13,6 +13,8 @@ BEGIN
IDS_FIND "Procurar..."
IDS_DEFAULTS "Padrões"
IDS_PROPERTIES "Propriedades"
/*
IDS_SCROLLHERE "Rolar aqui"
IDS_SCROLLTOP "Rolar até o topo"
IDS_SCROLLBOTTOM "Rolar até o fim"
@ -20,6 +22,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Page down"
IDS_SCROLLUP "Scroll up"
IDS_SCROLLDOWN "Scroll down"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/ro-RO.rc
View file

@ -18,6 +18,8 @@ BEGIN
IDS_FIND "Găsire…"
IDS_DEFAULTS "Implicite"
IDS_PROPERTIES "Proprietăți"
/*
IDS_SCROLLHERE "Derulează aici"
IDS_SCROLLTOP "Derulează la început"
IDS_SCROLLBOTTOM "Derulează la sfârșit"
@ -25,6 +27,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Pagina următoare"
IDS_SCROLLUP "Derulează în sus"
IDS_SCROLLDOWN "Derulează în jos"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/ru-RU.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "Искать..."
IDS_DEFAULTS "Умолчания"
IDS_PROPERTIES "Свойства"
/*
IDS_SCROLLHERE "Scroll Here"
IDS_SCROLLTOP "Scroll Top"
IDS_SCROLLBOTTOM "Прокрутить вниз"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Вниз страницы"
IDS_SCROLLUP "Прокрутить вверх"
IDS_SCROLLDOWN "Scroll Down"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/sk-SK.rc
View file

@ -16,6 +16,8 @@ BEGIN
IDS_FIND "Nájsť..." // Find
IDS_DEFAULTS "Predvolené" // Defaults
IDS_PROPERTIES "Vlastnosti"
/*
IDS_SCROLLHERE "Rolovať sem"
IDS_SCROLLTOP "K hornému okraju"
IDS_SCROLLBOTTOM "K dolnému okraju"
@ -23,6 +25,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "O stránku nižšie"
IDS_SCROLLUP "Rolovať nahor"
IDS_SCROLLDOWN "Rolovať nadol"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/sv-SE.rc
View file

@ -18,6 +18,8 @@ BEGIN
IDS_FIND "Sök..."
IDS_DEFAULTS "Ursprunglig"
IDS_PROPERTIES "Egenskaper"
/*
IDS_SCROLLHERE "Skrolla hit"
IDS_SCROLLTOP "Skrolla till topp"
IDS_SCROLLBOTTOM "Skrolla till botten"
@ -25,6 +27,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Sida ner"
IDS_SCROLLUP "Skrolla upp"
IDS_SCROLLDOWN "Skrolla ner"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/tr-TR.rc
View file

@ -31,6 +31,8 @@ BEGIN
IDS_FIND "Bul..."
IDS_DEFAULTS "Varsayılanlar"
IDS_PROPERTIES "Özellikler"
/*
IDS_SCROLLHERE "Buraya yuvarla"
IDS_SCROLLTOP "Üste yuvarla"
IDS_SCROLLBOTTOM "Alta yuvarla"
@ -38,6 +40,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Sayfa aşağı"
IDS_SCROLLUP "Yukarı yuvarla"
IDS_SCROLLDOWN "Aşağı yuvarla"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/uk-UA.rc
View file

@ -19,6 +19,8 @@ BEGIN
IDS_FIND "Знайти..."
IDS_DEFAULTS "Замовчування"
IDS_PROPERTIES "Властивості"
/*
IDS_SCROLLHERE "Прокрутити сюди"
IDS_SCROLLTOP "Прокрутити на початок"
IDS_SCROLLBOTTOM "Прокрутити на кінець"
@ -26,6 +28,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "Наступна сторінка"
IDS_SCROLLUP "Прокрутити догори"
IDS_SCROLLDOWN "Прокрутити донизу"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/zh-CN.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "查找..."
IDS_DEFAULTS "默认"
IDS_PROPERTIES "属性"
/*
IDS_SCROLLHERE "滚动到此"
IDS_SCROLLTOP "滚动至顶端"
IDS_SCROLLBOTTOM "滚动至末端"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "下一页"
IDS_SCROLLUP "向上滚动"
IDS_SCROLLDOWN "向下滚动"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

5
win32ss/user/consrv/frontends/gui/lang/zh-TW.rc
View file

@ -11,6 +11,8 @@ BEGIN
IDS_FIND "尋找..."
IDS_DEFAULTS "預設"
IDS_PROPERTIES "屬性"
/*
IDS_SCROLLHERE "滾動到此 "
IDS_SCROLLTOP "滾動到頂置"
IDS_SCROLLBOTTOM "滾動到末端"
@ -18,6 +20,7 @@ BEGIN
IDS_SCROLLPAGE_DOWN "下一頁"
IDS_SCROLLUP "向上滾動"
IDS_SCROLLDOWN "向下滾動"
*/
IDS_CONSOLE_TITLE "ReactOS Console"
IDS_TERMINAL_TITLE "ReactOS Console"
END

54
win32ss/user/consrv/frontends/gui/resource.h
View file

@ -7,37 +7,39 @@
#pragma once
#define ID_SYSTEM_EDIT_MARK 1001
#define ID_SYSTEM_EDIT_COPY 1002
#define ID_SYSTEM_EDIT_PASTE 1003
#define ID_SYSTEM_EDIT_MARK 1001
#define ID_SYSTEM_EDIT_COPY 1002
#define ID_SYSTEM_EDIT_PASTE 1003
#define ID_SYSTEM_EDIT_SELECTALL 1004
#define ID_SYSTEM_EDIT_SCROLL 1005
#define ID_SYSTEM_EDIT_FIND 1006
#define ID_SYSTEM_DEFAULTS 1007
#define ID_SYSTEM_PROPERTIES 1008
#define ID_SYSTEM_EDIT_SCROLL 1005
#define ID_SYSTEM_EDIT_FIND 1006
#define ID_SYSTEM_DEFAULTS 1007
#define ID_SYSTEM_PROPERTIES 1008
#define NCPOPUP_MENU 103
#define NCPOPUP_MENU 103
#define IDS_EDIT 204
#define IDS_MARK 205
#define IDS_COPY 206
#define IDS_PASTE 207
#define IDS_SELECTALL 208
#define IDS_SCROLL 209
#define IDS_FIND 210
#define IDS_DEFAULTS 211
#define IDS_PROPERTIES 212
#define IDS_EDIT 204
#define IDS_MARK 205
#define IDS_COPY 206
#define IDS_PASTE 207
#define IDS_SELECTALL 208
#define IDS_SCROLL 209
#define IDS_FIND 210
#define IDS_DEFAULTS 211
#define IDS_PROPERTIES 212
// Scrollbar resource ids
#define IDS_SCROLLHERE 304
#define IDS_SCROLLTOP 305
#define IDS_SCROLLBOTTOM 306
#define IDS_SCROLLPAGE_UP 307
// Scrollbar resource ids. Unused.
/*
#define IDS_SCROLLHERE 304
#define IDS_SCROLLTOP 305
#define IDS_SCROLLBOTTOM 306
#define IDS_SCROLLPAGE_UP 307
#define IDS_SCROLLPAGE_DOWN 308
#define IDS_SCROLLUP 309
#define IDS_SCROLLDOWN 310
#define IDS_SCROLLUP 309
#define IDS_SCROLLDOWN 310
*/
#define IDI_CONSOLE 1
#define IDS_CONSOLE_TITLE 500
#define IDI_TERMINAL 1
#define IDS_TERMINAL_TITLE 400
/* EOF */

6
win32ss/user/consrv/settings.c
View file

@ -415,8 +415,10 @@ ConSrvGetDefaultSettings(IN OUT PCONSOLE_INFO ConsoleInfo,
ConsoleInfo->QuickEdit = FALSE;
ConsoleInfo->InsertMode = TRUE;
// ConsoleInfo->InputBufferSize;
ConsoleInfo->ScreenBufferSize = (COORD){80, 300};
ConsoleInfo->ConsoleSize = (COORD){80, 25 };
ConsoleInfo->ScreenBufferSize.X = 80;
ConsoleInfo->ScreenBufferSize.Y = 300;
ConsoleInfo->ConsoleSize.X = 80;
ConsoleInfo->ConsoleSize.Y = 25;
ConsoleInfo->CursorBlinkOn;
ConsoleInfo->ForceCursorOff;