From 12b2af3a1cf2e5f94f60c0adbbde6080a247f892 Mon Sep 17 00:00:00 2001 From: OmniaX-Dev Date: Sun, 7 Sep 2025 08:04:14 +0200 Subject: [PATCH] Changed Utils::md5 function --- .vscode/c_cpp_properties.json | 6 +- .vscode/settings.json | 4 +- CMakeLists.txt | 3 +- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++ build.nr | 2 +- compile | 2 +- extra/testMidiFile.mid | Bin 0 -> 12799 bytes src/ostd/Utils.cpp | 20 - src/ostd/Utils.hpp | 7 + src/ostd/md5.cpp | 222 +++++++++++ src/test.cpp | 6 +- 11 files changed, 919 insertions(+), 27 deletions(-) create mode 100644 LICENSE.txt create mode 100644 extra/testMidiFile.mid create mode 100644 src/ostd/md5.cpp diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index ad72a72..1d747cb 100755 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,7 +3,8 @@ { "name": "Linux", "includePath": [ - "${default}" + "${default}", + "${workspaceFolder}/src" ], "defines": [], "compilerPath": "/usr/bin/clang++", @@ -14,7 +15,8 @@ { "name": "Windows", "includePath": [ - "${default}" + "${default}", + "${workspaceFolder}/src" ], "defines": [], "compilerPath": "C:\\msys64\\ucrt64\\bin\\clang++", diff --git a/.vscode/settings.json b/.vscode/settings.json index 74a5cc5..e6135e3 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -99,7 +99,9 @@ "format": "cpp", "stdfloat": "cpp", "*.inc": "cpp", - "text_encoding": "cpp" + "text_encoding": "cpp", + "flat_map": "cpp", + "flat_set": "cpp" }, "workbench.editorAssociations": { "*.bin": "hexEditor.hexedit" diff --git a/CMakeLists.txt b/CMakeLists.txt index dce1209..74839b8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ cmake_minimum_required(VERSION 3.18) project(${PROJ_NAME} LANGUAGES C CXX) set(CMAKE_BUILD_TYPE Debug) set(CMAKE_CXX_STANDARD 20) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) file(STRINGS "./build.nr" BUILD_NUMBER) #----------------------------------------------------------------------------------------- @@ -41,6 +42,7 @@ list(APPEND OSTD_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/src/ostd/Keyboard.cpp ${CMAKE_CURRENT_LIST_DIR}/src/ostd/Logger.cpp ${CMAKE_CURRENT_LIST_DIR}/src/ostd/Logic.cpp + ${CMAKE_CURRENT_LIST_DIR}/src/ostd/md5.cpp ${CMAKE_CURRENT_LIST_DIR}/src/ostd/OutputHandlers.cpp ${CMAKE_CURRENT_LIST_DIR}/src/ostd/PathFinder.cpp ${CMAKE_CURRENT_LIST_DIR}/src/ostd/QuadTree.cpp @@ -90,7 +92,6 @@ if (UNIX) target_link_libraries(${OMNIA_GFX_LIB} PUBLIC xcb xcb-randr) endif (UNIX) target_link_libraries(${OMNIA_GFX_LIB} PUBLIC SDL2main SDL2 SDL2_gfx SDL2_ttf SDL2_image) -target_link_libraries(${OMNIA_STD_LIB} PUBLIC ssl crypto) #----------------------------------------------------------------------------------------- #Finalize diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..f288702 --- /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/build.nr b/build.nr index c34a5b9..3964950 100644 --- a/build.nr +++ b/build.nr @@ -1 +1 @@ -1885 +1898 diff --git a/compile b/compile index 6427cb4..f80bdbb 100755 --- a/compile +++ b/compile @@ -45,7 +45,7 @@ elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then cp C:/msys64/ucrt64/bin/SDL2.dll ./Release/lib cp C:/msys64/ucrt64/bin/SDL2_image.dll ./Release/lib cp C:/msys64/ucrt64/bin/SDL2_ttf.dll ./Release/lib - cp C:/msys64/ucrt64/bin/SDL2_gfx.dll ./Release/lib + cp C:/msys64/ucrt64/bin/libSDL2_gfx-1-0-0.dll ./Release/lib mkdir -p ./Release/include/ostd/vendor mkdir -p ./Release/include/ogfx/ diff --git a/extra/testMidiFile.mid b/extra/testMidiFile.mid new file mode 100644 index 0000000000000000000000000000000000000000..c0e937c339e56cd675a12d4633529427d6a2a517 GIT binary patch literal 12799 zcmX|nSyLlRx1AW8rlFZ>=6R9?XaG@^D3vNDN)sxoO9(Ne0mMAh^gLB&RY?qe`rNd? zFYJ56abN7PpYKm__+R+lFMjv?=PgR-K6FH*kXB~y%-nmewNp-=99S%t8u(XH^*`m* zyK{?W=Kos$QPr9_-MhMee|S5znhHk4Ltf{cEyJ{`}SgESEZ&>~< zux$ybfA6P})?z!3O#STxwbtqTN`p3xt$Y8Wjk2voM2-3YW-kxW#-mKRrVi0MiJG-D zjAF0E45{YQkCoIj5_rb46y~un2IZTcN%Pv4{6 zd!BM5-J+u(jgkv2uC$g$X0;oE)s`YS*>d5-9n28ajV`KBmj4^A%%;2%hKN~4KJRX?P zhp}?n$)1viz`Oe|G&WK^5=T;jp;t?87uVf`V<*}gjalpQlG+`(>=Q4@7I!d6qhb)p zSS=Av%+uJ6vEd%|;@AvFQ~u-fwAZowW(NLW9Z(;_G|*MS4tSUrSSxcun%FC?E^zfU zL-~=3h^<+%k~og6k#K68H1eu;s^lJi!fz`B7IIGQvz^IlJ^%c-N-WrZ{=0@U!#=-N z1GKFnzwL38a_-5%@C*N-wv7YohCiC;l;X8H6*5BYo`J+1k#X``>wW%Ey~Xy+hh@r4 zMR_MV#)-@>bEsADYfn>DnP~`)P4mMY-a-8(4&L%I2mjrIYHHW;?Dcw z^2DyFyP-mw(M1zXYsK#ChdIjHQpl!dF?*sp(BgeB6=w#~U?=Y&Di(v&C_cqU9$uRm zn^^kMK^?A-u~|K2!kl5pXIR?2wGWNzb9jE6^rQSAuPJXM9gFoHs7ZSZr$k)L9wT{) zzy38(o%4exnzl_NK5f^;A=B8YYTn4^pWAd@sz7rCj8!|pj8v#YiC-5qG~ht(hg`FE zibJZ3a%6(r*BF|bEq3E|f5C4;-q4Y;x#ZkOoH{hhd4LS!k<5J)P4qt;;AA>Rg~>jq zD~uEC9aM4ZVa(*TgmBlX?CP&*!uscVXm}PUWSPc>Nd?zk*o5&4Z@K*a42_R8<5<2} zx^6Gv>;-UqhrFcLi8INe-I~kLUt#OPuh$ff9k6}cXUy)9cC__0NVx%zI71dt9n44E zy+qM4_wmtd&YG~)<2GKH2t^U|jsA9dr@}V)N9E;RzYn5F+f{Soi zz8Qq8LE5ob?Nq*WQCTDtSePje$d@na@???6%jcssWUcm%M`gh;v}Yi$WJvf%I(>Ob zR`qtO@WqpIK*nMCUU^X;!Aj=9j7up6Kh9H$^C5c|JKYB(>aW>T?F~v5SE=Y5M3Z)I zM7ze~nH81>oU0Sm96YeEa2{iJ=QGE-Q<(yo@IthGa$nMQLxSXN0|x*nzS zk_WTbhqBs4r9~G;^8F-@GdEbu6@S9u706a2Iv2R{YaBmp6~AenXrHWb2Op#?IiPa1 z_!;I!PR&shR8eZ(^M;x9RJ{(nugC(8@q zrkdyyU-ShghD7fKB-bj+^-jm)nux_jN8p{0yCCziW37?OO0m`)Y!sI8fi8!t+ylld zGi3TCT=Dlb;e80Qd^lihQ=+>#v7$FGpOFgof_zs_ztc5OBM$67hSypSX=JD=(9@N2 zZSk%8W+~-v1wNA_{*GLx(vwsfeq6OX2e5KdP6y;WO}bzZ`?Yza)jwWQ#$M&O>3+=Y zlAr$NhXD0EYB=kwfP-A)z!^#S)BW7>gWa5Sn%Z4+iCOX$Coi=cbJ9s{zjz#m4BpJU zOSkiYbR;rMeEQcp4O&MPuflh}^!6A{IQZ!k4=L7rq)*Z1@iVMU6;$f%Ym!~$2A~=O zmRh`=H-(7Ap6QV&&rk4GoieZiLvBsR=9} zox>R)q4Min%zY=F@)5~Xxg`n_Brf?qvC?HbIdeI>%xDZ!d60a>%POg*iU5Pi@5%*a z2)ix{aN`QFiexuCssyKXn8WE1dr3Bfhxb)9?hgs}SK?@6a8k42VCoQZLqt%?bX+R@ zwOgO56smRi>SJa^G&go%7LTEvyhqd88fK5kSG0B?qoT8kXI`Lw01{XG(MF!%d~7zS z*o~!AKXpuUv4}Bg!gOKB`=_6DezF!h^%$N{YYf_dnx<&5pPynDN3>PE7;lRme@2^m z{`ko(u$EQooYb}>i&}$;LPFTNtN9|ke@s%w+O;lq!<^EXIXBMH+uv_!XylG-pGO^f zTPbbKqFrL)4i9L`RmkJ@4gGtHd!_)E03eUJUnFM=ya{}TN7VaknizR(5L~@DneU;D zZC3Fla3ZZ=GyB?=@cv3U)(>dHVK{JNtFTQIcC9Vs@WwooT=yzYynQ?lsm29&Z7k5Z zRRb!sU3eGI|5aD*K<&tgG_IQrKqXNibWa~Cn%HKC^`DTuEhzhRLPe$v^>smtn#U;6 zEv|jw)F*Q*ETolsCXG^PUIbJU#-5)~K1r>BvfjN5vg zrEmgOog1i?XPm*o7g#wU)l{gx!NC*qQaC29^2JLo_f)3RA?k2+%Yna6&sXfYz8|B^ zf|Z}vZZN}>DgNpqMT5Z-^ZJ4L4PptZ51Z66+YJ+_2v`QO{Lx2a%wP1G$BvH=O>k(O zyaUc3e>Kh=J#EsUn*+p7%)gBVcS&C?`xK&j6L2vqK(N8SoVz z+AGme&>nw!X?(odXRYzPB4=27tF?PnZO<3f`1pyoM5QU?8cP>IsL}A6?Dly3?tGov zdyIA$e6n`qRf{e1iV>sI1e6RZ95e^e98{X+tu_srgJ>yiRiDxn&AnuudI-eK0#YBL z6nb5py#bABjlkcAP=MIDb-h~h6&6jLA?jh6h}UqKFilWb?}L;L#ZZvMaAbvCKvwBT zhxgwoO4Nv{J}wGJR#eF#@{V#JezjBE-gtRRvo!fuyEK6yVcBkgh0HNcei4e<+>PGr zUoE&OC%pE1t3*lr2q;ef?k;y_OQ!GLCPo)s*=e-x81wM!c@yb=o$|}IbMwp02oMS; zPip6`jJN!Y!aJ(0SBa~&eBT^i8JnTptX7A)STp}2B)%h6%ITxW1l^|grD1vXWjLuT z*skuIxKCA-nXCl;a}5++Z${T2wA(lOB7_ zd5zLB<%Oj5iYcQ3kEz?{ydFPMgnVo#*)K7@6JQh}@r=w!al-*bvQi9_Zr;}Kn}F@{ z9exwlYm}Av+XtE2#d;HWh{m_N!Yh93Op4q>T@ zThPmFw-CWxPGcjhr@_lw;ifnP%CB-!b}V>C&0kef#2BUMm-1R0UbtI8SuM1fUX7*= z`T1iDqS5$FV5!nOr$?WEq!t>1L?)t2d*HS>NF$!E*i2Pmq0vNa0l{LFGVNDkuV7@hndV___Uips|>ztj2%=V z@t4UwEFCn|=Z{Y$f*lsFt59aW_mw!l-y7O|^igp^m$7(o7`)MJP$W~BJ20+kgd^2h zJTVU8c9LGWKZQ@yImuG1os?4zWOs!JEo03S^LVPil29EM*kR3%*-fOJk?&~dfrD&N zA7+}x={~N}aAENhxa|%>T%PoXPcCU>;{LN4gDRkqot`035|L%2)}xjR2ZTebq7j!i zf}=;IKC-H}QLnvKaBnWT3hyDHSHcPDpz&EaL`z>lu_>O4khQ}%_63OSBozjw22X9`X*$n|R5-DcKhLP<6n6Ea(o@-vT zb^i(&xtp`spkeI|M)6hgHp6{;D6@z=Ix84MfLa54*o8f6qILvRhIzWg7-u6Ze(gN2Bw_AZwoqOb*AQ z^*EX*Z!c3{ z@(&d>Fy)9ixfH+4_Zka0vI>K#bUUOHZP9MHf`}|9Dp9qMi6Qa;$PzyhQ zqAmbK|9wmS3mwcD$zvw1pZH_==vnC1v3QY-#bl~KB zy(~>9z+8E(0H$2Q^ZE{EvgCCl`!AZP;tuE;@7a79JMHWV2h3PFgParx1WEI2&aAVGc6))Kp zQYm1^Z?L>aW|aeA;Z87h8zcLQ zw-d_;q&=i21&Q>-*;>Ke2jWtWwK@6bk}i*Glk)T%m)%*Odjg~@OO+^u4zyiKxuX)P65`qc`gu?jK0>)YA~D4a$Q+Wg%@Lo=&riU+Cl z0rJLol#6o*Ivm@W{uQt9B-helxs34bsc?z50eZoXN3!LsW;D}PR=>fiBx#^YH%a5w z3vG_B%x&Xj#8{!id|yIn1^=fTuUu;>DkJbk6LAnvaqc}F719o>@J{%o^~Mk3!g3FN zALun?Tf`nj0jLPtqtuxe2r(|esb-DlC=T#*u}b%)pkKf(dHGm z^@}m#fWOZUV`+be$_qvhuL4*y#@R_Qq5o79{_=8cuqUU ze7G`r`cTffd(<)39206laT}&8RezKOfSdAsj2X}v_T@)BdTQbmFcZ%gt=BjHHGV|GaJ-6XEFBdkih2gUy|uDq-q&k@=-a&T zooF-OFU2I4<}@&{wusFfbPy^Zn3)n&V|8ezH==62(5!eIr|eWGVssU9!3MZ?@2Th) z&`c-n^*S(wFxtE1)+FinzFbg_7^U(9r|zSsoof98q!o z6;isnh<1dkj4g+3AP;5u*0BHaXiCUWXHFzdScj^5YxIM8;4` zp9W&99f7CP5zgGAO<>_@s5|U_$@{G$uWe$nu`7H)n$cE{zkV2_Q)^X`L{&UlzH3Gc zp1LG|9i}`m`)c+rNCEKUtYD)2h{XHj`2tX|$Scmn3OtGFl~Oz z2WrnO#Me7OyyVPfRzl(Z(*{CiAf6*Llwmr<%N?=QCjmi|Nm$pSOw#BGpM8w&8MhSq z2V-bD%)Dk8qvW3%qv5k@6eClyY#~U|Y)x>njbE&cCv8CY>u~Ul)blru@uRu$Nh=b8 zA_XP09$6Y`Bt9VoUUG9r#+-<;hq<4+GmnI@ngvwK1WlLfL;Tx`FUZp~FH)@Jwg8Tt5{Z#wZrAHE_nb z!gNFcDk|<7UMjgs3htD_NGj+k>*R`wO1@DAY2{Sg0+;xYMvAN)JFa(w<=D*Thze}K zorY)n#hG5z736yKAvgrYiopAUD(VX#kJ89kvD?Jc+No#ab#$Iw;z;7_^Jl7FjXfJA z22lcf9XdumS-kEyB@f8h2>pc(RKR`Xv z4%t)vC0e?#1JeNr@gVBg8z7zJ(e@^%-kW=13Da4dF=Nh~aCr7kyDqVPNT#Y@LD}(I z%tEn6yCzw->7HQL%lFv<@VmYGj**;}SFDpP}A53we5>a1qAb@&t^sJq-UN6{I zuV@TuKfq}t$ALrgjxGg2&&9S1(2MP<6@B#qwjVEj8>TS@EWW@|x0usFoZZC^h>yx! zh4OG@7#Ke=Qgx9oCp42AsL#zdO`r+sKFInLfrSobo7CY%LbEP|1py7uZ^~IEUE6<) z12@p(3oO>B)?Y-#5IZTM1tUJgt7Ld>+e?+yFixH6chH;Rp~a9YpOZMXCpwcG zKy=QuGNaU9ft&tk2$JNYKWjE7%&z3FRuVBlDD!}FUrm_}H?Qbca8CV@ZJYR&M`(xccJe|+kY~L-u*2Yo6aGC3 zdew*Wq)xH2RZX2}Le7&)hXbmfBlZ_XS_2wV>?_e{EbnVmRE~VZN`!#92>X?)7yJmz zC&UTo5>S>t$m=he{A`KYzn2$F4Rq2kq&wyPG*#l{t-REPm1V6B;sGtw6!8OVya_R@ z5R56xP1g!zO9}&)dQPG%9Ya`9S3^I+j1RA4?n~3k4Os^IKMQsc^b!Q(b|F%3guS9N zO9D!wz2wWE%hziz)yy8MVFjsC7@|tv&-%Q<5Hu^4gF$Gk><882TN+p1h~8Jhg$lu? zGr-!Lf_LytK-Jm!v_5O@7&MfWA@`DAvNIscWC6QXpbhNi6jTiGHm$y#LTk1$2?L1ym7`hH3B9q0$p zj%}i$Kmd7aITn(9=qurnIL=*>A-c8&d1C!o>sZ?=npfUZLr0dIQmchF6SxUvfRU!F zjM0o!%qNc5a6h^4v8%>1j7$;f5E9pWep=viY93oYvRNg3D-_l5< zJ{g_k!Knl9X=yEbKqjD-PR3(_Ax_jTmqxUH96P$A@zF!PlsDeQkG@i6p}@-#jl+tf z`5^7}P{|AFTfVe`i&H0kEKX4C?1U5{C9e;z0rUc_YN`EF5l|lyMeHE!($7mxk{gKr z4&}xM#Q7i^AWK->Y(^I(4Xyh!MZTmSUOzV1s{sWo^)1olBHN}}F?&dkqy)%`%u|?( zBmG>12lYUi5)THD_XqdmkDuTiH9Y^;QU`X2!C~uB$i(`Sg)+D5?V9!3;I1KsRD0D? zpYmh{^tR9p>GrvZ7l-av(3$G9KAAP!0yoHGuaSMQT4++Xn^0h_!?XtFBV&q63k_(J z)cAV4y_G*W$&BNIGOT|l5rf`Cmxg`G2cyTsuP{&R2M<0 zpJ18SC#}ar@KHlReOjmN=rnTa?eH80%;U_1gL2kpWN#F`8kEoww4pcqq2;WY5YWGN z8D)b^gZicx6X24yK-l3boRDR-4q+5som~G{)CkE_TqQ$jZj#$Hb`-W)>R7je(oY@&lZ-^OD( zagiZS%fqQ7 z@_8MNd;HL}Gb*UmOSW))Pwxi)8K9oox($((G7m&eUxjd!lE8%14o%$k#0G0^LEy-O z!K%%n@YBIYNB_FdOVP|=3bl!|VYAhKrFEk%qbU`?;BF{rd1=n$y#*K`>_)~+YBqrW zS1?~J;*Jv<1Q?%73!hk)&b8<;2FRIu%ass zy8AAOWSm66@qCBeRaj0F@PQpREM>ZA+}p$r7QVsj18odkTabZ~*Wg0>xG#kcX}w^h zQbNzdH}CJLW4U4{Z8mW%#!YE?s)8Lif3MkLhUiw##dv|H-fuwTL*GYRK+HD0_tkg{ zx>z*0(8-%0bErWP&=qovSIsd>x~b z3?%ix&#xY3DC3(%k*?$hgn&8HRJ5fJCB?^Tir(;?wKe3mt!%=}mz8q~0;s@s&vQS2 zl|_679r3(a*(#U{PlXQo$o^xFCT2@^&0)ct*w$Al;~Er1SAsJ@nC10}#AZa;A-nKG z1jxQ}P^_gPn}Zwg7wpZ-+eh&1_OuEZ=}>Gs=?>ozSzdS)+80kR66+VYYdEXqog9zP` zFDQTOyU-CFD&U6FMj=AI{X@v!;hS8OLO^llOEQJh7rw)ocTc+l_mixbOoDGzvJ~{m6w63N*m)CmjH|X9Clzse3#XuwH_My@PJal$0?&cs}oA#h(l6sW= z*|^?;XOHhplnU&*{Ew!JwwzMWnqJCo5F}`3c+^5IMcFoX6>b50afrSbcc_@DMw>lc z9DLIyZ4Ek%Eojffoju0s&}qGNSP~$mM6wOxF10uSshGji;UCS^CwGT(jb7htkKOnL z;Kc6BDDVz*f<}_-ICQDQgRyuwj;QcH3kkzMFX@eJ^+Gm)0e{laT7|a`9)Lu4NXVNJ ze2dWE2XZb(iy;qmMGjxV)?ZPd?WK1Dt9u8#mIEUgzlM4!pD2e65SV54~RX zJv4=XY;0(?bStfI;H|6I)T#`ai|(L1N5-{dypQmWiC(3OcQUmVRQnw_)ttMY<54scQy?0v_OX7U47Yr)R#`=-?sZ+8FJ2+d~tolA|Y8>X_i z7^je!D$UjEdw4bfK6~(RMl+lC`#v9j5L zydiG-PbjV5$5yV$VERTtAGH?l({C5u-D*rETU>l8RY4IcR6VbroMP9d9^K8hCszJ# zitg;RC~w0-rjDI`?8CvWL3p!Qvy-qYyT1?U`o^oce_9Anis*Haf9S#D_RHWk;p2JI zz5Z@hP-)570_+Ov78q&y)yCd)V-wD*J_C}Uf%DRo->lz=4Y3P;gN!$J+w+$XFW~8pAEn7p{^q~VP)DkyTT9pA_IdKg0hEfrRZxDZ zdMnp1?{uPIBQyLbQ1g7@6+Dj3A*rw^LrZ3hee%&HNU{+4EJ=Qw+0 zbkdxs2WPg7E}9-RB3bt$P9Krs+<~@1Gp?`j6@5Ij>7ltvT}Y4XCt243PT!DR?igH+ zj2(>3>=9(nTzDO4R`gn$p4R8Gvm5Z8`P{yy00w!9v&UKk%?V>Tv#q;mdQ#iSI^iqn zR4%Xe(aa1OG1_I({Alk)=j!_`gS^ZNIWz%2Uj$EOkA0*4w{Q-r|D@e zly!lEN#}QS*T5+<40(sMXF$z!OS3qWgr|tdBl2)8M?oGcVoiyVmKXLYi*kQVr zux6+NX@|C)b@4cNxeBYAgs*6oI19cBOr{fOHlYENhH{W~+~M?TG?D&PSbYnD(ifY)7Spo3E82US1mtROn033n_E2y?@qnh zIl14V>)c1Ywf8u%e%nho2L9=Ns#71w8$aR2OwtN5N$vg(vS-h40Vi^k$@Dah_5E`) z?$$1GY@hh!$N%GoTH9(wU$4ZN71&bPd%hPBTP04=4_3{K2y=_2y}wD&CY*Q9z@dsH z$vT%W%M7FL`TM}d#neL&*y&Jx&O1R3x;;}myh8i_YfPFV+rT5a$P7G7^X&b;2K89u zw1Y~BgvP|+DyJ3%W&Ota<^IOJK4akiy_BMixTsH*uTM3$ri~ML;M~S}sTPjb3jGF4!~Fz)hUY2gR2k4}-O_xe$OTMjqv5$g|8phOcaCz- z`p7)EPo7+{OPu&4OP$WB;&GN7q8e`bsa5HJx&?~cLveY@!~(7(~YG8*8`9@xM$^cA)|-R9c5S jojs static String md5(const String& str); //Implemented in @@ -221,6 +223,11 @@ namespace ostd free(array); } + private: + static void transform(const uint8_t block[64], uint32_t state[4]); + static void encode(uint8_t* output, const uint32_t* input, size_t len); + static void decode(uint32_t* output, const uint8_t* input, size_t len); + private: inline static uint64_t s_startTime_ms; }; diff --git a/src/ostd/md5.cpp b/src/ostd/md5.cpp new file mode 100644 index 0000000..af998bb --- /dev/null +++ b/src/ostd/md5.cpp @@ -0,0 +1,222 @@ +#include +#include +#include +#include +#include + +#include "Utils.hpp" + +// Rotation amounts +namespace { + constexpr uint32_t S11 = 7; + constexpr uint32_t S12 = 12; + constexpr uint32_t S13 = 17; + constexpr uint32_t S14 = 22; + constexpr uint32_t S21 = 5; + constexpr uint32_t S22 = 9; + constexpr uint32_t S23 = 14; + constexpr uint32_t S24 = 20; + constexpr uint32_t S31 = 4; + constexpr uint32_t S32 = 11; + constexpr uint32_t S33 = 16; + constexpr uint32_t S34 = 23; + constexpr uint32_t S41 = 6; + constexpr uint32_t S42 = 10; + constexpr uint32_t S43 = 15; + constexpr uint32_t S44 = 21; + + inline uint32_t F(uint32_t x, uint32_t y, uint32_t z) { return (x & y) | (~x & z); } + inline uint32_t G(uint32_t x, uint32_t y, uint32_t z) { return (x & z) | (y & ~z); } + inline uint32_t H(uint32_t x, uint32_t y, uint32_t z) { return x ^ y ^ z; } + inline uint32_t I(uint32_t x, uint32_t y, uint32_t z) { return y ^ (x | ~z); } + + inline uint32_t rotate_left(uint32_t x, uint32_t n) { return (x << n) | (x >> (32 - n)); } + + inline void FF(uint32_t& a, uint32_t b, uint32_t c, uint32_t d, uint32_t x, uint32_t s, uint32_t ac) { + a += F(b, c, d) + x + ac; + a = rotate_left(a, s); + a += b; + } + inline void GG(uint32_t& a, uint32_t b, uint32_t c, uint32_t d, uint32_t x, uint32_t s, uint32_t ac) { + a += G(b, c, d) + x + ac; + a = rotate_left(a, s); + a += b; + } + inline void HH(uint32_t& a, uint32_t b, uint32_t c, uint32_t d, uint32_t x, uint32_t s, uint32_t ac) { + a += H(b, c, d) + x + ac; + a = rotate_left(a, s); + a += b; + } + inline void II(uint32_t& a, uint32_t b, uint32_t c, uint32_t d, uint32_t x, uint32_t s, uint32_t ac) { + a += I(b, c, d) + x + ac; + a = rotate_left(a, s); + a += b; + } +} + +ostd::String ostd::Utils::md5(const ostd::String& _str) { + std::string str = _str.cpp_str(); + // Initial state (RFC 1321) + uint32_t state[4] = { + 0x67452301u, 0xefcdab89u, 0x98badcfeu, 0x10325476u + }; + + // Process input in 64-byte blocks + const uint8_t* input = reinterpret_cast(str.data()); + size_t inputLen = str.size(); + + // Process full 64-byte chunks + size_t i = 0; + for (; i + 63 < inputLen; i += 64) { + transform(input + i, state); + } + + // Buffer for remaining bytes + padding + length + uint8_t buffer[64]; + size_t rem = inputLen - i; + std::memset(buffer, 0, sizeof(buffer)); + if (rem > 0) { + std::memcpy(buffer, input + i, rem); + } + + // Append 0x80 + buffer[rem++] = 0x80; + + if (rem > 56) { + // Not enough space for length: pad and process this block + std::memset(buffer + rem, 0, 64 - rem); + transform(buffer, state); + // New block with zeros up to 56 + std::memset(buffer, 0, 56); + } else { + // Pad zeros up to 56 + std::memset(buffer + rem, 0, 56 - rem); + } + + // Append original length in bits, little-endian + uint64_t bitLen = static_cast(inputLen) * 8ull; + for (int j = 0; j < 8; ++j) { + buffer[56 + j] = static_cast((bitLen >> (8 * j)) & 0xFF); + } + + // Final transform + transform(buffer, state); + + // Output digest (little-endian) + uint8_t digest[16]; + encode(digest, state, 16); + + std::ostringstream oss; + oss << std::hex << std::setfill('0'); + for (int j = 0; j < 16; ++j) { + oss << std::setw(2) << static_cast(digest[j]); + } + return oss.str(); +} + +void ostd::Utils::transform(const uint8_t block[64], uint32_t state[4]) { + uint32_t a = state[0]; + uint32_t b = state[1]; + uint32_t c = state[2]; + uint32_t d = state[3]; + uint32_t x[16]; + + decode(x, block, 64); + + // Round 1 + FF(a, b, c, d, x[ 0], S11, 0xd76aa478); // 1 + FF(d, a, b, c, x[ 1], S12, 0xe8c7b756); // 2 + FF(c, d, a, b, x[ 2], S13, 0x242070db); // 3 + FF(b, c, d, a, x[ 3], S14, 0xc1bdceee); // 4 + FF(a, b, c, d, x[ 4], S11, 0xf57c0faf); // 5 + FF(d, a, b, c, x[ 5], S12, 0x4787c62a); // 6 + FF(c, d, a, b, x[ 6], S13, 0xa8304613); // 7 + FF(b, c, d, a, x[ 7], S14, 0xfd469501); // 8 + FF(a, b, c, d, x[ 8], S11, 0x698098d8); // 9 + FF(d, a, b, c, x[ 9], S12, 0x8b44f7af); // 10 + FF(c, d, a, b, x[10], S13, 0xffff5bb1); // 11 + FF(b, c, d, a, x[11], S14, 0x895cd7be); // 12 + FF(a, b, c, d, x[12], S11, 0x6b901122); // 13 + FF(d, a, b, c, x[13], S12, 0xfd987193); // 14 + FF(c, d, a, b, x[14], S13, 0xa679438e); // 15 + FF(b, c, d, a, x[15], S14, 0x49b40821); // 16 + + // Round 2 + GG(a, b, c, d, x[ 1], S21, 0xf61e2562); // 17 + GG(d, a, b, c, x[ 6], S22, 0xc040b340); // 18 + GG(c, d, a, b, x[11], S23, 0x265e5a51); // 19 + GG(b, c, d, a, x[ 0], S24, 0xe9b6c7aa); // 20 + GG(a, b, c, d, x[ 5], S21, 0xd62f105d); // 21 + GG(d, a, b, c, x[10], S22, 0x02441453); // 22 + GG(c, d, a, b, x[15], S23, 0xd8a1e681); // 23 + GG(b, c, d, a, x[ 4], S24, 0xe7d3fbc8); // 24 + GG(a, b, c, d, x[ 9], S21, 0x21e1cde6); // 25 + GG(d, a, b, c, x[14], S22, 0xc33707d6); // 26 + GG(c, d, a, b, x[ 3], S23, 0xf4d50d87); // 27 + GG(b, c, d, a, x[ 8], S24, 0x455a14ed); // 28 + GG(a, b, c, d, x[13], S21, 0xa9e3e905); // 29 + GG(d, a, b, c, x[ 2], S22, 0xfcefa3f8); // 30 + GG(c, d, a, b, x[ 7], S23, 0x676f02d9); // 31 + GG(b, c, d, a, x[12], S24, 0x8d2a4c8a); // 32 + + // Round 3 + HH(a, b, c, d, x[ 5], S31, 0xfffa3942); // 33 + HH(d, a, b, c, x[ 8], S32, 0x8771f681); // 34 + HH(c, d, a, b, x[11], S33, 0x6d9d6122); // 35 + HH(b, c, d, a, x[14], S34, 0xfde5380c); // 36 + HH(a, b, c, d, x[ 1], S31, 0xa4beea44); // 37 + HH(d, a, b, c, x[ 4], S32, 0x4bdecfa9); // 38 + HH(c, d, a, b, x[ 7], S33, 0xf6bb4b60); // 39 + HH(b, c, d, a, x[10], S34, 0xbebfbc70); // 40 + HH(a, b, c, d, x[13], S31, 0x289b7ec6); // 41 + HH(d, a, b, c, x[ 0], S32, 0xeaa127fa); // 42 + HH(c, d, a, b, x[ 3], S33, 0xd4ef3085); // 43 + HH(b, c, d, a, x[ 6], S34, 0x04881d05); // 44 + HH(a, b, c, d, x[ 9], S31, 0xd9d4d039); // 45 + HH(d, a, b, c, x[12], S32, 0xe6db99e5); // 46 + HH(c, d, a, b, x[15], S33, 0x1fa27cf8); // 47 + HH(b, c, d, a, x[ 2], S34, 0xc4ac5665); // 48 + + // Round 4 + II(a, b, c, d, x[ 0], S41, 0xf4292244); // 49 + II(d, a, b, c, x[ 7], S42, 0x432aff97); // 50 + II(c, d, a, b, x[14], S43, 0xab9423a7); // 51 + II(b, c, d, a, x[ 5], S44, 0xfc93a039); // 52 + II(a, b, c, d, x[12], S41, 0x655b59c3); // 53 + II(d, a, b, c, x[ 3], S42, 0x8f0ccc92); // 54 + II(c, d, a, b, x[10], S43, 0xffeff47d); // 55 + II(b, c, d, a, x[ 1], S44, 0x85845dd1); // 56 + II(a, b, c, d, x[ 8], S41, 0x6fa87e4f); // 57 + II(d, a, b, c, x[15], S42, 0xfe2ce6e0); // 58 + II(c, d, a, b, x[ 6], S43, 0xa3014314); // 59 + II(b, c, d, a, x[13], S44, 0x4e0811a1); // 60 + II(a, b, c, d, x[ 4], S41, 0xf7537e82); // 61 + II(d, a, b, c, x[11], S42, 0xbd3af235); // 62 + II(c, d, a, b, x[ 2], S43, 0x2ad7d2bb); // 63 + II(b, c, d, a, x[ 9], S44, 0xeb86d391); // 64 + + state[0] += a; + state[1] += b; + state[2] += c; + state[3] += d; +} + +void ostd::Utils::encode(uint8_t* output, const uint32_t* input, size_t len) { + // Convert 32-bit words to bytes (little-endian) + for (size_t i = 0, j = 0; j < len; ++i, j += 4) { + output[j + 0] = static_cast( input[i] & 0xFF); + output[j + 1] = static_cast((input[i] >> 8) & 0xFF); + output[j + 2] = static_cast((input[i] >> 16) & 0xFF); + output[j + 3] = static_cast((input[i] >> 24) & 0xFF); + } +} + +void ostd::Utils::decode(uint32_t* output, const uint8_t* input, size_t len) { + // Convert bytes to 32-bit words (little-endian) + for (size_t i = 0, j = 0; j < len; ++i, j += 4) { + output[i] = static_cast(input[j + 0]) + | (static_cast(input[j + 1]) << 8) + | (static_cast(input[j + 2]) << 16) + | (static_cast(input[j + 3]) << 24); + } +} \ No newline at end of file diff --git a/src/test.cpp b/src/test.cpp index 1c445e9..7fc647a 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -7,6 +7,7 @@ #include #include + ostd::ConsoleOutputHandler out; class Window : public ogfx::WindowBase @@ -84,7 +85,10 @@ class Window : public ogfx::WindowBase int main(int argc, char** argv) { - + out.p(STR_BOOL(ostd::Utils::md5("") == "d41d8cd98f00b204e9800998ecf8427e")).nl(); + out.p(STR_BOOL(ostd::Utils::md5("abc") == "900150983cd24fb0d6963f7d28e17f72")).nl(); + out.p(STR_BOOL(ostd::Utils::md5("message digest") == "f96b697d7cb7938d525a2f31aaf161d0")).nl(); + Window window; window.initialize(1280, 720, "OmniaFramework - Test Window"); window.setClearColor({ 0, 2 , 15 });