diff --git a/resource.h b/resource.h index d34f8387..87b9fd1e 100644 Binary files a/resource.h and b/resource.h differ diff --git a/usbdos.c b/usbdos.c index 5f451d38..44292108 100644 --- a/usbdos.c +++ b/usbdos.c @@ -33,6 +33,9 @@ //#include // http://git.kernel.org/?p=fs/ext2/e2fsprogs.git;a=blob;f=misc/badblocks.c +// TODO: publicize the link and license for USB icon: +// http://www.softicons.com/free-icons/computer-icons/icons-unleashed-vol-1-by-pc-unleashed/usb-icon + #include "msapi_utf8.h" #include "resource.h" #include "usbdos.h" @@ -136,7 +139,7 @@ static BOOL GetDriveHandle(DWORD num, HANDLE* hDrive, char* DriveLetter) r = DeviceIoControl(*hDrive, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &sdn, sizeof(sdn), &size, NULL); if ((!r) || (size <= 0)) { - uprintf("IOCTL_STORAGE_GET_DEVICE_NUMBER 1 failed: %s\n", WindowsErrorString(0)); + uprintf("IOCTL_STORAGE_GET_DEVICE_NUMBER failed: %s\n", WindowsErrorString(0)); safe_closehandle(*hDrive); break; } diff --git a/usbdos.ico b/usbdos.ico new file mode 100644 index 00000000..b1d228f9 Binary files /dev/null and b/usbdos.ico differ diff --git a/usbdos.rc b/usbdos.rc index 7cdfd792..cd3aa8e2 100644 --- a/usbdos.rc +++ b/usbdos.rc @@ -33,10 +33,12 @@ BEGIN PUSHBUTTON "Start",IDC_START,53,230,50,14 COMBOBOX IDC_DEVICE,16,20,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Device",IDC_STATIC,18,8,22,8 - COMBOBOX IDC_FILESYSTEM,16,78,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "File System",IDC_STATIC,18,66,51,10 + COMBOBOX IDC_FILESYSTEM,16,81,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "File System",IDC_STATIC,18,69,51,10 COMBOBOX IDC_CAPACITY,16,49,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Capacity",IDC_STATIC,18,37,29,8 + COMBOBOX IDC_ALLOCSIZE,16,112,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Allocation unit size",IDC_STATIC,18,100,105,10 END @@ -80,6 +82,55 @@ BEGIN END #endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000904b0" + BEGIN + VALUE "CompanyName", "akeo.ie" + VALUE "FileDescription", "UsbDos" + VALUE "FileVersion", "1.0.0.1" + VALUE "InternalName", "UsbDos" + VALUE "LegalCopyright", "© 2010-2011 Pete Batard (GPL v3)" + VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" + VALUE "OriginalFilename", "usbdos.exe" + VALUE "ProductName", "UsbDos" + VALUE "ProductVersion", "1.0.0.1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x9, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "usbdos.ico" #endif // English resources /////////////////////////////////////////////////////////////////////////////