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

[misc] update msapi_utf8.h to latest

Browse source 
* Also update appveyor.yml now that MinGW is part of the VS2019 image
This commit is contained in:
Pete Batard 2020-03-30 11:09:03 +01:00
parent 590b89a56a
commit c86a62ed69
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
appveyor.yml
View file

@ -1,3 +1,5 @@
os: Visual Studio 2019
skip_commits: skip_commits:
# Don't run AppVeyor for commits that only modify resource or non-code files # Don't run AppVeyor for commits that only modify resource or non-code files
files: files:
@ -20,32 +22,25 @@ environment:
global: global:
BITS: 32 BITS: 32
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CONFIGURATION: Debug
CONFIGURATION: Debug
COMPILER: MSVC COMPILER: MSVC
PLATFORM: x86 PLATFORM: x86
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CONFIGURATION: Debug
CONFIGURATION: Debug
COMPILER: MSVC COMPILER: MSVC
PLATFORM: x64 PLATFORM: x64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CONFIGURATION: Release
CONFIGURATION: Release
COMPILER: MSVC COMPILER: MSVC
PLATFORM: x86 PLATFORM: x86
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CONFIGURATION: Release
CONFIGURATION: Release
COMPILER: MSVC COMPILER: MSVC
PLATFORM: x64 PLATFORM: x64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CONFIGURATION: Release
CONFIGURATION: Release
COMPILER: MinGW COMPILER: MinGW
PLATFORM: i686 PLATFORM: i686
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CONFIGURATION: Release
CONFIGURATION: Release
COMPILER: MinGW COMPILER: MinGW
PLATFORM: x86_64 PLATFORM: x86_64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CONFIGURATION: Release
CONFIGURATION: Release
COMPILER: Coverity COMPILER: Coverity
PLATFORM: x86 PLATFORM: x86

9
src/msapi_utf8.h
View file

@ -1024,6 +1024,15 @@ static __inline int _openU(const char *filename, int oflag , int pmode)
} }
#endif #endif
static __inline int _unlinkU(const char* path)
{
int ret;
wconvert(path);
ret = _wunlink(wpath);
wfree(path);
return ret;
}
static __inline int _stat64U(const char *path, struct __stat64 *buffer) static __inline int _stat64U(const char *path, struct __stat64 *buffer)
{ {
int ret; int ret;

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.10.1629" CAPTION "Rufus 3.10.1630"
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,10,1629,0 FILEVERSION 3,10,1630,0
PRODUCTVERSION 3,10,1629,0 PRODUCTVERSION 3,10,1630,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.10.1629" VALUE "FileVersion", "3.10.1630"
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.10.exe" VALUE "OriginalFilename", "rufus-3.10.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.10.1629" VALUE "ProductVersion", "3.10.1630"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"