From 8fa8faf5101a683db629b660de129538fa96ff58 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sat, 19 Nov 2011 19:08:23 +0000 Subject: [PATCH] [misc] renamed project to Rufus --- ...usbdos_2010.vcxproj => rufus_2010.vcxproj} | 13 ++++----- ...roj.filters => rufus_2010.vcxproj.filters} | 11 +++----- _gs.sh | 9 ------ resource.h | 2 +- usbdos.c => rufus.c | 14 +++++----- usbdos.h => rufus.h | 6 ++-- usbdos.ico => rufus.ico | Bin usbdos.rc => rufus.rc | 26 +++++++++--------- usbdos_2010.sln => rufus_2010.sln | 2 +- 9 files changed, 35 insertions(+), 48 deletions(-) rename .msvc/{usbdos_2010.vcxproj => rufus_2010.vcxproj} (96%) rename .msvc/{usbdos_2010.vcxproj.filters => rufus_2010.vcxproj.filters} (84%) delete mode 100755 _gs.sh rename usbdos.c => rufus.c (98%) rename usbdos.h => rufus.h (95%) rename usbdos.ico => rufus.ico (100%) rename usbdos.rc => rufus.rc (81%) rename usbdos_2010.sln => rufus_2010.sln (89%) diff --git a/.msvc/usbdos_2010.vcxproj b/.msvc/rufus_2010.vcxproj similarity index 96% rename from .msvc/usbdos_2010.vcxproj rename to .msvc/rufus_2010.vcxproj index a4ae8fbf..7b7d06c5 100644 --- a/.msvc/usbdos_2010.vcxproj +++ b/.msvc/rufus_2010.vcxproj @@ -19,9 +19,9 @@ - usbdos + rufus {731858A7-0303-4988-877B-9C0DD6471864} - usbdos + rufus Win32Proj @@ -139,22 +139,21 @@ - + - - + - + - + diff --git a/.msvc/usbdos_2010.vcxproj.filters b/.msvc/rufus_2010.vcxproj.filters similarity index 84% rename from .msvc/usbdos_2010.vcxproj.filters rename to .msvc/rufus_2010.vcxproj.filters index bb19f962..039c85a9 100644 --- a/.msvc/usbdos_2010.vcxproj.filters +++ b/.msvc/rufus_2010.vcxproj.filters @@ -15,15 +15,12 @@ - + Source Files - - Header Files - - + Header Files @@ -34,7 +31,7 @@ - + Resource Files @@ -44,7 +41,7 @@ - + Resource Files diff --git a/_gs.sh b/_gs.sh deleted file mode 100755 index 4faf397f..00000000 --- a/_gs.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -git branch | grep -q \* -if [ $? -eq 0 ]; then - git symbolic-ref HEAD refs/heads/dummy - echo "Switched to fake branch 'dummy'" -else - git symbolic-ref HEAD refs/heads/master - echo "Switched to branch 'master'" -fi diff --git a/resource.h b/resource.h index 87b9fd1e..a83479af 100644 --- a/resource.h +++ b/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by usbdos.rc +// Used by rufus.rc // #define IDD_DIALOG 101 #define IDI_ICON 102 diff --git a/usbdos.c b/rufus.c similarity index 98% rename from usbdos.c rename to rufus.c index ad62f94c..68256d68 100644 --- a/usbdos.c +++ b/rufus.c @@ -1,5 +1,5 @@ /* - * USBDOS: USB DOS bootable stick creation utility + * Rufus: The Reliable USB Formatting Utility * Copyright (c) 2011 Pete Batard * * Device enumeration based in part on TestUSBDriveEject.cpp by ahmd: @@ -38,7 +38,7 @@ #include "msapi_utf8.h" #include "resource.h" -#include "usbdos.h" +#include "rufus.h" /* * Globals @@ -46,7 +46,7 @@ static HINSTANCE hMainInstance; static HWND hDialog, hDeviceList, hCapacity, hFileSystem; -#ifdef USBDOS_DEBUG +#ifdef RUFUS_DEBUG static void _uprintf(const char *format, ...) { char buf[4096], *p = buf; @@ -443,13 +443,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine HWND hDlg = NULL; MSG msg; - uprintf("*** USBDOS INIT ***\n"); + uprintf("*** RUFUS INIT ***\n"); // Prevent 2 applications from running at the same time - mutex = CreateMutexA(NULL, TRUE, "Global/USBDOS"); + mutex = CreateMutexA(NULL, TRUE, "Global/RUFUS"); if ((mutex == NULL) || (GetLastError() == ERROR_ALREADY_EXISTS)) { - MessageBoxA(NULL, "Another USBDOS application is running.\n" + MessageBoxA(NULL, "Another Rufus application is running.\n" "Please close the first application before running another one.", "Other instance detected", MB_ICONSTOP); return 0; @@ -478,7 +478,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine out: CloseHandle(mutex); - uprintf("*** USBDOS EXIT ***\n"); + uprintf("*** RUFUS EXIT ***\n"); return 0; } diff --git a/usbdos.h b/rufus.h similarity index 95% rename from usbdos.h rename to rufus.h index 93afae0b..3a72c460 100644 --- a/usbdos.h +++ b/rufus.h @@ -1,5 +1,5 @@ /* - * USBDOS: USB DOS bootable stick creation utility + * Rufus: The Reliable USB Formatting Utility * Copyright (c) 2011 Pete Batard * * This program is free software: you can redistribute it and/or modify @@ -18,9 +18,9 @@ #pragma once -#define USBDOS_DEBUG +#define RUFUS_DEBUG -#define APP_VERSION "USBDOS v0.1.0.1" +#define APP_VERSION "Rufus v0.1.0.1" #define IGNORE_RETVAL(expr) do { (void)(expr); } while(0) #ifndef ARRAYSIZE #define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0])) diff --git a/usbdos.ico b/rufus.ico similarity index 100% rename from usbdos.ico rename to rufus.ico diff --git a/usbdos.rc b/rufus.rc similarity index 81% rename from usbdos.rc rename to rufus.rc index cd3aa8e2..06552450 100644 --- a/usbdos.rc +++ b/rufus.rc @@ -26,19 +26,19 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 221, 260 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "USBDOS" +CAPTION "Rufus" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN PUSHBUTTON "Close",IDC_CLOSE,119,230,50,14 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,81,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "File System",IDC_STATIC,18,69,51,10 + LTEXT "Device",IDC_STATIC,17,8,22,8 + COMBOBOX IDC_FILESYSTEM,16,80,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "File System",IDC_STATIC,17,68,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 + LTEXT "Capacity",IDC_STATIC,17,37,29,8 + COMBOBOX IDC_ALLOCSIZE,16,111,190,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Allocation unit size",IDC_STATIC,17,99,105,10 END @@ -106,13 +106,13 @@ BEGIN BLOCK "000904b0" BEGIN VALUE "CompanyName", "akeo.ie" - VALUE "FileDescription", "UsbDos" + VALUE "FileDescription", "Rufus" VALUE "FileVersion", "1.0.0.1" - VALUE "InternalName", "UsbDos" - VALUE "LegalCopyright", "© 2010-2011 Pete Batard (GPL v3)" + VALUE "InternalName", "Rufus" + VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" - VALUE "OriginalFilename", "usbdos.exe" - VALUE "ProductName", "UsbDos" + VALUE "OriginalFilename", "rufus.exe" + VALUE "ProductName", "Rufus" VALUE "ProductVersion", "1.0.0.1" END END @@ -130,7 +130,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON ICON "usbdos.ico" +IDI_ICON ICON "rufus.ico" #endif // English resources ///////////////////////////////////////////////////////////////////////////// diff --git a/usbdos_2010.sln b/rufus_2010.sln similarity index 89% rename from usbdos_2010.sln rename to rufus_2010.sln index da70ab02..113d9672 100644 --- a/usbdos_2010.sln +++ b/rufus_2010.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbdos", ".msvc\usbdos_2010.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", ".msvc\rufus_2010.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution