diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.txt b/README.txt index 91247f11..67cbdb91 100644 --- a/README.txt +++ b/README.txt @@ -3,19 +3,19 @@ Rufus: The Reliable USB Formatting Utility Features: - Formats USB flash drives to FAT/FAT32/NTFS/exFAT - Creates DOS bootable USB drives, with no external files required -- Creates bootable USB drives from bootable ISOs (Windows, Linux, etc.) +- Creates bootable USB drives from bootable ISOs (Windows, Linux, EFI, etc.) - Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO->USB (1) - Bad blocks check, with detection for fake capacity -- Modern UI, with UAC elevation for Windows Vista and later +- Modern UI - Small footprint, no installation required - 100% Free Source Software (GPL v3) Compilation: - Use either Visual Studio 2010, WDK (Windows Driver Kit) or MinGW and then + Use either Visual Studio 2012, WDK 7.1 (Windows Driver Kit) or MinGW and then invoke the .sln, wdk_build.cmd or configure/make respectively. Additional information: - Rufus provides extensive information about what it is doing through its easily + Rufus provides extensive information about what it is doing, through its easily accessible log or the Windows debug facility. More info: diff --git a/src/dos.c b/src/dos.c index 6d73fbc0..8c236eaf 100644 --- a/src/dos.c +++ b/src/dos.c @@ -27,14 +27,15 @@ #include #include #include +#include #include #include "rufus.h" #include "dos.h" #include "resource.h" -static BYTE* DiskImage; -static size_t DiskImageSize; +static BYTE* DiskImage = NULL; +static DWORD DiskImageSize; /* * FAT time conversion, from ReactOS' time.c @@ -166,57 +167,37 @@ static void FatDateTimeToSystemTime(PLARGE_INTEGER SystemTime, PFAT_DATETIME Fat * IO.SYS 000003AA 75 -> EB * COMMAND.COM 00006510 75 -> EB */ -static BOOL Patch_COMMAND_COM(HANDLE hFile) +static BOOL Patch_COMMAND_COM(size_t filestart, size_t filesize) { const BYTE expected[8] = { 0x15, 0x80, 0xFA, 0x03, 0x75, 0x10, 0xB8, 0x0E }; - BYTE data[sizeof(expected)] = { 0x00 }; - DWORD size = sizeof(data); uprintf("Patching COMMAND.COM...\n"); - if (GetFileSize(hFile, NULL) != 93040) { + if (filesize != 93040) { uprintf(" unexpected file size\n"); return FALSE; } - SetFilePointer(hFile, 0x650c, NULL, FILE_BEGIN); - if (!ReadFile(hFile, data, size, &size, NULL)) { - uprintf(" could not read data\n"); - return FALSE; - } - if (memcmp(data, expected, sizeof(expected)) != 0) { + if (memcmp(&DiskImage[filestart+0x650c], expected, sizeof(expected)) != 0) { uprintf(" unexpected binary data\n"); return FALSE; } - data[4] = 0xeb; - SetFilePointer(hFile, 0x650c, NULL, FILE_BEGIN); - size = sizeof(data); - WriteFile(hFile, data, size, &size, NULL); + DiskImage[filestart+0x6510] = 0xeb; return TRUE; } -static BOOL Patch_IO_SYS(HANDLE hFile) +static BOOL Patch_IO_SYS(size_t filestart, size_t filesize) { const BYTE expected[8] = { 0xFA, 0x80, 0x75, 0x09, 0x8D, 0xB6, 0x99, 0x00 }; - BYTE data[sizeof(expected)] = { 0x00 }; - DWORD size = sizeof(data); uprintf("Patching IO.SYS...\n"); - if (GetFileSize(hFile, NULL) != 116736) { + if (filesize != 116736) { uprintf(" unexpected file size\n"); return FALSE; } - SetFilePointer(hFile, 0x3a8, NULL, FILE_BEGIN); - if (!ReadFile(hFile, data, size, &size, NULL)) { - uprintf(" could not read data\n"); - return FALSE; - } - if (memcmp(data, expected, sizeof(expected)) != 0) { + if (memcmp(&DiskImage[filestart+0x3a8], expected, sizeof(expected)) != 0) { uprintf(" unexpected binary data\n"); return FALSE; } - data[2] = 0xeb; - SetFilePointer(hFile, 0x3a8, NULL, FILE_BEGIN); - size = sizeof(data); - WriteFile(hFile, data, size, &size, NULL); + DiskImage[filestart+0x3aa] = 0xeb; return TRUE; } @@ -239,7 +220,6 @@ static BOOL ExtractFAT(int entry, const char* path) } strcpy(filename, path); pos = strlen(path); - filename[pos++] = '\\'; fnamepos = pos; for(i=0; i<8; i++) { @@ -262,6 +242,13 @@ static BOOL ExtractFAT(int entry, const char* path) return FALSE; } + /* WinME DOS files need to be patched */ + if (strcmp(&filename[fnamepos], "COMMAND.COM") == 0) { + Patch_COMMAND_COM(filestart, filesize); + } else if (strcmp(&filename[fnamepos], "IO.SYS") == 0) { + Patch_IO_SYS(filestart, filesize); + } + /* Create a file, using the same attributes as found in the FAT */ hFile = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, dir_entry->Attributes, 0); @@ -276,13 +263,6 @@ static BOOL ExtractFAT(int entry, const char* path) return FALSE; } - /* WinME DOS files need to be patched */ - if (strcmp(&filename[fnamepos], "COMMAND.COM") == 0) { - Patch_COMMAND_COM(hFile); - } else if (strcmp(&filename[fnamepos], "IO.SYS") == 0) { - Patch_IO_SYS(hFile); - } - /* Restore timestamps from FAT */ FatDateTimeToSystemTime(&liCreationTime, &dir_entry->CreationDateTime, dir_entry->CreationTimeTenMs); ftCreationTime.dwHighDateTime = liCreationTime.HighPart; @@ -311,10 +291,8 @@ static BOOL ExtractMSDOS(const char* path) { char dllname[MAX_PATH] = "C:\\Windows\\System32"; int i, j; - BOOL r = TRUE; - HMODULE hDLL; - HGLOBAL hRes; - HRSRC hDiskImage; + BOOL r = FALSE; + HMODULE hDLL = NULL; char locale_path[MAX_PATH]; char* extractlist[] = { "MSDOS SYS", "COMMAND COM", "IO SYS", "MODE COM", "KEYB COM", "KEYBOARDSYS", "KEYBRD2 SYS", "KEYBRD3 SYS", "KEYBRD4 SYS", @@ -322,7 +300,7 @@ static BOOL ExtractMSDOS(const char* path) // Reduce the visible mess by placing all the locale files into a subdir safe_strcpy(locale_path, sizeof(locale_path), path); - safe_strcat(locale_path, sizeof(locale_path), "\\LOCALE"); + safe_strcat(locale_path, sizeof(locale_path), "LOCALE\\"); CreateDirectoryA(locale_path, NULL); GetSystemDirectoryA(dllname, sizeof(dllname)); @@ -330,31 +308,20 @@ static BOOL ExtractMSDOS(const char* path) hDLL = LoadLibraryA(dllname); if (hDLL == NULL) { uprintf("Unable to open %s: %s\n", dllname, WindowsErrorString()); - return FALSE; + goto out; } - hDiskImage = FindResourceA(hDLL, MAKEINTRESOURCEA(1), "BINFILE"); - if (hDiskImage == NULL) { - uprintf("Unable to locate disk image in %s: %s\n", dllname, WindowsErrorString()); - FreeLibrary(hDLL); - return FALSE; - } - hRes = LoadResource(hDLL, hDiskImage); - if (hRes != NULL) - DiskImage = (BYTE*)LockResource(hRes); - if ((hRes == NULL) || (DiskImage == NULL) ){ - uprintf("Unable to access disk image in %s: %s\n", dllname, WindowsErrorString()); - FreeLibrary(hDLL); - return FALSE; - } - DiskImageSize = (size_t)SizeofResource(hDLL, hDiskImage); + + DiskImage = (BYTE*)GetResource(hDLL, MAKEINTRESOURCEA(1), "BINFILE", "disk image", &DiskImageSize, TRUE); + if (DiskImage == NULL) + goto out; + // Sanity check if (DiskImageSize < 700*1024) { uprintf("MS-DOS disk image is too small (%d bytes)\n", dllname, DiskImageSize); - FreeLibrary(hDLL); - return FALSE; + goto out; } - for (i=0; r && iidEntries[i].nID), RT_ICON); + res = FindResourceA(hMainInstance, MAKEINTRESOURCEA(icondir->idEntries[i].nID), _RT_ICON); // Write the DWORD offset if ( (!WriteFile(hFile, &offset, sizeof(offset), &Size, NULL)) || (Size != sizeof(offset)) ) { uprintf("Couldn't write ICONDIRENTRY[%d] offset: %s.\n", i, WindowsErrorString()); @@ -142,7 +132,7 @@ static BOOL SaveIcon(const char* filename) } for (i=0; iidCount; i++) { // Write icon data - res = FindResource(hMainInstance, MAKEINTRESOURCE(icondir->idEntries[i].nID), RT_ICON); + res = FindResourceA(hMainInstance, MAKEINTRESOURCEA(icondir->idEntries[i].nID), _RT_ICON); res_handle = LoadResource(NULL, res); res_data = (BYTE*)LockResource(res_handle); res_size = SizeofResource(NULL, res); @@ -170,7 +160,7 @@ BOOL SetAutorun(const char* path) char filename[64]; wchar_t wlabel[128], wRufusVersion[32]; - safe_sprintf(filename, sizeof(filename), "%s\\autorun.inf", path); + safe_sprintf(filename, sizeof(filename), "%sautorun.inf", path); fd = fopen(filename, "r"); // If there's an existing autorun, don't overwrite if (fd != NULL) { uprintf("%s already exists - keeping it\n", filename); diff --git a/src/rufus.c b/src/rufus.c index f737db35..027d3643 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -987,9 +987,9 @@ DWORD WINAPI ISOScanThread(LPVOID param) uprintf(" With an old %s: %s\n", old_c32_name[i], iso_report.has_old_c32[i]?"Yes":"No"); } } - if ((!iso_report.has_bootmgr) && (!iso_report.has_isolinux) && (!IS_WINPE(iso_report.winpe))) { + if ((!iso_report.has_bootmgr) && (!iso_report.has_isolinux) && (!IS_WINPE(iso_report.winpe)) && (!iso_report.has_efi)) { MessageBoxU(hMainDialog, "This version of Rufus only supports bootable ISOs\n" - "based on 'bootmgr/WinPE' or 'isolinux'.\n" + "based on 'bootmgr/WinPE', 'isolinux' or EFI boot.\n" "This ISO image doesn't appear to use either...", "Unsupported ISO", MB_OK|MB_ICONINFORMATION); safe_free(iso_path); SetMBRProps(); @@ -1061,6 +1061,14 @@ void MoveControl(int nID, float vertical_shift) (rect.right - rect.left), (rect.bottom - rect.top), TRUE); } +void SetPassesTooltip(void) +{ + char passes_tooltip[32]; + safe_strcpy(passes_tooltip, sizeof(passes_tooltip), "Pattern: 0x55, 0xAA, 0xFF, 0x00"); + passes_tooltip[13 + ComboBox_GetCurSel(hNBPasses)*6] = 0; + CreateTooltip(hNBPasses, passes_tooltip, -1); +} + // Toggle "advanced" mode void ToggleAdvanced(void) { @@ -1100,6 +1108,61 @@ void ToggleAdvanced(void) SendMessage(GetDlgItem(hMainDialog, IDC_ADVANCED), BCM_SETIMAGELIST, 0, (LPARAM)(advanced_mode?&bi_up:&bi_down)); } +static BOOL BootCheck(void) +{ + int fs, bt; + + if (ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType)) == DT_ISO) { + if (iso_path == NULL) { + MessageBoxA(hMainDialog, "Please click on the disc button to select a bootable ISO,\n" + "or uncheck the \"Create a bootable disk...\" checkbox.", + "No ISO image selected...", MB_OK|MB_ICONERROR); + return FALSE; + } + if ((iso_size_check) && (iso_report.projected_size > (uint64_t)SelectedDrive.DiskSize)) { + MessageBoxA(hMainDialog, "This ISO image is too big " + "for the selected target.", "ISO image too big...", MB_OK|MB_ICONERROR); + return FALSE; + } + fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem)); + bt = GETBIOSTYPE((int)ComboBox_GetItemData(hPartitionScheme, ComboBox_GetCurSel(hPartitionScheme))); + if (bt == BT_UEFI) { + if (!IS_EFI(iso_report)) { + MessageBoxA(hMainDialog, "When using UEFI Target Type, only EFI bootable ISO images are supported. " + "Please select an EFI bootable ISO or set the Target Type to BIOS.", "Unsupported ISO...", MB_OK|MB_ICONERROR); + return FALSE; + } else if (fs > FS_FAT32) { + MessageBoxA(hMainDialog, "When using UEFI Target Type, only FAT/FAT32 is supported. " + "Please select FAT/FAT32 as the File system or set the Target Type to BIOS.", "Unsupported filesystem...", MB_OK|MB_ICONERROR); + return FALSE; + } + } else if ((fs == FS_NTFS) && (!iso_report.has_bootmgr) && (!IS_WINPE(iso_report.winpe))) { + if (iso_report.has_isolinux) { + MessageBoxA(hMainDialog, "Only FAT/FAT32 is supported for this type of ISO. " + "Please select FAT/FAT32 as the File system.", "Unsupported filesystem...", MB_OK|MB_ICONERROR); + } else { + MessageBoxA(hMainDialog, "Only 'bootmgr' or 'WinPE' based ISO " + "images can currently be used with NTFS.", "Unsupported ISO...", MB_OK|MB_ICONERROR); + } + return FALSE; + } else if (((fs == FS_FAT16)||(fs == FS_FAT32)) && (!iso_report.has_isolinux)) { + MessageBoxA(hMainDialog, "FAT/FAT32 can only be used for isolinux based ISO images " + "or when the Target Type is UEFI.", "Unsupported ISO...", MB_OK|MB_ICONERROR); + return FALSE; + } + if ((bt == BT_UEFI) && (iso_report.has_win7_efi) && (!WimExtractCheck())) { + if (MessageBoxA(hMainDialog, "Your platform cannot extract files from WIM archives. WIM extraction " + "is required to create EFI bootable Windows 7 and Windows Vista USB drives. You can fix that " + "by installing a recent version of 7-Zip.\r\nDo you want to visit the 7-zip download page?", + "Missing WIM support...", MB_YESNO|MB_ICONERROR) == IDYES) + ShellExecuteA(hMainDialog, "open", SEVENZIP_URL, NULL, NULL, SW_SHOWNORMAL); + return FALSE; + } + } + return TRUE; +} + + void InitDialog(HWND hDlg) { HINSTANCE hDllInst; @@ -1161,12 +1224,12 @@ void InitDialog(HWND hDlg) // Use maximum granularity for the progress bar SendMessage(hProgress, PBM_SETRANGE, 0, (MAX_PROGRESS<<16) & 0xFFFF0000); // Fill up the passes - IGNORE_RETVAL(ComboBox_AddStringU(hNBPasses, "1 Pass")); - IGNORE_RETVAL(ComboBox_AddStringU(hNBPasses, "2 Passes")); - IGNORE_RETVAL(ComboBox_AddStringU(hNBPasses, "3 Passes")); - IGNORE_RETVAL(ComboBox_AddStringU(hNBPasses, "4 Passes")); + for (i=0; i<4; i++) { + safe_sprintf(tmp, sizeof(tmp), "%d Pass%s", i+1, (i==0)?"":"es"); + IGNORE_RETVAL(ComboBox_AddStringU(hNBPasses, tmp)); + } IGNORE_RETVAL(ComboBox_SetCurSel(hNBPasses, 1)); - CreateTooltip(hNBPasses, "Pattern: 0x55, 0xAA", -1); + SetPassesTooltip(); // Fill up the DOS type dropdown IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "MS-DOS"), DT_WINME)); IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "FreeDOS"), DT_FREEDOS)); @@ -1380,20 +1443,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA case IDC_NBPASSES: if (HIWORD(wParam) != CBN_SELCHANGE) break; - switch(ComboBox_GetCurSel(hNBPasses)) { - case 0: - CreateTooltip(hNBPasses, "Pattern: 0x55", -1); - break; - case 1: - CreateTooltip(hNBPasses, "Pattern: 0x55, 0xAA", -1); - break; - case 2: - CreateTooltip(hNBPasses, "Pattern: 0x55, 0xAA, 0xFF", -1); - break; - case 3: - CreateTooltip(hNBPasses, "Pattern: 0x55, 0xAA, 0xFF, 0x00", -1); - break; - } + SetPassesTooltip(); break; case IDC_PARTITION_SCHEME: case IDC_FILESYSTEM: @@ -1522,55 +1572,8 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA selection_default = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType)); nDeviceIndex = ComboBox_GetCurSel(hDeviceList); if (nDeviceIndex != CB_ERR) { - if (IsChecked(IDC_BOOT)) { - if (ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType)) == DT_ISO) { - if (iso_path == NULL) { - MessageBoxA(hMainDialog, "Please click on the disc button to select a bootable ISO,\n" - "or uncheck the \"Create a bootable disk...\" checkbox.", - "No ISO image selected...", MB_OK|MB_ICONERROR); - break; - } - if ((iso_size_check) && (iso_report.projected_size > (uint64_t)SelectedDrive.DiskSize)) { - MessageBoxA(hMainDialog, "This ISO image is too big " - "for the selected target.", "ISO image too big...", MB_OK|MB_ICONERROR); - break; - } - fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem)); - bt = GETBIOSTYPE((int)ComboBox_GetItemData(hPartitionScheme, ComboBox_GetCurSel(hPartitionScheme))); - if (bt == BT_UEFI) { - if (!IS_EFI(iso_report)) { - MessageBoxA(hMainDialog, "When using UEFI Target Type, only EFI bootable ISO images are supported. " - "Please select an EFI bootable ISO or set the Target Type to BIOS.", "Unsupported ISO...", MB_OK|MB_ICONERROR); - break; - } else if (fs > FS_FAT32) { - MessageBoxA(hMainDialog, "When using UEFI Target Type, only FAT/FAT32 is supported. " - "Please select FAT/FAT32 as the File system or set the Target Type to BIOS.", "Unsupported filesystem...", MB_OK|MB_ICONERROR); - break; - } - } else if ((fs == FS_NTFS) && (!iso_report.has_bootmgr) && (!IS_WINPE(iso_report.winpe))) { - if (iso_report.has_isolinux) { - MessageBoxA(hMainDialog, "Only FAT/FAT32 is supported for this type of ISO. " - "Please select FAT/FAT32 as the File system.", "Unsupported filesystem...", MB_OK|MB_ICONERROR); - } else { - MessageBoxA(hMainDialog, "Only 'bootmgr' or 'WinPE' based ISO " - "images can currently be used with NTFS.", "Unsupported ISO...", MB_OK|MB_ICONERROR); - } - break; - } else if (((fs == FS_FAT16)||(fs == FS_FAT32)) && (!iso_report.has_isolinux)) { - MessageBoxA(hMainDialog, "FAT/FAT32 can only be used for isolinux based ISO images " - "or when the Target Type is UEFI.", "Unsupported ISO...", MB_OK|MB_ICONERROR); - break; - } - if ((bt == BT_UEFI) && (iso_report.has_win7_efi) && (!WimExtractCheck())) { - if (MessageBoxA(hMainDialog, "Your platform cannot extract files from WIM archives. WIM extraction " - "is required to create EFI bootable Windows 7 and Windows Vista USB drives. You can fix that " - "by installing a recent version of 7-Zip.\r\nDo you want to visit the 7-zip download page?", - "Missing WIM support...", MB_YESNO|MB_ICONERROR) == IDYES) - ShellExecuteA(hDlg, "open", SEVENZIP_URL, NULL, NULL, SW_SHOWNORMAL); - break; - } - } - } + if ((IsChecked(IDC_BOOT)) && (!BootCheck())) + break; GetWindowTextW(hDeviceList, wtmp, ARRAYSIZE(wtmp)); _snwprintf(wstr, ARRAYSIZE(wstr), L"WARNING: ALL DATA ON DEVICE %s\r\nWILL BE DESTROYED.\r\n" L"To continue with this operation, click OK. To quit click CANCEL.", wtmp); @@ -1656,6 +1659,11 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA return (INT_PTR)FALSE; } +static void PrintStatus2000(const char* str, BOOL val) +{ + PrintStatus(2000, FALSE, "%s %s.", str, (val)?"enabled":"disabled"); +} + /* * Application Entrypoint */ @@ -1744,7 +1752,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine // the target USB drive. If this is enabled, the size check is disabled. if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'S')) { iso_size_check = !iso_size_check; - PrintStatus(2000, FALSE, "ISO size check %s.", iso_size_check?"enabled":"disabled"); + PrintStatus2000("ISO size check", iso_size_check); continue; } // Alt-F => Toggle detection of fixed disks @@ -1753,7 +1761,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine // drive instead of an USB key. If this is enabled, Rufus will allow fixed disk formatting. if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'F')) { enable_fixed_disks = !enable_fixed_disks; - PrintStatus(2000, FALSE, "Fixed disks detection %s.", enable_fixed_disks?"enabled":"disabled"); + PrintStatus2000("Fixed disks detection", enable_fixed_disks); GetUSBDevices(0); continue; } @@ -1771,7 +1779,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine // it back during the bad block check. if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'K')) { detect_fakes = !detect_fakes; - PrintStatus(2000, FALSE, "Fake drive detection %s.", detect_fakes?"enabled":"disabled"); + PrintStatus2000("Fake drive detection", detect_fakes); continue; } // Alt-R => Remove all the registry keys created by Rufus diff --git a/src/rufus.h b/src/rufus.h index 0af8635a..e552dbff 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -293,6 +293,7 @@ extern BOOL CreateProgress(void); extern BOOL SetAutorun(const char* path); extern char* FileDialog(BOOL save, char* path, char* filename, char* ext, char* ext_desc); extern BOOL FileIO(BOOL save, char* path, char** buffer, DWORD* size); +extern unsigned char* GetResource(HMODULE module, char* name, char* type, const char* desc, DWORD* len, BOOL duplicate); extern BOOL SetLGP(BOOL bRestore, BOOL* bExistingKey, const char* szPath, const char* szPolicy, DWORD dwValue); extern LONG GetEntryWidth(HWND hDropDown, const char* entry); extern BOOL DownloadFile(const char* url, const char* file, HWND hProgressDialog); @@ -393,3 +394,8 @@ typedef struct { #ifndef PBM_SETMARQUEE #define PBM_SETMARQUEE (WM_USER+10) #endif + +/* Why oh why does Microsoft has to make everybody suffer with their braindead use of Unicode */ +#define _RT_ICON MAKEINTRESOURCEA(3) +#define _RT_RCDATA MAKEINTRESOURCEA(10) +#define _RT_GROUP_ICON MAKEINTRESOURCEA((ULONG_PTR)(MAKEINTRESOURCEA(3) + 11)) diff --git a/src/rufus.rc b/src/rufus.rc index a14a4431..e6cff99d 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.3.2.228" +CAPTION "Rufus v1.3.2.229" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -274,8 +274,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,2,228 - PRODUCTVERSION 1,3,2,228 + FILEVERSION 1,3,2,229 + PRODUCTVERSION 1,3,2,229 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -292,13 +292,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.3.2.228" + VALUE "FileVersion", "1.3.2.229" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "(c) 2011-2012 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.3.2.228" + VALUE "ProductVersion", "1.3.2.229" END END BLOCK "VarFileInfo" diff --git a/src/stdfn.c b/src/stdfn.c index 8bfaf718..c22dfa01 100644 --- a/src/stdfn.c +++ b/src/stdfn.c @@ -231,6 +231,40 @@ out: return ret; } +unsigned char* GetResource(HMODULE module, char* name, char* type, const char* desc, DWORD* len, BOOL duplicate) +{ + HGLOBAL res_handle; + HRSRC res; + unsigned char* p = NULL; + + res = FindResourceA(module, name, type); + if (res == NULL) { + uprintf("Unable to locate resource '%s': %s\n", desc, WindowsErrorString()); + goto out; + } + res_handle = LoadResource(module, res); + if (res_handle == NULL) { + uprintf("Unable to load resource '%s': %s\n", desc, WindowsErrorString()); + goto out; + } + *len = SizeofResource(module, res); + + if (duplicate) { + p = (unsigned char*)malloc(*len); + if (p == NULL) { + uprintf("Unable to allocate ldlinux.sys resource\n"); + goto out; + } + memcpy(p, LockResource(res_handle), *len); + } else { + p = (unsigned char*)LockResource(res_handle); + } + +out: + return p; +} + + /* * Set or restore a Local Group Policy DWORD key indexed by szPath/SzPolicy */ diff --git a/src/syslinux.c b/src/syslinux.c index 404fec89..d8e50e87 100644 --- a/src/syslinux.c +++ b/src/syslinux.c @@ -35,9 +35,9 @@ #include "setadv.h" unsigned char* syslinux_ldlinux = NULL; -unsigned int syslinux_ldlinux_len; +DWORD syslinux_ldlinux_len; unsigned char* syslinux_bootsect = NULL; -unsigned int syslinux_bootsect_len; +DWORD syslinux_bootsect_len; /* * Wrapper for ReadFile suitable for libfat @@ -73,8 +73,6 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name) DWORD bytes_read; DWORD bytes_written; BOOL r = FALSE; - HGLOBAL res_handle; - HRSRC res; static unsigned char sectbuf[SECTOR_SIZE]; static char ldlinux_name[] = "?:\\ldlinux.sys"; @@ -91,43 +89,14 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name) /* Initialize the ADV -- this should be smarter */ syslinux_reset_adv(syslinux_adv); - /* Access ldlinux.sys resource */ - res = FindResource(hMainInstance, MAKEINTRESOURCE(IDR_SL_LDLINUX_SYS), RT_RCDATA); - if (res == NULL) { - uprintf("Unable to locate ldlinux.sys resource: %s\n", WindowsErrorString()); + /* Access a copy of the ldlinux.sys & ldlinux.bss resources */ + syslinux_ldlinux = GetResource(hMainInstance, MAKEINTRESOURCEA(IDR_SL_LDLINUX_SYS), + _RT_RCDATA, "ldlinux.sys", &syslinux_ldlinux_len, TRUE); + syslinux_bootsect = GetResource(hMainInstance, MAKEINTRESOURCEA(IDR_SL_LDLINUX_BSS), + _RT_RCDATA,"ldlinux.bss", &syslinux_bootsect_len, TRUE); + if ((syslinux_ldlinux == NULL) || (syslinux_bootsect == NULL)) { goto out; } - res_handle = LoadResource(NULL, res); - if (res_handle == NULL) { - uprintf("Unable to load ldlinux.sys resource: %s\n", WindowsErrorString()); - goto out; - } - syslinux_ldlinux_len = SizeofResource(NULL, res); - syslinux_ldlinux = (unsigned char*)malloc(syslinux_ldlinux_len); - if (syslinux_ldlinux == NULL) { - uprintf("Unable to allocate ldlinux.sys resource\n"); - goto out; - } - memcpy(syslinux_ldlinux, LockResource(res_handle), syslinux_ldlinux_len); - - /* Access ldlinux.bss resource */ - res = FindResource(hMainInstance, MAKEINTRESOURCE(IDR_SL_LDLINUX_BSS), RT_RCDATA); - if (res == NULL) { - uprintf("Unable to locate ldlinux.bss resource: %s\n", WindowsErrorString()); - goto out; - } - res_handle = LoadResource(NULL, res); - if (res_handle == NULL) { - uprintf("Unable to load ldlinux.bss resource: %s\n", WindowsErrorString()); - goto out; - } - syslinux_bootsect_len = SizeofResource(NULL, res); - syslinux_bootsect = (unsigned char*)malloc(syslinux_bootsect_len); - if (syslinux_bootsect == NULL) { - uprintf("Unable to allocate ldlinux.bss resource\n"); - goto out; - } - memcpy(syslinux_bootsect, LockResource(res_handle), syslinux_bootsect_len); /* Create ldlinux.sys file */ f_handle = CreateFileA(ldlinux_name, GENERIC_READ | GENERIC_WRITE, diff --git a/src/syslinux/libinstaller/syslinux.h b/src/syslinux/libinstaller/syslinux.h index a4832b59..21360654 100644 --- a/src/syslinux/libinstaller/syslinux.h +++ b/src/syslinux/libinstaller/syslinux.h @@ -13,17 +13,18 @@ #ifndef SYSLINUX_H #define SYSLINUX_H +#include #include #include "advconst.h" #include "setadv.h" /* The standard boot sector and ldlinux image */ extern unsigned char* syslinux_bootsect; -extern unsigned int syslinux_bootsect_len; +extern DWORD syslinux_bootsect_len; extern const int syslinux_bootsect_mtime; extern unsigned char* syslinux_ldlinux; -extern unsigned int syslinux_ldlinux_len; +extern DWORD syslinux_ldlinux_len; extern const int syslinux_ldlinux_mtime; #define boot_sector syslinux_bootsect