diff --git a/res/freedos/COMMAND.COM b/res/freedos/COMMAND.COM index b82008e4..4a301682 100644 Binary files a/res/freedos/COMMAND.COM and b/res/freedos/COMMAND.COM differ diff --git a/res/freedos/DISPLAY.EXE b/res/freedos/DISPLAY.EXE index a635bb9c..9a0d98c9 100644 Binary files a/res/freedos/DISPLAY.EXE and b/res/freedos/DISPLAY.EXE differ diff --git a/res/freedos/ega.cpx b/res/freedos/EGA.CPX similarity index 100% rename from res/freedos/ega.cpx rename to res/freedos/EGA.CPX diff --git a/res/freedos/ega10.cpx b/res/freedos/EGA10.CPX similarity index 100% rename from res/freedos/ega10.cpx rename to res/freedos/EGA10.CPX diff --git a/res/freedos/ega11.cpx b/res/freedos/EGA11.CPX similarity index 100% rename from res/freedos/ega11.cpx rename to res/freedos/EGA11.CPX diff --git a/res/freedos/ega12.cpx b/res/freedos/EGA12.CPX similarity index 100% rename from res/freedos/ega12.cpx rename to res/freedos/EGA12.CPX diff --git a/res/freedos/ega13.cpx b/res/freedos/EGA13.CPX similarity index 100% rename from res/freedos/ega13.cpx rename to res/freedos/EGA13.CPX diff --git a/res/freedos/ega14.cpx b/res/freedos/EGA14.CPX similarity index 100% rename from res/freedos/ega14.cpx rename to res/freedos/EGA14.CPX diff --git a/res/freedos/ega15.cpx b/res/freedos/EGA15.CPX similarity index 100% rename from res/freedos/ega15.cpx rename to res/freedos/EGA15.CPX diff --git a/res/freedos/ega16.cpx b/res/freedos/EGA16.CPX similarity index 100% rename from res/freedos/ega16.cpx rename to res/freedos/EGA16.CPX diff --git a/res/freedos/ega17.cpx b/res/freedos/EGA17.CPX similarity index 100% rename from res/freedos/ega17.cpx rename to res/freedos/EGA17.CPX diff --git a/res/freedos/ega18.cpx b/res/freedos/EGA18.CPX similarity index 100% rename from res/freedos/ega18.cpx rename to res/freedos/EGA18.CPX diff --git a/res/freedos/ega2.cpx b/res/freedos/EGA2.CPX similarity index 100% rename from res/freedos/ega2.cpx rename to res/freedos/EGA2.CPX diff --git a/res/freedos/ega3.cpx b/res/freedos/EGA3.CPX similarity index 100% rename from res/freedos/ega3.cpx rename to res/freedos/EGA3.CPX diff --git a/res/freedos/ega4.cpx b/res/freedos/EGA4.CPX similarity index 100% rename from res/freedos/ega4.cpx rename to res/freedos/EGA4.CPX diff --git a/res/freedos/ega5.cpx b/res/freedos/EGA5.CPX similarity index 100% rename from res/freedos/ega5.cpx rename to res/freedos/EGA5.CPX diff --git a/res/freedos/ega6.cpx b/res/freedos/EGA6.CPX similarity index 100% rename from res/freedos/ega6.cpx rename to res/freedos/EGA6.CPX diff --git a/res/freedos/ega7.cpx b/res/freedos/EGA7.CPX similarity index 100% rename from res/freedos/ega7.cpx rename to res/freedos/EGA7.CPX diff --git a/res/freedos/ega8.cpx b/res/freedos/EGA8.CPX similarity index 100% rename from res/freedos/ega8.cpx rename to res/freedos/EGA8.CPX diff --git a/res/freedos/ega9.cpx b/res/freedos/EGA9.CPX similarity index 100% rename from res/freedos/ega9.cpx rename to res/freedos/EGA9.CPX diff --git a/res/freedos/KERNEL.SYS b/res/freedos/KERNEL.SYS index c83522ef..9ce38b19 100644 Binary files a/res/freedos/KERNEL.SYS and b/res/freedos/KERNEL.SYS differ diff --git a/res/freedos/MODE.COM b/res/freedos/MODE.COM index 13dd3bd6..43226fb8 100644 Binary files a/res/freedos/MODE.COM and b/res/freedos/MODE.COM differ diff --git a/res/freedos/readme.txt b/res/freedos/readme.txt index 3b91bb94..44048d09 100644 --- a/res/freedos/readme.txt +++ b/res/freedos/readme.txt @@ -1,21 +1,21 @@ -o KERNEL.SYS was extracted from ke2041_386f32.zip available at: - https://sourceforge.net/projects/freedos/files/Kernel/2041/ +o KERNEL.SYS was taken from KERNL386.SYS in FreeDOS Kernel 2042: + http://ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos/base/kernel.zip It was modified to have FORCELBA enabled (byte offset 0x0D set to 0x01) -o COMMAND.COM was extracted from the fd11src.iso -> ISOLINUX\FDBOOT.IMG at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.1/ +o COMMAND.COM was extracted from FreeCom 0.84 pre 2: + http://ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos/base/command.zip -o The EGA files were extracted from the cpidos30.zip available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/cpi/ +o The EGA files were extracted from CPI (Code Page Information) Package 3.0: + http://ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos/base/cpidos.zip -o DISPLAY.EXE was extracted from /disp013x.zip available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/display +o DISPLAY.EXE was extracted from Display 0.13b: + http://ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos/base/display.zip -o KEYB.EXE was extracted from KEYB201.ZIP available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/keyb/2.01/ +o KEYB.EXE was extracted from Keyb 2.01: + http://ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos/base/keyb.zip -o The keyboard layouts (KEYB___.SYS) were extracted from kpdos31x.zip: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/keyb/kblayout/ +o The keyboard layouts (KEYB___.SYS) were extracted from Keyb Layouts 3.1: + http://ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos/base/keyb_lay.zip -o MODE.COM was extracted from mode-2005may12.zip available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/mode/2005/ +o MODE.COM was extracted from Mode 2015-11-25: + http://ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos/base/mode.zip diff --git a/src/dos.c b/src/dos.c index 3ac091d2..49194664 100644 --- a/src/dos.c +++ b/src/dos.c @@ -2,7 +2,7 @@ * Rufus: The Reliable USB Formatting Utility * DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll * (MS WinME DOS) or from the embedded FreeDOS resource files - * Copyright © 2011-2016 Pete Batard + * Copyright © 2011-2017 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -352,11 +352,11 @@ out: BOOL ExtractFreeDOS(const char* path) { const char* res_name[] = { "COMMAND.COM", "KERNEL.SYS", "DISPLAY.EXE", "KEYB.EXE", - "MODE.COM", "KEYBOARD.SYS", "KEYBRD2.SYS", "KEYBRD3.SYS", "KEYBRD4.SYS", "ega.cpx", - "ega2.cpx", "ega3.cpx", "ega4.cpx", "ega5.cpx", "ega6.cpx", - "ega7.cpx", "ega8.cpx", "ega9.cpx", "ega10.cpx", "ega11.cpx", - "ega12.cpx", "ega13.cpx", "ega14.cpx", "ega15.cpx", "ega16.cpx", - "ega17.cpx", "ega18.cpx" }; + "MODE.COM", "KEYBOARD.SYS", "KEYBRD2.SYS", "KEYBRD3.SYS", "KEYBRD4.SYS", "EGA.CPX", + "EGA2.CPX", "EGA3.CPX", "EGA4.CPX", "EGA5.CPX", "EGA6.CPX", + "EGA7.CPX", "EGA8.CPX", "EGA9.CPX", "EGA10.CPX", "EGA11.CPX", + "EGA12.CPX", "EGA13.CPX", "EGA14.CPX", "EGA15.CPX", "EGA16.CPX", + "EGA17.CPX", "EGA18.CPX" }; const int res_id[ARRAYSIZE(res_name)] = { IDR_FD_COMMAND_COM, IDR_FD_KERNEL_SYS, IDR_FD_DISPLAY_EXE, IDR_FD_KEYB_EXE, IDR_FD_MODE_COM, IDR_FD_KB1_SYS, IDR_FD_KB2_SYS, IDR_FD_KB3_SYS, IDR_FD_KB4_SYS, IDR_FD_EGA1_CPX, IDR_FD_EGA2_CPX, IDR_FD_EGA3_CPX, IDR_FD_EGA4_CPX, IDR_FD_EGA5_CPX, IDR_FD_EGA6_CPX, diff --git a/src/rufus.rc b/src/rufus.rc index cb80b19b..51d62a2a 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.12.1019" +CAPTION "Rufus 2.12.1020" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -247,24 +247,24 @@ BEGIN "IDR_FD_KB2_SYS RCDATA ""../res/freedos/KEYBRD2.SYS""\r\n" "IDR_FD_KB3_SYS RCDATA ""../res/freedos/KEYBRD3.SYS""\r\n" "IDR_FD_KB4_SYS RCDATA ""../res/freedos/KEYBRD4.SYS""\r\n" - "IDR_FD_EGA1_CPX RCDATA ""../res/freedos/ega.cpx""\r\n" - "IDR_FD_EGA2_CPX RCDATA ""../res/freedos/ega2.cpx""\r\n" - "IDR_FD_EGA3_CPX RCDATA ""../res/freedos/ega3.cpx""\r\n" - "IDR_FD_EGA4_CPX RCDATA ""../res/freedos/ega4.cpx""\r\n" - "IDR_FD_EGA5_CPX RCDATA ""../res/freedos/ega5.cpx""\r\n" - "IDR_FD_EGA6_CPX RCDATA ""../res/freedos/ega6.cpx""\r\n" - "IDR_FD_EGA7_CPX RCDATA ""../res/freedos/ega7.cpx""\r\n" - "IDR_FD_EGA8_CPX RCDATA ""../res/freedos/ega8.cpx""\r\n" - "IDR_FD_EGA9_CPX RCDATA ""../res/freedos/ega9.cpx""\r\n" - "IDR_FD_EGA10_CPX RCDATA ""../res/freedos/ega10.cpx""\r\n" - "IDR_FD_EGA11_CPX RCDATA ""../res/freedos/ega11.cpx""\r\n" - "IDR_FD_EGA12_CPX RCDATA ""../res/freedos/ega12.cpx""\r\n" - "IDR_FD_EGA13_CPX RCDATA ""../res/freedos/ega13.cpx""\r\n" - "IDR_FD_EGA14_CPX RCDATA ""../res/freedos/ega14.cpx""\r\n" - "IDR_FD_EGA15_CPX RCDATA ""../res/freedos/ega15.cpx""\r\n" - "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" + "IDR_FD_EGA1_CPX RCDATA ""../res/freedos/EGA.CPX""\r\n" + "IDR_FD_EGA2_CPX RCDATA ""../res/freedos/EGA2.CPX""\r\n" + "IDR_FD_EGA3_CPX RCDATA ""../res/freedos/EGA3.CPX""\r\n" + "IDR_FD_EGA4_CPX RCDATA ""../res/freedos/EGA4.CPX""\r\n" + "IDR_FD_EGA5_CPX RCDATA ""../res/freedos/EGA5.CPX""\r\n" + "IDR_FD_EGA6_CPX RCDATA ""../res/freedos/EGA6.CPX""\r\n" + "IDR_FD_EGA7_CPX RCDATA ""../res/freedos/EGA7.CPX""\r\n" + "IDR_FD_EGA8_CPX RCDATA ""../res/freedos/EGA8.CPX""\r\n" + "IDR_FD_EGA9_CPX RCDATA ""../res/freedos/EGA9.CPX""\r\n" + "IDR_FD_EGA10_CPX RCDATA ""../res/freedos/EGA10.CPX""\r\n" + "IDR_FD_EGA11_CPX RCDATA ""../res/freedos/EGA11.CPX""\r\n" + "IDR_FD_EGA12_CPX RCDATA ""../res/freedos/EGA12.CPX""\r\n" + "IDR_FD_EGA13_CPX RCDATA ""../res/freedos/EGA13.CPX""\r\n" + "IDR_FD_EGA14_CPX RCDATA ""../res/freedos/EGA14.CPX""\r\n" + "IDR_FD_EGA15_CPX RCDATA ""../res/freedos/EGA15.CPX""\r\n" + "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" "IDR_XT_HOGGER RCDATA ""../res/hogger/hogger.exe""\r\n" "IDR_UEFI_NTFS RCDATA ""../res/uefi/uefi-ntfs.img""\r\n" "IDR_TOGO_SAN_POLICY_XML RCDATA ""../res/togo/san_policy.xml""\r\n" @@ -334,8 +334,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,12,1019,0 - PRODUCTVERSION 2,12,1019,0 + FILEVERSION 2,12,1020,0 + PRODUCTVERSION 2,12,1020,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -352,13 +352,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.12.1019" + VALUE "FileVersion", "2.12.1020" 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.12.1019" + VALUE "ProductVersion", "2.12.1020" END END BLOCK "VarFileInfo"