mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-18 17:14:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

[misc] reorganize UI function calls into their own source

Browse source 
* Also fix ARM/ARM64 broken compilation due to missing __popcnt()
This commit is contained in:
Pete Batard 2018-07-06 05:46:36 +01:00
parent a34cb1194e
commit 05f8400451
12 changed files with 1486 additions and 1363 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vs/rufus.vcxproj
View file

@ -340,6 +340,7 @@
<ClCompile Include="..\src\stdlg.c" />
<ClCompile Include="..\src\syslinux.c" />
<ClCompile Include="..\src\dev.c" />
<ClCompile Include="..\src\ui.c" />
<ClCompile Include="..\src\vhd.c" />
</ItemGroup>
<ItemGroup>
@ -367,6 +368,7 @@
<ClInclude Include="..\src\sys_types.h" />
<ClInclude Include="..\src\dev.h" />
<ClInclude Include="..\src\ui.h" />
<ClInclude Include="..\src\ui_data.h" />
</ItemGroup>
<ItemGroup>
<Manifest Include="..\src\rufus.manifest" />

6
.vs/rufus.vcxproj.filters
View file

@ -78,6 +78,9 @@
<ClCompile Include="..\src\process.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\ui.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\rufus.h">
@ -152,6 +155,9 @@
<ClInclude Include="..\src\ui.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\ui_data.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\res\rufus.ico">

2
src/Makefile.am
View file

@ -11,7 +11,7 @@ AM_V_WINDRES = $(AM_V_WINDRES_$(V))
$(AM_V_WINDRES) $(AM_RCFLAGS) -i $< -o $@
rufus_SOURCES = badblocks.c checksum.c dev.c dos.c dos_locale.c drive.c format.c icon.c iso.c localization.c \
net.c parser.c pki.c process.c rufus.c smart.c stdfn.c stdio.c stdlg.c syslinux.c vhd.c
net.c parser.c pki.c process.c rufus.c smart.c stdfn.c stdio.c stdlg.c syslinux.c ui.c vhd.c
rufus_CFLAGS = -I./ms-sys/inc -I./syslinux/libfat -I./syslinux/libinstaller -I./syslinux/win -I./libcdio $(AM_CFLAGS)
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows
rufus_LDADD = rufus_rc.o bled/libbled.a ms-sys/libmssys.a syslinux/libfat/libfat.a syslinux/libinstaller/libinstaller.a syslinux/win/libwin.a \

11
src/Makefile.in
View file

@ -96,7 +96,8 @@ am_rufus_OBJECTS = rufus-badblocks.$(OBJEXT) rufus-checksum.$(OBJEXT) \
rufus-process.$(OBJEXT) rufus-rufus.$(OBJEXT) \
rufus-smart.$(OBJEXT) rufus-stdfn.$(OBJEXT) \
rufus-stdio.$(OBJEXT) rufus-stdlg.$(OBJEXT) \
rufus-syslinux.$(OBJEXT) rufus-vhd.$(OBJEXT)
rufus-syslinux.$(OBJEXT) rufus-ui.$(OBJEXT) \
rufus-vhd.$(OBJEXT)
rufus_OBJECTS = $(am_rufus_OBJECTS)
rufus_DEPENDENCIES = rufus_rc.o bled/libbled.a ms-sys/libmssys.a \
syslinux/libfat/libfat.a syslinux/libinstaller/libinstaller.a \
@ -271,7 +272,7 @@ AM_V_WINDRES_1 = $(WINDRES)
AM_V_WINDRES_ = $(AM_V_WINDRES_$(AM_DEFAULT_VERBOSITY))
AM_V_WINDRES = $(AM_V_WINDRES_$(V))
rufus_SOURCES = badblocks.c checksum.c dev.c dos.c dos_locale.c drive.c format.c icon.c iso.c localization.c \
net.c parser.c pki.c process.c rufus.c smart.c stdfn.c stdio.c stdlg.c syslinux.c vhd.c
net.c parser.c pki.c process.c rufus.c smart.c stdfn.c stdio.c stdlg.c syslinux.c ui.c vhd.c
rufus_CFLAGS = -I./ms-sys/inc -I./syslinux/libfat -I./syslinux/libinstaller -I./syslinux/win -I./libcdio $(AM_CFLAGS)
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows
@ -452,6 +453,12 @@ rufus-syslinux.o: syslinux.c
rufus-syslinux.obj: syslinux.c
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_CFLAGS) $(CFLAGS) -c -o rufus-syslinux.obj `if test -f 'syslinux.c'; then $(CYGPATH_W) 'syslinux.c'; else $(CYGPATH_W) '$(srcdir)/syslinux.c'; fi`
rufus-ui.o: ui.c
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_CFLAGS) $(CFLAGS) -c -o rufus-ui.o `test -f 'ui.c' || echo '$(srcdir)/'`ui.c
rufus-ui.obj: ui.c
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_CFLAGS) $(CFLAGS) -c -o rufus-ui.obj `if test -f 'ui.c'; then $(CYGPATH_W) 'ui.c'; else $(CYGPATH_W) '$(srcdir)/ui.c'; fi`
rufus-vhd.o: vhd.c
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_CFLAGS) $(CFLAGS) -c -o rufus-vhd.o `test -f 'vhd.c' || echo '$(srcdir)/'`vhd.c

1219
src/rufus.c
View file

File diff suppressed because it is too large Load diff

1
src/rufus.h
View file

@ -428,6 +428,7 @@ extern char* image_path;
/*
* Shared prototypes
*/
extern uint8_t popcnt8(uint8_t val);
extern void GetWindowsVersion(void);
extern BOOL is_x64(void);
extern const char *WindowsErrorString(void);

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.2.1329"
CAPTION "Rufus 3.2.1330"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -392,8 +392,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,2,1329,0
PRODUCTVERSION 3,2,1329,0
FILEVERSION 3,2,1330,0
PRODUCTVERSION 3,2,1330,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -410,13 +410,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.2.1329"
VALUE "FileVersion", "3.2.1330"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.2.1329"
VALUE "ProductVersion", "3.2.1330"
END
END
BLOCK "VarFileInfo"

10
src/stdfn.c
View file

@ -36,6 +36,16 @@ int nWindowsVersion = WINDOWS_UNDEFINED;
int nWindowsBuildNumber = -1;
char WindowsVersionStr[128] = "Windows ";
// __popcnt16, __popcnt, __popcnt64 are not available for ARM :(
uint8_t popcnt8(uint8_t val)
{
static const uint8_t nibble_lookup[16] = {
0, 1, 1, 2, 1, 2, 2, 3,
1, 2, 2, 3, 2, 3, 3, 4
};
return nibble_lookup[val & 0x0F] + nibble_lookup[val >> 4];
}
/*
* Hash table functions - modified From glibc 2.3.2:
* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986

4
src/stdlg.c
View file

@ -37,6 +37,7 @@
#include "resource.h"
#include "msapi_utf8.h"
#include "localization.h"
#include "ui.h"
#include "registry.h"
#include "settings.h"
@ -58,9 +59,6 @@ static WNDPROC update_original_proc = NULL;
static HWINEVENTHOOK fp_weh = NULL;
static char *fp_title_str = "Microsoft Windows", *fp_button_str = "Format disk";
extern loc_cmd* selected_locale;
extern int cbw, ddw, ddbh, bh;
static int update_settings_reposition_ids[] = {
IDC_POLICY,
IDS_UPDATE_SETTINGS_GRP,

1177
src/ui.c Normal file
View file

File diff suppressed because it is too large Load diff

206
src/ui.h
View file

@ -1,6 +1,6 @@
/*
* Rufus: The Reliable USB Formatting Utility
* UI element lists
* UI-related function calls
* Copyright © 2018 Pete Batard <pete@akeo.ie>
*
* This program is free software: you can redistribute it and/or modify
@ -18,6 +18,7 @@
*/
#include <windows.h>
#include <stdint.h>
#include "resource.h"
#pragma once
@ -42,180 +43,31 @@
TBSTYLE_AUTOSIZE | TBSTYLE_LIST | \
TBSTYLE_TOOLTIPS )
static int section_control_ids[] = {
IDS_DRIVE_PROPERTIES_TXT,
IDS_FORMAT_OPTIONS_TXT,
IDS_STATUS_TXT
};
extern HWND hMultiToolbar, hSaveToolbar, hHashToolbar, hAdvancedDeviceToolbar, hAdvancedFormatToolbar;
extern HFONT hInfoFont;
extern UINT_PTR UM_LANGUAGE_MENU_MAX;
extern BOOL advanced_mode_device, advanced_mode_format, force_large_fat32;
extern loc_cmd* selected_locale;
extern const char *sfd_name, *flash_type[BADLOCKS_PATTERN_TYPES];
extern char *short_image_path;
extern int advanced_device_section_height, advanced_format_section_height, windows_to_go_selection;
extern int selection_default, cbw, ddw, ddbh, bh;
static int section_vpos[ARRAYSIZE(section_control_ids)];
static int image_option_move_ids[] = {
IDS_PARTITION_TYPE_TXT,
IDC_PARTITION_TYPE,
IDS_TARGET_SYSTEM_TXT,
IDC_TARGET_SYSTEM,
IDS_CSM_HELP_TXT,
IDC_ADVANCED_DEVICE_TOOLBAR,
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_RUFUS_MBR,
IDC_DISK_ID,
IDS_FORMAT_OPTIONS_TXT,
IDS_LABEL_TXT,
IDC_LABEL,
IDS_FILE_SYSTEM_TXT,
IDC_FILE_SYSTEM,
IDS_CLUSTER_SIZE_TXT,
IDC_CLUSTER_SIZE,
IDC_ADVANCED_FORMAT_TOOLBAR,
IDC_QUICK_FORMAT,
IDC_BAD_BLOCKS,
IDC_NB_PASSES,
IDC_EXTENDED_LABEL,
IDS_STATUS_TXT,
IDC_PROGRESS,
IDC_ABOUT,
IDC_LOG,
IDC_MULTI_TOOLBAR,
IDC_TEST,
IDC_START,
IDCANCEL,
IDC_STATUS,
IDC_STATUS_TOOLBAR,
};
static int image_option_toggle_ids[][2] = {
{ IDS_IMAGE_OPTION_TXT, 0x03 },
{ IDC_IMAGE_OPTION, 0x01 },
{ IDC_PERSISTENCE_SLIDER, 0x02 },
{ IDC_PERSISTENCE_SIZE, 0x02 },
{ IDC_PERSISTENCE_UNITS, 0x02 }
};
static int advanced_device_move_ids[] = {
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_RUFUS_MBR,
IDS_FORMAT_OPTIONS_TXT,
IDS_LABEL_TXT,
IDC_LABEL,
IDS_FILE_SYSTEM_TXT,
IDC_FILE_SYSTEM,
IDS_CLUSTER_SIZE_TXT,
IDC_CLUSTER_SIZE,
IDC_ADVANCED_FORMAT_TOOLBAR,
IDC_QUICK_FORMAT,
IDC_BAD_BLOCKS,
IDC_NB_PASSES,
IDC_EXTENDED_LABEL,
IDS_STATUS_TXT,
IDC_PROGRESS,
IDC_ABOUT,
IDC_LOG,
IDC_MULTI_TOOLBAR,
IDC_TEST,
IDC_START,
IDCANCEL,
IDC_STATUS,
IDC_STATUS_TOOLBAR,
};
static int advanced_device_toggle_ids[] = {
IDC_SAVE_TOOLBAR,
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_RUFUS_MBR,
IDC_DISK_ID,
};
static int advanced_format_move_ids[] = {
IDS_STATUS_TXT,
IDC_PROGRESS,
IDC_ABOUT,
IDC_LOG,
IDC_MULTI_TOOLBAR,
IDC_TEST,
IDC_START,
IDCANCEL,
IDC_STATUS,
IDC_STATUS_TOOLBAR,
};
static int advanced_format_toggle_ids[] = {
IDC_QUICK_FORMAT,
IDC_BAD_BLOCKS,
IDC_NB_PASSES,
IDC_EXTENDED_LABEL,
};
static int main_button_ids[] = {
IDC_SELECT,
IDC_START,
IDCANCEL,
};
static int full_width_controls[] = {
IDS_DEVICE_TXT,
IDS_BOOT_SELECTION_TXT,
IDS_IMAGE_OPTION_TXT,
IDC_IMAGE_OPTION,
IDS_LABEL_TXT,
IDC_LABEL,
IDC_ADVANCED_DRIVE_PROPERTIES,
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_ADVANCED_FORMAT_OPTIONS,
IDC_QUICK_FORMAT,
IDC_EXTENDED_LABEL,
IDC_PROGRESS,
};
static int full_width_checkboxes[] = {
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_QUICK_FORMAT,
IDC_EXTENDED_LABEL,
};
static int half_width_ids[] = {
IDC_BAD_BLOCKS,
IDC_RUFUS_MBR,
IDS_PARTITION_TYPE_TXT,
IDC_PARTITION_TYPE,
IDC_FILE_SYSTEM,
IDS_TARGET_SYSTEM_TXT,
IDC_TARGET_SYSTEM,
IDC_DISK_ID,
IDS_CLUSTER_SIZE_TXT,
IDC_CLUSTER_SIZE,
IDC_NB_PASSES,
};
static int adjust_dpi_ids[][5] = {
{IDS_DEVICE_TXT, IDC_DEVICE, IDC_SAVE_TOOLBAR, 0, 0},
{IDS_BOOT_SELECTION_TXT, IDC_BOOT_SELECTION, IDC_HASH_TOOLBAR, IDC_SELECT, 0},
{IDS_IMAGE_OPTION_TXT, IDC_IMAGE_OPTION, IDC_PERSISTENCE_SLIDER, IDC_PERSISTENCE_SIZE, IDC_PERSISTENCE_UNITS},
{IDS_PARTITION_TYPE_TXT, IDC_PARTITION_TYPE, IDS_TARGET_SYSTEM_TXT, IDC_TARGET_SYSTEM, IDS_CSM_HELP_TXT},
{IDC_ADVANCED_DEVICE_TOOLBAR, 0, 0, 0, 0},
{IDC_LIST_USB_HDD, 0, 0, 0, 0 },
{IDC_OLD_BIOS_FIXES, 0, 0, 0, 0},
{IDC_RUFUS_MBR, IDC_DISK_ID, 0, 0, 0},
{IDS_FORMAT_OPTIONS_TXT, 0, 0, 0, 0},
{IDS_LABEL_TXT, IDC_LABEL, 0, 0, 0},
{IDS_FILE_SYSTEM_TXT, IDC_FILE_SYSTEM, IDS_CLUSTER_SIZE_TXT, IDC_CLUSTER_SIZE, 0},
{IDC_ADVANCED_FORMAT_TOOLBAR, 0, 0, 0, 0},
{IDC_QUICK_FORMAT, 0, 0, 0, 0},
{IDC_EXTENDED_LABEL, 0, 0, 0, 0},
{IDC_BAD_BLOCKS, IDC_NB_PASSES, 0, 0, 0},
{IDS_STATUS_TXT, 0, 0, 0, 0},
{IDC_PROGRESS, 0, 0, 0, 0 },
{IDC_MULTI_TOOLBAR, IDC_TEST, IDC_START, IDCANCEL, 0}
};
static int multitoolbar_icons[] = {
IDI_LANG_16,
IDI_INFO_16,
IDI_SETTINGS_16,
IDI_LOG_16
};
extern void SetComboEntry(HWND hDlg, int data);
extern void GetBasicControlsWidth(HWND hDlg);
extern void GetMainButtonsWidth(HWND hDlg);
extern void GetHalfDropwdownWidth(HWND hDlg);
extern void GetFullWidth(HWND hDlg);
extern void PositionMainControls(HWND hDlg);
extern void AdjustForLowDPI(HWND hDlg);
extern void SetSectionHeaders(HWND hDlg);
extern void ToggleAdvancedDeviceOptions(BOOL enable);
extern void ToggleAdvancedFormatOptions(BOOL enable);
extern void ToggleImageOption(uint8_t mask);
extern void CreateSmallButtons(HWND hDlg);
extern void CreateAdditionalControls(HWND hDlg);
extern void InitProgress(BOOL bOnlyFormat);
extern void ShowLanguageMenu(RECT rcExclude);
extern void SetPassesTooltip(void);
extern void SetBootTypeDropdownWidth(void);
extern void OnPaint(HDC hdc);

201
src/ui_data.h Normal file
View file

@ -0,0 +1,201 @@
/*
* Rufus: The Reliable USB Formatting Utility
* UI element lists
* Copyright © 2018 Pete Batard <pete@akeo.ie>
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <windows.h>
#include "resource.h"
#pragma once
static int section_control_ids[] = {
IDS_DRIVE_PROPERTIES_TXT,
IDS_FORMAT_OPTIONS_TXT,
IDS_STATUS_TXT
};
static int section_vpos[ARRAYSIZE(section_control_ids)];
static int image_option_move_ids[] = {
IDS_PARTITION_TYPE_TXT,
IDC_PARTITION_TYPE,
IDS_TARGET_SYSTEM_TXT,
IDC_TARGET_SYSTEM,
IDS_CSM_HELP_TXT,
IDC_ADVANCED_DEVICE_TOOLBAR,
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_RUFUS_MBR,
IDC_DISK_ID,
IDS_FORMAT_OPTIONS_TXT,
IDS_LABEL_TXT,
IDC_LABEL,
IDS_FILE_SYSTEM_TXT,
IDC_FILE_SYSTEM,
IDS_CLUSTER_SIZE_TXT,
IDC_CLUSTER_SIZE,
IDC_ADVANCED_FORMAT_TOOLBAR,
IDC_QUICK_FORMAT,
IDC_BAD_BLOCKS,
IDC_NB_PASSES,
IDC_EXTENDED_LABEL,
IDS_STATUS_TXT,
IDC_PROGRESS,
IDC_ABOUT,
IDC_LOG,
IDC_MULTI_TOOLBAR,
IDC_TEST,
IDC_START,
IDCANCEL,
IDC_STATUS,
IDC_STATUS_TOOLBAR,
};
static int image_option_toggle_ids[][2] = {
{ IDS_IMAGE_OPTION_TXT, 0x03 },
{ IDC_IMAGE_OPTION, 0x01 },
{ IDC_PERSISTENCE_SLIDER, 0x02 },
{ IDC_PERSISTENCE_SIZE, 0x02 },
{ IDC_PERSISTENCE_UNITS, 0x02 }
};
static int advanced_device_move_ids[] = {
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_RUFUS_MBR,
IDS_FORMAT_OPTIONS_TXT,
IDS_LABEL_TXT,
IDC_LABEL,
IDS_FILE_SYSTEM_TXT,
IDC_FILE_SYSTEM,
IDS_CLUSTER_SIZE_TXT,
IDC_CLUSTER_SIZE,
IDC_ADVANCED_FORMAT_TOOLBAR,
IDC_QUICK_FORMAT,
IDC_BAD_BLOCKS,
IDC_NB_PASSES,
IDC_EXTENDED_LABEL,
IDS_STATUS_TXT,
IDC_PROGRESS,
IDC_ABOUT,
IDC_LOG,
IDC_MULTI_TOOLBAR,
IDC_TEST,
IDC_START,
IDCANCEL,
IDC_STATUS,
IDC_STATUS_TOOLBAR,
};
static int advanced_device_toggle_ids[] = {
IDC_SAVE_TOOLBAR,
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_RUFUS_MBR,
IDC_DISK_ID,
};
static int advanced_format_move_ids[] = {
IDS_STATUS_TXT,
IDC_PROGRESS,
IDC_ABOUT,
IDC_LOG,
IDC_MULTI_TOOLBAR,
IDC_TEST,
IDC_START,
IDCANCEL,
IDC_STATUS,
IDC_STATUS_TOOLBAR,
};
static int advanced_format_toggle_ids[] = {
IDC_QUICK_FORMAT,
IDC_BAD_BLOCKS,
IDC_NB_PASSES,
IDC_EXTENDED_LABEL,
};
static int main_button_ids[] = {
IDC_SELECT,
IDC_START,
IDCANCEL,
};
static int full_width_controls[] = {
IDS_DEVICE_TXT,
IDS_BOOT_SELECTION_TXT,
IDS_IMAGE_OPTION_TXT,
IDC_IMAGE_OPTION,
IDS_LABEL_TXT,
IDC_LABEL,
IDC_ADVANCED_DRIVE_PROPERTIES,
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_ADVANCED_FORMAT_OPTIONS,
IDC_QUICK_FORMAT,
IDC_EXTENDED_LABEL,
IDC_PROGRESS,
};
static int full_width_checkboxes[] = {
IDC_LIST_USB_HDD,
IDC_OLD_BIOS_FIXES,
IDC_QUICK_FORMAT,
IDC_EXTENDED_LABEL,
};
static int half_width_ids[] = {
IDC_BAD_BLOCKS,
IDC_RUFUS_MBR,
IDS_PARTITION_TYPE_TXT,
IDC_PARTITION_TYPE,
IDC_FILE_SYSTEM,
IDS_TARGET_SYSTEM_TXT,
IDC_TARGET_SYSTEM,
IDC_DISK_ID,
IDS_CLUSTER_SIZE_TXT,
IDC_CLUSTER_SIZE,
IDC_NB_PASSES,
};
static int adjust_dpi_ids[][5] = {
{ IDS_DEVICE_TXT, IDC_DEVICE, IDC_SAVE_TOOLBAR, 0, 0 },
{ IDS_BOOT_SELECTION_TXT, IDC_BOOT_SELECTION, IDC_HASH_TOOLBAR, IDC_SELECT, 0 },
{ IDS_IMAGE_OPTION_TXT, IDC_IMAGE_OPTION, IDC_PERSISTENCE_SLIDER, IDC_PERSISTENCE_SIZE, IDC_PERSISTENCE_UNITS },
{ IDS_PARTITION_TYPE_TXT, IDC_PARTITION_TYPE, IDS_TARGET_SYSTEM_TXT, IDC_TARGET_SYSTEM, IDS_CSM_HELP_TXT },
{ IDC_ADVANCED_DEVICE_TOOLBAR, 0, 0, 0, 0 },
{ IDC_LIST_USB_HDD, 0, 0, 0, 0 },
{ IDC_OLD_BIOS_FIXES, 0, 0, 0, 0 },
{ IDC_RUFUS_MBR, IDC_DISK_ID, 0, 0, 0 },
{ IDS_FORMAT_OPTIONS_TXT, 0, 0, 0, 0 },
{ IDS_LABEL_TXT, IDC_LABEL, 0, 0, 0 },
{ IDS_FILE_SYSTEM_TXT, IDC_FILE_SYSTEM, IDS_CLUSTER_SIZE_TXT, IDC_CLUSTER_SIZE, 0 },
{ IDC_ADVANCED_FORMAT_TOOLBAR, 0, 0, 0, 0 },
{ IDC_QUICK_FORMAT, 0, 0, 0, 0 },
{ IDC_EXTENDED_LABEL, 0, 0, 0, 0 },
{ IDC_BAD_BLOCKS, IDC_NB_PASSES, 0, 0, 0 },
{ IDS_STATUS_TXT, 0, 0, 0, 0 },
{ IDC_PROGRESS, 0, 0, 0, 0 },
{ IDC_MULTI_TOOLBAR, IDC_TEST, IDC_START, IDCANCEL, 0 }
};
static int multitoolbar_icons[] = {
IDI_LANG_16,
IDI_INFO_16,
IDI_SETTINGS_16,
IDI_LOG_16
};