[hbelusca] 58260: [CONSRV] - Further compactify console allocation / attach code by putting common code into helper functions. - Now, the default title of a console window is... "ReactOS Console" (...
1 Feb
2013
1 Feb
'13
11:36 p.m.
Author: hbelusca
Date: Fri Feb 1 23:36:23 2013
New Revision: 58260
URL: http://svn.reactos.org/svn/reactos?rev=58260&view=rev
Log:
[CONSRV]
- Further compactify console allocation / attach code by putting common code into helper
functions.
- Now, the default title of a console window is... "ReactOS Console" (and not
command prompt since a console window isn't only reserved to command prompts).
Modified:
branches/ros-csrss/win32ss/user/consrv/console.c
branches/ros-csrss/win32ss/user/consrv/consrv.h
branches/ros-csrss/win32ss/user/consrv/handle.c
branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc
branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc
branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc
branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc
branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc
branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc
branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc
branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc
branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc
branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc
branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc
branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc
branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc
branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc
branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc
branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc
branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc
branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc
branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc
branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc
branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc
branches/ros-csrss/win32ss/user/consrv/resource.h
Modified: branches/ros-csrss/win32ss/user/consrv/console.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -121,13 +121,13 @@
Console->Title.MaximumLength = Console->Title.Length = 0;
Console->Title.Buffer = NULL;
- if (LoadStringW(ConSrvDllInstance, IDS_COMMAND_PROMPT, Title, sizeof(Title) /
sizeof(Title[0])))
+ if (LoadStringW(ConSrvDllInstance, IDS_CONSOLE_TITLE, Title, sizeof(Title) /
sizeof(Title[0])))
{
RtlCreateUnicodeString(&Console->Title, Title);
}
else
{
- RtlCreateUnicodeString(&Console->Title, L"Command Prompt");
+ RtlCreateUnicodeString(&Console->Title, L"ReactOS Console");
}
InitializeCriticalSection(&Console->Lock);
@@ -363,10 +363,6 @@
DPRINT1("Process already has a console\n");
return STATUS_ACCESS_DENIED;
}
-
-/******************************************************************************/
-/** This comes from ConSrvConnect!! **/
- DPRINT1("SrvAllocConsole - Checkpoint 1\n");
/*
* We are about to create a new console. However when ConSrvNewProcess
@@ -383,33 +379,14 @@
/* Initialize a new Console owned by the Console Leader Process */
Status = ConSrvAllocateConsole(ProcessData,
- &AllocConsoleRequest->InputHandle,
- &AllocConsoleRequest->OutputHandle,
- &AllocConsoleRequest->ErrorHandle,
- AllocConsoleRequest->ShowCmd,
- ConsoleLeader);
+ &AllocConsoleRequest->InputHandle,
+ &AllocConsoleRequest->OutputHandle,
+ &AllocConsoleRequest->ErrorHandle,
+ AllocConsoleRequest->ShowCmd,
+ ConsoleLeader);
if (!NT_SUCCESS(Status))
{
DPRINT1("Console allocation failed\n");
- return Status;
- }
-
- /* Add a reference count because the process is tied to the console */
- _InterlockedIncrement(&ProcessData->Console->ReferenceCount);
-
- /* Insert the process into the processes list of the console */
- InsertHeadList(&ProcessData->Console->ProcessList,
&ProcessData->ConsoleLink);
-
- /* Duplicate the Event */
- Status = NtDuplicateObject(NtCurrentProcess(),
- ProcessData->Console->InputBuffer.ActiveEvent,
- ProcessData->Process->ProcessHandle,
- &ProcessData->ConsoleEvent,
- EVENT_ALL_ACCESS, 0, 0);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtDuplicateObject() failed: %lu\n", Status);
- ConSrvRemoveConsole(ProcessData);
return Status;
}
@@ -422,7 +399,6 @@
/* Set the Ctrl Dispatcher */
ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher;
DPRINT("CONSRV: CtrlDispatcher address: %x\n",
ProcessData->CtrlDispatcher);
-/******************************************************************************/
return STATUS_SUCCESS;
}
@@ -446,6 +422,7 @@
return STATUS_ACCESS_DENIED;
}
+ /* Check whether we try to attach to the parent's console */
if (ProcessId == ULongToHandle(ATTACH_PARENT_PROCESS))
{
PROCESS_BASIC_INFORMATION ProcessInfo;
@@ -468,16 +445,19 @@
DPRINT("Parent process ID = %lu\n", ProcessId);
}
- /* Lock the target process via its PID */
- DPRINT1("Lock process Id %lu\n", ProcessId);
+ /* Lock the source process via its PID */
Status = CsrLockProcessByClientId(ProcessId, &SourceProcess);
- DPRINT1("Lock process Status %lu\n", Status);
+ DPRINT1("Lock process Id %lu - Status %lu\n", ProcessId, Status);
if (!NT_SUCCESS(Status)) return Status;
- DPRINT1("AttachConsole OK\n");
-
-/******************************************************************************/
-/** This comes from ConSrvNewProcess!! **/
+
SourceProcessData = ConsoleGetPerProcessData(SourceProcess);
+
+ DPRINT1("SourceProcessData->Console = 0x%p\n",
SourceProcessData->Console);
+ if (SourceProcessData->Console == NULL)
+ {
+ Status = STATUS_INVALID_HANDLE;
+ goto Quit;
+ }
/*
* We are about to create a new console. However when ConSrvNewProcess
@@ -496,54 +476,15 @@
* Inherit the console from the parent,
* if any, otherwise return an error.
*/
- DPRINT1("SourceProcessData->Console = 0x%p\n",
SourceProcessData->Console);
- if (SourceProcessData->Console == NULL)
- {
- Status = STATUS_INVALID_HANDLE;
- goto Quit;
- }
- TargetProcessData->Console = SourceProcessData->Console;
-
- /// REMARK: This code comes from ConSrvAllocateConsole.
- /* Initialize the handles table */
- Status = ConSrvInitHandlesTable(TargetProcessData,
- &AttachConsoleRequest->InputHandle,
- &AttachConsoleRequest->OutputHandle,
- &AttachConsoleRequest->ErrorHandle);
+ Status = ConSrvInheritConsole(TargetProcessData,
+ SourceProcessData->Console,
+ TRUE,
+ &AttachConsoleRequest->InputHandle,
+ &AttachConsoleRequest->OutputHandle,
+ &AttachConsoleRequest->ErrorHandle);
if (!NT_SUCCESS(Status))
{
- DPRINT1("Failed to initialize the handles table\n");
-
- // ConSrvRemoveConsole(TargetProcessData);
- TargetProcessData->Console = NULL;
- goto Quit;
- }
-
-/******************************************************************************/
-
-/******************************************************************************/
-/** This comes from ConSrvConnect / SrvAllocConsole!! **/
- /* Add a reference count because the process is tied to the console */
- _InterlockedIncrement(&TargetProcessData->Console->ReferenceCount);
-
- /* Insert the process into the processes list of the console */
- InsertHeadList(&TargetProcessData->Console->ProcessList,
&TargetProcessData->ConsoleLink);
-
- /** Here, we inherited the console handles from the "source" process,
- ** so no need to reinitialize the handles table. **/
-
- DPRINT1("SrvAttachConsole - Checkpoint\n");
-
- /* Duplicate the Event */
- Status = NtDuplicateObject(NtCurrentProcess(),
-
TargetProcessData->Console->InputBuffer.ActiveEvent,
- TargetProcessData->Process->ProcessHandle,
- &TargetProcessData->ConsoleEvent,
- EVENT_ALL_ACCESS, 0, 0);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtDuplicateObject() failed: %lu\n", Status);
- ConSrvRemoveConsole(TargetProcessData);
+ DPRINT1("Console inheritance failed\n");
goto Quit;
}
@@ -558,14 +499,10 @@
DPRINT("CONSRV: CtrlDispatcher address: %x\n",
TargetProcessData->CtrlDispatcher);
Status = STATUS_SUCCESS;
-/******************************************************************************/
Quit:
- DPRINT1("SrvAttachConsole - exiting 1\n");
- /* Unlock the "source" process */
+ /* Unlock the "source" process and exit */
CsrUnlockProcess(SourceProcess);
- DPRINT1("SrvAttachConsole - exiting 2\n");
-
return Status;
}
Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Fri Feb 1 23:36:23 2013
@@ -183,6 +183,12 @@
PHANDLE pErrorHandle,
int ShowCmd,
PCSR_PROCESS CsrProcess);
+NTSTATUS FASTCALL ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData,
+ struct _CONSOLE* Console,
+ BOOL CreateNewHandlesTable,
+ PHANDLE pInputHandle,
+ PHANDLE pOutputHandle,
+ PHANDLE pErrorHandle);
VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData);
NTSTATUS FASTCALL ConSrvGetConsole(PCONSOLE_PROCESS_DATA ProcessData,
struct _CONSOLE** Console,
Modified: branches/ros-csrss/win32ss/user/consrv/handle.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Fri Feb 1 23:36:23 2013
@@ -420,21 +420,91 @@
/* Initialize the handles table */
Status = ConSrvInitHandlesTable(ProcessData,
- pInputHandle,
- pOutputHandle,
- pErrorHandle);
+ pInputHandle,
+ pOutputHandle,
+ pErrorHandle);
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to initialize the handles table\n");
-
- // ConSrvRemoveConsole(ProcessData);
ConSrvDeleteConsole(ProcessData->Console);
ProcessData->Console = NULL;
-
return Status;
}
- return Status;
+ /* Duplicate the Input Event */
+ Status = NtDuplicateObject(NtCurrentProcess(),
+ ProcessData->Console->InputBuffer.ActiveEvent,
+ ProcessData->Process->ProcessHandle,
+ &ProcessData->ConsoleEvent,
+ EVENT_ALL_ACCESS, 0, 0);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("NtDuplicateObject() failed: %lu\n", Status);
+ ConSrvFreeHandlesTable(ProcessData);
+ ConSrvDeleteConsole(ProcessData->Console);
+ ProcessData->Console = NULL;
+ return Status;
+ }
+
+ /* Insert the process into the processes list of the console */
+ InsertHeadList(&ProcessData->Console->ProcessList,
&ProcessData->ConsoleLink);
+
+ /* Add a reference count because the process is tied to the console */
+ _InterlockedIncrement(&ProcessData->Console->ReferenceCount);
+
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS
+FASTCALL
+ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData,
+ PCONSOLE Console,
+ BOOL CreateNewHandlesTable,
+ PHANDLE pInputHandle,
+ PHANDLE pOutputHandle,
+ PHANDLE pErrorHandle)
+{
+ NTSTATUS Status = STATUS_SUCCESS;
+
+ /* Inherit the console */
+ ProcessData->Console = Console;
+
+ if (CreateNewHandlesTable)
+ {
+ /* Initialize the handles table */
+ Status = ConSrvInitHandlesTable(ProcessData,
+ pInputHandle,
+ pOutputHandle,
+ pErrorHandle);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("Failed to initialize the handles table\n");
+ ProcessData->Console = NULL;
+ return Status;
+ }
+ }
+
+ /* Duplicate the Input Event */
+ Status = NtDuplicateObject(NtCurrentProcess(),
+ ProcessData->Console->InputBuffer.ActiveEvent,
+ ProcessData->Process->ProcessHandle,
+ &ProcessData->ConsoleEvent,
+ EVENT_ALL_ACCESS, 0, 0);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("NtDuplicateObject() failed: %lu\n", Status);
+ ConSrvFreeHandlesTable(ProcessData); // NOTE: Always free the handles table.
+ ProcessData->Console = NULL;
+ return Status;
+ }
+
+ /* Insert the process into the processes list of the console */
+ InsertHeadList(&ProcessData->Console->ProcessList,
&ProcessData->ConsoleLink);
+
+ /* Add a reference count because the process is tied to the console */
+ _InterlockedIncrement(&ProcessData->Console->ReferenceCount);
+
+ return STATUS_SUCCESS;
}
VOID
@@ -521,7 +591,7 @@
PCONSOLE_PROCESS_DATA SourceProcessData, TargetProcessData;
- DPRINT1("ConSrvNewProcess inside\n");
+ DPRINT1("ConSrvNewProcess\n");
DPRINT1("SourceProcess = 0x%p ; TargetProcess = 0x%p\n", SourceProcess,
TargetProcess);
/* An empty target process is invalid */
@@ -565,17 +635,14 @@
NTSTATUS Status;
Status = ConSrvInheritHandlesTable(SourceProcessData, TargetProcessData);
- if (!NT_SUCCESS(Status))
- {
- return Status;
- }
-
- /* Temporary "inherit" the console from the parent */
+ if (!NT_SUCCESS(Status)) return Status;
+
+ /* Temporary save the parent's console */
TargetProcessData->ParentConsole = SourceProcessData->Console;
}
else
{
- DPRINT1("ConSrvNewProcess - We don't launch a Console process :
SourceProcessData->Console = 0x%p ; TargetProcess->Flags = %lu\n",
SourceProcessData->Console, TargetProcess->Flags);
+ DPRINT1("ConSrvNewProcess - We don't inherit a handle table :
SourceProcessData->Console = 0x%p ; TargetProcess->Flags = %lu\n",
SourceProcessData->Console, TargetProcess->Flags);
}
return STATUS_SUCCESS;
@@ -632,11 +699,11 @@
/* Initialize a new Console owned by the Console Leader Process */
Status = ConSrvAllocateConsole(ProcessData,
- &ConnectInfo->InputHandle,
- &ConnectInfo->OutputHandle,
- &ConnectInfo->ErrorHandle,
- ConnectInfo->ShowCmd,
- CsrProcess);
+ &ConnectInfo->InputHandle,
+ &ConnectInfo->OutputHandle,
+ &ConnectInfo->ErrorHandle,
+ ConnectInfo->ShowCmd,
+ CsrProcess);
if (!NT_SUCCESS(Status))
{
DPRINT1("Console allocation failed\n");
@@ -648,27 +715,17 @@
DPRINT1("ConSrvConnect - Reuse current (parent's) console\n");
/* Reuse our current console */
- ProcessData->Console = ConnectInfo->Console;
- }
-
- /* Add a reference count because the process is tied to the console */
- _InterlockedIncrement(&ProcessData->Console->ReferenceCount);
-
- /* Insert the process into the processes list of the console */
- InsertHeadList(&ProcessData->Console->ProcessList,
&ProcessData->ConsoleLink);
-
- /// TODO: Move this up ?
- /* Duplicate the Event */
- Status = NtDuplicateObject(NtCurrentProcess(),
- ProcessData->Console->InputBuffer.ActiveEvent,
- ProcessData->Process->ProcessHandle,
- &ProcessData->ConsoleEvent,
- EVENT_ALL_ACCESS, 0, 0);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtDuplicateObject() failed: %lu\n", Status);
- ConSrvRemoveConsole(ProcessData);
- return Status;
+ Status = ConSrvInheritConsole(ProcessData,
+ ConnectInfo->Console,
+ FALSE,
+ NULL, // &ConnectInfo->InputHandle,
+ NULL, // &ConnectInfo->OutputHandle,
+ NULL); // &ConnectInfo->ErrorHandle);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("Console inheritance failed\n");
+ return Status;
+ }
}
/* Return it to the caller */
@@ -694,7 +751,8 @@
* This function is called whenever a new process (GUI or CUI) is destroyed.
**************************************************************************/
- DPRINT1("ConSrvDisconnect called\n");
+ DPRINT1("ConSrvDisconnect\n");
+
if ( ProcessData->Console != NULL ||
ProcessData->HandleTable != NULL )
{
Modified: branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/bg-BG.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -25,5 +25,5 @@
IDS_SCROLLUP "Ïðåëèñòâàíå íàãîðå"
IDS_SCROLLDOWN "Ïðåëèñòâàíå íàäîëó"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/cs-CZ.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -24,5 +24,5 @@
IDS_SCROLLUP "Posunout nahoru"
IDS_SCROLLDOWN "Posunout dolù"
- IDS_COMMAND_PROMPT "Pøíkazový øádek"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/de-DE.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "Nach oben scrollen"
IDS_SCROLLDOWN "Nach unten scrollen"
- IDS_COMMAND_PROMPT "Eingabeaufforderung"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/el-GR.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "Êýëéóç ðÜíù"
IDS_SCROLLDOWN "Êýëéóç êÜôù"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/en-US.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "Scroll up"
IDS_SCROLLDOWN "Scroll down"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/es-ES.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -24,5 +24,5 @@
IDS_SCROLLUP "Desplazar arriba"
IDS_SCROLLDOWN "Desplazar abajo"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/fr-FR.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -21,5 +21,5 @@
IDS_SCROLLUP "Défiler en haut"
IDS_SCROLLDOWN "Défiler en bas"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/id-ID.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "Gulung Naik"
IDS_SCROLLDOWN "Gulung Turun"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/it-IT.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -28,5 +28,5 @@
IDS_SCROLLUP "Scorri sù"
IDS_SCROLLDOWN "Scorri giù"
- IDS_COMMAND_PROMPT "Prompt dei commandi"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/ja-JP.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "ãÉXN["
IDS_SCROLLDOWN "ºÉXN["
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/no-NO.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "Rull opp"
IDS_SCROLLDOWN "Rull ned"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/pl-PL.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -27,5 +27,5 @@
IDS_SCROLLUP "PrzewiŠdo góry"
IDS_SCROLLDOWN "PrzewiÅ na dóÅ"
- IDS_COMMAND_PROMPT "Wiersz polecenia"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/pt-BR.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -21,5 +21,5 @@
IDS_SCROLLUP "Scroll up"
IDS_SCROLLDOWN "Scroll down"
- IDS_COMMAND_PROMPT "Prompt de Comando"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/ro-RO.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -26,5 +26,5 @@
IDS_SCROLLUP "DeruleazÄ Ã®n sus"
IDS_SCROLLDOWN "DeruleazÄ Ã®n jos"
- IDS_COMMAND_PROMPT "Linie de comandÄ"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/ru-RU.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "ÐÑокÑÑÑиÑÑ Ð²Ð²ÐµÑÑ
"
IDS_SCROLLDOWN "Scroll Down"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/sk-SK.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -24,5 +24,5 @@
IDS_SCROLLUP "Rolova nahor"
IDS_SCROLLDOWN "Rolova nadol"
- IDS_COMMAND_PROMPT "Príkazový riadok"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/sv-SE.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -26,5 +26,5 @@
IDS_SCROLLUP "Skrolla upp"
IDS_SCROLLDOWN "Skrolla ner"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/tr-TR.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -39,5 +39,5 @@
IDS_SCROLLUP "Yukarı yuvarla"
IDS_SCROLLDOWN "AÅaÄı yuvarla"
- IDS_COMMAND_PROMPT "Komut Ä°stemi"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/uk-UA.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -27,5 +27,5 @@
IDS_SCROLLUP "ÐÑокÑÑÑиÑи догоÑи"
IDS_SCROLLDOWN "ÐÑокÑÑÑиÑи донизÑ"
- IDS_COMMAND_PROMPT "Ðомандний ÑÑдок"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/zh-CN.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "ÏòÉϹö¶¯"
IDS_SCROLLDOWN "ÏòϹö¶¯"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/lang/zh-TW.rc [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -19,5 +19,5 @@
IDS_SCROLLUP "¦V¤Wºu°Ê"
IDS_SCROLLDOWN "¦V¤Uºu°Ê"
- IDS_COMMAND_PROMPT "Command Prompt"
+ IDS_CONSOLE_TITLE "ReactOS Console"
END
Modified: branches/ros-csrss/win32ss/user/consrv/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] Fri Feb 1 23:36:23
2013
@@ -37,6 +37,6 @@
#define IDS_SCROLLUP 309
#define IDS_SCROLLDOWN 310
-#define IDS_COMMAND_PROMPT 500
+#define IDS_CONSOLE_TITLE 500
/* EOF */
4345
days inactive
4345
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org