Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 15158: Fix a previous bug and fix NtReadFile: Read FileObject Status, Set Read Operation, support IRP_NOCACHE (ReactOS doesn't like this because of some other bug i'm investigating), use right event reqeuested access, add SEH
by ion＠svn.reactos.com 09 May '05

09 May '05

Fix a previous bug and fix NtReadFile: Read FileObject Status, Set Read Operation, support IRP_NOCACHE (ReactOS doesn't like this because of some other bug i'm investigating), use right event reqeuested access, add SEH Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 00:05:15 UTC (rev 15157) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 00:33:23 UTC (rev 15158) @@ -2058,7 +2058,7 @@ PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - BOOLEAN LocalEvent; + BOOLEAN LocalEvent = FALSE; PKEVENT Event = NULL; DPRINT("NtQueryDirectoryFile()\n"); @@ -2435,127 +2435,171 @@ IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ IN PULONG Key OPTIONAL) { - NTSTATUS Status; - PFILE_OBJECT FileObject; - PIRP Irp = NULL; - PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode; - PKEVENT EventObject = NULL; + NTSTATUS Status; + PFILE_OBJECT FileObject; + PIRP Irp = NULL; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + KPROCESSOR_MODE PreviousMode; + BOOLEAN LocalEvent = FALSE; + PKEVENT EventObject = NULL; - DPRINT("NtReadFile(FileHandle %x Buffer %x Length %x ByteOffset %x, " - "IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset, - IoStatusBlock); + DPRINT("NtReadFile(FileHandle %x Buffer %x Length %x ByteOffset %x, " + "IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset, + IoStatusBlock); + PAGED_CODE(); + + #if 0 + /* Validate User-Mode Buffers */ + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + ProbeForWrite(Buffer, + Length, + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - if (IoStatusBlock == NULL) - return STATUS_ACCESS_VIOLATION; + if(!NT_SUCCESS(Status)) return Status; + } + #endif - PreviousMode = ExGetPreviousMode(); + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + FILE_READ_DATA, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check the Byte Offset */ + if (!ByteOffset || + (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && + ByteOffset->u.HighPart == 0xffffffff)) + { + /* a valid ByteOffset is required if asynch. op. */ + if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) + { + DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } - Status = ObReferenceObjectByHandle(FileHandle, - FILE_READ_DATA, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } + /* Use the Current Byte OFfset */ + ByteOffset = &FileObject->CurrentByteOffset; + } - if (ByteOffset == NULL || - (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && - ByteOffset->u.HighPart == 0xffffffff)) - { - /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) + /* Check for event */ + if (Event) { - DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + /* Reference it */ + Status = ObReferenceObjectByHandle(Event, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&EventObject, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return Status; + } + KeClearEvent(EventObject); } - ByteOffset = &FileObject->CurrentByteOffset; - } + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + LocalEvent = TRUE; + } + + /* Create the IRP */ + _SEH_TRY + { + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + Buffer, + Length, + ByteOffset, + EventObject, + IoStatusBlock); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - if (Event != NULL) - { - Status = ObReferenceObjectByHandle(Event, - SYNCHRONIZE, - ExEventObjectType, - PreviousMode, - (PVOID*)&EventObject, - NULL); - if (!NT_SUCCESS(Status)) - { + /* Cleanup if IRP Allocation Failed */ + if (!NT_SUCCESS(Status) || !Irp) + { + if (Event) ObDereferenceObject(EventObject); ObDereferenceObject(FileObject); - return Status; - } + if (Irp) + { + IoFreeIrp(Irp); + } + return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; + } - KeClearEvent(EventObject); - } + /* Set up IRP Data */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; + Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; + Irp->Flags |= IRP_READ_OPERATION; + + /* FIXME: Somethign weird is going on when I enable this. */ + //if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) Irp->Flags |= IRP_NOCACHE; + + /* Setup Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->FileObject = FileObject; + StackPtr->Parameters.Read.Key = Key ? *Key : 0; + StackPtr->Parameters.Read.Length = Length; + StackPtr->Parameters.Read.ByteOffset = *ByteOffset; - _SEH_TRY - { - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - FileObject->DeviceObject, - Buffer, - Length, - ByteOffset, - EventObject, - IoStatusBlock); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status) || Irp == NULL) - { - if (Event) - { - ObDereferenceObject(&EventObject); - } - ObDereferenceObject(FileObject); - if (Irp) - { - IoFreeIrp(Irp); - } - return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; - } - - KeClearEvent(&FileObject->Event); - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - - Irp->RequestorMode = PreviousMode; - - Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; - Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = FileObject; - StackPtr->Parameters.Read.Key = Key ? *Key : 0; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - Status = KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - if (Status != STATUS_WAIT_0) + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) { - /* Wait failed. */ - return Status; + if (!LocalEvent) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } } - Status = IoStatusBlock->Status; - } - - return Status; + /* Return the Status */ + return Status; } /*

1 0

[greatlrd] 15157: Remove all hardcode string from format to En.rc
by greatlrd＠svn.reactos.com 09 May '05

09 May '05

Remove all hardcode string from format to En.rc so it can be translate Added: trunk/reactos/subsys/system/format/En.rc Modified: trunk/reactos/subsys/system/format/format.c Modified: trunk/reactos/subsys/system/format/format.rc Added: trunk/reactos/subsys/system/format/resource.h _____ Added: trunk/reactos/subsys/system/format/En.rc --- trunk/reactos/subsys/system/format/En.rc 2005-05-08 22:02:16 UTC (rev 15156) +++ trunk/reactos/subsys/system/format/En.rc 2005-05-09 00:05:15 UTC (rev 15157) @@ -0,0 +1,72 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +STRING_HELP, "Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ + [drive:] Specifies the drive to format.\n\ + -FS:file-system Specifies the type of file system (e.g. FAT).\n\ + -V:label Specifies volume label.\n\ + -Q Performs a quick format.\n\ + -A:size Overrides the default allocation unit size. Default settings\n\ + are strongly recommended for general use\n\ + NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS compression is not supported for allocation unit sizes\n\ + above 4096.\n\ + -C Files created on the new volume will be compressed by\n\ + default.\n\n" + +STRING_COMPLETE "%lu percent completed.\r" + +STRING_FORMAT_FAIL "FormatEx was unable to complete successfully.\n\n" + +STRING_NO_SUPPORT "Operation Not Supported" + +STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n" + +STRING_UNKNOW_ARG "Unknown argument: %S\n" + +STRING_DRIVE_PARM "Required drive parameter is missing.\n\n" + +STRING_ERROR_DRIVE_TYPE "Could not get drive type" + +STRING_INSERT_DISK "Insert a new floppy in drive %C:\nand press Enter when ready..." + +STRING_NO_VOLUME "Could not query volume" + +STRING_NO_VOLUME_SIZE "Could not query volume size" + +STRING_FILESYSTEM "The type of the file system is %S.\n" + +STRING_LABEL_NAME_EDIT "Enter current volume label for drive %C: " + +STRING_ERROR_LABEL "An incorrect volume label was entered for this drive.\n" + +STRING_YN_FORMAT "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\ +DRIVE %C: WILL BE LOST!\nProceed with Format (Y/N)? " + +STRING_YES_NO_FAQ "YN" + +STRING_VERIFYING "Verifying" + +STRING_FAST_FMT "QuickFormatting" + +STRING_CREATE_FSYS "Creating file system structures.\n" + +STRING_FMT_COMPLETE "Format complete.\n" + +STRING_VOL_COMPRESS "Volume does not support compression.\n" + +STRING_ENTER_LABEL "Volume Label (11 characters, Enter for none)? " + +STRING_NO_LABEL "Could not label volume" + +STRING_FREE_SPACE "\n%I64d bytes total disk space.\n%I64d bytes available on disk.\n" + +STRING_SERIAL_NUMBER "\nVolume Serial Number is %04X-%04X\n" +} Property changes on: trunk/reactos/subsys/system/format/En.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/format/format.c --- trunk/reactos/subsys/system/format/format.c 2005-05-08 22:02:16 UTC (rev 15156) +++ trunk/reactos/subsys/system/format/format.c 2005-05-09 00:05:15 UTC (rev 15157) @@ -9,6 +9,7 @@ #include <ntos.h> #include <fmifs.h> #include <tchar.h> +#include "resource.h" // Globals BOOL Error = FALSE; @@ -78,20 +79,9 @@ //---------------------------------------------------------------------- static VOID Usage( LPTSTR ProgramName ) { - _tprintf(_T("Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n"), ProgramName); - _tprintf(_T(" [drive:] Specifies the drive to format.\n")); - _tprintf(_T(" -FS:file-system Specifies the type of file system (e.g. FAT).\n")); - _tprintf(_T(" -V:label Specifies volume label.\n")); - _tprintf(_T(" -Q Performs a quick format.\n")); - _tprintf(_T(" -A:size Overrides the default allocation unit size. Default settings\n")); - _tprintf(_T(" are strongly recommended for general use\n")); - _tprintf(_T(" NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n")); - _tprintf(_T(" FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n")); - _tprintf(_T(" NTFS compression is not supported for allocation unit sizes\n")); - _tprintf(_T(" above 4096.\n")); - _tprintf(_T(" -C Files created on the new volume will be compressed by\n")); - _tprintf(_T(" default.\n")); - _tprintf(_T("\n")); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, ProgramName); } @@ -187,6 +177,7 @@ PDWORD percent; PTEXTOUTPUT output; PBOOLEAN status; + TCHAR szMsg[RC_STRING_MAX_SIZE]; // // We get other types of commands, but we don't have to pay attention to them @@ -195,7 +186,8 @@ case PROGRESS: percent = (PDWORD) Argument; - _tprintf(_T("%lu percent completed.\r"), *percent); + LoadString( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, *percent); break; case OUTPUT: @@ -207,7 +199,8 @@ status = (PBOOLEAN) Argument; if( *status == FALSE ) { - _tprintf(_T("FormatEx was unable to complete successfully.\n\n")); + LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); Error = TRUE; } break; @@ -224,7 +217,8 @@ case UNKNOWNC: case UNKNOWND: case STRUCTUREPROGRESS: - _tprintf(_T("Operation Not Supported")); + LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); return FALSE; } return TRUE; @@ -281,13 +275,15 @@ #ifndef UNICODE WCHAR RootDirectoryW[MAX_PATH], FormatW[MAX_PATH], LabelW[MAX_PATH]; #endif + TCHAR szMsg[RC_STRING_MAX_SIZE]; // // Get function pointers // if( !LoadFMIFSEntryPoints()) { - - _tprintf(_T("Could not located FMIFS entry points.\n\n")); + + LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); return -1; } @@ -296,7 +292,8 @@ // if( (badArg = ParseCommandLine( argc, argv ))) { - _tprintf(_T("Unknown argument: %S\n"), argv[badArg] ); + LoadString( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, argv[badArg] ); Usage(argv[0]); return -1; @@ -307,7 +304,8 @@ // if( !Drive ) { - _tprintf(_T("Required drive parameter is missing.\n\n")); + LoadString( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); Usage( argv[0] ); return -1; @@ -324,13 +322,14 @@ driveType = GetDriveType( RootDirectory ); if( driveType == 0 ) { - PrintWin32Error( _T("Could not get drive type"), GetLastError()); + LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); return -1; } if( driveType != DRIVE_FIXED ) { - _tprintf(_T("Insert a new floppy in drive %C:\nand press Enter when ready..."), - RootDirectory[0] ); + LoadString( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, RootDirectory[0] ); _fgetts( input, sizeof(input)/2, stdin ); media = FMIFS_FLOPPY; @@ -344,7 +343,8 @@ &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - PrintWin32Error( _T("Could not query volume"), GetLastError()); + LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); return -1; } @@ -353,10 +353,12 @@ &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - PrintWin32Error( _T("Could not query volume size"), GetLastError()); + LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); return -1; } - _tprintf(_T("The type of the file system is %S.\n"), fileSystem ); + LoadString( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, fileSystem ); // // Make sure they want to do this @@ -367,7 +369,8 @@ while(1 ) { - _tprintf(_T("Enter current volume label for drive %C: "), RootDirectory[0] ); + LoadString( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, RootDirectory[0] ); _fgetts( input, sizeof(input)/2, stdin ); input[ _tcslen( input ) - 1] = 0; @@ -375,20 +378,22 @@ break; } - _tprintf(_T("An incorrect volume label was entered for this drive.\n")); + LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); } } while( 1 ) { - _tprintf(_T("\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n")); - _tprintf(_T("DRIVE %C: WILL BE LOST!\n"), RootDirectory[0] ); - _tprintf(_T("Proceed with Format (Y/N)? " )); - _fgetts( input, sizeof(input)/2, stdin ); + LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, RootDirectory[0] ); - if( input[0] == _T('Y') || input[0] == _T('y') ) break; + + LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + + if( _strnicmp(&input[0],&szMsg[0],1)) break; - if( input[0] == _T('N') || input[0] == _T('n') ) { + if( _strnicmp(&input[0],&szMsg[1],1) ) { _tprintf(_T("\n")); return 0; @@ -402,27 +407,31 @@ // if( !QuickFormat ) { + LoadString( GetModuleHandle(NULL), STRING_VERIFYING, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - _tprintf(_T("Verifying %luM\n"), (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - _tprintf(_T("Verifying %.1fM\n"), + _tprintf(_T("%s %.1fM\n"),szMsg, ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } } else { + LoadString( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - _tprintf(_T("QuickFormatting %luM\n"), (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - _tprintf(_T("QuickFormatting %.2fM\n"), + _tprintf(_T("%s %.2fM\n"),szMsg, ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } - _tprintf(_T("Creating file system structures.\n")); + LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); } // @@ -439,7 +448,8 @@ ClusterSize, FormatExCallback ); #endif if( Error ) return -1; - _tprintf(_T("Format complete.\n")); + LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); // // Enable compression if desired @@ -453,7 +463,8 @@ if( !EnableVolumeCompression( RootDirectory, TRUE )) { #endif - _tprintf(_T("Volume does not support compression.\n")); + LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); } } @@ -462,13 +473,15 @@ // if( !GotALabel ) { - _tprintf(_T("Volume Label (11 characters, Enter for none)? " )); + LoadString( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg); _fgetts( input, sizeof(LabelString)/2, stdin ); input[ _tcslen(input)-1] = 0; if( !SetVolumeLabel( RootDirectory, input )) { - PrintWin32Error(_T("Could not label volume"), GetLastError()); + LoadString( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error(szMsg, GetLastError()); return -1; } } @@ -478,7 +491,8 @@ &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - PrintWin32Error( _T("Could not query volume"), GetLastError()); + LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); return -1; } @@ -489,13 +503,14 @@ &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - - PrintWin32Error( _T("Could not query volume size"), GetLastError()); + + LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error(szMsg, GetLastError()); return -1; } - _tprintf(_T("\n%I64d bytes total disk space.\n"), totalNumberOfBytes.QuadPart ); - _tprintf(_T("%I64d bytes available on disk.\n"), totalNumberOfFreeBytes.QuadPart ); + LoadString( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); // // Get the drive's serial number @@ -505,10 +520,12 @@ &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - PrintWin32Error( _T("Could not query volume"), GetLastError()); + LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); return -1; } - _tprintf(_T("\nVolume Serial Number is %04X-%04X\n"), (unsigned int)(serialNumber >> 16), + LoadString( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, (unsigned int)(serialNumber >> 16), (unsigned int)(serialNumber & 0xFFFF) ); return 0; _____ Modified: trunk/reactos/subsys/system/format/format.rc --- trunk/reactos/subsys/system/format/format.rc 2005-05-08 22:02:16 UTC (rev 15156) +++ trunk/reactos/subsys/system/format/format.rc 2005-05-09 00:05:15 UTC (rev 15157) @@ -5,3 +5,5 @@ #define REACTOS_STR_ORIGINAL_FILENAME "format.exe\0" #include <reactos/version.rc> +#include "En.rc" + _____ Added: trunk/reactos/subsys/system/format/resource.h --- trunk/reactos/subsys/system/format/resource.h 2005-05-08 22:02:16 UTC (rev 15156) +++ trunk/reactos/subsys/system/format/resource.h 2005-05-09 00:05:15 UTC (rev 15157) @@ -0,0 +1,31 @@ + + +#define RC_STRING_MAX_SIZE 4096 + +#define STRING_HELP 100 +#define STRING_COMPLETE 101 +#define STRING_FORMAT_FAIL 102 +#define STRING_NO_SUPPORT 103 +#define STRING_FMIFS_FAIL 104 +#define STRING_UNKNOW_ARG 105 +#define STRING_DRIVE_PARM 106 +#define STRING_ERROR_DRIVE_TYPE 107 +#define STRING_INSERT_DISK 108 +#define STRING_NO_VOLUME 109 +#define STRING_NO_VOLUME_SIZE 110 +#define STRING_FILESYSTEM 111 +#define STRING_LABEL_NAME_EDIT 112 +#define STRING_ERROR_LABEL 113 +#define STRING_YN_FORMAT 114 +#define STRING_YES_NO_FAQ 115 +#define STRING_VERIFYING 116 +#define STRING_FAST_FMT 117 +#define STRING_CREATE_FSYS 118 +#define STRING_FMT_COMPLETE 119 +#define STRING_VOL_COMPRESS 120 +#define STRING_ENTER_LABEL 121 +#define STRING_NO_LABEL 122 +#define STRING_FREE_SPACE 123 +#define STRING_SERIAL_NUMBER 124 + +/* EOF */ Property changes on: trunk/reactos/subsys/system/format/resource.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

1 0

[greatlrd] 15156: Udate french langues and make it unicode
by greatlrd＠svn.reactos.com 08 May '05

08 May '05

Udate french langues and make it unicode by Usurp Set eol-style on resurce.h Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/Fr.rc Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 21:55:28 UTC (rev 15155) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 22:02:16 UTC (rev 15156) @@ -1,572 +1,572 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE -{ - -STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n\ -ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ - [/S [/D]]\n\n\ - + Sets an attribute\n\ - - Clears an attribute\n\ - R Read-only file attribute\n\ - A Archive file attribute\n\ - S System file attribute\n\ - H Hidden file attribute\n\ - /S Processes matching files in the current directory\n\ - and all subdirectories\n\ - /D Processes directories as well\n\n\ -Type ATTRIB without a parameter to display the attributes of all files." - -STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ -ALIAS [alias=[command]]\n\n\ - alias Name for an alias.\n\ - command Text to be substituted for an alias.\n\n\ -To list all aliases:\n\ - ALIAS\n\n\ -To set a new or replace an existing alias:\n\ - ALIAS da=dir a:\n\n\ -To remove an alias from the alias list:\n\ - ALIAS da=" - -STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP" - -STRING_CALL_HELP, "Calls one batch program from another.\n\n\ -CALL [drive:][path]filename [batch-parameter]\n\n\ - batch-parameter Specifies any command-line information required by the\n\ - batch program." - -STRING_CD_HELP, "Changes the current directory or displays it's name\n\n\ -CHDIR [drive:][path]\n\ -CHDIR[..|-]\n\ -CD [drive:][path]\n\ -CD[..|-]\n\n\ - .. parent directory\n\ - - previous directory\n\n\ -Type CD drive: to display the current directory on the specified drive.\n\ -Type CD without a parameter to display the current drive and directory." - -STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n\ -CHCP [nnn]\n\n\ - nnn Specifies the active code page number.\n\n\ -Type CHCP without a parameter to display the active code page number." - -STRING_CHOICE_HELP, "Waits for the user to choose one of a set of choices.\n\n\ -CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ - /C[:]choices Specifies allowable keys. Default is YN.\n\ - /N Do not display choices and ? at the end of the prompt string.\n\ - /S Treat choice keys as case sensitive.\n\ - /T[:]c,nn Default choice to c after nn seconds.\n\ - text Prompt string to display.\n\n\ -ERRORLEVEL is set to offset of key user presses in choices." - -STRING_CLS_HELP, "Clears the screen.\n\nCLS" - -STRING_CMD_HELP1, "\nInternal commands available:\n" - -STRING_CMD_HELP2, "\nFeatures available:" - -STRING_CMD_HELP3," [aliases]" - -STRING_CMD_HELP4," [history]" - -STRING_CMD_HELP5," [unix filename completion]" - -STRING_CMD_HELP6," [directory stack]" - -STRING_CMD_HELP7," [redirections and piping]" - -STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line interpreter.\n\n\ -CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ - /C command Runs the specified command and terminates.\n\ - /K command Runs the specified command and remains.\n\ - /P CMD becomes permanent and runs autoexec.bat\n\ - (cannot be terminated).\n\ - /T:bf Sets the background/foreground color (see COLOR command)." - -STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/F]] \n\n\ - attr Specifies color attribute of console output\n\ - /F fill the console with color attribute\n\n\ -There are three ways to specify the colors:\n\ -1) [bright] name on [bright] name (only the first three letters are required)\n\ -2) decimal on decimal\n\ -3) two hex digits\n\n\ -Colors are:\n\ -dec hex name dec hex name\n\ -0 0 Black 8 8 Gray(Bright black)\n\ -1 1 Blue 9 9 Bright Blue\n\ -2 2 Green 10 A Bright Green\n\ -3 3 Cyan 11 B Bright Cyan\n\ -4 4 Red 12 C Bright Red\n\ -5 5 Magenta 13 D Bright Magenta\n\ -6 6 Yellow 14 E Bright Yellow\n\ -7 7 White 15 F Bright White" - -STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? " - -STRING_COPY_HELP2, "Copies one or more files to another location.\n\n\ -COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\ - [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ - source Specifies the file or files to be copied.\n\ - /A Indicates an ASCII text file.\n\ - /B Indicates a binary file.\n\ - destination Specifies the directory and/or filename for the new file(s).\n\ - /V Verifies that new files are written correctly.\n\ - /Y Suppresses prompting to confirm you want to overwrite an\n\ - existing destination file.\n\ - /-Y Causes prompting to confirm you want to overwrite an\n\ - existing destination file.\n\n\ -The switch /Y may be present in the COPYCMD environment variable.\n\ -..." - -STRING_DATE_HELP1, "\nEnter new date (mm%cdd%cyyyy): " - -STRING_DATE_HELP2, "\nEnter new date (dd%cmm%cyyyy): " - -STRING_DATE_HELP3, "\nEnter new date (yyyy%cmm%cdd): " - -STRING_DATE_HELP4, "Displays or sets the date.\n\n\ -DATE [/T][date]\n\n\ - /T display only\n\n\ -Type DATE without parameters to display the current date setting and\n\ -a prompt for a new one. Press ENTER to keep the same date." - -STRING_DEL_HELP1, "Deletes one or more files.\n\n\ -DEL [/N /P /T /Q /W /Y /Z] file ...\n\ -DELETE [/N /P /T /Q /W /Y /Z] file ...\n\ -ERASE [/N /P /T /Q /W /Y /Z] file ...\n\n\ - file Specifies the file(s) to delete.\n\n\ - /N Nothing.\n\ - /P Prompt. Ask before deleting each file.\n\ - /T Total. Display total number of deleted files and freed disk space.\n\ - /Q Quiet.\n\ - /W Wipe. Overwrite the file with random numbers before deleting it.\n\ - /Y Yes. Kill even *.* without asking.\n\ - /Z Zap. Delete hidden, read-only and system files.\n" - -STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" -STRING_DEL_HELP3, " %lu file deleted\n" -STRING_DEL_HELP4, " %lu files deleted\n" - -STRING_DELAY_HELP, "pause for n seconds or milliseconds\n\ -DELAY [/m]n\n\n\ - /m specifiy than n are milliseconds\n\ - otherwise n are seconds" - -STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ - [drive:][path][filename]\n\ - Specifies drive, directory, and/or files to list.\n\n\ - /A Displays files with specified attributes.\n\ - attributes D Directories R Read-only files\n\ - H Hidden files A Files ready for archiving\n\ - S System files - Prefix meaning not\n\ - /B Uses bare format (no heading information or summary).\n\ - /C Display the thousand separator in file sizes. This is the\n\ - default. Use /-C to disable display of separator.\n\ - /D Same as wide but files are list sorted by column.\n\ - /L Uses lowercase.\n\ - /N New long list format where filenames are on the far right.\n\ - /O List by files in sorted order.\n\ - sortorder N By name (alphabetic) S By size (smallest first)\n\ - E By extension (alphabetic) D By date/time (oldest first)\n\ - G Group directories first - Prefix to reverse order\n\ - /P Pauses after each screenful of information.\n\ - /Q Display the owner of the file.\n\ - /S Displays files in specified directory and all subdirectories.\n\ - /T Controls which time field displayed or used for sorting\n\ - timefield C Creation\n\ - A Last Access\n\ - W Last Written\n\ - /W Uses wide list format.\n\ - /X This displays the short names generated for non-8dot3 file\n\ - names. The format is that of /N with the short name inserted\n\ - before the long name. If no short name is present, blanks are\n\ - displayed in its place.\n\ - /4 Displays four-digit years\n\n\ -Switches may be preset in the DIRCMD environment variable. Override\n\ -preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" - -STRING_DIR_HELP2, " Volume in drive %c is %s" -STRING_DIR_HELP3, " Volume in drive %c has no label" -STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" -STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" -STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" -STRING_DIR_HELP7, "\n Directory of %s\n\n" -STRING_DIR_HELP8, "%16i Dir(s)% 14s bytes\n" - -STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ -changes to the specified directory.\n\n\ -PUSHD [path | ..]\n\n\ - path Specifies the directory to make the current directory" - -STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" - -STRING_DIRSTACK_HELP3, "Prints the contents of the directory stack.\n\nDIRS" - -STRING_DIRSTACK_HELP4, "Directory stack empty" - -STRING_ECHO_HELP1, "Display a messages without trailing carridge return and line feed.\n\n\ - ECHOS message" - -STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n\ - ECHOERR message\n\ - ECHOERR. prints an empty line" - -STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carridge return and line feed.\n\n\ - ECHOSERR message" - -STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n\ - ECHO [ON | OFF]\n\ - ECHO [message]\n\ - ECHO. prints an empty line\n\n\ -Type ECHO without a parameter to display the current ECHO setting." - -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 use the FOR comamnd in a batch program, specify %%variable instead of\n\ -%variable." - -STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\ - 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_LOCALE_HELP1, "Current time is" - -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_MISC_HELP1, "Press a key to continue...\n" - -STRING_MOVE_HELP1, "Overwrite %s (Yes/No/All)? " - -STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n\ -To move one or more files:\n\ -MOVE [/N][drive:][path]filename1[,...] destination\n\n\ -To rename a directory:\n\ -MOVE [/N][drive:][path]dirname1 dirname2\n\n\ - [drive:][path]filename1 Specifies the location and name of the file\n\ - or files you want to move.\n\ - /N Nothing. Do everything but move files or directories.\n\n\ -Current limitations:\n\ - - You can't move a file or directory from one drive to another.\n" - -STRING_MSGBOX_HELP, "display a message box and return user responce\n\n\ -MSGBOX type ['title'] prompt\n\n\ -type button displayed\n\ - possible values are: OK, OKCANCEL,\n\ - YESNO, YESNOCANCEL\n\ -title title of message box\n\ -prompt text displayed by the message box\n\n\n\ -ERRORLEVEL is set according the button pressed:\n\n\ -YES : 10 | NO : 11\n\ -OK : 10 | CANCEL : 12\n" - -STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n\ -PATH [[drive:]path[;...]]\nPATH ;\n\n\ -Type PATH ; to clear all search-path settings and direct the command shell\n\ -to search only in the current directory.\n\ -Type PATH without parameters to display the current path.\n" - -STRING_PROMPT_HELP1, "Changes the command prompt.\n\n\ -PROMPT [text]\n\n\ - text Specifies a new command prompt.\n\n\ -Prompt can be made up of normal characters and the following special codes:\n\n\ - $A & (Ampersand)\n\ - $B | (pipe)\n\ - $C ( (Left parenthesis)\n\ - $D Current date\n\ - $E Escape code (ASCII code 27)\n\ - $F ) (Right parenthesis)\n\ - $G > (greater-than sign)\n\ - $H Backspace (erases previous character)\n\ - $L < (less-than sign)\n\ - $N Current drive\n\ - $P Current drive and path\n\ - $Q = (equal sign)\n\ - $T Current time\n\ - $V OS version number\n\ - $_ Carriage return and linefeed\n\ - $$ $ (dollar sign)" - -STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ -'Press any key to continue...' or a user defined message.\n\n\ -PAUSE [message]" - -STRING_PROMPT_HELP2, " $+ Displays the current depth of the directory stack" - -STRING_PROMPT_HELP3, "\nType PROMPT without parameters to reset the prompt to the default setting." - -STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" - -STRING_RMDIR_HELP, "Removes a directory.\n\n\ -RMDIR [drive:]path\nRD [drive:]path" - -STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ -RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ -REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ - /E No eror messages.\n\ - /N Nothing.\n\ - /P Prompts for confirmation before renaming each file.\n\ - (Not implemented yet!)\n\ - /Q Quiet.\n\ - /S Rename subdirectories.\n\ - /T Display total number of renamed files.\n\n\ -Note that you cannot specify a new drive or path for your destination. Use\n\ -the MOVE command for that purpose." - -STRING_REN_HELP2, " %lu file renamed\n" - -STRING_REN_HELP3, " %lu files renamed\n" - -STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ -SHIFT [DOWN]" - -STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ -SCREEN row col [text]\n\n\ - row row to wich move the cursor\n\ - col column to wich move the cursor" - -STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ -SET [variable[=][string]]\n\n\ - variable Specifies the environment-variable name.\n\ - string Specifies a series of characters to assign to the variable.\n\n\ -Type SET without parameters to display the current environment variables.\n" - -STRING_START_HELP1, "Starts a command.\n\n\ -START command\n\n\ - command Specifies the command to run.\n\n\ -At the moment all commands are started asynchronously.\n" - -STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ -TITLE [string]\n\n\ -string Specifies the title for the command prompt window." - -STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ -TIME [/T][time]\n\n\ - /T display only\n\n\ -Type TIME with no parameters to display the current time setting and a prompt\n\ -for a new one. Press ENTER to keep the same time." - -STRING_TIME_HELP2, "Enter new time: " - -STRING_TIMER_HELP1, "Elapsed %d msecs\n" - -STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n" - -STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n\ -TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ - ON set stopwach ON\n\ - OFF set stopwach OFF\n\ - /S Split time. Return stopwatch split\n\ - time without changing its value\n\ - /n Specifiy the stopwach number.\n\ - Stopwaches avaliable are 0 to 10\n\ - If it is not specified default is 1\n\ - /Fn Format for output\n\ - n can be:\n\ - 0 milliseconds\n\ - 1 hh%cmm%css%cdd\n\n\ -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, "\nFreeDOS version written by:\n" - -STRING_VERSION_HELP7, "\nReactOS version written by:\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\ - [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\ -ACTIVATE '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" - - -STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" -STRING_BATCH_ERROR, "Error opening batch file\n" -STRING_CHCP_ERROR1, "Active code page: %u\n" -STRING_CHCP_ERROR2, "Invalid parameter format - %s\n" -STRING_CHCP_ERROR3, "Parameter format incorrect - %s\n" -STRING_CHCP_ERROR4, "Invalid code page\n" -STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" -STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" -STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" -STRING_CMD_ERROR1, "Can't redirect input from file %s\n" -STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n" -STRING_CMD_ERROR3, "Can't redirect to file %s\n" -STRING_CMD_ERROR4, "Running %s...\n" -STRING_CMD_ERROR5, "Running cmdexit.bat...\n" -STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" -STRING_COLOR_ERROR2, "error in color specification" -STRING_COLOR_ERROR3, "Color %x\n" -STRING_COLOR_ERROR4, "same colors error!" -STRING_CONSOLE_ERROR, "Unknown error: %d\n" -STRING_COPY_ERROR1, "Error: Cannot open source - %s!\n" -STRING_COPY_ERROR2, "Error: Can't copy onto itself!\n" -STRING_COPY_ERROR3, "Error writing destination!\n" -STRING_COPY_ERROR4, "Error: Not implemented yet!\n" -STRING_DATE_ERROR, "Invalid date." -STRING_DEL_ERROR5, "The file %s will be deleted! " -STRING_DEL_ERROR6, "Are you sure (Y/N)?" -STRING_DEL_ERROR7, "Deleting: %s\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_GOTO_ERROR1, "No label specified for GOTO" -STRING_GOTO_ERROR2, "Label '%s' not found\n" - -STRING_MOVE_ERROR1, "[OK]\n" -STRING_MOVE_ERROR2, "[Error]\n" - -STRING_REN_ERROR1, "MoveFile() failed. Error: %lu\n" - -STRING_START_ERROR1, "No batch support at the moment!" - -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" -STRING_ERROR_PATH_NOT_FOUND, "Path not found\n" -STRING_ERROR_FILE_NOT_FOUND, "File not found\n" -STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" -STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" -STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Bad command or filename\n" -STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" -STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" -STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." -STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" - -STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" - -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" -STRING_VERSION_RUNVER, " running on %s" -STRING_COPY_FILE , " %d file(s) copied\n" -STRING_DELETE_WIPE, "wiped" -STRING_FOR_ERROR, "bad variable specification." -STRING_SCREEN_COL, "invalid value for col" -STRING_SCREEN_ROW, "invalid value for row" -STRING_TIMER_TIME "Timer %d is %s: " -} +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ + [/S [/D]]\n\n\ + + Sets an attribute\n\ + - Clears an attribute\n\ + R Read-only file attribute\n\ + A Archive file attribute\n\ + S System file attribute\n\ + H Hidden file attribute\n\ + /S Processes matching files in the current directory\n\ + and all subdirectories\n\ + /D Processes directories as well\n\n\ +Type ATTRIB without a parameter to display the attributes of all files." + +STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ +ALIAS [alias=[command]]\n\n\ + alias Name for an alias.\n\ + command Text to be substituted for an alias.\n\n\ +To list all aliases:\n\ + ALIAS\n\n\ +To set a new or replace an existing alias:\n\ + ALIAS da=dir a:\n\n\ +To remove an alias from the alias list:\n\ + ALIAS da=" + +STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP" + +STRING_CALL_HELP, "Calls one batch program from another.\n\n\ +CALL [drive:][path]filename [batch-parameter]\n\n\ + batch-parameter Specifies any command-line information required by the\n\ + batch program." + +STRING_CD_HELP, "Changes the current directory or displays it's name\n\n\ +CHDIR [drive:][path]\n\ +CHDIR[..|-]\n\ +CD [drive:][path]\n\ +CD[..|-]\n\n\ + .. parent directory\n\ + - previous directory\n\n\ +Type CD drive: to display the current directory on the specified drive.\n\ +Type CD without a parameter to display the current drive and directory." + +STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n\ +CHCP [nnn]\n\n\ + nnn Specifies the active code page number.\n\n\ +Type CHCP without a parameter to display the active code page number." + +STRING_CHOICE_HELP, "Waits for the user to choose one of a set of choices.\n\n\ +CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ + /C[:]choices Specifies allowable keys. Default is YN.\n\ + /N Do not display choices and ? at the end of the prompt string.\n\ + /S Treat choice keys as case sensitive.\n\ + /T[:]c,nn Default choice to c after nn seconds.\n\ + text Prompt string to display.\n\n\ +ERRORLEVEL is set to offset of key user presses in choices." + +STRING_CLS_HELP, "Clears the screen.\n\nCLS" + +STRING_CMD_HELP1, "\nInternal commands available:\n" + +STRING_CMD_HELP2, "\nFeatures available:" + +STRING_CMD_HELP3," [aliases]" + +STRING_CMD_HELP4," [history]" + +STRING_CMD_HELP5," [unix filename completion]" + +STRING_CMD_HELP6," [directory stack]" + +STRING_CMD_HELP7," [redirections and piping]" + +STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line interpreter.\n\n\ +CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ + /C command Runs the specified command and terminates.\n\ + /K command Runs the specified command and remains.\n\ + /P CMD becomes permanent and runs autoexec.bat\n\ + (cannot be terminated).\n\ + /T:bf Sets the background/foreground color (see COLOR command)." + +STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n\ +COLOR [attr [/F]] \n\n\ + attr Specifies color attribute of console output\n\ + /F fill the console with color attribute\n\n\ +There are three ways to specify the colors:\n\ +1) [bright] name on [bright] name (only the first three letters are required)\n\ +2) decimal on decimal\n\ +3) two hex digits\n\n\ +Colors are:\n\ +dec hex name dec hex name\n\ +0 0 Black 8 8 Gray(Bright black)\n\ +1 1 Blue 9 9 Bright Blue\n\ +2 2 Green 10 A Bright Green\n\ +3 3 Cyan 11 B Bright Cyan\n\ +4 4 Red 12 C Bright Red\n\ +5 5 Magenta 13 D Bright Magenta\n\ +6 6 Yellow 14 E Bright Yellow\n\ +7 7 White 15 F Bright White" + +STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? " + +STRING_COPY_HELP2, "Copies one or more files to another location.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\ + [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ + source Specifies the file or files to be copied.\n\ + /A Indicates an ASCII text file.\n\ + /B Indicates a binary file.\n\ + destination Specifies the directory and/or filename for the new file(s).\n\ + /V Verifies that new files are written correctly.\n\ + /Y Suppresses prompting to confirm you want to overwrite an\n\ + existing destination file.\n\ + /-Y Causes prompting to confirm you want to overwrite an\n\ + existing destination file.\n\n\ +The switch /Y may be present in the COPYCMD environment variable.\n\ +..." + +STRING_DATE_HELP1, "\nEnter new date (mm%cdd%cyyyy): " + +STRING_DATE_HELP2, "\nEnter new date (dd%cmm%cyyyy): " + +STRING_DATE_HELP3, "\nEnter new date (yyyy%cmm%cdd): " + +STRING_DATE_HELP4, "Displays or sets the date.\n\n\ +DATE [/T][date]\n\n\ + /T display only\n\n\ +Type DATE without parameters to display the current date setting and\n\ +a prompt for a new one. Press ENTER to keep the same date." + +STRING_DEL_HELP1, "Deletes one or more files.\n\n\ +DEL [/N /P /T /Q /W /Y /Z] file ...\n\ +DELETE [/N /P /T /Q /W /Y /Z] file ...\n\ +ERASE [/N /P /T /Q /W /Y /Z] file ...\n\n\ + file Specifies the file(s) to delete.\n\n\ + /N Nothing.\n\ + /P Prompt. Ask before deleting each file.\n\ + /T Total. Display total number of deleted files and freed disk space.\n\ + /Q Quiet.\n\ + /W Wipe. Overwrite the file with random numbers before deleting it.\n\ + /Y Yes. Kill even *.* without asking.\n\ + /Z Zap. Delete hidden, read-only and system files.\n" + +STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" +STRING_DEL_HELP3, " %lu file deleted\n" +STRING_DEL_HELP4, " %lu files deleted\n" + +STRING_DELAY_HELP, "pause for n seconds or milliseconds\n\ +DELAY [/m]n\n\n\ + /m specifiy than n are milliseconds\n\ + otherwise n are seconds" + +STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [drive:][path][filename]\n\ + Specifies drive, directory, and/or files to list.\n\n\ + /A Displays files with specified attributes.\n\ + attributes D Directories R Read-only files\n\ + H Hidden files A Files ready for archiving\n\ + S System files - Prefix meaning not\n\ + /B Uses bare format (no heading information or summary).\n\ + /C Display the thousand separator in file sizes. This is the\n\ + default. Use /-C to disable display of separator.\n\ + /D Same as wide but files are list sorted by column.\n\ + /L Uses lowercase.\n\ + /N New long list format where filenames are on the far right.\n\ + /O List by files in sorted order.\n\ + sortorder N By name (alphabetic) S By size (smallest first)\n\ + E By extension (alphabetic) D By date/time (oldest first)\n\ + G Group directories first - Prefix to reverse order\n\ + /P Pauses after each screenful of information.\n\ + /Q Display the owner of the file.\n\ + /S Displays files in specified directory and all subdirectories.\n\ + /T Controls which time field displayed or used for sorting\n\ + timefield C Creation\n\ + A Last Access\n\ + W Last Written\n\ + /W Uses wide list format.\n\ + /X This displays the short names generated for non-8dot3 file\n\ + names. The format is that of /N with the short name inserted\n\ + before the long name. If no short name is present, blanks are\n\ + displayed in its place.\n\ + /4 Displays four-digit years\n\n\ +Switches may be preset in the DIRCMD environment variable. Override\n\ +preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" + +STRING_DIR_HELP2, " Volume in drive %c is %s" +STRING_DIR_HELP3, " Volume in drive %c has no label" +STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" +STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP7, "\n Directory of %s\n\n" +STRING_DIR_HELP8, "%16i Dir(s)% 14s bytes\n" + +STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ +changes to the specified directory.\n\n\ +PUSHD [path | ..]\n\n\ + path Specifies the directory to make the current directory" + +STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Prints the contents of the directory stack.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Directory stack empty" + +STRING_ECHO_HELP1, "Display a messages without trailing carridge return and line feed.\n\n\ + ECHOS message" + +STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n\ + ECHOERR message\n\ + ECHOERR. prints an empty line" + +STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carridge return and line feed.\n\n\ + ECHOSERR message" + +STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n\ + ECHO [ON | OFF]\n\ + ECHO [message]\n\ + ECHO. prints an empty line\n\n\ +Type ECHO without a parameter to display the current ECHO setting." + +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 use the FOR comamnd in a batch program, specify %%variable instead of\n\ +%variable." + +STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\ + 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_LOCALE_HELP1, "Current time is" + +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_MISC_HELP1, "Press a key to continue...\n" + +STRING_MOVE_HELP1, "Overwrite %s (Yes/No/All)? " + +STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n\ +To move one or more files:\n\ +MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +To rename a directory:\n\ +MOVE [/N][drive:][path]dirname1 dirname2\n\n\ + [drive:][path]filename1 Specifies the location and name of the file\n\ + or files you want to move.\n\ + /N Nothing. Do everything but move files or directories.\n\n\ +Current limitations:\n\ + - You can't move a file or directory from one drive to another.\n" + +STRING_MSGBOX_HELP, "display a message box and return user responce\n\n\ +MSGBOX type ['title'] prompt\n\n\ +type button displayed\n\ + possible values are: OK, OKCANCEL,\n\ + YESNO, YESNOCANCEL\n\ +title title of message box\n\ +prompt text displayed by the message box\n\n\n\ +ERRORLEVEL is set according the button pressed:\n\n\ +YES : 10 | NO : 11\n\ +OK : 10 | CANCEL : 12\n" + +STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n\ +PATH [[drive:]path[;...]]\nPATH ;\n\n\ +Type PATH ; to clear all search-path settings and direct the command shell\n\ +to search only in the current directory.\n\ +Type PATH without parameters to display the current path.\n" + +STRING_PROMPT_HELP1, "Changes the command prompt.\n\n\ +PROMPT [text]\n\n\ + text Specifies a new command prompt.\n\n\ +Prompt can be made up of normal characters and the following special codes:\n\n\ + $A & (Ampersand)\n\ + $B | (pipe)\n\ + $C ( (Left parenthesis)\n\ + $D Current date\n\ + $E Escape code (ASCII code 27)\n\ + $F ) (Right parenthesis)\n\ + $G > (greater-than sign)\n\ + $H Backspace (erases previous character)\n\ + $L < (less-than sign)\n\ + $N Current drive\n\ + $P Current drive and path\n\ + $Q = (equal sign)\n\ + $T Current time\n\ + $V OS version number\n\ + $_ Carriage return and linefeed\n\ + $$ $ (dollar sign)" + +STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ +'Press any key to continue...' or a user defined message.\n\n\ +PAUSE [message]" + +STRING_PROMPT_HELP2, " $+ Displays the current depth of the directory stack" + +STRING_PROMPT_HELP3, "\nType PROMPT without parameters to reset the prompt to the default setting." + +STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" + +STRING_RMDIR_HELP, "Removes a directory.\n\n\ +RMDIR [drive:]path\nRD [drive:]path" + +STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ +RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ +REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ + /E No eror messages.\n\ + /N Nothing.\n\ + /P Prompts for confirmation before renaming each file.\n\ + (Not implemented yet!)\n\ + /Q Quiet.\n\ + /S Rename subdirectories.\n\ + /T Display total number of renamed files.\n\n\ +Note that you cannot specify a new drive or path for your destination. Use\n\ +the MOVE command for that purpose." + +STRING_REN_HELP2, " %lu file renamed\n" + +STRING_REN_HELP3, " %lu files renamed\n" + +STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ +SHIFT [DOWN]" + +STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ +SCREEN row col [text]\n\n\ + row row to wich move the cursor\n\ + col column to wich move the cursor" + +STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ +SET [variable[=][string]]\n\n\ + variable Specifies the environment-variable name.\n\ + string Specifies a series of characters to assign to the variable.\n\n\ +Type SET without parameters to display the current environment variables.\n" + +STRING_START_HELP1, "Starts a command.\n\n\ +START command\n\n\ + command Specifies the command to run.\n\n\ +At the moment all commands are started asynchronously.\n" + +STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ +TITLE [string]\n\n\ +string Specifies the title for the command prompt window." + +STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ +TIME [/T][time]\n\n\ + /T display only\n\n\ +Type TIME with no parameters to display the current time setting and a prompt\n\ +for a new one. Press ENTER to keep the same time." + +STRING_TIME_HELP2, "Enter new time: " + +STRING_TIMER_HELP1, "Elapsed %d msecs\n" + +STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n" + +STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n\ +TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ + ON set stopwach ON\n\ + OFF set stopwach OFF\n\ + /S Split time. Return stopwatch split\n\ + time without changing its value\n\ + /n Specifiy the stopwach number.\n\ + Stopwaches avaliable are 0 to 10\n\ + If it is not specified default is 1\n\ + /Fn Format for output\n\ + n can be:\n\ + 0 milliseconds\n\ [truncated at 1000 lines; 1764 more skipped]

1 0

[weiden] 15155: Patch by tinus: use the right access mode. fixes bug 627
by weiden＠svn.reactos.com 08 May '05

08 May '05

Patch by tinus: use the right access mode. fixes bug 627 Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-05-08 21:54:32 UTC (rev 15154) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-05-08 21:55:28 UTC (rev 15155) @@ -314,7 +314,7 @@ if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\vmx_svga\\Device 0", - 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) + 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) { return FALSE; }

1 0

[greatlrd] 15154: set eol style
by greatlrd＠svn.reactos.com 08 May '05

08 May '05

set eol style Modified: trunk/reactos/subsys/system/format/format.rc _____ Modified: trunk/reactos/subsys/system/format/format.rc --- trunk/reactos/subsys/system/format/format.rc 2005-05-08 21:51:23 UTC (rev 15153) +++ trunk/reactos/subsys/system/format/format.rc 2005-05-08 21:54:32 UTC (rev 15154) @@ -1,7 +1,7 @@ -/* $Id: format.rc 12852 2005-01-06 13:58:04Z mf $ */ -#include <windows.h> -#define REACTOS_STR_FILE_DESCRIPTION "Formating a device with a filesystem \0" -#define REACTOS_STR_INTERNAL_NAME "format\0" -#define REACTOS_STR_ORIGINAL_FILENAME "format.exe\0" -#include <reactos/version.rc> - +/* $Id$ */ +#include <windows.h> +#define REACTOS_STR_FILE_DESCRIPTION "Formating a device with a filesystem \0" +#define REACTOS_STR_INTERNAL_NAME "format\0" +#define REACTOS_STR_ORIGINAL_FILENAME "format.exe\0" +#include <reactos/version.rc> + Property changes on: trunk/reactos/subsys/system/format/format.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

1 0

[greatlrd] 15153: forget the .rc file
by greatlrd＠svn.reactos.com 08 May '05

08 May '05

forget the .rc file Added: trunk/reactos/subsys/system/format/format.rc _____ Added: trunk/reactos/subsys/system/format/format.rc --- trunk/reactos/subsys/system/format/format.rc 2005-05-08 21:50:39 UTC (rev 15152) +++ trunk/reactos/subsys/system/format/format.rc 2005-05-08 21:51:23 UTC (rev 15153) @@ -0,0 +1,7 @@ +/* $Id: format.rc 12852 2005-01-06 13:58:04Z mf $ */ +#include <windows.h> +#define REACTOS_STR_FILE_DESCRIPTION "Formating a device with a filesystem \0" +#define REACTOS_STR_INTERNAL_NAME "format\0" +#define REACTOS_STR_ORIGINAL_FILENAME "format.exe\0" +#include <reactos/version.rc> +

1 0

[greatlrd] 15152: My and W3seek patch to make format ansi and unicode independen
by greatlrd＠svn.reactos.com 08 May '05

08 May '05

My and W3seek patch to make format ansi and unicode independen it is first step to make a rc files for format Modified: trunk/reactos/subsys/system/format/format.c Modified: trunk/reactos/subsys/system/format/makefile _____ Modified: trunk/reactos/subsys/system/format/format.c --- trunk/reactos/subsys/system/format/format.c 2005-05-08 20:20:14 UTC (rev 15151) +++ trunk/reactos/subsys/system/format/format.c 2005-05-08 21:50:39 UTC (rev 15152) @@ -2,10 +2,13 @@ // Systems Internals // http://www.sysinternals.com #include <stdio.h> +#include <stdlib.h> #include <string.h> +#include <windows.h> #define NTOS_MODE_USER #include <ntos.h> #include <fmifs.h> +#include <tchar.h> // Globals BOOL Error = FALSE; @@ -15,33 +18,33 @@ DWORD ClusterSize = 0; BOOL CompressDrive = FALSE; BOOL GotALabel = FALSE; -PWCHAR Label = L""; -PWCHAR Drive = NULL; -PWCHAR Format = L"FAT"; +LPTSTR Label = _T(""); +LPTSTR Drive = NULL; +LPTSTR Format = _T("FAT"); -WCHAR RootDirectory[MAX_PATH]; -WCHAR LabelString[12]; +TCHAR RootDirectory[MAX_PATH]; +TCHAR LabelString[12]; // // Size array // typedef struct { - WCHAR SizeString[16]; + TCHAR SizeString[16]; DWORD ClusterSize; } SIZEDEFINITION, *PSIZEDEFINITION; SIZEDEFINITION LegalSizes[] = { - { L"512", 512 }, - { L"1024", 1024 }, - { L"2048", 2048 }, - { L"4096", 4096 }, - { L"8192", 8192 }, - { L"16K", 16384 }, - { L"32K", 32768 }, - { L"64K", 65536 }, - { L"128K", 65536 * 2 }, - { L"256K", 65536 * 4 }, - { L"", 0 }, + { _T("512"), 512 }, + { _T("1024"), 1024 }, + { _T("2048"), 2048 }, + { _T("4096"), 4096 }, + { _T("8192"), 8192 }, + { _T("16K"), 16384 }, + { _T("32K"), 32768 }, + { _T("64K"), 65536 }, + { _T("128K"), 65536 * 2 }, + { _T("256K"), 65536 * 4 }, + { _T(""), 0 }, }; @@ -52,15 +55,16 @@ // Takes the win32 error code and prints the text version. // //---------------------------------------------------------------------- -void PrintWin32Error( PWCHAR Message, DWORD ErrorCode ) +static VOID PrintWin32Error( LPTSTR Message, DWORD ErrorCode ) { - LPWSTR lpMsgBuf; + LPTSTR lpMsgBuf; - FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (PWCHAR) &lpMsgBuf, 0, NULL ); - printf("%S: %S\n", Message, lpMsgBuf ); + (LPTSTR)&lpMsgBuf, 0, NULL ); + + _tprintf(_T("%S: %S\n"), Message, lpMsgBuf ); LocalFree( lpMsgBuf ); } @@ -72,22 +76,22 @@ // Tell the user how to use the program // //---------------------------------------------------------------------- -VOID Usage( PWCHAR ProgramName ) +static VOID Usage( LPTSTR ProgramName ) { - printf("Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n", ProgramName); - printf(" [drive:] Specifies the drive to format.\n"); - printf(" -FS:file-system Specifies the type of file system (e.g. FAT).\n"); - printf(" -V:label Specifies volume label.\n"); - printf(" -Q Performs a quick format.\n"); - printf(" -A:size Overrides the default allocation unit size. Default settings\n"); - printf(" are strongly recommended for general use\n"); - printf(" NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n"); - printf(" FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n"); - printf(" NTFS compression is not supported for allocation unit sizes\n"); - printf(" above 4096.\n"); - printf(" -C Files created on the new volume will be compressed by\n"); - printf(" default.\n"); - printf("\n"); + _tprintf(_T("Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n"), ProgramName); + _tprintf(_T(" [drive:] Specifies the drive to format.\n")); + _tprintf(_T(" -FS:file-system Specifies the type of file system (e.g. FAT).\n")); + _tprintf(_T(" -V:label Specifies volume label.\n")); + _tprintf(_T(" -Q Performs a quick format.\n")); + _tprintf(_T(" -A:size Overrides the default allocation unit size. Default settings\n")); + _tprintf(_T(" are strongly recommended for general use\n")); + _tprintf(_T(" NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n")); + _tprintf(_T(" FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n")); + _tprintf(_T(" NTFS compression is not supported for allocation unit sizes\n")); + _tprintf(_T(" above 4096.\n")); + _tprintf(_T(" -C Files created on the new volume will be compressed by\n")); + _tprintf(_T(" default.\n")); + _tprintf(_T("\n")); } @@ -98,7 +102,7 @@ // Get the switches. // //---------------------------------------------------------------------- -int ParseCommandLine( int argc, WCHAR *argv[] ) +static int ParseCommandLine( int argc, TCHAR *argv[] ) { int i, j; BOOLEAN gotFormat = FALSE; @@ -115,38 +119,38 @@ case '-': case '/': - if( !wcsnicmp( &argv[i][1], L"FS:", 3 )) { + if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) { if( gotFormat) return -1; Format = &argv[i][4]; gotFormat = TRUE; - } else if( !wcsnicmp( &argv[i][1], L"A:", 2 )) { + } else if( !_tcsnicmp( &argv[i][1], _T("A:"), 2 )) { if( gotSize ) return -1; j = 0; while( LegalSizes[j].ClusterSize && - wcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; + _tcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; if( !LegalSizes[j].ClusterSize ) return i; ClusterSize = LegalSizes[j].ClusterSize; gotSize = TRUE; - } else if( !wcsnicmp( &argv[i][1], L"V:", 2 )) { + } else if( ! _tcsnicmp( &argv[i][1], _T("V:"), 2 )) { if( gotLabel ) return -1; Label = &argv[i][3]; gotLabel = TRUE; GotALabel = TRUE; - } else if( !wcsicmp( &argv[i][1], L"Q" )) { + } else if( !_tcsicmp( &argv[i][1], _T("Q") )) { if( gotQuick ) return -1; QuickFormat = TRUE; gotQuick = TRUE; - } else if( !wcsicmp( &argv[i][1], L"C" )) { + } else if( !_tcsicmp( &argv[i][1], _T("C") )) { if( gotCompressed ) return -1; CompressDrive = TRUE; @@ -158,7 +162,7 @@ default: if( Drive ) return i; - if( argv[i][1] != L':' ) return i; + if( argv[i][1] != _T(':') ) return i; Drive = argv[i]; break; @@ -191,7 +195,7 @@ case PROGRESS: percent = (PDWORD) Argument; - printf("%lu percent completed.\r", *percent); + _tprintf(_T("%lu percent completed.\r"), *percent); break; case OUTPUT: @@ -203,7 +207,7 @@ status = (PBOOLEAN) Argument; if( *status == FALSE ) { - printf("FormatEx was unable to complete successfully.\n\n"); + _tprintf(_T("FormatEx was unable to complete successfully.\n\n")); Error = TRUE; } break; @@ -220,7 +224,7 @@ case UNKNOWNC: case UNKNOWND: case STRUCTUREPROGRESS: - printf("Operation Not Supported"); + _tprintf(_T("Operation Not Supported")); return FALSE; } return TRUE; @@ -236,13 +240,13 @@ //---------------------------------------------------------------------- BOOLEAN LoadFMIFSEntryPoints() { - LoadLibrary( "fmifs.dll" ); - if( !(void*) GetProcAddress( GetModuleHandle( "fmifs.dll"), "FormatEx" ) ) { + HMODULE hFmifs = LoadLibrary( _T("fmifs.dll") ); + if( !(void*) GetProcAddress( hFmifs, "FormatEx" ) ) { return FALSE; } - if( !((void *) GetProcAddress( GetModuleHandle( "fmifs.dll"), + if( !((void *) GetProcAddress( hFmifs, "EnableVolumeCompression" )) ) { return FALSE; @@ -262,24 +266,28 @@ // arguments. // //---------------------------------------------------------------------- -int wmain( int argc, WCHAR *argv[] ) +int +_tmain(int argc, TCHAR *argv[]) { int badArg; DWORD media = FMIFS_HARDDISK; DWORD driveType; - WCHAR fileSystem[1024]; - WCHAR volumeName[1024]; - WCHAR input[1024]; + TCHAR fileSystem[1024]; + TCHAR volumeName[1024]; + TCHAR input[1024]; DWORD serialNumber; DWORD flags, maxComponent; ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; +#ifndef UNICODE + WCHAR RootDirectoryW[MAX_PATH], FormatW[MAX_PATH], LabelW[MAX_PATH]; +#endif // // Get function pointers // if( !LoadFMIFSEntryPoints()) { - printf("Could not located FMIFS entry points.\n\n"); + _tprintf(_T("Could not located FMIFS entry points.\n\n")); return -1; } @@ -288,7 +296,7 @@ // if( (badArg = ParseCommandLine( argc, argv ))) { - printf("Unknown argument: %S\n", argv[badArg] ); + _tprintf(_T("Unknown argument: %S\n"), argv[badArg] ); Usage(argv[0]); return -1; @@ -299,31 +307,31 @@ // if( !Drive ) { - printf("Required drive parameter is missing.\n\n"); + _tprintf(_T("Required drive parameter is missing.\n\n")); Usage( argv[0] ); return -1; } else { - wcscpy( RootDirectory, Drive ); + _tcscpy( RootDirectory, Drive ); } - RootDirectory[2] = L'\\'; - RootDirectory[3] = (WCHAR) 0; + RootDirectory[2] = _T('\\'); + RootDirectory[3] = _T('\0'); // // See if the drive is removable or not // - driveType = GetDriveTypeW( RootDirectory ); + driveType = GetDriveType( RootDirectory ); if( driveType == 0 ) { - PrintWin32Error( L"Could not get drive type", GetLastError()); + PrintWin32Error( _T("Could not get drive type"), GetLastError()); return -1; } if( driveType != DRIVE_FIXED ) { - printf("Insert a new floppy in drive %C:\nand press Enter when ready...", + _tprintf(_T("Insert a new floppy in drive %C:\nand press Enter when ready..."), RootDirectory[0] ); - fgetws( input, sizeof(input)/2, stdin ); + _fgetts( input, sizeof(input)/2, stdin ); media = FMIFS_FLOPPY; } @@ -331,24 +339,24 @@ // // Determine the drive's file system format // - if( !GetVolumeInformationW( RootDirectory, + if( !GetVolumeInformation( RootDirectory, volumeName, sizeof(volumeName)/2, &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - PrintWin32Error( L"Could not query volume", GetLastError()); + PrintWin32Error( _T("Could not query volume"), GetLastError()); return -1; } - if( !GetDiskFreeSpaceExW( RootDirectory, + if( !GetDiskFreeSpaceEx( RootDirectory, &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - PrintWin32Error( L"Could not query volume size", GetLastError()); + PrintWin32Error( _T("Could not query volume size"), GetLastError()); return -1; } - printf("The type of the file system is %S.\n", fileSystem ); + _tprintf(_T("The type of the file system is %S.\n"), fileSystem ); // // Make sure they want to do this @@ -359,30 +367,30 @@ while(1 ) { - printf("Enter current volume label for drive %C: ", RootDirectory[0] ); - fgetws( input, sizeof(input)/2, stdin ); - input[ wcslen( input ) - 1] = 0; + _tprintf(_T("Enter current volume label for drive %C: "), RootDirectory[0] ); + _fgetts( input, sizeof(input)/2, stdin ); + input[ _tcslen( input ) - 1] = 0; - if( !wcsicmp( input, volumeName )) { + if( !_tcsicmp( input, volumeName )) { break; } - printf("An incorrect volume label was entered for this drive.\n"); + _tprintf(_T("An incorrect volume label was entered for this drive.\n")); } } while( 1 ) { - printf("\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n"); - printf("DRIVE %C: WILL BE LOST!\n", RootDirectory[0] ); - printf("Proceed with Format (Y/N)? " ); - fgetws( input, sizeof(input)/2, stdin ); + _tprintf(_T("\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n")); + _tprintf(_T("DRIVE %C: WILL BE LOST!\n"), RootDirectory[0] ); + _tprintf(_T("Proceed with Format (Y/N)? " )); + _fgetts( input, sizeof(input)/2, stdin ); - if( input[0] == L'Y' || input[0] == L'y' ) break; + if( input[0] == _T('Y') || input[0] == _T('y') ) break; - if( input[0] == L'N' || input[0] == L'n' ) { + if( input[0] == _T('N') || input[0] == _T('n') ) { - printf("\n"); + _tprintf(_T("\n")); return 0; } } @@ -396,43 +404,56 @@ if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - printf("Verifying %luM\n", (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + _tprintf(_T("Verifying %luM\n"), (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - printf("Verifying %.1fM\n", + _tprintf(_T("Verifying %.1fM\n"), ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } } else { if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - printf("QuickFormatting %luM\n", (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + _tprintf(_T("QuickFormatting %luM\n"), (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - printf("QuickFormatting %.2fM\n", + _tprintf(_T("QuickFormatting %.2fM\n"), ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } - printf("Creating file system structures.\n"); + _tprintf(_T("Creating file system structures.\n")); } // // Format away! // +#ifndef UNICODE + MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, Format, -1, FormatW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, Label, -1, LabelW, MAX_PATH); + FormatEx( RootDirectoryW, media, FormatW, LabelW, QuickFormat, + ClusterSize, FormatExCallback ); +#else FormatEx( RootDirectory, media, Format, Label, QuickFormat, ClusterSize, FormatExCallback ); +#endif if( Error ) return -1; - printf("Format complete.\n"); + _tprintf(_T("Format complete.\n")); // // Enable compression if desired // if( CompressDrive ) { +#ifndef UNICODE + MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); + if( !EnableVolumeCompression( RootDirectoryW, TRUE )) { +#else if( !EnableVolumeCompression( RootDirectory, TRUE )) { +#endif - printf("Volume does not support compression.\n"); + _tprintf(_T("Volume does not support compression.\n")); } } @@ -441,87 +462,55 @@ // if( !GotALabel ) { - printf("Volume Label (11 characters, Enter for none)? " ); - fgetws( input, sizeof(LabelString)/2, stdin ); + _tprintf(_T("Volume Label (11 characters, Enter for none)? " )); + _fgetts( input, sizeof(LabelString)/2, stdin ); - input[ wcslen(input)-1] = 0; - if( !SetVolumeLabelW( RootDirectory, input )) { + input[ _tcslen(input)-1] = 0; + if( !SetVolumeLabel( RootDirectory, input )) { - PrintWin32Error(L"Could not label volume", GetLastError()); + PrintWin32Error(_T("Could not label volume"), GetLastError()); return -1; } } - if( !GetVolumeInformationW( RootDirectory, + if( !GetVolumeInformation( RootDirectory, volumeName, sizeof(volumeName)/2, &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - PrintWin32Error( L"Could not query volume", GetLastError()); + PrintWin32Error( _T("Could not query volume"), GetLastError()); return -1; } // // Print out some stuff including the formatted size // - if( !GetDiskFreeSpaceExW( RootDirectory, + if( !GetDiskFreeSpaceEx( RootDirectory, &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - PrintWin32Error( L"Could not query volume size", GetLastError()); + PrintWin32Error( _T("Could not query volume size"), GetLastError()); return -1; } - printf("\n%I64d bytes total disk space.\n", totalNumberOfBytes.QuadPart ); - printf("%I64d bytes available on disk.\n", totalNumberOfFreeBytes.QuadPart ); + _tprintf(_T("\n%I64d bytes total disk space.\n"), totalNumberOfBytes.QuadPart ); + _tprintf(_T("%I64d bytes available on disk.\n"), totalNumberOfFreeBytes.QuadPart ); // // Get the drive's serial number // - if( !GetVolumeInformationW( RootDirectory, + if( !GetVolumeInformation( RootDirectory, volumeName, sizeof(volumeName)/2, &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - PrintWin32Error( L"Could not query volume", GetLastError()); + PrintWin32Error( _T("Could not query volume"), GetLastError()); return -1; } - printf("\nVolume Serial Number is %04X-%04X\n", (unsigned int)(serialNumber >> 16), + _tprintf(_T("\nVolume Serial Number is %04X-%04X\n"), (unsigned int)(serialNumber >> 16), (unsigned int)(serialNumber & 0xFFFF) ); return 0; } -int main(int argc, char* argv[]) -{ - UNICODE_STRING warg; - ANSI_STRING arg; - NTSTATUS status; - PWCHAR *wargv; - int i; - - wargv = (PWCHAR *) RtlAllocateHeap(RtlGetProcessHeap(), 0, argc * sizeof(PWCHAR)); - - for (i = 0; i < argc; i++) - { - RtlInitAnsiString(&arg, argv[i]); - status = RtlAnsiStringToUnicodeString(&warg, &arg, TRUE); - if (!NT_SUCCESS (status)) - { - printf("Not enough free memory.\n"); - return 1; - } - wargv[i] = (PWCHAR) warg.Buffer; - } - - wmain(argc, wargv); - - for (i = 0; i < argc; i++) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, wargv[i]); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, wargv); - - return 0; -} _____ Modified: trunk/reactos/subsys/system/format/makefile --- trunk/reactos/subsys/system/format/makefile 2005-05-08 20:20:14 UTC (rev 15151) +++ trunk/reactos/subsys/system/format/makefile 2005-05-08 21:50:39 UTC (rev 15152) @@ -2,13 +2,11 @@ PATH_TO_TOP = ../../.. -TARGET_NORC = yes - TARGET_TYPE = program TARGET_APPTYPE = console -TARGET_SDKLIBS = ntdll.a fmifs.a +TARGET_SDKLIBS = kernel32.a ntdll.a fmifs.a TARGET_NAME = format

1 0

[ion] 15151: Fix NtQueryDirectoryFile to wait on right status, to actually use the event that the user gives, to select the right device and sync/async wait mode and always use FileIndex = 0 since nothing else can be used for this API.
by ion＠svn.reactos.com 08 May '05

08 May '05

Fix NtQueryDirectoryFile to wait on right status, to actually use the event that the user gives, to select the right device and sync/async wait mode and always use FileIndex = 0 since nothing else can be used for this API. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-08 20:15:54 UTC (rev 15150) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-08 20:20:14 UTC (rev 15151) @@ -2050,116 +2050,133 @@ IN FILE_INFORMATION_CLASS FileInformationClass, IN BOOLEAN ReturnSingleEntry, IN PUNICODE_STRING FileName OPTIONAL, - IN BOOLEAN RestartScan - ) - + IN BOOLEAN RestartScan) { - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - PIO_STACK_LOCATION IoStack; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + PIO_STACK_LOCATION StackPtr; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN LocalEvent; + PKEVENT Event = NULL; - DPRINT("NtQueryDirectoryFile()\n"); - - PAGED_CODE(); + DPRINT("NtQueryDirectoryFile()\n"); + PAGED_CODE(); + + /* Validate User-Mode Buffers */ + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + ProbeForWrite(FileInformation, + Length, + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - ProbeForWrite(FileInformation, - Length, - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + if(!NT_SUCCESS(Status)) return Status; + } - if(!NT_SUCCESS(Status)) - { - return Status; - } - } + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + FILE_LIST_DIRECTORY, + IoFileObjectType, + PreviousMode, + (PVOID *)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) return(Status); + + /* Get Event Object */ + if (PEvent) + { + Status = ObReferenceObjectByHandle(PEvent, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID *)&Event, + NULL); + if (Status != STATUS_SUCCESS) return(Status); + KeClearEvent(Event); + } - Status = ObReferenceObjectByHandle(FileHandle, - FILE_LIST_DIRECTORY, - IoFileObjectType, - PreviousMode, - (PVOID *)&FileObject, - NULL); + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } - if (Status != STATUS_SUCCESS) - { - return(Status); - } - DeviceObject = FileObject->DeviceObject; + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + LocalEvent = TRUE; + } - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - ObDereferenceObject(FileObject); - return STATUS_UNSUCCESSFUL; - } + /* Allocate the IRP */ + if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE))) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; - Irp->UserEvent = &FileObject->Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - KeResetEvent( &FileObject->Event ); - Irp->UserBuffer=FileInformation; - Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; - Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; + /* Set up the IRP */ + Irp->RequestorMode = PreviousMode; + Irp->UserIosb = IoStatusBlock; + Irp->UserEvent = Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->UserBuffer = FileInformation; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; + Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; - IoStack = IoGetNextIrpStackLocation(Irp); + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->FileObject = FileObject; + StackPtr->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; + StackPtr->MinorFunction = IRP_MN_QUERY_DIRECTORY; - IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; - IoStack->MinorFunction = IRP_MN_QUERY_DIRECTORY; - IoStack->Flags = 0; - IoStack->Control = 0; - IoStack->DeviceObject = DeviceObject; - IoStack->FileObject = FileObject; + /* Set Parameters */ + StackPtr->Parameters.QueryDirectory.FileInformationClass = FileInformationClass; + StackPtr->Parameters.QueryDirectory.FileName = FileName; + StackPtr->Parameters.QueryDirectory.FileIndex = 0; + StackPtr->Parameters.QueryDirectory.Length = Length; + StackPtr->Flags = 0; + if (RestartScan) StackPtr->Flags = SL_RESTART_SCAN; + if (ReturnSingleEntry) StackPtr->Flags |= SL_RETURN_SINGLE_ENTRY; - if (RestartScan) - { - IoStack->Flags = IoStack->Flags | SL_RESTART_SCAN; - } - if (ReturnSingleEntry) - { - IoStack->Flags = IoStack->Flags | SL_RETURN_SINGLE_ENTRY; - } - if (((PFILE_DIRECTORY_INFORMATION)FileInformation)->FileIndex != 0) - { - IoStack->Flags = IoStack->Flags | SL_INDEX_SPECIFIED; - } + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + if (!LocalEvent) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } + } - IoStack->Parameters.QueryDirectory.FileInformationClass = - FileInformationClass; - IoStack->Parameters.QueryDirectory.FileName = FileName; - IoStack->Parameters.QueryDirectory.Length = Length; - - Status = IoCallDriver(FileObject->DeviceObject,Irp); - if (Status==STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock->Status; - } - - return(Status); + /* Return the Status */ + return Status; } /*

1 0

[greatlrd] 15150: Reomve string STRING_CMD_INVALIDDRIVE in En.rc it was doublcate of STRING_FREE_ERROR1
by greatlrd＠svn.reactos.com 08 May '05

08 May '05

Reomve string STRING_CMD_INVALIDDRIVE in En.rc it was doublcate of STRING_FREE_ERROR1 thanks Usurp for finding it Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 19:22:28 UTC (rev 15149) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 20:15:54 UTC (rev 15150) @@ -561,8 +561,6 @@ STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" - -STRING_CMD_INVALIDDRIVE, "ERROR: invalid drive" STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d file(s) copied\n" _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-05-08 19:22:28 UTC (rev 15149) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-05-08 20:15:54 UTC (rev 15150) @@ -333,7 +333,7 @@ working = SetCurrentDirectory(str); } - if (!working) ConErrResPuts (STRING_CMD_INVALIDDRIVE); + if (!working) ConErrResPuts (STRING_FREE_ERROR1); return; } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-08 19:22:28 UTC (rev 15149) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-08 20:15:54 UTC (rev 15150) @@ -84,7 +84,7 @@ #define STRING_CMD_HELP6 613 #define STRING_CMD_HELP7 614 #define STRING_CMD_HELP8 615 -#define STRING_CMD_INVALIDDRIVE 617 + #define STRING_CMD_SHELLINFO 624 #define STRING_COLOR_HELP1 625 _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-05-08 19:22:28 UTC (rev 15149) +++ trunk/reactos/subsys/system/cmd/start.c 2005-05-08 20:15:54 UTC (rev 15150) @@ -39,7 +39,7 @@ SetCurrentDirectory (szPath); GetCurrentDirectory (MAX_PATH, szPath); if (szPath[0] != (TCHAR)_totupper (*first)) - ConErrResPuts (STRING_CMD_INVALIDDRIVE); + ConErrResPuts (STRING_FREE_ERROR1); return 0; }

1 0

[weiden] 15149: prevent buffer overflow, LoadString accepts the size of the buffer in TCHARs, not in bytes! Please guys, read the documentation of the function _before_ you use it...
by weiden＠svn.reactos.com 08 May '05

08 May '05

prevent buffer overflow, LoadString accepts the size of the buffer in TCHARs, not in bytes! Please guys, read the documentation of the function _before_ you use it... Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/taskmgr/applpage.c Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-05-08 19:14:18 UTC (rev 15148) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-05-08 19:22:28 UTC (rev 15149) @@ -299,7 +299,7 @@ LPTSTR p; TCHAR szOptions[4]; - LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szOptions, 4); + LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szOptions, sizeof(szOptions) / sizeof(szOptions[0]) ); ConOutResPuts(STRING_COPY_HELP1); @@ -760,7 +760,7 @@ DeleteFileList (sources); freep ((VOID*)p); - LoadString( CMD_ModuleHandle, STRING_COPY_FILE, (LPTSTR) szMsg,sizeof(szMsg)); + LoadString( CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf (szMsg, copied); return 1; _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-05-08 19:14:18 UTC (rev 15148) +++ trunk/reactos/subsys/system/cmd/del.c 2005-05-08 19:22:28 UTC (rev 15149) @@ -71,9 +71,9 @@ HANDLE fh; WIN32_FIND_DATA f; LONGLONG FileSize; - TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, (LPTSTR) szMsg,sizeof(szMsg)); + LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szMsg, RC_STRING_MAX_SIZE); fh = FindFirstFile(lpFileName, &f); FileSize = ((LONGLONG)f.nFileSizeHigh * ((LONGLONG)MAXDWORD+1)) + (LONGLONG)f.nFileSizeLow; _____ Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-05-08 19:14:18 UTC (rev 15148) +++ trunk/reactos/subsys/system/cmd/for.c 2005-05-08 19:22:28 UTC (rev 15149) @@ -68,7 +68,7 @@ /* Check that first element is % then an alpha char followed by space */ if ((*param != _T('%')) || !_istalpha (*(param + 1)) || !_istspace (*(param + 2))) { - LoadString( CMD_ModuleHandle, STRING_FOR_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); + LoadString( CMD_ModuleHandle, STRING_FOR_ERROR, szMsg, RC_STRING_MAX_SIZE); error_syntax (szMsg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/timer.c --- trunk/reactos/subsys/system/cmd/timer.c 2005-05-08 19:14:18 UTC (rev 15148) +++ trunk/reactos/subsys/system/cmd/timer.c 2005-05-08 19:22:28 UTC (rev 15149) @@ -107,7 +107,7 @@ return 0; } - LoadString( CMD_ModuleHandle, STRING_TIMER_TIME, (LPTSTR) szMsg,sizeof(szMsg)); + LoadString( CMD_ModuleHandle, STRING_TIMER_TIME, szMsg, RC_STRING_MAX_SIZE); p = split (param, &argc, FALSE); _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-05-08 19:14:18 UTC (rev 15148) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-05-08 19:22:28 UTC (rev 15149) @@ -46,8 +46,8 @@ (RosVersion - VersionInfo.szCSDVersion); if (7 <= RosVersionLen && 0 == _tcsnicmp(RosVersion, _T("ReactOS"), 7)) { - LoadString( CMD_ModuleHandle, STRING_VERSION_RUNVER, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf (szMsg, RosVersion); + LoadString( CMD_ModuleHandle, STRING_VERSION_RUNVER, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf (szMsg, RosVersion); } } ConOutPuts (_T("\n")); _____ Modified: trunk/reactos/subsys/system/taskmgr/applpage.c --- trunk/reactos/subsys/system/taskmgr/applpage.c 2005-05-08 19:14:18 UTC (rev 15148) +++ trunk/reactos/subsys/system/taskmgr/applpage.c 2005-05-08 19:22:28 UTC (rev 15149) @@ -489,7 +489,7 @@ LPNM_LISTVIEW pnmv; LV_DISPINFO* pnmdi; LPAPPLICATION_PAGE_LIST_ITEM pAPLI; - TCHAR szMsg[256]; + TCHAR szMsg[256]; idctrl = (int) wParam; @@ -516,15 +516,15 @@ else if (pnmdi->item.iSubItem == 1) { if (pAPLI->bHung) - { - LoadString( GetModuleHandle(NULL), IDS_Not_Responding , (LPTSTR) szMsg,sizeof(szMsg)); + { + LoadString( GetModuleHandle(NULL), IDS_Not_Responding , szMsg, sizeof(szMsg) / sizeof(szMsg[0])); _tcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); - } + } else - { - LoadString( GetModuleHandle(NULL), IDS_Running, (LPTSTR) szMsg,sizeof(szMsg)); + { + LoadString( GetModuleHandle(NULL), IDS_Running, (LPTSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0])); _tcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); - } + } } break; _____ Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c --- trunk/reactos/subsys/system/taskmgr/trayicon.c 2005-05-08 19:14:18 UTC (rev 15148) +++ trunk/reactos/subsys/system/taskmgr/trayicon.c 2005-05-08 19:22:28 UTC (rev 15149) @@ -149,7 +149,7 @@ nid.hIcon = hIcon; - LoadString( GetModuleHandle(NULL), IDS_MSG_TRAYICONCPUUSAGE, (LPTSTR) szMsg,sizeof(szMsg)); + LoadString( GetModuleHandle(NULL), IDS_MSG_TRAYICONCPUUSAGE, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); wsprintf(nid.szTip, szMsg, PerfDataGetProcessorUsage()); bRetVal = Shell_NotifyIcon(NIM_ADD, &nid);

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005