From 48f9dd47aef45ff984230af01888953fb264e7a3 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 5 Dec 2011 10:49:45 +0000 Subject: [PATCH] [misc] move source files to src/ directory --- rufus.rc | 226 ------------------ Makefile.am => src/Makefile.am | 0 Makefile.in => src/Makefile.in | 57 ++--- br.c => src/br.c | 0 .../common_controls_and_elevation.manifest | 0 drive.c => src/drive.c | 0 fat12.c => src/fat12.c | 0 fat16.c => src/fat16.c | 0 fat32.c => src/fat32.c | 0 file.c => src/file.c | 0 format.c => src/format.c | 0 format.h => src/format.h | 0 {inc => src/inc}/br.h | 0 {inc => src/inc}/br_fat12_0x0.h | 0 {inc => src/inc}/br_fat12_0x3e.h | 0 {inc => src/inc}/br_fat16_0x0.h | 0 {inc => src/inc}/br_fat16_0x3e.h | 0 {inc => src/inc}/br_fat16fd_0x3e.h | 0 {inc => src/inc}/br_fat32_0x0.h | 0 {inc => src/inc}/br_fat32_0x3f0.h | 0 {inc => src/inc}/br_fat32_0x52.h | 0 {inc => src/inc}/br_fat32fd_0x3f0.h | 0 {inc => src/inc}/br_fat32fd_0x52.h | 0 {inc => src/inc}/br_fat32nt_0x0.h | 0 {inc => src/inc}/br_fat32nt_0x1800.h | 0 {inc => src/inc}/br_fat32nt_0x3f0.h | 0 {inc => src/inc}/br_fat32nt_0x52.h | 0 {inc => src/inc}/fat12.h | 0 {inc => src/inc}/fat16.h | 0 {inc => src/inc}/fat32.h | 0 {inc => src/inc}/file.h | 0 {inc => src/inc}/label_11_char.h | 0 {inc => src/inc}/mbr_2000.h | 0 {inc => src/inc}/mbr_95b.h | 0 {inc => src/inc}/mbr_dos.h | 0 {inc => src/inc}/mbr_dos_f2.h | 0 {inc => src/inc}/mbr_syslinux.h | 0 {inc => src/inc}/mbr_vista.h | 0 {inc => src/inc}/mbr_win7.h | 0 {inc => src/inc}/mbr_zero.h | 0 license.h => src/license.h | 0 mkf => src/mkf | 0 msapi_utf8.h => src/msapi_utf8.h | 0 msdos.c => src/msdos.c | 0 msdos.h => src/msdos.h | 0 resource.h => src/resource.h | 0 rufus.c => src/rufus.c | 0 rufus.h => src/rufus.h | 0 rufus.ico => src/rufus.ico | Bin src/rufus.rc | 226 ++++++++++++++++++ stdio.c => src/stdio.c | 0 stdlg.c => src/stdlg.c | 0 sys_types.h => src/sys_types.h | 0 53 files changed, 249 insertions(+), 260 deletions(-) rename Makefile.am => src/Makefile.am (100%) rename Makefile.in => src/Makefile.in (90%) rename br.c => src/br.c (100%) rename common_controls_and_elevation.manifest => src/common_controls_and_elevation.manifest (100%) rename drive.c => src/drive.c (100%) rename fat12.c => src/fat12.c (100%) rename fat16.c => src/fat16.c (100%) rename fat32.c => src/fat32.c (100%) rename file.c => src/file.c (100%) rename format.c => src/format.c (100%) rename format.h => src/format.h (100%) rename {inc => src/inc}/br.h (100%) rename {inc => src/inc}/br_fat12_0x0.h (100%) rename {inc => src/inc}/br_fat12_0x3e.h (100%) rename {inc => src/inc}/br_fat16_0x0.h (100%) rename {inc => src/inc}/br_fat16_0x3e.h (100%) rename {inc => src/inc}/br_fat16fd_0x3e.h (100%) rename {inc => src/inc}/br_fat32_0x0.h (100%) rename {inc => src/inc}/br_fat32_0x3f0.h (100%) rename {inc => src/inc}/br_fat32_0x52.h (100%) rename {inc => src/inc}/br_fat32fd_0x3f0.h (100%) rename {inc => src/inc}/br_fat32fd_0x52.h (100%) rename {inc => src/inc}/br_fat32nt_0x0.h (100%) rename {inc => src/inc}/br_fat32nt_0x1800.h (100%) rename {inc => src/inc}/br_fat32nt_0x3f0.h (100%) rename {inc => src/inc}/br_fat32nt_0x52.h (100%) rename {inc => src/inc}/fat12.h (100%) rename {inc => src/inc}/fat16.h (100%) rename {inc => src/inc}/fat32.h (100%) rename {inc => src/inc}/file.h (100%) rename {inc => src/inc}/label_11_char.h (100%) rename {inc => src/inc}/mbr_2000.h (100%) rename {inc => src/inc}/mbr_95b.h (100%) rename {inc => src/inc}/mbr_dos.h (100%) rename {inc => src/inc}/mbr_dos_f2.h (100%) rename {inc => src/inc}/mbr_syslinux.h (100%) rename {inc => src/inc}/mbr_vista.h (100%) rename {inc => src/inc}/mbr_win7.h (100%) rename {inc => src/inc}/mbr_zero.h (100%) rename license.h => src/license.h (100%) rename mkf => src/mkf (100%) rename msapi_utf8.h => src/msapi_utf8.h (100%) rename msdos.c => src/msdos.c (100%) rename msdos.h => src/msdos.h (100%) rename resource.h => src/resource.h (100%) rename rufus.c => src/rufus.c (100%) rename rufus.h => src/rufus.h (100%) rename rufus.ico => src/rufus.ico (100%) create mode 100644 src/rufus.rc rename stdio.c => src/stdio.c (100%) rename stdlg.c => src/stdlg.c (100%) rename sys_types.h => src/sys_types.h (100%) diff --git a/rufus.rc b/rufus.rc index ff1ab5f0..e69de29b 100644 --- a/rufus.rc +++ b/rufus.rc @@ -1,226 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include -#ifndef IDC_STATIC -#define IDC_STATIC -1 -#endif - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG DIALOGEX 12, 12, 206, 263 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.1.71" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "Start",IDC_START,94,223,50,14 - PUSHBUTTON "Close",IDCANCEL,148,223,50,14 - COMBOBOX IDC_DEVICE,8,17,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "&Device",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,6,22,8 - COMBOBOX IDC_FILESYSTEM,8,75,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&File system",IDC_STATIC,9,64,51,10 - COMBOBOX IDC_CAPACITY,8,46,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Ca&pacity",IDC_STATIC,9,35,29,8 - COMBOBOX IDC_CLUSTERSIZE,8,104,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Allocation unit size",IDC_STATIC,9,93,105,10 - PUSHBUTTON "About...",IDC_ABOUT,8,223,50,14 - GROUPBOX "Format Options",IDC_STATIC,7,149,189,40 - EDITTEXT IDC_LABEL,7,131,190,13,ES_AUTOHSCROLL - CONTROL "&Quick Format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,58,10 - CONTROL "Create an &MS-DOS startup disk",IDC_DOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,115,10 - LTEXT "New volume &label",IDC_STATIC,9,121,105,10 - CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,197,189,9 -END - -IDD_ABOUTBOX DIALOGEX 0, 0, 287, 195 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About Rufus" -FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 -BEGIN - ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 - LTEXT "Rufus - The Resourceful USB Formatting Utility *BETA*",IDC_RUFUS_BOLD,46,8,240,10,SS_NOPREFIX | SS_NOTIFY - LTEXT "Copyright (c) 2011 Pete Batard",IDC_STATIC,46,36,139,8 - DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP - CONTROL "https://github.com/pbatard/rufus",IDC_ABOUT_RUFUS_URL, - "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.0.1 (Build 71)",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 - LTEXT "Portions copyright:",IDC_STATIC,46,95,59,8 - CONTROL "https://github.com/pbatard/rufus/issues",IDC_ABOUT_BUG_URL, - "SysLink",WS_TABSTOP,46,76,203,14 -END - -IDD_NOTIFICATION DIALOGEX 0, 0, 263, 63 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME -CAPTION "Rufus" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - LTEXT "",IDC_NOTIFICATION_LINE,0,0,263,39 - CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,263,38 - ICON 32516,IDC_NOTIFICATION_ICON,6,6,20,20 - LTEXT "",IDC_NOTIFICATION_TEXT,35,10,219,20 - DEFPUSHBUTTON "Close",IDCANCEL,211,44,50,14 -END - -IDD_LICENSE DIALOGEX 0, 0, 335, 205 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus License" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "Close",IDOK,278,187,50,14 - EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include \r\n" - "#ifndef IDC_STATIC\r\n" - "#define IDC_STATIC -1\r\n" - "#endif\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\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" - "#if defined(__GNUC__)\r\n" - "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""common_controls_and_elevation.manifest""\r\n" - "#endif\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_DIALOG, DIALOG - BEGIN - BOTTOMMARGIN, 249 - END - - IDD_ABOUTBOX, DIALOG - BEGIN - END - - IDD_NOTIFICATION, DIALOG - BEGIN - END - - IDD_LICENSE, DIALOG - BEGIN - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,71 - PRODUCTVERSION 1,0,1,71 - 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", "Rufus" - VALUE "FileVersion", "1.0.1.71" - 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.0.1.71" - 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 "rufus.ico" -#endif // English resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - -// Must reference a manifest for visual styles and elevation -// Oh, and it must happen at the end, or MinGW will ignore it! -#if defined(__GNUC__) -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "common_controls_and_elevation.manifest" -#endif - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Makefile.am b/src/Makefile.am similarity index 100% rename from Makefile.am rename to src/Makefile.am diff --git a/Makefile.in b/src/Makefile.in similarity index 90% rename from Makefile.in rename to src/Makefile.in index ffcea3d3..7d583086 100644 --- a/Makefile.in +++ b/src/Makefile.in @@ -33,15 +33,12 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : noinst_PROGRAMS = rufus$(EXEEXT) -subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) +subdir = src +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -178,39 +175,35 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -am--refresh: - @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign --ignore-deps Makefile + $(AUTOMAKE) --foreign --ignore-deps src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(top_srcdir)/configure: $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): clean-noinstPROGRAMS: @@ -406,7 +399,6 @@ clean: clean-am clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -452,8 +444,6 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -473,18 +463,17 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-tags dvi dvi-am \ - html html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-noinstPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-tags dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am rufus_rc.o: rufus.rc diff --git a/br.c b/src/br.c similarity index 100% rename from br.c rename to src/br.c diff --git a/common_controls_and_elevation.manifest b/src/common_controls_and_elevation.manifest similarity index 100% rename from common_controls_and_elevation.manifest rename to src/common_controls_and_elevation.manifest diff --git a/drive.c b/src/drive.c similarity index 100% rename from drive.c rename to src/drive.c diff --git a/fat12.c b/src/fat12.c similarity index 100% rename from fat12.c rename to src/fat12.c diff --git a/fat16.c b/src/fat16.c similarity index 100% rename from fat16.c rename to src/fat16.c diff --git a/fat32.c b/src/fat32.c similarity index 100% rename from fat32.c rename to src/fat32.c diff --git a/file.c b/src/file.c similarity index 100% rename from file.c rename to src/file.c diff --git a/format.c b/src/format.c similarity index 100% rename from format.c rename to src/format.c diff --git a/format.h b/src/format.h similarity index 100% rename from format.h rename to src/format.h diff --git a/inc/br.h b/src/inc/br.h similarity index 100% rename from inc/br.h rename to src/inc/br.h diff --git a/inc/br_fat12_0x0.h b/src/inc/br_fat12_0x0.h similarity index 100% rename from inc/br_fat12_0x0.h rename to src/inc/br_fat12_0x0.h diff --git a/inc/br_fat12_0x3e.h b/src/inc/br_fat12_0x3e.h similarity index 100% rename from inc/br_fat12_0x3e.h rename to src/inc/br_fat12_0x3e.h diff --git a/inc/br_fat16_0x0.h b/src/inc/br_fat16_0x0.h similarity index 100% rename from inc/br_fat16_0x0.h rename to src/inc/br_fat16_0x0.h diff --git a/inc/br_fat16_0x3e.h b/src/inc/br_fat16_0x3e.h similarity index 100% rename from inc/br_fat16_0x3e.h rename to src/inc/br_fat16_0x3e.h diff --git a/inc/br_fat16fd_0x3e.h b/src/inc/br_fat16fd_0x3e.h similarity index 100% rename from inc/br_fat16fd_0x3e.h rename to src/inc/br_fat16fd_0x3e.h diff --git a/inc/br_fat32_0x0.h b/src/inc/br_fat32_0x0.h similarity index 100% rename from inc/br_fat32_0x0.h rename to src/inc/br_fat32_0x0.h diff --git a/inc/br_fat32_0x3f0.h b/src/inc/br_fat32_0x3f0.h similarity index 100% rename from inc/br_fat32_0x3f0.h rename to src/inc/br_fat32_0x3f0.h diff --git a/inc/br_fat32_0x52.h b/src/inc/br_fat32_0x52.h similarity index 100% rename from inc/br_fat32_0x52.h rename to src/inc/br_fat32_0x52.h diff --git a/inc/br_fat32fd_0x3f0.h b/src/inc/br_fat32fd_0x3f0.h similarity index 100% rename from inc/br_fat32fd_0x3f0.h rename to src/inc/br_fat32fd_0x3f0.h diff --git a/inc/br_fat32fd_0x52.h b/src/inc/br_fat32fd_0x52.h similarity index 100% rename from inc/br_fat32fd_0x52.h rename to src/inc/br_fat32fd_0x52.h diff --git a/inc/br_fat32nt_0x0.h b/src/inc/br_fat32nt_0x0.h similarity index 100% rename from inc/br_fat32nt_0x0.h rename to src/inc/br_fat32nt_0x0.h diff --git a/inc/br_fat32nt_0x1800.h b/src/inc/br_fat32nt_0x1800.h similarity index 100% rename from inc/br_fat32nt_0x1800.h rename to src/inc/br_fat32nt_0x1800.h diff --git a/inc/br_fat32nt_0x3f0.h b/src/inc/br_fat32nt_0x3f0.h similarity index 100% rename from inc/br_fat32nt_0x3f0.h rename to src/inc/br_fat32nt_0x3f0.h diff --git a/inc/br_fat32nt_0x52.h b/src/inc/br_fat32nt_0x52.h similarity index 100% rename from inc/br_fat32nt_0x52.h rename to src/inc/br_fat32nt_0x52.h diff --git a/inc/fat12.h b/src/inc/fat12.h similarity index 100% rename from inc/fat12.h rename to src/inc/fat12.h diff --git a/inc/fat16.h b/src/inc/fat16.h similarity index 100% rename from inc/fat16.h rename to src/inc/fat16.h diff --git a/inc/fat32.h b/src/inc/fat32.h similarity index 100% rename from inc/fat32.h rename to src/inc/fat32.h diff --git a/inc/file.h b/src/inc/file.h similarity index 100% rename from inc/file.h rename to src/inc/file.h diff --git a/inc/label_11_char.h b/src/inc/label_11_char.h similarity index 100% rename from inc/label_11_char.h rename to src/inc/label_11_char.h diff --git a/inc/mbr_2000.h b/src/inc/mbr_2000.h similarity index 100% rename from inc/mbr_2000.h rename to src/inc/mbr_2000.h diff --git a/inc/mbr_95b.h b/src/inc/mbr_95b.h similarity index 100% rename from inc/mbr_95b.h rename to src/inc/mbr_95b.h diff --git a/inc/mbr_dos.h b/src/inc/mbr_dos.h similarity index 100% rename from inc/mbr_dos.h rename to src/inc/mbr_dos.h diff --git a/inc/mbr_dos_f2.h b/src/inc/mbr_dos_f2.h similarity index 100% rename from inc/mbr_dos_f2.h rename to src/inc/mbr_dos_f2.h diff --git a/inc/mbr_syslinux.h b/src/inc/mbr_syslinux.h similarity index 100% rename from inc/mbr_syslinux.h rename to src/inc/mbr_syslinux.h diff --git a/inc/mbr_vista.h b/src/inc/mbr_vista.h similarity index 100% rename from inc/mbr_vista.h rename to src/inc/mbr_vista.h diff --git a/inc/mbr_win7.h b/src/inc/mbr_win7.h similarity index 100% rename from inc/mbr_win7.h rename to src/inc/mbr_win7.h diff --git a/inc/mbr_zero.h b/src/inc/mbr_zero.h similarity index 100% rename from inc/mbr_zero.h rename to src/inc/mbr_zero.h diff --git a/license.h b/src/license.h similarity index 100% rename from license.h rename to src/license.h diff --git a/mkf b/src/mkf similarity index 100% rename from mkf rename to src/mkf diff --git a/msapi_utf8.h b/src/msapi_utf8.h similarity index 100% rename from msapi_utf8.h rename to src/msapi_utf8.h diff --git a/msdos.c b/src/msdos.c similarity index 100% rename from msdos.c rename to src/msdos.c diff --git a/msdos.h b/src/msdos.h similarity index 100% rename from msdos.h rename to src/msdos.h diff --git a/resource.h b/src/resource.h similarity index 100% rename from resource.h rename to src/resource.h diff --git a/rufus.c b/src/rufus.c similarity index 100% rename from rufus.c rename to src/rufus.c diff --git a/rufus.h b/src/rufus.h similarity index 100% rename from rufus.h rename to src/rufus.h diff --git a/rufus.ico b/src/rufus.ico similarity index 100% rename from rufus.ico rename to src/rufus.ico diff --git a/src/rufus.rc b/src/rufus.rc new file mode 100644 index 00000000..ff1ab5f0 --- /dev/null +++ b/src/rufus.rc @@ -0,0 +1,226 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +#pragma code_page(1252) + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DIALOG DIALOGEX 12, 12, 206, 263 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Rufus v1.0.1.71" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Start",IDC_START,94,223,50,14 + PUSHBUTTON "Close",IDCANCEL,148,223,50,14 + COMBOBOX IDC_DEVICE,8,17,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "&Device",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,6,22,8 + COMBOBOX IDC_FILESYSTEM,8,75,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&File system",IDC_STATIC,9,64,51,10 + COMBOBOX IDC_CAPACITY,8,46,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Ca&pacity",IDC_STATIC,9,35,29,8 + COMBOBOX IDC_CLUSTERSIZE,8,104,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Allocation unit size",IDC_STATIC,9,93,105,10 + PUSHBUTTON "About...",IDC_ABOUT,8,223,50,14 + GROUPBOX "Format Options",IDC_STATIC,7,149,189,40 + EDITTEXT IDC_LABEL,7,131,190,13,ES_AUTOHSCROLL + CONTROL "&Quick Format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,58,10 + CONTROL "Create an &MS-DOS startup disk",IDC_DOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,115,10 + LTEXT "New volume &label",IDC_STATIC,9,121,105,10 + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,197,189,9 +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 287, 195 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About Rufus" +FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 + LTEXT "Rufus - The Resourceful USB Formatting Utility *BETA*",IDC_RUFUS_BOLD,46,8,240,10,SS_NOPREFIX | SS_NOTIFY + LTEXT "Copyright (c) 2011 Pete Batard",IDC_STATIC,46,36,139,8 + DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP + CONTROL "https://github.com/pbatard/rufus",IDC_ABOUT_RUFUS_URL, + "SysLink",WS_TABSTOP,46,47,114,9 + LTEXT "Version 1.0.1 (Build 71)",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 + LTEXT "Portions copyright:",IDC_STATIC,46,95,59,8 + CONTROL "https://github.com/pbatard/rufus/issues",IDC_ABOUT_BUG_URL, + "SysLink",WS_TABSTOP,46,76,203,14 +END + +IDD_NOTIFICATION DIALOGEX 0, 0, 263, 63 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME +CAPTION "Rufus" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_NOTIFICATION_LINE,0,0,263,39 + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,263,38 + ICON 32516,IDC_NOTIFICATION_ICON,6,6,20,20 + LTEXT "",IDC_NOTIFICATION_TEXT,35,10,219,20 + DEFPUSHBUTTON "Close",IDCANCEL,211,44,50,14 +END + +IDD_LICENSE DIALOGEX 0, 0, 335, 205 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Rufus License" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Close",IDOK,278,187,50,14 + EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \r\n" + "#ifndef IDC_STATIC\r\n" + "#define IDC_STATIC -1\r\n" + "#endif\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\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" + "#if defined(__GNUC__)\r\n" + "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""common_controls_and_elevation.manifest""\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_DIALOG, DIALOG + BEGIN + BOTTOMMARGIN, 249 + END + + IDD_ABOUTBOX, DIALOG + BEGIN + END + + IDD_NOTIFICATION, DIALOG + BEGIN + END + + IDD_LICENSE, DIALOG + BEGIN + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,1,71 + PRODUCTVERSION 1,0,1,71 + 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", "Rufus" + VALUE "FileVersion", "1.0.1.71" + 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.0.1.71" + 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 "rufus.ico" +#endif // English resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + +// Must reference a manifest for visual styles and elevation +// Oh, and it must happen at the end, or MinGW will ignore it! +#if defined(__GNUC__) +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "common_controls_and_elevation.manifest" +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/stdio.c b/src/stdio.c similarity index 100% rename from stdio.c rename to src/stdio.c diff --git a/stdlg.c b/src/stdlg.c similarity index 100% rename from stdlg.c rename to src/stdlg.c diff --git a/sys_types.h b/src/sys_types.h similarity index 100% rename from sys_types.h rename to src/sys_types.h