1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00

[mingw] fixed app launching a console on startup

* was the windows subsystem flag
* also added BETA status on about box
This commit is contained in:
Pete Batard 2011-12-02 00:39:48 +00:00
parent d67768923e
commit 9daeec0fa1
3 changed files with 9 additions and 9 deletions

View file

@ -12,5 +12,5 @@ rufus_rc.o: rufus.rc
rufus_SOURCES = fat12.c fat16.c fat32.c br.c file.c drive.c msdos.c format.c stdio.c stdlg.c rufus.c rufus_SOURCES = fat12.c fat16.c fat32.c br.c file.c drive.c msdos.c format.c stdio.c stdlg.c rufus.c
rufus_CFLAGS = -I./inc $(ARCH_CFLAGS) $(AM_CFLAGS) rufus_CFLAGS = -I./inc $(ARCH_CFLAGS) $(AM_CFLAGS)
# static ensures that the exe can be shared as a standalone, and still allow driver installation # static ensures that the exe can be shared as a standalone, and still allow driver installation
rufus_LDFLAGS = $(AM_LDFLAGS) -static rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows -static
rufus_LDADD = rufus_rc.o -lsetupapi -lole32 -lgdi32 rufus_LDADD = rufus_rc.o -lsetupapi -lole32 -lgdi32

View file

@ -170,7 +170,6 @@ static BOOL AnalyzeMBR(HANDLE hPhysicalDrive)
fake_fd._bufsiz = SelectedDrive.Geometry.BytesPerSector; fake_fd._bufsiz = SelectedDrive.Geometry.BytesPerSector;
// TODO: Apply this detection before partitioning // TODO: Apply this detection before partitioning
// TODO: since we detect all these, might as well give some MBR choice to the user?
if (is_br(&fake_fd)) { if (is_br(&fake_fd)) {
uprintf("Drive has an x86 boot sector\n"); uprintf("Drive has an x86 boot sector\n");
} else{ } else{
@ -352,6 +351,7 @@ void __cdecl FormatThread(void* param)
// TODO: Enable compression on NTFS // TODO: Enable compression on NTFS
// TODO: optionally disable indexing on NTFS // TODO: optionally disable indexing on NTFS
// TODO: use progress bar during MBR/FSBR/MSDOS copy // TODO: use progress bar during MBR/FSBR/MSDOS copy
// TODO: unlock/remount trick to make the volume reappear
PrintStatus("Writing master boot record...\n"); PrintStatus("Writing master boot record...\n");
if (!WriteMBR(hPhysicalDrive)) { if (!WriteMBR(hPhysicalDrive)) {

View file

@ -58,12 +58,12 @@ CAPTION "About Rufus"
FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
BEGIN BEGIN
ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20
LTEXT "Rufus",IDC_RUFUS_BOLD,46,8,25,8,SS_NOPREFIX | SS_NOTIFY LTEXT "Rufus *BETA*",IDC_RUFUS_BOLD,46,8,78,8,SS_NOPREFIX | SS_NOTIFY
LTEXT "Copyright (c) 2011 Pete Batard",IDC_STATIC,46,36,139,8 LTEXT "Copyright (c) 2011 Pete Batard",IDC_STATIC,46,36,139,8
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
CONTROL "<a href=""https://github.com/pbatard/rufus/wiki/Rufus"">https://github.com/pbatard/rufus</a>",IDC_ABOUT_RUFUS_URL, CONTROL "<a href=""https://github.com/pbatard/rufus/wiki/Rufus"">https://github.com/pbatard/rufus</a>",IDC_ABOUT_RUFUS_URL,
"SysLink",WS_TABSTOP,46,47,114,9 "SysLink",WS_TABSTOP,46,47,114,9
LTEXT "Version 1.0.0 (Build 62)",IDC_STATIC,46,19,78,8 LTEXT "Version 1.0.0 (Build 63)",IDC_STATIC,46,19,78,8
PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@ -162,8 +162,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,62 FILEVERSION 1,0,0,63
PRODUCTVERSION 1,0,0,62 PRODUCTVERSION 1,0,0,63
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -180,13 +180,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "akeo.ie" VALUE "CompanyName", "akeo.ie"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.0.0.62" VALUE "FileVersion", "1.0.0.63"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.0.0.62" VALUE "ProductVersion", "1.0.0.63"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@ -212,7 +212,7 @@ IDI_ICON ICON "rufus.ico"
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_VERSION "Rufus v1.0.0.62" IDS_VERSION "Rufus v1.0.0.63"
END END
#endif // English resources #endif // English resources