Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 14857: Swedish translations by Kris Engeman
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

Swedish translations by Kris Engeman Added: trunk/reactos/lib/cpl/sysdm/sv.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc _____ Added: trunk/reactos/lib/cpl/sysdm/sv.rc --- trunk/reactos/lib/cpl/sysdm/sv.rc 2005-04-28 23:15:26 UTC (rev 14856) +++ trunk/reactos/lib/cpl/sysdm/sv.rc 2005-04-28 23:17:13 UTC (rev 14857) @@ -0,0 +1,141 @@ +//Swedish resources by Kris Engeman 2005-04-28 + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +RC_LICENSE RTDATA "resources/gpl.txt" + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allmõnt" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Operativsystem",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COL UMN-PROPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3), PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Version" REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Dator",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPS HEETPADDING,8 + LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7) ,PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWI DTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSH EETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHE ETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TAB STOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nõtverksidentitet" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Windows anvõnder f÷ljande information f÷r att identifiera din dator pÕ nõtverket.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Fullstõndigt datornamn:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(4)-4 + LTEXT "",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDIN G)-ICONSIZE,LABELLINE(4)-5 + LTEXT "Arbetsgrupp:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PROPS HEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "",IDC_WORKGROUPDOMAIN_NAME,120,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "Klicka pÕ Nõtverksidentitet f÷r att anvõnda guiden Nõtverksidentifikation f÷r att ansluta till en domõn och skapa en lokal anvõndare.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSH EETPADDING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Nõtverksidentitet...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1 )+4 + LTEXT "Klicka pÕ egenskaper f÷r att ansluta till en domõn eller õndra datornamnet.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PRO PSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&Egenskaper...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1 )+4 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "HÕrdvara" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Guiden anslut ny hÕrdvara",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Guiden anslut ny hÕrdvara hjõlper dig att installera, avinstallera, reparera, koppla ur, mata ut och konfigurera din hÕrdvara.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "&Guiden anslut ny hÕrdvara...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LA BELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Enhetshanteraren",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2* PROPSHEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Enhetshanteraren visar all hÕrdvara i din dator.. Anvõnd enhetshanteraren f÷r att õndra egenskaper pÕ dina enheter.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&Enhetshanteraren...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PR OPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "HÕrdvaruprofiler",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2 *PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "HÕrdvaruprofiler ger dig m÷jligheten att konfigurera och lagra olika hÕrdvarukonfigurationer..",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18) -5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "HÕrdvaruprofiler...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETP ADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Anvõndarprofiler" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Anvõndarprofiler innehÕller skrivbordsinstõllningar och annan information om ditt konto. Olika profiler kan skapas pÕ varje dator du anvõnder eller sÕ kan du võlja en central profil som õr likadan pÕ alla datorer du anvõnder.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "Anvõndarprofiler pÕ datorn:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPAD DING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE + + PUSHBUTTON "Ta bort",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELLINE (1)+2 + PUSHBUTTON "?ndra typ...",IDC_USERPROFILE_CHANGE,95,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Kopiera till...",IDC_USERPROFILE_COPY,180,LABELLINE(20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avancerat" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Prestanda",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Prestandainstõllningar kontrollerar hur program anvõnder minne, vilket pÕverkar din dators hastighet.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Prestandainstõllningar...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADD ING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Milj÷variabler",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PR OPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Milj÷variabler anger var din dator ska hõmta viss typ av information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11) + PUSHBUTTON "&Milj÷variabler...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LAB ELLINE(12)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "&Start och Õterstõllning",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PRO PSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Start och Õterstõllning stõller in hur din dator ska starta och hur den ska bete sig om den st÷ter pÕ ett fel.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6* PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Start och Õterstõllning...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELL INE(19)+2,(18*PROPSHEETPADDING),14 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Milj÷variabler" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Anvõndarvariabler",-1,7,12,238,100 + LTEXT "&Variabler:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_S HOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS _TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Ny...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Redigera...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Ta bort",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "Systemvariabler",-1,7,116,238,100 + LTEXT "Variabler:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS _SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL| WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "Ny...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "Redigera...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "Ta bort",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?ndra variabel" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Variabelnamn:",-1,7,14,50,8 + EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL + LTEXT "Variabelvõrde:",-1,7,32,50,8 + EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "System" + IDS_CPLSYSTEMDESCRIPTION "Se information om din dator och õndra olika system- och hÕrdvaruinstõllningar." +END _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-04-28 23:15:26 UTC (rev 14856) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-04-28 23:17:13 UTC (rev 14857) @@ -21,3 +21,4 @@ #include "de.rc" #include "dk.rc" #include "fr.rc" +#include "sv.rc"

1 0

[greatlrd] 14856: Translate by Andreas Bjerkeholt (harteex@gmail.com)
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

Translate by Andreas Bjerkeholt (harteex(a)gmail.com) Modified: trunk/reactos/lib/mpr/mpr.rc Added: trunk/reactos/lib/mpr/mpr_Sv.rc _____ Modified: trunk/reactos/lib/mpr/mpr.rc --- trunk/reactos/lib/mpr/mpr.rc 2005-04-28 23:14:54 UTC (rev 14855) +++ trunk/reactos/lib/mpr/mpr.rc 2005-04-28 23:15:26 UTC (rev 14856) @@ -33,3 +33,4 @@ #include "mpr_Ja.rc" #include "mpr_Nl.rc" #include "mpr_Pt.rc" +#include "mpr_Sv.rc" _____ Added: trunk/reactos/lib/mpr/mpr_Sv.rc --- trunk/reactos/lib/mpr/mpr_Sv.rc 2005-04-28 23:14:54 UTC (rev 14855) +++ trunk/reactos/lib/mpr/mpr_Sv.rc 2005-04-28 23:15:26 UTC (rev 14856) @@ -0,0 +1,46 @@ +/* + * MPR dll Swedish resources + * + * Copyright (C) 2005 Andreas Bjerkeholt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Hela nõtverket" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ange nõtverksl÷senord" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ange ditt anvõndarnamn och l÷senord:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Anvõndare", -1, 40, 66, 50, 10 + LTEXT "L÷senord", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Spara detta l÷senord (Osõkert)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

[hpoussin] 14855: SVN maintenance:
by hpoussin＠svn.reactos.com 28 Apr '05

28 Apr '05

SVN maintenance: Add svn:eol-style = native Add svn:keywords = author date id revision Modified: trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S Modified: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_string.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c --- trunk/reactos/ntoskrnl/kd/kdinit.c 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kd/kdinit.c 2005-04-28 23:14:54 UTC (rev 14855) @@ -103,7 +103,7 @@ KdpDebugMode.Serial = TRUE; /* Set the port to use */ - SerialPortInfo.ComPort = Value; + SerialPortInfo.ComPort = Value; KdpPort = Value; } } Property changes on: trunk/reactos/ntoskrnl/kd/kdinit.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/kd/kdio.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/kd/kdmain.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S --- trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S 2005-04-28 23:14:54 UTC (rev 14855) @@ -1,70 +1,70 @@ - .file "longjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to longjmp looks like: - * - * value - * ptr to jmp_buf - * return PC - */ - -.globl _longjmp -_longjmp: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%ecx /* address of jmp_buf to ecx */ - movl 12(%ebp),%eax /* return value to %eax */ - testl %eax,%eax - jne 1f - incl %eax /* return 1 if handed 0 */ - -1: - movl (%ecx),%ebx /* restore %ebx */ - movl 4(%ecx),%esi /* restore %esi */ - movl 8(%ecx),%edi /* restore %edi */ - - /* - * From this instant on we are not running in a valid frame - */ - - movl 12(%ecx),%ebp /* restore %ebp */ - movl 16(%ecx),%esp /* restore %esp */ - /* movl 20(%ecx),%eax return PC */ - - /* - * Since we are abandoning the stack in any case, - * there isn't much point in doing the usual return - * discipline. - */ - - jmpl *20(%ecx) - + .file "longjmp.S" +/* + * Copyright (C) 1998, 1999, Jonathan S. Shapiro. + * + * This file is part of the EROS Operating System. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + /* + * typedef struct { + * unsigned long ebx, esi, edi; + * unsigned long ebp; + * unsigned long sp; + * unsigned long pc; + * } jmp_buf[1]; + */ + + /* + * On entry, the stack to longjmp looks like: + * + * value + * ptr to jmp_buf + * return PC + */ + +.globl _longjmp +_longjmp: + pushl %ebp + movl %esp,%ebp + + movl 8(%ebp),%ecx /* address of jmp_buf to ecx */ + movl 12(%ebp),%eax /* return value to %eax */ + testl %eax,%eax + jne 1f + incl %eax /* return 1 if handed 0 */ + +1: + movl (%ecx),%ebx /* restore %ebx */ + movl 4(%ecx),%esi /* restore %esi */ + movl 8(%ecx),%edi /* restore %edi */ + + /* + * From this instant on we are not running in a valid frame + */ + + movl 12(%ecx),%ebp /* restore %ebp */ + movl 16(%ecx),%esp /* restore %esp */ + /* movl 20(%ecx),%eax return PC */ + + /* + * Since we are abandoning the stack in any case, + * there isn't much point in doing the usual return + * discipline. + */ + + jmpl *20(%ecx) + Property changes on: trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S --- trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S 2005-04-28 23:14:54 UTC (rev 14855) @@ -1,59 +1,59 @@ - .file "setjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* #include <eros/i486/asm.h> */ - - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to setjmp looks like: - * - * ptr to jmp_buf - * return PC - */ -.globl _setjmp -_setjmp: - pushl %ebp - movl %esp,%ebp - - movl 0x8(%ebp),%eax /* address of jmp_buf to eax */ - movl %ebx,(%eax) /* save %ebx */ - movl %esi,4(%eax) /* save %esi */ - movl %edi,8(%eax) /* save %edi */ - leal 8(%ebp),%edx /* calling proc's esp, not ours! */ - movl %edx,16(%eax) - movl 4(%ebp), %edx /* save return PC */ - movl %edx,20(%eax) - movl 0(%ebp),%edx /* calling proc's ebp, not ours! */ - movl %edx,12(%eax) - - xorl %eax,%eax /* return 0 the first time */ - leave - ret $4 - + .file "setjmp.S" +/* + * Copyright (C) 1998, 1999, Jonathan S. Shapiro. + * + * This file is part of the EROS Operating System. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* #include <eros/i486/asm.h> */ + + + /* + * typedef struct { + * unsigned long ebx, esi, edi; + * unsigned long ebp; + * unsigned long sp; + * unsigned long pc; + * } jmp_buf[1]; + */ + + /* + * On entry, the stack to setjmp looks like: + * + * ptr to jmp_buf + * return PC + */ +.globl _setjmp +_setjmp: + pushl %ebp + movl %esp,%ebp + + movl 0x8(%ebp),%eax /* address of jmp_buf to eax */ + movl %ebx,(%eax) /* save %ebx */ + movl %esi,4(%eax) /* save %esi */ + movl %edi,8(%eax) /* save %edi */ + leal 8(%ebp),%edx /* calling proc's esp, not ours! */ + movl %edx,16(%eax) + movl 4(%ebp), %edx /* save return PC */ + movl %edx,20(%eax) + movl 0(%ebp),%edx /* calling proc's ebp, not ours! */ + movl %edx,12(%eax) + + xorl %eax,%eax /* return 0 the first time */ + leave + ret $4 + Property changes on: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-04-28 23:11:04 UTC (rev 14854) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-04-28 23:14:54 UTC (rev 14855) @@ -1,1081 +1,1081 @@ -/* - * ReactOS kernel - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/kdb_expr.c - * PURPOSE: Kernel debugger expression evaluation - * PROGRAMMER: Gregor Anich (blight(a)blight.eu.org) - * UPDATE HISTORY: - * Created 15/01/2005 - */ - -/* Note: - * - * The given expression is parsed and stored in reverse polish notation, - * then it is evaluated and the result is returned. - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#include <internal/kdb.h> -#define NDEBUG -#include <internal/debug.h> - -/* TYPES *********************************************************************/ -typedef enum _RPN_OP_TYPE -{ - RpnOpNop, - RpnOpBinaryOperator, - RpnOpUnaryOperator, - RpnOpImmediate, - RpnOpRegister, - RpnOpDereference -} RPN_OP_TYPE; - -typedef ULONGLONG (*RPN_BINARY_OPERATOR)(ULONGLONG a, ULONGLONG b); - -typedef struct _RPN_OP -{ - RPN_OP_TYPE Type; - ULONG CharacterOffset; - union { - /* RpnOpBinaryOperator */ - RPN_BINARY_OPERATOR BinaryOperator; - /* RpnOpImmediate */ - ULONGLONG Immediate; - /* RpnOpRegister */ - UCHAR Register; - /* RpnOpDereference */ - UCHAR DerefMemorySize; - } Data; -} RPN_OP, *PRPN_OP; - -typedef struct _RPN_STACK -{ - ULONG Size; /* Number of RPN_OPs on Ops */ - ULONG Sp; /* Stack pointer */ - RPN_OP Ops[1]; /* Array of RPN_OPs */ -} RPN_STACK, *PRPN_STACK; - -/* DEFINES *******************************************************************/ -#define stricmp _stricmp - -#ifndef RTL_FIELD_SIZE -# define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) -#endif - -#define CONST_STRCPY(dst, src) \ - do { if ((dst) != NULL) { memcpy(dst, src, sizeof(src)); } } while (0); - -#define RPN_OP_STACK_SIZE 256 -#define RPN_VALUE_STACK_SIZE 256 - -/* GLOBALS *******************************************************************/ -STATIC struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 }; - -STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] = -{ - {"eip", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eip)}, - {"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eflags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eflags)}, - {"eax", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eax), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eax)}, - {"ebx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebx)}, - {"ecx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ecx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ecx)}, - {"edx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edx)}, - {"esi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esi)}, - {"edi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edi)}, - {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esp)}, - {"ebp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebp)}, - {"cs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Cs), 2 }, /* Use only the lower 2 bytes */ - {"ds", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ds), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ds)}, - {"es", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Es), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Es)}, - {"fs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Fs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Fs)}, - {"gs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Gs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Gs)}, - {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ss), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ss)}, - {"dr0", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr0), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr0)}, - {"dr1", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr1), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr1)}, - {"dr2", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr2), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr2)}, - {"dr3", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr3), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr3)}, - {"dr6", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr6), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr6)}, - {"dr7", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr7), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr7)}, - {"cr0", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr0), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr0)}, - {"cr2", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr2), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr2)}, - {"cr3", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr3), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr3)}, - {"cr4", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr4), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr4)} -}; -STATIC CONST INT RegisterToTrapFrameCount = - sizeof (RegisterToTrapFrame) / sizeof (RegisterToTrapFrame[0]); - -/* FUNCTIONS *****************************************************************/ - -ULONGLONG -RpnBinaryOperatorAdd(ULONGLONG a, ULONGLONG b) -{ - return a + b; -} - -ULONGLONG -RpnBinaryOperatorSub(ULONGLONG a, ULONGLONG b) -{ - return a - b; -} - -ULONGLONG -RpnBinaryOperatorMul(ULONGLONG a, ULONGLONG b) -{ - return a * b; -} - -ULONGLONG -RpnBinaryOperatorDiv(ULONGLONG a, ULONGLONG b) -{ - - return a / b; -} - -ULONGLONG -RpnBinaryOperatorMod(ULONGLONG a, ULONGLONG b) -{ - return a % b; -} - -ULONGLONG -RpnBinaryOperatorEquals(ULONGLONG a, ULONGLONG b) -{ - return (a == b); -} - -ULONGLONG -RpnBinaryOperatorNotEquals(ULONGLONG a, ULONGLONG b) -{ - return (a != b); -} - -ULONGLONG -RpnBinaryOperatorLessThan(ULONGLONG a, ULONGLONG b) -{ - return (a < b); -} - -ULONGLONG -RpnBinaryOperatorLessThanOrEquals(ULONGLONG a, ULONGLONG b) -{ - return (a <= b); -} - -ULONGLONG -RpnBinaryOperatorGreaterThan(ULONGLONG a, ULONGLONG b) -{ - return (a > b); -} - -ULONGLONG -RpnBinaryOperatorGreaterThanOrEquals(ULONGLONG a, ULONGLONG b) -{ - return (a >= b); -} - -/*!\brief Dumps the given RPN stack content - * - * \param Stack Pointer to a RPN_STACK structure. - */ -VOID -RpnpDumpStack( - IN PRPN_STACK Stack) -{ - ULONG ul; - - ASSERT(Stack != NULL); - DbgPrint("\nStack size: %ld\n", Stack->Sp); - for (ul = 0; ul < Stack->Sp; ul++) - { - PRPN_OP Op = Stack->Ops + ul; - switch (Op->Type) - { - case RpnOpNop: - DbgPrint("NOP,"); - break; - - case RpnOpImmediate: - DbgPrint("0x%I64x,", Op->Data.Immediate); - break; - - case RpnOpBinaryOperator: - if (Op->Data.BinaryOperator == RpnBinaryOperatorAdd) - DbgPrint("+,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorSub) - DbgPrint("-,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorMul) - DbgPrint("*,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorDiv) - DbgPrint("/,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorMod) - DbgPrint("%%,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorEquals) - DbgPrint("==,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorNotEquals) - DbgPrint("!=,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorLessThan) - DbgPrint("<,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorLessThanOrEquals) - DbgPrint("<=,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorGreaterThan) - DbgPrint(">,"); - else if (Op->Data.BinaryOperator == RpnBinaryOperatorGreaterThanOrEquals) - DbgPrint(">=,"); - else - DbgPrint("UNKNOWN OP,"); - break; - - case RpnOpRegister: - DbgPrint("%s,", RegisterToTrapFrame[Op->Data.Register].Name); - break; - - case RpnOpDereference: - DbgPrint("[%s],", - (Op->Data.DerefMemorySize == 1) ? ("byte") : - ((Op->Data.DerefMemorySize == 2) ? ("word") : - ((Op->Data.DerefMemorySize == 4) ? ("dword") : ("qword")) - ) - ); - break; - - default: - DbgPrint("\nUnsupported Type: %d\n", Op->Type); - ul = Stack->Sp; - break; - } - } - DbgPrint("\n"); -} - -/*!\brief Clears the given RPN stack. - * - * \param Stack Pointer to a RPN_STACK structure. - */ -STATIC VOID -RpnpClearStack( - OUT PRPN_STACK Stack) -{ - ASSERT(Stack != NULL); - Stack->Sp = 0; -} - -/*!\brief Pushes an RPN_OP onto the stack. - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Op RPN_OP to be copied onto the stack. - */ -STATIC BOOLEAN -RpnpPushStack( - IN OUT PRPN_STACK Stack, - IN PRPN_OP Op) -{ - ASSERT(Stack != NULL); - ASSERT(Op != NULL); - - if (Stack->Sp >= Stack->Size) - return FALSE; - - memcpy(Stack->Ops + Stack->Sp, Op, sizeof (RPN_OP)); - Stack->Sp++; - return TRUE; -} - -/*!\brief Pops the top op from the stack. - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Op Pointer to an RPN_OP to store the popped op into (can be NULL). - * - * \retval TRUE Success. - * \retval FALSE Failure (stack empty) - */ -STATIC BOOLEAN -RpnpPopStack( - IN OUT PRPN_STACK Stack, - OUT PRPN_OP Op OPTIONAL) -{ - ASSERT(Stack != NULL); - - if (Stack->Sp == 0) - return FALSE; - - Stack->Sp--; - if (Op != NULL) - memcpy(Op, Stack->Ops + Stack->Sp, sizeof (RPN_OP)); - return TRUE; -} - -/*!\brief Gets the top op from the stack (not popping it) - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Op Pointer to an RPN_OP to copy the top op into. - * - * \retval TRUE Success. - * \retval FALSE Failure (stack empty) - */ -STATIC BOOLEAN -RpnpTopStack( - IN PRPN_STACK Stack, - OUT PRPN_OP Op) -{ - ASSERT(Stack != NULL); - ASSERT(Op != NULL); - - if (Stack->Sp == 0) - return FALSE; - - memcpy(Op, Stack->Ops + Stack->Sp - 1, sizeof (RPN_OP)); - return TRUE; -} - -/*!\brief Parses an expression. - * - * This functions parses the given expression until the end of string or a closing - * brace is found. As the function parses the string it pushes RPN_OPs onto the - * stack. - * - * Examples: 1+2*3 ; eax+10 ; (eax+16) * (ebx+4) ; dword[eax] - * - * \param Stack Pointer to a RPN_STACK structure. - * \param Expression String to parse. - * \param CharacterOffset Character offset of the subexpression from the beginning of the expression. - * \param End On success End is set to the character at which parsing stopped. - * \param ErrOffset On failure this is set to the character offset at which the error occoured. - * \param ErrMsg On failure a message describing the problem is copied into this buffer (128 bytes) - * - * \retval TRUE Success. - * \retval FALSE Failure. - */ -STATIC BOOLEAN -RpnpParseExpression( - IN PRPN_STACK Stack, - IN PCHAR Expression, - OUT PCHAR *End OPTIONAL, - IN ULONG CharacterOffset, - OUT PLONG ErrOffset OPTIONAL, - OUT PCHAR ErrMsg OPTIONAL) -{ - PCHAR p = Expression; - PCHAR pend; - PCHAR Operator = NULL; - LONG OperatorOffset = -1; - RPN_OP RpnOp; - RPN_OP PoppedOperator; - BOOLEAN HavePoppedOperator = FALSE; - RPN_OP ComparativeOp; - BOOLEAN ComparativeOpFilled = FALSE; - BOOLEAN IsComparativeOp; - INT i, i2; - ULONG ul; - UCHAR MemorySize; - CHAR Buffer[16]; - BOOLEAN First; - - ASSERT(Stack != NULL); - ASSERT(Expression != NULL); - - First = TRUE; - for (;;) - { - /* Skip whitespace */ - while (isspace(*p)) - { - p++; - CharacterOffset++; - } - - /* Check for end of expression */ - if (p[0] == '\0' || p[0] == ')' || p[0] == ']') - break; - - if (!First) - { - /* Remember operator */ - Operator = p++; - OperatorOffset = CharacterOffset++;; - - /* Pop operator (to get the right operator precedence) */ - HavePoppedOperator = FALSE; - if (*Operator == '*' || *Operator == '/' || *Operator == '%') - { - if (RpnpTopStack(Stack, &PoppedOperator) && - PoppedOperator.Type == RpnOpBinaryOperator && - (PoppedOperator.Data.BinaryOperator == RpnBinaryOperatorAdd || - PoppedOperator.Data.BinaryOperator == RpnBinaryOperatorSub)) - { - RpnpPopStack(Stack, NULL); - HavePoppedOperator = TRUE; - } - else if (PoppedOperator.Type == RpnOpNop) - { - RpnpPopStack(Stack, NULL); - /* Discard the NOP - it was only pushed to indicate there was a - * closing brace, so the previous operator shouldn't be popped. - */ - } - } - else if ((Operator[0] == '=' && Operator[1] == '=') || - (Operator[0] == '!' && Operator[1] == '=') || - Operator[0] == '<' || Operator[0] == '>') - { - if (Operator[0] == '=' || Operator[0] == '!' || - (Operator[0] == '<' && Operator[1] == '=') || - (Operator[0] == '>' && Operator[1] == '=')) - { - p++; - CharacterOffset++; - } -#if 0 - /* Parse rest of expression */ - if (!RpnpParseExpression(Stack, p + 1, &pend, CharacterOffset + 1, - ErrOffset, ErrMsg)) - { - return FALSE; - } - else if (pend == p + 1) - { - CONST_STRCPY(ErrMsg, "Expression expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + 1; - return FALSE; - } - goto end_of_expression; /* return */ -#endif - } - else if (Operator[0] != '+' && Operator[0] != '-') - { - CONST_STRCPY(ErrMsg, "Operator expected"); - if (ErrOffset != NULL) - *ErrOffset = OperatorOffset; - return FALSE; - } - - /* Skip whitespace */ - while (isspace(*p)) - { - p++; - CharacterOffset++; - } - } - - /* Get operand */ - MemorySize = sizeof(ULONG_PTR); /* default to pointer size */ -get_operand: - i = strcspn(p, "+-*/%()[]<>!="); - if (i > 0) - { - i2 = i; - - /* Copy register name/memory size */ - while (isspace(p[--i2])); - i2 = min(i2 + 1, sizeof (Buffer) - 1); - strncpy(Buffer, p, i2); - Buffer[i2] = '\0'; - - /* Memory size prefix */ - if (p[i] == '[') - { - if (stricmp(Buffer, "byte") == 0) - MemorySize = 1; - else if (stricmp(Buffer, "word") == 0) - MemorySize = 2; - else if (stricmp(Buffer, "dword") == 0) - MemorySize = 4; - else if (stricmp(Buffer, "qword") == 0) - MemorySize = 8; - else - { - CONST_STRCPY(ErrMsg, "Invalid memory size prefix"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset; - return FALSE; - } - - p += i; - CharacterOffset += i; - goto get_operand; - } - - /* Try to find register */ - for (i = 0; i < RegisterToTrapFrameCount; i++) - { - if (stricmp(RegisterToTrapFrame[i].Name, Buffer) == 0) - break; - } - if (i < RegisterToTrapFrameCount) - { - RpnOp.Type = RpnOpRegister; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Register = i; - i = strlen(RegisterToTrapFrame[i].Name); - CharacterOffset += i; - p += i; - } - else - { - /* Immediate value */ - /* FIXME: Need string to ULONGLONG function */ - ul = strtoul(p, &pend, 0); - if (p != pend) - { - RpnOp.Type = RpnOpImmediate; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Immediate = (ULONGLONG)ul; - CharacterOffset += pend - p; - p = pend; - } - else - { - CONST_STRCPY(ErrMsg, "Operand expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset; - return FALSE; - } - } - - /* Push operand */ - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - } - else if (i == 0) - { - if (p[0] == '(' || p[0] == '[') /* subexpression */ - { - if (!RpnpParseExpression(Stack, p + 1, &pend, CharacterOffset + 1, - ErrOffset, ErrMsg)) - { - return FALSE; - } - else if (pend == p + 1) - { - CONST_STRCPY(ErrMsg, "Expression expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + 1; - return FALSE; - } - - if (p[0] == '[') /* dereference */ - { - ASSERT(MemorySize == 1 || MemorySize == 2 || - MemorySize == 4 || MemorySize == 8); - if (pend[0] != ']') - { - CONST_STRCPY(ErrMsg, "']' expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + (pend - p); - return FALSE; - } - RpnOp.Type = RpnOpDereference; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.DerefMemorySize = MemorySize; - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - } - else /* p[0] == '(' */ - { - if (pend[0] != ')') - { - CONST_STRCPY(ErrMsg, "')' expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset + (pend - p); - return FALSE; - } - } - - /* Push a "nop" to prevent popping of the + operator (which would - * result in (10+10)/2 beeing evaluated as 15) - */ - RpnOp.Type = RpnOpNop; - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - - /* Skip closing brace/bracket */ - pend++; - - CharacterOffset += pend - p; - p = pend; - } - else if (First && p[0] == '-') /* Allow expressions like "- eax" */ - { - RpnOp.Type = RpnOpImmediate; - RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Immediate = 0; - if (!RpnpPushStack(Stack, &RpnOp)) - { - CONST_STRCPY(ErrMsg, "RPN op stack overflow"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - } - else - { - CONST_STRCPY(ErrMsg, "Operand expected"); - if (ErrOffset != NULL) - *ErrOffset = CharacterOffset; - return FALSE; - } - } - else - { - CONST_STRCPY(ErrMsg, "strcspn() failed"); - if (ErrOffset != NULL) - *ErrOffset = -1; - return FALSE; - } - - if (!First) - { - /* Push operator */ - RpnOp.CharacterOffset = OperatorOffset; - RpnOp.Type = RpnOpBinaryOperator; - IsComparativeOp = FALSE; - switch (*Operator) - { - case '+': - RpnOp.Data.BinaryOperator = RpnBinaryOperatorAdd; - break; - - case '-': - RpnOp.Data.BinaryOperator = RpnBinaryOperatorSub; - break; - - case '*': - RpnOp.Data.BinaryOperator = RpnBinaryOperatorMul; - break; [truncated at 1000 lines; 1749 more skipped]

1 0

[greatlrd] 14854: David Nordenberg: Swedish translation
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

David Nordenberg: Swedish translation Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc --- trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-04-28 22:39:50 UTC (rev 14853) +++ trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-04-28 23:11:04 UTC (rev 14854) @@ -375,7 +375,65 @@ //////////////////////////////////////////////////////////////////////// ///// +/////////////////////////////////////////////////////////////////////// ////// +// Swedish (SE) resources +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SWE) +#ifdef _WIN32 +LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Íppna", ID_FILE_OPEN + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Visa" + BEGIN + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR + MENUITEM "S&idfõlt", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "&Fullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "Om &IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "Om &operativsystemet...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS webblõsare" + IDS_EMPTY "(Tom)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&Om..." +END + +#endif // Swedish (SE) resources +/////////////////////////////////////////////////////////////////////// ////// + + #ifndef APSTUDIO_INVOKED //////////////////////////////////////////////////////////////////////// ///// //

1 0

[ion] 14853: Remove rant. H&E are very competent developers and made a typical bug that anyone could've made. I was just pissed for having lost an hour finding it ; )
by ion＠svn.reactos.com 28 Apr '05

28 Apr '05

Remove rant. H&E are very competent developers and made a typical bug that anyone could've made. I was just pissed for having lost an hour finding it ;) Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-04-28 22:05:26 UTC (rev 14852) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-04-28 22:39:50 UTC (rev 14853) @@ -2147,11 +2147,6 @@ ((PUCHAR)AdapterBusInfo + sizeof(SCSI_ADAPTER_BUS_INFO) + (sizeof(SCSI_BUS_DATA) * (AdapterBusInfo->NumberOfBuses - 1))); - /* - * RANT: - * Whoever originally coded this to depend on the IRP's System Buffer to be - * magically cleared for him should never be allowed to code drivers again. - */ RtlZeroMemory(UnitInfo, sizeof(*UnitInfo)); for (Bus = 0; Bus < AdapterBusInfo->NumberOfBuses; Bus++)

1 0

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

28 Apr '05

Remove all hardcode string to En.rc from memmory.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/memory.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-28 21:56:36 UTC (rev 14851) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 22:05:26 UTC (rev 14852) @@ -278,6 +278,17 @@ STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" +STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" + +STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n \ + %13s bytes total physical RAM.\n \ + %13s bytes available physical RAM.\n\n \ + %13s bytes total page file.\n \ + %13s bytes available page file.\n\n \ + %13s bytes total virtual memory.\n \ + %13s bytes available virtual memory.\n" + + STRING_RMDIR_HELP, "Removes a directory.\n\n \ RMDIR [drive:]path\nRD [drive:]path" _____ Modified: trunk/reactos/subsys/system/cmd/memory.c --- trunk/reactos/subsys/system/cmd/memory.c 2005-04-28 21:56:36 UTC (rev 14851) +++ trunk/reactos/subsys/system/cmd/memory.c 2005-04-28 22:05:26 UTC (rev 14852) @@ -6,9 +6,13 @@ * * 01-Sep-1999 (Eric Kohl) * Started. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_MEMORY @@ -60,12 +64,12 @@ TCHAR szAvailPageFile[20]; TCHAR szTotalVirtual[20]; TCHAR szAvailVirtual[20]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays the amount of system memory.\n" - "\n" - "MEMORY")); + LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -81,17 +85,8 @@ ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE); ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE); - ConOutPrintf (_T("\n" - " %12s%% memory load.\n" - "\n" - " %13s bytes total physical RAM.\n" - " %13s bytes available physical RAM.\n" - "\n" - " %13s bytes total page file.\n" - " %13s bytes available page file.\n" - "\n" - " %13s bytes total virtual memory.\n" - " %13s bytes available virtual memory.\n"), + LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, szAvailPageFile, szTotalVirtual, szAvailVirtual); _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 21:56:36 UTC (rev 14851) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 22:05:26 UTC (rev 14852) @@ -132,12 +132,15 @@ #define STRING_MKDIR_HELP 657 -#define STRING_RMDIR_HELP 658 +#define STRING_MEMMORY_HELP1 658 +#define STRING_MEMMORY_HELP2 659 -#define STRING_REM_HELP 659 +#define STRING_RMDIR_HELP 660 +#define STRING_REM_HELP 661 +

1 0

[hpoussin] 14851: Don't pass a NULL pointer as offset when creating a IRP_MJ_READ irp.
by hpoussin＠svn.reactos.com 28 Apr '05

28 Apr '05

Don't pass a NULL pointer as offset when creating a IRP_MJ_READ irp. Modified: trunk/reactos/drivers/bus/serenum/detect.c _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-04-28 21:17:07 UTC (rev 14850) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-04-28 21:56:36 UTC (rev 14851) @@ -71,14 +71,16 @@ PIRP Irp; IO_STATUS_BLOCK ioStatus; KEVENT event; + LARGE_INTEGER zero; NTSTATUS Status; KeInitializeEvent(&event, NotificationEvent, FALSE); + zero.QuadPart = 0; Irp = IoBuildSynchronousFsdRequest( IRP_MJ_READ, LowerDevice, Buffer, BufferSize, - 0, + &zero, &event, &ioStatus); if (!Irp) @@ -422,6 +424,10 @@ UNICODE_STRING CompatibleIds; NTSTATUS Status; + DPRINT("Serenum: SerenumDetectLegacyDevice(DeviceObject %p, LowerDevice %p)\n", + DeviceObject, + LowerDevice); + RtlZeroMemory(Buffer, sizeof(Buffer)); /* Reset UART */

1 0

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

28 Apr '05

Remove all hardcode string to En.rc from free.c, goto.c, if.c label.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/label.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-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 21:17:07 UTC (rev 14850) @@ -239,7 +239,42 @@ To user the FOR comamnd in a batch program, specify %%variable instead of\n \ %variable." +STRING_FREE_HELP1, "\n Volume in drive %s is %-11s Serial number is %s\n \ + %16s bytes total disk space\n \ + %16s bytes used\n \ + %16s bytes free\n" +STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]" + +STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n \ + IF [NOT] ERRORLEVEL number command\n \ + IF [NOT] string1==string2 command\n \ + IF [NOT] EXIST filename command\n \ + IF [NOT] DEFINED variable command\n\n \ +NOT Specifies that CMD should carry out the command only if\n \ + the condition is false\n \ +ERRORLEVEL number Specifies a true condition if the last program run returned\n \ + an exit code equal or greater than the number specified.\n \ +command Specifies the command to carry out if the condition is met.\n \ +string1==string2 Specifies a true condition if the specified text strings\n \ + match.\n \ +EXIST filename Specifies a true condition if the specified filename exists.\n \ +DEFINED variable Specifies a true condition if the specified variable is\n \ + defined." + +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n \ +GOTO label\n\n \ + label Specifies a text string used in a batch script as a label.\n\n \ +You type a label on a line by itself, beginning with a colon." + +STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]" + +STRING_LABEL_HELP2, "Volume in drive %c: is %s\n" +STRING_LABEL_HELP3, "Volume in drive %c: has no label\n" +STRING_LABEL_HELP4, "Volume Serial Number is %04X-%04X\n" +STRING_LABEL_HELP5, "Drive label (11 Characters, ENTER if none)? " + + STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" @@ -293,16 +328,17 @@ STRING_DEL_ERROR8, "No Wildcards!\n" STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2, "Syntax error" -STRING_FOR_ERROR1, "'in' missing in for statement." -STRING_FOR_ERROR2, "no brackets found." -STRING_FOR_ERROR3, "'do' missing." -STRING_FOR_ERROR4, "no command after 'do'." -STRING_FREE_ERROR1, "Invalid drive" -STRING_FREE_ERROR2, "unlabeled" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR4, "no command after 'do'." +STRING_FREE_ERROR1, "Invalid drive" +STRING_FREE_ERROR2, "unlabeled" +STRING_GOTO_ERROR1, "No label specified for GOTO" +STRING_GOTO_ERROR2, "Label '%s' not found\n" STRING_PARAM_ERROR, "Required parameter missing\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/free.c --- trunk/reactos/subsys/system/cmd/free.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/free.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -6,9 +6,13 @@ * * 01-Sep-1999 (Eric Kohl) * Started. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_FREE @@ -67,10 +71,14 @@ DWORD dwBytPerSec; DWORD dwFreeCl; DWORD dwTotCl; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':')) { - ConErrPrintf (_T("Invalid drive %s\n"), szDisk); + + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ((LPTSTR)szMsg); + return; } @@ -80,12 +88,17 @@ if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial, NULL, NULL, NULL, 0)) { - ConErrPrintf (_T("Invalid drive %s:\n"), szDrive); + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T("%s %s:\n"),(LPTSTR)szMsg, szDrive); return; } if (szVolume[0] == _T('\0')) - _tcscpy (szVolume, _T("unlabeled")); + { + + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); + _tcscpy (szVolume, (LPTSTR) szMsg); + } _stprintf (szSerial, _T("%04X-%04X"), @@ -95,7 +108,8 @@ if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl, &dwBytPerSec, &dwFreeCl, &dwTotCl)) { - ConErrPrintf (_T("Invalid drive %s:\n"), szDrive); + LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T("%s %s:\n"),(LPTSTR)szMsg, szDrive); return; } @@ -108,13 +122,9 @@ uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwFreeCl; ConvertULargeInteger (uliSize, szFree, 40); - ConOutPrintf (_T("\n" - " Volume in drive %s is %-11s Serial number is %s\n" - " %16s bytes total disk space\n" - " %16s bytes used\n" - " %16s bytes free\n"), - szDrive, szVolume, szSerial, - szTotal, szUsed, szFree); + + LoadString( GetModuleHandle(NULL), STRING_FREE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg,szDrive, szVolume, szSerial,szTotal, szUsed, szFree); } @@ -124,12 +134,13 @@ TCHAR szDefPath[MAX_PATH]; INT argc, i; LPTSTR *arg; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays drive information.\n" - "\n" - "FREE [drive: ...]")); + LoadString( GetModuleHandle(NULL), STRING_FREE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -21,9 +21,13 @@ * * 27-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Added help text ("/?"). + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" /* @@ -37,6 +41,7 @@ { LPTSTR tmp; LONG lNewPosHigh; + WCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_goto (\'%s\', \'%s\'\n"), cmd, param); @@ -44,13 +49,9 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Directs CMD to a labeled line in a batch script.\n" - "\n" - "GOTO label\n" - "\n" - " label Specifies a text string used in a batch script as a label.\n" - "\n" - "You type a label on a line by itself, beginning with a colon.")); + LoadString( GetModuleHandle(NULL), STRING_GOTO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } @@ -62,7 +63,9 @@ if (*param == _T('\0')) { - ExitBatch (_T("No label specified for GOTO\n")); + + LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ExitBatch ((LPTSTR)szMsg); return 1; } @@ -94,7 +97,8 @@ return 0; } - ConErrPrintf (_T("Label '%s' not found\n"), param); + LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf ((LPTSTR)szMsg,param); ExitBatch (NULL); return 1; _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/if.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -24,9 +24,14 @@ * * 17-Feb-2001 (ea) * IF DEFINED variable command + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc + * */ #include "precomp.h" +#include "resource.h" #define X_EXEC 1 @@ -36,6 +41,7 @@ { INT x_flag = 0; /* when set cause 'then' clause to be executed */ LPTSTR pp; + WCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_if: (\'%S\', \'%S\')\n"), cmd, param); @@ -43,23 +49,8 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Performs conditional processing in batch programs.\n" - "\n" - " IF [NOT] ERRORLEVEL number command\n" - " IF [NOT] string1==string2 command\n" - " IF [NOT] EXIST filename command\n" - " IF [NOT] DEFINED variable command\n" - "\n" - "NOT Specifies that CMD should carry out the command only if\n" - " the condition is false\n" - "ERRORLEVEL number Specifies a true condition if the last program run returned\n" - " an exit code equal or greater than the number specified.\n" - "command Specifies the command to carry out if the condition is met.\n" - "string1==string2 Specifies a true condition if the specified text strings\n" - " match.\n" - "EXIST filename Specifies a true condition if the specified filename exists.\n" - "DEFINED variable Specifies a true condition if the specified variable is\n" - " defined.")); + LoadString( GetModuleHandle(NULL), STRING_IF_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/label.c --- trunk/reactos/subsys/system/cmd/label.c 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/label.c 2005-04-28 21:17:07 UTC (rev 14850) @@ -12,9 +12,13 @@ * * 19-Jan-1998 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Unicode ready! + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_LABEL @@ -27,6 +31,7 @@ DWORD dwSerialNr; LPTSTR *arg; INT args; + WCHAR szMsg[RC_STRING_MAX_SIZE]; /* set empty label string */ szLabel[0] = _T('\0'); @@ -34,8 +39,9 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays or changes drive label.\n\n" - "LABEL [drive:][label]")); + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg); + return 0; } @@ -85,21 +91,29 @@ GetVolumeInformation (szRootPath, szOldLabel, 80, &dwSerialNr, NULL, NULL, NULL, 0); - /* print drive info */ - ConOutPrintf (_T("Volume in drive %c:"), _totupper (szRootPath[0])); - + /* print drive info */ if (szOldLabel[0] != _T('\0')) - ConOutPrintf (_T(" is %s\n"), szOldLabel); + { + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR) szMsg, _totupper (szRootPath[0]), szOldLabel); + } else - ConOutPrintf (_T(" has no label\n")); + { + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR) szMsg, _totupper (szRootPath[0])); + } + + /* print the volume serial number */ - ConOutPrintf (_T("Volume Serial Number is %04X-%04X\n"), - HIWORD(dwSerialNr), LOWORD(dwSerialNr)); + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); if (szLabel[0] == _T('\0')) { - ConOutPrintf (_T("Drive label (11 Characters, ENTER if none)? ")); + LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg); + ConInString (szLabel, 80); } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 20:26:06 UTC (rev 14849) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-28 21:17:07 UTC (rev 14850) @@ -59,7 +59,9 @@ #define STRING_FOR_ERROR4 337 #define STRING_FREE_ERROR1 338 #define STRING_FREE_ERROR2 339 -#define STRING_PARAM_ERROR 340 +#define STRING_GOTO_ERROR1 340 +#define STRING_GOTO_ERROR2 341 +#define STRING_PARAM_ERROR 342 #define STRING_ATTRIB_HELP 600 @@ -115,12 +117,27 @@ #define STRING_FOR_HELP1 646 -#define STRING_MKDIR_HELP 647 -#define STRING_RMDIR_HELP 648 -#define STRING_REM_HELP 649 +#define STRING_FREE_HELP1 647 +#define STRING_FREE_HELP2 648 +#define STRING_IF_HELP1 650 +#define STRING_GOTO_HELP1 651 +#define STRING_LABEL_HELP1 652 +#define STRING_LABEL_HELP2 653 +#define STRING_LABEL_HELP3 654 +#define STRING_LABEL_HELP4 655 +#define STRING_LABEL_HELP5 656 + +#define STRING_MKDIR_HELP 657 + +#define STRING_RMDIR_HELP 658 + +#define STRING_REM_HELP 659 + + +

1 0

[fireball] 14849: Fix (registry.c:325, dated 20050425) test failure. Description: Added RegOpenKeyA/W check for input param (if it's NULL pointer, returning error)
by fireball＠svn.reactos.com 28 Apr '05

28 Apr '05

Fix (registry.c:325, dated 20050425) test failure. Description: Added RegOpenKeyA/W check for input param (if it's NULL pointer, returning error) Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-04-28 20:00:37 UTC (rev 14848) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-04-28 20:26:06 UTC (rev 14849) @@ -1731,6 +1731,10 @@ NTSTATUS Status; DPRINT("RegOpenKeyA hKey 0x%x lpSubKey %s phkResult %p\n", hKey, lpSubKey, phkResult); + + // Check input params + if (phkResult == NULL) return ERROR_INVALID_PARAMETER; + Status = MapDefaultKey (&KeyHandle, hKey); if (!NT_SUCCESS(Status)) @@ -1782,6 +1786,10 @@ NTSTATUS Status; DPRINT("RegOpenKeyW hKey 0x%x lpSubKey %S phkResult %p\n", hKey, lpSubKey, phkResult); + + // Check input params + if (phkResult == NULL) return ERROR_INVALID_PARAMETER; + Status = MapDefaultKey (&KeyHandle, hKey); if (!NT_SUCCESS(Status))

1 0

[greatlrd] 14848: change _T((LPTSTR)szMsg)) to (LPTSTR)szMsg)
by greatlrd＠svn.reactos.com 28 Apr '05

28 Apr '05

change _T((LPTSTR)szMsg)) to (LPTSTR)szMsg) thanks royce3 he did see my small mistage Remove all hardcode string to En.rc from for.c Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.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-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-28 20:00:37 UTC (rev 14848) @@ -228,9 +228,18 @@ STRING_ECHO_HELP5, "ECHO is %s\n" - STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" +STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n \ +FOR %variable IN (set) DO command [parameters]\n\n \ + %variable Specifies a replaceable parameter.\n \ + (set) Specifies a set of one or more files. Wildcards may be used.\n \ + command Specifies the command to carry out for each file.\n \ + parameters Specifies parameters or switches for the specified command.\n\n \ +To user the FOR comamnd in a batch program, specify %%variable instead of\n \ +%variable." + + STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" @@ -240,6 +249,7 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" + @@ -283,6 +293,12 @@ STRING_DEL_ERROR8, "No Wildcards!\n" STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR2, "Syntax error" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR4, "no command after 'do'." +STRING_FREE_ERROR1, "Invalid drive" +STRING_FREE_ERROR2, "unlabeled" STRING_PARAM_ERROR, "Required parameter missing\n" _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -282,7 +282,7 @@ if ((int)(_tcslen (cmd) - len + m - n) > maxlen) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); /* the parser won't cause any problems with an empty line */ cmd[0] = _T('\0'); } @@ -311,7 +311,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -207,7 +207,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -233,7 +233,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -37,7 +37,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/call.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -53,7 +53,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -28,7 +28,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -39,7 +39,7 @@ { /* display active code page number */ LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), GetConsoleCP ()); + ConErrPrintf ((LPTSTR)szMsg, GetConsoleCP ()); return 0; } @@ -48,7 +48,7 @@ { /* too many parameters */ LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), param); + ConErrPrintf ((LPTSTR)szMsg, param); return 1; } @@ -62,7 +62,7 @@ if (uNewCodePage == 0) { LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), arg[0]); + ConErrPrintf ((LPTSTR)szMsg, arg[0]); freep (arg); return 1; } @@ -70,7 +70,7 @@ if (!SetConsoleCP (uNewCodePage)) { LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } else { _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -129,7 +129,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -172,7 +172,7 @@ { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); freep (arg); return 1; } @@ -203,7 +203,7 @@ if (*s != _T(',')) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); freep (arg); return 1; } @@ -215,7 +215,7 @@ else if (arg[i][0] == _T('/')) { LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), arg[i]); + ConErrPrintf ((LPTSTR)szMsg, arg[i]); freep (arg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -41,7 +41,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -635,14 +635,14 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), in); + ConErrPrintf ((LPTSTR)szMsg, in); return; } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), in); + ConErrPrintf ((LPTSTR)szMsg, in); return; } #ifdef _DEBUG @@ -668,7 +668,7 @@ if (hFile[1] == INVALID_HANDLE_VALUE){ LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return; } @@ -721,7 +721,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), out); + ConErrPrintf ((LPTSTR)szMsg, out); return; } @@ -729,7 +729,7 @@ if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), out); + ConErrPrintf ((LPTSTR)szMsg, out); return; } @@ -783,7 +783,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), err); + ConErrPrintf ((LPTSTR)szMsg, err); return; } @@ -791,7 +791,7 @@ if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), err); + ConErrPrintf ((LPTSTR)szMsg, err); return; } @@ -1080,32 +1080,32 @@ /* print command list */ LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg)); + ConOutPrintf ((LPTSTR)szMsg); PrintCommandList (); /* print feature list */ LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #ifdef FEATURE_ALIASES LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_HISTORY LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_UNIX_FILENAME_COMPLETION LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_DIRECTORY_STACK LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif #ifdef FEATURE_REDIRECTION LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); #endif ConOutChar (_T('\n')); } @@ -1155,7 +1155,7 @@ if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); ExitProcess (0); } SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); @@ -1260,7 +1260,7 @@ if (IsExistingFile (_T("commandline"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), commandline); + ConErrPrintf ((LPTSTR)szMsg, commandline); ParseCommandLine (commandline); } } @@ -1297,14 +1297,14 @@ if (IsExistingFile (_T("cmdexit.bat"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); ParseCommandLine (_T("cmdexit.bat")); } else if (IsExistingFile (_T("\\cmdexit.bat"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); ParseCommandLine (_T("\\cmdexit.bat")); } #ifndef __REACTOS__ @@ -1321,7 +1321,7 @@ if (IsExistingFile (_T("commandline"))) { LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), commandline); + ConErrPrintf ((LPTSTR)szMsg, commandline); ParseCommandLine (commandline); } } _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/color.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -31,7 +31,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); } @@ -46,7 +46,7 @@ if ((wColor & 0xF) == (wColor &0xF0) >> 4) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); } else { @@ -93,17 +93,17 @@ if (StringToColor (&wColor, &rest) == FALSE) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); return 1; } LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), wColor); + ConErrPrintf ((LPTSTR)szMsg, wColor); if ((wColor & 0xF) == (wColor &0xF0) >> 4) { LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), wColor); + ConErrPrintf ((LPTSTR)szMsg, wColor); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/console.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -234,7 +234,7 @@ else { LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } } _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -307,7 +307,7 @@ lpOptions = _T(Options); LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg)); + ConOutPrintf ((LPTSTR)szMsg); ConInString (inp, 10); ConOutPuts (_T("")); @@ -352,7 +352,7 @@ if (hFileSrc == INVALID_HANDLE_VALUE) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), source); + ConErrPrintf ((LPTSTR)szMsg, source); return 0; } @@ -380,7 +380,7 @@ if (!_tcscmp (dest, source)) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), source); + ConErrPrintf ((LPTSTR)szMsg, source); CloseHandle (hFileSrc); return 0; @@ -457,7 +457,7 @@ { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); free (buffer); CloseHandle (hFileDest); @@ -656,7 +656,7 @@ if (!_tcsncmp (rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 1; } @@ -729,7 +729,7 @@ else if (bDestFound && bWildcards) { LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); DeleteFileList (sources); freep (p); _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/date.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -54,17 +54,17 @@ case 0: /* mmddyy */ default: LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break; case 1: /* ddmmyy */ LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break; case 2: /* yymmdd */ LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); + ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); break; } } @@ -194,7 +194,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -248,7 +248,7 @@ return 0; } LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts (_T((LPTSTR)szMsg)); + ConErrPuts ((LPTSTR)szMsg); } _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/del.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -122,7 +122,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), + ConOutPrintf ((LPTSTR)szMsg, lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], @@ -232,7 +232,7 @@ /* wildcards in filespec */ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif GetFullPathName (arg[i], @@ -242,10 +242,10 @@ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), pFilePart); + ConErrPrintf ((LPTSTR)szMsg, pFilePart); #endif @@ -269,17 +269,17 @@ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif /* ask for deleting */ if (dwFlags & DEL_PROMPT) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN (_T((LPTSTR)szMsg)); + res = FilePromptYN ((LPTSTR)szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -290,7 +290,7 @@ if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); } /* delete the file */ @@ -335,7 +335,7 @@ /* no wildcards in filespec */ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); #endif GetFullPathName (arg[i], MAX_PATH, @@ -346,10 +346,10 @@ if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) //Don't ask if the file doesn't exist, the following code will make the error-msg { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN (_T((LPTSTR)szMsg)); + res = FilePromptYN ((LPTSTR)szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -359,12 +359,12 @@ #ifdef _DEBUG LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); #endif if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + ConErrPrintf ((LPTSTR)szMsg, szFullPath); } if (!(dwFlags & DEL_NOTHING)) @@ -424,7 +424,7 @@ LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); } - ConOutPrintf (_T((LPTSTR)szMsg), dwFiles); + ConOutPrintf ((LPTSTR)szMsg, dwFiles); } return 0; _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -24,7 +24,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -212,7 +212,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); } @@ -829,12 +829,12 @@ if (szVolName[0] != _T('\0')) { LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0], szVolName); + ConOutPrintf ((LPTSTR)szMsg, szRootName[0], szVolName); } else { LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0]); + ConOutPrintf ((LPTSTR)szMsg, szRootName[0]); } @@ -843,7 +843,7 @@ /* print the volume serial number if the return was successful */ LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), + ConOutPrintf ((LPTSTR)szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); @@ -1075,7 +1075,7 @@ ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),ulFiles, szBuffer); + ConOutPrintf ((LPTSTR)szMsg,ulFiles, szBuffer); } /* Print total directories and freespace */ @@ -1083,7 +1083,7 @@ GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),ulDirs, szBuffer); + ConOutPrintf ((LPTSTR)szMsg,ulDirs, szBuffer); return 0; } @@ -1729,7 +1729,7 @@ { ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg),dwCountFiles, szBytes); + ConOutPrintf ((LPTSTR)szMsg,dwCountFiles, szBytes); } /* Add statistics to recursive statistics*/ _____ Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -145,7 +145,7 @@ if (!_tcsncmp (rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -178,7 +178,7 @@ if (!_tcsncmp(rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -206,7 +206,7 @@ if (!_tcsncmp(rest, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -217,7 +217,7 @@ if (lpDir == NULL) { LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -42,7 +42,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -63,7 +63,7 @@ ConOutPuts (param); else { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (_T((LPTSTR)szMsg), bEcho ? D_ON : D_OFF); + ConOutPrintf ((LPTSTR)szMsg, bEcho ? D_ON : D_OFF); } } @@ -81,7 +81,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } @@ -104,7 +104,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } @@ -137,7 +137,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts(_T((LPTSTR)szMsg)); + ConOutPuts((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/error.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -72,7 +72,7 @@ else { LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), dwErrorCode); + ConErrPrintf ((LPTSTR)szMsg, dwErrorCode); return; } @@ -94,7 +94,7 @@ default: LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); return; } @@ -109,7 +109,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), ch); + ConErrPrintf ((LPTSTR)szMsg, ch); } @@ -117,7 +117,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), ch); + ConErrPrintf ((LPTSTR)szMsg, ch); } @@ -125,7 +125,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), s); + ConErrPrintf ((LPTSTR)szMsg, s); } @@ -133,7 +133,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -141,7 +141,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -157,7 +157,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -165,7 +165,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -173,7 +173,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -181,7 +181,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -189,7 +189,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg)); + ConErrPrintf ((LPTSTR)szMsg); } @@ -197,7 +197,7 @@ { WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf (_T((LPTSTR)szMsg), s); + ConErrPrintf ((LPTSTR)szMsg, s); } @@ -208,9 +208,9 @@ LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); if (s) - ConErrPrintf (_T("%s - %s\n"),_T((LPTSTR)szMsg), s); + ConErrPrintf (_T("%s - %s\n"),(LPTSTR)szMsg, s); else - ConErrPrintf (_T("%s.\n"), _T((LPTSTR)szMsg) ); + ConErrPrintf (_T("%s.\n"), (LPTSTR)szMsg ); } @@ -219,5 +219,5 @@ WCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts (_T((LPTSTR)szMsg)); + ConOutPuts ((LPTSTR)szMsg); } _____ Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-04-28 17:44:34 UTC (rev 14847) +++ trunk/reactos/subsys/system/cmd/for.c 2005-04-28 20:00:37 UTC (rev 14848) @@ -25,9 +25,13 @@ * 23-Feb-2001 (Carl Nettelblad <cnettel(a)hem.passagen.se>) * Implemented preservation of echo flag. Some other for related * code in other files fixed, too. + * + * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" /* @@ -49,6 +53,7 @@ LPBATCH_CONTEXT lpNew; LPTSTR pp; TCHAR var; + WCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param); @@ -56,17 +61,9 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Runs a specified command for each file in a set of files\n" - "\n" - "FOR %variable IN (set) DO command [parameters]\n" - "\n" - " %variable Specifies a replaceable parameter.\n" - " (set) Specifies a set of one or more files. Wildcards may be used.\n" - " command Specifies the command to carry out for each file.\n" - " parameters Specifies parameters or switches for the specified command.\n" - "\n" - "To user the FOR comamnd in a batch program, specify %%variable instead of\n" - "%variable.")); + LoadString( GetModuleHandle(NULL), STRING_FOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; } @@ -86,7 +83,8 @@ /* Check next element is 'IN' */ if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2))) { - error_syntax (_T("'in' missing in for statement.")); + LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + error_syntax ((LPTSTR)szMsg); return 1; [truncated at 1000 lines; 163 more skipped]

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