From ade5639c0047ee813f71a8bfef8b1cc7be551009 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 25 Feb 2016 18:21:31 +0000 Subject: [PATCH] [misc] more headers cleanup --- src/drive.h | 30 ++++++++++++++++++++++++++++-- src/rufus.h | 26 -------------------------- src/rufus.rc | 10 +++++----- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/drive.h b/src/drive.h index 584977ec..dd6de5e9 100644 --- a/src/drive.h +++ b/src/drive.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Drive access function calls - * Copyright © 2011-2014 Pete Batard + * Copyright © 2011-2016 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include #include +#include // for DISK_GEOMETRY #pragma once @@ -26,7 +27,7 @@ #define MOUNTMGRCONTROLTYPE ((ULONG)'m') #define MOUNTMGR_DOS_DEVICE_NAME "\\\\.\\MountPointManager" #define IOCTL_MOUNTMGR_QUERY_AUTO_MOUNT \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MOUNTMGR_SET_AUTO_MOUNT \ CTL_CODE(MOUNTMGRCONTROLTYPE, 16, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -48,6 +49,31 @@ typedef struct { DISK_EXTENT Extents[8]; } VOLUME_DISK_EXTENTS_REDEF; +static __inline BOOL UnlockDrive(HANDLE hDrive) { + DWORD size; + return DeviceIoControl(hDrive, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &size, NULL); +} +#define safe_unlockclose(h) do {if ((h != INVALID_HANDLE_VALUE) && (h != NULL)) {UnlockDrive(h); CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0) + +/* Current drive info */ +typedef struct { + DWORD DeviceNumber; + LONGLONG DiskSize; + DISK_GEOMETRY Geometry; + DWORD FirstSector; + char proposed_label[16]; + int PartitionType; + int nPartitions; // number of partitions we actually care about + int FSType; + BOOL has_protective_mbr; + BOOL has_mbr_uefi_marker; + struct { + ULONG Allowed; + ULONG Default; + } ClusterSize[FS_MAX]; +} RUFUS_DRIVE_INFO; +extern RUFUS_DRIVE_INFO SelectedDrive; + BOOL SetAutoMount(BOOL enable); BOOL GetAutoMount(BOOL* enabled); char* GetPhysicalName(DWORD DriveIndex); diff --git a/src/rufus.h b/src/rufus.h index 61b9b2dc..2a1c2bfd 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -16,7 +16,6 @@ * along with this program. If not, see . */ #include -#include // for DISK_GEOMETRY #include #include @@ -99,7 +98,6 @@ #define safe_strncmp(str1, str2, count) strncmp(((str1==NULL)?"":str1), ((str2==NULL)?"":str2), count) #define safe_strnicmp(str1, str2, count) _strnicmp(((str1==NULL)?"":str1), ((str2==NULL)?"":str2), count) #define safe_closehandle(h) do {if ((h != INVALID_HANDLE_VALUE) && (h != NULL)) {CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0) -#define safe_unlockclose(h) do {if ((h != INVALID_HANDLE_VALUE) && (h != NULL)) {UnlockDrive(h); CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0) #define safe_release_dc(hDlg, hDC) do {if ((hDC != INVALID_HANDLE_VALUE) && (hDC != NULL)) {ReleaseDC(hDlg, hDC); hDC = NULL;}} while(0) #define safe_sprintf(dst, count, ...) do {_snprintf(dst, count, __VA_ARGS__); (dst)[(count)-1] = 0; } while(0) #define static_sprintf(dst, ...) safe_sprintf(dst, sizeof(dst), __VA_ARGS__) @@ -225,24 +223,6 @@ enum target_type { #define GETTARGETTYPE(x) (((x)>0)?(((x) >> 16) & 0xFFFF):0) #define GETPARTTYPE(x) (((x)>0)?((x) & 0xFFFF):0); -/* Current drive info */ -typedef struct { - DWORD DeviceNumber; - LONGLONG DiskSize; - DISK_GEOMETRY Geometry; - DWORD FirstSector; - char proposed_label[16]; - int PartitionType; - int nPartitions; // number of partitions we actually care about - int FSType; - BOOL has_protective_mbr; - BOOL has_mbr_uefi_marker; - struct { - ULONG Allowed; - ULONG Default; - } ClusterSize[FS_MAX]; -} RUFUS_DRIVE_INFO; - /* Special handling for old .c32 files we need to replace */ #define NB_OLD_C32 2 #define OLD_C32_NAMES { "menu.c32", "vesamenu.c32" } @@ -372,7 +352,6 @@ extern char* image_path; extern DWORD FormatStatus, DownloadStatus; extern BOOL PromptOnError; extern unsigned long syslinux_ldlinux_len[2]; -extern RUFUS_DRIVE_INFO SelectedDrive; extern const int nb_steps[FS_MAX]; extern BOOL use_own_c32[NB_OLD_C32], detect_fakes, iso_op_in_progress, format_op_in_progress, right_to_left_mode; extern BOOL allow_dual_uefi_bios, togo_mode; @@ -466,11 +445,6 @@ DWORD WINAPI FormatThread(void* param); DWORD WINAPI SaveImageThread(void* param); DWORD WINAPI SumThread(void* param); -static __inline BOOL UnlockDrive(HANDLE hDrive) { - DWORD size; - return DeviceIoControl(hDrive, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &size, NULL); -} - /* Hash tables */ typedef struct htab_entry { uint32_t used; diff --git a/src/rufus.rc b/src/rufus.rc index 1262516a..34895c52 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.8.867" +CAPTION "Rufus 2.8.868" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -320,8 +320,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,867,0 - PRODUCTVERSION 2,8,867,0 + FILEVERSION 2,8,868,0 + PRODUCTVERSION 2,8,868,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -338,13 +338,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.8.867" + VALUE "FileVersion", "2.8.868" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.8.867" + VALUE "ProductVersion", "2.8.868" END END BLOCK "VarFileInfo"