Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 14877: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 30 Apr '05

30 Apr '05

Remove all hardcode string to En.rc for all file This changes are only for ver.c Remove hardcode dev list to cmd.rc update mailing adress for bug report to ros-dev(a)reactos.com sugestion by GvG I did leave copyright year hardcode in ver.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/cmd.rc Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 15:46:59 UTC (rev 14877) @@ -423,8 +423,63 @@ if none of ON, OFF or /S is specified the command\n \ will toggle stopwach state\n\n" +STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename" +STRING_VERIFY_HELP1, "This command is just a dummy!!\n \ +Sets whether to verify that your files are written correctly to a\n \ +disk.\n\n \ +VERIFY [ON | OFF]\n\n \ +Type VERIFY without a parameter to display the current VERIFY setting." +STRING_VERIFY_HELP2, "VERIFY is %s.\n" + +STRING_VERIFY_HELP3, "Must specify ON or OFF." + +STRING_VERSION_HELP1, "Displays shell version information\n\n \ +VER [/C][/R][/W]\n\n \ + /C Displays credits.\n \ + /R Displays redistribution information.\n \ + /W Displays warranty information." + +STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for details\n \ +type: `ver /w'. This is free software, and you are welcome to redistribute\n \ +it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n \ +listing of credits." + +STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n \ + but WITHOUT ANY WARRANTY; without even the implied warranty of\n \ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n \ + GNU General Public License for more details." + + STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n \ + it under the terms of the GNU General Public License as published by\n \ + the Free Software Foundation; either version 2 of the License, or\n \ + (at your option) any later version." + +STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n \ +Updates are available at: http://www.reactos.com" + +STRING_VERSION_HELP6, "FreeDOS version written by:\n%s\nReactOS version written by:\n%s\n" + + +STRING_WINDOW_HELP1, "change console window aspect\n\n \ +WINDOW [/POS[=]left,top,width,heigth]\n \ + [MIN|MAX|RESTORE] ['title']\n\n \ +/POS specify window placement and dimensions\n \ +MIN minimize the window\n \ +MAX maximize the window\n \ +RESTORE restore the window" + +STRING_WINDOW_HELP2, "change console window aspect\n\n \ +ACTIAVTE 'window' [/POS[=]left,top,width,heigth]\n \ + [MIN|MAX|RESTORE] ['title']\n\n \ +window tile of window on wich perform actions\n \ +/POS specify window placement and dimensions\n \ +MIN minimize the window\n \ +MAX maximize the window\n \ +RESTORE restore the window\n \ +title new title" + STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" @@ -487,6 +542,11 @@ STRING_TIME_ERROR1, "Invalid time." +STRING_TYPE_ERROR1, "Invalid option '/%s'\n" + +STRING_WINDOW_ERROR1, "window not found" + + STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n" _____ Modified: trunk/reactos/subsys/system/cmd/cmd.rc --- trunk/reactos/subsys/system/cmd/cmd.rc 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/cmd.rc 2005-04-30 15:46:59 UTC (rev 14877) @@ -8,9 +8,22 @@ #define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2001 Eric Kohl and others\0" #include <reactos/version.rc> #include "En.rc" +STRINGTABLE DISCARDABLE +{ + STRING_FreeDOS_DEV, " Tim Norman Matt Rains\n \ + Evan Jeffrey Steffen Kaiser\n \ + Svante Frey Oliver Mueller\n \ + Aaron Kaufman Marc Desrochers\n \ + Rob Lake John P Price\n \ + Hans B Pufal\n" + STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n \ + Paolo Pantaleo Phillip Susi\n" + +} + 1 ICON DISCARDABLE res/terminal.ico _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 15:46:59 UTC (rev 14877) @@ -68,6 +68,8 @@ #define STRING_REN_ERROR1 346 #define STRING_START_ERROR1 347 #define STRING_TIME_ERROR1 348 +#define STRING_TYPE_ERROR1 349 +#define STRING_WINDOW_ERROR1 350 @@ -184,7 +186,29 @@ #define STRING_TIMER_HELP2 681 #define STRING_TIMER_HELP3 682 +#define STRING_TYPE_HELP1 683 +#define STRING_VERIFY_HELP1 684 +#define STRING_VERIFY_HELP2 685 +#define STRING_VERIFY_HELP3 686 + +#define STRING_VERSION_HELP1 687 +#define STRING_VERSION_HELP2 688 +#define STRING_VERSION_HELP3 689 +#define STRING_VERSION_HELP4 690 +#define STRING_VERSION_HELP5 691 +#define STRING_VERSION_HELP6 692 + +#define STRING_WINDOW_HELP1 693 +#define STRING_WINDOW_HELP2 694 + +#define STRING_FreeDOS_DEV 800 +#define STRING_REACTOS_DEV 801 + + + + + _____ Modified: trunk/reactos/subsys/system/cmd/type.c --- trunk/reactos/subsys/system/cmd/type.c 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/type.c 2005-04-30 15:46:59 UTC (rev 14877) @@ -21,9 +21,13 @@ * * 19-Jan-1999 (Paolo Pantaleo <paolopan(a)freemail.it>) * Added multiple file support (copied from y.c) + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_TYPE @@ -38,13 +42,14 @@ INT argc,i; LPTSTR *argv; LPTSTR errmsg; + WCHAR szMsg[RC_STRING_MAX_SIZE]; hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE); if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays the contents of text files.\n\n" - "TYPE [drive:][path]filename")); + LoadString( GetModuleHandle(NULL), STRING_TYPE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -60,7 +65,8 @@ { if (_T('/') == argv[i][0]) { - ConErrPrintf(_T("Invalid option \"%S\"\n"), argv[i] + 1); + LoadString( GetModuleHandle(NULL), STRING_TYPE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ((LPTSTR)szMsg, argv[i] + 1); continue; } hFile = CreateFile(argv[i], _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-04-30 15:46:59 UTC (rev 14877) @@ -22,6 +22,7 @@ */ #include "precomp.h" +#include "resource.h" VOID ShortVersion (VOID) @@ -63,16 +64,15 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param) { INT i; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + WCHAR rosdev[RC_STRING_MAX_SIZE]; + WCHAR fredev[RC_STRING_MAX_SIZE]; if (_tcsstr (param, _T("/?")) != NULL) { - ConOutPuts (_T("Displays shell version information\n" - "\n" - "VER [/C][/R][/W]\n" - "\n" - " /C Displays credits.\n" - " /R Displays redistribution information.\n" - " /W Displays warranty information.")); + LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } @@ -83,11 +83,9 @@ /* Basic copyright notice */ if (param[0] == _T('\0')) { - ConOutPuts (_T("\n"SHELLINFO - " comes with ABSOLUTELY NO WARRANTY; for details\n" - "type: `ver /w'. This is free software, and you are welcome to redistribute\n" - "it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n" - "listing of credits.")); + ConOutPuts (_T("\n"SHELLINFO)); + LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); } else { @@ -111,22 +109,25 @@ if (_totupper (param[i]) == _T('W')) { /* Warranty notice */ - ConOutPuts (_T("\n This program is distributed in the hope that it will be useful,\n" - " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - " GNU General Public License for more details.")); + LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); } else if (_totupper (param[i]) == _T('R')) { /* Redistribution notice */ - ConOutPuts (_T("\n This program is free software; you can redistribute it and/or modify\n" - " it under the terms of the GNU General Public License as published by\n" - " the Free Software Foundation; either version 2 of the License, or\n" - " (at your option) any later version.")); + LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); } else if (_totupper (param[i]) == _T('C')) { /* Developer listing */ + + LoadString( GetModuleHandle(NULL), STRING_REACTOS_DEV, (LPTSTR) rosdev,sizeof(rosdev)); + LoadString( GetModuleHandle(NULL), STRING_FreeDOS_DEV, (LPTSTR) fredev,sizeof(fredev)); + LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg,fredev,rosdev); + + /* ConOutPuts (_T("\n" "FreeDOS version written by:\n" " Tim Norman Matt Rains\n" @@ -139,6 +140,7 @@ "ReactOS version written by:\n" " Eric Kohl Emanuele Aliberti\n" " Paolo Pantaleo Phillip Susi\n")); + */ } else { @@ -148,9 +150,8 @@ } } - ConOutPuts (_T("\n" - "Send bug reports to <ekohl(a)rz-online.de>.\n" - "Updates are available at: http://www.reactos.com")); + LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/verify.c --- trunk/reactos/subsys/system/cmd/verify.c 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/verify.c 2005-04-30 15:46:59 UTC (rev 14877) @@ -13,9 +13,13 @@ * * 20-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Unicode and redirection ready! + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_VERIFY @@ -26,24 +30,27 @@ INT cmd_verify (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("This command is just a dummy!!\n" - "Sets whether to verify that your files are written correctly to a\n" - "disk.\n\n" - "VERIFY [ON | OFF]\n\n" - "Type VERIFY without a parameter to display the current VERIFY setting.")); + LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } if (!*param) - ConOutPrintf (_T("VERIFY is %s.\n"), bVerify ? D_ON : D_OFF); + { + LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, bVerify ? D_ON : D_OFF); + } else if (_tcsicmp (param, D_OFF) == 0) bVerify = FALSE; else if (_tcsicmp (param, D_ON) == 0) bVerify = TRUE; - else - ConOutPuts (_T("Must specify ON or OFF.")); + else + LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/vol.c --- trunk/reactos/subsys/system/cmd/vol.c 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/vol.c 2005-04-30 15:46:59 UTC (rev 14877) @@ -21,6 +21,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_VOL _____ Modified: trunk/reactos/subsys/system/cmd/window.c --- trunk/reactos/subsys/system/cmd/window.c 2005-04-30 15:04:10 UTC (rev 14876) +++ trunk/reactos/subsys/system/cmd/window.c 2005-04-30 15:46:59 UTC (rev 14877) @@ -10,10 +10,14 @@ * 29 Sep 1999 (Paolo Pantaleo) * activate and window in a single file using mainly the same code * (nice size optimization :) + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #if ( defined(INCLUDE_CMD_WINDOW) || defined(INCLUDE_CMD_ACTIVATE) ) @@ -173,18 +177,13 @@ INT CommandWindow (LPTSTR cmd, LPTSTR param) { HWND h; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts(_T("change console window aspect\n" - "\n" - "WINDOW [/POS[=]left,top,width,heigth]\n" - " [MIN|MAX|RESTORE] [\"title\"]\n" - "\n" - "/POS specify window placement and dimensions\n" - "MIN minimize the window\n" - "MAX maximize the window\n" - "RESTORE restore the window")); + LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } @@ -198,20 +197,12 @@ { LPTSTR str; HWND h; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts(_T("change console window aspect\n" - "\n" - "ACTIAVTE \"window\" [/POS[=]left,top,width,heigth]\n" - " [MIN|MAX|RESTORE] [\"title\"]\n" - "\n" - "window tile of window on wich perform actions\n" - "/POS specify window placement and dimensions\n" - "MIN minimize the window\n" - "MAX maximize the window\n" - "RESTORE restore the window\n" - "title new title")); + LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -231,7 +222,8 @@ h=FindWindow(NULL, param); if (!h) { - ConErrPuts("window not found"); + LoadString( GetModuleHandle(NULL), STRING_WINDOW_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPuts ((LPTSTR)szMsg); return 1; }

1 0

[hpoussin] 14876: Register GUID_DEVINTERFACE_COMPORT for serial devices
by hpoussin＠svn.reactos.com 30 Apr '05

30 Apr '05

Register GUID_DEVINTERFACE_COMPORT for serial devices Register GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR for serenum devices Fix some comments Modified: trunk/reactos/drivers/bus/serenum/fdo.c Modified: trunk/reactos/drivers/bus/serenum/serenum.h Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/bus/serenum/fdo.c --- trunk/reactos/drivers/bus/serenum/fdo.c 2005-04-30 14:53:41 UTC (rev 14875) +++ trunk/reactos/drivers/bus/serenum/fdo.c 2005-04-30 15:04:10 UTC (rev 14876) @@ -18,11 +18,10 @@ { PDEVICE_OBJECT Fdo; PFDO_DEVICE_EXTENSION DeviceExtension; - //UNICODE_STRING SymbolicLinkName; NTSTATUS Status; - + DPRINT("Serenum: SerenumAddDevice called. Pdo = %p\n", Pdo); - + /* Create new device object */ Status = IoCreateDevice(DriverObject, sizeof(FDO_DEVICE_EXTENSION), @@ -36,27 +35,22 @@ DPRINT("Serenum: IoCreateDevice() failed with status 0x%08lx\n", Status); return Status; } + DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(FDO_DEVICE_EXTENSION)); /* Register device interface */ -#if 0 /* FIXME: activate */ - Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, NULL, &SymbolicLinkName); + Status = IoRegisterDeviceInterface( + Pdo, + &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, + NULL, + &DeviceExtension->SerenumInterfaceName); if (!NT_SUCCESS(Status)) { DPRINT("Serenum: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - goto ByeBye; + IoDeleteDevice(Fdo); + return Status; } - DPRINT1("Serenum: IoRegisterDeviceInterface() returned '%wZ'\n", &SymbolicLinkName); - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT("Serenum: IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); - goto ByeBye; - } - RtlFreeUnicodeString(&SymbolicLinkName); -#endif - DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(FDO_DEVICE_EXTENSION)); DeviceExtension->Common.IsFDO = TRUE; DeviceExtension->Common.PnpState = dsStopped; DeviceExtension->Pdo = Pdo; @@ -80,14 +74,23 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PCOMMON_DEVICE_EXTENSION DeviceExtension; + PFDO_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; DPRINT("Serenum: SerenumFdoStartDevice() called\n"); - DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(DeviceExtension->PnpState == dsStopped); - DeviceExtension->PnpState = dsStarted; + ASSERT(DeviceExtension->Common.PnpState == dsStopped); + Status = IoSetDeviceInterfaceState(&DeviceExtension->SerenumInterfaceName, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("Serenum: IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); + return Status; + } + + DeviceExtension->Common.PnpState = dsStarted; + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/bus/serenum/serenum.h --- trunk/reactos/drivers/bus/serenum/serenum.h 2005-04-30 14:53:41 UTC (rev 14875) +++ trunk/reactos/drivers/bus/serenum/serenum.h 2005-04-30 15:04:10 UTC (rev 14876) @@ -66,6 +66,8 @@ PDEVICE_OBJECT Pdo; IO_REMOVE_LOCK RemoveLock; + UNICODE_STRING SerenumInterfaceName; + PDEVICE_OBJECT AttachedPdo; ULONG Flags; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; @@ -122,7 +124,7 @@ NTSTATUS SerenumInitMultiSzString( OUT PUNICODE_STRING Destination, - ... /* list of ANSI_STRINGs */); + ... /* list of PCSZ */); NTSTATUS ForwardIrpAndWait( _____ Modified: trunk/reactos/drivers/dd/serial/create.c --- trunk/reactos/drivers/dd/serial/create.c 2005-04-30 14:53:41 UTC (rev 14875) +++ trunk/reactos/drivers/dd/serial/create.c 2005-04-30 15:04:10 UTC (rev 14876) @@ -45,7 +45,7 @@ if(DeviceExtension->IsOpened) { - DPRINT("Serial: COM%lu is already opened", DeviceExtension->ComPort); + DPRINT("Serial: COM%lu is already opened\n", DeviceExtension->ComPort); Status = STATUS_ACCESS_DENIED; goto ByeBye; } _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-30 14:53:41 UTC (rev 14875) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-30 15:04:10 UTC (rev 14876) @@ -26,15 +26,14 @@ NTSTATUS Status; WCHAR DeviceNameBuffer[32]; UNICODE_STRING DeviceName; - //UNICODE_STRING SymbolicLinkName; static ULONG DeviceNumber = 0; static ULONG ComPortNumber = 1; - + DPRINT("Serial: SerialAddDeviceInternal called\n"); ASSERT(DeviceObject); ASSERT(Pdo); - + /* Create new device object */ swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceNumber); RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); @@ -55,23 +54,13 @@ RtlZeroMemory(DeviceExtension, sizeof(SERIAL_DEVICE_EXTENSION)); /* Register device interface */ -#if 0 /* FIXME: activate */ - Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_COMPORT, NULL, &SymbolicLinkName); + Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_COMPORT, NULL, &DeviceExtension->SerialInterfaceName); if (!NT_SUCCESS(Status)) { DPRINT("Serial: IoRegisterDeviceInterface() failed with status 0x%08x\n", Status); goto ByeBye; } - DPRINT1("Serial: IoRegisterDeviceInterface() returned '%wZ'\n", &SymbolicLinkName); - Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT("Serial: IoSetDeviceInterfaceState() failed with status 0x%08x\n", Status); - goto ByeBye; - } - RtlFreeUnicodeString(&SymbolicLinkName); -#endif - + DeviceExtension->SerialPortNumber = DeviceNumber++; if (pComPortNumber == NULL) DeviceExtension->ComPort = ComPortNumber++; @@ -254,6 +243,15 @@ return Status; } + /* Activate serial interface */ + Status = IoSetDeviceInterfaceState(&DeviceExtension->SerialInterfaceName, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("Serial: IoSetDeviceInterfaceState() failed with status 0x%08x\n", Status); + IoDeleteSymbolicLink(&LinkName); + return Status; + } + /* Connect interrupt and enable them */ Status = IoConnectInterrupt( &DeviceExtension->Interrupt, SerialInterruptService, @@ -264,6 +262,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("Serial: IoConnectInterrupt() failed with status 0x%08x\n", Status); + IoSetDeviceInterfaceState(&DeviceExtension->SerialInterfaceName, FALSE); IoDeleteSymbolicLink(&LinkName); return Status; } @@ -366,6 +365,7 @@ IoAcquireRemoveLock IoReleaseRemoveLockAndWait pass request to DeviceExtension-LowerDriver + disable interface IoDeleteDevice(Fdo) and/or IoDetachDevice break; }*/ _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-04-30 14:53:41 UTC (rev 14875) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-04-30 15:04:10 UTC (rev 14876) @@ -100,6 +100,8 @@ CIRCULAR_BUFFER OutputBuffer; KSPIN_LOCK OutputBufferLock; + UNICODE_STRING SerialInterfaceName; + /* Current values */ UCHAR MCR; /* Base+4, Modem Control Register */ UCHAR MSR; /* Base+6, Modem Status Register */

1 0

[hpoussin] 14875: Patch by Tinus_: Check for right error code returned by ZwOpenSymbolicLinkObject
by hpoussin＠svn.reactos.com 30 Apr '05

30 Apr '05

Patch by Tinus_: Check for right error code returned by ZwOpenSymbolicLinkObject Modified: trunk/reactos/drivers/video/videoprt/videoprt.c _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-04-30 14:36:05 UTC (rev 14874) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-04-30 14:53:41 UTC (rev 14875) @@ -152,10 +152,13 @@ DeviceNumber++; continue; } - else if (Status == STATUS_NOT_FOUND || Status == STATUS_UNSUCCESSFUL) + else if (Status == STATUS_OBJECT_NAME_INVALID) break; else + { + DPRINT1("ZwOpenSymbolicLinkObject() returned unexpected status: 0x%08lx\n", Status); return 0xFFFFFFFF; + } } return DeviceNumber;

1 0

[hpoussin] 14874: Don't double define GUID_DEVICE_INTERFACE_ARRIVAL and GUID_DEVICE_INTERFACE_REMOVAL in include/ntos/ntpnp.h and w32api/include/ddk/wdmguid.h
by hpoussin＠svn.reactos.com 30 Apr '05

30 Apr '05

Don't double define GUID_DEVICE_INTERFACE_ARRIVAL and GUID_DEVICE_INTERFACE_REMOVAL in include/ntos/ntpnp.h and w32api/include/ddk/wdmguid.h Modified: trunk/reactos/include/ntos/ntpnp.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h _____ Modified: trunk/reactos/include/ntos/ntpnp.h --- trunk/reactos/include/ntos/ntpnp.h 2005-04-30 14:15:38 UTC (rev 14873) +++ trunk/reactos/include/ntos/ntpnp.h 2005-04-30 14:36:05 UTC (rev 14874) @@ -38,8 +38,9 @@ DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x194F, 0x11D3, 0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x78A4, 0x11D0, 0xBC, 0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0xD6C5, 0x11D2, 0x97, 0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E); -DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +/* These GUIDs are documented, and they are defined in wdmguid.h */ +/* DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); */ +/* DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); */ DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-30 14:15:38 UTC (rev 14873) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-30 14:36:05 UTC (rev 14874) @@ -27,6 +27,7 @@ #include <ddk/kefuncs.h> #include <ddk/pnptypes.h> #include <ddk/pnpfuncs.h> +#include <ddk/wdmguid.h> #include <ntdll/ldr.h> #include <internal/ctype.h> #include <internal/ntoskrnl.h>

1 0

[gvg] 14873: Change BootDrive/BootPartition examples to BootPath
by gvg＠svn.reactos.com 30 Apr '05

30 Apr '05

Change BootDrive/BootPartition examples to BootPath Modified: trunk/reactos/boot/freeldr/FREELDR.INI _____ Modified: trunk/reactos/boot/freeldr/FREELDR.INI --- trunk/reactos/boot/freeldr/FREELDR.INI 2005-04-30 13:53:39 UTC (rev 14872) +++ trunk/reactos/boot/freeldr/FREELDR.INI 2005-04-30 14:15:38 UTC (rev 14873) @@ -51,8 +51,7 @@ ; [OS-General] Section Commands: ; ; BootType - sets the boot type: ReactOS, Linux, BootSector, Partition, Drive -; BootDrive - sets the boot drive: 0 - first floppy, 1 - second floppy, 0x80 - first hard disk, 0x81 - second hard disk -; BootPartition - sets the boot partition +; BootPath - ARC path e.g. multi(0)disk(0)rdisk(x)partition(y) ; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 maps harddisk1 to harddisk0 or DriveMap=fd1,fd0) ; [BootSector OSType] Section Commands: @@ -134,8 +133,7 @@ [Linux] BootType=Linux -BootDrive=hd1 -BootPartition=1 +BootPath=multi(0)disk(0)rdisk(1)partition(1) Kernel=/vmlinuz Initrd=/initrd.img CommandLine="root=/dev/sdb1" @@ -146,13 +144,11 @@ [MSWinders] BootType=Partition -BootDrive=hd0 -BootPartition=1 +BootPath=multi(0)disk(0)rdisk(0)partition(1) ;DriveMap=hd1,hd0 ;DriveMap=hd2,hd0 ;DriveMap=hd3,hd0 [DriveD] BootType=Partition -BootDrive=hd1 -BootPartition=1 +BootPath=multi(0)disk(0)rdisk(1)partition(1)

1 0

[hpoussin] 14872: I forgot to dereference FileObject in IoSetDeviceInterfaceState
by hpoussin＠svn.reactos.com 30 Apr '05

30 Apr '05

I forgot to dereference FileObject in IoSetDeviceInterfaceState Modified: trunk/reactos/ntoskrnl/io/deviface.c _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-04-30 13:35:52 UTC (rev 14871) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-04-30 13:53:39 UTC (rev 14872) @@ -837,6 +837,8 @@ &GuidString, (PVOID)SymbolicLinkName); + ObDereferenceObject(FileObject); + return STATUS_SUCCESS; }

1 0

[greatlrd] 14871: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 30 Apr '05

30 Apr '05

1 0

[greatlrd] 14870: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 30 Apr '05

30 Apr '05

Remove all hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/time.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 12:36:36 UTC (rev 14869) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 13:13:36 UTC (rev 14870) @@ -355,6 +355,23 @@ STRING_RMDIR_HELP, "Removes a directory.\n\n \ RMDIR [drive:]path\nRD [drive:]path" +STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n \ +RENAME [/E /N /P /Q /S /T] old_name ... new_name\n \ +REN [/E /N /P /Q /S /T] old_name ... new_name\n\n \ + /E No eror messages.\n \ + /N Nothing.\n \ + /P Prompts for confirmation before renaming each file.\n \ + (Not implemented yet!)\n \ + /Q Quiet.\n \ + /S Rename subdirectories.\n \ + /T Display total number of renamed files.\n\n \ +Note that you cannot specify a new drive or path for your destination. Use\n \ +the MOVE command for that purpose." + +STRING_REN_HELP2, " %lu file renamed\n" + +STRING_REN_HELP3, " %lu files renamed\n" + STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n \ SHIFT [DOWN]" @@ -369,14 +386,25 @@ string Specifies a series of characters to assign to the variable.\n\n \ Type SET without parameters to display the current environment variables.\n" +STRING_START_HELP1, "Starts a command.\n\n \ +START command \n\n \ + command Specifies the command to run.\n\n \ +At the moment all commands are started asynchronously.\n" + STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n \ TITLE [string]\n\n \ string Specifies the title for the command prompt window." - +STRING_TIME_HELP1, "Displays or sets the system time.\n\n \ +TIME [/T][time]\n\n \ + /T display only\n\n \ +Type TIME with no parameters to display the current time setting and a prompt\n \ +for a new one. Press ENTER to keep the same time." +STRING_TIME_HELP2, "Enter new time: " + STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" @@ -431,8 +459,14 @@ STRING_PARAM_ERROR, "Required parameter missing\n" -STRING_PATH_ERROR "CMD: Not in environment 'PATH'\n" +STRING_PATH_ERROR, "CMD: Not in environment 'PATH'\n" +STRING_REN_ERROR1, "MoveFile() failed. Error: %lu\n" + +STRING_START_ERROR1, "No batch support at the moment!" + +STRING_TIME_ERROR1, "Invalid time." + STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n" _____ Modified: trunk/reactos/subsys/system/cmd/ren.c --- trunk/reactos/subsys/system/cmd/ren.c 2005-04-30 12:36:36 UTC (rev 14869) +++ trunk/reactos/subsys/system/cmd/ren.c 2005-04-30 13:13:36 UTC (rev 14870) @@ -15,9 +15,13 @@ * * 17-Oct-2001 (Eric Kohl <ekohl(a)rz.online.de> * Implemented basic rename code. + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_RENAME @@ -54,24 +58,13 @@ HANDLE hFile; WIN32_FIND_DATA f; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutPuts(_T("Renames a file/directory or files/directories.\n" - "\n" - "RENAME [/E /N /P /Q /S /T] old_name ... new_name\n" - "REN [/E /N /P /Q /S /T] old_name ... new_name\n" - "\n" - " /E No eror messages.\n" - " /N Nothing.\n" - " /P Prompts for confirmation before renaming each file.\n" - " (Not implemented yet!)\n" - " /Q Quiet.\n" - " /S Rename subdirectories.\n" - " /T Display total number of renamed files.\n" - "\n" - "Note that you cannot specify a new drive or path for your destination. Use\n" - "the MOVE command for that purpose.")); + LoadString( GetModuleHandle(NULL), STRING_REN_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); + return(0); } @@ -245,7 +238,10 @@ else { if (!(dwFlags & REN_ERROR)) - ConErrPrintf(_T("MoveFile() failed. Error: %lu\n"), GetLastError()); + { + LoadString( GetModuleHandle(NULL), STRING_REN_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ((LPTSTR)szMsg, GetLastError()); + } } } } @@ -256,13 +252,15 @@ if (!(dwFlags & REN_QUIET)) { if (dwFiles == 1) - ConOutPrintf(_T(" %lu file renamed\n"), - dwFiles); + LoadString( GetModuleHandle(NULL), STRING_REN_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); else - ConOutPrintf(_T(" %lu files renamed\n"), - dwFiles); + LoadString( GetModuleHandle(NULL), STRING_REN_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + + ConOutPrintf((LPTSTR)szMsg,dwFiles); } + + freep(arg); return(0); _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 12:36:36 UTC (rev 14869) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 13:13:36 UTC (rev 14870) @@ -65,6 +65,9 @@ #define STRING_MOVE_ERROR2 343 #define STRING_PARAM_ERROR 344 #define STRING_PATH_ERROR 345 +#define STRING_REN_ERROR1 346 +#define STRING_START_ERROR1 347 +#define STRING_TIME_ERROR1 348 @@ -158,18 +161,27 @@ #define STRING_REM_HELP 670 -#define STRING_RMDIR_HELP 671 +#define STRING_REN_HELP1 671 +#define STRING_REN_HELP2 672 +#define STRING_REN_HELP3 673 -#define STRING_SCREEN_HELP 672 +#define STRING_RMDIR_HELP 672 -#define STRING_SHIFT_HELP 673 +#define STRING_SCREEN_HELP 673 -#define STRING_SET_HELP 674 +#define STRING_SHIFT_HELP 674 -#define STRING_TITLE_HELP 675 +#define STRING_SET_HELP 675 +#define STRING_START_HELP1 676 +#define STRING_TITLE_HELP 677 +#define STRING_TIME_HELP1 678 +#define STRING_TIME_HELP2 679 + + + _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-04-30 12:36:36 UTC (rev 14869) +++ trunk/reactos/subsys/system/cmd/start.c 2005-04-30 13:13:36 UTC (rev 14870) @@ -6,9 +6,13 @@ * * 24-Jul-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Started. + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_START @@ -18,13 +22,13 @@ TCHAR szFullName[MAX_PATH]; BOOL bWait = FALSE; TCHAR *param; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (rest, _T("/?"), 2) == 0) { - ConOutPuts (_T("Starts a command.\n\n" - "START command \n\n" - " command Specifies the command to run.\n\n" - "At the moment all commands are started asynchronously.\n")); + + LoadString( GetModuleHandle(NULL), STRING_START_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } @@ -68,7 +72,9 @@ #ifdef _DEBUG DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest); #endif - ConErrPuts (_T("No batch support at the moment!")); + + LoadString( GetModuleHandle(NULL), STRING_START_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPuts ((LPTSTR)szMsg); } else { _____ Modified: trunk/reactos/subsys/system/cmd/time.c --- trunk/reactos/subsys/system/cmd/time.c 2005-04-30 12:36:36 UTC (rev 14869) +++ trunk/reactos/subsys/system/cmd/time.c 2005-04-30 13:13:36 UTC (rev 14870) @@ -19,9 +19,13 @@ * * 04-Feb-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Fixed time input bug. + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_TIME @@ -133,17 +137,13 @@ INT i; BOOL bPrompt = TRUE; INT nTimeString = -1; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays or sets the system time.\n" - "\n" - "TIME [/T][time]\n" - "\n" - " /T display only\n" - "\n" - "Type TIME with no parameters to display the current time setting and a prompt\n" - "for a new one. Press ENTER to keep the same time.")); + LoadString( GetModuleHandle(NULL), STRING_TIME_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } @@ -175,7 +175,8 @@ { TCHAR s[40]; - ConOutPrintf (_T("Enter new time: ")); + LoadString( GetModuleHandle(NULL), STRING_TIME_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg); ConInString (s, 40); @@ -203,7 +204,8 @@ /* force input the next time around. */ nTimeString = -1; } - ConErrPuts (_T("Invalid time.")); + LoadString( GetModuleHandle(NULL), STRING_TIME_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPuts ((LPTSTR)szMsg); } freep (arg);

1 0

[greatlrd] 14869: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 30 Apr '05

30 Apr '05

Remove all hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/title.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 11:53:15 UTC (rev 14868) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 12:36:36 UTC (rev 14869) @@ -350,13 +350,29 @@ STRING_PROMPT_HELP3, "\nType PROMPT without parameters to reset the prompt to the default setting." +STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" STRING_RMDIR_HELP, "Removes a directory.\n\n \ RMDIR [drive:]path\nRD [drive:]path" -STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" +STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n \ +SHIFT [DOWN]" +STRING_SCREEN_HELP, "move cursor and optionally print text\n\n \ +SCREEN row col [text]\n\n \ + row row to wich move the cursor\n \ + col column to wich move the cursor" +STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n \ +SET [variable[=][string]]\n\n \ + variable Specifies the environment-variable name.\n \ + string Specifies a series of characters to assign to the variable.\n\n \ +Type SET without parameters to display the current environment variables.\n" + +STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n \ +TITLE [string]\n\n \ +string Specifies the title for the command prompt window." + _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 11:53:15 UTC (rev 14868) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 12:36:36 UTC (rev 14869) @@ -156,12 +156,20 @@ #define STRING_PROMPT_HELP2 668 #define STRING_PROMPT_HELP3 669 -#define STRING_RMDIR_HELP 670 +#define STRING_REM_HELP 670 -#define STRING_REM_HELP 671 +#define STRING_RMDIR_HELP 671 +#define STRING_SCREEN_HELP 672 +#define STRING_SHIFT_HELP 673 +#define STRING_SET_HELP 674 + +#define STRING_TITLE_HELP 675 + + + _____ Modified: trunk/reactos/subsys/system/cmd/screen.c --- trunk/reactos/subsys/system/cmd/screen.c 2005-04-30 11:53:15 UTC (rev 14868) +++ trunk/reactos/subsys/system/cmd/screen.c 2005-04-30 12:36:36 UTC (rev 14869) @@ -6,10 +6,13 @@ * 30 Aug 1999 * started - Paolo Pantaleo <paolopan(a)freemail.it> * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc * */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_SCREEN @@ -18,16 +21,13 @@ { SHORT x,y; BOOL bSkipText = FALSE; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts(_T( - "move cursor and optionally print text\n" - "\n" - "SCREEN row col [text]\n" - "\n" - " row row to wich move the cursor\n" - " col column to wich move the cursor")); + LoadString( GetModuleHandle(NULL), STRING_SCREEN_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-04-30 11:53:15 UTC (rev 14868) +++ trunk/reactos/subsys/system/cmd/set.c 2005-04-30 12:36:36 UTC (rev 14869) @@ -29,9 +29,13 @@ * * 25-Feb-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Fixed little bug. + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_SET @@ -43,14 +47,13 @@ INT cmd_set (LPTSTR cmd, LPTSTR param) { LPTSTR p; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays, sets, or removes environment variables.\n\n" - "SET [variable[=][string]]\n\n" - " variable Specifies the environment-variable name.\n" - " string Specifies a series of characters to assign to the variable.\n\n" - "Type SET without parameters to display the current environment variables.\n")); + LoadString( GetModuleHandle(NULL), STRING_SET_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/shift.c --- trunk/reactos/subsys/system/cmd/shift.c 2005-04-30 11:53:15 UTC (rev 14868) +++ trunk/reactos/subsys/system/cmd/shift.c 2005-04-30 12:36:36 UTC (rev 14869) @@ -18,9 +18,13 @@ * * 20-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Unicode and redirection safe! + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" /* @@ -30,18 +34,22 @@ * * FREEDOS extension : optional parameter DOWN to allow shifting * parameters backwards. + * */ INT cmd_shift (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + #ifdef _DEBUG DebugPrintf (_T("cmd_shift: (\'%s\', \'%s\')\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Changes the position of replaceable parameters in a batch file.\n\n" - "SHIFT [DOWN]")); + LoadString( GetModuleHandle(NULL), STRING_SHIFT_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/title.c --- trunk/reactos/subsys/system/cmd/title.c 2005-04-30 11:53:15 UTC (rev 14868) +++ trunk/reactos/subsys/system/cmd/title.c 2005-04-30 12:36:36 UTC (rev 14869) @@ -4,15 +4,21 @@ * * History: * 1999-02-11 Emanuele Aliberti + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_TITLE INT cmd_title (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + /* Do nothing if no args */ if (*param == _T('\0')) return 0; @@ -20,11 +26,8 @@ /* Asking help? */ if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutPuts (_T("Sets the window title for the command prompt window.\n" - "\n" - "TITLE [string]\n" - "\n" - " string Specifies the title for the command prompt window.")); + LoadString( GetModuleHandle(NULL), STRING_TITLE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; }

1 0

[greatlrd] 14868: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 30 Apr '05

30 Apr '05

Remove all hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 11:16:47 UTC (rev 14867) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 11:53:15 UTC (rev 14868) @@ -303,9 +303,24 @@ /N Nothing. Don everthing but move files or direcories.\n\n \ Current limitations:\n \ - You can't move a file or directory from one drive to another.\n" - +STRING_MSGBOX_HELP, "display a message box and return user responce\n\n \ +MSGBOX type ['title'] prompt\n\n \ +type button displayed\n \ + possible values are: OK, OKCANCEL,\n \ + YESNO, YESNOCANCEL\n \ +title title of message box\n \ +prompt text displayed by the message box\n\n\n \ +ERRORLEVEL is set according the button pressed:\n\n \ +YES : 10 | NO : 11\n \ +OK : 10 | CANCEL : 12\n" +STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n \ +PATH [[drive:]path[;...]]\nPATH ;\n\n \ +Type PATH ; to clear all search-path settings and direct the command shell\n \ +to search only in the current directory.\n \ +Type PATH without parameters to display the current path.\n" + STRING_PROMPT_HELP1, "Changes the command prompt.\n\n \ PROMPT [text]\n\n \ text Specifies a new command prompt.\n\n \ @@ -400,6 +415,8 @@ STRING_PARAM_ERROR, "Required parameter missing\n" +STRING_PATH_ERROR "CMD: Not in environment 'PATH'\n" + STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n" _____ Modified: trunk/reactos/subsys/system/cmd/msgbox.c --- trunk/reactos/subsys/system/cmd/msgbox.c 2005-04-30 11:16:47 UTC (rev 14867) +++ trunk/reactos/subsys/system/cmd/msgbox.c 2005-04-30 11:53:15 UTC (rev 14868) @@ -5,9 +5,13 @@ * * 25 Aug 1999 * started - Paolo Pantaleo <paolopan(a)freemail.it> + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_MSGBOX @@ -28,6 +32,7 @@ //and to find window handle to pass to MessageBox HWND hWnd; TCHAR buff[128]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; //these are MessabeBox() parameters LPTSTR title, prompt=""; @@ -39,22 +44,8 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts(_T( - "display a message box and return user responce\n" - "\n" - "MSGBOX type [\"title\"] prompt\n" - "\n" - "type button displayed\n" - " possible values are: OK, OKCANCEL,\n" - " YESNO, YESNOCANCEL\n" - "title title of message box\n" - "prompt text displayed by the message box\n" - "\n" - "\n" - "ERRORLEVEL is set according the button pressed:\n" - "\n" - "YES : 10 | NO : 11\n" - "OK : 10 | CANCEL : 12\n")); + LoadString( GetModuleHandle(NULL), STRING_MSGBOX_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/path.c --- trunk/reactos/subsys/system/cmd/path.c 2005-04-30 11:16:47 UTC (rev 14867) +++ trunk/reactos/subsys/system/cmd/path.c 2005-04-30 11:53:15 UTC (rev 14868) @@ -21,8 +21,12 @@ * * 24-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Fixed Win32 environment handling. + * + * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_PATH @@ -32,13 +36,13 @@ INT cmd_path (LPTSTR cmd, LPTSTR param) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutPuts (_T("Displays or sets a search path for executable files.\n\n" - "PATH [[drive:]path[;...]]\nPATH ;\n\n" - "Type PATH ; to clear all search-path settings and direct the command shell\n" - "to search only in the current directory.\n" - "Type PATH without parameters to display the current path.\n")); + { + LoadString( GetModuleHandle(NULL), STRING_PATH_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } @@ -52,7 +56,8 @@ dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) { - ConErrPrintf (_T("CMD: Not in environment \"PATH\"\n")); + LoadString( GetModuleHandle(NULL), STRING_PATH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return 0; } else if (dwBuffer > ENV_BUFFER_SIZE) _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 11:16:47 UTC (rev 14867) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 11:53:15 UTC (rev 14868) @@ -64,8 +64,10 @@ #define STRING_MOVE_ERROR1 342 #define STRING_MOVE_ERROR2 343 #define STRING_PARAM_ERROR 344 +#define STRING_PATH_ERROR 345 + #define STRING_ATTRIB_HELP 600 #define STRING_ALIAS_HELP 601 #define STRING_BEEP_HELP 602 @@ -144,18 +146,22 @@ #define STRING_MOVE_HELP1 662 #define STRING_MOVE_HELP2 663 -#define STRING_PAUSE_HELP1 664 +#define STRING_MSGBOX_HELP 664 -#define STRING_PROMPT_HELP1 665 -#define STRING_PROMPT_HELP2 666 -#define STRING_PROMPT_HELP3 667 +#define STRING_PATH_HELP1 665 -#define STRING_RMDIR_HELP 668 +#define STRING_PAUSE_HELP1 666 -#define STRING_REM_HELP 669 +#define STRING_PROMPT_HELP1 667 +#define STRING_PROMPT_HELP2 668 +#define STRING_PROMPT_HELP3 669 +#define STRING_RMDIR_HELP 670 +#define STRING_REM_HELP 671 + +

1 0

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