[misc] remove manual hooks into ntdll

* Since we are now liking with ntdll directly, we can remove all the hooks we applied
  and just use regular calls. We also rename process.h to ntdll.h as a result.

Author: pbatard

.vs/rufus.vcxproj

@@ -426,7 +426,7 @@
     <ClInclude Include="..\src\mbr_types.h" />
     <ClInclude Include="..\src\missing.h" />
     <ClInclude Include="..\src\msvc-missing\unistd.h" />
-    <ClInclude Include="..\src\process.h" />
+    <ClInclude Include="..\src\ntdll.h" />
     <ClInclude Include="..\src\re.h" />
     <ClInclude Include="..\src\settings.h" />
     <ClInclude Include="..\src\libcdio\cdio\cdio.h" />

.vs/rufus.vcxproj.filters

@@ -161,7 +161,7 @@
     <ClInclude Include="..\src\db.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\process.h">
+    <ClInclude Include="..\src\ntdll.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\ui.h">

src/drive.c

@@ -33,6 +33,7 @@
 #endif
 
 #include "rufus.h"
+#include "ntdll.h"
 #include "missing.h"
 #include "resource.h"
 #include "settings.h"
@@ -66,8 +67,6 @@ const IID IID_IVdsVolume = { 0x88306BB2, 0xE71F, 0x478C, { 0x86, 0xA2, 0x79, 0xD
 const IID IID_IVdsVolumeMF3 = { 0x6788FAF9, 0x214E, 0x4B85, { 0xBA, 0x59, 0x26, 0x69, 0x53, 0x61, 0x6E, 0x09 } };
 #endif
 
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtQueryVolumeInformationFile, (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FS_INFORMATION_CLASS));
-
 /*
  * Globals
  */
@@ -1097,15 +1096,13 @@ static BOOL _GetDriveLettersAndType(DWORD DriveIndex, char* drive_letters, UINT*
 	HANDLE hDrive = INVALID_HANDLE_VALUE, hPhysical = INVALID_HANDLE_VALUE;
 	UINT _drive_type;
 	IO_STATUS_BLOCK io_status_block;
-	FILE_FS_DEVICE_INFORMATION file_fs_device_info;
+	FILE_FS_DEVICE_INFORMATION file_fs_device_info = { 0 };
 	BYTE geometry[256] = { 0 };
 	PDISK_GEOMETRY_EX DiskGeometry = (PDISK_GEOMETRY_EX)(void*)geometry;
 	int i = 0, drives_found = 0, drive_number;
 	char *drive, drives[26*4 + 1];	/* "D:\", "E:\", etc., plus one NUL */
 	char logical_drive[] = "\\\\.\\#:";
 
-	PF_INIT(NtQueryVolumeInformationFile, Ntdll);
-
 	if (drive_letters != NULL)
 		drive_letters[0] = 0;
 	if (drive_type != NULL)
@@ -1156,8 +1153,7 @@ static BOOL _GetDriveLettersAndType(DWORD DriveIndex, char* drive_letters, UINT*
 		}
 
 		// Eliminate floppy drives
-		if ((pfNtQueryVolumeInformationFile != NULL) &&
-			(pfNtQueryVolumeInformationFile(hDrive, &io_status_block, &file_fs_device_info,
+		if ((NtQueryVolumeInformationFile(hDrive, &io_status_block, &file_fs_device_info,
 				sizeof(file_fs_device_info), FileFsDeviceInformation) == NO_ERROR) &&
 			(file_fs_device_info.Characteristics & FILE_FLOPPY_DISKETTE) ) {
 				continue;

src/drive.h

@@ -61,22 +61,6 @@
 
 #define VDS_SET_ERROR(hr) do { if (hr != S_OK) { SetLastError((DWORD)hr); ErrorStatus = RUFUS_ERROR(ERROR_GEN_FAILURE); } } while(0)
 
-#if !defined(__MINGW32__)
-typedef enum _FSINFOCLASS {
-	FileFsVolumeInformation = 1,
-	FileFsLabelInformation,
-	FileFsSizeInformation,
-	FileFsDeviceInformation,
-	FileFsAttributeInformation,
-	FileFsControlInformation,
-	FileFsFullSizeInformation,
-	FileFsObjectIdInformation,
-	FileFsDriverPathInformation,
-	FileFsVolumeFlagsInformation,
-	FileFsMaximumInformation
-} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
-#endif
-
 /* We need a redef of these MS structure */
 typedef struct {
 	DWORD DeviceType;

src/ext2fs/nt_io.c

@@ -28,21 +28,12 @@
 #include "config.h"
 #include "ext2fs.h"
 #include "rufus.h"
+#include "ntdll.h"
 #include "msapi_utf8.h"
 
 extern char* NtStatusError(NTSTATUS Status);
 static DWORD LastWinError = 0;
 
-PF_TYPE_DECL(NTAPI, ULONG, RtlNtStatusToDosError, (NTSTATUS));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtClose, (HANDLE));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtOpenFile, (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtFlushBuffersFile, (HANDLE, PIO_STATUS_BLOCK));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtReadFile, (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, PVOID, ULONG, PLARGE_INTEGER, PULONG));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtWriteFile, (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, PVOID, ULONG, PLARGE_INTEGER, PULONG));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtDeviceIoControlFile, (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, ULONG, PVOID, ULONG, PVOID, ULONG));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtFsControlFile, (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, ULONG, PVOID, ULONG, PVOID, ULONG));
-PF_TYPE_DECL(NTAPI, NTSTATUS, NtDelayExecution, (BOOLEAN, PLARGE_INTEGER));
-
 #define ARGUMENT_PRESENT(ArgumentPointer)   ((CHAR *)((ULONG_PTR)(ArgumentPointer)) != (CHAR *)(NULL))
 
 #define STATUS_SUCCESS                      ((NTSTATUS)0x00000000L)
@@ -173,8 +164,7 @@ static unsigned _MapDosError(IN ULONG WinError)
 // Map NT status to dos error.
 static __inline unsigned _MapNtStatus(IN NTSTATUS Status)
 {
-	PF_INIT(RtlNtStatusToDosError, Ntdll);
-	return (pfRtlNtStatusToDosError == NULL) ? EFAULT: _MapDosError(pfRtlNtStatusToDosError(Status));
+	return _MapDosError(RtlNtStatusToDosError(Status));
 }
 
 // Return the last Windows Error
@@ -193,8 +183,6 @@ static NTSTATUS _OpenNtName(IN PCSTR Name, IN BOOLEAN Readonly, OUT PHANDLE Hand
 	NTSTATUS Status = EFAULT;
 	OBJECT_ATTRIBUTES ObjectAttributes;
 	IO_STATUS_BLOCK IoStatusBlock;
-	PF_INIT(NtDelayExecution, Ntdll);
-	PF_INIT_OR_OUT(NtOpenFile, Ntdll);
 
 	// Make Unicode name from input string
 	utf8_to_wchar_no_alloc(Name, Buffer, ARRAYSIZE(Buffer));
@@ -209,16 +197,16 @@ static NTSTATUS _OpenNtName(IN PCSTR Name, IN BOOLEAN Readonly, OUT PHANDLE Hand
 	if (ARGUMENT_PRESENT(OpenedReadonly))
 		*OpenedReadonly = Readonly;
 
-	Status = pfNtOpenFile(Handle, SYNCHRONIZE | FILE_READ_DATA | (Readonly ? 0 : FILE_WRITE_DATA),
+	Status = NtOpenFile(Handle, SYNCHRONIZE | FILE_READ_DATA | (Readonly ? 0 : FILE_WRITE_DATA),
 			      &ObjectAttributes, &IoStatusBlock, FILE_SHARE_WRITE | FILE_SHARE_READ,
 			      FILE_SYNCHRONOUS_IO_NONALERT);
 	if (!NT_SUCCESS(Status)) {
 		// Maybe was just mounted? wait 0.5 sec and retry.
 		LARGE_INTEGER Interval;
 		Interval.QuadPart = -5000000; // 0.5 sec. from now
-		pfNtDelayExecution(FALSE, &Interval);
+		NtDelayExecution(FALSE, &Interval);
 
-		Status = pfNtOpenFile(Handle, SYNCHRONIZE | FILE_READ_DATA | (Readonly ? 0 : FILE_WRITE_DATA),
+		Status = NtOpenFile(Handle, SYNCHRONIZE | FILE_READ_DATA | (Readonly ? 0 : FILE_WRITE_DATA),
 				      &ObjectAttributes, &IoStatusBlock, FILE_SHARE_WRITE | FILE_SHARE_READ,
 				      FILE_SYNCHRONOUS_IO_NONALERT);
 
@@ -227,13 +215,12 @@ static NTSTATUS _OpenNtName(IN PCSTR Name, IN BOOLEAN Readonly, OUT PHANDLE Hand
 			if (ARGUMENT_PRESENT(OpenedReadonly))
 				*OpenedReadonly = TRUE;
 
-			Status = pfNtOpenFile(Handle, SYNCHRONIZE | FILE_READ_DATA, &ObjectAttributes,
+			Status = NtOpenFile(Handle, SYNCHRONIZE | FILE_READ_DATA, &ObjectAttributes,
 					      &IoStatusBlock, FILE_SHARE_WRITE | FILE_SHARE_READ,
 					      FILE_SYNCHRONOUS_IO_NONALERT);
 		}
 	}
 
-out:
 	return Status;
 }
 
@@ -247,45 +234,38 @@ static NTSTATUS _OpenDriveLetter(IN CHAR Letter, IN BOOLEAN ReadOnly, OUT PHANDL
 static __inline NTSTATUS _FlushDrive(IN HANDLE Handle)
 {
 	IO_STATUS_BLOCK IoStatusBlock;
-	PF_INIT(NtFlushBuffersFile, NtDll);
-	return (pfNtFlushBuffersFile == NULL) ? STATUS_DLL_NOT_FOUND : pfNtFlushBuffersFile(Handle, &IoStatusBlock);
+	return NtFlushBuffersFile(Handle, &IoStatusBlock);
 }
 
 
 static __inline NTSTATUS _LockDrive(IN HANDLE Handle)
 {
 	IO_STATUS_BLOCK IoStatusBlock;
-	PF_INIT(NtFsControlFile, NtDll);
-	return (pfNtFsControlFile == NULL) ? STATUS_DLL_NOT_FOUND : pfNtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_LOCK_VOLUME, 0, 0, 0, 0);
+	return NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_LOCK_VOLUME, 0, 0, 0, 0);
 }
 
 
 static __inline NTSTATUS _UnlockDrive(IN HANDLE Handle)
 {
 	IO_STATUS_BLOCK IoStatusBlock;
-	PF_INIT(NtFsControlFile, NtDll);
-	return (pfNtFsControlFile == NULL) ? STATUS_DLL_NOT_FOUND : pfNtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_UNLOCK_VOLUME, 0, 0, 0, 0);
+	return NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_UNLOCK_VOLUME, 0, 0, 0, 0);
 }
 
 static __inline NTSTATUS _DismountDrive(IN HANDLE Handle)
 {
 	IO_STATUS_BLOCK IoStatusBlock;
-	PF_INIT(NtFsControlFile, NtDll);
-	return (pfNtFsControlFile == NULL) ? STATUS_DLL_NOT_FOUND : pfNtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_DISMOUNT_VOLUME, 0, 0, 0, 0);
+	return NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_DISMOUNT_VOLUME, 0, 0, 0, 0);
 }
 
 static __inline BOOLEAN _IsMounted(IN HANDLE Handle)
 {
 	IO_STATUS_BLOCK IoStatusBlock;
-	PF_INIT(NtFsControlFile, NtDll);
-	return (pfNtFsControlFile == NULL) ? FALSE :
-		(BOOLEAN)(pfNtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_IS_VOLUME_MOUNTED, 0, 0, 0, 0) == STATUS_SUCCESS);
+	return (BOOLEAN)(NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_IS_VOLUME_MOUNTED, 0, 0, 0, 0) == STATUS_SUCCESS);
 }
 
 static __inline NTSTATUS _CloseDisk(IN HANDLE Handle)
 {
-	PF_INIT(NtClose, Ntdll);
-	return (pfNtClose == NULL) ? STATUS_DLL_NOT_FOUND : pfNtClose(Handle);
+	return NtClose(Handle);
 }
 
 static PCSTR _NormalizeDeviceName(IN PCSTR Device, IN PSTR NormalizedDeviceNameBuffer, OUT __u64 *Offset, OUT __u64 *Size)
@@ -320,12 +300,9 @@ static VOID _GetDeviceSize(IN HANDLE h, OUT unsigned __int64 *FsSize)
 	LARGE_INTEGER li;
 
 	*FsSize = 0;
-	PF_INIT(NtDeviceIoControlFile, NtDll);
-	if (pfNtDeviceIoControlFile == NULL)
-		return;
 
 	RtlZeroMemory(&pi, sizeof(pi));
-	Status = pfNtDeviceIoControlFile(h, NULL, NULL, NULL, &IoStatusBlock,
+	Status = NtDeviceIoControlFile(h, NULL, NULL, NULL, &IoStatusBlock,
 					 IOCTL_DISK_GET_PARTITION_INFO_EX,
 					 &pi, sizeof(pi), &pi, sizeof(pi));
 	if (NT_SUCCESS(Status)) {
@@ -334,7 +311,7 @@ static VOID _GetDeviceSize(IN HANDLE h, OUT unsigned __int64 *FsSize)
 		// No partitions: Try a drive geometry request
 		RtlZeroMemory(&gi, sizeof(gi));
 
-		Status = pfNtDeviceIoControlFile(h, NULL, NULL, NULL, &IoStatusBlock,
+		Status = NtDeviceIoControlFile(h, NULL, NULL, NULL, &IoStatusBlock,
 						 IOCTL_DISK_GET_DRIVE_GEOMETRY_EX,
 						 &gi, sizeof(gi), &gi, sizeof(gi));
 
@@ -389,8 +366,6 @@ static BOOLEAN _BlockIo(IN HANDLE Handle, IN LARGE_INTEGER Offset, IN ULONG Byte
 {
 	IO_STATUS_BLOCK IoStatusBlock;
 	NTSTATUS Status = STATUS_DLL_NOT_FOUND;
-	PF_INIT_OR_OUT(NtReadFile, NtDll);
-	PF_INIT_OR_OUT(NtWriteFile, NtDll);
 
 	// Should be aligned
 	assert((Bytes % 512) == 0);
@@ -399,14 +374,13 @@ static BOOLEAN _BlockIo(IN HANDLE Handle, IN LARGE_INTEGER Offset, IN ULONG Byte
 	LastWinError = 0;
 	// Perform io
 	if(Read) {
-		Status = pfNtReadFile(Handle, NULL, NULL, NULL,
+		Status = NtReadFile(Handle, NULL, NULL, NULL,
 			&IoStatusBlock, Buffer, Bytes, &Offset, NULL);
 	} else	{
-		Status = pfNtWriteFile(Handle, NULL, NULL, NULL,
+		Status = NtWriteFile(Handle, NULL, NULL, NULL,
 			&IoStatusBlock, Buffer, Bytes, &Offset, NULL);
 	}
 
-out:
 	if (!NT_SUCCESS(Status)) {
 		if (ARGUMENT_PRESENT(Errno))
 			*Errno = _MapNtStatus(Status);
@@ -431,10 +405,7 @@ static BOOLEAN _RawRead(IN HANDLE Handle, IN LARGE_INTEGER Offset, IN ULONG Byte
 static BOOLEAN _SetPartType(IN HANDLE Handle, IN UCHAR Type)
 {
 	IO_STATUS_BLOCK IoStatusBlock;
-	PF_INIT(NtDeviceIoControlFile, NtDll);
-	if (pfNtDeviceIoControlFile == NULL)
-		return FALSE;
-	return NT_SUCCESS(pfNtDeviceIoControlFile(Handle, NULL, NULL, NULL, &IoStatusBlock,
+	return NT_SUCCESS(NtDeviceIoControlFile(Handle, NULL, NULL, NULL, &IoStatusBlock,
 						  IOCTL_DISK_SET_PARTITION_INFO, &Type, sizeof(Type), NULL, 0));
 }