Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 15087: Andreas Bjerkeholt : Swedish translation, proofread by David Nordenberg
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

Andreas Bjerkeholt : Swedish translation, proofread by David Nordenberg Added: trunk/reactos/lib/shellext/slayer/Sv.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc _____ Added: trunk/reactos/lib/shellext/slayer/Sv.rc --- trunk/reactos/lib/shellext/slayer/Sv.rc 2005-05-07 17:57:12 UTC (rev 15086) +++ trunk/reactos/lib/shellext/slayer/Sv.rc 2005-05-07 18:20:23 UTC (rev 15087) @@ -0,0 +1,40 @@ +/* Swedish resources by Andreas Bjerkeholt (harteex(a)gmail.com) */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Kompatibilitet" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ifall du har problem med att k÷ra det hõr programmet i ReactOS, võlj det operativsystem som ReactOS ska rapportera till programmet.", -1, 7,7,210,31 + GROUPBOX "Kompatibilitetslõge", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "K÷r det hõr programmet i kompatibilitetslõge f÷r:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Instõllningar", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Anvõnd 256 fõrger", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "K÷r i skõrmuppl÷sningen 640 x 480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Inaktivera teman", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Redigera kompatibilitetslõgen...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Lõr dig mer om <A>program-kompatibilitet</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Redigera kompatibilitetslõgen" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&Lõgg till...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&?ndra...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&Ta bort", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&Avbryt", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Tillõggsfliken Kompatibilitet" +END + _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.rc --- trunk/reactos/lib/shellext/slayer/slayer.rc 2005-05-07 17:57:12 UTC (rev 15086) +++ trunk/reactos/lib/shellext/slayer/slayer.rc 2005-05-07 18:20:23 UTC (rev 15087) @@ -17,4 +17,6 @@ #include "En.rc" #include "De.rc" +#include "Sv.rc" +

1 0

[greatlrd] 15086: remove a debug msg after me
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

remove a debug msg after me Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 17:48:25 UTC (rev 15085) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 17:57:12 UTC (rev 15086) @@ -602,8 +602,7 @@ len = _tcslen (file); if (file[len - 1] == _T('.')) { - _tcscat (file, _T("*")); - ConOutPrintf(L"file3 : %s\n",file); + _tcscat (file, _T("*")); return; } }

1 0

[greatlrd] 15085: Add *. to dir but it does not working in ros but in windows fine
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

Add *. to dir but it does not working in ros but in windows fine some bug in ros Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 17:44:54 UTC (rev 15084) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 17:48:25 UTC (rev 15085) @@ -567,14 +567,21 @@ if (!file) return; + /* if no file spec, change to "*.*" */ if (*file == _T('\0')) - { - _tcscpy (file, _T("*.*")); + { + _tcscpy (file, _T("*.*")); return; } + // add support for *. + if ((file[0] == _T('*')) && (file[1] == _T('.') )) + { + return; + } + /* if starts with . add * in front */ if (*file == _T('.')) { @@ -585,15 +592,18 @@ /* if no . add .* */ if (!_tcschr (file, _T('.'))) { - _tcscat (file, _T(".*")); + _tcscat (file, _T(".*")); return; } + + /* if last character is '.' add '*' */ len = _tcslen (file); if (file[len - 1] == _T('.')) { _tcscat (file, _T("*")); + ConOutPrintf(L"file3 : %s\n",file); return; } }

1 0

[ion] 15084: Implement FsRtlAllocateResource, FsRtlIsPagingFile, FsRtlBalanceReads. Fix some incorrect function prototypes, rename mdl.c to fastio.c and add some more functions to it. Implement FsRtlGetfileSize to use fastio, combine dbcsname.c and name.c and pretty-fy the array, clean up some ugly formatting. Create context.c and move stream/file context routines there.
by ion＠svn.reactos.com 07 May '05

07 May '05

Implement FsRtlAllocateResource, FsRtlIsPagingFile, FsRtlBalanceReads. Fix some incorrect function prototypes, rename mdl.c to fastio.c and add some more functions to it. Implement FsRtlGetfileSize to use fastio, combine dbcsname.c and name.c and pretty-fy the array, clean up some ugly formatting. Create context.c and move stream/file context routines there. Modified: trunk/reactos/include/ddk/fsfuncs.h Modified: trunk/reactos/ntoskrnl/Makefile Added: trunk/reactos/ntoskrnl/fs/context.c Deleted: trunk/reactos/ntoskrnl/fs/dbcsname.c Added: trunk/reactos/ntoskrnl/fs/fastio.c Deleted: trunk/reactos/ntoskrnl/fs/mdl.c Modified: trunk/reactos/ntoskrnl/fs/name.c Modified: trunk/reactos/ntoskrnl/fs/util.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/include/ddk/fsfuncs.h --- trunk/reactos/include/ddk/fsfuncs.h 2005-05-07 15:58:58 UTC (rev 15083) +++ trunk/reactos/include/ddk/fsfuncs.h 2005-05-07 17:44:54 UTC (rev 15084) @@ -84,7 +84,7 @@ IN ULONG NumberOfBytes, IN ULONG Tag ); -DWORD +PERESOURCE STDCALL FsRtlAllocateResource ( VOID @@ -351,7 +351,7 @@ BOOLEAN STDCALL FsRtlIsNtstatusExpected(IN NTSTATUS NtStatus); -ULONG +BOOLEAN STDCALL FsRtlIsPagingFile ( IN PFILE_OBJECT FileObject ); _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-05-07 15:58:58 UTC (rev 15083) +++ trunk/reactos/ntoskrnl/Makefile 2005-05-07 17:44:54 UTC (rev 15084) @@ -239,10 +239,10 @@ # Installable File System Run-Time Library (FsRtl) OBJECTS_FS = \ - fs/dbcsname.o \ + fs/context.o \ + fs/fastio.o \ fs/filelock.o \ fs/mcb.o \ - fs/mdl.o \ fs/name.o \ fs/notify.o \ fs/oplock.o \ _____ Added: trunk/reactos/ntoskrnl/fs/context.c --- trunk/reactos/ntoskrnl/fs/context.c 2005-05-07 15:58:58 UTC (rev 15083) +++ trunk/reactos/ntoskrnl/fs/context.c 2005-05-07 17:44:54 UTC (rev 15084) @@ -0,0 +1,81 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/fs/context.c + * PURPOSE: File and Stream Context Functions + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#include <internal/debug.h> + +/* GLOBALS *******************************************************************/ + +/* PRIVATE FUNCTIONS**********************************************************/ + +/* FUNCTIONS *****************************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +FsRtlInsertPerStreamContext(IN PFSRTL_ADVANCED_FCB_HEADER PerStreamContext, + IN PFSRTL_PER_STREAM_CONTEXT Ptr) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +PFSRTL_PER_STREAM_CONTEXT +STDCALL +FsRtlRemovePerStreamContext(IN PFSRTL_ADVANCED_FCB_HEADER StreamContext, + IN PVOID OwnerId OPTIONAL, + IN PVOID InstanceId OPTIONAL) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +FsRtlInsertPerFileObjectContext(IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext, + IN PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ Ptr) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ +STDCALL +FsRtlRemovePerFileObjectContext(IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext, + IN PVOID OwnerId OPTIONAL, + IN PVOID InstanceId OPTIONAL) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +VOID +STDCALL +FsRtlTeardownPerStreamContexts(IN PFSRTL_ADVANCED_FCB_HEADER AdvancedHeader) +{ + UNIMPLEMENTED; +} + +/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/fs/dbcsname.c --- trunk/reactos/ntoskrnl/fs/dbcsname.c 2005-05-07 15:58:58 UTC (rev 15083) +++ trunk/reactos/ntoskrnl/fs/dbcsname.c 2005-05-07 17:44:54 UTC (rev 15084) @@ -1,322 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/fs/dbcsname.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: No programmer listed. - */ - -#include <ntoskrnl.h> - -/* DATA ********************************************************************/ - -static UCHAR LegalAnsiCharacterArray[] = -{ - 0, /* CTRL+@, 0x00 */ - 0, /* CTRL+A, 0x01 */ - 0, /* CTRL+B, 0x02 */ - 0, /* CTRL+C, 0x03 */ - 0, /* CTRL+D, 0x04 */ - 0, /* CTRL+E, 0x05 */ - 0, /* CTRL+F, 0x06 */ - 0, /* CTRL+G, 0x07 */ - 0, /* CTRL+H, 0x08 */ - 0, /* CTRL+I, 0x09 */ - 0, /* CTRL+J, 0x0a */ - 0, /* CTRL+K, 0x0b */ - 0, /* CTRL+L, 0x0c */ - 0, /* CTRL+M, 0x0d */ - 0, /* CTRL+N, 0x0e */ - 0, /* CTRL+O, 0x0f */ - 0, /* CTRL+P, 0x10 */ - 0, /* CTRL+Q, 0x11 */ - 0, /* CTRL+R, 0x12 */ - 0, /* CTRL+S, 0x13 */ - 0, /* CTRL+T, 0x14 */ - 0, /* CTRL+U, 0x15 */ - 0, /* CTRL+V, 0x16 */ - 0, /* CTRL+W, 0x17 */ - 0, /* CTRL+X, 0x18 */ - 0, /* CTRL+Y, 0x19 */ - 0, /* CTRL+Z, 0x1a */ - 0, /* CTRL+[, 0x1b */ - 0, /* CTRL+\, 0x1c */ - 0, /* CTRL+], 0x1d */ - 0, /* CTRL+^, 0x1e */ - 0, /* CTRL+_, 0x1f */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* ` ', 0x20 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `!', 0x21 */ - FSRTL_WILD_CHARACTER, /* `"', 0x22 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `#', 0x23 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `$', 0x24 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `%', 0x25 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `&', 0x26 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `'', 0x27 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `(', 0x28 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `)', 0x29 */ - FSRTL_WILD_CHARACTER, /* `*', 0x2a */ - FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `+', 0x2b */ - FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `,', 0x2c */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `-', 0x2d */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `.', 0x2e */ - 0, /* `/', 0x2f */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `0', 0x30 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `1', 0x31 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `2', 0x32 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `3', 0x33 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `4', 0x34 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `5', 0x35 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `6', 0x36 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `7', 0x37 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `8', 0x38 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `9', 0x39 */ - FSRTL_NTFS_LEGAL, /* `:', 0x3a */ - FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `;', 0x3b */ - FSRTL_WILD_CHARACTER, /* `<', 0x3c */ - FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `=', 0x3d */ - FSRTL_WILD_CHARACTER, /* `>', 0x3e */ - FSRTL_WILD_CHARACTER, /* `?', 0x3f */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `@', 0x40 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `A', 0x41 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `B', 0x42 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `C', 0x43 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `D', 0x44 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `E', 0x45 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `F', 0x46 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `G', 0x47 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `H', 0x48 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `I', 0x49 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `J', 0x4a */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `K', 0x4b */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `L', 0x4c */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `M', 0x4d */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `N', 0x4e */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `O', 0x4f */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `P', 0x50 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `Q', 0x51 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `R', 0x52 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `S', 0x53 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `T', 0x54 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `U', 0x55 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `V', 0x56 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `W', 0x57 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `X', 0x58 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `Y', 0x59 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `Z', 0x5a */ - FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `[', 0x5b */ - 0, /* `\', 0x5c */ - FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `]', 0x5d */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `^', 0x5e */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `_', 0x5f */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* ``', 0x60 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `a', 0x61 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `b', 0x62 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `c', 0x63 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `d', 0x64 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `e', 0x65 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `f', 0x66 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `g', 0x67 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `h', 0x68 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `i', 0x69 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `j', 0x6a */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `k', 0x6b */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `l', 0x6c */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `m', 0x6d */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `n', 0x6e */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `o', 0x6f */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `p', 0x70 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `q', 0x71 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `r', 0x72 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `s', 0x73 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `t', 0x74 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `u', 0x75 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `v', 0x76 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `w', 0x77 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `x', 0x78 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `y', 0x79 */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `z', 0x7a */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `{', 0x7b */ - 0, /* `|', 0x7c */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `}', 0x7d */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `~', 0x7e */ - FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL /* 0x7f */ -}; - -PUCHAR EXPORTED FsRtlLegalAnsiCharacterArray = LegalAnsiCharacterArray; - - -/* FUNCTIONS ***************************************************************/ - -/********************************************************************** - * NAME EXPORTED - * FsRtlDissectDbcs@16 - * - * Dissects a given path name into first and remaining part. - * - * ARGUMENTS - * Name - * ANSI string to dissect. - * - * FirstPart - * Pointer to user supplied ANSI_STRING, that will - * later point to the first part of the original name. - * - * RemainingPart - * Pointer to user supplied ANSI_STRING, that will - * later point to the remaining part of the original name. - * - * RETURN VALUE - * None - * - * EXAMPLE - * Name: \test1\test2\test3 - * FirstPart: test1 - * RemainingPart: test2\test3 - * - * @implemented - */ -VOID STDCALL -FsRtlDissectDbcs(IN ANSI_STRING Name, - OUT PANSI_STRING FirstPart, - OUT PANSI_STRING RemainingPart) -{ - ULONG i; - ULONG FirstLoop; - - /* Initialize the Outputs */ - RtlZeroMemory(&FirstPart, sizeof(ANSI_STRING)); - RtlZeroMemory(&RemainingPart, sizeof(ANSI_STRING)); - - /* Bail out if empty */ - if (!Name.Length) return; - - /* Ignore backslash */ - if (Name.Buffer[0] == '\\') { - i = 1; - } else { - i = 0; - } - - /* Loop until we find a backslash */ - for (FirstLoop = i;i < Name.Length;i++) { - if (Name.Buffer[i] != '\\') break; - if (FsRtlIsLeadDbcsCharacter(Name.Buffer[i])) i++; - } - - /* Now we have the First Part */ - FirstPart->Length = (i-FirstLoop); - FirstPart->MaximumLength = FirstPart->Length; /* +2?? */ - FirstPart->Buffer = &Name.Buffer[FirstLoop]; - - /* Make the second part if something is still left */ - if (i<Name.Length) { - RemainingPart->Length = (Name.Length - (i+1)); - RemainingPart->MaximumLength = RemainingPart->Length; /* +2?? */ - RemainingPart->Buffer = &Name.Buffer[i+1]; - } - - return; -} - - -/********************************************************************** - * NAME EXPORTED - * FsRtlDoesDbcsContainWildCards@4 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * @implemented - */ -BOOLEAN STDCALL -FsRtlDoesDbcsContainWildCards(IN PANSI_STRING Name) -{ - ULONG i; - - /* Check every character */ - for (i=0;i < Name->Length;i++) { - - /* First make sure it's not the Lead DBCS */ - if (FsRtlIsLeadDbcsCharacter(Name->Buffer[i])) { - i++; - } else if (FsRtlIsAnsiCharacterWild(Name->Buffer[i])) { - /* Now return if it has a Wilcard */ - return TRUE; - } - } - - /* We didn't return above...so none found */ - return FALSE; -} - - -/********************************************************************** - * NAME EXPORTED - * FsRtlIsDbcsInExpression@8 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * @unimplemented - */ -BOOLEAN STDCALL -FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, - IN PANSI_STRING Name) -{ - return FALSE; -} - - -/********************************************************************** - * NAME EXPORTED - * FsRtlIsFatDbcsLegal@20 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * @unimplemented - */ -BOOLEAN -STDCALL -FsRtlIsFatDbcsLegal(IN ANSI_STRING DbcsName, - IN BOOLEAN WildCardsPermissible, - IN BOOLEAN PathNamePermissible, - IN BOOLEAN LeadingBackslashPermissible) -{ - return FALSE; -} - - -/********************************************************************** - * NAME EXPORTED - * FsRtlIsHpfsDbcsLegal@20 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * @unimplemented - */ -BOOLEAN STDCALL -FsRtlIsHpfsDbcsLegal(IN ANSI_STRING DbcsName, - IN BOOLEAN WildCardsPermissible, - IN BOOLEAN PathNamePermissible, - IN BOOLEAN LeadingBackslashPermissible) -{ - return FALSE; -} - -/* EOF */ _____ Added: trunk/reactos/ntoskrnl/fs/fastio.c --- trunk/reactos/ntoskrnl/fs/fastio.c 2005-05-07 15:58:58 UTC (rev 15083) +++ trunk/reactos/ntoskrnl/fs/fastio.c 2005-05-07 17:44:54 UTC (rev 15084) @@ -0,0 +1,513 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/fs/fastio.c + * PURPOSE: File System Routines which support Fast I/O or Cc Access. + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* GLOBALS *******************************************************************/ + +extern ULONG CcFastReadResourceMiss; +extern ULONG CcFastReadNoWait; + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +VOID +STDCALL +FsRtlIncrementCcFastReadResourceMiss( VOID ) +{ + CcFastReadResourceMiss++; +} + +/* + * @implemented + */ +VOID +STDCALL +FsRtlIncrementCcFastReadNotPossible( VOID ) +{ + CcFastReadNotPossible++; +} + +/* + * @implemented + */ +VOID +STDCALL +FsRtlIncrementCcFastReadWait( VOID ) +{ + CcFastReadWait++; +} + +/* + * @implemented + */ +VOID +STDCALL +FsRtlIncrementCcFastReadNoWait( VOID ) +{ + CcFastReadNoWait++; +} + +/* + * NAME EXPORTED + * FsRtlCopyRead@32 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * NOTE + * From Bo Branten's ntifs.h v12. + * + * @unimplemented + */ +BOOLEAN +STDCALL +FsRtlCopyRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * NAME EXPORTED + * FsRtlCopyWrite@32 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * NOTE + * From Bo Branten's ntifs.h v12. + * + * @unimplemented + */ +BOOLEAN +STDCALL +FsRtlCopyWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * NAME EXPORTED + * FsRtlGetFileSize@8 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @implemented + */ +NTSTATUS +STDCALL +FsRtlGetFileSize(IN PFILE_OBJECT FileObject, + IN OUT PLARGE_INTEGER FileSize) +{ + FILE_STANDARD_INFORMATION Info; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + ULONG Length; + PDEVICE_OBJECT DeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->FastIoQueryStandardInfo) + { + /* Fast Path */ + FastDispatch->FastIoQueryStandardInfo(FileObject, + TRUE, + &Info, + &IoStatusBlock, + DeviceObject); + Status = IoStatusBlock.Status; + } + else + { + /* Slow Path */ + Status = IoQueryFileInformation(FileObject, + FileStandardInformation, + sizeof(Info), + &Info, + &Length); + } + + /* Check success */ + if (NT_SUCCESS(Status)) + { + *FileSize = Info.EndOfFile; + } + + /* Return status */ + return Status; +} + +/* + * NAME EXPORTED + * FsRtlMdlRead@24 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @implemented + */ +BOOLEAN +STDCALL +FsRtlMdlRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) +{ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlRead) + { + /* Use the fast path */ + return FastDispatch->MdlRead(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlRead && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlReadDev(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); +} + +/* + * NAME EXPORTED + * FsRtlMdlReadComplete@8 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @implemented + */ +BOOLEAN +STDCALL +FsRtlMdlReadComplete(IN PFILE_OBJECT FileObject, + IN OUT PMDL MdlChain) +{ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlReadComplete) + { + /* Use the fast path */ + return FastDispatch->MdlReadComplete(FileObject, + MdlChain, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlReadComplete && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlReadCompleteDev(FileObject, MdlChain, DeviceObject); +} + + +/* + * NAME EXPORTED + * FsRtlMdlReadCompleteDev@12 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * NOTE + * From Bo Branten's ntifs.h v13. + * (CcMdlReadCompleteDev declared in internal/cc.h) + * + * @implemented + */ +BOOLEAN +STDCALL +FsRtlMdlReadCompleteDev(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + /* Call the Cache Manager */ + CcMdlReadCompleteDev(MdlChain, FileObject); + return TRUE; +} + +/* + * NAME EXPORTED + * FsRtlMdlReadDev@28 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @unimplemented + */ +BOOLEAN +STDCALL +FsRtlMdlReadDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * NAME EXPORTED + * FsRtlMdlWriteComplete@12 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @implemented + */ +BOOLEAN +STDCALL +FsRtlMdlWriteComplete(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) +{ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlWriteComplete) + { + /* Use the fast path */ + return FastDispatch->MdlWriteComplete(FileObject, + FileOffset, + MdlChain, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlWriteComplete && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlWriteCompleteDev(FileObject, + FileOffset, + MdlChain, + DeviceObject); +} + +/* + * NAME EXPORTED + * FsRtlMdlWriteCompleteDev@16 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @implemented + */ +BOOLEAN +STDCALL +FsRtlMdlWriteCompleteDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + /* Call the Cache Manager */ + CcMdlWriteCompleteDev(FileOffset, MdlChain, FileObject); + return TRUE; +} + + +/* + * NAME EXPORTED + * FsRtlPrepareMdlWrite@24 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @implemented + */ +BOOLEAN +STDCALL +FsRtlPrepareMdlWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) +{ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->PrepareMdlWrite) + { + /* Use the fast path */ + return FastDispatch->PrepareMdlWrite(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->PrepareMdlWrite && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlPrepareMdlWriteDev(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); +} + +/* + * NAME EXPORTED + * FsRtlPrepareMdlWriteDev@28 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + * + * @unimplemented + */ +BOOLEAN +STDCALL +FsRtlPrepareMdlWriteDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/fs/mdl.c --- trunk/reactos/ntoskrnl/fs/mdl.c 2005-05-07 15:58:58 UTC (rev 15083) +++ trunk/reactos/ntoskrnl/fs/mdl.c 2005-05-07 17:44:54 UTC (rev 15084) @@ -1,395 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/fs/mdl.c - * PURPOSE: Cached MDL Access Helper Routines for File System Drivers - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -extern ULONG CcFastReadResourceMiss; -extern ULONG CcFastReadNoWait; - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ [truncated at 1000 lines; 1544 more skipped]

1 0

[greatlrd] 15083: Remove the two last langues string it was doublecate
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

Remove the two last langues string it was doublecate small change to STRING_PATH_ERROR1 in En.rc and Fr.rc thanks Usurp for notice it Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/Fr.rc Modified: trunk/reactos/subsys/system/cmd/cmd.rc Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-07 15:40:03 UTC (rev 15082) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-07 15:58:58 UTC (rev 15083) @@ -534,8 +534,6 @@ STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[Error]\n" -STRING_PATH_ERROR, "CMD: Not in environment 'PATH'\n" - STRING_REN_ERROR1, "MoveFile() failed. Error: %lu\n" STRING_START_ERROR1, "No batch support at the moment!" @@ -561,6 +559,5 @@ STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" -STRING_ERROR_WRONG_DATE, "Invalid date." -STRING_SET_ERROR "CMD: Not in environment '%s'\n" +STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" } _____ Modified: trunk/reactos/subsys/system/cmd/Fr.rc --- trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-07 15:40:03 UTC (rev 15082) +++ trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-07 15:58:58 UTC (rev 15083) @@ -545,7 +545,7 @@ STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[Erreur]\n" -STRING_PATH_ERROR, "CMD: Pas dans l'environnement 'PATH'\n" +STRING_PATH_ERROR, "CMD: Pas dans l'environnement '%s'\n" STRING_REN_ERROR1, "MoveFile() a échoué. Erreur: %lu\n" _____ Modified: trunk/reactos/subsys/system/cmd/cmd.rc --- trunk/reactos/subsys/system/cmd/cmd.rc 2005-05-07 15:40:03 UTC (rev 15082) +++ trunk/reactos/subsys/system/cmd/cmd.rc 2005-05-07 15:58:58 UTC (rev 15083) @@ -11,6 +11,7 @@ #include "En.rc" #include "Fr.rc" + STRINGTABLE DISCARDABLE { STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\ _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-05-07 15:40:03 UTC (rev 15082) +++ trunk/reactos/subsys/system/cmd/date.c 2005-05-07 15:58:58 UTC (rev 15083) @@ -235,7 +235,7 @@ freep (arg); return 0; } - ConErrResPuts(STRING_ERROR_WRONG_DATE); + ConErrResPuts(STRING_DATE_ERROR); } } _____ Modified: trunk/reactos/subsys/system/cmd/path.c --- trunk/reactos/subsys/system/cmd/path.c 2005-05-07 15:40:03 UTC (rev 15082) +++ trunk/reactos/subsys/system/cmd/path.c 2005-05-07 15:58:58 UTC (rev 15083) @@ -48,12 +48,14 @@ { DWORD dwBuffer; LPTSTR pszBuffer; + TCHAR szMsg[RC_STRING_MAX_SIZE]; pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) - { - ConErrResPuts(STRING_PATH_ERROR); + { + LoadString(CMD_ModuleHandle, STRING_VOL_HELP2, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, _T("PATH")); return 0; } else if (dwBuffer > ENV_BUFFER_SIZE) _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-07 15:40:03 UTC (rev 15082) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-07 15:58:58 UTC (rev 15083) @@ -14,7 +14,6 @@ #define STRING_ERROR_CANNOTPIPE 110 #define STRING_ERROR_D_PAUSEMSG 111 #define STRING_ERROR_DRIVER_NOT_READY 112 -#define STRING_ERROR_WRONG_DATE 113 #define STRING_CHOICE_OPTION 200 #define STRING_COPY_OPTION 201 @@ -64,7 +63,6 @@ #define STRING_TIME_ERROR1 348 #define STRING_TYPE_ERROR1 349 #define STRING_WINDOW_ERROR1 350 -#define STRING_SET_ERROR 351 _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-05-07 15:40:03 UTC (rev 15082) +++ trunk/reactos/subsys/system/cmd/set.c 2005-05-07 15:58:58 UTC (rev 15083) @@ -104,7 +104,7 @@ dwBuffer = GetEnvironmentVariable (param, pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) { - LoadString(CMD_ModuleHandle, STRING_SET_ERROR, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_PATH_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf (szMsg, param); return 0; }

1 0

[ion] 15082: FILE_BASIC_INFORMATION is 0x28 bytes and aligned on a 8byte boundary. Thanks to Hartmut for notifying me of a bug
by ion＠svn.reactos.com 07 May '05

07 May '05

FILE_BASIC_INFORMATION is 0x28 bytes and aligned on a 8byte boundary. Thanks to Hartmut for notifying me of a bug Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/include/wine/winternl.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-05-07 15:31:07 UTC (rev 15081) +++ trunk/reactos/include/ddk/iotypes.h 2005-05-07 15:40:03 UTC (rev 15082) @@ -92,6 +92,7 @@ /* STRUCTURE TYPES ***********************************************************/ +#include <pshpack8.h> typedef struct _FILE_BASIC_INFORMATION { LARGE_INTEGER CreationTime; @@ -100,6 +101,7 @@ LARGE_INTEGER ChangeTime; ULONG FileAttributes; } FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; +#include <poppack.h> typedef struct _FILE_STANDARD_INFORMATION { _____ Modified: trunk/reactos/include/wine/winternl.h --- trunk/reactos/include/wine/winternl.h 2005-05-07 15:31:07 UTC (rev 15081) +++ trunk/reactos/include/wine/winternl.h 2005-05-07 15:40:03 UTC (rev 15082) @@ -246,6 +246,7 @@ FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; +#include <pshpack8.h> typedef struct _FILE_BASIC_INFORMATION { LARGE_INTEGER CreationTime; LARGE_INTEGER LastAccessTime; @@ -253,6 +254,7 @@ LARGE_INTEGER ChangeTime; ULONG FileAttributes; } FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; +#include <poppack.h> typedef struct _FILE_STANDARD_INFORMATION { LARGE_INTEGER AllocationSize; _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-05-07 15:31:07 UTC (rev 15081) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-05-07 15:40:03 UTC (rev 15082) @@ -2159,6 +2159,7 @@ WCHAR FileName[1]; } FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; +#include <pshpack8.h> typedef struct _FILE_BASIC_INFORMATION { LARGE_INTEGER CreationTime; LARGE_INTEGER LastAccessTime; @@ -2166,6 +2167,7 @@ LARGE_INTEGER ChangeTime; ULONG FileAttributes; } FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; +#include <poppack.h> typedef struct _FILE_STANDARD_INFORMATION { LARGE_INTEGER AllocationSize;

1 0

[greatlrd] 15081: implement VOID ConOutResPuts (UINT resID), VOID ConErrResPuts (UINT resID) to outpust msg from rc files
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

implement VOID ConOutResPuts (UINT resID), VOID ConErrResPuts (UINT resID) to outpust msg from rc files it take less memmory now, and it is bit faster CMD_ModuleHandle contain GetModuleHandle and it is only execute in main() in cmd it optimze for lite more speed in cmd Langues changes in En.rc follow new strings have been add and can be translate STRING_ERROR_WRONG_DATE STRING_SET_ERROR Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/pause.c Modified: trunk/reactos/subsys/system/cmd/prompt.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/title.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-07 15:31:07 UTC (rev 15081) @@ -559,5 +559,8 @@ 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_ERROR_DRIVER_NOT_READY, "Drive not ready" + +STRING_ERROR_WRONG_DATE, "Invalid date." +STRING_SET_ERROR "CMD: Not in environment '%s'\n" } _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -236,8 +236,7 @@ /* specified routines */ VOID ExpandAlias (LPTSTR cmd, INT maxlen) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ unsigned n = 0, m, i, @@ -280,9 +279,8 @@ { m = _tcslen (ptr->lpSubst); if ((int)(_tcslen (cmd) - len + m - n) > maxlen) - { - LoadString(GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + { + ConErrResPuts(STRING_ALIAS_ERROR); /* the parser won't cause any problems with an empty line */ cmd[0] = _T('\0'); @@ -305,14 +303,12 @@ INT CommandAlias (LPTSTR cmd, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ LPTSTR ptr; if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_ALIAS_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -188,8 +188,7 @@ INT CommandAttrib (LPTSTR cmd, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ LPTSTR *arg; INT argc, i; TCHAR szPath[MAX_PATH]; @@ -205,9 +204,8 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_ATTRIB_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_ATTRIB_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -216,8 +216,7 @@ */ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ HANDLE hFile; hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -230,9 +229,8 @@ #endif if (hFile == INVALID_HANDLE_VALUE) - { - LoadString(GetModuleHandle(NULL), STRING_BATCH_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + { + ConErrResPuts(STRING_BATCH_ERROR); return FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -32,12 +32,9 @@ INT cmd_beep (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - if (_tcsncmp (param, _T("/?"), 2) == 0) - { - LoadString(GetModuleHandle(NULL), STRING_BEEP_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_BEEP_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/call.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -42,17 +42,15 @@ */ INT cmd_call (LPTSTR cmd, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ LPBATCH_CONTEXT n = NULL; #ifdef _DEBUG DebugPrintf (_T("cmd_call: (\'%s\',\'%s\')\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_CALL_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_CALL_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -28,9 +28,8 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_CHCP_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_CHCP_HELP); return 0; } @@ -40,7 +39,7 @@ if (args == 0) { /* display active code page number */ - LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, InputCodePage); return 0; } @@ -48,7 +47,7 @@ if (args >= 2) { /* too many parameters */ - LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, param); return 1; } @@ -61,16 +60,15 @@ if (uNewCodePage == 0) { - LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, arg[0]); freep (arg); return 1; } if (!SetConsoleCP(uNewCodePage)) - { - LoadString(GetModuleHandle(NULL), STRING_CHCP_ERROR4, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + { + ConErrResPuts(STRING_CHCP_ERROR4); } else { _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -123,13 +123,12 @@ TCHAR Ch; DWORD amount,clk; - LoadString(GetModuleHandle(NULL), STRING_CHOICE_OPTION, Options, 2); + LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, Options, 2); lpOptions = Options; if (_tcsncmp (param, _T("/?"), 2) == 0) - { - LoadString(GetModuleHandle(NULL), STRING_CHOICE_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_CHOICE_HELP); return 0; } @@ -168,9 +167,8 @@ lpOptions = &arg[i][2]; if (_tcslen (lpOptions) == 0) - { - LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPuts(szMsg); + { + ConErrResPuts(STRING_CHOICE_ERROR); freep (arg); return 1; } @@ -199,9 +197,8 @@ } if (*s != _T(',')) - { - LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, szMsg, RC_STRING_MAX_SIZE); - ConErrPuts(szMsg); + { + ConErrResPuts(STRING_CHOICE_ERROR_TXT); freep (arg); return 1; } @@ -212,7 +209,7 @@ } else if (arg[i][0] == _T('/')) { - LoadString(GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CHOICE_ERROR_OPTION, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, arg[i]); freep (arg); return 1; _____ Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -32,16 +32,14 @@ #ifdef INCLUDE_CMD_CLS INT cmd_cls (LPTSTR cmd, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; DWORD dwWritten; if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_CLS_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_CLS_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -155,6 +155,7 @@ HANDLE hIn; HANDLE hOut; HANDLE hConsole; +HANDLE CMD_ModuleHandle; static NtQueryInformationProcessProc NtQueryInformationProcessPtr; static NtReadVirtualMemoryProc NtReadVirtualMemoryPtr; @@ -1074,37 +1075,28 @@ #if 0 static VOID ShowCommands (VOID) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - /* print command list */ - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); +{ + /* print command list */ + ConOutResPuts(STRING_CMD_HELP1); PrintCommandList(); - /* print feature list */ - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + /* print feature list */ + ConOutResPuts(STRING_CMD_HELP2); -#ifdef FEATURE_ALIASES - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); +#ifdef FEATURE_ALIASES + ConOutResPuts(STRING_CMD_HELP3); #endif -#ifdef FEATURE_HISTORY - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP4, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); +#ifdef FEATURE_HISTORY + ConOutResPuts(STRING_CMD_HELP4); #endif -#ifdef FEATURE_UNIX_FILENAME_COMPLETION - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP5, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); +#ifdef FEATURE_UNIX_FILENAME_COMPLETION + ConOutResPuts(STRING_CMD_HELP5); #endif -#ifdef FEATURE_DIRECTORY_STACK - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP6, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); +#ifdef FEATURE_DIRECTORY_STACK + ConOutResPuts(STRING_CMD_HELP6); #endif -#ifdef FEATURE_REDIRECTION - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP7, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); +#ifdef FEATURE_REDIRECTION + ConOutResPuts(STRING_CMD_HELP7); #endif ConOutChar(_T('\n')); } @@ -1119,8 +1111,7 @@ */ static VOID Initialize (int argc, TCHAR* argv[]) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; INT i; @@ -1152,9 +1143,8 @@ if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_CMD_HELP8, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_CMD_HELP8); ExitProcess(0); } SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); @@ -1290,20 +1280,20 @@ static VOID Cleanup (int argc, TCHAR *argv[]) { +#ifndef __REACTOS__ TCHAR szMsg[RC_STRING_MAX_SIZE]; +#endif /* run cmdexit.bat */ if (IsExistingFile (_T("cmdexit.bat"))) - { - LoadString(GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + { + ConErrResPuts(STRING_CMD_ERROR5); ParseCommandLine (_T("cmdexit.bat")); } else if (IsExistingFile (_T("\\cmdexit.bat"))) - { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf ((LPTSTR)szMsg); + { + ConErrResPuts (STRING_CMD_ERROR5); ParseCommandLine (_T("\\cmdexit.bat")); } #ifndef __REACTOS__ @@ -1435,6 +1425,7 @@ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); + CMD_ModuleHandle = GetModuleHandle(NULL); /* check switches on command-line */ Initialize(argc, argv); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-05-07 15:31:07 UTC (rev 15081) @@ -124,7 +124,9 @@ VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); +extern HANDLE CMD_ModuleHandle; + /* Prototypes for CMDINPUT.C */ VOID ReadCommand (LPTSTR, INT); @@ -179,6 +181,8 @@ VOID GetScreenSize (PSHORT, PSHORT); VOID SetCursorType (BOOL, BOOL); +VOID ConOutResPuts (UINT resID); +VOID ConErrResPuts (UINT resID); /* Prototypes for COPY.C */ INT cmd_copy (LPTSTR, LPTSTR); _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/color.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -28,10 +28,7 @@ static VOID ColorHelp (VOID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - LoadString(GetModuleHandle(NULL), STRING_COLOR_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + ConOutResPuts(STRING_COLOR_HELP1); } @@ -40,12 +37,11 @@ DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; - TCHAR szMsg[RC_STRING_MAX_SIZE]; + if ((wColor & 0xF) == (wColor &0xF0) >> 4) - { - LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPuts(szMsg); + { + ConErrResPuts(STRING_COLOR_ERROR1); } else { @@ -90,18 +86,17 @@ } if (StringToColor(&wColor, &rest) == FALSE) - { - LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConErrPuts(szMsg); + { + ConErrResPuts(STRING_COLOR_ERROR2); return 1; } - LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, wColor); if ((wColor & 0xF) == (wColor &0xF0) >> 4) { - LoadString(GetModuleHandle(NULL), STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR4, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, wColor); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/console.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -184,6 +184,14 @@ #endif } +VOID ConOutResPuts (UINT resID) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + + ConPuts(szMsg, STD_OUTPUT_HANDLE); +} + VOID ConOutPuts (LPTSTR szText) { ConPuts(szText, STD_OUTPUT_HANDLE); @@ -238,7 +246,7 @@ } else { - LoadString(GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg); } } @@ -258,6 +266,13 @@ } +VOID ConErrResPuts (UINT resID) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPuts(szMsg, STD_ERROR_HANDLE); +} + VOID ConErrPuts (LPTSTR szText) { ConPuts(szText, STD_ERROR_HANDLE); _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -295,16 +295,14 @@ static INT Overwrite (LPTSTR fn) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR inp[10]; LPTSTR p; TCHAR szOptions[4]; - LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, szOptions, 4); - - LoadString(GetModuleHandle(NULL), STRING_COPY_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); + LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szOptions, 4); + ConOutResPuts(STRING_COPY_HELP1); + ConInString(inp, 10); ConOutPuts(_T("")); @@ -347,7 +345,7 @@ NULL, OPEN_EXISTING, 0, NULL); if (hFileSrc == INVALID_HANDLE_VALUE) { - LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, source); return 0; } @@ -375,7 +373,7 @@ { if (!_tcscmp (dest, source)) { - LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, source); CloseHandle (hFileSrc); @@ -450,10 +448,8 @@ WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); if (dwWritten != dwRead) - { - - LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + { + ConErrResPuts(STRING_COPY_ERROR3); free (buffer); CloseHandle (hFileDest); @@ -628,8 +624,7 @@ INT cmd_copy (LPTSTR first, LPTSTR rest) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ TCHAR **p; TCHAR drive_d[_MAX_DRIVE]; TCHAR dir_d[_MAX_DIR]; @@ -650,9 +645,8 @@ DWORD dwFlags = 0; if (!_tcsncmp (rest, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_COPY_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_COPY_HELP2); return 1; } @@ -723,9 +717,8 @@ copied = SetupCopy (sources, p, bMultiple, drive_d, dir_d, file_d, ext_d, &append, &dwFlags); } else if (bDestFound && bWildcards) - { - LoadString(GetModuleHandle(NULL), STRING_COPY_ERROR4, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + { + ConErrResPuts(STRING_COPY_ERROR4); DeleteFileList (sources); freep (p); _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/date.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -53,17 +53,17 @@ { case 0: /* mmddyy */ default: - LoadString(GetModuleHandle(NULL), STRING_DATE_HELP1, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DATE_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); break; case 1: /* ddmmyy */ - LoadString(GetModuleHandle(NULL), STRING_DATE_HELP2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DATE_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); break; case 2: /* yymmdd */ - LoadString(GetModuleHandle(NULL), STRING_DATE_HELP3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DATE_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, cDateSeparator, cDateSeparator); break; } @@ -183,8 +183,7 @@ INT cmd_date (LPTSTR cmd, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ LPTSTR *arg; INT argc; INT i; @@ -192,9 +191,8 @@ INT nDateString = -1; if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_DATE_HELP4, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_DATE_HELP4); return 0; } @@ -237,7 +235,8 @@ freep (arg); return 0; } - ConErrPuts (_T("Invalid date.")); + ConErrResPuts(STRING_ERROR_WRONG_DATE); + } } else @@ -247,9 +246,8 @@ freep (arg); return 0; } - - LoadString(GetModuleHandle(NULL), STRING_DATE_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPuts(szMsg); + + ConErrResPuts(STRING_DATE_ERROR); } freep (arg); _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/del.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -111,9 +111,8 @@ LONG ch; if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_DEL_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); + { + ConOutResPuts(STRING_DEL_HELP1); return 0; } @@ -187,7 +186,7 @@ { if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT))) { - LoadString( GetModuleHandle(NULL), STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); + LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); res = FilePromptYN (szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) @@ -243,10 +242,10 @@ /* ask for deleting */ if (dwFlags & DEL_PROMPT) { - LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, szFullPath); - LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); res = FilePromptYN ((LPTSTR)szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) @@ -257,7 +256,7 @@ if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { - LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, szFullPath); } @@ -313,10 +312,10 @@ // Don't ask if the file doesn't exist, the following code will make the error-msg if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) { - LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR5, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, szFullPath); - LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR6, szMsg, RC_STRING_MAX_SIZE); res = FilePromptYN ((LPTSTR)szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) @@ -330,7 +329,7 @@ #endif if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) { - LoadString(GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_ERROR7, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, szFullPath); } @@ -384,11 +383,11 @@ { if (dwFiles < 2) { - LoadString(GetModuleHandle(NULL), STRING_DEL_HELP3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_HELP3, szMsg, RC_STRING_MAX_SIZE); } else { - LoadString(GetModuleHandle(NULL), STRING_DEL_HELP4, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DEL_HELP4, szMsg, RC_STRING_MAX_SIZE); } ConOutPrintf(szMsg, dwFiles); _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -16,15 +16,13 @@ INT CommandDelay (LPTSTR cmd, LPTSTR param) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ DWORD val; DWORD mul=1000; if (_tcsncmp (param, _T("/?"), 2) == 0) - { - LoadString(GetModuleHandle(NULL), STRING_DELAY_HELP, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_DELAY_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -216,9 +216,7 @@ */ static VOID DirHelp(VOID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + ConOutResPuts(STRING_DIR_HELP1); } @@ -839,17 +837,17 @@ /* print drive info */ if (szVolName[0] != _T('\0')) { - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf((LPTSTR)szMsg, szRootName[0], szVolName); } else { - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, szRootName[0]); } /* print the volume serial number if the return was successful */ - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); ConOutPrintf((LPTSTR)szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); @@ -1086,7 +1084,7 @@ { ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg,ulFiles, szBuffer); } @@ -1094,7 +1092,7 @@ szRoot[0] = szPath[0]; GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); ConOutPrintf((LPTSTR)szMsg,ulDirs, szBuffer); return 0; @@ -1430,7 +1428,7 @@ and if we are in recursive mode... we must have results */ if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) { - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, szTemp); } @@ -1782,7 +1780,7 @@ if (!(lpFlags->bBareFormat) && (dwCount > 0)) { ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); - LoadString(GetModuleHandle(NULL), STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg,dwCountFiles, szBytes); } _____ Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -136,16 +136,14 @@ * pushd command */ INT CommandPushd (LPTSTR first, LPTSTR rest) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ TCHAR curPath[MAX_PATH]; TCHAR newPath[MAX_PATH]; BOOL bChangePath = FALSE; if (!_tcsncmp (rest, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_DIRSTACK_HELP1); return 0; } @@ -171,13 +169,11 @@ */ INT CommandPopd (LPTSTR first, LPTSTR rest) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szPath[MAX_PATH]; if (!_tcsncmp(rest, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_DIRSTACK_HELP2); return 0; } @@ -197,14 +193,12 @@ * dirs command */ INT CommandDirs (LPTSTR first, LPTSTR rest) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; +{ LPDIRENTRY lpDir; if (!_tcsncmp(rest, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_DIRSTACK_HELP3); return 0; } @@ -212,9 +206,8 @@ lpDir = lpStackBottom; if (lpDir == NULL) - { - LoadString(GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_DIRSTACK_HELP4); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-05-07 15:22:32 UTC (rev 15080) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-05-07 15:31:07 UTC (rev 15081) @@ -39,9 +39,8 @@ #endif if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_ECHO_HELP4); return 0; } @@ -62,7 +61,7 @@ ConOutPuts (param); else { - LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, bEcho ? D_ON : D_OFF); } } @@ -73,16 +72,14 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("CommandEchos '%s' : '%s'\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_ECHO_HELP1); return 0; } @@ -95,16 +92,14 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("CommandEchoerr '%s' : '%s'\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(GetModuleHandle(NULL), STRING_ECHO_HELP2, szMsg, RC_STRING_MAX_SIZE); - ConOutPuts(szMsg); + { + ConOutResPuts(STRING_ECHO_HELP2); return 0; } @@ -126,16 +121,14 @@ INT CommandEchoserr (LPTSTR cmd, LPTSTR param) [truncated at 1000 lines; 1326 more skipped]

1 0

[ion] 15071: Update Fast I/O Dispatch routines to proper defintions, and move some stuff into io defines instead of internal native types. Remove outdated data due to newest IFS.
by ion＠svn.reactos.com 07 May '05

07 May '05

Update Fast I/O Dispatch routines to proper defintions, and move some stuff into io defines instead of internal native types. Remove outdated data due to newest IFS. Modified: trunk/reactos/include/ddk/fsfuncs.h Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/include/ntos/rtltypes.h Modified: trunk/reactos/include/ntos/zwtypes.h _____ Modified: trunk/reactos/include/ddk/fsfuncs.h --- trunk/reactos/include/ddk/fsfuncs.h 2005-05-07 01:17:36 UTC (rev 15070) +++ trunk/reactos/include/ddk/fsfuncs.h 2005-05-07 06:09:56 UTC (rev 15071) @@ -5,16 +5,6 @@ #include <ntos/fstypes.h> -/* Some comments on the Prototypes that aren't in the IFS: - -FsRtlMdlReadCompleteDev (FsRtlMdlReadComplete is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param) -FsRtlMdlReadDev (FsRtlMdlReadDev is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param) -FsRtlMdlWriteCompleteDev FsRtlMdlWriteCompleteDev is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param) -FsRtlPrepareMdlWrite (Compared with CcMdlWrite, which is already documented) -FsRtlPrepareMdlWriteDev (Same as above, and add a pointer to device object (Dev suffix) - -*/ - #ifdef __NTOSKRNL__ extern PUCHAR EXPORTED FsRtlLegalAnsiCharacterArray; #else _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-05-07 01:17:36 UTC (rev 15070) +++ trunk/reactos/include/ddk/iotypes.h 2005-05-07 06:09:56 UTC (rev 15071) @@ -92,6 +92,47 @@ /* STRUCTURE TYPES ***********************************************************/ +typedef struct _FILE_BASIC_INFORMATION +{ + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + ULONG FileAttributes; +} FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; + +typedef struct _FILE_STANDARD_INFORMATION +{ + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG NumberOfLinks; + BOOLEAN DeletePending; + BOOLEAN Directory; +} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; + +typedef struct _FILE_NETWORK_OPEN_INFORMATION +{ + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG FileAttributes; +} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; + +typedef struct _COMPRESSED_DATA_INFO +{ + USHORT CompressionFormatAndEngine; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved; + USHORT NumberOfChunks; + ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; +} COMPRESSED_DATA_INFO; + +typedef COMPRESSED_DATA_INFO *PCOMPRESSED_DATA_INFO; typedef struct _ADAPTER_OBJECT ADAPTER_OBJECT, *PADAPTER_OBJECT; typedef struct _IO_SECURITY_CONTEXT @@ -811,59 +852,258 @@ PVOID Reserved; } DEVICE_OBJECT, *PDEVICE_OBJECT; +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_CHECK_IF_POSSIBLE) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN BOOLEAN CheckForReadOperation, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); -/* - * Fast i/o routine type declaration - */ -//typedef NTSTATUS (*PFAST_IO_DISPATCH)(struct _DEVICE_OBJECT*, IRP*); -//FIXME : this type is ok for read and write, but not for all routines typedef BOOLEAN STDCALL_FUNC -(*PFAST_IO_ROUTINE)(IN struct _FILE_OBJECT *FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN ULONG LockKey, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN struct _DEVICE_OBJECT *DeviceObject); +(*PFAST_IO_READ) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); -typedef VOID +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_WRITE) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_QUERY_BASIC_INFO) ( + IN struct _FILE_OBJECT *FileObject, + IN BOOLEAN Wait, + OUT struct _FILE_BASIC_INFORMATION *Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_QUERY_STANDARD_INFO) ( + IN struct _FILE_OBJECT *FileObject, + IN BOOLEAN Wait, + OUT struct _FILE_STANDARD_INFORMATION *Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_LOCK) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN PLARGE_INTEGER Length, + PEPROCESS ProcessId, + ULONG Key, + BOOLEAN FailImmediately, + BOOLEAN ExclusiveLock, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_UNLOCK_SINGLE) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN PLARGE_INTEGER Length, + PEPROCESS ProcessId, + ULONG Key, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_UNLOCK_ALL) ( + IN struct _FILE_OBJECT *FileObject, + PEPROCESS ProcessId, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_UNLOCK_ALL_BY_KEY) ( + IN struct _FILE_OBJECT *FileObject, + PVOID ProcessId, + ULONG Key, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_DEVICE_CONTROL) ( + IN struct _FILE_OBJECT *FileObject, + IN BOOLEAN Wait, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer OPTIONAL, + IN ULONG OutputBufferLength, + IN ULONG IoControlCode, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef VOID STDCALL_FUNC (*PFAST_IO_ACQUIRE_FILE) ( IN struct _FILE_OBJECT *FileObject); -typedef VOID +typedef VOID STDCALL_FUNC (*PFAST_IO_RELEASE_FILE) ( IN struct _FILE_OBJECT *FileObject); -typedef struct _FAST_IO_DISPATCH { - ULONG SizeOfFastIoDispatch; - PFAST_IO_ROUTINE FastIoCheckIfPossible; - PFAST_IO_ROUTINE FastIoRead; - PFAST_IO_ROUTINE FastIoWrite; - PFAST_IO_ROUTINE FastIoQueryBasicInfo; - PFAST_IO_ROUTINE FastIoQueryStandardInfo; - PFAST_IO_ROUTINE FastIoLock; - PFAST_IO_ROUTINE FastIoUnlockSingle; - PFAST_IO_ROUTINE FastIoUnlockAll; - PFAST_IO_ROUTINE FastIoUnlockAllByKey; - PFAST_IO_ROUTINE FastIoDeviceControl; - PFAST_IO_ACQUIRE_FILE AcquireFileForNtCreateSection; - PFAST_IO_RELEASE_FILE ReleaseFileForNtCreateSection; - PFAST_IO_ROUTINE FastIoDetachDevice; - PFAST_IO_ROUTINE FastIoQueryNetworkOpenInfo; - PFAST_IO_ROUTINE AcquireForModWrite; - PFAST_IO_ROUTINE MdlRead; - PFAST_IO_ROUTINE MdlReadComplete; - PFAST_IO_ROUTINE PrepareMdlWrite; - PFAST_IO_ROUTINE MdlWriteComplete; - PFAST_IO_ROUTINE FastIoReadCompressed; - PFAST_IO_ROUTINE FastIoWriteCompressed; - PFAST_IO_ROUTINE MdlReadCompleteCompressed; - PFAST_IO_ROUTINE MdlWriteCompleteCompressed; - PFAST_IO_ROUTINE FastIoQueryOpen; - PFAST_IO_ROUTINE ReleaseForModWrite; - PFAST_IO_ROUTINE AcquireForCcFlush; - PFAST_IO_ROUTINE ReleaseForCcFlush; +typedef VOID STDCALL_FUNC +(*PFAST_IO_DETACH_DEVICE) ( + IN struct _DEVICE_OBJECT *SourceDevice, + IN struct _DEVICE_OBJECT *TargetDevice); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_QUERY_NETWORK_OPEN_INFO) ( + IN struct _FILE_OBJECT *FileObject, + IN BOOLEAN Wait, + OUT struct _FILE_NETWORK_OPEN_INFORMATION *Buffer, + OUT struct _IO_STATUS_BLOCK *IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_MDL_READ) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_MDL_READ_COMPLETE) ( + IN struct _FILE_OBJECT *FileObject, + IN PMDL MdlChain, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_PREPARE_MDL_WRITE) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_MDL_WRITE_COMPLETE) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef NTSTATUS STDCALL_FUNC +(*PFAST_IO_ACQUIRE_FOR_MOD_WRITE) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER EndingOffset, + OUT struct _ERESOURCE **ResourceToRelease, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef NTSTATUS STDCALL_FUNC +(*PFAST_IO_RELEASE_FOR_MOD_WRITE) ( + IN struct _FILE_OBJECT *FileObject, + IN struct _ERESOURCE *ResourceToRelease, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef NTSTATUS STDCALL_FUNC +(*PFAST_IO_ACQUIRE_FOR_CCFLUSH) ( + IN struct _FILE_OBJECT *FileObject, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef NTSTATUS STDCALL_FUNC +(*PFAST_IO_RELEASE_FOR_CCFLUSH) ( + IN struct _FILE_OBJECT *FileObject, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef +BOOLEAN STDCALL_FUNC +(*PFAST_IO_READ_COMPRESSED) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + OUT struct _COMPRESSED_DATA_INFO *CompressedDataInfo, + IN ULONG CompressedDataInfoLength, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_WRITE_COMPRESSED) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN struct _COMPRESSED_DATA_INFO *CompressedDataInfo, + IN ULONG CompressedDataInfoLength, + IN struct _DEVICE_OBJECT *DeviceObject); + + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_MDL_READ_COMPLETE_COMPRESSED) ( + IN struct _FILE_OBJECT *FileObject, + IN PMDL MdlChain, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED) ( + IN struct _FILE_OBJECT *FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef BOOLEAN STDCALL_FUNC +(*PFAST_IO_QUERY_OPEN) ( + IN struct _IRP *Irp, + OUT struct _FILE_NETWORK_OPEN_INFORMATION *NetworkInformation, + IN struct _DEVICE_OBJECT *DeviceObject); + +typedef struct _FAST_IO_DISPATCH +{ + ULONG SizeOfFastIoDispatch; + PFAST_IO_CHECK_IF_POSSIBLE FastIoCheckIfPossible; + PFAST_IO_READ FastIoRead; + PFAST_IO_WRITE FastIoWrite; + PFAST_IO_QUERY_BASIC_INFO FastIoQueryBasicInfo; + PFAST_IO_QUERY_STANDARD_INFO FastIoQueryStandardInfo; + PFAST_IO_LOCK FastIoLock; + PFAST_IO_UNLOCK_SINGLE FastIoUnlockSingle; + PFAST_IO_UNLOCK_ALL FastIoUnlockAll; + PFAST_IO_UNLOCK_ALL_BY_KEY FastIoUnlockAllByKey; + PFAST_IO_DEVICE_CONTROL FastIoDeviceControl; + PFAST_IO_ACQUIRE_FILE AcquireFileForNtCreateSection; + PFAST_IO_RELEASE_FILE ReleaseFileForNtCreateSection; + PFAST_IO_DETACH_DEVICE FastIoDetachDevice; + PFAST_IO_QUERY_NETWORK_OPEN_INFO FastIoQueryNetworkOpenInfo; + PFAST_IO_ACQUIRE_FOR_MOD_WRITE AcquireForModWrite; + PFAST_IO_MDL_READ MdlRead; + PFAST_IO_MDL_READ_COMPLETE MdlReadComplete; + PFAST_IO_PREPARE_MDL_WRITE PrepareMdlWrite; + PFAST_IO_MDL_WRITE_COMPLETE MdlWriteComplete; + PFAST_IO_READ_COMPRESSED FastIoReadCompressed; + PFAST_IO_WRITE_COMPRESSED FastIoWriteCompressed; + PFAST_IO_MDL_READ_COMPLETE_COMPRESSED MdlReadCompleteCompressed; + PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED MdlWriteCompleteCompressed; + PFAST_IO_QUERY_OPEN FastIoQueryOpen; + PFAST_IO_RELEASE_FOR_MOD_WRITE ReleaseForModWrite; + PFAST_IO_ACQUIRE_FOR_CCFLUSH AcquireForCcFlush; + PFAST_IO_RELEASE_FOR_CCFLUSH ReleaseForCcFlush; } FAST_IO_DISPATCH, *PFAST_IO_DISPATCH; /* _____ Modified: trunk/reactos/include/ntos/rtltypes.h --- trunk/reactos/include/ntos/rtltypes.h 2005-05-07 01:17:36 UTC (rev 15070) +++ trunk/reactos/include/ntos/rtltypes.h 2005-05-07 06:09:56 UTC (rev 15071) @@ -121,17 +121,6 @@ ULONG DefaultLength; } RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE; -typedef struct _COMPRESSED_DATA_INFO -{ - USHORT CompressionFormatAndEngine; - UCHAR CompressionUnitShift; - UCHAR ChunkShift; - UCHAR ClusterShift; - UCHAR Reserved; - USHORT NumberOfChunks; - ULONG CompressedChunkSizes[1]; -} COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; - typedef struct _GENERATE_NAME_CONTEXT { USHORT Checksum; _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-05-07 01:17:36 UTC (rev 15070) +++ trunk/reactos/include/ntos/zwtypes.h 2005-05-07 06:09:56 UTC (rev 15071) @@ -830,23 +830,7 @@ // file information -typedef struct _FILE_BASIC_INFORMATION -{ - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - ULONG FileAttributes; -} FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; -typedef struct _FILE_STANDARD_INFORMATION -{ - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG NumberOfLinks; - BOOLEAN DeletePending; - BOOLEAN Directory; -} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; typedef struct _FILE_POSITION_INFORMATION { @@ -868,17 +852,6 @@ LARGE_INTEGER EndOfFile; } FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; -typedef struct _FILE_NETWORK_OPEN_INFORMATION -{ - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG FileAttributes; -} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; - typedef struct _FILE_FULL_EA_INFORMATION { ULONG NextEntryOffset;

2 1

[ekohl] 15080: Implement AssertFail and GetSetFileTimestamp.
by ekohl＠svn.reactos.com 07 May '05

07 May '05

Implement AssertFail and GetSetFileTimestamp. Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/setupapi/setupcab.c _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-05-07 15:19:33 UTC (rev 15079) +++ trunk/reactos/include/wine/setupapi.h 2005-05-07 15:22:32 UTC (rev 15080) @@ -666,6 +666,7 @@ LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); +VOID WINAPI AssertFail(LPSTR, UINT, LPSTR); DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst); BOOL WINAPI DelayedMove(PCWSTR lpExistingFileName, PCWSTR lpNewFileName); @@ -673,6 +674,7 @@ PWSTR WINAPI DuplicateString(PCWSTR lpSrc); BOOL WINAPI EnablePrivilege(PCWSTR lpPrivilegeName, BOOL bEnable); BOOL WINAPI FileExists(PCWSTR lpFileName, PWIN32_FIND_DATAW lpFileFindData); +DWORD WINAPI GetSetFileTimestamp(PCWSTR, PFILETIME, PFILETIME, PFILETIME, BOOLEAN); void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show ); void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show ); #define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection) _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-05-07 15:19:33 UTC (rev 15079) +++ trunk/reactos/lib/setupapi/misc.c 2005-05-07 15:22:32 UTC (rev 15080) @@ -802,6 +802,8 @@ DWORD dwSize = 0x100; DWORD dwError; + TRACE("%s %p\n", debugstr_w(lpFileName), pSecurityDescriptor); + SecDesc = (PSECURITY_DESCRIPTOR)MyMalloc(dwSize); if (SecDesc == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -838,3 +840,97 @@ return dwError; } + + +/********************************************************************** **** + * AssertFail [SETUPAPI.@] + * + * Display an assertion message. + * + * PARAMS + * lpFile [I] File name + * uLine [I] Line number + * lpMessage [I] Assertion message + * + * RETURNS + * Nothing + */ +VOID WINAPI AssertFail(LPSTR lpFile, UINT uLine, LPSTR lpMessage) +{ + CHAR szModule[MAX_PATH]; + CHAR szBuffer[2048]; + LPSTR lpName; + LPSTR lpBuffer; + + TRACE("%s %u %s\n", lpFile, uLine, lpMessage); + + GetModuleFileNameA(hInstance, szModule, MAX_PATH); + lpName = strrchr(szModule, '\\'); + if (lpName != NULL) + lpName++; + else + lpName = szModule; + + wsprintfA(szBuffer, + "Assertion failure at line %u in file %s: %s\n\nCall DebugBreak()?", + uLine, lpFile, lpMessage); + + if (MessageBoxA(NULL, szBuffer, lpName, MB_SETFOREGROUND | + MB_TASKMODAL | MB_ICONERROR | MB_YESNO) == IDYES) + DebugBreak(); +} + + +/********************************************************************** **** + * GetSetFileTimestamp [SETUPAPI.@] + * + * Gets or sets a files timestamp. + * + * PARAMS + * lpFileName [I] File name + * lpCreationTime [I/O] Creation time + * lpLastAccessTime [I/O] Last access time + * lpLastWriteTime [I/O] Last write time + * bSetFileTime [I] TRUE: Set file times + * FALSE: Get file times + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: other + */ +DWORD WINAPI GetSetFileTimestamp(LPCWSTR lpFileName, + LPFILETIME lpCreationTime, + LPFILETIME lpLastAccessTime, + LPFILETIME lpLastWriteTime, + BOOLEAN bSetFileTime) +{ + HANDLE hFile; + BOOLEAN bRet; + DWORD dwError = ERROR_SUCCESS; + + TRACE("%s %p %p %p %x\n", debugstr_w(lpFileName), lpCreationTime, + lpLastAccessTime, lpLastWriteTime, bSetFileTime); + + hFile = CreateFileW(lpFileName, + bSetFileTime ? GENERIC_WRITE : GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + + if (hFile == INVALID_HANDLE_VALUE) + return GetLastError(); + + if (bSetFileTime) + bRet = SetFileTime(hFile, lpCreationTime, lpLastAccessTime, lpLastWriteTime); + else + bRet = GetFileTime(hFile, lpCreationTime, lpLastAccessTime, lpLastWriteTime); + + if (bRet == FALSE) + dwError = GetLastError(); + + CloseHandle(hFile); + + return dwError; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-05-07 15:19:33 UTC (rev 15079) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-05-07 15:22:32 UTC (rev 15080) @@ -2,7 +2,7 @@ @ stub AddMiniIconToList @ stub AddTagToGroupOrderListEntry @ stub AppendStringToMultiSz -@ stub AssertFail +@ stdcall AssertFail(str long str) @ stub CMP_Init_Detection @ stub CMP_RegisterNotification @ stub CMP_Report_LogOn @@ -205,7 +205,7 @@ @ stub FreeStringArray @ stub GetCurrentDriverSigningPolicy @ stub GetNewInfName -@ stub GetSetFileTimestamp +@ stdcall GetSetFileTimestamp(wstr ptr ptr ptr long) @ stub GetVersionInfoFromImage @ stub InfIsFromOemLocation @ stub InstallCatalog @@ -525,6 +525,7 @@ @ stub StringTableLookUpStringEx @ stub StringTableSetExtraData @ stub StringTableStringFromId +@ stub StringTableStringFromIdEx @ stub StringTableTrim @ stdcall TakeOwnershipOfFile(wstr) @ stdcall UnicodeToMultiByte(wstr long) _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-05-07 15:19:33 UTC (rev 15079) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-05-07 15:22:32 UTC (rev 15080) @@ -54,6 +54,7 @@ #define _S_IWRITE 0x0080 #define _S_IREAD 0x0100 +extern HINSTANCE hInstance; extern OSVERSIONINFOW OsVersionInfo; DWORD WINAPI CaptureAndConvertAnsiArg(LPCSTR pSrc, LPWSTR *pDst); _____ Modified: trunk/reactos/lib/setupapi/setupcab.c --- trunk/reactos/lib/setupapi/setupcab.c 2005-05-07 15:19:33 UTC (rev 15079) +++ trunk/reactos/lib/setupapi/setupcab.c 2005-05-07 15:22:32 UTC (rev 15080) @@ -1,4 +1,4 @@ -/* +/* * Setupapi cabinet routines * * Copyright 2003 Gregory M. Turner @@ -20,7 +20,7 @@ * * Many useful traces are commented in code, uncomment them if you have * trouble and run with WINEDEBUG=+setupapi - * + * */ #include <stdarg.h> @@ -44,6 +44,7 @@ #include "wine/debug.h" +HINSTANCE hInstance = 0; OSVERSIONINFOW OsVersionInfo; static HINSTANCE CABINET_hInstance = 0; @@ -544,7 +545,7 @@ TRACE("(CabinetFile == %s, Reserved == %lu, MsgHandler == ^%p, Context == ^%p)\n", debugstr_a(CabinetFile), Reserved, MsgHandler, Context); - if (! LoadCABINETDll()) + if (! LoadCABINETDll()) return FALSE; memset(&my_hsc, 0, sizeof(SC_HSC_A)); @@ -677,6 +678,7 @@ OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); if (!GetVersionExW(&OsVersionInfo)) return FALSE; + hInstance = (HINSTANCE)hinstDLL; break; case DLL_PROCESS_DETACH: UnloadCABINETDll();

1 0

[ion] 15079: Implement FsRtlMdlRead, FsRtlMdlReadComplete, FsMdlReadCompleteDev, FsRtlMdlWRiteComplete, FsRtlMdlWriteCompleteDev, FsRtlPrepareMdlWrite, CcMdlReadCompleted, CcMdlWriteComplete, CcMdlReadCompleteDev
by ion＠svn.reactos.com 07 May '05

07 May '05

Implement FsRtlMdlRead, FsRtlMdlReadComplete, FsMdlReadCompleteDev, FsRtlMdlWRiteComplete, FsRtlMdlWriteCompleteDev, FsRtlPrepareMdlWrite, CcMdlReadCompleted, CcMdlWriteComplete, CcMdlReadCompleteDev Modified: trunk/reactos/ntoskrnl/cc/mdl.c Modified: trunk/reactos/ntoskrnl/fs/mdl.c Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/cc/mdl.c --- trunk/reactos/ntoskrnl/cc/mdl.c 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/cc/mdl.c 2005-05-07 15:19:33 UTC (rev 15079) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -17,11 +17,11 @@ /* FUNCTIONS *****************************************************************/ /* - * @unimplemented + * @implemented */ VOID STDCALL -CcMdlRead ( +CcMdlRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -32,73 +32,119 @@ UNIMPLEMENTED; } -/********************************************************************** +/* * NAME INTERNAL - * CcMdlReadCompleteDev@8 + * CcMdlReadCompleteDev@8 * * DESCRIPTION * * ARGUMENTS - * MdlChain - * DeviceObject - * + * MdlChain + * DeviceObject + * * RETURN VALUE - * None. + * None. * * NOTE * Used by CcMdlReadComplete@8 and FsRtl * */ -VOID STDCALL -CcMdlReadCompleteDev (IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject) +VOID +STDCALL +CcMdlReadCompleteDev(IN PMDL MdlChain, + IN PFILE_OBJECT FileObject) { - UNIMPLEMENTED; + PMDL Mdl; + + /* Free MDLs */ + while ((Mdl = MdlChain)) + { + MdlChain = Mdl->Next; + MmUnlockPages(Mdl); + IoFreeMdl(Mdl); + } } - -/********************************************************************** - * NAME EXPORTED - * CcMdlReadComplete@8 +/* + * NAME EXPORTED + * CcMdlReadComplete@8 * * DESCRIPTION * * ARGUMENTS * * RETURN VALUE - * None. + * None. * * NOTE - * From Bo Branten's ntifs.h v13. + * From Bo Branten's ntifs.h v13. * - * @unimplemented + * @implemented */ -VOID STDCALL -CcMdlReadComplete (IN PFILE_OBJECT FileObject, - IN PMDL MdlChain) +VOID +STDCALL +CcMdlReadComplete(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain) { - PDEVICE_OBJECT DeviceObject = NULL; + PDEVICE_OBJECT DeviceObject = NULL; + PFAST_IO_DISPATCH FastDispatch; - DeviceObject = IoGetRelatedDeviceObject (FileObject); - /* FIXME: try fast I/O first */ - CcMdlReadCompleteDev (MdlChain, - DeviceObject); + /* Get Fast Dispatch Data */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlReadComplete) + { + /* Use the fast path */ + FastDispatch->MdlReadComplete(FileObject, + MdlChain, + DeviceObject); + } + + /* Use slow path */ + CcMdlReadCompleteDev(MdlChain, FileObject); } /* - * @unimplemented + * @implemented */ VOID STDCALL -CcMdlWriteComplete ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain - ) +CcMdlWriteComplete(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) { - UNIMPLEMENTED; + PDEVICE_OBJECT DeviceObject = NULL; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Fast Dispatch Data */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlWriteComplete) + { + /* Use the fast path */ + FastDispatch->MdlWriteComplete(FileObject, + FileOffset, + MdlChain, + DeviceObject); + } + + /* Use slow path */ + CcMdlWriteCompleteDev(FileOffset, MdlChain, FileObject); } +VOID +STDCALL +CcMdlWriteCompleteDev(IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; +} + /* * @unimplemented */ _____ Modified: trunk/reactos/ntoskrnl/fs/mdl.c --- trunk/reactos/ntoskrnl/fs/mdl.c 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/fs/mdl.c 2005-05-07 15:19:33 UTC (rev 15079) @@ -1,19 +1,25 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/fs/mdl.c - * PURPOSE: No purpose listed. + * PURPOSE: Cached MDL Access Helper Routines for File System Drivers * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ +/* INCLUDES ****************************************************************/ + #include <ntoskrnl.h> +#define NDEBUG #include <internal/debug.h> +/* GLOBALS *******************************************************************/ + extern ULONG CcFastReadResourceMiss; extern ULONG CcFastReadNoWait; +/* FUNCTIONS *****************************************************************/ + /* * @implemented */ @@ -54,150 +60,150 @@ CcFastReadNoWait++; } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlRead@24 +/* + * NAME EXPORTED + * FsRtlMdlRead@24 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlMdlRead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ) +FsRtlMdlRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) { - return FALSE; /* FIXME: call FsRtlMdlReadDev ? */ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlRead) + { + /* Use the fast path */ + return FastDispatch->MdlRead(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlRead && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlReadDev(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlReadComplete@8 +/* + * NAME EXPORTED + * FsRtlMdlReadComplete@8 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ -BOOLEAN STDCALL +BOOLEAN +STDCALL FsRtlMdlReadComplete(IN PFILE_OBJECT FileObject, - IN OUT PMDL Mdl) + IN OUT PMDL MdlChain) { - PDEVICE_OBJECT DeviceObject [2] = {NULL}; - PDRIVER_OBJECT DriverObject = NULL; - - /* - * Try fast I/O first - */ - DeviceObject [0] = IoGetRelatedDeviceObject (FileObject); - DriverObject = DeviceObject [0]->DriverObject; - if (NULL != DriverObject->FastIoDispatch) - { -#if 0 - if (IRP_MJ_READ <= DriverObject->FastIoDispatch->Count) - { - return FALSE; - } - if (NULL == DriverObject->FastIoDispatch->Dispatch [IRP_MJ_READ]) - { - return FALSE; - } - return DriverObject->FastIoDispatch->Dispatch - [IRP_MJ_READ] ( - Mdl, - NULL /* FIXME: how to get the IRP? */ - ); -#endif - } - /* - * Default I/O path - */ - DeviceObject [1] = IoGetBaseFileSystemDeviceObject (FileObject); - /* - * Did IoGetBaseFileSystemDeviceObject () - * returned the same device - * IoGetRelatedDeviceObject () returned? - */ - if (DeviceObject [1] != DeviceObject [0]) - { -#if 0 - DriverObject = DeviceObject [1]->DriverObject; - if (NULL != DriverObject->FastIoDispatch) - { - /* - * Check if the driver provides - * IRP_MJ_READ. - */ - if (IRP_MJ_READ <= DriverObject->FastIoDispatch->Count) - { - if (NULL == DriverObject->FastIoDispatch->Dispatch [IRP_MJ_READ]) - { - return FALSE; - } - } - } -#endif - DeviceObject [0] = DeviceObject [1]; - } - return FsRtlMdlReadCompleteDev ( - FileObject, - Mdl, - DeviceObject [0] - ); + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlReadComplete) + { + /* Use the fast path */ + return FastDispatch->MdlReadComplete(FileObject, + MdlChain, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlReadComplete && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlReadCompleteDev(FileObject, MdlChain, DeviceObject); } -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlReadCompleteDev@12 +/* + * NAME EXPORTED + * FsRtlMdlReadCompleteDev@12 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * * NOTE - * From Bo Branten's ntifs.h v13. - * (CcMdlReadCompleteDev declared in internal/cc.h) + * From Bo Branten's ntifs.h v13. + * (CcMdlReadCompleteDev declared in internal/cc.h) * * @implemented */ BOOLEAN STDCALL -FsRtlMdlReadCompleteDev ( - IN PFILE_OBJECT FileObject, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlMdlReadCompleteDev(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) { - FileObject = FileObject; /* unused parameter */ - CcMdlReadCompleteDev (MdlChain, DeviceObject); - return TRUE; + /* Call the Cache Manager */ + CcMdlReadCompleteDev(MdlChain, FileObject); + return TRUE; } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlReadDev@28 +/* + * NAME EXPORTED + * FsRtlMdlReadDev@28 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE @@ -206,99 +212,162 @@ */ BOOLEAN STDCALL -FsRtlMdlReadDev ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlMdlReadDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + UNIMPLEMENTED; + return FALSE; } -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlWriteComplete@12 +/* + * NAME EXPORTED + * FsRtlMdlWriteComplete@12 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlMdlWriteComplete ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain - ) +FsRtlMdlWriteComplete(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) { - return FALSE; /* FIXME: call FsRtlMdlWriteCompleteDev ? */ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->MdlWriteComplete) + { + /* Use the fast path */ + return FastDispatch->MdlWriteComplete(FileObject, + FileOffset, + MdlChain, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->MdlWriteComplete && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlMdlWriteCompleteDev(FileObject, + FileOffset, + MdlChain, + DeviceObject); } - -/********************************************************************** - * NAME EXPORTED - * FsRtlMdlWriteCompleteDev@16 +/* + * NAME EXPORTED + * FsRtlMdlWriteCompleteDev@16 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlMdlWriteCompleteDev ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlMdlWriteCompleteDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + /* Call the Cache Manager */ + CcMdlWriteCompleteDev(FileOffset, MdlChain, FileObject); + return TRUE; } -/********************************************************************** - * NAME EXPORTED - * FsRtlPrepareMdlWrite@24 +/* + * NAME EXPORTED + * FsRtlPrepareMdlWrite@24 * * DESCRIPTION - * + * * ARGUMENTS * * RETURN VALUE * - * @unimplemented + * @implemented */ BOOLEAN STDCALL -FsRtlPrepareMdlWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ) +FsRtlPrepareMdlWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus) { - return FALSE; /* call FsRtlPrepareMdlWriteDev ? */ + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if we support Fast Calls, and check this one */ + if (FastDispatch && FastDispatch->PrepareMdlWrite) + { + /* Use the fast path */ + return FastDispatch->PrepareMdlWrite(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); + } + + /* Get the Base File System (Volume) and Fast Calls */ + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = BaseDeviceObject->DriverObject->FastIoDispatch; + + /* If the Base Device Object has its own FastDispatch Routine, fail */ + if (FastDispatch && FastDispatch->PrepareMdlWrite && + BaseDeviceObject != DeviceObject) + { + return FALSE; + } + + /* No fast path, use slow path */ + return FsRtlPrepareMdlWriteDev(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + DeviceObject); } - -/********************************************************************** - * NAME EXPORTED - * FsRtlPrepareMdlWriteDev@28 +/* + * NAME EXPORTED + * FsRtlPrepareMdlWriteDev@28 * * DESCRIPTION * @@ -310,17 +379,16 @@ */ BOOLEAN STDCALL -FsRtlPrepareMdlWriteDev ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL *MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject - ) +FsRtlPrepareMdlWriteDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + UNIMPLEMENTED; + return FALSE; } _____ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h --- trunk/reactos/ntoskrnl/include/internal/cc.h 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/include/internal/cc.h 2005-05-07 15:19:33 UTC (rev 15079) @@ -62,9 +62,16 @@ CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ } INTERNAL_BCB, *PINTERNAL_BCB; -VOID STDCALL -CcMdlReadCompleteDev (IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject); +VOID +STDCALL +CcMdlReadCompleteDev(IN PMDL MdlChain, + IN PFILE_OBJECT FileObject); + +VOID +STDCALL +CcMdlWriteCompleteDev(IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PFILE_OBJECT FileObject); NTSTATUS CcRosFlushCacheSegment(PCACHE_SEGMENT CacheSegment); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-07 12:04:59 UTC (rev 15078) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-07 15:19:33 UTC (rev 15079) @@ -157,7 +157,10 @@ mov [edi+KTHREAD_KERNEL_STACK], esp mov esp, [esi+KTHREAD_KERNEL_STACK] - /* Change the address space */ + /* + * Sadly, ROS memory management is screwed up, so + * we must change the address space here. + */ mov eax, [esi+KTHREAD_APCSTATE_PROCESS] mov eax, [eax+KPROCESS_DIRECTORY_TABLE_BASE] mov cr3, eax @@ -200,10 +203,6 @@ /* Set current IOPM offset in the TSS */ mov [ebp+KTSS_IOMAPBASE], cx - - /* Change the address space */ - mov eax, [edi+KPROCESS_DIRECTORY_TABLE_BASE] - mov cr3, eax SameProcess:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs