From 8dfb760cf28f63ed89f2b32dcea4c9d25304f24d Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 20 Nov 2017 11:39:53 +0000 Subject: [PATCH] [misc] set Windows SDK to 10.0.16299 --- .vs/bled.vcxproj | 2 +- .vs/getopt.vcxproj | 2 +- .vs/libcdio-driver.vcxproj | 2 +- .vs/libcdio-iso9660.vcxproj | 2 +- .vs/libcdio-udf.vcxproj | 2 +- .vs/ms-sys.vcxproj | 2 +- .vs/rufus.vcxproj | 2 +- .vs/syslinux-libfat.vcxproj | 2 +- .vs/syslinux-libinstaller.vcxproj | 2 +- .vs/syslinux-win.vcxproj | 2 +- README.md | 3 ++- src/process.c | 2 +- src/process.h | 6 ------ src/rufus.h | 1 - src/rufus.rc | 10 +++++----- 15 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj index 532b2100..347030fc 100644 --- a/.vs/bled.vcxproj +++ b/.vs/bled.vcxproj @@ -76,7 +76,7 @@ bled {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D} bled - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj index 0c2448de..80266709 100644 --- a/.vs/getopt.vcxproj +++ b/.vs/getopt.vcxproj @@ -37,7 +37,7 @@ {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj index 9656ff11..d9505532 100644 --- a/.vs/libcdio-driver.vcxproj +++ b/.vs/libcdio-driver.vcxproj @@ -69,7 +69,7 @@ Win32Proj driver libcdio-driver - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj index f4c701ba..e60de9e4 100644 --- a/.vs/libcdio-iso9660.vcxproj +++ b/.vs/libcdio-iso9660.vcxproj @@ -61,7 +61,7 @@ Win32Proj iso9660 libcdio-iso9660 - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj index 1152237c..c2ed1c25 100644 --- a/.vs/libcdio-udf.vcxproj +++ b/.vs/libcdio-udf.vcxproj @@ -55,7 +55,7 @@ Win32Proj udf libcdio-udf - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj index 9915023e..113ea959 100644 --- a/.vs/ms-sys.vcxproj +++ b/.vs/ms-sys.vcxproj @@ -96,7 +96,7 @@ {2B1D078D-8EB4-4398-9CA4-23457265A7F6} Win32Proj mssys - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj index f9ea449f..c75845a4 100644 --- a/.vs/rufus.vcxproj +++ b/.vs/rufus.vcxproj @@ -39,7 +39,7 @@ {731858A7-0303-4988-877B-9C0DD6471864} rufus Win32Proj - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj index b3392477..a25af000 100644 --- a/.vs/syslinux-libfat.vcxproj +++ b/.vs/syslinux-libfat.vcxproj @@ -51,7 +51,7 @@ Win32Proj libfat syslinux-libfat - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj index f5176ad1..b0462bc5 100644 --- a/.vs/syslinux-libinstaller.vcxproj +++ b/.vs/syslinux-libinstaller.vcxproj @@ -51,7 +51,7 @@ Win32Proj libinstaller syslinux-libinstaller - 10.0.15063.0 + 10.0.16299.0 diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj index 85c644c7..a67cb89a 100644 --- a/.vs/syslinux-win.vcxproj +++ b/.vs/syslinux-win.vcxproj @@ -45,7 +45,7 @@ Win32Proj win syslinux-win - 10.0.15063.0 + 10.0.16299.0 diff --git a/README.md b/README.md index b5f1f1e5..cdb63a52 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ Features Compilation ----------- -Use either Visual Studio (2017 or later) or MinGW and then invoke the `.sln` or `configure`/`make` respectively. +Use either Visual Studio 2017 (with Update 4 and SDK 10.0.16299 installed) or MinGW and +then invoke the `.sln` or `configure`/`make` respectively. #### Visual Studio Note that, since Rufus is an OSI compliant Open Source project, you are entitled to diff --git a/src/process.c b/src/process.c index 3972be27..ac71ea61 100644 --- a/src/process.c +++ b/src/process.c @@ -43,7 +43,7 @@ PF_TYPE_DECL(NTAPI, NTSTATUS, NtQuerySystemInformation, (SYSTEM_INFORMATION_CLAS PF_TYPE_DECL(NTAPI, NTSTATUS, NtQueryInformationFile, (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS)); PF_TYPE_DECL(NTAPI, NTSTATUS, NtQueryObject, (HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG)); PF_TYPE_DECL(NTAPI, NTSTATUS, NtDuplicateObject, (HANDLE, HANDLE, HANDLE, PHANDLE, ACCESS_MASK, ULONG, ULONG)); -PF_TYPE_DECL(NTAPI, NTSTATUS, NtOpenProcess, (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PCLIENT_ID)); +PF_TYPE_DECL(NTAPI, NTSTATUS, NtOpenProcess, (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, CLIENT_ID*)); PF_TYPE_DECL(NTAPI, NTSTATUS, NtOpenProcessToken, (HANDLE, ACCESS_MASK, PHANDLE)); PF_TYPE_DECL(NTAPI, NTSTATUS, NtAdjustPrivilegesToken, (HANDLE, BOOLEAN, PTOKEN_PRIVILEGES, ULONG, PTOKEN_PRIVILEGES, PULONG)); PF_TYPE_DECL(NTAPI, NTSTATUS, NtClose, (HANDLE)); diff --git a/src/process.h b/src/process.h index e9dc9a2b..a0d7cf6a 100644 --- a/src/process.h +++ b/src/process.h @@ -77,12 +77,6 @@ typedef struct _OBJECT_NAME_INFORMATION UNICODE_STRING Name; } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; -typedef struct _CLIENT_ID -{ - HANDLE UniqueProcess; - HANDLE UniqueThread; -} CLIENT_ID, *PCLIENT_ID; - typedef struct _OBJECT_TYPE_INFORMATION { UNICODE_STRING TypeName; diff --git a/src/rufus.h b/src/rufus.h index 473a3e31..9cdf4077 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -598,4 +598,3 @@ static __inline HMODULE GetLibraryHandle(char* szLibraryName) { #define ERROR_CANT_PATCH 0x120A #define ERROR_CANT_ASSIGN_LETTER 0x120B #define ERROR_CANT_MOUNT_VOLUME 0x120C - diff --git a/src/rufus.rc b/src/rufus.rc index 33b8016a..ce0287e3 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.18.1216" +CAPTION "Rufus 2.18.1217" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -366,8 +366,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,18,1216,0 - PRODUCTVERSION 2,18,1216,0 + FILEVERSION 2,18,1217,0 + PRODUCTVERSION 2,18,1217,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -384,13 +384,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.18.1216" + VALUE "FileVersion", "2.18.1217" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.18.1216" + VALUE "ProductVersion", "2.18.1217" END END BLOCK "VarFileInfo"