Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[ion] 14884: Add hack for ROS's weird behavior. Will investigate but this lets you boot for now
by ion＠svn.reactos.com 30 Apr '05

30 Apr '05

Add hack for ROS's weird behavior. Will investigate but this lets you boot for now Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-04-30 17:37:11 UTC (rev 14883) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-04-30 17:43:18 UTC (rev 14884) @@ -1288,7 +1288,10 @@ /* Dereference the Event if this is an ASYNC IRP */ if (!Irp->Flags & IRP_SYNCHRONOUS_API) { - ObDereferenceObject(Irp->UserEvent); + if (Irp->UserEvent != &FileObject->Event) + { + ObDereferenceObject(Irp->UserEvent); + } } /* If the File Object is SYNC, then we need to signal its event too */ @@ -1382,7 +1385,10 @@ /* Dereference the Event if it's an ASYNC IRP on a File Object */ if (Irp->UserEvent && !(Irp->Flags & IRP_SYNCHRONOUS_API) && FileObject) { - ObDereferenceObject(Irp->UserEvent); + if (Irp->UserEvent != &FileObject->Event) + { + ObDereferenceObject(Irp->UserEvent); + } } /* Dereference the File Object */

1 0

[hbirr] 14883: Set the readed size within the irp.
by hbirr＠svn.reactos.com 30 Apr '05

30 Apr '05

Set the readed size within the irp. Modified: trunk/reactos/drivers/input/keyboard/keyboard.c _____ Modified: trunk/reactos/drivers/input/keyboard/keyboard.c --- trunk/reactos/drivers/input/keyboard/keyboard.c 2005-04-30 17:30:05 UTC (rev 14882) +++ trunk/reactos/drivers/input/keyboard/keyboard.c 2005-04-30 17:37:11 UTC (rev 14883) @@ -457,7 +457,6 @@ DPRINT("KbdDpcRoutine(DeviceObject %x, Irp %x)\n", DeviceObject,Irp); Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; IoCompleteRequest(Irp,IO_NO_INCREMENT); IoStartNextPacket(DeviceObject,FALSE); } @@ -592,8 +591,9 @@ DPRINT("KeysRequired %d KeysRead %x\n",KeysRequired,KeysRead); if (KeysRead==KeysRequired) { - PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT) Context; + PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT) Context; KeInsertQueueDpc(&KbdDpc,DeviceObject,CurrentIrp); + CurrentIrp->IoStatus.Information = KeysRead * sizeof(KEY_EVENT_RECORD); CurrentIrp=NULL; } CHECKPOINT; @@ -721,6 +721,7 @@ } if ((stk->Parameters.Read.Length/sizeof(KEY_EVENT_RECORD))==NrToRead) { + Irp->IoStatus.Information = stk->Parameters.Read.Length; return(TRUE); } @@ -743,7 +744,6 @@ { KIRQL oldIrql; Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); oldIrql = KeGetCurrentIrql(); if (oldIrql < DISPATCH_LEVEL)

1 0

[ion] 14882: Remove debug message
by ion＠svn.reactos.com 30 Apr '05

30 Apr '05

Remove debug message Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-04-30 17:22:34 UTC (rev 14881) +++ trunk/reactos/ntoskrnl/io/file.c 2005-04-30 17:30:05 UTC (rev 14882) @@ -895,7 +895,7 @@ * immediately. */ Status = IofCallDriver(FileObject->DeviceObject, Irp ); - DPRINT1("Status :%x\n", Status); + DPRINT("Status :%x\n", Status); if (Status == STATUS_PENDING) {

1 0

[Phreak] 14881: Fixed another makefile with the wrong case in the xmlbuildsystem branch
by Phreak＠svn.reactos.com 30 Apr '05

30 Apr '05

Fixed another makefile with the wrong case in the xmlbuildsystem branch Added: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/makefile _____ Copied: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile (from rev 14880, branches/xmlbuildsystem/reactos/ntoskrnl/makefile) _____ Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/makefile --- branches/xmlbuildsystem/reactos/ntoskrnl/makefile 2005-04-30 17:15:58 UTC (rev 14880) +++ branches/xmlbuildsystem/reactos/ntoskrnl/makefile 2005-04-30 17:22:34 UTC (rev 14881) @@ -1,3 +0,0 @@ -TOP = .. -DEFAULT = ntoskrnl -include $(TOP)/proxy.mak \ No newline at end of file

1 0

[Phreak] 14880: makefile was spelled with a lower case in the xmlbuild branch,
by Phreak＠svn.reactos.com 30 Apr '05

30 Apr '05

makefile was spelled with a lower case in the xmlbuild branch, but with upper case M in the trunk. This was causing problems with svn switch on win32 due to the name conflict. Added: branches/xmlbuildsystem/reactos/tools/unicode/Makefile Deleted: branches/xmlbuildsystem/reactos/tools/unicode/makefile _____ Copied: branches/xmlbuildsystem/reactos/tools/unicode/Makefile (from rev 14879, branches/xmlbuildsystem/reactos/tools/unicode/makefile) _____ Deleted: branches/xmlbuildsystem/reactos/tools/unicode/makefile --- branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-04-30 16:37:06 UTC (rev 14879) +++ branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-04-30 17:15:58 UTC (rev 14880) @@ -1,3 +0,0 @@ -TOP = ../.. -DEFAULT = unicode -include $(TOP)/proxy.mak \ No newline at end of file

1 0

[Phreak] 14879: Fixed up a few missing includes that were preventing builds
by Phreak＠svn.reactos.com 30 Apr '05

30 Apr '05

Fixed up a few missing includes that were preventing builds Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.c Modified: branches/xmlbuildsystem/reactos/lib/netapi32/nbt.c _____ Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.c --- branches/xmlbuildsystem/reactos/lib/midimap/midimap.c 2005-04-30 16:21:06 UTC (rev 14878) +++ branches/xmlbuildsystem/reactos/lib/midimap/midimap.c 2005-04-30 16:37:06 UTC (rev 14879) @@ -23,6 +23,7 @@ * IDF file loading */ +#include <ctype.h> #include <stdarg.h> #include <string.h> #include <stdlib.h> _____ Modified: branches/xmlbuildsystem/reactos/lib/netapi32/nbt.c --- branches/xmlbuildsystem/reactos/lib/netapi32/nbt.c 2005-04-30 16:21:06 UTC (rev 14878) +++ branches/xmlbuildsystem/reactos/lib/netapi32/nbt.c 2005-04-30 16:37:06 UTC (rev 14879) @@ -65,6 +65,7 @@ * See also other FIXMEs in the code. */ +#include <ctype.h> #include "config.h" #include <stdarg.h>

1 0

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

30 Apr '05

Remove all hardcode string to En.rc Hopplyfull all hardcoing string are gone now in cmd Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/vol.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 15:46:59 UTC (rev 14877) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-30 16:21:06 UTC (rev 14878) @@ -461,6 +461,10 @@ STRING_VERSION_HELP6, "FreeDOS version written by:\n%s\nReactOS version written by:\n%s\n" +STRING_VOL_HELP1, " Volume in drive %c: is %s" +STRING_VOL_HELP2, " Volume in drive %c: has no label" +STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n" +STRING_VOL_HELP4, "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" STRING_WINDOW_HELP1, "change console window aspect\n\n \ WINDOW [/POS[=]left,top,width,heigth]\n \ @@ -480,6 +484,7 @@ RESTORE restore the window\n \ title new title" + STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 15:46:59 UTC (rev 14877) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-30 16:21:06 UTC (rev 14878) @@ -199,9 +199,14 @@ #define STRING_VERSION_HELP5 691 #define STRING_VERSION_HELP6 692 -#define STRING_WINDOW_HELP1 693 -#define STRING_WINDOW_HELP2 694 +#define STRING_VOL_HELP1 693 +#define STRING_VOL_HELP2 694 +#define STRING_VOL_HELP3 695 +#define STRING_VOL_HELP4 696 +#define STRING_WINDOW_HELP1 697 +#define STRING_WINDOW_HELP2 698 + #define STRING_FreeDOS_DEV 800 #define STRING_REACTOS_DEV 801 _____ Modified: trunk/reactos/subsys/system/cmd/vol.c --- trunk/reactos/subsys/system/cmd/vol.c 2005-04-30 15:46:59 UTC (rev 14877) +++ trunk/reactos/subsys/system/cmd/vol.c 2005-04-30 16:21:06 UTC (rev 14878) @@ -31,7 +31,9 @@ { TCHAR szVolName[80]; DWORD dwSerialNr; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + /* get the volume information of the drive */ if(!GetVolumeInformation (pszRootPath, szVolName, @@ -47,16 +49,27 @@ } /* print drive info */ - ConOutPrintf (_T(" Volume in drive %c:"), pszRootPath[0]); + + + if (szVolName[0] != '\0') - ConOutPrintf (_T(" is %s\n"), - szVolName); + { + LoadString( GetModuleHandle(NULL), STRING_VOL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, pszRootPath[0],szVolName); + } else - ConOutPrintf (_T(" has no label\n")); + { + LoadString( GetModuleHandle(NULL), STRING_VOL_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, pszRootPath[0]); + } + + + /* print the volume serial number */ - ConOutPrintf (_T(" Volume Serial Number is %04X-%04X\n"), + LoadString( GetModuleHandle(NULL), STRING_VOL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); return 0; @@ -67,11 +80,13 @@ { TCHAR szRootPath[] = _T("A:\\"); TCHAR szPath[MAX_PATH]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays the disk volume label and serial number, if they exist.\n\n" - "VOL [drive:]")); + LoadString( GetModuleHandle(NULL), STRING_VOL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); + return 0; }

1 0

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

30 Apr '05

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

1 0

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

30 Apr '05

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

1 0

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

30 Apr '05

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

1 0

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 April 2005