Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/01: [SHELL32] Enable to change shortcut icon (#784)
by Katayama Hirofumi MZ 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73798d2e71c23db0fb467… commit 73798d2e71c23db0fb467f7c5d86a45ac23e343b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 21 20:49:32 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 21 13:49:32 2018 +0200 [SHELL32] Enable to change shortcut icon (#784) CORE-11407 --- dll/win32/shell32/CShellLink.cpp | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 1bbb2e1111..7efddc998e 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -1739,36 +1739,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIcon */ uFlags |= GIL_FORSHORTCUT; - if (m_pPidl || m_sPath) + hr = GetIconLocation(pszIconFile, cchMax, piIndex); + if (FAILED(hr)) { - /* first look for an icon using the PIDL (if present) */ if (m_pPidl) hr = SHELL_PidlGetIconLocationW(m_pPidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); - else - hr = E_FAIL; - -#if 0 // FIXME: Analyse further whether this is needed... - /* if we couldn't find an icon yet, look for it using the file system path */ - if (FAILED(hr) && m_sPath) - { - LPITEMIDLIST pidl; - CComPtr<IShellFolder> pdsk; - - hr = SHGetDesktopFolder(&pdsk); - - /* LPITEMIDLIST pidl = ILCreateFromPathW(sPath); */ - hr = pdsk->ParseDisplayName(0, NULL, m_sPath, NULL, &pidl, NULL); - if (SUCCEEDED(hr)) - { - hr = SHELL_PidlGetIconLocationW(pidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags); - SHFree(pidl); - } - } -#endif - return hr; } - return S_OK; + return hr; } HRESULT STDMETHODCALLTYPE @@ -2967,6 +2945,7 @@ LRESULT CShellLink::OnNotify(HWND hwndDlg, int idFrom, LPNMHDR pnmhdr) TRACE("This %p m_sLinkPath %S\n", this, m_sLinkPath); Save(m_sLinkPath, TRUE); + SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATHW, m_sLinkPath, NULL); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR); return TRUE; }

1 0

01/01: [BROWSEUI] Show Tooltip text for 'Go' Button -Patch by Barret Karish CORE-11058
by Robert Naumann 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3cfe88eda866440dbab9… commit b3cfe88eda866440dbab98e56ef84862875ae6cc Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Tue Aug 21 10:05:50 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 21 12:49:04 2018 +0200 [BROWSEUI] Show Tooltip text for 'Go' Button -Patch by Barret Karish CORE-11058 --- dll/win32/browseui/addressband.cpp | 13 +++++++++++-- dll/win32/browseui/addressband.h | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dll/win32/browseui/addressband.cpp b/dll/win32/browseui/addressband.cpp index 0bc3e971e2..54b0480c6a 100644 --- a/dll/win32/browseui/addressband.cpp +++ b/dll/win32/browseui/addressband.cpp @@ -415,8 +415,17 @@ LRESULT CAddressBand::OnTipText(UINT idControl, NMHDR *notifyHeader, BOOL &bHand { if (notifyHeader->hwndFrom == fGoButton) { - // TODO - // Go to "destination path" + WCHAR szText[MAX_PATH]; + WCHAR szFormat[MAX_PATH]; + LPNMTBGETINFOTIP pGIT = (LPNMTBGETINFOTIP)notifyHeader; + + if (::GetWindowTextW(fEditControl, szText, _countof(szText))) + { + LoadStringW(_AtlBaseModule.GetResourceInstance(), IDS_GOBUTTONTIPTEMPLATE, szFormat, _countof(szFormat)); + wnsprintf(pGIT->pszText, pGIT->cchTextMax, szFormat, szText); + } + else + *pGIT->pszText = 0; } return 0; } diff --git a/dll/win32/browseui/addressband.h b/dll/win32/browseui/addressband.h index eaba14282a..c4fd006ad6 100644 --- a/dll/win32/browseui/addressband.h +++ b/dll/win32/browseui/addressband.h @@ -109,7 +109,7 @@ public: BEGIN_MSG_MAP(CAddressBand) NOTIFY_CODE_HANDLER(NM_CLICK, OnNotifyClick) - NOTIFY_CODE_HANDLER(TTN_NEEDTEXTW, OnTipText) + NOTIFY_CODE_HANDLER(TBN_GETINFOTIP, OnTipText) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChanging)

1 0

01/01: Addendum to 45fd48b
by Pierre Schweitzer 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c15c61275ce61535bf3af… commit c15c61275ce61535bf3af3cde71eff1c589089bd Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Aug 21 12:41:50 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Aug 21 12:41:50 2018 +0200 Addendum to 45fd48b --- drivers/filesystems/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt index 24937d7f13..7485d433b5 100644 --- a/drivers/filesystems/CMakeLists.txt +++ b/drivers/filesystems/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(btrfs) -add_subdirectory(cdfs_new) +add_subdirectory(cdfs) add_subdirectory(ext2) add_subdirectory(fastfat) add_subdirectory(ffs)

1 0

02/02: [CDFS_NEW] -> [CDFS] No old driver, thus no new driver
by Pierre Schweitzer 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45fd48bd0ffb56d224d2e… commit 45fd48bd0ffb56d224d2e3bf2d93db6007fefbc5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Aug 21 12:32:15 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Aug 21 12:32:15 2018 +0200 [CDFS_NEW] -> [CDFS] No old driver, thus no new driver --- boot/environ/lib/io/etfs.c | 2 +- drivers/filesystems/{cdfs_new => cdfs}/CMakeLists.txt | 0 drivers/filesystems/{cdfs_new => cdfs}/LICENSE | 0 drivers/filesystems/{cdfs_new => cdfs}/README.md | 0 drivers/filesystems/{cdfs_new => cdfs}/allocsup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/cachesup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/cd.h | 0 drivers/filesystems/{cdfs_new => cdfs}/cddata.c | 0 drivers/filesystems/{cdfs_new => cdfs}/cddata.h | 0 drivers/filesystems/{cdfs_new => cdfs}/cdfs.rc | 0 drivers/filesystems/{cdfs_new => cdfs}/cdfs_reg.inf | 0 drivers/filesystems/{cdfs_new => cdfs}/cdinit.c | 0 drivers/filesystems/{cdfs_new => cdfs}/cdprocs.h | 0 drivers/filesystems/{cdfs_new => cdfs}/cdprocssrc.c | 0 drivers/filesystems/{cdfs_new => cdfs}/cdstruc.h | 0 drivers/filesystems/{cdfs_new => cdfs}/cleanup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/close.c | 0 drivers/filesystems/{cdfs_new => cdfs}/create.c | 0 drivers/filesystems/{cdfs_new => cdfs}/devctrl.c | 0 drivers/filesystems/{cdfs_new => cdfs}/deviosup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/dirctrl.c | 0 drivers/filesystems/{cdfs_new => cdfs}/dirsup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/fieldoff.c | 0 drivers/filesystems/{cdfs_new => cdfs}/fileinfo.c | 0 drivers/filesystems/{cdfs_new => cdfs}/filobsup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/fsctrl.c | 0 drivers/filesystems/{cdfs_new => cdfs}/fspdisp.c | 0 drivers/filesystems/{cdfs_new => cdfs}/lockctrl.c | 0 drivers/filesystems/{cdfs_new => cdfs}/namesup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/nodetype.h | 0 drivers/filesystems/{cdfs_new => cdfs}/pathsup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/pnp.c | 0 drivers/filesystems/{cdfs_new => cdfs}/prefxsup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/read.c | 0 drivers/filesystems/{cdfs_new => cdfs}/resrcsup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/shutdown.c | 0 drivers/filesystems/{cdfs_new => cdfs}/strucsup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/verfysup.c | 0 drivers/filesystems/{cdfs_new => cdfs}/volinfo.c | 0 drivers/filesystems/{cdfs_new => cdfs}/workque.c | 0 drivers/filesystems/{cdfs_new => cdfs}/write.c | 0 41 files changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/environ/lib/io/etfs.c b/boot/environ/lib/io/etfs.c index 8d8797b01b..da5ee0f865 100644 --- a/boot/environ/lib/io/etfs.c +++ b/boot/environ/lib/io/etfs.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ #include <bl.h> -#include <cdfs_new/cd.h> +#include <cdfs/cd.h> typedef struct _RAW_ET_VD { UCHAR BootIndicator; diff --git a/drivers/filesystems/cdfs_new/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt similarity index 100% rename from drivers/filesystems/cdfs_new/CMakeLists.txt rename to drivers/filesystems/cdfs/CMakeLists.txt diff --git a/drivers/filesystems/cdfs_new/LICENSE b/drivers/filesystems/cdfs/LICENSE similarity index 100% rename from drivers/filesystems/cdfs_new/LICENSE rename to drivers/filesystems/cdfs/LICENSE diff --git a/drivers/filesystems/cdfs_new/README.md b/drivers/filesystems/cdfs/README.md similarity index 100% rename from drivers/filesystems/cdfs_new/README.md rename to drivers/filesystems/cdfs/README.md diff --git a/drivers/filesystems/cdfs_new/allocsup.c b/drivers/filesystems/cdfs/allocsup.c similarity index 100% rename from drivers/filesystems/cdfs_new/allocsup.c rename to drivers/filesystems/cdfs/allocsup.c diff --git a/drivers/filesystems/cdfs_new/cachesup.c b/drivers/filesystems/cdfs/cachesup.c similarity index 100% rename from drivers/filesystems/cdfs_new/cachesup.c rename to drivers/filesystems/cdfs/cachesup.c diff --git a/drivers/filesystems/cdfs_new/cd.h b/drivers/filesystems/cdfs/cd.h similarity index 100% rename from drivers/filesystems/cdfs_new/cd.h rename to drivers/filesystems/cdfs/cd.h diff --git a/drivers/filesystems/cdfs_new/cddata.c b/drivers/filesystems/cdfs/cddata.c similarity index 100% rename from drivers/filesystems/cdfs_new/cddata.c rename to drivers/filesystems/cdfs/cddata.c diff --git a/drivers/filesystems/cdfs_new/cddata.h b/drivers/filesystems/cdfs/cddata.h similarity index 100% rename from drivers/filesystems/cdfs_new/cddata.h rename to drivers/filesystems/cdfs/cddata.h diff --git a/drivers/filesystems/cdfs_new/cdfs.rc b/drivers/filesystems/cdfs/cdfs.rc similarity index 100% rename from drivers/filesystems/cdfs_new/cdfs.rc rename to drivers/filesystems/cdfs/cdfs.rc diff --git a/drivers/filesystems/cdfs_new/cdfs_reg.inf b/drivers/filesystems/cdfs/cdfs_reg.inf similarity index 100% rename from drivers/filesystems/cdfs_new/cdfs_reg.inf rename to drivers/filesystems/cdfs/cdfs_reg.inf diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs/cdinit.c similarity index 100% rename from drivers/filesystems/cdfs_new/cdinit.c rename to drivers/filesystems/cdfs/cdinit.c diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs/cdprocs.h similarity index 100% rename from drivers/filesystems/cdfs_new/cdprocs.h rename to drivers/filesystems/cdfs/cdprocs.h diff --git a/drivers/filesystems/cdfs_new/cdprocssrc.c b/drivers/filesystems/cdfs/cdprocssrc.c similarity index 100% rename from drivers/filesystems/cdfs_new/cdprocssrc.c rename to drivers/filesystems/cdfs/cdprocssrc.c diff --git a/drivers/filesystems/cdfs_new/cdstruc.h b/drivers/filesystems/cdfs/cdstruc.h similarity index 100% rename from drivers/filesystems/cdfs_new/cdstruc.h rename to drivers/filesystems/cdfs/cdstruc.h diff --git a/drivers/filesystems/cdfs_new/cleanup.c b/drivers/filesystems/cdfs/cleanup.c similarity index 100% rename from drivers/filesystems/cdfs_new/cleanup.c rename to drivers/filesystems/cdfs/cleanup.c diff --git a/drivers/filesystems/cdfs_new/close.c b/drivers/filesystems/cdfs/close.c similarity index 100% rename from drivers/filesystems/cdfs_new/close.c rename to drivers/filesystems/cdfs/close.c diff --git a/drivers/filesystems/cdfs_new/create.c b/drivers/filesystems/cdfs/create.c similarity index 100% rename from drivers/filesystems/cdfs_new/create.c rename to drivers/filesystems/cdfs/create.c diff --git a/drivers/filesystems/cdfs_new/devctrl.c b/drivers/filesystems/cdfs/devctrl.c similarity index 100% rename from drivers/filesystems/cdfs_new/devctrl.c rename to drivers/filesystems/cdfs/devctrl.c diff --git a/drivers/filesystems/cdfs_new/deviosup.c b/drivers/filesystems/cdfs/deviosup.c similarity index 100% rename from drivers/filesystems/cdfs_new/deviosup.c rename to drivers/filesystems/cdfs/deviosup.c diff --git a/drivers/filesystems/cdfs_new/dirctrl.c b/drivers/filesystems/cdfs/dirctrl.c similarity index 100% rename from drivers/filesystems/cdfs_new/dirctrl.c rename to drivers/filesystems/cdfs/dirctrl.c diff --git a/drivers/filesystems/cdfs_new/dirsup.c b/drivers/filesystems/cdfs/dirsup.c similarity index 100% rename from drivers/filesystems/cdfs_new/dirsup.c rename to drivers/filesystems/cdfs/dirsup.c diff --git a/drivers/filesystems/cdfs_new/fieldoff.c b/drivers/filesystems/cdfs/fieldoff.c similarity index 100% rename from drivers/filesystems/cdfs_new/fieldoff.c rename to drivers/filesystems/cdfs/fieldoff.c diff --git a/drivers/filesystems/cdfs_new/fileinfo.c b/drivers/filesystems/cdfs/fileinfo.c similarity index 100% rename from drivers/filesystems/cdfs_new/fileinfo.c rename to drivers/filesystems/cdfs/fileinfo.c diff --git a/drivers/filesystems/cdfs_new/filobsup.c b/drivers/filesystems/cdfs/filobsup.c similarity index 100% rename from drivers/filesystems/cdfs_new/filobsup.c rename to drivers/filesystems/cdfs/filobsup.c diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs/fsctrl.c similarity index 100% rename from drivers/filesystems/cdfs_new/fsctrl.c rename to drivers/filesystems/cdfs/fsctrl.c diff --git a/drivers/filesystems/cdfs_new/fspdisp.c b/drivers/filesystems/cdfs/fspdisp.c similarity index 100% rename from drivers/filesystems/cdfs_new/fspdisp.c rename to drivers/filesystems/cdfs/fspdisp.c diff --git a/drivers/filesystems/cdfs_new/lockctrl.c b/drivers/filesystems/cdfs/lockctrl.c similarity index 100% rename from drivers/filesystems/cdfs_new/lockctrl.c rename to drivers/filesystems/cdfs/lockctrl.c diff --git a/drivers/filesystems/cdfs_new/namesup.c b/drivers/filesystems/cdfs/namesup.c similarity index 100% rename from drivers/filesystems/cdfs_new/namesup.c rename to drivers/filesystems/cdfs/namesup.c diff --git a/drivers/filesystems/cdfs_new/nodetype.h b/drivers/filesystems/cdfs/nodetype.h similarity index 100% rename from drivers/filesystems/cdfs_new/nodetype.h rename to drivers/filesystems/cdfs/nodetype.h diff --git a/drivers/filesystems/cdfs_new/pathsup.c b/drivers/filesystems/cdfs/pathsup.c similarity index 100% rename from drivers/filesystems/cdfs_new/pathsup.c rename to drivers/filesystems/cdfs/pathsup.c diff --git a/drivers/filesystems/cdfs_new/pnp.c b/drivers/filesystems/cdfs/pnp.c similarity index 100% rename from drivers/filesystems/cdfs_new/pnp.c rename to drivers/filesystems/cdfs/pnp.c diff --git a/drivers/filesystems/cdfs_new/prefxsup.c b/drivers/filesystems/cdfs/prefxsup.c similarity index 100% rename from drivers/filesystems/cdfs_new/prefxsup.c rename to drivers/filesystems/cdfs/prefxsup.c diff --git a/drivers/filesystems/cdfs_new/read.c b/drivers/filesystems/cdfs/read.c similarity index 100% rename from drivers/filesystems/cdfs_new/read.c rename to drivers/filesystems/cdfs/read.c diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs/resrcsup.c similarity index 100% rename from drivers/filesystems/cdfs_new/resrcsup.c rename to drivers/filesystems/cdfs/resrcsup.c diff --git a/drivers/filesystems/cdfs_new/shutdown.c b/drivers/filesystems/cdfs/shutdown.c similarity index 100% rename from drivers/filesystems/cdfs_new/shutdown.c rename to drivers/filesystems/cdfs/shutdown.c diff --git a/drivers/filesystems/cdfs_new/strucsup.c b/drivers/filesystems/cdfs/strucsup.c similarity index 100% rename from drivers/filesystems/cdfs_new/strucsup.c rename to drivers/filesystems/cdfs/strucsup.c diff --git a/drivers/filesystems/cdfs_new/verfysup.c b/drivers/filesystems/cdfs/verfysup.c similarity index 100% rename from drivers/filesystems/cdfs_new/verfysup.c rename to drivers/filesystems/cdfs/verfysup.c diff --git a/drivers/filesystems/cdfs_new/volinfo.c b/drivers/filesystems/cdfs/volinfo.c similarity index 100% rename from drivers/filesystems/cdfs_new/volinfo.c rename to drivers/filesystems/cdfs/volinfo.c diff --git a/drivers/filesystems/cdfs_new/workque.c b/drivers/filesystems/cdfs/workque.c similarity index 100% rename from drivers/filesystems/cdfs_new/workque.c rename to drivers/filesystems/cdfs/workque.c diff --git a/drivers/filesystems/cdfs_new/write.c b/drivers/filesystems/cdfs/write.c similarity index 100% rename from drivers/filesystems/cdfs_new/write.c rename to drivers/filesystems/cdfs/write.c

1 0

01/02: [CDFS] Delete the old CDFS driver.
by Pierre Schweitzer 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5795254933b462a0a960c… commit 5795254933b462a0a960c32900bde63c815bcc48 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Aug 21 12:27:35 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Aug 21 12:27:35 2018 +0200 [CDFS] Delete the old CDFS driver. You served us well! --- drivers/filesystems/cdfs/CMakeLists.txt | 28 -- drivers/filesystems/cdfs/cdfs.c | 141 ------ drivers/filesystems/cdfs/cdfs.h | 531 --------------------- drivers/filesystems/cdfs/cdfs.rc | 5 - drivers/filesystems/cdfs/cdfs_reg.inf | 7 - drivers/filesystems/cdfs/cleanup.c | 129 ----- drivers/filesystems/cdfs/close.c | 115 ----- drivers/filesystems/cdfs/common.c | 242 ---------- drivers/filesystems/cdfs/create.c | 297 ------------ drivers/filesystems/cdfs/devctrl.c | 69 --- drivers/filesystems/cdfs/dirctl.c | 812 -------------------------------- drivers/filesystems/cdfs/dispatch.c | 222 --------- drivers/filesystems/cdfs/fastio.c | 116 ----- drivers/filesystems/cdfs/fcb.c | 722 ---------------------------- drivers/filesystems/cdfs/finfo.c | 498 -------------------- drivers/filesystems/cdfs/fsctl.c | 702 --------------------------- drivers/filesystems/cdfs/misc.c | 380 --------------- drivers/filesystems/cdfs/rw.c | 251 ---------- drivers/filesystems/cdfs/volinfo.c | 297 ------------ 19 files changed, 5564 deletions(-) diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt deleted file mode 100644 index 6cd539b95e..0000000000 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) - -list(APPEND SOURCE - cdfs.c - cleanup.c - close.c - common.c - create.c - devctrl.c - dirctl.c - dispatch.c - fastio.c - fcb.c - finfo.c - fsctl.c - misc.c - rw.c - volinfo.c - cdfs.h) - -add_library(cdfs SHARED ${SOURCE} cdfs.rc) -set_module_type(cdfs kernelmodedriver) -target_link_libraries(cdfs ${PSEH_LIB}) -add_importlibs(cdfs ntoskrnl hal) -add_pch(cdfs cdfs.h SOURCE) -add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) -add_registry_inf(cdfs_reg.inf) diff --git a/drivers/filesystems/cdfs/cdfs.c b/drivers/filesystems/cdfs/cdfs.c deleted file mode 100644 index aa51948f61..0000000000 --- a/drivers/filesystems/cdfs/cdfs.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/cdfs.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Art Yerkes - * Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -#if defined(ALLOC_PRAGMA) -#pragma alloc_text(INIT, DriverEntry) -#endif - -/* GLOBALS ******************************************************************/ - -PCDFS_GLOBAL_DATA CdfsGlobalData; - - -/* FUNCTIONS ****************************************************************/ - -INIT_SECTION -NTSTATUS NTAPI -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) - /* - * FUNCTION: Called by the system to initialize the driver - * ARGUMENTS: - * DriverObject = object describing this driver - * RegistryPath = path to our configuration entries - * RETURNS: Success or failure - */ -{ - NTSTATUS Status; - PDEVICE_OBJECT CdFsDeviceObject; - PDEVICE_OBJECT HddFsDeviceObject; - UNICODE_STRING CdFsDeviceName = RTL_CONSTANT_STRING(L"\\Cdfs"); - UNICODE_STRING HddFsDeviceName = RTL_CONSTANT_STRING(L"\\CdfsHdd"); - - UNREFERENCED_PARAMETER(RegistryPath); - - DPRINT("CDFS 0.0.3\n"); - - Status = IoCreateDevice(DriverObject, - sizeof(CDFS_GLOBAL_DATA), - &CdFsDeviceName, - FILE_DEVICE_CD_ROM_FILE_SYSTEM, - 0, - FALSE, - &CdFsDeviceObject); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Status = IoCreateDevice(DriverObject, - 0, - &HddFsDeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &HddFsDeviceObject); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - /* Initialize global data */ - CdfsGlobalData = CdFsDeviceObject->DeviceExtension; - RtlZeroMemory(CdfsGlobalData, - sizeof(CDFS_GLOBAL_DATA)); - CdfsGlobalData->DriverObject = DriverObject; - CdfsGlobalData->CdFsDeviceObject = CdFsDeviceObject; - CdfsGlobalData->HddFsDeviceObject = HddFsDeviceObject; - HddFsDeviceObject->DeviceExtension = CdfsGlobalData; - - /* Initialize driver data */ - DriverObject->MajorFunction[IRP_MJ_CLOSE] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_CREATE] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_READ] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_WRITE] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = CdfsFsdDispatch; - - CdfsGlobalData->FastIoDispatch.SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); - CdfsGlobalData->FastIoDispatch.FastIoCheckIfPossible = CdfsFastIoCheckIfPossible; - CdfsGlobalData->FastIoDispatch.FastIoRead = CdfsFastIoRead; - CdfsGlobalData->FastIoDispatch.FastIoWrite = CdfsFastIoWrite; - DriverObject->FastIoDispatch = &CdfsGlobalData->FastIoDispatch; - - /* Initialize lookaside list for IRP contexts */ - ExInitializeNPagedLookasideList(&CdfsGlobalData->IrpContextLookasideList, - NULL, NULL, 0, sizeof(CDFS_IRP_CONTEXT), 'PRIC', 0); - - DriverObject->DriverUnload = NULL; - - /* Cache manager */ - CdfsGlobalData->CacheMgrCallbacks.AcquireForLazyWrite = CdfsAcquireForLazyWrite; - CdfsGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite = CdfsReleaseFromLazyWrite; - CdfsGlobalData->CacheMgrCallbacks.AcquireForReadAhead = CdfsAcquireForLazyWrite; - CdfsGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = CdfsReleaseFromLazyWrite; - - CdFsDeviceObject->Flags |= DO_DIRECT_IO | DO_LOW_PRIORITY_FILESYSTEM; - HddFsDeviceObject->Flags |= DO_DIRECT_IO | DO_LOW_PRIORITY_FILESYSTEM; - - IoRegisterFileSystem(CdFsDeviceObject); - IoRegisterFileSystem(HddFsDeviceObject); - - return(STATUS_SUCCESS); -} diff --git a/drivers/filesystems/cdfs/cdfs.h b/drivers/filesystems/cdfs/cdfs.h deleted file mode 100644 index b23846f647..0000000000 --- a/drivers/filesystems/cdfs/cdfs.h +++ /dev/null @@ -1,531 +0,0 @@ -#ifndef CDFS_H -#define CDFS_H - -#include <ntifs.h> -#include <ntddcdrm.h> -#include <pseh/pseh2.h> - -#ifdef __GNUC__ -#define INIT_SECTION __attribute__((section ("INIT"))) -#else -#define INIT_SECTION /* Done via alloc_text for MSC */ -#endif - -#define CDFS_BASIC_SECTOR 2048 -#define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 -#define BLOCKSIZE CDFS_BASIC_SECTOR -#define CDFS_MAX_NAME_LEN 256 - -/* Volume descriptor types (VdType) */ -#define BOOT_VOLUME_DESCRIPTOR_TYPE 0 -#define PRIMARY_VOLUME_DESCRIPTOR_TYPE 1 -#define SUPPLEMENTARY_VOLUME_DESCRIPTOR_TYPE 2 -#define VOLUME_PARTITION_DESCRIPTOR_TYPE 3 -#define VOLUME_DESCRIPTOR_SET_TERMINATOR 255 - -#include <pshpack1.h> -struct _DIR_RECORD -{ - UCHAR RecordLength; // 1 - UCHAR ExtAttrRecordLength; // 2 - ULONG ExtentLocationL; // 3-6 - ULONG ExtentLocationM; // 7-10 - ULONG DataLengthL; // 11-14 - ULONG DataLengthM; // 15-18 - UCHAR Year; // 19 - UCHAR Month; // 20 - UCHAR Day; // 21 - UCHAR Hour; // 22 - UCHAR Minute; // 23 - UCHAR Second; // 24 - UCHAR TimeZone; // 25 - UCHAR FileFlags; // 26 - UCHAR FileUnitSize; // 27 - UCHAR InterleaveGapSize; // 28 - ULONG VolumeSequenceNumber; // 29-32 - UCHAR FileIdLength; // 33 - UCHAR FileId[1]; // 34 -}; -#include <poppack.h> - -typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD; - -/* DIR_RECORD.FileFlags */ -#define FILE_FLAG_HIDDEN 0x01 -#define FILE_FLAG_DIRECTORY 0x02 -#define FILE_FLAG_SYSTEM 0x04 -#define FILE_FLAG_READONLY 0x10 - - -/* Volume Descriptor header*/ -#include <pshpack1.h> -struct _VD_HEADER -{ - UCHAR VdType; // 1 - UCHAR StandardId[5]; // 2-6 - UCHAR VdVersion; // 7 -}; - -typedef struct _VD_HEADER VD_HEADER, *PVD_HEADER; - - - -/* Primary Volume Descriptor */ -struct _PVD -{ - UCHAR VdType; // 1 - UCHAR StandardId[5]; // 2-6 - UCHAR VdVersion; // 7 - UCHAR unused0; // 8 - UCHAR SystemId[32]; // 9-40 - UCHAR VolumeId[32]; // 41-72 - UCHAR unused1[8]; // 73-80 - ULONG VolumeSpaceSizeL; // 81-84 - ULONG VolumeSpaceSizeM; // 85-88 - UCHAR unused2[32]; // 89-120 - ULONG VolumeSetSize; // 121-124 - ULONG VolumeSequenceNumber; // 125-128 - ULONG LogicalBlockSize; // 129-132 - ULONG PathTableSizeL; // 133-136 - ULONG PathTableSizeM; // 137-140 - ULONG LPathTablePos; // 141-144 - ULONG LOptPathTablePos; // 145-148 - ULONG MPathTablePos; // 149-152 - ULONG MOptPathTablePos; // 153-156 - DIR_RECORD RootDirRecord; // 157-190 - UCHAR VolumeSetIdentifier[128]; // 191-318 - UCHAR PublisherIdentifier[128]; // 319-446 - - /* more data ... */ - -}; -typedef struct _PVD PVD, *PPVD; - - -/* Supplementary Volume Descriptor */ -struct _SVD -{ - UCHAR VdType; // 1 - UCHAR StandardId[5]; // 2-6 - UCHAR VdVersion; // 7 - UCHAR VolumeFlags; // 8 - UCHAR SystemId[32]; // 9-40 - UCHAR VolumeId[32]; // 41-72 - UCHAR unused1[8]; // 73-80 - ULONG VolumeSpaceSizeL; // 81-84 - ULONG VolumeSpaceSizeM; // 85-88 - UCHAR EscapeSequences[32]; // 89-120 - ULONG VolumeSetSize; // 121-124 - ULONG VolumeSequenceNumber; // 125-128 - ULONG LogicalBlockSize; // 129-132 - ULONG PathTableSizeL; // 133-136 - ULONG PathTableSizeM; // 137-140 - ULONG LPathTablePos; // 141-144 - ULONG LOptPathTablePos; // 145-148 - ULONG MPathTablePos; // 149-152 - ULONG MOptPathTablePos; // 153-156 - DIR_RECORD RootDirRecord; // 157-190 - UCHAR VolumeSetIdentifier[128]; // 191-318 - UCHAR PublisherIdentifier[128]; // 319-446 - - // more data ... -}; -#include <poppack.h> - -typedef struct _SVD SVD, *PSVD; - - - - - - - -typedef struct _CDINFO -{ - ULONG VolumeOffset; - ULONG VolumeSpaceSize; - ULONG JolietLevel; - ULONG RootStart; - ULONG RootSize; - WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; - USHORT VolumeLabelLength; - ULONG SerialNumber; -} CDINFO, *PCDINFO; - - -#define VCB_VOLUME_LOCKED 0x0001 - -typedef struct -{ - ERESOURCE VcbResource; - ERESOURCE DirResource; - - KSPIN_LOCK FcbListLock; - LIST_ENTRY FcbListHead; - - PDEVICE_OBJECT VolumeDevice; - PDEVICE_OBJECT StorageDevice; - PFILE_OBJECT StreamFileObject; - - ULONG Flags; - - CDINFO CdInfo; - - /* Notifications */ - LIST_ENTRY NotifyList; - PNOTIFY_SYNC NotifySync; - - /* Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP */ - ULONG OpenHandleCount; -} DEVICE_EXTENSION, *PDEVICE_EXTENSION, VCB, *PVCB; - - -#define FCB_CACHE_INITIALIZED 0x0001 -#define FCB_IS_VOLUME_STREAM 0x0002 -#define FCB_IS_VOLUME 0x0004 - -#define MAX_PATH 260 - -typedef struct _CDFS_SHORT_NAME -{ - LIST_ENTRY Entry; - LARGE_INTEGER StreamOffset; - UNICODE_STRING Name; - WCHAR NameBuffer[13]; -} CDFS_SHORT_NAME, *PCDFS_SHORT_NAME; - -typedef struct _FCB -{ - FSRTL_COMMON_FCB_HEADER RFCB; - SECTION_OBJECT_POINTERS SectionObjectPointers; - ERESOURCE MainResource; - ERESOURCE PagingIoResource; - - PFILE_OBJECT FileObject; - PDEVICE_EXTENSION DevExt; - - UNICODE_STRING ShortNameU; - - WCHAR *ObjectName; /* point on filename (250 chars max) in PathName */ - UNICODE_STRING PathName; /* path+filename 260 max */ - WCHAR PathNameBuffer[MAX_PATH]; /* Buffer for PathName */ - WCHAR ShortNameBuffer[13]; - - LIST_ENTRY FcbListEntry; - struct _FCB* ParentFcb; - - ULONG DirIndex; - - LARGE_INTEGER IndexNumber; /* HighPart: Parent directory start sector */ - /* LowPart: Directory record offset in the parent directory file */ - - LONG RefCount; - ULONG Flags; - - DIR_RECORD Entry; - - ERESOURCE NameListResource; - LIST_ENTRY ShortNameList; - FILE_LOCK FileLock; -} FCB, *PFCB; - - -typedef struct _CCB -{ - LIST_ENTRY NextCCB; - PFILE_OBJECT PtrFileObject; - LARGE_INTEGER CurrentByteOffset; - /* for DirectoryControl */ - ULONG Entry; - ULONG Offset; - /* for DirectoryControl */ - UNICODE_STRING DirectorySearchPattern; - ULONG LastCluster; - ULONG LastOffset; -} CCB, *PCCB; - -#define CDFS_TAG 'sfdC' -#define CDFS_CCB_TAG 'ccdC' -#define CDFS_NONPAGED_FCB_TAG 'nfdC' -#define CDFS_SHORT_NAME_TAG 'sgdC' -#define CDFS_SEARCH_PATTERN_TAG 'eedC' -#define CDFS_FILENAME_TAG 'nFdC' - -typedef struct _CDFS_GLOBAL_DATA -{ - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT CdFsDeviceObject; - PDEVICE_OBJECT HddFsDeviceObject; - ULONG Flags; - CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; - FAST_IO_DISPATCH FastIoDispatch; - NPAGED_LOOKASIDE_LIST IrpContextLookasideList; -} CDFS_GLOBAL_DATA, *PCDFS_GLOBAL_DATA; - -#define IRPCONTEXT_CANWAIT 0x1 -#define IRPCONTEXT_COMPLETE 0x2 -#define IRPCONTEXT_QUEUE 0x4 - -typedef struct _CDFS_IRP_CONTEXT -{ -// NTFSIDENTIFIER Identifier; - ULONG Flags; - PIO_STACK_LOCATION Stack; - UCHAR MajorFunction; - UCHAR MinorFunction; - WORK_QUEUE_ITEM WorkQueueItem; - PIRP Irp; - BOOLEAN IsTopLevel; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - NTSTATUS SavedExceptionCode; - CCHAR PriorityBoost; -} CDFS_IRP_CONTEXT, *PCDFS_IRP_CONTEXT; - - -extern PCDFS_GLOBAL_DATA CdfsGlobalData; - -/* cdfs.c */ - -NTSTATUS -NTAPI -DriverEntry( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -/* cleanup.c */ - -NTSTATUS -NTAPI -CdfsCleanup( - PCDFS_IRP_CONTEXT IrpContext); - - -/* close.c */ - -NTSTATUS -NTAPI -CdfsClose( - PCDFS_IRP_CONTEXT IrpContext); - -NTSTATUS -CdfsCloseFile(PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject); - - -/* common.c */ - -NTSTATUS -CdfsReadSectors(IN PDEVICE_OBJECT DeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN OUT PUCHAR Buffer, - IN BOOLEAN Override); - -NTSTATUS -CdfsDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG pOutputBufferSize, - IN BOOLEAN Override); - -/* create.c */ - -NTSTATUS -NTAPI -CdfsCreate( - PCDFS_IRP_CONTEXT IrpContext); - -/* devctrl.c */ - -NTSTATUS NTAPI -CdfsDeviceControl( - PCDFS_IRP_CONTEXT IrpContext); - -/* dirctl.c */ - -NTSTATUS -NTAPI -CdfsDirectoryControl( - PCDFS_IRP_CONTEXT IrpContext); - -/* dispatch.c */ - -DRIVER_DISPATCH CdfsFsdDispatch; -NTSTATUS -NTAPI -CdfsFsdDispatch( - PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -/* fastio.c */ - -BOOLEAN -NTAPI -CdfsAcquireForLazyWrite(IN PVOID Context, - IN BOOLEAN Wait); - -VOID -NTAPI -CdfsReleaseFromLazyWrite(IN PVOID Context); - -FAST_IO_CHECK_IF_POSSIBLE CdfsFastIoCheckIfPossible; -FAST_IO_READ CdfsFastIoRead; -FAST_IO_WRITE CdfsFastIoWrite; - -/* fcb.c */ - -PFCB -CdfsCreateFCB(PCWSTR FileName); - -VOID -CdfsDestroyFCB(PFCB Fcb); - -BOOLEAN -CdfsFCBIsDirectory(PFCB Fcb); - -BOOLEAN -CdfsFCBIsRoot(PFCB Fcb); - -VOID -CdfsGrabFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb); - -VOID -CdfsReleaseFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb); - -VOID -CdfsAddFCBToTable(PDEVICE_EXTENSION Vcb, - PFCB Fcb); - -PFCB -CdfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, - PUNICODE_STRING FileName); - -NTSTATUS -CdfsFCBInitializeCache(PVCB Vcb, - PFCB Fcb); - -PFCB -CdfsMakeRootFCB(PDEVICE_EXTENSION Vcb); - -PFCB -CdfsOpenRootFCB(PDEVICE_EXTENSION Vcb); - -NTSTATUS -CdfsMakeFCBFromDirEntry(PVCB Vcb, - PFCB DirectoryFCB, - PWSTR LongName, - PWSTR ShortName, - PDIR_RECORD Record, - ULONG DirectorySector, - ULONG DirectoryOffset, - PFCB * fileFCB); - -NTSTATUS -CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, - PFCB Fcb, - PFILE_OBJECT FileObject); - -NTSTATUS -CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt, - PFCB DirectoryFcb, - PUNICODE_STRING FileToFind, - PFCB *FoundFCB); - -NTSTATUS -CdfsGetFCBForFile(PDEVICE_EXTENSION Vcb, - PFCB *pParentFCB, - PFCB *pFCB, - PUNICODE_STRING FileName); - - -/* finfo.c */ - -NTSTATUS -NTAPI -CdfsQueryInformation( - PCDFS_IRP_CONTEXT IrpContext); - -NTSTATUS -NTAPI -CdfsSetInformation( - PCDFS_IRP_CONTEXT IrpContext); - - -/* fsctl.c */ - -NTSTATUS NTAPI -CdfsFileSystemControl( - PCDFS_IRP_CONTEXT IrpContext); - - -/* misc.c */ - -BOOLEAN -CdfsIsIrpTopLevel( - PIRP Irp); - -PCDFS_IRP_CONTEXT -CdfsAllocateIrpContext( - PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -VOID -CdfsSwapString(PWCHAR Out, - PUCHAR In, - ULONG Count); - -VOID -CdfsDateTimeToSystemTime(PFCB Fcb, - PLARGE_INTEGER SystemTime); - -VOID -CdfsFileFlagsToAttributes(PFCB Fcb, - PULONG FileAttributes); - -VOID -CdfsShortNameCacheGet -(PFCB DirectoryFcb, - PLARGE_INTEGER StreamOffset, - PUNICODE_STRING LongName, - PUNICODE_STRING ShortName); - -BOOLEAN -CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, - IN PDIR_RECORD Record); - -VOID -CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, - PDIR_RECORD Record, - PWSTR Name); - -/* rw.c */ - -NTSTATUS -NTAPI -CdfsRead( - PCDFS_IRP_CONTEXT IrpContext); - -NTSTATUS -NTAPI -CdfsWrite( - PCDFS_IRP_CONTEXT IrpContext); - - -/* volinfo.c */ - -NTSTATUS -NTAPI -CdfsQueryVolumeInformation( - PCDFS_IRP_CONTEXT IrpContext); - -NTSTATUS -NTAPI -CdfsSetVolumeInformation( - PCDFS_IRP_CONTEXT IrpContext); - -#endif /* CDFS_H */ diff --git a/drivers/filesystems/cdfs/cdfs.rc b/drivers/filesystems/cdfs/cdfs.rc deleted file mode 100644 index f0ac8d551e..0000000000 --- a/drivers/filesystems/cdfs/cdfs.rc +++ /dev/null @@ -1,5 +0,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ISO9660 Driver" -#define REACTOS_STR_INTERNAL_NAME "cdfs" -#define REACTOS_STR_ORIGINAL_FILENAME "cdfs.sys" -#include <reactos/version.rc> diff --git a/drivers/filesystems/cdfs/cdfs_reg.inf b/drivers/filesystems/cdfs/cdfs_reg.inf deleted file mode 100644 index 9ae7413c61..0000000000 --- a/drivers/filesystems/cdfs/cdfs_reg.inf +++ /dev/null @@ -1,7 +0,0 @@ -; Cdfs (ISO96660) filesystem driver -[AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 diff --git a/drivers/filesystems/cdfs/cleanup.c b/drivers/filesystems/cdfs/cleanup.c deleted file mode 100644 index 63ae24f7d9..0000000000 --- a/drivers/filesystems/cdfs/cleanup.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/cleanup.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -static NTSTATUS -CdfsCleanupFile(PCDFS_IRP_CONTEXT IrpContext, - PFILE_OBJECT FileObject) - /* - * FUNCTION: Cleans up after a file has been closed. - */ -{ - PDEVICE_EXTENSION DeviceExt; - PFCB Fcb; - - DPRINT("CdfsCleanupFile(IrpContext %p, FileObject %p)\n", - IrpContext, - FileObject); - - DeviceExt = IrpContext->DeviceObject->DeviceExtension; - Fcb = FileObject->FsContext; - if (!Fcb) - { - return STATUS_SUCCESS; - } - - DeviceExt->OpenHandleCount--; - - /* Notify about the cleanup */ - FsRtlNotifyCleanup(DeviceExt->NotifySync, - &(DeviceExt->NotifyList), - FileObject->FsContext2); - - if (!CdfsFCBIsDirectory(Fcb) && - FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) - { - FsRtlFastUnlockAll(&Fcb->FileLock, - FileObject, - IoGetRequestorProcess(IrpContext->Irp), - NULL); - } - - /* Uninitialize file cache if initialized for this file object. */ - if (FileObject->SectionObjectPointer && FileObject->SectionObjectPointer->SharedCacheMap) - { - CcUninitializeCacheMap (FileObject, NULL, NULL); - } - - /* Inform cleanup is complete */ - FileObject->Flags |= FO_CLEANUP_COMPLETE; - - return STATUS_SUCCESS; -} - -NTSTATUS NTAPI -CdfsCleanup( - PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - NTSTATUS Status; - - DPRINT("CdfsCleanup() called\n"); - - ASSERT(IrpContext); - - Irp = IrpContext->Irp; - DeviceObject = IrpContext->DeviceObject; - Stack = IrpContext->Stack; - - if (DeviceObject == CdfsGlobalData->CdFsDeviceObject || DeviceObject == CdfsGlobalData->HddFsDeviceObject) - { - DPRINT("Closing file system\n"); - Status = STATUS_SUCCESS; - goto ByeBye; - } - - FileObject = Stack->FileObject; - DeviceExtension = DeviceObject->DeviceExtension; - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&DeviceExtension->DirResource, TRUE); - - Status = CdfsCleanupFile(IrpContext, FileObject); - - ExReleaseResourceLite(&DeviceExtension->DirResource); - KeLeaveCriticalRegion(); - -ByeBye: - Irp->IoStatus.Information = 0; - - return(Status); -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/close.c b/drivers/filesystems/cdfs/close.c deleted file mode 100644 index eaf645d9c8..0000000000 --- a/drivers/filesystems/cdfs/close.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/close.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Art Yerkes - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS -CdfsCloseFile(PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject) - /* - * FUNCTION: Closes a file - */ -{ - PCCB Ccb; - - DPRINT("CdfsCloseFile(DeviceExt %p, FileObject %p)\n", - DeviceExt, - FileObject); - - Ccb = (PCCB)(FileObject->FsContext2); - - DPRINT("Ccb %p\n", Ccb); - if (Ccb == NULL) - { - return(STATUS_SUCCESS); - } - - FileObject->FsContext2 = NULL; - - if (FileObject->FileName.Buffer) - { - // This a FO, that was created outside from FSD. - // Some FO's are created with IoCreateStreamFileObject() insid from FSD. - // This FO's don't have a FileName. - CdfsReleaseFCB(DeviceExt, FileObject->FsContext); - } - - if (Ccb->DirectorySearchPattern.Buffer) - { - ExFreePoolWithTag(Ccb->DirectorySearchPattern.Buffer, CDFS_SEARCH_PATTERN_TAG); - } - ExFreePoolWithTag(Ccb, CDFS_CCB_TAG); - - return(STATUS_SUCCESS); -} - - -NTSTATUS NTAPI -CdfsClose( - PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - NTSTATUS Status; - - DPRINT("CdfsClose() called\n"); - - ASSERT(IrpContext); - - Irp = IrpContext->Irp; - DeviceObject = IrpContext->DeviceObject; - Stack = IrpContext->Stack; - - if (DeviceObject == CdfsGlobalData->CdFsDeviceObject || DeviceObject == CdfsGlobalData->HddFsDeviceObject) - { - DPRINT("Closing file system\n"); - Status = STATUS_SUCCESS; - goto ByeBye; - } - - FileObject = Stack->FileObject; - DeviceExtension = DeviceObject->DeviceExtension; - - Status = CdfsCloseFile(DeviceExtension,FileObject); - -ByeBye: - Irp->IoStatus.Information = 0; - - return(Status); -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/common.c b/drivers/filesystems/cdfs/common.c deleted file mode 100644 index 38e4b5fca7..0000000000 --- a/drivers/filesystems/cdfs/common.c +++ /dev/null @@ -1,242 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/common.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Art Yerkes - * Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS -CdfsReadSectors(IN PDEVICE_OBJECT DeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN OUT PUCHAR Buffer, - IN BOOLEAN Override) -{ - PIO_STACK_LOCATION Stack; - IO_STATUS_BLOCK IoStatus; - LARGE_INTEGER Offset; - ULONG BlockSize; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - BOOLEAN LastChance = FALSE; - -again: - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - Offset.u.LowPart = DiskSector << 11; - Offset.u.HighPart = DiskSector >> 21; - - BlockSize = BLOCKSIZE * SectorCount; - - DPRINT("CdfsReadSectors(DeviceObject %p, DiskSector %u, Buffer %p)\n", - DeviceObject, DiskSector, Buffer); - DPRINT("Offset %I64x BlockSize %u\n", - Offset.QuadPart, - BlockSize); - - DPRINT("Building synchronous FSD Request...\n"); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - DeviceObject, - Buffer, - BlockSize, - &Offset, - &Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildSynchronousFsdRequest failed\n"); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - if (Override) - { - Stack = IoGetNextIrpStackLocation(Irp); - Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; - } - - DPRINT("Calling IO Driver... with irp %p\n", Irp); - Status = IoCallDriver(DeviceObject, Irp); - - DPRINT("Waiting for IO Operation for %p\n", Irp); - if (Status == STATUS_PENDING) - { - DPRINT("Operation pending\n"); - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status... for %p\n", Irp); - Status = IoStatus.Status; - } - - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_VERIFY_REQUIRED) - { - PDEVICE_OBJECT DeviceToVerify; - - DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - - Status = IoVerifyVolume(DeviceToVerify, FALSE); - - if (NT_SUCCESS(Status) && !LastChance) - { - DPRINT("Volume verify succeeded; trying request again\n"); - LastChance = TRUE; - goto again; - } - else if (NT_SUCCESS(Status)) - { - DPRINT1("Failed to read after successful verify, aborting\n"); - Status = STATUS_DEVICE_NOT_READY; - } - else - { - DPRINT1("IoVerifyVolume() failed (Status %lx)\n", Status); - } - } - - DPRINT("CdfsReadSectors() failed (Status %x)\n", Status); - DPRINT("(DeviceObject %p, DiskSector %u, Buffer %p, Offset 0x%I64x)\n", - DeviceObject, DiskSector, Buffer, - Offset.QuadPart); - return(Status); - } - - DPRINT("Block request succeeded for %p\n", Irp); - - return(STATUS_SUCCESS); -} - - -NTSTATUS -CdfsDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG OutputBufferSize, - IN BOOLEAN Override) -{ - PIO_STACK_LOCATION Stack; - IO_STATUS_BLOCK IoStatus; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - BOOLEAN LastChance = FALSE; - - DPRINT("CdfsDeviceIoControl(DeviceObject %p, CtlCode %u, " - "InputBuffer %p, InputBufferSize %u, OutputBuffer %p, " - "POutputBufferSize %p (%x)\n", DeviceObject, CtlCode, - InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, - OutputBufferSize ? *OutputBufferSize : 0); - -again: - KeInitializeEvent (&Event, NotificationEvent, FALSE); - - DPRINT("Building device I/O control request ...\n"); - Irp = IoBuildDeviceIoControlRequest(CtlCode, - DeviceObject, - InputBuffer, - InputBufferSize, - OutputBuffer, - (OutputBufferSize != NULL) ? *OutputBufferSize : 0, - FALSE, - &Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildDeviceIoControlRequest failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - if (Override) - { - Stack = IoGetNextIrpStackLocation(Irp); - Stack->Flags |= SL_OVERRIDE_VERIFY_VOLUME; - } - - DPRINT ("Calling IO Driver... with irp %p\n", Irp); - Status = IoCallDriver(DeviceObject, Irp); - - DPRINT ("Waiting for IO Operation for %p\n", Irp); - if (Status == STATUS_PENDING) - { - DPRINT ("Operation pending\n"); - KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT ("Getting IO Status... for %p\n", Irp); - - Status = IoStatus.Status; - } - - if (OutputBufferSize != NULL) - { - *OutputBufferSize = IoStatus.Information; - } - - if (Status == STATUS_VERIFY_REQUIRED) - { - PDEVICE_OBJECT DeviceToVerify; - - DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - - if (DeviceToVerify) - { - Status = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT("IoVerifyVolume() returned (Status %lx)\n", Status); - } - - if (NT_SUCCESS(Status) && !LastChance) - { - DPRINT1("Volume verify succeeded; trying request again\n"); - LastChance = TRUE; - goto again; - } - else if (NT_SUCCESS(Status)) - { - DPRINT1("Failed to read after successful verify, aborting\n"); - Status = STATUS_DEVICE_NOT_READY; - } - else - { - DPRINT1("IoVerifyVolume() failed (Status %lx)\n", Status); - } - } - - DPRINT("Returning Status %x\n", Status); - - return Status; -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/create.c b/drivers/filesystems/cdfs/create.c deleted file mode 100644 index 704a4cfc91..0000000000 --- a/drivers/filesystems/cdfs/create.c +++ /dev/null @@ -1,297 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002, 2003, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/cdfs.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Art Yerkes - * Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -static NTSTATUS -CdfsMakeAbsoluteFilename(PFILE_OBJECT FileObject, - PUNICODE_STRING RelativeFileName, - PUNICODE_STRING AbsoluteFileName) -{ - USHORT Length; - PFCB Fcb; - NTSTATUS Status; - - DPRINT("try related for %wZ\n", RelativeFileName); - Fcb = FileObject->FsContext; - ASSERT(Fcb); - - /* verify related object is a directory and target name - don't start with \. */ - if ((Fcb->Entry.FileFlags & FILE_FLAG_DIRECTORY) == 0 || - (RelativeFileName->Length >= sizeof(WCHAR) && - RelativeFileName->Buffer[0] == L'\\')) - { - return STATUS_INVALID_PARAMETER; - } - - /* construct absolute path name */ - Length = Fcb->PathName.Length + - sizeof(WCHAR) + - RelativeFileName->Length + - sizeof(WCHAR); - AbsoluteFileName->Length = 0; - AbsoluteFileName->MaximumLength = Length; - AbsoluteFileName->Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, CDFS_FILENAME_TAG); - if (AbsoluteFileName->Buffer == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = RtlAppendUnicodeStringToString(AbsoluteFileName, - &Fcb->PathName); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(AbsoluteFileName); - return Status; - } - - if (!CdfsFCBIsRoot(Fcb)) - { - Status = RtlAppendUnicodeToString(AbsoluteFileName, - L"\\"); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(AbsoluteFileName); - return Status; - } - } - - Status = RtlAppendUnicodeStringToString(AbsoluteFileName, - RelativeFileName); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(AbsoluteFileName); - return Status; - } - - return STATUS_SUCCESS; -} - - -/* -* FUNCTION: Opens a file -*/ -static NTSTATUS -CdfsOpenFile(PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject, - PUNICODE_STRING FileName) -{ - PFCB ParentFcb; - PFCB Fcb; - NTSTATUS Status; - UNICODE_STRING AbsFileName; - - DPRINT("CdfsOpenFile(%p, %p, %wZ)\n", DeviceExt, FileObject, FileName); - - if (FileObject->RelatedFileObject) - { - DPRINT("Converting relative filename to absolute filename\n"); - - Status = CdfsMakeAbsoluteFilename(FileObject->RelatedFileObject, - FileName, - &AbsFileName); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - FileName = &AbsFileName; - } - - Status = CdfsDeviceIoControl (DeviceExt->StorageDevice, - IOCTL_CDROM_CHECK_VERIFY, - NULL, - 0, - NULL, - 0, - FALSE); - DPRINT ("Status %lx\n", Status); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("Status %lx\n", Status); - return Status; - } - - DPRINT("PathName to open: %wZ\n", FileName); - - /* try first to find an existing FCB in memory */ - DPRINT("Checking for existing FCB in memory\n"); - Fcb = CdfsGrabFCBFromTable(DeviceExt, - FileName); - if (Fcb == NULL) - { - DPRINT("No existing FCB found, making a new one if file exists.\n"); - Status = CdfsGetFCBForFile(DeviceExt, - &ParentFcb, - &Fcb, - FileName); - if (ParentFcb != NULL) - { - CdfsReleaseFCB(DeviceExt, - ParentFcb); - } - - if (!NT_SUCCESS (Status)) - { - DPRINT("Could not make a new FCB, status: %x\n", Status); - - if (FileName == &AbsFileName) - RtlFreeUnicodeString(&AbsFileName); - - return Status; - } - } - - DPRINT("Attaching FCB to fileObject\n"); - Status = CdfsAttachFCBToFileObject(DeviceExt, - Fcb, - FileObject); - - if ((FileName == &AbsFileName) && AbsFileName.Buffer) - ExFreePoolWithTag(AbsFileName.Buffer, CDFS_FILENAME_TAG); - - return Status; -} - - -/* -* FUNCTION: Opens a file -*/ -static NTSTATUS -CdfsCreateFile(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDEVICE_EXTENSION DeviceExt; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - ULONG RequestedDisposition; - ULONG RequestedOptions; - PFCB Fcb; - NTSTATUS Status; - - DPRINT("CdfsCreateFile() called\n"); - - DeviceExt = DeviceObject->DeviceExtension; - ASSERT(DeviceExt); - Stack = IoGetCurrentIrpStackLocation (Irp); - ASSERT(Stack); - - RequestedDisposition = ((Stack->Parameters.Create.Options >> 24) & 0xff); - RequestedOptions = Stack->Parameters.Create.Options & FILE_VALID_OPTION_FLAGS; - DPRINT("RequestedDisposition %x, RequestedOptions %x\n", - RequestedDisposition, RequestedOptions); - - FileObject = Stack->FileObject; - - if (RequestedDisposition == FILE_CREATE || - RequestedDisposition == FILE_OVERWRITE_IF || - RequestedDisposition == FILE_SUPERSEDE) - { - return STATUS_ACCESS_DENIED; - } - - Status = CdfsOpenFile(DeviceExt, - FileObject, - &FileObject->FileName); - if (NT_SUCCESS(Status)) - { - Fcb = FileObject->FsContext; - - /* Check whether the file has the requested attributes */ - if (RequestedOptions & FILE_NON_DIRECTORY_FILE && CdfsFCBIsDirectory(Fcb)) - { - CdfsCloseFile (DeviceExt, FileObject); - return STATUS_FILE_IS_A_DIRECTORY; - } - - if (RequestedOptions & FILE_DIRECTORY_FILE && !CdfsFCBIsDirectory(Fcb)) - { - CdfsCloseFile (DeviceExt, FileObject); - return STATUS_NOT_A_DIRECTORY; - } - - DeviceExt->OpenHandleCount++; - } - - /* - * If the directory containing the file to open doesn't exist then - * fail immediately - */ - Irp->IoStatus.Information = (NT_SUCCESS(Status)) ? FILE_OPENED : 0; - - return Status; -} - - -NTSTATUS NTAPI -CdfsCreate( - PCDFS_IRP_CONTEXT IrpContext) -{ - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExt; - NTSTATUS Status; - - DPRINT("CdfsCreate()\n"); - - ASSERT(IrpContext); - - DeviceObject = IrpContext->DeviceObject; - DeviceExt = DeviceObject->DeviceExtension; - if (BooleanFlagOn(DeviceExt->Flags, VCB_VOLUME_LOCKED)) - { - return STATUS_ACCESS_DENIED; - } - - if (DeviceObject == CdfsGlobalData->CdFsDeviceObject || DeviceObject == CdfsGlobalData->HddFsDeviceObject) - { - /* DeviceObject represents FileSystem instead of logical volume */ - DPRINT("Opening file system\n"); - IrpContext->Irp->IoStatus.Information = FILE_OPENED; - DeviceExt->OpenHandleCount++; - return STATUS_SUCCESS; - } - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, - TRUE); - Status = CdfsCreateFile(DeviceObject, - IrpContext->Irp); - ExReleaseResourceLite(&DeviceExt->DirResource); - KeLeaveCriticalRegion(); - - return Status; -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/devctrl.c b/drivers/filesystems/cdfs/devctrl.c deleted file mode 100644 index 7e2221a331..0000000000 --- a/drivers/filesystems/cdfs/devctrl.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/devctrl.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Pierre Schweitzer - * - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS NTAPI -CdfsDeviceControl( - PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp; - NTSTATUS Status; - PVCB Vcb = NULL; - PFILE_OBJECT FileObject; - PIO_STACK_LOCATION Stack; - - DPRINT("CdfsDeviceControl()\n"); - - ASSERT(IrpContext); - - Irp = IrpContext->Irp; - Stack = IrpContext->Stack; - FileObject = Stack->FileObject; - Irp->IoStatus.Information = 0; - - /* FIXME: HACK, it means that CD has changed */ - if (!FileObject) - { - DPRINT1("FIXME: CdfsDeviceControl called without FileObject!\n"); - return STATUS_INVALID_DEVICE_REQUEST; - } - - /* Only support such operations on volume */ - if (!(FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL)) - { - return STATUS_INVALID_PARAMETER; - } - - if (Stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_DISK_TYPE) - { - /* We should handle this one, but we don't! */ - Status = STATUS_NOT_IMPLEMENTED; - } - else - { - /* Pass it to storage driver */ - IoSkipCurrentIrpStackLocation(Irp); - Vcb = (PVCB)Stack->DeviceObject->DeviceExtension; - - /* Lower driver will complete - we don't have to */ - IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; - - Status = IoCallDriver(Vcb->StorageDevice, Irp); - } - - return Status; -} diff --git a/drivers/filesystems/cdfs/dirctl.c b/drivers/filesystems/cdfs/dirctl.c deleted file mode 100644 index c3d2878007..0000000000 --- a/drivers/filesystems/cdfs/dirctl.c +++ /dev/null @@ -1,812 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/dirctl.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Art Yerkes - * Eric Kohl - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -#define ROUND_DOWN(N, S) (((N) / (S)) * (S)) -#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) - -/* FUNCTIONS ****************************************************************/ - -/* -* FUNCTION: Retrieves the file name, be it in short or long file name format -*/ -static NTSTATUS -CdfsGetEntryName(PDEVICE_EXTENSION DeviceExt, - PVOID *Context, - PVOID *Block, - PLARGE_INTEGER StreamOffset, - ULONG DirLength, - PVOID *Ptr, - PWSTR Name, - PULONG pIndex, - PULONG CurrentOffset) -{ - PDIR_RECORD Record = *Ptr; - ULONG Index; - - if (*CurrentOffset >= DirLength) - return(STATUS_NO_MORE_ENTRIES); - - if (*CurrentOffset == 0) - { - Index = 0; - Record = (PDIR_RECORD)*Block; - while (Index < *pIndex) - { - (*Ptr) = (PVOID)((ULONG_PTR)(*Ptr) + Record->RecordLength); - (*CurrentOffset) += Record->RecordLength; - Record = *Ptr; - if ((ULONG_PTR)(*Ptr) - (ULONG_PTR)(*Block) >= BLOCKSIZE || Record->RecordLength == 0) - { - DPRINT("Map next sector\n"); - CcUnpinData(*Context); - StreamOffset->QuadPart += BLOCKSIZE; - *CurrentOffset = ROUND_UP(*CurrentOffset, BLOCKSIZE); - _SEH2_TRY - { - CcMapData(DeviceExt->StreamFileObject, StreamOffset, BLOCKSIZE, MAP_WAIT, Context, Block); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT("CcMapData() failed\n"); - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - *Ptr = *Block; - Record = (PDIR_RECORD)*Ptr; - } - if (*CurrentOffset >= DirLength) - return(STATUS_NO_MORE_ENTRIES); - - Index++; - } - } - - if ((ULONG_PTR)(*Ptr) - (ULONG_PTR)(*Block) >= BLOCKSIZE || Record->RecordLength == 0) - { - DPRINT("Map next sector\n"); - CcUnpinData(*Context); - StreamOffset->QuadPart += BLOCKSIZE; - *CurrentOffset = ROUND_UP(*CurrentOffset, BLOCKSIZE); - _SEH2_TRY - { - CcMapData(DeviceExt->StreamFileObject, StreamOffset, BLOCKSIZE, MAP_WAIT, Context, Block); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT("CcMapData() failed\n"); - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - *Ptr = *Block; - Record = (PDIR_RECORD)*Ptr; - } - - if (*CurrentOffset >= DirLength) - return STATUS_NO_MORE_ENTRIES; - - DPRINT("Index %lu RecordLength %lu Offset %lu\n", - *pIndex, Record->RecordLength, *CurrentOffset); - - if (!CdfsIsRecordValid(DeviceExt, Record)) - { - CcUnpinData(*Context); - return STATUS_DISK_CORRUPT_ERROR; - } - - CdfsGetDirEntryName(DeviceExt, Record, Name); - - *Ptr = Record; - - return(STATUS_SUCCESS); -} - - -/* -* FUNCTION: Find a file -*/ -static NTSTATUS -CdfsFindFile(PDEVICE_EXTENSION DeviceExt, - PFCB Fcb, - PFCB Parent, - PUNICODE_STRING FileToFind, - PULONG pDirIndex, - PULONG pOffset) -{ - WCHAR name[256]; - WCHAR ShortNameBuffer[13]; - UNICODE_STRING TempString; - UNICODE_STRING ShortName; - UNICODE_STRING LongName; - UNICODE_STRING FileToFindUpcase; - PVOID Block; - NTSTATUS Status; - ULONG len; - ULONG DirIndex; - ULONG Offset = 0; - BOOLEAN IsRoot; - PVOID Context = NULL; - ULONG DirSize; - PDIR_RECORD Record; - LARGE_INTEGER StreamOffset, OffsetOfEntry; - - DPRINT("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %u)\n", - Parent, FileToFind, pDirIndex ? *pDirIndex : 0); - DPRINT("FindFile: old Pathname %p, old Objectname %p)\n", - Fcb->PathName, Fcb->ObjectName); - - IsRoot = FALSE; - DirIndex = 0; - - if (FileToFind == NULL || FileToFind->Length == 0) - { - RtlInitUnicodeString(&TempString, L"."); - FileToFind = &TempString; - } - - if (Parent) - { - if (Parent->Entry.ExtentLocationL == DeviceExt->CdInfo.RootStart) - { - IsRoot = TRUE; - } - } - else - { - IsRoot = TRUE; - } - - if (IsRoot != FALSE) - { - StreamOffset.QuadPart = (LONGLONG)DeviceExt->CdInfo.RootStart * (LONGLONG)BLOCKSIZE; - DirSize = DeviceExt->CdInfo.RootSize; - - - if (FileToFind->Buffer[0] == 0 || - (FileToFind->Buffer[0] == '\\' && FileToFind->Buffer[1] == 0) || - (FileToFind->Buffer[0] == '.' && FileToFind->Buffer[1] == 0)) - { - /* it's root : complete essentials fields then return ok */ - RtlZeroMemory(Fcb, sizeof(FCB)); - RtlInitEmptyUnicodeString(&Fcb->PathName, Fcb->PathNameBuffer, sizeof(Fcb->PathNameBuffer)); - - Fcb->PathNameBuffer[0] = '\\'; - Fcb->PathName.Length = sizeof(WCHAR); - Fcb->ObjectName = &Fcb->PathNameBuffer[1]; - Fcb->Entry.ExtentLocationL = DeviceExt->CdInfo.RootStart; - Fcb->Entry.DataLengthL = DeviceExt->CdInfo.RootSize; - Fcb->Entry.FileFlags = 0x02; //FILE_ATTRIBUTE_DIRECTORY; - - if (pDirIndex) - *pDirIndex = 0; - if (pOffset) - *pOffset = 0; - DPRINT("CdfsFindFile: new Pathname %wZ, new Objectname %S)\n",&Fcb->PathName, Fcb->ObjectName); - return STATUS_SUCCESS; - } - } - else - { - StreamOffset.QuadPart = (LONGLONG)Parent->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE; - DirSize = Parent->Entry.DataLengthL; - } - - DPRINT("StreamOffset %I64d DirSize %u\n", StreamOffset.QuadPart, DirSize); - - if (pDirIndex && (*pDirIndex)) - DirIndex = *pDirIndex; - - if (pOffset && (*pOffset)) - { - Offset = *pOffset; - StreamOffset.QuadPart += ROUND_DOWN(Offset, BLOCKSIZE); - } - - _SEH2_TRY - { - CcMapData(DeviceExt->StreamFileObject, &StreamOffset, BLOCKSIZE, MAP_WAIT, &Context, &Block); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT("CcMapData() failed\n"); - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - Record = (PDIR_RECORD) ((ULONG_PTR)Block + Offset % BLOCKSIZE); - if (Offset) - { - Offset += Record->RecordLength; - Record = (PDIR_RECORD)((ULONG_PTR)Record + Record->RecordLength); - } - - /* Upper case the expression for FsRtlIsNameInExpression */ - Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - while(TRUE) - { - DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", - Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - - Status = CdfsGetEntryName - (DeviceExt, &Context, &Block, &StreamOffset, - DirSize, (PVOID*)&Record, name, &DirIndex, &Offset); - - if (Status == STATUS_NO_MORE_ENTRIES) - { - break; - } - else if (Status == STATUS_UNSUCCESSFUL || Status == STATUS_DISK_CORRUPT_ERROR) - { - /* Note: the directory cache has already been unpinned */ - RtlFreeUnicodeString(&FileToFindUpcase); - return Status; - } - - DPRINT("Name '%S'\n", name); - - RtlInitUnicodeString(&LongName, name); - - ShortName.Length = 0; - ShortName.MaximumLength = 26; - ShortName.Buffer = ShortNameBuffer; - - OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; - CdfsShortNameCacheGet(Parent, &OffsetOfEntry, &LongName, &ShortName); - - DPRINT("ShortName '%wZ'\n", &ShortName); - - if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) - { - if (Parent->PathName.Buffer[0]) - { - RtlCopyUnicodeString(&Fcb->PathName, &Parent->PathName); - len = Parent->PathName.Length / sizeof(WCHAR); - Fcb->ObjectName=&Fcb->PathName.Buffer[len]; - if (len != 1 || Fcb->PathName.Buffer[0] != '\\') - { - Fcb->ObjectName[0] = '\\'; - Fcb->ObjectName = &Fcb->ObjectName[1]; - } - } - else - { - Fcb->ObjectName=Fcb->PathName.Buffer; - Fcb->ObjectName[0]='\\'; - Fcb->ObjectName=&Fcb->ObjectName[1]; - } - - DPRINT("PathName '%wZ' ObjectName '%S'\n", &Fcb->PathName, Fcb->ObjectName); - - memcpy(&Fcb->Entry, Record, sizeof(DIR_RECORD)); - wcsncpy(Fcb->ObjectName, name, min(wcslen(name) + 1, - MAX_PATH - (Fcb->PathName.Length / sizeof(WCHAR)) + wcslen(Fcb->ObjectName))); - - /* Copy short name */ - Fcb->ShortNameU.Length = ShortName.Length; - Fcb->ShortNameU.MaximumLength = ShortName.Length; - Fcb->ShortNameU.Buffer = Fcb->ShortNameBuffer; - memcpy(Fcb->ShortNameBuffer, ShortName.Buffer, ShortName.Length); - - if (pDirIndex) - *pDirIndex = DirIndex; - if (pOffset) - *pOffset = Offset; - - DPRINT("FindFile: new Pathname %wZ, new Objectname %S, DirIndex %u\n", - &Fcb->PathName, Fcb->ObjectName, DirIndex); - - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - - return STATUS_SUCCESS; - } - - Offset += Record->RecordLength; - Record = (PDIR_RECORD)((ULONG_PTR)Record + Record->RecordLength); - DirIndex++; - } - - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - - if (pDirIndex) - *pDirIndex = DirIndex; - - if (pOffset) - *pOffset = Offset; - - return STATUS_UNSUCCESSFUL; -} - - -static NTSTATUS -CdfsGetNameInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_NAMES_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetNameInformation() called\n"); - - UNREFERENCED_PARAMETER(DeviceExt); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_NAMES_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, Fcb->ObjectName, Length); - - // Info->FileIndex=; - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_DIRECTORY_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetDirectoryInformation() called\n"); - - UNREFERENCED_PARAMETER(DeviceExt); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToSystemTime(Fcb, - &Info->CreationTime); - Info->LastWriteTime = Info->CreationTime; - Info->ChangeTime = Info->CreationTime; - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - if (CdfsFCBIsDirectory(Fcb)) - { - Info->EndOfFile.QuadPart = 0; - Info->AllocationSize.QuadPart = 0; - } - else - { - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); - } - - // Info->FileIndex=; - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetFullDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIR_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetFullDirectoryInformation() called\n"); - - UNREFERENCED_PARAMETER(DeviceExt); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_FULL_DIR_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_FULL_DIR_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToSystemTime(Fcb, - &Info->CreationTime); - Info->LastWriteTime = Info->CreationTime; - Info->ChangeTime = Info->CreationTime; - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - if (CdfsFCBIsDirectory(Fcb)) - { - Info->EndOfFile.QuadPart = 0; - Info->AllocationSize.QuadPart = 0; - } - else - { - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); - } - - // Info->FileIndex=; - Info->EaSize = 0; - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetBothDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIR_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetBothDirectoryInformation() called\n"); - - UNREFERENCED_PARAMETER(DeviceExt); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, sizeof(ULONG)); - RtlCopyMemory(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToSystemTime(Fcb, - &Info->CreationTime); - Info->LastWriteTime = Info->CreationTime; - Info->ChangeTime = Info->CreationTime; - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - if (CdfsFCBIsDirectory(Fcb)) - { - Info->EndOfFile.QuadPart = 0; - Info->AllocationSize.QuadPart = 0; - } - else - { - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); - } - - // Info->FileIndex=; - Info->EaSize = 0; - - /* Copy short name */ - ASSERT(Fcb->ShortNameU.Length / sizeof(WCHAR) <= 12); - Info->ShortNameLength = (CCHAR)Fcb->ShortNameU.Length; - RtlCopyMemory(Info->ShortName, Fcb->ShortNameU.Buffer, Fcb->ShortNameU.Length); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsQueryDirectory(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDEVICE_EXTENSION DeviceExtension; - LONG BufferLength = 0; - PUNICODE_STRING SearchPattern = NULL; - FILE_INFORMATION_CLASS FileInformationClass; - ULONG FileIndex = 0; - PUCHAR Buffer = NULL; - PFILE_NAMES_INFORMATION Buffer0 = NULL; - PFCB Fcb; - PCCB Ccb; - FCB TempFcb; - BOOLEAN First = FALSE; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CdfsQueryDirectory() called\n"); - - DeviceExtension = DeviceObject->DeviceExtension; - Stack = IoGetCurrentIrpStackLocation(Irp); - FileObject = Stack->FileObject; - RtlInitEmptyUnicodeString(&TempFcb.PathName, TempFcb.PathNameBuffer, sizeof(TempFcb.PathNameBuffer)); - - Ccb = (PCCB)FileObject->FsContext2; - Fcb = (PFCB)FileObject->FsContext; - - /* Obtain the callers parameters */ - BufferLength = Stack->Parameters.QueryDirectory.Length; - SearchPattern = Stack->Parameters.QueryDirectory.FileName; - FileInformationClass = - Stack->Parameters.QueryDirectory.FileInformationClass; - FileIndex = Stack->Parameters.QueryDirectory.FileIndex; - - /* Determine Buffer for result */ - if (Irp->MdlAddress) - { - Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - } - else - { - Buffer = Irp->UserBuffer; - } - - /* Allocate search pattern in case: - * -> We don't have one already in context - * -> We have been given an input pattern - * -> The pattern length is not null - * -> The pattern buffer is not null - * Otherwise, we'll fall later and allocate a match all (*) pattern - */ - if (SearchPattern != NULL && - SearchPattern->Length != 0 && SearchPattern->Buffer != NULL) - { - if (Ccb->DirectorySearchPattern.Buffer == NULL) - { - First = TRUE; - Ccb->DirectorySearchPattern.Buffer = - ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), CDFS_SEARCH_PATTERN_TAG); - if (Ccb->DirectorySearchPattern.Buffer == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - Ccb->DirectorySearchPattern.MaximumLength = SearchPattern->Length + sizeof(WCHAR); - RtlCopyUnicodeString(&Ccb->DirectorySearchPattern, SearchPattern); - Ccb->DirectorySearchPattern.Buffer[SearchPattern->Length / sizeof(WCHAR)] = 0; - } - } - else if (Ccb->DirectorySearchPattern.Buffer == NULL) - { - First = TRUE; - Ccb->DirectorySearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), CDFS_SEARCH_PATTERN_TAG); - if (Ccb->DirectorySearchPattern.Buffer == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - Ccb->DirectorySearchPattern.Length = sizeof(WCHAR); - Ccb->DirectorySearchPattern.MaximumLength = 2 * sizeof(WCHAR); - Ccb->DirectorySearchPattern.Buffer[0] = L'*'; - Ccb->DirectorySearchPattern.Buffer[1] = 0; - } - DPRINT("Search pattern '%wZ'\n", &Ccb->DirectorySearchPattern); - - /* Determine directory index */ - if (Stack->Flags & SL_INDEX_SPECIFIED) - { - Ccb->Entry = Stack->Parameters.QueryDirectory.FileIndex; - Ccb->Offset = Ccb->CurrentByteOffset.u.LowPart; - } - else if (First || (Stack->Flags & SL_RESTART_SCAN)) - { - Ccb->Entry = 0; - Ccb->Offset = 0; - } - DPRINT("Buffer = %p tofind = %wZ\n", Buffer, &Ccb->DirectorySearchPattern); - - TempFcb.ObjectName = TempFcb.PathName.Buffer; - while (Status == STATUS_SUCCESS && BufferLength > 0) - { - Status = CdfsFindFile(DeviceExtension, - &TempFcb, - Fcb, - &Ccb->DirectorySearchPattern, - &Ccb->Entry, - &Ccb->Offset); - DPRINT("Found %S, Status=%x, entry %x\n", TempFcb.ObjectName, Status, Ccb->Entry); - - if (NT_SUCCESS(Status)) - { - switch (FileInformationClass) - { - case FileNameInformation: - Status = CdfsGetNameInformation(&TempFcb, - DeviceExtension, - (PFILE_NAMES_INFORMATION)Buffer, - BufferLength); - break; - - case FileDirectoryInformation: - Status = CdfsGetDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_DIRECTORY_INFORMATION)Buffer, - BufferLength); - break; - - case FileFullDirectoryInformation: - Status = CdfsGetFullDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_FULL_DIR_INFORMATION)Buffer, - BufferLength); - break; - - case FileBothDirectoryInformation: - Status = CdfsGetBothDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_BOTH_DIR_INFORMATION)Buffer, - BufferLength); - break; - - default: - Status = STATUS_INVALID_INFO_CLASS; - } - - if (Status == STATUS_BUFFER_OVERFLOW) - { - break; - } - } - else - { - if (First) - { - Status = STATUS_NO_SUCH_FILE; - } - else - { - Status = STATUS_NO_MORE_FILES; - } - break; - } - - Buffer0 = (PFILE_NAMES_INFORMATION)Buffer; - Buffer0->FileIndex = FileIndex++; - Ccb->Entry++; - BufferLength -= Buffer0->NextEntryOffset; - - if (Stack->Flags & SL_RETURN_SINGLE_ENTRY) - { - break; - } - - Buffer += Buffer0->NextEntryOffset; - } - - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } - - if (FileIndex > 0) - { - Status = STATUS_SUCCESS; - Irp->IoStatus.Information = Stack->Parameters.QueryDirectory.Length - BufferLength; - } - - return(Status); -} - - -static NTSTATUS -CdfsNotifyChangeDirectory(PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PCDFS_IRP_CONTEXT IrpContext) -{ - PDEVICE_EXTENSION DeviceExtension; - PFCB Fcb; - PCCB Ccb; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - - DPRINT("CdfsNotifyChangeDirectory() called\n"); - - DeviceExtension = DeviceObject->DeviceExtension; - Stack = IoGetCurrentIrpStackLocation(Irp); - FileObject = Stack->FileObject; - - Ccb = (PCCB)FileObject->FsContext2; - Fcb = (PFCB)FileObject->FsContext; - - FsRtlNotifyFullChangeDirectory(DeviceExtension->NotifySync, - &(DeviceExtension->NotifyList), - Ccb, - (PSTRING)&(Fcb->PathName), - BooleanFlagOn(Stack->Flags, SL_WATCH_TREE), - FALSE, - Stack->Parameters.NotifyDirectory.CompletionFilter, - Irp, - NULL, - NULL); - - /* We won't handle IRP completion */ - IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; - - return STATUS_PENDING; -} - - -NTSTATUS NTAPI -CdfsDirectoryControl( - PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; - - DPRINT("CdfsDirectoryControl() called\n"); - - ASSERT(IrpContext); - - Irp = IrpContext->Irp; - DeviceObject = IrpContext->DeviceObject; - - Irp->IoStatus.Information = 0; - - switch (IrpContext->MinorFunction) - { - case IRP_MN_QUERY_DIRECTORY: - Status = CdfsQueryDirectory(DeviceObject, - Irp); - break; - - case IRP_MN_NOTIFY_CHANGE_DIRECTORY: - Status = CdfsNotifyChangeDirectory(DeviceObject, - Irp, IrpContext); - break; - - default: - DPRINT1("CDFS: MinorFunction %u\n", IrpContext->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - return(Status); -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/dispatch.c b/drivers/filesystems/cdfs/dispatch.c deleted file mode 100644 index 4b1434757b..0000000000 --- a/drivers/filesystems/cdfs/dispatch.c +++ /dev/null @@ -1,222 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2008 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/dispatch.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Pierre Schweitzer - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -static LONG QueueCount = 0; - -/* FUNCTIONS ****************************************************************/ - -static WORKER_THREAD_ROUTINE CdfsDoRequest; - -static -NTSTATUS -CdfsQueueRequest(PCDFS_IRP_CONTEXT IrpContext) -{ - InterlockedIncrement(&QueueCount); - DPRINT("CdfsQueueRequest(IrpContext %p), %d\n", IrpContext, QueueCount); - - ASSERT(!(IrpContext->Flags & IRPCONTEXT_QUEUE) && - (IrpContext->Flags & IRPCONTEXT_COMPLETE)); - IrpContext->Flags |= IRPCONTEXT_CANWAIT; - IoMarkIrpPending(IrpContext->Irp); - ExInitializeWorkItem(&IrpContext->WorkQueueItem, CdfsDoRequest, IrpContext); - ExQueueWorkItem(&IrpContext->WorkQueueItem, CriticalWorkQueue); - - return STATUS_PENDING; -} - -static -NTSTATUS -CdfsLockControl( - IN PCDFS_IRP_CONTEXT IrpContext) -{ - PFCB Fcb; - NTSTATUS Status; - - DPRINT("CdfsLockControl(IrpContext %p)\n", IrpContext); - - if (IrpContext->DeviceObject == CdfsGlobalData->CdFsDeviceObject || IrpContext->DeviceObject == CdfsGlobalData->HddFsDeviceObject) - { - return STATUS_INVALID_DEVICE_REQUEST; - } - - Fcb = IrpContext->FileObject->FsContext; - if (CdfsFCBIsDirectory(Fcb)) - { - return STATUS_INVALID_PARAMETER; - } - - IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; - Status = FsRtlProcessFileLock(&Fcb->FileLock, - IrpContext->Irp, - NULL); - return Status; -} - -static -NTSTATUS -CdfsDispatch(PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp = IrpContext->Irp; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - DPRINT("CdfsDispatch()\n"); - - FsRtlEnterFileSystem(); - - CdfsIsIrpTopLevel(Irp); - - switch (IrpContext->MajorFunction) - { - case IRP_MJ_QUERY_VOLUME_INFORMATION: - Status = CdfsQueryVolumeInformation(IrpContext); - break; - - case IRP_MJ_SET_VOLUME_INFORMATION: - Status = CdfsSetVolumeInformation(IrpContext); - break; - - case IRP_MJ_QUERY_INFORMATION: - Status = CdfsQueryInformation(IrpContext); - break; - - case IRP_MJ_SET_INFORMATION: - Status = CdfsSetInformation(IrpContext); - break; - - case IRP_MJ_DIRECTORY_CONTROL: - Status = CdfsDirectoryControl(IrpContext); - break; - - case IRP_MJ_READ: - Status = CdfsRead(IrpContext); - break; - - case IRP_MJ_DEVICE_CONTROL: - Status = CdfsDeviceControl(IrpContext); - break; - - case IRP_MJ_WRITE: - Status = CdfsWrite(IrpContext); - break; - - case IRP_MJ_CLOSE: - Status = CdfsClose(IrpContext); - break; - - case IRP_MJ_CREATE: - Status = CdfsCreate(IrpContext); - break; - - case IRP_MJ_CLEANUP: - Status = CdfsCleanup(IrpContext); - break; - - case IRP_MJ_FILE_SYSTEM_CONTROL: - Status = CdfsFileSystemControl(IrpContext); - break; - - case IRP_MJ_LOCK_CONTROL: - Status = CdfsLockControl(IrpContext); - break; - } - - ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || - ((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || - (!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && (IrpContext->Flags & IRPCONTEXT_QUEUE))); - - if (IrpContext->Flags & IRPCONTEXT_COMPLETE) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IrpContext->PriorityBoost); - } - - if (IrpContext->Flags & IRPCONTEXT_QUEUE) - { - /* Reset our status flags before queueing the IRP */ - IrpContext->Flags |= IRPCONTEXT_COMPLETE; - IrpContext->Flags &= ~IRPCONTEXT_QUEUE; - Status = CdfsQueueRequest(IrpContext); - } - else - { - ExFreeToNPagedLookasideList(&CdfsGlobalData->IrpContextLookasideList, IrpContext); - } - - IoSetTopLevelIrp(NULL); - FsRtlExitFileSystem(); - - return Status; -} - -static -VOID -NTAPI -CdfsDoRequest(PVOID IrpContext) -{ - InterlockedDecrement(&QueueCount); - DPRINT("CdfsDoRequest(IrpContext %p), MajorFunction %x, %d\n", - IrpContext, ((PCDFS_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); - CdfsDispatch((PCDFS_IRP_CONTEXT)IrpContext); -} - -/* - * FUNCTION: This function manages IRP for various major functions - * ARGUMENTS: - * DriverObject = object describing this driver - * Irp = IRP to be passed to internal functions - * RETURNS: Status of I/O Request - */ -NTSTATUS -NTAPI -CdfsFsdDispatch( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PCDFS_IRP_CONTEXT IrpContext = NULL; - NTSTATUS Status; - - DPRINT("CdfsFsdDispatch()\n"); - - IrpContext = CdfsAllocateIrpContext(DeviceObject, Irp); - if (IrpContext == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - else - { - Status = CdfsDispatch(IrpContext); - } - - return Status; -} diff --git a/drivers/filesystems/cdfs/fastio.c b/drivers/filesystems/cdfs/fastio.c deleted file mode 100644 index 49547b5637..0000000000 --- a/drivers/filesystems/cdfs/fastio.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/fastio.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Pierre Schweitzer - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -BOOLEAN -NTAPI -CdfsAcquireForLazyWrite( - _In_ PVOID Context, - _In_ BOOLEAN Wait) -{ - PFCB Fcb = (PFCB)Context; - ASSERT(Fcb); - DPRINT("CdfsAcquireForLazyWrite(): Fcb %p\n", Fcb); - - if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) - { - DPRINT("CdfsAcquireForLazyWrite(): ExReleaseResourceLite failed.\n"); - return FALSE; - } - return TRUE; -} - -VOID -NTAPI -CdfsReleaseFromLazyWrite( - _In_ PVOID Context) -{ - PFCB Fcb = (PFCB)Context; - ASSERT(Fcb); - DPRINT("CdfsReleaseFromLazyWrite(): Fcb %p\n", Fcb); - - ExReleaseResourceLite(&(Fcb->MainResource)); -} - -BOOLEAN -NTAPI -CdfsFastIoCheckIfPossible( - _In_ PFILE_OBJECT FileObject, - _In_ PLARGE_INTEGER FileOffset, - _In_ ULONG Length, - _In_ BOOLEAN Wait, - _In_ ULONG LockKey, - _In_ BOOLEAN CheckForReadOperation, - _Out_ PIO_STATUS_BLOCK IoStatus, - _In_ PDEVICE_OBJECT DeviceObject) -{ - /* Deny FastIo */ - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(FileOffset); - UNREFERENCED_PARAMETER(Length); - UNREFERENCED_PARAMETER(Wait); - UNREFERENCED_PARAMETER(LockKey); - UNREFERENCED_PARAMETER(CheckForReadOperation); - UNREFERENCED_PARAMETER(IoStatus); - UNREFERENCED_PARAMETER(DeviceObject); - return FALSE; -} - -BOOLEAN -NTAPI -CdfsFastIoRead( - _In_ PFILE_OBJECT FileObject, - _In_ PLARGE_INTEGER FileOffset, - _In_ ULONG Length, - _In_ BOOLEAN Wait, - _In_ ULONG LockKey, - _Out_ PVOID Buffer, - _Out_ PIO_STATUS_BLOCK IoStatus, - _In_ PDEVICE_OBJECT DeviceObject) -{ - DBG_UNREFERENCED_PARAMETER(FileObject); - DBG_UNREFERENCED_PARAMETER(FileOffset); - DBG_UNREFERENCED_PARAMETER(Length); - DBG_UNREFERENCED_PARAMETER(Wait); - DBG_UNREFERENCED_PARAMETER(LockKey); - DBG_UNREFERENCED_PARAMETER(Buffer); - DBG_UNREFERENCED_PARAMETER(IoStatus); - DBG_UNREFERENCED_PARAMETER(DeviceObject); - return FALSE; -} - -BOOLEAN -NTAPI -CdfsFastIoWrite( - _In_ PFILE_OBJECT FileObject, - _In_ PLARGE_INTEGER FileOffset, - _In_ ULONG Length, - _In_ BOOLEAN Wait, - _In_ ULONG LockKey, - _In_ PVOID Buffer, - _Out_ PIO_STATUS_BLOCK IoStatus, - _In_ PDEVICE_OBJECT DeviceObject) -{ - DBG_UNREFERENCED_PARAMETER(FileObject); - DBG_UNREFERENCED_PARAMETER(FileOffset); - DBG_UNREFERENCED_PARAMETER(Length); - DBG_UNREFERENCED_PARAMETER(Wait); - DBG_UNREFERENCED_PARAMETER(LockKey); - DBG_UNREFERENCED_PARAMETER(Buffer); - DBG_UNREFERENCED_PARAMETER(IoStatus); - DBG_UNREFERENCED_PARAMETER(DeviceObject); - return FALSE; -} diff --git a/drivers/filesystems/cdfs/fcb.c b/drivers/filesystems/cdfs/fcb.c deleted file mode 100644 index 4a361d9ede..0000000000 --- a/drivers/filesystems/cdfs/fcb.c +++ /dev/null @@ -1,722 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/fcb.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Art Yerkes - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) - - -/* FUNCTIONS ****************************************************************/ - -static BOOLEAN -CdfsGetNextPathElement(PCUNICODE_STRING CurrentElement, PUNICODE_STRING NextElement) -{ - *NextElement = *CurrentElement; - - if (NextElement->Length == 0) - return FALSE; - - while ((NextElement->Length) && (NextElement->Buffer[0] != L'\\')) - { - NextElement->Buffer++; - NextElement->Length -= sizeof(WCHAR); - NextElement->MaximumLength -= sizeof(WCHAR); - } - - return TRUE; -} - - -PFCB -CdfsCreateFCB(PCWSTR FileName) -{ - PFCB Fcb; - - Fcb = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FCB), - CDFS_NONPAGED_FCB_TAG); - if(!Fcb) return NULL; - - RtlZeroMemory(Fcb, sizeof(FCB)); - RtlInitEmptyUnicodeString(&Fcb->PathName, Fcb->PathNameBuffer, sizeof(Fcb->PathNameBuffer)); - - if (FileName) - { - RtlAppendUnicodeToString(&Fcb->PathName, FileName); - if (wcsrchr(Fcb->PathName.Buffer, '\\') != 0) - { - Fcb->ObjectName = wcsrchr(Fcb->PathName.Buffer, '\\'); - } - else - { - Fcb->ObjectName = Fcb->PathName.Buffer; - } - } - - ExInitializeResourceLite(&Fcb->PagingIoResource); - ExInitializeResourceLite(&Fcb->MainResource); - ExInitializeResourceLite(&Fcb->NameListResource); - Fcb->RFCB.PagingIoResource = &Fcb->PagingIoResource; - Fcb->RFCB.Resource = &Fcb->MainResource; - Fcb->RFCB.IsFastIoPossible = FastIoIsNotPossible; - InitializeListHead(&Fcb->ShortNameList); - FsRtlInitializeFileLock(&Fcb->FileLock, NULL, NULL); - - return(Fcb); -} - - -VOID -CdfsDestroyFCB(PFCB Fcb) -{ - PLIST_ENTRY Entry; - - FsRtlUninitializeFileLock(&Fcb->FileLock); - ExDeleteResourceLite(&Fcb->PagingIoResource); - ExDeleteResourceLite(&Fcb->MainResource); - - while (!IsListEmpty(&Fcb->ShortNameList)) - { - Entry = Fcb->ShortNameList.Flink; - RemoveEntryList(Entry); - ExFreePoolWithTag(Entry, CDFS_SHORT_NAME_TAG); - } - - ExDeleteResourceLite(&Fcb->NameListResource); - ExFreePoolWithTag(Fcb, CDFS_NONPAGED_FCB_TAG); -} - - -BOOLEAN -CdfsFCBIsDirectory(PFCB Fcb) -{ - return(Fcb->Entry.FileFlags & FILE_FLAG_DIRECTORY); -} - - -BOOLEAN -CdfsFCBIsRoot(PFCB Fcb) -{ - return (Fcb->PathName.Length == sizeof(WCHAR) && Fcb->PathName.Buffer[0] == L'\\'); -} - - -VOID -CdfsGrabFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb) -{ - KIRQL oldIrql; - - DPRINT("grabbing FCB at %p: %wZ, refCount:%d\n", - Fcb, - &Fcb->PathName, - Fcb->RefCount); - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); - Fcb->RefCount++; - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); -} - - -VOID -CdfsReleaseFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb) -{ - KIRQL oldIrql; - - DPRINT("releasing FCB at %p: %wZ, refCount:%d\n", - Fcb, - &Fcb->PathName, - Fcb->RefCount); - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); - Fcb->RefCount--; - if (Fcb->RefCount <= 0 && !CdfsFCBIsDirectory(Fcb)) - { - RemoveEntryList(&Fcb->FcbListEntry); - CdfsDestroyFCB(Fcb); - } - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); -} - - -VOID -CdfsAddFCBToTable(PDEVICE_EXTENSION Vcb, - PFCB Fcb) -{ - KIRQL oldIrql; - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); - Fcb->DevExt = Vcb; - InsertTailList(&Vcb->FcbListHead, &Fcb->FcbListEntry); - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); -} - - -PFCB -CdfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, - PUNICODE_STRING FileName) -{ - KIRQL oldIrql; - PFCB Fcb; - PLIST_ENTRY current_entry; - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); - - if (FileName == NULL || FileName->Length == 0 || FileName->Buffer[0] == 0) - { - DPRINT("Return FCB for stream file object\n"); - Fcb = Vcb->StreamFileObject->FsContext; - Fcb->RefCount++; - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - return(Fcb); - } - - current_entry = Vcb->FcbListHead.Flink; - while (current_entry != &Vcb->FcbListHead) - { - Fcb = CONTAINING_RECORD(current_entry, FCB, FcbListEntry); - - // Disabled the DPRINT! Can't be called at DISPATCH_LEVEL! - //DPRINT("Comparing '%wZ' and '%wZ'\n", FileName, &Fcb->PathName); - if (RtlCompareUnicodeString(FileName, &Fcb->PathName, TRUE) == 0) - { - Fcb->RefCount++; - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - return(Fcb); - } - - //FIXME: need to compare against short name in FCB here - - current_entry = current_entry->Flink; - } - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - - return(NULL); -} - - -NTSTATUS -CdfsFCBInitializeCache(PVCB Vcb, - PFCB Fcb) -{ - PFILE_OBJECT FileObject; - PCCB newCCB; - - FileObject = IoCreateStreamFileObject(NULL, Vcb->StorageDevice); - - newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), CDFS_CCB_TAG); - if (newCCB == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlZeroMemory(newCCB, - sizeof(CCB)); - - FileObject->ReadAccess = TRUE; - FileObject->WriteAccess = FALSE; - FileObject->DeleteAccess = FALSE; - FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; - FileObject->FsContext = Fcb; - FileObject->FsContext2 = newCCB; - newCCB->PtrFileObject = FileObject; - Fcb->FileObject = FileObject; - Fcb->DevExt = Vcb; - - _SEH2_TRY - { - CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - FileObject->FsContext2 = NULL; - ExFreePoolWithTag(newCCB, CDFS_CCB_TAG); - ObDereferenceObject(FileObject); - Fcb->FileObject = NULL; - return _SEH2_GetExceptionCode(); - } - _SEH2_END; - - ObDereferenceObject(FileObject); - Fcb->Flags |= FCB_CACHE_INITIALIZED; - - return STATUS_SUCCESS; -} - - -PFCB -CdfsMakeRootFCB(PDEVICE_EXTENSION Vcb) -{ - PFCB Fcb; - - Fcb = CdfsCreateFCB(L"\\"); - - Fcb->Entry.DataLengthL = Vcb->CdInfo.RootSize; - Fcb->Entry.ExtentLocationL = Vcb->CdInfo.RootStart; - Fcb->Entry.FileFlags = FILE_FLAG_DIRECTORY; - Fcb->IndexNumber.QuadPart = 0LL; - Fcb->RefCount = 1; - Fcb->DirIndex = 0; - Fcb->RFCB.FileSize.QuadPart = Vcb->CdInfo.RootSize; - Fcb->RFCB.ValidDataLength.QuadPart = Vcb->CdInfo.RootSize; - Fcb->RFCB.AllocationSize.QuadPart = Vcb->CdInfo.RootSize; - - CdfsFCBInitializeCache(Vcb, Fcb); - CdfsAddFCBToTable(Vcb, Fcb); - CdfsGrabFCB(Vcb, Fcb); - - return(Fcb); -} - - -PFCB -CdfsOpenRootFCB(PDEVICE_EXTENSION Vcb) -{ - UNICODE_STRING FileName; - PFCB Fcb; - - RtlInitUnicodeString(&FileName, L"\\"); - - Fcb = CdfsGrabFCBFromTable(Vcb, - &FileName); - if (Fcb == NULL) - { - Fcb = CdfsMakeRootFCB(Vcb); - } - - return(Fcb); -} - - -NTSTATUS -CdfsMakeFCBFromDirEntry(PVCB Vcb, - PFCB DirectoryFCB, - PWSTR LongName, - PWSTR ShortName, - PDIR_RECORD Record, - ULONG DirectorySector, - ULONG DirectoryOffset, - PFCB * fileFCB) -{ - WCHAR pathName[MAX_PATH]; - PFCB rcFCB; - ULONG Size; - - /* Check if the full string would overflow the pathName buffer (the additional characters are for '\\' and '\0') */ - if ((LongName[0] != 0) && - ((DirectoryFCB->PathName.Length / sizeof(WCHAR)) + 1 + wcslen(LongName) + 1 > MAX_PATH)) - { - return(STATUS_OBJECT_NAME_INVALID); - } - - wcscpy(pathName, DirectoryFCB->PathName.Buffer); - if (!CdfsFCBIsRoot(DirectoryFCB)) - { - wcscat(pathName, L"\\"); - } - - if (LongName[0] != 0) - { - wcscat(pathName, LongName); - } - else - { - WCHAR entryName[MAX_PATH]; - - CdfsGetDirEntryName(Vcb, Record, entryName); - wcscat(pathName, entryName); - } - - rcFCB = CdfsCreateFCB(pathName); - memcpy(&rcFCB->Entry, Record, sizeof(DIR_RECORD)); - - /* Copy short name into FCB */ - rcFCB->ShortNameU.Length = wcslen(ShortName) * sizeof(WCHAR); - rcFCB->ShortNameU.MaximumLength = rcFCB->ShortNameU.Length; - rcFCB->ShortNameU.Buffer = rcFCB->ShortNameBuffer; - wcscpy(rcFCB->ShortNameBuffer, ShortName); - - Size = rcFCB->Entry.DataLengthL; - - rcFCB->RFCB.FileSize.QuadPart = Size; - rcFCB->RFCB.ValidDataLength.QuadPart = Size; - rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, BLOCKSIZE); - if (CdfsFCBIsDirectory(rcFCB)) - { - CdfsFCBInitializeCache(Vcb, rcFCB); - } - rcFCB->IndexNumber.u.HighPart = DirectorySector; - rcFCB->IndexNumber.u.LowPart = DirectoryOffset; - rcFCB->RefCount++; - CdfsAddFCBToTable(Vcb, rcFCB); - *fileFCB = rcFCB; - - DPRINT("%S %u %I64d\n", LongName, Size, rcFCB->RFCB.AllocationSize.QuadPart); - - return(STATUS_SUCCESS); -} - - -NTSTATUS -CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, - PFCB Fcb, - PFILE_OBJECT FileObject) -{ - PCCB newCCB; - - newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), CDFS_CCB_TAG); - if (newCCB == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - memset(newCCB, 0, sizeof(CCB)); - - FileObject->ReadAccess = TRUE; - FileObject->WriteAccess = FALSE; - FileObject->DeleteAccess = FALSE; - FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; - FileObject->FsContext = Fcb; - FileObject->FsContext2 = newCCB; - newCCB->PtrFileObject = FileObject; - Fcb->DevExt = Vcb; - - if (CdfsFCBIsDirectory(Fcb)) - { - _SEH2_TRY - { - CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - FileObject->FsContext2 = NULL; - ExFreePoolWithTag(newCCB, CDFS_CCB_TAG); - return _SEH2_GetExceptionCode(); - } - _SEH2_END; - Fcb->Flags |= FCB_CACHE_INITIALIZED; - } - - DPRINT("file open: fcb:%p file size: %u\n", Fcb, Fcb->Entry.DataLengthL); - - return(STATUS_SUCCESS); -} - - -NTSTATUS -CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt, - PFCB DirectoryFcb, - PUNICODE_STRING FileToFind, - PFCB *FoundFCB) -{ - UNICODE_STRING TempName; - WCHAR Name[256]; - PVOID Block; - ULONG DirSize; - PDIR_RECORD Record; - ULONG Offset; - ULONG BlockOffset; - NTSTATUS Status; - - LARGE_INTEGER StreamOffset, OffsetOfEntry; - PVOID Context; - - WCHAR ShortNameBuffer[13]; - UNICODE_STRING ShortName; - UNICODE_STRING LongName; - UNICODE_STRING FileToFindUpcase; - - ASSERT(DeviceExt); - ASSERT(DirectoryFcb); - ASSERT(FileToFind); - - DPRINT("CdfsDirFindFile(VCB:%p, dirFCB:%p, File:%wZ)\n", - DeviceExt, - DirectoryFcb, - FileToFind); - DPRINT("Dir Path:%wZ\n", &DirectoryFcb->PathName); - - /* default to '.' if no filename specified */ - if (FileToFind->Length == 0) - { - RtlInitUnicodeString(&TempName, L"."); - FileToFind = &TempName; - } - - DirSize = DirectoryFcb->Entry.DataLengthL; - StreamOffset.QuadPart = (LONGLONG)DirectoryFcb->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE; - - _SEH2_TRY - { - CcMapData(DeviceExt->StreamFileObject, &StreamOffset, BLOCKSIZE, MAP_WAIT, &Context, &Block); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT("CcMapData() failed\n"); - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - Offset = 0; - BlockOffset = 0; - Record = (PDIR_RECORD)Block; - - /* Upper case the expression for FsRtlIsNameInExpression */ - Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - while(TRUE) - { - if (Record->RecordLength == 0) - { - DPRINT("RecordLength == 0 Stopped!\n"); - break; - } - - DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", - Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - - if (!CdfsIsRecordValid(DeviceExt, Record)) - { - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - return STATUS_DISK_CORRUPT_ERROR; - } - - CdfsGetDirEntryName(DeviceExt, Record, Name); - DPRINT ("Name '%S'\n", Name); - DPRINT ("Sector %lu\n", DirectoryFcb->Entry.ExtentLocationL); - DPRINT ("Offset %lu\n", Offset); - - RtlInitUnicodeString(&LongName, Name); - RtlInitEmptyUnicodeString(&ShortName, ShortNameBuffer, sizeof(ShortNameBuffer)); - RtlZeroMemory(ShortNameBuffer, sizeof(ShortNameBuffer)); - - OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; - CdfsShortNameCacheGet(DirectoryFcb, &OffsetOfEntry, &LongName, &ShortName); - - DPRINT("ShortName '%wZ'\n", &ShortName); - - ASSERT(LongName.Length >= sizeof(WCHAR)); - ASSERT(ShortName.Length >= sizeof(WCHAR)); - if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) - { - DPRINT("Match found, %S\n", Name); - Status = CdfsMakeFCBFromDirEntry(DeviceExt, - DirectoryFcb, - Name, - ShortNameBuffer, - Record, - DirectoryFcb->Entry.ExtentLocationL, - Offset, - FoundFCB); - - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - - return(Status); - } - - Offset += Record->RecordLength; - BlockOffset += Record->RecordLength; - Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); - if (BlockOffset >= BLOCKSIZE || Record->RecordLength == 0) - { - DPRINT("Map next sector\n"); - CcUnpinData(Context); - StreamOffset.QuadPart += BLOCKSIZE; - Offset = ROUND_UP(Offset, BLOCKSIZE); - BlockOffset = 0; - - _SEH2_TRY - { - CcMapData(DeviceExt->StreamFileObject, &StreamOffset, BLOCKSIZE, MAP_WAIT, &Context, &Block); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT("CcMapData() failed\n"); - RtlFreeUnicodeString(&FileToFindUpcase); - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); - } - - if (Offset >= DirSize) - break; - } - - RtlFreeUnicodeString(&FileToFindUpcase); - CcUnpinData(Context); - - return(STATUS_OBJECT_NAME_NOT_FOUND); -} - - -NTSTATUS -CdfsGetFCBForFile(PDEVICE_EXTENSION Vcb, - PFCB *pParentFCB, - PFCB *pFCB, - PUNICODE_STRING FileName) -{ - UNICODE_STRING PathName; - UNICODE_STRING NextElement; - UNICODE_STRING CurrentElement; - NTSTATUS Status; - PFCB FCB; - PFCB parentFCB; - - DPRINT("CdfsGetFCBForFile(%p, %p, %p, '%wZ')\n", - Vcb, - pParentFCB, - pFCB, - FileName); - - /* Trivial case, open of the root directory on volume */ - if (FileName->Length == 0 || - ((FileName->Buffer[0] == '\\') && (FileName->Length == sizeof(WCHAR)))) - { - DPRINT("returning root FCB\n"); - - FCB = CdfsOpenRootFCB(Vcb); - *pFCB = FCB; - *pParentFCB = NULL; - - return((FCB != NULL) ? STATUS_SUCCESS : STATUS_OBJECT_PATH_NOT_FOUND); - } - else - { - /* Start with empty path */ - PathName = *FileName; - PathName.Length = 0; - CurrentElement = *FileName; - - FCB = CdfsOpenRootFCB (Vcb); - } - parentFCB = NULL; - - /* Parse filename and check each path element for existence and access */ - while (CdfsGetNextPathElement(&CurrentElement, &NextElement)) - { - /* Skip blank directory levels */ - if (CurrentElement.Buffer[0] == L'\\') - { - CurrentElement.Buffer++; - CurrentElement.Length -= sizeof(WCHAR); - CurrentElement.MaximumLength -= sizeof(WCHAR); - continue; - } - - DPRINT("Parsing, currentElement:%wZ\n", &CurrentElement); - DPRINT(" parentFCB:%p FCB:%p\n", parentFCB, FCB); - - /* Descend to next directory level */ - if (parentFCB) - { - CdfsReleaseFCB(Vcb, parentFCB); - parentFCB = NULL; - } - - /* fail if element in FCB is not a directory */ - if (!CdfsFCBIsDirectory(FCB)) - { - DPRINT("Element in requested path is not a directory\n"); - - CdfsReleaseFCB(Vcb, FCB); - FCB = 0; - *pParentFCB = NULL; - *pFCB = NULL; - - return(STATUS_OBJECT_PATH_NOT_FOUND); - } - parentFCB = FCB; - - /* Extract next directory level */ - PathName.Length = (NextElement.Buffer - FileName->Buffer) * sizeof(WCHAR); - DPRINT(" PathName:%wZ\n", &PathName); - - FCB = CdfsGrabFCBFromTable(Vcb, &PathName); - if (FCB == NULL) - { - UNICODE_STRING ChildElement = CurrentElement; - ChildElement.Length = (NextElement.Buffer - CurrentElement.Buffer) * sizeof(WCHAR); - - Status = CdfsDirFindFile(Vcb, - parentFCB, - &ChildElement, - &FCB); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - *pParentFCB = parentFCB; - *pFCB = NULL; - - if (NextElement.Length == 0) - { - return(STATUS_OBJECT_NAME_NOT_FOUND); - } - else - { - return(STATUS_OBJECT_PATH_NOT_FOUND); - } - } - else if (!NT_SUCCESS(Status)) - { - CdfsReleaseFCB(Vcb, parentFCB); - *pParentFCB = NULL; - *pFCB = NULL; - - return(Status); - } - } - CurrentElement = NextElement; - } - - *pParentFCB = parentFCB; - *pFCB = FCB; - - return STATUS_SUCCESS; -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/finfo.c b/drivers/filesystems/cdfs/finfo.c deleted file mode 100644 index e0e08e1abe..0000000000 --- a/drivers/filesystems/cdfs/finfo.c +++ /dev/null @@ -1,498 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/finfo.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Art Yerkes - * Eric Kohl - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -/* -* FUNCTION: Retrieve the standard file information -*/ -static NTSTATUS -CdfsGetStandardInformation(PFCB Fcb, - PDEVICE_OBJECT DeviceObject, - PFILE_STANDARD_INFORMATION StandardInfo, - PULONG BufferLength) -{ - DPRINT("CdfsGetStandardInformation() called\n"); - - UNREFERENCED_PARAMETER(DeviceObject); - - if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; - - /* PRECONDITION */ - ASSERT(StandardInfo != NULL); - ASSERT(Fcb != NULL); - - RtlZeroMemory(StandardInfo, - sizeof(FILE_STANDARD_INFORMATION)); - - if (CdfsFCBIsDirectory(Fcb)) - { - StandardInfo->AllocationSize.QuadPart = 0LL; - StandardInfo->EndOfFile.QuadPart = 0LL; - StandardInfo->Directory = TRUE; - } - else - { - StandardInfo->AllocationSize = Fcb->RFCB.AllocationSize; - StandardInfo->EndOfFile = Fcb->RFCB.FileSize; - StandardInfo->Directory = FALSE; - } - StandardInfo->NumberOfLinks = 0; - StandardInfo->DeletePending = FALSE; - - *BufferLength -= sizeof(FILE_STANDARD_INFORMATION); - return(STATUS_SUCCESS); -} - - -/* -* FUNCTION: Retrieve the file position information -*/ -static NTSTATUS -CdfsGetPositionInformation(PFILE_OBJECT FileObject, - PFILE_POSITION_INFORMATION PositionInfo, - PULONG BufferLength) -{ - DPRINT("CdfsGetPositionInformation() called\n"); - - if (*BufferLength < sizeof(FILE_POSITION_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; - - PositionInfo->CurrentByteOffset.QuadPart = - FileObject->CurrentByteOffset.QuadPart; - - DPRINT("Getting position %I64x\n", - PositionInfo->CurrentByteOffset.QuadPart); - - *BufferLength -= sizeof(FILE_POSITION_INFORMATION); - return(STATUS_SUCCESS); -} - - -/* -* FUNCTION: Retrieve the basic file information -*/ -static NTSTATUS -CdfsGetBasicInformation(PFILE_OBJECT FileObject, - PFCB Fcb, - PDEVICE_OBJECT DeviceObject, - PFILE_BASIC_INFORMATION BasicInfo, - PULONG BufferLength) -{ - DPRINT("CdfsGetBasicInformation() called\n"); - - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(DeviceObject); - - if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; - - CdfsDateTimeToSystemTime(Fcb, - &BasicInfo->CreationTime); - CdfsDateTimeToSystemTime(Fcb, - &BasicInfo->LastAccessTime); - CdfsDateTimeToSystemTime(Fcb, - &BasicInfo->LastWriteTime); - CdfsDateTimeToSystemTime(Fcb, - &BasicInfo->ChangeTime); - - CdfsFileFlagsToAttributes(Fcb, - &BasicInfo->FileAttributes); - - *BufferLength -= sizeof(FILE_BASIC_INFORMATION); - - return(STATUS_SUCCESS); -} - - -/* -* FUNCTION: Retrieve the file name information -*/ -static NTSTATUS -CdfsGetNameInformation(PFILE_OBJECT FileObject, - PFCB Fcb, - PDEVICE_OBJECT DeviceObject, - PFILE_NAME_INFORMATION NameInfo, - PULONG BufferLength) -{ - ULONG NameLength; - ULONG BytesToCopy; - - DPRINT("CdfsGetNameInformation() called\n"); - - ASSERT(NameInfo != NULL); - ASSERT(Fcb != NULL); - - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(DeviceObject); - - /* If buffer can't hold at least the file name length, bail out */ - if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) - return STATUS_BUFFER_OVERFLOW; - - /* Calculate file name length in bytes */ - NameLength = Fcb->PathName.Length; - NameInfo->FileNameLength = NameLength; - - /* Calculate amount of bytes to copy not to overflow the buffer */ - BytesToCopy = min(NameLength, - *BufferLength - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])); - - /* Fill in the bytes */ - RtlCopyMemory(NameInfo->FileName, Fcb->PathName.Buffer, BytesToCopy); - - /* Check if we could write more but are not able to */ - if (*BufferLength < NameLength + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) - { - /* Return number of bytes written */ - *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; - return STATUS_BUFFER_OVERFLOW; - } - - /* We filled up as many bytes, as needed */ - *BufferLength -= (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + NameLength); - - return STATUS_SUCCESS; -} - - -/* -* FUNCTION: Retrieve the internal file information -*/ -static NTSTATUS -CdfsGetInternalInformation(PFCB Fcb, - PFILE_INTERNAL_INFORMATION InternalInfo, - PULONG BufferLength) -{ - DPRINT("CdfsGetInternalInformation() called\n"); - - ASSERT(InternalInfo); - ASSERT(Fcb); - - if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION)) - return(STATUS_BUFFER_OVERFLOW); - - InternalInfo->IndexNumber.QuadPart = Fcb->IndexNumber.QuadPart; - - *BufferLength -= sizeof(FILE_INTERNAL_INFORMATION); - - return(STATUS_SUCCESS); -} - - -/* -* FUNCTION: Retrieve the file network open information -*/ -static NTSTATUS -CdfsGetNetworkOpenInformation(PFCB Fcb, - PFILE_NETWORK_OPEN_INFORMATION NetworkInfo, - PULONG BufferLength) -{ - ASSERT(NetworkInfo); - ASSERT(Fcb); - - if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) - return(STATUS_BUFFER_OVERFLOW); - - CdfsDateTimeToSystemTime(Fcb, - &NetworkInfo->CreationTime); - CdfsDateTimeToSystemTime(Fcb, - &NetworkInfo->LastAccessTime); - CdfsDateTimeToSystemTime(Fcb, - &NetworkInfo->LastWriteTime); - CdfsDateTimeToSystemTime(Fcb, - &NetworkInfo->ChangeTime); - if (CdfsFCBIsDirectory(Fcb)) - { - NetworkInfo->AllocationSize.QuadPart = 0LL; - NetworkInfo->EndOfFile.QuadPart = 0LL; - } - else - { - NetworkInfo->AllocationSize = Fcb->RFCB.AllocationSize; - NetworkInfo->EndOfFile = Fcb->RFCB.FileSize; - } - CdfsFileFlagsToAttributes(Fcb, - &NetworkInfo->FileAttributes); - - *BufferLength -= sizeof(FILE_NETWORK_OPEN_INFORMATION); - - return(STATUS_SUCCESS); -} - - -/* -* FUNCTION: Retrieve all file information -*/ -static NTSTATUS -CdfsGetAllInformation(PFILE_OBJECT FileObject, - PFCB Fcb, - PFILE_ALL_INFORMATION Info, - PULONG BufferLength) -{ - ULONG NameLength; - - ASSERT(Info); - ASSERT(Fcb); - - NameLength = Fcb->PathName.Length; - if (*BufferLength < sizeof(FILE_ALL_INFORMATION) + NameLength) - return(STATUS_BUFFER_OVERFLOW); - - /* Basic Information */ - CdfsDateTimeToSystemTime(Fcb, - &Info->BasicInformation.CreationTime); - CdfsDateTimeToSystemTime(Fcb, - &Info->BasicInformation.LastAccessTime); - CdfsDateTimeToSystemTime(Fcb, - &Info->BasicInformation.LastWriteTime); - CdfsDateTimeToSystemTime(Fcb, - &Info->BasicInformation.ChangeTime); - CdfsFileFlagsToAttributes(Fcb, - &Info->BasicInformation.FileAttributes); - - /* Standard Information */ - if (CdfsFCBIsDirectory(Fcb)) - { - Info->StandardInformation.AllocationSize.QuadPart = 0LL; - Info->StandardInformation.EndOfFile.QuadPart = 0LL; - Info->StandardInformation.Directory = TRUE; - } - else - { - Info->StandardInformation.AllocationSize = Fcb->RFCB.AllocationSize; - Info->StandardInformation.EndOfFile = Fcb->RFCB.FileSize; - Info->StandardInformation.Directory = FALSE; - } - Info->StandardInformation.NumberOfLinks = 0; - Info->StandardInformation.DeletePending = FALSE; - - /* Internal Information */ - Info->InternalInformation.IndexNumber.QuadPart = Fcb->IndexNumber.QuadPart; - - /* EA Information */ - Info->EaInformation.EaSize = 0; - - /* Access Information */ - /* The IO-Manager adds this information */ - - /* Position Information */ - Info->PositionInformation.CurrentByteOffset.QuadPart = FileObject->CurrentByteOffset.QuadPart; - - /* Mode Information */ - /* The IO-Manager adds this information */ - - /* Alignment Information */ - /* The IO-Manager adds this information */ - - /* Name Information */ - Info->NameInformation.FileNameLength = NameLength; - RtlCopyMemory(Info->NameInformation.FileName, - Fcb->PathName.Buffer, - NameLength + sizeof(WCHAR)); - - *BufferLength -= (sizeof(FILE_ALL_INFORMATION) + NameLength + sizeof(WCHAR)); - - return STATUS_SUCCESS; -} - - -/* -* FUNCTION: Retrieve the specified file information -*/ -NTSTATUS NTAPI -CdfsQueryInformation( - PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - FILE_INFORMATION_CLASS FileInformationClass; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - PFCB Fcb; - PVOID SystemBuffer; - ULONG BufferLength; - - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CdfsQueryInformation() called\n"); - - Irp = IrpContext->Irp; - DeviceObject = IrpContext->DeviceObject; - Stack = IrpContext->Stack; - FileInformationClass = Stack->Parameters.QueryFile.FileInformationClass; - FileObject = Stack->FileObject; - Fcb = FileObject->FsContext; - - SystemBuffer = Irp->AssociatedIrp.SystemBuffer; - BufferLength = Stack->Parameters.QueryFile.Length; - - switch (FileInformationClass) - { - case FileStandardInformation: - Status = CdfsGetStandardInformation(Fcb, - DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FilePositionInformation: - Status = CdfsGetPositionInformation(FileObject, - SystemBuffer, - &BufferLength); - break; - - case FileBasicInformation: - Status = CdfsGetBasicInformation(FileObject, - Fcb, - DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileNameInformation: - Status = CdfsGetNameInformation(FileObject, - Fcb, - DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileInternalInformation: - Status = CdfsGetInternalInformation(Fcb, - SystemBuffer, - &BufferLength); - break; - - case FileNetworkOpenInformation: - Status = CdfsGetNetworkOpenInformation(Fcb, - SystemBuffer, - &BufferLength); - break; - - case FileAllInformation: - Status = CdfsGetAllInformation(FileObject, - Fcb, - SystemBuffer, - &BufferLength); - break; - - case FileAlternateNameInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - DPRINT("Unimplemented information class %x\n", FileInformationClass); - Status = STATUS_INVALID_PARAMETER; - break; - } - - if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) - Irp->IoStatus.Information = - Stack->Parameters.QueryFile.Length - BufferLength; - else - Irp->IoStatus.Information = 0; - - return(Status); -} - - -/* -* FUNCTION: Set the file position information -*/ -static NTSTATUS -CdfsSetPositionInformation(PFILE_OBJECT FileObject, - PFILE_POSITION_INFORMATION PositionInfo) -{ - DPRINT ("CdfsSetPositionInformation()\n"); - - DPRINT ("PositionInfo %p\n", PositionInfo); - DPRINT ("Setting position %I64d\n", PositionInfo->CurrentByteOffset.QuadPart); - - FileObject->CurrentByteOffset.QuadPart = - PositionInfo->CurrentByteOffset.QuadPart; - - return STATUS_SUCCESS; -} - - -/* -* FUNCTION: Set the specified file information -*/ -NTSTATUS NTAPI -CdfsSetInformation( - PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp; - FILE_INFORMATION_CLASS FileInformationClass; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - PVOID SystemBuffer; - - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CdfsSetInformation() called\n"); - - Irp = IrpContext->Irp; - Stack = IrpContext->Stack; - FileInformationClass = Stack->Parameters.SetFile.FileInformationClass; - FileObject = Stack->FileObject; - - SystemBuffer = Irp->AssociatedIrp.SystemBuffer; - - switch (FileInformationClass) - { - case FilePositionInformation: - Status = CdfsSetPositionInformation(FileObject, - SystemBuffer); - break; - - case FileBasicInformation: - case FileRenameInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - Status = STATUS_NOT_SUPPORTED; - break; - } - - Irp->IoStatus.Information = 0; - - return Status; -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/fsctl.c b/drivers/filesystems/cdfs/fsctl.c deleted file mode 100644 index 925819fb8e..0000000000 --- a/drivers/filesystems/cdfs/fsctl.c +++ /dev/null @@ -1,702 +0,0 @@ -/* -* ReactOS kernel -* Copyright (C) 2002, 2003 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: drivers/filesystems/cdfs/fsctl.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -* Pierre Schweitzer -*/ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -static __inline -int msf_to_lba (UCHAR m, UCHAR s, UCHAR f) -{ - return (((m * 60) + s) * 75 + f) - 150; -} - - -static -VOID -CdfsGetPVDData( - PUCHAR Buffer, - PCDINFO CdInfo) -{ - PPVD Pvd; - USHORT i; - PUCHAR pc; - PWCHAR pw; - - union - { - ULONG Value; - UCHAR Part[4]; - } Serial; - - Pvd = (PPVD)Buffer; - - /* Calculate the volume serial number */ - Serial.Value = 0; - for (i = 0; i < 2048; i += 4) - { - /* DON'T optimize this to ULONG!!! (breaks overflow) */ - Serial.Part[3] += Buffer[i+0]; - Serial.Part[2] += Buffer[i+1]; - Serial.Part[1] += Buffer[i+2]; - Serial.Part[0] += Buffer[i+3]; - } - CdInfo->SerialNumber = Serial.Value; - - /* Extract the volume label */ - pc = Pvd->VolumeId; - pw = CdInfo->VolumeLabel; - for (i = 0; i < (MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)) - 1; i++) - { - *pw++ = (WCHAR)*pc++; - } - *pw = 0; - - /* Trim trailing spaces */ - while (pw > CdInfo->VolumeLabel) - { - if (*--pw != ' ') break; - - /* Remove the space */ - *pw = '\0'; - - /* Decrease size */ - i--; - } - - CdInfo->VolumeLabelLength = i * sizeof(WCHAR); - - CdInfo->VolumeSpaceSize = Pvd->VolumeSpaceSizeL; - CdInfo->RootStart = Pvd->RootDirRecord.ExtentLocationL; - CdInfo->RootSize = Pvd->RootDirRecord.DataLengthL; - - DPRINT("VolumeSerial: %08lx\n", CdInfo->SerialNumber); - DPRINT("VolumeLabel: '%S'\n", CdInfo->VolumeLabel); - DPRINT("VolumeLabelLength: %lu\n", CdInfo->VolumeLabelLength); - DPRINT("VolumeSize: %lu\n", Pvd->VolumeSpaceSizeL); - DPRINT("RootStart: %lu\n", Pvd->RootDirRecord.ExtentLocationL); - DPRINT("RootSize: %lu\n", Pvd->RootDirRecord.DataLengthL); - DPRINT("PathTableSize: %lu\n", Pvd->PathTableSizeL); - DPRINT("PathTablePos: %lu\n", Pvd->LPathTablePos); - DPRINT("OptPathTablePos: %lu\n", Pvd->LOptPathTablePos); - -#if 0 - DbgPrint("******** PVD **********\n"); - DbgPrint("VdType: %d\n", Pvd->VdType); - DbgPrint("StandardId: '%.*s'\n", 5, Pvd->StandardId); - DbgPrint("VdVersion: %d\n", Pvd->VdVersion); - DbgPrint("SystemId: '%.*s'\n", 32, Pvd->SystemId); - DbgPrint("VolumeId: '%.*s'\n", 32, Pvd->VolumeId); - DbgPrint("VolumeSpaceSizeL: %d (%x)\n", Pvd->VolumeSpaceSizeL, Pvd->VolumeSpaceSizeL); - DbgPrint("VolumeSpaceSizeM: %d (%x)\n", Pvd->VolumeSpaceSizeM, Pvd->VolumeSpaceSizeM); - DbgPrint("VolumeSetSize: %d (%x)\n", Pvd->VolumeSequenceNumber, Pvd->VolumeSequenceNumber); - DbgPrint("VolumeSequenceNumber: %d (%x)\n", Pvd->VolumeSequenceNumber, Pvd->VolumeSequenceNumber); - DbgPrint("LogicalBlockSize: %d (%x)\n", Pvd->LogicalBlockSize, Pvd->LogicalBlockSize); - DbgPrint("PathTableSizeL: %d (%x)\n", Pvd->PathTableSizeL, Pvd->PathTableSizeL); - DbgPrint("PathTableSizeM: %d (%x)\n", Pvd->PathTableSizeM, Pvd->PathTableSizeM); - DbgPrint("LPathTablePos: %d (%x)\n", Pvd->LPathTablePos, Pvd->LPathTablePos); - DbgPrint("LOptPathTablePos: %d (%x)\n", Pvd->LOptPathTablePos, Pvd->LOptPathTablePos); - DbgPrint("MPathTablePos: %d (%x)\n", Pvd->MPathTablePos, Pvd->MPathTablePos); - DbgPrint("MOptPathTablePos: %d (%x)\n", Pvd->MOptPathTablePos, Pvd->MOptPathTablePos); - DbgPrint("VolumeSetIdentifier: '%.*s'\n", 128, Pvd->VolumeSetIdentifier); - DbgPrint("PublisherIdentifier: '%.*s'\n", 128, Pvd->PublisherIdentifier); - DbgPrint("******** Root *********\n"); - DbgPrint("RecordLength: %d\n", Pvd->RootDirRecord.RecordLength); - DbgPrint("ExtAttrRecordLength: %d\n", Pvd->RootDirRecord.ExtAttrRecordLength); - DbgPrint("ExtentLocationL: %d\n", Pvd->RootDirRecord.ExtentLocationL); - DbgPrint("DataLengthL: %d\n", Pvd->RootDirRecord.DataLengthL); - DbgPrint("Year: %d\n", Pvd->RootDirRecord.Year); - DbgPrint("Month: %d\n", Pvd->RootDirRecord.Month); - DbgPrint("Day: %d\n", Pvd->RootDirRecord.Day); - DbgPrint("Hour: %d\n", Pvd->RootDirRecord.Hour); - DbgPrint("Minute: %d\n", Pvd->RootDirRecord.Minute); - DbgPrint("Second: %d\n", Pvd->RootDirRecord.Second); - DbgPrint("TimeZone: %d\n", Pvd->RootDirRecord.TimeZone); - DbgPrint("FileFlags: %d\n", Pvd->RootDirRecord.FileFlags); - DbgPrint("FileUnitSize: %d\n", Pvd->RootDirRecord.FileUnitSize); - DbgPrint("InterleaveGapSize: %d\n", Pvd->RootDirRecord.InterleaveGapSize); - DbgPrint("VolumeSequenceNumber: %d\n", Pvd->RootDirRecord.VolumeSequenceNumber); - DbgPrint("FileIdLength: %d\n", Pvd->RootDirRecord.FileIdLength); - DbgPrint("FileId: '%.*s'\n", Pvd->RootDirRecord.FileId); - DbgPrint("***********************\n"); -#endif -} - - -static -VOID -CdfsGetSVDData( - PUCHAR Buffer, - PCDINFO CdInfo) -{ - PSVD Svd; - ULONG JolietLevel = 0; - - Svd = (PSVD)Buffer; - - DPRINT("EscapeSequences: '%.32s'\n", Svd->EscapeSequences); - - if (strncmp((PCHAR)Svd->EscapeSequences, "%/@", 3) == 0) - { - DPRINT("Joliet extension found (UCS-2 Level 1)\n"); - JolietLevel = 1; - } - else if (strncmp((PCHAR)Svd->EscapeSequences, "%/C", 3) == 0) - { - DPRINT("Joliet extension found (UCS-2 Level 2)\n"); - JolietLevel = 2; - } - else if (strncmp((PCHAR)Svd->EscapeSequences, "%/E", 3) == 0) - { - DPRINT("Joliet extension found (UCS-2 Level 3)\n"); - JolietLevel = 3; - } - - CdInfo->JolietLevel = JolietLevel; - - if (JolietLevel != 0) - { - CdInfo->RootStart = Svd->RootDirRecord.ExtentLocationL; - CdInfo->RootSize = Svd->RootDirRecord.DataLengthL; - - DPRINT("RootStart: %lu\n", Svd->RootDirRecord.ExtentLocationL); - DPRINT("RootSize: %lu\n", Svd->RootDirRecord.DataLengthL); - } -} - - -static -NTSTATUS -CdfsGetVolumeData( - PDEVICE_OBJECT DeviceObject, - PCDINFO CdInfo) -{ - PUCHAR Buffer; - NTSTATUS Status; - ULONG Sector; - PVD_HEADER VdHeader; - ULONG Size; - ULONG Offset; - CDROM_TOC Toc; - - DPRINT("CdfsGetVolumeData\n"); - - Buffer = ExAllocatePoolWithTag(NonPagedPool, CDFS_BASIC_SECTOR, CDFS_TAG); - if (Buffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Size = sizeof(Toc); - Status = CdfsDeviceIoControl(DeviceObject, - IOCTL_CDROM_READ_TOC, - NULL, - 0, - &Toc, - &Size, - TRUE); - if (NT_SUCCESS(Status)) - { - - DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n", - Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); - - Offset = Toc.TrackData[0].Address[1] * 60 * 75; - Offset += Toc.TrackData[0].Address[2] * 75; - Offset += Toc.TrackData[0].Address[3]; - if (Offset >= 150) - { - /* Remove MSF numbering offset of first frame */ - /* FIXME: should be done only for real cdroms? */ - Offset -= 150; - } - } - else - { - DPRINT1("Allowing mount of CDFS volume on non-CD device\n"); - Offset = 0; - } - - CdInfo->VolumeOffset = Offset; - DPRINT("Offset of first track in last session %u\n", Offset); - - CdInfo->JolietLevel = 0; - VdHeader = (PVD_HEADER)Buffer; - Buffer[0] = 0; - - for (Sector = CDFS_PRIMARY_DESCRIPTOR_LOCATION; Sector < 100 && Buffer[0] != 255; Sector++) - { - /* Read the Primary Volume Descriptor (PVD) */ - Status = CdfsReadSectors(DeviceObject, - Sector + Offset, - 1, - Buffer, - TRUE); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(Buffer, CDFS_TAG); - return Status; - } - - if (Sector == CDFS_PRIMARY_DESCRIPTOR_LOCATION) - { - DPRINT("CD-identifier: [%.5s]\n", Buffer + 1); - - if (Buffer[0] != 1 || Buffer[1] != 'C' || Buffer[2] != 'D' || - Buffer[3] != '0' || Buffer[4] != '0' || Buffer[5] != '1') - { - ExFreePoolWithTag(Buffer, CDFS_TAG); - return STATUS_UNRECOGNIZED_VOLUME; - } - } - - switch (VdHeader->VdType) - { - case 0: - DPRINT("BootVolumeDescriptor found!\n"); - break; - - case 1: - DPRINT("PrimaryVolumeDescriptor found!\n"); - CdfsGetPVDData(Buffer, CdInfo); - break; - - case 2: - DPRINT("SupplementaryVolumeDescriptor found!\n"); - CdfsGetSVDData(Buffer, CdInfo); - break; - - case 3: - DPRINT("VolumePartitionDescriptor found!\n"); - break; - - case 255: - DPRINT("VolumeDescriptorSetTerminator found!\n"); - break; - - default: - DPRINT1("Unknown volume descriptor type %u found!\n", VdHeader->VdType); - break; - } - } - - ExFreePoolWithTag(Buffer, CDFS_TAG); - - return STATUS_SUCCESS; -} - - -static -NTSTATUS -CdfsMountVolume( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDEVICE_EXTENSION DeviceExt = NULL; - PDEVICE_OBJECT NewDeviceObject = NULL; - PDEVICE_OBJECT DeviceToMount; - PIO_STACK_LOCATION Stack; - PFCB Fcb = NULL; - PCCB Ccb = NULL; - PVPB Vpb; - NTSTATUS Status; - CDINFO CdInfo; - DEVICE_TYPE FilesystemDeviceType; - - DPRINT("CdfsMountVolume() called\n"); - - if (DeviceObject == CdfsGlobalData->CdFsDeviceObject) - { - FilesystemDeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - } - else if (DeviceObject == CdfsGlobalData->HddFsDeviceObject) - { - FilesystemDeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - } - else - { - Status = STATUS_INVALID_DEVICE_REQUEST; - goto ByeBye; - } - - Stack = IoGetCurrentIrpStackLocation(Irp); - DeviceToMount = Stack->Parameters.MountVolume.DeviceObject; - Vpb = Stack->Parameters.MountVolume.Vpb; - - Status = CdfsGetVolumeData(DeviceToMount, &CdInfo); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } - - Status = IoCreateDevice(CdfsGlobalData->DriverObject, - sizeof(DEVICE_EXTENSION), - NULL, - FilesystemDeviceType, - DeviceToMount->Characteristics, - FALSE, - &NewDeviceObject); - if (!NT_SUCCESS(Status)) - goto ByeBye; - - NewDeviceObject->Flags = NewDeviceObject->Flags | DO_DIRECT_IO; - NewDeviceObject->Flags &= ~DO_VERIFY_VOLUME; - DeviceExt = (PVOID)NewDeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExt, - sizeof(DEVICE_EXTENSION)); - - Vpb->SerialNumber = CdInfo.SerialNumber; - Vpb->VolumeLabelLength = CdInfo.VolumeLabelLength; - RtlCopyMemory(Vpb->VolumeLabel, CdInfo.VolumeLabel, CdInfo.VolumeLabelLength); - RtlCopyMemory(&DeviceExt->CdInfo, &CdInfo, sizeof(CDINFO)); - - NewDeviceObject->Vpb = DeviceToMount->Vpb; - - DeviceExt->VolumeDevice = NewDeviceObject; - DeviceExt->StorageDevice = DeviceToMount; - DeviceExt->StorageDevice->Vpb->DeviceObject = NewDeviceObject; - DeviceExt->StorageDevice->Vpb->RealDevice = DeviceExt->StorageDevice; - DeviceExt->StorageDevice->Vpb->Flags |= VPB_MOUNTED; - NewDeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; - NewDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - /* Close (and cleanup) might be called from IoCreateStreamFileObject - * but we use this resource from CdfsCleanup, therefore it should be - * initialized no later than this. */ - ExInitializeResourceLite(&DeviceExt->DirResource); - - DeviceExt->StreamFileObject = IoCreateStreamFileObject(NULL, - DeviceExt->StorageDevice); - - Fcb = CdfsCreateFCB(NULL); - if (Fcb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - Ccb = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), CDFS_CCB_TAG); - if (Ccb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - RtlZeroMemory(Ccb, - sizeof(CCB)); - - DeviceExt->StreamFileObject->ReadAccess = TRUE; - DeviceExt->StreamFileObject->WriteAccess = FALSE; - DeviceExt->StreamFileObject->DeleteAccess = FALSE; - DeviceExt->StreamFileObject->FsContext = Fcb; - DeviceExt->StreamFileObject->FsContext2 = Ccb; - DeviceExt->StreamFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; - DeviceExt->StreamFileObject->PrivateCacheMap = NULL; - DeviceExt->StreamFileObject->Vpb = DeviceToMount->Vpb; - Ccb->PtrFileObject = DeviceExt->StreamFileObject; - Fcb->FileObject = DeviceExt->StreamFileObject; - Fcb->DevExt = (PDEVICE_EXTENSION)DeviceExt->StorageDevice; - - Fcb->Flags = FCB_IS_VOLUME_STREAM; - - Fcb->RFCB.FileSize.QuadPart = (DeviceExt->CdInfo.VolumeSpaceSize + DeviceExt->CdInfo.VolumeOffset) * BLOCKSIZE; - Fcb->RFCB.ValidDataLength = Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; - - Fcb->Entry.ExtentLocationL = 0; - Fcb->Entry.DataLengthL = (DeviceExt->CdInfo.VolumeSpaceSize + DeviceExt->CdInfo.VolumeOffset) * BLOCKSIZE; - - _SEH2_TRY - { - CcInitializeCacheMap(DeviceExt->StreamFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - TRUE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - goto ByeBye; - } - _SEH2_END; - - ExInitializeResourceLite(&DeviceExt->VcbResource); - - KeInitializeSpinLock(&DeviceExt->FcbListLock); - InitializeListHead(&DeviceExt->FcbListHead); - - FsRtlNotifyInitializeSync(&DeviceExt->NotifySync); - InitializeListHead(&DeviceExt->NotifyList); - - Status = STATUS_SUCCESS; - -ByeBye: - if (!NT_SUCCESS(Status)) - { - /* Cleanup */ - if (DeviceExt && DeviceExt->StreamFileObject) - ObDereferenceObject(DeviceExt->StreamFileObject); - if (Fcb) - ExFreePoolWithTag(Fcb, CDFS_NONPAGED_FCB_TAG); - if (NewDeviceObject) - IoDeleteDevice(NewDeviceObject); - } - - DPRINT("CdfsMountVolume() done (Status: %lx)\n", Status); - - return Status; -} - - -static -NTSTATUS -CdfsVerifyVolume( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDEVICE_EXTENSION DeviceExt; - PIO_STACK_LOCATION Stack; - NTSTATUS Status; - CDINFO CdInfo; - PLIST_ENTRY Entry; - PFCB Fcb; - PVPB VpbToVerify; - - DPRINT("CdfsVerifyVolume() called\n"); - - DeviceExt = DeviceObject->DeviceExtension; - - Stack = IoGetCurrentIrpStackLocation (Irp); - VpbToVerify = Stack->Parameters.VerifyVolume.Vpb; - - FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&DeviceExt->VcbResource, - TRUE); - - if (!(VpbToVerify->RealDevice->Flags & DO_VERIFY_VOLUME)) - { - DPRINT1("Volume has been verified!\n"); - ExReleaseResourceLite (&DeviceExt->VcbResource); - FsRtlExitFileSystem(); - return STATUS_SUCCESS; - } - - DPRINT1("Device object %p Device to verify %p\n", DeviceObject, VpbToVerify->RealDevice); - - Status = CdfsGetVolumeData(VpbToVerify->RealDevice, - &CdInfo); - if (NT_SUCCESS(Status) && - CdInfo.SerialNumber == VpbToVerify->SerialNumber && - CdInfo.VolumeLabelLength == VpbToVerify->VolumeLabelLength && - !wcsncmp(CdInfo.VolumeLabel, VpbToVerify->VolumeLabel, CdInfo.VolumeLabelLength)) - { - DPRINT1("Same volume!\n"); - - /* FIXME: Flush and purge metadata */ - - Status = STATUS_SUCCESS; - } - else - { - DPRINT1("Different volume!\n"); - - /* FIXME: force volume dismount */ - Entry = DeviceExt->FcbListHead.Flink; - while (Entry != &DeviceExt->FcbListHead) - { - Fcb = (PFCB)CONTAINING_RECORD(Entry, FCB, FcbListEntry); - DPRINT1("OpenFile %wZ RefCount %ld\n", &Fcb->PathName, Fcb->RefCount); - - Entry = Entry->Flink; - } - - Status = STATUS_WRONG_VOLUME; - } - - VpbToVerify->RealDevice->Flags &= ~DO_VERIFY_VOLUME; - - ExReleaseResourceLite(&DeviceExt->VcbResource); - FsRtlExitFileSystem(); - - return Status; -} - - -static -NTSTATUS -CdfsLockOrUnlockVolume( - IN PCDFS_IRP_CONTEXT IrpContext, - IN BOOLEAN LockVolume) -{ - PFCB Fcb; - PVPB Vpb; - PFILE_OBJECT FileObject; - PDEVICE_EXTENSION DeviceExt; - - FileObject = IrpContext->FileObject; - Fcb = FileObject->FsContext; - DeviceExt = IrpContext->DeviceObject->DeviceExtension; - Vpb = DeviceExt->StreamFileObject->Vpb; - - /* Only allow locking with the volume open */ - if (!BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME_STREAM)) - { - return STATUS_ACCESS_DENIED; - } - - /* Bail out if it's already in the demanded state */ - if ((BooleanFlagOn(DeviceExt->Flags, VCB_VOLUME_LOCKED) && LockVolume) || - (!BooleanFlagOn(DeviceExt->Flags, VCB_VOLUME_LOCKED) && !LockVolume)) - { - return STATUS_ACCESS_DENIED; - } - - /* Bail out if it's already in the demanded state */ - if ((BooleanFlagOn(Vpb->Flags, VPB_LOCKED) && LockVolume) || - (!BooleanFlagOn(Vpb->Flags, VPB_LOCKED) && !LockVolume)) - { - return STATUS_ACCESS_DENIED; - } - - /* Deny locking if we're not alone */ - if (LockVolume && DeviceExt->OpenHandleCount != 1) - { - return STATUS_ACCESS_DENIED; - } - - /* Finally, proceed */ - if (LockVolume) - { - DeviceExt->Flags |= VCB_VOLUME_LOCKED; - Vpb->Flags |= VPB_LOCKED; - } - else - { - DeviceExt->Flags &= ~VCB_VOLUME_LOCKED; - Vpb->Flags &= ~VPB_LOCKED; - } - - return STATUS_SUCCESS; -} - - -NTSTATUS -NTAPI -CdfsSetCompression( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - USHORT CompressionState; - - UNREFERENCED_PARAMETER(DeviceObject); - - Stack = IoGetCurrentIrpStackLocation(Irp); - - if (Stack->Parameters.DeviceIoControl.InputBufferLength != sizeof(CompressionState)) - return STATUS_INVALID_DEVICE_REQUEST; - - CompressionState = *(USHORT *)Irp->AssociatedIrp.SystemBuffer; - if (CompressionState != COMPRESSION_FORMAT_NONE) - return STATUS_INVALID_PARAMETER; - - return STATUS_SUCCESS; -} - - -NTSTATUS -NTAPI -CdfsFileSystemControl( - PCDFS_IRP_CONTEXT IrpContext) -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION Stack; - NTSTATUS Status; - - DPRINT("CdfsFileSystemControl() called\n"); - - ASSERT(IrpContext); - - DeviceObject = IrpContext->DeviceObject; - Irp = IrpContext->Irp; - Stack = IrpContext->Stack; - - Irp->IoStatus.Information = 0; - - switch (IrpContext->MinorFunction) - { - case IRP_MN_KERNEL_CALL: - case IRP_MN_USER_FS_REQUEST: - switch (Stack->Parameters.DeviceIoControl.IoControlCode) - { - case FSCTL_SET_COMPRESSION: - DPRINT("CDFS: IRP_MN_USER_FS_REQUEST / FSCTL_SET_COMPRESSION\n"); - Status = CdfsSetCompression(DeviceObject, Irp); - break; - - case FSCTL_LOCK_VOLUME: - DPRINT("CDFS: IRP_MN_USER_FS_REQUEST / FSCTL_LOCK_VOLUME\n"); - Status = CdfsLockOrUnlockVolume(IrpContext, TRUE); - break; - - case FSCTL_UNLOCK_VOLUME: - DPRINT("CDFS: IRP_MN_USER_FS_REQUEST / FSCTL_UNLOCK_VOLUME\n"); - Status = CdfsLockOrUnlockVolume(IrpContext, FALSE); - break; - - default: - DPRINT1("CDFS: IRP_MN_USER_FS_REQUEST / Unknown IoControlCode 0x%x\n", - Stack->Parameters.DeviceIoControl.IoControlCode); - Status = STATUS_INVALID_DEVICE_REQUEST; - } - break; - - case IRP_MN_MOUNT_VOLUME: - DPRINT("CDFS: IRP_MN_MOUNT_VOLUME\n"); - Status = CdfsMountVolume(DeviceObject, Irp); - break; - - case IRP_MN_VERIFY_VOLUME: - DPRINT1("CDFS: IRP_MN_VERIFY_VOLUME\n"); - Status = CdfsVerifyVolume(DeviceObject, Irp); - break; - - default: - DPRINT1("CDFS FSC: MinorFunction %u\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - return Status; -} - -/* EOF */ diff --git a/drivers/filesystems/cdfs/misc.c b/drivers/filesystems/cdfs/misc.c deleted file mode 100644 index fe5d9e5388..0000000000 --- a/drivers/filesystems/cdfs/misc.c +++ /dev/null @@ -1,380 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/cdfs/misc.c - * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Eric Kohl - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include "cdfs.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -/* - * FUNCTION: Used with IRP to set them to TopLevelIrp field - * ARGUMENTS: - * Irp = The IRP to set - * RETURNS: TRUE if top level was null, else FALSE - */ -BOOLEAN -CdfsIsIrpTopLevel( - PIRP Irp) -{ - BOOLEAN ReturnCode = FALSE; - - DPRINT("CdfsIsIrpTopLevel()\n"); - - if (IoGetTopLevelIrp() == NULL) - { - IoSetTopLevelIrp(Irp); - ReturnCode = TRUE; - } - - return ReturnCode; -} - - -/* - * FUNCTION: Allocate and fill a CDFS_IRP_CONTEXT struct in order to use it for IRP - * ARGUMENTS: - * DeviceObject = Used to fill in struct - * Irp = The IRP that need IRP_CONTEXT struct - * RETURNS: NULL or PCDFS_IRP_CONTEXT - */ -PCDFS_IRP_CONTEXT -CdfsAllocateIrpContext( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PCDFS_IRP_CONTEXT IrpContext; - - DPRINT("CdfsAllocateIrpContext()\n"); - - IrpContext = (PCDFS_IRP_CONTEXT)ExAllocateFromNPagedLookasideList(&CdfsGlobalData->IrpContextLookasideList); - if (IrpContext == NULL) - return NULL; - - RtlZeroMemory(IrpContext, sizeof(CDFS_IRP_CONTEXT)); - -// IrpContext->Identifier.Type = NTFS_TYPE_IRP_CONTEST; -// IrpContext->Identifier.Size = sizeof(NTFS_IRP_CONTEXT); - IrpContext->Irp = Irp; - IrpContext->DeviceObject = DeviceObject; - IrpContext->Stack = IoGetCurrentIrpStackLocation(Irp); - IrpContext->MajorFunction = IrpContext->Stack->MajorFunction; - IrpContext->MinorFunction = IrpContext->Stack->MinorFunction; - IrpContext->FileObject = IrpContext->Stack->FileObject; - IrpContext->IsTopLevel = (IoGetTopLevelIrp() == Irp); - IrpContext->PriorityBoost = IO_NO_INCREMENT; - IrpContext->Flags = IRPCONTEXT_COMPLETE; - - if (IrpContext->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL || - IrpContext->MajorFunction == IRP_MJ_DEVICE_CONTROL || - IrpContext->MajorFunction == IRP_MJ_SHUTDOWN || - (IrpContext->MajorFunction != IRP_MJ_CLEANUP && - IrpContext->MajorFunction != IRP_MJ_CLOSE && - IoIsOperationSynchronous(Irp))) - { - IrpContext->Flags |= IRPCONTEXT_CANWAIT; - } - - return IrpContext; -} - - -VOID -CdfsSwapString(PWCHAR Out, - PUCHAR In, - ULONG Count) -{ - PUCHAR t = (PUCHAR)Out; - ULONG i; - - for (i = 0; i < Count; i += 2) - { - t[i] = In[i+1]; - t[i+1] = In[i]; - if (t[i+1] == 0 && t[i] == ';') - break; - } - if ((i>2)&&(t[i-2] == '.')) - { - t[i-2] = 0; - t[i-1] = 0; - } - t[i] = 0; - t[i+1] = 0; -} - - -VOID -CdfsDateTimeToSystemTime(PFCB Fcb, - PLARGE_INTEGER SystemTime) -{ - TIME_FIELDS TimeFields; - LARGE_INTEGER LocalTime; - - TimeFields.Milliseconds = 0; - TimeFields.Second = Fcb->Entry.Second; - TimeFields.Minute = Fcb->Entry.Minute; - TimeFields.Hour = Fcb->Entry.Hour; - - TimeFields.Day = Fcb->Entry.Day; - TimeFields.Month = Fcb->Entry.Month; - TimeFields.Year = Fcb->Entry.Year + 1900; - - RtlTimeFieldsToTime(&TimeFields, - &LocalTime); - ExLocalTimeToSystemTime(&LocalTime, SystemTime); -} - - -VOID -CdfsFileFlagsToAttributes(PFCB Fcb, - PULONG FileAttributes) -{ - /* FIXME: Fix attributes */ - - *FileAttributes = // FILE_ATTRIBUTE_READONLY | - ((Fcb->Entry.FileFlags & FILE_FLAG_HIDDEN) ? FILE_ATTRIBUTE_HIDDEN : 0) | - ((Fcb->Entry.FileFlags & FILE_FLAG_DIRECTORY) ? FILE_ATTRIBUTE_DIRECTORY : 0) | - ((Fcb->Entry.FileFlags & FILE_FLAG_SYSTEM) ? FILE_ATTRIBUTE_SYSTEM : 0) | - ((Fcb->Entry.FileFlags & FILE_FLAG_READONLY) ? FILE_ATTRIBUTE_READONLY : 0); -} - -BOOLEAN -CdfsIsNameLegalDOS8Dot3(IN UNICODE_STRING FileName - ) -{ - ULONG i; - STRING DbcsName; - CHAR DbcsNameBuffer[12]; - - /* 8dot3 filename is max 12 length */ - if (FileName.Length / sizeof(WCHAR) > 12) - { - return FALSE; - } - - ASSERT(FileName.Length >= sizeof(WCHAR)); - for (i = 0; i < FileName.Length / sizeof(WCHAR) ; i++) - { - /* Don't allow spaces in FileName */ - if (FileName.Buffer[i] == L' ') - return FALSE; - } - - /* If FileName is finishing with a dot, remove it */ - if (FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] == '.') - { - FileName.Length -= sizeof(WCHAR); - } - - /* Finally, convert the string to call the FsRtl function */ - RtlInitEmptyAnsiString(&DbcsName, DbcsNameBuffer, sizeof(DbcsNameBuffer)); - if (!NT_SUCCESS(RtlUnicodeStringToCountedOemString(&DbcsName, - &FileName, - FALSE))) - { - - return FALSE; - } - return FsRtlIsFatDbcsLegal(DbcsName, FALSE, FALSE, FALSE); -} - -BOOLEAN -CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, - IN PDIR_RECORD Record) -{ - if (Record->RecordLength < Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)) - { - DPRINT1("Found corrupted entry! %u - %u\n", Record->RecordLength, Record->FileIdLength + FIELD_OFFSET(DIR_RECORD, FileId)); - return FALSE; - } - - if (Record->FileIdLength == 0) - { - DPRINT1("Found corrupted entry (null size)!\n"); - return FALSE; - } - - if (DeviceExt->CdInfo.JolietLevel == 0) - { - if (Record->FileId[0] == ANSI_NULL && Record->FileIdLength != 1) - { - DPRINT1("Found corrupted entry!\n"); - return FALSE; - } ... 709 lines suppressed ...

1 0

01/01: [ZIPFLDR] Enable / disable the correct wizard buttons
by Andreas Bjerkeholt 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4554c07b04e282985b80… commit a4554c07b04e282985b80b3f3d4769759e577959 Author: Andreas Bjerkeholt <harteex(a)gmail.com> AuthorDate: Tue Aug 21 11:14:14 2018 +0200 Commit: Harteex <harteex(a)gmail.com> CommitDate: Tue Aug 21 12:06:41 2018 +0200 [ZIPFLDR] Enable / disable the correct wizard buttons --- dll/shellext/zipfldr/CZipExtract.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 258f9b34a1..baa0b308fc 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -163,6 +163,7 @@ public: m_pExtract->m_DirectoryChanged = false; ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); /* Not supported for now */ GetParent().CenterWindow(::GetDesktopWindow()); + SetWizardButtons(PSWIZB_NEXT); return 0; } @@ -171,6 +172,7 @@ public: ::EnableWindow(GetDlgItem(IDC_BROWSE), FALSE); ::EnableWindow(GetDlgItem(IDC_DIRECTORY), FALSE); ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); + SetWizardButtons(0); if (m_pExtract->m_DirectoryChanged) UpdateDirectory(); @@ -183,6 +185,7 @@ public: ::EnableWindow(GetDlgItem(IDC_BROWSE), TRUE); ::EnableWindow(GetDlgItem(IDC_DIRECTORY), TRUE); ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); /* Not supported for now */ + SetWizardButtons(PSWIZB_NEXT); return TRUE; }

1 0

01/01: [NTOS:Mm] Fix a 64 bit issue in MmMapViewOfArm3Section (#778)
by Timo Kreuzer 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f43a7b81a7cbab29ffe4e… commit f43a7b81a7cbab29ffe4ed31cafa6550f353440a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 21 11:25:22 2018 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 21 11:25:22 2018 +0200 [NTOS:Mm] Fix a 64 bit issue in MmMapViewOfArm3Section (#778) Fixes a Clang-Cl warning CORE-14306 --- ntoskrnl/mm/ARM3/section.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 689f6cd86f..f1912253d9 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> +#include <ntintsafe.h> #define NDEBUG #include <debug.h> @@ -2847,6 +2848,7 @@ MmMapViewOfArm3Section(IN PVOID SectionObject, PCONTROL_AREA ControlArea; ULONG ProtectionMask; NTSTATUS Status; + ULONG64 CalculatedViewSize; PAGED_CODE(); /* Get the segment and control area */ @@ -2893,11 +2895,12 @@ MmMapViewOfArm3Section(IN PVOID SectionObject, if (!(*ViewSize)) { /* Compute it for the caller */ - *ViewSize = (SIZE_T)(Section->SizeOfSection.QuadPart - SectionOffset->QuadPart); + CalculatedViewSize = Section->SizeOfSection.QuadPart - + SectionOffset->QuadPart; /* Check if it's larger than 4GB or overflows into kernel-mode */ - if ((*ViewSize > 0xFFFFFFFF) || - (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)*BaseAddress) < *ViewSize)) + if (!NT_SUCCESS(RtlULongLongToSIZET(CalculatedViewSize, ViewSize)) || + (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)*BaseAddress) < CalculatedViewSize)) { DPRINT1("Section view won't fit\n"); return STATUS_INVALID_VIEW_SIZE;

1 0

01/01: [NTOS] Fix MiFindInitializationCode (#751)
by Timo Kreuzer 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5181e44dd10615fe6c35… commit d5181e44dd10615fe6c3515e38ac11ff01b51ec6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 21 10:35:57 2018 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 21 10:35:57 2018 +0200 [NTOS] Fix MiFindInitializationCode (#751) Short: The code was suffering from an off-by-one bug (inconsistency between inclusive end exclusive end address), which could lead to freeing one page above the initialization code. This led to freeing part of the kernel import section on x64. Now it is consistently using the aligned/exclusive end address. Long: * Initialization sections are freed both for the boot loaded images as well as for drivers that are loaded later. Obviously the second mechanism needs to be able to run at any time, so it is not initialization code itself. For some reason someone decided though, it would be a smart idea to implement the code twice, once for the boot loaded images, once for drivers and concluding that the former was initialization code itself and had to be freed. * Since freeing the code that frees the initialization sections, while it is doing that is not possible, it uses a "smart trick", initially skipping that range, returning its start and end to the caller and have the caller free it afterwards. * The code was using the end address in an inconsistent way, partly aligning it to the start of the following section, sometimes pointing to the last byte that should be freed. The function that freed each chunk was assuming the latter (i.e. that the end was included in the range) and thus freed the page that contained the end address. The end address for the range that was returned to the caller was aligned to the start of the next section, and the caller used it to free the range in [...] --- ntoskrnl/mm/ARM3/sysldr.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 471551184f..d614b8bf3a 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -1435,7 +1435,7 @@ MiFreeInitializationCode(IN PVOID InitStart, ASSERT(MI_IS_PHYSICAL_ADDRESS(InitStart) == FALSE); /* Compute the number of pages we expect to free */ - PagesFreed = (PFN_NUMBER)(MiAddressToPte(InitEnd) - PointerPte + 1); + PagesFreed = (PFN_NUMBER)(MiAddressToPte(InitEnd) - PointerPte); /* Try to actually free them */ PagesFreed = MiDeleteSystemPageableVm(PointerPte, @@ -1455,8 +1455,9 @@ MiFindInitializationCode(OUT PVOID *StartVa, ULONG_PTR DllBase, InitStart, InitEnd, ImageEnd, InitCode; PLIST_ENTRY NextEntry; PIMAGE_NT_HEADERS NtHeader; - PIMAGE_SECTION_HEADER Section, LastSection; + PIMAGE_SECTION_HEADER Section, LastSection, InitSection; BOOLEAN InitFound; + DBG_UNREFERENCED_LOCAL_VARIABLE(InitSection); /* So we don't free our own code yet */ InitCode = (ULONG_PTR)&MiFindInitializationCode; @@ -1503,11 +1504,12 @@ MiFindInitializationCode(OUT PVOID *StartVa, InitFound = FALSE; /* Is this the INIT section or a discardable section? */ - if ((*(PULONG)Section->Name == 'TINI') || + if ((strncmp((PCCH)Section->Name, "INIT", 5) == 0) || ((Section->Characteristics & IMAGE_SCN_MEM_DISCARDABLE))) { /* Remember this */ InitFound = TRUE; + InitSection = Section; } if (InitFound) @@ -1518,10 +1520,13 @@ MiFindInitializationCode(OUT PVOID *StartVa, /* Read the section alignment */ Alignment = NtHeader->OptionalHeader.SectionAlignment; - /* Align the start and end addresses appropriately */ + /* Get the start and end addresses */ InitStart = DllBase + Section->VirtualAddress; - InitEnd = ((Alignment + InitStart + Size - 2) & 0xFFFFF000) - 1; - InitStart = (InitStart + (PAGE_SIZE - 1)) & 0xFFFFF000; + InitEnd = ALIGN_UP_BY(InitStart + Size, Alignment); + + /* Align the addresses to PAGE_SIZE */ + InitStart = ALIGN_UP_BY(InitStart, PAGE_SIZE); + InitEnd = ALIGN_DOWN_BY(InitEnd, PAGE_SIZE); /* Have we reached the last section? */ if (SectionCount == 1) @@ -1559,25 +1564,26 @@ MiFindInitializationCode(OUT PVOID *StartVa, Size = max(LastSection->SizeOfRawData, LastSection->Misc.VirtualSize); /* Use this as the end of the section address */ - InitEnd = DllBase + LastSection->VirtualAddress + Size - 1; + InitEnd = DllBase + LastSection->VirtualAddress + Size; /* Have we reached the last section yet? */ if (SectionCount != 1) { /* Then align this accross the session boundary */ - InitEnd = ((Alignment + InitEnd - 1) & 0XFFFFF000) - 1; + InitEnd = ALIGN_UP_BY(InitEnd, Alignment); + InitEnd = ALIGN_DOWN_BY(InitEnd, PAGE_SIZE); } } /* Make sure we don't let the init section go past the image */ ImageEnd = DllBase + LdrEntry->SizeOfImage; - if (InitEnd > ImageEnd) InitEnd = (ImageEnd - 1) | (PAGE_SIZE - 1); + if (InitEnd > ImageEnd) InitEnd = ALIGN_UP_BY(ImageEnd, PAGE_SIZE); /* Make sure we have a valid, non-zero init section */ - if (InitStart <= InitEnd) + if (InitStart < InitEnd) { /* Make sure we are not within this code itself */ - if ((InitCode >= InitStart) && (InitCode <= InitEnd)) + if ((InitCode >= InitStart) && (InitCode < InitEnd)) { /* Return it, we can't free ourselves now */ ASSERT(*StartVa == 0); @@ -1588,6 +1594,12 @@ MiFindInitializationCode(OUT PVOID *StartVa, { /* This isn't us -- go ahead and free it */ ASSERT(MI_IS_PHYSICAL_ADDRESS((PVOID)InitStart) == FALSE); + DPRINT("Freeing init code: %p-%p ('%wZ' @%p : '%s')\n", + (PVOID)InitStart, + (PVOID)InitEnd, + &LdrEntry->BaseDllName, + LdrEntry->DllBase, + InitSection->Name); MiFreeInitializationCode((PVOID)InitStart, (PVOID)InitEnd); } }

1 0

02/02: [FASTFAT] Drop an useless #ifdef, we have this cast in all other FSDs
by Pierre Schweitzer 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5aa79a66df7ce3ea6771… commit b5aa79a66df7ce3ea6771b9582f68ef1ab5cdd2d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Aug 21 08:50:29 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Aug 21 08:50:29 2018 +0200 [FASTFAT] Drop an useless #ifdef, we have this cast in all other FSDs --- drivers/filesystems/fastfat/dir.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/fastfat/dir.c index fc78f7cbe1..6f82f65c93 100644 --- a/drivers/filesystems/fastfat/dir.c +++ b/drivers/filesystems/fastfat/dir.c @@ -530,13 +530,7 @@ DoQuery( } /* Obtain the callers parameters */ -#ifdef _MSC_VER - /* HACKHACK: Bug in the MS ntifs.h header: - * FileName is really a PUNICODE_STRING, not a PSTRING */ pSearchPattern = (PUNICODE_STRING)Stack->Parameters.QueryDirectory.FileName; -#else - pSearchPattern = Stack->Parameters.QueryDirectory.FileName; -#endif FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; /* Allocate search pattern in case:

1 0

01/02: [FASTFAT] Finally drop the TAG_VFAT allocation tag
by Pierre Schweitzer 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bb1baa8607c60a4c75fa… commit 4bb1baa8607c60a4c75fa580f477f654a2244540 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Aug 21 08:36:51 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Aug 21 08:36:51 2018 +0200 [FASTFAT] Finally drop the TAG_VFAT allocation tag --- drivers/filesystems/fastfat/create.c | 10 +++++----- drivers/filesystems/fastfat/dir.c | 4 ++-- drivers/filesystems/fastfat/dirwr.c | 22 +++++++++++----------- drivers/filesystems/fastfat/fcb.c | 2 +- drivers/filesystems/fastfat/finfo.c | 6 +++--- drivers/filesystems/fastfat/fsctl.c | 18 +++++++++--------- drivers/filesystems/fastfat/vfat.h | 5 ++++- 7 files changed, 35 insertions(+), 32 deletions(-) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 6dbf032e6e..22ce0a54ff 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -122,7 +122,7 @@ FindFile( DPRINT("FindFile: Path %wZ\n",&Parent->PathNameU); PathNameBufferLength = LONGNAME_MAX_LENGTH * sizeof(WCHAR); - PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameBufferLength + sizeof(WCHAR), TAG_VFAT); + PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameBufferLength + sizeof(WCHAR), TAG_NAME); if (!PathNameBuffer) { return STATUS_INSUFFICIENT_RESOURCES; @@ -173,7 +173,7 @@ FindFile( Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb); - ExFreePool(PathNameBuffer); + ExFreePoolWithTag(PathNameBuffer, TAG_NAME); return Status; } } @@ -183,7 +183,7 @@ FindFile( Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFindU, TRUE); if (!NT_SUCCESS(Status)) { - ExFreePool(PathNameBuffer); + ExFreePoolWithTag(PathNameBuffer, TAG_NAME); return Status; } @@ -251,7 +251,7 @@ FindFile( CcUnpinData(Context); } RtlFreeUnicodeString(&FileToFindUpcase); - ExFreePool(PathNameBuffer); + ExFreePoolWithTag(PathNameBuffer, TAG_NAME); return STATUS_SUCCESS; } DirContext->DirIndex++; @@ -263,7 +263,7 @@ FindFile( } RtlFreeUnicodeString(&FileToFindUpcase); - ExFreePool(PathNameBuffer); + ExFreePoolWithTag(PathNameBuffer, TAG_NAME); return Status; } diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/fastfat/dir.c index b0b442a33a..fc78f7cbe1 100644 --- a/drivers/filesystems/fastfat/dir.c +++ b/drivers/filesystems/fastfat/dir.c @@ -555,7 +555,7 @@ DoQuery( pCcb->SearchPattern.MaximumLength = pSearchPattern->Length + sizeof(WCHAR); pCcb->SearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, pCcb->SearchPattern.MaximumLength, - TAG_VFAT); + TAG_SEARCH); if (!pCcb->SearchPattern.Buffer) { ExReleaseResourceLite(&pFcb->MainResource); @@ -572,7 +572,7 @@ DoQuery( pCcb->SearchPattern.MaximumLength = 2 * sizeof(WCHAR); pCcb->SearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), - TAG_VFAT); + TAG_SEARCH); if (!pCcb->SearchPattern.Buffer) { ExReleaseResourceLite(&pFcb->MainResource); diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index ba791fbc60..65db414d21 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -445,7 +445,7 @@ FATAddEntry( /* nb of entry needed for long name+normal entry */ nbSlots = (DirContext.LongNameU.Length / sizeof(WCHAR) + 12) / 13 + 1; DPRINT("NameLen= %u, nbSlots =%u\n", DirContext.LongNameU.Length / sizeof(WCHAR), nbSlots); - Buffer = ExAllocatePoolWithTag(NonPagedPool, (nbSlots - 1) * sizeof(FAT_DIR_ENTRY), TAG_VFAT); + Buffer = ExAllocatePoolWithTag(NonPagedPool, (nbSlots - 1) * sizeof(FAT_DIR_ENTRY), TAG_DIRENT); if (Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -505,7 +505,7 @@ FATAddEntry( } if (i == 100) /* FIXME : what to do after this ? */ { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); return STATUS_UNSUCCESSFUL; } IsNameLegal = RtlIsNameLegalDOS8Dot3(&DirContext.ShortNameU, &NameA, &SpacesFound); @@ -650,7 +650,7 @@ FATAddEntry( /* try to find nbSlots contiguous entries frees in directory */ if (!vfatFindDirSpace(DeviceExt, ParentFcb, nbSlots, &DirContext.StartIndex)) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); return STATUS_DISK_FULL; } DirContext.DirIndex = DirContext.StartIndex + nbSlots - 1; @@ -663,7 +663,7 @@ FATAddEntry( Status = NextCluster(DeviceExt, 0, &CurrentCluster, TRUE); if (CurrentCluster == 0xffffffff || !NT_SUCCESS(Status)) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); if (!NT_SUCCESS(Status)) { return Status; @@ -713,7 +713,7 @@ FATAddEntry( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -736,7 +736,7 @@ FATAddEntry( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -750,7 +750,7 @@ FATAddEntry( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -774,7 +774,7 @@ FATAddEntry( } if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); return Status; } @@ -786,7 +786,7 @@ FATAddEntry( Status = vfatFCBInitializeCacheFromVolume(DeviceExt, (*Fcb)); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); return Status; } @@ -797,7 +797,7 @@ FATAddEntry( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -824,7 +824,7 @@ FATAddEntry( CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); } - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); DPRINT("addentry ok\n"); return STATUS_SUCCESS; } diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index 6befca9128..ed85ab277c 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -260,7 +260,7 @@ vfatDestroyCCB( { if (pCcb->SearchPattern.Buffer) { - ExFreePoolWithTag(pCcb->SearchPattern.Buffer, TAG_VFAT); + ExFreePoolWithTag(pCcb->SearchPattern.Buffer, TAG_SEARCH); } ExFreeToNPagedLookasideList(&VfatGlobalData->CcbLookasideList, pCcb); } diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index a19c21db55..576adb2e18 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -713,7 +713,7 @@ VfatSetRenameInformation( NewName.MaximumLength += sizeof(WCHAR) + ((PVFATFCB)TargetFileObject->FsContext)->PathNameU.Length; } - NewName.Buffer = ExAllocatePoolWithTag(NonPagedPool, NewName.MaximumLength, TAG_VFAT); + NewName.Buffer = ExAllocatePoolWithTag(NonPagedPool, NewName.MaximumLength, TAG_NAME); if (NewName.Buffer == NULL) { if (TargetFileObject != NULL) @@ -779,7 +779,7 @@ VfatSetRenameInformation( NewName.Length = 0; NewName.MaximumLength = TargetFileObject->FileName.Length + ((PVFATFCB)TargetFileObject->FsContext)->PathNameU.Length + sizeof(WCHAR); - NewName.Buffer = ExAllocatePoolWithTag(NonPagedPool, NewName.MaximumLength, TAG_VFAT); + NewName.Buffer = ExAllocatePoolWithTag(NonPagedPool, NewName.MaximumLength, TAG_NAME); if (NewName.Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -949,7 +949,7 @@ VfatSetRenameInformation( ASSERT(NewReferences == ParentFCB->RefCount - 1); // new file Cleanup: if (ParentFCB != NULL) vfatReleaseFCB(DeviceExt, ParentFCB); - if (NewName.Buffer != NULL) ExFreePoolWithTag(NewName.Buffer, TAG_VFAT); + if (NewName.Buffer != NULL) ExFreePoolWithTag(NewName.Buffer, TAG_NAME); if (RenameInfo->RootDirectory != NULL) ObDereferenceObject(RootFileObject); return Status; diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index b70a84cd7e..b7e576d2d8 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -132,7 +132,7 @@ VfatHasFileSystem( if (*RecognizedFS) { - Boot = ExAllocatePoolWithTag(NonPagedPool, DiskGeometry.BytesPerSector, TAG_VFAT); + Boot = ExAllocatePoolWithTag(NonPagedPool, DiskGeometry.BytesPerSector, TAG_BUFFER); if (Boot == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -256,12 +256,12 @@ VfatHasFileSystem( } } - ExFreePool(Boot); + ExFreePoolWithTag(Boot, TAG_BUFFER); } if (!*RecognizedFS && PartitionInfoIsValid) { - BootFatX = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _BootSectorFatX), TAG_VFAT); + BootFatX = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _BootSectorFatX), TAG_BUFFER); if (BootFatX == NULL) { *RecognizedFS=FALSE; @@ -332,7 +332,7 @@ VfatHasFileSystem( } } } - ExFreePool(BootFatX); + ExFreePoolWithTag(BootFatX, TAG_BUFFER); } DPRINT("VfatHasFileSystem done\n"); @@ -412,13 +412,13 @@ ReadVolumeLabel( ASSERT(DeviceObject->Type == 3); - Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_VFAT); + Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_DIRENT); if (Buffer != NULL) { Status = VfatReadDisk(DeviceObject, &FileOffset, PAGE_SIZE, (PUCHAR)Buffer, TRUE); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); } else { @@ -496,7 +496,7 @@ ReadVolumeLabel( } else if (NoCache) { - ExFreePoolWithTag(Buffer, TAG_VFAT); + ExFreePoolWithTag(Buffer, TAG_DIRENT); } } @@ -668,7 +668,7 @@ VfatMount( ExInitializeResourceLite(&DeviceExt->DirResource); DeviceExt->IoVPB = DeviceObject->Vpb; - DeviceExt->SpareVPB = ExAllocatePoolWithTag(NonPagedPool, sizeof(VPB), TAG_VFAT); + DeviceExt->SpareVPB = ExAllocatePoolWithTag(NonPagedPool, sizeof(VPB), TAG_VPB); if (DeviceExt->SpareVPB == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -807,7 +807,7 @@ ByeBye: if (DeviceExt && DeviceExt->FATFileObject) ObDereferenceObject (DeviceExt->FATFileObject); if (DeviceExt && DeviceExt->SpareVPB) - ExFreePoolWithTag(DeviceExt->SpareVPB, TAG_VFAT); + ExFreePoolWithTag(DeviceExt->SpareVPB, TAG_VPB); if (DeviceExt && DeviceExt->Statistics) ExFreePoolWithTag(DeviceExt->Statistics, TAG_STATS); if (Fcb) diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 993d5f9fb9..e6c7c73e1d 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -538,10 +538,13 @@ typedef struct _VFATCCB #define TAG_CCB 'CtaF' #define TAG_FCB 'FtaF' #define TAG_IRP 'ItaF' -#define TAG_VFAT 'TAFV' #define TAG_CLOSE 'xtaF' #define TAG_STATS 'VtaF' #define TAG_BUFFER 'OtaF' +#define TAG_VPB 'vtaF' +#define TAG_NAME 'ntaF' +#define TAG_SEARCH 'LtaF' +#define TAG_DIRENT 'DtaF' #define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry))

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2018