nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

v1.0.6 (#109)

Browse source 
* removed TODO (duplicates github feature)
* updated copyrights to 2012
* fixed MS only rufus VS2010 solution file
* fixed a Clang warning in SetLGP
This commit is contained in:
Pete Batard 2012-01-02 23:55:47 +00:00
parent d27e73137d
commit 3187f71933
20 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.txt
View file

@ -2,16 +2,16 @@ Rufus: The Reliable USB Formatting Utility
Features: Features:
- Formats USB memory sticks to FAT/FAT32/NTFS/exFAT - Formats USB memory sticks to FAT/FAT32/NTFS/exFAT
- Creates MS-DOS bootable USB memory sticks, with no external files required - Creates MS-DOS/FreeDOS bootable USB memory sticks, with no external files required
- Checks for badblock - Checks for bad blocks
- Modern UI, with UAC elevation for Windows Vista and later - Modern UI, with UAC elevation for Windows Vista and later
- Fully Open Source (GPL v3) - Fully Open Source (GPL v3)
Compilation: Compilation:
Use either Visual Studio 2010, WDK (Windows Driver Kit) or MinGW and then Use either Visual Studio 2010, WDK (Windows Driver Kit) or MinGW and then
invoke the .sln, wdk_build.cmd or configure/make respectively. invoke the .sln, wdk_build.cmd or configure/make respectively.
Remember that you can get plenty of useful information about what Rufus You can get additional information about what Rufus is doing through a Windows
is doing through a Windows debugger such as DebugView. debugger such as DebugView.
More info: More info:
http://rufus.akeo.ie http://rufus.akeo.ie

5
TODO.txt
View file

@ -1,5 +0,0 @@
o Create a report file with failed block details on bad blocks
o Allow selection of one of the existing compatible partitions (keep existing MBR) vs. full repartitioning (overwrite MBR)
o Bootable NTFS/exFAT (http://sourceforge.net/projects/grub4dos)?
o GPT support?
o FAT32 formatting for volumes > 32 GB?

1
src/.msvc/rufus_2010.vcxproj
View file

@ -148,6 +148,7 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\badblocks.c" /> <ClCompile Include="..\badblocks.c" />
<ClCompile Include="..\br.c" /> <ClCompile Include="..\br.c" />
<ClCompile Include="..\dos_locale.c" />
<ClCompile Include="..\drive.c" /> <ClCompile Include="..\drive.c" />
<ClCompile Include="..\fat12.c" /> <ClCompile Include="..\fat12.c" />
<ClCompile Include="..\fat16.c" /> <ClCompile Include="..\fat16.c" />

3
src/.msvc/rufus_2010.vcxproj.filters
View file

@ -57,6 +57,9 @@
<ClCompile Include="..\partition_info.c"> <ClCompile Include="..\partition_info.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\dos_locale.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\rufus.h"> <ClInclude Include="..\rufus.h">

2
src/badblocks.c
View file

@ -7,7 +7,7 @@
* *
* Copyright 1995, 1996, 1997, 1998, 1999 by Theodore Ts'o * Copyright 1995, 1996, 1997, 1998, 1999 by Theodore Ts'o
* Copyright 1999 by David Beattie * Copyright 1999 by David Beattie
* Copyright 2011 by Pete Batard * Copyright 2011-2012 by Pete Batard
* *
* This file is based on the minix file system programs fsck and mkfs * This file is based on the minix file system programs fsck and mkfs
* written and copyrighted by Linus Torvalds <Linus.Torvalds@cs.helsinki.fi> * written and copyrighted by Linus Torvalds <Linus.Torvalds@cs.helsinki.fi>

2
src/badblocks.h
View file

@ -7,7 +7,7 @@
* *
* Copyright 1995, 1996, 1997, 1998, 1999 by Theodore Ts'o * Copyright 1995, 1996, 1997, 1998, 1999 by Theodore Ts'o
* Copyright 1999 by David Beattie * Copyright 1999 by David Beattie
* Copyright 2011 by Pete Batard * Copyright 2011-2012 by Pete Batard
* *
* This file is based on the minix file system programs fsck and mkfs * This file is based on the minix file system programs fsck and mkfs
* written and copyrighted by Linus Torvalds <Linus.Torvalds@cs.helsinki.fi> * written and copyrighted by Linus Torvalds <Linus.Torvalds@cs.helsinki.fi>

2
src/dos.c
View file

@ -2,7 +2,7 @@
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll * DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll
* (MS WinME DOS) or from the embedded FreeDOS resource files * (MS WinME DOS) or from the embedded FreeDOS resource files
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/dos.h
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* MS-DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll * MS-DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/dos_locale.c
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* DOS keyboard locale setup * DOS keyboard locale setup
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/drive.c
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Drive access function calls * Drive access function calls
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/file.c
View file

@ -1,6 +1,6 @@
/****************************************************************** /******************************************************************
Copyright (C) 2009 Henrik Carlqvist Copyright (C) 2009 Henrik Carlqvist
Modified for Rufus/Windows (C) 2011 Pete Batard Modified for Rufus/Windows (C) 2011-2012 Pete Batard
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by

2
src/format.c
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Formatting function calls * Formatting function calls
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/format.h
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Formatting function calls * Formatting function calls
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/license.h
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Licensing Data * Licensing Data
* Copyright (c) 20111 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/msapi_utf8.h
View file

@ -2,7 +2,7 @@
* MSAPI_UTF8: Common API calls using UTF-8 strings * MSAPI_UTF8: Common API calls using UTF-8 strings
* Compensating for what Microsoft should have done a long long time ago. * Compensating for what Microsoft should have done a long long time ago.
* *
* Copyright (c) 2010-2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2010-2012 Pete Batard <pete@akeo.ie>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public

10
src/rufus.c
View file

@ -1,6 +1,6 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -739,7 +739,7 @@ typedef IGroupPolicyObject *LPGROUPPOLICYOBJECT;
BOOL SetLGP(BOOL bRestore, const char* szPath, const char* szPolicy, DWORD dwValue) BOOL SetLGP(BOOL bRestore, const char* szPath, const char* szPolicy, DWORD dwValue)
{ {
LONG r; LONG r;
DWORD disp, regtype, val, val_size=sizeof(DWORD); DWORD disp, regtype, val=0, val_size=sizeof(DWORD);
HRESULT hr; HRESULT hr;
IGroupPolicyObject* pLGPO; IGroupPolicyObject* pLGPO;
// Along with global 'existing_key', this static value is used to restore initial state // Along with global 'existing_key', this static value is used to restore initial state
@ -812,10 +812,10 @@ BOOL SetLGP(BOOL bRestore, const char* szPath, const char* szPolicy, DWORD dwVal
uprintf("SetLGP: Unable to apply %s policy - error %x\n", szPolicy, hr); uprintf("SetLGP: Unable to apply %s policy - error %x\n", szPolicy, hr);
goto error; goto error;
} else { } else {
if ((bRestore) && (!existing_key)) { if ((!bRestore) || (existing_key)) {
uprintf("SetLGP: Successfully removed %s policy key\n", szPolicy);
} else {
uprintf("SetLGP: Successfully %s %s policy to 0x%08X\n", (bRestore)?"restored":"set", szPolicy, val); uprintf("SetLGP: Successfully %s %s policy to 0x%08X\n", (bRestore)?"restored":"set", szPolicy, val);
} else {
uprintf("SetLGP: Successfully removed %s policy key\n", szPolicy);
} }
} }

2
src/rufus.h
View file

@ -1,6 +1,6 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

14
src/rufus.rc
View file

@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 278 IDD_DIALOG DIALOGEX 12, 12, 206, 278
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.0.6.108" CAPTION "Rufus v1.0.6.109"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 DEFPUSHBUTTON "Start",IDC_START,94,236,50,14
@ -61,11 +61,11 @@ FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
BEGIN BEGIN
ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20
LTEXT "Rufus - The Reliable USB Formatting Utility",IDC_RUFUS_BOLD,46,8,240,10,SS_NOPREFIX | SS_NOTIFY LTEXT "Rufus - The Reliable USB Formatting Utility",IDC_RUFUS_BOLD,46,8,240,10,SS_NOPREFIX | SS_NOTIFY
LTEXT "Copyright (c) 2011 Pete Batard",IDC_STATIC,46,36,139,8 LTEXT "Copyright (c) 2011-2012 Pete Batard",IDC_STATIC,46,36,139,8
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL, CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
"SysLink",WS_TABSTOP,46,47,114,9 "SysLink",WS_TABSTOP,46,47,114,9
LTEXT "Version 1.0.6 (Build 108)",IDC_STATIC,46,19,78,8 LTEXT "Version 1.0.6 (Build 109)",IDC_STATIC,46,19,78,8
PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP 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 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 "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@ -170,8 +170,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,6,108 FILEVERSION 1,0,6,109
PRODUCTVERSION 1,0,6,108 PRODUCTVERSION 1,0,6,109
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -188,13 +188,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "akeo.ie" VALUE "CompanyName", "akeo.ie"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.0.6.108" VALUE "FileVersion", "1.0.6.109"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.0.6.108" VALUE "ProductVersion", "1.0.6.109"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
src/stdio.c
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Standard I/O Routines (logging, status, etc.) * Standard I/O Routines (logging, status, etc.)
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

2
src/stdlg.c
View file

@ -1,7 +1,7 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Standard Dialog Routines (Browse for folder, About, etc) * Standard Dialog Routines (Browse for folder, About, etc)
* Copyright (c) 2011 Pete Batard <pete@akeo.ie> * Copyright (c) 2011-2012 Pete Batard <pete@akeo.ie>
* *
* Based on zadig_stdlg.c, part of libwdi: http://libwdi.sf.net * Based on zadig_stdlg.c, part of libwdi: http://libwdi.sf.net
* *