nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[ext2fs] fix Status control code not being checked

Browse source 
* Status code assignation was removed when the original code
  was altered to use pfNtFsControlFile(). Fix that and also
  make the code more similar to other calls.
* Closes #1459
This commit is contained in:
Tsarevich Dmitry 2020-02-18 02:10:58 +03:00 committed by Pete Batard
parent 3d1ec358b5
commit 0679fe11df
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ext2fs/nt_io.c
View file

@ -280,11 +280,9 @@ static __inline NTSTATUS _DismountDrive(IN HANDLE Handle)
static __inline BOOLEAN _IsMounted(IN HANDLE Handle) static __inline BOOLEAN _IsMounted(IN HANDLE Handle)
{ {
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
NTSTATUS Status = STATUS_DLL_NOT_FOUND;
PF_INIT(NtFsControlFile, NtDll); PF_INIT(NtFsControlFile, NtDll);
if (pfNtFsControlFile != NULL) return (pfNtFsControlFile == NULL) ? STATUS_DLL_NOT_FOUND :
pfNtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_IS_VOLUME_MOUNTED, 0, 0, 0, 0); (BOOLEAN)(pfNtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_IS_VOLUME_MOUNTED, 0, 0, 0, 0) == STATUS_SUCCESS);
return (BOOLEAN)(Status == STATUS_SUCCESS);
} }
static __inline NTSTATUS _CloseDisk(IN HANDLE Handle) static __inline NTSTATUS _CloseDisk(IN HANDLE Handle)

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.9.1620" CAPTION "Rufus 3.9.1621"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,9,1620,0 FILEVERSION 3,9,1621,0
PRODUCTVERSION 3,9,1620,0 PRODUCTVERSION 3,9,1621,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.9.1620" VALUE "FileVersion", "3.9.1621"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.9.exe" VALUE "OriginalFilename", "rufus-3.9.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.9.1620" VALUE "ProductVersion", "3.9.1621"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"