mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[misc] renamed project to Rufus
This commit is contained in:
		
							parent
							
								
									9cdce54ad9
								
							
						
					
					
						commit
						8fa8faf510
					
				
					 9 changed files with 35 additions and 48 deletions
				
			
		|  | @ -19,9 +19,9 @@ | |||
|     </ProjectConfiguration> | ||||
|   </ItemGroup> | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectName>usbdos</ProjectName> | ||||
|     <ProjectName>rufus</ProjectName> | ||||
|     <ProjectGuid>{731858A7-0303-4988-877B-9C0DD6471864}</ProjectGuid> | ||||
|     <RootNamespace>usbdos</RootNamespace> | ||||
|     <RootNamespace>rufus</RootNamespace> | ||||
|     <Keyword>Win32Proj</Keyword> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|  | @ -139,22 +139,21 @@ | |||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemGroup> | ||||
|     <ClCompile Include="..\usbdos.c" /> | ||||
|     <ClCompile Include="..\rufus.c" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ClInclude Include="..\msapi_utf8.h" /> | ||||
|     <ClInclude Include="..\usbdos_license.h" /> | ||||
|     <ClInclude Include="..\usbdos.h" /> | ||||
|     <ClInclude Include="..\rufus.h" /> | ||||
|     <ClInclude Include="..\resource.h" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <Manifest Include="..\common_controls_and_elevation.manifest" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <None Include="..\usbdos.ico" /> | ||||
|     <None Include="..\rufus.ico" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ResourceCompile Include="..\usbdos.rc" /> | ||||
|     <ResourceCompile Include="..\rufus.rc" /> | ||||
|   </ItemGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||||
|   <ImportGroup Label="ExtensionTargets"> | ||||
|  | @ -15,15 +15,12 @@ | |||
|     </Filter> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ClCompile Include="..\usbdos.c"> | ||||
|     <ClCompile Include="..\rufus.c"> | ||||
|       <Filter>Source Files</Filter> | ||||
|     </ClCompile> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ClInclude Include="..\usbdos.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="..\usbdos_license.h"> | ||||
|     <ClInclude Include="..\rufus.h"> | ||||
|       <Filter>Header Files</Filter> | ||||
|     </ClInclude> | ||||
|     <ClInclude Include="..\resource.h"> | ||||
|  | @ -34,7 +31,7 @@ | |||
|     </ClInclude> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <None Include="..\usbdos.ico"> | ||||
|     <None Include="..\rufus.ico"> | ||||
|       <Filter>Resource Files</Filter> | ||||
|     </None> | ||||
|   </ItemGroup> | ||||
|  | @ -44,7 +41,7 @@ | |||
|     </Manifest> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <ResourceCompile Include="..\usbdos.rc"> | ||||
|     <ResourceCompile Include="..\rufus.rc"> | ||||
|       <Filter>Resource Files</Filter> | ||||
|     </ResourceCompile> | ||||
|   </ItemGroup> | ||||
							
								
								
									
										9
									
								
								_gs.sh
									
										
									
									
									
								
							
							
						
						
									
										9
									
								
								_gs.sh
									
										
									
									
									
								
							|  | @ -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 | ||||
|  | @ -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 | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| /*
 | ||||
|  * USBDOS: USB DOS bootable stick creation utility | ||||
|  * Rufus: The Reliable USB Formatting Utility | ||||
|  * Copyright (c) 2011 Pete Batard <pete@akeo.ie> | ||||
|  *  | ||||
|  * 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; | ||||
| } | ||||
|  | @ -1,5 +1,5 @@ | |||
| /*
 | ||||
|  * USBDOS: USB DOS bootable stick creation utility | ||||
|  * Rufus: The Reliable USB Formatting Utility | ||||
|  * Copyright (c) 2011 Pete Batard <pete@akeo.ie> | ||||
|  * | ||||
|  * 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])) | ||||
| Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB | 
|  | @ -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 | ||||
| ///////////////////////////////////////////////////////////////////////////// | ||||
| 
 | ||||
|  | @ -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 | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue