mirror of https://github.com/pbatard/rufus.git
[freedos] Embed FreeDOS always in a single version of rufus.c
* also bump version to rufus-next * also change build prefix from '#' to 'b' in tags
This commit is contained in:
Pete Batard
parent
b397889ab6
commit
51fb4e339f
|
|
@ -6,10 +6,5 @@ release: all
|
|||
@mv src/$(TARGET)$(EXEEXT) .
|
||||
@$(STRIP) $(TARGET)$(EXEEXT)
|
||||
@upx $(TARGET)$(EXEEXT)
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXESUFFIX)$(EXEEXT)
|
||||
# Don't want to enter a password twice => only sign when we have both release files
|
||||
@if [ -f $(TARGET)_v$(VERSION)f$(EXEEXT) ]; then \
|
||||
if [ -f $(TARGET)_v$(VERSION)$(EXEEXT) ]; then \
|
||||
cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT); \
|
||||
fi; \
|
||||
fi
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
@cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
|
|
|
|||
11
Makefile.in
11
Makefile.in
|
|
@ -71,7 +71,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -85,7 +84,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -449,13 +447,8 @@ release: all
|
|||
@mv src/$(TARGET)$(EXEEXT) .
|
||||
@$(STRIP) $(TARGET)$(EXEEXT)
|
||||
@upx $(TARGET)$(EXEEXT)
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXESUFFIX)$(EXEEXT)
|
||||
# Don't want to enter a password twice => only sign when we have both release files
|
||||
@if [ -f $(TARGET)_v$(VERSION)f$(EXEEXT) ]; then \
|
||||
if [ -f $(TARGET)_v$(VERSION)$(EXEEXT) ]; then \
|
||||
cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT); \
|
||||
fi; \
|
||||
fi
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
@cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
|
|
|||
|
|
@ -5,16 +5,14 @@ Features:
|
|||
- Creates DOS bootable USB drives, with no external files required
|
||||
- Creates bootable USB drives from bootable ISOs (Windows, Linux, etc.)
|
||||
- Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO->USB (1)
|
||||
- Bad blocks check
|
||||
- Bad blocks check, with detection for fake capacity
|
||||
- Modern UI, with UAC elevation for Windows Vista and later
|
||||
- Very small footprint, no installation required
|
||||
- Small footprint, no installation required
|
||||
- 100% Free Source Software (GPL v3)
|
||||
|
||||
Compilation:
|
||||
Use either Visual Studio 2010, WDK (Windows Driver Kit) or MinGW and then
|
||||
invoke the .sln, wdk_build.cmd or configure/make respectively.
|
||||
You can change the project options (FreeDOS support, etc) by editing the top-level
|
||||
ms-config.h (Visual Studio, WDK) or running "./configure --help" (MinGW).
|
||||
|
||||
Additional information:
|
||||
Rufus provides extensive information about what it is doing through the Windows
|
||||
|
|
|
|||
|
|
@ -12,5 +12,5 @@
|
|||
type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; }
|
||||
|
||||
TAGVER=`cat ./.tag`
|
||||
git tag "#$TAGVER"
|
||||
git tag "b$TAGVER"
|
||||
rm ./.tag
|
||||
|
|
@ -1,10 +1,5 @@
|
|||
#!/bin/sh
|
||||
rm -f rufus*.exe
|
||||
./configure --without-freedos
|
||||
./configure
|
||||
make clean
|
||||
make release -j2
|
||||
./configure --with-freedos
|
||||
# The only difference between FreeDOS and non FreeDOS is with the RC
|
||||
# => instead of invoking 'make clean, just remove the RC object
|
||||
rm src/rufus_rc.o
|
||||
make release -j2
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68 for rufus 1.1.6.
|
||||
# Generated by GNU Autoconf 2.68 for rufus 1.2.0.
|
||||
#
|
||||
# Report bugs to <https://github.com/pbatard/rufus/issues>.
|
||||
#
|
||||
|
|
@ -559,8 +559,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='rufus'
|
||||
PACKAGE_TARNAME='rufus'
|
||||
PACKAGE_VERSION='1.1.6'
|
||||
PACKAGE_STRING='rufus 1.1.6'
|
||||
PACKAGE_VERSION='1.2.0'
|
||||
PACKAGE_STRING='rufus 1.2.0'
|
||||
PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
|
||||
PACKAGE_URL='http://rufus.akeo.ie'
|
||||
|
||||
|
|
@ -569,8 +569,6 @@ ac_subst_vars='am__EXEEXT_FALSE
|
|||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
EXESUFFIX
|
||||
AM_RCFLAGS
|
||||
AM_LDFLAGS
|
||||
AM_CFLAGS
|
||||
VISIBILITY_CFLAGS
|
||||
|
|
@ -651,7 +649,6 @@ ac_subst_files=''
|
|||
ac_user_opts='
|
||||
enable_option_checking
|
||||
enable_silent_rules
|
||||
with_freedos
|
||||
enable_debug
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
|
|
@ -1204,7 +1201,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures rufus 1.1.6 to adapt to many kinds of systems.
|
||||
\`configure' configures rufus 1.2.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1270,7 +1267,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of rufus 1.1.6:";;
|
||||
short | recursive ) echo "Configuration of rufus 1.2.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1282,11 +1279,6 @@ Optional Features:
|
|||
--disable-silent-rules verbose build output (undo: `make V=0')
|
||||
--enable-debug keep debug symbols for gdb (default=yes)
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-freedos embed FreeDOS support (default=yes)
|
||||
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
CFLAGS C compiler flags
|
||||
|
|
@ -1363,7 +1355,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
rufus configure 1.1.6
|
||||
rufus configure 1.2.0
|
||||
generated by GNU Autoconf 2.68
|
||||
|
||||
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
|
|
@ -1418,7 +1410,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by rufus $as_me 1.1.6, which was
|
||||
It was created by rufus $as_me 1.2.0, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2233,7 +2225,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='rufus'
|
||||
VERSION='1.1.6'
|
||||
VERSION='1.2.0'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -3450,20 +3442,6 @@ $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h
|
|||
AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501"
|
||||
AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined"
|
||||
|
||||
# FreeDOS support
|
||||
|
||||
# Check whether --with-freedos was given.
|
||||
if test "${with_freedos+set}" = set; then :
|
||||
withval=$with_freedos;
|
||||
else
|
||||
with_freedos=yes
|
||||
fi
|
||||
|
||||
if test "x$with_freedos" != "xno" ; then
|
||||
AM_RCFLAGS="${AM_RCFLAGS} -DWITH_FREEDOS"
|
||||
EXESUFFIX="f"
|
||||
fi
|
||||
|
||||
# Debug symbols
|
||||
# Check whether --enable-debug was given.
|
||||
if test "${enable_debug+set}" = set; then :
|
||||
|
|
@ -3511,8 +3489,6 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-protot
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files src/Makefile"
|
||||
|
|
@ -4091,7 +4067,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by rufus $as_me 1.1.6, which was
|
||||
This file was extended by rufus $as_me 1.2.0, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -4145,7 +4121,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
rufus config.status 1.1.6
|
||||
rufus config.status 1.2.0
|
||||
configured by $0, generated by GNU Autoconf 2.68,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
@ -4726,6 +4702,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
|||
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeDOS support: $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled)" >&5
|
||||
$as_echo "FreeDOS support: $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled)" >&6; }
|
||||
|
|
|
|||
17
configure.ac
17
configure.ac
|
|
@ -1,4 +1,4 @@
|
|||
AC_INIT([rufus], [1.1.6], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
|
||||
AC_INIT([rufus], [1.2.0], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
|
||||
AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
|
||||
AC_CONFIG_SRCDIR([src/rufus.c])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
|
@ -21,17 +21,6 @@ AC_DEFINE([_GNU_SOURCE], [], [Use GNU extensions])
|
|||
AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501"
|
||||
AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined"
|
||||
|
||||
# FreeDOS support
|
||||
AC_ARG_WITH([freedos],
|
||||
[AS_HELP_STRING([--with-freedos],
|
||||
[embed FreeDOS support (default=yes)])],
|
||||
[],
|
||||
[with_freedos=yes])
|
||||
if test "x$with_freedos" != "xno" ; then
|
||||
AM_RCFLAGS="${AM_RCFLAGS} -DWITH_FREEDOS"
|
||||
EXESUFFIX="f"
|
||||
fi
|
||||
|
||||
# Debug symbols
|
||||
AC_ARG_ENABLE([debug],
|
||||
[AS_HELP_STRING([--enable-debug],
|
||||
|
|
@ -60,8 +49,6 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-protot
|
|||
AC_SUBST([VISIBILITY_CFLAGS])
|
||||
AC_SUBST([AM_CFLAGS])
|
||||
AC_SUBST([AM_LDFLAGS])
|
||||
AC_SUBST([AM_RCFLAGS])
|
||||
AC_SUBST([EXESUFFIX])
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_CONFIG_FILES([src/Makefile])
|
||||
|
|
@ -72,5 +59,3 @@ AC_CONFIG_FILES([src/libcdio/iso9660/Makefile])
|
|||
AC_CONFIG_FILES([src/libcdio/udf/Makefile])
|
||||
AC_CONFIG_FILES([src/libcdio/driver/Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
AC_MSG_RESULT([FreeDOS support: $(test "x$with_freedos" != "xno" && echo enabled || echo disabled)])
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
/* Option for Visual Studio and WDK compilation */
|
||||
/* For MinGW, use "./configure <option>" instead */
|
||||
|
||||
/* Embed FreeDOS files and allow FreeDOS support */
|
||||
#define WITH_FREEDOS
|
||||
|
|
@ -173,7 +173,6 @@
|
|||
<ClCompile Include="..\syslinux.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\ms-config.h" />
|
||||
<ClInclude Include="..\badblocks.h" />
|
||||
<ClInclude Include="..\format.h" />
|
||||
<ClInclude Include="..\libcdio\cdio\cdio.h" />
|
||||
|
|
|
|||
|
|
@ -80,9 +80,6 @@
|
|||
<ClInclude Include="..\resource.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\ms-config.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\libcdio\cdio\cdio.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -98,7 +98,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -112,7 +111,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -100,7 +99,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -97,7 +96,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -97,7 +96,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -98,7 +97,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
|
|||
24
src/rufus.c
24
src/rufus.c
|
|
@ -60,7 +60,7 @@ float fScale = 1.0f;
|
|||
int default_fs;
|
||||
HWND hDeviceList, hCapacity, hFileSystem, hClusterSize, hLabel, hDOSType, hNBPasses;
|
||||
HWND hISOProgressDlg = NULL, hISOProgressBar, hISOFileName;
|
||||
BOOL bWithFreeDOS, use_own_vesamenu = FALSE;
|
||||
BOOL use_own_vesamenu = FALSE;
|
||||
int rufus_version[4];
|
||||
extern char szStatusMessage[256];
|
||||
|
||||
|
|
@ -1163,16 +1163,8 @@ void InitDialog(HWND hDlg)
|
|||
for (i=0; (i<4) && ((token = strtok(NULL, ".")) != NULL); i++)
|
||||
rufus_version[i] = atoi(token);
|
||||
|
||||
// Update the title if we have FreeDOS support
|
||||
if (bWithFreeDOS) {
|
||||
GetWindowTextA(hDlg, &tmp[15], sizeof(tmp)-15);
|
||||
safe_sprintf(tmp, sizeof(tmp), "Rufus (with FreeDOS)");
|
||||
tmp[20] = ' ';
|
||||
SetWindowTextA(hDlg, tmp);
|
||||
selection_default = DT_FREEDOS;
|
||||
} else {
|
||||
selection_default = DT_WINME;
|
||||
}
|
||||
// Prefer FreeDOS to MS-DOS
|
||||
selection_default = DT_FREEDOS;
|
||||
|
||||
// Create the status line
|
||||
CreateStatusBar();
|
||||
|
|
@ -1347,13 +1339,12 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
|
|||
IGNORE_RETVAL(ComboBox_ResetContent(hDOSType));
|
||||
if ((fs == FS_FAT16) || (fs == FS_FAT32)) {
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "MS-DOS"), DT_WINME));
|
||||
if (bWithFreeDOS)
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "FreeDOS"), DT_FREEDOS));
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "FreeDOS"), DT_FREEDOS));
|
||||
}
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "ISO Image"), DT_ISO));
|
||||
if (selection_default == DT_ISO) {
|
||||
if (iso_path == NULL)
|
||||
selection_default = (bWithFreeDOS)?DT_FREEDOS:DT_WINME;
|
||||
selection_default = DT_FREEDOS;
|
||||
else
|
||||
EnableWindow(GetDlgItem(hMainDialog, IDC_RUFUS_MBR),
|
||||
(iso_report.has_bootmgr) || (IS_WINPE(iso_report.winpe)));
|
||||
|
|
@ -1556,11 +1547,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
|
|||
// 0x9e disables removable and fixed drive notifications
|
||||
SetLGP(FALSE, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", "NoDriveTypeAutorun", 0x9e);
|
||||
|
||||
// Find out if the FreeDOS resources are embedded in the app
|
||||
bWithFreeDOS = (FindResource(hMainInstance, MAKEINTRESOURCE(IDR_FD_COMMAND_COM), RT_RCDATA) != NULL) &&
|
||||
(FindResource(hMainInstance, MAKEINTRESOURCE(IDR_FD_KERNEL_SYS), RT_RCDATA) != NULL);
|
||||
uprintf("FreeDOS resources are %sembedded with this app\n", bWithFreeDOS?"":"NOT ");
|
||||
|
||||
// Create the main Window
|
||||
if ( (hDlg = CreateDialogA(hInstance, MAKEINTRESOURCEA(IDD_DIALOG), NULL, MainCallback)) == NULL ) {
|
||||
MessageBoxA(NULL, "Could not create Window", "DialogBox failure", MB_ICONSTOP);
|
||||
|
|
|
|||
24
src/rufus.rc
24
src/rufus.rc
|
|
@ -8,9 +8,6 @@
|
|||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include <windows.h>
|
||||
#ifndef __MINGW32__
|
||||
#include "../ms-config.h"
|
||||
#endif
|
||||
#ifndef IDC_STATIC
|
||||
#define IDC_STATIC -1
|
||||
#endif
|
||||
|
|
@ -33,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
|
|||
IDD_DIALOG DIALOGEX 12, 12, 206, 289
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_APPWINDOW
|
||||
CAPTION "Rufus v1.1.6.161"
|
||||
CAPTION "Rufus v1.2.0.162"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,94,248,50,14
|
||||
|
|
@ -74,7 +71,7 @@ BEGIN
|
|||
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
|
||||
CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
|
||||
"SysLink",WS_TABSTOP,46,47,114,9
|
||||
LTEXT "Version 1.1.6 (Build 161)",IDC_STATIC,46,19,78,8
|
||||
LTEXT "Version 1.2.0 (Build 162)",IDC_STATIC,46,19,78,8
|
||||
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
|
||||
LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
|
||||
|
|
@ -129,9 +126,6 @@ END
|
|||
2 TEXTINCLUDE
|
||||
BEGIN
|
||||
"#include <windows.h>\r\n"
|
||||
"#ifndef __MINGW32__\r\n"
|
||||
"#include ""../ms-config.h""\r\n"
|
||||
"#endif\r\n"
|
||||
"#ifndef IDC_STATIC\r\n"
|
||||
"#define IDC_STATIC -1\r\n"
|
||||
"#endif\r\n"
|
||||
|
|
@ -144,8 +138,6 @@ BEGIN
|
|||
"IDR_SL_LDLINUX_BSS RCDATA ""../res/syslinux/ldlinux.bss""\r\n"
|
||||
"IDR_SL_LDLINUX_SYS RCDATA ""../res/syslinux/ldlinux.sys""\r\n"
|
||||
"IDR_BR_MBR_BIN RCDATA ""../res/mbr/mbr.bin""\r\n"
|
||||
"// Only include these in rufus_fd\r\n"
|
||||
"#if defined(WITH_FREEDOS)\r\n"
|
||||
"IDR_FD_COMMAND_COM RCDATA ""../res/freedos/COMMAND.COM""\r\n"
|
||||
"IDR_FD_KERNEL_SYS RCDATA ""../res/freedos/KERNEL.SYS""\r\n"
|
||||
"IDR_FD_DISPLAY_EXE RCDATA ""../res/freedos/DISPLAY.EXE""\r\n"
|
||||
|
|
@ -173,7 +165,6 @@ BEGIN
|
|||
"IDR_FD_EGA16_CPX RCDATA ""../res/freedos/ega16.cpx""\r\n"
|
||||
"IDR_FD_EGA17_CPX RCDATA ""../res/freedos/ega17.cpx""\r\n"
|
||||
"IDR_FD_EGA18_CPX RCDATA ""../res/freedos/ega18.cpx""\r\n"
|
||||
"#endif\r\n"
|
||||
"\r\n"
|
||||
"// Must reference a manifest for visual styles and elevation\r\n"
|
||||
"// Oh, and it must happen at the end, or MinGW will ignore it!\r\n"
|
||||
|
|
@ -225,8 +216,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,1,6,161
|
||||
PRODUCTVERSION 1,1,6,161
|
||||
FILEVERSION 1,2,0,162
|
||||
PRODUCTVERSION 1,2,0,162
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
|
@ -243,13 +234,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "akeo.ie"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "1.1.6.161"
|
||||
VALUE "FileVersion", "1.2.0.162"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "1.1.6.161"
|
||||
VALUE "ProductVersion", "1.2.0.162"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
@ -281,8 +272,6 @@ IDI_ICON ICON "../res/rufus.ico"
|
|||
IDR_SL_LDLINUX_BSS RCDATA "../res/syslinux/ldlinux.bss"
|
||||
IDR_SL_LDLINUX_SYS RCDATA "../res/syslinux/ldlinux.sys"
|
||||
IDR_BR_MBR_BIN RCDATA "../res/mbr/mbr.bin"
|
||||
// Only include these in rufus_fd
|
||||
#if defined(WITH_FREEDOS)
|
||||
IDR_FD_COMMAND_COM RCDATA "../res/freedos/COMMAND.COM"
|
||||
IDR_FD_KERNEL_SYS RCDATA "../res/freedos/KERNEL.SYS"
|
||||
IDR_FD_DISPLAY_EXE RCDATA "../res/freedos/DISPLAY.EXE"
|
||||
|
|
@ -310,7 +299,6 @@ IDR_FD_EGA15_CPX RCDATA "../res/freedos/ega15.cpx"
|
|||
IDR_FD_EGA16_CPX RCDATA "../res/freedos/ega16.cpx"
|
||||
IDR_FD_EGA17_CPX RCDATA "../res/freedos/ega17.cpx"
|
||||
IDR_FD_EGA18_CPX RCDATA "../res/freedos/ega18.cpx"
|
||||
#endif
|
||||
|
||||
// Must reference a manifest for visual styles and elevation
|
||||
// Oh, and it must happen at the end, or MinGW will ignore it!
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -97,7 +96,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ AMTAR = @AMTAR@
|
|||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AM_LDFLAGS = @AM_LDFLAGS@
|
||||
AM_RCFLAGS = @AM_RCFLAGS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -97,7 +96,6 @@ ECHO_C = @ECHO_C@
|
|||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXESUFFIX = @EXESUFFIX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
|
|||
Loading…
Reference in New Issue