From 3187f71933a22ac5690a1851570fea64945faad9 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 2 Jan 2012 23:55:47 +0000 Subject: [PATCH] v1.0.6 (#109) * removed TODO (duplicates github feature) * updated copyrights to 2012 * fixed MS only rufus VS2010 solution file * fixed a Clang warning in SetLGP --- README.txt | 8 ++++---- TODO.txt | 5 ----- src/.msvc/rufus_2010.vcxproj | 1 + src/.msvc/rufus_2010.vcxproj.filters | 3 +++ src/badblocks.c | 2 +- src/badblocks.h | 2 +- src/dos.c | 2 +- src/dos.h | 2 +- src/dos_locale.c | 2 +- src/drive.c | 2 +- src/file.c | 2 +- src/format.c | 2 +- src/format.h | 2 +- src/license.h | 2 +- src/msapi_utf8.h | 2 +- src/rufus.c | 10 +++++----- src/rufus.h | 2 +- src/rufus.rc | 14 +++++++------- src/stdio.c | 2 +- src/stdlg.c | 2 +- 20 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 TODO.txt diff --git a/README.txt b/README.txt index ee30ec09..e16468ad 100644 --- a/README.txt +++ b/README.txt @@ -2,16 +2,16 @@ Rufus: The Reliable USB Formatting Utility Features: - Formats USB memory sticks to FAT/FAT32/NTFS/exFAT -- Creates MS-DOS bootable USB memory sticks, with no external files required -- Checks for badblock +- Creates MS-DOS/FreeDOS bootable USB memory sticks, with no external files required +- Checks for bad blocks - Modern UI, with UAC elevation for Windows Vista and later - Fully Open Source (GPL v3) Compilation: Use either Visual Studio 2010, WDK (Windows Driver Kit) or MinGW and then invoke the .sln, wdk_build.cmd or configure/make respectively. - Remember that you can get plenty of useful information about what Rufus - is doing through a Windows debugger such as DebugView. + You can get additional information about what Rufus is doing through a Windows + debugger such as DebugView. More info: http://rufus.akeo.ie diff --git a/TODO.txt b/TODO.txt deleted file mode 100644 index 017dbf75..00000000 --- a/TODO.txt +++ /dev/null @@ -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? diff --git a/src/.msvc/rufus_2010.vcxproj b/src/.msvc/rufus_2010.vcxproj index 7cee829a..f3a14465 100644 --- a/src/.msvc/rufus_2010.vcxproj +++ b/src/.msvc/rufus_2010.vcxproj @@ -148,6 +148,7 @@ + diff --git a/src/.msvc/rufus_2010.vcxproj.filters b/src/.msvc/rufus_2010.vcxproj.filters index 904b0527..cc2ab722 100644 --- a/src/.msvc/rufus_2010.vcxproj.filters +++ b/src/.msvc/rufus_2010.vcxproj.filters @@ -57,6 +57,9 @@ Source Files + + Source Files + diff --git a/src/badblocks.c b/src/badblocks.c index 9a3ef7e0..79a718a9 100644 --- a/src/badblocks.c +++ b/src/badblocks.c @@ -7,7 +7,7 @@ * * Copyright 1995, 1996, 1997, 1998, 1999 by Theodore Ts'o * 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 * written and copyrighted by Linus Torvalds diff --git a/src/badblocks.h b/src/badblocks.h index 3c3f5eb4..b836e6d4 100644 --- a/src/badblocks.h +++ b/src/badblocks.h @@ -7,7 +7,7 @@ * * Copyright 1995, 1996, 1997, 1998, 1999 by Theodore Ts'o * 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 * written and copyrighted by Linus Torvalds diff --git a/src/dos.c b/src/dos.c index 5675a4c3..653ee47a 100644 --- a/src/dos.c +++ b/src/dos.c @@ -2,7 +2,7 @@ * Rufus: The Reliable USB Formatting Utility * DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll * (MS WinME DOS) or from the embedded FreeDOS resource files - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/dos.h b/src/dos.h index e4ba2e9b..b47180ba 100644 --- a/src/dos.h +++ b/src/dos.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * MS-DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/dos_locale.c b/src/dos_locale.c index 34901293..9406aa33 100644 --- a/src/dos_locale.c +++ b/src/dos_locale.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * DOS keyboard locale setup - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/drive.c b/src/drive.c index b6cf61f6..271cbcf4 100644 --- a/src/drive.c +++ b/src/drive.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Drive access function calls - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/file.c b/src/file.c index ec863b0e..d9be7a25 100644 --- a/src/file.c +++ b/src/file.c @@ -1,6 +1,6 @@ /****************************************************************** 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 it under the terms of the GNU General Public License as published by diff --git a/src/format.c b/src/format.c index 1b89f9e4..40ddac0a 100644 --- a/src/format.c +++ b/src/format.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Formatting function calls - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/format.h b/src/format.h index 73ca2a06..f7a723cd 100644 --- a/src/format.h +++ b/src/format.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Formatting function calls - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/license.h b/src/license.h index 464c7c71..b2e3d603 100644 --- a/src/license.h +++ b/src/license.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Licensing Data - * Copyright (c) 20111 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/msapi_utf8.h b/src/msapi_utf8.h index 243c8248..ceb54817 100644 --- a/src/msapi_utf8.h +++ b/src/msapi_utf8.h @@ -2,7 +2,7 @@ * MSAPI_UTF8: Common API calls using UTF-8 strings * Compensating for what Microsoft should have done a long long time ago. * - * Copyright (c) 2010-2011 Pete Batard + * Copyright (c) 2010-2012 Pete Batard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/rufus.c b/src/rufus.c index 8758c5fa..36aef5f8 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1,6 +1,6 @@ /* * Rufus: The Reliable USB Formatting Utility - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 @@ -739,7 +739,7 @@ typedef IGroupPolicyObject *LPGROUPPOLICYOBJECT; BOOL SetLGP(BOOL bRestore, const char* szPath, const char* szPolicy, DWORD dwValue) { LONG r; - DWORD disp, regtype, val, val_size=sizeof(DWORD); + DWORD disp, regtype, val=0, val_size=sizeof(DWORD); HRESULT hr; IGroupPolicyObject* pLGPO; // 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); goto error; } else { - if ((bRestore) && (!existing_key)) { - uprintf("SetLGP: Successfully removed %s policy key\n", szPolicy); - } else { + if ((!bRestore) || (existing_key)) { 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); } } diff --git a/src/rufus.h b/src/rufus.h index 9f3982da..906c1615 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -1,6 +1,6 @@ /* * Rufus: The Reliable USB Formatting Utility - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/rufus.rc b/src/rufus.rc index 8e60537d..33fc1ef1 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 278 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.6.108" +CAPTION "Rufus v1.0.6.109" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -61,11 +61,11 @@ FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 BEGIN 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 "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 CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "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 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 @@ -170,8 +170,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,6,108 - PRODUCTVERSION 1,0,6,108 + FILEVERSION 1,0,6,109 + PRODUCTVERSION 1,0,6,109 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -188,13 +188,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.6.108" + VALUE "FileVersion", "1.0.6.109" 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.6.108" + VALUE "ProductVersion", "1.0.6.109" END END BLOCK "VarFileInfo" diff --git a/src/stdio.c b/src/stdio.c index 1b6b1aab..a919c86f 100644 --- a/src/stdio.c +++ b/src/stdio.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Standard I/O Routines (logging, status, etc.) - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * 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 diff --git a/src/stdlg.c b/src/stdlg.c index 25668b28..23aeb8b2 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Standard Dialog Routines (Browse for folder, About, etc) - * Copyright (c) 2011 Pete Batard + * Copyright (c) 2011-2012 Pete Batard * * Based on zadig_stdlg.c, part of libwdi: http://libwdi.sf.net *