Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[ion] 22755: - Some small changes to some prototypes/names for upcoming functionality.
by ion＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: ion Date: Sun Jul 2 05:29:12 2006 New Revision: 22755 URL: http://svn.reactos.org/svn/reactos?rev=22755&view=rev Log: - Some small changes to some prototypes/names for upcoming functionality. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jul 2 05:29:12 2006 @@ -334,6 +334,16 @@ } SHUTDOWN_ENTRY, *PSHUTDOWN_ENTRY; // +// F/S Notification entry for registered File Systems +// +typedef struct _FS_CHANGE_NOTIFY_ENTRY +{ + LIST_ENTRY FsChangeNotifyList; + PDRIVER_OBJECT DriverObject; + PDRIVER_FS_NOTIFICATION FSDNotificationProc; +} FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; + +// // Called on every visit of a node during a preorder-traversal of the device // node tree. // If the routine returns STATUS_UNSUCCESSFUL the traversal will stop and @@ -559,7 +569,10 @@ NTAPI IopMountVolume( IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount + IN BOOLEAN AllowRawMount, + IN BOOLEAN DeviceIsLocked, + IN BOOLEAN Alertable, + OUT PVPB *Vpb ); PVOID @@ -575,7 +588,7 @@ NTSTATUS NTAPI -IopAttachVpb( +IopCreateVpb( IN PDEVICE_OBJECT DeviceObject ); Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Sun Jul 2 05:29:12 2006 @@ -798,7 +798,7 @@ CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE) { /* Create Vpb */ - IopAttachVpb(CreatedDeviceObject); + IopCreateVpb(CreatedDeviceObject); /* Initialize Lock Event */ KeInitializeEvent(&CreatedDeviceObject->DeviceLock, Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sun Jul 2 05:29:12 2006 @@ -43,6 +43,7 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PFILE_OBJECT FileObject; + PVPB Vpb; DPRINT("IopParseDevice:\n" "DeviceObject : %p\n" "RelatedFileObject : %p\n" @@ -100,7 +101,7 @@ /* Check if it's not already mounted */ if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) { - Status = IopMountVolume(DeviceObject, FALSE); + Status = IopMountVolume(DeviceObject, FALSE, FALSE, FALSE, &Vpb); if (!NT_SUCCESS(Status)) { /* Couldn't mount, fail the lookup */ Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Sun Jul 2 05:29:12 2006 @@ -26,13 +26,6 @@ LIST_ENTRY Entry; } FILE_SYSTEM_OBJECT, *PFILE_SYSTEM_OBJECT; -typedef struct _FS_CHANGE_NOTIFY_ENTRY -{ - LIST_ENTRY FsChangeNotifyList; - PDRIVER_OBJECT DriverObject; - PDRIVER_FS_NOTIFICATION FSDNotificationProc; -} FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; - #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IoInitVpbImplementation) #endif @@ -68,8 +61,8 @@ } NTSTATUS -STDCALL -IopAttachVpb(IN PDEVICE_OBJECT DeviceObject) +NTAPI +IopCreateVpb(IN PDEVICE_OBJECT DeviceObject) { PVPB Vpb; @@ -77,7 +70,7 @@ Vpb = ExAllocatePoolWithTag(NonPagedPool, sizeof(VPB), TAG_VPB); - if (!Vpb) return(STATUS_UNSUCCESSFUL); + if (!Vpb) return STATUS_UNSUCCESSFUL; /* Clear it so we don't waste time manually */ RtlZeroMemory(Vpb, sizeof(VPB)); @@ -87,9 +80,9 @@ Vpb->Size = sizeof(VPB); Vpb->RealDevice = DeviceObject; - /* link it to the Device Object */ + /* Link it to the Device Object */ DeviceObject->Vpb = Vpb; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } VOID @@ -237,7 +230,10 @@ NTSTATUS NTAPI IopMountVolume(IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount) + IN BOOLEAN AllowRawMount, + IN BOOLEAN DeviceIsLocked, + IN BOOLEAN Alertable, + OUT PVPB *Vpb) { PFILE_SYSTEM_OBJECT current; NTSTATUS Status; @@ -341,6 +337,7 @@ PIRP Irp; NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT DevObject; + PVPB NewVpb; KeWaitForSingleObject(&DeviceObject->DeviceLock, Executive, @@ -401,7 +398,7 @@ } /* Start mount sequence */ - Status = IopMountVolume(DeviceObject, AllowRawMount); + Status = IopMountVolume(DeviceObject, AllowRawMount, TRUE, FALSE, &NewVpb); KeSetEvent(&DeviceObject->DeviceLock, IO_NO_INCREMENT, FALSE); return(Status);

1 0

[ion] 22754: - Correct function name
by ion＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: ion Date: Sun Jul 2 05:23:18 2006 New Revision: 22754 URL: http://svn.reactos.org/svn/reactos?rev=22754&view=rev Log: - Correct function name Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sun Jul 2 05:23:18 2006 @@ -100,7 +100,7 @@ /* Check if it's not already mounted */ if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) { - Status = IoMountVolume(DeviceObject, FALSE); + Status = IopMountVolume(DeviceObject, FALSE); if (!NT_SUCCESS(Status)) { /* Couldn't mount, fail the lookup */

1 0

[greatlrd] 22753: remove STYLEX DS_SHELLFONT
by greatlrd＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: greatlrd Date: Sun Jul 2 05:11:07 2006 New Revision: 22753 URL: http://svn.reactos.org/svn/reactos?rev=22753&view=rev Log: remove STYLEX DS_SHELLFONT Modified: trunk/reactos/dll/win32/console/en.rc Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Sun Jul 2 05:11:07 2006 @@ -13,7 +13,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cursor Size", -1, 15, 15, 120, 70 CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", 0x50010009, 25, 25, 90, 10 @@ -41,7 +40,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Font" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 END @@ -50,7 +48,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Layout" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 END @@ -59,7 +56,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 END

1 0

[greatlrd] 22752: revert Revision: 22668 this change is also incorrect. now the rc file is more less okay again
by greatlrd＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: greatlrd Date: Sun Jul 2 04:45:08 2006 New Revision: 22752 URL: http://svn.reactos.org/svn/reactos?rev=22752&view=rev Log: revert Revision: 22668 this change is also incorrect. now the rc file is more less okay again Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/Cz.rc trunk/reactos/base/applications/calc/De.rc trunk/reactos/base/applications/calc/En.rc trunk/reactos/base/applications/calc/Es.rc trunk/reactos/base/applications/calc/Fr.rc trunk/reactos/base/applications/calc/Hu.rc trunk/reactos/base/applications/calc/It.rc trunk/reactos/base/applications/calc/Ja.rc trunk/reactos/base/applications/calc/Nl.rc trunk/reactos/base/applications/calc/Pt.rc trunk/reactos/base/applications/calc/Ru.rc trunk/reactos/base/applications/calc/Sv.rc trunk/reactos/base/applications/calc/Uk.rc trunk/reactos/base/applications/control/Es.rc trunk/reactos/base/applications/control/Fi.rc trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/winemine/De.rc trunk/reactos/base/applications/games/winemine/En.rc trunk/reactos/base/applications/games/winemine/Fr.rc trunk/reactos/base/applications/games/winemine/Nl.rc trunk/reactos/base/applications/games/winemine/Pl.rc trunk/reactos/base/applications/getfirefox/De.rc trunk/reactos/base/applications/getfirefox/En.rc trunk/reactos/base/applications/getfirefox/Fr.rc trunk/reactos/base/applications/getfirefox/Hu.rc trunk/reactos/base/applications/getfirefox/Nl.rc trunk/reactos/base/applications/getfirefox/Ru.rc trunk/reactos/base/applications/getfirefox/Sv.rc trunk/reactos/base/applications/getfirefox/Uk.rc trunk/reactos/base/applications/ibrowser/De.rc trunk/reactos/base/applications/ibrowser/En.rc trunk/reactos/base/applications/ibrowser/Nl.rc trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/msconfig/De.rc trunk/reactos/base/applications/msconfig/En.rc trunk/reactos/base/applications/msconfig/Fr.rc trunk/reactos/base/applications/msconfig/Hu.rc trunk/reactos/base/applications/msconfig/Nl.rc trunk/reactos/base/applications/msconfig/No.rc trunk/reactos/base/applications/notepad/res/Cs.rc trunk/reactos/base/applications/notepad/res/Da.rc trunk/reactos/base/applications/notepad/res/De.rc trunk/reactos/base/applications/notepad/res/En.rc trunk/reactos/base/applications/notepad/res/Es.rc trunk/reactos/base/applications/notepad/res/Fi.rc trunk/reactos/base/applications/notepad/res/Fr.rc trunk/reactos/base/applications/notepad/res/Gr.rc trunk/reactos/base/applications/notepad/res/Hu.rc trunk/reactos/base/applications/notepad/res/It.rc trunk/reactos/base/applications/notepad/res/Ja.rc trunk/reactos/base/applications/notepad/res/Nl.rc trunk/reactos/base/applications/notepad/res/Pl.rc trunk/reactos/base/applications/notepad/res/Pt.rc trunk/reactos/base/applications/notepad/res/Ru.rc trunk/reactos/base/applications/notepad/res/Si.rc trunk/reactos/base/applications/notepad/res/Sk.rc trunk/reactos/base/applications/notepad/res/Sv.rc trunk/reactos/base/applications/notepad/res/Th.rc trunk/reactos/base/applications/notepad/res/Uk.rc trunk/reactos/base/applications/notepad/res/Wa.rc trunk/reactos/base/applications/notepad/res/Zh.rc trunk/reactos/base/applications/regedit/Cz.rc trunk/reactos/base/applications/regedit/De.rc trunk/reactos/base/applications/regedit/En.rc trunk/reactos/base/applications/regedit/Es.rc trunk/reactos/base/applications/regedit/Fr.rc trunk/reactos/base/applications/regedit/Hu.rc trunk/reactos/base/applications/regedit/It.rc trunk/reactos/base/applications/regedit/Ja.rc trunk/reactos/base/applications/regedit/Nl.rc trunk/reactos/base/applications/regedit/Pl.rc trunk/reactos/base/applications/regedit/Pt.rc trunk/reactos/base/applications/regedit/Ru.rc trunk/reactos/base/applications/regedit/Si.rc trunk/reactos/base/applications/regedit/Sv.rc trunk/reactos/base/applications/reporterror/Ja.rc trunk/reactos/base/applications/reporterror/Nl.rc trunk/reactos/base/applications/reporterror/de.rc trunk/reactos/base/applications/reporterror/dk.rc trunk/reactos/base/applications/reporterror/en.rc trunk/reactos/base/applications/reporterror/hu.rc trunk/reactos/base/applications/reporterror/ru.rc trunk/reactos/base/applications/reporterror/sv.rc trunk/reactos/base/applications/screensavers/matrix/matrix.rc trunk/reactos/base/applications/servman/De.rc trunk/reactos/base/applications/servman/En.rc trunk/reactos/base/applications/servman/Ru.rc trunk/reactos/base/applications/sndvol32/Cz.rc trunk/reactos/base/applications/sndvol32/De.rc trunk/reactos/base/applications/sndvol32/En.rc trunk/reactos/base/applications/sndvol32/Fr.rc trunk/reactos/base/applications/sndvol32/Hu.rc trunk/reactos/base/applications/sndvol32/Ja.rc trunk/reactos/base/applications/sndvol32/Nl.rc trunk/reactos/base/applications/sndvol32/Sv.rc trunk/reactos/base/applications/taskmgr/Cz.rc trunk/reactos/base/applications/taskmgr/De.rc trunk/reactos/base/applications/taskmgr/Dk.rc trunk/reactos/base/applications/taskmgr/En.rc trunk/reactos/base/applications/taskmgr/Es.rc trunk/reactos/base/applications/taskmgr/Fr.rc trunk/reactos/base/applications/taskmgr/Hu.rc trunk/reactos/base/applications/taskmgr/Ja.rc trunk/reactos/base/applications/taskmgr/Nl.rc trunk/reactos/base/applications/taskmgr/Sv.rc trunk/reactos/base/applications/taskmgr/Uk.rc trunk/reactos/base/applications/winefile/Sv.rc trunk/reactos/base/applications/winefile/cs.rc trunk/reactos/base/applications/winefile/de.rc trunk/reactos/base/applications/winefile/en.rc trunk/reactos/base/applications/winefile/es.rc trunk/reactos/base/applications/winefile/fr.rc trunk/reactos/base/applications/winefile/hu.rc trunk/reactos/base/applications/winefile/it.rc trunk/reactos/base/applications/winefile/nl.rc trunk/reactos/base/applications/winefile/pl.rc trunk/reactos/base/applications/winefile/pt.rc trunk/reactos/base/applications/winefile/ru.rc trunk/reactos/base/applications/winefile/si.rc trunk/reactos/base/applications/winefile/zh.rc trunk/reactos/base/applications/wordpad/En.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… Modified: trunk/reactos/base/applications/calc/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Cz.… Modified: trunk/reactos/base/applications/calc/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/De.… Modified: trunk/reactos/base/applications/calc/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/En.… Modified: trunk/reactos/base/applications/calc/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Es.… Modified: trunk/reactos/base/applications/calc/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Fr.… Modified: trunk/reactos/base/applications/calc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Hu.… Modified: trunk/reactos/base/applications/calc/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/It.… Modified: trunk/reactos/base/applications/calc/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ja.… Modified: trunk/reactos/base/applications/calc/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Nl.… Modified: trunk/reactos/base/applications/calc/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Pt.… Modified: trunk/reactos/base/applications/calc/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ru.… Modified: trunk/reactos/base/applications/calc/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Sv.… Modified: trunk/reactos/base/applications/calc/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Uk.… Modified: trunk/reactos/base/applications/control/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/control/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/getfirefox/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/ibrowser/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… Modified: trunk/reactos/base/applications/msconfig/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/notepad/res/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/reporterror/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/servman/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/sndvol32/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winefile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…

1 0

[greatlrd] 22751: revert complete wrong changes 22742
by greatlrd＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: greatlrd Date: Sun Jul 2 04:10:13 2006 New Revision: 22751 URL: http://svn.reactos.org/svn/reactos?rev=22751&view=rev Log: revert complete wrong changes 22742 Modified: trunk/reactos/base/applications/calc/Cz.rc trunk/reactos/base/applications/calc/De.rc trunk/reactos/base/applications/calc/En.rc trunk/reactos/base/applications/calc/Es.rc trunk/reactos/base/applications/calc/Fr.rc trunk/reactos/base/applications/calc/Hu.rc trunk/reactos/base/applications/calc/It.rc trunk/reactos/base/applications/calc/Ja.rc trunk/reactos/base/applications/calc/Nl.rc trunk/reactos/base/applications/calc/Pt.rc trunk/reactos/base/applications/calc/Ru.rc trunk/reactos/base/applications/calc/Sv.rc trunk/reactos/base/applications/calc/Uk.rc trunk/reactos/base/applications/control/control.c trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc trunk/reactos/base/applications/games/winemine/De.rc trunk/reactos/base/applications/games/winemine/En.rc trunk/reactos/base/applications/games/winemine/Fr.rc trunk/reactos/base/applications/games/winemine/Nl.rc trunk/reactos/base/applications/games/winemine/Pl.rc trunk/reactos/base/applications/getfirefox/De.rc trunk/reactos/base/applications/getfirefox/En.rc trunk/reactos/base/applications/getfirefox/Fr.rc trunk/reactos/base/applications/getfirefox/Hu.rc trunk/reactos/base/applications/getfirefox/Nl.rc trunk/reactos/base/applications/getfirefox/Ru.rc trunk/reactos/base/applications/getfirefox/Sv.rc trunk/reactos/base/applications/getfirefox/Uk.rc trunk/reactos/base/applications/ibrowser/De.rc trunk/reactos/base/applications/ibrowser/En.rc trunk/reactos/base/applications/ibrowser/Nl.rc trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/msconfig/De.rc trunk/reactos/base/applications/msconfig/En.rc trunk/reactos/base/applications/msconfig/Fr.rc trunk/reactos/base/applications/msconfig/Hu.rc trunk/reactos/base/applications/msconfig/Nl.rc trunk/reactos/base/applications/msconfig/No.rc trunk/reactos/base/applications/notepad/res/Cs.rc trunk/reactos/base/applications/notepad/res/Da.rc trunk/reactos/base/applications/notepad/res/De.rc trunk/reactos/base/applications/notepad/res/En.rc trunk/reactos/base/applications/notepad/res/Es.rc trunk/reactos/base/applications/notepad/res/Fi.rc trunk/reactos/base/applications/notepad/res/Fr.rc trunk/reactos/base/applications/notepad/res/Gr.rc trunk/reactos/base/applications/notepad/res/Hu.rc trunk/reactos/base/applications/notepad/res/It.rc trunk/reactos/base/applications/notepad/res/Ja.rc trunk/reactos/base/applications/notepad/res/Nl.rc trunk/reactos/base/applications/notepad/res/Pl.rc trunk/reactos/base/applications/notepad/res/Pt.rc trunk/reactos/base/applications/notepad/res/Ru.rc trunk/reactos/base/applications/notepad/res/Si.rc trunk/reactos/base/applications/notepad/res/Sk.rc trunk/reactos/base/applications/notepad/res/Sv.rc trunk/reactos/base/applications/notepad/res/Th.rc trunk/reactos/base/applications/notepad/res/Uk.rc trunk/reactos/base/applications/notepad/res/Wa.rc trunk/reactos/base/applications/notepad/res/Zh.rc trunk/reactos/base/applications/regedit/Cz.rc trunk/reactos/base/applications/regedit/De.rc trunk/reactos/base/applications/regedit/En.rc trunk/reactos/base/applications/regedit/Es.rc trunk/reactos/base/applications/regedit/Fr.rc trunk/reactos/base/applications/regedit/Hu.rc trunk/reactos/base/applications/regedit/It.rc trunk/reactos/base/applications/regedit/Ja.rc trunk/reactos/base/applications/regedit/Nl.rc trunk/reactos/base/applications/regedit/Pl.rc trunk/reactos/base/applications/regedit/Pt.rc trunk/reactos/base/applications/regedit/Ru.rc trunk/reactos/base/applications/regedit/Si.rc trunk/reactos/base/applications/regedit/Sv.rc trunk/reactos/base/applications/reporterror/Ja.rc trunk/reactos/base/applications/reporterror/Nl.rc trunk/reactos/base/applications/reporterror/de.rc trunk/reactos/base/applications/reporterror/dk.rc trunk/reactos/base/applications/reporterror/en.rc trunk/reactos/base/applications/reporterror/hu.rc trunk/reactos/base/applications/reporterror/ru.rc trunk/reactos/base/applications/reporterror/sv.rc trunk/reactos/base/applications/screensavers/matrix/matrix.rc trunk/reactos/base/applications/servman/De.rc trunk/reactos/base/applications/servman/En.rc trunk/reactos/base/applications/servman/Ru.rc trunk/reactos/base/applications/sndvol32/Cz.rc trunk/reactos/base/applications/sndvol32/De.rc trunk/reactos/base/applications/sndvol32/En.rc trunk/reactos/base/applications/sndvol32/Fr.rc trunk/reactos/base/applications/sndvol32/Hu.rc trunk/reactos/base/applications/sndvol32/Ja.rc trunk/reactos/base/applications/sndvol32/Nl.rc trunk/reactos/base/applications/sndvol32/Sv.rc trunk/reactos/base/applications/taskmgr/Cz.rc trunk/reactos/base/applications/taskmgr/De.rc trunk/reactos/base/applications/taskmgr/Dk.rc trunk/reactos/base/applications/taskmgr/En.rc trunk/reactos/base/applications/taskmgr/Es.rc trunk/reactos/base/applications/taskmgr/Fr.rc trunk/reactos/base/applications/taskmgr/Hu.rc trunk/reactos/base/applications/taskmgr/Ja.rc trunk/reactos/base/applications/taskmgr/Nl.rc trunk/reactos/base/applications/taskmgr/Sv.rc trunk/reactos/base/applications/taskmgr/Uk.rc trunk/reactos/base/applications/winefile/Sv.rc trunk/reactos/base/applications/winefile/cs.rc trunk/reactos/base/applications/winefile/de.rc trunk/reactos/base/applications/winefile/en.rc trunk/reactos/base/applications/winefile/es.rc trunk/reactos/base/applications/winefile/fr.rc trunk/reactos/base/applications/winefile/hu.rc trunk/reactos/base/applications/winefile/it.rc trunk/reactos/base/applications/winefile/nl.rc trunk/reactos/base/applications/winefile/pl.rc trunk/reactos/base/applications/winefile/pt.rc trunk/reactos/base/applications/winefile/ru.rc trunk/reactos/base/applications/winefile/si.rc trunk/reactos/base/applications/winefile/zh.rc trunk/reactos/base/applications/wordpad/En.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Cz.… Modified: trunk/reactos/base/applications/calc/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/De.… Modified: trunk/reactos/base/applications/calc/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/En.… Modified: trunk/reactos/base/applications/calc/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Es.… Modified: trunk/reactos/base/applications/calc/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Fr.… Modified: trunk/reactos/base/applications/calc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Hu.… Modified: trunk/reactos/base/applications/calc/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/It.… Modified: trunk/reactos/base/applications/calc/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ja.… Modified: trunk/reactos/base/applications/calc/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Nl.… Modified: trunk/reactos/base/applications/calc/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Pt.… Modified: trunk/reactos/base/applications/calc/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ru.… Modified: trunk/reactos/base/applications/calc/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Sv.… Modified: trunk/reactos/base/applications/calc/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Uk.… Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/getfirefox/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/ibrowser/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… Modified: trunk/reactos/base/applications/msconfig/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/notepad/res/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/reporterror/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/servman/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/sndvol32/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winefile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…

1 0

[greatlrd] 22750: Adding langues type (LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US) to en.rc some forget adding it. it is wrong type as well fixing it later. it should be LANG_NETURAL.
by greatlrd＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: greatlrd Date: Sun Jul 2 03:59:33 2006 New Revision: 22750 URL: http://svn.reactos.org/svn/reactos?rev=22750&view=rev Log: Adding langues type (LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US) to en.rc some forget adding it. it is wrong type as well fixing it later. it should be LANG_NETURAL. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Modified: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/en.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/en.rc Sun Jul 2 03:59:33 2006 @@ -1,3 +1,5 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "End Program - " Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Sun Jul 2 03:59:33 2006 @@ -9,6 +9,5 @@ 1 ICON DISCARDABLE res/terminal.ico -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #include "en.rc"

1 0

[ion] 22749: [FORMATTING] - Cleanup formatting before starting to work on the file.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sun Jul 2 02:47:52 2006 New Revision: 22749 URL: http://svn.reactos.org/svn/reactos?rev=22749&view=rev Log: [FORMATTING] - Cleanup formatting before starting to work on the file. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jul 2 02:47:52 2006 @@ -556,7 +556,8 @@ ); NTSTATUS -IoMountVolume( +NTAPI +IopMountVolume( IN PDEVICE_OBJECT DeviceObject, IN BOOLEAN AllowRawMount ); @@ -573,17 +574,19 @@ ); NTSTATUS -STDCALL +NTAPI IopAttachVpb( IN PDEVICE_OBJECT DeviceObject ); VOID +NTAPI IoInitFileSystemImplementation( VOID ); VOID +NTAPI IoInitVpbImplementation( VOID ); @@ -609,6 +612,7 @@ ); VOID +NTAPI IoShutdownRegisteredFileSystems( VOID ); Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Sun Jul 2 02:47:52 2006 @@ -1,11 +1,11 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/fs.c - * PURPOSE: Filesystem functions - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/iomgr/volume.c + * PURPOSE: Volume and File System I/O Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -22,15 +22,15 @@ typedef struct _FILE_SYSTEM_OBJECT { - PDEVICE_OBJECT DeviceObject; - LIST_ENTRY Entry; + PDEVICE_OBJECT DeviceObject; + LIST_ENTRY Entry; } FILE_SYSTEM_OBJECT, *PFILE_SYSTEM_OBJECT; typedef struct _FS_CHANGE_NOTIFY_ENTRY { - LIST_ENTRY FsChangeNotifyList; - PDRIVER_OBJECT DriverObject; - PDRIVER_FS_NOTIFICATION FSDNotificationProc; + LIST_ENTRY FsChangeNotifyList; + PDRIVER_OBJECT DriverObject; + PDRIVER_FS_NOTIFICATION FSDNotificationProc; } FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; #if defined (ALLOC_PRAGMA) @@ -39,28 +39,37 @@ /* GLOBALS ******************************************************************/ -static ERESOURCE FileSystemListLock; -static LIST_ENTRY FileSystemListHead; - -static KGUARDED_MUTEX FsChangeNotifyListLock; -static LIST_ENTRY FsChangeNotifyListHead; - -static VOID -IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, - BOOLEAN DriverActive); - -static KSPIN_LOCK IoVpbLock; -/* FUNCTIONS *****************************************************************/ - -VOID INIT_FUNCTION +ERESOURCE FileSystemListLock; +LIST_ENTRY FileSystemListHead; +KGUARDED_MUTEX FsChangeNotifyListLock; +LIST_ENTRY FsChangeNotifyListHead; +KSPIN_LOCK IoVpbLock; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +INIT_FUNCTION +NTAPI IoInitVpbImplementation(VOID) { KeInitializeSpinLock(&IoVpbLock); +} + +VOID +INIT_FUNCTION +NTAPI +IoInitFileSystemImplementation(VOID) +{ + InitializeListHead(&FileSystemListHead); + ExInitializeResourceLite(&FileSystemListLock); + + InitializeListHead(&FsChangeNotifyListHead); + KeInitializeGuardedMutex(&FsChangeNotifyListLock); } NTSTATUS STDCALL -IopAttachVpb(PDEVICE_OBJECT DeviceObject) +IopAttachVpb(IN PDEVICE_OBJECT DeviceObject) { PVPB Vpb; @@ -68,7 +77,7 @@ Vpb = ExAllocatePoolWithTag(NonPagedPool, sizeof(VPB), TAG_VPB); - if (Vpb == NULL) return(STATUS_UNSUCCESSFUL); + if (!Vpb) return(STATUS_UNSUCCESSFUL); /* Clear it so we don't waste time manually */ RtlZeroMemory(Vpb, sizeof(VPB)); @@ -83,580 +92,491 @@ return(STATUS_SUCCESS); } -VOID INIT_FUNCTION -IoInitFileSystemImplementation(VOID) -{ - InitializeListHead(&FileSystemListHead); - ExInitializeResourceLite(&FileSystemListLock); - - InitializeListHead(&FsChangeNotifyListHead); - KeInitializeGuardedMutex(&FsChangeNotifyListLock); -} - - -VOID +VOID +NTAPI +IopNotifyFileSystemChange(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN DriverActive) +{ + PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; + + KeAcquireGuardedMutex(&FsChangeNotifyListLock); + LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead,FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) + { + (ChangeEntry->FSDNotificationProc)(DeviceObject, DriverActive); + } + KeReleaseGuardedMutex(&FsChangeNotifyListLock); +} + +VOID +NTAPI IoShutdownRegisteredFileSystems(VOID) { - FILE_SYSTEM_OBJECT* current; - PIRP Irp; - KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - DPRINT("IoShutdownRegisteredFileSystems()\n"); - - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - LIST_FOR_EACH(current, &FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - /* send IRP_MJ_SHUTDOWN */ - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, - current->DeviceObject, - NULL, - 0, - 0, - &Event, - &IoStatusBlock); - - Status = IoCallDriver(current->DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - } - } - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); -} - - -static NTSTATUS -IopMountFileSystem(PDEVICE_OBJECT DeviceObject, - PDEVICE_OBJECT DeviceToMount) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - - DPRINT("IopMountFileSystem(DeviceObject 0x%p, DeviceToMount 0x%p)\n", - DeviceObject,DeviceToMount); - - ASSERT_IRQL(PASSIVE_LEVEL); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.MountVolume.Vpb = DeviceToMount->Vpb; - StackPtr->Parameters.MountVolume.DeviceObject = DeviceToMount; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); -} - - -static NTSTATUS + FILE_SYSTEM_OBJECT* current; + PIRP Irp; + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + LIST_FOR_EACH(current, &FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) + { + /* send IRP_MJ_SHUTDOWN */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, + current->DeviceObject, + NULL, + 0, + 0, + &Event, + &IoStatusBlock); + + Status = IoCallDriver(current->DeviceObject,Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + } + } + + ExReleaseResourceLite(&FileSystemListLock); + KeLeaveCriticalRegion(); +} + +NTSTATUS +NTAPI +IopMountFileSystem(IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT DeviceToMount) +{ + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION StackPtr; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + ASSERT_IRQL(PASSIVE_LEVEL); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (Irp==NULL) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + Irp->UserIosb = &IoStatusBlock; + DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); + Irp->UserEvent = &Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; + StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = NULL; + StackPtr->CompletionRoutine = NULL; + + StackPtr->Parameters.MountVolume.Vpb = DeviceToMount->Vpb; + StackPtr->Parameters.MountVolume.DeviceObject = DeviceToMount; + + Status = IoCallDriver(DeviceObject,Irp); + if (Status==STATUS_PENDING) + { + KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); + Status = IoStatusBlock.Status; + } + + return(Status); +} + +NTSTATUS +NTAPI IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject) { - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - - DPRINT("IopLoadFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - ASSERT_IRQL(PASSIVE_LEVEL); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_LOAD_FILE_SYSTEM; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); -} - + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION StackPtr; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + ASSERT_IRQL(PASSIVE_LEVEL); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (Irp==NULL) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; + StackPtr->MinorFunction = IRP_MN_LOAD_FILE_SYSTEM; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = NULL; + StackPtr->CompletionRoutine = NULL; + + Status = IoCallDriver(DeviceObject,Irp); + if (Status==STATUS_PENDING) + { + KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); + Status = IoStatusBlock.Status; + } + + return(Status); +} NTSTATUS -IoMountVolume(IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount) -/* - * FUNCTION: Mounts a logical volume - * ARGUMENTS: - * DeviceObject = Device to mount - * RETURNS: Status - */ -{ - PFILE_SYSTEM_OBJECT current; - NTSTATUS Status; - DEVICE_TYPE MatchingDeviceType; - PDEVICE_OBJECT DevObject; - - ASSERT_IRQL(PASSIVE_LEVEL); - - DPRINT("IoMountVolume(DeviceObject 0x%p AllowRawMount %x)\n", - DeviceObject, AllowRawMount); - - switch (DeviceObject->DeviceType) - { - case FILE_DEVICE_DISK: - case FILE_DEVICE_VIRTUAL_DISK: /* ?? */ - MatchingDeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - break; - - case FILE_DEVICE_CD_ROM: - MatchingDeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - break; - - case FILE_DEVICE_NETWORK: - MatchingDeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; - break; - - case FILE_DEVICE_TAPE: - MatchingDeviceType = FILE_DEVICE_TAPE_FILE_SYSTEM; - break; - - default: - CPRINT("No matching file system type found for device type: %x\n", - DeviceObject->DeviceType); - return(STATUS_UNRECOGNIZED_VOLUME); - } - - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - -restart: - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT, Entry) - { - if (current->DeviceObject->DeviceType != MatchingDeviceType) - { - continue; - } - /* If we are not allowed to mount this volume as a raw filesystem volume +NTAPI +IopMountVolume(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN AllowRawMount) +{ + PFILE_SYSTEM_OBJECT current; + NTSTATUS Status; + DEVICE_TYPE MatchingDeviceType; + PDEVICE_OBJECT DevObject; + ASSERT_IRQL(PASSIVE_LEVEL); + + switch (DeviceObject->DeviceType) + { + case FILE_DEVICE_DISK: + case FILE_DEVICE_VIRTUAL_DISK: /* ?? */ + MatchingDeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; + break; + + case FILE_DEVICE_CD_ROM: + MatchingDeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; + break; + + case FILE_DEVICE_NETWORK: + MatchingDeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; + break; + + case FILE_DEVICE_TAPE: + MatchingDeviceType = FILE_DEVICE_TAPE_FILE_SYSTEM; + break; + + default: + CPRINT("No matching file system type found for device type: %x\n", + DeviceObject->DeviceType); + return(STATUS_UNRECOGNIZED_VOLUME); + } + + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); + + restart: + LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT, Entry) + { + if (current->DeviceObject->DeviceType != MatchingDeviceType) + { + continue; + } + + /* If we are not allowed to mount this volume as a raw filesystem volume then don't try this */ - if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(current->DeviceObject)) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - } - else - { - Status = IopMountFileSystem(current->DeviceObject, - DeviceObject); - } - switch (Status) - { - case STATUS_FS_DRIVER_REQUIRED: - DevObject = current->DeviceObject; - ExReleaseResourceLite(&FileSystemListLock); - Status = IopLoadFileSystem(DevObject); - if (!NT_SUCCESS(Status)) - { - KeLeaveCriticalRegion(); - return(Status); - } - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - goto restart; - - case STATUS_SUCCESS: - DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | - VPB_MOUNTED; - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - return(STATUS_SUCCESS); - - case STATUS_UNRECOGNIZED_VOLUME: - default: - /* do nothing */ - break; - } - } - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - - return(STATUS_UNRECOGNIZED_VOLUME); -} - - -/********************************************************************** - * NAME EXPORTED - * IoVerifyVolume - * - * DESCRIPTION - * Verify the file system type and volume information or mount - * a file system. - * - * ARGUMENTS - * DeviceObject - * Device to verify or mount - * - * AllowRawMount - * ... - * - * RETURN VALUE - * Status - * - * @implemented - */ -NTSTATUS STDCALL + if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(current->DeviceObject)) + { + Status = STATUS_UNRECOGNIZED_VOLUME; + } + else + { + Status = IopMountFileSystem(current->DeviceObject, DeviceObject); + } + + switch (Status) + { + case STATUS_FS_DRIVER_REQUIRED: + DevObject = current->DeviceObject; + ExReleaseResourceLite(&FileSystemListLock); + Status = IopLoadFileSystem(DevObject); + if (!NT_SUCCESS(Status)) + { + KeLeaveCriticalRegion(); + return(Status); + } + ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); + goto restart; + + case STATUS_SUCCESS: + DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | + VPB_MOUNTED; + ExReleaseResourceLite(&FileSystemListLock); + KeLeaveCriticalRegion(); + return(STATUS_SUCCESS); + + case STATUS_UNRECOGNIZED_VOLUME: + default: + /* do nothing */ + break; + } + } + + ExReleaseResourceLite(&FileSystemListLock); + KeLeaveCriticalRegion(); + return(STATUS_UNRECOGNIZED_VOLUME); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI IoVerifyVolume(IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - PDEVICE_OBJECT DevObject; - - DPRINT("IoVerifyVolume(DeviceObject 0x%p AllowRawMount %x)\n", - DeviceObject, AllowRawMount); - - Status = STATUS_SUCCESS; - - KeWaitForSingleObject(&DeviceObject->DeviceLock, - Executive, - KernelMode, - FALSE, - NULL); - - if (DeviceObject->Vpb->Flags & VPB_MOUNTED) - { - /* Issue verify request to the FSD */ - DevObject = DeviceObject->Vpb->DeviceObject; - - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - Irp = IoAllocateIrp(DevObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_VERIFY_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DevObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.VerifyVolume.Vpb = DeviceObject->Vpb; - StackPtr->Parameters.VerifyVolume.DeviceObject = DeviceObject; - - Status = IoCallDriver(DevObject, - Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - if (NT_SUCCESS(Status)) - { - KeSetEvent(&DeviceObject->DeviceLock, - IO_NO_INCREMENT, - FALSE); - return(STATUS_SUCCESS); - } - } - - if (Status == STATUS_WRONG_VOLUME) - { - /* Clean existing VPB. This unmounts the filesystem. */ - DPRINT("Wrong volume!\n"); - - DeviceObject->Vpb->DeviceObject = NULL; - DeviceObject->Vpb->Flags &= ~VPB_MOUNTED; - } - - /* Start mount sequence */ - Status = IoMountVolume(DeviceObject, - AllowRawMount); - - KeSetEvent(&DeviceObject->DeviceLock, - IO_NO_INCREMENT, - FALSE); - - return(Status); -} - - - - -/* - * @implemented - */ -VOID STDCALL + IN BOOLEAN AllowRawMount) +{ + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION StackPtr; + KEVENT Event; + PIRP Irp; + NTSTATUS Status = STATUS_SUCCESS; + PDEVICE_OBJECT DevObject; + + KeWaitForSingleObject(&DeviceObject->DeviceLock, + Executive, + KernelMode, + FALSE, + NULL); + + if (DeviceObject->Vpb->Flags & VPB_MOUNTED) + { + /* Issue verify request to the FSD */ + DevObject = DeviceObject->Vpb->DeviceObject; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoAllocateIrp(DevObject->StackSize, TRUE); + if (Irp==NULL) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; + StackPtr->MinorFunction = IRP_MN_VERIFY_VOLUME; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DevObject; + StackPtr->FileObject = NULL; + StackPtr->CompletionRoutine = NULL; + + StackPtr->Parameters.VerifyVolume.Vpb = DeviceObject->Vpb; + StackPtr->Parameters.VerifyVolume.DeviceObject = DeviceObject; + + Status = IoCallDriver(DevObject, Irp); + if (Status==STATUS_PENDING) + { + KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); + Status = IoStatusBlock.Status; + } + + if (NT_SUCCESS(Status)) + { + KeSetEvent(&DeviceObject->DeviceLock, IO_NO_INCREMENT, FALSE); + return(STATUS_SUCCESS); + } + } + + if (Status == STATUS_WRONG_VOLUME) + { + /* Clean existing VPB. This unmounts the filesystem. */ + DPRINT("Wrong volume!\n"); + + DeviceObject->Vpb->DeviceObject = NULL; + DeviceObject->Vpb->Flags &= ~VPB_MOUNTED; + } + + /* Start mount sequence */ + Status = IopMountVolume(DeviceObject, AllowRawMount); + + KeSetEvent(&DeviceObject->DeviceLock, IO_NO_INCREMENT, FALSE); + return(Status); +} + +/* + * @implemented + */ +VOID +NTAPI IoRegisterFileSystem(IN PDEVICE_OBJECT DeviceObject) { - PFILE_SYSTEM_OBJECT Fs; - - DPRINT("IoRegisterFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - Fs = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FILE_SYSTEM_OBJECT), - TAG_FILE_SYSTEM); - ASSERT(Fs!=NULL); - - Fs->DeviceObject = DeviceObject; - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - - /* The RAW filesystem device objects must be last in the list so the + PFILE_SYSTEM_OBJECT Fs; + + Fs = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FILE_SYSTEM_OBJECT), + TAG_FILE_SYSTEM); + ASSERT(Fs!=NULL); + + Fs->DeviceObject = DeviceObject; + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); + + /* The RAW filesystem device objects must be last in the list so the raw filesystem driver is the last filesystem driver asked to mount a volume. It is always the first filesystem driver registered so we use InsertHeadList() here as opposed to the other alternative InsertTailList(). */ - InsertHeadList(&FileSystemListHead, - &Fs->Entry); - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - - IopNotifyFileSystemChange(DeviceObject, - TRUE); -} - - -/* - * @implemented - */ -VOID STDCALL + InsertHeadList(&FileSystemListHead, &Fs->Entry); + + ExReleaseResourceLite(&FileSystemListLock); + KeLeaveCriticalRegion(); + + IopNotifyFileSystemChange(DeviceObject, TRUE); +} + +/* + * @implemented + */ +VOID +NTAPI IoUnregisterFileSystem(IN PDEVICE_OBJECT DeviceObject) { - PFILE_SYSTEM_OBJECT current; - - DPRINT("IoUnregisterFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - if (current->DeviceObject == DeviceObject) - { - RemoveEntryList(&current->Entry); - ExFreePoolWithTag(current, TAG_FILE_SYSTEM); - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - IopNotifyFileSystemChange(DeviceObject, FALSE); - return; - } - } - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); -} - - -/********************************************************************** - * NAME EXPORTED - * IoGetBaseFileSystemDeviceObject@4 - * - * DESCRIPTION - * Get the DEVICE_OBJECT associated to - * a FILE_OBJECT. - * - * ARGUMENTS - * FileObject - * - * RETURN VALUE - * - * NOTE - * From Bo Branten's ntifs.h v13. - * - * @implemented - */ -PDEVICE_OBJECT STDCALL + PFILE_SYSTEM_OBJECT current; + + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); + + LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) + { + if (current->DeviceObject == DeviceObject) + { + RemoveEntryList(&current->Entry); + ExFreePoolWithTag(current, TAG_FILE_SYSTEM); + ExReleaseResourceLite(&FileSystemListLock); + KeLeaveCriticalRegion(); + IopNotifyFileSystemChange(DeviceObject, FALSE); + return; + } + } + + ExReleaseResourceLite(&FileSystemListLock); + KeLeaveCriticalRegion(); +} + +/* + * @implemented + */ +PDEVICE_OBJECT +NTAPI IoGetBaseFileSystemDeviceObject(IN PFILE_OBJECT FileObject) { - PDEVICE_OBJECT DeviceObject = NULL; - PVPB Vpb = NULL; - - /* - * If the FILE_OBJECT's VPB is defined, - * get the device from it. - */ - if (NULL != (Vpb = FileObject->Vpb)) - { - if (NULL != (DeviceObject = Vpb->DeviceObject)) - { - /* Vpb->DeviceObject DEFINED! */ - return DeviceObject; - } - } - /* - * If that failed, try the VPB - * in the FILE_OBJECT's DeviceObject. - */ - DeviceObject = FileObject->DeviceObject; - if (NULL == (Vpb = DeviceObject->Vpb)) - { - /* DeviceObject->Vpb UNDEFINED! */ - return DeviceObject; - } - /* - * If that pointer to the VPB is again - * undefined, return directly the - * device object from the FILE_OBJECT. - */ - return ( - (NULL == Vpb->DeviceObject) - ? DeviceObject - : Vpb->DeviceObject - ); -} - - -static VOID -IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, - BOOLEAN DriverActive) -{ - PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead,FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - (ChangeEntry->FSDNotificationProc)(DeviceObject, DriverActive); - } - KeReleaseGuardedMutex(&FsChangeNotifyListLock); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL + PDEVICE_OBJECT DeviceObject = NULL; + PVPB Vpb = NULL; + + /* + * If the FILE_OBJECT's VPB is defined, + * get the device from it. + */ + if (NULL != (Vpb = FileObject->Vpb)) + { + if (NULL != (DeviceObject = Vpb->DeviceObject)) + { + /* Vpb->DeviceObject DEFINED! */ + return DeviceObject; + } + } + + /* + * If that failed, try the VPB + * in the FILE_OBJECT's DeviceObject. + */ + DeviceObject = FileObject->DeviceObject; + if (NULL == (Vpb = DeviceObject->Vpb)) + { + /* DeviceObject->Vpb UNDEFINED! */ + return DeviceObject; + } + + /* + * If that pointer to the VPB is again + * undefined, return directly the + * device object from the FILE_OBJECT. + */ + return ((NULL == Vpb->DeviceObject) ? DeviceObject : Vpb->DeviceObject); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI IoRegisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) -{ - PFS_CHANGE_NOTIFY_ENTRY Entry; - - Entry = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FS_CHANGE_NOTIFY_ENTRY), - TAG_FS_CHANGE_NOTIFY); - if (Entry == NULL) - return(STATUS_INSUFFICIENT_RESOURCES); - - Entry->DriverObject = DriverObject; - Entry->FSDNotificationProc = FSDNotificationProc; - - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - InsertHeadList(&FsChangeNotifyListHead, - &Entry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -VOID STDCALL + IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) +{ + PFS_CHANGE_NOTIFY_ENTRY Entry; + + Entry = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FS_CHANGE_NOTIFY_ENTRY), + TAG_FS_CHANGE_NOTIFY); + if (Entry == NULL) return(STATUS_INSUFFICIENT_RESOURCES); + + Entry->DriverObject = DriverObject; + Entry->FSDNotificationProc = FSDNotificationProc; + + KeAcquireGuardedMutex(&FsChangeNotifyListLock); + InsertHeadList(&FsChangeNotifyListHead, &Entry->FsChangeNotifyList); + KeReleaseGuardedMutex(&FsChangeNotifyListLock); + + return(STATUS_SUCCESS); +} + +/* + * @implemented + */ +VOID +NTAPI IoUnregisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) -{ - PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - if (ChangeEntry->DriverObject == DriverObject && - ChangeEntry->FSDNotificationProc == FSDNotificationProc) - { - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - RemoveEntryList(&ChangeEntry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); - - ExFreePoolWithTag(ChangeEntry, TAG_FS_CHANGE_NOTIFY); - return; - } - - } -} - -/* - * @implemented - */ -VOID STDCALL + IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) +{ + PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; + + LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) + { + if (ChangeEntry->DriverObject == DriverObject && + ChangeEntry->FSDNotificationProc == FSDNotificationProc) + { + KeAcquireGuardedMutex(&FsChangeNotifyListLock); + RemoveEntryList(&ChangeEntry->FsChangeNotifyList); + KeReleaseGuardedMutex(&FsChangeNotifyListLock); + + ExFreePoolWithTag(ChangeEntry, TAG_FS_CHANGE_NOTIFY); + return; + } + } +} + +/* + * @implemented + */ +VOID +NTAPI IoAcquireVpbSpinLock(OUT PKIRQL Irql) { - KeAcquireSpinLock(&IoVpbLock, - Irql); -} - - -/* - * @implemented - */ -VOID STDCALL + KeAcquireSpinLock(&IoVpbLock, Irql); +} + +/* + * @implemented + */ +VOID +NTAPI IoReleaseVpbSpinLock(IN KIRQL Irql) { - KeReleaseSpinLock(&IoVpbLock, - Irql); + KeReleaseSpinLock(&IoVpbLock, Irql); } /* EOF */

1 0

[ion] 22748: - Add some more functions that just build IRPs to send to devices into iofunc.c from vpb.c - Add IoCheckQuerySetvolumeInformation to util.c from vpb.c with other similar functions - Add the actual VPB functions in vpc.c to fs.c, and rename fs.c to volume.c, because it already contained Volume APIs, and now with VPB, even more so. It also still contains the FileSystem stuff, which is of course also generically part of "volumes". - Delete vpb.c, rename fs.c to volume.c.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sun Jul 2 01:58:29 2006 New Revision: 22748 URL: http://svn.reactos.org/svn/reactos?rev=22748&view=rev Log: - Add some more functions that just build IRPs to send to devices into iofunc.c from vpb.c - Add IoCheckQuerySetvolumeInformation to util.c from vpb.c with other similar functions - Add the actual VPB functions in vpc.c to fs.c, and rename fs.c to volume.c, because it already contained Volume APIs, and now with VPB, even more so. It also still contains the FileSystem stuff, which is of course also generically part of "volumes". - Delete vpb.c, rename fs.c to volume.c. Added: trunk/reactos/ntoskrnl/io/iomgr/volume.c - copied, changed from r22747, trunk/reactos/ntoskrnl/io/iomgr/fs.c Removed: trunk/reactos/ntoskrnl/io/iomgr/fs.c trunk/reactos/ntoskrnl/io/iomgr/vpb.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Removed: trunk/reactos/ntoskrnl/io/iomgr/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/fs.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/fs.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/fs.c (removed) @@ -1,606 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/fs.c - * PURPOSE: Filesystem functions - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, IoInitFileSystemImplementation) -#endif - -/* TYPES *******************************************************************/ - -typedef struct _FILE_SYSTEM_OBJECT -{ - PDEVICE_OBJECT DeviceObject; - LIST_ENTRY Entry; -} FILE_SYSTEM_OBJECT, *PFILE_SYSTEM_OBJECT; - -typedef struct _FS_CHANGE_NOTIFY_ENTRY -{ - LIST_ENTRY FsChangeNotifyList; - PDRIVER_OBJECT DriverObject; - PDRIVER_FS_NOTIFICATION FSDNotificationProc; -} FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; - -/* GLOBALS ******************************************************************/ - -static ERESOURCE FileSystemListLock; -static LIST_ENTRY FileSystemListHead; - -static KGUARDED_MUTEX FsChangeNotifyListLock; -static LIST_ENTRY FsChangeNotifyListHead; - -static VOID -IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, - BOOLEAN DriverActive); - - -/* FUNCTIONS *****************************************************************/ - -VOID INIT_FUNCTION -IoInitFileSystemImplementation(VOID) -{ - InitializeListHead(&FileSystemListHead); - ExInitializeResourceLite(&FileSystemListLock); - - InitializeListHead(&FsChangeNotifyListHead); - KeInitializeGuardedMutex(&FsChangeNotifyListLock); -} - - -VOID -IoShutdownRegisteredFileSystems(VOID) -{ - FILE_SYSTEM_OBJECT* current; - PIRP Irp; - KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - DPRINT("IoShutdownRegisteredFileSystems()\n"); - - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - LIST_FOR_EACH(current, &FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - /* send IRP_MJ_SHUTDOWN */ - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, - current->DeviceObject, - NULL, - 0, - 0, - &Event, - &IoStatusBlock); - - Status = IoCallDriver(current->DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - } - } - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); -} - - -static NTSTATUS -IopMountFileSystem(PDEVICE_OBJECT DeviceObject, - PDEVICE_OBJECT DeviceToMount) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - - DPRINT("IopMountFileSystem(DeviceObject 0x%p, DeviceToMount 0x%p)\n", - DeviceObject,DeviceToMount); - - ASSERT_IRQL(PASSIVE_LEVEL); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.MountVolume.Vpb = DeviceToMount->Vpb; - StackPtr->Parameters.MountVolume.DeviceObject = DeviceToMount; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); -} - - -static NTSTATUS -IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - - DPRINT("IopLoadFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - ASSERT_IRQL(PASSIVE_LEVEL); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_LOAD_FILE_SYSTEM; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); -} - - -NTSTATUS -IoMountVolume(IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount) -/* - * FUNCTION: Mounts a logical volume - * ARGUMENTS: - * DeviceObject = Device to mount - * RETURNS: Status - */ -{ - PFILE_SYSTEM_OBJECT current; - NTSTATUS Status; - DEVICE_TYPE MatchingDeviceType; - PDEVICE_OBJECT DevObject; - - ASSERT_IRQL(PASSIVE_LEVEL); - - DPRINT("IoMountVolume(DeviceObject 0x%p AllowRawMount %x)\n", - DeviceObject, AllowRawMount); - - switch (DeviceObject->DeviceType) - { - case FILE_DEVICE_DISK: - case FILE_DEVICE_VIRTUAL_DISK: /* ?? */ - MatchingDeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - break; - - case FILE_DEVICE_CD_ROM: - MatchingDeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - break; - - case FILE_DEVICE_NETWORK: - MatchingDeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; - break; - - case FILE_DEVICE_TAPE: - MatchingDeviceType = FILE_DEVICE_TAPE_FILE_SYSTEM; - break; - - default: - CPRINT("No matching file system type found for device type: %x\n", - DeviceObject->DeviceType); - return(STATUS_UNRECOGNIZED_VOLUME); - } - - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - -restart: - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT, Entry) - { - if (current->DeviceObject->DeviceType != MatchingDeviceType) - { - continue; - } - /* If we are not allowed to mount this volume as a raw filesystem volume - then don't try this */ - if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(current->DeviceObject)) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - } - else - { - Status = IopMountFileSystem(current->DeviceObject, - DeviceObject); - } - switch (Status) - { - case STATUS_FS_DRIVER_REQUIRED: - DevObject = current->DeviceObject; - ExReleaseResourceLite(&FileSystemListLock); - Status = IopLoadFileSystem(DevObject); - if (!NT_SUCCESS(Status)) - { - KeLeaveCriticalRegion(); - return(Status); - } - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - goto restart; - - case STATUS_SUCCESS: - DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | - VPB_MOUNTED; - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - return(STATUS_SUCCESS); - - case STATUS_UNRECOGNIZED_VOLUME: - default: - /* do nothing */ - break; - } - } - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - - return(STATUS_UNRECOGNIZED_VOLUME); -} - - -/********************************************************************** - * NAME EXPORTED - * IoVerifyVolume - * - * DESCRIPTION - * Verify the file system type and volume information or mount - * a file system. - * - * ARGUMENTS - * DeviceObject - * Device to verify or mount - * - * AllowRawMount - * ... - * - * RETURN VALUE - * Status - * - * @implemented - */ -NTSTATUS STDCALL -IoVerifyVolume(IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - PDEVICE_OBJECT DevObject; - - DPRINT("IoVerifyVolume(DeviceObject 0x%p AllowRawMount %x)\n", - DeviceObject, AllowRawMount); - - Status = STATUS_SUCCESS; - - KeWaitForSingleObject(&DeviceObject->DeviceLock, - Executive, - KernelMode, - FALSE, - NULL); - - if (DeviceObject->Vpb->Flags & VPB_MOUNTED) - { - /* Issue verify request to the FSD */ - DevObject = DeviceObject->Vpb->DeviceObject; - - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - Irp = IoAllocateIrp(DevObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_VERIFY_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DevObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.VerifyVolume.Vpb = DeviceObject->Vpb; - StackPtr->Parameters.VerifyVolume.DeviceObject = DeviceObject; - - Status = IoCallDriver(DevObject, - Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - if (NT_SUCCESS(Status)) - { - KeSetEvent(&DeviceObject->DeviceLock, - IO_NO_INCREMENT, - FALSE); - return(STATUS_SUCCESS); - } - } - - if (Status == STATUS_WRONG_VOLUME) - { - /* Clean existing VPB. This unmounts the filesystem. */ - DPRINT("Wrong volume!\n"); - - DeviceObject->Vpb->DeviceObject = NULL; - DeviceObject->Vpb->Flags &= ~VPB_MOUNTED; - } - - /* Start mount sequence */ - Status = IoMountVolume(DeviceObject, - AllowRawMount); - - KeSetEvent(&DeviceObject->DeviceLock, - IO_NO_INCREMENT, - FALSE); - - return(Status); -} - - - - -/* - * @implemented - */ -VOID STDCALL -IoRegisterFileSystem(IN PDEVICE_OBJECT DeviceObject) -{ - PFILE_SYSTEM_OBJECT Fs; - - DPRINT("IoRegisterFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - Fs = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FILE_SYSTEM_OBJECT), - TAG_FILE_SYSTEM); - ASSERT(Fs!=NULL); - - Fs->DeviceObject = DeviceObject; - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - - /* The RAW filesystem device objects must be last in the list so the - raw filesystem driver is the last filesystem driver asked to mount - a volume. It is always the first filesystem driver registered so - we use InsertHeadList() here as opposed to the other alternative - InsertTailList(). */ - InsertHeadList(&FileSystemListHead, - &Fs->Entry); - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - - IopNotifyFileSystemChange(DeviceObject, - TRUE); -} - - -/* - * @implemented - */ -VOID STDCALL -IoUnregisterFileSystem(IN PDEVICE_OBJECT DeviceObject) -{ - PFILE_SYSTEM_OBJECT current; - - DPRINT("IoUnregisterFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - if (current->DeviceObject == DeviceObject) - { - RemoveEntryList(&current->Entry); - ExFreePoolWithTag(current, TAG_FILE_SYSTEM); - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - IopNotifyFileSystemChange(DeviceObject, FALSE); - return; - } - } - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); -} - - -/********************************************************************** - * NAME EXPORTED - * IoGetBaseFileSystemDeviceObject@4 - * - * DESCRIPTION - * Get the DEVICE_OBJECT associated to - * a FILE_OBJECT. - * - * ARGUMENTS - * FileObject - * - * RETURN VALUE - * - * NOTE - * From Bo Branten's ntifs.h v13. - * - * @implemented - */ -PDEVICE_OBJECT STDCALL -IoGetBaseFileSystemDeviceObject(IN PFILE_OBJECT FileObject) -{ - PDEVICE_OBJECT DeviceObject = NULL; - PVPB Vpb = NULL; - - /* - * If the FILE_OBJECT's VPB is defined, - * get the device from it. - */ - if (NULL != (Vpb = FileObject->Vpb)) - { - if (NULL != (DeviceObject = Vpb->DeviceObject)) - { - /* Vpb->DeviceObject DEFINED! */ - return DeviceObject; - } - } - /* - * If that failed, try the VPB - * in the FILE_OBJECT's DeviceObject. - */ - DeviceObject = FileObject->DeviceObject; - if (NULL == (Vpb = DeviceObject->Vpb)) - { - /* DeviceObject->Vpb UNDEFINED! */ - return DeviceObject; - } - /* - * If that pointer to the VPB is again - * undefined, return directly the - * device object from the FILE_OBJECT. - */ - return ( - (NULL == Vpb->DeviceObject) - ? DeviceObject - : Vpb->DeviceObject - ); -} - - -static VOID -IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, - BOOLEAN DriverActive) -{ - PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead,FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - (ChangeEntry->FSDNotificationProc)(DeviceObject, DriverActive); - } - KeReleaseGuardedMutex(&FsChangeNotifyListLock); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoRegisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) -{ - PFS_CHANGE_NOTIFY_ENTRY Entry; - - Entry = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FS_CHANGE_NOTIFY_ENTRY), - TAG_FS_CHANGE_NOTIFY); - if (Entry == NULL) - return(STATUS_INSUFFICIENT_RESOURCES); - - Entry->DriverObject = DriverObject; - Entry->FSDNotificationProc = FSDNotificationProc; - - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - InsertHeadList(&FsChangeNotifyListHead, - &Entry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -VOID STDCALL -IoUnregisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) -{ - PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - if (ChangeEntry->DriverObject == DriverObject && - ChangeEntry->FSDNotificationProc == FSDNotificationProc) - { - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - RemoveEntryList(&ChangeEntry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); - - ExFreePoolWithTag(ChangeEntry, TAG_FS_CHANGE_NOTIFY); - return; - } - - } -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 01:58:29 2006 @@ -400,6 +400,86 @@ /* Return the Length and Status. ReturnedLength is NOT optional */ *ReturnedLength = IoStatusBlock.Information; return Status; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +IoQueryVolumeInformation(IN PFILE_OBJECT FileObject, + IN FS_INFORMATION_CLASS FsInformationClass, + IN ULONG Length, + OUT PVOID FsInformation, + OUT PULONG ReturnedLength) +{ + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION StackPtr; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status; + + ASSERT(FsInformation != NULL); + + DPRINT("FsInformation %p\n", FsInformation); + + Status = ObReferenceObjectByPointer(FileObject, + FILE_READ_ATTRIBUTES, + IoFileObjectType, + KernelMode); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, + TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = FsInformation; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = &IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.QueryVolume.Length = Length; + StackPtr->Parameters.QueryVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject, + Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + DPRINT("Status %x\n", Status); + + if (ReturnedLength != NULL) + { + *ReturnedLength = IoStatusBlock.Information; + } + + return(Status); } /* @@ -2421,3 +2501,328 @@ return(STATUS_NOT_IMPLEMENTED); } +/* + * FUNCTION: Queries the volume information + * ARGUMENTS: + * FileHandle = Handle to a file object on the target volume + * ReturnLength = DataWritten + * FsInformation = Caller should supply storage for the information + * structure. + * Length = Size of the information structure + * FsInformationClass = Index to a information structure + * + * FileFsVolumeInformation FILE_FS_VOLUME_INFORMATION + * FileFsLabelInformation FILE_FS_LABEL_INFORMATION + * FileFsSizeInformation FILE_FS_SIZE_INFORMATION + * FileFsDeviceInformation FILE_FS_DEVICE_INFORMATION + * FileFsAttributeInformation FILE_FS_ATTRIBUTE_INFORMATION + * FileFsControlInformation + * FileFsQuotaQueryInformation -- + * FileFsQuotaSetInformation -- + * FileFsMaximumInformation + * + * RETURNS: Status + * + * @implemented + */ + +NTSTATUS STDCALL +NtQueryVolumeInformationFile(IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock, + OUT PVOID FsInformation, + IN ULONG Length, + IN FS_INFORMATION_CLASS FsInformationClass) +{ + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION StackPtr; + PVOID SystemBuffer; + KPROCESSOR_MODE PreviousMode; + + DPRINT("FsInformation %p\n", FsInformation); + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + if (IoStatusBlock != NULL) + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + + if (Length != 0) + { + ProbeForWrite(FsInformation, + Length, + 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + ASSERT(IoStatusBlock != NULL); + ASSERT(FsInformation != NULL); + } + + Status = ObReferenceObjectByHandle(FileHandle, + 0, /* FIXME - depends on the information class! */ + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, + TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (SystemBuffer == NULL) + { + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + + Irp->RequestorMode = PreviousMode; + Irp->AssociatedIrp.SystemBuffer = SystemBuffer; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.QueryVolume.Length = Length; + StackPtr->Parameters.QueryVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject, + Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + PreviousMode, + FALSE, + NULL); + Status = IoStatusBlock->Status; + } + DPRINT("Status %x\n", Status); + + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + DPRINT("Information %lu\n", IoStatusBlock->Information); + RtlCopyMemory(FsInformation, + SystemBuffer, + IoStatusBlock->Information); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + ExFreePool(SystemBuffer); + + return(Status); +} + +/* + * @implemented + */ +NTSTATUS STDCALL +NtSetVolumeInformationFile(IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID FsInformation, + IN ULONG Length, + IN FS_INFORMATION_CLASS FsInformationClass) +{ + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status; + PIO_STACK_LOCATION StackPtr; + PVOID SystemBuffer; + KPROCESSOR_MODE PreviousMode; + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + Status = STATUS_SUCCESS; + _SEH_TRY + { + if (IoStatusBlock != NULL) + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + + if (Length != 0) + { + ProbeForRead(FsInformation, + Length, + 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + ASSERT(IoStatusBlock != NULL); + ASSERT(FsInformation != NULL); + } + + Status = ObReferenceObjectByHandle(FileHandle, + FILE_WRITE_ATTRIBUTES, + NULL, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) + { + return(Status); + } + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (SystemBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto failfreeirp; + } + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + /* no need to probe again */ + RtlCopyMemory(SystemBuffer, + FsInformation, + Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(SystemBuffer, + TAG_SYSB); +failfreeirp: + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return Status; + } + } + else + { + RtlCopyMemory(SystemBuffer, + FsInformation, + Length); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->AssociatedIrp.SystemBuffer = SystemBuffer; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.SetVolume.Length = Length; + StackPtr->Parameters.SetVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject,Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + PreviousMode, + FALSE, + NULL); + _SEH_TRY + { + Status = IoStatusBlock->Status; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + ExFreePool(SystemBuffer); + + return(Status); +} Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c Sun Jul 2 01:58:29 2006 @@ -195,4 +195,16 @@ return Thread->DeviceToVerify; } +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoCheckQuerySetVolumeInformation(IN FS_INFORMATION_CLASS FsInformationClass, + IN ULONG Length, + IN BOOLEAN SetOperation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /* EOF */ Copied: trunk/reactos/ntoskrnl/io/iomgr/volume.c (from r22747, trunk/reactos/ntoskrnl/io/iomgr/fs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/fs.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Sun Jul 2 01:58:29 2006 @@ -33,6 +33,10 @@ PDRIVER_FS_NOTIFICATION FSDNotificationProc; } FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IoInitVpbImplementation) +#endif + /* GLOBALS ******************************************************************/ static ERESOURCE FileSystemListLock; @@ -45,8 +49,39 @@ IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, BOOLEAN DriverActive); - +static KSPIN_LOCK IoVpbLock; /* FUNCTIONS *****************************************************************/ + +VOID INIT_FUNCTION +IoInitVpbImplementation(VOID) +{ + KeInitializeSpinLock(&IoVpbLock); +} + +NTSTATUS +STDCALL +IopAttachVpb(PDEVICE_OBJECT DeviceObject) +{ + PVPB Vpb; + + /* Allocate the Vpb */ + Vpb = ExAllocatePoolWithTag(NonPagedPool, + sizeof(VPB), + TAG_VPB); + if (Vpb == NULL) return(STATUS_UNSUCCESSFUL); + + /* Clear it so we don't waste time manually */ + RtlZeroMemory(Vpb, sizeof(VPB)); + + /* Set the Header and Device Field */ + Vpb->Type = IO_TYPE_VPB; + Vpb->Size = sizeof(VPB); + Vpb->RealDevice = DeviceObject; + + /* link it to the Device Object */ + DeviceObject->Vpb = Vpb; + return(STATUS_SUCCESS); +} VOID INIT_FUNCTION IoInitFileSystemImplementation(VOID) @@ -603,4 +638,25 @@ } } +/* + * @implemented + */ +VOID STDCALL +IoAcquireVpbSpinLock(OUT PKIRQL Irql) +{ + KeAcquireSpinLock(&IoVpbLock, + Irql); +} + + +/* + * @implemented + */ +VOID STDCALL +IoReleaseVpbSpinLock(IN KIRQL Irql) +{ + KeReleaseSpinLock(&IoVpbLock, + Irql); +} + /* EOF */ Removed: trunk/reactos/ntoskrnl/io/iomgr/vpb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/vpb.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/vpb.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/vpb.c (removed) @@ -1,502 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/vpb.c - * PURPOSE: Volume Parameter Block managment - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, IoInitVpbImplementation) -#endif - - -/* GLOBALS *******************************************************************/ - -static KSPIN_LOCK IoVpbLock; - -/* FUNCTIONS *****************************************************************/ - -VOID INIT_FUNCTION -IoInitVpbImplementation(VOID) -{ - KeInitializeSpinLock(&IoVpbLock); -} - -NTSTATUS -STDCALL -IopAttachVpb(PDEVICE_OBJECT DeviceObject) -{ - PVPB Vpb; - - /* Allocate the Vpb */ - Vpb = ExAllocatePoolWithTag(NonPagedPool, - sizeof(VPB), - TAG_VPB); - if (Vpb == NULL) return(STATUS_UNSUCCESSFUL); - - /* Clear it so we don't waste time manually */ - RtlZeroMemory(Vpb, sizeof(VPB)); - - /* Set the Header and Device Field */ - Vpb->Type = IO_TYPE_VPB; - Vpb->Size = sizeof(VPB); - Vpb->RealDevice = DeviceObject; - - /* link it to the Device Object */ - DeviceObject->Vpb = Vpb; - return(STATUS_SUCCESS); -} - -/* - * FUNCTION: Queries the volume information - * ARGUMENTS: - * FileHandle = Handle to a file object on the target volume - * ReturnLength = DataWritten - * FsInformation = Caller should supply storage for the information - * structure. - * Length = Size of the information structure - * FsInformationClass = Index to a information structure - * - * FileFsVolumeInformation FILE_FS_VOLUME_INFORMATION - * FileFsLabelInformation FILE_FS_LABEL_INFORMATION - * FileFsSizeInformation FILE_FS_SIZE_INFORMATION - * FileFsDeviceInformation FILE_FS_DEVICE_INFORMATION - * FileFsAttributeInformation FILE_FS_ATTRIBUTE_INFORMATION - * FileFsControlInformation - * FileFsQuotaQueryInformation -- - * FileFsQuotaSetInformation -- - * FileFsMaximumInformation - * - * RETURNS: Status - * - * @implemented - */ - -NTSTATUS STDCALL -NtQueryVolumeInformationFile(IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass) -{ - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status = STATUS_SUCCESS; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - - DPRINT("FsInformation %p\n", FsInformation); - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - if (IoStatusBlock != NULL) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - - if (Length != 0) - { - ProbeForWrite(FsInformation, - Length, - 1); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - ASSERT(IoStatusBlock != NULL); - ASSERT(FsInformation != NULL); - } - - Status = ObReferenceObjectByHandle(FileHandle, - 0, /* FIXME - depends on the information class! */ - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); - Status = IoStatusBlock->Status; - } - DPRINT("Status %x\n", Status); - - if (NT_SUCCESS(Status)) - { - _SEH_TRY - { - DPRINT("Information %lu\n", IoStatusBlock->Information); - RtlCopyMemory(FsInformation, - SystemBuffer, - IoStatusBlock->Information); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(SystemBuffer); - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoQueryVolumeInformation(IN PFILE_OBJECT FileObject, - IN FS_INFORMATION_CLASS FsInformationClass, - IN ULONG Length, - OUT PVOID FsInformation, - OUT PULONG ReturnedLength) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - - ASSERT(FsInformation != NULL); - - DPRINT("FsInformation %p\n", FsInformation); - - Status = ObReferenceObjectByPointer(FileObject, - FILE_READ_ATTRIBUTES, - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FsInformation; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = &IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - DPRINT("Status %x\n", Status); - - if (ReturnedLength != NULL) - { - *ReturnedLength = IoStatusBlock.Information; - } - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtSetVolumeInformationFile(IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass) -{ - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - Status = STATUS_SUCCESS; - _SEH_TRY - { - if (IoStatusBlock != NULL) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - - if (Length != 0) - { - ProbeForRead(FsInformation, - Length, - 1); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - ASSERT(IoStatusBlock != NULL); - ASSERT(FsInformation != NULL); - } - - Status = ObReferenceObjectByHandle(FileHandle, - FILE_WRITE_ATTRIBUTES, - NULL, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (Status != STATUS_SUCCESS) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto failfreeirp; - } - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - /* no need to probe again */ - RtlCopyMemory(SystemBuffer, - FsInformation, - Length); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(SystemBuffer, - TAG_SYSB); -failfreeirp: - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return Status; - } - } - else - { - RtlCopyMemory(SystemBuffer, - FsInformation, - Length); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.SetVolume.Length = Length; - StackPtr->Parameters.SetVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); - _SEH_TRY - { - Status = IoStatusBlock->Status; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(SystemBuffer); - - return(Status); -} - - -/* - * @implemented - */ -VOID STDCALL -IoAcquireVpbSpinLock(OUT PKIRQL Irql) -{ - KeAcquireSpinLock(&IoVpbLock, - Irql); -} - - -/* - * @implemented - */ -VOID STDCALL -IoReleaseVpbSpinLock(IN KIRQL Irql) -{ - KeReleaseSpinLock(&IoVpbLock, - Irql); -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoCheckQuerySetVolumeInformation(IN FS_INFORMATION_CLASS FsInformationClass, - IN ULONG Length, - IN BOOLEAN SetOperation) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Jul 2 01:58:29 2006 @@ -175,7 +175,6 @@ <file>error.c</file> <file>event.c</file> <file>file.c</file> - <file>fs.c</file> <file>iocomp.c</file> <file>iofunc.c</file> <file>iomgr.c</file> @@ -189,7 +188,7 @@ <file>util.c</file> <file>symlink.c</file> <file>timer.c</file> - <file>vpb.c</file> + <file>volume.c</file> </directory> <directory name="pnpmgr"> <file>plugplay.c</file>

1 0

[ion] 22747: - Move efi.c to \ex, because the functions are related to environmental variables, not I/O. - Create \wmi directory and put wmi.c, since it's the start of a large chunk of the XP+ kernel dedicated to WMI support. - Separate \io into \iomgr and \pnpmgr
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sun Jul 2 01:51:06 2006 New Revision: 22747 URL: http://svn.reactos.org/svn/reactos?rev=22747&view=rev Log: - Move efi.c to \ex, because the functions are related to environmental variables, not I/O. - Create \wmi directory and put wmi.c, since it's the start of a large chunk of the XP+ kernel dedicated to WMI support. - Separate \io into \iomgr and \pnpmgr Added: trunk/reactos/ntoskrnl/ex/efi.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/efi.c trunk/reactos/ntoskrnl/io/iomgr/ trunk/reactos/ntoskrnl/io/iomgr/adapter.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/adapter.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/arcname.c trunk/reactos/ntoskrnl/io/iomgr/bootlog.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/bootlog.c trunk/reactos/ntoskrnl/io/iomgr/controller.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/controller.c trunk/reactos/ntoskrnl/io/iomgr/device.c - copied, changed from r22746, trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/deviface.c trunk/reactos/ntoskrnl/io/iomgr/disk.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/disk.c trunk/reactos/ntoskrnl/io/iomgr/driver.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/driver.c trunk/reactos/ntoskrnl/io/iomgr/error.c - copied unchanged from r22734, trunk/reactos/ntoskrnl/io/error.c trunk/reactos/ntoskrnl/io/iomgr/event.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/event.c trunk/reactos/ntoskrnl/io/iomgr/file.c - copied unchanged from r22740, trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/iomgr/fs.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/fs.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/iowork.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iowork.c trunk/reactos/ntoskrnl/io/iomgr/irp.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/irp.c trunk/reactos/ntoskrnl/io/iomgr/irq.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/irq.c trunk/reactos/ntoskrnl/io/iomgr/mdl.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/mdl.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/rawfs.c trunk/reactos/ntoskrnl/io/iomgr/remlock.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/remlock.c trunk/reactos/ntoskrnl/io/iomgr/resource.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/resource.c trunk/reactos/ntoskrnl/io/iomgr/symlink.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/symlink.c trunk/reactos/ntoskrnl/io/iomgr/timer.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/timer.c trunk/reactos/ntoskrnl/io/iomgr/util.c - copied unchanged from r22735, trunk/reactos/ntoskrnl/io/util.c trunk/reactos/ntoskrnl/io/iomgr/vpb.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/vpb.c trunk/reactos/ntoskrnl/io/pnpmgr/ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnpdma.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c - copied unchanged from r22744, trunk/reactos/ntoskrnl/io/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnpnotify.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnproot.c trunk/reactos/ntoskrnl/wmi/ trunk/reactos/ntoskrnl/wmi/wmi.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/wmi.c Removed: trunk/reactos/ntoskrnl/io/adapter.c trunk/reactos/ntoskrnl/io/arcname.c trunk/reactos/ntoskrnl/io/bootlog.c trunk/reactos/ntoskrnl/io/controller.c trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/deviface.c trunk/reactos/ntoskrnl/io/disk.c trunk/reactos/ntoskrnl/io/driver.c trunk/reactos/ntoskrnl/io/efi.c trunk/reactos/ntoskrnl/io/error.c trunk/reactos/ntoskrnl/io/event.c trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/fs.c trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/iofunc.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/iowork.c trunk/reactos/ntoskrnl/io/irp.c trunk/reactos/ntoskrnl/io/irq.c trunk/reactos/ntoskrnl/io/mdl.c trunk/reactos/ntoskrnl/io/plugplay.c trunk/reactos/ntoskrnl/io/pnpdma.c trunk/reactos/ntoskrnl/io/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpnotify.c trunk/reactos/ntoskrnl/io/pnpreport.c trunk/reactos/ntoskrnl/io/pnproot.c trunk/reactos/ntoskrnl/io/rawfs.c trunk/reactos/ntoskrnl/io/remlock.c trunk/reactos/ntoskrnl/io/resource.c trunk/reactos/ntoskrnl/io/symlink.c trunk/reactos/ntoskrnl/io/timer.c trunk/reactos/ntoskrnl/io/util.c trunk/reactos/ntoskrnl/io/vpb.c trunk/reactos/ntoskrnl/io/wmi.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Removed: trunk/reactos/ntoskrnl/io/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/adapter.c?rev=… Removed: trunk/reactos/ntoskrnl/io/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/arcname.c?rev=… Removed: trunk/reactos/ntoskrnl/io/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/bootlog.c?rev=… Removed: trunk/reactos/ntoskrnl/io/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/controller.c?r… Removed: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/deviface.c?rev… Removed: trunk/reactos/ntoskrnl/io/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/disk.c?rev=227… Removed: trunk/reactos/ntoskrnl/io/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/driver.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/efi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/efi.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/error.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/event.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=227… Removed: trunk/reactos/ntoskrnl/io/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/fs.c?rev=22746… Removed: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iofunc.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=22… Copied: trunk/reactos/ntoskrnl/io/iomgr/device.c (from r22746, trunk/reactos/ntoskrnl/io/device.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… Removed: trunk/reactos/ntoskrnl/io/iowork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iowork.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irq.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/mdl.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/plugplay.c?rev… Removed: trunk/reactos/ntoskrnl/io/pnpdma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpdma.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpnotify.c?re… Removed: trunk/reactos/ntoskrnl/io/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpreport.c?re… Removed: trunk/reactos/ntoskrnl/io/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnproot.c?rev=… Removed: trunk/reactos/ntoskrnl/io/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/rawfs.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/remlock.c?rev=… Removed: trunk/reactos/ntoskrnl/io/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/resource.c?rev… Removed: trunk/reactos/ntoskrnl/io/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/symlink.c?rev=… Removed: trunk/reactos/ntoskrnl/io/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/timer.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/util.c?rev=227… Removed: trunk/reactos/ntoskrnl/io/vpb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/vpb.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/wmi.c?rev=2274… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[ion] 22746: - Add definitions for additional DOE flags to NDK. - I/O Packet APIs improvements Part 2: - Implement IoSetStartIoAttributes - Obey StartIo Flags set by IoSetStartIoAttributes and change Packet functions to Windows XP/2003 semantics by supporting non-cancelable packets and deferred Start I/O calling.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sun Jul 2 01:29:50 2006 New Revision: 22746 URL: http://svn.reactos.org/svn/reactos?rev=22746&view=rev Log: - Add definitions for additional DOE flags to NDK. - I/O Packet APIs improvements Part 2: - Implement IoSetStartIoAttributes - Obey StartIo Flags set by IoSetStartIoAttributes and change Packet functions to Windows XP/2003 semantics by supporting non-cancelable packets and deferred Start I/O calling. Modified: trunk/reactos/include/ndk/iotypes.h trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Sun Jul 2 01:29:50 2006 @@ -123,6 +123,15 @@ #define DOE_REMOVE_PENDING 0x4 #define DOE_REMOVE_PROCESSED 0x8 #define DOE_START_PENDING 0x10 + +// +// Device Object StartIo Flags +// +#define DOE_SIO_NO_KEY 0x20 +#define DOE_SIO_WITH_KEY 0x40 +#define DOE_SIO_CANCELABLE 0x80 +#define DOE_SIO_DEFERRED 0x100 +#define DOE_SIO_NO_CANCEL 0x200 // // Device Node Flags Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sun Jul 2 01:29:50 2006 @@ -358,6 +358,171 @@ } } +VOID +NTAPI +IopStartNextPacketByKey(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable, + IN ULONG Key) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, Key); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); + DeviceObject->CurrentIrp = Irp; + + /* Check if this is a cancelable packet */ + if (Cancelable) + { + /* Check if the caller requested no cancellation */ + if (IoGetDevObjExtension(DeviceObject)->StartIoFlags & + DOE_SIO_NO_CANCEL) + { + /* He did, so remove the cancel routine */ + Irp->CancelRoutine = NULL; + } + + /* Release the cancel lock */ + IoReleaseCancelSpinLock(OldIrql); + } + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } +} + +VOID +NTAPI +IopStartNextPacket(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); + DeviceObject->CurrentIrp = Irp; + + /* Check if this is a cancelable packet */ + if (Cancelable) + { + /* Check if the caller requested no cancellation */ + if (IoGetDevObjExtension(DeviceObject)->StartIoFlags & + DOE_SIO_NO_CANCEL) + { + /* He did, so remove the cancel routine */ + Irp->CancelRoutine = NULL; + } + + /* Release the cancel lock */ + IoReleaseCancelSpinLock(OldIrql); + } + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } +} + +VOID +NTAPI +IopStartNextPacketByKeyEx(IN PDEVICE_OBJECT DeviceObject, + IN ULONG Key, + IN ULONG Flags) +{ + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + ULONG CurrentKey = Key; + ULONG CurrentFlags = Flags; + + /* Get the device extension and start the packet loop */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + while (TRUE) + { + /* Increase the count */ + if (InterlockedIncrement(&DeviceExtension->StartIoCount) > 1) + { + /* + * We've already called the routine once... + * All we have to do is save the key and add the new flags + */ + DeviceExtension->StartIoFlags |= CurrentFlags; + DeviceExtension->StartIoKey = CurrentKey; + } + else + { + /* Mask out the current packet flags and key */ + DeviceExtension->StartIoFlags &= ~(DOE_SIO_WITH_KEY | + DOE_SIO_NO_KEY | + DOE_SIO_CANCELABLE); + DeviceExtension->StartIoKey = 0; + + /* Check if this is a packet start with key */ + if (Flags & DOE_SIO_WITH_KEY) + { + /* Start the packet with a key */ + IopStartNextPacketByKey(DeviceObject, + (DOE_SIO_CANCELABLE) ? TRUE : FALSE, + CurrentKey); + } + else if (Flags & DOE_SIO_NO_KEY) + { + /* Start the packet */ + IopStartNextPacket(DeviceObject, + (DOE_SIO_CANCELABLE) ? TRUE : FALSE); + } + } + + /* Decrease the Start I/O count and check if it's 0 now */ + if (!InterlockedDecrement(&DeviceExtension->StartIoCount)) + { + /* Get the current active key and flags */ + CurrentKey = DeviceExtension->StartIoKey; + CurrentFlags = DeviceExtension->StartIoFlags & (DOE_SIO_WITH_KEY | + DOE_SIO_NO_KEY | + DOE_SIO_CANCELABLE); + + /* Check if we should still loop */ + if (!(CurrentFlags & (DOE_SIO_WITH_KEY | DOE_SIO_NO_KEY))) break; + } + else + { + /* There are still Start I/Os active, so quit this loop */ + break; + } + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -1129,15 +1294,22 @@ } /* - * @unimplemented + * @implemented */ VOID -STDCALL +NTAPI IoSetStartIoAttributes(IN PDEVICE_OBJECT DeviceObject, IN BOOLEAN DeferredStartIo, IN BOOLEAN NonCancelable) { - UNIMPLEMENTED; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the Device Extension */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + + /* Set the flags the caller requested */ + DeviceExtension->StartIoFlags |= (DeferredStartIo) ? DOE_SIO_DEFERRED : 0; + DeviceExtension->StartIoFlags |= (NonCancelable) ? DOE_SIO_NO_CANCEL : 0; } /* @@ -1149,34 +1321,24 @@ IN BOOLEAN Cancelable, IN ULONG Key) { - PKDEVICE_QUEUE_ENTRY Entry; - PIRP Irp; - KIRQL OldIrql; - - /* Acquire the cancel lock if this is cancelable */ - if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); - - /* Clear the current IRP */ - DeviceObject->CurrentIrp = NULL; - - /* Remove an entry from the queue */ - Entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, Key); - if (Entry) - { - /* Get the IRP and set it */ - Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); - DeviceObject->CurrentIrp = Irp; - - /* Release the cancel lock if we had acquired it */ - if (Cancelable) IoReleaseCancelSpinLock(OldIrql); - - /* Call the Start I/O Routine */ - DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the Device Extension */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + + /* Check if deferred start was requested */ + if (DeviceExtension->StartIoFlags & DOE_SIO_DEFERRED) + { + /* Call our internal function to handle the defered case */ + return IopStartNextPacketByKeyEx(DeviceObject, + Key, + DOE_SIO_WITH_KEY | + (Cancelable) ? DOE_SIO_CANCELABLE : 0); } else { - /* Otherwise, release the cancel lock if we had acquired it */ - if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + /* Call the normal routine */ + return IopStartNextPacketByKey(DeviceObject, Cancelable, Key); } } @@ -1188,31 +1350,24 @@ IoStartNextPacket(IN PDEVICE_OBJECT DeviceObject, IN BOOLEAN Cancelable) { - PKDEVICE_QUEUE_ENTRY Entry; - PIRP Irp; - KIRQL OldIrql; - - /* Acquire the cancel lock if this is cancelable */ - if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); - - /* Clear the current IRP */ - DeviceObject->CurrentIrp = NULL; - - /* Remove an entry from the queue */ - Entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); - if (Entry) - { - /* Get the IRP and set it */ - Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); - DeviceObject->CurrentIrp = Irp; - - /* Call the Start I/O Routine */ - DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the Device Extension */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + + /* Check if deferred start was requested */ + if (DeviceExtension->StartIoFlags & DOE_SIO_DEFERRED) + { + /* Call our internal function to handle the defered case */ + return IopStartNextPacketByKeyEx(DeviceObject, + 0, + DOE_SIO_NO_KEY | + (Cancelable) ? DOE_SIO_CANCELABLE : 0); } else { - /* Otherwise, release the cancel lock if we had acquired it */ - if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + /* Call the normal routine */ + return IopStartNextPacket(DeviceObject, Cancelable); } } @@ -1261,8 +1416,20 @@ /* Set the IRP */ DeviceObject->CurrentIrp = Irp; - /* Release the cancel lock if we had a cancel function */ - if (CancelFunction) IoReleaseCancelSpinLock(CancelIrql); + /* Check if this is a cancelable packet */ + if (CancelFunction) + { + /* Check if the caller requested no cancellation */ + if (IoGetDevObjExtension(DeviceObject)->StartIoFlags & + DOE_SIO_NO_CANCEL) + { + /* He did, so remove the cancel routine */ + Irp->CancelRoutine = NULL; + } + + /* Release the cancel lock */ + IoReleaseCancelSpinLock(OldIrql); + } /* Call the Start I/O function */ DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006