Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[gedmurphy] 24573: - test app to display both the system and device image lists. - this app confirms the overlay icons in the device image list are part of the list.
by gedmurphy＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: gedmurphy Date: Thu Oct 19 20:55:11 2006 New Revision: 24573 URL: http://svn.reactos.org/svn/reactos?rev=24573&view=rev Log: - test app to display both the system and device image lists. - this app confirms the overlay icons in the device image list are part of the list. Added: trunk/rosapps/tests/Imagelistviewer/ trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild trunk/rosapps/tests/Imagelistviewer/main.c trunk/rosapps/tests/Imagelistviewer/res.rc trunk/rosapps/tests/Imagelistviewer/resource.h Modified: trunk/rosapps/tests/directory.rbuild Added: trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/imag… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild (added) +++ trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild Thu Oct 19 20:55:11 2006 @@ -1,0 +1,12 @@ +<module name="imagelistviewer" type="win32gui" installbase="bin" installname="imagelistviewer.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <include base="imagelistviewer">.</include> + <library>kernel32</library> + <library>user32</library> + <library>setupapi</library> + <library>comctl32</library> + <file>main.c</file> + <file>res.rc</file> +</module> Added: trunk/rosapps/tests/Imagelistviewer/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/main… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/main.c (added) +++ trunk/rosapps/tests/Imagelistviewer/main.c Thu Oct 19 20:55:11 2006 @@ -1,0 +1,145 @@ +#include <windows.h> +#include <setupapi.h> +#include <tchar.h> +#include "resource.h" + +typedef BOOL (WINAPI * SH_GIL_PROC)(HIMAGELIST *phLarge, HIMAGELIST *phSmall); +typedef BOOL (WINAPI * FII_PROC)(BOOL fFullInit); + +/*** Shell32 undoc'd functions ***/ + /* Shell_GetImageLists @71 */ + /* FileIconInit @660 */ + +BOOL +DisplayImageList(HWND hwnd, + UINT uID) +{ + HWND hLV; + SP_CLASSIMAGELIST_DATA ImageListData; + LV_ITEM lvItem; + TCHAR Buf[6]; + INT ImageListCount = -1; + INT i = 0; + + hLV = GetDlgItem(hwnd, IDC_LSTVIEW); + (void)ListView_DeleteAllItems(hLV); + + if (uID == IDC_SYSTEM) + { + HIMAGELIST hLarge, hSmall; + HMODULE hShell32; + SH_GIL_PROC Shell_GetImageLists; + FII_PROC FileIconInit; + + hShell32 = LoadLibrary(_T("shell32.dll")); + if(hShell32 == NULL) + return FALSE; + + Shell_GetImageLists = (SH_GIL_PROC)GetProcAddress(hShell32, (LPCSTR)71); + FileIconInit = (FII_PROC)GetProcAddress(hShell32, (LPCSTR)660); + + if(Shell_GetImageLists == NULL || FileIconInit == NULL) + { + FreeLibrary(hShell32); + return FALSE; + } + + FileIconInit(TRUE); + + Shell_GetImageLists(&hLarge, &hSmall); + + ImageListCount = ImageList_GetImageCount(hSmall); + + (void)ListView_SetImageList(hLV, + hSmall, + LVSIL_SMALL); + + FreeLibrary(hShell32); + } + else if (uID == IDC_DEVICE) + { + ImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA); + SetupDiGetClassImageList(&ImageListData); + + ImageListCount = ImageList_GetImageCount(ImageListData.ImageList); + + (void)ListView_SetImageList(hLV, + ImageListData.ImageList, + LVSIL_SMALL); + } + else + return FALSE; + + lvItem.mask = LVIF_TEXT | LVIF_IMAGE; + + while (i <= ImageListCount) + { + lvItem.iItem = i; + lvItem.iSubItem = 0; + lvItem.pszText = _itot(i, Buf, 10); + lvItem.iImage = i; + + (void)ListView_InsertItem(hLV, &lvItem); + + i++; + } + + return TRUE; +} + + +BOOL CALLBACK +DlgProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + DisplayImageList(hwnd, IDC_SYSTEM); + return TRUE; + + case WM_CLOSE: + EndDialog(hwnd, 0); + return TRUE; + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hwnd, 0); + return TRUE; + + case IDC_SYSTEM: + DisplayImageList(hwnd, IDC_SYSTEM); + return TRUE; + + case IDC_DEVICE: + DisplayImageList(hwnd, IDC_DEVICE); + return TRUE; + } + } + } + + return FALSE; +} + +int WINAPI +WinMain(HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPSTR lpszArgument, + int nCmdShow) +{ + INITCOMMONCONTROLSEX icex; + + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; + InitCommonControlsEx(&icex); + + return DialogBox(hThisInstance, + MAKEINTRESOURCE(IDD_IMGLST), + NULL, + (DLGPROC)DlgProc); +} Added: trunk/rosapps/tests/Imagelistviewer/res.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/res.… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/res.rc (added) +++ trunk/rosapps/tests/Imagelistviewer/res.rc Thu Oct 19 20:55:11 2006 @@ -1,0 +1,14 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +IDD_IMGLST DIALOGEX 6,6,303,216 +CAPTION "Imagelist Viewer" +FONT 8, "MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU +BEGIN + CONTROL "", IDC_LSTVIEW, "SysListView32", WS_CHILD | WS_VISIBLE | WS_BORDER | LVS_LIST | LVS_SMALLICON | LVS_SHAREIMAGELISTS, 0, 0, 302, 200 + DEFPUSHBUTTON "System IL", IDC_SYSTEM, 2, 202, 54, 13 + PUSHBUTTON "Device IL", IDC_DEVICE, 60, 202, 54, 13 + PUSHBUTTON "Close", IDOK, 248, 202, 54, 13 +END Added: trunk/rosapps/tests/Imagelistviewer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/reso… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/resource.h (added) +++ trunk/rosapps/tests/Imagelistviewer/resource.h Thu Oct 19 20:55:11 2006 @@ -1,0 +1,4 @@ +#define IDD_IMGLST 1000 +#define IDC_LSTVIEW 1001 +#define IDC_SYSTEM 1002 +#define IDC_DEVICE 1003 Modified: trunk/rosapps/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/directory.rbuild?rev… ============================================================================== --- trunk/rosapps/tests/directory.rbuild (original) +++ trunk/rosapps/tests/directory.rbuild Thu Oct 19 20:55:11 2006 @@ -112,6 +112,9 @@ <directory name="icontest"> <xi:include href="icontest/icontest.rbuild" /> </directory> +<directory name="imagelistviewer"> + <xi:include href="imagelistviewer/imagelistviewer.rbuild" /> +</directory>

1 0

[ion] 24572: - Implement the entire kernel-mode native interface of Debug Objects, minus a few missing operations in NtWaitForDebugEvent: - NtCreateDebugObject, NtDebugContinue, NtDebugActiveProcess, NtRemoveProcessDebug, NtSetInformationDebugObject, NtWaitForDebugEvent. - Of course, the entire backend is stubbed out. - Implement Debug object initialization (not called yet) and close(not done) and delete (done) callbacks.
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 11:04:21 2006 New Revision: 24572 URL: http://svn.reactos.org/svn/reactos?rev=24572&view=rev Log: - Implement the entire kernel-mode native interface of Debug Objects, minus a few missing operations in NtWaitForDebugEvent: - NtCreateDebugObject, NtDebugContinue, NtDebugActiveProcess, NtRemoveProcessDebug, NtSetInformationDebugObject, NtWaitForDebugEvent. - Of course, the entire backend is stubbed out. - Implement Debug object initialization (not called yet) and close(not done) and delete (done) callbacks. Modified: trunk/reactos/include/ddk/ntstatus.h trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/include/ddk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstatus.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntstatus.h (original) +++ trunk/reactos/include/ddk/ntstatus.h Thu Oct 19 11:04:21 2006 @@ -1099,6 +1099,25 @@ #define STATUS_CLUSTER_NETWORK_NOT_INTERNAL ((NTSTATUS)0xC0130016L) #define STATUS_CLUSTER_POISONED ((NTSTATUS)0xC0130017L) +/* +* Debug codes +*/ + +#define DBG_EXCEPTION_HANDLED ((NTSTATUS)0x00010001) +#define DBG_CONTINUE ((NTSTATUS)0x00010002) +#define DBG_REPLY_LATER ((NTSTATUS)0x40010001) +#define DBG_UNABLE_TO_PROVIDE_HANDLE ((NTSTATUS)0x40010002) +#define DBG_TERMINATE_THREAD ((NTSTATUS)0x40010003) +#define DBG_TERMINATE_PROCESS ((NTSTATUS)0x40010004) +#define DBG_CONTROL_C ((NTSTATUS)0x40010005) +#define DBG_PRINTEXCEPTION_C ((NTSTATUS)0x40010006) +#define DBG_RIPEXCEPTION ((NTSTATUS)0x40010007) +#define DBG_CONTROL_BREAK ((NTSTATUS)0x40010008) +#define DBG_COMMAND_EXCEPTION ((NTSTATUS)0x40010009) +#define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS)0x80010001) +#define DBG_NO_STATE_CHANGE ((NTSTATUS)0xC0010001) +#define DBG_APP_NOT_IDLE ((NTSTATUS)0xC0010002) + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h (original) +++ trunk/reactos/include/ndk/dbgktypes.h Thu Oct 19 11:04:21 2006 @@ -30,6 +30,7 @@ // #define DEBUG_OBJECT_WAIT_STATE_CHANGE 0x0001 #define DEBUG_OBJECT_ADD_REMOVE_PROCESS 0x0002 +#define DEBUG_OBJECT_SET_INFORMATION 0x0004 #define DEBUG_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0F) // @@ -172,8 +173,8 @@ typedef struct _DBGKM_MSG { PORT_MESSAGE h; - ULONG Opcode; - ULONG Status; + ULONG ApiNumber; + ULONG ReturnedStatus; union { DBGKM_EXCEPTION Exception; @@ -186,4 +187,25 @@ }; } DBGKM_MSG, *PDBGKM_MSG; +#ifndef NTOS_MODE_USER + +// +// Debug Event +// +typedef struct _DEBUG_EVENT +{ + LIST_ENTRY EventList; + KEVENT ContinueEvent; + CLIENT_ID ClientId; + PEPROCESS Process; + PETHREAD Thread; + NTSTATUS Status; + ULONG Flags; + PETHREAD BackoutThread; + DBGKM_MSG ApiMsg; +} DEBUG_EVENT, *PDEBUG_EVENT; + + #endif + +#endif Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Oct 19 11:04:21 2006 @@ -7,15 +7,76 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> POBJECT_TYPE DbgkDebugObjectType; - -/* FUNCTIONS *****************************************************************/ +KGUARDED_MUTEX DbgkpProcessDebugPortMutex; + +GENERIC_MAPPING DbgkDebugObjectMapping = +{ + STANDARD_RIGHTS_READ | DEBUG_OBJECT_WAIT_STATE_CHANGE, + STANDARD_RIGHTS_WRITE | DEBUG_OBJECT_ADD_REMOVE_PROCESS, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + DEBUG_OBJECT_ALL_ACCESS +}; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +DbgkpDeleteObject(IN PVOID Object) +{ + PDBGK_DEBUG_OBJECT DebugObject = Object; + PAGED_CODE(); + + /* Sanity check */ + ASSERT(IsListEmpty(&DebugObject->StateEventListEntry)); +} + +VOID +NTAPI +DbgkpCloseObject(IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount, + IN ULONG SystemHandleCount) +{ + /* FIXME: Implement */ + ASSERT(FALSE); +} + +VOID +INIT_FUNCTION +NTAPI +DbgkInitialize(VOID) +{ + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + PAGED_CODE(); + + /* Initialize the process debug port mutex */ + KeInitializeGuardedMutex(&DbgkpProcessDebugPortMutex); + + /* Create the Event Pair Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"DebugObject"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DBGK_DEBUG_OBJECT); + ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_WAIT_STATE_CHANGE; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.CloseProcedure = DbgkpCloseObject; + ObjectTypeInitializer.DeleteProcedure = DbgkpDeleteObject; + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &DbgkDebugObjectType); +} VOID NTAPI @@ -35,6 +96,66 @@ return FALSE; } +VOID +NTAPI +DbgkpWakeTarget(IN PDEBUG_EVENT DebugEvent) +{ + /* FIXME: TODO */ + return; +} + +NTSTATUS +NTAPI +DbgkpPostFakeProcessCreateMessages(IN PEPROCESS Process, + IN PDBGK_DEBUG_OBJECT DebugObject, + IN PETHREAD *LastThread) +{ + /* FIXME: Implement */ + *LastThread = NULL; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkpSetProcessDebugObject(IN PEPROCESS Process, + IN PDBGK_DEBUG_OBJECT DebugObject, + IN NTSTATUS MsgStatus, + IN PETHREAD LastThread) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkClearProcessDebugObject(IN PEPROCESS Process, + IN PDBGK_DEBUG_OBJECT SourceDebugObject) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, + IN PDEBUG_EVENT DebugEvent) +{ + /* FIXME: TODO */ + return; +} + +VOID +NTAPI +DbgkpOpenHandles(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, + IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* FIXME: TODO */ + return; +} + + +/* PUBLIC FUNCTIONS **********************************************************/ NTSTATUS NTAPI @@ -47,25 +168,23 @@ PDBGK_DEBUG_OBJECT DebugObject; HANDLE hDebug; NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - DPRINT("NtCreateDebugObject(0x%p, 0x%x, 0x%p)\n", DebugHandle, DesiredAccess, ObjectAttributes); - - /* Check Output Safety */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWrite(DebugHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } _SEH_HANDLE { - + + /* Check if we were called from user mode*/ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the handle */ + ProbeForWrite(DebugHandle, sizeof(HANDLE), sizeof(ULONG)); + } + _SEH_HANDLE + { + /* Get exception error */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) return Status; } /* Create the Object */ @@ -78,10 +197,8 @@ 0, 0, (PVOID*)&DebugObject); - - /* Check for Success */ - if(NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Initialize the Debug Object's Fast Mutex */ ExInitializeFastMutex(&DebugObject->Mutex); @@ -104,16 +221,15 @@ ObDereferenceObject(DebugObject); /* Check for success and return handle */ - if(NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { *DebugHandle = hDebug; - - } _SEH_HANDLE { - + } + _SEH_HANDLE + { Status = _SEH_GetExceptionCode(); - } _SEH_END; } } @@ -124,61 +240,507 @@ NTSTATUS NTAPI -NtWaitForDebugEvent(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout OPTIONAL, - OUT PDBGUI_WAIT_STATE_CHANGE StateChange) -{ - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtDebugContinue(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. +NtDebugContinue(IN HANDLE DebugHandle, IN PCLIENT_ID AppClientId, IN NTSTATUS ContinueStatus) { - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtDebugActiveProcess(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. - IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. -{ - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtRemoveProcessDebug(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. - IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. -{ - - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSetInformationDebugObject(IN HANDLE DebugObject, // Debug object handle need not grant any particular access right. + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PDBGK_DEBUG_OBJECT DebugObject; + NTSTATUS Status = STATUS_SUCCESS; + PDEBUG_EVENT DebugEvent = NULL, DebugEventToWake = NULL; + PLIST_ENTRY ListHead, NextEntry; + BOOLEAN NeedsWake = FALSE; + CLIENT_ID ClientId; + PAGED_CODE(); + + /* Check if we were called from user mode*/ + if (PreviousMode != KernelMode) + { + /* Enter SEH for probing */ + _SEH_TRY + { + /* Probe the handle */ + ProbeForRead(AppClientId, sizeof(CLIENT_ID), sizeof(ULONG)); + ClientId = *AppClientId; + } + _SEH_HANDLE + { + /* Get exception error */ + Status = _SEH_GetExceptionCode(); + } _SEH_END; + if (!NT_SUCCESS(Status)) return Status; + } + + /* Make sure that the status is valid */ + if ((ContinueStatus != DBG_EXCEPTION_NOT_HANDLED) && + (ContinueStatus != DBG_REPLY_LATER) && + (ContinueStatus != DBG_UNABLE_TO_PROVIDE_HANDLE) && + (ContinueStatus != DBG_TERMINATE_THREAD) && + (ContinueStatus != DBG_TERMINATE_PROCESS)) + { + /* Invalid status */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Get the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_WAIT_STATE_CHANGE, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (NT_SUCCESS(Status)) + { + /* Acquire the mutex */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Loop the state list */ + ListHead = &DebugObject->StateEventListEntry; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the current debug event */ + DebugEvent = CONTAINING_RECORD(NextEntry, + DEBUG_EVENT, + EventList); + + /* Compare process ID */ + if (DebugEvent->ClientId.UniqueProcess == + ClientId.UniqueProcess) + { + /* Check if we already found a match */ + if (NeedsWake) + { + /* Wake it up and break out */ + DebugEvent->Flags &= ~4; + KeSetEvent(&DebugEvent->ContinueEvent, + IO_NO_INCREMENT, + FALSE); + break; + } + + /* Compare thread ID and flag */ + if ((DebugEvent->ClientId.UniqueThread == + ClientId.UniqueThread) && (DebugEvent->Flags & 1)) + { + /* Remove the event from the list */ + RemoveEntryList(NextEntry); + + /* Remember who to wake */ + NeedsWake = TRUE; + DebugEventToWake = DebugEvent; + } + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Release the mutex */ + ExReleaseFastMutex(&DebugObject->Mutex); + + /* Dereference the object */ + ObDereferenceObject(DebugObject); + + /* Check if need a wait */ + if (NeedsWake) + { + /* Set the continue status */ + DebugEvent->ApiMsg.ReturnedStatus = Status; + DebugEvent->Status = STATUS_SUCCESS; + + /* Wake the target */ + DbgkpWakeTarget(DebugEvent); + } + else + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + } + } + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +NtDebugActiveProcess(IN HANDLE ProcessHandle, + IN HANDLE DebugHandle) +{ + PEPROCESS Process; + PDBGK_DEBUG_OBJECT DebugObject; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PETHREAD LastThread; + NTSTATUS Status; + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_SUSPEND_RESUME, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Don't allow debugging the initial system process */ + if (Process == PsInitialSystemProcess) return STATUS_ACCESS_DENIED; + + /* Reference the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_ADD_REMOVE_PROCESS, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Dereference the process and exit */ + ObDereferenceObject(Process); + return Status; + } + + /* Acquire process rundown protection */ + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Dereference the process and debug object and exit */ + ObDereferenceObject(Process); + ObDereferenceObject(DebugObject); + return STATUS_PROCESS_IS_TERMINATING; + } + + /* Send fake create messages for debuggers to have a consistent state */ + Status = DbgkpPostFakeProcessCreateMessages(Process, + DebugObject, + &LastThread); + Status = DbgkpSetProcessDebugObject(Process, + DebugObject, + Status, + LastThread); + + /* Release rundown protection */ + ExReleaseRundownProtection(&Process->RundownProtect); + + /* Dereference the process and debug object and return status */ + ObDereferenceObject(Process); + ObDereferenceObject(DebugObject); + return Status; +} + +NTSTATUS +NTAPI +NtRemoveProcessDebug(IN HANDLE ProcessHandle, + IN HANDLE DebugHandle) +{ + PEPROCESS Process; + PDBGK_DEBUG_OBJECT DebugObject; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + NTSTATUS Status; + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_SUSPEND_RESUME, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Reference the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_ADD_REMOVE_PROCESS, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Dereference the process and exit */ + ObDereferenceObject(Process); + return Status; + } + + /* Remove the debug object */ + Status = DbgkClearProcessDebugObject(Process, DebugObject); + + /* Dereference the process and debug object and return status */ + ObDereferenceObject(Process); + ObDereferenceObject(DebugObject); + return Status; +} + +static const INFORMATION_CLASS_INFO DbgkpDebugObjectInfoClass[] = +{ + /* DebugObjectUnusedInformation */ + ICI_SQ_SAME(sizeof(ULONG), sizeof(ULONG), 0), + /* DebugObjectKillProcessOnExitInformation */ + ICI_SQ_SAME(sizeof(DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION), sizeof(ULONG), ICIF_SET), +}; + +NTSTATUS +NTAPI +NtSetInformationDebugObject(IN HANDLE DebugHandle, IN DEBUGOBJECTINFOCLASS DebugObjectInformationClass, IN PVOID DebugInformation, IN ULONG DebugInformationLength, OUT PULONG ReturnLength OPTIONAL) { - UNIMPLEMENTED; - - return STATUS_NOT_IMPLEMENTED; -} + PDBGK_DEBUG_OBJECT DebugObject; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION DebugInfo = DebugInformation; + PAGED_CODE(); + + /* Check buffers and parameters */ + Status = DefaultSetInfoBufferCheck(DebugObjectInformationClass, + DbgkpDebugObjectInfoClass, + sizeof(DbgkpDebugObjectInfoClass) / + sizeof(DbgkpDebugObjectInfoClass[0]), + DebugInformation, + DebugInformationLength, + PreviousMode); + + /* Return required length to user-mode */ + if (ReturnLength) *ReturnLength = sizeof(*DebugInfo); + if (!NT_SUCCESS(Status)) return Status; + + /* Open the Object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_WAIT_STATE_CHANGE, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (NT_SUCCESS(Status)) + { + /* Acquire the object */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Set the proper flag */ + if (DebugInfo->KillProcessOnExit) + { + /* Enable killing the process */ + DebugObject->Flags |= 2; + } + else + { + /* Disable */ + DebugObject->Flags &= ~2; + } + + /* Release the mutex */ + ExReleaseFastMutex(&DebugObject->Mutex); + + /* Release the Object */ + ObDereferenceObject(DebugObject); + } + + /* Return Status */ + return Status; +} + +NTSTATUS +NTAPI +NtWaitForDebugEvent(IN HANDLE DebugHandle, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PDBGUI_WAIT_STATE_CHANGE StateChange) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + LARGE_INTEGER SafeTimeOut; + PEPROCESS Process; + LARGE_INTEGER StartTime; + PETHREAD Thread; + BOOLEAN GotEvent; + LARGE_INTEGER NewTime; + PDBGK_DEBUG_OBJECT DebugObject; + DBGUI_WAIT_STATE_CHANGE WaitStateChange; + NTSTATUS Status = STATUS_SUCCESS; + PDEBUG_EVENT DebugEvent, DebugEvent2; + PLIST_ENTRY ListHead, NextEntry; + + /* Clear the initial wait state change structure */ + RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange)); + + /* Check if we came with a timeout from user mode */ + if ((Timeout) && (PreviousMode != KernelMode)) + { + _SEH_TRY + { + /* Make a copy on the stack */ + SafeTimeOut = ProbeForReadLargeInteger(Timeout); + Timeout = &SafeTimeOut; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; + + /* Query the current time */ + KeQuerySystemTime(&StartTime); + } + + /* Check if the call is from user mode */ + if (PreviousMode == UserMode) + { + /* FIXME: Probe the state change structure */ + } + + /* Get the debug object */ + Status = ObReferenceObjectByHandle(DebugHandle, + DEBUG_OBJECT_WAIT_STATE_CHANGE, + DbgkDebugObjectType, + PreviousMode, + (PVOID*)&DebugObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Clear process and thread */ + Process = NULL; + Thread = NULL; + + /* Wait on the debug object given to us */ + Status = KeWaitForSingleObject(DebugObject, + Executive, + PreviousMode, + Alertable, + Timeout); + + /* Start the wait loop */ + while (TRUE) + { + if (!NT_SUCCESS(Status) || + (Status == STATUS_TIMEOUT) || + (Status == STATUS_ALERTED) || + (Status == STATUS_USER_APC)) + { + /* Break out the wait */ + break; + } + + /* Lock the object */ + GotEvent = FALSE; + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Check if a debugger is connected */ + if (DebugObject->Flags & 1) + { + /* Not connected */ + Status = STATUS_DEBUGGER_INACTIVE; + } + else + { + /* Loop the events */ + ListHead = &DebugObject->StateEventListEntry; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the debug event */ + DebugEvent = CONTAINING_RECORD(NextEntry, + DEBUG_EVENT, + EventList); + + /* Check flags */ + if (!(DebugEvent->Flags & (4 | 1))) + { + /* We got an event */ + GotEvent = TRUE; + + /* Loop the list internally */ + while (&DebugEvent->EventList != NextEntry) + { + /* Get the debug event */ + DebugEvent2 = CONTAINING_RECORD(NextEntry, + DEBUG_EVENT, + EventList); + + /* Try to match process IDs */ + if (DebugEvent2->ClientId.UniqueProcess == + DebugEvent->ClientId.UniqueProcess) + { + /* Found it, break out */ + DebugEvent->Flags |= 4; + DebugEvent->BackoutThread = NULL; + GotEvent = FALSE; + break; + } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we still have a valid event */ + if (GotEvent) break; + } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we have an event */ + if (GotEvent) + { + /* Save and reference the process and thread */ + Process = DebugEvent->Process; + Thread = DebugEvent->Thread; + ObReferenceObject(Process); + ObReferenceObject(Thread); + + /* Convert to user-mode structure */ + DbgkpConvertKernelToUserStateChange(&WaitStateChange, + DebugEvent); + + /* Set flag */ + DebugEvent->Flags |= 1; + Status = STATUS_SUCCESS; + } + else + { + /* Unsignal the event */ + DebugObject->Event.Header.SignalState = 0; + Status = STATUS_SUCCESS; + } + } + + /* Release the mutex */ + ExReleaseFastMutex(&DebugObject->Mutex); + if (!NT_SUCCESS(Status)) break; + + /* Check if we got an event */ + if (GotEvent) + { + /* Check if we can wait again */ + if (!SafeTimeOut.QuadPart) + { + /* Query the new time */ + KeQuerySystemTime(&NewTime); + + /* Substract times */ + /* FIXME: TODO */ + } + } + else + { + /* Open the handles and dereference the objects */ + DbgkpOpenHandles(&WaitStateChange, Process, Thread); + ObDereferenceObject(Process); + ObDereferenceObject(Thread); + } + } + + /* We're, dereference the object */ + ObDereferenceObject(DebugObject); + + /* Return our wait state change structure */ + RtlMoveMemory(StateChange, + &WaitStateChange, + sizeof(DBGUI_WAIT_STATE_CHANGE)); + return Status; +} + /* EOF */

1 0

[jimtabor] 24571: Add four more members to the Gdi user data (DC_ATTR) structure. Sort the list later.
by jimtabor＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: jimtabor Date: Thu Oct 19 08:48:51 2006 New Revision: 24571 URL: http://svn.reactos.org/svn/reactos?rev=24571&view=rev Log: Add four more members to the Gdi user data (DC_ATTR) structure. Sort the list later. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Oct 19 08:48:51 2006 @@ -120,6 +120,10 @@ ULONG ulBackgroundClr; COLORREF crForegroundClr; ULONG ulForegroundClr; + COLORREF crBrushClr; + ULONG ulBrushClr; + COLORREF crPenClr; + ULONG ulPenClr; DWORD iCS_CP; INT iGraphicsMode; BYTE jROP2;

1 0

[ion] 24570: - Fix SD charges to 2048 bytes instead of 2000. - Fix a memory leak in ObOpenObjectByName. Object Create Information is now freed.
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 07:09:19 2006 New Revision: 24570 URL: http://svn.reactos.org/svn/reactos?rev=24570&view=rev Log: - Fix SD charges to 2048 bytes instead of 2000. - Fix a memory leak in ObOpenObjectByName. Object Create Information is now freed. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Oct 19 07:09:19 2006 @@ -1559,8 +1559,9 @@ if (ObjectHeader->ObjectCreateInfo) { /* Free it */ - //ObpFreeAndReleaseCapturedAttributes(&ObjectCreateInfo); - //ObjectHeader->ObjectCreateInfo = NULL; + ObpFreeAndReleaseCapturedAttributes(ObjectHeader-> + ObjectCreateInfo); + ObjectHeader->ObjectCreateInfo = NULL; } } else Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 19 07:09:19 2006 @@ -105,7 +105,7 @@ TypeInfo.DefaultNonPagedPoolCharge; /* Add the SD charge too */ - if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2000; + if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2048; } /* FIXME: Should be returning quota */ @@ -546,7 +546,7 @@ ObjectType->TypeInfo.DefaultPagedPoolCharge) || (ObjectCreateInfo->NonPagedPoolCharge != ObjectType->TypeInfo.DefaultNonPagedPoolCharge) || - (ObjectCreateInfo->SecurityDescriptorCharge > 2000) || + (ObjectCreateInfo->SecurityDescriptorCharge > 2048) || (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) { /* Set quota size */

1 0

[ion] 24569: - Implement Object Type Resource Lock, since object types are shared across all objects and thread-safety is critical. Used it everywhere where I think it's needed. Thomas, can you check if I missed anything please? - Use interlocked increase/decrease for accounting variables inside the Object Type instead of acquiring a full lock or not being thread safe. - Clear the creator type list of an object if it lost all its handles. - Fix a bug in NtduplicateObject which was potentially de
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 06:54:48 2006 New Revision: 24569 URL: http://svn.reactos.org/svn/reactos?rev=24569&view=rev Log: - Implement Object Type Resource Lock, since object types are shared across all objects and thread-safety is critical. Used it everywhere where I think it's needed. Thomas, can you check if I missed anything please? - Use interlocked increase/decrease for accounting variables inside the Object Type instead of acquiring a full lock or not being thread safe. - Clear the creator type list of an object if it lost all its handles. - Fix a bug in NtduplicateObject which was potentially derefernecing a garbage pointer (thanks Prefast!). Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=245… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Oct 19 06:54:48 2006 @@ -22,7 +22,6 @@ // Ob: // - Fix bug related to Deferred Loading (don't requeue active work item). // - Add Directory Lock. -// - Use Object Type Mutex/Lock. // // Ke: // Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Thu Oct 19 06:54:48 2006 @@ -5,6 +5,30 @@ * PURPOSE: Intenral Inlined Functions for the Object Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ + +VOID +FORCEINLINE +ObpEnterObjectTypeMutex(IN POBJECT_TYPE ObjectType) +{ + /* Sanity check */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + + /* Enter a critical region and acquire the resource */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&ObjectType->Mutex, TRUE); +} + +VOID +FORCEINLINE +ObpLeaveObjectTypeMutex(IN POBJECT_TYPE ObjectType) +{ + /* Enter a critical region and acquire the resource */ + ExReleaseResourceLite(&ObjectType->Mutex); + KeLeaveCriticalRegion(); + + /* Sanity check */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); +} VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Oct 19 06:54:48 2006 @@ -93,6 +93,8 @@ POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; LONG SystemHandleCount, ProcessHandleCount; + LONG NewCount; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; /* Get the object type and header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); @@ -104,12 +106,31 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* FIXME: The process handle count should be in the Handle DB. Investigate */ SystemHandleCount = ObjectHeader->HandleCount; ProcessHandleCount = 0; /* Decrement the handle count */ - InterlockedDecrement(&ObjectHeader->HandleCount); + NewCount = InterlockedDecrement(&ObjectHeader->HandleCount); + + /* Check if we're out of handles */ + if (!NewCount) + { + /* Get the creator info */ + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(ObjectHeader); + if ((CreatorInfo) && !(IsListEmpty(&CreatorInfo->TypeList))) + { + /* Remove it from the list and re-initialize it */ + RemoveEntryList(&CreatorInfo->TypeList); + InitializeListHead(&CreatorInfo->TypeList); + } + } + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); /* Check if we have a close procedure */ if (ObjectType->TypeInfo.CloseProcedure) @@ -126,7 +147,7 @@ ObpDeleteNameCheck(ObjectBody); /* Decrease the total number of handles for this type */ - ObjectType->TotalNumberOfHandles--; + InterlockedDecrement(&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Decremented count for: %p. HC LC %lx %lx\n", __FUNCTION__, @@ -306,6 +327,9 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* Charge quota and remove the creator info flag */ Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); if (!NT_SUCCESS(Status)) return Status; @@ -346,6 +370,9 @@ /* Increase the handle count */ InterlockedIncrement(&ObjectHeader->HandleCount); + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); + /* FIXME: Use the Handle Database */ ProcessHandleCount = 0; @@ -361,7 +388,7 @@ } /* Increase total number of handles */ - ObjectType->TotalNumberOfHandles++; + InterlockedIncrement(&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", __FUNCTION__, @@ -423,6 +450,9 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* Charge quota and remove the creator info flag */ Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); if (!NT_SUCCESS(Status)) return Status; @@ -445,6 +475,9 @@ /* Increase the handle count */ InterlockedIncrement(&ObjectHeader->HandleCount); + + /* Release the object type */ + ObpLeaveObjectTypeMutex(ObjectType); /* FIXME: Use the Handle Database */ ProcessHandleCount = 0; @@ -461,7 +494,7 @@ } /* Increase total number of handles */ - ObjectType->TotalNumberOfHandles++; + InterlockedIncrement(&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", __FUNCTION__, @@ -2000,9 +2033,7 @@ ObCloseHandle(IN HANDLE Handle, IN KPROCESSOR_MODE AccessMode) { - // - // Call the internal API - // + /* Call the internal API */ return ObpCloseHandle(Handle, AccessMode); } @@ -2142,7 +2173,7 @@ hTarget, TargetProcessHandle, Status); - ObDereferenceObject(TargetProcess); + ObDereferenceObject(Target); ObDereferenceObject(SourceProcess); return Status; } Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 19 06:54:48 2006 @@ -151,12 +151,18 @@ NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* Check if the object is on a type list */ if ((CreatorInfo) && !(IsListEmpty(&CreatorInfo->TypeList))) { /* Remove the object from the type list */ RemoveEntryList(&CreatorInfo->TypeList); } + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); /* Check if we have a name */ if ((NameInfo) && (NameInfo->Name.Buffer)) @@ -782,15 +788,14 @@ if (!PagedPoolCharge) { /* Save it */ - PagedPoolCharge = ObjectType->TypeInfo.DefaultPagedPoolCharge; + PagedPoolCharge = Type->TypeInfo.DefaultPagedPoolCharge; } /* Check for nonpaged charge */ if (!NonPagedPoolCharge) { /* Save it */ - NonPagedPoolCharge = ObjectType-> - TypeInfo.DefaultNonPagedPoolCharge; + NonPagedPoolCharge = Type->TypeInfo.DefaultNonPagedPoolCharge; } /* Write the pool charges */ @@ -1019,6 +1024,9 @@ ExInitializeResourceLite(&LocalObjectType->Mutex); InitializeListHead(&LocalObjectType->TypeList); + /* Lock the object type */ + ObpEnterObjectTypeMutex(LocalObjectType); + /* Get creator info and insert it into the type list */ CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); if (CreatorInfo) InsertTailList(&ObTypeObjectType->TypeList, @@ -1031,6 +1039,9 @@ /* It fits, insert it */ ObpObjectTypes[LocalObjectType->Index - 1] = LocalObjectType; } + + /* Release the object type */ + ObpLeaveObjectTypeMutex(LocalObjectType); /* Check if we're actually creating the directory object itself */ if (!(ObpTypeDirectoryObject) || Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Oct 19 06:54:48 2006 @@ -191,6 +191,9 @@ &Context); if ((Object) && !(ObjectHeader->HandleCount)) { + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* First delete it from the directory */ ObpDeleteEntryDirectory(&Context); @@ -209,6 +212,9 @@ TypeInfo.PoolType, NULL); } + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); /* Free the name */ ExFreePool(ObjectNameInfo->Name.Buffer);

1 0

[ion] 24568: - Set OBJ_OPENLINK invalid for core object types. - Initialize symbolic link in-line with other core object types. - Use the SePublicDefaultUnrestrictedSd directly instead of building another SD. - Create core directory objects with Nt* functions instead of Ob*, to insure full accounting and error-handling. - Create core objects with OBJ_CASE_INSENSITIVE. - Fix the huge ObInit hack which was manually inserting Directory and Type object types in the type directory, and now loop the t
by ion＠svn.reactos.org 19 Oct '06

19 Oct '06

Author: ion Date: Thu Oct 19 06:20:32 2006 New Revision: 24568 URL: http://svn.reactos.org/svn/reactos?rev=24568&view=rev Log: - Set OBJ_OPENLINK invalid for core object types. - Initialize symbolic link in-line with other core object types. - Use the SePublicDefaultUnrestrictedSd directly instead of building another SD. - Create core directory objects with Nt* functions instead of Ob*, to insure full accounting and error-handling. - Create core objects with OBJ_CASE_INSENSITIVE. - Fix the huge ObInit hack which was manually inserting Directory and Type object types in the type directory, and now loop the type list. Now we don't skip the Process, Token, Thread, Job, Section types anymore. - Support Quota Information during object allocation and deallocation isntead of ignoring it. - Use interlocked decrement when touching the object type (since it's a shared structure. We don't use the lock yet, but we won't for this anyways, since it's a simple lockable operation). - Use the right object key when freeing the object. - Modify the allocation function for a more optimized way of allocating objects instead of having to keep track of two sets of variables. - Add various accounting variables. - Make sure to properly handle allocations without object create info (ie, for object types). Now they get creator info and name info (which allowed us to cleanp the hack in ObInit). - Add checks to see if Quota informatio is needed. - Clear CreatorBackTraceIndex during allocation. - Remove CreatorUniqueProcess hack from back when the idle thread was NULL. - Do not zero out the header during allocation anymore, since this slows down the routine (instead, simply zero out the 2 fields that are NULL). - Locate and clearly display that the fact we zero objects on creation is a HACK that needs to be fixed. (The Token code makes this assumption). - Update HighWaterNumberOfObjects when needed. - If caller didn't give pool charges, use the one from the object type. - Clear the Total/HighWater* values for newly created object types instead of using random values. - Properly typecast the WCHAR tag as CHAR. - Insert each new object type in the ObTypeObjectType Type List. - Set the Index member of each new object type and insert each new object type in the ObpObjectTypes array. This is crucial for object type enumeration when implemented. - Fixup the way we insert new object types into the tree. Allow failure and don't return a type if we couldn't insert it, and only reference the type directory object if it actually exists. - Move DOS Devices\"??" initialization in its own routine and fix it: - Use Nt APIs for all operations instead of raw I/O. - Create GLOBALROOT link to \ - Create \??\Global link to \?? Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=245… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 19 06:20:32 2006 @@ -425,7 +425,7 @@ /* Create the environment string */ RtlInitEmptyUnicodeString(&Environment, ProcessParameters->Environment, - Size); + (USHORT)Size); /* Append the DLL path to it */ RtlAppendUnicodeToString(&Environment, L"Path=" ); Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Oct 19 06:20:32 2006 @@ -112,8 +112,8 @@ // VOID NTAPI -ObInitSymbolicLinkImplementation( - VOID +ObpDeleteSymbolicLink( + IN PVOID ObjectBody ); NTSTATUS @@ -220,17 +220,6 @@ ); VOID -NTAPI -ObDereferenceDeviceMap(IN PEPROCESS Process); - -VOID -NTAPI -ObInheritDeviceMap( - IN PEPROCESS Parent, - IN PEPROCESS Process -); - -VOID FASTCALL ObpSetPermanentObject( IN PVOID ObjectBody, @@ -245,10 +234,35 @@ VOID NTAPI -ObClearProcessHandleTable(IN PEPROCESS Process); - -/* Security descriptor cache functions */ - +ObClearProcessHandleTable( + IN PEPROCESS Process +); + +// +// DOS Devices Functions +// +VOID +NTAPI +ObDereferenceDeviceMap( + IN PEPROCESS Process +); + +VOID +NTAPI +ObInheritDeviceMap( + IN PEPROCESS Parent, + IN PEPROCESS Process +); + +NTSTATUS +NTAPI +ObpCreateDosDevicesDirectory( + VOID +); + +// +// Security descriptor cache functions +// NTSTATUS NTAPI ObpInitSdCache( Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Thu Oct 19 06:20:32 2006 @@ -37,6 +37,14 @@ DIRECTORY_ALL_ACCESS }; +GENERIC_MAPPING ObpSymbolicLinkMapping = +{ + STANDARD_RIGHTS_READ | SYMBOLIC_LINK_QUERY, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYMBOLIC_LINK_QUERY, + SYMBOLIC_LINK_ALL_ACCESS +}; + PDEVICE_MAP ObSystemDeviceMap = NULL; ULONG ObpTraceLevel = OB_HANDLE_DEBUG | OB_REFERENCE_DEBUG; @@ -124,12 +132,15 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name; - SECURITY_DESCRIPTOR SecurityDescriptor; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; OBP_LOOKUP_CONTEXT Context; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\DosDevices"); HANDLE Handle; PKPRCB Prcb = KeGetCurrentPrcb(); + PLIST_ENTRY ListHead, NextEntry; + POBJECT_HEADER Header; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; + POBJECT_HEADER_NAME_INFO NameInfo; + NTSTATUS Status; /* Check if this is actually Phase 1 initialization */ if (ObpInitializationPhase != 0) goto ObPostPhase0; @@ -184,12 +195,11 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.GenericMapping = ObpTypeMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE); + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObTypeObjectType); /* Create the Directory Type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Directory"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = FALSE; ObjectTypeInitializer.MaintainTypeList = FALSE; @@ -197,6 +207,16 @@ ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); + /* Create 'symbolic link' object type */ + RtlInitUnicodeString(&Name, L"SymbolicLink"); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = + sizeof(OBJECT_SYMBOLIC_LINK); + ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; + ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; + ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; + ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); + /* Phase 0 initialization complete */ ObpInitializationPhase++; return TRUE; @@ -206,105 +226,102 @@ /* Re-initialize lookaside lists */ ObInit2(); - /* Create security descriptor */ - RtlCreateSecurityDescriptor(&SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION1); - RtlSetOwnerSecurityDescriptor(&SecurityDescriptor, - SeAliasAdminsSid, - FALSE); - RtlSetGroupSecurityDescriptor(&SecurityDescriptor, - SeLocalSystemSid, - FALSE); - RtlSetDaclSecurityDescriptor(&SecurityDescriptor, - TRUE, - SePublicDefaultDacl, - FALSE); - - /* Create root directory */ + /* Initialize Object Types directory attributes */ + RtlInitUnicodeString(&Name, L"\\"); InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - ObCreateObject(KernelMode, - ObDirectoryType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(OBJECT_DIRECTORY), - 0, - 0, - (PVOID*)&NameSpaceRoot); - ObInsertObject((PVOID)NameSpaceRoot, - NULL, - DIRECTORY_ALL_ACCESS, - 0, - NULL, - NULL); - - /* Create '\ObjectTypes' directory */ + SePublicDefaultUnrestrictedSd); + + /* Create the directory */ + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get a handle to it */ + Status = ObReferenceObjectByHandle(Handle, + 0, + ObDirectoryType, + KernelMode, + (PVOID*)&NameSpaceRoot, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Close the extra handle */ + Status = NtClose(Handle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Initialize Object Types directory attributes */ RtlInitUnicodeString(&Name, L"\\ObjectTypes"); InitializeObjectAttributes(&ObjectAttributes, &Name, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - ObCreateObject(KernelMode, - ObDirectoryType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(OBJECT_DIRECTORY), - 0, - 0, - (PVOID*)&ObpTypeDirectoryObject); - ObInsertObject((PVOID)ObpTypeDirectoryObject, - NULL, - DIRECTORY_ALL_ACCESS, - 0, - NULL, - NULL); - - /* Insert the two objects we already created but couldn't add */ - /* NOTE: Uses TypeList & Creator Info in OB 2.0 */ - Context.Directory = ObpTypeDirectoryObject; - Context.DirectoryLocked = TRUE; - if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObTypeObjectType))->Name, - OBJ_CASE_INSENSITIVE, - FALSE, - &Context)) - { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, OBJECT_TO_OBJECT_HEADER(ObTypeObjectType)); - } - if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObDirectoryType))->Name, - OBJ_CASE_INSENSITIVE, - FALSE, - &Context)) - { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, OBJECT_TO_OBJECT_HEADER(ObDirectoryType)); - } - - /* Create 'symbolic link' object type */ - ObInitSymbolicLinkImplementation(); - - /* Create the '\??' directory */ - RtlInitUnicodeString(&Name, L"\\??"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - 0, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, NULL); - ZwCreateDirectoryObject(&Handle, 0, &ObjectAttributes); - - /* Create link from '\DosDevices' to '\??' directory */ - RtlInitUnicodeString(&Name, L"\\??"); - IoCreateSymbolicLink(&LinkName, &Name); - - /* FIXME: Hack Hack! */ - ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), TAG('O', 'b', 'D', 'm')); - RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); + + /* Create the directory */ + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get a handle to it */ + Status = ObReferenceObjectByHandle(Handle, + 0, + ObDirectoryType, + KernelMode, + (PVOID*)&ObpTypeDirectoryObject, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Close the extra handle */ + Status = NtClose(Handle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Loop the object types */ + ListHead = &ObTypeObjectType->TypeList; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the creator info from the list */ + CreatorInfo = CONTAINING_RECORD(NextEntry, + OBJECT_HEADER_CREATOR_INFO, + TypeList); + + /* Recover the header and the name header from the creator info */ + Header = (POBJECT_HEADER)(CreatorInfo + 1); + NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); + + /* Make sure we have a name, and aren't inserted yet */ + if ((NameInfo) && !(NameInfo->Directory)) + { + /* Set up the context for the insert */ + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + + /* Do the initial lookup to setup the context */ + if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, + &NameInfo->Name, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context)) + { + /* Insert this object type */ + ObpInsertEntryDirectory(ObpTypeDirectoryObject, + &Context, + Header); + } + } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Initialize DOS Devices Directory and related Symbolic Links */ + Status = ObpCreateDosDevicesDirectory(); + if (!NT_SUCCESS(Status)) return FALSE; return TRUE; } Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 19 06:20:32 2006 @@ -27,6 +27,10 @@ WORK_QUEUE_ITEM ObpReaperWorkItem; volatile PVOID ObpReaperList; +ULONG ObpObjectsCreated, ObpObjectsWithName, ObpObjectsWithPoolQuota; +ULONG ObpObjectsWithHandleDB, ObpObjectsWithCreatorInfo; +POBJECT_TYPE ObpObjectTypes[32]; + /* PRIVATE FUNCTIONS *********************************************************/ VOID @@ -39,6 +43,8 @@ POBJECT_HEADER_HANDLE_INFO HandleInfo; POBJECT_HEADER_NAME_INFO NameInfo; POBJECT_HEADER_CREATOR_INFO CreatorInfo; + POBJECT_HEADER_QUOTA_INFO QuotaInfo; + ULONG PagedPoolCharge, NonPagedPoolCharge; PAGED_CODE(); /* Get the header and assume this is what we'll free */ @@ -59,6 +65,13 @@ { HeaderLocation = HandleInfo; } + if ((QuotaInfo = OBJECT_HEADER_TO_QUOTA_INFO(Header))) + { + HeaderLocation = QuotaInfo; + } + + /* Decrease the total */ + InterlockedDecrement(&ObjectType->TotalNumberOfObjects); /* Check if we have create info */ if (Header->Flags & OB_FLAG_CREATE_INFO) @@ -71,6 +84,34 @@ Header->ObjectCreateInfo = NULL; } } + else + { + /* Check if it has a quota block */ + if (Header->QuotaBlockCharged) + { + /* Check if we have quota information */ + if (QuotaInfo) + { + /* Get charges from quota information */ + PagedPoolCharge = QuotaInfo->PagedPoolCharge + + QuotaInfo->SecurityDescriptorCharge; + NonPagedPoolCharge = QuotaInfo->NonPagedPoolCharge; + } + else + { + /* Get charges from object type */ + PagedPoolCharge = ObjectType->TypeInfo.DefaultPagedPoolCharge; + NonPagedPoolCharge = ObjectType-> + TypeInfo.DefaultNonPagedPoolCharge; + + /* Add the SD charge too */ + if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2000; + } + + /* FIXME: Should be returning quota */ + DPRINT("Quotas: %lx %lx\n", PagedPoolCharge, NonPagedPoolCharge); + } + } /* Check if a handle database was active */ if ((HandleInfo) && !(Header->Flags & OB_FLAG_SINGLE_PROCESS)) @@ -89,11 +130,7 @@ } /* Free the object using the same allocation tag */ - ExFreePoolWithTag(HeaderLocation, - ObjectType ? TAG('T', 'j', 'b', 'O') : ObjectType->Key); - - /* Decrease the total */ - ObjectType->TotalNumberOfObjects--; + ExFreePoolWithTag(HeaderLocation, ObjectType->Key); } VOID @@ -134,6 +171,7 @@ /* Check if we have a security descriptor */ if (Header->SecurityDescriptor) { + /* Call the security procedure to delete it */ ObjectType->TypeInfo.SecurityProcedure(Object, DeleteSecurityDescriptor, 0, @@ -247,9 +285,7 @@ /* First Probe the String */ ProbeForReadUnicodeString(ObjectName); LocalName = *ObjectName; - ProbeForRead(LocalName.Buffer, - LocalName.Length, - sizeof(WCHAR)); + ProbeForRead(LocalName.Buffer, LocalName.Length, sizeof(WCHAR)); } else { @@ -311,6 +347,7 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + /* Handle exception and free the string buffer */ Status = _SEH_GetExceptionCode(); if (StringBuffer) ExFreePool(StringBuffer); } @@ -461,59 +498,125 @@ IN POBJECT_HEADER *ObjectHeader) { POBJECT_HEADER Header; - BOOLEAN HasHandleInfo = FALSE; - BOOLEAN HasNameInfo = FALSE; - BOOLEAN HasCreatorInfo = FALSE; + ULONG QuotaSize, HandleSize, NameSize, CreatorSize; POBJECT_HEADER_HANDLE_INFO HandleInfo; POBJECT_HEADER_NAME_INFO NameInfo; POBJECT_HEADER_CREATOR_INFO CreatorInfo; + POBJECT_HEADER_QUOTA_INFO QuotaInfo; POOL_TYPE PoolType; - ULONG FinalSize = ObjectSize; + ULONG FinalSize; ULONG Tag; PAGED_CODE(); - /* If we don't have an Object Type yet, force NonPaged */ - if (!ObjectType) - { + /* Accounting */ + ObpObjectsCreated++; + + /* Check if we don't have an Object Type yet */ + if (!ObjectType) + { + /* Use default tag and non-paged pool */ PoolType = NonPagedPool; Tag = TAG('O', 'b', 'j', 'T'); } else { + /* Use the pool and tag given */ PoolType = ObjectType->TypeInfo.PoolType; Tag = ObjectType->Key; } - /* Check if the Object has a name */ - if (ObjectName->Buffer) - { - FinalSize += sizeof(OBJECT_HEADER_NAME_INFO); - HasNameInfo = TRUE; - } - - if (ObjectType) - { - /* Check if the Object maintains handle counts */ + /* Check if we have no create information (ie: we're an object type) */ + if (!ObjectCreateInfo) + { + /* Use defaults */ + QuotaSize = HandleSize = 0; + NameSize = sizeof(OBJECT_HEADER_NAME_INFO); + CreatorSize = sizeof(OBJECT_HEADER_CREATOR_INFO); + } + else + { + /* Check if we have quota */ + if ((ObjectCreateInfo->PagedPoolCharge != + ObjectType->TypeInfo.DefaultPagedPoolCharge) || + (ObjectCreateInfo->NonPagedPoolCharge != + ObjectType->TypeInfo.DefaultNonPagedPoolCharge) || + (ObjectCreateInfo->SecurityDescriptorCharge > 2000) || + (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) + { + /* Set quota size */ + QuotaSize = sizeof(OBJECT_HEADER_QUOTA_INFO); + ObpObjectsWithPoolQuota++; + } + else + { + /* No Quota */ + QuotaSize = 0; + } + + /* Check if we have a handle database */ if (ObjectType->TypeInfo.MaintainHandleCount) { - FinalSize += sizeof(OBJECT_HEADER_HANDLE_INFO); - HasHandleInfo = TRUE; - } - + /* Set handle database size */ + HandleSize = sizeof(OBJECT_HEADER_HANDLE_INFO); + ObpObjectsWithHandleDB++; + } + else + { + /* None */ + HandleSize = 0; + } + + /* Check if the Object has a name */ + if (ObjectName->Buffer) + { + /* Set name size */ + NameSize = sizeof(OBJECT_HEADER_NAME_INFO); + ObpObjectsWithName++; + } + else + { + /* No name */ + NameSize = 0; + } + /* Check if the Object maintains type lists */ - if (ObjectType->TypeInfo.MaintainTypeList) - { - FinalSize += sizeof(OBJECT_HEADER_CREATOR_INFO); - HasCreatorInfo = TRUE; - } - } + if (ObjectType->TypeInfo.MaintainTypeList) + { + /* Set owner/creator size */ + CreatorSize = sizeof(OBJECT_HEADER_CREATOR_INFO); + ObpObjectsWithCreatorInfo++; + } + else + { + /* No info */ + CreatorSize = 0; + } + } + + /* Set final header size */ + FinalSize = QuotaSize + + HandleSize + + NameSize + + CreatorSize + + FIELD_OFFSET(OBJECT_HEADER, Body); /* Allocate memory for the Object and Header */ - Header = ExAllocatePoolWithTag(PoolType, FinalSize, Tag); + Header = ExAllocatePoolWithTag(PoolType, FinalSize + ObjectSize, Tag); if (!Header) return STATUS_INSUFFICIENT_RESOURCES; + /* Initialize quota info */ + if (QuotaSize) + { + QuotaInfo = (POBJECT_HEADER_QUOTA_INFO)Header; + QuotaInfo->PagedPoolCharge = ObjectCreateInfo->PagedPoolCharge; + QuotaInfo->NonPagedPoolCharge = ObjectCreateInfo->NonPagedPoolCharge; + QuotaInfo->SecurityDescriptorCharge = ObjectCreateInfo->SecurityDescriptorCharge; + QuotaInfo->ExclusiveProcess = NULL; + Header = (POBJECT_HEADER)(QuotaInfo + 1); + } + /* Initialize Handle Info */ - if (HasHandleInfo) + if (HandleSize) { HandleInfo = (POBJECT_HEADER_HANDLE_INFO)Header; HandleInfo->SingleEntry.HandleCount = 0; @@ -521,7 +624,7 @@ } /* Initialize the Object Name Info */ - if (HasNameInfo) + if (NameSize) { NameInfo = (POBJECT_HEADER_NAME_INFO)Header; NameInfo->Name = *ObjectName; @@ -530,59 +633,104 @@ } /* Initialize Creator Info */ - if (HasCreatorInfo) + if (CreatorSize) { CreatorInfo = (POBJECT_HEADER_CREATOR_INFO)Header; - CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcess() ? - PsGetCurrentProcessId() : 0; + CreatorInfo->CreatorBackTraceIndex = 0; + CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcessId(); InitializeListHead(&CreatorInfo->TypeList); Header = (POBJECT_HEADER)(CreatorInfo + 1); } + /* Check for quota information */ + if (QuotaSize) + { + /* Set the offset */ + Header->QuotaInfoOffset = (UCHAR)(QuotaSize + + HandleSize + + NameSize + + CreatorSize); + } + else + { + /* No offset */ + Header->QuotaInfoOffset = 0; + } + + /* Check for handle information */ + if (HandleSize) + { + /* Set the offset */ + Header->HandleInfoOffset = (UCHAR)(HandleSize + + NameSize + + CreatorSize); + } + else + { + /* No offset */ + Header->HandleInfoOffset = 0; + } + + /* Check for name information */ + if (NameSize) + { + /* Set the offset */ + Header->NameInfoOffset = (UCHAR)(NameSize + CreatorSize); + } + else + { + /* No Name */ + Header->NameInfoOffset = 0; + } + + /* Set the new object flag */ + Header->Flags = OB_FLAG_CREATE_INFO; + + /* Remember if we have creator info */ + if (CreatorSize) Header->Flags |= OB_FLAG_CREATOR_INFO; + + /* Remember if we have handle info */ + if (HandleSize) Header->Flags |= OB_FLAG_SINGLE_PROCESS; + /* Initialize the object header */ - RtlZeroMemory(Header, ObjectSize); Header->PointerCount = 1; + Header->HandleCount = 0; Header->Type = ObjectType; - Header->Flags = OB_FLAG_CREATE_INFO; Header->ObjectCreateInfo = ObjectCreateInfo; - - /* Set the Offsets for the Info */ - if (HasHandleInfo) - { - Header->HandleInfoOffset = HasNameInfo * - sizeof(OBJECT_HEADER_NAME_INFO) + - sizeof(OBJECT_HEADER_HANDLE_INFO) + - HasCreatorInfo * - sizeof(OBJECT_HEADER_CREATOR_INFO); - - /* Set the flag so we know when freeing */ - Header->Flags |= OB_FLAG_SINGLE_PROCESS; - } - if (HasNameInfo) - { - Header->NameInfoOffset = sizeof(OBJECT_HEADER_NAME_INFO) + - HasCreatorInfo * - sizeof(OBJECT_HEADER_CREATOR_INFO); - } - if (HasCreatorInfo) Header->Flags |= OB_FLAG_CREATOR_INFO; + Header->SecurityDescriptor = NULL; + + /* Check if this is a permanent object */ if ((ObjectCreateInfo) && (ObjectCreateInfo->Attributes & OBJ_PERMANENT)) { /* Set the needed flag so we can check */ Header->Flags |= OB_FLAG_PERMANENT; } + + /* Check if this is an exclusive object */ if ((ObjectCreateInfo) && (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) { /* Set the needed flag so we can check */ Header->Flags |= OB_FLAG_EXCLUSIVE; } - if (PreviousMode == KernelMode) - { - /* Set the kernel flag */ - Header->Flags |= OB_FLAG_KERNEL_MODE; - } - - /* Increase the number of objects of this type */ - if (ObjectType) ObjectType->TotalNumberOfObjects++; + + /* Set kernel-mode flag */ + if (PreviousMode == KernelMode) Header->Flags |= OB_FLAG_KERNEL_MODE; + + /* Check if we have a type */ + if (ObjectType) + { + /* Increase the number of objects of this type */ + ObjectType->TotalNumberOfObjects++; + + /* Update the high water */ + ObjectType->HighWaterNumberOfObjects = max(ObjectType-> + TotalNumberOfObjects, + ObjectType-> + HighWaterNumberOfObjects); + } + + /* OMG-Hack-Of-Doom */ + RtlZeroMemory(&Header->Body, ObjectSize); /* Return Header */ *ObjectHeader = Header; @@ -593,7 +741,7 @@ NTSTATUS NTAPI -ObCreateObject(IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, +ObCreateObject(IN KPROCESSOR_MODE ProbeMode OPTIONAL, IN POBJECT_TYPE Type, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN KPROCESSOR_MODE AccessMode, @@ -616,22 +764,36 @@ /* Capture all the info */ Status = ObpCaptureObjectAttributes(ObjectAttributes, - ObjectAttributesAccessMode, + ProbeMode, FALSE, ObjectCreateInfo, &ObjectName); if (NT_SUCCESS(Status)) { /* Validate attributes */ - if (Type->TypeInfo.InvalidAttributes & - ObjectCreateInfo->Attributes) + if (Type->TypeInfo.InvalidAttributes & ObjectCreateInfo->Attributes) { /* Fail */ Status = STATUS_INVALID_PARAMETER; } else { - /* Save the pool charges */ + /* Check if we have a paged charge */ + if (!PagedPoolCharge) + { + /* Save it */ + PagedPoolCharge = ObjectType->TypeInfo.DefaultPagedPoolCharge; + } + + /* Check for nonpaged charge */ + if (!NonPagedPoolCharge) + { + /* Save it */ + NonPagedPoolCharge = ObjectType-> + TypeInfo.DefaultNonPagedPoolCharge; + } + + /* Write the pool charges */ ObjectCreateInfo->PagedPoolCharge = PagedPoolCharge; ObjectCreateInfo->NonPagedPoolCharge = NonPagedPoolCharge; @@ -639,7 +801,7 @@ Status = ObpAllocateObject(ObjectCreateInfo, &ObjectName, Type, - ObjectSize + sizeof(OBJECT_HEADER), + ObjectSize, AccessMode, &Header); if (NT_SUCCESS(Status)) @@ -652,7 +814,7 @@ { /* Do the privilege check */ if (!SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, - ObjectAttributesAccessMode)) + ProbeMode)) { /* Fail */ ObpDeallocateObject(*Object); @@ -691,6 +853,7 @@ PWCHAR p; ULONG i; UNICODE_STRING ObjectName; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; /* Verify parameters */ if (!(TypeName) || @@ -752,7 +915,7 @@ Status = ObpAllocateObject(NULL, &ObjectName, ObTypeObjectType, - sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), + sizeof(OBJECT_TYPE), KernelMode, (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) @@ -767,21 +930,30 @@ LocalObjectType->Name = ObjectName; Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; + /* Clear accounting data */ + LocalObjectType->TotalNumberOfObjects = + LocalObjectType->TotalNumberOfHandles = + LocalObjectType->HighWaterNumberOfObjects = + LocalObjectType->HighWaterNumberOfHandles = 0; + /* Check if this is the first Object Type */ if (!ObTypeObjectType) { + /* It is, so set this as the type object */ ObTypeObjectType = LocalObjectType; Header->Type = ObTypeObjectType; + + /* Set the hard-coded key and object count */ LocalObjectType->TotalNumberOfObjects = 1; LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); } else { /* Set Tag */ - Tag[0] = TypeName->Buffer[0]; - Tag[1] = TypeName->Buffer[1]; - Tag[2] = TypeName->Buffer[2]; - Tag[3] = TypeName->Buffer[3]; + Tag[0] = (CHAR)TypeName->Buffer[0]; + Tag[1] = (CHAR)TypeName->Buffer[1]; + Tag[2] = (CHAR)TypeName->Buffer[2]; + Tag[3] = (CHAR)TypeName->Buffer[3]; LocalObjectType->Key = *(PULONG)Tag; } @@ -797,9 +969,10 @@ } /* Calculate how much space our header'll take up */ - HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + + HeaderSize = sizeof(OBJECT_HEADER) + + sizeof(OBJECT_HEADER_NAME_INFO) + (ObjectTypeInitializer->MaintainHandleCount ? - sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); + sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); /* Check the pool type */ if (ObjectTypeInitializer->PoolType == NonPagedPool) @@ -846,17 +1019,37 @@ ExInitializeResourceLite(&LocalObjectType->Mutex); InitializeListHead(&LocalObjectType->TypeList); + /* Get creator info and insert it into the type list */ + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); + if (CreatorInfo) InsertTailList(&ObTypeObjectType->TypeList, + &CreatorInfo->TypeList); + + /* Set the index and the entry into the object type array */ + LocalObjectType->Index = ObTypeObjectType->TotalNumberOfObjects; + if (LocalObjectType->Index < 32) + { + /* It fits, insert it */ + ObpObjectTypes[LocalObjectType->Index - 1] = LocalObjectType; + } + /* Check if we're actually creating the directory object itself */ - if (ObpTypeDirectoryObject) - { - /* Insert it into the Object Directory */ - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); - ObReferenceObject(ObpTypeDirectoryObject); - } - - /* Return the object type and creations tatus */ - *ObjectType = LocalObjectType; - return Status; + if (!(ObpTypeDirectoryObject) || + (ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header))) + { + /* Check if the type directory exists */ + if (ObpTypeDirectoryObject) + { + /* Reference it */ + ObReferenceObject(ObpTypeDirectoryObject); + } + + /* Return the object type and success */ + *ObjectType = LocalObjectType; + return STATUS_SUCCESS; + } + + /* If we got here, then we failed */ + return STATUS_INSUFFICIENT_RESOURCES; } /*++ @@ -878,7 +1071,7 @@ ObMakeTemporaryObject(IN PVOID ObjectBody) { /* Call the internal API */ - ObpSetPermanentObject (ObjectBody, FALSE); + ObpSetPermanentObject(ObjectBody, FALSE); } /*++ Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Oct 19 06:20:32 2006 @@ -20,6 +20,82 @@ POBJECT_DIRECTORY ObpTypeDirectoryObject = NULL; /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +ObpCreateDosDevicesDirectory(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name, LinkName; + HANDLE Handle, SymHandle; + NTSTATUS Status; + + /* Create the '\??' directory */ + RtlInitUnicodeString(&Name, L"\\??"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_PERMANENT, + NULL, + NULL); + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Initialize the GLOBALROOT path */ + RtlInitUnicodeString(&LinkName, L"GLOBALROOT"); + RtlInitUnicodeString(&Name, L""); + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_PERMANENT, + Handle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (NT_SUCCESS(Status)) NtClose(SymHandle); + + /* Link \??\Global to \?? */ + RtlInitUnicodeString(&LinkName, L"Global"); + RtlInitUnicodeString(&Name, L"\\??"); + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_PERMANENT, + Handle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (NT_SUCCESS(Status)) NtClose(SymHandle); + + /* Close the directory handle */ + NtClose(Handle); + if (!NT_SUCCESS(Status)) return Status; + + /* Create link from '\DosDevices' to '\??' directory */ + RtlCreateUnicodeString(&LinkName, L"\\DosDevices"); + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_PERMANENT, + NULL, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (NT_SUCCESS(Status)) NtClose(SymHandle); + + /* FIXME: Hack Hack! */ + ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*ObSystemDeviceMap), + TAG('O', 'b', 'D', 'm')); + RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); + + /* Return status */ + return Status; +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Thu Oct 19 06:20:32 2006 @@ -20,14 +20,6 @@ /* GLOBALS ******************************************************************/ POBJECT_TYPE ObSymbolicLinkType = NULL; - -static GENERIC_MAPPING ObpSymbolicLinkMapping = -{ - STANDARD_RIGHTS_READ | SYMBOLIC_LINK_QUERY, - STANDARD_RIGHTS_WRITE, - STANDARD_RIGHTS_EXECUTE | SYMBOLIC_LINK_QUERY, - SYMBOLIC_LINK_ALL_ACCESS -}; /* PRIVATE FUNCTIONS *********************************************************/ @@ -181,40 +173,6 @@ return STATUS_REPARSE; } -/*++ -* @name ObInitSymbolicLinkImplementation -* -* The ObInitSymbolicLinkImplementation routine <FILLMEIN> -* -* @param None. -* -* @return None. -* -* @remarks None. -* -*--*/ -VOID -INIT_FUNCTION -NTAPI -ObInitSymbolicLinkImplementation(VOID) -{ - UNICODE_STRING Name; - OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - - /* Initialize the Directory type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); - RtlInitUnicodeString(&Name, L"SymbolicLink"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_SYMBOLIC_LINK); - ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; - ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); -} - /* PUBLIC FUNCTIONS **********************************************************/ /*++

1 0

[hpoussin] 24567: Fix calling convention for class callbacks
by hpoussin＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: hpoussin Date: Thu Oct 19 02:40:39 2006 New Revision: 24567 URL: http://svn.reactos.org/svn/reactos?rev=24567&view=rev Log: Fix calling convention for class callbacks Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Thu Oct 19 02:40:39 2006 @@ -438,7 +438,7 @@ return Status; } -static BOOLEAN +static BOOLEAN CALLBACK ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, IN OUT PKEYBOARD_INPUT_DATA DataStart, Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Thu Oct 19 02:40:39 2006 @@ -414,7 +414,7 @@ return Status; } -static BOOLEAN +static BOOLEAN CALLBACK ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, IN OUT PMOUSE_INPUT_DATA DataStart,

1 0

[weiden] 24566: Fix gcc4 warning (thx to Herve)
by weiden＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: weiden Date: Thu Oct 19 01:35:18 2006 New Revision: 24566 URL: http://svn.reactos.org/svn/reactos?rev=24566&view=rev Log: Fix gcc4 warning (thx to Herve) Modified: trunk/reactos/lib/crt/wine/cpp.c Modified: trunk/reactos/lib/crt/wine/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/wine/cpp.c?rev=245… ============================================================================== --- trunk/reactos/lib/crt/wine/cpp.c (original) +++ trunk/reactos/lib/crt/wine/cpp.c Thu Oct 19 01:35:18 2006 @@ -1181,7 +1181,7 @@ { int count = 0; const rtti_object_hierachy *obj_bases = obj_locator->type_hierachy; - const rtti_base_descriptor **base_desc = obj_bases->base_classes->bases; + const rtti_base_descriptor* const *base_desc = obj_bases->base_classes->bases; int src_offset = obj_locator->base_class_offset, dst_offset = -1; while (count < obj_bases->array_len)

1 0

[weiden] 24565: fix gcc4 warning
by weiden＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: weiden Date: Thu Oct 19 01:18:02 2006 New Revision: 24565 URL: http://svn.reactos.org/svn/reactos?rev=24565&view=rev Log: fix gcc4 warning Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Thu Oct 19 01:18:02 2006 @@ -358,7 +358,7 @@ ScreenToClient(Info->hTreeView, &HitTest.pt)) { if (TreeView_HitTest(Info->hTreeView, &HitTest)) - TreeView_SelectItem(Info->hTreeView, HitTest.hItem); + (void)TreeView_SelectItem(Info->hTreeView, HitTest.hItem); } } break;

1 0

[ion] 24564: - A much simpler and featured RawFs driver that I had been working on while learning how to write simple FS drivers. Still missing some advanced functionality (Lite Stream File Objects and FS Notifications) because the Kernel doesn't fully support them yet. This one actually creates the \\Device names so that user-mode can even talk to it.
by ion＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: ion Date: Wed Oct 18 22:00:42 2006 New Revision: 24564 URL: http://svn.reactos.org/svn/reactos?rev=24564&view=rev Log: - A much simpler and featured RawFs driver that I had been working on while learning how to write simple FS drivers. Still missing some advanced functionality (Lite Stream File Objects and FS Notifications) because the Kernel doesn't fully support them yet. This one actually creates the \\Device names so that user-mode can even talk to it. Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Wed Oct 18 22:00:42 2006 @@ -1,962 +1,1105 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/rawfs.c - * PURPOSE: Raw filesystem driver - * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/io/iomgr/rawfs.c +* PURPOSE: Raw File System Driver +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* TYPES *******************************************************************/ -typedef struct _RAWFS_GLOBAL_DATA -{ - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; - ULONG Flags; - ERESOURCE VolumeListLock; - LIST_ENTRY VolumeListHead; - NPAGED_LOOKASIDE_LIST FcbLookasideList; - NPAGED_LOOKASIDE_LIST CcbLookasideList; -} RAWFS_GLOBAL_DATA, *PRAWFS_GLOBAL_DATA, VCB, *PVCB; - -typedef struct _RAWFS_DEVICE_EXTENSION -{ - KSPIN_LOCK FcbListLock; - LIST_ENTRY FcbListHead; - PDEVICE_OBJECT StorageDevice; - ULONG Flags; - struct _RAWFS_FCB *VolumeFcb; - LIST_ENTRY VolumeListEntry; -} RAWFS_DEVICE_EXTENSION, *PRAWFS_DEVICE_EXTENSION; - -typedef struct _RAWFS_IRP_CONTEXT -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PRAWFS_DEVICE_EXTENSION DeviceExt; - ULONG Flags; - WORK_QUEUE_ITEM WorkQueueItem; - PIO_STACK_LOCATION Stack; - UCHAR MajorFunction; - UCHAR MinorFunction; - PFILE_OBJECT FileObject; -} RAWFS_IRP_CONTEXT, *PRAWFS_IRP_CONTEXT; - -#define IRPCONTEXT_CANWAIT 0x0001 - -#define FCB_CACHE_INITIALIZED 0x0001 -#define FCB_DELETE_PENDING 0x0002 -#define FCB_IS_FAT 0x0004 -#define FCB_IS_PAGE_FILE 0x0008 -#define FCB_IS_VOLUME 0x0010 - -typedef struct _RAWFS_FCB -{ - /* Start FCB header required by ReactOS/Windows NT */ - FSRTL_COMMON_FCB_HEADER RFCB; - SECTION_OBJECT_POINTERS SectionObjectPointers; - ERESOURCE MainResource; - ERESOURCE PagingIoResource; - /* End FCB header required by ReactOS/Windows NT */ - - /* Reference count */ - LONG RefCount; - - /* List of FCB's for this volume */ - LIST_ENTRY FcbListEntry; - - /* Pointer to the parent fcb */ - struct _RAWFS_FCB* ParentFcb; - - /* Flags for the FCB */ - ULONG Flags; - - /* Pointer to the file object which has initialized the fcb */ - PFILE_OBJECT FileObject; -} RAWFS_FCB, *PRAWFS_FCB; - -typedef struct _RAWFS_CCB -{ - LARGE_INTEGER CurrentByteOffset; -} RAWFS_CCB, *PRAWFS_CCB; - -/* GLOBALS ******************************************************************/ - -static PDRIVER_OBJECT RawFsDriverObject; -static PDEVICE_OBJECT DiskDeviceObject; -static PDEVICE_OBJECT CdromDeviceObject; -static PDEVICE_OBJECT TapeDeviceObject; -static NPAGED_LOOKASIDE_LIST IrpContextLookasideList; -static LONG RawFsQueueCount = 0; +typedef struct _VCB +{ + USHORT NodeTypeCode; + USHORT NodeByteSize; + PDEVICE_OBJECT TargetDeviceObject; + PVPB Vpb; + ULONG VcbState; + KMUTEX Mutex; + CLONG OpenCount; + SHARE_ACCESS ShareAccess; + ULONG BytesPerSector; + LARGE_INTEGER SectorsOnDisk; +} VCB, *PVCB; + +typedef struct _VOLUME_DEVICE_OBJECT +{ + DEVICE_OBJECT DeviceObject; + VCB Vcb; +} VOLUME_DEVICE_OBJECT, *PVOLUME_DEVICE_OBJECT; + +/* GLOBALS *******************************************************************/ + +PDEVICE_OBJECT RawDiskDeviceObject, RawCdromDeviceObject, RawTapeDeviceObject; /* FUNCTIONS *****************************************************************/ +VOID +NTAPI +RawInitializeVcb(IN OUT PVCB Vcb, + IN PDEVICE_OBJECT TargetDeviceObject, + IN PVPB Vpb) +{ + PAGED_CODE(); + + /* Clear it */ + RtlZeroMemory(Vcb, sizeof(VCB)); + + /* Associate to system objects */ + Vcb->TargetDeviceObject = TargetDeviceObject; + Vcb->Vpb = Vpb; + + /* Initialize the lock */ + KeInitializeMutex(&Vcb->Mutex, 0); +} + BOOLEAN -RawFsIsRawFileSystemDeviceObject(IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("RawFsIsRawFileSystemDeviceObject(DeviceObject 0x%p)\n", DeviceObject); - - if (DeviceObject == DiskDeviceObject) - return TRUE; - if (DeviceObject == CdromDeviceObject) - return TRUE; - if (DeviceObject == TapeDeviceObject) - return TRUE; - return FALSE; -} - -static NTSTATUS -RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext); - -/*static */NTSTATUS -RawFsReadDisk(IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN OUT PUCHAR Buffer) -{ - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - DPRINT("RawFsReadDisk(pDeviceObject 0x%p, Offset %I64x, Length %d, Buffer 0x%p)\n", - pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); - - DPRINT ("Building synchronous FSD Request...\n"); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - pDeviceObject, - Buffer, - ReadLength, - ReadOffset, - &Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildSynchronousFsdRequest() failed\n"); - return STATUS_UNSUCCESSFUL; - } - - DPRINT("Calling IO Driver... with irp 0x%p\n", Irp); - Status = IoCallDriver(pDeviceObject, Irp); - - DPRINT("Waiting for IO Operation for 0x%p\n", Irp); - if (Status == STATUS_PENDING) - { - DPRINT("Operation pending\n"); - KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status... for 0x%p\n", Irp); - Status = IoStatus.Status; - } - - if (!NT_SUCCESS(Status)) - { - DPRINT("RawFsReadDisk() failed. Status %x\n", Status); - DPRINT("(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p\n", - pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); - return Status; - } - DPRINT("Block request succeeded for 0x%p\n", Irp); - return STATUS_SUCCESS; -} - -/*static */NTSTATUS -RawFsWriteDisk(IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER WriteOffset, - IN ULONG WriteLength, - IN PUCHAR Buffer) -{ - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - DPRINT("RawFsWriteDisk(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p)\n", - pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - DPRINT("Building synchronous FSD Request...\n"); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, - pDeviceObject, - Buffer, - WriteLength, - WriteOffset, - &Event, - &IoStatus); - if (!Irp) - { - DPRINT("IoBuildSynchronousFsdRequest()\n"); - return(STATUS_UNSUCCESSFUL); - } - - DPRINT("Calling IO Driver...\n"); - Status = IoCallDriver(pDeviceObject, Irp); - - DPRINT("Waiting for IO Operation...\n"); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status...\n"); - Status = IoStatus.Status; - } - if (!NT_SUCCESS(Status)) - { - DPRINT("RawFsWriteDisk() failed. Status %x\n", Status); - DPRINT("(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p\n", - pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); - return Status; - } - - return STATUS_SUCCESS; -} - -static NTSTATUS -RawFsBlockDeviceIoControl(IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG pOutputBufferSize) -{ - ULONG OutputBufferSize = 0; - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - - DPRINT("RawFsBlockDeviceIoControl(DeviceObject 0x%p, CtlCode %x, " - "InputBuffer 0x%p, InputBufferSize %x, OutputBuffer 0x%p, " - "POutputBufferSize 0x%p (%x)\n", DeviceObject, CtlCode, - InputBuffer, InputBufferSize, OutputBuffer, pOutputBufferSize, - pOutputBufferSize ? *pOutputBufferSize : 0); - - if (pOutputBufferSize) - { - OutputBufferSize = *pOutputBufferSize; - } - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - DPRINT("Building device I/O control request ...\n"); - Irp = IoBuildDeviceIoControlRequest(CtlCode, - DeviceObject, - InputBuffer, - InputBufferSize, - OutputBuffer, - OutputBufferSize, - FALSE, - &Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildDeviceIoControlRequest failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - DPRINT("Calling IO Driver... with irp 0x%p\n", Irp); - Status = IoCallDriver(DeviceObject, Irp); - - DPRINT("Waiting for IO Operation for 0x%p\n", Irp); - if (Status == STATUS_PENDING) - { - DPRINT("Operation pending\n"); - KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status... for 0x%p\n", Irp); - Status = IoStatus.Status; - } - if (OutputBufferSize) - { - *pOutputBufferSize = OutputBufferSize; - } - DPRINT("Returning Status %x\n", Status); - return Status; -} - -static PRAWFS_FCB -RawFsNewFCB(IN PRAWFS_GLOBAL_DATA pGlobalData) -{ - PRAWFS_FCB Fcb; - - Fcb = ExAllocateFromNPagedLookasideList(&pGlobalData->FcbLookasideList); - memset(Fcb, 0, sizeof(RAWFS_FCB)); - ExInitializeResourceLite(&Fcb->PagingIoResource); - ExInitializeResourceLite(&Fcb->MainResource); -// FsRtlInitializeFileLock(&Fcb->FileLock, NULL, NULL); - return Fcb; -} - -static VOID -RawFsDestroyFCB(IN PRAWFS_GLOBAL_DATA pGlobalData, IN PRAWFS_FCB pFcb) -{ - //FsRtlUninitializeFileLock(&pFcb->FileLock); - ExDeleteResourceLite(&pFcb->PagingIoResource); - ExDeleteResourceLite(&pFcb->MainResource); - ExFreeToNPagedLookasideList(&pGlobalData->FcbLookasideList, pFcb); -} - -static PRAWFS_CCB -RawFsNewCCB(PRAWFS_GLOBAL_DATA pGlobalData) -{ - PRAWFS_CCB Ccb; - - Ccb = ExAllocateFromNPagedLookasideList(&pGlobalData->CcbLookasideList); - memset(Ccb, 0, sizeof(RAWFS_CCB)); - return Ccb; -} - -/*static */VOID -RawFsDestroyCCB(PRAWFS_GLOBAL_DATA pGlobalData, PRAWFS_CCB pCcb) -{ - ExFreeToNPagedLookasideList(&pGlobalData->CcbLookasideList, pCcb); -} - -static PRAWFS_IRP_CONTEXT -RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) -{ - PRAWFS_GLOBAL_DATA GlobalData; - PRAWFS_IRP_CONTEXT IrpContext; - UCHAR MajorFunction; - - DPRINT("RawFsAllocateIrpContext(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp); - - ASSERT(DeviceObject); - ASSERT(Irp); - - GlobalData = (PRAWFS_GLOBAL_DATA) DeviceObject->DeviceExtension; - IrpContext = ExAllocateFromNPagedLookasideList(&IrpContextLookasideList); - if (IrpContext) - { - RtlZeroMemory(IrpContext, sizeof(IrpContext)); - IrpContext->Irp = Irp; - IrpContext->DeviceObject = DeviceObject; - IrpContext->DeviceExt = DeviceObject->DeviceExtension; - IrpContext->Stack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IrpContext->Stack); - MajorFunction = IrpContext->MajorFunction = IrpContext->Stack->MajorFunction; - IrpContext->MinorFunction = IrpContext->Stack->MinorFunction; - IrpContext->FileObject = IrpContext->Stack->FileObject; - if (MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL || - MajorFunction == IRP_MJ_DEVICE_CONTROL || - MajorFunction == IRP_MJ_SHUTDOWN) +NTAPI +RawCheckForDismount(IN PVCB Vcb, + IN BOOLEAN CreateOperation) +{ + KIRQL OldIrql; + PVPB Vpb; + BOOLEAN Delete; + + /* Lock VPB */ + IoAcquireVpbSpinLock(&OldIrql); + + /* Reference it and check if a create is being done */ + Vpb = Vcb->Vpb; + if (Vcb->Vpb->ReferenceCount != CreateOperation) + { + /* Don't do anything */ + Delete = FALSE; + } + else + { + /* Otherwise, delete the volume */ + Delete = TRUE; + + /* Check if it has a VPB and unmount it */ + if (Vpb->RealDevice->Vpb == Vpb) { - IrpContext->Flags |= IRPCONTEXT_CANWAIT; + Vpb->DeviceObject = NULL; + Vpb->Flags &= ~VPB_MOUNTED; } - else if (MajorFunction != IRP_MJ_CLEANUP && - MajorFunction != IRP_MJ_CLOSE && - IoIsOperationSynchronous(Irp)) + } + + /* Release lock and return status */ + IoReleaseVpbSpinLock(OldIrql); + return Delete; +} + +NTSTATUS +NTAPI +RawCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Check if this was a valid sync R/W request */ + if (((IoStackLocation->MajorFunction == IRP_MJ_READ) || + (IoStackLocation->MajorFunction == IRP_MJ_WRITE)) && + ((IoStackLocation->FileObject)) && + (FlagOn(IoStackLocation->FileObject->Flags, FO_SYNCHRONOUS_IO)) && + (NT_SUCCESS(Irp->IoStatus.Status))) + { + /* Update byte offset */ + IoStackLocation->FileObject->CurrentByteOffset.QuadPart += + Irp->IoStatus.Information; + } + + /* Mark the IRP Pending if it was */ + if (Irp->PendingReturned) IoMarkIrpPending(Irp); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawClose(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + BOOLEAN Deleted = FALSE; + PAGED_CODE(); + + /* Make sure we can clean up */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Decrease the open count and check if this is a dismount */ + Vcb->OpenCount--; + if (!Vcb->OpenCount) Deleted = RawCheckForDismount(Vcb, FALSE); + + /* Check if we should delete the device */ + KeReleaseMutex(&Vcb->Mutex, FALSE); + if (Deleted) + { + /* Delete it */ + IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + } + + /* Complete the request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawCreate(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + BOOLEAN Deleted = FALSE; + USHORT ShareAccess; + ACCESS_MASK DesiredAccess; + PAGED_CODE(); + + /* Make sure we can clean up */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Check if this is a valid non-directory file open */ + if ((!(IoStackLocation->FileObject) || + !(IoStackLocation->FileObject->FileName.Length)) && + ((IoStackLocation->Parameters.Create.Options >> 24) == FILE_OPEN) && + (!(IoStackLocation->Parameters.Create.Options & FILE_DIRECTORY_FILE))) + { + /* Make sure the VCB isn't locked */ + if (Vcb->VcbState & 1) { - IrpContext->Flags |= IRPCONTEXT_CANWAIT; + /* Refuse the operation */ + Status = STATUS_ACCESS_DENIED; + Irp->IoStatus.Information = 0; } - } - return IrpContext; -} - -static VOID -RawFsFreeIrpContext(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsFreeIrpContext(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - ExFreeToNPagedLookasideList(&IrpContextLookasideList, IrpContext); -} - -static VOID -STDCALL RawFsDoRequest(PVOID IrpContext) -{ - ULONG Count; - - Count = InterlockedDecrement(&RawFsQueueCount); - - DPRINT("RawFsDoRequest(IrpContext 0x%p), MajorFunction %x, %d\n", - IrpContext, ((PRAWFS_IRP_CONTEXT) IrpContext)->MajorFunction, Count); - - RawFsDispatchRequest((PRAWFS_IRP_CONTEXT) IrpContext); -} - -static NTSTATUS -RawFsQueueRequest(PRAWFS_IRP_CONTEXT IrpContext) -{ - ULONG Count; - - ASSERT(IrpContext != NULL); - ASSERT(IrpContext->Irp != NULL); - - Count = InterlockedIncrement(&RawFsQueueCount); - - DPRINT("RawFsQueueRequest (IrpContext 0x%p), %d\n", IrpContext, Count); - - IrpContext->Flags |= IRPCONTEXT_CANWAIT; - IoMarkIrpPending (IrpContext->Irp); - ExInitializeWorkItem (&IrpContext->WorkQueueItem, RawFsDoRequest, IrpContext); - ExQueueWorkItem(&IrpContext->WorkQueueItem, CriticalWorkQueue); - return STATUS_PENDING; -} - -static NTSTATUS -RawFsClose(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsClose(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsCreateFile(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - PRAWFS_DEVICE_EXTENSION DeviceExt; - PRAWFS_GLOBAL_DATA GlobalData; - PIO_STACK_LOCATION IoSp; - PFILE_OBJECT FileObject; - ULONG RequestedDisposition; - ULONG RequestedOptions; - PRAWFS_FCB pFcb; - PRAWFS_CCB pCcb; - - GlobalData = (PRAWFS_GLOBAL_DATA) IrpContext->DeviceObject->DeviceExtension; - IoSp = IoGetCurrentIrpStackLocation(IrpContext->Irp); - RequestedDisposition = ((IoSp->Parameters.Create.Options >> 24) & 0xff); - RequestedOptions = IoSp->Parameters.Create.Options & FILE_VALID_OPTION_FLAGS; - FileObject = IoSp->FileObject; - DeviceExt = IrpContext->DeviceObject->DeviceExtension; - - if (FileObject->FileName.Length == 0 && - FileObject->RelatedFileObject == NULL) - { - /* This a open operation for the volume itself */ - if (RequestedDisposition == FILE_CREATE - || RequestedDisposition == FILE_OVERWRITE_IF - || RequestedDisposition == FILE_SUPERSEDE) - { - return STATUS_ACCESS_DENIED; - } - if (RequestedOptions & FILE_DIRECTORY_FILE) - { - return STATUS_NOT_A_DIRECTORY; - } - pFcb = DeviceExt->VolumeFcb; - pCcb = RawFsNewCCB(GlobalData); - if (pCcb == NULL) - { - return (STATUS_INSUFFICIENT_RESOURCES); - } - - FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers; - FileObject->FsContext = pFcb; - FileObject->FsContext2 = pCcb; - pFcb->RefCount++; - - IrpContext->Irp->IoStatus.Information = FILE_OPENED; - return(STATUS_SUCCESS); - } - - /* This filesystem driver only supports volume access */ - return(STATUS_INVALID_PARAMETER); -} - -static NTSTATUS -RawFsCreate(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - NTSTATUS Status; - - DPRINT("RawFsCreate(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - if (RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject)) - { - /* DeviceObject represents FileSystem instead of logical volume */ - DPRINT("RawFsCreate() called with file system\n"); - IrpContext->Irp->IoStatus.Information = FILE_OPENED; - IrpContext->Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(IrpContext->Irp, IO_DISK_INCREMENT); - RawFsFreeIrpContext(IrpContext); - return STATUS_SUCCESS; - } - - if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT)) - { - return RawFsQueueRequest(IrpContext); - } - - IrpContext->Irp->IoStatus.Information = 0; - - Status = RawFsCreateFile(IrpContext); - - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest(IrpContext->Irp, - (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); - RawFsFreeIrpContext(IrpContext); - - return Status; -} - -static NTSTATUS -RawFsRead(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsRead(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsWrite(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsWrite(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsMount(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - PRAWFS_GLOBAL_DATA GlobalData = NULL; - PDEVICE_OBJECT DeviceObject = NULL; - PRAWFS_DEVICE_EXTENSION DeviceExt = NULL; - PRAWFS_FCB VolumeFcb = NULL; - PRAWFS_FCB Fcb = NULL; - PARTITION_INFORMATION PartitionInfo; - DISK_GEOMETRY DiskGeometry; - LARGE_INTEGER VolumeSize; - NTSTATUS Status; - ULONG Size; - - DPRINT("RawFsMount(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - if (!RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject)) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - DPRINT("Not for me\n"); - goto ByeBye; - } - - GlobalData = (PRAWFS_GLOBAL_DATA) IrpContext->DeviceObject->DeviceExtension; - - Status = IoCreateDevice(GlobalData->DriverObject, - sizeof(RAWFS_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } - - DeviceObject->Flags |= DO_DIRECT_IO; - DeviceExt = (PVOID) DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExt, sizeof(RAWFS_DEVICE_EXTENSION)); - - /* Use same vpb as device disk */ - DeviceObject->Vpb = IrpContext->Stack->Parameters.MountVolume.DeviceObject->Vpb; - DeviceExt->StorageDevice = IrpContext->Stack->Parameters.MountVolume.DeviceObject; - DeviceExt->StorageDevice->Vpb->DeviceObject = DeviceObject; - DeviceExt->StorageDevice->Vpb->RealDevice = DeviceExt->StorageDevice; - DeviceExt->StorageDevice->Vpb->Flags |= VPB_MOUNTED; - DeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - KeInitializeSpinLock(&DeviceExt->FcbListLock); - InitializeListHead(&DeviceExt->FcbListHead); - - /* First try getting harddisk geometry then try getting CD-ROM geometry */ - Size = sizeof(DISK_GEOMETRY); - Status = RawFsBlockDeviceIoControl( - IrpContext->Stack->Parameters.MountVolume.DeviceObject, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("RawFsBlockDeviceIoControl failed with status 0x%.08x\n", Status); - goto ByeBye; - } - if (DiskGeometry.MediaType == FixedMedia) - { - // We have found a hard disk - Size = sizeof(PARTITION_INFORMATION); - Status = RawFsBlockDeviceIoControl( - IrpContext->Stack->Parameters.MountVolume.DeviceObject, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size); - if (!NT_SUCCESS(Status)) + else { - DPRINT("RawFsBlockDeviceIoControl() failed (%x)\n", Status); - goto ByeBye; + /* Setup share access */ + ShareAccess = IoStackLocation->Parameters.Create.ShareAccess; + DesiredAccess = IoStackLocation->Parameters.Create. + SecurityContext->DesiredAccess; + + /* Check if this VCB was already opened */ + if (Vcb->OpenCount > 0) + { + /* Try to see if we have access to it */ + Status = IoCheckShareAccess(DesiredAccess, + ShareAccess, + IoStackLocation->FileObject, + &Vcb->ShareAccess, + TRUE); + if (!NT_SUCCESS(Status)) Irp->IoStatus.Information = 0; + } + + /* Make sure we have access */ + if (NT_SUCCESS(Status)) + { + /* Check if this is the first open */ + if (!Vcb->OpenCount) + { + /* Set the share access */ + IoSetShareAccess(DesiredAccess, + ShareAccess, + IoStackLocation->FileObject, + &Vcb->ShareAccess); + } + + /* Increase the open count and set the VPB */ + Vcb->OpenCount += 1; + IoStackLocation->FileObject->Vpb = Vcb->Vpb; + + /* Set IRP status and disable intermediate buffering */ + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + IoStackLocation->FileObject->Flags |= + FO_NO_INTERMEDIATE_BUFFERING; + } } -#ifndef NDEBUG - DbgPrint("Partition Information:\n"); - DbgPrint("StartingOffset %u\n", PartitionInfo.StartingOffset.QuadPart); - DbgPrint("PartitionLength %u\n", PartitionInfo.PartitionLength.QuadPart); - DbgPrint("HiddenSectors %u\n", PartitionInfo.HiddenSectors); - DbgPrint("PartitionNumber %u\n", PartitionInfo.PartitionNumber); - DbgPrint("PartitionType %u\n", PartitionInfo.PartitionType); - DbgPrint("BootIndicator %u\n", PartitionInfo.BootIndicator); - DbgPrint("RecognizedPartition %u\n", PartitionInfo.RecognizedPartition); - DbgPrint("RewritePartition %u\n", PartitionInfo.RewritePartition); + } + else + { + /* Invalid create request */ + Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + } + + /* Check if the request failed */ + if (!(NT_SUCCESS(Status)) && !(Vcb->OpenCount)) + { + /* Check if we can dismount the device */ + Deleted = RawCheckForDismount(Vcb, FALSE); + } + + /* Check if we should delete the device */ + KeReleaseMutex(&Vcb->Mutex, FALSE); + if (Deleted) + { + /* Delete it */ + IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + } + + /* Complete the request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawReadWriteDeviceControl(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Don't do anything if the request was 0 bytes */ + if (((IoStackLocation->MajorFunction == IRP_MJ_READ) || + (IoStackLocation->MajorFunction == IRP_MJ_WRITE)) && + !(IoStackLocation->Parameters.Read.Length)) + { + /* Complete it */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; + } + + /* Copy the IRP stack location */ + IoCopyCurrentIrpStackLocationToNext(Irp); + + /* Disable verifies */ + IoGetNextIrpStackLocation(Irp)->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + + /* Setup a completion routine */ + IoSetCompletionRoutine(Irp, + RawCompletionRoutine, + NULL, + TRUE, + TRUE, + TRUE); + + /* Call the next driver and exit */ + Status = IoCallDriver(Vcb->TargetDeviceObject, Irp); + return Status; +} + +NTSTATUS +NTAPI +RawMountVolume(IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + PVOLUME_DEVICE_OBJECT Volume; + PAGED_CODE(); + + /* Remember our owner */ + DeviceObject = IoStackLocation->Parameters.MountVolume.DeviceObject; + + /* Create the volume */ + Status = IoCreateDevice(RawDiskDeviceObject->DriverObject, + sizeof(VOLUME_DEVICE_OBJECT) - + sizeof(DEVICE_OBJECT), + NULL, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + (PDEVICE_OBJECT*)&Volume); + if (!NT_SUCCESS(Status)) return Status; + + /* Use highest alignment requirement */ + Volume->DeviceObject.AlignmentRequirement = max(DeviceObject-> + AlignmentRequirement, + Volume->DeviceObject. + AlignmentRequirement); + + /* Setup the VCB */ + RawInitializeVcb(&Volume->Vcb, + IoStackLocation->Parameters.MountVolume.DeviceObject, + IoStackLocation->Parameters.MountVolume.Vpb); + + /* Set dummy label and serial number */ + Volume->Vcb.Vpb->SerialNumber = 0xFFFFFFFF; + Volume->Vcb.Vpb->VolumeLabelLength = 0; + + /* Setup the DO */ + Volume->Vcb.Vpb->DeviceObject = &Volume->DeviceObject; + Volume->DeviceObject.StackSize = DeviceObject->StackSize + 1; + Volume->DeviceObject.SectorSize = DeviceObject->SectorSize; + Volume->DeviceObject.Flags |= DO_DIRECT_IO; + Volume->DeviceObject.Flags &= ~DO_DEVICE_INITIALIZING; + return Status; +} + +NTSTATUS +NTAPI +RawUserFsCtrl(IN PIO_STACK_LOCATION IoStackLocation, + IN PVCB Vcb) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Lock the device */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Check what kind of request this is */ + switch (IoStackLocation->Parameters.FileSystemControl.FsControlCode) + { + /* Oplock requests */ + case FSCTL_REQUEST_OPLOCK_LEVEL_1: + case FSCTL_REQUEST_OPLOCK_LEVEL_2: + case FSCTL_OPLOCK_BREAK_ACKNOWLEDGE: + case FSCTL_OPLOCK_BREAK_NOTIFY: + + /* We don't handle them */ + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Lock request */ + case FSCTL_LOCK_VOLUME: + + /* Make sure we're not locked, and that we're alone */ + if (!(Vcb->VcbState & 1) && (Vcb->OpenCount == 1)) + { + /* Lock the VCB */ + Vcb->VcbState |= 1; + Status = STATUS_SUCCESS; + } + else + { + /* Otherwise, we can't do this */ + Status = STATUS_ACCESS_DENIED; + } + break; + + /* Unlock request */ + case FSCTL_UNLOCK_VOLUME: + + /* Make sure we're locked */ + if (!(Vcb->VcbState & 1)) + { + /* Let caller know we're not */ + Status = STATUS_NOT_LOCKED; + } + else + { + /* Unlock the VCB */ + Vcb->VcbState &= ~1; + Status = STATUS_SUCCESS; + } + break; + + /* Dismount request */ + case FSCTL_DISMOUNT_VOLUME: + + /* Make sure we're locked */ + if (Vcb->VcbState & 1) + { + /* Do nothing, just return success */ + Status = STATUS_SUCCESS; + } + else + { + /* We can't dismount, device not locked */ + Status = STATUS_ACCESS_DENIED; + } + break; + + /* Unknown request */ + default: + + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Unlock device and return */ + KeReleaseMutex(&Vcb->Mutex, FALSE); + return Status; +} + +NTSTATUS +NTAPI +RawFileSystemControl(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Check the kinds of FSCTLs that we support */ + switch (IoStackLocation->MinorFunction) + { + /* User-mode request */ + case IRP_MN_USER_FS_REQUEST: + + /* Handle it */ + Status = RawUserFsCtrl(IoStackLocation, Vcb); + break; + + /* Mount request */ + case IRP_MN_MOUNT_VOLUME: + + /* Mount the volume */ + Status = RawMountVolume(IoStackLocation); + break; + + case IRP_MN_VERIFY_VOLUME: + + /* We don't do verifies */ + Status = STATUS_WRONG_VOLUME; + Vcb->Vpb->RealDevice->Flags &= ~DO_VERIFY_VOLUME; + + /* Check if we should delete the device */ + if (RawCheckForDismount(Vcb, FALSE)) + { + /* Do it */ + IoDeleteDevice((PDEVICE_OBJECT) + CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + } + + /* We're done */ + break; + + /* Invalid request */ + default: + + /* Fail it */ + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + /* Complete the request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawQueryInformation(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PULONG Length; + PFILE_POSITION_INFORMATION Buffer; + PAGED_CODE(); + + /* Get information from the IRP */ + Length = &IoStackLocation->Parameters.QueryFile.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + /* We only handle this request */ + if (IoStackLocation->Parameters.QueryFile.FileInformationClass == + FilePositionInformation) + { + /* Validate buffer size */ + if (*Length < sizeof(FILE_POSITION_INFORMATION)) + { + /* Invalid, fail */ + Irp->IoStatus.Information = 0; + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + /* Get offset and update length */ + Buffer->CurrentByteOffset = IoStackLocation->FileObject-> + CurrentByteOffset; + *Length -= sizeof(FILE_POSITION_INFORMATION); + + /* Set IRP Status information */ + Irp->IoStatus.Information = sizeof(FILE_POSITION_INFORMATION); + Status = STATUS_SUCCESS; + } + } + + /* Complete it */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawSetInformation(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PULONG Length; + PFILE_POSITION_INFORMATION Buffer; + PDEVICE_OBJECT DeviceObject; + PAGED_CODE(); + + /* Get information from the IRP */ + Length = &IoStackLocation->Parameters.QueryFile.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + /* We only handle this request */ + if (IoStackLocation->Parameters.QueryFile.FileInformationClass == + FilePositionInformation) + { + /* Get the DO */ + DeviceObject = IoGetRelatedDeviceObject(IoStackLocation->FileObject); + + /* Make sure the offset is aligned */ + if ((Buffer->CurrentByteOffset.LowPart & + DeviceObject->AlignmentRequirement)) + { + /* It's not, fail */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Otherwise, set offset */ + IoStackLocation->FileObject->CurrentByteOffset = Buffer-> + CurrentByteOffset; + + /* Set IRP Status information */ + Status = STATUS_SUCCESS; + } + } + + /* Complete it */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawQueryFsVolumeInfo(IN PVCB Vcb, + IN PFILE_FS_VOLUME_INFORMATION Buffer, + IN OUT PULONG Length) +{ + PAGED_CODE(); + + /* Clear the buffer and stub it out */ + RtlZeroMemory( Buffer, sizeof(FILE_FS_VOLUME_INFORMATION)); + Buffer->VolumeSerialNumber = Vcb->Vpb->SerialNumber; + Buffer->SupportsObjects = FALSE; + Buffer->VolumeLabelLength = 0; + + /* Return length and success */ + *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel[0]); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryFsSizeInfo(IN PVCB Vcb, + IN PFILE_FS_SIZE_INFORMATION Buffer, + IN OUT PULONG Length) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_OBJECT RealDevice; + DISK_GEOMETRY DiskGeometry; + PARTITION_INFORMATION PartitionInformation; + BOOLEAN DiskHasPartitions; + PAGED_CODE(); + + /* Validate the buffer */ + if (*Length < sizeof(FILE_FS_SIZE_INFORMATION)) + { + /* Fail */ + return STATUS_BUFFER_OVERFLOW; + } + + /* Clear the buffer, initialize the event and set the DO */ + RtlZeroMemory(Buffer, sizeof(FILE_FS_SIZE_INFORMATION)); + KeInitializeEvent(&Event, NotificationEvent, FALSE); + RealDevice = Vcb->Vpb->RealDevice; + + /* Build query IRP */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, + RealDevice, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY), + FALSE, + &Event, + &IoStatusBlock); + + /* Call driver and check if we're pending */ + Status = IoCallDriver(RealDevice, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on driver to finish */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* Fail if we couldn't get CHS data */ + if (!NT_SUCCESS(Status)) + { + *Length = 0; + return Status; + } + + /* Check if this is a floppy */ + if (FlagOn(RealDevice->Characteristics, FILE_FLOPPY_DISKETTE)) + { + /* Floppies don't have partitions */ + DiskHasPartitions = FALSE; + } + else + { + /* Setup query IRP */ + KeResetEvent(&Event); + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO, + RealDevice, + NULL, + 0, + &PartitionInformation, + sizeof(PARTITION_INFORMATION), + FALSE, + &Event, + &IoStatusBlock); + + /* Call driver and check if we're pending */ + Status = IoCallDriver(RealDevice, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on driver to finish */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* If this was an invalid request, then the disk is not partitioned */ + if (Status == STATUS_INVALID_DEVICE_REQUEST) + { + DiskHasPartitions = FALSE; + } + else + { + /* Otherwise, it must be */ + ASSERT(NT_SUCCESS(Status)); + DiskHasPartitions = TRUE; + } + } + + /* Set sector data */ + Buffer->BytesPerSector = DiskGeometry.BytesPerSector; + Buffer->SectorsPerAllocationUnit = 1; + + /* Calculate allocation units */ + if (DiskHasPartitions) + { + /* Use partition data */ + Buffer->TotalAllocationUnits = + RtlExtendedLargeIntegerDivide(PartitionInformation.PartitionLength, + DiskGeometry.BytesPerSector, + NULL); + } + else + { + /* Use CHS */ + Buffer->TotalAllocationUnits = + RtlExtendedIntegerMultiply(DiskGeometry.Cylinders, + DiskGeometry.TracksPerCylinder * + DiskGeometry.SectorsPerTrack); + } + + /* Set available units */ + Buffer->AvailableAllocationUnits = Buffer->TotalAllocationUnits; + + /* Return length and success */ + *Length -= sizeof(FILE_FS_SIZE_INFORMATION); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryFsDeviceInfo(IN PVCB Vcb, + IN PFILE_FS_DEVICE_INFORMATION Buffer, + IN OUT PULONG Length) +{ + PAGED_CODE(); + + /* Validate buffer */ + if (*Length < sizeof(FILE_FS_DEVICE_INFORMATION)) + { + /* Fail */ + return STATUS_BUFFER_OVERFLOW; + } + + /* Clear buffer and write information */ + RtlZeroMemory(Buffer, sizeof(FILE_FS_DEVICE_INFORMATION)); + Buffer->DeviceType = FILE_DEVICE_DISK; + Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics; + + /* Return length and success */ + *Length -= sizeof(FILE_FS_DEVICE_INFORMATION); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryFsAttributeInfo(IN PVCB Vcb, + IN PFILE_FS_ATTRIBUTE_INFORMATION Buffer, + IN OUT PULONG Length) +{ + ULONG ReturnLength; + PAGED_CODE(); + + /* Check if the buffer is large enough for our name ("RAW") */ + ReturnLength = FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, + FileSystemName[0]); + ReturnLength += sizeof(L"RAW"); + if (*Length < ReturnLength) return STATUS_BUFFER_OVERFLOW; + + /* Output the data */ + Buffer->FileSystemAttributes = 0; + Buffer->MaximumComponentNameLength = 0; + Buffer->FileSystemNameLength = 6; + RtlMoveMemory(&Buffer->FileSystemName[0], L"RAW", 6); + + /* Return length and success */ + *Length -= ReturnLength; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryVolumeInformation(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + ULONG Length; + PVOID Buffer; + PAGED_CODE(); + + /* Get IRP Data */ + Length = IoStackLocation->Parameters.QueryVolume.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + /* Check the kind of request */ + switch (IoStackLocation->Parameters.QueryVolume.FsInformationClass) + { + /* Volume information request */ + case FileFsVolumeInformation: + + Status = RawQueryFsVolumeInfo(Vcb, Buffer, &Length); + break; + + /* File system size invormation */ + case FileFsSizeInformation: + + Status = RawQueryFsSizeInfo(Vcb, Buffer, &Length); + break; + + /* Device information */ + case FileFsDeviceInformation: + + Status = RawQueryFsDeviceInfo(Vcb, Buffer, &Length); + break; + + /* Attribute information */ + case FileFsAttributeInformation: + + Status = RawQueryFsAttributeInfo(Vcb, Buffer, &Length); + break; + + /* Invalid request */ + default: + + /* Fail it */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Set status and complete the request */ + Irp->IoStatus.Information = IoStackLocation-> + Parameters.QueryVolume.Length - Length; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawCleanup(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Make sure we can clean up */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Remove shared access and complete the request */ + IoRemoveShareAccess(IoStackLocation->FileObject, &Vcb->ShareAccess); + KeReleaseMutex(&Vcb->Mutex, FALSE); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawDispatch(IN PVOLUME_DEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PIO_STACK_LOCATION IoStackLocation; + PVCB Vcb; + PAGED_CODE(); + + /* Get the stack location */ + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Differentiate between Volume DO and FS DO */ + if ((((PDEVICE_OBJECT)DeviceObject)->Size == sizeof(DEVICE_OBJECT)) && + !((IoStackLocation->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) && + (IoStackLocation->MinorFunction == IRP_MN_MOUNT_VOLUME))) + { + /* This is an FS DO. Stub out the common calls */ + if ((IoStackLocation->MajorFunction == IRP_MJ_CREATE) || + (IoStackLocation->MajorFunction == IRP_MJ_CLEANUP) || + (IoStackLocation->MajorFunction == IRP_MJ_CLOSE)) + { + /* Return success for them */ + Status = STATUS_SUCCESS; + } + else + { + /* Anything else, we don't support */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Complete the request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; + } + + /* Otherwise, get our VCB and start handling the IRP */ + FsRtlEnterFileSystem(); + Vcb = &DeviceObject->Vcb; + + /* Check what kind of IRP this is */ + switch (IoStackLocation->MajorFunction) + { + /* Cleanup request */ + case IRP_MJ_CLEANUP: + + Status = RawCleanup(Vcb, Irp, IoStackLocation); + break; + + /* Close request */ + case IRP_MJ_CLOSE: + + Status = RawClose(Vcb, Irp, IoStackLocation); + break; + + /* Create request */ + case IRP_MJ_CREATE: + + Status = RawCreate(Vcb, Irp, IoStackLocation); + break; + + /* FSCTL request */ + case IRP_MJ_FILE_SYSTEM_CONTROL: + + Status = RawFileSystemControl(Vcb, Irp, IoStackLocation); + break; + + /* R/W or IOCTL request */ + case IRP_MJ_READ: + case IRP_MJ_WRITE: + case IRP_MJ_DEVICE_CONTROL: + + Status = RawReadWriteDeviceControl(Vcb, Irp, IoStackLocation); + break; + + /* Information query request */ + case IRP_MJ_QUERY_INFORMATION: + + Status = RawQueryInformation(Vcb, Irp, IoStackLocation); + break; + + /* Information set request */ + case IRP_MJ_SET_INFORMATION: + + Status = RawSetInformation(Vcb, Irp, IoStackLocation); + break; + + /* Volume information request */ + case IRP_MJ_QUERY_VOLUME_INFORMATION: + + Status = RawQueryVolumeInformation(Vcb, Irp, IoStackLocation); + break; + + /* Unexpected request */ + default: + + /* Anything else is pretty bad */ + KeBugCheck(FILE_SYSTEM); + } + + /* Return the status */ + FsRtlExitFileSystem(); + return Status; +} + +NTSTATUS +NTAPI +RawShutdown(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* Unregister file systems */ +#if 0 // FIXME: This freezes ROS at shutdown. PnP Problem? + IoUnregisterFileSystem(RawDiskDeviceObject); + IoUnregisterFileSystem(RawCdromDeviceObject); + IoUnregisterFileSystem(RawTapeDeviceObject); + + /* Delete the devices */ + IoDeleteDevice(RawDiskDeviceObject); + IoDeleteDevice(RawCdromDeviceObject); + IoDeleteDevice(RawTapeDeviceObject); #endif - VolumeSize.QuadPart = PartitionInfo.PartitionLength.QuadPart; - } - else if (DiskGeometry.MediaType > Unknown && DiskGeometry.MediaType <= RemovableMedia) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - goto ByeBye; - } - - VolumeFcb = RawFsNewFCB(GlobalData); - if (VolumeFcb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - VolumeFcb->Flags = FCB_IS_VOLUME; - VolumeFcb->RFCB.FileSize.QuadPart = VolumeSize.QuadPart; - VolumeFcb->RFCB.ValidDataLength.QuadPart = VolumeFcb->RFCB.FileSize.QuadPart; - VolumeFcb->RFCB.AllocationSize.QuadPart = VolumeFcb->RFCB.FileSize.QuadPart; - DeviceExt->VolumeFcb = VolumeFcb; - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&GlobalData->VolumeListLock, TRUE); - InsertHeadList(&GlobalData->VolumeListHead, &DeviceExt->VolumeListEntry); - ExReleaseResourceLite(&GlobalData->VolumeListLock); - KeLeaveCriticalRegion(); - - /* No serial number */ - DeviceObject->Vpb->SerialNumber = 0; - - /* Set volume label (no label) */ - *(DeviceObject->Vpb->VolumeLabel) = 0; - DeviceObject->Vpb->VolumeLabelLength = 0; - - Status = STATUS_SUCCESS; - -ByeBye: - if (!NT_SUCCESS(Status)) - { - DPRINT("RAWFS: RawFsMount() Status 0x%.08x\n", Status); - - if (Fcb) - RawFsDestroyFCB(GlobalData, Fcb); - if (DeviceObject) - IoDeleteDevice(DeviceObject); - if (VolumeFcb) - RawFsDestroyFCB(GlobalData, VolumeFcb); - } - return Status; -} - -static NTSTATUS -RawFsFileSystemControl(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - NTSTATUS Status; - - DPRINT("RawFsFileSystemControl(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - switch (IrpContext->MinorFunction) - { - case IRP_MN_USER_FS_REQUEST: - DPRINT("RawFs FSC: IRP_MN_USER_FS_REQUEST\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - - case IRP_MN_MOUNT_VOLUME: - DPRINT("RawFs FSC: IRP_MN_MOUNT_VOLUME\n"); - Status = RawFsMount(IrpContext); - break; - - case IRP_MN_VERIFY_VOLUME: - DPRINT("RawFs FSC: IRP_MN_VERIFY_VOLUME\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - - default: - DPRINT("RawFs FSC: MinorFunction %d\n", IrpContext->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - IrpContext->Irp->IoStatus.Status = Status; - IrpContext->Irp->IoStatus.Information = 0; - - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - RawFsFreeIrpContext(IrpContext); - return Status; -} - -static NTSTATUS -RawFsQueryInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsQueryInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsSetInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsSetInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsDirectoryControl(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsDirectoryControl(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsQueryVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsQueryVolumeInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsSetVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsSetVolumeInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsLockControl(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsLockControl(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsCleanup(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsCleanup(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsFlush(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsFlush(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS STDCALL -RawFsShutdown(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) -{ - DPRINT("RawFsShutdown(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp); - - /* - * Note: Do NOT call UNIMPLEMENTED here! - * This function must finish in order to shutdown ReactOS properly! - */ - - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsDispatchRequest(IrpContext 0x%p), MajorFunction %x\n", - IrpContext, IrpContext->MajorFunction); - - ASSERT(IrpContext); - - switch (IrpContext->MajorFunction) - { - case IRP_MJ_CLOSE: - return RawFsClose(IrpContext); - case IRP_MJ_CREATE: - return RawFsCreate (IrpContext); - case IRP_MJ_READ: - return RawFsRead (IrpContext); - case IRP_MJ_WRITE: - return RawFsWrite (IrpContext); - case IRP_MJ_FILE_SYSTEM_CONTROL: - return RawFsFileSystemControl(IrpContext); - case IRP_MJ_QUERY_INFORMATION: - return RawFsQueryInformation (IrpContext); - case IRP_MJ_SET_INFORMATION: - return RawFsSetInformation (IrpContext); - case IRP_MJ_DIRECTORY_CONTROL: - return RawFsDirectoryControl(IrpContext); - case IRP_MJ_QUERY_VOLUME_INFORMATION: - return RawFsQueryVolumeInformation(IrpContext); - case IRP_MJ_SET_VOLUME_INFORMATION: - return RawFsSetVolumeInformation(IrpContext); - case IRP_MJ_LOCK_CONTROL: - return RawFsLockControl(IrpContext); - case IRP_MJ_CLEANUP: - return RawFsCleanup(IrpContext); - case IRP_MJ_FLUSH_BUFFERS: - return RawFsFlush(IrpContext); - default: - DPRINT1("Unexpected major function %x\n", IrpContext->MajorFunction); - IrpContext->Irp->IoStatus.Status = STATUS_DRIVER_INTERNAL_ERROR; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - RawFsFreeIrpContext(IrpContext); - return STATUS_DRIVER_INTERNAL_ERROR; - } -} - -static NTSTATUS STDCALL -RawFsBuildRequest(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PRAWFS_IRP_CONTEXT IrpContext; - NTSTATUS Status; - - DPRINT("RawFsBuildRequest(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp); - - ASSERT(DeviceObject); - ASSERT(Irp); - - IrpContext = RawFsAllocateIrpContext(DeviceObject, Irp); - if (IrpContext == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - else - { - if (KeGetCurrentIrql() <= PASSIVE_LEVEL) - { - FsRtlEnterFileSystem(); - } - else - { - DPRINT1("RawFs is entered at irql = %d\n", KeGetCurrentIrql()); - } - Status = RawFsDispatchRequest(IrpContext); - if (KeGetCurrentIrql() <= PASSIVE_LEVEL) - { - FsRtlExitFileSystem(); - } - } - return Status; -} - -NTSTATUS STDCALL + + /* Complete the request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +VOID +NTAPI +RawUnload(IN PDRIVER_OBJECT DriverObject) +{ +#if 0 // FIXME: DriverUnload is never called + /* Dereference device objects */ + ObDereferenceObject(RawDiskDeviceObject); + ObDereferenceObject(RawCdromDeviceObject); + ObDereferenceObject(RawTapeDeviceObject); +#endif +} + +NTSTATUS +NTAPI RawFsDriverEntry(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) -{ - PRAWFS_GLOBAL_DATA DeviceData; - NTSTATUS Status; - - RawFsDriverObject = DriverObject; - - Status = IoCreateDevice(DriverObject, - sizeof(RAWFS_GLOBAL_DATA), - NULL, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DiskDeviceObject); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDevice() failed with status 0x%.08x\n", Status); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - return(Status); - } - DeviceData = DiskDeviceObject->DeviceExtension; - RtlZeroMemory(DeviceData, sizeof(RAWFS_GLOBAL_DATA)); - DeviceData->DriverObject = DriverObject; - DeviceData->DeviceObject = DiskDeviceObject; - DiskDeviceObject->Flags |= DO_DIRECT_IO; - - - Status = IoCreateDevice(DriverObject, - sizeof(RAWFS_GLOBAL_DATA), - NULL, - FILE_DEVICE_CD_ROM_FILE_SYSTEM, - 0, - FALSE, - &CdromDeviceObject); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDevice() failed with status 0x%.08x\n", Status); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - return(Status); - } - DeviceData = CdromDeviceObject->DeviceExtension; - RtlZeroMemory (DeviceData, sizeof(RAWFS_GLOBAL_DATA)); - DeviceData->DriverObject = DriverObject; - DeviceData->DeviceObject = CdromDeviceObject; - CdromDeviceObject->Flags |= DO_DIRECT_IO; - - - Status = IoCreateDevice(DriverObject, - sizeof(RAWFS_GLOBAL_DATA), - NULL, - FILE_DEVICE_TAPE_FILE_SYSTEM, - 0, - FALSE, - &TapeDeviceObject); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - return(Status); - } - DeviceData = TapeDeviceObject->DeviceExtension; - RtlZeroMemory (DeviceData, sizeof(RAWFS_GLOBAL_DATA)); - DeviceData->DriverObject = DriverObject; - DeviceData->DeviceObject = TapeDeviceObject; - TapeDeviceObject->Flags |= DO_DIRECT_IO; - - - DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = (PDRIVER_DISPATCH) RawFsShutdown; - DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->DriverUnload = NULL; - - ExInitializeNPagedLookasideList(&IrpContextLookasideList, - NULL, NULL, 0, sizeof(RAWFS_IRP_CONTEXT), TAG_IRP, 0); - - - IoRegisterFileSystem(DiskDeviceObject); - IoRegisterFileSystem(CdromDeviceObject); - IoRegisterFileSystem(TapeDeviceObject); - - return STATUS_SUCCESS; + IN PUNICODE_STRING RegistryPath) +{ + UNICODE_STRING DeviceName; + NTSTATUS Status; + + /* Create the raw disk device */ + RtlInitUnicodeString(&DeviceName, L"\\Device\\RawDisk"); + Status = IoCreateDevice(DriverObject, + 0, + NULL, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &RawDiskDeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the raw CDROM device */ + RtlInitUnicodeString(&DeviceName, L"\\Device\\RawCdRom"); + Status = IoCreateDevice(DriverObject, + 0, + NULL, + FILE_DEVICE_CD_ROM_FILE_SYSTEM, + 0, + FALSE, + &RawCdromDeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the raw tape device */ + RtlInitUnicodeString(&DeviceName, L"\\Device\\RawTape"); + Status = IoCreateDevice(DriverObject, + 0, + NULL, + FILE_DEVICE_TAPE_FILE_SYSTEM, + 0, + FALSE, + &RawTapeDeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Set Direct I/O for all devices */ + RawDiskDeviceObject->Flags |= DO_DIRECT_IO; + RawCdromDeviceObject->Flags |= DO_DIRECT_IO; + RawTapeDeviceObject->Flags |= DO_DIRECT_IO; + + /* Set generic stubs */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = + DriverObject->MajorFunction[IRP_MJ_CLOSE] = + DriverObject->MajorFunction[IRP_MJ_READ] = + DriverObject->MajorFunction[IRP_MJ_WRITE] = + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)RawDispatch; + + /* Shutdown and unload */ + DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = RawShutdown; + DriverObject->DriverUnload = RawUnload; + + /* Register the file systems */ + IoRegisterFileSystem(RawDiskDeviceObject); + IoRegisterFileSystem(RawCdromDeviceObject); + IoRegisterFileSystem(RawTapeDeviceObject); + +#if 0 // FIXME: DriverUnload is never called + /* Reference device objects */ + ObReferenceObject(RawDiskDeviceObject); + ObReferenceObject(RawCdromDeviceObject); + ObReferenceObject(RawTapeDeviceObject); +#endif + return STATUS_SUCCESS; } /* EOF */

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
36
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2006