From 1270e0efe7232a1987c5bee62f4ed9dd7b31d0a9 Mon Sep 17 00:00:00 2001 From: Olof Lagerkvist Date: Sun, 31 Oct 2021 00:41:31 +0200 Subject: [PATCH] 2.1.1 --- .gitignore | 13 +- ImDisk.sln | 98 ++ .../DevioNet/Client/DevioProviderStream.vb | 9 +- ImDiskNet/DevioNet/Client/DevioShmStream.vb | 38 +- ImDiskNet/DevioNet/Client/DevioStream.vb | 318 +++--- ImDiskNet/DevioNet/Client/DevioTcpStream.vb | 290 +++--- ImDiskNet/DevioNet/DevioNet.vbproj | 175 +--- ImDiskNet/DevioNet/Enums.vb | 44 +- ImDiskNet/DevioNet/GlobalSuppressions.vb | 9 + ImDiskNet/DevioNet/My Project/AssemblyInfo.vb | 23 +- .../DevioNet/My Project/Settings.Designer.vb | 73 -- .../Providers/DevioProviderFromStream.vb | 6 +- .../Providers/DevioProviderManagedBase.vb | 4 +- .../Providers/DevioProviderUnmanagedBase.vb | 8 +- .../Server/Services/DevioNoneService.vb | 14 +- .../Server/Services/DevioServiceBase.vb | 23 +- .../Server/Services/DevioShmService.vb | 94 +- .../Server/Services/DevioTcpService.vb | 340 ++++--- ImDiskNet/DevioNet/app.config | 23 + ImDiskNet/DevioNet/packages.config | 8 + ImDiskNet/Directory.build.props | 34 + .../DiscUtilsDevio/DiscUtilsDevio.vbproj | 184 +--- .../DiscUtilsDevio/GlobalSuppressions.vb | 9 + .../DiscUtilsDevio/My Project/AssemblyInfo.vb | 20 - .../My Project/Settings.Designer.vb | 73 -- ImDiskNet/DiscUtilsDevio/ServerModule.vb | 351 ++++--- ImDiskNet/DiscUtilsDevio/app.config | 23 + ImDiskNet/DiscUtilsDevio/packages.config | 8 + ImDiskNet/ImDiskNet.inf | 69 ++ ImDiskNet/ImDiskNet.shfbproj | 69 -- ImDiskNet/ImDiskNet.sln | 12 +- ImDiskNet/ImDiskNet/GlobalSuppressions.vb | 9 + ImDiskNet/ImDiskNet/IO/ConsoleSupport.vb | 68 ++ ImDiskNet/ImDiskNet/IO/PinnedBuffer.vb | 321 ++++++ .../ImDiskNet/ImDisk/ComInterop/ImDiskCOM.vb | 86 +- ImDiskNet/ImDiskNet/ImDisk/Flags.vb | 5 +- ImDiskNet/ImDiskNet/ImDisk/ImDiskAPI.vb | 206 ++-- ImDiskNet/ImDiskNet/ImDisk/ImDiskControl.vb | 26 +- ImDiskNet/ImDiskNet/ImDisk/ImDiskDevice.vb | 87 +- .../ImDiskNet/ImDisk/ImDiskDeviceStream.vb | 72 +- ImDiskNet/ImDiskNet/ImDisk/ImDiskObject.vb | 139 +-- .../ImDiskNet/ImDisk/ImDiskRefreshEvent.vb | 4 +- .../ImDisk/{DLL.vb => UnsafeNativeMethods.vb} | 69 +- ImDiskNet/ImDiskNet/ImDiskNet.vbproj | 170 +--- .../ImDiskNet/My Project/AssemblyInfo.vb | 25 +- .../ImDiskNet/My Project/Settings.Designer.vb | 73 -- .../ImDiskNet/My Project/Settings.settings | 7 - ImDiskNet/ImDiskNet/NativeFileIO.vb | 317 +++--- ImDiskNet/ImDiskNet/Support/DisposableList.vb | 41 + ImDiskNet/ImDiskNet/packages.config | 8 + ImDiskNet/ImDiskNetHelpBuilder.shfbproj | 10 +- ImDiskNet/VB6test/Form.frm | 190 ++++ ImDiskNet/VB6test/VB6test.vbp | 33 + Makefile | 37 +- awealloc/awealloc.c | 45 +- awealloc/awealloc.inf | 54 + awealloc/awealloc.props | 13 + awealloc/awealloc.rc | 10 +- awealloc/awealloc.vcxproj | 51 +- cli/cli.inf | 54 + cli/cli.vcxproj | 6 +- cli/imdisk.c | 394 ++++--- cli/imdisk.rc | 10 +- cpl/Dialogs.rc | 105 ++ cpl/Icons/CD.bmp | Bin 0 -> 822 bytes cpl/amd64/imdisk.exp | Bin 8924 -> 9193 bytes cpl/amd64/imdisk.lib | Bin 15124 -> 15578 bytes cpl/cpl.inf | 54 + cpl/cpl.vcxproj | 15 +- cpl/drvio.c | 809 +++++++++------ cpl/drvio.h | 34 +- cpl/i386/imdisk.exp | Bin 16398 -> 16601 bytes cpl/i386/imdisk.lib | Bin 29262 -> 29740 bytes cpl/ia64/imdisk.exp | Bin 8914 -> 9191 bytes cpl/ia64/imdisk.lib | Bin 18298 -> 18852 bytes cpl/imdisk.cpp | 181 +++- cpl/imdisk.rc | 2 +- cpl/mbr.c | 44 +- cpl/rundll.c | 34 +- cpl/sources | 2 +- cpl/sources.props | 2 +- cpl/wconmsg.cpp | 2 +- cplcore/Icons/CD.bmp | Bin 0 -> 822 bytes cplcore/Icons/CD.ico | Bin 0 -> 1406 bytes cplcore/Icons/Disk.ico | Bin 0 -> 318 bytes cplcore/Icons/Floppy.ico | Bin 0 -> 1406 bytes cplcore/Icons/VD.ico | Bin 0 -> 26694 bytes cplcore/Icons/VDInfo.ico | Bin 0 -> 6518 bytes cplcore/amd64/imdisk.exp | Bin 8137 -> 8408 bytes cplcore/amd64/imdisk.lib | Bin 13822 -> 14276 bytes cplcore/cplcore.inf | 54 + cplcore/cplcore.vcxproj | 9 +- cplcore/drvio.c | 809 +++++++++------ cplcore/drvio.h | 34 +- cplcore/i386/imdisk.exp | Bin 14839 -> 15038 bytes cplcore/i386/imdisk.lib | Bin 26538 -> 27016 bytes cplcore/ia64/imdisk.exp | Bin 8127 -> 8402 bytes cplcore/ia64/imdisk.lib | Bin 16712 -> 17270 bytes cplcore/imdisk.rc | 2 +- cplcore/imdisk.vcxproj | 201 ---- cplcore/mbr.c | 89 ++ cplcore/sources | 2 +- cplcore/sources.props | 2 +- cplcore/wconmsg.cpp | 2 +- devio/Makefile | 24 +- devio/Makefile.win64d | 10 + devio/Makefile.winarm | 18 + devio/Makefile.winarm64 | 18 + devio/devio.c | 448 +++++++- devio/devio.h | 41 +- devio/devio.inf | 51 + devio/devio.props | 3 + devio/devio.vcxproj | 3 +- devio/devio_types.h | 6 + devio/devioimp.props | 10 + devio/safeio.c | 48 +- devio/safeio.h | 2 +- devio/safeio_win32.cpp | 2 +- devio/win32_fileio.def | 5 + devio/win32_fileio.exp | Bin 0 -> 676 bytes devio/win32_fileio.lib | Bin 0 -> 1786 bytes deviodrv/MAKEFILE | 7 + deviodrv/deviodrv.cpp | 132 +++ deviodrv/deviodrv.h | 360 +++++++ deviodrv/deviodrv.inf | 54 + deviodrv/deviodrv.rc | 43 + deviodrv/deviodrv.vcxproj | 193 ++++ deviodrv/dispatch.cpp | 451 ++++++++ deviodrv/filetable.cpp | 211 ++++ deviodrv/irpfwd.cpp | 960 ++++++++++++++++++ deviodrv/sources | 8 + imdisk.inf | 27 +- imdisk.props | 4 +- inc/imdisk.h | 21 +- inc/imdiskver.h | 13 +- inc/imdproxy.h | 28 + inc/ntkmapi.h | 2 +- inc/ntumapi.h | 20 + readme.txt | 2 +- svc/imdsksvc.cpp | 120 ++- svc/imdsksvc.rc | 2 +- svc/svc.inf | 54 + sys/commonio.cpp | 2 +- sys/createdev.cpp | 87 +- sys/devthrd.cpp | 49 +- sys/floppy.cpp | 6 +- sys/imdisk.cpp | 13 +- sys/imdisk.rc | 10 +- sys/imdsksys.h | 9 +- sys/iodisp.cpp | 22 +- sys/lowerdev.cpp | 24 +- sys/proxy.cpp | 18 +- sys/sources | 4 +- sys/sources.props | 2 +- sys/sys.inf | 55 + sys/sys.props | 12 +- sys/sys.vcxproj | 77 +- 157 files changed, 8082 insertions(+), 3299 deletions(-) create mode 100644 ImDiskNet/DevioNet/GlobalSuppressions.vb delete mode 100644 ImDiskNet/DevioNet/My Project/Settings.Designer.vb create mode 100644 ImDiskNet/DevioNet/app.config create mode 100644 ImDiskNet/DevioNet/packages.config create mode 100644 ImDiskNet/Directory.build.props create mode 100644 ImDiskNet/DiscUtilsDevio/GlobalSuppressions.vb delete mode 100644 ImDiskNet/DiscUtilsDevio/My Project/Settings.Designer.vb create mode 100644 ImDiskNet/DiscUtilsDevio/app.config create mode 100644 ImDiskNet/DiscUtilsDevio/packages.config create mode 100644 ImDiskNet/ImDiskNet.inf delete mode 100644 ImDiskNet/ImDiskNet.shfbproj create mode 100644 ImDiskNet/ImDiskNet/GlobalSuppressions.vb create mode 100644 ImDiskNet/ImDiskNet/IO/ConsoleSupport.vb create mode 100644 ImDiskNet/ImDiskNet/IO/PinnedBuffer.vb rename ImDiskNet/ImDiskNet/ImDisk/{DLL.vb => UnsafeNativeMethods.vb} (87%) delete mode 100644 ImDiskNet/ImDiskNet/My Project/Settings.Designer.vb delete mode 100644 ImDiskNet/ImDiskNet/My Project/Settings.settings create mode 100644 ImDiskNet/ImDiskNet/Support/DisposableList.vb create mode 100644 ImDiskNet/ImDiskNet/packages.config create mode 100644 ImDiskNet/VB6test/Form.frm create mode 100644 ImDiskNet/VB6test/VB6test.vbp create mode 100644 awealloc/awealloc.inf create mode 100644 awealloc/awealloc.props create mode 100644 cli/cli.inf create mode 100644 cpl/Dialogs.rc create mode 100644 cpl/Icons/CD.bmp create mode 100644 cpl/cpl.inf create mode 100644 cplcore/Icons/CD.bmp create mode 100644 cplcore/Icons/CD.ico create mode 100644 cplcore/Icons/Disk.ico create mode 100644 cplcore/Icons/Floppy.ico create mode 100644 cplcore/Icons/VD.ico create mode 100644 cplcore/Icons/VDInfo.ico create mode 100644 cplcore/cplcore.inf delete mode 100644 cplcore/imdisk.vcxproj create mode 100644 cplcore/mbr.c create mode 100644 devio/Makefile.win64d create mode 100644 devio/Makefile.winarm create mode 100644 devio/Makefile.winarm64 create mode 100644 devio/devio.inf create mode 100644 devio/devioimp.props create mode 100644 devio/win32_fileio.def create mode 100644 devio/win32_fileio.exp create mode 100644 devio/win32_fileio.lib create mode 100644 deviodrv/MAKEFILE create mode 100644 deviodrv/deviodrv.cpp create mode 100644 deviodrv/deviodrv.h create mode 100644 deviodrv/deviodrv.inf create mode 100644 deviodrv/deviodrv.rc create mode 100644 deviodrv/deviodrv.vcxproj create mode 100644 deviodrv/dispatch.cpp create mode 100644 deviodrv/filetable.cpp create mode 100644 deviodrv/irpfwd.cpp create mode 100644 deviodrv/sources create mode 100644 svc/svc.inf create mode 100644 sys/sys.inf diff --git a/.gitignore b/.gitignore index e8eaba2..34e29ee 100644 --- a/.gitignore +++ b/.gitignore @@ -355,7 +355,8 @@ devio_with_options/ cab/ ImDiskNet/Help/ private/ -*/obj* +*/objchk* +*/objfre* *.exe *.dll *.cpl @@ -387,6 +388,9 @@ devio/devio.static.Linux_x86_64 *.diff *.cat *.old +*.old2 +*.old3 +*.old4 *.err *.zip *.cab @@ -400,4 +404,9 @@ changes.txt *.gz *.xz *.cer -devio/iobridge/Release64/Bridge.asm +*/*/Release* +*.py +*.snk +*.filters +dirs.sln +ImDiskNet/DevioNet/Server/Services/DevioDrvService.vb diff --git a/ImDisk.sln b/ImDisk.sln index d6f8474..b405ee9 100644 --- a/ImDisk.sln +++ b/ImDisk.sln @@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution files", "Solution EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cplcore", "cplcore\cplcore.vcxproj", "{4052F81F-5D49-4457-8F78-4DCE5DAD91E1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deviodrv", "deviodrv\deviodrv.vcxproj", "{457B6C05-3FED-4056-A4B3-B1B110242F14}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -580,6 +582,102 @@ Global {4052F81F-5D49-4457-8F78-4DCE5DAD91E1}.Win8.1 Release|Win32.Build.0 = Release|Win32 {4052F81F-5D49-4457-8F78-4DCE5DAD91E1}.Win8.1 Release|x64.ActiveCfg = Release|x64 {4052F81F-5D49-4457-8F78-4DCE5DAD91E1}.Win8.1 Release|x64.Build.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|ARM.ActiveCfg = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|ARM.Build.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|ARM.Deploy.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|ARM64.Build.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|Win32.ActiveCfg = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|Win32.Build.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|Win32.Deploy.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|x64.ActiveCfg = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|x64.Build.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Debug|x64.Deploy.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|ARM.ActiveCfg = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|ARM.Build.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|ARM.Deploy.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|ARM64.ActiveCfg = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|ARM64.Build.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|ARM64.Deploy.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|Win32.ActiveCfg = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|Win32.Build.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|Win32.Deploy.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|x64.ActiveCfg = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|x64.Build.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Release|x64.Deploy.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|ARM.ActiveCfg = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|ARM.Build.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|ARM.Deploy.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|ARM64.ActiveCfg = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|ARM64.Build.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|ARM64.Deploy.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|Win32.ActiveCfg = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|Win32.Build.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|Win32.Deploy.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|x64.ActiveCfg = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|x64.Build.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Debug|x64.Deploy.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|ARM.ActiveCfg = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|ARM.Build.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|ARM.Deploy.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|ARM64.ActiveCfg = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|ARM64.Build.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|ARM64.Deploy.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|Win32.ActiveCfg = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|Win32.Build.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|Win32.Deploy.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|x64.ActiveCfg = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|x64.Build.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win7 Release|x64.Deploy.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|ARM.ActiveCfg = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|ARM.Build.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|ARM.Deploy.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|ARM64.ActiveCfg = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|ARM64.Build.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|ARM64.Deploy.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|Win32.ActiveCfg = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|Win32.Build.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|Win32.Deploy.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|x64.ActiveCfg = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|x64.Build.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Debug|x64.Deploy.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|ARM.ActiveCfg = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|ARM.Build.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|ARM.Deploy.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|ARM64.ActiveCfg = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|ARM64.Build.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|ARM64.Deploy.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|Win32.ActiveCfg = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|Win32.Build.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|Win32.Deploy.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|x64.ActiveCfg = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|x64.Build.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8 Release|x64.Deploy.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|ARM.ActiveCfg = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|ARM.Build.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|ARM.Deploy.0 = Debug|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|ARM64.ActiveCfg = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|ARM64.Build.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|ARM64.Deploy.0 = Debug|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|Win32.ActiveCfg = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|Win32.Build.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|Win32.Deploy.0 = Debug|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|x64.ActiveCfg = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|x64.Build.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Debug|x64.Deploy.0 = Debug|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|ARM.ActiveCfg = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|ARM.Build.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|ARM.Deploy.0 = Release|ARM + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|ARM64.ActiveCfg = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|ARM64.Build.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|ARM64.Deploy.0 = Release|ARM64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|Win32.ActiveCfg = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|Win32.Build.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|Win32.Deploy.0 = Release|Win32 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|x64.ActiveCfg = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|x64.Build.0 = Release|x64 + {457B6C05-3FED-4056-A4B3-B1B110242F14}.Win8.1 Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ImDiskNet/DevioNet/Client/DevioProviderStream.vb b/ImDiskNet/DevioNet/Client/DevioProviderStream.vb index 6b5f9bd..ca5199a 100644 --- a/ImDiskNet/DevioNet/Client/DevioProviderStream.vb +++ b/ImDiskNet/DevioNet/Client/DevioProviderStream.vb @@ -1,4 +1,6 @@ -Imports LTR.IO.ImDisk.Devio.Server.Providers +Imports System.ComponentModel +Imports System.IO +Imports LTR.IO.ImDisk.Devio.Server.Providers Namespace Client @@ -8,8 +10,9 @@ Namespace Client Public Class DevioProviderStream Inherits Stream - Private _Provider As IDevioProvider - Private _OwnsProvider As Boolean + Public ReadOnly Property Provider As IDevioProvider + + Public ReadOnly Property OwnsProvider As Boolean Public Sub New(Provider As IDevioProvider, ownsProvider As Boolean) _Provider = Provider diff --git a/ImDiskNet/DevioNet/Client/DevioShmStream.vb b/ImDiskNet/DevioNet/Client/DevioShmStream.vb index ff61f97..2977d84 100644 --- a/ImDiskNet/DevioNet/Client/DevioShmStream.vb +++ b/ImDiskNet/DevioNet/Client/DevioShmStream.vb @@ -1,4 +1,8 @@ -Imports LTR.IO.ImDisk.Devio.IMDPROXY_CONSTANTS +Imports System.IO +Imports System.IO.MemoryMappedFiles +Imports System.Runtime.InteropServices +Imports System.Threading +Imports LTR.IO.ImDisk.Devio.IMDPROXY_CONSTANTS Namespace Client @@ -22,11 +26,11 @@ Namespace Client ''' communication with a Devio service using this shared memory object. ''' ''' Name of shared memory object to use for communication. - ''' Specifies if communication should be read-only. + ''' Specifies if communication should be read-only. ''' Returns new instance of DevioShmStream. - Public Shared Function Open(name As String, read_only As Boolean) As DevioShmStream + Public Shared Function Open(name As String, [readOnly] As Boolean) As DevioShmStream - Return New DevioShmStream(name, read_only) + Return New DevioShmStream(name, [readOnly]) End Function @@ -35,9 +39,9 @@ Namespace Client ''' communication with a Devio service using this shared memory object. ''' ''' Name of shared memory object to use for communication. - ''' Specifies if communication should be read-only. - Public Sub New(name As String, read_only As Boolean) - MyBase.New(name, read_only) + ''' Specifies if communication should be read-only. + Public Sub New(name As String, [readOnly] As Boolean) + MyBase.New(name, [readOnly]) Try Using Mapping = MemoryMappedFile.OpenExisting(ObjectName, @@ -47,11 +51,11 @@ Namespace Client End Using - RequestEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:="Global\" & ObjectName & "_Request") + RequestEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:=$"Global\{ObjectName}_Request") - ResponseEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:="Global\" & ObjectName & "_Response") + ResponseEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:=$"Global\{ObjectName}_Response") - ServerMutex = New Mutex(initiallyOwned:=False, name:="Global\" & ObjectName & "_Server") + ServerMutex = New Mutex(initiallyOwned:=False, name:=$"Global\{ObjectName}_Server") MapView.Write(&H0, IMDPROXY_REQ.IMDPROXY_REQ_INFO) @@ -89,9 +93,7 @@ Namespace Client For Each obj In New IDisposable() {ServerMutex, MapView, RequestEvent, ResponseEvent} Try - If obj IsNot Nothing Then - obj.Dispose() - End If + obj?.Dispose() Catch @@ -116,11 +118,11 @@ Namespace Client Dim Response = MapView.Read(Of IMDPROXY_READ_RESP)(&H0) If Response.errorno <> 0 Then - Throw New EndOfStreamException("Read error: " & Response.errorno) + Throw New EndOfStreamException($"Read error: {Response.errorno}") End If Dim Length = CInt(Response.length) - MapView.ReadArray(CULng(IMDPROXY_HEADER_SIZE), buffer, offset, Length) + MapView.ReadArray(IMDPROXY_HEADER_SIZE, buffer, offset, Length) Position += Length Return Length @@ -135,7 +137,7 @@ Namespace Client MapView.Write(&H0, Request) - MapView.WriteArray(CULng(IMDPROXY_HEADER_SIZE), buffer, offset, count) + MapView.WriteArray(IMDPROXY_HEADER_SIZE, buffer, offset, count) RequestEvent.Set() If WaitHandle.WaitAny({ResponseEvent, ServerMutex}) <> 0 Then @@ -144,13 +146,13 @@ Namespace Client Dim Response = MapView.Read(Of IMDPROXY_WRITE_RESP)(&H0) If Response.errorno <> 0 Then - Throw New EndOfStreamException("Write error: " & Response.errorno) + Throw New EndOfStreamException($"Write error: {Response.errorno}") End If Dim Length = CInt(Response.length) Position += Length If Length <> count Then - Throw New EndOfStreamException("Write length mismatch. Wrote " & Length & " of " & count & " bytes.") + Throw New EndOfStreamException($"Write length mismatch. Wrote {Length} of {count} bytes.") End If End Sub diff --git a/ImDiskNet/DevioNet/Client/DevioStream.vb b/ImDiskNet/DevioNet/Client/DevioStream.vb index e3b5bbb..8a7bf9d 100644 --- a/ImDiskNet/DevioNet/Client/DevioStream.vb +++ b/ImDiskNet/DevioNet/Client/DevioStream.vb @@ -1,158 +1,164 @@ -Namespace Client - - ''' - ''' Base class for classes that implement Stream for client side of ImDisk/Devio protocol. - ''' - Public MustInherit Class DevioStream - Inherits Stream - - ''' - ''' Object name used by proxy implementation. - ''' - Public ReadOnly ObjectName As String - - ''' - ''' Virtual disk size of server object. - ''' - Protected Size As Long - - ''' - ''' Alignment requirement for I/O at server. - ''' - Protected Alignment As Long - - ''' - ''' ImDisk proxy flags specified for proxy connection. - ''' - Protected Flags As IMDPROXY_FLAGS - - ''' - ''' Initiates a new instance with supplied object name and read-only flag. - ''' - ''' Object name used by proxy implementation. - ''' Flag set to true to indicate read-only proxy - ''' operation. - Protected Sub New(name As String, read_only As Boolean) - ObjectName = name - If read_only Then - Flags = IMDPROXY_FLAGS.IMDPROXY_FLAG_RO - End If - End Sub - - ''' - ''' Indicates whether Stream is readable. This implementation returns a - ''' constant value of True, because ImDisk/Devio proxy implementations are - ''' always readable. - ''' - Public Overrides ReadOnly Property CanRead As Boolean - Get - Return True - End Get - End Property - - ''' - ''' Indicates whether Stream is seekable. This implementation returns a - ''' constant value of True. - ''' - Public Overrides ReadOnly Property CanSeek As Boolean - Get - Return True - End Get - End Property - - ''' - ''' Indicates whether Stream is writable. This implementation returns True - ''' unless ProxyFlags property contains IMDPROXY_FLAGS.IMDPROXY_FLAG_RO value. - ''' - Public Overrides ReadOnly Property CanWrite As Boolean - Get - Return (Flags And IMDPROXY_FLAGS.IMDPROXY_FLAG_RO) = 0 - End Get - End Property - - ''' - ''' This implementation does not do anything. - ''' - Public Overrides Sub Flush() - - End Sub - - ''' - ''' When overriden in a derived class, closes communication and causes server side to exit. - ''' - Public Overrides Sub Close() - MyBase.Close() - End Sub - - ''' - ''' Returns current virtual disk size. - ''' - Public Overrides ReadOnly Property Length As Long - Get - Return Size - End Get - End Property - - ''' - ''' Current byte position in Stream. - ''' - Public Overrides Property Position As Long - - ''' - ''' Moves current position in Stream. - ''' - ''' Byte offset to move. Can be negative to move backwards. - ''' Origin from where number of bytes to move counts. - ''' Returns new absolute position in Stream. - Public Overrides Function Seek(offset As Long, origin As SeekOrigin) As Long - - Select Case origin - - Case SeekOrigin.Begin - Position = offset - - Case SeekOrigin.Current - Position += offset - - Case SeekOrigin.End - Position = Size + offset - - Case Else - Throw New ArgumentException("Invalid origin", "origin") - - End Select - - Return Position - - End Function - - ''' - ''' This method is not supported in this implementation and throws a NotImplementedException. - ''' A derived class can override this method to implement a resize feature. - ''' - ''' New total size of Stream - Public Overrides Sub SetLength(value As Long) - Throw New NotImplementedException("SetLength() not implemented for DevioStream objects.") - End Sub - - ''' - ''' Alignment requirement for I/O at server. - ''' - Public ReadOnly Property RequiredAlignment As Long - Get - Return Alignment - End Get - End Property - - ''' - ''' ImDisk proxy flags specified for proxy connection. - ''' - Public ReadOnly Property ProxyFlags As IMDPROXY_FLAGS - Get - Return Flags - End Get - End Property - - End Class +Imports System.IO + +Namespace Client + + ''' + ''' Base class for classes that implement Stream for client side of ImDisk/Devio protocol. + ''' + Public MustInherit Class DevioStream + Inherits Stream + + ''' + ''' Object name used by proxy implementation. + ''' + Public ReadOnly Property ObjectName As String + + ''' + ''' Virtual disk size of server object. + ''' + Protected Property Size As Long + + ''' + ''' Alignment requirement for I/O at server. + ''' + Protected Property Alignment As Long + + ''' + ''' ImDisk proxy flags specified for proxy connection. + ''' + Protected Property Flags As IMDPROXY_FLAGS + + ''' + ''' Initiates a new instance with supplied object name and read-only flag. + ''' + ''' Object name used by proxy implementation. + ''' Flag set to true to indicate read-only proxy + ''' operation. + Protected Sub New(name As String, [readOnly] As Boolean) + If name Is Nothing Then + Throw New ArgumentNullException(NameOf(name)) + End If + + ObjectName = name + If [readOnly] Then + Flags = IMDPROXY_FLAGS.IMDPROXY_FLAG_RO + End If + End Sub + + ''' + ''' Indicates whether Stream is readable. This implementation returns a + ''' constant value of True, because ImDisk/Devio proxy implementations are + ''' always readable. + ''' + Public Overrides ReadOnly Property CanRead As Boolean + Get + Return True + End Get + End Property + + ''' + ''' Indicates whether Stream is seekable. This implementation returns a + ''' constant value of True. + ''' + Public Overrides ReadOnly Property CanSeek As Boolean + Get + Return True + End Get + End Property + + ''' + ''' Indicates whether Stream is writable. This implementation returns True + ''' unless ProxyFlags property contains IMDPROXY_FLAGS.IMDPROXY_FLAG_RO value. + ''' + Public Overrides ReadOnly Property CanWrite As Boolean + Get + Return (Flags And IMDPROXY_FLAGS.IMDPROXY_FLAG_RO) = 0 + End Get + End Property + + ''' + ''' This implementation does not do anything. + ''' + Public Overrides Sub Flush() + + End Sub + + ''' + ''' When overriden in a derived class, closes communication and causes server side to exit. + ''' + Public Overrides Sub Close() + MyBase.Close() + End Sub + + ''' + ''' Returns current virtual disk size. + ''' + Public Overrides ReadOnly Property Length As Long + Get + Return Size + End Get + End Property + + ''' + ''' Current byte position in Stream. + ''' + Public Overrides Property Position As Long + + ''' + ''' Moves current position in Stream. + ''' + ''' Byte offset to move. Can be negative to move backwards. + ''' Origin from where number of bytes to move counts. + ''' Returns new absolute position in Stream. + Public Overrides Function Seek(offset As Long, origin As SeekOrigin) As Long + + Select Case origin + + Case SeekOrigin.Begin + Position = offset + + Case SeekOrigin.Current + Position += offset + + Case SeekOrigin.End + Position = Size + offset + + Case Else + Throw New ArgumentException("Invalid origin", NameOf(origin)) + + End Select + + Return Position + + End Function + + ''' + ''' This method is not supported in this implementation and throws a NotImplementedException. + ''' A derived class can override this method to implement a resize feature. + ''' + ''' New total size of Stream + Public Overrides Sub SetLength(value As Long) + Throw New NotImplementedException("SetLength() not implemented for DevioStream objects.") + End Sub + + ''' + ''' Alignment requirement for I/O at server. + ''' + Public ReadOnly Property RequiredAlignment As Long + Get + Return Alignment + End Get + End Property + + ''' + ''' ImDisk proxy flags specified for proxy connection. + ''' + Public ReadOnly Property ProxyFlags As IMDPROXY_FLAGS + Get + Return Flags + End Get + End Property + + End Class End Namespace diff --git a/ImDiskNet/DevioNet/Client/DevioTcpStream.vb b/ImDiskNet/DevioNet/Client/DevioTcpStream.vb index 7492bef..678f063 100644 --- a/ImDiskNet/DevioNet/Client/DevioTcpStream.vb +++ b/ImDiskNet/DevioNet/Client/DevioTcpStream.vb @@ -1,149 +1,153 @@ -Namespace Client +Imports System.IO +Imports System.Net.Sockets +Imports System.Text - ''' - ''' Derives DevioStream and implements client side of Devio tcp/ip based communication - ''' proxy. - ''' - Public Class DevioTcpStream - Inherits DevioStream - - Protected ReadOnly Connection As NetworkStream - - Protected ReadOnly Reader As BinaryReader - - Protected ReadOnly Writer As New BinaryWriter(New MemoryStream, Encoding.Unicode) - - ''' - ''' Creates a new instance by opening an tcp/ip connection to specified host and port - ''' and starts communication with a Devio service using this connection. - ''' - ''' Host name and port where service is listening for incoming - ''' connection. This can be on the form hostname:port or just hostname where default - ''' port number 9000 will be used. The hostname part can be either an IP address or a - ''' host name. - ''' Specifies if communication should be read-only. - ''' Returns new instance of DevioTcpStream. - Public Shared Function Open(name As String, read_only As Boolean) As DevioTcpStream - - Return New DevioTcpStream(name, read_only) - - End Function +Namespace Client ''' - ''' Creates a new instance by opening an tcp/ip connection to specified host and port - ''' and starts communication with a Devio service using this connection. + ''' Derives DevioStream and implements client side of Devio tcp/ip based communication + ''' proxy. ''' - ''' Host name and port where service is listening for incoming - ''' connection. This can be on the form hostname:port or just hostname where default - ''' port number 9000 will be used. The hostname part can be either an IP address or a - ''' host name. - ''' Specifies if communication should be read-only. - Public Sub New(name As String, read_only As Boolean) - MyBase.New(name, read_only) - - Try - Dim spl = ObjectName.Split({":"}, StringSplitOptions.RemoveEmptyEntries) - Dim server = spl(0) - Dim port = 9000 - If spl.Length >= 2 Then - port = Integer.Parse(spl(1)) - End If - - Dim Socket As New Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) - Socket.Connect(server, port) - Connection = New NetworkStream(Socket, ownsSocket:=True) - - Reader = New BinaryReader(Connection, Encoding.Unicode) - - Writer.Write(IMDPROXY_REQ.IMDPROXY_REQ_INFO) - Writer.Flush() - With DirectCast(Writer.BaseStream, MemoryStream) - .WriteTo(Connection) - .SetLength(0) - .Position = 0 - End With - Connection.Flush() - - Size = Reader.ReadInt64() - Alignment = Reader.ReadInt64() - Flags = Flags Or CType(Reader.ReadInt64(), IMDPROXY_FLAGS) - - Catch - Dispose() - Throw - - End Try - - End Sub - - Public Overrides Sub Close() - MyBase.Close() - - For Each obj In New IDisposable() {Writer, Reader, Connection} - Try - If obj IsNot Nothing Then - obj.Dispose() - End If - - Catch - - End Try - Next - End Sub - - Public Overrides Function Read(buffer As Byte(), offset As Integer, count As Integer) As Integer - - Writer.Write(IMDPROXY_REQ.IMDPROXY_REQ_READ) - Writer.Write(Position) - Writer.Write(CLng(count)) - Writer.Flush() - With DirectCast(Writer.BaseStream, MemoryStream) - .WriteTo(Connection) - .SetLength(0) - .Position = 0 - End With - Connection.Flush() - - Dim ErrorCode = Reader.ReadUInt64() - If ErrorCode <> 0 Then - Throw New EndOfStreamException("Read error: " & ErrorCode) - End If - Dim Length = CInt(Reader.ReadInt64()) - - Length = Reader.Read(buffer, offset, Length) - Position += Length - - Return Length - - End Function - - Public Overrides Sub Write(buffer As Byte(), offset As Integer, count As Integer) - - Writer.Write(IMDPROXY_REQ.IMDPROXY_REQ_WRITE) - Writer.Write(Position) - Writer.Write(CLng(count)) - Writer.Write(buffer, offset, count) - Writer.Flush() - With DirectCast(Writer.BaseStream, MemoryStream) - .WriteTo(Connection) - .SetLength(0) - .Position = 0 - End With - Connection.Flush() - - Dim ErrorCode = Reader.ReadUInt64() - If ErrorCode <> 0 Then - Throw New EndOfStreamException("Write error: " & ErrorCode) - End If - Dim Length = Reader.ReadInt64() - Position += Length - - If Length <> count Then - Throw New EndOfStreamException("Write length mismatch. Wrote " & Length & " of " & count & " bytes.") - End If - - End Sub - - End Class + Public Class DevioTcpStream + Inherits DevioStream + + Protected ReadOnly Property Connection As NetworkStream + + Protected ReadOnly Property Reader As BinaryReader + + Protected ReadOnly Property Writer As New BinaryWriter(New MemoryStream, Encoding.Unicode) + + ''' + ''' Creates a new instance by opening an tcp/ip connection to specified host and port + ''' and starts communication with a Devio service using this connection. + ''' + ''' Host name and port where service is listening for incoming + ''' connection. This can be on the form hostname:port or just hostname where default + ''' port number 9000 will be used. The hostname part can be either an IP address or a + ''' host name. + ''' Specifies if communication should be read-only. + ''' Returns new instance of DevioTcpStream. + Public Shared Function Open(name As String, [readOnly] As Boolean) As DevioTcpStream + + Return New DevioTcpStream(name, [readOnly]) + + End Function + + ''' + ''' Creates a new instance by opening an tcp/ip connection to specified host and port + ''' and starts communication with a Devio service using this connection. + ''' + ''' Host name and port where service is listening for incoming + ''' connection. This can be on the form hostname:port or just hostname where default + ''' port number 9000 will be used. The hostname part can be either an IP address or a + ''' host name. + ''' Specifies if communication should be read-only. + Public Sub New(name As String, [readOnly] As Boolean) + MyBase.New(name, [readOnly]) + + Try + Dim spl = ObjectName.Split({":"}, StringSplitOptions.RemoveEmptyEntries) + Dim server = spl(0) + Dim port = 9000 + If spl.Length >= 2 Then + port = Integer.Parse(spl(1), Globalization.NumberFormatInfo.InvariantInfo) + End If + + Dim Socket As New Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) + Socket.Connect(server, port) + Connection = New NetworkStream(Socket, ownsSocket:=True) + + Reader = New BinaryReader(Connection, Encoding.Unicode) + + Writer.Write(IMDPROXY_REQ.IMDPROXY_REQ_INFO) + Writer.Flush() + With DirectCast(Writer.BaseStream, MemoryStream) + .WriteTo(Connection) + .SetLength(0) + .Position = 0 + End With + Connection.Flush() + + Size = Reader.ReadInt64() + Alignment = Reader.ReadInt64() + Flags = Flags Or CType(Reader.ReadInt64(), IMDPROXY_FLAGS) + + Catch + Dispose() + Throw + + End Try + + End Sub + + Public Overrides Sub Close() + MyBase.Close() + + For Each obj In New IDisposable() {Writer, Reader, Connection} + Try + If obj IsNot Nothing Then + obj.Dispose() + End If + + Catch + + End Try + Next + End Sub + + Public Overrides Function Read(buffer As Byte(), offset As Integer, count As Integer) As Integer + + Writer.Write(IMDPROXY_REQ.IMDPROXY_REQ_READ) + Writer.Write(Position) + Writer.Write(CLng(count)) + Writer.Flush() + With DirectCast(Writer.BaseStream, MemoryStream) + .WriteTo(Connection) + .SetLength(0) + .Position = 0 + End With + Connection.Flush() + + Dim ErrorCode = Reader.ReadUInt64() + If ErrorCode <> 0 Then + Throw New EndOfStreamException("Read error: " & ErrorCode) + End If + Dim Length = CInt(Reader.ReadInt64()) + + Length = Reader.Read(buffer, offset, Length) + Position += Length + + Return Length + + End Function + + Public Overrides Sub Write(buffer As Byte(), offset As Integer, count As Integer) + + Writer.Write(IMDPROXY_REQ.IMDPROXY_REQ_WRITE) + Writer.Write(Position) + Writer.Write(CLng(count)) + Writer.Write(buffer, offset, count) + Writer.Flush() + With DirectCast(Writer.BaseStream, MemoryStream) + .WriteTo(Connection) + .SetLength(0) + .Position = 0 + End With + Connection.Flush() + + Dim ErrorCode = Reader.ReadUInt64() + If ErrorCode <> 0 Then + Throw New EndOfStreamException("Write error: " & ErrorCode) + End If + Dim Length = Reader.ReadInt64() + Position += Length + + If Length <> count Then + Throw New EndOfStreamException("Write length mismatch. Wrote " & Length & " of " & count & " bytes.") + End If + + End Sub + + End Class End Namespace diff --git a/ImDiskNet/DevioNet/DevioNet.vbproj b/ImDiskNet/DevioNet/DevioNet.vbproj index c4d2ee8..c2b467b 100644 --- a/ImDiskNet/DevioNet/DevioNet.vbproj +++ b/ImDiskNet/DevioNet/DevioNet.vbproj @@ -1,167 +1,26 @@  - + + + - Debug - x86 - - - - - {C8131F7E-E240-4A1B-8D3D-FC4E5DBED050} - Library - - + LTR.IO.ImDisk.Devio - DevioNet - 512 - Windows - v4.0 - - - - - x86 - true - full - true - true - bin\Debug\ - DevioNet.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - x86 - pdbonly - false - true - true - bin\Release\ - DevioNet.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - On - - - On - - - true - true - true - ..\Debug\ - DevioNet.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - AnyCPU - true - true - - - true - ..\Release\ - DevioNet.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - AnyCPU - - - true - - + DevioNet + ImDisk Devio for DiscUtils Library + DevioNet.snk + false + + net40;netstandard2.0 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - + + - - {3efcb6f8-ef7e-4f60-a0de-bb197240fcc9} - ImDiskNet - + - - - \ No newline at end of file + + diff --git a/ImDiskNet/DevioNet/Enums.vb b/ImDiskNet/DevioNet/Enums.vb index 17d0973..e21ef16 100644 --- a/ImDiskNet/DevioNet/Enums.vb +++ b/ImDiskNet/DevioNet/Enums.vb @@ -1,4 +1,9 @@ -Public Enum IMDPROXY_REQ As ULong +#Disable Warning CA1707 ' Identifiers should not contain underscores +#Disable Warning IDE1006 ' Naming Styles + +Imports System.Runtime.InteropServices + +Public Enum IMDPROXY_REQ As ULong ''' ''' No operation. @@ -45,6 +50,7 @@ IMDPROXY_REQ_ZERO End Enum + Public Enum IMDPROXY_FLAGS As ULong IMDPROXY_FLAG_NONE = 0UL IMDPROXY_FLAG_RO = 1UL @@ -72,15 +78,15 @@ End Class Public Structure IMDPROXY_CONNECT_REQ - Public request_code As IMDPROXY_REQ - Public flags As ULong - Public length As ULong + Public Property request_code As IMDPROXY_REQ + Public Property flags As ULong + Public Property length As ULong End Structure Public Structure IMDPROXY_CONNECT_RESP - Public error_code As ULong - Public object_ptr As ULong + Public Property error_code As ULong + Public Property object_ptr As ULong End Structure ''' @@ -94,42 +100,42 @@ Public Structure IMDPROXY_INFO_RESP ''' ''' Total size in bytes of virtual image ''' - Public file_size As ULong + Public Property file_size As ULong ''' ''' Required alignment in bytes for I/O requests sent to this proxy service ''' - Public req_alignment As ULong + Public Property req_alignment As ULong ''' ''' Flags from IMDPROXY_FLAGS enumeration ''' - Public flags As IMDPROXY_FLAGS + Public Property flags As IMDPROXY_FLAGS End Structure Public Structure IMDPROXY_READ_REQ - Public request_code As IMDPROXY_REQ - Public offset As ULong - Public length As ULong + Public Property request_code As IMDPROXY_REQ + Public Property offset As ULong + Public Property length As ULong End Structure Public Structure IMDPROXY_READ_RESP - Public errorno As ULong - Public length As ULong + Public Property errorno As ULong + Public Property length As ULong End Structure Public Structure IMDPROXY_WRITE_REQ - Public request_code As IMDPROXY_REQ - Public offset As ULong - Public length As ULong + Public Property request_code As IMDPROXY_REQ + Public Property offset As ULong + Public Property length As ULong End Structure Public Structure IMDPROXY_WRITE_RESP - Public errorno As ULong - Public length As ULong + Public Property errorno As ULong + Public Property length As ULong End Structure diff --git a/ImDiskNet/DevioNet/GlobalSuppressions.vb b/ImDiskNet/DevioNet/GlobalSuppressions.vb new file mode 100644 index 0000000..fafdca9 --- /dev/null +++ b/ImDiskNet/DevioNet/GlobalSuppressions.vb @@ -0,0 +1,9 @@ +' This file is used by Code Analysis to maintain SuppressMessage +' attributes that are applied to this project. +' Project-level suppressions either have no target or are given +' a specific target and scoped to a namespace, type, member, etc. + +Imports System.Diagnostics.CodeAnalysis + + + diff --git a/ImDiskNet/DevioNet/My Project/AssemblyInfo.vb b/ImDiskNet/DevioNet/My Project/AssemblyInfo.vb index 2cf7e41..14cdedd 100644 --- a/ImDiskNet/DevioNet/My Project/AssemblyInfo.vb +++ b/ImDiskNet/DevioNet/My Project/AssemblyInfo.vb @@ -8,28 +8,7 @@ Imports System.Runtime.InteropServices ' Review the values of the assembly attributes - - - - - - - 'The following GUID is for the ID of the typelib if this project is exposed to COM - - -' Version information for an assembly consists of the following four values: -' -' Major Version -' Minor Version -' Build Number -' Revision -' -' You can specify all the values or you can default the Build and Revision Numbers -' by using the '*' as shown below: -' - - - + diff --git a/ImDiskNet/DevioNet/My Project/Settings.Designer.vb b/ImDiskNet/DevioNet/My Project/Settings.Designer.vb deleted file mode 100644 index 46e203d..0000000 --- a/ImDiskNet/DevioNet/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.239 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - - Friend Module MySettingsProperty - - - Friend ReadOnly Property Settings() As Global.LTR.IO.ImDisk.Devio.My.MySettings - Get - Return Global.LTR.IO.ImDisk.Devio.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/ImDiskNet/DevioNet/Server/Providers/DevioProviderFromStream.vb b/ImDiskNet/DevioNet/Server/Providers/DevioProviderFromStream.vb index 0a44d01..706c68b 100644 --- a/ImDiskNet/DevioNet/Server/Providers/DevioProviderFromStream.vb +++ b/ImDiskNet/DevioNet/Server/Providers/DevioProviderFromStream.vb @@ -1,4 +1,6 @@ -Namespace Server.Providers +Imports System.IO + +Namespace Server.Providers ''' ''' Class that implements IDevioProvider interface with a System.IO.Stream @@ -23,7 +25,7 @@ ''' to an object of a class derived from System.IO.Stream. ''' ''' Object of a class derived from System.IO.Stream. - ''' Indicates whether Stream object will be automacially closed when this + ''' Indicates whether Stream object will be automatically closed when this ''' instance is disposed. Public Sub New(Stream As Stream, ownsStream As Boolean) _BaseStream = Stream diff --git a/ImDiskNet/DevioNet/Server/Providers/DevioProviderManagedBase.vb b/ImDiskNet/DevioNet/Server/Providers/DevioProviderManagedBase.vb index 46721ed..42227f8 100644 --- a/ImDiskNet/DevioNet/Server/Providers/DevioProviderManagedBase.vb +++ b/ImDiskNet/DevioNet/Server/Providers/DevioProviderManagedBase.vb @@ -1,4 +1,6 @@ -Namespace Server.Providers +Imports System.Runtime.InteropServices + +Namespace Server.Providers ''' ''' Base class for implementing IDevioProvider interface with a storage backend where diff --git a/ImDiskNet/DevioNet/Server/Providers/DevioProviderUnmanagedBase.vb b/ImDiskNet/DevioNet/Server/Providers/DevioProviderUnmanagedBase.vb index 3fa7b62..cbae279 100644 --- a/ImDiskNet/DevioNet/Server/Providers/DevioProviderUnmanagedBase.vb +++ b/ImDiskNet/DevioNet/Server/Providers/DevioProviderUnmanagedBase.vb @@ -1,4 +1,6 @@ -Namespace Server.Providers +Imports System.Runtime.InteropServices + +Namespace Server.Providers ''' ''' Base class for implementing IDevioProvider interface with a storage backend where @@ -33,7 +35,7 @@ Private Function Read(buffer As Byte(), bufferoffset As Integer, count As Integer, fileoffset As Long) As Integer Implements IDevioProvider.Read If buffer Is Nothing Then - Throw New ArgumentNullException("buffer") + Throw New ArgumentNullException(NameOf(buffer)) ElseIf bufferoffset + count > buffer.Length Then Throw New ArgumentException("buffer too small") End If @@ -62,7 +64,7 @@ Private Function Write(buffer As Byte(), bufferoffset As Integer, count As Integer, fileoffset As Long) As Integer Implements IDevioProvider.Write If buffer Is Nothing Then - Throw New ArgumentNullException("buffer") + Throw New ArgumentNullException(NameOf(buffer)) ElseIf bufferoffset + count > buffer.Length Then Throw New ArgumentException("buffer too small") End If diff --git a/ImDiskNet/DevioNet/Server/Services/DevioNoneService.vb b/ImDiskNet/DevioNet/Server/Services/DevioNoneService.vb index c27414f..aebdd2d 100644 --- a/ImDiskNet/DevioNet/Server/Services/DevioNoneService.vb +++ b/ImDiskNet/DevioNet/Server/Services/DevioNoneService.vb @@ -1,4 +1,6 @@ -Imports LTR.IO.ImDisk.Devio.Server.Providers +Imports System.Collections.ObjectModel +Imports System.IO +Imports LTR.IO.ImDisk.Devio.Server.Providers Namespace Server.Services @@ -13,7 +15,7 @@ Namespace Server.Services ''' ''' Name and path of image file mounted by ImDisk Virtual Disk Driver. ''' - Public ReadOnly Imagefile As String + Public ReadOnly Property Imagefile As String Private ReadOnly _Access As FileAccess @@ -29,7 +31,7 @@ Namespace Server.Services _Access = Access Offset = ImDiskAPI.GetOffsetByFileExt(Imagefile) - Me.Imagefile = Imagefile + Me._Imagefile = Imagefile End Sub @@ -38,13 +40,13 @@ Namespace Server.Services ''' structure objects. ''' ''' Collection of PARTITION_INFORMATION structures objects. - Public Overrides Function GetPartitionInformation() As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) - Return ImDiskAPI.GetPartitionInformation(Imagefile, SectorSize, Offset) + Public Overrides Function GetPartitionInformation() As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) + Return ImDiskAPI.GetPartitionInformation(_Imagefile, SectorSize, Offset) End Function Protected Overrides ReadOnly Property ImDiskProxyObjectName As String Get - Return Imagefile + Return _Imagefile End Get End Property diff --git a/ImDiskNet/DevioNet/Server/Services/DevioServiceBase.vb b/ImDiskNet/DevioNet/Server/Services/DevioServiceBase.vb index 3eec322..81ff0fd 100644 --- a/ImDiskNet/DevioNet/Server/Services/DevioServiceBase.vb +++ b/ImDiskNet/DevioNet/Server/Services/DevioServiceBase.vb @@ -1,4 +1,7 @@ -Imports LTR.IO.ImDisk.Devio.Server.Providers +Imports System.Collections.ObjectModel +Imports System.ComponentModel +Imports System.Threading +Imports LTR.IO.ImDisk.Devio.Server.Providers Namespace Server.Services @@ -28,7 +31,7 @@ Namespace Server.Services ''' Indicates whether DevioProvider will be automatically closed when this instance ''' is disposed. ''' - Public ReadOnly OwnsProvider As Boolean + Public ReadOnly Property OwnsProvider As Boolean ''' ''' Size of virtual disk device. @@ -127,6 +130,10 @@ Namespace Server.Services ''' instance is disposed. Protected Sub New(DevioProvider As IDevioProvider, OwnsProvider As Boolean) + If DevioProvider Is Nothing Then + Throw New ArgumentNullException(NameOf(DevioProvider)) + End If + Me.OwnsProvider = OwnsProvider _DevioProvider = DevioProvider @@ -141,7 +148,7 @@ Namespace Server.Services ''' Creates a device reader delegate used to directly read from device through this instance. ''' ''' A delegate that can be used to directly read from device through this instance. - Protected Overridable Function GetDeviceReader() As DLL.ImDiskReadFileUnmanagedProc + Protected Overridable Function GetDeviceReader() As UnsafeNativeMethods.ImDiskReadFileUnmanagedProc Return _ Function(handle As IntPtr, @@ -168,7 +175,7 @@ Namespace Server.Services ''' structure objects. ''' ''' Collection of PARTITION_INFORMATION structures objects. - Public Overridable Function GetPartitionInformation() As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Overridable Function GetPartitionInformation() As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) Return ImDiskAPI.GetPartitionInformation(Nothing, GetDeviceReader(), SectorSize, Offset) @@ -311,15 +318,15 @@ Namespace Server.Services Exit Do Catch ex As Win32Exception When ( - ex.NativeErrorCode = NativeFileIO.Win32API.ERROR_DEVICE_REMOVED OrElse - ex.NativeErrorCode = NativeFileIO.Win32API.ERROR_DEV_NOT_EXIST) + ex.NativeErrorCode = NativeFileIO.UnsafeNativeMethods.ERROR_DEVICE_REMOVED OrElse + ex.NativeErrorCode = NativeFileIO.UnsafeNativeMethods.ERROR_DEV_NOT_EXIST) _ImDiskDeviceNumber = UInteger.MaxValue Exit Do Catch ex As Win32Exception When ( i < 40 AndAlso - ex.NativeErrorCode = NativeFileIO.Win32API.ERROR_ACCESS_DENIED) + ex.NativeErrorCode = NativeFileIO.UnsafeNativeMethods.ERROR_ACCESS_DENIED) i += 1 Thread.Sleep(100) @@ -378,7 +385,7 @@ Namespace Server.Services Public Overridable ReadOnly Property ImDiskDeviceNumber As UInteger Get If _ImDiskDeviceNumber = UInteger.MaxValue Then - Throw New IOException("No ImDisk Virtual Disk Device currently associated with this instance.") + Throw New InvalidOperationException("No ImDisk Virtual Disk Device currently associated with this instance.") End If Return _ImDiskDeviceNumber End Get diff --git a/ImDiskNet/DevioNet/Server/Services/DevioShmService.vb b/ImDiskNet/DevioNet/Server/Services/DevioShmService.vb index c7d994d..3108e44 100644 --- a/ImDiskNet/DevioNet/Server/Services/DevioShmService.vb +++ b/ImDiskNet/DevioNet/Server/Services/DevioShmService.vb @@ -1,5 +1,10 @@ -Imports LTR.IO.ImDisk.Devio.IMDPROXY_CONSTANTS +Imports System.IO +Imports System.IO.MemoryMappedFiles +Imports System.Runtime.InteropServices +Imports System.Threading +Imports LTR.IO.ImDisk.Devio.IMDPROXY_CONSTANTS Imports LTR.IO.ImDisk.Devio.Server.Providers +Imports Microsoft.Win32.SafeHandles Namespace Server.Services @@ -35,11 +40,10 @@ Namespace Server.Services End Get End Property - Private Shared _random As New Random Private Shared Function GetNextRandomValue() As Integer - SyncLock _random - Return _random.Next() - End SyncLock + Dim value As Integer + NativeFileIO.UnsafeNativeMethods.RtlGenRandom(value, 4) + Return value End Function ''' @@ -91,7 +95,7 @@ Namespace Server.Services ''' instance is disposed. ''' Buffer size to use for shared memory I/O communication. Public Sub New(DevioProvider As IDevioProvider, OwnsProvider As Boolean, BufferSize As Long) - MyClass.New("devio-" & GetNextRandomValue(), DevioProvider, OwnsProvider, BufferSize) + MyClass.New($"devio-{GetNextRandomValue()}", DevioProvider, OwnsProvider, BufferSize) End Sub ''' @@ -115,15 +119,15 @@ Namespace Server.Services Dim ServerMutex As Mutex Try - Trace.WriteLine("Creating objects for shared memory communication '" & _ObjectName & "'.") + Trace.WriteLine($"Creating objects for shared memory communication '{_ObjectName}'.") - RequestEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:="Global\" & _ObjectName & "_Request") + RequestEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:=$"Global\{_ObjectName}_Request") DisposableObjects.Add(RequestEvent) - ResponseEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:="Global\" & _ObjectName & "_Response") + ResponseEvent = New EventWaitHandle(initialState:=False, mode:=EventResetMode.AutoReset, name:=$"Global\{_ObjectName}_Response") DisposableObjects.Add(ResponseEvent) - ServerMutex = New Mutex(initiallyOwned:=False, name:="Global\" & _ObjectName & "_Server") + ServerMutex = New Mutex(initiallyOwned:=False, name:=$"Global\{_ObjectName}_Server") DisposableObjects.Add(ServerMutex) If ServerMutex.WaitOne(0) = False Then @@ -132,12 +136,21 @@ Namespace Server.Services Return End If - Mapping = MemoryMappedFile.CreateNew("Global\" & _ObjectName, +#If NETFRAMEWORK AndAlso Not NET46_OR_GREATER Then + Mapping = MemoryMappedFile.CreateNew($"Global\{_ObjectName}", _BufferSize, MemoryMappedFileAccess.ReadWrite, MemoryMappedFileOptions.None, Nothing, HandleInheritability.None) +#Else + Mapping = MemoryMappedFile.CreateNew($"Global\{_ObjectName}", + _BufferSize, + MemoryMappedFileAccess.ReadWrite, + MemoryMappedFileOptions.None, + HandleInheritability.None) +#End If + DisposableObjects.Add(Mapping) Dim MapAccessor = Mapping.CreateViewAccessor() @@ -146,7 +159,7 @@ Namespace Server.Services MapView = MapAccessor.SafeMemoryMappedViewHandle DisposableObjects.Add(MapView) - Trace.WriteLine("Created shared memory object, " & MapView.ByteLength & " bytes.") + Trace.WriteLine($"Created shared memory object, {MapView.ByteLength} bytes.") Trace.WriteLine("Raising service ready event.") OnServiceReady() @@ -204,7 +217,7 @@ Namespace Server.Services Return Case Else - Trace.WriteLine("Unsupported request code: " & RequestCode.ToString()) + Trace.WriteLine($"Unsupported request code: {RequestCode}") Return End Select @@ -222,7 +235,7 @@ Namespace Server.Services Trace.WriteLine("Client disconnected.") Catch ex As Exception - Trace.WriteLine("Unhandled exception in service thread: " & ex.ToString()) + Trace.WriteLine($"Unhandled exception in service thread: {ex}") OnServiceUnhandledException(New UnhandledExceptionEventArgs(ex, True)) Finally @@ -262,15 +275,15 @@ Namespace Server.Services Try If ReadLength > MapView.ByteLength - IMDPROXY_HEADER_SIZE Then - Trace.WriteLine("Requested read length " & ReadLength & ", lowered to " & CInt(MapView.ByteLength - CInt(IMDPROXY_HEADER_SIZE)) & " bytes.") - ReadLength = CInt(MapView.ByteLength - CInt(IMDPROXY_HEADER_SIZE)) + Trace.WriteLine($"Requested read length {ReadLength}, lowered to {MapView.ByteLength - IMDPROXY_HEADER_SIZE} bytes.") + ReadLength = CInt(MapView.ByteLength - IMDPROXY_HEADER_SIZE) End If Response.length = CULng(DevioProvider.Read(MapView.DangerousGetHandle(), IMDPROXY_HEADER_SIZE, ReadLength, Offset)) Response.errorno = 0 Catch ex As Exception Trace.WriteLine(ex.ToString()) - Trace.WriteLine("Read request at " & Offset.ToString("X").PadLeft(8, "0"c) & " for " & ReadLength & " bytes.") + Trace.WriteLine($"Read request at 0x{Offset:X8} for {ReadLength} bytes.") Response.errorno = 1 Response.length = 0 @@ -297,7 +310,7 @@ Namespace Server.Services Try If Length > MapView.ByteLength - IMDPROXY_HEADER_SIZE Then - Throw New Exception("Requested write length " & Length & ". Buffer size is " & CInt(MapView.ByteLength - CInt(IMDPROXY_HEADER_SIZE)) & " bytes.") + Throw New Exception($"Requested write length {Length}. Buffer size is {CInt(MapView.ByteLength - IMDPROXY_HEADER_SIZE)} bytes.") End If Length = DevioProvider.Write(MapView.DangerousGetHandle(), IMDPROXY_HEADER_SIZE, Length, Offset) Response.errorno = 0 @@ -305,7 +318,7 @@ Namespace Server.Services Catch ex As Exception Trace.WriteLine(ex.ToString()) - Trace.WriteLine("Write request at " & Offset.ToString("X").PadLeft(8, "0"c) & " for " & Length & " bytes.") + Trace.WriteLine($"Write request at 0x{Offset:X8} for {Length} bytes.") Response.errorno = 1 Response.length = 0 @@ -327,49 +340,6 @@ Namespace Server.Services End Get End Property - ''' - ''' A System.Collections.Generic.List(Of T) extended with IDisposable implementation that disposes each - ''' object in the list when the list is disposed. - ''' - ''' - - Private Class DisposableList(Of T As IDisposable) - Inherits List(Of T) - - Implements IDisposable - - Private disposedValue As Boolean ' To detect redundant calls - - ' IDisposable - Protected Overridable Sub Dispose(disposing As Boolean) - If Not Me.disposedValue Then - If disposing Then - ' TODO: free managed resources when explicitly called - For Each obj In Me - obj.Dispose() - Next - End If - End If - Me.disposedValue = True - - ' TODO: free shared unmanaged resources - Clear() - - End Sub - - ' This code added by Visual Basic to correctly implement the disposable pattern. - Public Sub Dispose() Implements IDisposable.Dispose - ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. - Dispose(True) - GC.SuppressFinalize(Me) - End Sub - - Protected Overrides Sub Finalize() - Dispose(False) - MyBase.Finalize() - End Sub - End Class - End Class End Namespace diff --git a/ImDiskNet/DevioNet/Server/Services/DevioTcpService.vb b/ImDiskNet/DevioNet/Server/Services/DevioTcpService.vb index 1099f37..e8e25f7 100644 --- a/ImDiskNet/DevioNet/Server/Services/DevioTcpService.vb +++ b/ImDiskNet/DevioNet/Server/Services/DevioTcpService.vb @@ -1,234 +1,238 @@ -Imports LTR.IO.ImDisk.Devio.IMDPROXY_CONSTANTS +Imports System.IO +Imports System.Net +Imports System.Net.Sockets +Imports System.Text +Imports LTR.IO.ImDisk.Devio.IMDPROXY_CONSTANTS Imports LTR.IO.ImDisk.Devio.Server.Providers Namespace Server.Services - ''' - ''' Class that implements server end of ImDisk/Devio TCP/IP based communication protocol. - ''' It uses an object implementing IDevioProvider interface as storage backend - ''' for I/O requests received from client. - ''' - Public Class DevioTcpService - Inherits DevioServiceBase - ''' - ''' Server endpoint where this service listens for client connection. + ''' Class that implements server end of ImDisk/Devio TCP/IP based communication protocol. + ''' It uses an object implementing IDevioProvider interface as storage backend + ''' for I/O requests received from client. ''' - Public ReadOnly ListenEndPoint As IPEndPoint + Public Class DevioTcpService + Inherits DevioServiceBase - ''' - ''' Creates a new service instance with enough data to later run a service that acts as server end in ImDisk/Devio - ''' TCP/IP based communication. - ''' - ''' IP address where service should listen for client connection. - ''' IP port where service should listen for client connection. - ''' IDevioProvider object to that serves as storage backend for this service. - ''' Indicates whether DevioProvider object will be automatically closed when this - ''' instance is disposed. - Public Sub New(ListenAddress As IPAddress, ListenPort As Integer, DevioProvider As IDevioProvider, OwnsProvider As Boolean) - MyBase.New(DevioProvider, OwnsProvider) + ''' + ''' Server endpoint where this service listens for client connection. + ''' + Public ReadOnly Property ListenEndPoint As IPEndPoint - ListenEndPoint = New IPEndPoint(ListenAddress, ListenPort) + ''' + ''' Creates a new service instance with enough data to later run a service that acts as server end in ImDisk/Devio + ''' TCP/IP based communication. + ''' + ''' IP address where service should listen for client connection. + ''' IP port where service should listen for client connection. + ''' IDevioProvider object to that serves as storage backend for this service. + ''' Indicates whether DevioProvider object will be automatically closed when this + ''' instance is disposed. + Public Sub New(ListenAddress As IPAddress, ListenPort As Integer, DevioProvider As IDevioProvider, OwnsProvider As Boolean) + MyBase.New(DevioProvider, OwnsProvider) - End Sub + ListenEndPoint = New IPEndPoint(ListenAddress, ListenPort) - ''' - ''' Creates a new service instance with enough data to later run a service that acts as server end in ImDisk/Devio - ''' TCP/IP based communication. - ''' - ''' IP port where service should listen for client connection. Instance will listen on all - ''' interfaces where this port is available. - ''' IDevioProvider object to that serves as storage backend for this service. - ''' Indicates whether DevioProvider object will be automatically closed when this - ''' instance is disposed. - Public Sub New(ListenPort As Integer, DevioProvider As IDevioProvider, OwnsProvider As Boolean) - MyBase.New(DevioProvider, OwnsProvider) + End Sub - ListenEndPoint = New IPEndPoint(IPAddress.Any, ListenPort) + ''' + ''' Creates a new service instance with enough data to later run a service that acts as server end in ImDisk/Devio + ''' TCP/IP based communication. + ''' + ''' IP port where service should listen for client connection. Instance will listen on all + ''' interfaces where this port is available. + ''' IDevioProvider object to that serves as storage backend for this service. + ''' Indicates whether DevioProvider object will be automatically closed when this + ''' instance is disposed. + Public Sub New(ListenPort As Integer, DevioProvider As IDevioProvider, OwnsProvider As Boolean) + MyBase.New(DevioProvider, OwnsProvider) - End Sub + ListenEndPoint = New IPEndPoint(IPAddress.Any, ListenPort) - ''' - ''' Runs service that acts as server end in ImDisk/Devio TCP/IP based communication. It will first wait for - ''' a client to connect, then serve client I/O requests and when client finally requests service to terminate, this - ''' method returns to caller. To run service in a worker thread that automatically disposes this object after client - ''' disconnection, call StartServiceThread() instead. - ''' - Public Overrides Sub RunService() + End Sub + + ''' + ''' Runs service that acts as server end in ImDisk/Devio TCP/IP based communication. It will first wait for + ''' a client to connect, then serve client I/O requests and when client finally requests service to terminate, this + ''' method returns to caller. To run service in a worker thread that automatically disposes this object after client + ''' disconnection, call StartServiceThread() instead. + ''' + Public Overrides Sub RunService() - Try - Trace.WriteLine("Setting up listener at " & ListenEndPoint.ToString()) + Try + Trace.WriteLine("Setting up listener at " & ListenEndPoint.ToString()) - Dim Listener As New TcpListener(ListenEndPoint) + Dim Listener As New TcpListener(ListenEndPoint) - Try - Listener.ExclusiveAddressUse = False - Listener.Start() + Try + Listener.ExclusiveAddressUse = False + Listener.Start() - Catch ex As Exception - Trace.WriteLine("Listen failed: " & ex.ToString()) - OnServiceInitFailed() - Return + Catch ex As Exception + Trace.WriteLine("Listen failed: " & ex.ToString()) + OnServiceInitFailed() + Return - End Try + End Try - Trace.WriteLine("Raising service ready event.") - OnServiceReady() + Trace.WriteLine("Raising service ready event.") + OnServiceReady() - Dim StopServiceThreadHandler As New Action(AddressOf Listener.Stop) - AddHandler StopServiceThread, StopServiceThreadHandler - Dim TcpSocket = Listener.AcceptSocket() - RemoveHandler StopServiceThread, StopServiceThreadHandler - Listener.Stop() - Trace.WriteLine("Connection from " & TcpSocket.RemoteEndPoint.ToString()) - Dim TcpStream As New NetworkStream(TcpSocket, ownsSocket:=True) + Dim StopServiceThreadHandler As New Action(AddressOf Listener.Stop) + AddHandler StopServiceThread, StopServiceThreadHandler + Dim TcpSocket = Listener.AcceptSocket() + RemoveHandler StopServiceThread, StopServiceThreadHandler + Listener.Stop() + Trace.WriteLine("Connection from " & TcpSocket.RemoteEndPoint.ToString()) + Dim TcpStream As New NetworkStream(TcpSocket, ownsSocket:=True) - Dim Reader As New BinaryReader(TcpStream, Encoding.Default) - Dim Writer As New BinaryWriter(New MemoryStream, Encoding.Default) + Dim Reader As New BinaryReader(TcpStream, Encoding.Default) + Dim Writer As New BinaryWriter(New MemoryStream, Encoding.Default) - Dim ManagedBuffer As Byte() = Nothing + Dim ManagedBuffer As Byte() = Nothing - Do + Do - Dim RequestCode As IMDPROXY_REQ + Dim RequestCode As IMDPROXY_REQ - Try - RequestCode = CType(Reader.ReadUInt64(), IMDPROXY_REQ) + Try + RequestCode = CType(Reader.ReadUInt64(), IMDPROXY_REQ) - Catch ex As EndOfStreamException - Exit Do + Catch ex As EndOfStreamException + Exit Do - End Try + End Try - 'Trace.WriteLine("Got client request: " & RequestCode.ToString()) + 'Trace.WriteLine("Got client request: " & RequestCode.ToString()) - Select Case RequestCode + Select Case RequestCode - Case IMDPROXY_REQ.IMDPROXY_REQ_INFO - SendInfo(Writer) + Case IMDPROXY_REQ.IMDPROXY_REQ_INFO + SendInfo(Writer) - Case IMDPROXY_REQ.IMDPROXY_REQ_READ - ReadData(Reader, Writer, ManagedBuffer) + Case IMDPROXY_REQ.IMDPROXY_REQ_READ + ReadData(Reader, Writer, ManagedBuffer) - Case IMDPROXY_REQ.IMDPROXY_REQ_WRITE - WriteData(Reader, Writer, ManagedBuffer) + Case IMDPROXY_REQ.IMDPROXY_REQ_WRITE + WriteData(Reader, Writer, ManagedBuffer) - Case IMDPROXY_REQ.IMDPROXY_REQ_CLOSE - Trace.WriteLine("Closing connection.") - Return + Case IMDPROXY_REQ.IMDPROXY_REQ_CLOSE + Trace.WriteLine("Closing connection.") + Return - Case Else - Trace.WriteLine("Unsupported request code: " & RequestCode.ToString()) - Return + Case Else + Trace.WriteLine("Unsupported request code: " & RequestCode.ToString()) + Return - End Select + End Select - 'Trace.WriteLine("Sending response and waiting for next request.") + 'Trace.WriteLine("Sending response and waiting for next request.") - Writer.Seek(0, SeekOrigin.Begin) - With DirectCast(Writer.BaseStream, MemoryStream) - .WriteTo(TcpStream) - .SetLength(0) - End With + Writer.Seek(0, SeekOrigin.Begin) + With DirectCast(Writer.BaseStream, MemoryStream) + .WriteTo(TcpStream) + .SetLength(0) + End With - Loop + Loop - Trace.WriteLine("Client disconnected.") + Trace.WriteLine("Client disconnected.") - Catch ex As Exception - Trace.WriteLine("Unhandled exception in service thread: " & ex.ToString()) - OnServiceUnhandledException(New UnhandledExceptionEventArgs(ex, True)) + Catch ex As Exception + Trace.WriteLine("Unhandled exception in service thread: " & ex.ToString()) + OnServiceUnhandledException(New UnhandledExceptionEventArgs(ex, True)) - Finally - OnServiceShutdown() + Finally + OnServiceShutdown() - End Try + End Try - End Sub + End Sub - Private Sub SendInfo(Writer As BinaryWriter) + Private Sub SendInfo(Writer As BinaryWriter) - Writer.Write(CULng(DevioProvider.Length)) - Writer.Write(CULng(REQUIRED_ALIGNMENT)) - Writer.Write(CULng(If(DevioProvider.CanWrite, IMDPROXY_FLAGS.IMDPROXY_FLAG_NONE, IMDPROXY_FLAGS.IMDPROXY_FLAG_RO))) + Writer.Write(CULng(DevioProvider.Length)) + Writer.Write(CULng(REQUIRED_ALIGNMENT)) + Writer.Write(CULng(If(DevioProvider.CanWrite, IMDPROXY_FLAGS.IMDPROXY_FLAG_NONE, IMDPROXY_FLAGS.IMDPROXY_FLAG_RO))) - End Sub + End Sub - Private Sub ReadData(Reader As BinaryReader, Writer As BinaryWriter, Data As Byte()) + Private Sub ReadData(Reader As BinaryReader, Writer As BinaryWriter, Data As Byte()) - Dim Offset = Reader.ReadInt64() - Dim ReadLength = CInt(Reader.ReadUInt64()) - If Data Is Nothing OrElse Data.Length < ReadLength Then - Array.Resize(Data, ReadLength) - End If - Dim WriteLength As ULong - Dim ErrorCode As ULong + Dim Offset = Reader.ReadInt64() + Dim ReadLength = CInt(Reader.ReadUInt64()) + If Data Is Nothing OrElse Data.Length < ReadLength Then + Array.Resize(Data, ReadLength) + End If + Dim WriteLength As ULong + Dim ErrorCode As ULong - Try - WriteLength = CULng(DevioProvider.Read(Data, 0, ReadLength, Offset)) - ErrorCode = 0 + Try + WriteLength = CULng(DevioProvider.Read(Data, 0, ReadLength, Offset)) + ErrorCode = 0 - Catch ex As Exception - Trace.WriteLine(ex.ToString()) - Trace.WriteLine("Read request at " & Offset.ToString("X").PadLeft(8, "0"c) & " for " & ReadLength & " bytes.") - ErrorCode = 1 - WriteLength = 0 + Catch ex As Exception + Trace.WriteLine(ex.ToString()) + Trace.WriteLine($"Read request at 0x{Offset:X8} for {ReadLength} bytes.") + ErrorCode = 1 + WriteLength = 0 - End Try + End Try - Writer.Write(ErrorCode) - Writer.Write(WriteLength) - If WriteLength > 0 Then - Writer.Write(Data, 0, CInt(WriteLength)) - End If + Writer.Write(ErrorCode) + Writer.Write(WriteLength) + If WriteLength > 0 Then + Writer.Write(Data, 0, CInt(WriteLength)) + End If - End Sub + End Sub - Private Sub WriteData(Reader As BinaryReader, Writer As BinaryWriter, Data As Byte()) + Private Sub WriteData(Reader As BinaryReader, Writer As BinaryWriter, Data As Byte()) - Dim Offset = Reader.ReadInt64() - Dim Length = Reader.ReadUInt64() - If Data Is Nothing OrElse Data.Length < Length Then - Array.Resize(Data, CInt(Length)) - End If + Dim Offset = Reader.ReadInt64() + Dim Length = Reader.ReadUInt64() + If Data Is Nothing OrElse Data.Length < Length Then + Array.Resize(Data, CInt(Length)) + End If - Dim ReadLength = Reader.Read(Data, 0, CInt(Length)) - Dim WriteLength As ULong - Dim ErrorCode As ULong + Dim ReadLength = Reader.Read(Data, 0, CInt(Length)) + Dim WriteLength As ULong + Dim ErrorCode As ULong - Try - WriteLength = CULng(DevioProvider.Write(Data, 0, ReadLength, Offset)) - ErrorCode = 0 + Try + WriteLength = CULng(DevioProvider.Write(Data, 0, ReadLength, Offset)) + ErrorCode = 0 - Catch ex As Exception - Trace.WriteLine(ex.ToString()) - Trace.WriteLine("Write request at " & Offset.ToString("X").PadLeft(8, "0"c) & " for " & Length & " bytes.") - ErrorCode = 1 - WriteLength = 0 + Catch ex As Exception + Trace.WriteLine(ex.ToString()) + Trace.WriteLine($"Write request at 0x{Offset:X8} for {Length} bytes.") + ErrorCode = 1 + WriteLength = 0 - End Try + End Try - Writer.Write(ErrorCode) - Writer.Write(WriteLength) + Writer.Write(ErrorCode) + Writer.Write(WriteLength) - End Sub + End Sub - Protected Overrides ReadOnly Property ImDiskProxyObjectName As String - Get - Dim EndPoint = ListenEndPoint - If EndPoint.Address.Equals(IPAddress.Any) Then - EndPoint = New IPEndPoint(IPAddress.Loopback, EndPoint.Port) - End If - Return EndPoint.ToString() - End Get - End Property + Protected Overrides ReadOnly Property ImDiskProxyObjectName As String + Get + Dim EndPoint = ListenEndPoint + If EndPoint.Address.Equals(IPAddress.Any) Then + EndPoint = New IPEndPoint(IPAddress.Loopback, EndPoint.Port) + End If + Return EndPoint.ToString() + End Get + End Property - Protected Overrides ReadOnly Property ImDiskProxyModeFlags As ImDiskFlags - Get - Return ImDiskFlags.TypeProxy Or ImDiskFlags.ProxyTypeTCP - End Get - End Property + Protected Overrides ReadOnly Property ImDiskProxyModeFlags As ImDiskFlags + Get + Return ImDiskFlags.TypeProxy Or ImDiskFlags.ProxyTypeTCP + End Get + End Property - End Class + End Class End Namespace diff --git a/ImDiskNet/DevioNet/app.config b/ImDiskNet/DevioNet/app.config new file mode 100644 index 0000000..6b91abd --- /dev/null +++ b/ImDiskNet/DevioNet/app.config @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ImDiskNet/DevioNet/packages.config b/ImDiskNet/DevioNet/packages.config new file mode 100644 index 0000000..0a5ecf9 --- /dev/null +++ b/ImDiskNet/DevioNet/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ImDiskNet/Directory.build.props b/ImDiskNet/Directory.build.props new file mode 100644 index 0000000..9b729d8 --- /dev/null +++ b/ImDiskNet/Directory.build.props @@ -0,0 +1,34 @@ + + + + + LTR.IO + ..\$(Configuration)\ + true + true + false + true + 9.0 + portable + false + true + On + On + On + + + + + + ImDisk Virtual Disk Driver + Olof Lagerkvist, LTR Data + ImDisk Virtual Disk Driver + Copyright © Olof Lagerkvist, 2011 - 2021 + + 2.1.013.0 + 1.0.009.0 + 1.0.009.0 + + + + diff --git a/ImDiskNet/DiscUtilsDevio/DiscUtilsDevio.vbproj b/ImDiskNet/DiscUtilsDevio/DiscUtilsDevio.vbproj index 53c9638..ca3fa9b 100644 --- a/ImDiskNet/DiscUtilsDevio/DiscUtilsDevio.vbproj +++ b/ImDiskNet/DiscUtilsDevio/DiscUtilsDevio.vbproj @@ -1,154 +1,48 @@  - + + + - Debug - x86 - - - - - {0E6ECB44-49AE-4732-AA27-4566258F1B96} + Exe - LTR.IO.ImDisk.Devio.DiscUtilsDevio.ServerModule LTR.IO.ImDisk.Devio.DiscUtilsDevio - DiscUtilsDevio - 512 - Console - v4.0 - - + DiscUtilsDevio + ImDisk Devio for DiscUtils library + + net40;net5.0-windows + - - x86 - true - full - true - true - bin\Debug\ - DiscUtilsDevio.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - x86 - pdbonly - false - true - true - bin\Release\ - DiscUtilsDevio.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - On - - - On - - - true - true - true - ..\Debug\ - DiscUtilsDevio.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - AnyCPU - true - true - - - true - ..\Release\ - DiscUtilsDevio.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - AnyCPU - - - - False - .\DiscUtils.dll - - - + - - - - - - - - - - - - - + + + - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - Designer - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - {C8131F7E-E240-4A1B-8D3D-FC4E5DBED050} - DevioNet - - - {3EFCB6F8-EF7E-4F60-A0DE-BB197240FCC9} - ImDiskNet - + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Core.dll + + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Dmg.dll + + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Streams.dll + + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Vdi.dll + + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Vhd.dll + + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Vhdx.dll + + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Vmdk.dll + + + ..\DiscUtils\$(TargetFramework)\DiscUtils.Xva.dll + - - - \ No newline at end of file + + diff --git a/ImDiskNet/DiscUtilsDevio/GlobalSuppressions.vb b/ImDiskNet/DiscUtilsDevio/GlobalSuppressions.vb new file mode 100644 index 0000000..fafdca9 --- /dev/null +++ b/ImDiskNet/DiscUtilsDevio/GlobalSuppressions.vb @@ -0,0 +1,9 @@ +' This file is used by Code Analysis to maintain SuppressMessage +' attributes that are applied to this project. +' Project-level suppressions either have no target or are given +' a specific target and scoped to a namespace, type, member, etc. + +Imports System.Diagnostics.CodeAnalysis + + + diff --git a/ImDiskNet/DiscUtilsDevio/My Project/AssemblyInfo.vb b/ImDiskNet/DiscUtilsDevio/My Project/AssemblyInfo.vb index 116e34e..041c092 100644 --- a/ImDiskNet/DiscUtilsDevio/My Project/AssemblyInfo.vb +++ b/ImDiskNet/DiscUtilsDevio/My Project/AssemblyInfo.vb @@ -8,28 +8,8 @@ Imports System.Runtime.InteropServices ' Review the values of the assembly attributes - - - - - - - 'The following GUID is for the ID of the typelib if this project is exposed to COM -' Version information for an assembly consists of the following four values: -' -' Major Version -' Minor Version -' Build Number -' Revision -' -' You can specify all the values or you can default the Build and Revision Numbers -' by using the '*' as shown below: -' - - - diff --git a/ImDiskNet/DiscUtilsDevio/My Project/Settings.Designer.vb b/ImDiskNet/DiscUtilsDevio/My Project/Settings.Designer.vb deleted file mode 100644 index ca8b8ea..0000000 --- a/ImDiskNet/DiscUtilsDevio/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.239 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - - Friend Module MySettingsProperty - - - Friend ReadOnly Property Settings() As Global.LTR.IO.ImDisk.Devio.DiscUtilsDevio.My.MySettings - Get - Return Global.LTR.IO.ImDisk.Devio.DiscUtilsDevio.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/ImDiskNet/DiscUtilsDevio/ServerModule.vb b/ImDiskNet/DiscUtilsDevio/ServerModule.vb index d6df4c8..0ab0b82 100644 --- a/ImDiskNet/DiscUtilsDevio/ServerModule.vb +++ b/ImDiskNet/DiscUtilsDevio/ServerModule.vb @@ -1,9 +1,25 @@ -Imports DiscUtils - -Module ServerModule +Imports System.IO +Imports System.Net +Imports System.Reflection +Imports System.Threading +Imports DiscUtils +Imports DiscUtils.Setup +Imports LTR.IO.ImDisk.Devio.Server.Providers +Imports LTR.IO.ImDisk.Devio.Server.Services + +Public Module ServerModule + + Private ReadOnly asms As New List(Of Assembly) From { + GetType(Dmg.Disk).Assembly, + GetType(Vdi.Disk).Assembly, + GetType(Vmdk.Disk).Assembly, + GetType(Vhd.Disk).Assembly, + GetType(Vhdx.Disk).Assembly, + GetType(Xva.Disk).Assembly + } - Sub Main(args As String()) + Friend Sub Main(args As String()) Try SafeMain(args) @@ -22,220 +38,247 @@ Module ServerModule End Sub - Sub SafeMain(args As String()) + Public Sub SafeMain(ParamArray args As String()) - Dim DeviceName As String = Nothing - Dim ObjectName As String = Nothing - Dim ListenAddress As IPAddress = IPAddress.Any - Dim ListenPort As Integer - Dim BufferSize As Long = DevioShmService.DefaultBufferSize - Dim DiskAccess As FileAccess = FileAccess.ReadWrite - Dim PartitionNumber As Integer? = Nothing - Dim Mount As Boolean = False - Dim MountPoint As String = Nothing - Dim ShowHelp As Boolean = False + Dim device_name As String = Nothing + Dim object_name As String = Nothing + Dim listen_address As IPAddress = IPAddress.Any + Dim listen_port As Integer + Dim buffer_size As Long = DevioShmService.DefaultBufferSize + Dim disk_access As FileAccess = FileAccess.ReadWrite + Dim partition_number As Integer? = Nothing + Dim mount As Boolean = False + Dim mount_point As String = Nothing + Dim show_help As Boolean = False For Each arg In args If arg.StartsWith("/name=", StringComparison.OrdinalIgnoreCase) Then - ObjectName = arg.Substring("/name=".Length) + object_name = arg.Substring("/name=".Length) ElseIf arg.StartsWith("/ipaddress=", StringComparison.OrdinalIgnoreCase) Then - ListenAddress = IPAddress.Parse(arg.Substring("/ipaddress=".Length)) + listen_address = IPAddress.Parse(arg.Substring("/ipaddress=".Length)) ElseIf arg.StartsWith("/port=", StringComparison.OrdinalIgnoreCase) Then - ListenPort = Integer.Parse(arg.Substring("/port=".Length)) + listen_port = Integer.Parse(arg.Substring("/port=".Length), Globalization.NumberFormatInfo.InvariantInfo) ElseIf arg.StartsWith("/buffersize=", StringComparison.OrdinalIgnoreCase) Then - BufferSize = Long.Parse(arg.Substring("/buffersize=".Length)) + buffer_size = Long.Parse(arg.Substring("/buffersize=".Length), Globalization.NumberFormatInfo.InvariantInfo) ElseIf arg.StartsWith("/partition=", StringComparison.OrdinalIgnoreCase) Then - PartitionNumber = Integer.Parse(arg.Substring("/partition=".Length)) + partition_number = Integer.Parse(arg.Substring("/partition=".Length), Globalization.NumberFormatInfo.InvariantInfo) ElseIf arg.StartsWith("/filename=", StringComparison.OrdinalIgnoreCase) Then - DeviceName = arg.Substring("/filename=".Length) + device_name = arg.Substring("/filename=".Length) ElseIf arg.Equals("/readonly", StringComparison.OrdinalIgnoreCase) Then - DiskAccess = FileAccess.Read + disk_access = FileAccess.Read ElseIf arg.Equals("/mount", StringComparison.OrdinalIgnoreCase) Then - Mount = True + mount = True ElseIf arg.Equals("/trace", StringComparison.OrdinalIgnoreCase) Then Trace.Listeners.Add(New ConsoleTraceListener) ElseIf arg.StartsWith("/mount=", StringComparison.OrdinalIgnoreCase) Then - Mount = True - MountPoint = arg.Substring("/mount=".Length) - ElseIf arg = "/?" OrElse arg.Equals("/help", StringComparison.OrdinalIgnoreCase) Then - ShowHelp = True + mount = True + mount_point = arg.Substring("/mount=".Length) + ElseIf arg.StartsWith("/asm=", StringComparison.OrdinalIgnoreCase) Then + Dim asmname = AssemblyName.GetAssemblyName(arg.Substring("/asm=".Length)) + asms.Add(Assembly.Load(asmname)) + ElseIf arg.Equals("/?", StringComparison.Ordinal) OrElse arg.Equals("/help", StringComparison.OrdinalIgnoreCase) Then + show_help = True Exit For Else Console.WriteLine("Unsupported switch: " & arg) - ShowHelp = True + show_help = True Exit For End If Next If _ - ShowHelp OrElse - String.IsNullOrEmpty(DeviceName) Then - - Console.WriteLine("Syntax:" & Environment.NewLine & - "DiscUtilsDevio /name=objectname [/buffersize=bytes] [/partition=number]" & Environment.NewLine & - " /filename=imagefilename [/readonly] [/mount[=d:]] [/trace]" & Environment.NewLine & - Environment.NewLine & - "DiscUtilsDevio [/name=objectname] [/buffersize=bytes] [/partition=number]" & Environment.NewLine & - " /filename=imagefilename [/readonly] /mount[=d:] [/trace]" & Environment.NewLine & - Environment.NewLine & - "DiscUtilsDevio [/ipaddress=address] /port=tcpport [/partition=number]" & Environment.NewLine & - " /filename=imagefilename [/readonly] [/mount[=d:]] [/trace]") + show_help OrElse + String.IsNullOrEmpty(device_name) Then - Return + Dim msg = "Syntax: +DiscUtilsDevio /name=objectname [/buffersize=bytes] [/partition=number] /filename=imagefilename [/readonly] [/mount[=d:]] [/trace] - End If +DiscUtilsDevio [/name=objectname] [/buffersize=bytes] [/partition=number] /filename=imagefilename [/readonly] /mount[=d:] [/trace] - Console.WriteLine("Opening image " & DeviceName) +DiscUtilsDevio [/ipaddress=address] /port=tcpport [/partition=number] /filename=imagefilename [/readonly] [/mount[=d:]] [/trace] - Dim Device = VirtualDisk.OpenDisk(DeviceName, DiskAccess) +You can additionally use the /asm=path switch to load an additional DiscUtils compatible assembly file that provides support for more virtual disk formats." - If Device Is Nothing Then - Dim fs As New FileStream(DeviceName, FileMode.Open, DiskAccess, FileShare.Read Or FileShare.Delete) - Try - Device = New Dmg.Disk(fs, Ownership.Dispose) - Catch - fs.Dispose() - End Try - End If + msg = LineFormat(msg, 4) + + Console.WriteLine(msg) - If Device Is Nothing Then - Console.WriteLine("Image not recognized by DiscUtils." & Environment.NewLine & - Environment.NewLine & - "Formats currently supported: " & String.Join(", ", VirtualDisk.SupportedDiskTypes.ToArray()), - "Error") Return - End If - Dim Table As Partitions.PartitionTable = Nothing - Console.WriteLine("Image type class: " & Device.GetType().ToString()) - If Device.IsPartitioned Then - Table = Device.Partitions - End If - If Table Is Nothing Then - Console.WriteLine("Unknown partition table format or partition table not found.") - Else - Console.WriteLine("Partition table class: " & Table.GetType().ToString()) - End If - Console.WriteLine("Image virtual size is " & Device.Capacity & " bytes") - If Device.Geometry Is Nothing Then - Console.WriteLine("Image sector size is unknown") - Else - Console.WriteLine("Image sector size is " & Device.Geometry.BytesPerSector & " bytes") End If - Dim DiskStream As Stream + For Each asm In asms.Distinct() + + Trace.WriteLine($"Registering assembly {asm.GetName().Name}...") + + SetupHelper.RegisterAssembly(asm) + + Next + + Console.WriteLine($"Opening image {device_name}") + + Using device = VirtualDisk.OpenDisk(device_name, disk_access) + + If device Is Nothing Then + + Console.WriteLine($"Image not recognized by DiscUtils. + +Formats currently supported: {String.Join(", ", VirtualDiskManager.SupportedDiskTypes.ToArray())}") - If PartitionNumber.HasValue = False Then - If Table IsNot Nothing Then - PartitionNumber = 1 - Console.WriteLine("Partition table found.") + Return + + End If + + Dim partition_table As Partitions.PartitionTable = Nothing + + Console.WriteLine($"Image type class: {device.GetType()}") + + If device.IsPartitioned Then + partition_table = device.Partitions + End If + + If partition_table Is Nothing Then + Console.WriteLine("Unknown partition table format or partition table not found.") Else - PartitionNumber = 0 - Console.WriteLine("Partition table not found.") + Console.WriteLine($"Partition table class: {partition_table.GetType()}") End If - End If - If PartitionNumber = 0 Then - If Device IsNot Nothing Then - DiskStream = Device.Content + Console.WriteLine($"Image virtual size is {device.Capacity} bytes") + + If device.Geometry Is Nothing Then + Console.WriteLine("Image sector size is unknown") Else - Console.WriteLine("Raw image access for this format is not supported by DiscUtils." & Environment.NewLine & - Environment.NewLine & - "Formats currently supported: " & String.Join(", ", VirtualDisk.SupportedDiskTypes.ToArray())) - Return + Console.WriteLine($"Image sector size is {device.Geometry.BytesPerSector} bytes") End If - Console.WriteLine("Using entire image file: " & DeviceName) - Else - If Table Is Nothing Then - Console.WriteLine("Partition table not found in image.") - Return + + Dim disk_stream As Stream + + If partition_number.HasValue = False Then + If partition_table IsNot Nothing Then + partition_number = 1 + Console.WriteLine("Partition table found.") + Else + partition_number = 0 + Console.WriteLine("Partition table not found.") + End If End If - If PartitionNumber > Table.Count Then - Console.WriteLine("Partition " & PartitionNumber & " not defined in partition table.") - Return + + If partition_number = 0 Then + If device.Content Is Nothing Then + Console.WriteLine($"Raw image access for this format is not supported by DiscUtils. + +Formats currently supported: {String.Join(", ", VirtualDiskManager.SupportedDiskTypes.ToArray())}") + Return + End If + + disk_stream = device.Content + + Console.WriteLine($"Using entire image file: {device_name}") + Else + If partition_table Is Nothing Then + Console.WriteLine("Partition table not found in image.") + Return + End If + + If partition_number > partition_table.Count Then + Console.WriteLine($"Partition {partition_number} not defined in partition table.") + Return + End If + + disk_stream = partition_table(partition_number.Value - 1).Open() + + Console.WriteLine($"Using partition {partition_number}") End If - DiskStream = Table(PartitionNumber.Value - 1).Open() - Console.WriteLine("Using partition " & PartitionNumber) - End If - Console.WriteLine("Used size is " & DiskStream.Length & " bytes") - If DiskStream.CanWrite Then - Console.WriteLine("Read/write mode.") - Else - Console.WriteLine("Read-only mode.") - End If + Console.WriteLine($"Used size is {disk_stream.Length} bytes") - Dim Service As DevioServiceBase - Dim Provider As New DevioProviderFromStream(DiskStream, ownsStream:=True) + If disk_stream.CanWrite Then + Console.WriteLine("Read/write mode.") + Else + Console.WriteLine("Read-only mode.") + End If - If Not String.IsNullOrEmpty(ObjectName) Then + Dim service As DevioServiceBase - Service = New DevioShmService(ObjectName, Provider, OwnsProvider:=True, BufferSize:=BufferSize) + Using provider As New DevioProviderFromStream(disk_stream, ownsStream:=True) - ElseIf ListenPort <> 0 Then + If Not String.IsNullOrEmpty(object_name) Then - Service = New DevioTcpService(ListenAddress, ListenPort, Provider, OwnsProvider:=True) + service = New DevioShmService(object_name, provider, OwnsProvider:=True, BufferSize:=buffer_size) - ElseIf Mount Then + ElseIf listen_port <> 0 Then - Service = New DevioShmService(Provider, OwnsProvider:=True, BufferSize:=BufferSize) + service = New DevioTcpService(listen_address, listen_port, provider, OwnsProvider:=True) - Else + ElseIf mount Then - Provider.Dispose() - Console.WriteLine("Shared memory object name or TCP/IP port must be specified.") - Return + service = New DevioShmService(provider, OwnsProvider:=True, BufferSize:=buffer_size) - End If + Else - If Mount Then - If "#:".Equals(MountPoint, StringComparison.Ordinal) Then - Dim drive_letter = ImDiskAPI.FindFreeDriveLetter() - If drive_letter = Nothing Then - Console.Error.WriteLine("No drive letter available") + provider.Dispose() + + Console.WriteLine("Shared memory object name or TCP/IP port must be specified.") Return - End If - MountPoint = {drive_letter, ":"c} - Console.WriteLine("Selected " & MountPoint & " as drive letter mount point") - End If - Console.WriteLine("Opening image file and mounting as virtual disk...") - Service.StartServiceThreadAndMountImDisk(ImDiskFlags.Auto, MountPoint) - Console.WriteLine("Virtual disk created. Press Ctrl+C to remove virtual disk and exit.") - Else - Console.WriteLine("Opening image file...") - Service.StartServiceThread() - Console.WriteLine("Image file opened, waiting for incoming connections. Press Ctrl+C to exit.") - End If - AddHandler Console.CancelKeyPress, - Sub(sender, e) - ThreadPool.QueueUserWorkItem( - Sub() + End If - If Not Monitor.TryEnter(break_lock) Then - Return + Using service + + If mount Then + If "#:".Equals(mount_point, StringComparison.Ordinal) Then + Dim drive_letter = ImDiskAPI.FindFreeDriveLetter() + If drive_letter = Nothing Then + Console.Error.WriteLine("No drive letter available") + Return + End If + mount_point = {drive_letter, ":"c} + Console.WriteLine($"Selected {mount_point} as drive letter mount point") + End If + Console.WriteLine("Opening image file and mounting as virtual disk...") + service.StartServiceThreadAndMountImDisk(ImDiskFlags.Auto, mount_point) + Console.WriteLine("Virtual disk created. Press Ctrl+C to remove virtual disk and exit.") + Else + Console.WriteLine("Opening image file...") + service.StartServiceThread() + Console.WriteLine("Image file opened, waiting for incoming connections. Press Ctrl+C to exit.") End If - Try - Console.WriteLine("Stopping service...") - Service.Dispose() + AddHandler Console.CancelKeyPress, + Sub(sender, e) + ThreadPool.QueueUserWorkItem( + Sub() + + If Not Monitor.TryEnter(break_lock) Then + Return + End If + + Try + Console.WriteLine("Stopping service...") + service.Dispose() - Finally - Monitor.Exit(break_lock) + Finally + Monitor.Exit(break_lock) + End Try + End Sub) + + Try + e.Cancel = True + Catch End Try - End Sub) - Try - e.Cancel = True - Catch - End Try + End Sub + + service.WaitForServiceThreadExit() + + Console.WriteLine("Service stopped.") - End Sub + End Using - Service.WaitForServiceThreadExit() + End Using - Console.WriteLine("Service stopped.") + End Using End Sub diff --git a/ImDiskNet/DiscUtilsDevio/app.config b/ImDiskNet/DiscUtilsDevio/app.config new file mode 100644 index 0000000..6b91abd --- /dev/null +++ b/ImDiskNet/DiscUtilsDevio/app.config @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ImDiskNet/DiscUtilsDevio/packages.config b/ImDiskNet/DiscUtilsDevio/packages.config new file mode 100644 index 0000000..0a5ecf9 --- /dev/null +++ b/ImDiskNet/DiscUtilsDevio/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ImDiskNet/ImDiskNet.inf b/ImDiskNet/ImDiskNet.inf new file mode 100644 index 0000000..506adda --- /dev/null +++ b/ImDiskNet/ImDiskNet.inf @@ -0,0 +1,69 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 03/24/2020,2.1.0.00068 +CatalogFile = ImDiskNet.cat + + +[SourceDisksNames] +1 = "ImDisk .NET API and tools" + + +[SourceDisksFiles.x86] +ImDiskNet.dll = 1, Release +DevioNet.dll = 1, Release +DiscUtils.dll = 1, Release +DiscUtilsDevio.exe = 1, Release + +[SourceDisksFiles.ia64] +ImDiskNet.dll = 1, Release +DevioNet.dll = 1, Release +DiscUtils.dll = 1, Release +DiscUtilsDevio.exe = 1, Release + +[SourceDisksFiles.amd64] +ImDiskNet.dll = 1, Release +DevioNet.dll = 1, Release +DiscUtils.dll = 1, Release +DiscUtilsDevio.exe = 1, Release + +[SourceDisksFiles.arm] +ImDiskNet.dll = 1, Release +DevioNet.dll = 1, Release +DiscUtils.dll = 1, Release +DiscUtilsDevio.exe = 1, Release + +[SourceDisksFiles.arm64] +ImDiskNet.dll = 1, Release +DevioNet.dll = 1, Release +DiscUtils.dll = 1, Release +DiscUtilsDevio.exe = 1, Release + +[DestinationDirs] +ExeFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = ExeFiles + + +[ExeFiles] +DiscUtilsDevio.exe + + +[DefaultInstall.ntx86.Services] +AddService = ImDiskNet, , ImDiskNet + + +[ImDiskNet] +DisplayName = "ImDiskNet" +StartType = 2 +ServiceType = 16 +ErrorControl = 0 +ServiceBinary = %11%\DiscUtilsDevio.exe diff --git a/ImDiskNet/ImDiskNet.shfbproj b/ImDiskNet/ImDiskNet.shfbproj deleted file mode 100644 index 142ceda..0000000 --- a/ImDiskNet/ImDiskNet.shfbproj +++ /dev/null @@ -1,69 +0,0 @@ - - - - - Debug - AnyCPU - 2.0 - {ff9b3f4a-c5d0-4215-9d57-120a2e5974ca} - 1.9.3.0 - - Documentation - Documentation - Documentation - - .\Help\ - ImDisk Virtual Disk Driver API - en-US - HtmlHelp1, MSHelpViewer, Website - ImDisk Virtual Disk Driver API - None - Attributes, ExplicitInterfaceImplementations, InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ImDiskNet/ImDiskNet.sln b/ImDiskNet/ImDiskNet.sln index db0dfbf..3490677 100644 --- a/ImDiskNet/ImDiskNet.sln +++ b/ImDiskNet/ImDiskNet.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29920.165 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImDiskNet", "ImDiskNet\ImDiskNet.vbproj", "{3EFCB6F8-EF7E-4F60-A0DE-BB197240FCC9}" EndProject @@ -15,6 +15,11 @@ Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "ImDiskNetHelpBuilder", "ImD {3EFCB6F8-EF7E-4F60-A0DE-BB197240FCC9} = {3EFCB6F8-EF7E-4F60-A0DE-BB197240FCC9} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{24EB0931-A36C-425E-ACEF-7B8E400E8C58}" + ProjectSection(SolutionItems) = preProject + Directory.build.props = Directory.build.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,4 +60,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DF55C9DC-F716-4394-8B6D-DEEBB8A9FE17} + EndGlobalSection EndGlobal diff --git a/ImDiskNet/ImDiskNet/GlobalSuppressions.vb b/ImDiskNet/ImDiskNet/GlobalSuppressions.vb new file mode 100644 index 0000000..da1da05 --- /dev/null +++ b/ImDiskNet/ImDiskNet/GlobalSuppressions.vb @@ -0,0 +1,9 @@ +' This file is used by Code Analysis to maintain SuppressMessage +' attributes that are applied to this project. +' Project-level suppressions either have no target or are given +' a specific target and scoped to a namespace, type, member, etc. + +Imports System.Diagnostics.CodeAnalysis + + + diff --git a/ImDiskNet/ImDiskNet/IO/ConsoleSupport.vb b/ImDiskNet/ImDiskNet/IO/ConsoleSupport.vb new file mode 100644 index 0000000..e3c636b --- /dev/null +++ b/ImDiskNet/ImDiskNet/IO/ConsoleSupport.vb @@ -0,0 +1,68 @@ +Imports System.Runtime.CompilerServices +Imports System.Text + +Namespace ImDisk + + Public Module ConsoleSupport + + Public Function LineFormat(message As String, Optional IndentWidth As Integer = 0, Optional LineWidth As Integer? = Nothing, Optional WordDelimiter As Char = " "c, Optional FillChar As Char = " "c) As String + + If message Is Nothing Then + Throw New ArgumentNullException(NameOf(message)) + End If + + Dim Width As Integer + + If LineWidth.HasValue Then + Width = LineWidth.Value + Else + If NativeFileIO.UnsafeNativeMethods.GetFileType(NativeFileIO.UnsafeNativeMethods.GetStdHandle(NativeFileIO.StdHandle.Output)) <> NativeFileIO.Win32FileType.Character Then + Width = 79 + Else + Width = Console.WindowWidth - 1 + End If + End If + + Dim origLines = message.Replace(Microsoft.VisualBasic.vbCr, "").Split({Microsoft.VisualBasic.vbLf(0)}) + + Dim resultLines As New List(Of String)(origLines.Length) + + Dim result As New StringBuilder + + Dim line As New StringBuilder(Width) + + For Each origLine In origLines + + result.Length = 0 + line.Length = 0 + + For Each Word In origLine.Split(WordDelimiter) + If Word.Length >= Width Then + result.AppendLine(Word) + Continue For + End If + If Word.Length + line.Length >= Width Then + result.AppendLine(line.ToString()) + line.Length = 0 + line.Append(FillChar, IndentWidth) + ElseIf line.Length > 0 Then + line.Append(WordDelimiter) + End If + line.Append(Word) + Next + + If line.Length > 0 Then + result.Append(line.ToString()) + End If + + resultLines.Add(result.ToString()) + + Next + + Return String.Join(Environment.NewLine, resultLines.ToArray()) + + End Function + + End Module + +End Namespace diff --git a/ImDiskNet/ImDiskNet/IO/PinnedBuffer.vb b/ImDiskNet/ImDiskNet/IO/PinnedBuffer.vb new file mode 100644 index 0000000..71db77a --- /dev/null +++ b/ImDiskNet/ImDiskNet/IO/PinnedBuffer.vb @@ -0,0 +1,321 @@ +Imports System.Runtime.InteropServices +Imports System.Runtime.InteropServices.Marshal +Imports System.Security +Imports System.Security.Permissions +Imports Microsoft.Win32.SafeHandles + +Namespace IO + + ''' + ''' Pins a value object for unmanaged use. + ''' + + + + Public Class PinnedBuffer +#If NET40_OR_GREATER OrElse Not NETFRAMEWORK Then + Inherits SafeBuffer +#Else + Inherits SafeHandleZeroOrMinusOneIsInvalid + + Public ReadOnly Property ByteLength As ULong + + Protected Sub Initialize(size As ULong) + _ByteLength = size + End Sub +#End If + + + Protected _gchandle As GCHandle + + Protected Sub New() + MyBase.New(ownsHandle:=True) + + End Sub + + Public ReadOnly Property Offset As Integer + + Get + If IntPtr.Size > 4 Then + Return CInt(DangerousGetHandle().ToInt64() - _gchandle.AddrOfPinnedObject().ToInt64()) + Else + Return DangerousGetHandle().ToInt32() - _gchandle.AddrOfPinnedObject().ToInt32() + End If + End Get + End Property + + ''' + ''' Initializes a new instance with an existing type T object and pins memory + ''' position. + ''' + ''' Existing object to marshal to unmanaged memory. + + Public Shared Function Create(obj As String) As PinnedString + Return New PinnedString(obj) + End Function + + ''' + ''' Initializes a new instance with an existing type T array and pins memory + ''' position. + ''' + ''' Existing object to marshal to unmanaged memory. + + Public Shared Function Create(Of T As Structure)(obj As T()) As PinnedBuffer(Of T) + Return New PinnedBuffer(Of T)(obj) + End Function + +#If Not NET_CORE Then + + Public Shared Function PtrToStructure(Of T)(ptr As IntPtr) As T + Return DirectCast(Marshal.PtrToStructure(ptr, GetType(T)), T) + End Function + + + Public Shared Sub DestroyStructure(Of T)(ptr As IntPtr) + Marshal.DestroyStructure(ptr, GetType(T)) + End Sub +#End If + + + Public Shared Function Serialize(Of T)(obj As T) As Byte() + Using pinned As New PinnedBuffer(Of Byte)(SizeOf(GetType(T))) + StructureToPtr(obj, pinned.DangerousGetHandle(), fDeleteOld:=False) + Return pinned.Target + End Using + End Function + + + Public Shared Function Deserialize(Of T)(buffer As Byte(), free As Boolean, checkinput As Boolean) As T + If checkinput AndAlso + (buffer Is Nothing OrElse buffer.Length < SizeOf(GetType(T))) Then + + Throw New ArgumentException("Invalid input buffer", NameOf(buffer)) + End If + + Using pinned = Create(buffer) + Dim obj = PtrToStructure(Of T)(pinned.DangerousGetHandle()) + If free Then + DestroyStructure(Of T)(pinned.DangerousGetHandle()) + End If + Return obj + End Using + + End Function + +#If NET40_OR_GREATER OrElse Not NETFRAMEWORK Then + + Public Sub New(existing As PinnedBuffer, offset As Integer) + MyBase.New(ownsHandle:=True) + + Initialize(existing.ByteLength) + + _gchandle = GCHandle.Alloc(existing._gchandle.Target, GCHandleType.Pinned) + + SetHandle(_gchandle.AddrOfPinnedObject() + existing.Offset + offset) + + End Sub + + ''' + ''' Initializes a new instance with an existing object and pins memory + ''' position. + ''' + ''' Existing object to pin in memory. + ''' Total number of bytes used by obj in unmanaged memory + ''' Byte offset into unmanaged memory where this instance should start + + Public Sub New(obj As Object, toalObjectSize As Integer, byteOffset As Integer) + MyClass.New() + + If byteOffset > toalObjectSize Then + Throw New ArgumentOutOfRangeException("Argument offset must be within total object size", "offset") + End If + + Initialize(CULng(toalObjectSize - byteOffset)) + + _gchandle = GCHandle.Alloc(obj, GCHandleType.Pinned) + + SetHandle(_gchandle.AddrOfPinnedObject() + byteOffset) + + End Sub +#End If + + ''' + ''' Initializes a new instance with an existing object and pins memory + ''' position. + ''' + ''' Existing object to pin in memory. + ''' Number of bytes in unmanaged memory + + Public Sub New(obj As Object, size As Integer) + MyClass.New() + + Initialize(CULng(size)) + + _gchandle = GCHandle.Alloc(obj, GCHandleType.Pinned) + + SetHandle(_gchandle.AddrOfPinnedObject()) + + End Sub + + + Protected Overrides Function ReleaseHandle() As Boolean + _gchandle.Free() + Return True + End Function + + Public ReadOnly Property Target As Object + + Get + Return _gchandle.Target + End Get + End Property + +#If NET40_OR_GREATER OrElse Not NETFRAMEWORK Then + + Public Shared Operator +(existing As PinnedBuffer, offset As Integer) As PinnedBuffer + + Return New PinnedBuffer(existing, offset) + + End Operator + + Public Shared Operator -(existing As PinnedBuffer, offset As Integer) As PinnedBuffer + + Return New PinnedBuffer(existing, -offset) + + End Operator + +#End If + + + Public Overrides Function ToString() As String + + If _gchandle.IsAllocated Then + Return _gchandle.Target.ToString() + Else + Return "{Unallocated}" + End If + + End Function + + End Class + + ''' + ''' Pins a managed string for unmanaged use. + ''' + + + + Public Class PinnedString + Inherits PinnedBuffer + + ''' + ''' Initializes a new instance with an existing managed string and pins memory + ''' position. + ''' + ''' Managed string to pin in unmanaged memory. + + Public Sub New(str As String) + MyBase.New(str, str.Length << 1) + + End Sub + + ''' + ''' Initializes a new instance with a new managed string and pins memory + ''' position. + ''' + ''' Size in characters of managed string to pin in unmanaged memory. + + Public Sub New(count As Integer) + MyBase.New(New String(New Char, count), count << 1) + + End Sub + + ''' + ''' Returns managed object pinned by this instance. + ''' + Public Overloads ReadOnly Property Target As String + + Get + Return DirectCast(_gchandle.Target, String) + End Get + End Property + + End Class + + ''' + ''' Pins an array of values for unmanaged use. + ''' + ''' Type of elements in array. + + + + Public Class PinnedBuffer(Of T As Structure) + Inherits PinnedBuffer + + ''' + ''' Initializes a new instance with an new type T array and pins memory + ''' position. + ''' + ''' Number of items in new array. + + Public Sub New(count As Integer) + MyBase.New(New T(count - 1) {}, SizeOf(GetType(T)) * count) + + End Sub + + ''' + ''' Initializes a new instance with an existing type T array and pins memory + ''' position. + ''' + ''' Existing object to marshal to unmanaged memory. + + Public Sub New(obj As T()) + MyBase.New(obj, Buffer.ByteLength(obj)) + + End Sub + +#If NET40_OR_GREATER OrElse Not NETFRAMEWORK Then + ''' + ''' Initializes a new instance with an existing type T array and pins memory + ''' position. + ''' + ''' Existing object to marshal to unmanaged memory. + + Public Sub New(obj As T(), arrayOffset As Integer, arrayItems As Integer) + MyBase.New(obj, MakeTotalByteSize(obj, arrayOffset, arrayItems), (Buffer.ByteLength(obj) \ obj.Length) * arrayOffset) + + End Sub + + Private Shared Function MakeTotalByteSize(obj() As T, arrayOffset As Integer, arrayItems As Integer) As Integer + + If arrayOffset >= obj.Length OrElse + arrayOffset + arrayItems > obj.Length Then + + Throw New IndexOutOfRangeException("arrayOffset and arrayItems must resolve to positions within the array") + + ElseIf arrayOffset + arrayItems < obj.Length Then + + Return (Buffer.ByteLength(obj) \ obj.Length) * (arrayOffset + arrayItems) + + Else + + Return Buffer.ByteLength(obj) + + End If + + End Function +#End If + + ''' + ''' Returns associated object of this instance. + ''' + Public Overloads ReadOnly Property Target As T() + + Get + Return DirectCast(_gchandle.Target, T()) + End Get + End Property + + End Class + +End Namespace diff --git a/ImDiskNet/ImDiskNet/ImDisk/ComInterop/ImDiskCOM.vb b/ImDiskNet/ImDiskNet/ImDisk/ComInterop/ImDiskCOM.vb index 43724c2..4b1470d 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/ComInterop/ImDiskCOM.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/ComInterop/ImDiskCOM.vb @@ -1,4 +1,12 @@ -Namespace ImDisk.ComInterop +#Disable Warning CA1822 ' Mark members as static +#Disable Warning CA1707 ' Identifiers should not contain underscores +#Disable Warning CA1711 ' Identifiers should not have incorrect suffix +#Disable Warning CA1305 ' Specify IFormatProvider + +Imports System.IO +Imports System.Runtime.InteropServices + +Namespace ImDisk.ComInterop @@ -264,22 +272,22 @@ Public Structure LARGE_INTEGER - Implements IEquatable(Of LARGE_INTEGER), IEquatable(Of Int64) + Implements IEquatable(Of LARGE_INTEGER), IEquatable(Of Int64), IComparable(Of LARGE_INTEGER), IComparable(Of Int64) - Public LowPart As Int32 - Public HighPart As Int32 + Public Property LowPart As Int32 + Public Property HighPart As Int32 Public Property QuadPart As Int64 Get Dim bytes As New List(Of Byte)(8) - bytes.AddRange(BitConverter.GetBytes(LowPart)) - bytes.AddRange(BitConverter.GetBytes(HighPart)) + bytes.AddRange(BitConverter.GetBytes(_LowPart)) + bytes.AddRange(BitConverter.GetBytes(_HighPart)) Return BitConverter.ToInt64(bytes.ToArray(), 0) End Get - Set(value As Int64) - Dim bytes = BitConverter.GetBytes(value) - LowPart = BitConverter.ToInt32(bytes, 0) - HighPart = BitConverter.ToInt32(bytes, 4) + Set + Dim bytes = BitConverter.GetBytes(Value) + _LowPart = BitConverter.ToInt32(bytes, 0) + _HighPart = BitConverter.ToInt32(bytes, 4) End Set End Property @@ -303,12 +311,62 @@ Return value.QuadPart End Operator - Public Overloads Function Equals(other As Int64) As Boolean Implements IEquatable(Of Int64).Equals - Return QuadPart = other + Public Overloads Function Equals(other As LARGE_INTEGER) As Boolean Implements IEquatable(Of LARGE_INTEGER).Equals + Return _LowPart = other._LowPart AndAlso _HighPart = other._HighPart End Function - Public Overloads Function Equals(other As LARGE_INTEGER) As Boolean Implements IEquatable(Of LARGE_INTEGER).Equals - Return LowPart = other.LowPart AndAlso HighPart = other.HighPart + Public Overrides Function Equals(obj As Object) As Boolean + If TypeOf obj Is IEquatable(Of LARGE_INTEGER) Then + Return DirectCast(obj, IEquatable(Of LARGE_INTEGER)).Equals(Me) + ElseIf TypeOf obj Is IEquatable(Of Int64) Then + Return DirectCast(obj, IEquatable(Of Int64)).Equals(QuadPart) + Else + Return False + End If + End Function + + Public Shared Operator =(left As LARGE_INTEGER, right As LARGE_INTEGER) As Boolean + Return left.Equals(right) + End Operator + + Public Shared Operator <>(left As LARGE_INTEGER, right As LARGE_INTEGER) As Boolean + Return Not left.Equals(right) + End Operator + + Public Function ToLARGE_INTEGER() As LARGE_INTEGER + Return Me + End Function + + Public Function ToInt64() As Long + Return Me + End Function + + Public Function CompareTo(other As LARGE_INTEGER) As Integer Implements IComparable(Of LARGE_INTEGER).CompareTo + Throw New NotImplementedException() + End Function + + Public Shared Operator <(left As LARGE_INTEGER, right As LARGE_INTEGER) As Boolean + Return left.CompareTo(right) < 0 + End Operator + + Public Shared Operator <=(left As LARGE_INTEGER, right As LARGE_INTEGER) As Boolean + Return left.CompareTo(right) <= 0 + End Operator + + Public Shared Operator >(left As LARGE_INTEGER, right As LARGE_INTEGER) As Boolean + Return left.CompareTo(right) > 0 + End Operator + + Public Shared Operator >=(left As LARGE_INTEGER, right As LARGE_INTEGER) As Boolean + Return left.CompareTo(right) >= 0 + End Operator + + Public Function CompareTo(other As Long) As Integer Implements IComparable(Of Long).CompareTo + Return QuadPart.CompareTo(other) + End Function + + Public Overloads Function Equals(other As Long) As Boolean Implements IEquatable(Of Long).Equals + Return QuadPart.Equals(other) End Function End Structure diff --git a/ImDiskNet/ImDiskNet/ImDisk/Flags.vb b/ImDiskNet/ImDiskNet/ImDisk/Flags.vb index f209952..75b13f7 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/Flags.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/Flags.vb @@ -1,4 +1,7 @@ -Namespace ImDisk +#Disable Warning CA1028 ' Enum Storage should be Int32 +#Disable Warning CA1008 + +Namespace ImDisk ''' ''' Values for ImDisk flags fields used when creating, querying or modifying virtual disks. diff --git a/ImDiskNet/ImDiskNet/ImDisk/ImDiskAPI.vb b/ImDiskNet/ImDiskNet/ImDisk/ImDiskAPI.vb index 7b8aa56..02faebf 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/ImDiskAPI.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/ImDiskAPI.vb @@ -1,4 +1,9 @@ -Imports System.Threading +Imports System.Collections.ObjectModel +Imports System.ComponentModel +Imports System.IO +Imports System.Runtime.InteropServices +Imports System.Text +Imports System.Threading Namespace ImDisk @@ -69,12 +74,12 @@ Namespace ImDisk ''' ''' ImDisk API behaviour flags. ''' - Public Shared Property APIFlags As DLL.ImDiskAPIFlags + Public Shared Property APIFlags As UnsafeNativeMethods.ImDiskAPIFlags Get - Return DLL.ImDiskGetAPIFlags() + Return UnsafeNativeMethods.ImDiskGetAPIFlags() End Get - Set(value As DLL.ImDiskAPIFlags) - DLL.ImDiskSetAPIFlags(value) + Set + UnsafeNativeMethods.ImDiskSetAPIFlags(Value) End Set End Property @@ -110,7 +115,7 @@ Namespace ImDisk Public Shared Function GetOffsetByFileExt(ImageFile As String) As Long Dim Offset As Long - If DLL.ImDiskGetOffsetByFileExt(ImageFile, Offset) Then + If UnsafeNativeMethods.ImDiskGetOffsetByFileExt(ImageFile, Offset) Then Return Offset Else Return 0 @@ -118,7 +123,7 @@ Namespace ImDisk End Function - Private Shared Function GetStreamReaderFunction(stream As Stream) As DLL.ImDiskReadFileManagedProc + Private Shared Function GetStreamReaderFunction(stream As Stream) As UnsafeNativeMethods.ImDiskReadFileManagedProc Return _ Function(_Handle As IntPtr, @@ -149,11 +154,11 @@ Namespace ImDisk ''' parameter is in most cases 512. ''' Offset in image file where master boot record is located. ''' An array of PARTITION_INFORMATION structures - Public Shared Function GetPartitionInformation(ImageFile As String, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Shared Function GetPartitionInformation(ImageFile As String, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) - Dim PartitionInformation As New List(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Dim PartitionInformation As New List(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) - NativeFileIO.Win32Try(DLL.ImDiskGetPartitionInformationEx(ImageFile, SectorSize, Offset, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetPartitionInformationEx(ImageFile, SectorSize, Offset, Function(data, ByRef info) PartitionInformation.Add(info) Return True @@ -172,13 +177,13 @@ Namespace ImDisk ''' parameter is in most cases 512. ''' Offset in image file where master boot record is located. ''' An array of PARTITION_INFORMATION structures - Public Shared Function GetPartitionInformation(ImageFile As Stream, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Shared Function GetPartitionInformation(ImageFile As Stream, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) Dim StreamReader = GetStreamReaderFunction(ImageFile) - Dim PartitionInformation As New List(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Dim PartitionInformation As New List(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) - NativeFileIO.Win32Try(DLL.ImDiskGetPartitionInfoIndirectEx(Nothing, StreamReader, SectorSize, Offset, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetPartitionInfoIndirectEx(Nothing, StreamReader, SectorSize, Offset, Function(data, ByRef info) PartitionInformation.Add(info) Return True @@ -198,11 +203,11 @@ Namespace ImDisk ''' parameter is in most cases 512. ''' Offset in image file where master boot record is located. ''' An array of PARTITION_INFORMATION structures - Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As DLL.ImDiskReadFileManagedProc, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As UnsafeNativeMethods.ImDiskReadFileManagedProc, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) - Dim PartitionInformation As New List(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Dim PartitionInformation As New List(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) - NativeFileIO.Win32Try(DLL.ImDiskGetPartitionInfoIndirectEx(Handle, ReadFileProc, SectorSize, Offset, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetPartitionInfoIndirectEx(Handle, ReadFileProc, SectorSize, Offset, Function(data, ByRef info) PartitionInformation.Add(info) Return True @@ -221,7 +226,7 @@ Namespace ImDisk ''' Sector size for translating sector values to absolute byte positions. This ''' parameter is in most cases 512. ''' An array of PARTITION_INFORMATION structures - Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As DLL.ImDiskReadFileManagedProc, SectorSize As UInt32) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As UnsafeNativeMethods.ImDiskReadFileManagedProc, SectorSize As UInt32) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) Return GetPartitionInformation(Handle, ReadFileProc, SectorSize, 0) @@ -236,11 +241,11 @@ Namespace ImDisk ''' parameter is in most cases 512. ''' Offset in image file where master boot record is located. ''' An array of PARTITION_INFORMATION structures - Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As DLL.ImDiskReadFileUnmanagedProc, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As UnsafeNativeMethods.ImDiskReadFileUnmanagedProc, SectorSize As UInt32, Offset As Long) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) - Dim PartitionInformation As New List(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Dim PartitionInformation As New List(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) - NativeFileIO.Win32Try(DLL.ImDiskGetPartitionInfoIndirectEx(Handle, ReadFileProc, SectorSize, Offset, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetPartitionInfoIndirectEx(Handle, ReadFileProc, SectorSize, Offset, Function(data, ByRef info) PartitionInformation.Add(info) Return True @@ -259,7 +264,7 @@ Namespace ImDisk ''' Sector size for translating sector values to absolute byte positions. This ''' parameter is in most cases 512. ''' An array of PARTITION_INFORMATION structures - Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As DLL.ImDiskReadFileUnmanagedProc, SectorSize As UInt32) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Shared Function GetPartitionInformation(Handle As IntPtr, ReadFileProc As UnsafeNativeMethods.ImDiskReadFileUnmanagedProc, SectorSize As UInt32) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) Return GetPartitionInformation(Handle, ReadFileProc, SectorSize, 0) @@ -272,7 +277,7 @@ Namespace ImDisk ''' Sector size for translating sector values to absolute byte positions. This ''' parameter is in most cases 512. ''' An array of PARTITION_INFORMATION structures - Public Shared Function GetPartitionInformation(ImageFile As String, SectorSize As UInt32) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) + Public Shared Function GetPartitionInformation(ImageFile As String, SectorSize As UInt32) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) Return GetPartitionInformation(ImageFile, SectorSize, 0) @@ -283,8 +288,13 @@ Namespace ImDisk ''' from source sequence with valid partition definitions. ''' ''' Sequence of partition table entries - Public Shared Function FilterDefinedPartitions(PartitionList As IEnumerable(Of NativeFileIO.Win32API.PARTITION_INFORMATION)) As ReadOnlyCollection(Of NativeFileIO.Win32API.PARTITION_INFORMATION) - Dim DefinedPartitions As New List(Of NativeFileIO.Win32API.PARTITION_INFORMATION)(7) + Public Shared Function FilterDefinedPartitions(PartitionList As IEnumerable(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION)) As ReadOnlyCollection(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION) + + If PartitionList Is Nothing Then + Throw New ArgumentNullException(NameOf(PartitionList)) + End If + + Dim DefinedPartitions As New List(Of NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION)(7) For Each PartitionInfo In PartitionList If PartitionInfo.PartitionLength <> 0 AndAlso Not PartitionInfo.IsContainerPartition Then @@ -303,7 +313,7 @@ Namespace ImDisk ''' Optional offset in bytes to where raw disk data begins, for use ''' with "non-raw" image files with headers before the actual disk image data. Public Shared Function ImageContainsISOFS(Imagefile As String, Offset As Int64) As Boolean - Dim rc = DLL.ImDiskImageContainsISOFS(Imagefile, Offset) + Dim rc = UnsafeNativeMethods.ImDiskImageContainsISOFS(Imagefile, Offset) If rc Then Return True ElseIf Marshal.GetLastWin32Error() = 0 Then @@ -320,7 +330,7 @@ Namespace ImDisk ''' Optional offset in bytes to where raw disk data begins, for use ''' with "non-raw" image files with headers before the actual disk image data. Public Shared Function ImageContainsISOFS(Imagefile As Stream, Offset As Int64) As Boolean - Dim rc = DLL.ImDiskImageContainsISOFSIndirect(Nothing, GetStreamReaderFunction(Imagefile), Offset) + Dim rc = UnsafeNativeMethods.ImDiskImageContainsISOFSIndirect(Nothing, GetStreamReaderFunction(Imagefile), Offset) If rc Then Return True ElseIf Marshal.GetLastWin32Error() = 0 Then @@ -345,9 +355,9 @@ Namespace ImDisk ''' single volume. ''' A DISK_GEOMETRY structure that receives information about formatted geometry. ''' This function zeroes the Cylinders member. - Public Shared Function GetFormattedGeometry(Imagefile As String, Offset As Int64) As NativeFileIO.Win32API.DISK_GEOMETRY - Dim DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY - NativeFileIO.Win32Try(DLL.ImDiskGetFormattedGeometry(Imagefile, Offset, DiskGeometry)) + Public Shared Function GetFormattedGeometry(Imagefile As String, Offset As Int64) As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY + Dim DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetFormattedGeometry(Imagefile, Offset, DiskGeometry)) Return DiskGeometry End Function @@ -365,9 +375,9 @@ Namespace ImDisk ''' single volume. ''' A DISK_GEOMETRY structure that receives information about formatted geometry. ''' This function zeroes the Cylinders member. - Public Shared Function GetFormattedGeometry(Imagefile As Stream, Offset As Int64) As NativeFileIO.Win32API.DISK_GEOMETRY - Dim DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY - NativeFileIO.Win32Try(DLL.ImDiskGetFormattedGeometryIndirect(Nothing, GetStreamReaderFunction(Imagefile), Offset, DiskGeometry)) + Public Shared Function GetFormattedGeometry(Imagefile As Stream, Offset As Int64) As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY + Dim DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetFormattedGeometryIndirect(Nothing, GetStreamReaderFunction(Imagefile), Offset, DiskGeometry)) Return DiskGeometry End Function @@ -418,7 +428,7 @@ Namespace ImDisk ''' Public Shared Sub LoadDriver() - NativeFileIO.Win32Try(DLL.ImDiskStartService("ImDisk")) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskStartService("ImDisk")) End Sub @@ -430,7 +440,7 @@ Namespace ImDisk ''' Public Shared Sub LoadHelperService() - NativeFileIO.Win32Try(DLL.ImDiskStartService("ImDskSvc")) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskStartService("ImDskSvc")) End Sub @@ -445,7 +455,7 @@ Namespace ImDisk ''' Target path in native format, for example \Device\ImDisk0 Public Shared Sub CreateMountPoint(Directory As String, Target As String) - NativeFileIO.Win32Try(DLL.ImDiskCreateMountPoint(Directory, Target)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskCreateMountPoint(Directory, Target)) End Sub @@ -460,7 +470,7 @@ Namespace ImDisk ''' Device number of an existing ImDisk virtual disk Public Shared Sub CreateMountPoint(Directory As String, DeviceNumber As UInt32) - NativeFileIO.Win32Try(DLL.ImDiskCreateMountPoint(Directory, "\Device\ImDisk" & DeviceNumber)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskCreateMountPoint(Directory, "\Device\ImDisk" & DeviceNumber)) End Sub @@ -472,7 +482,7 @@ Namespace ImDisk ''' letter followed by a colon to remove a drive letter mount point. Public Shared Sub RemoveMountPoint(MountPoint As String) - NativeFileIO.Win32Try(DLL.ImDiskRemoveMountPoint(MountPoint)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskRemoveMountPoint(MountPoint)) End Sub @@ -481,7 +491,7 @@ Namespace ImDisk ''' Public Shared Function FindFreeDriveLetter() As Char - Return DLL.ImDiskFindFreeDriveLetter() + Return UnsafeNativeMethods.ImDiskFindFreeDriveLetter() End Function @@ -495,7 +505,7 @@ Namespace ImDisk For i = 0 To 1 - If DLL.ImDiskGetDeviceListEx(NativeList.Length, NativeList) Then + If UnsafeNativeMethods.ImDiskGetDeviceListEx(NativeList.Length, NativeList) Then Exit For End If @@ -503,7 +513,7 @@ Namespace ImDisk Select Case errorcode - Case NativeFileIO.Win32API.ERROR_MORE_DATA + Case NativeFileIO.UnsafeNativeMethods.ERROR_MORE_DATA Array.Resize(NativeList, NativeList(0) + 1) Continue For @@ -532,7 +542,7 @@ Namespace ImDisk ''' Optional handle to control that can display status messages during operation. Public Shared Sub ExtendDevice(DeviceNumber As UInt32, ExtendSize As Int64, StatusControl As IntPtr) - NativeFileIO.Win32Try(DLL.ImDiskExtendDevice(StatusControl, DeviceNumber, ExtendSize)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskExtendDevice(StatusControl, DeviceNumber, ExtendSize)) End Sub @@ -582,14 +592,14 @@ Namespace ImDisk MountPoint As String, StatusControl As IntPtr) - Dim DiskGeometry As New NativeFileIO.Win32API.DISK_GEOMETRY With { + Dim DiskGeometry As New NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY With { .Cylinders = DiskSize, .TracksPerCylinder = TracksPerCylinder, .SectorsPerTrack = SectorsPerTrack, .BytesPerSector = BytesPerSector } - NativeFileIO.Win32Try(DLL.ImDiskCreateDevice(StatusControl, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskCreateDevice(StatusControl, DiskGeometry, ImageOffset, Flags, @@ -625,9 +635,9 @@ Namespace ImDisk MountPoint As String, ByRef DeviceNumber As UInt32) - Dim DiskGeometry As New NativeFileIO.Win32API.DISK_GEOMETRY + Dim DiskGeometry As New NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY - NativeFileIO.Win32Try(DLL.ImDiskCreateDeviceEx(IntPtr.Zero, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskCreateDeviceEx(IntPtr.Zero, DeviceNumber, DiskGeometry, ImageOffset, @@ -652,11 +662,11 @@ Namespace ImDisk MountPoint As String, ByRef DeviceNumber As UInt32) - Dim DiskGeometry As New NativeFileIO.Win32API.DISK_GEOMETRY With { + Dim DiskGeometry As New NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY With { .Cylinders = DiskSize } - NativeFileIO.Win32Try(DLL.ImDiskCreateDeviceEx(IntPtr.Zero, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskCreateDeviceEx(IntPtr.Zero, DeviceNumber, DiskGeometry, 0, @@ -703,11 +713,11 @@ Namespace ImDisk MountPoint As String, ByRef DeviceNumber As UInt32) - Dim DiskGeometry As New NativeFileIO.Win32API.DISK_GEOMETRY With { + Dim DiskGeometry As New NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY With { .Cylinders = DiskSize } - NativeFileIO.Win32Try(DLL.ImDiskCreateDeviceEx(IntPtr.Zero, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskCreateDeviceEx(IntPtr.Zero, DeviceNumber, DiskGeometry, 0, @@ -760,14 +770,14 @@ Namespace ImDisk ByRef DeviceNumber As UInt32, StatusControl As IntPtr) - Dim DiskGeometry As New NativeFileIO.Win32API.DISK_GEOMETRY With { + Dim DiskGeometry As New NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY With { .Cylinders = DiskSize, .TracksPerCylinder = TracksPerCylinder, .SectorsPerTrack = SectorsPerTrack, .BytesPerSector = BytesPerSector } - NativeFileIO.Win32Try(DLL.ImDiskCreateDeviceEx(StatusControl, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskCreateDeviceEx(StatusControl, DeviceNumber, DiskGeometry, ImageOffset, @@ -795,7 +805,7 @@ Namespace ImDisk ''' Optional handle to control that can display status messages during operation. Public Shared Sub RemoveDevice(DeviceNumber As UInt32, StatusControl As IntPtr) - NativeFileIO.Win32Try(DLL.ImDiskRemoveDevice(StatusControl, DeviceNumber, Nothing)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskRemoveDevice(StatusControl, DeviceNumber, Nothing)) End Sub @@ -817,9 +827,10 @@ Namespace ImDisk Public Shared Sub RemoveDevice(MountPoint As String, StatusControl As IntPtr) If String.IsNullOrEmpty(MountPoint) Then - Throw New ArgumentNullException("MountPoint") + Throw New ArgumentNullException(NameOf(MountPoint)) End If - NativeFileIO.Win32Try(DLL.ImDiskRemoveDevice(StatusControl, 0, MountPoint)) + + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskRemoveDevice(StatusControl, 0, MountPoint)) End Sub @@ -829,7 +840,7 @@ Namespace ImDisk ''' Device number to remove. Public Shared Sub ForceRemoveDevice(DeviceNumber As UInt32) - NativeFileIO.Win32Try(DLL.ImDiskForceRemoveDevice(IntPtr.Zero, DeviceNumber)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskForceRemoveDevice(IntPtr.Zero, DeviceNumber)) End Sub @@ -862,25 +873,26 @@ Namespace ImDisk Dim CreateDataBuffer As Byte() = Nothing Array.Resize(CreateDataBuffer, 1096) - NativeFileIO.Win32Try(DLL.ImDiskQueryDevice(DeviceNumber, CreateDataBuffer, CreateDataBuffer.Length)) - - Dim CreateDataReader As New BinaryReader(New MemoryStream(CreateDataBuffer), Encoding.Unicode) - DeviceNumber = CreateDataReader.ReadUInt32() - Dim Dummy = CreateDataReader.ReadUInt32() - DiskSize = CreateDataReader.ReadInt64() - Dim MediaType = CreateDataReader.ReadInt32() - TracksPerCylinder = CreateDataReader.ReadUInt32() - SectorsPerTrack = CreateDataReader.ReadUInt32() - BytesPerSector = CreateDataReader.ReadUInt32() - ImageOffset = CreateDataReader.ReadInt64() - Flags = CType(CreateDataReader.ReadUInt32(), ImDiskFlags) - DriveLetter = CreateDataReader.ReadChar() - Dim FilenameLength = CreateDataReader.ReadUInt16() - If FilenameLength = 0 Then - Filename = Nothing - Else - Filename = Encoding.Unicode.GetString(CreateDataReader.ReadBytes(FilenameLength)) - End If + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskQueryDevice(DeviceNumber, CreateDataBuffer, CreateDataBuffer.Length)) + + Using CreateDataReader As New BinaryReader(New MemoryStream(CreateDataBuffer), Encoding.Unicode) + CreateDataReader.ReadUInt32() + Dim Dummy = CreateDataReader.ReadUInt32() + DiskSize = CreateDataReader.ReadInt64() + Dim MediaType = CreateDataReader.ReadInt32() + TracksPerCylinder = CreateDataReader.ReadUInt32() + SectorsPerTrack = CreateDataReader.ReadUInt32() + BytesPerSector = CreateDataReader.ReadUInt32() + ImageOffset = CreateDataReader.ReadInt64() + Flags = CType(CreateDataReader.ReadUInt32(), ImDiskFlags) + DriveLetter = CreateDataReader.ReadChar() + Dim FilenameLength = CreateDataReader.ReadUInt16() + If FilenameLength = 0 Then + Filename = Nothing + Else + Filename = Encoding.Unicode.GetString(CreateDataReader.ReadBytes(FilenameLength)) + End If + End Using End Sub @@ -888,10 +900,10 @@ Namespace ImDisk ''' Retrieves properties for an existing ImDisk virtual disk. ''' ''' Device number of ImDisk virtual disk to retrieve properties for. - Public Shared Function QueryDevice(DeviceNumber As UInt32) As DLL.ImDiskCreateData + Public Shared Function QueryDevice(DeviceNumber As UInt32) As UnsafeNativeMethods.ImDiskCreateData - Dim CreateDataBuffer As New DLL.ImDiskCreateData - NativeFileIO.Win32Try(DLL.ImDiskQueryDevice(DeviceNumber, CreateDataBuffer, Marshal.SizeOf(CreateDataBuffer.GetType()))) + Dim CreateDataBuffer As New UnsafeNativeMethods.ImDiskCreateData + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskQueryDevice(DeviceNumber, CreateDataBuffer, Marshal.SizeOf(CreateDataBuffer.GetType()))) Return CreateDataBuffer End Function @@ -922,7 +934,7 @@ Namespace ImDisk Flags As ImDiskFlags, StatusControl As IntPtr) - NativeFileIO.Win32Try(DLL.ImDiskChangeFlags(StatusControl, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskChangeFlags(StatusControl, DeviceNumber, Nothing, FlagsToChange, @@ -956,7 +968,7 @@ Namespace ImDisk Flags As ImDiskFlags, StatusControl As IntPtr) - NativeFileIO.Win32Try(DLL.ImDiskChangeFlags(StatusControl, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskChangeFlags(StatusControl, 0, MountPoint, FlagsToChange, @@ -1081,11 +1093,15 @@ Namespace ImDisk ''' without any partition definitions. ''' Pointer to memory buffer of at least 512 bytes where MBR will ''' be built. - Public Shared Sub BuildInMemoryMBR(DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, - PartitionInfo As NativeFileIO.Win32API.PARTITION_INFORMATION(), + Public Shared Sub BuildInMemoryMBR(DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, + PartitionInfo As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION(), MBR As Byte()) - NativeFileIO.Win32Try(DLL.ImDiskBuildMBR(DiskGeometry, + If MBR Is Nothing Then + Throw New ArgumentNullException(NameOf(MBR)) + End If + + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskBuildMBR(DiskGeometry, PartitionInfo, CByte(If(PartitionInfo Is Nothing, 0, PartitionInfo.Length)), MBR, @@ -1115,12 +1131,12 @@ Namespace ImDisk ''' This parameter can be Nothing/null to create an empty MBR with just boot code ''' without any partition definitions. ''' Memory buffer containing built MBR. - Public Shared Function BuildInMemoryMBR(DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, - PartitionInfo As NativeFileIO.Win32API.PARTITION_INFORMATION()) As Byte() + Public Shared Function BuildInMemoryMBR(DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, + PartitionInfo As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION()) As Byte() Dim MBR(0 To 511) As Byte - NativeFileIO.Win32Try(DLL.ImDiskBuildMBR(DiskGeometry, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskBuildMBR(DiskGeometry, PartitionInfo, CByte(If(PartitionInfo Is Nothing, 0, PartitionInfo.Length)), MBR, @@ -1139,10 +1155,10 @@ Namespace ImDisk ''' Pointer to CHS disk address in three-byte partition table ''' style format. ''' Calculated LBA disk address. - Public Shared Function ConvertCHSToLBA(DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, + Public Shared Function ConvertCHSToLBA(DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, CHS As Byte()) As UInteger - Return DLL.ImDiskConvertCHSToLBA(DiskGeometry, CHS) + Return UnsafeNativeMethods.ImDiskConvertCHSToLBA(DiskGeometry, CHS) End Function @@ -1155,10 +1171,10 @@ Namespace ImDisk ''' SectorsPerTrack and TracksPerCylinder members. ''' LBA disk address. ''' Calculated CHS values expressed in an array of three bytes. - Public Shared Function ConvertCHSToLBA(DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, + Public Shared Function ConvertCHSToLBA(DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, LBA As UInteger) As Byte() - Dim bytes = BitConverter.GetBytes(DLL.ImDiskConvertLBAToCHS(DiskGeometry, LBA)) + Dim bytes = BitConverter.GetBytes(UnsafeNativeMethods.ImDiskConvertLBAToCHS(DiskGeometry, LBA)) Array.Resize(bytes, 3) Return bytes @@ -1169,9 +1185,9 @@ Namespace ImDisk ''' when driver is loaded). ''' ImDiskCreateData that contains device creation ''' settings to save. This structure is for example returned by QueryDevice. - Public Shared Sub SaveRegistrySettings(CreateData As DLL.ImDiskCreateData) + Public Shared Sub SaveRegistrySettings(CreateData As UnsafeNativeMethods.ImDiskCreateData) - NativeFileIO.Win32Try(DLL.ImDiskSaveRegistrySettings(CreateData)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveRegistrySettings(CreateData)) End Sub @@ -1182,7 +1198,7 @@ Namespace ImDisk ''' Device number specified in registry settings. Public Shared Sub RemoveRegistrySettings(DeviceNumber As UInt32) - NativeFileIO.Win32Try(DLL.ImDiskRemoveRegistrySettings(DeviceNumber)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskRemoveRegistrySettings(DeviceNumber)) End Sub @@ -1194,7 +1210,7 @@ Namespace ImDisk Public Shared Function GetRegistryAutoLoadDevices() As UInt32 Dim LoadDevicesValue As UInt32 - NativeFileIO.Win32Try(DLL.ImDiskGetRegistryAutoLoadDevices(LoadDevicesValue)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetRegistryAutoLoadDevices(LoadDevicesValue)) Return LoadDevicesValue End Function @@ -1222,7 +1238,7 @@ Namespace ImDisk ''' Public Shared Sub NotifyShellDriveLetter(WindowHandle As IntPtr, DriveLetterPath As String) - NativeFileIO.Win32Try(DLL.ImDiskNotifyShellDriveLetter(WindowHandle, DriveLetterPath)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskNotifyShellDriveLetter(WindowHandle, DriveLetterPath)) End Sub @@ -1239,7 +1255,7 @@ Namespace ImDisk ''' Public Shared Sub NotifyRemovePending(WindowHandle As IntPtr, DriveLetter As Char) - NativeFileIO.Win32Try(DLL.ImDiskNotifyRemovePending(WindowHandle, DriveLetter)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskNotifyRemovePending(WindowHandle, DriveLetter)) End Sub diff --git a/ImDiskNet/ImDiskNet/ImDisk/ImDiskControl.vb b/ImDiskNet/ImDiskNet/ImDisk/ImDiskControl.vb index fbd49fe..cf682eb 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/ImDiskControl.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/ImDiskControl.vb @@ -1,20 +1,22 @@ -Namespace ImDisk +Imports System.Runtime.InteropServices - ''' - ''' Represents ImDisk Virtual Disk Driver control device object. - ''' - - Public Class ImDiskControl - Inherits ImDiskObject +Namespace ImDisk ''' - ''' Creates a new instance and opens ImDisk Virtual Disk Driver control device object. + ''' Represents ImDisk Virtual Disk Driver control device object. ''' - Public Sub New() - MyBase.New("\\?\ImDiskCtl", AccessMode:=0) + + Public Class ImDiskControl + Inherits ImDiskObject - End Sub + ''' + ''' Creates a new instance and opens ImDisk Virtual Disk Driver control device object. + ''' + Public Sub New() + MyBase.New("\\?\ImDiskCtl", AccessMode:=0) - End Class + End Sub + + End Class End Namespace \ No newline at end of file diff --git a/ImDiskNet/ImDiskNet/ImDisk/ImDiskDevice.vb b/ImDiskNet/ImDiskNet/ImDisk/ImDiskDevice.vb index 248fc8d..259e772 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/ImDiskDevice.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/ImDiskDevice.vb @@ -1,4 +1,9 @@ -Namespace ImDisk +Imports System.ComponentModel +Imports System.IO +Imports System.Runtime.InteropServices +Imports Microsoft.Win32.SafeHandles + +Namespace ImDisk ''' ''' Represents ImDisk Virtual Disk Driver disk device objects. @@ -12,15 +17,15 @@ Private Shared Function OpenDeviceHandle(DeviceNumber As UInt32, AccessMode As FileAccess) As SafeFileHandle - Dim NativeAccessMode As UInt32 = NativeFileIO.Win32API.FILE_READ_ATTRIBUTES + Dim NativeAccessMode As UInt32 = NativeFileIO.UnsafeNativeMethods.FILE_READ_ATTRIBUTES If (AccessMode And FileAccess.Read) = FileAccess.Read Then - NativeAccessMode += NativeFileIO.Win32API.GENERIC_READ + NativeAccessMode += NativeFileIO.UnsafeNativeMethods.GENERIC_READ End If If (AccessMode And FileAccess.Write) = FileAccess.Write Then - NativeAccessMode += NativeFileIO.Win32API.GENERIC_WRITE + NativeAccessMode += NativeFileIO.UnsafeNativeMethods.GENERIC_WRITE End If - Dim Handle = DLL.ImDiskOpenDeviceByNumber(DeviceNumber, NativeAccessMode) + Dim Handle = UnsafeNativeMethods.ImDiskOpenDeviceByNumber(DeviceNumber, NativeAccessMode) If Handle.IsInvalid Then Throw New Win32Exception End If @@ -29,27 +34,27 @@ Throw New Win32Exception End If - NativeFileIO.Win32API.DeviceIoControl(Handle, NativeFileIO.Win32API.FSCTL_ALLOW_EXTENDED_DASD_IO, IntPtr.Zero, 0UI, IntPtr.Zero, 0UI, 0UI, IntPtr.Zero) + NativeFileIO.UnsafeNativeMethods.DeviceIoControl(Handle, NativeFileIO.UnsafeNativeMethods.FSCTL_ALLOW_EXTENDED_DASD_IO, IntPtr.Zero, 0UI, IntPtr.Zero, 0UI, 0UI, IntPtr.Zero) Return Handle End Function Private Shared Function OpenDeviceHandle(MountPoint As String, AccessMode As FileAccess) As SafeFileHandle - Dim NativeAccessMode As UInt32 = NativeFileIO.Win32API.FILE_READ_ATTRIBUTES + Dim NativeAccessMode As UInt32 = NativeFileIO.UnsafeNativeMethods.FILE_READ_ATTRIBUTES If (AccessMode And FileAccess.Read) = FileAccess.Read Then - NativeAccessMode += NativeFileIO.Win32API.GENERIC_READ + NativeAccessMode += NativeFileIO.UnsafeNativeMethods.GENERIC_READ End If If (AccessMode And FileAccess.Write) = FileAccess.Write Then - NativeAccessMode += NativeFileIO.Win32API.GENERIC_WRITE + NativeAccessMode += NativeFileIO.UnsafeNativeMethods.GENERIC_WRITE End If - Dim Handle = DLL.ImDiskOpenDeviceByMountPoint(MountPoint, NativeAccessMode) + Dim Handle = UnsafeNativeMethods.ImDiskOpenDeviceByMountPoint(MountPoint, NativeAccessMode) If Handle.IsInvalid Then Throw New Win32Exception End If - NativeFileIO.Win32API.DeviceIoControl(Handle, NativeFileIO.Win32API.FSCTL_ALLOW_EXTENDED_DASD_IO, IntPtr.Zero, 0UI, IntPtr.Zero, 0UI, 0UI, IntPtr.Zero) + NativeFileIO.UnsafeNativeMethods.DeviceIoControl(Handle, NativeFileIO.UnsafeNativeMethods.FSCTL_ALLOW_EXTENDED_DASD_IO, IntPtr.Zero, 0UI, IntPtr.Zero, 0UI, 0UI, IntPtr.Zero) Return Handle End Function @@ -80,7 +85,7 @@ Public ReadOnly Property DiskSize As Long Get Dim Size As Int64 - NativeFileIO.Win32Try(DLL.ImDiskGetVolumeSize(SafeFileHandle, Size)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetVolumeSize(SafeFileHandle, Size)) Return Size End Get End Property @@ -117,7 +122,11 @@ Public Sub SaveImageFile(ImageFile As FileStream, BufferSize As UInt32) - NativeFileIO.Win32Try(DLL.ImDiskSaveImageFile(SafeFileHandle, + If ImageFile Is Nothing Then + Throw New ArgumentNullException(NameOf(ImageFile)) + End If + + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveImageFile(SafeFileHandle, ImageFile.SafeFileHandle, BufferSize, IntPtr.Zero)) @@ -134,13 +143,17 @@ Public Sub SaveImageFile(ImageFile As FileStream, BufferSize As UInt32, CancelAction As Action(Of Action(Of Boolean))) + If ImageFile Is Nothing Then + Throw New ArgumentNullException(NameOf(ImageFile)) + End If + Dim CancelFlag As Integer Dim CancelFlagHandle = GCHandle.Alloc(CancelFlag, GCHandleType.Pinned) Try If CancelAction IsNot Nothing Then CancelAction(Sub(flag) CancelFlag = If(flag, 1, 0)) End If - NativeFileIO.Win32Try(DLL.ImDiskSaveImageFile(SafeFileHandle, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveImageFile(SafeFileHandle, ImageFile.SafeFileHandle, BufferSize, CancelFlagHandle.AddrOfPinnedObject())) @@ -159,7 +172,7 @@ Public Sub SaveImageFile(ImageFile As SafeFileHandle, BufferSize As UInt32) - NativeFileIO.Win32Try(DLL.ImDiskSaveImageFile(SafeFileHandle, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveImageFile(SafeFileHandle, ImageFile, BufferSize, IntPtr.Zero)) @@ -176,13 +189,19 @@ Public Sub SaveImageFile(ImageFile As SafeFileHandle, BufferSize As UInt32, CancelAction As Action(Of Action(Of Boolean))) + If ImageFile Is Nothing Then + Throw New ArgumentNullException(NameOf(ImageFile)) + End If + Dim CancelFlag As Integer Dim CancelFlagHandle = GCHandle.Alloc(CancelFlag, GCHandleType.Pinned) + Try If CancelAction IsNot Nothing Then CancelAction(Sub(flag) CancelFlag = If(flag, 1, 0)) End If - NativeFileIO.Win32Try(DLL.ImDiskSaveImageFile(SafeFileHandle, + + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveImageFile(SafeFileHandle, ImageFile, BufferSize, CancelFlagHandle.AddrOfPinnedObject())) @@ -202,9 +221,13 @@ Public Sub SaveImageFile(ImageFile As String, BufferSize As UInt32) + If ImageFile Is Nothing Then + Throw New ArgumentNullException(NameOf(ImageFile)) + End If + Using ImageFileHandle = NativeFileIO.OpenFileHandle(ImageFile, FileAccess.Write, FileShare.None, FileMode.Create, Overlapped:=False) - NativeFileIO.Win32Try(DLL.ImDiskSaveImageFile(SafeFileHandle, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveImageFile(SafeFileHandle, ImageFileHandle, BufferSize, IntPtr.Zero)) @@ -223,6 +246,10 @@ Public Sub SaveImageFile(ImageFile As String, BufferSize As UInt32, CancelAction As Action(Of Action(Of Boolean))) + If ImageFile Is Nothing Then + Throw New ArgumentNullException(NameOf(ImageFile)) + End If + Using ImageFileHandle = NativeFileIO.OpenFileHandle(ImageFile, FileAccess.Write, FileShare.None, FileMode.Create, Overlapped:=False) Dim CancelFlag As Integer @@ -231,7 +258,7 @@ If CancelAction IsNot Nothing Then CancelAction(Sub(flag) CancelFlag = If(flag, 1, 0)) End If - NativeFileIO.Win32Try(DLL.ImDiskSaveImageFile(SafeFileHandle, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveImageFile(SafeFileHandle, ImageFileHandle, BufferSize, CancelFlagHandle.AddrOfPinnedObject())) @@ -249,9 +276,13 @@ ''' Name of file to which disk contents will be written. Public Sub SaveImageFile(ImageFile As String) + If ImageFile Is Nothing Then + Throw New ArgumentNullException(NameOf(ImageFile)) + End If + Using ImageFileHandle = NativeFileIO.OpenFileHandle(ImageFile, FileAccess.Write, FileShare.None, FileMode.Create, Overlapped:=False) - NativeFileIO.Win32Try(DLL.ImDiskSaveImageFile(SafeFileHandle, + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskSaveImageFile(SafeFileHandle, ImageFileHandle, 0, IntPtr.Zero)) @@ -269,13 +300,13 @@ ''' boxes etc. ''' I/O buffer size to use when reading source disk. This ''' parameter is optional, if it is zero the buffer size to use - ''' will automatically choosen. + ''' will automatically chosen. ''' If this parameter is TRUE and the source device type cannot ''' be automatically determined this function will ask user for ''' a .iso suffixed image file name. Public Sub SaveImageFileInteractive(hWnd As IntPtr, BufferSize As UInt32, IsCdRomType As Boolean) - DLL.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, BufferSize, IsCdRomType) + UnsafeNativeMethods.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, BufferSize, IsCdRomType) End Sub @@ -292,7 +323,7 @@ Public Sub SaveImageFileInteractive(hWnd As IntPtr, IsCdRomType As Boolean) - DLL.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, 0, IsCdRomType) + UnsafeNativeMethods.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, 0, IsCdRomType) End Sub @@ -305,11 +336,11 @@ ''' boxes etc. ''' I/O buffer size to use when reading source disk. This ''' parameter is optional, if it is zero the buffer size to use - ''' will automatically choosen. + ''' will automatically chosen. Public Sub SaveImageFileInteractive(hWnd As IntPtr, BufferSize As UInt32) - DLL.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, BufferSize, False) + UnsafeNativeMethods.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, BufferSize, False) End Sub @@ -323,7 +354,7 @@ Public Sub SaveImageFileInteractive(hWnd As IntPtr) - DLL.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, 0, False) + UnsafeNativeMethods.ImDiskSaveImageFileInteractive(SafeFileHandle, hWnd, 0, False) End Sub @@ -338,7 +369,7 @@ Public Sub SaveImageFileInteractive(IsCdRomType As Boolean) - DLL.ImDiskSaveImageFileInteractive(SafeFileHandle, IntPtr.Zero, 0, IsCdRomType) + UnsafeNativeMethods.ImDiskSaveImageFileInteractive(SafeFileHandle, IntPtr.Zero, 0, IsCdRomType) End Sub @@ -350,7 +381,7 @@ Public Sub SaveImageFileInteractive() - DLL.ImDiskSaveImageFileInteractive(SafeFileHandle, IntPtr.Zero, 0, False) + UnsafeNativeMethods.ImDiskSaveImageFileInteractive(SafeFileHandle, IntPtr.Zero, 0, False) End Sub @@ -359,7 +390,7 @@ ''' Public Overloads Sub ForceRemoveDevice() - NativeFileIO.Win32Try(DLL.ImDiskForceRemoveDevice(SafeFileHandle, 0)) + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskForceRemoveDevice(SafeFileHandle, 0)) End Sub diff --git a/ImDiskNet/ImDiskNet/ImDisk/ImDiskDeviceStream.vb b/ImDiskNet/ImDiskNet/ImDisk/ImDiskDeviceStream.vb index 1f89487..330c0d9 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/ImDiskDeviceStream.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/ImDiskDeviceStream.vb @@ -1,43 +1,47 @@ -Namespace ImDisk - - ''' - ''' A FileStream derived class that represents disk devices by overriding properties and methods - ''' where FileStream base implementation rely on file API not directly compatible with disk device - ''' objects. - ''' - - - Public Class ImDiskDeviceStream - Inherits FileStream +Imports System.IO +Imports System.Runtime.InteropServices +Imports Microsoft.Win32.SafeHandles - ''' - ''' Initializes an ImDiskDeviceStream object for an open disk device. - ''' - ''' Open file handle for disk device. - ''' Access to request for stream. - Public Sub New(SafeFileHandle As SafeFileHandle, AccessMode As FileAccess) - MyBase.New(SafeFileHandle, AccessMode) - End Sub +Namespace ImDisk ''' - ''' Retrieves raw disk size. + ''' A FileStream derived class that represents disk devices by overriding properties and methods + ''' where FileStream base implementation rely on file API not directly compatible with disk device + ''' objects. ''' - Public Overrides ReadOnly Property Length As Long - Get - Dim Size As Int64 - NativeFileIO.Win32Try(DLL.ImDiskGetVolumeSize(SafeFileHandle, Size)) - Return Size - End Get - End Property + + + Public Class ImDiskDeviceStream + Inherits FileStream - ''' - ''' Not implemented. - ''' - Public Overrides Sub SetLength(value As Long) - Throw New NotImplementedException - End Sub + ''' + ''' Initializes an ImDiskDeviceStream object for an open disk device. + ''' + ''' Open file handle for disk device. + ''' Access to request for stream. + Public Sub New(SafeFileHandle As SafeFileHandle, AccessMode As FileAccess) + MyBase.New(SafeFileHandle, AccessMode) + End Sub + + ''' + ''' Retrieves raw disk size. + ''' + Public Overrides ReadOnly Property Length As Long + Get + Dim Size As Int64 + NativeFileIO.Win32Try(UnsafeNativeMethods.ImDiskGetVolumeSize(SafeFileHandle, Size)) + Return Size + End Get + End Property + + ''' + ''' Not implemented. + ''' + Public Overrides Sub SetLength(value As Long) + Throw New NotImplementedException + End Sub - End Class + End Class End Namespace diff --git a/ImDiskNet/ImDiskNet/ImDisk/ImDiskObject.vb b/ImDiskNet/ImDiskNet/ImDisk/ImDiskObject.vb index 256fa72..9ded743 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/ImDiskObject.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/ImDiskObject.vb @@ -1,83 +1,86 @@ -Namespace ImDisk +Imports System.IO +Imports System.Runtime.InteropServices +Imports Microsoft.Win32.SafeHandles - ''' - ''' Base class that represents ImDisk Virtual Disk Driver created device objects. - ''' - - - Public Class ImDiskObject - Implements IDisposable - - Public ReadOnly SafeFileHandle As SafeFileHandle - Public ReadOnly AccessMode As FileAccess +Namespace ImDisk ''' - ''' Opens specified Path with CreateFile Win32 API and encapsulates the returned handle - ''' in a new ImDiskObject. + ''' Base class that represents ImDisk Virtual Disk Driver created device objects. ''' - ''' Path to pass to CreateFile API - ''' Access mode for opening and for underlying FileStream - Protected Sub New(Path As String, AccessMode As FileAccess) - Me.New(NativeFileIO.OpenFileHandle(Path, AccessMode, FileShare.Read, FileMode.Open, Overlapped:=False), AccessMode) - End Sub + + + Public Class ImDiskObject + Implements IDisposable - ''' - ''' Encapsulates a handle in a new ImDiskObject. - ''' - ''' Existing handle to use - ''' Access mode for underlying FileStream - Protected Sub New(Handle As SafeFileHandle, Access As FileAccess) - SafeFileHandle = Handle - AccessMode = Access - End Sub + Public ReadOnly Property SafeFileHandle As SafeFileHandle + Public ReadOnly Property AccessMode As FileAccess - ''' - ''' Checks if version of running ImDisk Virtual Disk Driver servicing this device object is compatible with this API - ''' library. If this device object is not created by ImDisk Virtual Disk Driver this method returns False. - ''' - Public Function CheckDriverVersion() As Boolean + ''' + ''' Opens specified Path with CreateFile Win32 API and encapsulates the returned handle + ''' in a new ImDiskObject. + ''' + ''' Path to pass to CreateFile API + ''' Access mode for opening and for underlying FileStream + Protected Sub New(Path As String, AccessMode As FileAccess) + Me.New(NativeFileIO.OpenFileHandle(Path, AccessMode, FileShare.Read, FileMode.Open, Overlapped:=False), AccessMode) + End Sub + + ''' + ''' Encapsulates a handle in a new ImDiskObject. + ''' + ''' Existing handle to use + ''' Access mode for underlying FileStream + Protected Sub New(Handle As SafeFileHandle, Access As FileAccess) + _SafeFileHandle = Handle + _AccessMode = Access + End Sub + + ''' + ''' Checks if version of running ImDisk Virtual Disk Driver servicing this device object is compatible with this API + ''' library. If this device object is not created by ImDisk Virtual Disk Driver this method returns False. + ''' + Public Function CheckDriverVersion() As Boolean - Return DLL.ImDiskCheckDriverVersion(SafeFileHandle) + Return UnsafeNativeMethods.ImDiskCheckDriverVersion(_SafeFileHandle) - End Function + End Function #Region "IDisposable Support" - Private disposedValue As Boolean ' To detect redundant calls - - ' IDisposable - Protected Overridable Sub Dispose(disposing As Boolean) - If Not Me.disposedValue Then - If disposing Then - ' TODO: dispose managed state (managed objects). - End If - - ' TODO: free unmanaged resources (unmanaged objects) and override Finalize() below. - If SafeFileHandle IsNot Nothing Then - SafeFileHandle.Dispose() - End If - - ' TODO: set large fields to null. - End If - Me.disposedValue = True - End Sub - - ' TODO: override Finalize() only if Dispose(disposing As Boolean) above has code to free unmanaged resources. - Protected Overrides Sub Finalize() - ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. - Dispose(False) - MyBase.Finalize() - End Sub + Private disposedValue As Boolean ' To detect redundant calls - ''' - ''' Close device object. - ''' - Public Sub Close() Implements IDisposable.Dispose - ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. - Dispose(True) - GC.SuppressFinalize(Me) - End Sub + ' IDisposable + Protected Overridable Sub Dispose(disposing As Boolean) + If Not Me.disposedValue Then + If disposing Then + ' TODO: dispose managed state (managed objects). + _SafeFileHandle?.Dispose() + End If + + ' TODO: free unmanaged resources (unmanaged objects) and override Finalize() below. + + ' TODO: set large fields to null. + _SafeFileHandle = Nothing + End If + Me.disposedValue = True + End Sub + + ' TODO: override Finalize() only if Dispose(disposing As Boolean) above has code to free unmanaged resources. + Protected Overrides Sub Finalize() + ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. + Dispose(False) + MyBase.Finalize() + End Sub + + ''' + ''' Close device object. + ''' + Public Sub Close() Implements IDisposable.Dispose + ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. + Dispose(True) + GC.SuppressFinalize(Me) + End Sub #End Region - End Class + End Class End Namespace \ No newline at end of file diff --git a/ImDiskNet/ImDiskNet/ImDisk/ImDiskRefreshEvent.vb b/ImDiskNet/ImDiskNet/ImDisk/ImDiskRefreshEvent.vb index 4a7be7a..2b72327 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/ImDiskRefreshEvent.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/ImDiskRefreshEvent.vb @@ -7,7 +7,7 @@ Namespace ImDisk Inherits WaitHandle Public Sub New(InheritHandle As Boolean) - SafeWaitHandle = DLL.ImDiskOpenRefreshEvent(InheritHandle) + SafeWaitHandle = UnsafeNativeMethods.ImDiskOpenRefreshEvent(InheritHandle) End Sub ''' @@ -15,7 +15,7 @@ Namespace ImDisk ''' simulates the same action done by the driver after such changes. ''' Public Sub Notify() - NativeFileIO.Win32Try(NativeFileIO.Win32API.PulseEvent(SafeWaitHandle)) + NativeFileIO.Win32Try(NativeFileIO.UnsafeNativeMethods.PulseEvent(SafeWaitHandle)) End Sub End Class diff --git a/ImDiskNet/ImDiskNet/ImDisk/DLL.vb b/ImDiskNet/ImDiskNet/ImDisk/UnsafeNativeMethods.vb similarity index 87% rename from ImDiskNet/ImDiskNet/ImDisk/DLL.vb rename to ImDiskNet/ImDiskNet/ImDisk/UnsafeNativeMethods.vb index 872d86a..aa77df4 100644 --- a/ImDiskNet/ImDiskNet/ImDisk/DLL.vb +++ b/ImDiskNet/ImDiskNet/ImDisk/UnsafeNativeMethods.vb @@ -1,10 +1,15 @@ -Namespace ImDisk +#Disable Warning CA1401 ' P/Invokes should not be visible +#Disable Warning CA1711 + +Imports System.Runtime.InteropServices +Imports Microsoft.Win32.SafeHandles + +Namespace ImDisk - Public Class DLL + Public NotInheritable Class UnsafeNativeMethods Private Sub New() - End Sub ''' @@ -64,7 +69,7 @@ ImageFileName As String, SectorSize As UInt32, <[In]> ByRef Offset As Int64, - PartitionInformation As NativeFileIO.Win32API.PARTITION_INFORMATION() + PartitionInformation As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION() ) As Boolean Public Declare Unicode Function ImDiskGetPartitionInformationEx _ @@ -81,7 +86,7 @@ ImageFileName As String, SectorSize As UInt32, <[In]> ByRef Offset As Int64, - ByRef PartitionInformation As NativeFileIO.Win32API.PARTITION_INFORMATION + ByRef PartitionInformation As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION ) As Boolean Public Delegate Function ImDiskReadFileManagedProc _ @@ -105,7 +110,7 @@ Public Delegate Function ImDiskGetPartitionInfoProc _ ( UserData As IntPtr, - <[In]> ByRef PartitionInformation As NativeFileIO.Win32API.PARTITION_INFORMATION + <[In]> ByRef PartitionInformation As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION ) As Boolean Public Declare Unicode Function ImDiskReadFileHandle _ @@ -132,7 +137,7 @@ ReadFileProc As ImDiskReadFileManagedProc, SectorSize As UInt32, <[In]> ByRef Offset As Int64, - PartitionInformation As NativeFileIO.Win32API.PARTITION_INFORMATION() + PartitionInformation As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION() ) As Boolean Public Declare Unicode Function ImDiskGetPartitionInfoIndirect _ @@ -150,7 +155,7 @@ ReadFileProc As ImDiskReadFileUnmanagedProc, SectorSize As UInt32, <[In]> ByRef Offset As Int64, - PartitionInformation As NativeFileIO.Win32API.PARTITION_INFORMATION() + PartitionInformation As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION() ) As Boolean Public Declare Unicode Function ImDiskGetPartitionInfoIndirectEx _ @@ -179,7 +184,7 @@ ReadFileProc As ImDiskReadFileManagedProc, SectorSize As UInt32, <[In]> ByRef Offset As Int64, - ByRef PartitionInformation As NativeFileIO.Win32API.PARTITION_INFORMATION + ByRef PartitionInformation As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION ) As Boolean Public Declare Unicode Function ImDiskImageContainsISOFS _ @@ -206,7 +211,7 @@ Lib "imdisk.cpl" ( ImageFileName As String, <[In]> ByRef Offset As Int64, - ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY + ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY ) As Boolean Public Declare Unicode Function ImDiskGetFormattedGeometryIndirect _ @@ -214,7 +219,7 @@ Handle As IntPtr, ReadFileProc As ImDiskReadFileManagedProc, <[In]> ByRef Offset As Int64, - ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY + ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY ) As Boolean Public Declare Unicode Function ImDiskGetFormattedGeometryIndirect _ @@ -222,7 +227,7 @@ Handle As IntPtr, ReadFileProc As ImDiskReadFileUnmanagedProc, <[In]> ByRef Offset As Int64, - ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY + ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY ) As Boolean Public Declare Unicode Function ImDiskCreateMountPoint _ @@ -272,7 +277,7 @@ Public Declare Unicode Function ImDiskCreateDevice _ Lib "imdisk.cpl" ( hWndStatusText As IntPtr, - ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, + ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, ByRef ImageOffset As Int64, Flags As UInt32, Filename As String, @@ -284,7 +289,7 @@ Lib "imdisk.cpl" ( hWndStatusText As IntPtr, ByRef DeviceNumber As UInt32, - ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, + ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, ByRef ImageOffset As Int64, Flags As UInt32, Filename As String, @@ -330,16 +335,16 @@ Public Structure ImDiskCreateData - Public DeviceNumber As Int32 - Private _Dummy As Int32 - Public DiskSize As Int64 - Public MediaType As Int32 - Public TracksPerCylinder As UInt32 - Public SectorsPerTrack As UInt32 - Public BytesPerSector As UInt32 - Public ImageOffset As Int64 - Public Flags As ImDiskFlags - Public DriveLetter As Char + Public Property DeviceNumber As Int32 + Private ReadOnly _Dummy As Int32 + Public Property DiskSize As Int64 + Public Property MediaType As Int32 + Public Property TracksPerCylinder As UInt32 + Public Property SectorsPerTrack As UInt32 + Public Property BytesPerSector As UInt32 + Public Property ImageOffset As Int64 + Public Property Flags As ImDiskFlags + Public Property DriveLetter As Char Private _FilenameLength As UInt16 @@ -352,13 +357,13 @@ End If Return _Filename End Get - Set(value As String) - If value Is Nothing Then + Set + If Value Is Nothing Then _Filename = Nothing _FilenameLength = 0 Return End If - _Filename = value + _Filename = Value _FilenameLength = CUShort(_Filename.Length * 2) End Set End Property @@ -375,7 +380,7 @@ Lib "imdisk.cpl" ( ) As Char - + Public Declare Unicode Function ImDiskGetDeviceList _ Lib "imdisk.cpl" ( ) As UInt64 @@ -388,8 +393,8 @@ Public Declare Unicode Function ImDiskBuildMBR _ Lib "imdisk.cpl" ( - <[In]> ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, - PartitionInfo As NativeFileIO.Win32API.PARTITION_INFORMATION(), + <[In]> ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, + PartitionInfo As NativeFileIO.UnsafeNativeMethods.PARTITION_INFORMATION(), NumberOfParts As Byte, MBR As Byte(), MBRSize As IntPtr @@ -397,13 +402,13 @@ Public Declare Unicode Function ImDiskConvertCHSToLBA _ Lib "imdisk.cpl" ( - <[In]> ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, + <[In]> ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, CHS As Byte() ) As UInt32 Public Declare Unicode Function ImDiskConvertLBAToCHS _ Lib "imdisk.cpl" ( - <[In]> ByRef DiskGeometry As NativeFileIO.Win32API.DISK_GEOMETRY, + <[In]> ByRef DiskGeometry As NativeFileIO.UnsafeNativeMethods.DISK_GEOMETRY, LBA As UInt32 ) As UInt32 diff --git a/ImDiskNet/ImDiskNet/ImDiskNet.vbproj b/ImDiskNet/ImDiskNet/ImDiskNet.vbproj index 984ca47..0a9503a 100644 --- a/ImDiskNet/ImDiskNet/ImDiskNet.vbproj +++ b/ImDiskNet/ImDiskNet/ImDiskNet.vbproj @@ -1,158 +1,20 @@  - + + + - Debug - AnyCPU - - - - - {3EFCB6F8-EF7E-4F60-A0DE-BB197240FCC9} - Library + LTR.IO - ImDiskNet - 512 - Windows - v2.0 - - - - - true - full - true - true - ..\Debug\ - ImDiskNet.xml - - - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - true - true - - - pdbonly - false - true - true - ..\Release\ - ImDiskNet.xml - - - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - true - - - On - - - Binary - - - On - - - On - - - true - - + ImDiskNet + ImDisk Low Level API Library + ImDiskNet.snk - - - true - true - true - bin\x86\Debug\ - ImDiskNet.xml - true - true - full - x86 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - MinimumRecommendedRules.ruleset - - - true - bin\x86\Release\ - ImDiskNet.xml - true - true - pdbonly - x86 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - \ No newline at end of file + false + + net20;net40;netstandard2.0 + + true + + + + diff --git a/ImDiskNet/ImDiskNet/My Project/AssemblyInfo.vb b/ImDiskNet/ImDiskNet/My Project/AssemblyInfo.vb index 365e7e2..b9332a4 100644 --- a/ImDiskNet/ImDiskNet/My Project/AssemblyInfo.vb +++ b/ImDiskNet/ImDiskNet/My Project/AssemblyInfo.vb @@ -8,28 +8,7 @@ Imports System.Runtime.InteropServices ' Review the values of the assembly attributes - - - - - - - - + 'The following GUID is for the ID of the typelib if this project is exposed to COM - - -' Version information for an assembly consists of the following four values: -' -' Major Version -' Minor Version -' Build Number -' Revision -' -' You can specify all the values or you can default the Build and Revision Numbers -' by using the '*' as shown below: -' - - - + diff --git a/ImDiskNet/ImDiskNet/My Project/Settings.Designer.vb b/ImDiskNet/ImDiskNet/My Project/Settings.Designer.vb deleted file mode 100644 index 84c0255..0000000 --- a/ImDiskNet/ImDiskNet/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.239 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - - Friend Module MySettingsProperty - - - Friend ReadOnly Property Settings() As Global.LTR.IO.My.MySettings - Get - Return Global.LTR.IO.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/ImDiskNet/ImDiskNet/My Project/Settings.settings b/ImDiskNet/ImDiskNet/My Project/Settings.settings deleted file mode 100644 index 85b890b..0000000 --- a/ImDiskNet/ImDiskNet/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ImDiskNet/ImDiskNet/NativeFileIO.vb b/ImDiskNet/ImDiskNet/NativeFileIO.vb index 12aec30..34b81da 100644 --- a/ImDiskNet/ImDiskNet/NativeFileIO.vb +++ b/ImDiskNet/ImDiskNet/NativeFileIO.vb @@ -1,11 +1,22 @@ -''' -''' Provides wrappers for Win32 file API. This makes it possible to open everyting that +#Disable Warning CA1707 ' Identifiers should not contain underscores +#Disable Warning CA1401 ' P/Invokes should not be visible +#Disable Warning CA2101 + +Imports System.ComponentModel +Imports System.IO +Imports System.Runtime.InteropServices +Imports Microsoft.Win32.SafeHandles +''' +''' Provides wrappers for Win32 file API. This makes it possible to open everything that ''' CreateFile() can open and get a FileStream based .NET wrapper around the file handle. ''' -Public Class NativeFileIO +Public NotInheritable Class NativeFileIO #Region "Win32 API" - Public Class Win32API + Public NotInheritable Class UnsafeNativeMethods + + Private Sub New() + End Sub Public Const GENERIC_READ As UInt32 = &H80000000UI Public Const GENERIC_WRITE As UInt32 = &H40000000UI @@ -57,6 +68,36 @@ Public Class NativeFileIO Public Const ERROR_SERVICE_DOES_NOT_EXIST As UInt32 = 1060 Public Const ERROR_SERVICE_ALREADY_RUNNING As UInt32 = 1056 + Public Declare Function DeviceIoControl Lib "kernel32" ( + hDevice As SafeFileHandle, + dwIoControlCode As UInt32, + lpInBuffer As IntPtr, + nInBufferSize As UInt32, + ByRef lpOutBuffer As DISK_GEOMETRY, + nOutBufferSize As UInt32, + ByRef lpBytesReturned As UInt32, + lpOverlapped As IntPtr) As Boolean + + Public Declare Function DeviceIoControl Lib "kernel32" ( + hDevice As SafeFileHandle, + dwIoControlCode As UInt32, + lpInBuffer As IntPtr, + nInBufferSize As UInt32, + ByRef lpOutBuffer As Int64, + nOutBufferSize As UInt32, + ByRef lpBytesReturned As UInt32, + lpOverlapped As IntPtr) As Boolean + + Public Declare Function DeviceIoControl Lib "kernel32" ( + hDevice As SafeFileHandle, + dwIoControlCode As UInt32, + <[In]> ByRef lpInBuffer As DISK_GROW_PARTITION, + nInBufferSize As UInt32, + lpOutBuffer As IntPtr, + nOutBufferSize As UInt32, + ByRef lpBytesReturned As UInt32, + lpOverlapped As IntPtr) As Boolean + Structure DISK_GEOMETRY Public Enum MEDIA_TYPE As Int32 @@ -88,11 +129,11 @@ Public Class NativeFileIO F3_32M_512 = &H19 End Enum - Public Cylinders As Int64 - Public MediaType As MEDIA_TYPE - Public TracksPerCylinder As UInt32 - Public SectorsPerTrack As UInt32 - Public BytesPerSector As UInt32 + Public Property Cylinders As Int64 + Public Property MediaType As MEDIA_TYPE + Public Property TracksPerCylinder As UInt32 + Public Property SectorsPerTrack As UInt32 + Public Property BytesPerSector As UInt32 End Structure @@ -117,14 +158,14 @@ Public Class NativeFileIO PARTITION_NTFT = &H80 ' NTFT partition End Enum - Public StartingOffset As Int64 - Public PartitionLength As Int64 - Public HiddenSectors As UInt32 - Public PartitionNumber As UInt32 - Public PartitionType As PARTITION_TYPE - Public BootIndicator As Byte - Public RecognizedPartition As Byte - Public RewritePartition As Byte + Public Property StartingOffset As Int64 + Public Property PartitionLength As Int64 + Public Property HiddenSectors As UInt32 + Public Property PartitionNumber As UInt32 + Public Property PartitionType As PARTITION_TYPE + Public Property BootIndicator As Byte + Public Property RecognizedPartition As Byte + Public Property RewritePartition As Byte ''' ''' Indicates whether this partition entry represents a Windows NT fault tolerant partition, @@ -178,28 +219,28 @@ Public Class NativeFileIO Public Structure DISK_GROW_PARTITION - Public PartitionNumber As Int32 - Public BytesToGrow As Int64 + Public Property PartitionNumber As Int32 + Public Property BytesToGrow As Int64 End Structure Public Structure COMMTIMEOUTS - Public ReadIntervalTimeout As UInt32 - Public ReadTotalTimeoutMultiplier As UInt32 - Public ReadTotalTimeoutConstant As UInt32 - Public WriteTotalTimeoutMultiplier As UInt32 - Public WriteTotalTimeoutConstant As UInt32 + Public Property ReadIntervalTimeout As UInt32 + Public Property ReadTotalTimeoutMultiplier As UInt32 + Public Property ReadTotalTimeoutConstant As UInt32 + Public Property WriteTotalTimeoutMultiplier As UInt32 + Public Property WriteTotalTimeoutConstant As UInt32 End Structure Public Structure SERVICE_STATUS - Public dwServiceType As Integer - Public dwCurrentState As Integer - Public dwControlsAccepted As Integer - Public dwWin32ExitCode As Integer - Public dwServiceSpecificExitCode As Integer - Public dwCheckPoint As Integer - Public dwWaitHint As Integer + Public Property dwServiceType As Integer + Public Property dwCurrentState As Integer + Public Property dwControlsAccepted As Integer + Public Property dwWin32ExitCode As Integer + Public Property dwServiceSpecificExitCode As Integer + Public Property dwCheckPoint As Integer + Public Property dwWaitHint As Integer End Structure @@ -232,7 +273,7 @@ Public Class NativeFileIO ''' Creates a new empty instance. This constructor is used by native to managed ''' handle marshaller. ''' - Protected Sub New() + Private Sub New() MyBase.New(ownsHandle:=True) End Sub @@ -249,7 +290,9 @@ Public Class NativeFileIO Public Const ERROR_MORE_DATA As Int32 = 234L Public Declare Auto Function OpenSCManager Lib "advapi32.dll" ( - lpMachineName As String, lpDatabaseName As String, dwDesiredAccess As Integer) As SafeServiceHandle + lpMachineName As String, + lpDatabaseName As String, + dwDesiredAccess As Integer) As SafeServiceHandle Public Declare Auto Function CreateService Lib "advapi32.dll" ( hSCManager As SafeServiceHandle, @@ -268,7 +311,7 @@ Public Class NativeFileIO Public Declare Auto Function OpenService Lib "advapi32.dll" ( hSCManager As SafeServiceHandle, - lpServiceName As String, + lpServiceName As String, dwDesiredAccess As Integer) As SafeServiceHandle Public Declare Auto Function ControlService Lib "advapi32.dll" ( @@ -288,10 +331,10 @@ Public Class NativeFileIO lpServiceArgVectors As IntPtr) As Boolean Public Declare Auto Function GetModuleHandle Lib "kernel32.dll" ( - ModuleName As String) As IntPtr + ModuleName As String) As IntPtr Public Declare Auto Function LoadLibrary Lib "kernel32.dll" ( - lpFileName As String) As IntPtr + lpFileName As String) As IntPtr Public Declare Auto Function FreeLibrary Lib "kernel32.dll" ( hModule As IntPtr) As Boolean @@ -304,11 +347,11 @@ Public Class NativeFileIO Public Declare Auto Function DefineDosDevice Lib "kernel32.dll" ( dwFlags As DEFINE_DOS_DEVICE_FLAGS, - lpDeviceName As String, - lpTargetPath As String) As Boolean + lpDeviceName As String, + lpTargetPath As String) As Boolean Public Declare Unicode Function QueryDosDeviceW Lib "kernel32.dll" ( - lpDeviceName As String, + lpDeviceName As String, ByRef lpTargetPath As Char(), ucchMax As UInt32) As Boolean @@ -321,7 +364,7 @@ Public Class NativeFileIO <[In]> ByRef lpCommTimeouts As COMMTIMEOUTS) As Boolean Public Declare Auto Function CreateFile Lib "kernel32" ( - lpFileName As String, + lpFileName As String, dwDesiredAccess As UInt32, dwShareMode As UInt32, lpSecurityAttributes As IntPtr, @@ -355,12 +398,12 @@ Public Class NativeFileIO Public Declare Auto Function GetModuleFileName Lib "kernel32" ( hModule As IntPtr, - lpFilename As String, + lpFilename As String, nSize As Int32) As Int32 Public Declare Ansi Function GetProcAddress Lib "kernel32" ( hModule As IntPtr, - <[In](), MarshalAs(UnmanagedType.LPStr)> lpEntryName As String) As IntPtr + <[In], MarshalAs(UnmanagedType.LPStr)> lpEntryName As String) As IntPtr Public Declare Ansi Function GetProcAddress Lib "kernel32" ( hModule As IntPtr, @@ -369,11 +412,24 @@ Public Class NativeFileIO Public Declare Ansi Function PulseEvent Lib "kernel32" ( safeWaitHandle As SafeWaitHandle) As Boolean + Public Declare Auto Function RtlGenRandom Lib "advapi32" Alias "SystemFunction036" ( + ByRef buffer As Int32, + length As Int32) As Byte + + Public Declare Function GetFileType Lib "kernel32.dll" (handle As IntPtr) As Win32FileType + + Public Declare Function GetFileType Lib "kernel32.dll" (handle As SafeFileHandle) As Win32FileType + + Public Declare Function GetStdHandle Lib "kernel32.dll" (nStdHandle As StdHandle) As IntPtr + + Public Declare Function GetConsoleScreenBufferInfo Lib "kernel32.dll" (hConsoleOutput As IntPtr, ByRef lpConsoleScreenBufferInfo As CONSOLE_SCREEN_BUFFER_INFO) As Boolean + + Public Declare Function GetConsoleScreenBufferInfo Lib "kernel32.dll" (hConsoleOutput As SafeFileHandle, ByRef lpConsoleScreenBufferInfo As CONSOLE_SCREEN_BUFFER_INFO) As Boolean + End Class #End Region Private Sub New() - End Sub ''' @@ -426,50 +482,50 @@ Public Class NativeFileIO Overlapped As Boolean) As SafeFileHandle If String.IsNullOrEmpty(FileName) Then - Throw New ArgumentNullException("FileName") + Throw New ArgumentNullException(NameOf(FileName)) End If - Dim NativeDesiredAccess As UInt32 = Win32API.FILE_READ_ATTRIBUTES + Dim NativeDesiredAccess As UInt32 = UnsafeNativeMethods.FILE_READ_ATTRIBUTES If (DesiredAccess And FileAccess.Read) = FileAccess.Read Then - NativeDesiredAccess = NativeDesiredAccess Or Win32API.GENERIC_READ + NativeDesiredAccess = NativeDesiredAccess Or UnsafeNativeMethods.GENERIC_READ End If If (DesiredAccess And FileAccess.Write) = FileAccess.Write Then - NativeDesiredAccess = NativeDesiredAccess Or Win32API.GENERIC_WRITE + NativeDesiredAccess = NativeDesiredAccess Or UnsafeNativeMethods.GENERIC_WRITE End If Dim NativeShareMode As UInt32 = 0 If (ShareMode And FileShare.Read) = FileShare.Read Then - NativeShareMode = NativeShareMode Or Win32API.FILE_SHARE_READ + NativeShareMode = NativeShareMode Or UnsafeNativeMethods.FILE_SHARE_READ End If If (ShareMode And FileShare.Write) = FileShare.Write Then - NativeShareMode = NativeShareMode Or Win32API.FILE_SHARE_WRITE + NativeShareMode = NativeShareMode Or UnsafeNativeMethods.FILE_SHARE_WRITE End If If (ShareMode And FileShare.Delete) = FileShare.Delete Then - NativeShareMode = NativeShareMode Or Win32API.FILE_SHARE_DELETE + NativeShareMode = NativeShareMode Or UnsafeNativeMethods.FILE_SHARE_DELETE End If - Dim NativeCreationDisposition As UInt32 = 0 + Dim NativeCreationDisposition As UInt32 Select Case CreationDisposition Case FileMode.Create - NativeCreationDisposition = Win32API.CREATE_ALWAYS + NativeCreationDisposition = UnsafeNativeMethods.CREATE_ALWAYS Case FileMode.CreateNew - NativeCreationDisposition = Win32API.CREATE_NEW + NativeCreationDisposition = UnsafeNativeMethods.CREATE_NEW Case FileMode.Open - NativeCreationDisposition = Win32API.OPEN_EXISTING + NativeCreationDisposition = UnsafeNativeMethods.OPEN_EXISTING Case FileMode.OpenOrCreate - NativeCreationDisposition = Win32API.OPEN_ALWAYS + NativeCreationDisposition = UnsafeNativeMethods.OPEN_ALWAYS Case FileMode.Truncate - NativeCreationDisposition = Win32API.TRUNCATE_EXISTING + NativeCreationDisposition = UnsafeNativeMethods.TRUNCATE_EXISTING Case Else Throw New NotImplementedException End Select - Dim NativeFlagsAndAttributes As UInt32 = Win32API.FILE_ATTRIBUTE_NORMAL + Dim NativeFlagsAndAttributes As UInt32 = UnsafeNativeMethods.FILE_ATTRIBUTE_NORMAL If Overlapped Then - NativeFlagsAndAttributes += Win32API.FILE_FLAG_OVERLAPPED + NativeFlagsAndAttributes += UnsafeNativeMethods.FILE_FLAG_OVERLAPPED End If - Dim Handle = Win32API.CreateFile(FileName, + Dim Handle = UnsafeNativeMethods.CreateFile(FileName, NativeDesiredAccess, NativeShareMode, IntPtr.Zero, @@ -499,47 +555,47 @@ Public Class NativeFileIO CreationDisposition As FileMode) As SafeFileHandle If String.IsNullOrEmpty(FilePath) Then - Throw New ArgumentNullException("FilePath") + Throw New ArgumentNullException(NameOf(FilePath)) End If - Dim NativeDesiredAccess As UInt32 = Win32API.FILE_READ_ATTRIBUTES + Dim NativeDesiredAccess As UInt32 = UnsafeNativeMethods.FILE_READ_ATTRIBUTES If (DesiredAccess And FileAccess.Read) = FileAccess.Read Then - NativeDesiredAccess = NativeDesiredAccess Or Win32API.GENERIC_READ + NativeDesiredAccess = NativeDesiredAccess Or UnsafeNativeMethods.GENERIC_READ End If If (DesiredAccess And FileAccess.Write) = FileAccess.Write Then - NativeDesiredAccess = NativeDesiredAccess Or Win32API.GENERIC_WRITE + NativeDesiredAccess = NativeDesiredAccess Or UnsafeNativeMethods.GENERIC_WRITE End If Dim NativeShareMode As UInt32 = 0 If (ShareMode And FileShare.Read) = FileShare.Read Then - NativeShareMode = NativeShareMode Or Win32API.FILE_SHARE_READ + NativeShareMode = NativeShareMode Or UnsafeNativeMethods.FILE_SHARE_READ End If If (ShareMode And FileShare.Write) = FileShare.Write Then - NativeShareMode = NativeShareMode Or Win32API.FILE_SHARE_WRITE + NativeShareMode = NativeShareMode Or UnsafeNativeMethods.FILE_SHARE_WRITE End If If (ShareMode And FileShare.Delete) = FileShare.Delete Then - NativeShareMode = NativeShareMode Or Win32API.FILE_SHARE_DELETE + NativeShareMode = NativeShareMode Or UnsafeNativeMethods.FILE_SHARE_DELETE End If - Dim NativeCreationDisposition As UInt32 = 0 + Dim NativeCreationDisposition As UInt32 Select Case CreationDisposition Case FileMode.Create - NativeCreationDisposition = Win32API.CREATE_ALWAYS + NativeCreationDisposition = UnsafeNativeMethods.CREATE_ALWAYS Case FileMode.CreateNew - NativeCreationDisposition = Win32API.CREATE_NEW + NativeCreationDisposition = UnsafeNativeMethods.CREATE_NEW Case FileMode.Open - NativeCreationDisposition = Win32API.OPEN_EXISTING + NativeCreationDisposition = UnsafeNativeMethods.OPEN_EXISTING Case FileMode.OpenOrCreate - NativeCreationDisposition = Win32API.OPEN_ALWAYS + NativeCreationDisposition = UnsafeNativeMethods.OPEN_ALWAYS Case FileMode.Truncate - NativeCreationDisposition = Win32API.TRUNCATE_EXISTING + NativeCreationDisposition = UnsafeNativeMethods.TRUNCATE_EXISTING Case Else Throw New NotImplementedException End Select - Dim NativeFlagsAndAttributes As UInt32 = Win32API.FILE_FLAG_BACKUP_SEMANTICS + Dim NativeFlagsAndAttributes As UInt32 = UnsafeNativeMethods.FILE_FLAG_BACKUP_SEMANTICS - Dim Handle = Win32API.CreateFile(FilePath, + Dim Handle = UnsafeNativeMethods.CreateFile(FilePath, NativeDesiredAccess, NativeShareMode, IntPtr.Zero, @@ -645,8 +701,8 @@ Public Class NativeFileIO Dim pinptr = GCHandle.Alloc(State, GCHandleType.Pinned) Try - Win32Try(Win32API.DeviceIoControl(SafeFileHandle, - Win32API.FSCTL_SET_COMPRESSION, + Win32Try(UnsafeNativeMethods.DeviceIoControl(SafeFileHandle, + UnsafeNativeMethods.FSCTL_SET_COMPRESSION, pinptr.AddrOfPinnedObject(), 2UI, IntPtr.Zero, @@ -665,66 +721,46 @@ Public Class NativeFileIO Dim FileSize As Int64 - Win32Try(Win32API.GetFileSize(SafeFileHandle, FileSize)) + Win32Try(UnsafeNativeMethods.GetFileSize(SafeFileHandle, FileSize)) Return FileSize End Function - Private Declare Function DeviceIoControl Lib "kernel32" ( - hDevice As SafeFileHandle, - dwIoControlCode As UInt32, - lpInBuffer As IntPtr, - nInBufferSize As UInt32, - ByRef lpOutBuffer As Int64, - nOutBufferSize As UInt32, - ByRef lpBytesReturned As UInt32, - lpOverlapped As IntPtr) As Boolean - Public Shared Function GetDiskSize(SafeFileHandle As SafeFileHandle) As Int64 Dim FileSize As Int64 - Win32Try(DeviceIoControl(SafeFileHandle, Win32API.IOCTL_DISK_GET_LENGTH_INFO, IntPtr.Zero, 0UI, FileSize, CUInt(Marshal.SizeOf(FileSize.GetType())), 0UI, IntPtr.Zero)) + Win32Try(UnsafeNativeMethods.DeviceIoControl(SafeFileHandle, UnsafeNativeMethods.IOCTL_DISK_GET_LENGTH_INFO, IntPtr.Zero, 0UI, FileSize, CUInt(Marshal.SizeOf(FileSize.GetType())), 0UI, IntPtr.Zero)) Return FileSize End Function - Private Declare Function DeviceIoControl Lib "kernel32" ( - hDevice As SafeFileHandle, - dwIoControlCode As UInt32, - <[In]> ByRef lpInBuffer As Win32API.DISK_GROW_PARTITION, - nInBufferSize As UInt32, - lpOutBuffer As IntPtr, - nOutBufferSize As UInt32, - ByRef lpBytesReturned As UInt32, - lpOverlapped As IntPtr) As Boolean - Public Shared Sub GrowPartition(DiskHandle As SafeFileHandle, PartitionNumber As Integer, BytesToGrow As Int64) - Dim DiskGrowPartition As Win32API.DISK_GROW_PARTITION + Dim DiskGrowPartition As UnsafeNativeMethods.DISK_GROW_PARTITION DiskGrowPartition.PartitionNumber = PartitionNumber DiskGrowPartition.BytesToGrow = BytesToGrow - Win32Try(DeviceIoControl(DiskHandle, Win32API.IOCTL_DISK_GROW_PARTITION, DiskGrowPartition, CUInt(Marshal.SizeOf(DiskGrowPartition.GetType())), IntPtr.Zero, 0UI, 0UI, IntPtr.Zero)) + Win32Try(UnsafeNativeMethods.DeviceIoControl(DiskHandle, UnsafeNativeMethods.IOCTL_DISK_GROW_PARTITION, DiskGrowPartition, CUInt(Marshal.SizeOf(DiskGrowPartition.GetType())), IntPtr.Zero, 0UI, 0UI, IntPtr.Zero)) End Sub Public Shared Sub CompressFile(SafeFileHandle As SafeFileHandle) - SetFileCompressionState(SafeFileHandle, Win32API.COMPRESSION_FORMAT_DEFAULT) + SetFileCompressionState(SafeFileHandle, UnsafeNativeMethods.COMPRESSION_FORMAT_DEFAULT) End Sub Public Shared Sub UncompressFile(SafeFileHandle As SafeFileHandle) - SetFileCompressionState(SafeFileHandle, Win32API.COMPRESSION_FORMAT_NONE) + SetFileCompressionState(SafeFileHandle, UnsafeNativeMethods.COMPRESSION_FORMAT_NONE) End Sub Public Shared Sub AllowExtendedDASDIO(SafeFileHandle As SafeFileHandle) - Win32Try(Win32API.DeviceIoControl(SafeFileHandle, Win32API.FSCTL_ALLOW_EXTENDED_DASD_IO, IntPtr.Zero, 0UI, IntPtr.Zero, 0UI, 0UI, IntPtr.Zero)) + Win32Try(UnsafeNativeMethods.DeviceIoControl(SafeFileHandle, UnsafeNativeMethods.FSCTL_ALLOW_EXTENDED_DASD_IO, IntPtr.Zero, 0UI, IntPtr.Zero, 0UI, 0UI, IntPtr.Zero)) End Sub @@ -791,39 +827,29 @@ Public Class NativeFileIO ''' successful lock (no other open handles) is required before attempting to dismount filesystem. Public Shared Function DismountVolumeFilesystem(hDevice As SafeFileHandle, bForce As Boolean) As Boolean - If Not Win32API.DeviceIoControl(hDevice, Win32API.FSCTL_LOCK_VOLUME, IntPtr.Zero, 0, IntPtr.Zero, 0, Nothing, Nothing) Then + If Not UnsafeNativeMethods.DeviceIoControl(hDevice, UnsafeNativeMethods.FSCTL_LOCK_VOLUME, IntPtr.Zero, 0, IntPtr.Zero, 0, Nothing, Nothing) Then If Not bForce Then Return False End If End If - If Not Win32API.DeviceIoControl(hDevice, Win32API.FSCTL_DISMOUNT_VOLUME, IntPtr.Zero, 0, IntPtr.Zero, 0, Nothing, Nothing) Then + If Not UnsafeNativeMethods.DeviceIoControl(hDevice, UnsafeNativeMethods.FSCTL_DISMOUNT_VOLUME, IntPtr.Zero, 0, IntPtr.Zero, 0, Nothing, Nothing) Then Return False End If - Return Win32API.DeviceIoControl(hDevice, Win32API.FSCTL_LOCK_VOLUME, IntPtr.Zero, 0, IntPtr.Zero, 0, Nothing, Nothing) + Return UnsafeNativeMethods.DeviceIoControl(hDevice, UnsafeNativeMethods.FSCTL_LOCK_VOLUME, IntPtr.Zero, 0, IntPtr.Zero, 0, Nothing, Nothing) End Function - Private Declare Function DeviceIoControl Lib "kernel32" ( - hDevice As SafeFileHandle, - dwIoControlCode As UInt32, - lpInBuffer As IntPtr, - nInBufferSize As UInt32, - ByRef lpOutBuffer As Win32API.DISK_GEOMETRY, - nOutBufferSize As UInt32, - ByRef lpBytesReturned As UInt32, - lpOverlapped As IntPtr) As Boolean - ''' ''' Retrieves disk geometry. ''' ''' Handle to device. - Public Shared Function GetDiskGeometry(hDevice As SafeFileHandle) As Win32API.DISK_GEOMETRY + Public Shared Function GetDiskGeometry(hDevice As SafeFileHandle) As UnsafeNativeMethods.DISK_GEOMETRY - Dim DiskGeometry As Win32API.DISK_GEOMETRY + Dim DiskGeometry As UnsafeNativeMethods.DISK_GEOMETRY - Win32Try(DeviceIoControl(hDevice, Win32API.IOCTL_DISK_GET_DRIVE_GEOMETRY, IntPtr.Zero, 0, DiskGeometry, CUInt(Marshal.SizeOf(GetType(Win32API.DISK_GEOMETRY))), Nothing, Nothing)) + Win32Try(UnsafeNativeMethods.DeviceIoControl(hDevice, UnsafeNativeMethods.IOCTL_DISK_GET_DRIVE_GEOMETRY, IntPtr.Zero, 0, DiskGeometry, CUInt(Marshal.SizeOf(GetType(UnsafeNativeMethods.DISK_GEOMETRY))), Nothing, Nothing)) Return DiskGeometry @@ -831,15 +857,62 @@ Public Class NativeFileIO Public Shared Function GetProcAddress(hModule As IntPtr, procedureName As String, delegateType As Type) As [Delegate] - Return Marshal.GetDelegateForFunctionPointer(Win32Try(Win32API.GetProcAddress(hModule, procedureName)), delegateType) + Return Marshal.GetDelegateForFunctionPointer(Win32Try(UnsafeNativeMethods.GetProcAddress(hModule, procedureName)), delegateType) End Function Public Shared Function GetProcAddress(moduleName As String, procedureName As String, delegateType As Type) As [Delegate] - Dim hModule = Win32Try(Win32API.LoadLibrary(moduleName)) - Return Marshal.GetDelegateForFunctionPointer(Win32Try(Win32API.GetProcAddress(hModule, procedureName)), delegateType) + Dim hModule = Win32Try(UnsafeNativeMethods.LoadLibrary(moduleName)) + Return Marshal.GetDelegateForFunctionPointer(Win32Try(UnsafeNativeMethods.GetProcAddress(hModule, procedureName)), delegateType) End Function + Public Enum Win32FileType As Int32 + Unknown = &H0 + Disk = &H1 + Character = &H2 + Pipe = &H3 + Remote = &H8000 + End Enum + + Public Enum StdHandle As Int32 + Input = -10 + Output = -11 + [Error] = -12 + End Enum + + + Public Structure COORD + Public ReadOnly Property X As Short + Public ReadOnly Property Y As Short + End Structure + + + Public Structure SMALL_RECT + Public ReadOnly Property Left As Short + Public ReadOnly Property Top As Short + Public ReadOnly Property Right As Short + Public ReadOnly Property Bottom As Short + Public ReadOnly Property Width As Short + Get + Return _Right - _Left + 1S + End Get + End Property + Public ReadOnly Property Height As Short + Get + Return _Bottom - _Top + 1S + End Get + End Property + End Structure + + + Public Structure CONSOLE_SCREEN_BUFFER_INFO + Public ReadOnly Property dwSize As COORD + Public ReadOnly Property dwCursorPosition As COORD + Public ReadOnly Property wAttributes As Short + Public ReadOnly Property srWindow As SMALL_RECT + Public ReadOnly Property dwMaximumWindowSize As COORD + End Structure + End Class diff --git a/ImDiskNet/ImDiskNet/Support/DisposableList.vb b/ImDiskNet/ImDiskNet/Support/DisposableList.vb new file mode 100644 index 0000000..be90c4a --- /dev/null +++ b/ImDiskNet/ImDiskNet/Support/DisposableList.vb @@ -0,0 +1,41 @@ +Imports System.Diagnostics.CodeAnalysis +Imports System.Runtime.InteropServices + +''' +''' A System.Collections.Generic.List(Of T) extended with IDisposable implementation that disposes each +''' object in the list when the list is disposed. +''' +''' + +Public Class DisposableList(Of T As IDisposable) + Inherits List(Of T) + + Implements IDisposable + + ' IDisposable + Protected Overridable Sub Dispose(disposing As Boolean) + If disposing Then + ' TODO: free managed resources when explicitly called + For Each obj In Me + obj.Dispose() + Next + End If + + ' TODO: free shared unmanaged resources + Clear() + + End Sub + + ' This code added by Visual Basic to correctly implement the disposable pattern. + Public Sub Dispose() Implements IDisposable.Dispose + ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. + Dispose(True) + GC.SuppressFinalize(Me) + End Sub + + Protected Overrides Sub Finalize() + Dispose(False) + MyBase.Finalize() + End Sub +End Class + diff --git a/ImDiskNet/ImDiskNet/packages.config b/ImDiskNet/ImDiskNet/packages.config new file mode 100644 index 0000000..f6123cd --- /dev/null +++ b/ImDiskNet/ImDiskNet/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ImDiskNet/ImDiskNetHelpBuilder.shfbproj b/ImDiskNet/ImDiskNetHelpBuilder.shfbproj index 9425e44..496a633 100644 --- a/ImDiskNet/ImDiskNetHelpBuilder.shfbproj +++ b/ImDiskNet/ImDiskNetHelpBuilder.shfbproj @@ -15,7 +15,7 @@ Documentation Documentation - .\Help\ + Help\ ImDisk Virtual Disk Driver API en-US HtmlHelp1, MSHelpViewer, Website @@ -23,10 +23,10 @@ None Attributes, ExplicitInterfaceImplementations, InheritedMembers, InheritedFrameworkMembers, Protected, EditorBrowsableNever, NonBrowsable - - - - + + + + diff --git a/ImDiskNet/VB6test/Form.frm b/ImDiskNet/VB6test/Form.frm new file mode 100644 index 0000000..0e169bf --- /dev/null +++ b/ImDiskNet/VB6test/Form.frm @@ -0,0 +1,190 @@ +VERSION 5.00 +Begin VB.Form Form1 + Caption = "Form1" + ClientHeight = 12465 + ClientLeft = 1650 + ClientTop = 1545 + ClientWidth = 6585 + LinkTopic = "Form1" + ScaleHeight = 12465 + ScaleWidth = 6585 + Begin VB.CommandButton Command7 + Caption = "Load driver" + Height = 615 + Left = 600 + TabIndex = 7 + Top = 180 + Width = 5115 + End + Begin VB.CommandButton Command6 + Caption = "Command6" + Height = 555 + Left = 1680 + TabIndex = 6 + Top = 10140 + Width = 3375 + End + Begin VB.CommandButton Command5 + Caption = "Read boot sector from drive" + Height = 495 + Left = 540 + TabIndex = 5 + Top = 7920 + Width = 5715 + End + Begin VB.TextBox Text1 + Height = 375 + Left = 780 + TabIndex = 4 + Text = "Text1" + Top = 8580 + Width = 5295 + End + Begin VB.CommandButton Command4 + Caption = "Load device from image file" + Height = 915 + Left = 840 + TabIndex = 3 + Top = 6660 + Width = 5415 + End + Begin VB.CommandButton Command3 + Caption = "Remove device" + Height = 735 + Left = 1080 + TabIndex = 2 + Top = 4980 + Width = 4275 + End + Begin VB.CommandButton Command2 + Caption = "Save to image file" + Height = 735 + Left = 1080 + TabIndex = 1 + Top = 3180 + Width = 4695 + End + Begin VB.CommandButton Command1 + Caption = "Create new device" + Height = 795 + Left = 540 + TabIndex = 0 + Top = 1080 + Width = 5355 + End +End +Attribute VB_Name = "Form1" +Attribute VB_GlobalNameSpace = False +Attribute VB_Creatable = False +Attribute VB_PredeclaredId = True +Attribute VB_Exposed = False +Option Explicit + +Dim ImDisk As New ImDiskCOM + +Private Sub Command1_Click() + + Dim DeviceNumber As Long + DeviceNumber = -1 + + Dim DiskSize As LARGE_INTEGER + DiskSize.LowPart = 1440 * 2 ^ 10 + Dim ImageOffset As LARGE_INTEGER + + ImDisk.CreateDeviceEx DiskSize:=DiskSize, ImageOffset:=ImageOffset, MountPoint:="B:", DeviceNumber:=DeviceNumber, StatusControl:=Text1.hWnd + + Dim Flags As ImDiskFlags + Dim DriveLetter As String + Dim Filename As String + + ImDisk.QueryDevice _ + DeviceNumber, _ + DiskSize:=DiskSize, _ + ImageOffset:=ImageOffset, _ + Flags:=Flags, _ + DriveLetter:=DriveLetter, _ + Filename:=Filename + +End Sub + +Private Sub Command4_Click() + + Dim DeviceNumber As Long + DeviceNumber = -1 + + Dim Filename As String + Filename = "C:\test.img" + + Dim DiskSize As LARGE_INTEGER + Dim ImageOffset As LARGE_INTEGER + + ImDisk.AutoFindOffsetAndSize Filename, ImageOffset, DiskSize + + ImDisk.CreateDeviceEx DiskSize:=DiskSize, ImageOffset:=ImageOffset, Filename:=Filename, Flags:=ImDiskFlags_TypeVM, MountPoint:="B:", DeviceNumber:=DeviceNumber, StatusControl:=Text1.hWnd + + Dim Flags As ImDiskFlags + Dim DriveLetter As String + + ImDisk.QueryDevice _ + DeviceNumber, _ + DiskSize:=DiskSize, _ + ImageOffset:=ImageOffset, _ + Flags:=Flags, _ + DriveLetter:=DriveLetter, _ + Filename:=Filename + +End Sub + +Private Sub Command2_Click() + + Dim Device As ImDiskDevice + Set Device = ImDisk.OpenDeviceByMountPoint("B:", FileAccess_Read) + + Device.SaveImageFile "C:\test.img" + + Device.Close + +End Sub + +Private Sub Command3_Click() + + ImDisk.RemoveDeviceByMountPoint "B:", StatusControl:=Text1.hWnd + +End Sub + +Private Sub Command5_Click() + + Dim Device As ImDiskDevice + Set Device = ImDisk.OpenDeviceByMountPoint("B:", FileAccess_Read) + + Dim Stream As Stream + Set Stream = Device.GetRawDiskStream() + + Text1 = "" + Dim i As Integer + For i = 0 To 511 + Dim hexstr As String + hexstr = Hex(Stream.ReadByte()) + If Len(hexstr) = 1 Then + hexstr = "0" & hexstr + End If + Text1 = Text1 & hexstr + Next + + Device.Close + +End Sub + +Private Sub Command6_Click() + + MkDir "C:\test" + ImDisk.CreateMountPointForDeviceNumber "C:\test", 0 + +End Sub + +Private Sub Command7_Click() + + ImDisk.LoadDriver + ImDisk.LoadHelperService + +End Sub diff --git a/ImDiskNet/VB6test/VB6test.vbp b/ImDiskNet/VB6test/VB6test.vbp new file mode 100644 index 0000000..b1d773f --- /dev/null +++ b/ImDiskNet/VB6test/VB6test.vbp @@ -0,0 +1,33 @@ +Type=Exe +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#D:\WINNT\system32\stdole2.tlb#OLE Automation +Reference=*\G{BED7F4EA-1A96-11D2-8F08-00A0C9A6186D}#2.0#0#D:\WINNT\Microsoft.NET\Framework\v2.0.50727\mscorlib.tlb#mscorlib.dll +Reference=*\G{8EB0AE23-5CF4-4863-A2A0-DE9F303F613A}#1.0#0#..\ImDiskNet\bin\Release\ImDiskNet.tlb#ImDiskNet +Form=Form.frm +Startup="Form1" +Command32="" +Name="Project1" +HelpContextID="0" +CompatibleMode="0" +MajorVer=1 +MinorVer=0 +RevisionVer=0 +AutoIncrementVer=0 +ServerSupportFiles=0 +CompilationType=0 +OptimizationType=0 +FavorPentiumPro(tm)=0 +CodeViewDebugInfo=0 +NoAliasing=0 +BoundsCheck=0 +OverflowCheck=0 +FlPointCheck=0 +FDIVCheck=0 +UnroundedFP=0 +StartMode=0 +Unattended=0 +Retained=0 +ThreadPerObject=0 +MaxNumberOfThreads=1 + +[MS Transaction Server] +AutoRefresh=1 diff --git a/Makefile b/Makefile index 97760a8..8e01d99 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,10 @@ !ENDIF !IFNDEF TIMESTAMP_WEBSERVICE -TIMESTAMP_WEBSERVICE=http://timestamp.globalsign.com/scripts/timestamp.dll -#TIMESTAMP_WEBSERVICE=http://timestamp.comodoca.com/authenticode -#TIMESTAMP_WEBSERVICE=http://timestamp.verisign.com/scripts/timestamp.dll +TIMESTAMP_WEBSERVICE=/tr "http://sha256timestamp.ws.symantec.com/sha256/timestamp" +#TIMESTAMP_WEBSERVICE=/t "http://timestamp.globalsign.com/scripts/timestamp.dll" +#TIMESTAMP_WEBSERVICE=/t "http://timestamp.comodoca.com/authenticode" +#TIMESTAMP_WEBSERVICE=/t "http://timestamp.verisign.com/scripts/timestamp.dll" !ENDIF !IFNDEF ARCHDIR @@ -52,7 +53,7 @@ UPLOAD_DIR=$(MAKEDIR)\dist\setup STAMPINF_VERSION=$(IMDISK_VERSION) -all: cli\$(ARCHDIR)\imdisk.exe svc\$(ARCHDIR)\imdsksvc.exe cpl\$(ARCHDIR)\imdisk.cpl cplcore\$(ARCHDIR)\imdisk.cpl sys\$(ARCHDIR)\imdisk.sys awealloc\$(ARCHDIR)\awealloc.sys deviotst\$(ARCHDIR)\deviotst.exe +all: cli\$(ARCHDIR)\imdisk.exe svc\$(ARCHDIR)\imdsksvc.exe cpl\$(ARCHDIR)\imdisk.cpl cplcore\$(ARCHDIR)\imdisk.cpl sys\$(ARCHDIR)\imdisk.sys awealloc\$(ARCHDIR)\awealloc.sys deviodrv\$(ARCHDIR)\deviodrv.sys deviotst\$(ARCHDIR)\deviotst.exe clean: del /s *~ *.obj *.log *.wrn *.err *.mac *.o @@ -65,7 +66,7 @@ $(DIST_DIR) $(UPLOAD_DIR): $(DIST_DIR)\imdiskinst.exe: $(DIST_DIR)\imdisk.7z 7zSD.sfx 7zSDcfg.txt copy /y /b 7zSD.sfx + 7zSDcfg.txt + $(DIST_DIR)\imdisk.7z $(DIST_DIR)\imdiskinst.exe - $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver" /du "$(COMPANYURL)" $(CROSSCERT) /t "$(TIMESTAMP_WEBSERVICE)" $(DIST_DIR)\imdiskinst.exe + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $(DIST_DIR)\imdiskinst.exe xcopy /d /y $(DIST_DIR)\imdiskinst.exe $(UPLOAD_DIR) $(DIST_DIR)\imdisk_source.7z: $(DIST_DIR)\imdisk.7z 7zSDcfg.txt $(README_TXT_FILES) runwaitw.exe install.cmd msgboxw.exe inc\imdiskver.h devio\*.c devio\*.cpp devio\*.h devio\Makefile* uninstall_imdisk.cmd 7zSD.sfx *.sln *.props ImDiskNet\*.sln ImDiskNet\ImDiskNet\*.vb ImDiskNet\ImDiskNet\*.*proj ImDiskNet\DiscUtilsDevio\*.vb ImDiskNet\DiscUtilsDevio\*.*proj ImDiskNet\DevioNet\*.vb ImDiskNet\DevioNet\*.*proj Makefile devio\Makefile* @@ -73,17 +74,17 @@ $(DIST_DIR)\imdisk_source.7z: $(DIST_DIR)\imdisk.7z 7zSDcfg.txt $(README_TXT_FIL 7z a -r $(DIST_DIR)\imdisk_source.7z -x!*~ -m0=PPMd 7zSDcfg.txt 7zSD.sfx $(README_TXT_FILES) *.def *.src *.ico *.c *.h *.cpp *.hpp *.cxx *.hxx *.rc *.lib *.sln *.vb *.cs *.*proj *.snk *.resx *.resources *.myapp *.settings *.props Sources dirs imdisk.inf runwaitw.exe install.cmd msgboxw.exe uninstall_imdisk.cmd Makefile xcopy /d /y $(DIST_DIR)\imdisk_source.7z $(UPLOAD_DIR) -$(DIST_DIR)\imdisk.7z: $(README_TXT_FILES) imdisk.inf runwaitw.exe install.cmd uninstall_imdisk.cmd msgboxw.exe cli\i386\imdisk.exe cpl\i386\imdisk.cpl cplcore\i386\imdisk.cpl svc\i386\imdsksvc.exe sys\i386\imdisk.sys awealloc\i386\awealloc.sys cli\ia64\imdisk.exe cpl\ia64\imdisk.cpl cplcore\ia64\imdisk.cpl svc\ia64\imdsksvc.exe sys\ia64\imdisk.sys awealloc\ia64\awealloc.sys cli\amd64\imdisk.exe cpl\amd64\imdisk.cpl cplcore\amd64\imdisk.cpl svc\amd64\imdsksvc.exe sys\amd64\imdisk.sys awealloc\amd64\awealloc.sys cli\arm\imdisk.exe cpl\arm\imdisk.cpl cplcore\arm\imdisk.cpl svc\arm\imdsksvc.exe sys\arm\imdisk.sys awealloc\arm\awealloc.sys cli\arm64\imdisk.exe cpl\arm64\imdisk.cpl cplcore\arm64\imdisk.cpl svc\arm64\imdsksvc.exe sys\arm64\imdisk.sys awealloc\arm64\awealloc.sys +$(DIST_DIR)\imdisk.7z: $(README_TXT_FILES) imdisk.inf runwaitw.exe install.cmd uninstall_imdisk.cmd msgboxw.exe cli\i386\imdisk.exe cpl\i386\imdisk.cpl cplcore\i386\imdisk.cpl svc\i386\imdsksvc.exe sys\i386\imdisk.sys awealloc\i386\awealloc.sys deviodrv\i386\deviodrv.sys cli\ia64\imdisk.exe cpl\ia64\imdisk.cpl cplcore\ia64\imdisk.cpl svc\ia64\imdsksvc.exe sys\ia64\imdisk.sys awealloc\ia64\awealloc.sys deviodrv\ia64\deviodrv.sys cli\amd64\imdisk.exe cpl\amd64\imdisk.cpl cplcore\amd64\imdisk.cpl svc\amd64\imdsksvc.exe sys\amd64\imdisk.sys awealloc\amd64\awealloc.sys deviodrv\amd64\deviodrv.sys cli\arm\imdisk.exe cpl\arm\imdisk.cpl cplcore\arm\imdisk.cpl svc\arm\imdsksvc.exe sys\arm\imdisk.sys awealloc\arm\awealloc.sys deviodrv\arm\deviodrv.sys cli\arm64\imdisk.exe cpl\arm64\imdisk.cpl cplcore\arm64\imdisk.cpl svc\arm64\imdsksvc.exe sys\arm64\imdisk.sys awealloc\arm64\awealloc.sys deviodrv\arm64\deviodrv.sys del $(DIST_DIR)\imdisk.7z stampinf -f imdisk.inf -a NTx86,NTia64,NTamd64,NTarm,NTarm64 - 7z a $(DIST_DIR)\imdisk.7z -m0=LZMA:a=2 $(README_TXT_FILES) imdisk.inf runwaitw.exe install.cmd uninstall_imdisk.cmd msgboxw.exe cli\i386\imdisk.exe cpl\i386\imdisk.cpl cplcore\i386\imdisk.cpl svc\i386\imdsksvc.exe sys\i386\imdisk.sys awealloc\i386\awealloc.sys cli\ia64\imdisk.exe cpl\ia64\imdisk.cpl cplcore\ia64\imdisk.cpl svc\ia64\imdsksvc.exe sys\ia64\imdisk.sys awealloc\ia64\awealloc.sys cli\amd64\imdisk.exe cpl\amd64\imdisk.cpl cplcore\amd64\imdisk.cpl svc\amd64\imdsksvc.exe sys\amd64\imdisk.sys awealloc\amd64\awealloc.sys cli\arm\imdisk.exe cpl\arm\imdisk.cpl cplcore\arm\imdisk.cpl svc\arm\imdsksvc.exe sys\arm\imdisk.sys awealloc\arm\awealloc.sys cli\arm64\imdisk.exe cpl\arm64\imdisk.cpl cplcore\arm64\imdisk.cpl svc\arm64\imdsksvc.exe sys\arm64\imdisk.sys awealloc\arm64\awealloc.sys + 7z a $(DIST_DIR)\imdisk.7z -m0=LZMA:a=2 $(README_TXT_FILES) imdisk.inf runwaitw.exe install.cmd uninstall_imdisk.cmd msgboxw.exe cli\i386\imdisk.exe cpl\i386\imdisk.cpl cplcore\i386\imdisk.cpl svc\i386\imdsksvc.exe sys\i386\imdisk.sys awealloc\i386\awealloc.sys deviodrv\i386\deviodrv.sys cli\ia64\imdisk.exe cpl\ia64\imdisk.cpl cplcore\ia64\imdisk.cpl svc\ia64\imdsksvc.exe sys\ia64\imdisk.sys awealloc\ia64\awealloc.sys deviodrv\ia64\deviodrv.sys cli\amd64\imdisk.exe cpl\amd64\imdisk.cpl cplcore\amd64\imdisk.cpl svc\amd64\imdsksvc.exe sys\amd64\imdisk.sys awealloc\amd64\awealloc.sys deviodrv\amd64\deviodrv.sys cli\arm\imdisk.exe cpl\arm\imdisk.cpl cplcore\arm\imdisk.cpl svc\arm\imdsksvc.exe sys\arm\imdisk.sys awealloc\arm\awealloc.sys deviodrv\arm\deviodrv.sys cli\arm64\imdisk.exe cpl\arm64\imdisk.cpl cplcore\arm64\imdisk.cpl svc\arm64\imdsksvc.exe sys\arm64\imdisk.sys awealloc\arm64\awealloc.sys deviodrv\arm64\deviodrv.sys cli\$(ARCHDIR)\imdisk.exe: cli\sources cli\*.c cli\*.rc inc\*.h cpl\$(ARCHDIR)\imdisk.lib cplcore\$(ARCHDIR)\imdisk.lib cd cli build cd $(MAKEDIR) editbin /nologo /subsystem:console,4.00 $@ - $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Command line tool" /du "$(COMPANYURL)" $(CROSSCERT) /t "$(TIMESTAMP_WEBSERVICE)" $@ + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Command line tool" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $@ cpl\$(ARCHDIR)\imdisk.lib: cpl\$(ARCHDIR)\imdisk.cpl @@ -92,7 +93,7 @@ cpl\$(ARCHDIR)\imdisk.cpl: cpl\sources cpl\*.c cpl\*.cpp cpl\*.rc cpl\*.src cpl\ build cd $(MAKEDIR) editbin /nologo /subsystem:windows,4.00 $@ - $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Control Panel Applet" /du "$(COMPANYURL)" $(CROSSCERT) /t "$(TIMESTAMP_WEBSERVICE)" $@ + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Control Panel Applet" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $@ cplcore\$(ARCHDIR)\imdisk.lib: cplcore\$(ARCHDIR)\imdisk.cpl @@ -102,29 +103,35 @@ cplcore\$(ARCHDIR)\imdisk.cpl: cplcore\sources cplcore\*.c cpl\*.c cplcore\*.cpp build cd $(MAKEDIR) editbin /nologo /subsystem:windows,4.00 $@ - $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Core API Library" /du "$(COMPANYURL)" $(CROSSCERT) /t "$(TIMESTAMP_WEBSERVICE)" $@ + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Core API Library" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $@ svc\$(ARCHDIR)\imdsksvc.exe: svc\sources svc\*.cpp svc\*.rc inc\*.h inc\*.hpp cd svc build cd $(MAKEDIR) editbin /nologo /subsystem:console,4.00 $@ - $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Helper Service" /du "$(COMPANYURL)" $(CROSSCERT) /t "$(TIMESTAMP_WEBSERVICE)" $@ + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver Helper Service" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $@ -sys\$(ARCHDIR)\imdisk.sys: sys\sources sys\*.cpp sys\*.rc inc\*.h +sys\$(ARCHDIR)\imdisk.sys: sys\sources sys\*.cpp sys\*.h sys\*.rc inc\*.h cd sys build cd $(MAKEDIR) - $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver" /du "$(COMPANYURL)" $(CROSSCERT) /t "$(TIMESTAMP_WEBSERVICE)" $@ + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "ImDisk Virtual Disk Driver" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $@ awealloc\$(ARCHDIR)\awealloc.sys: awealloc\sources awealloc\*.c awealloc\*.rc inc\*.h cd awealloc build cd $(MAKEDIR) - $(SIGNTOOL) /n "$(COMPANYNAME)" /d "AWE Allocation Driver" /du "$(COMPANYURL)" $(CROSSCERT) /t "$(TIMESTAMP_WEBSERVICE)" $@ + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "AWE Allocation Driver" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $@ + +deviodrv\$(ARCHDIR)\deviodrv.sys: deviodrv\sources deviodrv\*.cpp deviodrv\*.rc deviodrv\*.h inc\*.h + cd deviodrv + build + cd $(MAKEDIR) + $(SIGNTOOL) /n "$(COMPANYNAME)" /d "DevIO Client Driver" /du "$(COMPANYURL)" $(CROSSCERT) $(TIMESTAMP_WEBSERVICE) $@ deviotst\$(ARCHDIR)\deviotst.exe: deviotst\sources deviotst\deviotst.cpp inc\*.h inc\*.hpp cd deviotst build cd $(MAKEDIR) - editbin /nologo /subsystem:console,4.00 $@ +# editbin /nologo /subsystem:console,4.00 $@ diff --git a/awealloc/awealloc.c b/awealloc/awealloc.c index eb50db0..a6c4ee0 100644 --- a/awealloc/awealloc.c +++ b/awealloc/awealloc.c @@ -1,7 +1,7 @@ /* AWE Allocation Driver for Windows 2000/XP and later. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -105,17 +105,17 @@ typedef struct _OBJECT_CONTEXT PAGE_CONTEXT LatestPageContext; - LONGLONG AsynchronousExchangeHit; + volatile LONGLONG AsynchronousExchangeHit; KSPIN_LOCK IOLock; - LONG ActiveReaders; + volatile LONG ActiveReaders; - LONG ActiveWriters; + volatile LONG ActiveWriters; - LONGLONG ReadRequestLockConflicts; + volatile LONGLONG ReadRequestLockConflicts; - LONGLONG WriteRequestLockConflicts; + volatile LONGLONG WriteRequestLockConflicts; BOOLEAN UseNumaNumber; @@ -402,7 +402,9 @@ IN OUT PKIRQL LowestAssumedIrql) (Context->ActiveReaders >= (OwnsReadLock ? 2 : 1))) { Context->WriteRequestLockConflicts++; - KdPrint(("AWEAlloc: I/O write protection busy while requesting lock for writing.\n")); + KdPrint(("AWEAlloc: I/O write protection busy while requesting lock for writing. Active readers: %i writers: %i\n", + Context->ActiveReaders, Context->ActiveWriters)); + status = STATUS_DEVICE_BUSY; } else @@ -416,6 +418,10 @@ IN OUT PKIRQL LowestAssumedIrql) } else { + KdPrint(("AWEAlloc: Thread %p acquired lock for writing. Active readers: %i writers: %i\n", + KeGetCurrentThread(), + Context->ActiveReaders, Context->ActiveWriters)); + status = STATUS_SUCCESS; } } @@ -425,7 +431,9 @@ IN OUT PKIRQL LowestAssumedIrql) if ((Context->ActiveWriters >= 1) | (Context->ActiveReaders >= LONG_MAX)) { Context->ReadRequestLockConflicts++; - KdPrint(("AWEAlloc: I/O write protection busy while requesting lock for reading.\n")); + KdPrint(("AWEAlloc: I/O write protection busy while requesting lock for reading. Active readers: %i writers: %i\n", + Context->ActiveReaders, Context->ActiveWriters)); + status = STATUS_DEVICE_BUSY; } else @@ -439,6 +447,10 @@ IN OUT PKIRQL LowestAssumedIrql) } else { + KdPrint(("AWEAlloc: Thread %p acquired lock for reading. Active readers: %i writers: %i\n", + KeGetCurrentThread(), + Context->ActiveReaders, Context->ActiveWriters)); + status = STATUS_SUCCESS; } } @@ -458,6 +470,11 @@ IN OUT PKIRQL LowestAssumedIrql) if (ForWriteOperation) { Context->ActiveWriters--; + + KdPrint(("AWEAlloc: Thread %p released lock for writing. Active readers: %i writers: %i\n", + KeGetCurrentThread(), + Context->ActiveReaders, Context->ActiveWriters)); + if (Context->ActiveWriters < 0) { DbgPrint("AWEAlloc: I/O synchronization state corrupt.\n"); @@ -467,6 +484,11 @@ IN OUT PKIRQL LowestAssumedIrql) if (ForReadOperation) { Context->ActiveReaders--; + + KdPrint(("AWEAlloc: Thread %p released lock for reading. Active readers: %i writers: %i\n", + KeGetCurrentThread(), + Context->ActiveReaders, Context->ActiveWriters)); + if (Context->ActiveReaders < 0) { DbgPrint("AWEAlloc: I/O synchronization state corrupt.\n"); @@ -836,6 +858,9 @@ IN PIRP Irp) { KdPrint(("AWEAlloc: Read request starting past EOF.\n")); + AWEAllocReleaseProtection(context, TRUE, FALSE, + &lowest_assumed_irql); + Irp->IoStatus.Status = STATUS_END_OF_FILE; Irp->IoStatus.Information = 0; @@ -937,8 +962,10 @@ IN PIRP Irp) return STATUS_SUCCESS; } - if ((page_offset_this_iter + bytes_this_iter) > ALLOC_PAGE_SIZE) + if (((ULONGLONG)page_offset_this_iter + bytes_this_iter) > ALLOC_PAGE_SIZE) + { bytes_this_iter = ALLOC_PAGE_SIZE - page_offset_this_iter; + } status = AWEAllocMapPage(context, abs_offset_this_iter, ¤t_page_context, &lowest_assumed_irql); diff --git a/awealloc/awealloc.inf b/awealloc/awealloc.inf new file mode 100644 index 0000000..0fbc083 --- /dev/null +++ b/awealloc/awealloc.inf @@ -0,0 +1,54 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 10/26/2021,2.1.0.00070 +CatalogFile = awealloc.cat + + +[SourceDisksNames] +1 = "AWE Allocation Driver" + + +[SourceDisksFiles.x86] +awealloc.sys = 1, i386 + +[SourceDisksFiles.ia64] +awealloc.sys = 1, ia64 + +[SourceDisksFiles.amd64] +awealloc.sys = 1, amd64 + +[SourceDisksFiles.arm] +awealloc.sys = 1, arm + +[SourceDisksFiles.arm64] +awealloc.sys = 1, arm64 + +[DestinationDirs] +AWEAllocSysFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = AWEAllocSysFiles + + +[AWEAllocSysFiles] +awealloc.sys + + +[DefaultInstall.ntx86.Services] +AddService = AWEAlloc, , AWEAllocDrv + + +[AWEAllocDrv] +DisplayName = "AWE Allocation Driver" +StartType = 2 +ServiceType = 1 +ErrorControl = 0 +ServiceBinary = %12%\AWEAlloc.sys diff --git a/awealloc/awealloc.props b/awealloc/awealloc.props new file mode 100644 index 0000000..58945c9 --- /dev/null +++ b/awealloc/awealloc.props @@ -0,0 +1,13 @@ + + + + + + + + + DriverEntry + + + + \ No newline at end of file diff --git a/awealloc/awealloc.rc b/awealloc/awealloc.rc index e67e6bb..f2fdd20 100644 --- a/awealloc/awealloc.rc +++ b/awealloc/awealloc.rc @@ -10,8 +10,8 @@ // VS_VERSION_INFO VERSIONINFO -FILEVERSION IMDISK_RC_VERSION_FLD,22 -PRODUCTVERSION IMDISK_RC_VERSION_FLD,22 +FILEVERSION IMDISK_RC_VERSION_FLD,24 +PRODUCTVERSION IMDISK_RC_VERSION_FLD,24 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifndef DEBUG FILEFLAGS 0 @@ -28,12 +28,12 @@ BEGIN BEGIN VALUE "CompanyName", "Olof Lagerkvist\0" VALUE "FileDescription", "AWE Allocation Driver\0" - VALUE "FileVersion", IMDISK_RC_VERSION_STR ".22\0" + VALUE "FileVersion", IMDISK_RC_VERSION_STR ".24\0" VALUE "InternalName", "awealloc\0" - VALUE "LegalCopyright", "Copyright © 2009-2018 Olof Lagerkvist.\0" + VALUE "LegalCopyright", "Copyright © 2009-2021 Olof Lagerkvist.\0" VALUE "OriginalFilename", "awealloc.sys\0" VALUE "ProductName", "imdisk\0" - VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".22\0" + VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".24\0" END END BLOCK "VarFileInfo" diff --git a/awealloc/awealloc.vcxproj b/awealloc/awealloc.vcxproj index 6db4645..53cf3d3 100644 --- a/awealloc/awealloc.vcxproj +++ b/awealloc/awealloc.vcxproj @@ -241,6 +241,7 @@ + @@ -293,6 +294,7 @@ + @@ -321,6 +323,7 @@ + @@ -336,76 +339,76 @@ - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + - http://timestamp.globalsign.com/scripts/timstamp.dll + diff --git a/cli/cli.inf b/cli/cli.inf new file mode 100644 index 0000000..6b9d44c --- /dev/null +++ b/cli/cli.inf @@ -0,0 +1,54 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 10/26/2021,2.1.0.00070 +CatalogFile = cli.cat + + +[SourceDisksNames] +1 = "ImDisk Virtual Disk Driver Command line tool" + + +[SourceDisksFiles.x86] +imdisk.exe = 1, i386 + +[SourceDisksFiles.ia64] +imdisk.exe = 1, ia64 + +[SourceDisksFiles.amd64] +imdisk.exe = 1, amd64 + +[SourceDisksFiles.arm] +imdisk.exe = 1, arm + +[SourceDisksFiles.arm64] +imdisk.exe = 1, arm64 + +[DestinationDirs] +ImDiskExeExeFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = ImDiskExeExeFiles + + +[ImDiskExeExeFiles] +imdisk.exe + + +[DefaultInstall.ntx86.Services] +AddService = ImDiskExe, , ImDiskExe + + +[ImDiskExe] +DisplayName = "ImDisk Virtual Disk Driver Command line tool" +StartType = 2 +ServiceType = 16 +ErrorControl = 0 +ServiceBinary = %11%\imdisk.exe diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj index fdbb59b..a43689d 100644 --- a/cli/cli.vcxproj +++ b/cli/cli.vcxproj @@ -274,14 +274,14 @@ - - - {79ee1ea9-7953-4195-ae59-317bf021eb33} + + + \ No newline at end of file diff --git a/cli/imdisk.c b/cli/imdisk.c index 8ec0dd7..e9dea17 100644 --- a/cli/imdisk.c +++ b/cli/imdisk.c @@ -2,7 +2,7 @@ Control program for the ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2004-2018 Olof Lagerkvist. +Copyright (C) 2004-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -90,7 +90,7 @@ void __declspec(noreturn) ImDiskSyntaxHelp() { int rc = fputs - ("Control program for the ImDisk Virtual Disk Driver.\n" + ("Control program for the ImDisk Virtual Disk Driver.\n" "For copyrights and credits, type imdisk --version\n" "\n" "Syntax:\n" @@ -200,8 +200,8 @@ ImDiskSyntaxHelp() " Specifies which partition to mount when mounting a raw hard disk image\n" " file containing a master boot record and partitions.\n" "\n" - " Specify number 1-4 to mount a partition from the primary partition\n" - " table and 5-8 to mount a partition from an extended partition table.\n" + " Partitions are numbered in the order they are found in primary\n" + " partition table and then in extended partition tables.\n" "\n" "-S sectorsize\n" " Sectorsize to use for the virtual disk device. Default value is 512\n" @@ -325,6 +325,12 @@ ImDiskSyntaxHelp() " performance or cause reads and writes to fail if underlying drivers\n" " cannot handle I/O requests simultaneously.\n" "\n" + "buf Buffered I/O. Valid for file-type virtual disks. With this flag set,\n" + " driver opens image file in buffered I/O mode. This is usually less\n" + " efficient, but it could be required to for example mount an image file\n" + " with smaller sector size than the volume where the image file is\n" + " stored.\n" + "\n" "-u unit\n" " Along with -a, request a specific unit number for the ImDisk device\n" " instead of automatic allocation. Along with -d or -l specifies the\n" @@ -354,7 +360,9 @@ ImDiskSyntaxHelp() // Prints out a FormatMessage style parameterized message to specified stream. BOOL -ImDiskOemPrintF(FILE *Stream, LPCSTR Message, ...) +ImDiskOemPrintF( + FILE* Stream, + LPCSTR Message, ...) { va_list param_list; LPSTR lpBuf = NULL; @@ -424,7 +432,7 @@ ImDiskCliCheckDriverVersion(HANDLE Device) &VersionCheck, sizeof VersionCheck, &BytesReturned, NULL)) switch (GetLastError()) - { + { case ERROR_INVALID_FUNCTION: case ERROR_NOT_SUPPORTED: fputs("Error: Not an ImDisk device.\n", stderr); @@ -433,7 +441,7 @@ ImDiskCliCheckDriverVersion(HANDLE Device) default: PrintLastError(L"Error opening device:"); return FALSE; - } + } if (BytesReturned < sizeof VersionCheck) { @@ -460,8 +468,9 @@ ImDiskCliCheckDriverVersion(HANDLE Device) } BOOL -ImDiskCliValidateDriveLetterTarget(LPCWSTR DriveLetter, -LPCWSTR ValidTargetPath) +ImDiskCliValidateDriveLetterTarget( + LPCWSTR DriveLetter, + LPCWSTR ValidTargetPath) { WCHAR target[MAX_PATH]; @@ -481,7 +490,7 @@ LPCWSTR ValidTargetPath) { PrintLastError(L"Error verifying temporary drive letter:"); } - + return FALSE; } @@ -490,9 +499,10 @@ LPCWSTR ValidTargetPath) // a colon, and FormatOptions parameter is passed to the format.com command // line. int -ImDiskCliFormatDisk(LPCWSTR DevicePath, -WCHAR DriveLetter, -LPCWSTR FormatOptions) +ImDiskCliFormatDisk( + LPCWSTR DevicePath, + WCHAR DriveLetter, + LPCWSTR FormatOptions) { static const WCHAR format_mutex[] = L"ImDiskFormat"; @@ -503,7 +513,7 @@ LPCWSTR FormatOptions) #pragma warning(suppress: 6305) LPWSTR format_cmd = (LPWSTR) ImDiskCliAssertNotNull(_alloca(sizeof(format_cmd_prefix) + - sizeof(temporary_mount_point) + (wcslen(FormatOptions) << 1))); + sizeof(temporary_mount_point) + (wcslen(FormatOptions) << 1))); STARTUPINFO startup_info = { sizeof(startup_info) }; PROCESS_INFORMATION process_info; @@ -545,8 +555,8 @@ LPCWSTR FormatOptions) if (temporary_mount_point[0] == 0) { fprintf - (stderr, - "Format failed. No free drive letters available.\n"); + (stderr, + "Format failed. No free drive letters available.\n"); ReleaseMutex(hMutex); CloseHandle(hMutex); @@ -625,16 +635,17 @@ LPCWSTR FormatOptions) // Creates a new virtual disk device. int -ImDiskCliCreateDevice(LPDWORD DeviceNumber, -PDISK_GEOMETRY DiskGeometry, -PLARGE_INTEGER ImageOffset, -DWORD Flags, -LPCWSTR FileName, -BOOL NativePath, -LPWSTR MountPoint, -BOOL NumericPrint, -LPWSTR FormatOptions, -BOOL SaveSettings) +ImDiskCliCreateDevice( + LPDWORD DeviceNumber, + PDISK_GEOMETRY DiskGeometry, + PLARGE_INTEGER ImageOffset, + DWORD Flags, + LPCWSTR FileName, + BOOL NativePath, + LPWSTR MountPoint, + BOOL NumericPrint, + LPWSTR FormatOptions, + BOOL SaveSettings) { PIMDISK_CREATE_DATA create_data; HANDLE driver; @@ -660,7 +671,7 @@ BOOL SaveSettings) if (!ImDiskStartService(IMDISK_DRIVER_NAME)) switch (GetLastError()) - { + { case ERROR_SERVICE_DOES_NOT_EXIST: fputs("The ImDisk Virtual Disk Driver is not installed. " "Please re-install ImDisk.\n", stderr); @@ -679,7 +690,7 @@ BOOL SaveSettings) default: PrintLastError(L"Error loading ImDisk Virtual Disk Driver:"); return IMDISK_CLI_ERROR_DRIVER_NOT_INSTALLED; - } + } Sleep(0); puts("The ImDisk Virtual Disk Driver was loaded into the kernel."); @@ -692,8 +703,8 @@ BOOL SaveSettings) } // Physical memory allocation requires the AWEAlloc driver. - if (((IMDISK_TYPE(Flags) == IMDISK_TYPE_FILE) | - (IMDISK_TYPE(Flags) == 0)) & + if (((IMDISK_TYPE(Flags) == IMDISK_TYPE_FILE) || + (IMDISK_TYPE(Flags) == 0)) && (IMDISK_FILE_TYPE(Flags) == IMDISK_FILE_TYPE_AWEALLOC)) { HANDLE awealloc; @@ -747,9 +758,9 @@ BOOL SaveSettings) } } // Proxy reconnection types requires the user mode service. - else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) & - ((IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_TCP) | - (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_COMM))) + else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) && + ((IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_TCP) || + (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_COMM))) { if (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0)) if (GetLastError() == ERROR_FILE_NOT_FOUND) @@ -762,7 +773,7 @@ BOOL SaveSettings) break; puts - ("The ImDisk Virtual Disk Driver Helper Service was started."); + ("The ImDisk Virtual Disk Driver Helper Service was started."); } else { @@ -788,7 +799,7 @@ BOOL SaveSettings) default: PrintLastError - (L"Error starting ImDisk Virtual Disk Driver Helper " + (L"Error starting ImDisk Virtual Disk Driver Helper " L"Service:"); } @@ -798,7 +809,9 @@ BOOL SaveSettings) } if (FileName == NULL) + { RtlInitUnicodeString(&file_name, NULL); + } else if (NativePath) { if (!RtlCreateUnicodeString(&file_name, FileName)) @@ -808,21 +821,28 @@ BOOL SaveSettings) return IMDISK_CLI_ERROR_FATAL; } } - else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) & + else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) && (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_SHM)) { LPWSTR namespace_prefix; LPWSTR prefixed_name; HANDLE h = CreateFile(L"\\\\?\\Global", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if ((h == INVALID_HANDLE_VALUE) & + + if ((h == INVALID_HANDLE_VALUE) && (GetLastError() == ERROR_FILE_NOT_FOUND)) + { namespace_prefix = L"\\BaseNamedObjects\\"; + } else + { namespace_prefix = L"\\BaseNamedObjects\\Global\\"; + } if (h != INVALID_HANDLE_VALUE) + { CloseHandle(h); + } prefixed_name = (LPWSTR) _alloca(((wcslen(namespace_prefix) + wcslen(FileName)) << 1) + 1); @@ -862,11 +882,12 @@ BOOL SaveSettings) puts("Creating device..."); // Check if mount point is a drive letter or junction point - if (MountPoint != NULL) - if ((wcslen(MountPoint) == 2) ? MountPoint[1] == ':' : - (wcslen(MountPoint) == 3) ? wcscmp(MountPoint + 1, L":\\") == 0 : - FALSE) - create_data->DriveLetter = MountPoint[0]; + if (MountPoint != NULL && MountPoint[0] != 0 && + (wcscmp(MountPoint + 1, L":") == 0 || + wcscmp(MountPoint + 1, L":\\") == 0)) + { + create_data->DriveLetter = MountPoint[0]; + } create_data->DeviceNumber = *DeviceNumber; create_data->DiskGeometry = *DiskGeometry; @@ -944,13 +965,13 @@ BOOL SaveSettings) } fputs - ("Warning: The device is created without a mount point.\n", + ("Warning: The device is created without a mount point.\n", stderr); MountPoint[0] = 0; } } -#ifndef _WIN64 +#ifdef _M_IX86 else if (!IMDISK_GTE_WINXP()) if (!DefineDosDevice(DDD_RAW_TARGET_PATH, MountPoint, device_path)) PrintLastError(L"Error creating mount point:"); @@ -959,13 +980,17 @@ BOOL SaveSettings) } if (NumericPrint) + { printf("%u\n", *DeviceNumber); + } else + { ImDiskOemPrintF(stdout, - "Created device %1!u!: %2!ws! -> %3!ws!", - *DeviceNumber, - MountPoint == NULL ? L"No mountpoint" : MountPoint, - FileName == NULL ? L"Image in memory" : FileName); + "Created device %1!u!: %2!ws! -> %3!ws!", + *DeviceNumber, + MountPoint == NULL ? L"No mountpoint" : MountPoint, + FileName == NULL ? L"Image in memory" : FileName); + } if (SaveSettings) { @@ -975,9 +1000,11 @@ BOOL SaveSettings) } if (FormatOptions != NULL) + { return ImDiskCliFormatDisk(device_path, - create_data->DriveLetter, - FormatOptions); + create_data->DriveLetter, + FormatOptions); + } return IMDISK_CLI_SUCCESS; } @@ -987,14 +1014,15 @@ BOOL SaveSettings) // the virtual disk. EmergencyRemove can be set to TRUE to have the device // immediately removed, regardless of whether device handler loop in driver is // responsive or hung, or whether or not there are any handles open to the -// device. Use this as a last restort to remove for example proxy backed +// device. Use this as a last resort to remove for example proxy backed // devices with hung proxy connections and similar. int -ImDiskCliRemoveDevice(DWORD DeviceNumber, -LPCWSTR MountPoint, -BOOL ForceDismount, -BOOL EmergencyRemove, -BOOL RemoveSettings) +ImDiskCliRemoveDevice( + DWORD DeviceNumber, + LPCWSTR MountPoint, + BOOL ForceDismount, + BOOL EmergencyRemove, + BOOL RemoveSettings) { WCHAR drive_letter_mount_point[] = L" :"; DWORD dw; @@ -1021,15 +1049,15 @@ BOOL RemoveSettings) if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - FILE_READ_ATTRIBUTES); + FILE_READ_ATTRIBUTES); } else if ((MountPoint[0] != 0) && ((wcscmp(MountPoint + 1, L":") == 0) || - (wcscmp(MountPoint + 1, L":\\") == 0))) + (wcscmp(MountPoint + 1, L":\\") == 0))) { WCHAR drive_letter_path[] = L"\\\\.\\ :"; drive_letter_path[4] = MountPoint[0]; @@ -1052,17 +1080,17 @@ BOOL RemoveSettings) if (device == INVALID_HANDLE_VALUE) device = CreateFile(drive_letter_path, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, - NULL); + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, + NULL); if (device == INVALID_HANDLE_VALUE) device = CreateFile(drive_letter_path, - FILE_READ_ATTRIBUTES, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, - NULL); + FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, + NULL); } else { @@ -1071,11 +1099,11 @@ BOOL RemoveSettings) if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByMountPoint(MountPoint, - GENERIC_READ); + GENERIC_READ); if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByMountPoint(MountPoint, - FILE_READ_ATTRIBUTES); + FILE_READ_ATTRIBUTES); if (device == INVALID_HANDLE_VALUE) { @@ -1130,7 +1158,7 @@ BOOL RemoveSettings) create_data = (PIMDISK_CREATE_DATA) ImDiskCliAssertNotNull(malloc(sizeof(IMDISK_CREATE_DATA) + - (MAX_PATH << 2))); + (MAX_PATH << 2))); if (!DeviceIoControl(device, IOCTL_IMDISK_QUERY_DEVICE, @@ -1157,7 +1185,7 @@ BOOL RemoveSettings) return IMDISK_CLI_ERROR_DEVICE_INACCESSIBLE; } - if ((MountPoint == NULL) & (create_data->DriveLetter != 0)) + if ((MountPoint == NULL) && (create_data->DriveLetter != 0)) { drive_letter_mount_point[0] = create_data->DriveLetter; MountPoint = drive_letter_mount_point; @@ -1188,6 +1216,7 @@ BOOL RemoveSettings) 0, &dw, NULL)) + { if (ForceDismount) { puts("Failed, forcing dismount..."); @@ -1215,6 +1244,7 @@ BOOL RemoveSettings) PrintLastError(MountPoint == NULL ? L"Error" : MountPoint); return IMDISK_CLI_ERROR_DEVICE_INACCESSIBLE; } + } else { puts("Dismounting filesystem..."); @@ -1243,11 +1273,13 @@ BOOL RemoveSettings) 0, &dw, NULL)) - if (ForceDismount ? !ImDiskForceRemoveDevice(device, 0) : FALSE) + { + if (ForceDismount && !ImDiskForceRemoveDevice(device, 0)) { PrintLastError(MountPoint == NULL ? L"Error" : MountPoint); return IMDISK_CLI_ERROR_DEVICE_INACCESSIBLE; } + } DeviceIoControl(device, FSCTL_UNLOCK_VOLUME, @@ -1263,7 +1295,7 @@ BOOL RemoveSettings) if (MountPoint != NULL) { - puts("Removing mountpoint..."); + printf("Removing mount point '%ws'...\n", MountPoint); if (!ImDiskRemoveMountPoint(MountPoint)) { @@ -1361,48 +1393,54 @@ ImDiskCliQueryStatusDriver(BOOL NumericPrint) } for (counter = 1; counter <= *device_list; counter++) + { printf("%s%u\n", - NumericPrint ? "" : "\\Device\\ImDisk", - device_list[counter]); + NumericPrint ? "" : "\\Device\\ImDisk", + device_list[counter]); + } HeapFree(GetProcessHeap(), 0, device_list); return 0; } -/* int */ -/* ImDiskCliQueryStatusDriver(BOOL NumericPrint) */ -/* { */ -/* DWORDLONG device_list = ImDiskGetDeviceList(); */ -/* DWORD counter; */ +#if 0 +int +ImDiskCliQueryStatusDriver(BOOL NumericPrint) +{ + DWORDLONG device_list = ImDiskGetDeviceList(); + DWORD counter; -/* if (device_list == 0) */ -/* switch (GetLastError()) */ -/* { */ -/* case NO_ERROR: */ -/* puts("No virtual disks."); */ -/* return 0; */ + if (device_list == 0) + switch (GetLastError()) + { + case NO_ERROR: + puts("No virtual disks."); + return 0; -/* case ERROR_FILE_NOT_FOUND: */ -/* puts("The ImDisk Virtual Disk Driver is not loaded."); */ -/* return 0; */ + case ERROR_FILE_NOT_FOUND: + puts("The ImDisk Virtual Disk Driver is not loaded."); + return 0; -/* default: */ -/* PrintLastError(L"Cannot control the ImDisk Virtual Disk Driver:"); */ -/* return -1; */ -/* } */ + default: + PrintLastError(L"Cannot control the ImDisk Virtual Disk Driver:"); + return -1; + } -/* for (counter = 0; device_list != 0; device_list >>= 1, counter++) */ -/* if (device_list & 1) */ -/* printf("%s%u\n", NumericPrint ? "" : "\\Device\\ImDisk", counter); */ + for (counter = 0; device_list != 0; device_list >>= 1, counter++) + if (device_list & 1) + printf("%s%u\n", NumericPrint ? "" : "\\Device\\ImDisk", counter); -/* return 0; */ -/* } */ + return 0; +} +#endif // Prints information about an existing virtual disk device, identified by // either a device number or mount point. int -ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) +ImDiskCliQueryStatusDevice( + DWORD DeviceNumber, + LPWSTR MountPoint) { HANDLE device; DWORD dw; @@ -1451,6 +1489,7 @@ ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) } if (device == INVALID_HANDLE_VALUE) + { if (GetLastError() == ERROR_FILE_NOT_FOUND) { fputs("No such device.\n", stderr); @@ -1461,6 +1500,7 @@ ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) PrintLastError(L"Error opening device:"); return IMDISK_CLI_ERROR_DEVICE_INACCESSIBLE; } + } if (!ImDiskCliCheckDriverVersion(device)) { @@ -1470,7 +1510,7 @@ ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) create_data = (PIMDISK_CREATE_DATA) ImDiskCliAssertNotNull(malloc(sizeof(IMDISK_CREATE_DATA) + - (MAX_PATH << 2))); + (MAX_PATH << 2))); if (!DeviceIoControl(device, IOCTL_IMDISK_QUERY_DEVICE, @@ -1481,10 +1521,13 @@ ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) &dw, NULL)) { PrintLastError(MountPoint); + ImDiskOemPrintF(stderr, "%1!ws!: Is that drive really an ImDisk drive?", MountPoint); + CloseHandle(device); + return IMDISK_CLI_ERROR_DEVICE_INACCESSIBLE; } @@ -1501,28 +1544,40 @@ ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) CloseHandle(device); if (MountPoint != NULL) + { ImDiskOemPrintF(stdout, - "Mount point: %1!ws!", - MountPoint); + "Mount point: %1!ws!", + MountPoint); + } else if (create_data->DriveLetter != 0) + { ImDiskOemPrintF(stdout, - "Drive letter: %1!wc!", - create_data->DriveLetter); + "Drive letter: %1!wc!", + create_data->DriveLetter); + } else + { puts("No drive letter."); + } if (create_data->FileNameLength != 0) + { ImDiskOemPrintF(stdout, - "Image file: %1!.*ws!", - (int)(create_data->FileNameLength / - sizeof(*create_data->FileName)), - create_data->FileName); + "Image file: %1!.*ws!", + (int)(create_data->FileNameLength / + sizeof(*create_data->FileName)), + create_data->FileName); + } else + { puts("No image file."); + } if (create_data->ImageOffset.QuadPart > 0) + { printf("Image file offset: %I64i bytes\n", - create_data->ImageOffset.QuadPart); + create_data->ImageOffset.QuadPart); + } printf("Size: %I64i bytes (%.4g %s)", create_data->DiskGeometry.Cylinders.QuadPart, @@ -1543,8 +1598,10 @@ ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) IMDISK_FILE_TYPE(create_data->Flags) == IMDISK_FILE_TYPE_AWEALLOC ? ", Physical Memory" : IMDISK_FILE_TYPE(create_data->Flags) == IMDISK_FILE_TYPE_PARALLEL_IO ? - ", Parallel I/O Image File" : - ", Queued I/O Image File", + ", Parallel I/O Image File" : + IMDISK_FILE_TYPE(create_data->Flags) == IMDISK_FILE_TYPE_BUFFERED_IO ? + ", Queued buffered I/O Image File" : + ", Queued unbuffered I/O Image File", IMDISK_DEVICE_TYPE(create_data->Flags) == IMDISK_DEVICE_TYPE_CD ? ", CD-ROM" : IMDISK_DEVICE_TYPE(create_data->Flags) == @@ -1562,8 +1619,11 @@ ImDiskCliQueryStatusDevice(DWORD DeviceNumber, LPWSTR MountPoint) // number or mount point. FlagsToChange specifies which flag bits to change, // (0=not touch, 1=set to corresponding bit value in Flags parameter). int -ImDiskCliChangeFlags(DWORD DeviceNumber, LPCWSTR MountPoint, -DWORD FlagsToChange, DWORD Flags) +ImDiskCliChangeFlags( + DWORD DeviceNumber, + LPCWSTR MountPoint, + DWORD FlagsToChange, + DWORD Flags) { HANDLE device; DWORD dw; @@ -1573,21 +1633,27 @@ DWORD FlagsToChange, DWORD Flags) { device = ImDiskOpenDeviceByNumber(DeviceNumber, GENERIC_READ | GENERIC_WRITE); + if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); + } } else { device = ImDiskOpenDeviceByMountPoint(MountPoint, GENERIC_READ | GENERIC_WRITE); + if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByMountPoint(MountPoint, - GENERIC_READ); + GENERIC_READ); + } if (device == INVALID_HANDLE_VALUE) switch (GetLastError()) - { + { case ERROR_INVALID_PARAMETER: fputs("This version of Windows only supports drive letters as " "mount points.\n" @@ -1611,10 +1677,11 @@ DWORD FlagsToChange, DWORD Flags) default: PrintLastError(MountPoint); return IMDISK_CLI_ERROR_BAD_MOUNT_POINT; - } + } } if (device == INVALID_HANDLE_VALUE) + { if (GetLastError() == ERROR_FILE_NOT_FOUND) { fputs("No such device.\n", stderr); @@ -1625,6 +1692,7 @@ DWORD FlagsToChange, DWORD Flags) PrintLastError(L"Error opening device:"); return IMDISK_CLI_ERROR_DEVICE_INACCESSIBLE; } + } if (!ImDiskCliCheckDriverVersion(device)) { @@ -1675,6 +1743,7 @@ DWORD FlagsToChange, DWORD Flags) device_flags.FlagsToChange = FlagsToChange; device_flags.FlagValues = Flags; + if (!DeviceIoControl(device, IOCTL_IMDISK_SET_DEVICE_FLAGS, &device_flags, @@ -1704,7 +1773,7 @@ DWORD FlagsToChange, DWORD Flags) // mount point. int ImDiskCliExtendDevice(DWORD DeviceNumber, LPCWSTR MountPoint, -LARGE_INTEGER ExtendSize) + LARGE_INTEGER ExtendSize) { HANDLE device; DWORD dw; @@ -1717,21 +1786,27 @@ LARGE_INTEGER ExtendSize) { device = ImDiskOpenDeviceByNumber(DeviceNumber, GENERIC_READ | GENERIC_WRITE); + if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); + } } else { device = ImDiskOpenDeviceByMountPoint(MountPoint, GENERIC_READ | GENERIC_WRITE); + if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByMountPoint(MountPoint, - GENERIC_READ); + GENERIC_READ); + } if (device == INVALID_HANDLE_VALUE) switch (GetLastError()) - { + { case ERROR_INVALID_PARAMETER: fputs("This version of Windows only supports drive letters as " "mount points.\n" @@ -1755,10 +1830,11 @@ LARGE_INTEGER ExtendSize) default: PrintLastError(MountPoint); return IMDISK_CLI_ERROR_BAD_MOUNT_POINT; - } + } } if (device == INVALID_HANDLE_VALUE) + { if (GetLastError() == ERROR_FILE_NOT_FOUND) { fputs("No such device.\n", stderr); @@ -1769,11 +1845,13 @@ LARGE_INTEGER ExtendSize) PrintLastError(L"Error opening device:"); return IMDISK_CLI_ERROR_DEVICE_INACCESSIBLE; } + } puts("Extending disk size..."); grow_partition.PartitionNumber = 1; grow_partition.BytesToGrow = ExtendSize; + if (!DeviceIoControl(device, IOCTL_DISK_GROW_PARTITION, &grow_partition, @@ -1883,10 +1961,10 @@ wmain(int argc, LPWSTR argv[]) if (wcscmp(argv[1], L"--version") == 0) { printf - ("Control program for the ImDisk Virtual Disk Driver for Windows NT/2000/XP.\n" + ("Control program for the ImDisk Virtual Disk Driver for Windows NT/2000/XP.\n" "Version %i.%i.%i - (Compiled " __DATE__ ")\n" "\n" - "Copyright (C) 2004-2018 Olof Lagerkvist.\n" + "Copyright (C) 2004-2021 Olof Lagerkvist.\n" "\n" "http://www.ltr-data.se olof@ltr-data.se\n" "\n" @@ -1936,7 +2014,7 @@ wmain(int argc, LPWSTR argv[]) if (wcslen(argv[0]) == 2 ? argv[0][0] == L'-' : FALSE) switch (argv[0][1]) - { + { case L'a': if (op_mode != OP_MODE_NONE) ImDiskSyntaxHelp(); @@ -2011,10 +2089,13 @@ wmain(int argc, LPWSTR argv[]) for (opt = wcstok(argv[1], L","); opt != NULL; opt = wcstok(NULL, L",")) + { if (wcscmp(opt, L"ro") == 0) { if (IMDISK_READONLY(flags_to_change)) + { ImDiskSyntaxHelp(); + } flags_to_change |= IMDISK_OPTION_RO; flags |= IMDISK_OPTION_RO; @@ -2022,7 +2103,9 @@ wmain(int argc, LPWSTR argv[]) else if (wcscmp(opt, L"rw") == 0) { if (IMDISK_READONLY(flags_to_change)) + { ImDiskSyntaxHelp(); + } flags_to_change |= IMDISK_OPTION_RO; flags &= ~IMDISK_OPTION_RO; @@ -2035,7 +2118,9 @@ wmain(int argc, LPWSTR argv[]) else if (wcscmp(opt, L"rem") == 0) { if (IMDISK_REMOVABLE(flags_to_change)) + { ImDiskSyntaxHelp(); + } flags_to_change |= IMDISK_OPTION_REMOVABLE; flags |= IMDISK_OPTION_REMOVABLE; @@ -2043,7 +2128,9 @@ wmain(int argc, LPWSTR argv[]) else if (wcscmp(opt, L"fix") == 0) { if (IMDISK_REMOVABLE(flags_to_change)) + { ImDiskSyntaxHelp(); + } flags_to_change |= IMDISK_OPTION_REMOVABLE; flags &= ~IMDISK_OPTION_REMOVABLE; @@ -2051,58 +2138,83 @@ wmain(int argc, LPWSTR argv[]) else if (wcscmp(opt, L"saved") == 0) { if (op_mode != OP_MODE_EDIT) + { ImDiskSyntaxHelp(); + } flags_to_change |= IMDISK_IMAGE_MODIFIED; flags &= ~IMDISK_IMAGE_MODIFIED; } // None of the other options are valid with the -e parameter. else if (op_mode != OP_MODE_CREATE) + { ImDiskSyntaxHelp(); + } else if (wcscmp(opt, L"ip") == 0) { - if ((IMDISK_TYPE(flags) != IMDISK_TYPE_PROXY) | + if ((IMDISK_TYPE(flags) != IMDISK_TYPE_PROXY) || (IMDISK_PROXY_TYPE(flags) != IMDISK_PROXY_TYPE_DIRECT)) + { ImDiskSyntaxHelp(); + } native_path = TRUE; flags |= IMDISK_PROXY_TYPE_TCP; } else if (wcscmp(opt, L"comm") == 0) { - if ((IMDISK_TYPE(flags) != IMDISK_TYPE_PROXY) | + if ((IMDISK_TYPE(flags) != IMDISK_TYPE_PROXY) || (IMDISK_PROXY_TYPE(flags) != IMDISK_PROXY_TYPE_DIRECT)) + { ImDiskSyntaxHelp(); + } native_path = TRUE; flags |= IMDISK_PROXY_TYPE_COMM; } else if (wcscmp(opt, L"shm") == 0) { - if ((IMDISK_TYPE(flags) != IMDISK_TYPE_PROXY) | + if ((IMDISK_TYPE(flags) != IMDISK_TYPE_PROXY) || (IMDISK_PROXY_TYPE(flags) != IMDISK_PROXY_TYPE_DIRECT)) + { ImDiskSyntaxHelp(); + } flags |= IMDISK_PROXY_TYPE_SHM; } else if (wcscmp(opt, L"awe") == 0) { - if (((IMDISK_TYPE(flags) != IMDISK_TYPE_FILE) & - (IMDISK_TYPE(flags) != 0)) | + if (((IMDISK_TYPE(flags) != IMDISK_TYPE_FILE) && + (IMDISK_TYPE(flags) != 0)) || (IMDISK_FILE_TYPE(flags) != 0)) + { ImDiskSyntaxHelp(); + } flags |= IMDISK_TYPE_FILE | IMDISK_FILE_TYPE_AWEALLOC; } else if (wcscmp(opt, L"par") == 0) { - if (((IMDISK_TYPE(flags) != IMDISK_TYPE_FILE) & - (IMDISK_TYPE(flags) != 0)) | + if (((IMDISK_TYPE(flags) != IMDISK_TYPE_FILE) && + (IMDISK_TYPE(flags) != 0)) || (IMDISK_FILE_TYPE(flags) != 0)) + { ImDiskSyntaxHelp(); + } flags |= IMDISK_TYPE_FILE | IMDISK_FILE_TYPE_PARALLEL_IO; } + else if (wcscmp(opt, L"buf") == 0) + { + if (((IMDISK_TYPE(flags) != IMDISK_TYPE_FILE) && + (IMDISK_TYPE(flags) != 0)) || + (IMDISK_FILE_TYPE(flags) != 0)) + { + ImDiskSyntaxHelp(); + } + + flags |= IMDISK_TYPE_FILE | IMDISK_FILE_TYPE_BUFFERED_IO; + } else if (wcscmp(opt, L"bswap") == 0) { flags |= IMDISK_OPTION_BYTE_SWAP; @@ -2135,6 +2247,7 @@ wmain(int argc, LPWSTR argv[]) { ImDiskSyntaxHelp(); } + } } argc--; @@ -2394,7 +2507,7 @@ wmain(int argc, LPWSTR argv[]) if ((argc < 2) | (mount_point != NULL) | ((device_number != IMDISK_AUTO_DEVICE_NUMBER) & - (op_mode != OP_MODE_CREATE))) + (op_mode != OP_MODE_CREATE))) ImDiskSyntaxHelp(); mount_point = _wcsupr(argv[1]); @@ -2405,7 +2518,7 @@ wmain(int argc, LPWSTR argv[]) default: ImDiskSyntaxHelp(); - } + } else ImDiskSyntaxHelp(); } @@ -2466,7 +2579,7 @@ wmain(int argc, LPWSTR argv[]) { image_offset.QuadPart += partition_information.StartingOffset.QuadPart; - + disk_geometry.Cylinders = partition_information.PartitionLength; } @@ -2487,9 +2600,10 @@ wmain(int argc, LPWSTR argv[]) return ret; // Notify processes that new device has arrived. - if ((mount_point != NULL) && - (((wcslen(mount_point) == 2) && mount_point[1] == ':') || - ((wcslen(mount_point) == 3) && (wcscmp(mount_point + 1, L":\\") == 0)))) + if (mount_point != NULL && + mount_point[0] != 0 && + (wcscmp(mount_point + 1, L":") == 0 || + wcscmp(mount_point + 1, L":\\") == 0)) { puts("Notifying applications..."); @@ -2504,7 +2618,7 @@ wmain(int argc, LPWSTR argv[]) case OP_MODE_REMOVE: if ((device_number == IMDISK_AUTO_DEVICE_NUMBER) && ((mount_point == NULL) || - emergency_remove)) + emergency_remove)) ImDiskSyntaxHelp(); return ImDiskCliRemoveDevice(device_number, mount_point, force_dismount, @@ -2553,7 +2667,7 @@ __cdecl wmainCRTStartup() { int argc = 0; - LPWSTR *argv = CommandLineToArgvW(GetCommandLine(), &argc); + LPWSTR* argv = CommandLineToArgvW(GetCommandLine(), &argc); if (argv == NULL) { diff --git a/cli/imdisk.rc b/cli/imdisk.rc index e96edbd..1ff122c 100644 --- a/cli/imdisk.rc +++ b/cli/imdisk.rc @@ -8,8 +8,8 @@ // VS_VERSION_INFO VERSIONINFO -FILEVERSION IMDISK_RC_VERSION_FLD, 49 -PRODUCTVERSION IMDISK_RC_VERSION_FLD, 49 +FILEVERSION IMDISK_RC_VERSION_FLD, 50 +PRODUCTVERSION IMDISK_RC_VERSION_FLD, 50 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifndef DEBUG FILEFLAGS 0 @@ -26,12 +26,12 @@ BEGIN BEGIN VALUE "CompanyName", "Olof Lagerkvist" VALUE "FileDescription", "Control program for the ImDisk Virtual Disk Driver" - VALUE "FileVersion", IMDISK_RC_VERSION_STR ".49" + VALUE "FileVersion", IMDISK_RC_VERSION_STR ".50" VALUE "InternalName", "imdisk" - VALUE "LegalCopyright", "Copyright © 2004-2018 Olof Lagerkvist." + VALUE "LegalCopyright", "Copyright © 2004-2021 Olof Lagerkvist." VALUE "OriginalFilename", "imdisk.exe" VALUE "ProductName", "imdisk" - VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".49" + VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".50" END END BLOCK "VarFileInfo" diff --git a/cpl/Dialogs.rc b/cpl/Dialogs.rc new file mode 100644 index 0000000..398ee3a --- /dev/null +++ b/cpl/Dialogs.rc @@ -0,0 +1,105 @@ +1 DIALOG 81, 42, 267, 255 +STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Virtual Disks" +MENU "IDM_MENU_CPL_APPLET" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS SANS SERIF" +{ + CONTROL "", 0, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 7, 2, 252, 44 + CONTROL 1, 0, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE | WS_GROUP, 14, 15, 21, 20 + CONTROL "Virtual disks work just like physical disks. Image files can be mounted as virtual disks and used like normal drives.", 0, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 43, 18, 208, 18 + CONTROL "Available Virtual Disks:", 0, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 7, 52, 252, 177 + CONTROL "Current virtual devices", 101, "SysListView32", LVS_EX_FULLROWSELECT | LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 14, 66, 238, 136 + CONTROL "&Unmount", 11855, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 207, 50, 15 + CONTROL "&Extend...", 11854, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 207, 50, 15 + CONTROL "F&ormat...", 11853, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 125, 207, 50, 15 + CONTROL "Save &As...", 11852, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 180, 207, 50, 15 + CONTROL "Mount &New...", 11840, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 234, 50, 15 + CONTROL "&Refresh", 11843, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 62, 234, 50, 15 +} + +2 DIALOG 111, 12, 268, 321 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_CONTROLPARENT +CAPTION "Mount New Virtual Disk" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS SANS SERIF" +{ + CONTROL "", 0, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 7, 4, 253, 44 + CONTROL 303, 0, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE | WS_GROUP, 14, 17, 21, 20 + CONTROL "To create a virtual disk in memory instead of using an image file, specify the size of disk and leave the Image file field blank.", 112, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 46, 19, 202, 18 + CONTROL "Specify Image File:", 0, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 7, 54, 253, 34 + CONTROL "", 102, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 14, 68, 183, 13 + CONTROL "Bro&wse...", 111, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 203, 67, 50, 15 + CONTROL "Specify Disk Size and Units:", 113, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP, 7, 94, 253, 50 + CONTROL "Virtual Disk &Size:", 0, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 14, 110, 61, 9 + CONTROL "(current image file size)", 105, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 81, 108, 87, 13 + CONTROL "Bytes", 114, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 14, 126, 32, 13 + CONTROL "Blocks", 101, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 54, 126, 36, 13 + CONTROL "Kilobytes", 115, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 96, 126, 45, 13 + CONTROL "Megabytes", 116, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 145, 126, 51, 13 + CONTROL "Gigabytes", 117, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 201, 126, 47, 13 + CONTROL "Specify Image File Offset and Units:", 127, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP, 7, 148, 253, 50 + CONTROL "Image File &Offset:", 0, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 14, 164, 61, 9 + CONTROL "0", 123, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 81, 162, 87, 13 + CONTROL "Bytes", 128, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 14, 181, 32, 13 + CONTROL "Blocks", 129, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 54, 181, 36, 13 + CONTROL "Kilobytes", 130, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 96, 181, 44, 13 + CONTROL "Megabytes", 131, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 145, 181, 48, 13 + CONTROL "Gigabytes", 132, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 201, 181, 48, 13 + CONTROL "Select Device Type:", 107, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP, 7, 203, 253, 37 + CONTROL "&Auto", 108, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 14, 217, 32, 13 + CONTROL "Fixed &Disk", 109, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 55, 217, 54, 13 + CONTROL "&Floppy Disk", 118, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 114, 217, 57, 13 + CONTROL "&CD/DVD-ROM", 110, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 176, 217, 64, 13 + CONTROL "Select Attributes:", 0, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 7, 245, 253, 50 + CONTROL "Assign Drive &Letter:", 124, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 14, 261, 65, 9 + CONTROL "", 103, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 81, 258, 87, 13 + CONTROL "Create a Copy in &Memory", 106, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 278, 97, 9 + CONTROL "&Read-only access", 104, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 111, 278, 75, 9 + CONTROL "Remo&vable Drive", 121, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 187, 278, 69, 9 + CONTROL "OK", 1, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 155, 300, 50, 15 + CONTROL "Cancel", 2, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 210, 300, 50, 14 +} + +3 DIALOG 21, 11, 247, 28 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Virtual Disks" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS SANS SERIF" +{ + CONTROL "", 101, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 4, 4, 196, 20 + CONTROL "Cancel", 2, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_TABSTOP, 204, 12, 40, 14 +} + +4 DIALOG 173, 56, 228, 72 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_CONTROLPARENT +CAPTION "Extend Disk Size" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS SANS SERIF" +{ + CONTROL "Enter the size you want to add to the selected virtual disk:", 104, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 4, 4, 164, 16 + CONTROL "", 102, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 4, 24, 164, 13 + CONTROL "Size Unit:", 103, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP, 4, 40, 220, 28 + CONTROL "&Bytes", 114, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 8, 52, 32, 13 + CONTROL "B&locks", 101, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 41, 52, 36, 13 + CONTROL "&Kilobytes", 115, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 78, 52, 44, 13 + CONTROL "&Megabytes", 116, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 123, 52, 48, 13 + CONTROL "&Gigabytes", 117, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 173, 52, 48, 13 + CONTROL "OK", 1, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 172, 5, 50, 15 + CONTROL "Cancel", 2, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 24, 50, 15 +} + +5 DIALOG 14, 11, 308, 196 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_CONTROLPARENT +CAPTION "" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS Sans Serif" +{ + CONTROL "OK", 1, BUTTON, BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 256, 180, 50, 14 + CONTROL "", 101, EDIT, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 0, 308, 176 +} + diff --git a/cpl/Icons/CD.bmp b/cpl/Icons/CD.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4b57347dc42a0ac9093fb3a7fd49d1d9ca86d924 GIT binary patch literal 822 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 Rs$LZ;P3GU+{)eB~{tGcSp}znC literal 8924 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 CS8z%I diff --git a/cpl/amd64/imdisk.lib b/cpl/amd64/imdisk.lib index ba101b3399ede625ed54d09c034e6229bcb4efc4..c79c5f944711b382e019c4ec9782b261c0c3fe69 100644 GIT binary patch literal 15578 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 nPFkW!kXe9?M3+IJkjPD(ak8)sW8zA)K~$x zvqYCen5Zg|FM%~eG(AFezKn?|5Pb+LaiR;by$wI-Mv11te(284!1y2xd_|%b2qaCv3!7UAz8(p#BET*rb_j_b zufs3cI)=o+G>Sme=EQNJGOeK^byFV=(*%u^ow~?JUW$;5hNwhtDv(Bl)I$z5WrRja zr!-~BMhQxhpPUq@80Dyw)>1zOC`3W(paDvfhr-lGy;Pxg$|K$w)u~2RdWc$#s4x95 zVfk+FhNZ_{u~znKJxlD_*}~gwUHp{I!7FVJKHKKxO3bx1<^8yoUv>2Ga}LK+PJ6SZ zIVrp;IlwD^r|rh%pWFB+|EKK^wC(f)zdQVF>*C4m&kVzrM2=i(TpnAyM@RPk&SG;$>rw7y5Cf|QPvGxF;#7> z$7-hN>$ntQ5UHJAaW5~&0{<@VfVg528Bv90C!+S)y!?J#i3-GHBOp(vb; z$k;g1Wan2B1=IPlgzgX}1tIE2QGBU=E&rMrGBsQyy0L#@zLIeBWLG!u7*WLVZ3Gv- zdl3AsHV1$PAXvMZ@{ z7F%gFUF?dB-%cvk3CrDiX&HdHkMAW*W@%`gQCf)aCI@++9yCSAblDf&KRCVU%N3i( z_jI#xG1{4w$FR@v6+OhWI7^S^Obx~~7?q1@=tp69`Ud%zl&K(G1k)ZPd0e36<;nEJ z%@l<6$$|`!;<0p$e@L4HBc%NqkKrGeC~g@W-?s;NDq}WI=*(xN2c5H-C|}I{M~Rv! zG3(HHL)MxfGBEPPJxfFUL3W)bzrV9G1KiBG|7`qdx1W3MUA!Z0^)j22dbs6rw+g+O zB~#=0-p|R6!rMau*7CV#D1LAsgZxfj*+;d}A-GR_2H9P(rl1xQ=G_Ie5O|k+Ek-yZ z8sXC1yhqt6BfdI;QU125OduxMXp$K57*Ce!&CJCXILjX6h~YWH0|ECtH9vn}vZe - - + + + + + + + + - + + + + diff --git a/cpl/drvio.c b/cpl/drvio.c index fea242f..ebcf076 100644 --- a/cpl/drvio.c +++ b/cpl/drvio.c @@ -1,7 +1,7 @@ /* API library for the ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2007-2018 Olof Lagerkvist. +Copyright (C) 2007-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -54,7 +54,7 @@ typedef struct _KNOWN_FORMAT { LPCWSTR Extension; LONGLONG Offset; -} KNOWN_FORMAT, *PKNOWN_FORMAT; +} KNOWN_FORMAT, * PKNOWN_FORMAT; KNOWN_FORMAT KnownFormats[] = { { L"nrg", 600 << 9 }, @@ -67,7 +67,7 @@ ImDiskFlushWindowMessages(HWND hWnd) { #ifndef CORE_BUILD MSG msg; - + while (PeekMessage(&msg, hWnd, 0, 0, PM_REMOVE)) { if (!IsDialogMessage(hWnd, &msg)) @@ -99,6 +99,25 @@ ImDiskAllocPrintF(LPCWSTR lpMessage, ...) return lpBuf; } +IMDISK_API LPSTR +CDECL +ImDiskAllocPrintFA(LPCSTR lpMessage, ...) +{ + va_list param_list; + LPSTR lpBuf = NULL; + + va_start(param_list, lpMessage); + + if (!FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_STRING, lpMessage, 0, 0, + (LPSTR)&lpBuf, 0, ¶m_list)) + { + return NULL; + } + + return lpBuf; +} + ULONGLONG APIFlags; IMDISK_API ULONGLONG @@ -200,8 +219,8 @@ MsgBoxLastError(HWND hWnd, LPCWSTR Prefix) IMDISK_API VOID WINAPI ImDiskGetPartitionTypeName(IN BYTE PartitionType, -IN OUT LPWSTR Name, -IN DWORD NameSize) + IN OUT LPWSTR Name, + IN DWORD NameSize) { LPWSTR name; WCHAR other_type[] = L"Type XXh"; @@ -278,7 +297,7 @@ IN DWORD NameSize) IMDISK_API BOOL WINAPI ImDiskGetOffsetByFileExt(IN LPCWSTR ImageFile, -IN OUT PLARGE_INTEGER Offset) + IN OUT PLARGE_INTEGER Offset) { LPCWSTR path_sep; PKNOWN_FORMAT known_format; @@ -299,12 +318,14 @@ IN OUT PLARGE_INTEGER Offset) for (known_format = KnownFormats; known_format < KnownFormats + _countof(KnownFormats); - known_format++) + known_format++) + { if (_wcsicmp(ImageFile, known_format->Extension) == 0) { Offset->QuadPart = known_format->Offset; return TRUE; } + } return FALSE; } @@ -406,7 +427,7 @@ ImDiskGetPartitionInformation(IN LPCWSTR ImageFile, return bResult; } -typedef BOOL(WINAPI *ImDiskReadFileProc)(IN HANDLE Handle, +typedef BOOL(WINAPI* ImDiskReadFileProc)(IN HANDLE Handle, IN OUT LPVOID Buffer, IN LARGE_INTEGER Offset, IN DWORD NumberOfBytesToRead, @@ -415,15 +436,17 @@ typedef BOOL(WINAPI *ImDiskReadFileProc)(IN HANDLE Handle, IMDISK_API BOOL WINAPI ImDiskReadFileHandle(IN HANDLE Handle, -IN OUT LPVOID Buffer, -IN LARGE_INTEGER Offset, -IN DWORD NumberOfBytesToRead, -IN OUT LPDWORD NumberOfBytesRead) + IN OUT LPVOID Buffer, + IN LARGE_INTEGER Offset, + IN DWORD NumberOfBytesToRead, + IN OUT LPDWORD NumberOfBytesRead) { if (SetFilePointer(Handle, Offset.LowPart, &Offset.HighPart, - FILE_BEGIN) == INVALID_SET_FILE_POINTER) - if (GetLastError() != NO_ERROR) - return FALSE; + FILE_BEGIN) == INVALID_SET_FILE_POINTER && + GetLastError() != NO_ERROR) + { + return FALSE; + } return ReadFile(Handle, Buffer, @@ -613,7 +636,7 @@ typedef struct _IMDISKGETPARTITIONINFOINDIRECTEX_DATA { PPARTITION_INFORMATION Next; DWORD Count; -} IMDISKGETPARTITIONINFOINDIRECTEX_DATA, *PIMDISKGETPARTITIONINFOINDIRECTEX_DATA; +} IMDISKGETPARTITIONINFOINDIRECTEX_DATA, * PIMDISKGETPARTITIONINFOINDIRECTEX_DATA; BOOL CALLBACK GotPartInfoForArray(LPVOID UserData, PPARTITION_INFORMATION PartitionInformation) @@ -696,11 +719,11 @@ ImDiskGetSinglePartitionInfoIndirect(IN HANDLE Handle, IMDISK_API BOOL WINAPI ImDiskGetPartitionInfoIndirect(IN HANDLE Handle, -IN ImDiskReadFileProc ReadFileProc, -IN DWORD SectorSize OPTIONAL, -IN PLARGE_INTEGER Offset OPTIONAL, -IN OUT PPARTITION_INFORMATION -PartitionInformation) + IN ImDiskReadFileProc ReadFileProc, + IN DWORD SectorSize OPTIONAL, + IN PLARGE_INTEGER Offset OPTIONAL, + IN OUT PPARTITION_INFORMATION + PartitionInformation) { LPBYTE buffer = NULL; DWORD read_size = 0; @@ -802,7 +825,7 @@ PartitionInformation) IMDISK_API BOOL WINAPI ImDiskImageContainsISOFS(IN LPCWSTR ImageFile, -IN PLARGE_INTEGER Offset OPTIONAL) + IN PLARGE_INTEGER Offset OPTIONAL) { HANDLE hImageFile; BOOL bResult; @@ -829,8 +852,8 @@ IN PLARGE_INTEGER Offset OPTIONAL) IMDISK_API BOOL WINAPI ImDiskImageContainsISOFSIndirect(IN HANDLE Handle, -IN ImDiskReadFileProc ReadFileProc, -IN PLARGE_INTEGER Offset OPTIONAL) + IN ImDiskReadFileProc ReadFileProc, + IN PLARGE_INTEGER Offset OPTIONAL) { const char magic[] = { 0x01, 'C', 'D', '0', '0', '1', 0x01 }; char buffer[sizeof(magic)]; @@ -922,7 +945,7 @@ typedef struct _REPARSE_DATA_JUNCTION WORD DisplayNameOffset; WORD DisplayNameLength; BYTE Data[65536]; -} REPARSE_DATA_JUNCTION, *PREPARSE_DATA_JUNCTION; +} REPARSE_DATA_JUNCTION, * PREPARSE_DATA_JUNCTION; IMDISK_API BOOL WINAPI @@ -939,8 +962,14 @@ ImDiskCreateMountPoint(LPCWSTR MountPoint, LPCWSTR Target) FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer) + iSize + 2 + iSize + 2; - if ((wcslen(MountPoint) == 2) && - (MountPoint[1] == L':')) + if (MountPoint == NULL || MountPoint[0] == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((wcscmp(MountPoint + 1, L":") == 0 || + wcscmp(MountPoint + 1, L":\\") == 0)) { WCHAR GlobalMountPoint[] = L"Global\\ :"; DWORD ddd_flags = DDD_RAW_TARGET_PATH; @@ -953,7 +982,7 @@ ImDiskCreateMountPoint(LPCWSTR MountPoint, LPCWSTR Target) ddd_flags |= DDD_NO_BROADCAST_SYSTEM; } -#ifdef _WIN64 +#ifndef _M_IX86 if (DefineDosDevice(ddd_flags, GlobalMountPoint, Target)) return TRUE; @@ -987,20 +1016,20 @@ ImDiskCreateMountPoint(LPCWSTR MountPoint, LPCWSTR Target) if (hDir == INVALID_HANDLE_VALUE) return FALSE; - if ((iSize + 6 > MAXIMUM_REPARSE_DATA_BUFFER_SIZE) | (iSize == 0)) + if ((iSize + 6 > MAXIMUM_REPARSE_DATA_BUFFER_SIZE) || (iSize == 0)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - ReparseData = HeapAlloc(GetProcessHeap(), + ReparseData = (PREPARSE_DATA_BUFFER)HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, buffer_size); __analysis_assume(ReparseData != NULL); ReparseData->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; - + ReparseData->ReparseDataLength = data_length; ReparseData->MountPointReparseBuffer.SubstituteNameLength = (WORD)iSize; @@ -1043,8 +1072,14 @@ ImDiskRemoveMountPoint(LPCWSTR MountPoint) HANDLE hDir; DWORD dw; - if (((wcslen(MountPoint) == 2) && MountPoint[1] == ':') || - ((wcslen(MountPoint) == 3) && (wcscmp(MountPoint + 1, L":\\") == 0))) + if (MountPoint == NULL || MountPoint[0] == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((wcscmp(MountPoint + 1, L":") == 0 || + wcscmp(MountPoint + 1, L":\\") == 0)) { DWORD_PTR dwp; DEV_BROADCAST_VOLUME dev_broadcast_volume = { @@ -1070,7 +1105,7 @@ ImDiskRemoveMountPoint(LPCWSTR MountPoint) SHChangeNotify(SHCNE_DRIVEREMOVED, SHCNF_PATH, MountPoint, NULL); #endif } -#ifndef _WIN64 +#ifdef _M_IX86 else if (!IMDISK_GTE_WIN2K()) { } @@ -1218,7 +1253,7 @@ ImDiskOpenDeviceByMountPoint(LPCWSTR MountPoint, DWORD AccessMode) if ((MountPoint[0] != 0) && ((wcscmp(MountPoint + 1, L":") == 0) || - (wcscmp(MountPoint + 1, L":\\") == 0))) + (wcscmp(MountPoint + 1, L":\\") == 0))) { DriveLetterPath[12] = MountPoint[0]; @@ -1248,7 +1283,7 @@ ImDiskOpenDeviceByMountPoint(LPCWSTR MountPoint, DWORD AccessMode) if (hDir == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; - ReparseData = HeapAlloc(GetProcessHeap(), + ReparseData = (PREPARSE_DATA_BUFFER)HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, buffer_size); @@ -1275,14 +1310,14 @@ ImDiskOpenDeviceByMountPoint(LPCWSTR MountPoint, DWORD AccessMode) DeviceName.Length = ReparseData->MountPointReparseBuffer.SubstituteNameLength; - + DeviceName.Buffer = (PWSTR) ((PUCHAR)ReparseData->MountPointReparseBuffer.PathBuffer + - ReparseData->MountPointReparseBuffer.SubstituteNameOffset); - + ReparseData->MountPointReparseBuffer.SubstituteNameOffset); + DeviceName.MaximumLength = DeviceName.Length; } - + if (DeviceName.Buffer[(DeviceName.Length >> 1) - 1] == L'\\') { DeviceName.Buffer[(DeviceName.Length >> 1) - 1] = 0; @@ -1309,7 +1344,9 @@ ImDiskCheckDriverVersion(HANDLE Device) NULL, 0, &VersionCheck, sizeof VersionCheck, &BytesReturned, NULL)) + { return FALSE; + } SetLastError(NO_ERROR); @@ -1325,7 +1362,7 @@ ImDiskCheckDriverVersion(HANDLE Device) IMDISK_API BOOL WINAPI ImDiskGetVersion(PULONG LibraryVersion, -PULONG DriverVersion) + PULONG DriverVersion) { if (LibraryVersion != NULL) *LibraryVersion = IMDISK_VERSION; @@ -1380,9 +1417,14 @@ ImDiskFindFreeDriveLetter() { DWORD logical_drives = GetLogicalDrives(); WCHAR search; + for (search = L'D'; search <= L'Z'; search++) + { if ((logical_drives & (1 << (search - L'A'))) == 0) + { return search; + } + } return 0; } @@ -1420,7 +1462,7 @@ ImDiskGetDeviceList() IMDISK_API BOOL WINAPI ImDiskGetDeviceListEx(IN ULONG ListLength, -OUT ULONG *DeviceList) + OUT ULONG* DeviceList) { UNICODE_STRING file_name; HANDLE driver; @@ -1446,7 +1488,7 @@ OUT ULONG *DeviceList) NtClose(driver); - if ((dw == sizeof(ULONG)) & + if ((dw == sizeof(ULONG)) && (*DeviceList > 0)) { SetLastError(ERROR_MORE_DATA); @@ -1460,8 +1502,8 @@ OUT ULONG *DeviceList) IMDISK_API BOOL WINAPI ImDiskQueryDevice(DWORD DeviceNumber, -PIMDISK_CREATE_DATA CreateData, -ULONG CreateDataSize) + PIMDISK_CREATE_DATA CreateData, + ULONG CreateDataSize) { HANDLE device = ImDiskOpenDeviceByNumber(DeviceNumber, FILE_READ_ATTRIBUTES); DWORD dw; @@ -1495,12 +1537,12 @@ ULONG CreateDataSize) IMDISK_API BOOL WINAPI ImDiskCreateDevice(HWND hWnd, -PDISK_GEOMETRY DiskGeometry, -PLARGE_INTEGER ImageOffset, -DWORD Flags, -LPCWSTR FileName, -BOOL NativePath, -LPWSTR MountPoint) + PDISK_GEOMETRY DiskGeometry, + PLARGE_INTEGER ImageOffset, + DWORD Flags, + LPCWSTR FileName, + BOOL NativePath, + LPWSTR MountPoint) { return ImDiskCreateDeviceEx(hWnd, NULL, @@ -1515,13 +1557,13 @@ LPWSTR MountPoint) IMDISK_API BOOL WINAPI ImDiskCreateDeviceEx(HWND hWnd, -LPDWORD DeviceNumber, -PDISK_GEOMETRY DiskGeometry, -PLARGE_INTEGER ImageOffset, -DWORD Flags, -LPCWSTR FileName, -BOOL NativePath, -LPWSTR MountPoint) + LPDWORD DeviceNumber, + PDISK_GEOMETRY DiskGeometry, + PLARGE_INTEGER ImageOffset, + DWORD Flags, + LPCWSTR FileName, + BOOL NativePath, + LPWSTR MountPoint) { PIMDISK_CREATE_DATA create_data; UNICODE_STRING file_name; @@ -1554,37 +1596,49 @@ LPWSTR MountPoint) if (!ImDiskStartService(IMDISK_DRIVER_NAME)) switch (GetLastError()) - { + { case ERROR_SERVICE_DOES_NOT_EXIST: if (hWnd != NULL) + { MessageBox(hWnd, - L"The ImDisk Virtual Disk Driver is not installed. " - L"Please re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The ImDisk Virtual Disk Driver is not installed. " + L"Please re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; case ERROR_PATH_NOT_FOUND: case ERROR_FILE_NOT_FOUND: if (hWnd != NULL) + { MessageBox(hWnd, - L"Cannot load imdisk.sys. " - L"Please re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"Cannot load imdisk.sys. " + L"Please re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; case ERROR_SERVICE_DISABLED: if (hWnd != NULL) + { MessageBox(hWnd, - L"The ImDisk Virtual Disk Driver is disabled.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The ImDisk Virtual Disk Driver is disabled.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; default: if (hWnd != NULL) + { MsgBoxLastError(hWnd, - L"Error loading ImDisk Virtual Disk Driver:"); + L"Error loading ImDisk Virtual Disk Driver:"); + } + return FALSE; - } + } ImDiskFlushWindowMessages(NULL); @@ -1595,24 +1649,27 @@ LPWSTR MountPoint) if (!ImDiskCheckDriverVersion(driver)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, - L"The version of the ImDisk Virtual Disk Driver " - L"(imdisk.sys) installed on this system does not match " - L"the version of this control program. Please reinstall " - L"ImDisk to make sure that all components of it on this " - L"system are from the same install package. You may have " - L"to restart your computer if you still see this message " - L"after reinstalling.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The version of the ImDisk Virtual Disk Driver " + L"(imdisk.sys) installed on this system does not match " + L"the version of this control program. Please reinstall " + L"ImDisk to make sure that all components of it on this " + L"system are from the same install package. You may have " + L"to restart your computer if you still see this message " + L"after reinstalling.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } SetLastError(ERROR_INVALID_FUNCTION); return FALSE; } // Physical memory allocation requires the AWEAlloc driver. - if (((IMDISK_TYPE(Flags) == IMDISK_TYPE_FILE) | - (IMDISK_TYPE(Flags) == 0)) & + if (((IMDISK_TYPE(Flags) == IMDISK_TYPE_FILE) || + (IMDISK_TYPE(Flags) == 0)) && (IMDISK_FILE_TYPE(Flags) == IMDISK_FILE_TYPE_AWEALLOC)) { HANDLE awealloc; @@ -1643,26 +1700,35 @@ LPWSTR MountPoint) { case ERROR_SERVICE_DOES_NOT_EXIST: if (hWnd != NULL) + { MessageBox(hWnd, - L"The AWEAlloc driver is not installed. Please " - L"re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The AWEAlloc driver is not installed. Please " + L"re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + break; case ERROR_PATH_NOT_FOUND: case ERROR_FILE_NOT_FOUND: if (hWnd != NULL) + { MessageBox(hWnd, - L"Cannot load the AWEAlloc driver. Please " - L"re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"Cannot load the AWEAlloc driver. Please " + L"re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + break; case ERROR_SERVICE_DISABLED: if (hWnd != NULL) + { MessageBox(hWnd, - L"The AWEAlloc driver is disabled.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The AWEAlloc driver is disabled.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + break; default: @@ -1675,93 +1741,119 @@ LPWSTR MountPoint) } } // Proxy reconnection types requires the user mode service. - else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) & - ((IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_TCP) | - (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_COMM))) + else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) && + ((IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_TCP) || + (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_COMM))) { - if (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0)) - if (GetLastError() == ERROR_FILE_NOT_FOUND) - if (ImDiskStartService(IMDPROXY_SVC)) + if (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0) && + GetLastError() == ERROR_FILE_NOT_FOUND) + { + if (ImDiskStartService(IMDPROXY_SVC)) + { + while (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0)) { - while (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0)) - if (GetLastError() == ERROR_FILE_NOT_FOUND) - Sleep(500); - else - break; + if (GetLastError() == ERROR_FILE_NOT_FOUND) + Sleep(500); + else + break; + } - if (hWnd != NULL) - SetWindowText - (hWnd, + if (hWnd != NULL) + { + SetWindowText(hWnd, L"ImDisk Virtual Disk Driver Helper Service started."); } - else + } + else + { + switch (GetLastError()) { - switch (GetLastError()) + case ERROR_SERVICE_DOES_NOT_EXIST: + if (hWnd != NULL) { - case ERROR_SERVICE_DOES_NOT_EXIST: - if (hWnd != NULL) - MessageBox(hWnd, + MessageBox(hWnd, L"The ImDisk Virtual Disk Driver Helper " L"Service is not installed. Please re-install " L"ImDisk.", L"ImDisk Virtual Disk Driver", MB_ICONSTOP); - break; + } + + break; - case ERROR_PATH_NOT_FOUND: - case ERROR_FILE_NOT_FOUND: - if (hWnd != NULL) - MessageBox(hWnd, + case ERROR_PATH_NOT_FOUND: + case ERROR_FILE_NOT_FOUND: + if (hWnd != NULL) + { + MessageBox(hWnd, L"Cannot start the ImDisk Virtual Disk Driver " L"Helper Service. Please re-install ImDisk.", L"ImDisk Virtual Disk Driver", MB_ICONSTOP); - break; + } + + break; - case ERROR_SERVICE_DISABLED: - if (hWnd != NULL) - MessageBox(hWnd, + case ERROR_SERVICE_DISABLED: + if (hWnd != NULL) + { + MessageBox(hWnd, L"The ImDisk Virtual Disk Driver Helper " L"Service is disabled.", L"ImDisk Virtual Disk Driver", MB_ICONSTOP); - break; + } + + break; - default: - if (hWnd != NULL) - MsgBoxLastError - (hWnd, + default: + if (hWnd != NULL) + { + MsgBoxLastError(hWnd, L"Error starting ImDisk Virtual Disk Driver Helper " L"Service:"); } - - NtClose(driver); - return FALSE; } + + NtClose(driver); + return FALSE; + } + } } if (FileName == NULL) + { RtlInitUnicodeString(&file_name, NULL); + } else if (NativePath) { if (!RtlCreateUnicodeString(&file_name, FileName)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, L"Memory allocation error.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; } } - else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) & + else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) && (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_SHM)) { LPWSTR namespace_prefix; LPWSTR prefixed_name; HANDLE h = CreateFile(L"\\\\?\\Global", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if ((h == INVALID_HANDLE_VALUE) & + + if ((h == INVALID_HANDLE_VALUE) && (GetLastError() == ERROR_FILE_NOT_FOUND)) + { namespace_prefix = L"\\BaseNamedObjects\\"; + } else + { namespace_prefix = L"\\BaseNamedObjects\\Global\\"; + } if (h != INVALID_HANDLE_VALUE) CloseHandle(h); @@ -1775,9 +1867,13 @@ LPWSTR MountPoint) if (!RtlCreateUnicodeString(&file_name, prefixed_name)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, L"Memory allocation error.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; } } @@ -1786,9 +1882,13 @@ LPWSTR MountPoint) if (!RtlDosPathNameToNtPathName_U(FileName, &file_name, NULL, NULL)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, L"Memory allocation error.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; } } @@ -1803,7 +1903,7 @@ LPWSTR MountPoint) // Check if mount point is a drive letter or junction point if ((MountPoint != NULL) && (MountPoint[0] != 0) && ((wcscmp(MountPoint + 1, L":") == 0) || - ((wcscmp(MountPoint + 1, L":\\") == 0)))) + ((wcscmp(MountPoint + 1, L":\\") == 0)))) { create_data->DriveLetter = MountPoint[0]; } @@ -1860,10 +1960,14 @@ LPWSTR MountPoint) IMDISK_DEVICE_BASE_NAME L"%u", create_data->DeviceNumber); device_path[_countof(device_path) - 1] = 0; - if ((wcslen(MountPoint) == 2) && - (MountPoint[1] == L':')) + if (MountPoint != NULL && MountPoint[0] != 0 && + (wcscmp(MountPoint + 1, L":") == 0 || + wcscmp(MountPoint + 1, L":\\") == 0)) { -#ifndef _WIN64 + WCHAR drive_letter[] = L" :"; + drive_letter[0] = MountPoint[0]; + +#ifdef _M_IX86 if (!IMDISK_GTE_WINXP()) { DWORD ddd_flags = DDD_RAW_TARGET_PATH; @@ -1874,18 +1978,21 @@ LPWSTR MountPoint) ddd_flags |= DDD_NO_BROADCAST_SYSTEM; } - if (!DefineDosDevice(ddd_flags, MountPoint, device_path)) + if (!DefineDosDevice(ddd_flags, drive_letter, device_path)) + { if (hWnd != NULL) MsgBoxLastError(hWnd, L"Error creating mount point:"); + } } #endif if (hWnd != NULL) - SetWindowText - (hWnd, - L"Notifying applications that device has been created..."); + { + SetWindowText(hWnd, + L"Notifying applications that device has been created..."); + } - ImDiskNotifyShellDriveLetter(hWnd, MountPoint); + ImDiskNotifyShellDriveLetter(hWnd, drive_letter); } else { @@ -1899,10 +2006,11 @@ LPWSTR MountPoint) IMDISK_API BOOL WINAPI ImDiskNotifyShellDriveLetter(HWND hWnd, -LPWSTR DriveLetterPath) + LPWSTR DriveLetterPath) { #ifndef CORE_BUILD DWORD_PTR dwp; + DEV_BROADCAST_VOLUME dev_broadcast_volume = { sizeof(DEV_BROADCAST_VOLUME), DBT_DEVTYP_VOLUME @@ -1945,19 +2053,20 @@ LPWSTR DriveLetterPath) 4000, &dwp); - /* Tried PostMessage instead of SendMessageTimeout +#if 0 // Tried PostMessage instead of SendMessageTimeout PostMessage(HWND_BROADCAST, - WM_DEVICECHANGE, - DBT_DEVICEARRIVAL, - (LPARAM)&dev_broadcast_volume); + WM_DEVICECHANGE, + DBT_DEVICEARRIVAL, + (LPARAM)&dev_broadcast_volume); dev_broadcast_volume.dbcv_flags = DBTF_MEDIA; PostMessage(HWND_BROADCAST, - WM_DEVICECHANGE, - DBT_DEVICEARRIVAL, - (LPARAM)&dev_broadcast_volume); - */ + WM_DEVICECHANGE, + DBT_DEVICEARRIVAL, + (LPARAM)&dev_broadcast_volume); +#endif + #endif return TRUE; @@ -1966,17 +2075,19 @@ LPWSTR DriveLetterPath) IMDISK_API BOOL WINAPI ImDiskNotifyRemovePending(HWND hWnd, -WCHAR DriveLetter) + WCHAR DriveLetter) { #ifndef CORE_BUILD DEV_BROADCAST_VOLUME dev_broadcast_volume = { sizeof(DEV_BROADCAST_VOLUME), DBT_DEVTYP_VOLUME }; + DWORD_PTR dwp; dev_broadcast_volume.dbcv_unitmask = 1 << (DriveLetter - L'A'); +#ifdef SEND_DBT_DEVICEQUERYREMOVE SendMessageTimeout(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVICEQUERYREMOVE, @@ -1984,6 +2095,7 @@ WCHAR DriveLetter) SMTO_BLOCK | SMTO_ABORTIFHUNG, 4000, &dwp); +#endif SendMessageTimeout(HWND_BROADCAST, WM_DEVICECHANGE, @@ -2000,8 +2112,8 @@ WCHAR DriveLetter) IMDISK_API BOOL WINAPI ImDiskRemoveDevice(HWND hWnd, -DWORD DeviceNumber, -LPCWSTR MountPoint) + DWORD DeviceNumber, + LPCWSTR MountPoint) { HANDLE device; DWORD dw; @@ -2017,11 +2129,11 @@ LPCWSTR MountPoint) if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - FILE_READ_ATTRIBUTES); + FILE_READ_ATTRIBUTES); } else if ((wcscmp(MountPoint + 1, L":") == 0) || (wcscmp(MountPoint + 1, L":\\") == 0)) @@ -2030,13 +2142,14 @@ LPCWSTR MountPoint) drive_letter_path[4] = MountPoint[0]; // Notify processes that this device is about to be removed. - if (((APIFlags & IMDISK_API_NO_BROADCAST_NOTIFY) == 0) & - (MountPoint[0] >= L'A') & (MountPoint[0] <= L'Z')) + if (((APIFlags & IMDISK_API_NO_BROADCAST_NOTIFY) == 0) && + (MountPoint[0] >= L'A') && (MountPoint[0] <= L'Z')) { if (hWnd != NULL) - SetWindowText - (hWnd, - L"Notifying applications that device is being removed..."); + { + SetWindowText(hWnd, + L"Notifying applications that device is being removed..."); + } ImDiskNotifyRemovePending(hWnd, MountPoint[0]); } @@ -2050,16 +2163,20 @@ LPCWSTR MountPoint) NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); if (device == INVALID_HANDLE_VALUE) + { device = CreateFile(drive_letter_path, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + } if (device == INVALID_HANDLE_VALUE) + { device = CreateFile(drive_letter_path, - FILE_READ_ATTRIBUTES, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + } } else { @@ -2070,32 +2187,41 @@ LPCWSTR MountPoint) GENERIC_READ | GENERIC_WRITE); if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByMountPoint(MountPoint, - GENERIC_READ); + GENERIC_READ); + } if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByMountPoint(MountPoint, - FILE_READ_ATTRIBUTES); + FILE_READ_ATTRIBUTES); + } } if (device == INVALID_HANDLE_VALUE) { if (hWnd != NULL) MsgBoxLastError(hWnd, L"Error opening device:"); + return FALSE; } - if (!ImDiskCheckDriverVersion(device)) - if (GetLastError() != NO_ERROR) + if (!ImDiskCheckDriverVersion(device) && + GetLastError() != NO_ERROR) + { + NtClose(device); + + if (hWnd != NULL) { - NtClose(device); - if (hWnd != NULL) - ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, L"ImDisk Virtual Disk Driver", + ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, + L"ImDisk Virtual Disk Driver", L"Not an ImDisk Virtual Disk: '%1'", MountPoint); - - return FALSE; } + return FALSE; + } + if (hWnd != NULL) SetWindowText(hWnd, L"Flushing file buffers..."); @@ -2112,8 +2238,11 @@ LPCWSTR MountPoint) 0, &dw, NULL)) + { if (APIFlags & IMDISK_API_FORCE_DISMOUNT) + { force_dismount = TRUE; + } else if (hWnd == NULL) { NtClose(device); @@ -2133,22 +2262,26 @@ LPCWSTR MountPoint) return FALSE; } else + { force_dismount = TRUE; + } + } - if (hWnd != NULL) - SetWindowText(hWnd, L"Dismounting filesystem..."); + if (hWnd != NULL) + SetWindowText(hWnd, L"Dismounting filesystem..."); - DeviceIoControl(device, - FSCTL_DISMOUNT_VOLUME, - NULL, - 0, - NULL, - 0, - &dw, - NULL); + DeviceIoControl(device, + FSCTL_DISMOUNT_VOLUME, + NULL, + 0, + NULL, + 0, + &dw, + NULL); - if (force_dismount) - DeviceIoControl(device, + if (force_dismount) + { + DeviceIoControl(device, FSCTL_LOCK_VOLUME, NULL, 0, @@ -2156,72 +2289,77 @@ LPCWSTR MountPoint) 0, &dw, NULL); + } - // If interactive mode, check if image has been modified and if so ask user - // if it should be saved first. + // If interactive mode, check if image has been modified and if so ask user + // if it should be saved first. #ifndef CORE_BUILD - if (hWnd != NULL) - if (!ImDiskInteractiveCheckSave(hWnd, device)) - { - NtClose(device); - return FALSE; - } + if (hWnd != NULL && !ImDiskInteractiveCheckSave(hWnd, device)) + { + NtClose(device); + return FALSE; + } #endif - if (hWnd != NULL) - SetWindowText(hWnd, L"Removing device..."); + if (hWnd != NULL) + SetWindowText(hWnd, L"Removing device..."); - if (!DeviceIoControl(device, - IOCTL_STORAGE_EJECT_MEDIA, - NULL, - 0, - NULL, - 0, - &dw, - NULL)) - if (force_dismount ? !ImDiskForceRemoveDevice(device, 0) : FALSE) + if (!DeviceIoControl(device, + IOCTL_STORAGE_EJECT_MEDIA, + NULL, + 0, + NULL, + 0, + &dw, + NULL)) + { + if (force_dismount && !ImDiskForceRemoveDevice(device, 0)) + { + if (hWnd != NULL) { - if (hWnd != NULL) - MsgBoxLastError(hWnd, L"Error removing device:"); - NtClose(device); - return FALSE; + MsgBoxLastError(hWnd, L"Error removing device:"); } - DeviceIoControl(device, - FSCTL_UNLOCK_VOLUME, - NULL, - 0, - NULL, - 0, - &dw, - NULL); + NtClose(device); + return FALSE; + } + } - NtClose(device); + DeviceIoControl(device, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0, + &dw, + NULL); + + NtClose(device); + + if (MountPoint != NULL) + { + if (hWnd != NULL) + SetWindowText(hWnd, L"Removing mount point..."); - if (MountPoint != NULL) + if (!ImDiskRemoveMountPoint(MountPoint)) { if (hWnd != NULL) - SetWindowText(hWnd, L"Removing mount point..."); - - if (!ImDiskRemoveMountPoint(MountPoint)) { - if (hWnd != NULL) - { - MsgBoxLastError(hWnd, L"Error removing drive letter:"); - } + MsgBoxLastError(hWnd, L"Error removing drive letter:"); } } + } - if (hWnd != NULL) - SetWindowText(hWnd, L"OK."); + if (hWnd != NULL) + SetWindowText(hWnd, L"OK."); - return TRUE; + return TRUE; } IMDISK_API BOOL WINAPI ImDiskForceRemoveDevice(HANDLE Device, -DWORD DeviceNumber) + DWORD DeviceNumber) { UNICODE_STRING file_name; HANDLE driver; @@ -2249,8 +2387,10 @@ DWORD DeviceNumber) } RtlInitUnicodeString(&file_name, IMDISK_CTL_DEVICE_NAME); + driver = ImDiskOpenDeviceByName(&file_name, GENERIC_READ | GENERIC_WRITE); + if (driver == NULL) return FALSE; @@ -2276,10 +2416,10 @@ DWORD DeviceNumber) IMDISK_API BOOL WINAPI ImDiskChangeFlags(HWND hWnd, -DWORD DeviceNumber, -LPCWSTR MountPoint, -DWORD FlagsToChange, -DWORD Flags) + DWORD DeviceNumber, + LPCWSTR MountPoint, + DWORD FlagsToChange, + DWORD Flags) { HANDLE device; DWORD dw; @@ -2292,9 +2432,12 @@ DWORD Flags) { device = ImDiskOpenDeviceByNumber(DeviceNumber, GENERIC_READ | GENERIC_WRITE); + if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); + } } else if ((wcslen(MountPoint) == 2) ? MountPoint[1] == ':' : (wcslen(MountPoint) == 3) ? wcscmp(MountPoint + 1, L":\\") == 0 : @@ -2310,16 +2453,21 @@ DWORD Flags) NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); if (device == INVALID_HANDLE_VALUE) + { device = CreateFile(drive_letter_path, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + } } else { if (hWnd != NULL) + { ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, L"ImDisk Virtual Disk Driver", - L"Unsupported mount point: '%1'", MountPoint); + L"Unsupported mount point: '%1'", MountPoint); + } + SetLastError(ERROR_INVALID_FUNCTION); return FALSE; } @@ -2335,9 +2483,12 @@ DWORD Flags) if (GetLastError() != NO_ERROR) { NtClose(device); + if (hWnd != NULL) + { ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, L"ImDisk Virtual Disk Driver", - L"Not an ImDisk Virtual Disk: '%1'", MountPoint); + L"Not an ImDisk Virtual Disk: '%1'", MountPoint); + } return FALSE; } @@ -2358,6 +2509,7 @@ DWORD Flags) 0, &dw, NULL)) + { if (hWnd == NULL) { NtClose(device); @@ -2376,6 +2528,7 @@ DWORD Flags) return FALSE; } + } if (hWnd != NULL) SetWindowText(hWnd, L"Dismounting filesystem..."); @@ -2388,6 +2541,7 @@ DWORD Flags) 0, &dw, NULL)) + { if (hWnd == NULL) { NtClose(device); @@ -2404,6 +2558,7 @@ DWORD Flags) return FALSE; } + } if (hWnd != NULL) SetWindowText(hWnd, L"Setting device flags..."); @@ -2434,8 +2589,8 @@ DWORD Flags) IMDISK_API BOOL WINAPI ImDiskExtendDevice(HWND hWnd, -DWORD DeviceNumber, -CONST PLARGE_INTEGER ExtendSize) + DWORD DeviceNumber, + CONST PLARGE_INTEGER ExtendSize) { HANDLE device; DWORD dw; @@ -2452,7 +2607,7 @@ CONST PLARGE_INTEGER ExtendSize) if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); if (device == INVALID_HANDLE_VALUE) { @@ -2493,10 +2648,11 @@ CONST PLARGE_INTEGER ExtendSize) &dw, NULL)) { if (hWnd != NULL) - MsgBoxLastError - (hWnd, - L"An error occured when attempting to check the new total size of " - L"the resized virtual disk:"); + { + MsgBoxLastError(hWnd, + L"An error occurred when attempting to check the new total size of " + L"the resized virtual disk:"); + } NtClose(device); return FALSE; @@ -2511,10 +2667,11 @@ CONST PLARGE_INTEGER ExtendSize) &dw, NULL)) { if (hWnd != NULL) - MsgBoxLastError - (hWnd, - L"An error occured when attempting to check the new total size of " - L"the resized virtual disk:"); + { + MsgBoxLastError(hWnd, + L"An error occurred when attempting to check the new total size of " + L"the resized virtual disk:"); + } NtClose(device); return FALSE; @@ -2531,12 +2688,15 @@ CONST PLARGE_INTEGER ExtendSize) NULL, 0, &dw, NULL)) + { if (hWnd != NULL) - MsgBoxLastError - (hWnd, - L"The disk size was extended successfully, but it was not possible " - L"to extend the current filesystem on it. You will have to reformat " - L"the disk to use the full disk size."); + { + MsgBoxLastError(hWnd, + L"The disk size was extended successfully, but it was not possible " + L"to extend the current filesystem on it. You will have to reformat " + L"the disk to use the full disk size."); + } + } NtClose(device); return TRUE; @@ -2545,9 +2705,9 @@ CONST PLARGE_INTEGER ExtendSize) IMDISK_API BOOL WINAPI ImDiskSaveImageFile(IN HANDLE DeviceHandle, -IN HANDLE FileHandle, -IN DWORD BufferSize OPTIONAL, -IN LPBOOL CancelFlag OPTIONAL) + IN HANDLE FileHandle, + IN DWORD BufferSize OPTIONAL, + IN LPBOOL CancelFlag OPTIONAL) { LPBYTE buffer; IMDISK_SET_DEVICE_FLAGS device_flags = { 0 }; @@ -2648,7 +2808,7 @@ IN LPBOOL CancelFlag OPTIONAL) IMDISK_API BOOL WINAPI ImDiskAdjustImageFileSize(IN HANDLE FileHandle, -IN PLARGE_INTEGER FileSize) + IN PLARGE_INTEGER FileSize) { ULARGE_INTEGER existing_size = { 0 }; DWORD ptr; @@ -2657,9 +2817,11 @@ IN PLARGE_INTEGER FileSize) // original disk volume and possibly adjusts image file size if it does not // exactly match the size of the original disk/partition. existing_size.LowPart = GetFileSize(FileHandle, &existing_size.HighPart); - if (existing_size.LowPart == INVALID_FILE_SIZE) - if (GetLastError() != NO_ERROR) - return FALSE; + if (existing_size.LowPart == INVALID_FILE_SIZE && + GetLastError() != NO_ERROR) + { + return FALSE; + } if (existing_size.QuadPart < (ULONGLONG)FileSize->QuadPart) { @@ -2671,9 +2833,12 @@ IN PLARGE_INTEGER FileSize) FileSize->LowPart, (LPLONG)&FileSize->HighPart, FILE_BEGIN); - if (ptr == INVALID_SET_FILE_POINTER) - if (GetLastError() != NO_ERROR) - return FALSE; + + if (ptr == INVALID_SET_FILE_POINTER && + GetLastError() != NO_ERROR) + { + return FALSE; + } return SetEndOfFile(FileHandle); } @@ -2681,7 +2846,7 @@ IN PLARGE_INTEGER FileSize) IMDISK_API BOOL WINAPI ImDiskGetVolumeSize(IN HANDLE Handle, -IN OUT PLONGLONG Size) + IN OUT PLONGLONG Size) { PARTITION_INFORMATION partition_info = { 0 }; DISK_GEOMETRY disk_geometry = { 0 }; @@ -2732,8 +2897,8 @@ IN OUT PLONGLONG Size) IMDISK_API BOOL WINAPI ImDiskGetFormattedGeometry(IN LPCWSTR ImageFile, -IN PLARGE_INTEGER Offset OPTIONAL, -IN OUT PDISK_GEOMETRY DiskGeometry) + IN PLARGE_INTEGER Offset OPTIONAL, + IN OUT PDISK_GEOMETRY DiskGeometry) { HANDLE hImageFile; BOOL bResult; @@ -2761,9 +2926,9 @@ IN OUT PDISK_GEOMETRY DiskGeometry) IMDISK_API BOOL WINAPI ImDiskGetFormattedGeometryIndirect(IN HANDLE Handle, -IN ImDiskReadFileProc ReadFileProc, -IN PLARGE_INTEGER Offset OPTIONAL, -IN OUT PDISK_GEOMETRY DiskGeometry) + IN ImDiskReadFileProc ReadFileProc, + IN PLARGE_INTEGER Offset OPTIONAL, + IN OUT PDISK_GEOMETRY DiskGeometry) { FAT_VBR fat_vbr; LARGE_INTEGER offset = { 0 }; @@ -2787,10 +2952,10 @@ IN OUT PDISK_GEOMETRY DiskGeometry) IMDISK_API BOOL WINAPI ImDiskBuildMBR(IN PDISK_GEOMETRY DiskGeometry OPTIONAL, -IN PPARTITION_INFORMATION PartitionInformation OPTIONAL, -IN BYTE NumberOfPartitions OPTIONAL, -IN OUT LPBYTE MBR, -IN DWORD_PTR MBRSize) + IN PPARTITION_INFORMATION PartitionInformation OPTIONAL, + IN BYTE NumberOfPartitions OPTIONAL, + IN OUT LPBYTE MBR, + IN DWORD_PTR MBRSize) { BYTE i; @@ -2858,7 +3023,7 @@ IN DWORD_PTR MBRSize) IMDISK_API DWORD WINAPI ImDiskConvertCHSToLBA(IN PDISK_GEOMETRY DiskGeometry, -IN LPBYTE CHS) + IN LPBYTE CHS) { DWORD cylinder = (((DWORD)CHS[1] & 0xC0) << 2) | CHS[2]; DWORD heads = CHS[0]; @@ -2866,13 +3031,13 @@ IN LPBYTE CHS) return ((cylinder * DiskGeometry->TracksPerCylinder + heads) * - DiskGeometry->SectorsPerTrack) + sector - 1; + DiskGeometry->SectorsPerTrack) + sector - 1; } IMDISK_API DWORD WINAPI ImDiskConvertLBAToCHS(IN PDISK_GEOMETRY DiskGeometry, -IN DWORD LBA) + IN DWORD LBA) { /* cylinder = LBA / (heads_per_cylinder * sectors_per_track) @@ -2897,8 +3062,8 @@ IN DWORD LBA) temp % DiskGeometry->SectorsPerTrack + 1; - if ((cylinder >= 1024) | - (head >= 256) | + if ((cylinder >= 1024) || + (head >= 256) || (sector >= 64)) { cylinder = 1023; @@ -2915,12 +3080,16 @@ IN DWORD LBA) IMDISK_API VOID WINAPI -ImDiskNativePathToWin32(IN OUT LPWSTR *Path) +ImDiskNativePathToWin32(IN OUT LPWSTR* Path) { if ((Path == NULL) || (Path[0] == 0)) + { return; + } else if (wcsncmp(*Path, L"\\??\\", 4) == 0) + { (*Path)[1] = L'\\'; + } else if (wcsncmp(*Path, L"\\DosDevices\\", 12) == 0) { (*Path) += 8; @@ -2929,10 +3098,14 @@ ImDiskNativePathToWin32(IN OUT LPWSTR *Path) (*Path)[3] = L'?'; } else + { return; + } - if ((*Path)[4] != 0 ? (*Path)[5] == L':' : FALSE) + if ((*Path)[4] != 0 && (*Path)[5] == L':') + { (*Path) += 4; + } else if (wcsncmp(*Path, L"\\\\?\\UNC\\", 8) == 0) { (*Path) += 6; @@ -2947,16 +3120,23 @@ ImDiskOpenRefreshEvent(BOOL InheritHandle) SECURITY_ATTRIBUTES sec_attrs = { 0 }; PSECURITY_DESCRIPTOR sec_descr = NULL; HANDLE hEvent = NULL; - WCHAR *objname; + WCHAR* objname; HANDLE h = CreateFile(L"\\\\?\\Global", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if ((h == INVALID_HANDLE_VALUE) && (GetLastError() == ERROR_FILE_NOT_FOUND)) + { objname = IMDISK_REFRESH_EVENT_NAME; + } else + { objname = L"Global\\" IMDISK_REFRESH_EVENT_NAME; + } if (h != INVALID_HANDLE_VALUE) + { CloseHandle(h); + } // Initialize a security descriptor. sec_descr = (PSECURITY_DESCRIPTOR) @@ -3028,21 +3208,29 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) &value_size); if (err_code == ERROR_SUCCESS) + { if (CreateData->DeviceNumber == IMDISK_AUTO_DEVICE_NUMBER) { CreateData->DeviceNumber = load_devices; ++load_devices; } else + { load_devices = max(load_devices, CreateData->DeviceNumber + 1); + } + } else + { if (CreateData->DeviceNumber == IMDISK_AUTO_DEVICE_NUMBER) { CreateData->DeviceNumber = 0; load_devices = 1; } else + { load_devices = CreateData->DeviceNumber + 1; + } + } err_code = RegSetValueEx(hkey, IMDISK_CFG_LOAD_DEVICES_VALUE, @@ -3060,6 +3248,7 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) value_name = ImDiskAllocPrintF(IMDISK_CFG_IMAGE_FILE_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3070,9 +3259,9 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) { LPWSTR value_data = ImDiskAllocPrintF(L"%1!.*ws!", - (int)(CreateData->FileNameLength / - sizeof(*CreateData->FileName)), - CreateData->FileName); + (int)(CreateData->FileNameLength / + sizeof(*CreateData->FileName)), + CreateData->FileName); if (value_data == NULL) { @@ -3097,12 +3286,15 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); value_name = ImDiskAllocPrintF(IMDISK_CFG_SIZE_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3126,12 +3318,15 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); value_name = ImDiskAllocPrintF(IMDISK_CFG_FLAGS_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3155,12 +3350,15 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); value_name = ImDiskAllocPrintF(IMDISK_CFG_DRIVE_LETTER_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3187,7 +3385,9 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); @@ -3216,7 +3416,9 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); @@ -3283,6 +3485,7 @@ ImDiskRemoveRegistrySettings(DWORD DeviceNumber) value_name = ImDiskAllocPrintF(IMDISK_CFG_IMAGE_FILE_PREFIX L"%1!u!", DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3295,6 +3498,7 @@ ImDiskRemoveRegistrySettings(DWORD DeviceNumber) value_name = ImDiskAllocPrintF(IMDISK_CFG_SIZE_PREFIX L"%1!u!", DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3384,3 +3588,40 @@ ImDiskGetRegistryAutoLoadDevices(LPDWORD LoadDevicesValue) return TRUE; } + +BOOL +WINAPI +ImDiskIsProcessElevated() +{ + HANDLE hToken; + TOKEN_ELEVATION elevation; + DWORD dwSize; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenElevation, &elevation, sizeof(elevation), &dwSize)) + { + DWORD dwerr = GetLastError(); + CloseHandle(hToken); + SetLastError(dwerr); + + switch (dwerr) + { + case ERROR_INVALID_FUNCTION: + case ERROR_INVALID_PARAMETER: + return TRUE; + + default: + return FALSE; + } + } + + CloseHandle(hToken); + + SetLastError(NO_ERROR); + + return elevation.TokenIsElevated; +} diff --git a/cpl/drvio.h b/cpl/drvio.h index a17263a..6e0d8c2 100644 --- a/cpl/drvio.h +++ b/cpl/drvio.h @@ -2,17 +2,31 @@ extern "C" { #endif - INT_PTR - CALLBACK - StatusDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + INT_PTR + CALLBACK + StatusDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - INT_PTR - CALLBACK - NewDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + INT_PTR + CALLBACK + NewDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - BOOL - WINAPI - ImDiskInteractiveCheckSave(HWND hWnd, HANDLE device); + BOOL + WINAPI + ImDiskInteractiveCheckSave(HWND hWnd, HANDLE device); + + LONG + WINAPI + ImDiskShowCPlAppletElevated(HWND hWnd); + + VOID + WINAPI + ImDiskRelaunchElevated(HWND hWnd, LPCSTR DllFunction, + LPCSTR CommandLine, int nCmdShow); + + VOID + WINAPI + ImDiskRelaunchElevatedW(HWND hWnd, LPCWSTR DllFunction, + LPCWSTR CommandLine, int nCmdShow); /** This function is a quick perror-style way of displaying an error message @@ -25,7 +39,7 @@ extern "C" { VOID WINAPI MsgBoxLastError(IN HWND hWndParent OPTIONAL, - IN LPCWSTR Prefix); + IN LPCWSTR Prefix); extern ULONGLONG diff --git a/cpl/i386/imdisk.exp b/cpl/i386/imdisk.exp index 46a859e88f44aa545448ae3607b110c3b7ff6e7b..ade5bf0e9b8d9f9aa865afe337d5bff9f5d2cc5e 100644 GIT binary patch literal 16601 zcmeI3e{@{Mb;qw`!x|%l1qKZMfouybgOK-^q?IvPzbs2cl7%E}Lj?9(`y?%1?TX!% zkR4K-)-LXY&z(CEV<$aqJJkoX4N^VWHIUfBFc&d zMEmgbAbyJD6#h5kUtP-CF*#a2AecCIz<&5@SIe@Q7PQu-^3HH^%8_gl#5{bSc6`YF zP1Hs5SrB>ezhviso^OHkE%1M>1!hqbt)&mqY??zC(1jGDxpWcDql>A6=F=r~DJ`H% zx{NNTg>(g7NmtP#x|*(`#k7Q$(lWZ1s%SY4(F$5g)pQ+QPphbgR?`i1Bh}JPR7Yzl zOc9DwjN(*J4b(^px|!C|Ep#ibM>J}oR%)Ym+CUw&kvgf1Zle!VH}z02ZK6K9o%(5j z2I&skOj~Fx-AQ-RN9b<4hqlpnO41G*rW83eLZdWBX}XtoQijGUOF5dL`zSr0N*8w4 z4NqjKtuNCuF_CeK)HU7?*pj+;vQX?APmVer>5Maw-tBmn*2#1x)zjMV{n|E`%)%#= z94(ZHGrY4spPq8^o1J_ioy$r?E?dZDoF1o8z-3zk=@y^j{9;?@z+kSsRq+)RU@!-h z^vyfTqSNk7rH5rD+Z426TJ!74O=gRIxpY?E>W1l}lTB%-ccinaj=baWU35FeqLcTo z(UF-fjBSBAcfWTZ^0qs2`C+Hu8P84WRoUniTl%`x1_E(Etvg+imC#tJ#-O~ecaA9@|`MY9ZyIhl;z>o!d|S+~oy?y~x?YE;@%!;|AXN?lkO`kj%yQyAMY<&<87 z+b5m;F6}Mocaka5aXORPR7O6cfFAB5t6naa&vO885$;w#$bsaPQ;IHL6KJd}iZ>Y|0z-POBq@a5cvUzPbtB2DF1V0YEy`W2&Vq$lg;DNi^)A?4R&kUcW%WMTMXVAiA7CXuejclJC_lz( z4%o%4no<55tGQsJwjr!Oh#q8B0XCmiC(1pn7JyyCsvG6USuF&+lvN+fUuU%lOe9)D zSgjEK2CF4tm8`a++{>y8>@rqEC?8@~4R$%J?I?efRSnoeRwq` zUCAng@{_FMU{|r4K>1s&5?~^O6QUx@-)6NAOeB6n{4DmdY6iQ8m1xgTv1$if%xVwH zM_6@&Eny|@>vvdngDqtx>b9R%AJ{Th;`)!W8U(wRmGF6t)mE@7RtHf2E~_E1<*W{( z6g))R!B((3g!0p@QeZ1tJ%RFZR%2k*te!&od#o~G*ReW`Qd~1c6JXb~I)d^utcqZ( zSRFUET#V|4&*4XfiQKhNqQSeVrbluxoc1QucSCQ8u`A$kHV z%IYnYUtskVSd7(4lwV|Z7%a}}ZIn;5Is#VD>J&=Rh9No%*1+mC%0FiHELbC}GbsOr z)$?EpR%cOuiPbT%CRXpF6zw0P7s1xDdLQL8tX=}UnH9|<`cqb~f~{jU2kgtNUI)8{ z)m$*~>_T)L>{eD4U|(T%0&G321z=xg^(I&|tA${H#_BDw7FLVE#B&ePNw8K{OTfOy z>TR$#R#jlnu{s6T&Z-*h&sm)Y+rX*@O!S!$odN4$RSWhPtj>aMWEBScOIGiKb+U?s zy};^yur5{!Fwx&a9CUAEwGQmBSk0MD$f^iyGuU6VnhVy=svYd>tSZ2ISapKE$Z7#t zFRN~_Z?IYjwux0A*f&`%0_$Tn2=+IumVn*PYAcxN=NJvZ`dJNuz09f_Y=G5vuvb{s zfDN)rf&DG3TCh7IS=;)x%)NS@nV4!)hPc_gD>rZDX|` z?E9>?f^BDY0PF{>hQN}n4uYLvwH<5+t3zOKuu6dqvw8yT?^%t3rC2=$_7AKwU=FLp zU~jUT02^U-1neJK6~RVX9R>R#t7)(?R?mX{h}8pNX;#mJy~Sz|*uAWdf&G}(Ua+04 zUIhCItB1idtX=~9CszBw##y}zc9PY8uq>xo>1Ix2|3+x?MPk|L!odo+AR)@igtlkFuS5`;BCRv>VJH_fK*c7YNVE@MI zS+M(A%|ZDK{D1#aG5XG`grvHmbS%*@z225O?l-7|V9yaFOL8Q>D1YrEr+1 zI4J9Nv5XhzUmR@4nh?u*QO63?L7CsXpD^F|Fqik@L0saSgO~Zj3Ee^7XYg`=Ih+HFrBruo{=VO7qbc@ukb5XWj_cMdx-E3;sA>vP9+8<(=g+99{JWcwTc(PjS^S zx6|TaUp1W|F1bW=lWRCTt*{2ZOEuqstbyMQaZC>rmCMd`g1kS}`5O3NtNHus2GMV- zbXzHBjBX)f!E)amn0^pXWyMTBrMe>xA^Q1B-#IA3Al{d1#l=oAqhi;?={nOXAmJeV zuJ`@a#Deysi%_sC*w0Hqh^DA1;~^6f;wr0kA0r_lLhlW}hmn{Nuj!4x)lN`|$5pF3 z_?t5#Q6WD6Cey6kXPn!u&h(IdQ^_wZ!}QhRfKEL`F4SBf4wA2a4zx zRlJnwmcYU@Q5jQ=N-7))4smK+Sk0V{dI70XiWZ zv?RLd!cBtCluQ=`^jgJ9$*PMt_U1rS3y#df9F|M~M4guqOd$8Fb*Eg6B%4^_`>m9yF(73+QH3o9|+e>zD`1o&=*cu6LI)m&WxT&7thL-aE6KAI05qeUs)MJg)a? zJ~NK%x1Zb9AJ_ZKJIis;8`lTU>FJN_gTcP$xPFJ`CPP{9xV~BQ{T0UbE$2Ex-k&$F zizTiuZdVS zd$w}Z0;cmPkq}TW74U&#Y!@j4>19m| zM6N&@?P)38AY`Z_YbKA5?8z{MhlruvA@xs@u z)?n|yYR#rQ2G{!EcWNHajZf62Q>$LtO&@$9atrGBLq$DiQ(-rMn}QBu@$ZuS=!8gS zaHd-l*Xs;^mE`_Sd34|Bkxg((b#E9)gq|*4$0bqvicabi^d465%31YIG#^WLg@j}D zntoO|PCqnAJ)Jg416_b5g?gPvT5OO6MGVqJ8+8&1)7=J%(1byv^pHVfbjToa`m#al z>01VApr09}k=`>%g61Q!qTE-ciI(dGp})}}5$ZQclqL-lqel!9r)LaOPv0>}1D!TV zBUK==qtp2t8_$D1F`_F?!A*ar&-Knqu@lq-d1-#Ompc?h|XE zxkxpsK8>`(APHJ;kR}?^NjyvigG6YbL8A1eL1OeZgT(3E2C1hX8>E5G8l;g#K1{ib zI1)DoX`*(W)Z@Dk28qyp28q&MgT(0528q+t2C1hP4AMZy4bn(I(Mdy?s`LoZ5TTes z@a-~##KNF%*skOaMBkS3}?DpRRpB1|;~iO`1)5~T@)#ON`D#OXPM)YBUV zX`ufy2;MLKtxP27HiIx4ogpL>_O5Zd{jDBR0IQ^$V>Zt;0V!wuwa0AsEq>}-NnY74$i+sT%V%JO_?x(+D zk+T+A?7H%au57f(T^4!JBA>I!%N7y4-STkdT+9UJ;gX0&?zG6bMZ`X#JlyMu-8y-= zi<@hXv1^RH$J>fOz<}nJfpf};UQzEqC^9BD5TBanFzFSI>)ydI}y4; z*@2J-W9K0NyE_h=LCLI@zLRV2FnA{f?<`1T;EsYc2J9qwCVdCNhuY3T5at~N-w?P{ zFoW682bcbg1XZzj2K-Bu-4Qs4i@Ot0#z|(#u>&x(hnx8i@KH1VzFB4`?M%P#bB+xE zjE=J2NbmT5enwwmY9`;qff@X=HvdVL{zN4x+}&t2R2`5#|Jd$j-n literal 16398 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 diff --git a/cpl/i386/imdisk.lib b/cpl/i386/imdisk.lib index 6179ab70c3ac8c7eb161b52f0c1ef106a1d3530b..558f52d27d457ddf2eb239864e43a705210ac5b1 100644 GIT binary patch literal 29740 zcmd^HTWplqwO&9jElFE)Z9)^`5E96ZfUylEgpRLZ@D1Bw?q=}(wg<*DW<2IVj*c4T zp^BpO)TgMARnJRRRe9u8RfVc5s;VBTtyC$hqDrR^t<;AqPf^r|_N+bY-~V1~-{v32 zc{-LBGv4d+?fY7LuWg<`Qmij5AKm&!m;Bk^cc8a#-@(Iu`((NP^v%w3IKlv zcTJ|~*~F@U1Me-I5}+Z2ubkZ1<$p{Rd~Xc+6MX!g%U6W9(# z$5E$Af5K0s!e596pG3Qg-X|)oVmZ>}J4C0a0TfNYNp$)*_&d_<^@=64B(} zQ4eVV%bJAs96(ZIsp#BKiO%l?RNzsjWiLPw}P?TWbC|ba_D5@SID&aUOTKEOg zBKDi2GPY6Cjn9ZK{|G=)Z6{G>5ui!f{}rU`eLfk_=&Xg zYohB_)I++4BN_JNSvT`aaRwPjFo!UBLcTba7G9{QT(n)a3N+{Lt{s;PmL!?Bw)( zd8JfdyAJd76Q{?|IgO6_Jcl-w*YSVjdWm7XcyOh#9VONmK+*VB=zNLpK$j%rU=4f@XR$nP9c+m^kCa+A?!tkv;Hc%?F zGE=TDRT3`}&9*#}Br}~9OR5`=7ptXgE_zv+O@TXFEtTuZg42h7p}36}9igFG^n@0( zJJr)^nJCq(xf}*-)kd*gT^pU59GMX|JnWEOW|$9$tDlLHotXyC>6xU?7O;mwMT7OE z*hre2$W*OdmHqE9Nr$$9fR4i?oypatN?XdnZD*A^Opng`%GIPU`cY^R+tmxylIt=N z(jQz-7OoG~%QutynWVmEFHR4e^l;VsY3Wh6dRf9`swHT?@7ZTxX`1E(Vgc4K` zjI>6}#VUF%$CnJUa+1VtJ*k#F?Gy}>mHv*`S#n5PO^aG(eI=PGzvDO^#>u3y;pi$F zN$FTpTS*%A+hT~&oGTF4&9)3)O`nZSkZcXCmn)_5foXxA6_N~YeYkWQgU4rPYhwfb zLe%C74HTZOp_)%4*x>Du~QBMUs7KJ@WPa{}G%O>}yV<=GkrA_uw!n#(0EF@mF2 zT(ZRlWk)Cng~*25bf%NVda|}Wd^553T8C+Hr;{aI?)BRkzckQe%kW2GIs&9i6W?L- z5f6xvK28U%+`rzajn#_jLXb6xh>@L%TBE#pduBPQR6<)`K!od4Ri|(@VjqZZCuPYe zO`L6OwMvpkn$AoVJfDV+l>FleR4u$+G~ta7fBqERr8zTNN}Ovf5-EzMKY2(yQ!&kfJl0(v-Al2Su0wNij2|#U41e8pV4lX{cdxRFT zNsooE&g8Xuq~Z5RHegtaTM>@QZ^98FeJ9klwY>tQ%R*UaTd{eh!6RCyn;a(Tc)~2Z zjsX$US2HUMf^AKQndvx@uHKOg`}?HdLK|^mvT22-c1=8Np{Ik>fF5U)o)c!;3)L$? zx^|>!tNQq)>5CO@?T`#vpoyxZLLHFWHo{V51qVf&umVflQe2X(jjm1AYYTXpI9y3? z;$=q3-c7s$Sxtn4O)uk=V{hS#rDSH!<6KiopT!o^nN?pMeN#Osm-dvpr^UH!E~e}W z>$-9!LE7@HUdRqkVK(W}Y@q$z*;gDU>4=k*(^8j9TE4~ZAO?lVhCa(W!zCCb%X_5I zZFwVy>0HFKcKLaBX+)vPO66srW*cINo0hws+Dtgi2icyHVh3YZ*BpXbT7#*{vb4wL zfsRRs`998E3(Y3K{T%IqEJwQzm{EEQ;Jvp2?qFtWYXM-#9KZ)iUmz`?1=u?R@YFHP z1fBu-*-6YCjRJgp0yB;HeeXEH_8EZRVwuXa{$vbwFoVk6U<0`f&AH1sDtz= zX3l=zk8-GYXBgnSX!moZA5R1PV-WFB{)dS70qRVl+zFKVGiKJdqrK(h0DnUI3)b;T zlzks*6~DhTiP_E50B@p=-{9vpl<&rRlo0Fh$m_!>M4kHOdB8}Kmn!Q-$E zcEBs}1Uw1*;Sd~zXJ9*g3l6|ecm!U8r=b^KhHmJAhv1uVKRf^r!dGAo&cP9Q8!9jd z6VQNlxCobE1(snH&cYPD1!v$WoPue%4i{hmhG7U6p#=SK6-FR|NjMKna10ip0GHu3 z%)&UFgfW@u zMQ0^W;=s50^lNdkna!C}aeJCsP^CJO)UwU&O?o?>3bLZ?M%_Ltr|LYYPm4TfHqG&5 zZVA#kg`^tjY4!D!DKY0dUs+aTpO-cY!I0jFSeHPCAz~zbZfL>g)e`z?Y!^_^Vnh#L z-+&obAS5;do@mjnzemWaWO~dumdzO~Epy|*Aj7JHb8tx&!yV0I6Yl6POjUcM+sXk(RlN5t4d5^(iT3ia5(x#)2ru4q0>77{5%@ zPdb`4Y(CIPqq(fW|LVgR^MQGL(hQ!c2Ryr_IWe$1X?=)bMcFmA-dCF;H<@L7t0=Yi zS9M-YHNNuM+-7VO3fU^r5EVdCFV_0bR;y^LKMDy*)tl~bl-Wu3opqRBYi)xC^HB(n- zaq0n7_ll?kdo~qpA$cSC+N*+$JK8@Hl2YuR4CBt3T+8H{H;HqGKS_6X{Fi{__$ zx9ByqeVbx;2aoZxI;ngNRX%cS;>+$h`@Wf(o~_^1#lQO-KHtoJ>xlF9jXgC$a6I?z z+!L6}GH1X>TRH?b*W_6{>pa^r82iN0Q%Cy-!x!#>EgVtKT!bYOF>E}A>0RzDR2^*h z(6nwB(iWPQ$_~I4=JOp*Gw!R$maifyRh?Y~q*uE%ydKXZ_}Z(8LgrVja@(^=wsbBL zo|7@=4#w6~Jnds7kNJ}z1A|hY%6DRX&g9-kXnFjN>>dwz4CjcQ#wl@t%8Yxs?{SbTDpphfgMANjoIFMtb>MF3A@2IGa#E zc|-$ENIjE{Wt@}Xxc;dH+gm}$>j)zr$K&BgAEt08V%(3g!bRdw8|f^`Mk!K$|6@~fUTXF8d?1p;INy0jF zW6}IbdS-HU&62aBxkqaTYFydl)zk?`h`5f;?mX{_irZlB%{DLmSd>X;EX%Cp#+)Yl zoT1(#Dcn+jE@I9*mcO&R6U_-1l$mOk2i1b<3CwDTu&K{8o*cbTPFb`Djn`7UKwr=3 zt;TYL_5hH5Xi5?PJy*L2=993LWilH(l5v)Y~K zajtev!)H5=#QkS@y>lsj&I?(gOFz3dwy(7t#N4ejr=-huW`;ZjSx*{m*K6YvUr$-> zeQhb>rJMyWxXcNA1zSQHUu^dwcgLoNwnt{DHjBF$k7sr@MavZXJAuEHqvE{_s};)I zw)%_Op2PdoKefHGb!^iX_%Qj8;zOGNGj7eFO?ykp)%B%am@lQDe*E}P{Y&~;fNcYN z%cWwYxT{;U@Xre2e~|t+E!cve1=x2tmBYV6q@RcJ<6lTxPL&p*>+WX!d<64|>SwEI z)E;`**K-KMVIs_87wd|y{1H! zKd1glf0Qju*`~j#kIk6i#6KOqhpU6oG+|wuZ=Q7b>c7EO^JH^#p8R*SYN~?ZohO)N z7C&sB9MB9kPyS2)l76ar@}-P_o>6@kD-rzrR5L|#_S(UN&g%LD0?-iqdo8lMdUZ#s ziKtc=|6!}EN0%$P-|1h{&kgO}JU#jh0&mzn?9tm*m->rwwKT^zsXgn7X6x=_d2BOQ zd;`fhZoPWgER+`!WfN{3!7~tag4)xUP8JJwJEGo~q3Sadhcc-7+ShZ~kEAC5{TUKF zbaAk@_m18`yLKVk0}RbR#&OVgTiAQR-@@k+^Ff1Y-Dnz=dzdp3#IFPp=Xev_@7D<8 zS2-d-ynbnjTW!SbPPe08)o#aH6FYDmA2NvSh|L>lkn^pJ-fsV_=|Z%Jy=ZtlX+YT5 zoOnHcyq$>mH4D!i3K$IgniDb7pI^@q`LzOrU|(~hMfTBeWN4my3WjtKD=~t)&7ith zADyB0`p5DG9Lq-xs*@>T)2HnnAhwS`nqlGrKg&OKg4P@Gy()NpjH9uvMn`y&{q1o- zo?MP?_h)bVa<$9aZC=6_KEV;4n<+kZOq=tqlD>d{+>5ABMp5;ZMbzJ|z8w?vlHtLyaw|B;T((?i<`vW`Pwe8R5z+SD+GCMOo_xhTHw%f+o zp7lZmb0hZ4-bhsQVutNplk?`b-^YRZt4`l98O-MYr$E=n`u{^PJ$ny(WFRu$gQ&YL zR3}-^fX&x@GuZrJhw?^4;qJ+B`NjVRodg0qq&j=N?8R-S^-c5G80TwgEYf(zk4SF? zI>C&z@>PK;9w2mp7>mhY%Me+bh4o|mvo>~OeLX{yi5m`R8k%zq1FJ-x$M-Tk_5i~` zFyNeMkC5nGM>EJPhT=wuaZ9{ZZJrGeN`ovrp~xFQY2FxsCtu?W1|kH->f z9NG+T&XxwE19iqaAdok*e`Bk%$DnT1Njb7gdJP)?AL>juvd+!dqp^6a57F%GBLiSx zb7Dnqjt_dUI=tbGtcpVhjVGR2i`rimvEB5r!3!=!Gl)5RGZ0-pjcege#FG!OjP>?g z7Ted}Qb@s+1}485u=$#=g<0Crx=~U7Vl$?1H7Hn_$q=mw0+#j3EMW+avyWSA_Kqh3q0t~FnC?go)o z4*3!338n#J@HsIfGk4g=G$E_(+VO;@t%ly59!XP7;o&Tr~#+=K}R?ZX%AXFY_!XXSyL@+j}D(eNxoGO83Z# z-1ZI?%W+K!TyM(93S`=CbzflhsvG%Jtgq z2h6lYrw8b)@$HX&U>8%_zF9xMP62he-eN63Es*tHgOvu7PNVIX9}KiyJ{c07_RXr9mRpM7ZVp5zUO}@G+oT5ch24p%xQI7y33sN z#ou)>xVC#a*2+t!l};K=ZXc!w`C1u^u`e@JHxVW$Rol3Mdj|DdVBW^HQ(+Ri?VgUk zRJdZW{pqj{v16}(i+=3%Z*WWx-@{%NiO8-7Q1$=g&=GDRDo|P01&Pa3V{%HjJ-)Gb zxg~?j(qmQ#&^}`1gpn9TnIh}Z=f=)aiyYIW$*g9Yk$y>)nMzrBIEq+aS>3t+OenFZhO821Ido_araU7~Mv zUkBpYE<~;{WRpIVTXDNBjqMUE438zyI-O0C7FHFaokZ(!EMqOK`S3cwXO66wRffou TX;vfKUN5m1A2%3gY?1yScTg&P literal 29262 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 CfzPr4 diff --git a/cpl/ia64/imdisk.exp b/cpl/ia64/imdisk.exp index fc81975dbdffe1fc2d521e036d3fcd509bd7fac2..7718b5b643d3df5d2ae714cc89c6b88da24428a4 100644 GIT binary patch literal 9191 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 IAAVr_FaL_AhX4Qo literal 8914 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 y8d-zY(c7F}Y}3eLjhqaTAsj9L6t(e`=io diff --git a/cpl/ia64/imdisk.lib b/cpl/ia64/imdisk.lib index ff019764790fadc04f64748f9bfb6b853850e588..c01d187d6eaefdae8fe076c1119ce5ee1b0734eb 100644 GIT binary patch literal 18852 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 delta 3412 zcmcgtTWFhQ7=F5TJuO`i>Du(1p4T)@nlx#WCT-KE>0!q@F9%ZR7#r%SI%PLo9S*!w z=3Wq)Ly>vm#pr~1F-F~{An1)wQ5ZNJjtxYHc5@83A^3d%A^j2$cUpMzm;XII@Ap3M z_rEU%4__}h(NGo+1;epOFcLjEfQ?8EmcSna!>0ioi5-9q-!Nb!b(|zD3>^h*`1#I8=qg}i z(hJxaJ3(?5#)|Wm08;OfNAqyicY$I9(WWmBw3lkiNjp#$Zx3Co7 zL)I2zhX5N99+i#QD&JceT_y<&Q#Yvt3*l`%6$`$z9GQg>bK96H2W(8UVPdQLLHhC< zroA*+7`Ou1NZsS?EevwTSx}^d24u{;O}=UD$b470vQZwi)X4cxSLRX8bL*PQ{ie#Z zzk%!$$U>}sDG&PCY#|!`KurWVO^xng z;4r0goW4hg_@wP>h>J7{oM24xIQ=+5AF*Qs@G#~=7`RQ}r5kbJE(4CzX+MkH=kpW; z9W?GrQMHaY0GDT7P5i3mckk37gJrrXR5?SSQnZ7qkb{mtQC80eeQ9i?b)4*ls z^746Q0Juk@R|nbPAh(bcMGTb~!Uoi!6$!*qjxxAVk4{vh86h|kL=zfO0SA28j6U>Z z0Dcsq7hberBYMz{L6l+>>d=OExKV-zcucY&5J42f2xluU{eLA3ur6CR zTXo^T?o=vVsmxwix-j!;)7UyGDXz?PwAK}7=G$Lfm-(UdR-yb}U6J{v_a#d8z_WV~ zyzsQ|sl{hZ(P~m%oOQ{Yo{dHCc<%1beBk-5VC^oajO*lrx5~7A=`GB+tqxSJS8>!l#zEK|{qj4qUxfG@}HF>Ecg70IiCpk`Z$d5o%Ew5?ZFkGUG;!Dw@iOTAnQ zIyb2F?Q|<l-Wuv zW6LEF(pot=Q&z~au$EHYTxu=`9W|GY@@se` zkFGwqN_B#*-Hq~m&fFG~X8BI0sFLr8qgo2iG&`JX*%`?%e?4u=qK&aND*e~xweoG` zZw}R%qdHWl>E@JF)U8#z95*ZV(4|)1jp~ier|acG)M*@`Pu`BU%g*95iN|tvuqKr{ zRie4NLC)p4s5CpL&GX{N9QAT+q+J}NI$PzlJz@Ir_J@l;NsXqmzZWs7^vRKt7C8|w zk(PLCp3m;MnS);uG%`m6{dzSYz1=3-DcI^VsSfHb<#TD41BrYtUnI-{@FM3G%(n0J zbW26fhNv`iqb6m){FvyJC#p)NHLka_;AVRC$dQSJMnJdq%Js=jazB_`+5zy|FdB1{wwH~ycht$&DLt`%dINH1 zN(&a9v`?zjdQmoQWL5{lZ@4UUw91*BmaUl^UTWrp^m?PCR^FO($Ps@{&H);WWq7K^ z3K*Vld2L!}O351@YQux{_^_inucCh249V^py%+XrTp{Xi4Jjo&+2WMzGkSr15r-u* qtBaWF4Fc**GfV;nolZGFtE(hm<`Jo$(`3$R7#rYbf~Xvu>--Z}3ixvX diff --git a/cpl/imdisk.cpp b/cpl/imdisk.cpp index 589f2c5..624d53f 100644 --- a/cpl/imdisk.cpp +++ b/cpl/imdisk.cpp @@ -2,7 +2,7 @@ Control Panel Applet for the ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2007-2018 Olof Lagerkvist. +Copyright (C) 2007-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -135,7 +135,7 @@ BOOL *lpTranslated wcSize, _countof(wcSize)); - if ((item_text_size == 0) | + if ((item_text_size == 0) || (item_text_size >= _countof(wcSize))) { if (lpTranslated != NULL) @@ -183,7 +183,9 @@ LoadDeviceToList(HWND hWnd, int iDeviceNumber, bool SelectItem) if (!QueryDosDevice(wcMountPoint, wcActualTarget, _countof(wcActualTarget))) + { wcMountPoint[0] = 0; + } else { wcActualTarget[_countof(wcActualTarget) - 1] = 0; @@ -198,7 +200,7 @@ LoadDeviceToList(HWND hWnd, int iDeviceNumber, bool SelectItem) wcMountPoint[0] = 0; } - LVITEM lvi; + LVITEM lvi = { 0 }; lvi.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM | LVIF_STATE; lvi.iItem = 0; lvi.iSubItem = 0; @@ -237,7 +239,7 @@ LoadDeviceToList(HWND hWnd, int iDeviceNumber, bool SelectItem) case IMDISK_TYPE_VM: if (create_data->FileNameLength == 0) { - if ((IMDISK_TYPE(create_data->Flags) == IMDISK_TYPE_FILE) & + if ((IMDISK_TYPE(create_data->Flags) == IMDISK_TYPE_FILE) && (IMDISK_FILE_TYPE(create_data->Flags) == IMDISK_FILE_TYPE_AWEALLOC)) { @@ -250,7 +252,7 @@ LoadDeviceToList(HWND hWnd, int iDeviceNumber, bool SelectItem) break; } } - + mem.ReAlloc(create_data->FileNameLength + sizeof(*create_data->FileName), HEAP_GENERATE_EXCEPTIONS); @@ -417,9 +419,11 @@ RefreshList(HWND hWnd, DWORD SelectDeviceNumber) } for (DWORD counter = 1; counter <= *device_list; counter++) + { LoadDeviceToList(hWnd, - device_list[counter], - device_list[counter] == SelectDeviceNumber); + device_list[counter], + device_list[counter] == SelectDeviceNumber); + } return true; } @@ -722,8 +726,8 @@ IN BOOL IsCdRomType) BOOL use_original_file_name = FALSE; LARGE_INTEGER save_offset = { 0 }; - if ((IMDISK_DEVICE_TYPE(create_data->Flags) == IMDISK_DEVICE_TYPE_HD) ? - TRUE : !IsCdRomType) + if ((IMDISK_DEVICE_TYPE(create_data->Flags) == IMDISK_DEVICE_TYPE_HD) || + !IsCdRomType) { INT_PTR i = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_OPTIONS_SAVE), @@ -884,12 +888,24 @@ IN BOOL IsCdRomType) } CloseHandle(hImage); - ImDiskMsgBoxPrintF(hWnd, MB_ICONINFORMATION, - L"ImDisk Virtual Disk Driver", - L"Successfully saved the contents of drive '%1!c!:' to " - L"image file '%2'.", - create_data->DriveLetter ? create_data->DriveLetter : L' ', - ofn.lpstrFile); + + if (create_data->DriveLetter != 0) + { + ImDiskMsgBoxPrintF(hWnd, MB_ICONINFORMATION, + L"ImDisk Virtual Disk Driver", + L"Successfully saved the contents of drive '%1!c!:' to " + L"image file '%2'.", + create_data->DriveLetter, + ofn.lpstrFile); + } + else + { + ImDiskMsgBoxPrintF(hWnd, MB_ICONINFORMATION, + L"ImDisk Virtual Disk Driver", + L"Successfully saved drive contents to " + L"image file '%1'.", + ofn.lpstrFile); + } } BOOL @@ -1170,11 +1186,15 @@ NewDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_COMMAND: { - if ((GetWindowTextLength(GetDlgItem(hWnd, IDC_EDT_IMAGEFILE)) > 0) | + if ((GetWindowTextLength(GetDlgItem(hWnd, IDC_EDT_IMAGEFILE)) > 0) || (GetDlgItemDouble(hWnd, IDC_EDT_SIZE, NULL) > 0)) + { EnableWindow(GetDlgItem(hWnd, IDOK), TRUE); + } else + { EnableWindow(GetDlgItem(hWnd, IDOK), FALSE); + } if (GetWindowTextLength(GetDlgItem(hWnd, IDC_EDT_IMAGEFILE)) > 0) { @@ -1246,7 +1266,7 @@ NewDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) wcSize, _countof(wcSize)); - if ((item_text_size == 0) | + if ((item_text_size == 0) || (item_text_size >= _countof(wcSize))) { MessageBox(hWnd, @@ -1263,7 +1283,7 @@ NewDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) disk_geometry.Cylinders.QuadPart = wcstoul(wcSize, &stop_pos, 0); // If failed, try to parse as double - if ((stop_pos == wcSize) | (stop_pos[0] != 0)) + if ((stop_pos == wcSize) || (stop_pos[0] != 0)) { double size = wcstod(wcSize, &stop_pos); @@ -1478,7 +1498,7 @@ ExtendDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM /*lParam*/) wcSize, _countof(wcSize)); - if ((item_text_size == 0) | + if ((item_text_size == 0) || (item_text_size >= _countof(wcSize))) { MessageBox(hWnd, @@ -1804,6 +1824,7 @@ CPlAppletDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) DWORD device_number = (DWORD) DialogBox(hInstance, MAKEINTRESOURCE(IDD_NEWDIALOG), hWnd, NewDlgProc); + if (device_number != IMDISK_AUTO_DEVICE_NUMBER) RefreshList(GetDlgItem(hWnd, IDC_LISTVIEW), device_number); @@ -2087,7 +2108,7 @@ CPlAppletDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SendDlgItemMessage(hWnd, IDC_LISTVIEW, LVM_GETITEM, 0, (LPARAM)&lvi); - if ((mount_point[0] < 'A') | (mount_point[0] > 'Z')) + if ((mount_point[0] < 'A') || (mount_point[0] > 'Z')) { ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, L"Unsupported mount point", L"It is only possible to format drives with a " @@ -2124,7 +2145,7 @@ CPlAppletDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) L"ImDisk Virtual Disk Driver for Windows NT/2000/XP/2003.\r\n" L"Version %1!i!.%2!i!.%3!i! - (Compiled %4!hs!)\r\n" L"\r\n" - L"Copyright (C) 2004-2018 Olof Lagerkvist.\r\n" + L"Copyright (C) 2004-2021 Olof Lagerkvist.\r\n" L"http://www.ltr-data.se olof@ltr-data.se\r\n" L"\r\n" L"Permission is hereby granted, free of charge, to any person\r\n" @@ -2348,6 +2369,117 @@ ImDiskInteractiveCheckSave(HWND hWnd, HANDLE device) } } +EXTERN_C +VOID WINAPI +ImDiskRelaunchElevated(HWND hWnd, LPCSTR DllFunction, LPCSTR CommandLine, + int nCmdShow) +{ + WHeapMem path(MAX_PATH, HEAP_GENERATE_EXCEPTIONS); + + UINT length = GetSystemDirectoryA(path, (UINT)path.Count()); + + if (length == 0 || length >= path.Count()) + { + ImDiskMsgBoxPrintF(hWnd, MB_ICONERROR, L"ImDisk Virtual Disk Driver", + L"Cannot find system directory."); + + return; + } + + strncat((LPSTR)path + length, "\\rundll32.exe", + path.Count() - length - 2); + + WMem arguments(ImDiskAllocPrintFA("%1!s! %2!s!", + DllFunction, CommandLine)); + + if (arguments == NULL) + { + MsgBoxLastError(hWnd, + L"Not enough memory to launch ImDisk Control Panel applet with administrative privileges:"); + + return; + } + + int inst = (int)(INT_PTR)ShellExecuteA(hWnd, "runas", path, arguments, NULL, + nCmdShow); + + if (inst > 32) + { + return; + } + + MsgBoxLastError(hWnd, + L"Failed to launch ImDisk Control Panel applet with administrative privileges:"); + + return; +} + +EXTERN_C +VOID WINAPI +ImDiskRelaunchElevatedW(HWND hWnd, LPCWSTR DllFunction, LPCWSTR CommandLine, + int nCmdShow) +{ + WHeapMem path(MAX_PATH * sizeof(WCHAR), HEAP_GENERATE_EXCEPTIONS); + + UINT length = GetSystemDirectory(path, (UINT)path.Count()); + + if (length == 0 || length >= path.Count()) + { + ImDiskMsgBoxPrintF(hWnd, MB_ICONERROR, L"ImDisk Virtual Disk Driver", + L"Cannot find system directory."); + + return; + } + + wcsncat((LPWSTR)path + length, L"\\rundll32.exe", + path.Count() - length - 2); + + WMem arguments(ImDiskAllocPrintF(L"%1!ws! %2!ws!", + DllFunction, CommandLine)); + + if (arguments == NULL) + { + MsgBoxLastError(hWnd, + L"Not enough memory to launch ImDisk Control Panel applet with administrative privileges:"); + + return; + } + + int inst = (int)(INT_PTR)ShellExecute(hWnd, L"runas", path, arguments, NULL, + nCmdShow); + + if (inst > 32) + { + return; + } + + MsgBoxLastError(hWnd, + L"Failed to launch ImDisk Control Panel applet with administrative privileges:"); + + return; +} + +EXTERN_C +LONG WINAPI +ImDiskShowCPlAppletElevated(HWND hwndCPl) +{ + if (!ImDiskIsProcessElevated()) + { + ImDiskRelaunchElevatedW(hwndCPl, L"shell32.dll,Control_RunDLL", + L"imdisk.cpl", SW_SHOW); + + return 0; + } + + if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_CPLAPPLET), hwndCPl, + CPlAppletDlgProc) == -1) + { + MsgBoxLastError(hwndCPl, L"Failed to launch ImDisk Control Panel applet:"); + } + + return 0; +} + EXTERN_C IMDISK_API LONG APIENTRY @@ -2360,12 +2492,7 @@ LPARAM lParam2 // second message parameter switch (uMsg) { case CPL_DBLCLK: - if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_CPLAPPLET), hwndCPl, - CPlAppletDlgProc) == -1) - MsgBoxLastError(hwndCPl, - L"Error loading dialog box:"); - - return 0; + return ImDiskShowCPlAppletElevated(hwndCPl); case CPL_EXIT: return 0; diff --git a/cpl/imdisk.rc b/cpl/imdisk.rc index 9b3dfe8..5e1c848 100644 --- a/cpl/imdisk.rc +++ b/cpl/imdisk.rc @@ -37,7 +37,7 @@ FILESUBTYPE 0 VALUE "FileDescription", "Control Panel Applet for the ImDisk Virtual Disk Driver\0" VALUE "FileVersion", IMDISK_RC_VERSION_STR ".59\0" VALUE "InternalName", "imdisk\0" - VALUE "LegalCopyright", "Copyright © 2004-2018 Olof Lagerkvist.\0" + VALUE "LegalCopyright", "Copyright © 2004-2021 Olof Lagerkvist.\0" VALUE "OriginalFilename", "imdisk.cpl\0" VALUE "ProductName", "imdisk\0" VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".59\0" diff --git a/cpl/mbr.c b/cpl/mbr.c index 9472060..7428909 100644 --- a/cpl/mbr.c +++ b/cpl/mbr.c @@ -4,6 +4,8 @@ extern "C" { #endif +#ifdef INCLUDE_GPL_ORIGIN + const char default_mbr[] = { 0xFA, 0xFC, 0x31, 0xC0, 0x8E, 0xD0, 0x8E, 0xD8, 0xBD, 0x00, 0x7C, 0x8D, 0x66, 0xE0, 0xFB, 0xB8, @@ -40,7 +42,47 @@ extern "C" { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xAA, }; - const unsigned int default_mbr_size = sizeof(default_mbr); +#else // INCLUDE_GPL_ORIGIN + + const char default_mbr[] = + { + 0xF4, 0xEB, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xAA + }; + +#endif // INCLUDE_GPL_ORIGIN + +const unsigned int default_mbr_size = sizeof(default_mbr); #ifdef __cplusplus } diff --git a/cpl/rundll.c b/cpl/rundll.c index 13e06f9..316e23b 100644 --- a/cpl/rundll.c +++ b/cpl/rundll.c @@ -2,7 +2,7 @@ rundll32.exe compatible functions for the ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2007-2018 Olof Lagerkvist. +Copyright (C) 2007-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -55,6 +55,14 @@ HINSTANCE hInst, LPWSTR lpszCmdLine, int nCmdShow) { + if (!ImDiskIsProcessElevated()) + { + ImDiskRelaunchElevatedW(hWnd, L"imdisk.cpl,RunDLL_MountFile", + lpszCmdLine, nCmdShow); + + return; + } + DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_NEWDIALOG), hWnd, NewDlgProc, (LPARAM)lpszCmdLine); } @@ -70,6 +78,14 @@ int nCmdShow) int file_name_length; LPWSTR file_name; + if (!ImDiskIsProcessElevated()) + { + ImDiskRelaunchElevated(hWnd, "imdisk.cpl,RunDLL_MountFile", + lpszCmdLine, nCmdShow); + + return; + } + file_name_length = (int)(strlen(lpszCmdLine) + 1); file_name = (LPWSTR)malloc(((size_t)file_name_length) << 1); @@ -108,6 +124,14 @@ int nCmdShow) WCHAR mount_point[3] = L" :"; HWND hWndStatus; + if (!ImDiskIsProcessElevated()) + { + ImDiskRelaunchElevated(hWnd, "imdisk.cpl,RunDLL_RemoveDevice", + lpszCmdLine, nCmdShow); + + return; + } + // If user right-clicked in Windows Explorer the drive we are dismounting is // the current directory in this process. Change to Windows directory. if (GetWindowsDirectory(win_dir, _countof(win_dir))) @@ -150,6 +174,14 @@ int nCmdShow) HANDLE hDev; BOOL bIsCdRomType = FALSE; + if (!ImDiskIsProcessElevated()) + { + ImDiskRelaunchElevated(hWnd, "imdisk.cpl,RunDLL_SaveImageFile", + lpszCmdLine, nCmdShow); + + return; + } + switch (GetDriveTypeA(lpszCmdLine)) { case DRIVE_CDROM: diff --git a/cpl/sources b/cpl/sources index 41a219d..0fb6fb5 100644 --- a/cpl/sources +++ b/cpl/sources @@ -2,7 +2,7 @@ TARGETNAME=imdisk TARGETEXT=cpl TARGETPATH=. TARGETTYPE=DYNLINK -C_DEFINES = $(C_DEFINES) /DUNICODE /D_UNICODE /DNT4_COMPATIBLE /DIMDISK_CPL_EXPORTS +C_DEFINES = $(C_DEFINES) /DUNICODE /D_UNICODE /DNT4_COMPATIBLE /DIMDISK_CPL_EXPORTS /DINCLUDE_GPL_ORIGIN UMTYPE=windows USE_MSVCRT=1 MSC_OPTIMIZATION=/Ox /GF diff --git a/cpl/sources.props b/cpl/sources.props index 3aff5f7..d755d47 100644 --- a/cpl/sources.props +++ b/cpl/sources.props @@ -4,7 +4,7 @@ imdisk cpl DYNLINK - $(C_DEFINES) /DUNICODE /D_UNICODE + $(C_DEFINES) /DUNICODE /D_UNICODE /DINCLUDE_GPL_ORIGIN windows 1 /Ox /GF diff --git a/cpl/wconmsg.cpp b/cpl/wconmsg.cpp index c80714b..0a648d7 100644 --- a/cpl/wconmsg.cpp +++ b/cpl/wconmsg.cpp @@ -1,7 +1,7 @@ /* No-GUI support for the ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2007-2018 Olof Lagerkvist. +Copyright (C) 2007-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/cplcore/Icons/CD.bmp b/cplcore/Icons/CD.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4b57347dc42a0ac9093fb3a7fd49d1d9ca86d924 GIT binary patch literal 822 zcmZXSA#%hp3`Nr^Ea^;1X<1LO2UyBu;~j}<+Mc7eR!T|t;G4`d80O{;zbqyjB=kdo!bs#P$%>AXW$SeVjv> zRm}$|tf*O0Z&q~un{8?Q*}^qDw>tLl3K-*H3lG7Ag+kB?{!ny|;4DL9eO}%FR48ZZ+Fiff96qZOF5*x{5MDh?YlShd-9Cd(>L?V!gJOKR$b2TvY@!#%Y z7~1|eo9%YH+pfqB=j|;8$D79@&xkK@3&o8*p%k&R$65WS2oWxcn1Pb2RF%~Ck}qGs zF_6K*4NVl9K?Mpb<_IJTE#d-&fy4ueLO;A$i3Ud?QD_mWk_v+(kSH{h6etXiK%&qh zT+#}IBakSxm@rLIjMEWF6nZXAm1uAT5`~`2HYFMyfkdI_Cvhbj9Dzik=jRF~8XSQ{ zq35SeB^n%oM4{(rE+rZqfkdItUtq07gCmeAv;^x9QH+&4#+fLzgbEY}M<7w?`P)p1 z21g)K==n=si3Ud?QRw-*c}ax95l9qzZiQ5$!4XIldTx_aqQMbJ6#Cpk(MmKp0*OLP zvHlW;!4XJ|v**@QB^n%oM4{)lGbI`vfkdI_mUJZ=9Dzik=XMPx8XSQ{q32dkB^n%o zM4{(4FC`irfs~)WuJZErE52c{!s~g-^*UFzz4plyzDDHZbI}E|<%4;r984bz8SF_PDWLF5C8g-7XjM{kT82 zySwdf-9CT%_+we=vhN%D^6u@2{eBF^u=^&*r)|HC_l<^aVX|bTR~nXm%x|P4XF4Mt n4G*)OsR$G2IL`FX68P^i+Q79BCq2Yv^6eBt0c9 zu)!H-J>jKif|I8ENGMzA>b+w`Ek)!G5?M;Qz-vG&%@LcebtdnLBY!q~m;bd#)pygl ZXBW>ObL1?{d!w8GpTQ}1yfODb{{TczNR|Kq literal 0 HcmV?d00001 diff --git a/cplcore/Icons/Floppy.ico b/cplcore/Icons/Floppy.ico new file mode 100644 index 0000000000000000000000000000000000000000..3813631df43658e48a02daf5480365835ebe4e8b GIT binary patch literal 1406 zcmeH{Jxmlq9L3)Wcpx4u2X}zVdIu~53*IgQo(Bpy@^$51M@g=M(p*Jn$X1kQD@&7W zEKRndA~Bi9l4Ki7i!CfIrmz^_EEXnOSsG^ZoA=&-KC&~#02zLkg|r>_0Y$obVoD{F zK|gz7JCn*yXZ)`$yfWIJk51Kxs2de%HCyN$lA{*7Rg3uO*2{<*WvWjlO&YREWQbQ!~s6>$BbL?I1I&8v{mkm>*7n_8?j9c(=h>2* z?R~VjKc5@R@r9XN_m;Bg-PwIuD2$B&3oq8aEL;Brd%VExZftOdyXef8?D0IX{OaZO zV|!|NXmFrpGgrin){TSxo!9k&(kQSZ9R62Y7@XltwkDo1r-dPh`MGdSHih9u=9+k# sW)`OIOqlH7WZkeQCxOk)TCKXaQmHJv3vS$cEc?{ChY%_f^5^{xMF51+~G zIcLtyGtWHp+~%3Vm_DYzIr(Jc@<%^z%uHjGeikTJ!@-u=(_F{b@6V~UEr z`w1U2X3=L%_WMER(W8yo=P3Vs?kU%Fj{p52bJxDcjH~v)A7m!%ZA_}hm}6-Z5X^Xz z;Bgmab5|dJDd{>VX!>6eG9~BKn39WwruvdW9mt>noZfP22)-iH|2BUresdSl+0~5<=;z~O3GHuikYezQByTD zW`Z*!CO}>}H*TutG??nS4JJrlwIpGxpJ_HVOX4Q9EN*I+HB)cW^q)&wkThman=uR8 zOcD1c)^5xa(z28>jijcODO$$;@{}oAk~AgD+D!Sfq$zLY_wsgA`b^4{u1cA*XWB{n zrh{)t%Sq2DrHxrdYDt?Sl4;3MzQa^KlQb24Q@N_$RPcQb^#z-friSN%XWC3~6|l5s zj9E)+wdACAr1jSHCz%c8q#~t_))bQ$lNW8Wretl}l(lx4vh`_GvMysvcvr%^lFinX z^1hV3ocl86q>`;XBbAc^>ry7TuHA&zr%c5<;H0jKjTuwTcLC}PZseYF6&==8l2?*f zY`3P0-&Ops((kl2)#TOWp{;3CLmqgWl(8mA9#Ycpzmt=~Gr}f3Gi)NHaDBu?W|7FF zv%)5-d``r~NRb6G6P+71F;a9<%*42lkvDMPuz zJZ~@!%Nk6aJWk#KEySOQn?z%SNi@YxGbz42VG>U#O!G73&`k5{W|RD3!X#HEOj}E{ zX=`mZVa6!N_(WRUOk`b~iLE7puS9FoG^}kmiMDpryfI~B8#_#RQ^tfl(k7Ztlk+>B z;djQwz)9q7?%$>V!hz+UJVG8N#Yl;*8Pfos;`&XV{8^IrNxyD0?X=teV!KIgB)yU{ z9h*`nxw*r%caU~uOcETolTxIPH#$suN7{5yM+bGKNtt&uCPQv%(~^JaYw3Om_V2s* zz&-rF@xZ3%TKXLJ*-syEpm}`hXHMC7-~A7MsIk|Nmp;6$<;RD9ZuE@Pzu2^Y*=C4-3Az>1$iLUf=rK1M{!kcUku@`t6tA@uM%-)^Dx9d~MkgU%e&u z+D)&i{MOfE^XGjpG6Z&>e=Xf-ar#f=C*1y8{kos8J?a}%Q(JC~<;q9vZ=Zg_zE9s4NYr|XH zw*BJLd2?!ha-b{!`qtR|X#K5ICtr7MZGH<&n^rdMN~iy{WBYbK_|?yzdur)|SJmCu zV)JI-K5g=Kfx5bJd7`1Ibz8DElTPn&A8bo*+b`duf7g8 z7ev21%`5(mi!RDR)VP$ocm3o2f9y!Mv@|VVS~qd(?a>(U$L7^fn>?{@!d11D9(&OV z4IYM8wr)@EdjI|R|FJ8R-nMdOZEaoToqs~=e|x?DRu!+UR&g%B%iG?6f7^DT-=1u3 z89Vl(+IJ}Iu7A$1tE;2(i&T2#*pssK`e<^;w$@=SEiJ=`j~F@jVv4@=;`;R)^x5oM zic|RPkt0WpIP+5;KuaoyWv_~g;UfX$%I4LpS3VVA!524=yO63WJeW7`> z1|YA$6%{Yqw>#l!ZP{S|+6jNfagJ9!b%Lq@Wg3$I$^)o%P4i!EIIsM%4xcNBP}UV5 zIdaUHckSPPn^Y6Y*48zDwl;5UDo*xh@nagkkt0TqgiyvoK7Z8*$zJ_Bx4-@E3xBh=eay%ajIQ^^S=kA&`m{07C6qkwB8dOm zdJ(^O-8F6;#3p)B4^Q%$N_@aLqi_48Fdyhjb>J{U9Dhh7aVzu>C633b;}JVNziZZH#g z6%Du+#*R5BiyW2aidU<4prQI0)l+`neYd&>G~vgM>?Sr^o|tg$#OtT3dXE>rx)A2( zaVz-A*rltzdUJo*JaPREQ>MA<1dt$lC0B3Wk0-CZw>~;=VM^dj6d_t%1E)QjS1AAI>i8Y==4VCAtCYVlGHuFr zmn?lczf9NPtK)6I&xtNX-JMr7b`f1&OY3g+Uv@(U8CqOsXjkvv-BSN6w#G|SUnY|G*no?%;7EW@sBYBN=`DX}AKTG~ut747$8OXk~=zWrFV z8C#N6iVZ1S(%FuiJloOPjQsZPM%j$z*nQ>LdzEWbrmD5w)L;Wuw5ClZ_G0CRjH#0S zsI)o5yAEv34ih5PY)YHJX3wS!(q4DFvL}183VS9fn-W_pK)cSi#FnbTw&`MHaxeQb z2+{dAW`yx`Hs;Jc8xxz;*_n)Mfvq_QJ2Pu<#;`A=vNyZioU%7%gJN@r7h!LbB8_nq z#kPzp$L@?RZ!WMs1q@ z_XC}k?6u+#U!8f~sudN}?>ga5y?_4BX|+fDMuu6q&qF(Y+WN|-=D>{jJokQ9c?8HT7~!bJHzhzTa?n=!#1&9DDkH-utFauckJ?@y4sKrdBMx;x^tt zAHL^#0Za@KK<(E_w0K+ zHmw*jV$8U8+u!yu78(Qa#6Zp@0sKet1NoO8^9xDjL3d@%X9X zSsQpCo_ZPMJNk_L*C27iRnxvh^}G*_$5K7}e!uZ-{?ubPMnt^pA>Qi$D(P%HSMI6C zHNVvR;CYC@9!1 zR1uf@Oz*o!|N3q5l78zM@3&-=)DxifKr~7W_{HqEh$fz$oEg@ z`KBxIK}&zAZfQ4Fl&w~I`JmT=jdkb+_>;{>&+jaKp%`7j=?RRleeSfk1#BuqFc_trm9G|c+r<>&; z&dTQq{@`Q_K4Em9DE$p1BNNE!hOC^9q5H@O979i%9M1Ri#(CDjvp7le*O$G?b;w_m zFMr#Szn!udxto=}lDjG7Ya94UB0t-yCq?Qackwk#-e$-%Sy}6o?0@oqF9zTgyQ}cV z;9eg)=!VNaesRA(-^?p__4f|=Y}F_G9yRK&S+l`;V zo==&#;Qo2hskfA$Gj7)17o2takW&Y{)xc?UA9-ZS?C6O@&c0{S-Dj5%IraGCN?qgk z9(w5E1CA)2X&V}B{g4xnD?R3zeW<6d_)uNpN3WlB!*vgT_n0G(957(-D~!4Fa6LZE z-aOfu$=BLJhwJ_lW5z2#q^x18fVgq#$V0e2oCd}p&aXpGS$40UPkv}5j}JYZ1G3BHe$YM?vx`fQ z96&WrQMvZG=*{2Uao^I{0 z$Hv@n!jRL?JoiFj?aM;Lr|Z1uCh)~!XI~&}jz07BA%ja?E$-D-6_sPa{I8@85}rw%}M;gR#BF3^da*&ZnDx z+0>V3efizTOfM#VIWO@{@4VCxd%qtx{Xy9A1My`HHI_P6x8zt6X%NYmWBlm6^5mGK z=Z9Z056+)!f`74Q=skCoL@|x$QkO`o~+%Esy-bY<=lPe4hU_57I`} z%kP__@BP?}di-Z*TKya|KDyXk`^z`YX5Kx~^aC?+ZQ6{xdAj+;%kabS3^M}$e^1jB z=I%dRGcJrel=!1D^VgX--+0~By|UfZzWG;k@Zxo5_M%1RvghA6)2T-`+lxEiF*SGG zZAN{+(d^{eb&+~=$GnARHos5XY|Z6&&ofj0V9oxIy<{F<{Gj>zHfvV?XoYzK-u}m3 ze>G9syZtfTln=aMuHI?Q)%Q1;Ti~Bl?!3nw{;D+tfBl}h`P<(%=BMxC*h-t1fB!pk z>5Tgf297!S1!UH@?=bh?eW$tk-g;RX&N7EG*jT)Z*ART<^ivHvcpsY>%#9x%@u#*{(HZ~U+^1a z9(%=n3*28i^ZVxWzq96w8TID3Z@p`N`N#LnU3bhd<`gup9JZVmyP)q-~HmB z#ym%wyN+>q(<}hCr4KGb4?sKm8R`CC8T0I)STEmT%)=YaCtu{7Ut6=7a*NcD1=JOL zfjW8rdtHCfAtxL;ZN$K%D$%s-FQ2|&$)Qt5 zUUT;u7wMh~4&H0*UKdu68+X8`reA)>Bx5c; z_4*Oll%H_IDcA3HMv=JMSFV{>d)XH*JA3%R>#q_3w|wI8OGe+Y_sOHKIUdo(b=v-y zec^^P2b}el!S0qnmmYn@mrgq0zw45Vly?m@W(%OLQNo8h9p0#P`|V!x@AXbeW%Z4| z6+|bK#*_M(LHy<0qh0p@)gNMqityP6i6?3%hA2%uku4rslj(m>puPNpKr}cpQ2u`^ zLV&$mFcWKHi3_p#?JTiUmbfNMypkoR$r1-;0}}(u(3D^$ayuTpi`bXTBEnkqZ(YG@e`^82!rEH`%X+ujIEHPk~aZ80J1;fOG{oDHj9s}5T z7Qdr|A3v)lcFdZY2}?YdC7#9-8)J#Tvc&sXVuUO)WR|!yOYE4%Z*GaRvgLCV79VGi ziP#()Y>Zplvh*WPEK=#eV@w#^3gYK1ep3fOaYL4PH%mO5B^JyQFJ-X-Ek18cJennb z$r1+#&SREXG>hNe67vJjGq!AbTaU04CuFfDEq-oGY?ZCiI8F+vA5q2wrupG6XtRiU znifv5F)cQy#U2Lsq-7n!67yx%Ht}DUm^GVRp0LE;Sz`Ju@p6`UGaG)}>tET%j16q> z8TYD#I53M{Z}H<>;>Ij-Wwv^5%m(Xf+M&g=57Pr^J_7t!w1aQj;-|L6*I9fR7N3N} zyZS&JmnE*tCYjS_25D8=5+7&7z(hQjEnSy!a1oc)BmVVV@CSe!zlFn#>My14@>T7c z8yUu->R;^x@TUbo-`b9j4mSqGl{wf%GlHGiGfOO(WsSh`B;pJ$aebDx4o3^b6xtyD z$6sQ5f}el>xeVHO{E)fiXkTMMe3~Uj&JsUp z6YJV7@oR2QoJsJRy#6MbM@obS&`k_zQ6F!@kj4;vy|;Tekn&jMs;0 zdo~WxOeOJ$ju#RuXvOncukh%IK8ThyAH10U1xyK#jx-lEpL^;<6(xLF&T7-**tyX8y3Uqqay!>#ZvScPZ7 zg+I%sf<9!&!XJ;&jF7EpO<8=34#w{EJV&?} z&nkdjaQm>s*TmbzBiwwR);k@s-r2zzSkaAmkCNygzo8{o)Z#mIebamCLHI@89MN14 z)T0a0CUMDDv>?0^1MGODaPB9~TOar0H==oclcO0QZsep7H?hqI zfWtP?yYMNRVV%*zP4n&&{Cej2D)`s@72ffAd*ckh5F8botxZ7RfZF9^NGvhAwi4Wz z(LbN&3t-RUTR0~cyfZavF2hr&^{g)ebD3ar7x>n1^+og}n#s)v@E?QMR3U%+Q>Tv~ zjXANuA9$%>(m}){dxhPHTlFh7rd(bzt3mLGyC6RAhIs6BWEK38`I}hVW-FE?Z5gR@ znU~7>O}v9;-NF)QpR2bBoaJB5^rK;8$~I6(13VxhzAHM+yQ($=f2$JX=Ht8z+}ZjC zyV@cZEou`Dv9M8iLHlK4Y*84=IgDcu71rzuDW6rH?$AbMSVjfp*KD z6ycvhqOMo0K9XdA%AUgy?!)WFRfyu;jy)sTJ^obyyWbK#qJ(kDh@KJ~Jh~&+-)mDa z=i#Qe-|VB2oxq}E*9#k}ofxG(s>9Vir_Huwqv%SY-wAej7K@U*zZjp0_%87=?pys~ zeRGf7Wv`C#PheEn3;0v)>)GRa*!z>CfjBy~sA{L-J1)4SEx zq5pQlPb`2*{N^C>yTZ0Jb&Sz_0r=)h5U1FG*G<&KSGZ80&70Zl7o_ok}*n7 z=5$!`KV7(lY@!95%Mu|4OM3n#=Sdm*7j9+s^+8?wj*qXOCWITYJR++ieJa zomj{oX%zjfqrYJHb&njbv-r+~+vzRNKFV136n44Ti{|K?eQ}Hl_5wNk;;i%||6+e! zr*5hC)UF%*-sghmF0md3ywfLC_;R#z5i+>Z*I9dm8@x$x%}F@Xt&azqq8Et${6&QQu!TnI#mwe^hfrD^xQ1YoqdhHBD+;KpzJC6 z&}5@z)w2TN*?Z{OTWf*8yWWid&dn=-EP5CZ*?Q1O9>=dQa@MXY=x{v%NG1z4bvfl{Xg5 zS&NThkNl#HL980zva8#N+tGWr-7M^~VMRCcH~6^k?sIVP!(;P(4sHz8hqWZvhb(Oh zUmA0N9NfIsCv zAJLTHm)~0b?dmgO40`HAwjadiJDvmXck92(hhM*;Bl+Vp{ae9_;Ld|x?fZ1&<6b_s zeA>y;PZs_f!Ou838e-gXW1xC{I_ly#N#h@2&1P0O0~~uqHwArYjMuQ=ItROaH9qW) z-{j$5I2P^rv|j*!+M5Hr^;`LKL30}X%O6GjeXsUVcX)fcXB-0RL-G2IWxu@h+xW2O za1U(4eLn5@emCFern$`?_nfc1i@#Q5AX%buAoa&*CD>ubza*_i($ym#*tI&Zo3 zi{LX!$IInM6Fh>eC)&w}Uuzj%;HUqBKQ{)@rRG=lGS>U*BPn42Q1sp%=I-~{=tZ0% z5R;7NtOQ#vxS$)KcJgW8hhOxg_dfg@vz*@?Uc|W#mh&LQ+b#HsQun{aXS&0;^ zW${I^g!&Oi-{fopw>FkfI|cC5S2qV3FV20ioDIRcBfN1ga4(1^kU1X-&Ue=z#-o(| zH<8$!Xh#ftHin)V!}lKBp0+Xkz0w`n|6)V*FSHpSIAa#VcPf4$T7*s_z}=%Ryt{Tk zig%Lj;4(m8Vx%Og-Sta-!#AU6oQDzP42%Hje>tu{ia!6RPQ?o8B4^uy^7jp!8_0>Y za~lzMkq_j4CwV{eE#!T(dH(*>H9RL|l=x4sq1k+3x14>R?!BKYu1V#|w`B7*%KK)Y zyPWM3F7LO+%X9lryX`mipZoh%`)12`t#1pr`R)1l>L1~%d%O=76bNaZ`%l*Zw(hrh zc(Nc)c(Wk%Hsw|uI+W|`%#Wp-L8M`%T%1-BH~+bIiveP~iWFmnewkuFE^$$TO!38` zW@4RcSR?9>kGYCCh)9sQCsL9)D7}mGJIwP+Vog4@oTJ?m*6LI8i^!kPUSDEmu&*28 z?Z_kiW43e>YdM#PZ5c64k^wPf0sA8@dns)Q|1E2A8P=s0FVmy1tGCYcT@l};v_`F% zD)ty#tW=|5=hiN?R)cTRTbpGZTwDnE?3pDt2Olc9K(BDI2-0!$+t+XP zT{@ub?=I`#Yr%nvCu)h|p^lM8LcVW}zvf@r5_}KzMfI~6*|HzlYPE{} z#jfwNzjAH+wyX2wc>W^x;A;*StYu(Bw7I_1Z>{I+QZ9G|gVrxgklAw z@$Iq4tkZYV-G7wzT`(s*@^P=<;I){sZWHYVq1Pbsd5VLpqQ51+pB-Nld*EH$?1^^k zTw1S_PlhKVK^J7|?!OZ)+o3hhR^APC&AsBEbqvl~aJc0x0nLd5xkCE^ z$q!we#n9{84d-KMovaZ5*r=S7!MKS|@YQ!&qhanr%evT`=+!I={7;>-eX9c5K>1{gBpPk!5+pRk+t z25kG8#CA^!RdlC6`6f9JB5#eMvt8$l7C&2yuHj8{2ZzR*a}g}(9Jq_K89IHWzK>V9 z%&kMUTV!#%d)xkfVo5B{Ss~f}(!O|@@8`u2BHk(#9}UXt2N8Z>9=I5pvMFoDfX7-U=&TFxp#gfCnbaCmzoPA?Cm&dY4 zUG07(ely0f#QBNlMC164+DIucMcVL>HsEWL59veU`h#%r|LS{&&s{rBKf8sKzt-SF zAo*uc_~%dbn~wV-n{>{Ecm72FU*pc7(7S$HvI*aZ&Y&2$i-g~2sB>9N?_=$jetxs| zSd)ML#31gB8NaW~cKfI7K z4H0Ljmmit&PL)) z4B~GyZVyTj-@9*@=j=lGqtK#g!9Z!8sA=d|nI; z=Uv+nI)`7s_`i5>j`t%gIWxqDCj|=P5lW6KDTSwY$kuZ9Ww-d_P$OeNKUAlW8}W9@ zzMNg>*2CcK^)6<(iymHjY-ySN1%h4nn{UI(whdrY^{4NW;hc+M6%j2zzH|pCGu9zD za=L@JPRN)i^T!w7R?ZpV&FG+kq#L<4TFK-5b!>DK z&Tdi6QcjnLheo8Icj{}Mx*O+xI6Y7MrtkrD2#=Bn9ncZyeR%p-F4n?}QQ(Xi(NoUW zLjP#)DUO%(UmUEQMIzlgr`vn#f;o}n0g3^W&qfz#;&j1_k0bmIIa?3891*T_@gvfYg;!{y89En^ znrQ?3Dh|!YfjuMGIftbO*xRhem-=(#g?z5yoSy=_#p#03H|MyxOLeA5x;WRx)AwcT zxY!(@=Gtu~a}0k?7v4&IXG(sMT>OpZ40US`xi}%}lWmYBcm5FGx%Rc+LVeA%3E=Ss zta{9Hqw?elC&ONV8i-tNQZ}ywsE$RE!hlSvasjtuHtcpb^~~1ogBO* zfpNF86kkITx>qyjAz98ma(>Z#-PG03bG5C#ck)9Duh3xpUx_(UtN}crgY$=SdcSZK zB307|`C2*K$r7WOLRbFKYy0%2N;nnX;Aml3KSk%JWY11vrKijJDLP9<&q!-1qqK!ZDkYtv;?7T@PEgtH{FFhiv%~iO==;o` ziQ>TJ)!`aqmjlFS1WByBwAWnBvrDQAe6{%y!F#H!W=1pG*I5Cr$rh0ZNc16lsd`2v zjo-V+{i^(*9@Q1vSE9MQ-m~2lkD+g+vnYtKg@OShBS_ zrZt$rI{HrEoE)Ql^z9t4#+MN3ufBmd=WAgMqu@-q(|(^2eAB%XZuzzdpC5FP!yogx zxMo2^#*e)dj}>nhUstZNbh=npUxJP@to`N2Pk6*0uBpUFt~DO{CVbv1-;n$Oo*x9B zhmOxVtv%8p|F=g?urZO5Uqfw+_N0r8mKE29u9u;&yX9&0r34un#qREiEGGsXoh&pr pmV&;cJpZ@b!t~7SWIcOJKi1M&KcC*GGj%^dMDJ8aW%Z4|{clt#hgSdq literal 0 HcmV?d00001 diff --git a/cplcore/Icons/VDInfo.ico b/cplcore/Icons/VDInfo.ico new file mode 100644 index 0000000000000000000000000000000000000000..1fbe0dec8e83835c0eff3c461c9272843dbf37a6 GIT binary patch literal 6518 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 literal 0 HcmV?d00001 diff --git a/cplcore/amd64/imdisk.exp b/cplcore/amd64/imdisk.exp index 3b8479d3c85f3d4c0b113f1b657732b15990c532..aacbd82d1c305770ec422738414e31beaaa81938 100644 GIT binary patch literal 8408 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 diff --git a/cplcore/amd64/imdisk.lib b/cplcore/amd64/imdisk.lib index 7ba8c6514d4048f17b204cca6c3d5a9b39ab3c01..d65e6bcec9608ba82d0a12f1e2bf2a375891451a 100644 GIT binary patch literal 14276 zcmcgyOK)677Cw0}Atr=8m`sMe+KwIDvEyfVJ3-ONub5c)h1(>EjcMH1aSz>nt?p}2 z9BG&hLI{o6%r48(C<}f7%8~^_EV4joma{-vAQoA(K+!N?b=_OHp4Z)UGgmskx9gl! zUp-Eps&mSnH}lnvtv_`Pr_^UOJD$moOx&0lQOl#B4 zX!tRw!EGW&nNK-ot3-^(-{my&kciRcuR~hH8`Rm&ssB6?qrOL+hTb7!bm==z*@LJL z)bk0a&d;C+y7H7$`g0;iqsK$~2yaj~>Z{Xryg}nnIQ6B01M2;XQ_oMR7j*3zr_Sf7 zA2b@$*bhW?3h)MH&T{HG13l2h9ZthHF&?0yZ#WI2K1Ns3t~#OpS3&95ISm{pVsx#< zY2ZWr2K8gC7!CZ)X=D)N2g?4)sTX*RQeT908*k7R)WfI?<5DNgN!RxJ`uyU`^6J|9 z?5*6)>io*u^6GlATqxE)p!M~ow-**nKK+dgaQ52mx0l{rpPgEpqWSVH^yX_TRe!^) z)ozu%-F)B`P*JhGz3$@j@;AI-)w@@$1=YQ&oxor4^MzS&w}^Ta^#n0q&#G7UcfF{p zoEHSe%00CXhX~it<@eFH3UJ-!ZLhNGZC1V7)~#Ky5-2SW&TlgqVc{K~FZ4Hl-S*8G{_dx1shvQP5qNf^DlKv^lWu_@$k)mn%N-bR~(yk){fN-l+xi z<@`Nwu2?d4Y<#ZCCST|&I4Xxr-?|@omC%e8VTHkEXSVVcG^do;j8!h@k{Iv}7&tR? zzCx6$O)l4RDkuytyW|JO%{|UoK@YHk6bu_**34~rrP6E_cD;c0=T$Arh6vZ6se14j zyj!>KD|#Bsly^#pHuBbvSKYIWm|V_lg*9=x1^6Sa89L9Rp)^F14_h)Ro^rvB1S z`F(Bf9F7 z9OR3Y+I((#E@$z~hOE+5Ni_1prJdRqj$8%*FN-*>;xM2d z6Xz^^j)4VU^GjZ+byvaBc{UBT6RO4(H6MkIiYN?W3|%}&G<$*Q0b;So!$jMN4L;2f zRkK9zjuSl`A^Q3<(Hf|`ljwXu(W5@1cZP_*yF_#la-Z}NeFomsD@30o7CJsk^bzP$ zH_>&_6V#K2&R4xeKSB1{HKON`e-4=+#)tyYSzw+4@6H6#O|;`1)c*`^Ier!OgI-6y zhX;sC(ESkahiJ#ocn_j|KcWqHQ1=%pqT8Sn+VQjteE}iNq!W~(G##VUbcwFh1ieHZ z^hY{N-E@jBP?lb$aXL@u=s3Mh!_-e#X^@6!gkGRNx<(i273!rcbeKlzD4n4{P>Q;! zlU}6PXn=lCm+5zOl8(?A_0R!2_&PJi58>O2!Ub+ zgC+K2J}%JK-ML^WyM?J|Wy{S{1RC9oOmuBCK#Qa3S`XBPu4UIW+iwvv8W|m4Ma@Pm z=R69T46O-fo`R!THZ@lm-gF?u5#$4{bQU$4^-bDR%um)aLrFUDVl%3-9+E84pX2Dv zi=(L*i4~4!i+&RlCFWs3IZOYVoRoYTvw2U2AD<_by<735vV!oZa-r;1)$-)nOF29w z9R-Yoh2m`$$fR_T7euCWzA?5e{mWHwq6i`-=rUK~HTq=bLh1fr#`dwEUF;>KNl zw1_&o5cz!#OY;6Q$8`0|RGMsS1I_(F#!z+znPKh?3b&zDnvo5Yt8nZVE)gTJll2`r z8D;;FE0%W=xm?>zRF)$%Y3wVeR%CKwcacTZJx1pwt2%s#vg^2RHTY%6(8hL&M`ruo ziluKv_havM6h1yg|MdQv?>In+F8DK4@ZR6K*PRQ0(j-3q9{mX4lXPNws94Ac`EEo~ z{CO3xC!p{7PdbG6B#nF-${}Ln&oR9I3;Le_tpA;))RzbGbrSIodphDy_0s7RM^N-_ zok4YhqxVlO7B{MX&EE`CeXISch54m7L%#B2Sgak45Y5%UPT=ng^{*HNE#2_T+i2?1 z`~RR{evvgGiWrMg)ZRC5nPFpVYwUVj8a2MQ{sV-hQA=1`$WZWytxdMJAj^T2PHHD)HlVNJ1{e6~IdA2Yv&^bMZFVLWR)S4(TW>Dd%ZKtp9Vb09{Q zPV23pWg@q%p&?BM`w@MN(WXd(i$5E))O6N9qOSq%kU$fGMO?iE+8|QoNVI;jQ9LY= zs416Bzx{%mj#!>o8pTNf!<%}Z7^gj+F)^w}U@ zv^8mXUBEl0;Yp!&D~Ji>`LaM%;`LV0684DW0?n2LkU*RFHwmb(#Hg0kLQAL_yT`eV zxjYf08VQS5Fq3w}lLAvtgS3K{8MXJ2otsa|Xi{>eCAOMWBjeoo{%mZ7lW_Y4u6*avrdY?Z2e9a>--=tm2#LGb^h!<2 zbX>I~@_YGKFcW$?pkOLjHZ33~MID0zQN9O~z?%2Cj>%?tcIh5YGSr literal 13822 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 Gxc>oDJ9;Gm diff --git a/cplcore/cplcore.inf b/cplcore/cplcore.inf new file mode 100644 index 0000000..fabaf8b --- /dev/null +++ b/cplcore/cplcore.inf @@ -0,0 +1,54 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 10/26/2021,2.1.0.00070 +CatalogFile = cplcore.cat + + +[SourceDisksNames] +1 = "ImDisk Virtual Disk Driver API library" + + +[SourceDisksFiles.x86] +imdisk.cpl = 1, i386 + +[SourceDisksFiles.ia64] +imdisk.cpl = 1, ia64 + +[SourceDisksFiles.amd64] +imdisk.cpl = 1, amd64 + +[SourceDisksFiles.arm] +imdisk.cpl = 1, arm + +[SourceDisksFiles.arm64] +imdisk.cpl = 1, arm64 + +[DestinationDirs] +ImDiskCplExeFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = ImDiskCplExeFiles + + +[ImDiskCplExeFiles] +imdisk.cpl + + +[DefaultInstall.ntx86.Services] +AddService = ImDiskCpl, , ImDiskCpl + + +[ImDiskCpl] +DisplayName = "ImDisk Virtual Disk Driver API library" +StartType = 2 +ServiceType = 16 +ErrorControl = 0 +ServiceBinary = %11%\imdisk.cpl diff --git a/cplcore/cplcore.vcxproj b/cplcore/cplcore.vcxproj index 474fd4d..d036a2c 100644 --- a/cplcore/cplcore.vcxproj +++ b/cplcore/cplcore.vcxproj @@ -355,16 +355,21 @@ - + + + + - + + + diff --git a/cplcore/drvio.c b/cplcore/drvio.c index fea242f..ebcf076 100644 --- a/cplcore/drvio.c +++ b/cplcore/drvio.c @@ -1,7 +1,7 @@ /* API library for the ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2007-2018 Olof Lagerkvist. +Copyright (C) 2007-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -54,7 +54,7 @@ typedef struct _KNOWN_FORMAT { LPCWSTR Extension; LONGLONG Offset; -} KNOWN_FORMAT, *PKNOWN_FORMAT; +} KNOWN_FORMAT, * PKNOWN_FORMAT; KNOWN_FORMAT KnownFormats[] = { { L"nrg", 600 << 9 }, @@ -67,7 +67,7 @@ ImDiskFlushWindowMessages(HWND hWnd) { #ifndef CORE_BUILD MSG msg; - + while (PeekMessage(&msg, hWnd, 0, 0, PM_REMOVE)) { if (!IsDialogMessage(hWnd, &msg)) @@ -99,6 +99,25 @@ ImDiskAllocPrintF(LPCWSTR lpMessage, ...) return lpBuf; } +IMDISK_API LPSTR +CDECL +ImDiskAllocPrintFA(LPCSTR lpMessage, ...) +{ + va_list param_list; + LPSTR lpBuf = NULL; + + va_start(param_list, lpMessage); + + if (!FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_STRING, lpMessage, 0, 0, + (LPSTR)&lpBuf, 0, ¶m_list)) + { + return NULL; + } + + return lpBuf; +} + ULONGLONG APIFlags; IMDISK_API ULONGLONG @@ -200,8 +219,8 @@ MsgBoxLastError(HWND hWnd, LPCWSTR Prefix) IMDISK_API VOID WINAPI ImDiskGetPartitionTypeName(IN BYTE PartitionType, -IN OUT LPWSTR Name, -IN DWORD NameSize) + IN OUT LPWSTR Name, + IN DWORD NameSize) { LPWSTR name; WCHAR other_type[] = L"Type XXh"; @@ -278,7 +297,7 @@ IN DWORD NameSize) IMDISK_API BOOL WINAPI ImDiskGetOffsetByFileExt(IN LPCWSTR ImageFile, -IN OUT PLARGE_INTEGER Offset) + IN OUT PLARGE_INTEGER Offset) { LPCWSTR path_sep; PKNOWN_FORMAT known_format; @@ -299,12 +318,14 @@ IN OUT PLARGE_INTEGER Offset) for (known_format = KnownFormats; known_format < KnownFormats + _countof(KnownFormats); - known_format++) + known_format++) + { if (_wcsicmp(ImageFile, known_format->Extension) == 0) { Offset->QuadPart = known_format->Offset; return TRUE; } + } return FALSE; } @@ -406,7 +427,7 @@ ImDiskGetPartitionInformation(IN LPCWSTR ImageFile, return bResult; } -typedef BOOL(WINAPI *ImDiskReadFileProc)(IN HANDLE Handle, +typedef BOOL(WINAPI* ImDiskReadFileProc)(IN HANDLE Handle, IN OUT LPVOID Buffer, IN LARGE_INTEGER Offset, IN DWORD NumberOfBytesToRead, @@ -415,15 +436,17 @@ typedef BOOL(WINAPI *ImDiskReadFileProc)(IN HANDLE Handle, IMDISK_API BOOL WINAPI ImDiskReadFileHandle(IN HANDLE Handle, -IN OUT LPVOID Buffer, -IN LARGE_INTEGER Offset, -IN DWORD NumberOfBytesToRead, -IN OUT LPDWORD NumberOfBytesRead) + IN OUT LPVOID Buffer, + IN LARGE_INTEGER Offset, + IN DWORD NumberOfBytesToRead, + IN OUT LPDWORD NumberOfBytesRead) { if (SetFilePointer(Handle, Offset.LowPart, &Offset.HighPart, - FILE_BEGIN) == INVALID_SET_FILE_POINTER) - if (GetLastError() != NO_ERROR) - return FALSE; + FILE_BEGIN) == INVALID_SET_FILE_POINTER && + GetLastError() != NO_ERROR) + { + return FALSE; + } return ReadFile(Handle, Buffer, @@ -613,7 +636,7 @@ typedef struct _IMDISKGETPARTITIONINFOINDIRECTEX_DATA { PPARTITION_INFORMATION Next; DWORD Count; -} IMDISKGETPARTITIONINFOINDIRECTEX_DATA, *PIMDISKGETPARTITIONINFOINDIRECTEX_DATA; +} IMDISKGETPARTITIONINFOINDIRECTEX_DATA, * PIMDISKGETPARTITIONINFOINDIRECTEX_DATA; BOOL CALLBACK GotPartInfoForArray(LPVOID UserData, PPARTITION_INFORMATION PartitionInformation) @@ -696,11 +719,11 @@ ImDiskGetSinglePartitionInfoIndirect(IN HANDLE Handle, IMDISK_API BOOL WINAPI ImDiskGetPartitionInfoIndirect(IN HANDLE Handle, -IN ImDiskReadFileProc ReadFileProc, -IN DWORD SectorSize OPTIONAL, -IN PLARGE_INTEGER Offset OPTIONAL, -IN OUT PPARTITION_INFORMATION -PartitionInformation) + IN ImDiskReadFileProc ReadFileProc, + IN DWORD SectorSize OPTIONAL, + IN PLARGE_INTEGER Offset OPTIONAL, + IN OUT PPARTITION_INFORMATION + PartitionInformation) { LPBYTE buffer = NULL; DWORD read_size = 0; @@ -802,7 +825,7 @@ PartitionInformation) IMDISK_API BOOL WINAPI ImDiskImageContainsISOFS(IN LPCWSTR ImageFile, -IN PLARGE_INTEGER Offset OPTIONAL) + IN PLARGE_INTEGER Offset OPTIONAL) { HANDLE hImageFile; BOOL bResult; @@ -829,8 +852,8 @@ IN PLARGE_INTEGER Offset OPTIONAL) IMDISK_API BOOL WINAPI ImDiskImageContainsISOFSIndirect(IN HANDLE Handle, -IN ImDiskReadFileProc ReadFileProc, -IN PLARGE_INTEGER Offset OPTIONAL) + IN ImDiskReadFileProc ReadFileProc, + IN PLARGE_INTEGER Offset OPTIONAL) { const char magic[] = { 0x01, 'C', 'D', '0', '0', '1', 0x01 }; char buffer[sizeof(magic)]; @@ -922,7 +945,7 @@ typedef struct _REPARSE_DATA_JUNCTION WORD DisplayNameOffset; WORD DisplayNameLength; BYTE Data[65536]; -} REPARSE_DATA_JUNCTION, *PREPARSE_DATA_JUNCTION; +} REPARSE_DATA_JUNCTION, * PREPARSE_DATA_JUNCTION; IMDISK_API BOOL WINAPI @@ -939,8 +962,14 @@ ImDiskCreateMountPoint(LPCWSTR MountPoint, LPCWSTR Target) FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer) + iSize + 2 + iSize + 2; - if ((wcslen(MountPoint) == 2) && - (MountPoint[1] == L':')) + if (MountPoint == NULL || MountPoint[0] == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((wcscmp(MountPoint + 1, L":") == 0 || + wcscmp(MountPoint + 1, L":\\") == 0)) { WCHAR GlobalMountPoint[] = L"Global\\ :"; DWORD ddd_flags = DDD_RAW_TARGET_PATH; @@ -953,7 +982,7 @@ ImDiskCreateMountPoint(LPCWSTR MountPoint, LPCWSTR Target) ddd_flags |= DDD_NO_BROADCAST_SYSTEM; } -#ifdef _WIN64 +#ifndef _M_IX86 if (DefineDosDevice(ddd_flags, GlobalMountPoint, Target)) return TRUE; @@ -987,20 +1016,20 @@ ImDiskCreateMountPoint(LPCWSTR MountPoint, LPCWSTR Target) if (hDir == INVALID_HANDLE_VALUE) return FALSE; - if ((iSize + 6 > MAXIMUM_REPARSE_DATA_BUFFER_SIZE) | (iSize == 0)) + if ((iSize + 6 > MAXIMUM_REPARSE_DATA_BUFFER_SIZE) || (iSize == 0)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - ReparseData = HeapAlloc(GetProcessHeap(), + ReparseData = (PREPARSE_DATA_BUFFER)HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, buffer_size); __analysis_assume(ReparseData != NULL); ReparseData->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; - + ReparseData->ReparseDataLength = data_length; ReparseData->MountPointReparseBuffer.SubstituteNameLength = (WORD)iSize; @@ -1043,8 +1072,14 @@ ImDiskRemoveMountPoint(LPCWSTR MountPoint) HANDLE hDir; DWORD dw; - if (((wcslen(MountPoint) == 2) && MountPoint[1] == ':') || - ((wcslen(MountPoint) == 3) && (wcscmp(MountPoint + 1, L":\\") == 0))) + if (MountPoint == NULL || MountPoint[0] == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((wcscmp(MountPoint + 1, L":") == 0 || + wcscmp(MountPoint + 1, L":\\") == 0)) { DWORD_PTR dwp; DEV_BROADCAST_VOLUME dev_broadcast_volume = { @@ -1070,7 +1105,7 @@ ImDiskRemoveMountPoint(LPCWSTR MountPoint) SHChangeNotify(SHCNE_DRIVEREMOVED, SHCNF_PATH, MountPoint, NULL); #endif } -#ifndef _WIN64 +#ifdef _M_IX86 else if (!IMDISK_GTE_WIN2K()) { } @@ -1218,7 +1253,7 @@ ImDiskOpenDeviceByMountPoint(LPCWSTR MountPoint, DWORD AccessMode) if ((MountPoint[0] != 0) && ((wcscmp(MountPoint + 1, L":") == 0) || - (wcscmp(MountPoint + 1, L":\\") == 0))) + (wcscmp(MountPoint + 1, L":\\") == 0))) { DriveLetterPath[12] = MountPoint[0]; @@ -1248,7 +1283,7 @@ ImDiskOpenDeviceByMountPoint(LPCWSTR MountPoint, DWORD AccessMode) if (hDir == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; - ReparseData = HeapAlloc(GetProcessHeap(), + ReparseData = (PREPARSE_DATA_BUFFER)HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, buffer_size); @@ -1275,14 +1310,14 @@ ImDiskOpenDeviceByMountPoint(LPCWSTR MountPoint, DWORD AccessMode) DeviceName.Length = ReparseData->MountPointReparseBuffer.SubstituteNameLength; - + DeviceName.Buffer = (PWSTR) ((PUCHAR)ReparseData->MountPointReparseBuffer.PathBuffer + - ReparseData->MountPointReparseBuffer.SubstituteNameOffset); - + ReparseData->MountPointReparseBuffer.SubstituteNameOffset); + DeviceName.MaximumLength = DeviceName.Length; } - + if (DeviceName.Buffer[(DeviceName.Length >> 1) - 1] == L'\\') { DeviceName.Buffer[(DeviceName.Length >> 1) - 1] = 0; @@ -1309,7 +1344,9 @@ ImDiskCheckDriverVersion(HANDLE Device) NULL, 0, &VersionCheck, sizeof VersionCheck, &BytesReturned, NULL)) + { return FALSE; + } SetLastError(NO_ERROR); @@ -1325,7 +1362,7 @@ ImDiskCheckDriverVersion(HANDLE Device) IMDISK_API BOOL WINAPI ImDiskGetVersion(PULONG LibraryVersion, -PULONG DriverVersion) + PULONG DriverVersion) { if (LibraryVersion != NULL) *LibraryVersion = IMDISK_VERSION; @@ -1380,9 +1417,14 @@ ImDiskFindFreeDriveLetter() { DWORD logical_drives = GetLogicalDrives(); WCHAR search; + for (search = L'D'; search <= L'Z'; search++) + { if ((logical_drives & (1 << (search - L'A'))) == 0) + { return search; + } + } return 0; } @@ -1420,7 +1462,7 @@ ImDiskGetDeviceList() IMDISK_API BOOL WINAPI ImDiskGetDeviceListEx(IN ULONG ListLength, -OUT ULONG *DeviceList) + OUT ULONG* DeviceList) { UNICODE_STRING file_name; HANDLE driver; @@ -1446,7 +1488,7 @@ OUT ULONG *DeviceList) NtClose(driver); - if ((dw == sizeof(ULONG)) & + if ((dw == sizeof(ULONG)) && (*DeviceList > 0)) { SetLastError(ERROR_MORE_DATA); @@ -1460,8 +1502,8 @@ OUT ULONG *DeviceList) IMDISK_API BOOL WINAPI ImDiskQueryDevice(DWORD DeviceNumber, -PIMDISK_CREATE_DATA CreateData, -ULONG CreateDataSize) + PIMDISK_CREATE_DATA CreateData, + ULONG CreateDataSize) { HANDLE device = ImDiskOpenDeviceByNumber(DeviceNumber, FILE_READ_ATTRIBUTES); DWORD dw; @@ -1495,12 +1537,12 @@ ULONG CreateDataSize) IMDISK_API BOOL WINAPI ImDiskCreateDevice(HWND hWnd, -PDISK_GEOMETRY DiskGeometry, -PLARGE_INTEGER ImageOffset, -DWORD Flags, -LPCWSTR FileName, -BOOL NativePath, -LPWSTR MountPoint) + PDISK_GEOMETRY DiskGeometry, + PLARGE_INTEGER ImageOffset, + DWORD Flags, + LPCWSTR FileName, + BOOL NativePath, + LPWSTR MountPoint) { return ImDiskCreateDeviceEx(hWnd, NULL, @@ -1515,13 +1557,13 @@ LPWSTR MountPoint) IMDISK_API BOOL WINAPI ImDiskCreateDeviceEx(HWND hWnd, -LPDWORD DeviceNumber, -PDISK_GEOMETRY DiskGeometry, -PLARGE_INTEGER ImageOffset, -DWORD Flags, -LPCWSTR FileName, -BOOL NativePath, -LPWSTR MountPoint) + LPDWORD DeviceNumber, + PDISK_GEOMETRY DiskGeometry, + PLARGE_INTEGER ImageOffset, + DWORD Flags, + LPCWSTR FileName, + BOOL NativePath, + LPWSTR MountPoint) { PIMDISK_CREATE_DATA create_data; UNICODE_STRING file_name; @@ -1554,37 +1596,49 @@ LPWSTR MountPoint) if (!ImDiskStartService(IMDISK_DRIVER_NAME)) switch (GetLastError()) - { + { case ERROR_SERVICE_DOES_NOT_EXIST: if (hWnd != NULL) + { MessageBox(hWnd, - L"The ImDisk Virtual Disk Driver is not installed. " - L"Please re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The ImDisk Virtual Disk Driver is not installed. " + L"Please re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; case ERROR_PATH_NOT_FOUND: case ERROR_FILE_NOT_FOUND: if (hWnd != NULL) + { MessageBox(hWnd, - L"Cannot load imdisk.sys. " - L"Please re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"Cannot load imdisk.sys. " + L"Please re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; case ERROR_SERVICE_DISABLED: if (hWnd != NULL) + { MessageBox(hWnd, - L"The ImDisk Virtual Disk Driver is disabled.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The ImDisk Virtual Disk Driver is disabled.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; default: if (hWnd != NULL) + { MsgBoxLastError(hWnd, - L"Error loading ImDisk Virtual Disk Driver:"); + L"Error loading ImDisk Virtual Disk Driver:"); + } + return FALSE; - } + } ImDiskFlushWindowMessages(NULL); @@ -1595,24 +1649,27 @@ LPWSTR MountPoint) if (!ImDiskCheckDriverVersion(driver)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, - L"The version of the ImDisk Virtual Disk Driver " - L"(imdisk.sys) installed on this system does not match " - L"the version of this control program. Please reinstall " - L"ImDisk to make sure that all components of it on this " - L"system are from the same install package. You may have " - L"to restart your computer if you still see this message " - L"after reinstalling.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The version of the ImDisk Virtual Disk Driver " + L"(imdisk.sys) installed on this system does not match " + L"the version of this control program. Please reinstall " + L"ImDisk to make sure that all components of it on this " + L"system are from the same install package. You may have " + L"to restart your computer if you still see this message " + L"after reinstalling.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } SetLastError(ERROR_INVALID_FUNCTION); return FALSE; } // Physical memory allocation requires the AWEAlloc driver. - if (((IMDISK_TYPE(Flags) == IMDISK_TYPE_FILE) | - (IMDISK_TYPE(Flags) == 0)) & + if (((IMDISK_TYPE(Flags) == IMDISK_TYPE_FILE) || + (IMDISK_TYPE(Flags) == 0)) && (IMDISK_FILE_TYPE(Flags) == IMDISK_FILE_TYPE_AWEALLOC)) { HANDLE awealloc; @@ -1643,26 +1700,35 @@ LPWSTR MountPoint) { case ERROR_SERVICE_DOES_NOT_EXIST: if (hWnd != NULL) + { MessageBox(hWnd, - L"The AWEAlloc driver is not installed. Please " - L"re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The AWEAlloc driver is not installed. Please " + L"re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + break; case ERROR_PATH_NOT_FOUND: case ERROR_FILE_NOT_FOUND: if (hWnd != NULL) + { MessageBox(hWnd, - L"Cannot load the AWEAlloc driver. Please " - L"re-install ImDisk.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"Cannot load the AWEAlloc driver. Please " + L"re-install ImDisk.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + break; case ERROR_SERVICE_DISABLED: if (hWnd != NULL) + { MessageBox(hWnd, - L"The AWEAlloc driver is disabled.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"The AWEAlloc driver is disabled.", + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + break; default: @@ -1675,93 +1741,119 @@ LPWSTR MountPoint) } } // Proxy reconnection types requires the user mode service. - else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) & - ((IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_TCP) | - (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_COMM))) + else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) && + ((IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_TCP) || + (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_COMM))) { - if (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0)) - if (GetLastError() == ERROR_FILE_NOT_FOUND) - if (ImDiskStartService(IMDPROXY_SVC)) + if (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0) && + GetLastError() == ERROR_FILE_NOT_FOUND) + { + if (ImDiskStartService(IMDPROXY_SVC)) + { + while (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0)) { - while (!WaitNamedPipe(IMDPROXY_SVC_PIPE_DOSDEV_NAME, 0)) - if (GetLastError() == ERROR_FILE_NOT_FOUND) - Sleep(500); - else - break; + if (GetLastError() == ERROR_FILE_NOT_FOUND) + Sleep(500); + else + break; + } - if (hWnd != NULL) - SetWindowText - (hWnd, + if (hWnd != NULL) + { + SetWindowText(hWnd, L"ImDisk Virtual Disk Driver Helper Service started."); } - else + } + else + { + switch (GetLastError()) { - switch (GetLastError()) + case ERROR_SERVICE_DOES_NOT_EXIST: + if (hWnd != NULL) { - case ERROR_SERVICE_DOES_NOT_EXIST: - if (hWnd != NULL) - MessageBox(hWnd, + MessageBox(hWnd, L"The ImDisk Virtual Disk Driver Helper " L"Service is not installed. Please re-install " L"ImDisk.", L"ImDisk Virtual Disk Driver", MB_ICONSTOP); - break; + } + + break; - case ERROR_PATH_NOT_FOUND: - case ERROR_FILE_NOT_FOUND: - if (hWnd != NULL) - MessageBox(hWnd, + case ERROR_PATH_NOT_FOUND: + case ERROR_FILE_NOT_FOUND: + if (hWnd != NULL) + { + MessageBox(hWnd, L"Cannot start the ImDisk Virtual Disk Driver " L"Helper Service. Please re-install ImDisk.", L"ImDisk Virtual Disk Driver", MB_ICONSTOP); - break; + } + + break; - case ERROR_SERVICE_DISABLED: - if (hWnd != NULL) - MessageBox(hWnd, + case ERROR_SERVICE_DISABLED: + if (hWnd != NULL) + { + MessageBox(hWnd, L"The ImDisk Virtual Disk Driver Helper " L"Service is disabled.", L"ImDisk Virtual Disk Driver", MB_ICONSTOP); - break; + } + + break; - default: - if (hWnd != NULL) - MsgBoxLastError - (hWnd, + default: + if (hWnd != NULL) + { + MsgBoxLastError(hWnd, L"Error starting ImDisk Virtual Disk Driver Helper " L"Service:"); } - - NtClose(driver); - return FALSE; } + + NtClose(driver); + return FALSE; + } + } } if (FileName == NULL) + { RtlInitUnicodeString(&file_name, NULL); + } else if (NativePath) { if (!RtlCreateUnicodeString(&file_name, FileName)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, L"Memory allocation error.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; } } - else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) & + else if ((IMDISK_TYPE(Flags) == IMDISK_TYPE_PROXY) && (IMDISK_PROXY_TYPE(Flags) == IMDISK_PROXY_TYPE_SHM)) { LPWSTR namespace_prefix; LPWSTR prefixed_name; HANDLE h = CreateFile(L"\\\\?\\Global", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if ((h == INVALID_HANDLE_VALUE) & + + if ((h == INVALID_HANDLE_VALUE) && (GetLastError() == ERROR_FILE_NOT_FOUND)) + { namespace_prefix = L"\\BaseNamedObjects\\"; + } else + { namespace_prefix = L"\\BaseNamedObjects\\Global\\"; + } if (h != INVALID_HANDLE_VALUE) CloseHandle(h); @@ -1775,9 +1867,13 @@ LPWSTR MountPoint) if (!RtlCreateUnicodeString(&file_name, prefixed_name)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, L"Memory allocation error.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; } } @@ -1786,9 +1882,13 @@ LPWSTR MountPoint) if (!RtlDosPathNameToNtPathName_U(FileName, &file_name, NULL, NULL)) { NtClose(driver); + if (hWnd != NULL) + { MessageBox(hWnd, L"Memory allocation error.", - L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + L"ImDisk Virtual Disk Driver", MB_ICONSTOP); + } + return FALSE; } } @@ -1803,7 +1903,7 @@ LPWSTR MountPoint) // Check if mount point is a drive letter or junction point if ((MountPoint != NULL) && (MountPoint[0] != 0) && ((wcscmp(MountPoint + 1, L":") == 0) || - ((wcscmp(MountPoint + 1, L":\\") == 0)))) + ((wcscmp(MountPoint + 1, L":\\") == 0)))) { create_data->DriveLetter = MountPoint[0]; } @@ -1860,10 +1960,14 @@ LPWSTR MountPoint) IMDISK_DEVICE_BASE_NAME L"%u", create_data->DeviceNumber); device_path[_countof(device_path) - 1] = 0; - if ((wcslen(MountPoint) == 2) && - (MountPoint[1] == L':')) + if (MountPoint != NULL && MountPoint[0] != 0 && + (wcscmp(MountPoint + 1, L":") == 0 || + wcscmp(MountPoint + 1, L":\\") == 0)) { -#ifndef _WIN64 + WCHAR drive_letter[] = L" :"; + drive_letter[0] = MountPoint[0]; + +#ifdef _M_IX86 if (!IMDISK_GTE_WINXP()) { DWORD ddd_flags = DDD_RAW_TARGET_PATH; @@ -1874,18 +1978,21 @@ LPWSTR MountPoint) ddd_flags |= DDD_NO_BROADCAST_SYSTEM; } - if (!DefineDosDevice(ddd_flags, MountPoint, device_path)) + if (!DefineDosDevice(ddd_flags, drive_letter, device_path)) + { if (hWnd != NULL) MsgBoxLastError(hWnd, L"Error creating mount point:"); + } } #endif if (hWnd != NULL) - SetWindowText - (hWnd, - L"Notifying applications that device has been created..."); + { + SetWindowText(hWnd, + L"Notifying applications that device has been created..."); + } - ImDiskNotifyShellDriveLetter(hWnd, MountPoint); + ImDiskNotifyShellDriveLetter(hWnd, drive_letter); } else { @@ -1899,10 +2006,11 @@ LPWSTR MountPoint) IMDISK_API BOOL WINAPI ImDiskNotifyShellDriveLetter(HWND hWnd, -LPWSTR DriveLetterPath) + LPWSTR DriveLetterPath) { #ifndef CORE_BUILD DWORD_PTR dwp; + DEV_BROADCAST_VOLUME dev_broadcast_volume = { sizeof(DEV_BROADCAST_VOLUME), DBT_DEVTYP_VOLUME @@ -1945,19 +2053,20 @@ LPWSTR DriveLetterPath) 4000, &dwp); - /* Tried PostMessage instead of SendMessageTimeout +#if 0 // Tried PostMessage instead of SendMessageTimeout PostMessage(HWND_BROADCAST, - WM_DEVICECHANGE, - DBT_DEVICEARRIVAL, - (LPARAM)&dev_broadcast_volume); + WM_DEVICECHANGE, + DBT_DEVICEARRIVAL, + (LPARAM)&dev_broadcast_volume); dev_broadcast_volume.dbcv_flags = DBTF_MEDIA; PostMessage(HWND_BROADCAST, - WM_DEVICECHANGE, - DBT_DEVICEARRIVAL, - (LPARAM)&dev_broadcast_volume); - */ + WM_DEVICECHANGE, + DBT_DEVICEARRIVAL, + (LPARAM)&dev_broadcast_volume); +#endif + #endif return TRUE; @@ -1966,17 +2075,19 @@ LPWSTR DriveLetterPath) IMDISK_API BOOL WINAPI ImDiskNotifyRemovePending(HWND hWnd, -WCHAR DriveLetter) + WCHAR DriveLetter) { #ifndef CORE_BUILD DEV_BROADCAST_VOLUME dev_broadcast_volume = { sizeof(DEV_BROADCAST_VOLUME), DBT_DEVTYP_VOLUME }; + DWORD_PTR dwp; dev_broadcast_volume.dbcv_unitmask = 1 << (DriveLetter - L'A'); +#ifdef SEND_DBT_DEVICEQUERYREMOVE SendMessageTimeout(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVICEQUERYREMOVE, @@ -1984,6 +2095,7 @@ WCHAR DriveLetter) SMTO_BLOCK | SMTO_ABORTIFHUNG, 4000, &dwp); +#endif SendMessageTimeout(HWND_BROADCAST, WM_DEVICECHANGE, @@ -2000,8 +2112,8 @@ WCHAR DriveLetter) IMDISK_API BOOL WINAPI ImDiskRemoveDevice(HWND hWnd, -DWORD DeviceNumber, -LPCWSTR MountPoint) + DWORD DeviceNumber, + LPCWSTR MountPoint) { HANDLE device; DWORD dw; @@ -2017,11 +2129,11 @@ LPCWSTR MountPoint) if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - FILE_READ_ATTRIBUTES); + FILE_READ_ATTRIBUTES); } else if ((wcscmp(MountPoint + 1, L":") == 0) || (wcscmp(MountPoint + 1, L":\\") == 0)) @@ -2030,13 +2142,14 @@ LPCWSTR MountPoint) drive_letter_path[4] = MountPoint[0]; // Notify processes that this device is about to be removed. - if (((APIFlags & IMDISK_API_NO_BROADCAST_NOTIFY) == 0) & - (MountPoint[0] >= L'A') & (MountPoint[0] <= L'Z')) + if (((APIFlags & IMDISK_API_NO_BROADCAST_NOTIFY) == 0) && + (MountPoint[0] >= L'A') && (MountPoint[0] <= L'Z')) { if (hWnd != NULL) - SetWindowText - (hWnd, - L"Notifying applications that device is being removed..."); + { + SetWindowText(hWnd, + L"Notifying applications that device is being removed..."); + } ImDiskNotifyRemovePending(hWnd, MountPoint[0]); } @@ -2050,16 +2163,20 @@ LPCWSTR MountPoint) NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); if (device == INVALID_HANDLE_VALUE) + { device = CreateFile(drive_letter_path, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + } if (device == INVALID_HANDLE_VALUE) + { device = CreateFile(drive_letter_path, - FILE_READ_ATTRIBUTES, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + } } else { @@ -2070,32 +2187,41 @@ LPCWSTR MountPoint) GENERIC_READ | GENERIC_WRITE); if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByMountPoint(MountPoint, - GENERIC_READ); + GENERIC_READ); + } if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByMountPoint(MountPoint, - FILE_READ_ATTRIBUTES); + FILE_READ_ATTRIBUTES); + } } if (device == INVALID_HANDLE_VALUE) { if (hWnd != NULL) MsgBoxLastError(hWnd, L"Error opening device:"); + return FALSE; } - if (!ImDiskCheckDriverVersion(device)) - if (GetLastError() != NO_ERROR) + if (!ImDiskCheckDriverVersion(device) && + GetLastError() != NO_ERROR) + { + NtClose(device); + + if (hWnd != NULL) { - NtClose(device); - if (hWnd != NULL) - ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, L"ImDisk Virtual Disk Driver", + ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, + L"ImDisk Virtual Disk Driver", L"Not an ImDisk Virtual Disk: '%1'", MountPoint); - - return FALSE; } + return FALSE; + } + if (hWnd != NULL) SetWindowText(hWnd, L"Flushing file buffers..."); @@ -2112,8 +2238,11 @@ LPCWSTR MountPoint) 0, &dw, NULL)) + { if (APIFlags & IMDISK_API_FORCE_DISMOUNT) + { force_dismount = TRUE; + } else if (hWnd == NULL) { NtClose(device); @@ -2133,22 +2262,26 @@ LPCWSTR MountPoint) return FALSE; } else + { force_dismount = TRUE; + } + } - if (hWnd != NULL) - SetWindowText(hWnd, L"Dismounting filesystem..."); + if (hWnd != NULL) + SetWindowText(hWnd, L"Dismounting filesystem..."); - DeviceIoControl(device, - FSCTL_DISMOUNT_VOLUME, - NULL, - 0, - NULL, - 0, - &dw, - NULL); + DeviceIoControl(device, + FSCTL_DISMOUNT_VOLUME, + NULL, + 0, + NULL, + 0, + &dw, + NULL); - if (force_dismount) - DeviceIoControl(device, + if (force_dismount) + { + DeviceIoControl(device, FSCTL_LOCK_VOLUME, NULL, 0, @@ -2156,72 +2289,77 @@ LPCWSTR MountPoint) 0, &dw, NULL); + } - // If interactive mode, check if image has been modified and if so ask user - // if it should be saved first. + // If interactive mode, check if image has been modified and if so ask user + // if it should be saved first. #ifndef CORE_BUILD - if (hWnd != NULL) - if (!ImDiskInteractiveCheckSave(hWnd, device)) - { - NtClose(device); - return FALSE; - } + if (hWnd != NULL && !ImDiskInteractiveCheckSave(hWnd, device)) + { + NtClose(device); + return FALSE; + } #endif - if (hWnd != NULL) - SetWindowText(hWnd, L"Removing device..."); + if (hWnd != NULL) + SetWindowText(hWnd, L"Removing device..."); - if (!DeviceIoControl(device, - IOCTL_STORAGE_EJECT_MEDIA, - NULL, - 0, - NULL, - 0, - &dw, - NULL)) - if (force_dismount ? !ImDiskForceRemoveDevice(device, 0) : FALSE) + if (!DeviceIoControl(device, + IOCTL_STORAGE_EJECT_MEDIA, + NULL, + 0, + NULL, + 0, + &dw, + NULL)) + { + if (force_dismount && !ImDiskForceRemoveDevice(device, 0)) + { + if (hWnd != NULL) { - if (hWnd != NULL) - MsgBoxLastError(hWnd, L"Error removing device:"); - NtClose(device); - return FALSE; + MsgBoxLastError(hWnd, L"Error removing device:"); } - DeviceIoControl(device, - FSCTL_UNLOCK_VOLUME, - NULL, - 0, - NULL, - 0, - &dw, - NULL); + NtClose(device); + return FALSE; + } + } - NtClose(device); + DeviceIoControl(device, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0, + &dw, + NULL); + + NtClose(device); + + if (MountPoint != NULL) + { + if (hWnd != NULL) + SetWindowText(hWnd, L"Removing mount point..."); - if (MountPoint != NULL) + if (!ImDiskRemoveMountPoint(MountPoint)) { if (hWnd != NULL) - SetWindowText(hWnd, L"Removing mount point..."); - - if (!ImDiskRemoveMountPoint(MountPoint)) { - if (hWnd != NULL) - { - MsgBoxLastError(hWnd, L"Error removing drive letter:"); - } + MsgBoxLastError(hWnd, L"Error removing drive letter:"); } } + } - if (hWnd != NULL) - SetWindowText(hWnd, L"OK."); + if (hWnd != NULL) + SetWindowText(hWnd, L"OK."); - return TRUE; + return TRUE; } IMDISK_API BOOL WINAPI ImDiskForceRemoveDevice(HANDLE Device, -DWORD DeviceNumber) + DWORD DeviceNumber) { UNICODE_STRING file_name; HANDLE driver; @@ -2249,8 +2387,10 @@ DWORD DeviceNumber) } RtlInitUnicodeString(&file_name, IMDISK_CTL_DEVICE_NAME); + driver = ImDiskOpenDeviceByName(&file_name, GENERIC_READ | GENERIC_WRITE); + if (driver == NULL) return FALSE; @@ -2276,10 +2416,10 @@ DWORD DeviceNumber) IMDISK_API BOOL WINAPI ImDiskChangeFlags(HWND hWnd, -DWORD DeviceNumber, -LPCWSTR MountPoint, -DWORD FlagsToChange, -DWORD Flags) + DWORD DeviceNumber, + LPCWSTR MountPoint, + DWORD FlagsToChange, + DWORD Flags) { HANDLE device; DWORD dw; @@ -2292,9 +2432,12 @@ DWORD Flags) { device = ImDiskOpenDeviceByNumber(DeviceNumber, GENERIC_READ | GENERIC_WRITE); + if (device == INVALID_HANDLE_VALUE) + { device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); + } } else if ((wcslen(MountPoint) == 2) ? MountPoint[1] == ':' : (wcslen(MountPoint) == 3) ? wcscmp(MountPoint + 1, L":\\") == 0 : @@ -2310,16 +2453,21 @@ DWORD Flags) NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); if (device == INVALID_HANDLE_VALUE) + { device = CreateFile(drive_letter_path, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, NULL); + } } else { if (hWnd != NULL) + { ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, L"ImDisk Virtual Disk Driver", - L"Unsupported mount point: '%1'", MountPoint); + L"Unsupported mount point: '%1'", MountPoint); + } + SetLastError(ERROR_INVALID_FUNCTION); return FALSE; } @@ -2335,9 +2483,12 @@ DWORD Flags) if (GetLastError() != NO_ERROR) { NtClose(device); + if (hWnd != NULL) + { ImDiskMsgBoxPrintF(hWnd, MB_ICONSTOP, L"ImDisk Virtual Disk Driver", - L"Not an ImDisk Virtual Disk: '%1'", MountPoint); + L"Not an ImDisk Virtual Disk: '%1'", MountPoint); + } return FALSE; } @@ -2358,6 +2509,7 @@ DWORD Flags) 0, &dw, NULL)) + { if (hWnd == NULL) { NtClose(device); @@ -2376,6 +2528,7 @@ DWORD Flags) return FALSE; } + } if (hWnd != NULL) SetWindowText(hWnd, L"Dismounting filesystem..."); @@ -2388,6 +2541,7 @@ DWORD Flags) 0, &dw, NULL)) + { if (hWnd == NULL) { NtClose(device); @@ -2404,6 +2558,7 @@ DWORD Flags) return FALSE; } + } if (hWnd != NULL) SetWindowText(hWnd, L"Setting device flags..."); @@ -2434,8 +2589,8 @@ DWORD Flags) IMDISK_API BOOL WINAPI ImDiskExtendDevice(HWND hWnd, -DWORD DeviceNumber, -CONST PLARGE_INTEGER ExtendSize) + DWORD DeviceNumber, + CONST PLARGE_INTEGER ExtendSize) { HANDLE device; DWORD dw; @@ -2452,7 +2607,7 @@ CONST PLARGE_INTEGER ExtendSize) if (device == INVALID_HANDLE_VALUE) device = ImDiskOpenDeviceByNumber(DeviceNumber, - GENERIC_READ); + GENERIC_READ); if (device == INVALID_HANDLE_VALUE) { @@ -2493,10 +2648,11 @@ CONST PLARGE_INTEGER ExtendSize) &dw, NULL)) { if (hWnd != NULL) - MsgBoxLastError - (hWnd, - L"An error occured when attempting to check the new total size of " - L"the resized virtual disk:"); + { + MsgBoxLastError(hWnd, + L"An error occurred when attempting to check the new total size of " + L"the resized virtual disk:"); + } NtClose(device); return FALSE; @@ -2511,10 +2667,11 @@ CONST PLARGE_INTEGER ExtendSize) &dw, NULL)) { if (hWnd != NULL) - MsgBoxLastError - (hWnd, - L"An error occured when attempting to check the new total size of " - L"the resized virtual disk:"); + { + MsgBoxLastError(hWnd, + L"An error occurred when attempting to check the new total size of " + L"the resized virtual disk:"); + } NtClose(device); return FALSE; @@ -2531,12 +2688,15 @@ CONST PLARGE_INTEGER ExtendSize) NULL, 0, &dw, NULL)) + { if (hWnd != NULL) - MsgBoxLastError - (hWnd, - L"The disk size was extended successfully, but it was not possible " - L"to extend the current filesystem on it. You will have to reformat " - L"the disk to use the full disk size."); + { + MsgBoxLastError(hWnd, + L"The disk size was extended successfully, but it was not possible " + L"to extend the current filesystem on it. You will have to reformat " + L"the disk to use the full disk size."); + } + } NtClose(device); return TRUE; @@ -2545,9 +2705,9 @@ CONST PLARGE_INTEGER ExtendSize) IMDISK_API BOOL WINAPI ImDiskSaveImageFile(IN HANDLE DeviceHandle, -IN HANDLE FileHandle, -IN DWORD BufferSize OPTIONAL, -IN LPBOOL CancelFlag OPTIONAL) + IN HANDLE FileHandle, + IN DWORD BufferSize OPTIONAL, + IN LPBOOL CancelFlag OPTIONAL) { LPBYTE buffer; IMDISK_SET_DEVICE_FLAGS device_flags = { 0 }; @@ -2648,7 +2808,7 @@ IN LPBOOL CancelFlag OPTIONAL) IMDISK_API BOOL WINAPI ImDiskAdjustImageFileSize(IN HANDLE FileHandle, -IN PLARGE_INTEGER FileSize) + IN PLARGE_INTEGER FileSize) { ULARGE_INTEGER existing_size = { 0 }; DWORD ptr; @@ -2657,9 +2817,11 @@ IN PLARGE_INTEGER FileSize) // original disk volume and possibly adjusts image file size if it does not // exactly match the size of the original disk/partition. existing_size.LowPart = GetFileSize(FileHandle, &existing_size.HighPart); - if (existing_size.LowPart == INVALID_FILE_SIZE) - if (GetLastError() != NO_ERROR) - return FALSE; + if (existing_size.LowPart == INVALID_FILE_SIZE && + GetLastError() != NO_ERROR) + { + return FALSE; + } if (existing_size.QuadPart < (ULONGLONG)FileSize->QuadPart) { @@ -2671,9 +2833,12 @@ IN PLARGE_INTEGER FileSize) FileSize->LowPart, (LPLONG)&FileSize->HighPart, FILE_BEGIN); - if (ptr == INVALID_SET_FILE_POINTER) - if (GetLastError() != NO_ERROR) - return FALSE; + + if (ptr == INVALID_SET_FILE_POINTER && + GetLastError() != NO_ERROR) + { + return FALSE; + } return SetEndOfFile(FileHandle); } @@ -2681,7 +2846,7 @@ IN PLARGE_INTEGER FileSize) IMDISK_API BOOL WINAPI ImDiskGetVolumeSize(IN HANDLE Handle, -IN OUT PLONGLONG Size) + IN OUT PLONGLONG Size) { PARTITION_INFORMATION partition_info = { 0 }; DISK_GEOMETRY disk_geometry = { 0 }; @@ -2732,8 +2897,8 @@ IN OUT PLONGLONG Size) IMDISK_API BOOL WINAPI ImDiskGetFormattedGeometry(IN LPCWSTR ImageFile, -IN PLARGE_INTEGER Offset OPTIONAL, -IN OUT PDISK_GEOMETRY DiskGeometry) + IN PLARGE_INTEGER Offset OPTIONAL, + IN OUT PDISK_GEOMETRY DiskGeometry) { HANDLE hImageFile; BOOL bResult; @@ -2761,9 +2926,9 @@ IN OUT PDISK_GEOMETRY DiskGeometry) IMDISK_API BOOL WINAPI ImDiskGetFormattedGeometryIndirect(IN HANDLE Handle, -IN ImDiskReadFileProc ReadFileProc, -IN PLARGE_INTEGER Offset OPTIONAL, -IN OUT PDISK_GEOMETRY DiskGeometry) + IN ImDiskReadFileProc ReadFileProc, + IN PLARGE_INTEGER Offset OPTIONAL, + IN OUT PDISK_GEOMETRY DiskGeometry) { FAT_VBR fat_vbr; LARGE_INTEGER offset = { 0 }; @@ -2787,10 +2952,10 @@ IN OUT PDISK_GEOMETRY DiskGeometry) IMDISK_API BOOL WINAPI ImDiskBuildMBR(IN PDISK_GEOMETRY DiskGeometry OPTIONAL, -IN PPARTITION_INFORMATION PartitionInformation OPTIONAL, -IN BYTE NumberOfPartitions OPTIONAL, -IN OUT LPBYTE MBR, -IN DWORD_PTR MBRSize) + IN PPARTITION_INFORMATION PartitionInformation OPTIONAL, + IN BYTE NumberOfPartitions OPTIONAL, + IN OUT LPBYTE MBR, + IN DWORD_PTR MBRSize) { BYTE i; @@ -2858,7 +3023,7 @@ IN DWORD_PTR MBRSize) IMDISK_API DWORD WINAPI ImDiskConvertCHSToLBA(IN PDISK_GEOMETRY DiskGeometry, -IN LPBYTE CHS) + IN LPBYTE CHS) { DWORD cylinder = (((DWORD)CHS[1] & 0xC0) << 2) | CHS[2]; DWORD heads = CHS[0]; @@ -2866,13 +3031,13 @@ IN LPBYTE CHS) return ((cylinder * DiskGeometry->TracksPerCylinder + heads) * - DiskGeometry->SectorsPerTrack) + sector - 1; + DiskGeometry->SectorsPerTrack) + sector - 1; } IMDISK_API DWORD WINAPI ImDiskConvertLBAToCHS(IN PDISK_GEOMETRY DiskGeometry, -IN DWORD LBA) + IN DWORD LBA) { /* cylinder = LBA / (heads_per_cylinder * sectors_per_track) @@ -2897,8 +3062,8 @@ IN DWORD LBA) temp % DiskGeometry->SectorsPerTrack + 1; - if ((cylinder >= 1024) | - (head >= 256) | + if ((cylinder >= 1024) || + (head >= 256) || (sector >= 64)) { cylinder = 1023; @@ -2915,12 +3080,16 @@ IN DWORD LBA) IMDISK_API VOID WINAPI -ImDiskNativePathToWin32(IN OUT LPWSTR *Path) +ImDiskNativePathToWin32(IN OUT LPWSTR* Path) { if ((Path == NULL) || (Path[0] == 0)) + { return; + } else if (wcsncmp(*Path, L"\\??\\", 4) == 0) + { (*Path)[1] = L'\\'; + } else if (wcsncmp(*Path, L"\\DosDevices\\", 12) == 0) { (*Path) += 8; @@ -2929,10 +3098,14 @@ ImDiskNativePathToWin32(IN OUT LPWSTR *Path) (*Path)[3] = L'?'; } else + { return; + } - if ((*Path)[4] != 0 ? (*Path)[5] == L':' : FALSE) + if ((*Path)[4] != 0 && (*Path)[5] == L':') + { (*Path) += 4; + } else if (wcsncmp(*Path, L"\\\\?\\UNC\\", 8) == 0) { (*Path) += 6; @@ -2947,16 +3120,23 @@ ImDiskOpenRefreshEvent(BOOL InheritHandle) SECURITY_ATTRIBUTES sec_attrs = { 0 }; PSECURITY_DESCRIPTOR sec_descr = NULL; HANDLE hEvent = NULL; - WCHAR *objname; + WCHAR* objname; HANDLE h = CreateFile(L"\\\\?\\Global", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if ((h == INVALID_HANDLE_VALUE) && (GetLastError() == ERROR_FILE_NOT_FOUND)) + { objname = IMDISK_REFRESH_EVENT_NAME; + } else + { objname = L"Global\\" IMDISK_REFRESH_EVENT_NAME; + } if (h != INVALID_HANDLE_VALUE) + { CloseHandle(h); + } // Initialize a security descriptor. sec_descr = (PSECURITY_DESCRIPTOR) @@ -3028,21 +3208,29 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) &value_size); if (err_code == ERROR_SUCCESS) + { if (CreateData->DeviceNumber == IMDISK_AUTO_DEVICE_NUMBER) { CreateData->DeviceNumber = load_devices; ++load_devices; } else + { load_devices = max(load_devices, CreateData->DeviceNumber + 1); + } + } else + { if (CreateData->DeviceNumber == IMDISK_AUTO_DEVICE_NUMBER) { CreateData->DeviceNumber = 0; load_devices = 1; } else + { load_devices = CreateData->DeviceNumber + 1; + } + } err_code = RegSetValueEx(hkey, IMDISK_CFG_LOAD_DEVICES_VALUE, @@ -3060,6 +3248,7 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) value_name = ImDiskAllocPrintF(IMDISK_CFG_IMAGE_FILE_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3070,9 +3259,9 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) { LPWSTR value_data = ImDiskAllocPrintF(L"%1!.*ws!", - (int)(CreateData->FileNameLength / - sizeof(*CreateData->FileName)), - CreateData->FileName); + (int)(CreateData->FileNameLength / + sizeof(*CreateData->FileName)), + CreateData->FileName); if (value_data == NULL) { @@ -3097,12 +3286,15 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); value_name = ImDiskAllocPrintF(IMDISK_CFG_SIZE_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3126,12 +3318,15 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); value_name = ImDiskAllocPrintF(IMDISK_CFG_FLAGS_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3155,12 +3350,15 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); value_name = ImDiskAllocPrintF(IMDISK_CFG_DRIVE_LETTER_PREFIX L"%1!u!", CreateData->DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3187,7 +3385,9 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); @@ -3216,7 +3416,9 @@ ImDiskSaveRegistrySettings(PIMDISK_CREATE_DATA CreateData) } } else + { RegDeleteValue(hkey, value_name); + } LocalFree(value_name); @@ -3283,6 +3485,7 @@ ImDiskRemoveRegistrySettings(DWORD DeviceNumber) value_name = ImDiskAllocPrintF(IMDISK_CFG_IMAGE_FILE_PREFIX L"%1!u!", DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3295,6 +3498,7 @@ ImDiskRemoveRegistrySettings(DWORD DeviceNumber) value_name = ImDiskAllocPrintF(IMDISK_CFG_SIZE_PREFIX L"%1!u!", DeviceNumber); + if (value_name == NULL) { RegCloseKey(hkey); @@ -3384,3 +3588,40 @@ ImDiskGetRegistryAutoLoadDevices(LPDWORD LoadDevicesValue) return TRUE; } + +BOOL +WINAPI +ImDiskIsProcessElevated() +{ + HANDLE hToken; + TOKEN_ELEVATION elevation; + DWORD dwSize; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenElevation, &elevation, sizeof(elevation), &dwSize)) + { + DWORD dwerr = GetLastError(); + CloseHandle(hToken); + SetLastError(dwerr); + + switch (dwerr) + { + case ERROR_INVALID_FUNCTION: + case ERROR_INVALID_PARAMETER: + return TRUE; + + default: + return FALSE; + } + } + + CloseHandle(hToken); + + SetLastError(NO_ERROR); + + return elevation.TokenIsElevated; +} diff --git a/cplcore/drvio.h b/cplcore/drvio.h index a17263a..6e0d8c2 100644 --- a/cplcore/drvio.h +++ b/cplcore/drvio.h @@ -2,17 +2,31 @@ extern "C" { #endif - INT_PTR - CALLBACK - StatusDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + INT_PTR + CALLBACK + StatusDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - INT_PTR - CALLBACK - NewDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + INT_PTR + CALLBACK + NewDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - BOOL - WINAPI - ImDiskInteractiveCheckSave(HWND hWnd, HANDLE device); + BOOL + WINAPI + ImDiskInteractiveCheckSave(HWND hWnd, HANDLE device); + + LONG + WINAPI + ImDiskShowCPlAppletElevated(HWND hWnd); + + VOID + WINAPI + ImDiskRelaunchElevated(HWND hWnd, LPCSTR DllFunction, + LPCSTR CommandLine, int nCmdShow); + + VOID + WINAPI + ImDiskRelaunchElevatedW(HWND hWnd, LPCWSTR DllFunction, + LPCWSTR CommandLine, int nCmdShow); /** This function is a quick perror-style way of displaying an error message @@ -25,7 +39,7 @@ extern "C" { VOID WINAPI MsgBoxLastError(IN HWND hWndParent OPTIONAL, - IN LPCWSTR Prefix); + IN LPCWSTR Prefix); extern ULONGLONG diff --git a/cplcore/i386/imdisk.exp b/cplcore/i386/imdisk.exp index 20e5e28c38aa059d179f99ebe562c6ae82aee8ce..ba3214017e83b9cbe6974519eeba6a60589e89b3 100644 GIT binary patch literal 15038 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 literal 14839 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 aa)}|E;)HaDEw86Yt~p_NtUO`O=l=kq1`Uw_ literal 26538 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 OWqlVI9!uO?{rUeJv~z0! diff --git a/cplcore/ia64/imdisk.exp b/cplcore/ia64/imdisk.exp index 880d9daa8bc8e5d77b9c46880de8a6de471b96cf..6387f6b26c729f3bdf848c22e492d2a48e3bf8f5 100644 GIT binary patch literal 8402 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 R3`F!eKRu+`_%lmJ_kYu&=d%C+ delta 3198 zcmbVNS!i5k6#k}}W^a~Gnw!~YlF2rc+4ro|s7Rqp`rwNqRp>*kbtyvMWI`#?K8UgB z!IxU7K3Sm+j6xsUvxt??2}|%YSBl z(e~9b+mf>-n@MGh`BX6{e~xM8d?6Fi|6XVXa0(ba4h)|KMs5JP`A3-P05-7B?*=BX z1183OfQje|uz}tDZXn_TOr(3tK)R=j)M>y(VGb}6E&wKG78%$;d;u^K;X4zFRlvk_ z3@|Z%lHv?ZGy^)y{1Ri}4J7#8z!XK8NR3gPf#gNNMEo{I7|7oOOhoQckbwybH8FXJ z)iN+~A1JF2g=v=FM4Y8IQDQbGiW$H};R-8cAjiNaGL66n7&v2KYK6%d$UNZtD$2+o zq-q1%qkxGtOJyQ^m+uV}mnp(P=`h6^NbY4-41~|IWd;)TZDNecY=E;hHg8uSvNMp8 z>mz-(n5+y0EAKR1?5LdBzTM`ES4VT>GijaOzH%{Tj&2UX@j>A1FmPi8nCFX*8DO2b zJ_-27ft4t*oA5+{o-}Ye1K_ zdzfeT()l?GI!F<#oVR)66qD;j8g1APA9Bc|6)osPS;GLj;Xwutq~L}N+t7{}Mlgy9 zqKLzeVT{3x4h&%s2{dB|df`V90W`shFnZ9Bt>{7{k_c@Y=CM)A|2vEgTmD<9O(PBb zi;Tq9Td3^meX2p;@7^Ytx|=GOoy)e$G54VUrgGKyyRGtF;3xH;vvNDMW|Q@i?%EyM zS4$^Wjdr zvR7UY4_eO!;+pJBIdq#`jm%h%aaGIt8N)O?maj2|Ta-5!$7G8PL}N8J{aBl_dueZg zUDlc$@?q3#VX3%3Mjg7B5LtHlD_W?rS0e;z+bU}@O%`MR$JiTb&(+%W=;~~fitg6r zaJ)A9Bk#@fWxV#ZCY_UxcBS7(4=tQ%`Mkv;dlH_SAewkf4n0tSv{nWRczWeh4XZRA z*4xrAXA%zirM*q!$$Bpgrk6nlYnQi@sk$g^j~<1)hL_DQ2R!agib<9(S+P2l7|>JzV-CT z_i3Mn5r|h456b1VOLk=fH8xFt$XAmZq6Y^(bT+!>i;Pw6H#tonW*mC?Vsa)E6tA~M z9L4(baf);;YKnHy({Eia`7CQ?DNlE@)$(x9aT~Eb$xffda`gfI6IB{lAhaqiD4*nN zy@mBckCM_?rS!`A&SnYa>%G00ugZ_e!(2!{$p2FjT$Enw_J~%f4WGPp9x#hJ& z$x=#{+O=AgPPZC@YsG3r4{1L6wV1F( zWb5_xRqOrA#r{x_ygF`8-MHI2O?4%pXmd`d+#KH|H@$f(w;(G}_Vvqw2`fuE;|W1`_wbb1sJ8N33SR8GgrAB*ztUv5d`E;^g81IQ*O?6K~vTbVIlH1%=H8=j6^QViV z?=*YmqbaK#D`iMg%57e8Pg^Ox^Lpz2^fIg{J6#SrF - - - - Win8.1 Debug - Win32 - - - Win8 Debug - Win32 - - - Win7 Debug - Win32 - - - Win8.1 Release - Win32 - - - Win8 Release - Win32 - - - Win7 Release - Win32 - - - Win8.1 Debug - x64 - - - Win8 Debug - x64 - - - Win7 Debug - x64 - - - Win8.1 Release - x64 - - - Win8 Release - x64 - - - Win7 Release - x64 - - - - WindowsApplicationForDrivers8.1 - DynamicLibrary - - imdisk - Win8.1 Debug - Win32 - - - - 1.0 - $(Configuration.Replace(' ','')) - $(BUILD_ALT_DIR)\$(Platform)\ - $(BUILD_ALT_DIR)\x86\ - $(IntDir) - - - - - - {99A7A6E5-AC73-4FB9-BA97-9C206F06A3C7} - $(MSBuildProjectName) - - - WindowsV6.3 - True - - - Win8 - True - - - Win7 - True - - - WindowsV6.3 - False - - - Win8 - False - - - Win7 - False - - - WindowsV6.3 - True - - - Win8 - True - - - Win7 - True - - - WindowsV6.3 - False - - - Win8 - False - - - Win7 - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(KIT_SHARED_INC_PATH) - true - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cplcore/mbr.c b/cplcore/mbr.c new file mode 100644 index 0000000..7428909 --- /dev/null +++ b/cplcore/mbr.c @@ -0,0 +1,89 @@ +#include "mbr.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef INCLUDE_GPL_ORIGIN + + const char default_mbr[] = + { + 0xFA, 0xFC, 0x31, 0xC0, 0x8E, 0xD0, 0x8E, 0xD8, 0xBD, 0x00, 0x7C, 0x8D, 0x66, 0xE0, 0xFB, 0xB8, + 0xE0, 0x1F, 0x8E, 0xC0, 0x89, 0xEE, 0x89, 0xEF, 0xB9, 0x00, 0x01, 0xF3, 0xA5, 0xEA, 0x22, 0x7C, + 0xE0, 0x1F, 0x8E, 0xD8, 0x8E, 0xD0, 0x31, 0xC0, 0x8E, 0xC0, 0x8D, 0xBE, 0xBE, 0x01, 0xF6, 0x05, + 0x80, 0x75, 0x71, 0x81, 0xC7, 0x10, 0x00, 0x81, 0xFF, 0xFE, 0x7D, 0x72, 0xF1, 0xE8, 0xC7, 0x00, + 0x6E, 0x6F, 0x20, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x20, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, + 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x6F, 0x75, 0x6E, 0x64, 0x00, 0xE9, 0xFD, 0xFF, 0xE8, 0xA7, 0x00, + 0x72, 0x65, 0x61, 0x64, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x77, 0x68, 0x69, 0x6C, 0x65, + 0x20, 0x72, 0x65, 0x61, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x64, 0x72, 0x69, 0x76, 0x65, 0x00, 0xE9, + 0xD8, 0xFF, 0xE8, 0x82, 0x00, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x73, + 0x69, 0x67, 0x6E, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x21, 0x3D, 0x20, 0x35, 0x35, 0x41, 0x41, + 0x00, 0xE9, 0xB6, 0xFF, 0xE8, 0x10, 0x00, 0x72, 0xB4, 0x26, 0x81, 0x3E, 0xFE, 0x7D, 0x55, 0xAA, + 0x75, 0xD0, 0xEA, 0x00, 0x7C, 0x00, 0x00, 0xBB, 0xAA, 0x55, 0xB4, 0x41, 0xCD, 0x13, 0x72, 0x32, + 0x81, 0xFB, 0x55, 0xAA, 0x75, 0x2C, 0xF6, 0xC1, 0x01, 0x74, 0x27, 0xEB, 0x10, 0x10, 0x00, 0x04, + 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8B, 0x45, 0x08, + 0xA3, 0xD5, 0x7C, 0x8B, 0x45, 0x0A, 0xA3, 0xD7, 0x7C, 0xB8, 0x00, 0x42, 0xBE, 0xCD, 0x7C, 0xCD, + 0x13, 0xC3, 0xB8, 0x04, 0x02, 0xBB, 0x00, 0x7C, 0x8B, 0x4D, 0x02, 0x8A, 0x75, 0x01, 0xCD, 0x13, + 0xC3, 0x31, 0xDB, 0xB4, 0x0E, 0xCD, 0x10, 0x5E, 0xAC, 0x56, 0x3C, 0x00, 0x75, 0xF3, 0xC3, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xAA, + }; + +#else // INCLUDE_GPL_ORIGIN + + const char default_mbr[] = + { + 0xF4, 0xEB, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xAA + }; + +#endif // INCLUDE_GPL_ORIGIN + +const unsigned int default_mbr_size = sizeof(default_mbr); + +#ifdef __cplusplus +} +#endif diff --git a/cplcore/sources b/cplcore/sources index bc6eed1..343bcca 100644 --- a/cplcore/sources +++ b/cplcore/sources @@ -2,7 +2,7 @@ TARGETNAME=imdisk TARGETEXT=cpl TARGETPATH=. TARGETTYPE=DYNLINK -C_DEFINES = $(C_DEFINES) /DUNICODE /D_UNICODE /DNT4_COMPATIBLE /DIMDISK_CPL_EXPORTS /DCORE_BUILD +C_DEFINES = $(C_DEFINES) /DUNICODE /D_UNICODE /DNT4_COMPATIBLE /DIMDISK_CPL_EXPORTS /DCORE_BUILD /DINCLUDE_GPL_ORIGIN UMTYPE=windows USE_MSVCRT=1 MSC_OPTIMIZATION=/Ox /GF diff --git a/cplcore/sources.props b/cplcore/sources.props index 998d730..986185a 100644 --- a/cplcore/sources.props +++ b/cplcore/sources.props @@ -5,7 +5,7 @@ cpl . DYNLINK - $(C_DEFINES) /DUNICODE /D_UNICODE + $(C_DEFINES) /DUNICODE /D_UNICODE /DINCLUDE_GPL_ORIGIN windows 1 /Ox /GF diff --git a/cplcore/wconmsg.cpp b/cplcore/wconmsg.cpp index c80714b..0a648d7 100644 --- a/cplcore/wconmsg.cpp +++ b/cplcore/wconmsg.cpp @@ -1,7 +1,7 @@ /* No-GUI support for the ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2007-2018 Olof Lagerkvist. +Copyright (C) 2007-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/devio/Makefile b/devio/Makefile index 8e80909..79dd867 100644 --- a/devio/Makefile +++ b/devio/Makefile @@ -6,11 +6,13 @@ UNAME_M?=$(shell uname -m) UNAME=$(UNAME_S)_$(UNAME_M) +DIST=../dist + default: devio.$(UNAME) static: devio.static.$(UNAME) -publish: /usr/utils/devio.gz /usr/utils/devio.xz +publish: $(DIST)/devio_$(UNAME).gz $(DIST)/devio_$(UNAME).xz $(DIST)/devio_$(UNAME).bz2 $(DIST)/devio_static_$(UNAME).gz $(DIST)/devio_static_$(UNAME).xz $(DIST)/devio_static_$(UNAME).bz2 install: /usr/local/bin/devio @@ -22,11 +24,23 @@ devio.$(UNAME): devio.c ../inc/*.h safeio.c safeio.h devio_types.h Makefile devio.static.$(UNAME): devio.c ../inc/*.h safeio.c safeio.h devio_types.h Makefile cc $(CC_OPT) -static -o devio.static.$(UNAME) devio.c safeio.c -/usr/utils/devio.gz: devio.static.$(UNAME) - gzip -9 < devio.static.$(UNAME) > /usr/utils/devio_$(UNAME).gz +$(DIST)/devio_$(UNAME).gz: devio.static.$(UNAME) + gzip -9 < devio.$(UNAME) > $(DIST)/devio_$(UNAME).gz + +$(DIST)/devio_$(UNAME).xz: devio.static.$(UNAME) + xz < devio.$(UNAME) > $(DIST)/devio_$(UNAME).xz + +$(DIST)/devio_$(UNAME).bz2: devio.static.$(UNAME) + bzip2 < devio.$(UNAME) > $(DIST)/devio_$(UNAME).bz2 + +$(DIST)/devio_static_$(UNAME).gz: devio.static.$(UNAME) + gzip -9 < devio.static.$(UNAME) > $(DIST)/devio_static_$(UNAME).gz + +$(DIST)/devio_static_$(UNAME).xz: devio.static.$(UNAME) + xz < devio.static.$(UNAME) > $(DIST)/devio_static_$(UNAME).xz -/usr/utils/devio.xz: devio.static.$(UNAME) - xz < devio.static.$(UNAME) > /usr/utils/devio_$(UNAME).xz +$(DIST)/devio_static_$(UNAME).bz2: devio.static.$(UNAME) + bzip2 < devio.static.$(UNAME) > $(DIST)/devio_static_$(UNAME).bz2 /usr/local/bin/devio: devio.$(UNAME) install devio.$(UNAME) /usr/local/bin/devio diff --git a/devio/Makefile.win64d b/devio/Makefile.win64d new file mode 100644 index 0000000..2a7d0da --- /dev/null +++ b/devio/Makefile.win64d @@ -0,0 +1,10 @@ +all: Debug\x64\devio.exe + +Debug\x64\devio.obj: devio.c ..\inc\*.h safeio.h devio.h devio_types.h Makefile.win64 + cl /c /DDEBUG /D_DEBUG /WX /W4 /wd4201 /wd4204 /wd4996 /Od /GR- /MD /FoDebug\x64\devio.obj /nologo devio.c + +Debug\x64\safeio_win32.obj: safeio_win32.cpp ..\inc\*.h safeio.h devio.h devio_types.h Makefile.win64 + cl /c /DDEBUG /D_DEBUG /WX /W4 /wd4201 /wd4204 /wd4996 /Od /GR- /MD /FoDebug\x64\safeio_win32.obj /nologo safeio_win32.cpp + +Debug\x64\devio.exe: Debug\x64\devio.obj Debug\x64\safeio_win32.obj Makefile.win64 + link /opt:nowin98,ref,icf=10 /largeaddressaware /defaultlib:bufferoverflowU.lib /release /debug /nologo /out:Debug\x64\devio.exe Debug\x64\devio.obj Debug\x64\safeio_win32.obj diff --git a/devio/Makefile.winarm b/devio/Makefile.winarm new file mode 100644 index 0000000..953d838 --- /dev/null +++ b/devio/Makefile.winarm @@ -0,0 +1,18 @@ +all: Release\arm\devio.exe + +publish: P:\UtilsARM\devio.exe Z:\ltr-website\ltr-data.se\files\winRelease\arm\devio.exe + +P:\UtilsARM\devio.exe: Release\arm\devio.exe + copy /y Release\arm\devio.exe P:\UtilsARM\\ + +Z:\ltr-website\ltr-data.se\files\winarm\devio.exe: Release\arm\devio.exe + copy /y Release\arm\devio.exe Z:\ltr-website\ltr-data.se\files\winarm\\ + +Release\arm\devio.obj: devio.c ..\inc\*.h safeio.h devio.h devio_types.h Makefile.winarm + cl /c /WX /W4 /wd4201 /wd4204 /wd4996 /Ox /GR- /MD /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE /D_MSC_PLATFORM_TOOLSET=120 /FoRelease\arm\devio.obj /nologo devio.c + +Release\arm\safeio_win32.obj: safeio_win32.cpp ..\inc\*.h safeio.h devio.h devio_types.h Makefile.winarm + cl /c /WX /W4 /wd4201 /wd4204 /wd4996 /Ox /GR- /MD /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE /D_MSC_PLATFORM_TOOLSET=120 /FoRelease\arm\safeio_win32.obj /nologo safeio_win32.cpp + +Release\arm\devio.exe: Release\arm\devio.obj Release\arm\safeio_win32.obj Makefile.winarm + link /opt:ref,icf=10 /largeaddressaware /release /debug /nologo /out:Release\arm\devio.exe Release\arm\devio.obj Release\arm\safeio_win32.obj diff --git a/devio/Makefile.winarm64 b/devio/Makefile.winarm64 new file mode 100644 index 0000000..cabe4f7 --- /dev/null +++ b/devio/Makefile.winarm64 @@ -0,0 +1,18 @@ +all: Release\arm64\devio.exe + +publish: P:\UtilsARM\devio.exe Z:\ltr-website\ltr-data.se\files\winRelease\arm64\devio.exe + +P:\UtilsARM\devio.exe: Release\arm64\devio.exe + copy /y Release\arm64\devio.exe P:\UtilsARM\\ + +Z:\ltr-website\ltr-data.se\files\winarm64\devio.exe: Release\arm64\devio.exe + copy /y Release\arm64\devio.exe Z:\ltr-website\ltr-data.se\files\winarm64\\ + +Release\arm64\devio.obj: devio.c ..\inc\*.h safeio.h devio.h devio_types.h Makefile.winarm + cl /c /WX /W4 /wd4201 /wd4204 /wd4996 /Ox /GR- /MD /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE /D_MSC_PLATFORM_TOOLSET=140 /FoRelease\arm64\devio.obj /nologo devio.c + +Release\arm64\safeio_win32.obj: safeio_win32.cpp ..\inc\*.h safeio.h devio.h devio_types.h Makefile.winarm + cl /c /WX /W4 /wd4201 /wd4204 /wd4996 /Ox /GR- /MD /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE /D_MSC_PLATFORM_TOOLSET=140 /FoRelease\arm64\safeio_win32.obj /nologo safeio_win32.cpp + +Release\arm64\devio.exe: Release\arm64\devio.obj Release\arm64\safeio_win32.obj Makefile.winarm + link /opt:ref,icf=10 /largeaddressaware /release /debug /nologo /out:Release\arm64\devio.exe Release\arm64\devio.obj Release\arm64\safeio_win32.obj diff --git a/devio/devio.c b/devio/devio.c index 76fe5ac..afbdab3 100644 --- a/devio/devio.c +++ b/devio/devio.c @@ -1,7 +1,7 @@ /* Server end for ImDisk Virtual Disk Driver proxy operation. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -43,6 +43,7 @@ OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #ifdef _WIN32 @@ -91,15 +92,34 @@ syslog(FILE *Stream, LPCSTR Message, ...) { va_list param_list; LPSTR MsgBuf = NULL; + LPSTR msgptr = NULL; + LPSTR alloc_msg = NULL; va_start(param_list, Message); - if (strstr(Message, "%m") != NULL) + msgptr = strstr(Message, "%m"); + + if (msgptr != NULL) { + size_t msgpos = msgptr - Message; + DWORD winerrno = GetLastError(); if (winerrno == NO_ERROR) + { winerrno = 10000 + errno; + } + + alloc_msg = _strdup(Message); + + if (alloc_msg == NULL) + { + return; + } + + msgptr = alloc_msg + msgpos; + + *msgptr = 0; if (FormatMessage(FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_ALLOCATE_BUFFER | @@ -113,6 +133,8 @@ syslog(FILE *Stream, LPCSTR Message, ...) { MsgBuf = NULL; } + + Message = alloc_msg; } if (MsgBuf != NULL) @@ -123,7 +145,14 @@ syslog(FILE *Stream, LPCSTR Message, ...) LocalFree(MsgBuf); } else + { vfprintf(Stream, Message, param_list); + } + + if (alloc_msg != NULL) + { + free(alloc_msg); + } fflush(Stream); return; @@ -142,14 +171,15 @@ HANDLE shm_server_mutex = NULL; HANDLE shm_request_event = NULL; HANDLE shm_response_event = NULL; +OVERLAPPED drv_memory_io; +OVERLAPPED drv_request_io; + #else // Unix #include #include #include #include -#include -#include #include #include #include @@ -169,26 +199,16 @@ HANDLE shm_response_event = NULL; #define O_FSYNC 0 #endif -#define DEF_BUFFER_SIZE (64 << 20) +#define DEF_BUFFER_SIZE ((int)((sizeof(void*) << 3) << 20)) #define DEF_REQUIRED_ALIGNMENT 1 -#ifdef DEBUG +#if defined(DEBUG) || defined(_DEBUG) || defined(DBG) || defined(SYSLOG) #define dbglog(x) syslog x #else #define dbglog(x) #endif -//typedef union _LONGLONG_SWAP -//{ -// int64_t v64; -// struct -// { -// int32_t v1; -// int32_t v2; -// } v32; -//} longlongswap; - int64_t GetBigEndian64(int8_t *storage) { int i; @@ -224,6 +244,7 @@ safeio_size_t buffer_size = DEF_BUFFER_SIZE; off_t_64 image_offset = 0; IMDPROXY_INFO_RESP devio_info = { 0 }; char dll_mode = 0; +char drv_mode = 0; char vhd_mode = 0; char auto_vhd_detect = 1; @@ -316,6 +337,86 @@ physical_close(int fd) #ifdef _WIN32 +int alloc_drv_buffer() +{ + HANDLE hFileMap = NULL; + safeio_size_t detected_buffer_size; + MEMORY_BASIC_INFORMATION memory_info; + ULARGE_INTEGER map_size = { 0 }; + + printf("Allocating new buffer: " SIZ_FMT " bytes.\n", buffer_size); + + map_size.QuadPart = (ULONGLONG)buffer_size + IMDPROXY_HEADER_SIZE; + + hFileMap = CreateFileMapping(INVALID_HANDLE_VALUE, + NULL, + PAGE_READWRITE | SEC_COMMIT, + map_size.HighPart, + map_size.LowPart, + NULL); + + if (hFileMap == NULL) + { + syslog(LOG_ERR, "CreateFileMapping() failed: %m\n"); + return 2; + } + + shm_view = (char*)MapViewOfFile(hFileMap, FILE_MAP_WRITE, 0, 0, 0); + + if (shm_view == NULL) + { + syslog(LOG_ERR, "MapViewOfFile() failed: %m\n"); + return 2; + } + + CloseHandle(hFileMap); + + buf = shm_view + IMDPROXY_HEADER_SIZE; + + if (!VirtualQuery(shm_view, &memory_info, sizeof(memory_info))) + { + syslog(LOG_ERR, "VirtualQuery() failed: %m\n"); + return 2; + } + + memset(shm_view, 0, memory_info.RegionSize); + + detected_buffer_size = (safeio_size_t) + (memory_info.RegionSize - IMDPROXY_HEADER_SIZE); + + if (buffer_size != detected_buffer_size) + { + buffer_size = detected_buffer_size; + if (buf2 != NULL) + { + free(buf2); + buf2 = (char*)malloc(buffer_size); + if (buf2 == NULL) + { + syslog(LOG_ERR, "malloc() failed: %m\n"); + return 2; + } + } + } + + ResetEvent(drv_memory_io.hEvent); + + if (!DeviceIoControl((HANDLE)sd, IOCTL_DEVIODRV_LOCK_MEMORY, &shm_view, sizeof(void*), shm_view, buffer_size + IMDPROXY_HEADER_SIZE, NULL, &drv_memory_io)) + { + if (GetLastError() == ERROR_IO_PENDING) + { + dbglog((LOG_ERR, "Memory successfully locked.\n")); + } + else + { + syslog(LOG_ERR, "Lock memory request failed: %m\n"); + return 3; + } + } + + return 0; +} + int shm_read(void *io_ptr, safeio_size_t size) { @@ -326,7 +427,10 @@ shm_read(void *io_ptr, safeio_size_t size) return 0; if (shm_readptr == NULL) - shm_readptr = shm_view; + if (drv_mode) + shm_readptr = shm_view + sizeof(IMDPROXY_DEVIODRV_BUFFER_HEADER); + else + shm_readptr = shm_view; if ((long long)size > (long long)(buf - shm_readptr)) return 0; @@ -347,7 +451,10 @@ shm_write(const void *io_ptr, safeio_size_t size) return 0; if (shm_writeptr == NULL) - shm_writeptr = shm_view; + if (drv_mode) + shm_writeptr = shm_view + sizeof(IMDPROXY_DEVIODRV_BUFFER_HEADER); + else + shm_writeptr = shm_view; if ((long long)size > (long long)(buf - shm_writeptr)) return 0; @@ -376,6 +483,78 @@ shm_flush() return 1; } +int +drv_flush() +{ + DWORD dw; + + shm_readptr = NULL; + shm_writeptr = NULL; + + dbglog((LOG_ERR, "Calling DeviceIoControl for exchanging requests.\n")); + + ResetEvent(drv_request_io.hEvent); + + while (!DeviceIoControl((HANDLE)sd, IOCTL_DEVIODRV_EXCHANGE_IO, &shm_view, sizeof(void*), NULL, 0, &dw, &drv_request_io)) + { + DWORD err = GetLastError(); + + if (err == ERROR_IO_PENDING) + { + dbglog((LOG_ERR, "Waiting for request to complete.\n")); + + if (GetOverlappedResult((HANDLE)sd, &drv_request_io, &dw, TRUE)) + { + dbglog((LOG_ERR, "Request complete.\n")); + + break; + } + + err = GetLastError(); + } + + dbglog((LOG_ERR, "Request failed: %i %m", err)); + + if (err == ERROR_INSUFFICIENT_BUFFER) + { + // need larger buffer (for write request, detected in driver) + dbglog((LOG_ERR, "Larger buffer needed.\n")); + + if (!GetOverlappedResult((HANDLE)sd, &drv_memory_io, &dw, TRUE) && + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + syslog(LOG_ERR, "Error waiting for memory unlock: %i %m", GetLastError()); + } + + UnmapViewOfFile(shm_view); + + shm_view = NULL; + + buffer_size <<= 1; + + if (alloc_drv_buffer() == 0) + { + continue; + } + else + { + return 0; + } + } + else if (err == ERROR_DEV_NOT_EXIST) + { + return 1; + } + else + { + syslog(LOG_ERR, "DeviceIoControl() failed: %m\n", err); + return 0; + } + } + + return 1; +} + #else // Unix int @@ -396,13 +575,91 @@ shm_flush() return 0; } +int +drv_flush() +{ + return 0; +} + +#endif + +void +buf_realloc(ULONGLONG new_size) +{ + if (shm_mode) + return; + + if (new_size > (((safeio_size_t)-1) >> 1)) + { + new_size = (((safeio_size_t)-1) >> 1); + } + + buffer_size = (safeio_size_t)new_size; + + dbglog((LOG_ERR, "Read request " SLL_FMT " bytes, reallocating buffer.\n", + (off_t_64)buffer_size)); + +#ifdef _WIN32 + if (drv_mode) + { + DWORD dw; + + char* existing_buf = buf; + char* existing_buf2 = buf2; + char* existing_shm_view = shm_view; + safeio_size_t existing_buffer_size = buffer_size; + + if (!GetOverlappedResult((HANDLE)sd, &drv_memory_io, &dw, TRUE) && + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + syslog(LOG_ERR, "Error waiting for memory unlock: %i %m", GetLastError()); + } + + if (alloc_drv_buffer() == 0) + { + memcpy(shm_view, existing_shm_view, IMDPROXY_HEADER_SIZE); + UnmapViewOfFile(existing_shm_view); + free(existing_buf2); + } + else + { + shm_view = existing_shm_view; + buf = existing_buf; + buf2 = existing_buf2; + buffer_size = existing_buffer_size; + } + } + else #endif + { + char *new_buf = (char*)malloc(buffer_size); + char *new_buf2 = (char*)malloc(buffer_size); + if (new_buf == NULL || new_buf2 == NULL) + { + syslog(LOG_ERR, "Failed allocating new buffer: %m\n"); + + if (new_buf != NULL) + free(new_buf); + if (new_buf2 != NULL) + free(new_buf2); + } + else + { + free(buf); + buf = new_buf; + free(buf2); + buf2 = new_buf2; + } + } +} int comm_flush() { if (shm_mode) return shm_flush(); + else if (drv_mode) + return drv_flush(); else return 1; } @@ -410,7 +667,7 @@ comm_flush() int comm_read(void *io_ptr, safeio_size_t size) { - if (shm_mode) + if (shm_mode || drv_mode) return shm_read(io_ptr, size); else return safe_read(sd, io_ptr, size); @@ -419,7 +676,7 @@ comm_read(void *io_ptr, safeio_size_t size) int comm_write(const void *io_ptr, safeio_size_t size) { - if (shm_mode) + if (shm_mode || drv_mode) return shm_write(io_ptr, size); else return safe_write(sd, io_ptr, size); @@ -434,6 +691,7 @@ send_info() if (!comm_flush()) { syslog(LOG_ERR, "Error flushing comm data: %m\n"); + return 0; } @@ -491,6 +749,7 @@ vhd_read(char *io_ptr, safeio_size_t size, off_t_64 offset) (((off_t_64)block_offset) << sector_shift) + sector_size + in_block_offset; + readdone = physical_read(io_ptr, (safeio_size_t)first_size, data_offset); readdone = physical_read(io_ptr, (safeio_size_t)first_size, data_offset); if (readdone == -1) return (safeio_ssize_t)-1; @@ -735,13 +994,18 @@ read_data() return 0; } + if (req_block.length > buffer_size) // we will need larger buffer to complete this request + { + buf_realloc(req_block.length); + } + size = (safeio_size_t) (req_block.length < buffer_size ? req_block.length : buffer_size); dbglog((LOG_ERR, "read request " ULL_FMT " bytes at " ULL_FMT " + " ULL_FMT " = " ULL_FMT ".\n", - req_block.length, req_block.offset, offset, - req_block.offset + offset)); + req_block.length, req_block.offset, image_offset, + req_block.offset + image_offset)); memset(buf, 0, size); @@ -804,8 +1068,8 @@ write_data() dbglog((LOG_ERR, "write request " ULL_FMT " bytes at " ULL_FMT " + " ULL_FMT " = " ULL_FMT ".\n", - req_block.length, req_block.offset, offset, - req_block.offset + offset)); + req_block.length, req_block.offset, image_offset, + req_block.offset + image_offset)); if (req_block.length > buffer_size) { @@ -905,7 +1169,7 @@ main(int argc, char **argv) { fprintf(stderr, "devio with custom DLL support\n" - "Copyright (C) 2005-2018 Olof Lagerkvist.\n" + "Copyright (C) 2005-2021 Olof Lagerkvist.\n" "\n" "Usage for unmanaged C/C++ DLL files:\n" "devio --dll=dllfile;procedure other_devio_parameters ...\n" @@ -1026,6 +1290,13 @@ main(int argc, char **argv) #endif } + if (argc >= 4 && strcmp(argv[1], "--drv") == 0) + { + drv_mode = 1; + argv++; + argc--; + } + if (argc >= 4 && strcmp(argv[1], "--novhd") == 0) { auto_vhd_detect = 0; @@ -1044,14 +1315,16 @@ main(int argc, char **argv) { fprintf(stderr, "devio - Device I/O Service ver " DEVIO_VERSION "\n" - "With support for Microsoft VHD format, custom DLL files and shared memory proxy\n" - "operation.\n" - "Copyright (C) 2005-2018 Olof Lagerkvist.\n" + "With support for Microsoft VHD format, custom DLL files, shared memory proxy\n" + "operation and also for use with DevIO Client Driver, if installed.\n" + "Copyright (C) 2005-2021 Olof Lagerkvist.\n" "\n" "Usage:\n" "devio [-r] tcp-port|commdev diskdev [blocks] [offset] [alignm] [buffersize]\n" "devio [-r] tcp-port|commdev diskdev [partitionnumber] [alignm] [buffersize]\n" "\n" + "-r Open image file in read-only mode.\n" + "\n" "tcp-port can be any free tcp port where this service should listen for incoming\n" "client connections.\n" "\n" @@ -1059,7 +1332,8 @@ main(int argc, char **argv) "service should listen for incoming client connections.\n" "\n" "commdev can also start with shm: followed by an section object name for using\n" - "shared memory communication.\n" + "shared memory communication. Alternatively, drv: followed by a name for using\n" + "DevIO Client Driver to expose a device object connected to this devio instance.\n" "\n" "Default number of blocks is 0. When running on Windows the program will try to\n" "get the size of the image file or partition automatically, otherwise the client\n" @@ -1123,7 +1397,7 @@ main(int argc, char **argv) void *geometry = &vhd_info.Footer.DiskGeometry; // VHD I/O uses a secondary buffer - buf2 = malloc(buffer_size); + buf2 = (char*)malloc(buffer_size); if (buf2 == NULL) { syslog(LOG_ERR, "malloc() failed: %m\n"); @@ -1136,22 +1410,12 @@ main(int argc, char **argv) current_size = GetBigEndian64(vhd_info.Footer.CurrentSize); table_offset = GetBigEndian64(vhd_info.Header.TableOffset); - //((longlongswap*)¤t_size)->v32.v1 = - // ntohl(((longlongswap*)&vhd_info.Footer.CurrentSize)->v32.v2); - //((longlongswap*)¤t_size)->v32.v2 = - // ntohl(((longlongswap*)&vhd_info.Footer.CurrentSize)->v32.v1); - - //((longlongswap*)&table_offset)->v32.v1 = - // ntohl(((longlongswap*)&vhd_info.Header.TableOffset)->v32.v2); - //((longlongswap*)&table_offset)->v32.v2 = - // ntohl(((longlongswap*)&vhd_info.Header.TableOffset)->v32.v1); - sector_size = 512; block_size = ntohl(vhd_info.Header.BlockSize); for (block_shift = 0; - (block_shift < 64) & + (block_shift < 64) && ((((safeio_size_t)1) << block_shift) != block_size); block_shift++); @@ -1167,8 +1431,9 @@ main(int argc, char **argv) } for (sector_shift = 0; - (sector_shift < 64) & ((((safeio_size_t)1) << sector_shift) != - sector_size); sector_shift++); + (sector_shift < 64) && + ((((safeio_size_t)1) << sector_shift) != sector_size); + sector_shift++); if (argc > 3) { @@ -1303,7 +1568,7 @@ main(int argc, char **argv) if (devio_info.file_size == 0) { struct stat file_stat = { 0 }; - if (fstat(fd, &file_stat) == 0) + if (fstat(image_fd, &file_stat) == 0) devio_info.file_size = file_stat.st_size; else syslog(LOG_ERR, "Cannot determine size of image/partition: %m\n"); @@ -1579,7 +1844,7 @@ do_comm_shm(char *comm_device) char *namespace_prefix; HANDLE h = CreateFile("\\\\?\\Global", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if ((h == INVALID_HANDLE_VALUE) & (GetLastError() == ERROR_FILE_NOT_FOUND)) + if ((h == INVALID_HANDLE_VALUE) && (GetLastError() == ERROR_FILE_NOT_FOUND)) namespace_prefix = ""; else namespace_prefix = "Global\\"; @@ -1620,7 +1885,7 @@ do_comm_shm(char *comm_device) return 2; } - shm_view = MapViewOfFile(hFileMap, FILE_MAP_WRITE, 0, 0, 0); + shm_view = (char*)MapViewOfFile(hFileMap, FILE_MAP_WRITE, 0, 0, 0); if (shm_view == NULL) { @@ -1645,7 +1910,7 @@ do_comm_shm(char *comm_device) if (buf2 != NULL) { free(buf2); - buf2 = malloc(buffer_size); + buf2 = (char*)malloc(buffer_size); if (buf2 == NULL) { syslog(LOG_ERR, "malloc() failed: %m\n"); @@ -1712,6 +1977,77 @@ do_comm_shm(char *comm_device) return 0; } + +int +do_comm_drv(char *comm_device) +{ + int rc; + + char *objname = (char*)malloc(OBJNAME_SIZE); + if (objname == NULL) + { + syslog(LOG_ERR, "Memory allocation failed: %m"); + return -1; + } + + drv_memory_io.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + drv_request_io.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + if (drv_memory_io.hEvent == NULL || drv_request_io.hEvent == NULL) + { + syslog(LOG_ERR, "Event object create failed: %m"); + return -1; + } + + puts("Driver mode."); + + _snprintf(objname, OBJNAME_SIZE, + "%ws\\%s", DEVIODRV_DEVICE_DOSDEV_NAME, comm_device); + objname[OBJNAME_SIZE - 1] = 0; + + sd = (SOCKET)CreateFile(objname, GENERIC_ALL, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL); + + if (sd == INVALID_SOCKET) + { + if (GetLastError() == ERROR_ALREADY_EXISTS) + { + syslog(LOG_ERR, "A service with this name is already running.\n"); + } + else + { + syslog(LOG_ERR, "Error opening '%s': %m", objname); + } + + return 2; + } + + free(objname); + objname = NULL; + + rc = alloc_drv_buffer(); + if (rc > 0) + { + return rc; + } + + drv_mode = 1; + + printf("Waiting for client connection on object %s. Press Ctrl+C to cancel.\n", + comm_device); + + ((PIMDPROXY_DEVIODRV_BUFFER_HEADER)shm_view)->request_code = IMDPROXY_REQ_INFO; + + if (!send_info()) + { + syslog(LOG_ERR, "Wait failed: %m.\n"); + return 2; + } + + printf("Connection on object %s.\n", + comm_device); + + return 0; +} #endif int @@ -1729,11 +2065,22 @@ do_comm(char *comm_device) #else fprintf(stderr, "Shared memory operation only supported on Windows.\n"); return 2; +#endif + } + else if (_strnicmp(comm_device, "drv:", 4) == 0) + { +#ifdef _WIN32 + int drvresult = do_comm_drv(comm_device + 4); + if (drvresult != 0) + return drvresult; +#else + fprintf(stderr, "Driver operation only supported on Windows.\n"); + return 2; #endif } else { - buf = malloc(buffer_size); + buf = (char*)malloc(buffer_size); if (buf == NULL) { syslog(LOG_ERR, "malloc() failed: %m\n"); @@ -1741,8 +2088,9 @@ do_comm(char *comm_device) } } - if (shm_mode) - ; + if (shm_mode || drv_mode) + { + } else if (port != 0) { struct sockaddr_in saddr = { 0 }; diff --git a/devio/devio.h b/devio/devio.h index 6f1b6f6..37eaf4b 100644 --- a/devio/devio.h +++ b/devio/devio.h @@ -1,21 +1,30 @@ -#define DEVIO_VERSION "3.05" +#define DEVIO_VERSION "3.10" -typedef safeio_ssize_t (__cdecl *dllread_proc)(void *handle, - void *buf, - safeio_size_t size, - off_t_64 offset); +#define MULTI_CONTAINER_DELIMITER ":::" -typedef safeio_ssize_t (__cdecl *dllwrite_proc)(void *handle, - void *buf, - safeio_size_t size, - off_t_64 offset); +typedef safeio_ssize_t(__cdecl dllread_decl)(void *handle, + void *buf, + safeio_size_t size, + off_t_64 offset); -typedef int (__cdecl *dllclose_proc)(void *handle); +typedef dllread_decl *dllread_proc; -typedef void * (__cdecl *dllopen_proc)(const char *file, - int read_only, - dllread_proc *dllread, - dllwrite_proc *dllwrite, - dllclose_proc *dllclose, - off_t_64 *size); +typedef safeio_ssize_t(__cdecl dllwrite_decl)(void *handle, + void *buf, + safeio_size_t size, + off_t_64 offset); +typedef dllwrite_decl *dllwrite_proc; + +typedef int(__cdecl dllclose_decl)(void *handle); + +typedef dllclose_decl *dllclose_proc; + +typedef void * (__cdecl dllopen_decl)(const char *file, + int read_only, + dllread_proc *dllread, + dllwrite_proc *dllwrite, + dllclose_proc *dllclose, + off_t_64 *size); + +typedef dllopen_decl *dllopen_proc; diff --git a/devio/devio.inf b/devio/devio.inf new file mode 100644 index 0000000..9335516 --- /dev/null +++ b/devio/devio.inf @@ -0,0 +1,51 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 10/26/2021,2.1.0.00070 +CatalogFile = devio.cat + + +[SourceDisksNames] +1 = "ImDisk Virtual Disk Driver Proxy back-end" + + +[SourceDisksFiles.x86] +devio.exe = 1, Release\x86 + +[SourceDisksFiles.amd64] +devio.exe = 1, Release\x64 + +[SourceDisksFiles.arm] +devio.exe = 1, Release\arm + +[SourceDisksFiles.arm64] +devio.exe = 1, Release\arm64 + +[DestinationDirs] +ImDiskExeExeFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = ImDiskExeExeFiles + + +[ImDiskExeExeFiles] +devio.exe + + +[DefaultInstall.ntx86.Services] +AddService = ImDiskExe, , ImDiskExe + + +[ImDiskExe] +DisplayName = "ImDisk Virtual Disk Driver Proxy back-end" +StartType = 2 +ServiceType = 16 +ErrorControl = 0 +ServiceBinary = %11%\devio.exe diff --git a/devio/devio.props b/devio/devio.props index 9088708..6b7dd21 100644 --- a/devio/devio.props +++ b/devio/devio.props @@ -7,6 +7,9 @@ _WINSOCK_DEPRECATED_NO_WARNINGS;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + + true + \ No newline at end of file diff --git a/devio/devio.vcxproj b/devio/devio.vcxproj index 075a6e2..e0aba1d 100644 --- a/devio/devio.vcxproj +++ b/devio/devio.vcxproj @@ -255,7 +255,7 @@ MaxSpeed true - WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + WIN32;CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) false Level4 true @@ -266,6 +266,7 @@ true true true + compexch.obj;%(AdditionalDependencies) diff --git a/devio/devio_types.h b/devio/devio_types.h index 029c5cb..1101038 100644 --- a/devio/devio_types.h +++ b/devio/devio_types.h @@ -1,3 +1,9 @@ +#ifndef FALSE +#define FALSE 0 +#endif +#ifndef TRUE +#define TRUE 1 +#endif #if defined(_MSC_VER) && _MSC_PLATFORM_TOOLSET < 120 diff --git a/devio/devioimp.props b/devio/devioimp.props new file mode 100644 index 0000000..808f513 --- /dev/null +++ b/devio/devioimp.props @@ -0,0 +1,10 @@ + + + + + + Z:\Kod\imdisk\devio;$(IncludePath) + + + + \ No newline at end of file diff --git a/devio/safeio.c b/devio/safeio.c index f95299c..0a92cd1 100644 --- a/devio/safeio.c +++ b/devio/safeio.c @@ -1,28 +1,28 @@ /* - General I/O support routines for POSIX environments. - - Copyright (C) 2005-2007 Olof Lagerkvist. - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. + General I/O support routines for POSIX environments. + + Copyright (C) 2005-2007 Olof Lagerkvist. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. */ #include diff --git a/devio/safeio.h b/devio/safeio.h index 0d191bf..d84bdbe 100644 --- a/devio/safeio.h +++ b/devio/safeio.h @@ -1,7 +1,7 @@ /* General I/O support routines. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/devio/safeio_win32.cpp b/devio/safeio_win32.cpp index 3c3773f..ba7e7be 100644 --- a/devio/safeio_win32.cpp +++ b/devio/safeio_win32.cpp @@ -1,7 +1,7 @@ /* General I/O support routines for WIN32 environments. - Copyright (C) 2005-2018 Olof Lagerkvist. + Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/devio/win32_fileio.def b/devio/win32_fileio.def new file mode 100644 index 0000000..9a6ee83 --- /dev/null +++ b/devio/win32_fileio.def @@ -0,0 +1,5 @@ +LIBRARY win32_fileio.dll + +EXPORTS + + dllopen=?dllopen@@YAPAXPBDHPAP6AHPAX1H_J@Z3PAP6AH1@ZPA_J@Z diff --git a/devio/win32_fileio.exp b/devio/win32_fileio.exp new file mode 100644 index 0000000000000000000000000000000000000000..87caf7280c365698e18b4431926a53fcb86d3005 GIT binary patch literal 676 zcmZWlO-{mK5FJ3R8WV_`xN*@13rtM;OI*0I1&ko2ZAvkSCSQ;iQU%%+1mngFcm)&h z!X>;7&a{*io%BuLyuQxN_sOvY+C) zuY+`xG>RL<3?Im(WL+5TUmDp4;PMf%Wa7Wjlg7 z90I~|tuep>8si8KXj;N&JmxK*r7>^&EaPYLog<@@asGcNu!kHVwK2kab2D(1;_w5t zq~LJ#Me?v=_dI9f^rw7AKjY<^QU^X;k!3!swv5Y-CbXy6b4IRUn~UTlESJ$gP#MlEcVDd95IUXG*Jx!xu8f?2*gD z8)U53&{W-EmFs3%uW5#=v**-?R=Hpik)Im=f#dDQ4PP8l6D;c literal 0 HcmV?d00001 diff --git a/devio/win32_fileio.lib b/devio/win32_fileio.lib new file mode 100644 index 0000000000000000000000000000000000000000..bbb77157636093c6e28f8326f5b6599297a5bb77 GIT binary patch literal 1786 zcmb_d-A)rh6#jNwp>9lQkQ**cs=)+r`m;X;5<`}Xi4993ZShL8t!4Yyr7z$G z58#E5;3JU0g%>`655O~ci|0&dx(ltPAk*xepE)yU&N<(iK7QUjZ0)TYxyd)U*6o_s@DDWm$etw@^*cz>VFOnEYsf& zx}6||?^kv_Z`cZ7;%0rL`m3GFhQGd6U!!foe$Q`ryJ4?$07Y*cfgMGVq!7+EV2+p) z#d16)LV^YzN%|$o=WSydecSO7=B@;DZ8erul^RAoby-RdjGQXkpmyVH>*UpjhT&-m zy#D^7mZI#WC`&Z7Y`gRB)BA;5Uj&wk`Kkm-U8GCdpxr!bE|_YGz=1RReoIAysEhoG zv@1$AW{LSjpR!}Ui_D2mG==*tLd!4WVS1W4K843L44lr)ZU(Kx@ME}plv%7k%XsC= zMt}Lr{D5TM$tMtQ1(&9oich+s9Kvmd`#rko>C9VPTqv)+j|bmOhlZVU zZLt(hF}zqx%Xs;w1W6e$cZq{Z>iUR$|MRK3ad(+Z(YvF%>lb +#include + +#include "..\inc\imdisk.h" +#include "..\inc\imdproxy.h" + +#include "deviodrv.h" + +#pragma code_seg("INIT") + +NTSTATUS +DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING) +{ + PAGED_CODE(); + + KdPrint(("DevIoDrv loading.\n")); + +#if DBG + +#if (NTDDI_VERSION >= NTDDI_WS03) + KdRefreshDebuggerNotPresent(); +#endif + + if (!KD_DEBUGGER_NOT_PRESENT) + DbgBreakPoint(); +#endif + + InitializeListHead(&FileTable); + + DriverObject->DriverUnload = DevIoDrvUnload; + + UNICODE_STRING dev_path; + RtlInitUnicodeString(&dev_path, DEVIODRV_DEVICE_NATIVE_NAME); + + PDEVICE_OBJECT DeviceObject; + + NTSTATUS status = IoCreateDevice(DriverObject, 0, &dev_path, FILE_DEVICE_UNKNOWN, 0, FALSE, &DeviceObject); + if (!NT_SUCCESS(status)) + { + DbgPrint("Failed creating device %wZ: %#x\n", &dev_path, status); + return status; + } + UNICODE_STRING symlink_path; + RtlInitUnicodeString(&symlink_path, DEVIODRV_SYMLINK_NATIVE_NAME); + + status = IoCreateUnprotectedSymbolicLink(&symlink_path, &dev_path); + if (!NT_SUCCESS(status)) + { + IoDeleteDevice(DeviceObject); + DbgPrint("Failed creating symlink %wZ to %wZ: %#x\n", &symlink_path, &dev_path, status); + return status; + } + + DeviceObject->Flags |= DO_DIRECT_IO; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = DevIoDrvDispatchCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = DevIoDrvDispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DevIoDrvDispatchCleanup; + + DriverObject->MajorFunction[IRP_MJ_READ] = DevIoDrvDispatchReadWrite; + DriverObject->MajorFunction[IRP_MJ_WRITE] = DevIoDrvDispatchReadWrite; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DevIoDrvDispatchControl; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = DevIoDrvDispatchControl; + + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DevIoDrvDispatchQueryInformation; + + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = DevIoDrvDispatchFlushBuffers; + + KdPrint(("DevIoDrv loaded.\n")); + + return STATUS_SUCCESS; +} + +#pragma code_seg("PAGE") + +void +DevIoDrvUnload(PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + KdPrint(("DevIoDrv unloading.\n")); + + UNICODE_STRING symlink_path; + RtlInitUnicodeString(&symlink_path, DEVIODRV_SYMLINK_NATIVE_NAME); + + NTSTATUS status = IoDeleteSymbolicLink(&symlink_path); + if (!NT_SUCCESS(status)) + { + DbgPrint("Failed removing symlink %wZ: %#x\n", &symlink_path, status); + } + + while (DriverObject->DeviceObject != NULL) + { +#pragma warning(suppress: 6001) + IoDeleteDevice(DriverObject->DeviceObject); + } +} diff --git a/deviodrv/deviodrv.h b/deviodrv/deviodrv.h new file mode 100644 index 0000000..fc38cd4 --- /dev/null +++ b/deviodrv/deviodrv.h @@ -0,0 +1,360 @@ +/* + + General License for Open Source projects published by + Olof Lagerkvist - LTR Data. + + Copyright (c) Olof Lagerkvist, LTR Data + http://www.ltr-data.se + olof@ltr-data.se + + The above copyright notice shall be included in all copies or + substantial portions of the Software. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + As a discretionary option, the above permission notice may be + included in copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + */ + +#pragma once + +typedef struct _OBJECT_CONTEXT +{ + LIST_ENTRY ListEntry; + + UNICODE_STRING Name; + + LONG RefCount; + + LARGE_INTEGER FileSize; + + ULONG AlignmentRequirement; + + ULONGLONG ServiceFlags; + + PFILE_OBJECT Server; + + PFILE_OBJECT Client; + + KSPIN_LOCK IrpListLock; + + LIST_ENTRY ServerMemoryIrpList; + + LIST_ENTRY ServerRequestIrpList; + + LIST_ENTRY ClientReceivedIrpList; + + LIST_ENTRY ClientSentIrpList; + +} OBJECT_CONTEXT, *POBJECT_CONTEXT; + +typedef struct _IRP_QUEUE_ITEM +{ + LIST_ENTRY ListEntry; + + PIRP Irp; + + struct _IRP_QUEUE_ITEM *MemoryIrp; + + PIMDPROXY_DEVIODRV_BUFFER_HEADER MappedBuffer; + + ULONG MappedBufferSize; + +} IRP_QUEUE_ITEM, *PIRP_QUEUE_ITEM; + +#ifdef _NTDDK_ + +#define POOL_TAG 'oIvD' + +IO_COMPLETION_ROUTINE +DevIoDrvIoCtlCallCompletion; + +DRIVER_UNLOAD +DevIoDrvUnload; + +EXTERN_C DRIVER_INITIALIZE +DriverEntry; + +__drv_dispatchType(IRP_MJ_CREATE) +DRIVER_DISPATCH DevIoDrvDispatchCreate; + +__drv_dispatchType(IRP_MJ_CREATE_NAMED_PIPE) +DRIVER_DISPATCH DevIoDrvDispatchCreateNamedPipe; + +__drv_dispatchType(IRP_MJ_CLOSE) +DRIVER_DISPATCH DevIoDrvDispatchClose; + +__drv_dispatchType(IRP_MJ_CLEANUP) +DRIVER_DISPATCH DevIoDrvDispatchCleanup; + +__drv_dispatchType(IRP_MJ_QUERY_INFORMATION) +DRIVER_DISPATCH DevIoDrvDispatchQueryInformation; + +__drv_dispatchType(IRP_MJ_SET_INFORMATION) +DRIVER_DISPATCH DevIoDrvDispatchSetInformation; + +__drv_dispatchType(IRP_MJ_FLUSH_BUFFERS) +DRIVER_DISPATCH DevIoDrvDispatchFlushBuffers; + +__drv_dispatchType(IRP_MJ_READ) +__drv_dispatchType(IRP_MJ_WRITE) +DRIVER_DISPATCH DevIoDrvDispatchReadWrite; + +__drv_dispatchType(IRP_MJ_DEVICE_CONTROL) +__drv_dispatchType(IRP_MJ_FILE_SYSTEM_CONTROL) +DRIVER_DISPATCH DevIoDrvDispatchControl; + +DRIVER_CANCEL DevIoDrvServerIrpCancelRoutine; + +NTSTATUS +DevIoDrvOpenFileTableEntry(PFILE_OBJECT FileObject); + +NTSTATUS +DevIoDrvCreateFileTableEntry(PFILE_OBJECT FileObject); + +NTSTATUS +DevIoDrvCloseFileTableEntry(PFILE_OBJECT FileObject); + +NTSTATUS +DevIoDrvCancelAll(PFILE_OBJECT FileObject, + PKIRQL LowestAssumedIrql); + +void +DevIoDrvSendClientRequestToServer(POBJECT_CONTEXT File, + PIRP_QUEUE_ITEM ClientItem, + PIRP_QUEUE_ITEM ServerItem, + NTSTATUS *ClientStatus, + NTSTATUS *ServerStatus, + PKIRQL LowestAssumedIrql); + +NTSTATUS +DevIoDrvDispatchServerLockMemory(PIRP Irp, + PKIRQL LowestAssumedIrql); + +NTSTATUS +DevIoDrvDispatchServerIORequest(PIRP Irp, + PKIRQL LowestAssumedIrql); + +NTSTATUS +DevIoDrvDispatchClientRequest(PIRP Irp, + PKIRQL LowestAssumedIrql); + +void +DevIoDrvCompleteIrpQueueItem(PIRP_QUEUE_ITEM Item, + NTSTATUS Status, + ULONG_PTR Length, + PKIRQL LowestAssumedIrql); + +void +DevIoDrvCompleteIrp(PIRP Irp, + NTSTATUS Status, + ULONG_PTR Length); + +NTSTATUS +DevIoDrvReserveMemoryIrp(PIRP RequestIrp, + PIRP_QUEUE_ITEM *MemoryIrp, + PIMDPROXY_DEVIODRV_BUFFER_HEADER *MemoryBuffer, + PULONG BufferSize, + PKIRQL LowestAssumedIrql); + +void +DevIoDrvQueueMemoryIrpUnsafe(PIRP_QUEUE_ITEM MemoryIrp, + POBJECT_CONTEXT Context); + +void +DevIoDrvQueueMemoryIrp(PIRP_QUEUE_ITEM MemoryIrp, + POBJECT_CONTEXT Context, + PKIRQL LowestAssumedIrql); + +extern LIST_ENTRY FileTable; + +// +// Optimized spin lock functions +// + +#if _WIN32_WINNT >= 0x0502 + +FORCEINLINE +VOID +__drv_maxIRQL(DISPATCH_LEVEL) +__drv_when(LowestAssumedIrql < DISPATCH_LEVEL, __drv_savesIRQLGlobal(QueuedSpinLock, LockHandle)) + __drv_when(LowestAssumedIrql < DISPATCH_LEVEL, __drv_setsIRQL(DISPATCH_LEVEL)) + DevIoDrvAcquireLock_x64(__inout PKSPIN_LOCK SpinLock, + __out __deref __drv_acquiresExclusiveResource(KeQueuedSpinLockType) + PKLOCK_QUEUE_HANDLE LockHandle, + __in KIRQL LowestAssumedIrql) +{ + if (LowestAssumedIrql >= DISPATCH_LEVEL) + { + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + KeAcquireInStackQueuedSpinLockAtDpcLevel(SpinLock, LockHandle); + } + else + { + KeAcquireInStackQueuedSpinLock(SpinLock, LockHandle); + } +} + +FORCEINLINE +VOID +__drv_requiresIRQL(DISPATCH_LEVEL) +__drv_when(*LowestAssumedIrql < DISPATCH_LEVEL, __drv_restoresIRQLGlobal(QueuedSpinLock, LockHandle)) + DevIoDrvReleaseLock_x64( + __in __deref __drv_releasesExclusiveResource(KeQueuedSpinLockType) + PKLOCK_QUEUE_HANDLE LockHandle, + __inout PKIRQL LowestAssumedIrql) +{ + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + if (*LowestAssumedIrql >= DISPATCH_LEVEL) + { + KeReleaseInStackQueuedSpinLockFromDpcLevel(LockHandle); + } + else + { + KeReleaseInStackQueuedSpinLock(LockHandle); + *LowestAssumedIrql = LockHandle->OldIrql; + } +} + +#endif + +FORCEINLINE +VOID +__drv_maxIRQL(DISPATCH_LEVEL) +__drv_when(LowestAssumedIrql < DISPATCH_LEVEL, __drv_setsIRQL(DISPATCH_LEVEL)) + DevIoDrvAcquireLock_x86(__inout __deref __drv_acquiresExclusiveResource(KeSpinLockType) PKSPIN_LOCK SpinLock, + __drv_when(LowestAssumedIrql < DISPATCH_LEVEL, __out __deref __drv_savesIRQL) PKIRQL OldIrql, + __in KIRQL LowestAssumedIrql) +{ + if (LowestAssumedIrql >= DISPATCH_LEVEL) + { + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + KeAcquireSpinLockAtDpcLevel(SpinLock); + } + else + { + KeAcquireSpinLock(SpinLock, OldIrql); + } +} + +FORCEINLINE +VOID +__drv_requiresIRQL(DISPATCH_LEVEL) +DevIoDrvReleaseLock_x86( + __inout __deref __drv_releasesExclusiveResource(KeSpinLockType) PKSPIN_LOCK SpinLock, + __in __drv_when(*LowestAssumedIrql < DISPATCH_LEVEL, __drv_restoresIRQL) KIRQL OldIrql, + __inout __deref PKIRQL LowestAssumedIrql) +{ + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + if (*LowestAssumedIrql >= DISPATCH_LEVEL) + { + KeReleaseSpinLockFromDpcLevel(SpinLock); + } + else + { + KeReleaseSpinLock(SpinLock, OldIrql); + *LowestAssumedIrql = OldIrql; + } +} + +#ifdef _AMD64_ + +#define DevIoDrvAcquireLock DevIoDrvAcquireLock_x64 + +#define DevIoDrvReleaseLock DevIoDrvReleaseLock_x64 + +#else + +#define DevIoDrvAcquireLock(SpinLock, LockHandle, LowestAssumedIrql) \ + { \ + (LockHandle)->LockQueue.Lock = (SpinLock); \ + DevIoDrvAcquireLock_x86((LockHandle)->LockQueue.Lock, &(LockHandle)->OldIrql, (LowestAssumedIrql)); \ + } + +#define DevIoDrvReleaseLock(LockHandle, LowestAssumedIrql) \ + { \ + DevIoDrvReleaseLock_x86((LockHandle)->LockQueue.Lock, (LockHandle)->OldIrql, (LowestAssumedIrql)); \ + } + +#endif + +FORCEINLINE +VOID +DevIoDrvInterlockedInsertTailList( + PLIST_ENTRY ListHead, + PLIST_ENTRY ListEntry, + PKSPIN_LOCK SpinLock, + PKIRQL LowestAssumedIrql) +{ + KLOCK_QUEUE_HANDLE lock_handle; + + DevIoDrvAcquireLock(SpinLock, &lock_handle, *LowestAssumedIrql); + + InsertTailList(ListHead, ListEntry); + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); +} + +FORCEINLINE +VOID +DevIoDrvInterlockedInsertHeadList( + PLIST_ENTRY ListHead, + PLIST_ENTRY ListEntry, + PKSPIN_LOCK SpinLock, + PKIRQL LowestAssumedIrql) +{ + KLOCK_QUEUE_HANDLE lock_handle; + + DevIoDrvAcquireLock(SpinLock, &lock_handle, *LowestAssumedIrql); + + InsertHeadList(ListHead, ListEntry); + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); +} + +FORCEINLINE +PLIST_ENTRY +DevIoDrvInterlockedRemoveHeadList( + PLIST_ENTRY ListHead, + PKSPIN_LOCK SpinLock, + PKIRQL LowestAssumedIrql) +{ + KLOCK_QUEUE_HANDLE lock_handle; + PLIST_ENTRY item; + + DevIoDrvAcquireLock(SpinLock, &lock_handle, *LowestAssumedIrql); + + item = RemoveHeadList(ListHead); + + if (item == ListHead) + { + item = NULL; + } + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + return item; +} + +#endif diff --git a/deviodrv/deviodrv.inf b/deviodrv/deviodrv.inf new file mode 100644 index 0000000..bc85bbd --- /dev/null +++ b/deviodrv/deviodrv.inf @@ -0,0 +1,54 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 10/26/2021,2.1.0.00070 +CatalogFile = deviodrv.cat + + +[SourceDisksNames] +1 = "DevIO Client Driver" + + +[SourceDisksFiles.x86] +deviodrv.sys = 1, i386 + +[SourceDisksFiles.ia64] +deviodrv.sys = 1, ia64 + +[SourceDisksFiles.amd64] +deviodrv.sys = 1, amd64 + +[SourceDisksFiles.arm] +deviodrv.sys = 1, arm + +[SourceDisksFiles.arm64] +deviodrv.sys = 1, arm64 + +[DestinationDirs] +DevIoDrvSysFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = DevIoDrvSysFiles + + +[DevIoDrvSysFiles] +deviodrv.sys + + +[DefaultInstall.ntx86.Services] +AddService = DevIoDrv, , DevIoDrvDrv + + +[DevIoDrvDrv] +DisplayName = "DevIO Client Driver" +StartType = 2 +ServiceType = 1 +ErrorControl = 0 +ServiceBinary = %12%\DevIoDrv.sys diff --git a/deviodrv/deviodrv.rc b/deviodrv/deviodrv.rc new file mode 100644 index 0000000..79a270e --- /dev/null +++ b/deviodrv/deviodrv.rc @@ -0,0 +1,43 @@ +#define UNICODE +#define _UNICODE +#include + +#include "..\inc\imdiskver.h" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO +FILEVERSION IMDISK_RC_VERSION_FLD,1 +PRODUCTVERSION IMDISK_RC_VERSION_FLD,1 +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifndef DEBUG + FILEFLAGS 0 +#else + FILEFLAGS VS_FF_DEBUG | VS_FF_PRERELEASE +#endif +FILEOS VOS_NT +FILETYPE VFT_DRV +FILESUBTYPE VFT2_DRV_INSTALLABLE +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Olof Lagerkvist\0" + VALUE "FileDescription", "DevIO Client Driver\0" + VALUE "FileVersion", IMDISK_RC_VERSION_STR ".1\0" + VALUE "InternalName", "deviodrv\0" + VALUE "LegalCopyright", "Copyright © 2019 Olof Lagerkvist.\0" + VALUE "OriginalFilename", "deviodrv.sys\0" + VALUE "ProductName", "deviodrv\0" + VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".1\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/deviodrv/deviodrv.vcxproj b/deviodrv/deviodrv.vcxproj new file mode 100644 index 0000000..ac5554d --- /dev/null +++ b/deviodrv/deviodrv.vcxproj @@ -0,0 +1,193 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + + + + {457B6C05-3FED-4056-A4B3-B1B110242F14} + {dd38f7fc-d7bd-488b-9242-7d8754cde80d} + 12.0 + Debug + Win32 + deviodrv + $(LatestTargetPlatformVersion) + + + + true + WindowsKernelModeDriver8.1 + Driver + WDM + + + false + WindowsKernelModeDriver8.1 + Driver + WDM + + + true + WindowsKernelModeDriver8.1 + Driver + WDM + + + false + WindowsKernelModeDriver8.1 + Driver + WDM + + + true + WindowsKernelModeDriver8.1 + Driver + WDM + + + false + WindowsKernelModeDriver8.1 + Driver + WDM + + + true + WindowsKernelModeDriver10.0 + Driver + WDM + + + false + WindowsKernelModeDriver10.0 + Driver + WDM + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DbgengKernelDebugger + $(ConfigurationName)\$(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + DbgengKernelDebugger + $(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + DbgengKernelDebugger + $(ConfigurationName)\$(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + DbgengKernelDebugger + $(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + DbgengKernelDebugger + $(ConfigurationName)\$(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + DbgengKernelDebugger + $(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + DbgengKernelDebugger + $(ConfigurationName)\$(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + DbgengKernelDebugger + $(InfArch)\ + $(ConfigurationName)\$(InfArch)\ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/deviodrv/dispatch.cpp b/deviodrv/dispatch.cpp new file mode 100644 index 0000000..105e514 --- /dev/null +++ b/deviodrv/dispatch.cpp @@ -0,0 +1,451 @@ +/* + + General License for Open Source projects published by + Olof Lagerkvist - LTR Data. + + Copyright (c) Olof Lagerkvist, LTR Data + http://www.ltr-data.se + olof@ltr-data.se + + The above copyright notice shall be included in all copies or + substantial portions of the Software. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + As a discretionary option, the above permission notice may be + included in copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + */ + +#include +#include + +#include "..\inc\imdisk.h" +#include "..\inc\imdproxy.h" +#include "..\inc\ntkmapi.h" + +#include "deviodrv.h" + +NTSTATUS +DevIoDrvDispatchCreate(PDEVICE_OBJECT, PIRP Irp) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + + Irp->IoStatus.Information = 0; + + union CREATE_OPTIONS + { + struct + { + ULONG CreateOptions : 24; + ULONG CreateDisposition : 8; + }; + ULONG Options; + } Options; + Options.Options = io_stack->Parameters.Create.Options; + + KdPrint(("Creating handle for '%wZ' FileObject=%p DesiredAccess=%#x CreateDisposition=%#x CreateOptions=%#x Flags=%#x\n", + &io_stack->FileObject->FileName, io_stack->FileObject, io_stack->Parameters.Create.SecurityContext->DesiredAccess, + Options.CreateDisposition, Options.CreateOptions, io_stack->FileObject->Flags)); + + NTSTATUS status; + + if (Options.CreateDisposition == FILE_CREATE) // Create server end + { + status = DevIoDrvCreateFileTableEntry(io_stack->FileObject); + + if (status == STATUS_SUCCESS) + { + Irp->IoStatus.Information = FILE_CREATED; + } + else if (status == STATUS_OBJECT_NAME_COLLISION) + { + Irp->IoStatus.Information = FILE_EXISTS; + } + } + else if (Options.CreateDisposition == FILE_OPEN) // Open client end + { + status = DevIoDrvOpenFileTableEntry(io_stack->FileObject); + + if (status == STATUS_SUCCESS) + { + Irp->IoStatus.Information = FILE_OPENED; + } + else if (status == STATUS_OBJECT_NAME_NOT_FOUND || + status == STATUS_SHARING_VIOLATION) + { + Irp->IoStatus.Information = FILE_DOES_NOT_EXIST; + } + } + else + { + status = STATUS_INVALID_DEVICE_REQUEST; + } + + Irp->IoStatus.Status = status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; +} + +NTSTATUS +DevIoDrvDispatchClose(PDEVICE_OBJECT, PIRP Irp) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + + KdPrint(("Closing handle for FileObject=%p Name='%wZ'\n", + io_stack->FileObject, &((POBJECT_CONTEXT)io_stack->FileObject->FsContext2)->Name)); + + while (!NT_SUCCESS(DevIoDrvCloseFileTableEntry(io_stack->FileObject))) + { + LARGE_INTEGER interval; + interval.QuadPart = -200000; + KeDelayExecutionThread(KernelMode, TRUE, &interval); + } + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS +DevIoDrvDispatchCleanup(PDEVICE_OBJECT, PIRP Irp) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + + Irp->IoStatus.Information = 0; + + KdPrint(("IRP=%p Cleanup request for FileObject=%p Name='%wZ'\n", + Irp, io_stack->FileObject, &((POBJECT_CONTEXT)io_stack->FileObject->FsContext2)->Name)); + + KIRQL lowest_assumed_irql = PASSIVE_LEVEL; + + NTSTATUS status = DevIoDrvCancelAll(io_stack->FileObject, &lowest_assumed_irql); + + Irp->IoStatus.Status = status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; +} + +NTSTATUS +DevIoDrvDispatchControl(PDEVICE_OBJECT, PIRP Irp) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + if (context == NULL || + (io_stack->MajorFunction != IRP_MJ_DEVICE_CONTROL && + !(io_stack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && + (io_stack->MinorFunction == IRP_MN_KERNEL_CALL || + io_stack->MinorFunction == IRP_MN_USER_FS_REQUEST)))) + { + DevIoDrvCompleteIrp(Irp, STATUS_INVALID_DEVICE_REQUEST, 0); + + return STATUS_INVALID_DEVICE_REQUEST; + } + + Irp->IoStatus.Information = 0; + + KIRQL lowest_assumed_irql = PASSIVE_LEVEL; + + NTSTATUS status = STATUS_INVALID_DEVICE_REQUEST; + + switch (io_stack->Parameters.DeviceIoControl.IoControlCode) + { + case FSCTL_SET_ZERO_DATA: + { + PFILE_ZERO_DATA_INFORMATION zero = (PFILE_ZERO_DATA_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + if (io_stack->Parameters.FileSystemControl.InputBufferLength != sizeof FILE_ZERO_DATA_INFORMATION || + zero->BeyondFinalZero.QuadPart < zero->FileOffset.QuadPart) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + return DevIoDrvDispatchClientRequest(Irp, &lowest_assumed_irql); + } + + case FSCTL_FILE_LEVEL_TRIM: + { + PFILE_LEVEL_TRIM trim = (PFILE_LEVEL_TRIM)Irp->AssociatedIrp.SystemBuffer; + + if (io_stack->Parameters.FileSystemControl.InputBufferLength < sizeof FILE_LEVEL_TRIM || + io_stack->Parameters.FileSystemControl.InputBufferLength < + FIELD_OFFSET(FILE_LEVEL_TRIM, Ranges) + trim->NumRanges * (ULONGLONG)sizeof(*trim->Ranges)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + return DevIoDrvDispatchClientRequest(Irp, &lowest_assumed_irql); + } + + case IOCTL_DEVIODRV_EXCHANGE_IO: + { + if (context->Server != io_stack->FileObject) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + return DevIoDrvDispatchServerIORequest(Irp, &lowest_assumed_irql); + } + + case IOCTL_DEVIODRV_LOCK_MEMORY: + { + if (context->Server != io_stack->FileObject) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + return DevIoDrvDispatchServerLockMemory(Irp, &lowest_assumed_irql); + } + } + + Irp->IoStatus.Status = status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; +} + +NTSTATUS +DevIoDrvDispatchSetInformation(PDEVICE_OBJECT, PIRP Irp) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + + Irp->IoStatus.Information = 0; + + NTSTATUS status = STATUS_INVALID_DEVICE_REQUEST; + + switch (io_stack->Parameters.SetFile.FileInformationClass) + { + case FilePositionInformation: + { + PFILE_POSITION_INFORMATION position_info = + (PFILE_POSITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + if (io_stack->Parameters.SetFile.Length < + sizeof(FILE_POSITION_INFORMATION)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + if (io_stack->FileObject != NULL) + { + io_stack->FileObject->CurrentByteOffset = + position_info->CurrentByteOffset; + } + + status = STATUS_SUCCESS; + break; + } + + case FileBasicInformation: + case FileDispositionInformation: + case FileValidDataLengthInformation: + status = STATUS_SUCCESS; + break; + + default: + { + KdPrint(("DevIoDrv: Unknown SetInformation function %#x.\n", + io_stack->Parameters.SetFile.FileInformationClass)); + + status = STATUS_INVALID_DEVICE_REQUEST; + } + } + + Irp->IoStatus.Status = status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; +} + +NTSTATUS +DevIoDrvDispatchReadWrite(PDEVICE_OBJECT, PIRP Irp) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + + Irp->IoStatus.Information = 0; + + KdPrint(("IRP=%p Read for FileObject=%p\n", Irp, io_stack->FileObject)); + + if ((io_stack->Parameters.Read.ByteOffset.QuadPart < 0) || + ((io_stack->Parameters.Read.ByteOffset.QuadPart + + io_stack->Parameters.Read.Length) < 0)) + { + KdPrint(("DevIoDrv: Read/write attempt on negative offset.\n")); + + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_PARAMETER; + } + + NTSTATUS status; + + KIRQL lowest_assumed_irql = PASSIVE_LEVEL; + + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + if (context == NULL) + { + status = STATUS_INTERNAL_ERROR; + } + else if (context->Server == NULL) + { + KdPrint(("DevIoDrv: IRP=%p Request to disconnected device.\n", Irp)); + + status = STATUS_DEVICE_DOES_NOT_EXIST; + } + else if (io_stack->MajorFunction == IRP_MJ_READ && + io_stack->Parameters.Read.Length == 0 && + io_stack->Parameters.Read.ByteOffset.QuadPart < context->FileSize.QuadPart) + { + status = STATUS_SUCCESS; + } + else if (io_stack->MajorFunction == IRP_MJ_WRITE && + FlagOn(context->ServiceFlags, IMDPROXY_FLAG_RO)) + { + status = STATUS_MEDIA_WRITE_PROTECTED; + } + else if (io_stack->MajorFunction == IRP_MJ_WRITE && + io_stack->Parameters.Write.Length == 0 && + io_stack->Parameters.Write.ByteOffset.QuadPart < context->FileSize.QuadPart) + { + status = STATUS_SUCCESS; + } + else if (context->Client == io_stack->FileObject || + context->Server == io_stack->FileObject) + { + return DevIoDrvDispatchClientRequest(Irp, &lowest_assumed_irql); + } + else + { + status = STATUS_INTERNAL_ERROR; + } + + Irp->IoStatus.Status = status; + + IoCompleteRequest(Irp, status == STATUS_SUCCESS ? IO_DISK_INCREMENT : IO_NO_INCREMENT); + + return status; +} + +NTSTATUS +DevIoDrvDispatchQueryInformation(PDEVICE_OBJECT, PIRP Irp) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + KdPrint(("IRP=%p Query information for '%wZ' FileObject=%p\n", + Irp, &context->Name, io_stack->FileObject)); + + Irp->IoStatus.Information = 0; + + NTSTATUS status; + + status = STATUS_INVALID_DEVICE_REQUEST; + + if (context == NULL) + { + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; + } + + switch (io_stack->Parameters.QueryFile.FileInformationClass) + { + case FileStandardInformation: + { + PFILE_STANDARD_INFORMATION standard_info = + (PFILE_STANDARD_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + if (io_stack->Parameters.QueryFile.Length < sizeof(FILE_STANDARD_INFORMATION)) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + standard_info->AllocationSize = + standard_info->EndOfFile = context->FileSize; + + Irp->IoStatus.Information = sizeof(FILE_STANDARD_INFORMATION); + status = STATUS_SUCCESS; + break; + } + + case FilePositionInformation: + { + PFILE_POSITION_INFORMATION position_info = + (PFILE_POSITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + if (io_stack->Parameters.QueryFile.Length < + sizeof(FILE_POSITION_INFORMATION)) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + position_info->CurrentByteOffset = + io_stack->FileObject->CurrentByteOffset; + + Irp->IoStatus.Information = sizeof(FILE_POSITION_INFORMATION); + + status = STATUS_SUCCESS; + break; + } + + default: + KdPrint(("DevIoDrv: Unknown QueryInformation function %#x.\n", + io_stack->Parameters.QueryFile.FileInformationClass)); + + status = STATUS_INVALID_DEVICE_REQUEST; + } + + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; +} + +NTSTATUS +DevIoDrvDispatchFlushBuffers(PDEVICE_OBJECT, PIRP Irp) +{ + KdPrint(("IRP=%p Flush buffers for FileObject=%p\n", + Irp, IoGetCurrentIrpStackLocation(Irp)->FileObject)); + + DevIoDrvCompleteIrp(Irp, STATUS_SUCCESS, 0); + + return STATUS_SUCCESS; +} + diff --git a/deviodrv/filetable.cpp b/deviodrv/filetable.cpp new file mode 100644 index 0000000..5d16ded --- /dev/null +++ b/deviodrv/filetable.cpp @@ -0,0 +1,211 @@ +/* + + General License for Open Source projects published by + Olof Lagerkvist - LTR Data. + + Copyright (c) Olof Lagerkvist, LTR Data + http://www.ltr-data.se + olof@ltr-data.se + + The above copyright notice shall be included in all copies or + substantial portions of the Software. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + As a discretionary option, the above permission notice may be + included in copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + */ + +#include +#include +#include + +#include "..\inc\imdisk.h" +#include "..\inc\imdproxy.h" +#include "..\inc\ntkmapi.h" + +#include "deviodrv.h" + +#pragma code_seg("PAGE") + +LIST_ENTRY FileTable; + +LONG FileTableListLock; + +NTSTATUS DevIoDrvOpenFileTableEntry(PFILE_OBJECT FileObject) +{ + PAGED_CODE(); + + if (InterlockedExchange(&FileTableListLock, 1) != 0) + { + return STATUS_DEVICE_BUSY; + } + + PLIST_ENTRY entry = FileTable.Flink; + + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + POBJECT_CONTEXT context; + + while (entry != &FileTable) + { + context = CONTAINING_RECORD(entry, OBJECT_CONTEXT, ListEntry); + + if (RtlEqualUnicodeString(&FileObject->FileName, &context->Name, TRUE)) + { + if (InterlockedIncrement(&context->RefCount) != 2) + { + status = STATUS_SHARING_VIOLATION; + } + else + { + context->Client = FileObject; + FileObject->FsContext2 = context; + status = STATUS_SUCCESS; + } + + break; + } + + entry = entry->Flink; + } + + InterlockedExchange(&FileTableListLock, 0); + + return status; +} + +NTSTATUS DevIoDrvCreateFileTableEntry(PFILE_OBJECT FileObject) +{ + PAGED_CODE(); + + if (InterlockedExchange(&FileTableListLock, 1) != 0) + { + return STATUS_DEVICE_BUSY; + } + + PLIST_ENTRY entry = FileTable.Flink; + + NTSTATUS status = STATUS_SUCCESS; + + POBJECT_CONTEXT context = NULL; + + while (entry != &FileTable) + { + context = CONTAINING_RECORD(entry, OBJECT_CONTEXT, ListEntry); + + if (RtlEqualUnicodeString(&FileObject->FileName, &context->Name, TRUE)) + { + status = STATUS_OBJECT_NAME_COLLISION; + break; + } + + entry = entry->Flink; + } + + if (NT_SUCCESS(status)) + { + context = (POBJECT_CONTEXT)ExAllocatePoolWithTag(NonPagedPool, sizeof OBJECT_CONTEXT, POOL_TAG); + + if (context == NULL) + { + status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + if (NT_SUCCESS(status)) + { + RtlZeroMemory(context, sizeof OBJECT_CONTEXT); + + context->Name.Buffer = (PWCHAR)ExAllocatePoolWithTag(NonPagedPool, FileObject->FileName.Length, POOL_TAG); + + if (context->Name.Buffer == NULL) + { + ExFreePoolWithTag(context, POOL_TAG); + status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + if (NT_SUCCESS(status)) + { + context->Name.MaximumLength = context->Name.Length = FileObject->FileName.Length; + RtlCopyUnicodeString(&context->Name, &FileObject->FileName); + + KeInitializeSpinLock(&context->IrpListLock); + InitializeListHead(&context->ServerRequestIrpList); + InitializeListHead(&context->ServerMemoryIrpList); + InitializeListHead(&context->ClientReceivedIrpList); + InitializeListHead(&context->ClientSentIrpList); + + context->Server = FileObject; + context->RefCount = 1; + FileObject->FsContext2 = context; + + InsertHeadList(&FileTable, &context->ListEntry); + } + + InterlockedExchange(&FileTableListLock, 0); + + return status; +} + +NTSTATUS DevIoDrvCloseFileTableEntry(PFILE_OBJECT FileObject) +{ + PAGED_CODE(); + + if (InterlockedExchange(&FileTableListLock, 1) != 0) + { + return STATUS_RESOURCE_IN_USE; + } + + POBJECT_CONTEXT context = (POBJECT_CONTEXT)FileObject->FsContext2; + + if (FileObject == context->Server) + { + context->Server = NULL; + } + else if (FileObject == context->Client) + { + context->Client = NULL; + } + + if (InterlockedDecrement(&context->RefCount) > 0) + { + KdPrint(("Reference to file '%wZ' closing. Not last reference.\n", &context->Name)); + + InterlockedExchange(&FileTableListLock, 0); + return STATUS_SUCCESS; + } + + KdPrint(("Last reference to file '%wZ' closing.\n", &context->Name)); + + RemoveEntryList(&context->ListEntry); + + FileObject->FsContext2 = NULL; + + InterlockedExchange(&FileTableListLock, 0); + + ExFreePoolWithTag(context->Name.Buffer, POOL_TAG); + + ExFreePoolWithTag(context, POOL_TAG); + + return STATUS_SUCCESS; +} + diff --git a/deviodrv/irpfwd.cpp b/deviodrv/irpfwd.cpp new file mode 100644 index 0000000..18cf0ed --- /dev/null +++ b/deviodrv/irpfwd.cpp @@ -0,0 +1,960 @@ +/* + + General License for Open Source projects published by + Olof Lagerkvist - LTR Data. + + Copyright (c) Olof Lagerkvist, LTR Data + http://www.ltr-data.se + olof@ltr-data.se + + The above copyright notice shall be included in all copies or + substantial portions of the Software. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + As a discretionary option, the above permission notice may be + included in copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + */ + +#include +#include +#include + +#include "..\inc\imdisk.h" +#include "..\inc\imdproxy.h" +#include "..\inc\ntkmapi.h" + +#include "deviodrv.h" + +NTSTATUS +DevIoDrvCancelAll(PFILE_OBJECT FileObject, + PKIRQL LowestAssumedIrql) +{ + POBJECT_CONTEXT context = (POBJECT_CONTEXT)FileObject->FsContext2; + KLOCK_QUEUE_HANDLE lock_handle; + + KdPrint(("Request to cancel all pending IRPs for FileObject=%p.\n", + FileObject)); + + context->Server = NULL; + + DevIoDrvAcquireLock(&context->IrpListLock, &lock_handle, *LowestAssumedIrql); + + KIRQL raised_irql = DISPATCH_LEVEL; + + for (;;) + { + KIRQL cancel_irql; + IoAcquireCancelSpinLock(&cancel_irql); + + PLIST_ENTRY entry = RemoveHeadList(&context->ServerRequestIrpList); + + if (entry == &context->ServerRequestIrpList) + { + entry = RemoveHeadList(&context->ServerMemoryIrpList); + + if (entry == &context->ServerMemoryIrpList) + { + IoReleaseCancelSpinLock(cancel_irql); + break; + } + } + + PIRP_QUEUE_ITEM item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + + IoSetCancelRoutine(item->Irp, NULL); + + IoReleaseCancelSpinLock(cancel_irql); + + if (item->MemoryIrp != NULL) + { + item->MappedBuffer = NULL; + + for (PLIST_ENTRY mem_entry = context->ServerMemoryIrpList.Flink; + mem_entry != &context->ServerMemoryIrpList; + mem_entry = mem_entry->Flink) + { + PIRP_QUEUE_ITEM mem_item = CONTAINING_RECORD(mem_entry, IRP_QUEUE_ITEM, ListEntry); + + if (mem_item == item->MemoryIrp) + { + item->MappedBuffer = mem_item->MappedBuffer; + item->MappedBufferSize = mem_item->MappedBufferSize; + break; + } + } + + item->MemoryIrp = NULL; + } + + //KdPrint(("Closing server connection '%wZ' IRP=%p\n", &context->Name, item->Irp)); + + if (item->MappedBuffer == NULL) + { + DevIoDrvCompleteIrpQueueItem(item, STATUS_DEVICE_DOES_NOT_EXIST, 0, &raised_irql); + } + else + { + item->MappedBuffer->request_code = IMDPROXY_REQ_CLOSE; + item->MappedBuffer->io_tag = 0; + PIMDPROXY_CLOSE_REQ header = (PIMDPROXY_CLOSE_REQ)(item->MappedBuffer + 1); + header->request_code = IMDPROXY_REQ_CLOSE; + DevIoDrvCompleteIrpQueueItem(item, STATUS_SUCCESS, IMDPROXY_HEADER_SIZE, &raised_irql); + } + } + + while (!IsListEmpty(&context->ClientReceivedIrpList)) + { + PLIST_ENTRY entry = context->ClientReceivedIrpList.Flink; + PIRP_QUEUE_ITEM item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + + KdPrint(("Canceling received client IRP=%p\n", item->Irp)); + + RemoveEntryList(entry); + + DevIoDrvCompleteIrpQueueItem(item, STATUS_DEVICE_DOES_NOT_EXIST, 0, &raised_irql); + } + + while (!IsListEmpty(&context->ClientSentIrpList)) + { + PLIST_ENTRY entry = context->ClientSentIrpList.Flink; + PIRP_QUEUE_ITEM item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + + KdPrint(("Canceling processed client IRP=%p\n", item->Irp)); + + RemoveEntryList(entry); + + DevIoDrvCompleteIrpQueueItem(item, STATUS_DEVICE_DOES_NOT_EXIST, 0, &raised_irql); + } + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + return STATUS_SUCCESS; +} + +PIRP_QUEUE_ITEM +DevIoDrvGetSentClientRequest(POBJECT_CONTEXT File, + ULONGLONG Tag, + PKIRQL LowestAssumedIrql) +{ + KLOCK_QUEUE_HANDLE lock_handle; + + PIRP_QUEUE_ITEM found_item = NULL; + + DevIoDrvAcquireLock(&File->IrpListLock, &lock_handle, *LowestAssumedIrql); + + for (PLIST_ENTRY entry = File->ClientSentIrpList.Flink; entry != &File->ClientSentIrpList; entry = entry->Flink) + { + if ((ULONGLONG)(ULONG_PTR)entry == Tag) + { + RemoveEntryList(entry); + found_item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + break; + } + } + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + return found_item; +} + +void +DevIoDrvCompleteIrpQueueItem(PIRP_QUEUE_ITEM Item, + NTSTATUS Status, + ULONG_PTR Length, + PKIRQL LowestAssumedIrql) +{ + if (Status == STATUS_BUFFER_TOO_SMALL && + Item->MemoryIrp != NULL) + { + DevIoDrvCompleteIrpQueueItem(Item->MemoryIrp, Status, Length, LowestAssumedIrql); + Item->MemoryIrp = NULL; + } + else if (Item->MemoryIrp != NULL) + { + POBJECT_CONTEXT context = (POBJECT_CONTEXT) + IoGetCurrentIrpStackLocation(Item->Irp)->FileObject->FsContext2; + + DevIoDrvQueueMemoryIrp(Item->MemoryIrp, context, LowestAssumedIrql); + } + + DevIoDrvCompleteIrp(Item->Irp, Status, Length); + + ExFreePoolWithTag(Item, POOL_TAG); +} + +void +DevIoDrvCompleteIrp(PIRP Irp, + NTSTATUS Status, + ULONG_PTR Length) +{ + KdPrint(("Completing IRP=%p with status %#x\n", Irp, Status)); + + Irp->IoStatus.Information = Length; + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, Status == STATUS_SUCCESS ? IO_DISK_INCREMENT : IO_NO_INCREMENT); +} + +NTSTATUS +DevIoDrvReserveMemoryIrp(PIRP RequestIrp, + PIRP_QUEUE_ITEM *MemoryIrp, + PIMDPROXY_DEVIODRV_BUFFER_HEADER *MemoryBuffer, + PULONG BufferSize, + PKIRQL LowestAssumedIrql) +{ + *MemoryIrp = NULL; + *MemoryBuffer = NULL; + *BufferSize = 0; + + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(RequestIrp); + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + if (io_stack->Parameters.DeviceIoControl.OutputBufferLength > 0) + { + *MemoryBuffer = + (PIMDPROXY_DEVIODRV_BUFFER_HEADER)MmGetSystemAddressForMdlSafe(RequestIrp->MdlAddress, + NormalPagePriority); + + if (*MemoryBuffer != NULL) + { + *BufferSize = io_stack->Parameters.DeviceIoControl.OutputBufferLength; + return STATUS_SUCCESS; + } + else + { + return STATUS_INSUFFICIENT_RESOURCES; + } + } + + if (io_stack->Parameters.DeviceIoControl.InputBufferLength == 0) + { + return STATUS_INVALID_PARAMETER; + } + + KLOCK_QUEUE_HANDLE lock_handle; + + DevIoDrvAcquireLock(&context->IrpListLock, &lock_handle, *LowestAssumedIrql); + + for (PLIST_ENTRY entry = context->ServerMemoryIrpList.Flink; entry != &context->ServerMemoryIrpList; entry = entry->Flink) + { + PIRP_QUEUE_ITEM item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + PIO_STACK_LOCATION mem_irp_io_stack = IoGetCurrentIrpStackLocation(item->Irp); + + if (io_stack->Parameters.DeviceIoControl.InputBufferLength == mem_irp_io_stack->Parameters.DeviceIoControl.InputBufferLength && + RtlEqualMemory(RequestIrp->AssociatedIrp.SystemBuffer, item->Irp->AssociatedIrp.SystemBuffer, + io_stack->Parameters.DeviceIoControl.InputBufferLength)) + { + KIRQL cancel_irql; + + IoAcquireCancelSpinLock(&cancel_irql); + + if (item->Irp->Cancel) + { + IoReleaseCancelSpinLock(cancel_irql); + continue; + } + + IoSetCancelRoutine(item->Irp, NULL); + + IoReleaseCancelSpinLock(cancel_irql); + + RemoveEntryList(&item->ListEntry); + + *MemoryIrp = item; + *MemoryBuffer = item->MappedBuffer; + *BufferSize = mem_irp_io_stack->Parameters.DeviceIoControl.OutputBufferLength; + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + return STATUS_SUCCESS; + } + } + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + return STATUS_INVALID_PARAMETER; +} + +void +DevIoDrvQueueMemoryIrpUnsafe(PIRP_QUEUE_ITEM MemoryIrp, + POBJECT_CONTEXT Context) +{ + if (MemoryIrp == NULL) + { + return; + } + + IoSetCancelRoutine(MemoryIrp->Irp, DevIoDrvServerIrpCancelRoutine); + + IoMarkIrpPending(MemoryIrp->Irp); + + InsertTailList(&Context->ServerMemoryIrpList, &MemoryIrp->ListEntry); +} + +void +DevIoDrvQueueMemoryIrp(PIRP_QUEUE_ITEM MemoryIrp, + POBJECT_CONTEXT Context, + PKIRQL LowestAssumedIrql) +{ + if (MemoryIrp == NULL) + { + return; + } + + KLOCK_QUEUE_HANDLE lock_handle; + DevIoDrvAcquireLock(&Context->IrpListLock, &lock_handle, *LowestAssumedIrql); + + KIRQL cancel_irql; + + IoAcquireCancelSpinLock(&cancel_irql); + + DevIoDrvQueueMemoryIrpUnsafe(MemoryIrp, Context); + + IoReleaseCancelSpinLock(cancel_irql); + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); +} + +NTSTATUS +DevIoDrvDispatchServerLockMemory(PIRP Irp, + PKIRQL LowestAssumedIrql) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + KdPrint(("IRP=%p Server Memory Lock request.\n", Irp)); + + if (io_stack->Parameters.DeviceIoControl.OutputBufferLength < IMDPROXY_HEADER_SIZE) + { + KdPrint(("IRP=%p Buffer too small: %u.\n", + Irp, io_stack->Parameters.DeviceIoControl.OutputBufferLength)); + + DevIoDrvCompleteIrp(Irp, STATUS_BUFFER_TOO_SMALL, 0); + + return STATUS_BUFFER_TOO_SMALL; + } + + PIMDPROXY_DEVIODRV_BUFFER_HEADER buffer = + (PIMDPROXY_DEVIODRV_BUFFER_HEADER)MmGetSystemAddressForMdlSafe(Irp->MdlAddress, + NormalPagePriority); + + if (buffer == NULL) + { + KdPrint(("IRP=%p Failed getting direct I/O address.\n", + Irp)); + + DevIoDrvCompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + KdPrint(("IRP=%p Request to lock memory. Queuing server IRP.\n", Irp)); + + PIRP_QUEUE_ITEM memory_irp = (PIRP_QUEUE_ITEM) + ExAllocatePoolWithTag(NonPagedPool, sizeof IRP_QUEUE_ITEM, POOL_TAG); + + if (memory_irp == NULL) + { + DevIoDrvCompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(memory_irp, sizeof(*memory_irp)); + + memory_irp->Irp = Irp; + memory_irp->MappedBuffer = buffer; + + DevIoDrvQueueMemoryIrp(memory_irp, context, LowestAssumedIrql); + + return STATUS_PENDING; +} + +NTSTATUS +DevIoDrvDispatchServerIORequest(PIRP Irp, + PKIRQL LowestAssumedIrql) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + KdPrint(("IRP=%p Server I/O request.\n", Irp)); + + if (io_stack->Parameters.DeviceIoControl.OutputBufferLength > 0 && + io_stack->Parameters.DeviceIoControl.OutputBufferLength < IMDPROXY_HEADER_SIZE) + { + KdPrint(("IRP=%p Buffer too small: %u.\n", + Irp, io_stack->Parameters.DeviceIoControl.OutputBufferLength)); + + DevIoDrvCompleteIrp(Irp, STATUS_BUFFER_TOO_SMALL, 0); + + return STATUS_BUFFER_TOO_SMALL; + } + + PIRP_QUEUE_ITEM memory_irp; + PIMDPROXY_DEVIODRV_BUFFER_HEADER buffer; + ULONG buffer_size; + + NTSTATUS status = DevIoDrvReserveMemoryIrp(Irp, &memory_irp, &buffer, &buffer_size, LowestAssumedIrql); + + if (!NT_SUCCESS(status)) + { + KdPrint(("IRP=%p Failed getting direct I/O address. %#x\n", + Irp, status)); + + DevIoDrvCompleteIrp(Irp, status, 0); + + return status; + } + + KdPrint(("IRP=%p I/O tag %#I64x, request code %#I64x flags %#I64x.\n", + Irp, buffer->io_tag, buffer->request_code, buffer->flags)); + + PIRP_QUEUE_ITEM client_item = NULL; + + if (buffer->io_tag != 0) + { + client_item = DevIoDrvGetSentClientRequest(context, buffer->io_tag, LowestAssumedIrql); + + if (client_item == NULL) + { + KdPrint(("IRP=%p Error finding client request with tag %#I64x.\n", + Irp, buffer->io_tag)); + + DevIoDrvCompleteIrp(Irp, STATUS_INVALID_PARAMETER, 0); + + DevIoDrvQueueMemoryIrp(memory_irp, context, LowestAssumedIrql); + + return STATUS_INVALID_PARAMETER; + } + + KdPrint(("IRP=%p Server request completing client IRP=%p.\n", + Irp, client_item->Irp)); + } + + PIMDPROXY_READ_RESP read_write_response = (PIMDPROXY_READ_RESP)(buffer + 1); + + if (client_item == NULL && buffer->request_code == IMDPROXY_REQ_INFO) + { + KdPrint(("IRP=%p IMDPROXY_REQ_INFO.\n", + Irp)); + + PIMDPROXY_INFO_RESP response = (PIMDPROXY_INFO_RESP)(buffer + 1); + context->FileSize.QuadPart = response->file_size; + context->AlignmentRequirement = (ULONG)(response->req_alignment - 1); + context->ServiceFlags = response->flags; + } + else if (client_item != NULL && + IoGetCurrentIrpStackLocation(client_item->Irp)->MajorFunction == IRP_MJ_READ && + buffer->request_code == IMDPROXY_REQ_READ && + IoGetCurrentIrpStackLocation(client_item->Irp)->Parameters.Read.Length >= read_write_response->length && + buffer_size >= IMDPROXY_HEADER_SIZE + read_write_response->length) + { + KdPrint(("IRP=%p IMDPROXY_REQ_READ.\n", Irp)); + + PIMDPROXY_READ_RESP response = (PIMDPROXY_READ_RESP)(buffer + 1); + + if (response->length > 0) + { + PVOID client_buffer = MmGetSystemAddressForMdlSafe(client_item->Irp->MdlAddress, NormalPagePriority); + + if (client_buffer == NULL) + { + DevIoDrvCompleteIrpQueueItem(client_item, STATUS_INSUFFICIENT_RESOURCES, 0, LowestAssumedIrql); + DevIoDrvCompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + DevIoDrvQueueMemoryIrp(memory_irp, context, LowestAssumedIrql); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(client_buffer, ((PUCHAR)buffer) + IMDPROXY_HEADER_SIZE, (SIZE_T)response->length); + } + + KIRQL irql; + + KeRaiseIrql(APC_LEVEL, &irql); + + KIRQL new_irql = APC_LEVEL; + + if (response->errorno == 0) + { + DevIoDrvCompleteIrpQueueItem(client_item, STATUS_SUCCESS, (ULONG_PTR)response->length, &new_irql); + } + else + { + DevIoDrvCompleteIrpQueueItem(client_item, STATUS_IO_DEVICE_ERROR, (ULONG_PTR)response->length, &new_irql); + } + + KeLowerIrql(irql); + } + else if (client_item != NULL && + IoGetCurrentIrpStackLocation(client_item->Irp)->MajorFunction == IRP_MJ_WRITE && + buffer->request_code == IMDPROXY_REQ_WRITE && + IoGetCurrentIrpStackLocation(client_item->Irp)->Parameters.Write.Length >= read_write_response->length) + { + KdPrint(("IRP=%p IMDPROXY_REQ_WRITE.\n", + Irp)); + + PIMDPROXY_WRITE_RESP response = (PIMDPROXY_WRITE_RESP)(buffer + 1); + + KIRQL irql; + + KeRaiseIrql(APC_LEVEL, &irql); + + KIRQL new_irql = APC_LEVEL; + + if (response->errorno == 0) + { + DevIoDrvCompleteIrpQueueItem(client_item, STATUS_SUCCESS, (ULONG_PTR)response->length, &new_irql); + } + else + { + DevIoDrvCompleteIrpQueueItem(client_item, STATUS_IO_DEVICE_ERROR, (ULONG_PTR)response->length, &new_irql); + } + + KeLowerIrql(irql); + } + else if (client_item == NULL && buffer->request_code == IMDPROXY_REQ_NULL) + { + // no response here, just wants next request + + KdPrint(("IRP=%p IMDPROXY_REQ_NULL.\n", + Irp)); + } + else + { + DbgPrint("IRP=%p Bad server request.\n", Irp); + + KdBreakPoint(); + + if (client_item != NULL) + { + DevIoDrvCompleteIrpQueueItem(client_item, STATUS_IO_DEVICE_ERROR, 0, LowestAssumedIrql); + } + + DevIoDrvCompleteIrp(Irp, STATUS_INVALID_PARAMETER, 0); + DevIoDrvQueueMemoryIrp(memory_irp, context, LowestAssumedIrql); + return STATUS_INVALID_PARAMETER; + } + + PIRP_QUEUE_ITEM server_item = (PIRP_QUEUE_ITEM)ExAllocatePoolWithTag(NonPagedPool, sizeof IRP_QUEUE_ITEM, POOL_TAG); + + if (server_item == NULL) + { + DevIoDrvCompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + DevIoDrvQueueMemoryIrp(memory_irp, context, LowestAssumedIrql); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(server_item, sizeof *server_item); + + server_item->Irp = Irp; + + KLOCK_QUEUE_HANDLE lock_handle; + DevIoDrvAcquireLock(&context->IrpListLock, &lock_handle, *LowestAssumedIrql); + + PLIST_ENTRY entry = RemoveHeadList(&context->ClientReceivedIrpList); + + if (entry == &context->ClientReceivedIrpList) + { + KdPrint(("IRP=%p No client request available. Queuing server IRP.\n", Irp)); + + KIRQL cancel_irql; + + IoAcquireCancelSpinLock(&cancel_irql); + + DevIoDrvQueueMemoryIrpUnsafe(memory_irp, context); + + IoSetCancelRoutine(Irp, DevIoDrvServerIrpCancelRoutine); + + IoMarkIrpPending(Irp); + + InsertTailList(&context->ServerRequestIrpList, &server_item->ListEntry); + + IoReleaseCancelSpinLock(cancel_irql); + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + return STATUS_PENDING; + } + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + server_item->MemoryIrp = memory_irp; + server_item->MappedBuffer = buffer; + server_item->MappedBufferSize = buffer_size; + + KdPrint(("IRP=%p Client request found. Completing server request in-thread.\n", + Irp)); + + client_item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + + NTSTATUS client_status, server_status; + DevIoDrvSendClientRequestToServer(context, client_item, server_item, &client_status, &server_status, LowestAssumedIrql); + + return server_status; +} + +void +DevIoDrvSendClientRequestToServer(POBJECT_CONTEXT File, + PIRP_QUEUE_ITEM ClientItem, + PIRP_QUEUE_ITEM ServerItem, + NTSTATUS *ClientStatus, + NTSTATUS *ServerStatus, + PKIRQL LowestAssumedIrql) +{ + if (ServerItem->MappedBuffer == NULL) + { + NTSTATUS status = DevIoDrvReserveMemoryIrp(ServerItem->Irp, &ServerItem->MemoryIrp, &ServerItem->MappedBuffer, &ServerItem->MappedBufferSize, LowestAssumedIrql); + + if (!NT_SUCCESS(status)) + { + KdPrint(("IRP=%p Failed getting direct I/O address. %#x\n", + ServerItem->Irp, status)); + + DevIoDrvCompleteIrpQueueItem(ClientItem, status, 0, LowestAssumedIrql); + DevIoDrvCompleteIrpQueueItem(ServerItem, status, 0, LowestAssumedIrql); + + *ClientStatus = *ServerStatus = status; + + return; + } + } + + ServerItem->MappedBuffer->flags = 0; + ServerItem->MappedBuffer->io_tag = (ULONGLONG)(ULONG_PTR)&ClientItem->ListEntry; + + KdPrint(("Sending client IRP=%p to server IRP=%p. I/O tag = %#I64x\n", + ClientItem->Irp, ServerItem->Irp, ServerItem->MappedBuffer->io_tag)); + + PIO_STACK_LOCATION io_stack_client = IoGetCurrentIrpStackLocation(ClientItem->Irp); + + if (io_stack_client->MajorFunction == IRP_MJ_READ) + { + if (ServerItem->MappedBufferSize < IMDPROXY_HEADER_SIZE + io_stack_client->Parameters.Read.Length) + { + IoMarkIrpPending(ClientItem->Irp); + DevIoDrvInterlockedInsertHeadList(&File->ClientReceivedIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_BUFFER_TOO_SMALL, 0, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_BUFFER_TOO_SMALL; + + return; + } + + ServerItem->MappedBuffer->request_code = IMDPROXY_REQ_READ; + + PIMDPROXY_READ_REQ request = (PIMDPROXY_READ_REQ)(ServerItem->MappedBuffer + 1); + request->request_code = IMDPROXY_REQ_READ; + request->offset = io_stack_client->Parameters.Read.ByteOffset.QuadPart; + request->length = io_stack_client->Parameters.Read.Length; + + IoMarkIrpPending(ClientItem->Irp); + + DevIoDrvInterlockedInsertTailList(&File->ClientSentIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_SUCCESS, IMDPROXY_HEADER_SIZE, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_SUCCESS; + } + else if (io_stack_client->MajorFunction == IRP_MJ_WRITE) + { + if (ServerItem->MappedBufferSize < IMDPROXY_HEADER_SIZE + io_stack_client->Parameters.Write.Length) + { + IoMarkIrpPending(ClientItem->Irp); + DevIoDrvInterlockedInsertHeadList(&File->ClientReceivedIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_BUFFER_TOO_SMALL, 0, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_BUFFER_TOO_SMALL; + + return; + } + + if (io_stack_client->Parameters.Write.Length > 0) + { + PVOID client_buffer = MmGetSystemAddressForMdlSafe(ClientItem->Irp->MdlAddress, NormalPagePriority); + + if (client_buffer == NULL) + { + DevIoDrvCompleteIrpQueueItem(ClientItem, STATUS_INSUFFICIENT_RESOURCES, 0, LowestAssumedIrql); + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_INSUFFICIENT_RESOURCES, 0, LowestAssumedIrql); + + *ClientStatus = *ServerStatus = STATUS_INSUFFICIENT_RESOURCES; + + return; + } + + RtlCopyMemory(((PUCHAR)ServerItem->MappedBuffer) + IMDPROXY_HEADER_SIZE, client_buffer, io_stack_client->Parameters.Write.Length); + } + + ServerItem->MappedBuffer->request_code = IMDPROXY_REQ_WRITE; + + PIMDPROXY_WRITE_REQ request = (PIMDPROXY_WRITE_REQ)(ServerItem->MappedBuffer + 1); + request->request_code = IMDPROXY_REQ_WRITE; + request->offset = io_stack_client->Parameters.Write.ByteOffset.QuadPart; + request->length = io_stack_client->Parameters.Write.Length; + + IoMarkIrpPending(ClientItem->Irp); + + DevIoDrvInterlockedInsertTailList(&File->ClientSentIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_SUCCESS, IMDPROXY_HEADER_SIZE + (ULONG_PTR)io_stack_client->Parameters.Write.Length, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_SUCCESS; + } + else if (io_stack_client->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && + io_stack_client->Parameters.FileSystemControl.FsControlCode == FSCTL_SET_ZERO_DATA) + { + if (ServerItem->MappedBufferSize < IMDPROXY_HEADER_SIZE + sizeof DEVICE_DATA_SET_RANGE) + { + IoMarkIrpPending(ClientItem->Irp); + DevIoDrvInterlockedInsertHeadList(&File->ClientReceivedIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_BUFFER_TOO_SMALL, 0, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_BUFFER_TOO_SMALL; + return; + } + + PFILE_ZERO_DATA_INFORMATION zero_info = (PFILE_ZERO_DATA_INFORMATION)ClientItem->Irp->AssociatedIrp.SystemBuffer; + + ServerItem->MappedBuffer->request_code = IMDPROXY_REQ_ZERO; + + PIMDPROXY_ZERO_REQ request = (PIMDPROXY_ZERO_REQ)(ServerItem->MappedBuffer + 1); + request->request_code = IMDPROXY_REQ_ZERO; + request->length = sizeof DEVICE_DATA_SET_RANGE; + + PDEVICE_DATA_SET_RANGE range = (PDEVICE_DATA_SET_RANGE)((PUCHAR)ServerItem->MappedBuffer + IMDPROXY_HEADER_SIZE); + range->StartingOffset = zero_info->FileOffset.QuadPart; + range->LengthInBytes = zero_info->BeyondFinalZero.QuadPart - zero_info->FileOffset.QuadPart; + + IoMarkIrpPending(ClientItem->Irp); + + DevIoDrvInterlockedInsertTailList(&File->ClientSentIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_SUCCESS, IMDPROXY_HEADER_SIZE, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_SUCCESS; + } + else if (io_stack_client->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && + io_stack_client->Parameters.FileSystemControl.FsControlCode == FSCTL_FILE_LEVEL_TRIM) + { + PFILE_LEVEL_TRIM trim_info = (PFILE_LEVEL_TRIM)ClientItem->Irp->AssociatedIrp.SystemBuffer; + + if (ServerItem->MappedBufferSize < IMDPROXY_HEADER_SIZE + trim_info->NumRanges * sizeof DEVICE_DATA_SET_RANGE) + { + IoMarkIrpPending(ClientItem->Irp); + DevIoDrvInterlockedInsertHeadList(&File->ClientReceivedIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_BUFFER_TOO_SMALL, 0, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_BUFFER_TOO_SMALL; + return; + } + + ServerItem->MappedBuffer->request_code = IMDPROXY_REQ_UNMAP; + + PIMDPROXY_ZERO_REQ request = (PIMDPROXY_ZERO_REQ)(ServerItem->MappedBuffer + 1); + request->request_code = IMDPROXY_REQ_UNMAP; + request->length = trim_info->NumRanges * sizeof DEVICE_DATA_SET_RANGE; + + PDEVICE_DATA_SET_RANGE range = (PDEVICE_DATA_SET_RANGE)((PUCHAR)ServerItem->MappedBuffer + IMDPROXY_HEADER_SIZE); + + for (ULONG i = 0; i < trim_info->NumRanges; i++) + { + range[i].StartingOffset = trim_info->Ranges[i].Offset; + range[i].LengthInBytes = trim_info->Ranges[i].Length; + } + + IoMarkIrpPending(ClientItem->Irp); + + DevIoDrvInterlockedInsertTailList(&File->ClientSentIrpList, &ClientItem->ListEntry, &File->IrpListLock, LowestAssumedIrql); + + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_SUCCESS, IMDPROXY_HEADER_SIZE, LowestAssumedIrql); + + *ClientStatus = STATUS_PENDING; + *ServerStatus = STATUS_SUCCESS; + } + else + { + DevIoDrvCompleteIrpQueueItem(ClientItem, STATUS_INTERNAL_ERROR, 0, LowestAssumedIrql); + DevIoDrvCompleteIrpQueueItem(ServerItem, STATUS_INTERNAL_ERROR, 0, LowestAssumedIrql); + + *ClientStatus = *ServerStatus = STATUS_INTERNAL_ERROR; + } +} + +NTSTATUS +DevIoDrvDispatchClientRequest(PIRP Irp, + PKIRQL LowestAssumedIrql) +{ + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + if (context->Server == NULL) + { + KdPrint(("DevIoDrv: IRP=%p Request to disconnected device.\n", Irp)); + + DevIoDrvCompleteIrp(Irp, STATUS_DEVICE_DOES_NOT_EXIST, 0); + return STATUS_DEVICE_DOES_NOT_EXIST; + } + + PIRP_QUEUE_ITEM client_item = (PIRP_QUEUE_ITEM)ExAllocatePoolWithTag(NonPagedPool, sizeof IRP_QUEUE_ITEM, POOL_TAG); + + if (client_item == NULL) + { + DevIoDrvCompleteIrp(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(client_item, sizeof *client_item); + + client_item->Irp = Irp; + + KLOCK_QUEUE_HANDLE lock_handle; + + DevIoDrvAcquireLock(&context->IrpListLock, &lock_handle, *LowestAssumedIrql); + + if (context->Server == NULL) + { + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + KdPrint(("DevIoDrv: IRP=%p Request to disconnected device.\n", Irp)); + + DevIoDrvCompleteIrpQueueItem(client_item, STATUS_DEVICE_DOES_NOT_EXIST, 0, LowestAssumedIrql); + + return STATUS_DEVICE_DOES_NOT_EXIST; + } + + KIRQL cancel_irql; + + IoAcquireCancelSpinLock(&cancel_irql); + + PLIST_ENTRY entry; + PIRP_QUEUE_ITEM server_item; + + for (;;) + { + entry = RemoveHeadList(&context->ServerRequestIrpList); + server_item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + + if (entry != &context->ServerRequestIrpList) + { + if (server_item->Irp->Cancel) + { + continue; + } + + IoSetCancelRoutine(server_item->Irp, NULL); + } + + break; + } + + IoReleaseCancelSpinLock(cancel_irql); + + if (entry == &context->ServerRequestIrpList) + { + IoMarkIrpPending(Irp); + + InsertTailList(&context->ClientReceivedIrpList, &client_item->ListEntry); + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + KdPrint(("IRP=%p FileObject=%p No server irp available. Queuing client request.\n", + Irp, io_stack->FileObject)); + + return STATUS_PENDING; + } + + DevIoDrvReleaseLock(&lock_handle, LowestAssumedIrql); + + KdPrint(("IRP=%p FileObject=%p Found pending server IRP=%p. Completing client request in-thread.\n", + Irp, io_stack->FileObject, server_item->Irp)); + + NTSTATUS client_status, server_status; + DevIoDrvSendClientRequestToServer(context, client_item, server_item, &client_status, &server_status, LowestAssumedIrql); + + return client_status; +} + +void +DevIoDrvServerIrpCancelRoutine(PDEVICE_OBJECT, PIRP Irp) +{ + IoSetCancelRoutine(Irp, NULL); + + IoReleaseCancelSpinLock(DISPATCH_LEVEL); + + PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + POBJECT_CONTEXT context = (POBJECT_CONTEXT)io_stack->FileObject->FsContext2; + + KdPrint(("IRP=%p FileObject=%p Cancel request.\n", Irp, io_stack->FileObject)); + + KLOCK_QUEUE_HANDLE lock_handle; + + DevIoDrvAcquireLock(&context->IrpListLock, &lock_handle, DISPATCH_LEVEL); + + PLIST_ENTRY irp_list = NULL; + + if (io_stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DEVIODRV_EXCHANGE_IO) + { + irp_list = &context->ServerRequestIrpList; + } + else if (io_stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DEVIODRV_LOCK_MEMORY) + { + irp_list = &context->ServerMemoryIrpList; + } + else + { + RtlAssert("Unknown IoControlCode in cancel routine.", __FILE__, __LINE__, + "Unknown IoControlCode in cancel routine."); + } + + PIRP_QUEUE_ITEM item = NULL; + + for (PLIST_ENTRY entry = irp_list->Flink; entry != irp_list; entry = entry->Flink) + { + item = CONTAINING_RECORD(entry, IRP_QUEUE_ITEM, ListEntry); + + if (item->Irp == Irp) + { + RemoveEntryList(entry); + ExFreePoolWithTag(item, POOL_TAG); + break; + } + } + + KIRQL lowest_assumed_irql = DISPATCH_LEVEL; + + DevIoDrvReleaseLock(&lock_handle, &lowest_assumed_irql); + + KeLowerIrql(Irp->CancelIrql); + + DevIoDrvCompleteIrp(Irp, STATUS_CANCELLED, 0); +} diff --git a/deviodrv/sources b/deviodrv/sources new file mode 100644 index 0000000..6a498f1 --- /dev/null +++ b/deviodrv/sources @@ -0,0 +1,8 @@ +TARGETNAME=deviodrv +TARGETPATH=. +TARGETTYPE=DRIVER +SOURCES=deviodrv.cpp dispatch.cpp filetable.cpp irpfwd.cpp deviodrv.rc +MSC_WARNING_LEVEL=/W4 /WX /wd4100 /wd4201 +!IF "$(NTDEBUG)" != "ntsd" +MSC_OPTIMIZATION=/Ox /GF +!ENDIF diff --git a/imdisk.inf b/imdisk.inf index 14dbeab..68c0d50 100644 --- a/imdisk.inf +++ b/imdisk.inf @@ -1,7 +1,7 @@ [Version] signature = "$Windows NT$" Provider = "LTR Data" -DriverVer=11/19/2018,6.0.6001.18000 +DriverVer=10/30/2021,2.1.0 [SourceDisksNames] @@ -9,6 +9,7 @@ DriverVer=11/19/2018,6.0.6001.18000 [SourceDisksFiles.x86] +deviodrv.sys = 1,deviodrv\i386 awealloc.sys = 1,awealloc\i386 imdisk.sys = 1,sys\i386 imdsksvc.exe = 1,svc\i386 @@ -20,6 +21,7 @@ uninstall_imdisk.cmd = 1 [SourceDisksFiles.ia64] +deviodrv.sys = 1,deviodrv\ia64 awealloc.sys = 1,awealloc\ia64 imdisk.sys = 1,sys\ia64 imdsksvc.exe = 1,svc\ia64 @@ -31,6 +33,7 @@ uninstall_imdisk.cmd = 1 [SourceDisksFiles.amd64] +deviodrv.sys = 1,deviodrv\amd64 awealloc.sys = 1,awealloc\amd64 imdisk.sys = 1,sys\amd64 imdsksvc.exe = 1,svc\amd64 @@ -42,6 +45,7 @@ uninstall_imdisk.cmd = 1 [SourceDisksFiles.arm] +deviodrv.sys = 1,deviodrv\arm awealloc.sys = 1,awealloc\arm imdisk.sys = 1,sys\arm imdsksvc.exe = 1,svc\arm @@ -53,6 +57,7 @@ uninstall_imdisk.cmd = 1 [SourceDisksFiles.arm64] +deviodrv.sys = 1,deviodrv\arm64 awealloc.sys = 1,awealloc\arm64 imdisk.sys = 1,sys\arm64 imdsksvc.exe = 1,svc\arm64 @@ -127,60 +132,70 @@ DelReg = ImDiskDelReg [DefaultInstall.ntx86.Services] +AddService = DevIoDrv, , DevIoDrv AddService = AWEAlloc, , AWEAllocDrv AddService = ImDisk, , ImDskDrv AddService = ImDskSvc, , ImDskSvc [DefaultUninstall.ntx86.Services] +DelService = DevIoDrv DelService = AWEAlloc DelService = ImDisk DelService = ImDskSvc [DefaultInstall.ntarm.Services] +AddService = DevIoDrv, , DevIoDrv AddService = AWEAlloc, , AWEAllocDrv AddService = ImDisk, , ImDskDrv AddService = ImDskSvc, , ImDskSvc [DefaultUninstall.ntarm.Services] +DelService = DevIoDrv DelService = AWEAlloc DelService = ImDisk DelService = ImDskSvc [DefaultInstall.ntamd64.Services] +AddService = DevIoDrv, , DevIoDrv AddService = AWEAlloc, , AWEAllocDrv AddService = ImDisk, , ImDskDrv AddService = ImDskSvc, , ImDskSvc [DefaultUninstall.ntamd64.Services] +DelService = DevIoDrv DelService = AWEAlloc DelService = ImDisk DelService = ImDskSvc [DefaultInstall.ntarm64.Services] +AddService = DevIoDrv, , DevIoDrv AddService = AWEAlloc, , AWEAllocDrv AddService = ImDisk, , ImDskDrv AddService = ImDskSvc, , ImDskSvc [DefaultUninstall.ntarm64.Services] +DelService = DevIoDrv DelService = AWEAlloc DelService = ImDisk DelService = ImDskSvc [DefaultInstall.ntia64.Services] +AddService = DevIoDrv, , DevIoDrv AddService = AWEAlloc, , AWEAllocDrv AddService = ImDisk, , ImDskDrv AddService = ImDskSvc, , ImDskSvc [DefaultUninstall.ntia64.Services] +DelService = DevIoDrv DelService = AWEAlloc DelService = ImDisk DelService = ImDskSvc @@ -199,6 +214,7 @@ imdisk.cpl,cpl\i386\imdisk.cpl [ImDiskSysFiles] +deviodrv.sys awealloc.sys imdisk.sys @@ -267,6 +283,15 @@ ErrorControl = 0 ServiceBinary = %12%\awealloc.sys +[DevIoDrv] +DisplayName = "DevIO Client Driver" +Description = "Client driver for ImDisk devio proxy mode" +ServiceType = 1 +StartType = 2 +ErrorControl = 0 +ServiceBinary = %12%\deviodrv.sys + + [ImDskSvc] DisplayName = "ImDisk Virtual Disk Driver Helper" Description = "Helper service for ImDisk Virtual Disk Driver." diff --git a/imdisk.props b/imdisk.props index 99023f2..383a273 100644 --- a/imdisk.props +++ b/imdisk.props @@ -8,8 +8,8 @@ Default - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_WCSTOK;NT4_COMPATIBLE;WIN32_LEAN_AND_MEAN;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) - 4996;4201;4306;%(DisableSpecificWarnings) + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_WCSTOK;NT4_COMPATIBLE;INCLUDE_GPL_ORIGIN;WIN32_LEAN_AND_MEAN;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + 4996;4201;4306;4127;28159;%(DisableSpecificWarnings) false Level4 true diff --git a/inc/imdisk.h b/inc/imdisk.h index 6b364a6..b0f6300 100644 --- a/inc/imdisk.h +++ b/inc/imdisk.h @@ -1,7 +1,7 @@ /* ImDisk Virtual Disk Driver for Windows NT/2000/XP. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -108,16 +108,16 @@ OTHER DEALINGS IN THE SOFTWARE. #define IMDISK_WINVER() ((IMDISK_WINVER_MAJOR() << 8) | \ IMDISK_WINVER_MINOR()) -#if defined(NT4_COMPATIBLE) && !defined(_WIN64) +#if defined(NT4_COMPATIBLE) && defined(_M_IX86) #define IMDISK_GTE_WIN2K() (IMDISK_WINVER_MAJOR() >= 0x05) #else #define IMDISK_GTE_WIN2K() TRUE #endif -#ifdef _WIN64 -#define IMDISK_GTE_WINXP() TRUE -#else +#ifdef _M_IX86 #define IMDISK_GTE_WINXP() (IMDISK_WINVER() >= 0x0501) +#else +#define IMDISK_GTE_WINXP() TRUE #endif #define IMDISK_GTE_SRV2003() (IMDISK_WINVER() >= 0x0502) @@ -221,6 +221,9 @@ OTHER DEALINGS IN THE SOFTWARE. #define IMDISK_FILE_TYPE_AWEALLOC 0x00001000 /// Direct parallel I/O to an image file, done in request thread #define IMDISK_FILE_TYPE_PARALLEL_IO 0x00002000 +/// Buffered I/O to an image file. Disables FILE_NO_INTERMEDIATE_BUFFERING when +/// opening image file. +#define IMDISK_FILE_TYPE_BUFFERED_IO 0x00003000 /// Extracts the IMDISK_FILE_TYPE_xxx from flags #define IMDISK_FILE_TYPE(x) ((ULONG)(x) & 0x0000F000) @@ -1535,6 +1538,10 @@ extern "C" { CDECL ImDiskAllocPrintF(LPCWSTR lpMessage, ...); + IMDISK_API LPSTR + CDECL + ImDiskAllocPrintFA(LPCSTR lpMessage, ...); + IMDISK_API int WINAPI ImDiskConsoleMessageA( @@ -1551,6 +1558,10 @@ extern "C" { LPCWSTR lpCaption, UINT uType); + IMDISK_API BOOL + WINAPI + ImDiskIsProcessElevated(); + #ifdef CORE_BUILD #ifdef CharToOemA diff --git a/inc/imdiskver.h b/inc/imdiskver.h index 0c12331..6c1a73c 100644 --- a/inc/imdiskver.h +++ b/inc/imdiskver.h @@ -1,6 +1,9 @@ -#define IMDISK_RC_VERSION_STR "2.0.10" -#define IMDISK_MAJOR_VERSION 2 -#define IMDISK_MINOR_VERSION 0 -#define IMDISK_MINOR_LOW_VERSION 10 +#define IMDISK_MAJOR_VERSION 2 +#define IMDISK_MINOR_VERSION 1 +#define IMDISK_MINOR_LOW_VERSION 1 -#define IMDISK_RC_VERSION_FLD IMDISK_MAJOR_VERSION,IMDISK_MINOR_VERSION,IMDISK_MINOR_LOW_VERSION +#define STR_EXPAND(tok) #tok +#define STR(tok) STR_EXPAND(tok) + +#define IMDISK_RC_VERSION_FLD IMDISK_MAJOR_VERSION,IMDISK_MINOR_VERSION,IMDISK_MINOR_LOW_VERSION +#define IMDISK_RC_VERSION_STR STR(IMDISK_MAJOR_VERSION) "." STR(IMDISK_MINOR_VERSION) "." STR(IMDISK_MINOR_LOW_VERSION) diff --git a/inc/imdproxy.h b/inc/imdproxy.h index 7121111..167d85e 100644 --- a/inc/imdproxy.h +++ b/inc/imdproxy.h @@ -34,12 +34,18 @@ typedef uint32_t ULONG; typedef int64_t LONGLONG; typedef uint64_t ULONGLONG; typedef u_short WCHAR; +typedef u_char UCHAR; #endif #define IMDPROXY_SVC L"ImDskSvc" #define IMDPROXY_SVC_PIPE_DOSDEV_NAME L"\\\\.\\PIPE\\" IMDPROXY_SVC #define IMDPROXY_SVC_PIPE_NATIVE_NAME L"\\Device\\NamedPipe\\" IMDPROXY_SVC +#define DEVIODRV_DEVICE_NAME L"DevIoDrv" +#define DEVIODRV_DEVICE_DOSDEV_NAME L"\\\\.\\" DEVIODRV_DEVICE_NAME +#define DEVIODRV_DEVICE_NATIVE_NAME L"\\Device\\" DEVIODRV_DEVICE_NAME +#define DEVIODRV_SYMLINK_NATIVE_NAME L"\\DosDevices\\" DEVIODRV_DEVICE_NAME + #define IMDPROXY_FLAG_RO 0x01 // Read-only #define IMDPROXY_FLAG_SUPPORTS_UNMAP 0x02 // Unmap/TRIM ranges #define IMDPROXY_FLAG_SUPPORTS_ZERO 0x04 // Zero-fill ranges @@ -60,6 +66,11 @@ typedef enum _IMDPROXY_REQ IMDPROXY_REQ_SHARED } IMDPROXY_REQ, *PIMDPROXY_REQ; +typedef struct _IMDPROXY_CLOSE_REQ +{ + ULONGLONG request_code; +} IMDPROXY_CLOSE_REQ, *PIMDPROXY_CLOSE_REQ; + typedef struct _IMDPROXY_CONNECT_REQ { ULONGLONG request_code; @@ -189,4 +200,21 @@ typedef enum _IMDPROXY_SHARED_RESP_CODE // shared memory. #define IMDPROXY_HEADER_SIZE 4096 +// For use with deviodrv driver, where requests and responses are tagged +// with an id for asynchronous operations. +typedef struct _IMDPROXY_DEVIODRV_BUFFER_HEADER +{ + ULONGLONG request_code; // Request code to forward to response header. + ULONGLONG io_tag; // Tag to forward to response header. + ULONGLONG flags; // Reserved. Currently not used. +} IMDPROXY_DEVIODRV_BUFFER_HEADER, *PIMDPROXY_DEVIODRV_BUFFER_HEADER; + +#if defined(CTL_CODE) && !defined(IOCTL_DEVIODRV_EXCHANGE_IO) +#ifndef FILE_DEVICE_IMDISK +#define FILE_DEVICE_IMDISK 0x8372 +#endif +#define IOCTL_DEVIODRV_EXCHANGE_IO ((ULONG) CTL_CODE(FILE_DEVICE_IMDISK, 0x8D0, METHOD_OUT_DIRECT, FILE_READ_ACCESS | FILE_WRITE_ACCESS)) +#define IOCTL_DEVIODRV_LOCK_MEMORY ((ULONG) CTL_CODE(FILE_DEVICE_IMDISK, 0x8D1, METHOD_OUT_DIRECT, FILE_READ_ACCESS | FILE_WRITE_ACCESS)) +#endif + #endif // _INC_IMDPROXY_ diff --git a/inc/ntkmapi.h b/inc/ntkmapi.h index 763af24..12ca53a 100644 --- a/inc/ntkmapi.h +++ b/inc/ntkmapi.h @@ -10,7 +10,7 @@ // Ensures that we build a pre Win 2000 compatible x86 sys file // (without ExFreePoolWithTag()). // Olof Lagerkvist // -#ifndef _WIN64 +#if defined(_M_IX86) #ifdef ExFreePool #undef ExFreePool #endif diff --git a/inc/ntumapi.h b/inc/ntumapi.h index 2bc9722..98552db 100644 --- a/inc/ntumapi.h +++ b/inc/ntumapi.h @@ -6,6 +6,7 @@ extern "C" { #endif +#if !defined(_NTDEF_) && !defined(_NTSECAPI_) typedef struct _UNICODE_STRING { USHORT Length; USHORT MaximumLength; @@ -13,6 +14,7 @@ typedef struct _UNICODE_STRING { } UNICODE_STRING; typedef UNICODE_STRING *PUNICODE_STRING; typedef const UNICODE_STRING *PCUNICODE_STRING; +#endif #define UNICODE_NULL ((WCHAR)0) typedef LONG NTSTATUS; @@ -623,6 +625,24 @@ typedef struct _REPARSE_INDEX_KEY { #pragma pack() +NTSYSAPI +ULONG +__cdecl +DbgPrint( + IN PCSTR Format, + ... +); + +NTSYSAPI +ULONG +__cdecl +DbgPrintEx( + IN ULONG ComponentId, + IN ULONG Level, + IN PCSTR Format, + ... +); + NTSYSAPI BOOLEAN NTAPI diff --git a/readme.txt b/readme.txt index c290455..e67f8b6 100644 --- a/readme.txt +++ b/readme.txt @@ -23,7 +23,7 @@ this product under NT 3.51 you have to manually add registry entries needed by driver and service or use resource kit tools to add necessary settings. - Copyright (c) 2005-2016 Olof Lagerkvist + Copyright (c) 2005-2018 Olof Lagerkvist http://www.ltr-data.se olof@ltr-data.se Permission is hereby granted, free of charge, to any person diff --git a/svc/imdsksvc.cpp b/svc/imdsksvc.cpp index cf3f87a..0e8eee6 100644 --- a/svc/imdsksvc.cpp +++ b/svc/imdsksvc.cpp @@ -5,7 +5,7 @@ This service redirects I/O requests sent to the ImDisk Virtual Disk Driver to another computer through a serial communication interface or by opening a TCP/IP connection. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -40,9 +40,11 @@ OTHER DEALINGS IN THE SOFTWARE. #include "..\inc\imdisk.h" #include "..\inc\imdproxy.h" +#include "..\inc\ntumapi.h" #include "..\inc\wio.hpp" #include "..\inc\wmem.hpp" +#pragma comment(lib, "ntdll.lib") #pragma comment(lib, "advapi32.lib") #pragma comment(lib, "ws2_32.lib") @@ -57,33 +59,9 @@ HANDLE ImDiskSvcStopEvent = NULL; #if defined(DEBUG) || defined(_DEBUG) -#define KdPrint(x) DbgPrintF x +#define KdPrint(x) DbgPrint x #define KdPrintLastError(x) DbgPrintLastError x -BOOL -DbgPrintF(LPCSTR Message, ...) -{ - va_list param_list; - LPSTR lpBuf = NULL; - - va_start(param_list, Message); - - if (!FormatMessageA(FORMAT_MESSAGE_MAX_WIDTH_MASK | - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_STRING, Message, 0, 0, - (LPSTR)&lpBuf, 0, ¶m_list)) - return FALSE; - - OutputDebugStringA(lpBuf); - - DWORD dw; - WriteFile(GetStdHandle(STD_ERROR_HANDLE), lpBuf, (DWORD)strlen(lpBuf), &dw, NULL); - - LocalFree(lpBuf); - - return TRUE; -} - void DbgPrintLastError(LPCSTR Prefix) { @@ -95,7 +73,7 @@ DbgPrintLastError(LPCSTR Prefix) FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), 0, (LPSTR)&MsgBuf, 0, NULL); - DbgPrintF("ImDskSvc: %1: %2%n", Prefix, MsgBuf); + DbgPrint("ImDskSvc: %s: %s\n", Prefix, MsgBuf); LocalFree(MsgBuf); } @@ -116,7 +94,7 @@ class ImDiskSvcServerSession { IMDPROXY_CONNECT_REQ ConnectReq; - KdPrint(("ImDskSvc: Thread created.%n")); + KdPrint(("ImDskSvc: Thread created.\n")); if (Overlapped.BufRecv(hPipe, &ConnectReq.request_code, sizeof ConnectReq.request_code) != @@ -148,9 +126,9 @@ class ImDiskSvcServerSession return 0; } - if ((ConnectReq.length == 0) | (ConnectReq.length > 520)) + if ((ConnectReq.length == 0) || (ConnectReq.length > 520)) { - KdPrint(("ImDskSvc: Bad connection string length received (%1!u!).%n", + KdPrint(("ImDskSvc: Bad connection string length received (%u).\n", ConnectReq.length)); delete this; @@ -200,7 +178,7 @@ class ImDiskSvcServerSession { LPWSTR FileName = wcstok(ConnectionString, L": "); - KdPrint(("ImDskSvc: Connecting to '%1!ws!'.%n", FileName)); + KdPrint(("ImDskSvc: Connecting to '%ws'.\n", FileName)); hTarget = CreateFile(FileName, GENERIC_READ | GENERIC_WRITE, @@ -231,7 +209,7 @@ class ImDiskSvcServerSession if (DCBAndTimeouts[0] == L' ') ++DCBAndTimeouts; - KdPrint(("ImDskSvc: Configuring '%1!ws!'.%n", DCBAndTimeouts)); + KdPrint(("ImDskSvc: Configuring '%ws'.\n", DCBAndTimeouts)); GetCommState(hTarget, &dcb); GetCommTimeouts(hTarget, &timeouts); @@ -240,7 +218,7 @@ class ImDiskSvcServerSession SetCommTimeouts(hTarget, &timeouts); } - KdPrint(("ImDskSvc: Connected to '%1!ws!' and configured.%n", + KdPrint(("ImDskSvc: Connected to '%ws' and configured.\n", FileName)); break; @@ -255,7 +233,7 @@ class ImDiskSvcServerSession if (PortName == NULL) PortName = L"9000"; - KdPrint(("ImDskSvc: Connecting to '%1!ws!:%2!ws!'.%n", + KdPrint(("ImDskSvc: Connecting to '%ws:%ws'.\n", ServerName, PortName)); hTarget = (HANDLE)ConnectTCP(ServerName, PortName); @@ -276,14 +254,14 @@ class ImDiskSvcServerSession setsockopt((SOCKET)hTarget, IPPROTO_TCP, TCP_NODELAY, (LPCSTR)&b, sizeof b); - KdPrint(("ImDskSvc: Connected to '%1!ws!:%2!ws!' and configured.%n", + KdPrint(("ImDskSvc: Connected to '%ws:%ws' and configured.\n", ServerName, PortName)); break; } default: - KdPrint(("ImDskSvc: Unsupported connection type (%1!#x!).%n", + KdPrint(("ImDskSvc: Unsupported connection type (%#x).\n", IMDISK_PROXY_TYPE(ConnectReq.flags))); connect_resp.error_code = (ULONGLONG)-1; @@ -406,7 +384,7 @@ class ImDiskSvcServerSession // we should shut down this connection. Overlapped.BufRecv(hPipe, &dw, sizeof dw); - KdPrint(("ImDskSvc: Cleaning up.%n")); + KdPrint(("ImDskSvc: Cleaning up.\n")); CloseHandle(hTarget); @@ -452,7 +430,7 @@ class ImDiskSvcServerSession } ThreadFunction; ThreadFunction.Member = &ImDiskSvcServerSession::Thread; - KdPrint(("ImDskSvc: Creating thread.%n")); + KdPrint(("ImDskSvc: Creating thread.\n")); UINT id = 0; HANDLE hThread = (HANDLE) @@ -501,8 +479,8 @@ class ImDiskSvcServerSession return false; return - (hPipe != NULL) & - (hPipe != INVALID_HANDLE_VALUE) & + (hPipe != NULL) && + (hPipe != INVALID_HANDLE_VALUE) && (Overlapped.hEvent != NULL); } }; @@ -545,6 +523,7 @@ ImDiskSvcStart(DWORD, LPWSTR *) ImDiskSvcStatusHandle = RegisterServiceCtrlHandler(IMDPROXY_SVC, ImDiskSvcCtrlHandler); + if (ImDiskSvcStatusHandle == (SERVICE_STATUS_HANDLE)0) { KdPrintLastError(("RegisterServiceCtrlHandler() failed")); @@ -586,6 +565,8 @@ ImDiskSvcStart(DWORD, LPWSTR *) SetServiceStatus(ImDiskSvcStatusHandle, &ImDiskSvcStatus); } +#ifdef _DEBUG + extern "C" int CALLBACK @@ -595,7 +576,62 @@ wWinMain(HINSTANCE, LPWSTR, int) { - KdPrint(("ImDskSvc: Starting up process.%n")); + KdPrint(("ImDskSvc: Starting up process.\n")); + + WSADATA wsadata; + WSAStartup(0x0101, &wsadata); + + ImDiskSvcStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + if (ImDiskSvcStopEvent == NULL) + { + KdPrintLastError(("CreateEvent() failed")); + return 0; + } + + for (;;) + { + if (WaitForSingleObject(ImDiskSvcStopEvent, 0) != WAIT_TIMEOUT) + { + ImDiskSvcStatus.dwWin32ExitCode = NO_ERROR; + break; + } + +#pragma warning(suppress: 28197) + ImDiskSvcServerSession* ServerSession = new ImDiskSvcServerSession; + if (!ServerSession->IsOk()) + { + delete ServerSession; + KdPrintLastError(("Pipe initialization failed")); + break; + } + + if (!ServerSession->Connect()) + { + if (ImDiskSvcStatus.dwWin32ExitCode != NO_ERROR) + { + KdPrintLastError(("Pipe connect failed")); + } + break; + } + } + + SetEvent(ImDiskSvcStopEvent); + + return 1; +} + +#else + +extern "C" +int +CALLBACK +#pragma warning(suppress: 28251) +wWinMain(HINSTANCE, + HINSTANCE, + LPWSTR, + int) +{ + KdPrint(("ImDskSvc: Starting up process.\n")); WSADATA wsadata; WSAStartup(0x0101, &wsadata); @@ -631,6 +667,8 @@ wWinMain(HINSTANCE, return 1; } +#endif + #if !defined(_DEBUG) && !defined(DEBUG) && _MSC_PLATFORM_TOOLSET < 140 // We have our own EXE entry to be less dependent on diff --git a/svc/imdsksvc.rc b/svc/imdsksvc.rc index 72d9f5e..c053430 100644 --- a/svc/imdsksvc.rc +++ b/svc/imdsksvc.rc @@ -28,7 +28,7 @@ BEGIN VALUE "FileDescription", "ImDisk Virtual Disk Driver helper service\0" VALUE "FileVersion", IMDISK_RC_VERSION_STR ".24\0" VALUE "InternalName", "imdsksvc\0" - VALUE "LegalCopyright", "Copyright © 2005-2018 Olof Lagerkvist.\0" + VALUE "LegalCopyright", "Copyright © 2005-2021 Olof Lagerkvist.\0" VALUE "OriginalFilename", "imdsksvc.exe\0" VALUE "ProductName", "imdisk\0" VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".24\0" diff --git a/svc/svc.inf b/svc/svc.inf new file mode 100644 index 0000000..bf07140 --- /dev/null +++ b/svc/svc.inf @@ -0,0 +1,54 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 10/26/2021,2.1.0.00070 +CatalogFile = svc.cat + + +[SourceDisksNames] +1 = "ImDisk Virtual Disk Driver Helper Service" + + +[SourceDisksFiles.x86] +imdsksvc.exe = 1, i386 + +[SourceDisksFiles.ia64] +imdsksvc.exe = 1, ia64 + +[SourceDisksFiles.amd64] +imdsksvc.exe = 1, amd64 + +[SourceDisksFiles.arm] +imdsksvc.exe = 1, arm + +[SourceDisksFiles.arm64] +imdsksvc.exe = 1, arm64 + +[DestinationDirs] +ImDskSvcExeFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = ImDskSvcExeFiles + + +[ImDskSvcExeFiles] +imdsksvc.exe + + +[DefaultInstall.ntx86.Services] +AddService = ImDskSvc, , ImDskSvc + + +[ImDskSvc] +DisplayName = "ImDisk Virtual Disk Driver Helper Service" +StartType = 2 +ServiceType = 16 +ErrorControl = 0 +ServiceBinary = %11%\imdsksvc.exe diff --git a/sys/commonio.cpp b/sys/commonio.cpp index 7821349..1a661d8 100644 --- a/sys/commonio.cpp +++ b/sys/commonio.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/sys/createdev.cpp b/sys/createdev.cpp index 2a3e949..078614a 100644 --- a/sys/createdev.cpp +++ b/sys/createdev.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -43,7 +43,7 @@ Copyright (C) The Regents of the University of California. #include "imdsksys.h" -#ifdef INCLUDE_VFD_ORIGIN +#ifdef INCLUDE_GPL_ORIGIN // For floppy devices. Based on Virtual Floppy Driver, VFD, by Ken Kato. #define SECTOR_SIZE_FDD 512 @@ -115,7 +115,7 @@ const DISK_GEOMETRY media_table[] = { #define SET_MEDIA_TYPE(geometry, media_index) \ (geometry.MediaType = media_table[media_index].MediaType) -#endif // INCLUDE_VFD_ORIGIN +#endif // INCLUDE_GPL_ORIGIN VOID ImDiskFindFreeDeviceNumber(PDRIVER_OBJECT DriverObject, @@ -211,7 +211,7 @@ ImDiskReadFormattedGeometry(IN OUT PIMDISK_CREATE_DATA CreateData, if (CreateData->DiskGeometry.BytesPerSector == 0) CreateData->DiskGeometry.BytesPerSector = BPB->BytesPerSector; -#ifdef INCLUDE_VFD_ORIGIN +#ifdef INCLUDE_GPL_ORIGIN if (((IMDISK_DEVICE_TYPE(CreateData->Flags) == IMDISK_DEVICE_TYPE_FD) | (IMDISK_DEVICE_TYPE(CreateData->Flags) == 0)) & @@ -291,7 +291,7 @@ ImDiskReadFormattedGeometry(IN OUT PIMDISK_CREATE_DATA CreateData, break; } -#endif // INCLUDE_VFD_ORIGIN +#endif // INCLUDE_GPL_ORIGIN KdPrint (("ImDisk: Values after BPB geometry detection:\n" @@ -475,17 +475,23 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, // Auto-select type if not specified. if (IMDISK_TYPE(CreateData->Flags) == 0) + { if (CreateData->FileNameLength == 0) + { CreateData->Flags |= IMDISK_TYPE_VM; + } else + { CreateData->Flags |= IMDISK_TYPE_FILE; + } + } // Blank filenames only supported for memory disks where size is specified. if ((CreateData->FileNameLength == 0) && - !(((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_VM) & - (CreateData->DiskGeometry.Cylinders.QuadPart > 65536)) | - ((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_FILE) & - (IMDISK_FILE_TYPE(CreateData->Flags) == IMDISK_FILE_TYPE_AWEALLOC) & + !(((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_VM) && + (CreateData->DiskGeometry.Cylinders.QuadPart > 65536)) || + ((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_FILE) && + (IMDISK_FILE_TYPE(CreateData->Flags) == IMDISK_FILE_TYPE_AWEALLOC) && (CreateData->DiskGeometry.Cylinders.QuadPart > 65536)))) { KdPrint(("ImDisk: Blank filenames only supported for memory disks where " @@ -529,12 +535,6 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, KdPrint(("ImDisk: Free device number %i.\n", CreateData->DeviceNumber)); } - /* for (CreateData->DeviceNumber = 0; */ - /* CreateData->DeviceNumber < MaxDevices; */ - /* CreateData->DeviceNumber++) */ - /* if ((~DeviceList) & (1ULL << CreateData->DeviceNumber)) */ - /* break; */ - if (CreateData->DeviceNumber >= MaxDevices) { ImDiskLogError((DriverObject, @@ -556,7 +556,7 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, if (IMDISK_BYTE_SWAP(CreateData->Flags) && (IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_FILE) && - (IMDISK_FILE_TYPE(CreateData->Flags) == IMDISK_FILE_TYPE_PARALLEL_IO)) + (IMDISK_FILE_TYPE(CreateData->Flags) != IMDISK_FILE_TYPE_BUFFERED_IO)) { ImDiskLogError((DriverObject, 0, @@ -584,8 +584,8 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, // If a file is to be opened or created, allocate name buffer and open that // file... - if ((CreateData->FileNameLength > 0) | - ((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_FILE) & + if ((CreateData->FileNameLength > 0) || + ((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_FILE) && (IMDISK_FILE_TYPE(CreateData->Flags) == IMDISK_FILE_TYPE_AWEALLOC))) { IO_STATUS_BLOCK io_status; @@ -715,9 +715,9 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, NULL, NULL); } - else if ((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_PROXY) & + else if ((IMDISK_TYPE(CreateData->Flags) == IMDISK_TYPE_PROXY) && ((IMDISK_PROXY_TYPE(CreateData->Flags) == - IMDISK_PROXY_TYPE_TCP) | + IMDISK_PROXY_TYPE_TCP) || (IMDISK_PROXY_TYPE(CreateData->Flags) == IMDISK_PROXY_TYPE_COMM))) { @@ -772,9 +772,11 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, } create_options = FILE_NON_DIRECTORY_FILE | - FILE_NO_INTERMEDIATE_BUFFERING | FILE_SYNCHRONOUS_IO_NONALERT; + if (IMDISK_FILE_TYPE(CreateData->Flags) != IMDISK_FILE_TYPE_BUFFERED_IO) + create_options |= FILE_NO_INTERMEDIATE_BUFFERING; + if (IMDISK_SPARSE_FILE(CreateData->Flags)) { create_options |= FILE_OPEN_FOR_BACKUP_INTENT; @@ -810,7 +812,7 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, // call will fail because OBJ_FORCE_ACCESS_CHECK is not supported. If so, // STATUS_INVALID_PARAMETER is returned and we go on without any access // checks in that case. -#ifndef _WIN64 +#ifdef _M_IX86 if (status == STATUS_INVALID_PARAMETER) { InitializeObjectAttributes(&object_attributes, @@ -1180,6 +1182,7 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, &max_size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(status)) { ZwClose(file_handle); @@ -1245,15 +1248,17 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, } if (CreateData->DiskGeometry.Cylinders.QuadPart == 0) + { CreateData->DiskGeometry.Cylinders.QuadPart = - disk_size.QuadPart - - CreateData->ImageOffset.QuadPart; + disk_size.QuadPart - + CreateData->ImageOffset.QuadPart; + } alignment_requirement = file_alignment.AlignmentRequirement; } - if ((CreateData->DiskGeometry.TracksPerCylinder == 0) | - (CreateData->DiskGeometry.SectorsPerTrack == 0) | + if ((CreateData->DiskGeometry.TracksPerCylinder == 0) || + (CreateData->DiskGeometry.SectorsPerTrack == 0) || (CreateData->DiskGeometry.BytesPerSector == 0)) { SIZE_T free_size = 0; @@ -1362,8 +1367,8 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, if (CreateData->DiskGeometry.Cylinders.QuadPart == 0) CreateData->DiskGeometry.Cylinders.QuadPart = proxy_info.file_size; - if ((CreateData->DiskGeometry.TracksPerCylinder == 0) | - (CreateData->DiskGeometry.SectorsPerTrack == 0) | + if ((CreateData->DiskGeometry.TracksPerCylinder == 0) || + (CreateData->DiskGeometry.SectorsPerTrack == 0) || (CreateData->DiskGeometry.BytesPerSector == 0)) { WPoolMem fat_vbr(sizeof(FAT_VBR)); @@ -1399,11 +1404,12 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, sizeof(FAT_VBR), &CreateData->ImageOffset); - if (!NT_SUCCESS(status)) + if (NT_SUCCESS(status)) + { + ImDiskReadFormattedGeometry(CreateData, &fat_vbr->BPB); + } + else { - ImDiskCloseProxy(&proxy); - ZwClose(file_handle); - ImDiskLogError((DriverObject, 0, 0, @@ -1420,14 +1426,10 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, KdPrint(("ImDisk: Error reading first sector (%#x).\n", status)); - - return status; } - - ImDiskReadFormattedGeometry(CreateData, &fat_vbr->BPB); } - if ((proxy_info.req_alignment - 1 > FILE_512_BYTE_ALIGNMENT) | + if ((proxy_info.req_alignment - 1 > FILE_512_BYTE_ALIGNMENT) || (CreateData->DiskGeometry.Cylinders.QuadPart == 0)) { ImDiskCloseProxy(&proxy); @@ -1526,6 +1528,7 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, &max_size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(status)) { KdPrint @@ -1554,7 +1557,7 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, KdPrint(("ImDisk: Done with file/memory checks.\n")); -#ifdef INCLUDE_VFD_ORIGIN +#ifdef INCLUDE_GPL_ORIGIN // If no device-type specified and size matches common floppy sizes, // auto-select FILE_DEVICE_DISK with FILE_FLOPPY_DISKETTE and @@ -1587,12 +1590,12 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, KdPrint(("ImDisk: Done with device type selection for floppy sizes.\n")); -#else // INCLUDE_VFD_ORIGIN +#else // INCLUDE_GPL_ORIGIN if (IMDISK_DEVICE_TYPE(CreateData->Flags) == 0) CreateData->Flags |= IMDISK_DEVICE_TYPE_HD; -#endif // INCLUDE_VFD_ORIGIN +#endif // INCLUDE_GPL_ORIGIN // If some parts of the DISK_GEOMETRY structure are zero, auto-fill with // typical values for this type of disk. @@ -1636,7 +1639,7 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, { LONGLONG calccyl = CreateData->DiskGeometry.Cylinders.QuadPart; -#ifdef INCLUDE_VFD_ORIGIN +#ifdef INCLUDE_GPL_ORIGIN if ((IMDISK_DEVICE_TYPE(CreateData->Flags) == IMDISK_DEVICE_TYPE_FD) & (CreateData->DiskGeometry.BytesPerSector == 0) & @@ -1709,7 +1712,7 @@ ImDiskCreateDevice(__in PDRIVER_OBJECT DriverObject, // defined floppy geometries above. CreateData->DiskGeometry.Cylinders.QuadPart = calccyl; -#endif // INCLUDE_VFD_ORIGIN +#endif // INCLUDE_GPL_ORIGIN if (CreateData->DiskGeometry.BytesPerSector == 0) CreateData->DiskGeometry.BytesPerSector = SECTOR_SIZE_HDD; diff --git a/sys/devthrd.cpp b/sys/devthrd.cpp index 8290ae9..524967c 100644 --- a/sys/devthrd.cpp +++ b/sys/devthrd.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -55,6 +55,8 @@ ImDiskDeviceThreadRead(IN PIRP Irp, LARGE_INTEGER offset; KLOCK_QUEUE_HANDLE lock_handle; + UNREFERENCED_PARAMETER(DeviceObject); + if (system_buffer == NULL) { Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; @@ -136,11 +138,6 @@ ImDiskDeviceThreadRead(IN PIRP Irp, DeviceExtension->device_number, Irp->IoStatus.Status)); - // If indicating that proxy connection died we can do - // nothing else but remove this device. - // if (Irp->IoStatus.Status == STATUS_CONNECTION_RESET) - ImDiskRemoveVirtualDisk(DeviceObject); - Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; Irp->IoStatus.Information = 0; } @@ -202,6 +199,8 @@ ImDiskDeviceThreadWrite(IN PIRP Irp, BOOLEAN set_zero_data = FALSE; KLOCK_QUEUE_HANDLE lock_handle; + UNREFERENCED_PARAMETER(DeviceObject); + if (system_buffer == NULL) { Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; @@ -335,11 +334,6 @@ ImDiskDeviceThreadWrite(IN PIRP Irp, DeviceExtension->device_number, Irp->IoStatus.Status)); - // If indicating that proxy connection died we can do - // nothing else but remove this device. - if (Irp->IoStatus.Status == STATUS_CONNECTION_RESET) - ImDiskRemoveVirtualDisk(DeviceObject); - Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; Irp->IoStatus.Information = 0; } @@ -511,6 +505,8 @@ ImDiskDeviceThreadDeviceControl(IN PIRP Irp, { PIO_STACK_LOCATION io_stack = IoGetCurrentIrpStackLocation(Irp); + UNREFERENCED_PARAMETER(DeviceObject); + switch (io_stack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_DISK_CHECK_VERIFY: @@ -561,11 +557,6 @@ ImDiskDeviceThreadDeviceControl(IN PIRP Irp, KdPrint(("ImDisk: Verify failed on device %i.\n", DeviceExtension->device_number)); - // If indicating that proxy connection died we can do - // nothing else but remove this device. - if (Irp->IoStatus.Status == STATUS_CONNECTION_RESET) - ImDiskRemoveVirtualDisk(DeviceObject); - Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; Irp->IoStatus.Information = 0; break; @@ -695,7 +686,7 @@ ImDiskDeviceThreadDeviceControl(IN PIRP Irp, break; } -#ifdef INCLUDE_VFD_ORIGIN +#ifdef INCLUDE_GPL_ORIGIN case IOCTL_DISK_FORMAT_TRACKS: case IOCTL_DISK_FORMAT_TRACKS_EX: @@ -705,11 +696,6 @@ ImDiskDeviceThreadDeviceControl(IN PIRP Irp, if (!NT_SUCCESS(status)) { - // If indicating that proxy connection died we can do - // nothing else but remove this device. - if (status == STATUS_CONNECTION_RESET) - ImDiskRemoveVirtualDisk(DeviceObject); - Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; Irp->IoStatus.Information = 0; break; @@ -720,7 +706,7 @@ ImDiskDeviceThreadDeviceControl(IN PIRP Irp, break; } -#endif // INCLUDE_VFD_ORIGIN +#endif // INCLUDE_GPL_ORIGIN case IOCTL_STORAGE_MANAGE_DATA_SET_ATTRIBUTES: { @@ -1276,6 +1262,23 @@ ImDiskDeviceThread(IN PVOID Context) Irp->IoStatus.Status = STATUS_DRIVER_INTERNAL_ERROR; } + // If indicating that proxy connection died we can do + // nothing else but remove this device. + switch (Irp->IoStatus.Status) + { + case STATUS_CONNECTION_RESET: + case STATUS_DEVICE_REMOVED: + case STATUS_DEVICE_DOES_NOT_EXIST: + case STATUS_PIPE_BROKEN: + case STATUS_PIPE_DISCONNECTED: + case STATUS_PORT_DISCONNECTED: + case STATUS_REMOTE_DISCONNECT: + ImDiskRemoveVirtualDisk(device_object); + Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; + Irp->IoStatus.Information = 0; + + } + IoCompleteRequest(Irp, NT_SUCCESS(Irp->IoStatus.Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT); diff --git a/sys/floppy.cpp b/sys/floppy.cpp index d9d0144..5ad256f 100644 --- a/sys/floppy.cpp +++ b/sys/floppy.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -45,7 +45,7 @@ Copyright (C) The Regents of the University of California. #pragma code_seg("PAGE") -#ifdef INCLUDE_VFD_ORIGIN +#ifdef INCLUDE_GPL_ORIGIN // // Format tracks @@ -153,4 +153,4 @@ ImDiskFloppyFormat(IN PDEVICE_EXTENSION Extension, return status; } -#endif // INCLUDE_VFD_ORIGIN +#endif // INCLUDE_GPL_ORIGIN diff --git a/sys/imdisk.cpp b/sys/imdisk.cpp index 1acb8ce..b8c0c9b 100644 --- a/sys/imdisk.cpp +++ b/sys/imdisk.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -108,7 +108,12 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, OBJECT_ATTRIBUTES object_attributes; ULONG n; - KdBreakPoint(); +#if DBG + if (!KD_DEBUGGER_NOT_PRESENT) + { + KdBreakPoint(); + } +#endif KeInitializeSpinLock(&DeviceListLock); @@ -1020,7 +1025,7 @@ ImDiskCreateDriveLetter(IN WCHAR DriveLetter, IN ULONG DeviceNumber) { WCHAR sym_link_global_wchar[] = L"\\DosDevices\\Global\\ :"; -#ifndef _WIN64 +#ifdef _M_IX86 WCHAR sym_link_wchar[] = L"\\DosDevices\\ :"; #endif UNICODE_STRING sym_link; @@ -1049,7 +1054,7 @@ ImDiskCreateDriveLetter(IN WCHAR DriveLetter, device_name_buffer[MAXIMUM_FILENAME_LENGTH - 1] = 0; RtlInitUnicodeString(&device_name, device_name_buffer); -#ifndef _WIN64 +#ifdef _M_IX86 sym_link_wchar[12] = DriveLetter; KdPrint(("ImDisk: Creating symlink '%ws' -> '%ws'.\n", diff --git a/sys/imdisk.rc b/sys/imdisk.rc index 337d7e9..e4c1c48 100644 --- a/sys/imdisk.rc +++ b/sys/imdisk.rc @@ -10,8 +10,8 @@ // VS_VERSION_INFO VERSIONINFO -FILEVERSION IMDISK_RC_VERSION_FLD,64 -PRODUCTVERSION IMDISK_RC_VERSION_FLD,64 +FILEVERSION IMDISK_RC_VERSION_FLD,65 +PRODUCTVERSION IMDISK_RC_VERSION_FLD,65 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifndef DEBUG FILEFLAGS 0 @@ -28,12 +28,12 @@ BEGIN BEGIN VALUE "CompanyName", "Olof Lagerkvist\0" VALUE "FileDescription", "ImDisk Virtual Disk Driver\0" - VALUE "FileVersion", IMDISK_RC_VERSION_STR ".64\0" + VALUE "FileVersion", IMDISK_RC_VERSION_STR ".65\0" VALUE "InternalName", "imdisk\0" - VALUE "LegalCopyright", "Copyright © 2005-2018 Olof Lagerkvist etc.\0" + VALUE "LegalCopyright", "Copyright © 2005-2021 Olof Lagerkvist etc.\0" VALUE "OriginalFilename", "imdisk.sys\0" VALUE "ProductName", "imdisk\0" - VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".64\0" + VALUE "ProductVersion", IMDISK_RC_VERSION_STR ".65\0" END END BLOCK "VarFileInfo" diff --git a/sys/imdsksys.h b/sys/imdsksys.h index 090df53..a24e052 100644 --- a/sys/imdsksys.h +++ b/sys/imdsksys.h @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -174,7 +174,8 @@ typedef struct _DEVICE_EXTENSION BOOLEAN vm_disk; // TRUE if this device is a virtual memory disk BOOLEAN awealloc_disk; // TRUE if this device is a physical memory disk // through AWEAlloc driver - BOOLEAN use_proxy; // TRUE if this device uses proxy device for I/O + BOOLEAN use_proxy; // TRUE if this device uses proxy service through + // shared memory, TCP/IP, serial port etc for I/O BOOLEAN proxy_unmap; // TRUE if proxy supports UNMAP operations BOOLEAN proxy_zero; // TRUE if proxy supports ZERO operations BOOLEAN image_modified; // TRUE if this device has been written to @@ -346,13 +347,13 @@ ImDiskReadWriteLowerDevice(PIRP Irp, PDEVICE_EXTENSION DeviceExtension); NTSTATUS ImDiskDeviceControlLowerDevice(PIRP Irp, PDEVICE_EXTENSION DeviceExtension); -#ifdef INCLUDE_VFD_ORIGIN +#ifdef INCLUDE_GPL_ORIGIN NTSTATUS ImDiskFloppyFormat(IN PDEVICE_EXTENSION Extension, IN PIRP Irp); -#endif // INCLUDE_VFD_ORIGIN +#endif // INCLUDE_GPL_ORIGIN #ifdef _AMD64_ diff --git a/sys/iodisp.cpp b/sys/iodisp.cpp index 922eabd..fb1c246 100644 --- a/sys/iodisp.cpp +++ b/sys/iodisp.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -81,7 +81,7 @@ ImDiskDispatchCreateClose(IN PDEVICE_OBJECT DeviceObject, KdPrint(("ImDisk: Attempt to open device %i when shut down.\n", device_extension->device_number)); - status = STATUS_DEVICE_DOES_NOT_EXIST; + status = STATUS_DEVICE_REMOVED; Irp->IoStatus.Status = status; Irp->IoStatus.Information = 0; @@ -126,7 +126,7 @@ ImDiskDispatchReadWrite(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + return STATUS_INVALID_PARAMETER; } device_extension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -150,7 +150,7 @@ ImDiskDispatchReadWrite(IN PDEVICE_OBJECT DeviceObject, KdPrint(("ImDisk: Read/write attempt on device %i while removing.\n", device_extension->device_number)); - status = STATUS_DEVICE_DOES_NOT_EXIST; + status = STATUS_DEVICE_REMOVED; Irp->IoStatus.Status = status; Irp->IoStatus.Information = 0; @@ -348,7 +348,7 @@ ImDiskDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, KdPrint(("ImDisk: IOCTL attempt on device %i that is being removed.\n", device_extension->device_number)); - status = STATUS_DEVICE_DOES_NOT_EXIST; + status = STATUS_DEVICE_REMOVED; Irp->IoStatus.Status = status; @@ -811,6 +811,7 @@ ImDiskDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, case IOCTL_DISK_EJECT_MEDIA: case IOCTL_STORAGE_EJECT_MEDIA: + { KdPrint(("ImDisk: IOCTL_DISK/STORAGE_EJECT_MEDIA for device %i.\n", device_extension->device_number)); @@ -826,6 +827,7 @@ ImDiskDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, } break; + } case IOCTL_IMDISK_QUERY_DRIVER: { @@ -1911,10 +1913,10 @@ ImDiskDispatchFlushBuffers(IN PDEVICE_OBJECT DeviceObject, if (KeReadStateEvent(&device_extension->terminate_thread) != 0) { - KdPrint(("ImDisk: flush dispatch on device %i that is being removed.\n", + KdPrint(("ImDisk: Flush dispatch on device %i that is being removed.\n", device_extension->device_number)); - status = STATUS_DEVICE_DOES_NOT_EXIST; + status = STATUS_DEVICE_REMOVED; Irp->IoStatus.Status = status; Irp->IoStatus.Information = 0; @@ -1998,7 +2000,7 @@ ImDiskDispatchQueryInformation(IN PDEVICE_OBJECT DeviceObject, KdPrint(("ImDisk: QueryInformation dispatch on device %i that is being removed.\n", device_extension->device_number)); - status = STATUS_DEVICE_DOES_NOT_EXIST; + status = STATUS_DEVICE_REMOVED; Irp->IoStatus.Status = status; Irp->IoStatus.Information = 0; @@ -2121,7 +2123,7 @@ ImDiskDispatchSetInformation(IN PDEVICE_OBJECT DeviceObject, KdPrint(("ImDisk: SetInformation dispatch on device %i that is being removed.\n", device_extension->device_number)); - status = STATUS_DEVICE_DOES_NOT_EXIST; + status = STATUS_DEVICE_REMOVED; Irp->IoStatus.Status = status; Irp->IoStatus.Information = 0; @@ -2222,7 +2224,7 @@ ImDiskDispatchPnP(IN PDEVICE_OBJECT DeviceObject, KdPrint(("ImDisk: PnP dispatch on device %i that is being removed.\n", device_extension->device_number)); - status = STATUS_DEVICE_DOES_NOT_EXIST; + status = STATUS_DEVICE_REMOVED; Irp->IoStatus.Status = status; Irp->IoStatus.Information = 0; diff --git a/sys/lowerdev.cpp b/sys/lowerdev.cpp index 10f5092..ebf2581 100644 --- a/sys/lowerdev.cpp +++ b/sys/lowerdev.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -93,6 +93,28 @@ ImDiskReadWriteLowerDeviceCompletion(PDEVICE_OBJECT DeviceObject, { KdPrint(("ImDiskReadWriteLowerDeviceCompletion: Parallel I/O failed with status %#x\n", Irp->IoStatus.Status)); + + // If indicating that proxy connection died we can do + // nothing else but remove this device. + switch (item->OriginalIrp->IoStatus.Status) + { + case STATUS_CONNECTION_RESET: + case STATUS_DEVICE_REMOVED: + case STATUS_DEVICE_DOES_NOT_EXIST: + case STATUS_PIPE_BROKEN: + case STATUS_PIPE_DISCONNECTED: + case STATUS_PORT_DISCONNECTED: + case STATUS_REMOTE_DISCONNECT: + ImDiskRemoveVirtualDisk(DeviceObject); + item->OriginalIrp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; + item->OriginalIrp->IoStatus.Information = 0; + + } + + if (item->AllocatedBuffer != NULL) + { + ExFreePoolWithTag(item->AllocatedBuffer, POOL_TAG); + } } else { diff --git a/sys/proxy.cpp b/sys/proxy.cpp index fdda6b4..54acc39 100644 --- a/sys/proxy.cpp +++ b/sys/proxy.cpp @@ -5,7 +5,7 @@ drives from disk image files, in virtual memory or by redirecting I/O requests somewhere else, possibly to another machine, through a co-operating user-mode service, ImDskSvc. -Copyright (C) 2005-2018 Olof Lagerkvist. +Copyright (C) 2005-2021 Olof Lagerkvist. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -435,11 +435,10 @@ ImDiskConnectProxy(IN OUT PPROXY_CONNECTION Proxy, base_name.Length = ConnectionStringLength; base_name.MaximumLength = ConnectionStringLength; event_name.MaximumLength = ConnectionStringLength + 20; - event_name.Buffer = - (PWCHAR)ExAllocatePoolWithTag(PagedPool, - event_name.MaximumLength, - POOL_TAG); - if (event_name.Buffer == NULL) + + WPoolMem event_name_buffer(event_name.MaximumLength); + + if (!event_name_buffer) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -448,6 +447,8 @@ ImDiskConnectProxy(IN OUT PPROXY_CONNECTION Proxy, return IoStatusBlock->Status; } + event_name.Buffer = event_name_buffer; + InitializeObjectAttributes(&object_attributes, &event_name, OBJ_CASE_INSENSITIVE, @@ -464,7 +465,6 @@ ImDiskConnectProxy(IN OUT PPROXY_CONNECTION Proxy, if (!NT_SUCCESS(status)) { Proxy->request_event_handle = NULL; - ExFreePoolWithTag(event_name.Buffer, POOL_TAG); IoStatusBlock->Status = status; IoStatusBlock->Information = 0; @@ -481,7 +481,6 @@ ImDiskConnectProxy(IN OUT PPROXY_CONNECTION Proxy, if (!NT_SUCCESS(status)) { Proxy->request_event = NULL; - ExFreePoolWithTag(event_name.Buffer, POOL_TAG); IoStatusBlock->Status = status; IoStatusBlock->Information = 0; @@ -498,7 +497,6 @@ ImDiskConnectProxy(IN OUT PPROXY_CONNECTION Proxy, if (!NT_SUCCESS(status)) { Proxy->response_event_handle = NULL; - ExFreePoolWithTag(event_name.Buffer, POOL_TAG); IoStatusBlock->Status = status; IoStatusBlock->Information = 0; @@ -515,7 +513,6 @@ ImDiskConnectProxy(IN OUT PPROXY_CONNECTION Proxy, if (!NT_SUCCESS(status)) { Proxy->response_event = NULL; - ExFreePoolWithTag(event_name.Buffer, POOL_TAG); IoStatusBlock->Status = status; IoStatusBlock->Information = 0; @@ -596,6 +593,7 @@ ImDiskConnectProxy(IN OUT PPROXY_CONNECTION Proxy, if (status == STATUS_PENDING) { KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + status = irp->IoStatus.Status; } if (!NT_SUCCESS(status)) diff --git a/sys/sources b/sys/sources index 34cabe5..3a48619 100644 --- a/sys/sources +++ b/sys/sources @@ -2,11 +2,11 @@ TARGETNAME=imdisk TARGETPATH=. TARGETTYPE=DRIVER -MSC_WARNING_LEVEL=/W4 /WX /wd4201 /wd4204 /wd4221 +MSC_WARNING_LEVEL=/W4 /WX /wd4201 /wd4204 /wd4221 /wd4482 !IF "$(NTDEBUG)" != "ntsd" MSC_OPTIMIZATION=/Ox /GF !ENDIF -C_DEFINES=$(C_DEFINES) /DINCLUDE_VFD_ORIGIN +C_DEFINES=$(C_DEFINES) /DINCLUDE_GPL_ORIGIN !IF "$(_BUILDARCH)" == "x86" LINKER_FLAGS=llmath.lib diff --git a/sys/sources.props b/sys/sources.props index 5319c42..76922a0 100644 --- a/sys/sources.props +++ b/sys/sources.props @@ -7,7 +7,7 @@ imdisk.c imdisk.rc /W4 /WX /wd4201 /wd4204 /wd4221 /Ox /GF - $(C_DEFINES) /DINCLUDE_VFD_ORIGIN + $(C_DEFINES) /DINCLUDE_GPL_ORIGIN diff --git a/sys/sys.inf b/sys/sys.inf new file mode 100644 index 0000000..33e6bb8 --- /dev/null +++ b/sys/sys.inf @@ -0,0 +1,55 @@ + +; DUMMY.INF +; Dummy inf file. + +[Version] +signature = "$Windows NT$" +Class = SCSIAdapter +ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} +Provider = "LTR Data" +DriverVer = 10/26/2021,2.1.0.00070 +CatalogFile = sys.cat + + +[SourceDisksNames] +1 = "ImDisk Virtual Disk Driver" + + +[SourceDisksFiles.x86] +imdisk.sys = 1, i386 + +[SourceDisksFiles.ia64] +imdisk.sys = 1, ia64 + +[SourceDisksFiles.amd64] +imdisk.sys = 1, amd64 + +[SourceDisksFiles.arm] +imdisk.sys = 1, arm + +[SourceDisksFiles.arm64] +imdisk.sys = 1, arm64 + +[DestinationDirs] +ImDiskSysFiles = 12 + + +[DefaultInstall.ntx86] +CopyFiles = ImDiskSysFiles + + +[ImDiskSysFiles] +imdisk.sys + + +[DefaultInstall.ntx86.Services] +AddService = ImDisk, , ImDiskDrv + + +[ImDiskDrv] +DisplayName = "ImDisk Virtual Disk Driver" +StartType = 2 +ServiceType = 1 +ErrorControl = 0 +ServiceBinary = %12%\ImDisk.sys + diff --git a/sys/sys.props b/sys/sys.props index 73bc6ee..13ad07c 100644 --- a/sys/sys.props +++ b/sys/sys.props @@ -1,8 +1,14 @@ - + - + + + DriverEntry + + + + - + \ No newline at end of file diff --git a/sys/sys.vcxproj b/sys/sys.vcxproj index 5041910..b39d53a 100644 --- a/sys/sys.vcxproj +++ b/sys/sys.vcxproj @@ -305,8 +305,8 @@ - + @@ -360,76 +360,100 @@ - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + - http://timestamp.globalsign.com/scripts/timstamp.dll + + @@ -490,6 +514,7 @@ + @@ -536,12 +561,12 @@ - +