Fix bad revert of wininet wine sync and remove the actual sync.

See issue #5663 for more details.

svn path=/branches/ros-branch-0_3_12/; revision=49121

reactos/COPYING

@@ -1,13 +1,12 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -16,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -56,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -111,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -169,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -226,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -256,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -278,9 +277,9 @@ 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.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     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
@@ -304,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -337,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This 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 Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

reactos/COPYING.LIB

@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

reactos/COPYING3

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <http://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<http://www.gnu.org/licenses/>.
+
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

reactos/COPYING3.LIB

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

reactos/CREDITS

@@ -16,7 +16,7 @@ Daniel Reimer <reimer.daniel@freenet.de>
 David Welch <welch@cwcom.net>
 Dmitry Chapyshev <dmitry@reactos.org>
 Emanuele Aliberti <ea@iol.it>
-Eric Kohl <ekohl@rz-online.de>
+Eric Kohl
 Eugene Ingerman <geneing@myrealbox.com>
 Filip Navara <xnavara@volny.cz>
 Frederik Leemans
@@ -31,7 +31,7 @@ Hartmut Birr <hartmut.birr@gmx.de>
 Hernan Ochoa
 Herve Poussineau <hpoussin@reactos.com>
 Iwan Fatahi <i_fatahi@hotmail.com>
-James B. Tabor <jimtabor.rosdev@gmail.com> <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
+James Tabor <james.tabor@reactos.org> <jimtabor.rosdev@gmail.com> <jamestabor_rosdev@yahoo.com>
 Jason Eager
 Jason Filby <jasonfilby@yahoo.com>
 Jason Weiler
@@ -66,7 +66,7 @@ Royce Mitchell III <royce3@ev1.net>
 Samuel Serapi<70>n <samdwise51@gmail.com>
 Saveliy Tretiakov <saveliyt@mail.ru>
 Stefan Ginsberg <stefan__100__@hotmail.com>
-Steven Edwards <steven_ed4153@yahoo.com>
+Steven Edwards <winehacker@gmail.com>
 Thomas Weidenmueller <w3seek@users.sourceforge.net>
 Timo Kreuzer <timo.kreuzer@reactos.org>
 Victor Kirhenshtein <sauros@iname.com>

reactos/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.5.8
+# Doxyfile 1.6.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -54,11 +54,11 @@ CREATE_SUBDIRS         = YES
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
-# Spanish, Swedish, and Ukrainian.
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
@@ -124,7 +124,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = .
+STRIP_FROM_PATH        = 
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -169,13 +169,13 @@ MULTILINE_CPP_IS_BRIEF = NO
 # member inherits the documentation from any documented member that it 
 # re-implements.
 
-INHERIT_DOCS           = NO
+INHERIT_DOCS           = YES
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
 # a new page for each member. If set to NO, the documentation of a member will 
 # be part of the file/class/namespace that contains it.
 
-SEPARATE_MEMBER_PAGES  = NO
+SEPARATE_MEMBER_PAGES  = YES
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -224,7 +224,8 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
 # Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
 # .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set
+# FILE_PATTERNS otherwise the files are not read by doxygen.
 
 EXTENSION_MAPPING      = 
 
@@ -396,6 +397,12 @@ HIDE_SCOPE_NAMES       = NO
 
 SHOW_INCLUDE_FILES     = YES
 
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
+# will list include files with double quotes in the documentation 
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
 # is inserted in the documentation for inline members.
 
@@ -415,6 +422,16 @@ SORT_MEMBER_DOCS       = YES
 
 SORT_BRIEF_DOCS        = NO
 
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
 # hierarchy of group names into alphabetical order. If set to NO (the default) 
 # the group names will appear in their defined order.
@@ -591,11 +608,13 @@ INPUT_ENCODING         = UTF-8
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = *.c \
+                         *.cc \
                          *.cxx \
                          *.cpp \
                          *.c++ \
                          *.h \
                          *.hh \
+                         *.hxx \
                          *.hpp \
                          *.idl
 
@@ -644,7 +663,7 @@ EXAMPLE_PATH           =
 # and *.h) to filter out the source-files in the directories. If left 
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       = *
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
 # searched for input files to be used with the \include or \dontinclude 
@@ -710,7 +729,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities 
@@ -737,7 +756,7 @@ USE_HTAGS              = NO
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
 
-VERBATIM_HEADERS       = YES
+VERBATIM_HEADERS       = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
@@ -804,6 +823,12 @@ HTML_FOOTER            = Doxygen/footer.html
 
 HTML_STYLESHEET        = 
 
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
+# page will contain the date and time when the page was generated. Setting 
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = NO
+
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
@@ -937,6 +962,23 @@ QHP_SECT_FILTER_ATTRS  =
 
 QHG_LOCATION           = 
 
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
+# will be generated, which together with the HTML files, form an Eclipse help  
+# plugin. To install this plugin and make it available under the help contents 
+# menu in Eclipse, the contents of the directory containing the HTML and XML 
+# files needs to be copied into the plugins directory of eclipse. The name of 
+# the directory within the plugins directory should be the same as 
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin 
+# the directory name containing the HTML and XML files should also have 
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
@@ -950,20 +992,18 @@ ENUM_VALUES_PER_LINE   = 4
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
 # structure should be generated to display hierarchical information. 
-# If the tag value is set to FRAME, a side panel will be generated 
+# If the tag value is set to YES, a side panel will be generated 
 # containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list; 
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
-# disables this behavior completely. For backwards compatibility with previous 
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
-# respectively.
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
+# Windows users are probably better off using the HTML help feature.
 
-GENERATE_TREEVIEW      = NONE
+GENERATE_TREEVIEW      = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
 # used to set the initial width (in pixels) of the frame in which the tree 
@@ -979,6 +1019,26 @@ TREEVIEW_WIDTH         = 250
 
 FORMULA_FONTSIZE       = 10
 
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript 
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should 
+# typically be disabled. For large projects the javascript based search engine 
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index 
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvances is that it is more difficult to setup 
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = YES
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -995,7 +1055,10 @@ GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
+# invoked. If left blank `latex' will be used as the default command name. 
+# Note that when enabling USE_PDFLATEX this option is only used for 
+# generating bitmaps for formulas in the HTML output, but not in the 
+# Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
@@ -1055,6 +1118,13 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1206,14 +1276,14 @@ PERLMOD_PRETTY         = YES
 PERLMOD_MAKEVAR_PREFIX = 
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
 # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
 # evaluate all C-preprocessor directives found in the sources and include 
 # files.
 
-ENABLE_PREPROCESSING   = NO
+ENABLE_PREPROCESSING   = YES
 
 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
 # names in the source code. If set to NO (the default) only conditional 
@@ -1272,7 +1342,7 @@ EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. 
@@ -1315,7 +1385,7 @@ EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
@@ -1507,12 +1577,3 @@ GENERATE_LEGEND        = YES
 # the various graphs.
 
 DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = YES

reactos/LGPL.txt

@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-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 this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser 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 Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

reactos/Makefile

@@ -46,6 +46,10 @@
 #        This is faster than the depends target which does a complete dependency
 #        check of the ReactOS codebase.
 #
+#    bootcdregtest
+#        This target builds an ISO (ReactOS-RegTest.ISO) which is used for unattended
+#        regression testing.
+#
 #
 # Accepted environment variables:
 #
@@ -112,6 +116,10 @@
 #        will go from 80 to 40MB, memory usage from 58 to 38MB and the install CD
 #        from 18 to 13MB. The variable defaults to no.
 #
+#    ROS_GENERATE_RSYM
+#        This variable controls generation of RSYM symbol data. The value can be
+#        either yes (to generate symbol data) or no. The variable defaults to yes.
+#
 #    ROS_RBUILDFLAGS
 #        Pass parameters to rbuild.
 #            -v           Be verbose.
@@ -148,6 +156,11 @@ $(error ReactOS's makefiles use GNU Make 3.80+ features, you have $(MAKE_VERSION
 endif
 # END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ )
 
+define NL
+
+
+endef
+
 .PHONY: all
 .PHONY: clean
 .PHONY: world
@@ -160,11 +173,7 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-  ifeq ($(ARCH),i386)
-    ROS_AUTOMAKE=makefile.auto
-  else
-    ROS_AUTOMAKE=makefile-$(ARCH).auto
-  endif
+  ROS_AUTOMAKE=makefile-$(ARCH).auto
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -230,7 +239,7 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_CVTRES  =@echo $(QUOTE)[CVTRES]   $@$(QUOTE)
   ECHO_WIDL    =@echo $(QUOTE)[WIDL]     $@$(QUOTE)
   ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES]  $<$(QUOTE)
-  ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL]  $@$(QUOTE)
+  ECHO_IMPLIB  =@echo $(QUOTE)[IMPLIB]   $@$(QUOTE)
   ECHO_LD      =@echo $(QUOTE)[LD]       $@$(QUOTE)
   ECHO_HOSTLD  =@echo $(QUOTE)[HOST-LD]  $@$(QUOTE)
   ECHO_LINK    =@echo $(QUOTE)[LINK]     $@$(QUOTE)
@@ -238,6 +247,7 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP]  $@$(QUOTE)
   ECHO_RBUILD  =@echo $(QUOTE)[RBUILD]   $@$(QUOTE)
   ECHO_RSYM    =@echo $(QUOTE)[RSYM]     $@$(QUOTE)
+  ECHO_PEFIXUP =@echo $(QUOTE)[PEFIXUP]  $@$(QUOTE)
   ECHO_WMC     =@echo $(QUOTE)[WMC]      $@$(QUOTE)
   ECHO_NCI     =@echo $(QUOTE)[NCI]      $@$(QUOTE)
   ECHO_CABMAN  =@echo $(QUOTE)[CABMAN]   $<$(QUOTE)
@@ -249,6 +259,7 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_STRIP   =@echo $(QUOTE)[STRIP]    $@$(QUOTE)
   ECHO_RGENSTAT=@echo $(QUOTE)[RGENSTAT] $@$(QUOTE)
   ECHO_DEPENDS =@echo $(QUOTE)[DEPENDS]  $<$(QUOTE)
+  ECHO_RSP     =@echo $(QUOTE)[RSP]      $@$(QUOTE)
 else
   ECHO_CP      =
   ECHO_MKDIR   =
@@ -268,7 +279,7 @@ else
   ECHO_CVTRES  =
   ECHO_WIDL    =
   ECHO_BIN2RES =
-  ECHO_DLLTOOL =
+  ECHO_IMPLIB  =
   ECHO_LD      =
   ECHO_HOSTLD  =
   ECHO_NM      =
@@ -286,6 +297,7 @@ else
   ECHO_STRIP   =
   ECHO_RGENSTAT=
   ECHO_DEPENDS =
+  ECHO_RSP     =
 endif
 
 # Set host compiler/linker
@@ -341,6 +353,7 @@ ifeq ($(HOST),mingw32-linux)
 	endif
 	export SEP = /
 	mkdir = -$(Q)mkdir -p
+	checkpoint = $(Q)touch
 	rm = $(Q)rm -f
 	cp = $(Q)cp
 	NUL = /dev/null
@@ -349,6 +362,7 @@ else # mingw32-windows
 	ROS_EMPTY =
 	export SEP = \$(ROS_EMPTY)
 	mkdir = -$(Q)mkdir
+	checkpoint = $(Q)copy /y NUL
 	rm = $(Q)del /f /q
 	cp = $(Q)copy /y
 	NUL = NUL
@@ -462,11 +476,6 @@ rgenstat: $(RGENSTAT_TARGET)
 	$(ECHO_RGENSTAT)
 	$(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
 
-.PHONY: cb
-cb: $(ROS_BUILDENGINE)
-	$(ECHO_RBUILD)
-	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb
-
 .PHONY: msbuild
 msbuild: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
@@ -517,6 +526,11 @@ msvc9: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
 	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc
 
+.PHONY: msvc10
+msvc10: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs10.00 -voversionconfiguration msvc
+
 .PHONY: msvc6_clean
 msvc6_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
@@ -542,6 +556,11 @@ msvc9_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
 	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc
 
+.PHONY: msvc10_clean
+msvc10_clean: $(ROS_BUILDENGINE)
+	$(ECHO_RBUILD)
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs10.00 -voversionconfiguration msvc
+
 .PHONY: msvc_clean
 msvc_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)

reactos/ReactOS-amd64.rbuild

@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true">
+	<xi:include href="config-amd64.rbuild">
+		<xi:fallback>
+			<xi:include href="config-amd64.template.rbuild" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="ReactOS-generic.rbuild" />
+
+	<define name="_M_AMD64" />
+	<define name="_AMD64_" />
+	<define name="_M_AXP64" />
+	<define name="__x86_64__" />
+	<!-- define name="_X86AMD64_" / FIXME: what is this used for? -->
+	<define name="_WIN64" />
+	<define name="TARGET_amd64" host="true" />
+
+	<define name="USE_COMPILER_EXCEPTIONS" />
+	<define name ="NO_UNDERSCORE_PREFIX" />
+
+	<property name="PLATFORM" value="PC"/>
+	<property name="usewrc" value="false"/>
+	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
+
+	<group compilerset="gcc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>-ftracer</compilerflag>
+			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+		</if>
+		<compilerflag>-fms-extensions</compilerflag>
+		<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
+		<compilerflag compiler="midl">-m64 --win64</compilerflag>
+		<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
+		<!-- compilerflag compiler="as">-gstabs+</compilerflag -->
+		<compilerflag>-U_X86_</compilerflag>
+		<compilerflag>-UWIN32</compilerflag>
+		<compilerflag>-Wno-format</compilerflag>
+	</group>
+
+	<group linkerset="ld">
+		<linkerflag>-disable-stdcall-fixup</linkerflag>
+		<linkerflag>-file-alignment=0x1000</linkerflag>
+		<linkerflag>-section-alignment=0x1000</linkerflag>
+		<linkerflag>--unique=.eh_frame</linkerflag>
+		<linkerflag>-static</linkerflag>
+		<linkerflag>--exclude-all-symbols</linkerflag>
+	</group>
+
+	<if property="USERMODE" value="1">
+		<directory name="base">
+			<directory name="applications">
+				<xi:include href="base/applications/applications.rbuild" />
+			</directory>
+			<directory name="services">
+				<xi:include href="base/services/services.rbuild" />
+			</directory>
+			<directory name="setup">
+				<xi:include href="base/setup/setup.rbuild" />
+			</directory>
+			<directory name="shell">
+				<directory name="cmd">
+					<xi:include href="base/shell/cmd/cmd.rbuild" />
+				</directory>
+				<directory name="explorer-new">
+					<xi:include href="base/shell/explorer-new/explorer.rbuild" />
+				</directory>
+			</directory>
+			<directory name="system">
+				<xi:include href="base/system/system.rbuild" />
+			</directory>
+		</directory>
+		<directory name="dll">
+			<xi:include href="dll/dll.rbuild" />
+		</directory>
+	</if>
+
+	<directory name="boot">
+		<xi:include href="boot/boot.rbuild" />
+	</directory>
+	<directory name="drivers">
+		<xi:include href="drivers/drivers.rbuild" />
+	</directory>
+	<directory name="hal">
+		<xi:include href="hal/hal.rbuild" />
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.rbuild" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/lib.rbuild" />
+	</directory>
+	<directory name="media">
+		<xi:include href="media/media.rbuild" />
+	</directory>
+	<directory name="modules">
+		<xi:include href="modules/directory.rbuild" />
+	</directory>
+	<directory name="ntoskrnl">
+		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
+		<if property="BUILD_MP" value="1">
+			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
+		</if>
+	</directory>
+	<directory name="subsystems">
+		<xi:include href="subsystems/subsystems.rbuild" />
+	</directory>
+	<directory name="tools">
+		<xi:include href="tools/tools.rbuild" />
+	</directory>
+
+</project>

reactos/ReactOS-arm.rbuild

@@ -7,74 +7,42 @@
 		</xi:fallback>
 	</xi:include>
 
-	<xi:include href="baseaddress.rbuild" />
+	<xi:include href="ReactOS-generic.rbuild" />
 
-	<define name="__REACTOS__" />
+	<!-- <define name="_M_ARM" /> Already defined by toolchain -->
 	<define name="_ARM_" />
 	<define name="__arm__" />
 	<define name="TARGET_arm" host="true" />
 
-	<if property="DBG" value="1">
-		<define name="DBG">1</define>
-		<define name="_SEH_ENABLE_TRACE" />
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-	<if property="DBG" value="0">
-		<define name="DBG">0</define>
-	</if>
-
-	<if property="KDBG" value="1">
-		<define name="KDBG">1</define>
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-
-	<include>.</include>
-	<include>include</include>
-	<include root="intermediate">include</include>
-	<include>include/psdk</include>
-	<include root="intermediate">include/psdk</include>
-	<include>include/dxsdk</include>
-	<include root="intermediate">include/dxsdk</include>
-	<include>include/crt</include>
-	<include>include/crt/mingw32</include>
-	<include>include/ddk</include>
-	<include>include/GL</include>
-	<include>include/ndk</include>
-	<include>include/reactos</include>
-	<include root="intermediate">include/reactos</include>
-	<include root="intermediate">include/reactos/mc</include>
-	<include>include/reactos/libs</include>
-	<include>include/reactos/arm</include>
+	<define name="USE_COMPILER_EXCEPTIONS" />
 
 	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
-	<property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/>
+
+	<include>include/reactos/arm</include>
 
 	<if property="SARCH" value="versatile">
 		<define name="BOARD_CONFIG_VERSATILE"/>
 	</if>
 
-	<if property="OPTIMIZE" value="1">
-		<compilerflag>-Os</compilerflag>
-		<compilerflag>-ftracer</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="2">
-		<compilerflag>-Os</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="3">
-		<compilerflag>-O1</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="4">
-		<compilerflag>-O2</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="5">
-		<compilerflag>-O3</compilerflag>
-	</if>
+	<group compilerset="gcc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>-ftracer</compilerflag>
+		</if>
+		<compilerflag>-fms-extensions</compilerflag>
+		<compilerflag>-Wno-attributes</compilerflag>
+		<compilerflag>-U_UNICODE</compilerflag>
+		<compilerflag>-UUNICODE</compilerflag>
+	</group>
 
-	<define name="__MSVCRT__"/>
-	<compilerflag>-Wno-attributes</compilerflag>
-	<compilerflag>-fno-strict-aliasing</compilerflag>
-	<linkerflag>--strip-debug</linkerflag>
-	<linkerflag>-static</linkerflag>
+
+	<define name="__MSVCRT__"/> <!-- DUBIOUS -->
+
+	<group linkerset="ld">
+		<linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE -->
+		<linkerflag>-static</linkerflag> <!-- INVESTIGATE -->
+		<linkerflag>-file-alignment=0x1000</linkerflag>
+		<linkerflag>-section-alignment=0x1000</linkerflag>
+	</group>
 
 	<directory name="media">
 		<directory name="nls">
@@ -85,7 +53,10 @@
 		<directory name="drivers">
 			<directory name="csq">
 				<xi:include href="lib/drivers/csq/csq.rbuild" />
-            </directory>
+			</directory>
+		</directory>
+		<directory name="cportlib">
+			<xi:include href="lib/cportlib/cportlib.rbuild" />
 		</directory>
 		<directory name="debugsup">
 			<xi:include href="lib/debugsup/debugsup.rbuild" />
@@ -106,6 +77,9 @@
 		<directory name="inflib">
 			<xi:include href="lib/inflib/inflib.rbuild" />
 		</directory>
+		<directory name="newinflib">
+			<xi:include href="lib/newinflib/inflib.rbuild" />
+		</directory>
 		<directory name="cmlib">
 			<xi:include href="lib/cmlib/cmlib.rbuild" />
 		</directory>
@@ -120,6 +94,9 @@
 				<xi:include href="lib/sdk/crt/crt.rbuild" />
 				<xi:include href="lib/sdk/crt/libcntpr.rbuild" />
 			</directory>
+			<directory name="ioevent">
+				<xi:include href="lib/sdk/ioevent/ioevent.rbuild" />
+			</directory>
 			<directory name="nt">
 				<xi:include href="lib/sdk/nt/nt.rbuild" />
 			</directory>
@@ -144,17 +121,7 @@
 		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
 	</directory>
 	<directory name="hal">
-		<directory name="halarm">
-			<directory name="generic">
-				<xi:include href="hal/halarm/generic/generic.rbuild" />
-			</directory>
-			<directory name="up">
-				<xi:include href="hal/halarm/up/halup.rbuild" />
-			</directory>
-		</directory>
-		<directory name="hal">
-			<xi:include href="hal/hal/hal.rbuild" />
-		</directory>
+		<xi:include href="hal/hal.rbuild" />
 	</directory>
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />
@@ -188,11 +155,9 @@
 	</directory>
 	<directory name="base">
 		<directory name="system">
-            <directory name="smss">
-                <xi:include href="base/system/smss/smss.rbuild" />
-            </directory>
+			<directory name="smss">
+				<xi:include href="base/system/smss/smss.rbuild" />
+			</directory>
 		</directory>
 	</directory>
-
-	<define name="_USE_32BIT_TIME_T" />
 </project>

reactos/ReactOS-generic.rbuild

@@ -86,47 +86,68 @@
 	<include host="true">include/reactos</include>
 	<include host="true">include/reactos/wine</include>
 
-	<directory name="base">
-		<xi:include href="base/base.rbuild" />
-	</directory>
-	<directory name="boot">
-		<xi:include href="boot/boot.rbuild" />
-	</directory>
-	<directory name="dll">
-		<xi:include href="dll/dll.rbuild" />
-	</directory>
-	<directory name="drivers">
-		<xi:include href="drivers/drivers.rbuild" />
-	</directory>
-	<directory name="hal">
-		<xi:include href="hal/hal.rbuild" />
-	</directory>
-	<directory name="include">
-		<xi:include href="include/directory.rbuild" />
-	</directory>
-	<directory name="lib">
-		<xi:include href="lib/lib.rbuild" />
-	</directory>
-	<directory name="media">
-		<xi:include href="media/media.rbuild" />
-	</directory>
-	<directory name="modules">
-		<xi:include href="modules/directory.rbuild" />
-	</directory>
-	<directory name="ntoskrnl">
-		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
-		<if property="BUILD_MP" value="1">
-			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
+	<group compilerset="gcc">
+		<compilerflag>-Wall</compilerflag>
+		<compilerflag>-Wno-char-subscripts</compilerflag>
+		<compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
+	</group>
+
+	<group compilerset="msc">
+		<define name="inline" compiler="cc">__inline</define>
+		<define name="__STDC__" compiler="cc">1</define>
+		<compilerflag>/Zl</compilerflag>
+		<compilerflag>/Zi</compilerflag>
+		<compilerflag>/W1</compilerflag>
+	</group>
+
+	<group compilerset="gcc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>-Os</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="2">
+			<compilerflag>-Os</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="3">
+			<compilerflag>-O1</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="4">
+			<compilerflag>-O2</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="5">
+			<compilerflag>-O3</compilerflag>
 		</if>
-	</directory>
-	<directory name="subsystems">
-		<xi:include href="subsystems/subsystems.rbuild" />
-	</directory>
-	<directory name="tools">
-		<xi:include href="tools/tools.rbuild" />
-	</directory>
 
-	<compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag>
+		<compilerflag>-fno-strict-aliasing</compilerflag>
+		<compilerflag>-Wpointer-arith</compilerflag>
+		<compilerflag>-Wno-multichar</compilerflag>
+		<compilerflag>-Wno-error=uninitialized</compilerflag>
+		<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
+	</group>
+
+	<group compilerset="msc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>/O1</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="2">
+			<compilerflag>/O2</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="3">
+			<compilerflag>/Ox /GS-</compilerflag>
+			<compilerflag>/Ot</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="4">
+			<compilerflag>/Ox /GS-</compilerflag>
+			<compilerflag>/Os</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="5">
+			<compilerflag>/Ox /GS-</compilerflag>
+			<compilerflag>/Os</compilerflag>
+			<compilerflag>/Ob2</compilerflag>
+			<compilerflag>/GF</compilerflag>
+			<compilerflag>/Gy</compilerflag>
+		</if>
+
+		<compilerflag>/GS-</compilerflag>
+	</group>
 
-	<compilerflag compilerset="msc">/wd4711</compilerflag>
 </group>

reactos/ReactOS-i386.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config.rbuild">
 		<xi:fallback>
 			<xi:include href="config.template.rbuild" />
@@ -15,69 +15,67 @@
 	<define name="TARGET_i386" host="true" />
 
 	<define name="USE_COMPILER_EXCEPTIONS" />
+	<define name="_USE_32BIT_TIME_T" />
 
-	<property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/>
 	<property name="PLATFORM" value="PC"/>
 
 	<group compilerset="gcc">
 		<if property="OPTIMIZE" value="1">
-			<compilerflag>-Os</compilerflag>
 			<compilerflag>-ftracer</compilerflag>
 			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
 		</if>
-		<if property="OPTIMIZE" value="2">
-			<compilerflag>-Os</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-			<compilerflag>-O1</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-			<compilerflag>-O2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-			<compilerflag>-O3</compilerflag>
-		</if>
-
+		<compilerflag>-fms-extensions</compilerflag>
 		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		<compilerflag>-fno-strict-aliasing</compilerflag>
-		<compilerflag>-Wno-strict-aliasing</compilerflag>
-		<compilerflag>-Wpointer-arith</compilerflag>
-		<compilerflag>-Wno-multichar</compilerflag>
-		<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
-	</group>
-
-	<group compilerset="msc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>/O1</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="2">
-			<compilerflag>/O2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Ot</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Os</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Os</compilerflag>
-			<compilerflag>/Ob2</compilerflag>
-			<compilerflag>/GF</compilerflag>
-			<compilerflag>/Gy</compilerflag>
-		</if>
-
-		<compilerflag>/GS-</compilerflag>
-		<compilerflag>/Zl</compilerflag>
-		<compilerflag>/Zi</compilerflag>
-		<compilerflag>/Wall</compilerflag>
+		<compilerflag compiler="midl">-m32 --win32</compilerflag>
+		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+		<compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag>
+		<compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag>
+		<compilerflag compiler="as">-gstabs+</compilerflag>
 	</group>
 
 	<group linkerset="ld">
 		<linkerflag>-disable-stdcall-fixup</linkerflag>
+		<linkerflag>-file-alignment=0x1000</linkerflag>
+		<linkerflag>-section-alignment=0x1000</linkerflag>
 	</group>
 
-	<define name="_USE_32BIT_TIME_T" />
+	<directory name="base">
+		<xi:include href="base/base.rbuild" />
+	</directory>
+	<directory name="boot">
+		<xi:include href="boot/boot.rbuild" />
+	</directory>
+	<directory name="dll">
+		<xi:include href="dll/dll.rbuild" />
+	</directory>
+	<directory name="drivers">
+		<xi:include href="drivers/drivers.rbuild" />
+	</directory>
+	<directory name="hal">
+		<xi:include href="hal/hal.rbuild" />
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.rbuild" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/lib.rbuild" />
+	</directory>
+	<directory name="media">
+		<xi:include href="media/media.rbuild" />
+	</directory>
+	<directory name="modules">
+		<xi:include href="modules/directory.rbuild" />
+	</directory>
+	<directory name="ntoskrnl">
+		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
+		<if property="BUILD_MP" value="1">
+			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
+		</if>
+	</directory>
+	<directory name="subsystems">
+		<xi:include href="subsystems/subsystems.rbuild" />
+	</directory>
+	<directory name="tools">
+		<xi:include href="tools/tools.rbuild" />
+	</directory>
 </project>

reactos/ReactOS-ppc.rbuild

@@ -20,4 +20,6 @@
 	<compilerflag>-meabi</compilerflag>
 	<compilerflag>-O2</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
+	<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+	<compilerflag compiler="as">-gstabs+</compilerflag>
 </project>

reactos/base/applications/applications.rbuild

@@ -16,12 +16,12 @@
 	<directory name="control">
 		<xi:include href="control/control.rbuild" />
 	</directory>
-	<directory name="downloader">
-		<xi:include href="downloader/downloader.rbuild" />
-	</directory>	
 	<directory name="dxdiag">
 		<xi:include href="dxdiag/dxdiag.rbuild" />
 	</directory>
+	<directory name="extrac32">
+		<xi:include href="extrac32/extrac32.rbuild" />
+	</directory>
 	<directory name="fontview">
 		<xi:include href="fontview/fontview.rbuild" />
 	</directory>
@@ -79,6 +79,9 @@
 	<directory name="shutdown">
 		<xi:include href="shutdown/shutdown.rbuild" />
 	</directory>
+	<directory name="sndrec32">
+		<xi:include href="sndrec32/sndrec32.rbuild" />
+	</directory>
 	<directory name="sndvol32">
 		<xi:include href="sndvol32/sndvol32.rbuild" />
 	</directory>
@@ -97,4 +100,7 @@
 	<directory name="write">
 		<xi:include href="write/write.rbuild" />
 	</directory>
+	<directory name="rapps">
+		<xi:include href="rapps/rapps.rbuild" />
+	</directory>
 </group>

reactos/base/applications/cacls/cacls.c

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <precomp.h>
@@ -180,14 +180,14 @@ BOOL
 PrintFileDacl(IN LPTSTR FilePath,
               IN LPTSTR FileName)
 {
-    SIZE_T Indent;
+    SIZE_T Length;
     PSECURITY_DESCRIPTOR SecurityDescriptor;
     DWORD SDSize = 0;
     TCHAR FullFileName[MAX_PATH + 1];
     BOOL Error = FALSE, Ret = FALSE;
 
-    Indent = _tcslen(FilePath) + _tcslen(FileName);
-    if (Indent++ > MAX_PATH - 1)
+    Length = _tcslen(FilePath) + _tcslen(FileName);
+    if (Length > MAX_PATH)
     {
         /* file name too long */
         SetLastError(ERROR_FILE_NOT_FOUND);
@@ -529,7 +529,6 @@ _tmain(int argc, const TCHAR *argv[])
         WIN32_FIND_DATA FindData;
         HANDLE hFind;
         DWORD LastError;
-        BOOL ContinueAccessDenied = FALSE;
 
         if (argc > 2)
         {
@@ -572,8 +571,7 @@ _tmain(int argc, const TCHAR *argv[])
                         {
                             LastError = GetLastError();
 
-                            if (LastError == ERROR_ACCESS_DENIED &&
-                                ContinueAccessDenied)
+                            if (LastError == ERROR_ACCESS_DENIED)
                             {
                                 PrintErrorMessage(LastError);
                             }

reactos/base/applications/cacls/cacls.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" unicode="true">
 	<include base="cacls">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
 	<library>user32</library>

reactos/base/applications/cacls/lang/ja-JP.rc

@@ -0,0 +1,78 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "<22>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD>䃊<EFBFBD>X<EFBFBD>g(ACL) <20><><EFBFBD>\\<5C><><EFBFBD>܂<EFBFBD><DC82>͕ύX<CF8D><58><EFBFBD>܂<EFBFBD><DC82>B\n\n\
+CACLS <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD> [/T] [/E] [/C] [/G <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>]\n\
+                 [/R <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><> [...]] [/P <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58> [...]]\n\
+                 [/D <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><> [...]]\n\
+  <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD>        ACL <20><><EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
+  /T                <20><><EFBFBD>݂̃f<CC83>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>Ƃ<EFBFBD><C682>ׂẴT<CC83>u<EFBFBD>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>ɂ<EFBFBD><C982><EFBFBD>\n\
+                    <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD> ACL <20><><EFBFBD>ύX<CF8D><58><EFBFBD>܂<EFBFBD><DC82>B\n\
+  /E                ACL <20><><EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɁAACL <20><><EFBFBD>ҏW<D28F><57><EFBFBD>܂<EFBFBD><DC82>B\n\
+  /C                <20>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD>ۃG<DB83><47><EFBFBD>[<5B>𖳎<EFBFBD><F096B38E><EFBFBD><EFBFBD>āAACL <20>̕ύX<CF8D>𑱍s<F091B18D><73><EFBFBD>܂<EFBFBD><DC82>B\n\
+  /G <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>\n\
+                    <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>ɃA<C983>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>^<5E><><EFBFBD>܂<EFBFBD><DC82>B\n\
+                    <20>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>: R  <20>ǂݎ<C782><DD8E><EFBFBD>\n\
+                                W  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
+                                C  <20>ύX (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\n\
+                                F  <20>t<EFBFBD><74> <20>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><>\n\
+  /R <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>     <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
+                    (/E <20>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>Ƌ<EFBFBD><C68B>Ɏg<C98E>p)<29>B\n\
+  /P <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>:<3A>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>\n\
+                    <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
+                    <20>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58>: N  <20>Ȃ<EFBFBD>\n\
+                                W  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
+                                R  <20>ǂݎ<C782><DD8E><EFBFBD>\n\
+                                C  <20>ύX (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\n\
+                                F  <20>t<EFBFBD><74> <20>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><>\n\
+  /D <20><><EFBFBD>[<5B>U<EFBFBD>[<5B><>     <20>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>[<5B>U<EFBFBD>[<5B>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>ۂ<EFBFBD><DB82>܂<EFBFBD><DC82>B\n\
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>肷<EFBFBD><E882B7><EFBFBD>ɂ́A<CD81><41><EFBFBD>C<EFBFBD><43><EFBFBD>h<EFBFBD>J<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>g<EFBFBD>p<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82>B\n\
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃<EFBFBD><EFBFBD>[<5B>U<EFBFBD>[<5B><><EFBFBD>w<EFBFBD><77><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82>B\n\n\
+<EFBFBD>ȗ<EFBFBD><EFBFBD>`:\n\
+   CI - <20>R<EFBFBD><52><EFBFBD>e<EFBFBD>i<EFBFBD>p<EFBFBD><70><EFBFBD>B\n\
+        ACE <20>̓f<CD83>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>Ɍp<C98C><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
+   OI - <20>I<EFBFBD>u<EFBFBD>W<EFBFBD>F<EFBFBD>N<EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD>B\n\
+        ACE <20>̓t<CD83>@<40>C<EFBFBD><43><EFBFBD>Ɍp<C98C><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B\n\
+   IO - <20>p<EFBFBD><70><EFBFBD>̂݁B\n\
+        ACE <20>͌<EFBFBD><CD8C>݂̃t<CC83>@<40>C<EFBFBD><43>/<2F>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>ɓK<C993>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B\n"
+
+IDS_ABBR_CI, "(CI)"
+IDS_ABBR_OI, "(OI)"
+IDS_ABBR_IO, "(IO)"
+IDS_ABBR_FULL, "F"
+IDS_ABBR_READ, "R"
+IDS_ABBR_WRITE, "W"
+IDS_ABBR_CHANGE, "C"
+IDS_ABBR_NONE, "N"
+IDS_ALLOW, ""
+IDS_DENY, "(DENY)"
+IDS_SPECIAL_ACCESS, "(special access:)"
+IDS_GENERIC_READ, "GENERIC_READ"
+IDS_GENERIC_WRITE, "GENERIC_WRITE"
+IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
+IDS_GENERIC_ALL, "GENERIC_ALL"
+IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
+IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
+IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
+IDS_FILE_READ_DATA, "FILE_READ_DATA"
+IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
+IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
+IDS_FILE_READ_EA, "FILE_READ_EA"
+IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
+IDS_FILE_EXECUTE, "FILE_EXECUTE"
+IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
+IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
+IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
+IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
+IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
+IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
+IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
+IDS_SYNCHRONIZE, "SYNCHRONIZE"
+IDS_WRITE_OWNER, "WRITE_OWNER"
+IDS_WRITE_DAC, "WRITE_DAC"
+IDS_READ_CONTROL, "READ_CONTROL"
+IDS_DELETE, "DELETE"
+IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
+END

reactos/base/applications/cacls/lang/zh-CN.rc

@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

reactos/base/applications/cacls/lang/zh-TW.rc

@@ -1,95 +1,95 @@
-/*
- *  cacls (TRADITIONAL Chinese resources)
- *  (<28>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>귽)
- *  Copyright 2007 jauming <jauming.tw@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "<22><><EFBFBD>ܩΪ̭ק<CCAD><D7A7><EFBFBD><EFBFBD>󪺳X<F3AABAB3>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD><EFBFBD> \n\n\
-CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
-               [/P user:perm [...]] [/D user [...]]\n\
-   filename      <20><><EFBFBD><EFBFBD> ACLs<4C>C\n\
-   /T            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>ؿ<EFBFBD><D8BF>Ψ<EFBFBD><CEA8>Ҧ<EFBFBD><D2A6>l<EFBFBD>ؿ<EFBFBD><D8BF><EFBFBD>\n\
-                 <20><><EFBFBD>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ACL<43>C\n\
-   /E            <20>s<EFBFBD><73> ACL <20>Ӥ<EFBFBD><D3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
-   /C            <20>b<EFBFBD>X<EFBFBD>{<7B>ڵ<EFBFBD><DAB5>X<EFBFBD>ݿ<EFBFBD><DDBF>~<7E><><EFBFBD>~<7E><><EFBFBD>C\n\
-   /G user:perm  <20>ᤩ<EFBFBD><E1A4A9><EFBFBD>w<EFBFBD>Τ<EFBFBD><CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
-                 Perm <20>i<EFBFBD>H<EFBFBD>O: R  Ū<><C5AA> \n\
-                              W  <20>g<EFBFBD>J \n\
-                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
-                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
-   /R user       <20>M<EFBFBD>P<EFBFBD><50><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76>(<28>Ȧb<C8A6>O /E <20>@<40>_<EFBFBD>ϥήɦX<C9A6>k)<29>C\n\
-   /P user:perm  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
-                 Perm <20>i<EFBFBD>H<EFBFBD>O: N  <20>L \n\
-                              R  Ū<><C5AA> \n\
-                              W  <20>g<EFBFBD>J \n\
-                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
-                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
-   /D user       <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD>ݡC\n\
-<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>H<EFBFBD>ϥγq<EFBFBD>t<EFBFBD>ū<EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>Ӥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
-<EFBFBD>z<EFBFBD>]<5D>i<EFBFBD>H<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>ӥΤ<D3A5><CEA4>C\n\n\
-<EFBFBD>Y<EFBFBD>g: \n\
-   CI - <20>e<EFBFBD><65><EFBFBD>~<7E>ӡC\n\
-        ACE<43>|<7C>ѥؿ<D1A5><D8BF>~<7E>ӡC\n\
-   OI - <20><><EFBFBD>H<EFBFBD>~<7E>ӡC\n\
-        ACE <20>|<7C>Ѥ<EFBFBD><D1A4><EFBFBD><EFBFBD>~<7E>ӡC\n\
-   IO - <20>u<EFBFBD>~<7E>ӡC\n\
-        ACE <20><><EFBFBD>A<EFBFBD>Ω<EFBFBD><CEA9><EFBFBD><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD>/<2F>ؿ<EFBFBD><D8BF>C\n"
-
-IDS_ABBR_CI, "(CI)"
-IDS_ABBR_OI, "(OI)"
-IDS_ABBR_IO, "(IO)"
-IDS_ABBR_FULL, "F"
-IDS_ABBR_READ, "R"
-IDS_ABBR_WRITE, "W"
-IDS_ABBR_CHANGE, "C"
-IDS_ABBR_NONE, "N"
-IDS_ALLOW, ""
-IDS_DENY, "(DENY)"
-IDS_SPECIAL_ACCESS, "(special access:)"
-IDS_GENERIC_READ, "GENERIC_READ"
-IDS_GENERIC_WRITE, "GENERIC_WRITE"
-IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
-IDS_GENERIC_ALL, "GENERIC_ALL"
-IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
-IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
-IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
-IDS_FILE_READ_DATA, "FILE_READ_DATA"
-IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
-IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
-IDS_FILE_READ_EA, "FILE_READ_EA"
-IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
-IDS_FILE_EXECUTE, "FILE_EXECUTE"
-IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
-IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
-IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
-IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
-IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
-IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
-IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
-IDS_SYNCHRONIZE, "SYNCHRONIZE"
-IDS_WRITE_OWNER, "WRITE_OWNER"
-IDS_WRITE_DAC, "WRITE_DAC"
-IDS_READ_CONTROL, "READ_CONTROL"
-IDS_DELETE, "DELETE"
-IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-END
+/*
+ *  cacls (TRADITIONAL Chinese resources)
+ *  (<28>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>귽)
+ *  Copyright 2007 jauming <jauming.tw@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "<22><><EFBFBD>ܩΪ̭ק<CCAD><D7A7><EFBFBD><EFBFBD>󪺳X<F3AABAB3>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD><EFBFBD> \n\n\
+CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
+               [/P user:perm [...]] [/D user [...]]\n\
+   filename      <20><><EFBFBD><EFBFBD> ACLs<4C>C\n\
+   /T            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>ؿ<EFBFBD><D8BF>Ψ<EFBFBD><CEA8>Ҧ<EFBFBD><D2A6>l<EFBFBD>ؿ<EFBFBD><D8BF><EFBFBD>\n\
+                 <20><><EFBFBD>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ACL<43>C\n\
+   /E            <20>s<EFBFBD><73> ACL <20>Ӥ<EFBFBD><D3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
+   /C            <20>b<EFBFBD>X<EFBFBD>{<7B>ڵ<EFBFBD><DAB5>X<EFBFBD>ݿ<EFBFBD><DDBF>~<7E><><EFBFBD>~<7E><><EFBFBD>C\n\
+   /G user:perm  <20>ᤩ<EFBFBD><E1A4A9><EFBFBD>w<EFBFBD>Τ<EFBFBD><CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
+                 Perm <20>i<EFBFBD>H<EFBFBD>O: R  Ū<><C5AA> \n\
+                              W  <20>g<EFBFBD>J \n\
+                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
+                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
+   /R user       <20>M<EFBFBD>P<EFBFBD><50><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76>(<28>Ȧb<C8A6>O /E <20>@<40>_<EFBFBD>ϥήɦX<C9A6>k)<29>C\n\
+   /P user:perm  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD><58><EFBFBD>v<EFBFBD><76><EFBFBD>C\n\
+                 Perm <20>i<EFBFBD>H<EFBFBD>O: N  <20>L \n\
+                              R  Ū<><C5AA> \n\
+                              W  <20>g<EFBFBD>J \n\
+                              C  <20><><EFBFBD><EFBFBD>(<28>g<EFBFBD>J) \n\
+                              F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
+   /D user       <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD>w<EFBFBD>Τ᪺<CEA4>X<EFBFBD>ݡC\n\
+<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>H<EFBFBD>ϥγq<EFBFBD>t<EFBFBD>ū<EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>Ӥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n\
+<EFBFBD>z<EFBFBD>]<5D>i<EFBFBD>H<EFBFBD>b<EFBFBD>R<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>h<EFBFBD>ӥΤ<D3A5><CEA4>C\n\n\
+<EFBFBD>Y<EFBFBD>g: \n\
+   CI - <20>e<EFBFBD><65><EFBFBD>~<7E>ӡC\n\
+        ACE<43>|<7C>ѥؿ<D1A5><D8BF>~<7E>ӡC\n\
+   OI - <20><><EFBFBD>H<EFBFBD>~<7E>ӡC\n\
+        ACE <20>|<7C>Ѥ<EFBFBD><D1A4><EFBFBD><EFBFBD>~<7E>ӡC\n\
+   IO - <20>u<EFBFBD>~<7E>ӡC\n\
+        ACE <20><><EFBFBD>A<EFBFBD>Ω<EFBFBD><CEA9><EFBFBD><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD>/<2F>ؿ<EFBFBD><D8BF>C\n"
+
+IDS_ABBR_CI, "(CI)"
+IDS_ABBR_OI, "(OI)"
+IDS_ABBR_IO, "(IO)"
+IDS_ABBR_FULL, "F"
+IDS_ABBR_READ, "R"
+IDS_ABBR_WRITE, "W"
+IDS_ABBR_CHANGE, "C"
+IDS_ABBR_NONE, "N"
+IDS_ALLOW, ""
+IDS_DENY, "(DENY)"
+IDS_SPECIAL_ACCESS, "(special access:)"
+IDS_GENERIC_READ, "GENERIC_READ"
+IDS_GENERIC_WRITE, "GENERIC_WRITE"
+IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
+IDS_GENERIC_ALL, "GENERIC_ALL"
+IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
+IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
+IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
+IDS_FILE_READ_DATA, "FILE_READ_DATA"
+IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
+IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
+IDS_FILE_READ_EA, "FILE_READ_EA"
+IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
+IDS_FILE_EXECUTE, "FILE_EXECUTE"
+IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
+IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
+IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
+IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
+IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
+IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
+IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
+IDS_SYNCHRONIZE, "SYNCHRONIZE"
+IDS_WRITE_OWNER, "WRITE_OWNER"
+IDS_WRITE_DAC, "WRITE_DAC"
+IDS_READ_CONTROL, "READ_CONTROL"
+IDS_DELETE, "DELETE"
+IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
+END

reactos/base/applications/cacls/resource.h

@@ -1,5 +1,4 @@
-#ifndef _CACLS_RESOURCE_H
-#define _CACLS_RESOURCE_H
+#pragma once
 
 #define IDS_HELP                        101
 #define IDS_ABBR_CI                     102
@@ -40,5 +39,3 @@
 #define IDS_READ_CONTROL                137
 #define IDS_DELETE                      138
 #define IDS_STANDARD_RIGHTS_ALL         139
-
-#endif /* _CACLS_RESOURCE_H */

reactos/base/applications/cacls/rsrc.rc

@@ -10,6 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

reactos/base/applications/calc/calc.h

@@ -1,5 +1,4 @@
-#ifndef __CALC_H__
-#define __CALC_H__
+#pragma once
 
 #include <windows.h>
 #include <tchar.h>
@@ -236,5 +235,3 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);
-
-#endif

reactos/base/applications/calc/calc.rbuild

@@ -4,7 +4,6 @@
 	<include base="calc">.</include>
 	<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
 	<library>advapi32</library>
-	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<file>about.c</file>

reactos/base/applications/calc/convert.c

@@ -56,35 +56,35 @@ static const conv_t conv_ANGLE[] = {
 
 /*
     1 acre ................ = 4840 square yd = 4046,8564224 mq
-    1 acre brazil ......... = 
-    1 acre france ......... = 
+    1 acre brazil ......... =
+    1 acre france ......... =
     1 acre scots .......... = 5000 mq
     1 acre us ............. = 4840*(36/39.37)^2 m = 6272640/1549.9969 m
     1 are ................. = 100 mq
     1 chou ................ = 108000*(10/33)^2 mq
-    1 danbo ............... = 
+    1 danbo ............... =
     1 ha .................. = 10000 mq
-    1 jeongbo ............. = 
-    1 morgen hungary ...... = 
-    1 mu .................. = 
-    1 ping ................ = 
-    1 pyeong .............. = 
-    1 pyeongbangja ........ = 
-    1 rai ................. = 
+    1 jeongbo ............. =
+    1 morgen hungary ...... =
+    1 mu .................. = 2000/3 mq
+    1 ping ................ =
+    1 pyeong .............. =
+    1 pyeongbangja ........ =
+    1 rai ................. = 1600 mq
     1 se .................. = 1080*(10/33)^2 mq
     1 square cm ........... = 0.0001 mq
-    1 square chr .......... = 
+    1 square chr .......... =
     1 square fathom ....... = 1.8288^2 = 3.34450944 mq
     1 square fathom hungary = 1.8964838^2 = 3.59665080366244 mq
     1 square ft ........... = 0,09290304 mq
     1 square in ........... = 0,00064516 mq
     1 square km ........... = 1000000 mq
-    1 square lar .......... = 
+    1 square lar .......... =
     1 square mile ......... = 1609.344^2 = 2589988.110336 mq
     1 square mm ........... = 0,000001 mq
     1 square shaku ........ = (10/33)^2 mq
-    1 square tsuen ........ = 
-    1 square va ........... = 
+    1 square tsuen ........ =
+    1 square va ........... =
     1 square yard ......... = 0,83612736 mq
     1 tan ................. = 10800*(10/33)^2 mq
     1 tsubo ............... = 36*(10/33)^2 mq
@@ -101,11 +101,11 @@ static const conv_t conv_AREA[] = {
     DECLARE_CONV_UNIT(AREA, HECTARES,               "$*10000",           "$/10000")
 //    DECLARE_CONV_UNIT(AREA, JEONGBO,                "$", "$")
 //    DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY,         "$", "$")
-//    DECLARE_CONV_UNIT(AREA, MU,                     "$", "$")
+    DECLARE_CONV_UNIT(AREA, MU,                     "$*(2000/3)", "$/(2000/3)")
 //    DECLARE_CONV_UNIT(AREA, PING,                   "$", "$")
 //    DECLARE_CONV_UNIT(AREA, PYEONG,                 "$", "$")
 //    DECLARE_CONV_UNIT(AREA, PYEONGBANGJA,           "$", "$")
-//    DECLARE_CONV_UNIT(AREA, RAI,                    "$", "$")
+    DECLARE_CONV_UNIT(AREA, RAI,                    "$*1600", "$/1600")
     DECLARE_CONV_UNIT(AREA, SE,                     "$*108000/1089",     "$*1089/108000")
     DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS,     "$*0,0001",          "$/0,0001")
 //    DECLARE_CONV_UNIT(AREA, SQUARE_CHR,             "$", "$")
@@ -197,46 +197,47 @@ static const conv_t conv_ENERGY[] = {
     1 barleycorn ..... = 1/3 inch = 0.9144/108 m
     1 cm ............. = 1/100 m
     1 chain uk ....... = 22 yards = 22*0.9144 m
-    1 chi ............ = 
+    1 chi ............ = 1/3 m
     1 chou ........... = 3600/33 m
-    1 chr ............ = 
+    1 chr ............ =
+    1 cun ............ = 1/10 chi = 1/30 m
     1 fathom ......... = 2 yard = 2*0.9144 m
     1 fathom ungary .. = 1.8964838 m (fixed)
     1 feet ........... = 12 inch = 0.9144/3 m
     1 furlong ........ = 10 chains = 220*0.9144 m
-    1 gan ............ = 
+    1 gan ............ =
     1 hand ........... = 4 inches = 0.9144/9 m
-    1 hunh ........... = 
+    1 hunh ........... =
     1 inch ........... = yard/36 = 0.9144/36 m
-    1 ja ............. = 
-    1 jeong .......... = 
-    1 kabiet ......... = 
+    1 ja ............. =
+    1 jeong .......... =
+    1 kabiet ......... =
     1 ken ............ = 60/33 m
-    1 keub ........... = 
+    1 keub ........... =
     1 km ............. = 1000 m
-    1 lar ............ = 
+    1 lar ............ =
     1 light year ..... = 9460730472580800 m
     1 link uk ........ = 0.01 chains = 0.22*0.9144 m
     1 micron ......... = 0.000001 m
     1 mile ........... = 1760 yards = 1609.344 m
     1 millimeter ..... = 1/1000 m
     1 nautical mile .. = 1852 m
-    1 nieu ........... = 
+    1 nieu ........... =
     1 parsec ......... = 30856800000000000 m
     1 pica ........... = yard/216 = 0.9144/216 m
-    1 ri japan ....... = 
-    1 ri korea ....... = 
+    1 ri japan ....... =
+    1 ri korea ....... =
     1 rod ............ = 5.0292 m
-    1 sawk ........... = 
-    1 sen ............ = 
+    1 sawk ........... =
+    1 sen ............ =
     1 shaku .......... = 10/33 m
     1 span ........... = 9 inches = 0.9144/4 m
-    1 sun ............ = 10/330 m
-    1 tsuen .......... = 
-    1 va ............. = 
+    1 sun ............ = 1/33 m
+    1 tsuen .......... =
+    1 va ............. =
     1 yard ........... = 0.9144 m
-    1 yote ........... = 
-    1 zhang .......... = 
+    1 yote ........... =
+    1 zhang .......... =
 */
 static const conv_t conv_LENGTH[] = {
     DECLARE_CONV_UNIT(LENGTH, ANGSTROMS,            "$*0.0000000001",   "$/0.0000000001")
@@ -244,10 +245,10 @@ static const conv_t conv_LENGTH[] = {
     DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS,          "$*0.9144/108",     "$/0.9144*108")
     DECLARE_CONV_UNIT(LENGTH, CENTIMETERS,          "$/100",            "$*100")
     DECLARE_CONV_UNIT(LENGTH, CHAINS_UK,            "$*20.1168",        "$/20.1168")
-//    DECLARE_CONV_UNIT(LENGTH, CHI,                  "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, CHI,                  "$/3",              "$*3")
     DECLARE_CONV_UNIT(LENGTH, CHOU,                 "$*3600/33",        "$*33/3600")
 //    DECLARE_CONV_UNIT(LENGTH, CHR,                  "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, CUN,                  "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, CUN,                  "$/30",             "$*30")
     DECLARE_CONV_UNIT(LENGTH, FATHOMS,              "$*1.8288",         "$/1.8288")
     DECLARE_CONV_UNIT(LENGTH, FATHOMS_HUNGARY,      "$*1.8964838",      "$/1.8964838")
     DECLARE_CONV_UNIT(LENGTH, FEET,                 "$*0.3048",         "$/0.3048")
@@ -280,7 +281,7 @@ static const conv_t conv_LENGTH[] = {
 //    DECLARE_CONV_UNIT(LENGTH, SEN,                  "$", "$")
     DECLARE_CONV_UNIT(LENGTH, SHAKU,                "$*10/33",          "$*33/10")
     DECLARE_CONV_UNIT(LENGTH, SPAN,                 "$*0.9144/4",       "$*4/0.9144")
-    DECLARE_CONV_UNIT(LENGTH, SUN,                  "$*10/330",         "$*330/10")
+    DECLARE_CONV_UNIT(LENGTH, SUN,                  "$*1/33",            "$*33")
 //    DECLARE_CONV_UNIT(LENGTH, TSUEN,                "$", "$")
 //    DECLARE_CONV_UNIT(LENGTH, VA,                   "$", "$")
     DECLARE_CONV_UNIT(LENGTH, YARDS,                "$*0.9144",         "$/0.9144")
@@ -312,7 +313,7 @@ static const conv_t conv_POWER[] = {
     1 hPa   = 100 Pa
     1 kPa   = 1000 Pa
     1 mm HG = 133.322 Pa
-    1 psi   = 6894.757 Pa 
+    1 psi   = 6894.757 Pa
 */
 static const conv_t conv_PRESSURE[] = {
     DECLARE_CONV_UNIT(PRESSURE, ATMOSPHERES,   "$*101325",   "$/101325")
@@ -330,18 +331,20 @@ static const conv_t conv_PRESSURE[] = {
     1 hour ...... = 3600 s
     1 microsecond = 0.000001 s
     1 millisecond = 0.001 s
+    1 nanosecond. = 0.000000001 s
     1 minute .... = 60 s
     1 week ...... = 669600 s
 */
 static const conv_t conv_TIME[] = {
-    DECLARE_CONV_UNIT(TIME, MINUTES,      "$*60",       "$/60")
-    DECLARE_CONV_UNIT(TIME, DAYS,         "$*86400",    "$/86400")
-    DECLARE_CONV_UNIT(TIME, HOURS,        "$*3600",     "$/3600")
-    DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001",    "$/0.001")
-    DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001")
-    DECLARE_CONV_UNIT(TIME, SECONDS,      "$",          "$")
-    DECLARE_CONV_UNIT(TIME, WEEKS,        "$*604800",   "$/604800")
-    DECLARE_CONV_UNIT(TIME, YEARS,        "$*31556952", "$/31556952")
+    DECLARE_CONV_UNIT(TIME, MINUTES,      "$*60",          "$/60")
+    DECLARE_CONV_UNIT(TIME, DAYS,         "$*86400",       "$/86400")
+    DECLARE_CONV_UNIT(TIME, HOURS,        "$*3600",        "$/3600")
+    DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001",       "$/0.001")
+    DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001",    "$/0.000001")
+    DECLARE_CONV_UNIT(TIME, NANOSECONDS,  "$*0.000000001", "$/0.000000001")
+    DECLARE_CONV_UNIT(TIME, SECONDS,      "$",             "$")
+    DECLARE_CONV_UNIT(TIME, WEEKS,        "$*604800",      "$/604800")
+    DECLARE_CONV_UNIT(TIME, YEARS,        "$*31556952",    "$/31556952")
     DECLARE_CONV_END
 };
 
@@ -382,7 +385,7 @@ static const conv_t conv_VELOCITY[] = {
 /*
     1 barrel uk ...... = 163.65924 l
     1 barrel oil ..... = 158.987295 l
-    1 bun ............ = 
+    1 bun ............ =
     1 bushel uk ...... = 36.36872 l
     1 bushel us ...... = 35.23907017 l
     1 cubic cm  ...... = 0.001 l
@@ -390,17 +393,17 @@ static const conv_t conv_VELOCITY[] = {
     1 cubic inch ..... = 0.016387064 l
     1 cubic meter .... = 1000 l
     1 cubic yard ..... = 764.554857 l
-    1 doe ............ = 
+    1 doe ............ =
     1 fluid ounce uk   = 0.0284130625 l
     1 fluid ounce us   = 0.0295735295625 l
     1 gallon uk ...... = 4.54609 l
     1 gallon dry us .. = 4.40488377086 l
     1 gallon liquid us = 3.785411784 l
     1 gou ............ = 0.1809 l
-    1 hop ............ = 
-    1 icce ........... = 
-    1 kwian .......... = 
-    1 mal ............ = 
+    1 hop ............ =
+    1 icce ........... =
+    1 kwian .......... =
+    1 mal ............ =
     1 milliliter ..... = 0.001 l
     1 pint uk ........ = 0.56826125 l
     1 pint dry us .... = 0.5506104713575 l
@@ -408,10 +411,10 @@ static const conv_t conv_VELOCITY[] = {
     1 quart uk ....... = 1.1365225 l
     1 quart dry us ... = 1.101220942715 l
     1 quart liquid us  = 0.946352946 l
-    1 seki ........... = 
-    1 syou ........... = 
-    1 tananloung ..... = 
-    1 tang ........... = 
+    1 seki ........... =
+    1 syou ........... =
+    1 tananloung ..... =
+    1 tang ........... =
     1 to ............. = 18040 l
 */
 static const conv_t conv_VOLUME[] = {
@@ -455,16 +458,16 @@ static const conv_t conv_VOLUME[] = {
 /*
     1 baht ............ = 12.244 g
     1 carat ........... = 0.2 g
-    1 chung ........... = 
-    1 don ............. = 
-    1 geun ............ = 
-    1 gwan ............ = 
-    1 harb ............ = 
-    1 jin china ....... = 
-    1 jin taiwan ...... = 
-    1 Kan ............. =
+    1 chung ........... =
+    1 don ............. =
+    1 geun ............ =
+    1 gwan ............ =
+    1 harb ............ =
+    1 jin china ....... =
+    1 jin taiwan ...... =
+    1 Kan ............. = 3750 g
     1 Kilograms ....... = 1000 g
-    1 Kin ............. =
+    1 Kin ............. = 600 g
     1 Liang China ..... =
     1 Liang Taiwan .... =
     1 monme ........... = 3.75 g
@@ -472,9 +475,9 @@ static const conv_t conv_VOLUME[] = {
     1 ounce troy ...... = 31.1034768 g
     1 pound ........... = 453.59237 g
     1 quintal metric .. = 100000 g
-    1 saloung ......... = 
+    1 saloung ......... =
     1 stone ........... = 6350.29318 g
-    1 tamlung ......... = 
+    1 tamlung ......... =
     1 ton ............. = 1000000 g
     1 ton uk .......... = 1016046.9088 g  // long ton
     1 ton us .......... = 907184.74 g     // short ton
@@ -490,9 +493,9 @@ static const conv_t conv_WEIGHT[] = {
 //    DECLARE_CONV_UNIT(WEIGHT, HARB,                 "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA,            "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, JIN_TAIWAN,           "$", "$")
-//    DECLARE_CONV_UNIT(WEIGHT, KAN,                  "$", "$")
+    DECLARE_CONV_UNIT(WEIGHT, KAN,                  "$*3750",         "$/3750")
     DECLARE_CONV_UNIT(WEIGHT, KILOGRAMS,            "$*1000",         "$/1000")
-//    DECLARE_CONV_UNIT(WEIGHT, KIN,                  "$", "$")
+    DECLARE_CONV_UNIT(WEIGHT, KIN,                  "$*600",          "$/600")
 //    DECLARE_CONV_UNIT(WEIGHT, LIANG_CHINA,          "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN,         "$", "$")
     DECLARE_CONV_UNIT(WEIGHT, MONME,                "$*3.75",         "$/3.75")
@@ -548,7 +551,7 @@ void ConvExecute(HWND hWnd)
             break;
         }
     }
-    
+
     /* The units can be sorted, so I must search the exact match */
     item = items;
     SendDlgItemMessage(hWnd, IDC_COMBO_FROM, CB_GETLBTEXT, from, (LPARAM)txt_cb);

reactos/base/applications/calc/lang/bg-BG.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "<22><><EFBFBD>"
     IDS_TIME_HOURS        "<22><><EFBFBD><EFBFBD>"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MILLISECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

reactos/base/applications/calc/lang/cs-CZ.rc

@@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Dny"
     IDS_TIME_HOURS        "Hodiny"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Mikrosekundy"
     IDS_TIME_MILLISECONDS "Milisekundy"
     IDS_TIME_MINUTES      "Minuty"

reactos/base/applications/calc/lang/de-DE.rc

@@ -324,7 +324,7 @@ END
 
 IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Statistik Box"
+CAPTION "Statistikbox"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
@@ -465,11 +465,11 @@ END
 // FL<46>CHENTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_AREA_ACRES                  "Acres"
-    IDS_AREA_ACRES_BRAZIL           "Acres (Brasilien)"
-    IDS_AREA_ACRES_FRANCE           "Acres (Frankreich)"
-    IDS_AREA_ACRES_SCOTS            "Acres (Schottland)"
-    IDS_AREA_ACRES_US               "Acres (USA)"
+    IDS_AREA_ACRES                  "Acre"
+    IDS_AREA_ACRES_BRAZIL           "Acre (Brasilien)"
+    IDS_AREA_ACRES_FRANCE           "Acre (Frankreich)"
+    IDS_AREA_ACRES_SCOTS            "Acre (Schottland)"
+    IDS_AREA_ACRES_US               "Acre (USA)"
     IDS_AREA_ARES                   "Ar"
     IDS_AREA_CHOU                   "Chou"
     IDS_AREA_DANBO                  "Danbo"
@@ -482,21 +482,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CHR             "Qaudratchr"
-    IDS_AREA_SQUARE_FATHOMS         "Qaudratfathom"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Qaudratfathom (Ungarn)"
-    IDS_AREA_SQUARE_FEET            "Qaudratfu<EFBFBD>"
-    IDS_AREA_SQUARE_KILOMETERS      "Qaudratkilometer"
-    IDS_AREA_SQUARE_LAR             "Qaudratlar"
-    IDS_AREA_SQUARE_METER           "Qaudratmeter"
-    IDS_AREA_SQUARE_MILES           "Qaudratmeilen"
-    IDS_AREA_SQUARE_MILLIMETERS     "Qaudratmillimeter"
-    IDS_AREA_SQUARE_SHAKU           "Qaudratshaku"
-    IDS_AREA_SQUARE_TSUEN           "Qaudrattsuen"
-    IDS_AREA_SQUARE_VA              "Qaudratva"
-    IDS_AREA_SQUARE_YARD            "Qaudratyard"
+    IDS_AREA_SQUARE_CHR             "Quadratchr"
+    IDS_AREA_SQUARE_FATHOMS         "Quadratfathom"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Quadratfathom (Ungarn)"
+    IDS_AREA_SQUARE_FEET            "Quadratfu<EFBFBD>"
+    IDS_AREA_SQUARE_KILOMETERS      "Quadratkilometer"
+    IDS_AREA_SQUARE_LAR             "Quadratlar"
+    IDS_AREA_SQUARE_METER           "Quadratmeter"
+    IDS_AREA_SQUARE_MILES           "Quadratmeilen"
+    IDS_AREA_SQUARE_MILLIMETERS     "Quadratmillimeter"
+    IDS_AREA_SQUARE_SHAKU           "Quadratshaku"
+    IDS_AREA_SQUARE_TSUEN           "Quadrattsuen"
+    IDS_AREA_SQUARE_VA              "Quadratva"
+    IDS_AREA_SQUARE_YARD            "Quadratyard"
     IDS_AREA_SQUARE_CENTIMETERS     "Quadratzentimeter"
-    IDS_AREA_SQUARE_INCHES          "Qaudratzoll"
+    IDS_AREA_SQUARE_INCHES          "Quadratzoll"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -517,7 +517,7 @@ BEGIN
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_EURO               "Euro"
     IDS_CURRENCY_FINNISH_MARKKA     "Finnische Mark"
-    IDS_CURRENCY_FRENCH_FRANC       "Franz<6E>schishe Franc"
+    IDS_CURRENCY_FRENCH_FRANC       "Franz<6E>schische Franc"
     IDS_CURRENCY_GREEK_DRACHMA      "Griechische Drachme"
     IDS_CURRENCY_IRISH_POUND        "Irische Pfund"
     IDS_CURRENCY_ITALIAN_LIRA       "Italienische Lire"
@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Tagen"
     IDS_TIME_HOURS        "Stunden"
+    IDS_TIME_NANOSECONDS  "Nanosekunden"
     IDS_TIME_MICROSECONDS "Mikrosekunden"
     IDS_TIME_MILLISECONDS "Millisekunden"
     IDS_TIME_MINUTES      "Minuten"

reactos/base/applications/calc/lang/el-GR.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "<22><><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_HOURS        "<22><><EFBFBD><EFBFBD>"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MILLISECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD>"

reactos/base/applications/calc/lang/en-US.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconds"
     IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"

reactos/base/applications/calc/lang/es-ES.rc

@@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "D<>as"
     IDS_TIME_HOURS        "Horas"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsegundos"
     IDS_TIME_MILLISECONDS "Milisegundos"
     IDS_TIME_MINUTES      "Minutos"

reactos/base/applications/calc/lang/fr-FR.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Jours"
     IDS_TIME_HOURS        "Heures"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsecondes"
     IDS_TIME_MILLISECONDS "Millisecondes"
     IDS_TIME_MINUTES      "Minutes"

reactos/base/applications/calc/lang/it-IT.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Giorni"
     IDS_TIME_HOURS        "Ore"
+    IDS_TIME_NANOSECONDS  "Nanosecondi"
     IDS_TIME_MICROSECONDS "Microsecondi"
     IDS_TIME_MILLISECONDS "Millisecondi"
     IDS_TIME_MINUTES      "Minuti"

reactos/base/applications/calc/lang/ko-KR.rc

@@ -643,6 +643,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconds"
     IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"

reactos/base/applications/calc/lang/nl-NL.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Dagen"
     IDS_TIME_HOURS        "Uren"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconden"
     IDS_TIME_MILLISECONDS "Milliseconden"
     IDS_TIME_MINUTES      "Minuten"
@@ -703,7 +704,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Carats"
+    IDS_WEIGHT_CARATS               "Karaat"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"

reactos/base/applications/calc/lang/no-NO.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "**"
     IDS_TIME_HOURS        "**"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "**"
     IDS_TIME_MILLISECONDS "**"
     IDS_TIME_MINUTES      "**"

reactos/base/applications/calc/lang/pl-PL.rc

@@ -464,9 +464,9 @@ END
 // TYPES OF ANGLES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ANGLE_DEGREES       "Stopni"
-    IDS_ANGLE_GRADIANS      "Gradian<EFBFBD>w"
-    IDS_ANGLE_RADIANS       "Radian<EFBFBD>w"
+    IDS_ANGLE_DEGREES       "Stopnie"
+    IDS_ANGLE_GRADIANS      "Gradiany"
+    IDS_ANGLE_RADIANS       "Radiany"
 END
 
 // TYPES OF AREAS
@@ -489,21 +489,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Centymetr<EFBFBD>w kwadratowych"
-    IDS_AREA_SQUARE_CHR             "Chr kwadratowych"
-    IDS_AREA_SQUARE_FATHOMS         "S<><53>ni kwadratowych"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "S<><53>ni kwadratowych (W<>gry)"
-    IDS_AREA_SQUARE_FEET            "St<EFBFBD>p kwadratowych"
-    IDS_AREA_SQUARE_INCHES          "Cali kwadratowych"
-    IDS_AREA_SQUARE_KILOMETERS      "Kilometr<EFBFBD>w kwadratowych"
-    IDS_AREA_SQUARE_LAR             "Lar kwadratowych"
-    IDS_AREA_SQUARE_METER           "Metr<EFBFBD>w kwadratowych"
-    IDS_AREA_SQUARE_MILES           "Mil kwadratowych"
-    IDS_AREA_SQUARE_MILLIMETERS     "Milimetr<EFBFBD>w kwadratowych"
-    IDS_AREA_SQUARE_SHAKU           "Shaku kwadratowych"
-    IDS_AREA_SQUARE_TSUEN           "Tsuen kwadratowych"
-    IDS_AREA_SQUARE_VA              "Va kwadratowych"
-    IDS_AREA_SQUARE_YARD            "Jard<EFBFBD>w kwadratowych"
+    IDS_AREA_SQUARE_CENTIMETERS     "Centymetry kwadratowe"
+    IDS_AREA_SQUARE_CHR             "Chr kwadratowe"
+    IDS_AREA_SQUARE_FATHOMS         "S<><53>nie kwadratowe"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "S<><53>nie kwadratowe (W<>gry)"
+    IDS_AREA_SQUARE_FEET            "Stopy kwadratowe"
+    IDS_AREA_SQUARE_INCHES          "Cale kwadratowe"
+    IDS_AREA_SQUARE_KILOMETERS      "Kilometry kwadratowe"
+    IDS_AREA_SQUARE_LAR             "Lar kwadratowe"
+    IDS_AREA_SQUARE_METER           "Metry kwadratowe"
+    IDS_AREA_SQUARE_MILES           "Mile kwadratowe"
+    IDS_AREA_SQUARE_MILLIMETERS     "Milimetry kwadratowe"
+    IDS_AREA_SQUARE_SHAKU           "Shaku kwadratowe"
+    IDS_AREA_SQUARE_TSUEN           "Tsuen kwadratowe"
+    IDS_AREA_SQUARE_VA              "Va kwadratowe"
+    IDS_AREA_SQUARE_YARD            "Jardy kwadratowe"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -511,10 +511,10 @@ END
 // TYPES OF COMSUMPTIONS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L        "Kilometr<EFBFBD>w/litr"
-    IDS_CONSUMPTION_L_PER_100_KM    "Litr<EFBFBD>w/100 kilometr<74>ws"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (USA)"
+    IDS_CONSUMPTION_KM_PER_L        "Kilometry/litr"
+    IDS_CONSUMPTION_L_PER_100_KM    "Litry/100 kilometr<74>w"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Mile/galon (UK)"
+    IDS_CONSUMPTION_MILES_GALLON_US "Mile/galon (USA)"
 END
 
 // TYPES OF CURRENCIES
@@ -543,56 +543,56 @@ END
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "15 <20>C kalorii"
+    IDS_ENERGY_15_C_CALORIES        "15 <20>C kalorie"
     IDS_ENERGY_BTUS                 "British Thermal Unit"
-    IDS_ENERGY_ERGS                 "Erg<EFBFBD>w"
-    IDS_ENERGY_EVS                  "Elektronowolt"
-    IDS_ENERGY_FOOT_POUNDS          "Foot-pound"
+    IDS_ENERGY_ERGS                 "Ergi"
+    IDS_ENERGY_EVS                  "Elektronowolty"
+    IDS_ENERGY_FOOT_POUNDS          "Stopo-funty"
     IDS_ENERGY_IT_CALORIES          "Mi<4D>dzynarodowa Tablica kalorii"
     IDS_ENERGY_IT_KILOCALORIES      "Mi<4D>dzynarodowa Tablica kilokalorii"
-    IDS_ENERGY_JOULES               "D<>uli"
-    IDS_ENERGY_KILOJOULES           "Kilod<6F>uli"
-    IDS_ENERGY_KILOWATT_HOURS       "Kilowatogodzin"
-    IDS_ENERGY_NUTRITION_CALORIES   "Kalorii spo<70>ywczych"
-    IDS_ENERGY_TH_CALORIES          "Kalorii termochemicznych"
+    IDS_ENERGY_JOULES               "D<>ule"
+    IDS_ENERGY_KILOJOULES           "Kilod<6F>ule"
+    IDS_ENERGY_KILOWATT_HOURS       "Kilowatogodziny"
+    IDS_ENERGY_NUTRITION_CALORIES   "Kalorie spo<70>ywcze"
+    IDS_ENERGY_TH_CALORIES          "Kalorie termochemiczne"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angsztrem<EFBFBD>w"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Jednostek Astronomicznych"
-    IDS_LENGTH_BARLEYCORNS          "Palc<EFBFBD>w"
-    IDS_LENGTH_CENTIMETERS          "Centimetr<EFBFBD>w"
+    IDS_LENGTH_ANGSTROMS            "Angsztremy"
+    IDS_LENGTH_ASTRONOMICAL_UNITS   "Jednostki Astronomiczne"
+    IDS_LENGTH_BARLEYCORNS          "Palce"
+    IDS_LENGTH_CENTIMETERS          "Centymetry"
     IDS_LENGTH_CHAINS_UK            "Chains (UK)"
     IDS_LENGTH_CHI                  "Chi"
     IDS_LENGTH_CHOU                 "Chou"
     IDS_LENGTH_CHR                  "Chr"
     IDS_LENGTH_CUN                  "Cun"
-    IDS_LENGTH_FATHOMS              "S<><53>ni"
-    IDS_LENGTH_FATHOMS_HUNGARY      "S<><53>ni (W<>gry)"
-    IDS_LENGTH_FEET                 "St<EFBFBD>p"
+    IDS_LENGTH_FATHOMS              "S<><53>nie"
+    IDS_LENGTH_FATHOMS_HUNGARY      "S<><53>nie (W<>gry)"
+    IDS_LENGTH_FEET                 "Stopy"
     IDS_LENGTH_FURLONGS             "Furlongs"
     IDS_LENGTH_GAN                  "Gan"
-    IDS_LENGTH_HANDS                "D<>oni"
+    IDS_LENGTH_HANDS                "D<>onie"
     IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Cali"
+    IDS_LENGTH_INCHES               "Cale"
     IDS_LENGTH_JA                   "Ja"
     IDS_LENGTH_JEONG                "Jeong"
     IDS_LENGTH_KABIET               "Kabiet"
     IDS_LENGTH_KEN                  "Ken"
     IDS_LENGTH_KEUB                 "Keub"
-    IDS_LENGTH_KILOMETERS           "Kilometer<EFBFBD>w"
+    IDS_LENGTH_KILOMETERS           "Kilometry"
     IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Lat <20>wietlnych"
+    IDS_LENGTH_LIGHT_YEARS          "Lata <20>wietlne"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
-    IDS_LENGTH_METERS               "Metr<EFBFBD>w"
-    IDS_LENGTH_MICRONS              "Mikrometr<EFBFBD>w"
-    IDS_LENGTH_MILES                "Mil"
-    IDS_LENGTH_MILLIMETERS          "Millimetr<EFBFBD>w"
-    IDS_LENGTH_NAUTICAL_MILES       "Mil morskich"
+    IDS_LENGTH_METERS               "Metry"
+    IDS_LENGTH_MICRONS              "Mikrometry"
+    IDS_LENGTH_MILES                "Mile"
+    IDS_LENGTH_MILLIMETERS          "Milimetry"
+    IDS_LENGTH_NAUTICAL_MILES       "Mile morskie"
     IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parsek<EFBFBD>w"
+    IDS_LENGTH_PARSECS              "Parseki"
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japan)"
     IDS_LENGTH_RI_KOREA             "Ri (Korea)"
@@ -604,7 +604,7 @@ BEGIN
     IDS_LENGTH_SUN                  "Sun"
     IDS_LENGTH_TSUEN                "Tsuen"
     IDS_LENGTH_VA                   "Va"
-    IDS_LENGTH_YARDS                "Jard<EFBFBD>w"
+    IDS_LENGTH_YARDS                "Jardy"
     IDS_LENGTH_YOTE                 "Yote"
     IDS_LENGTH_ZHANG                "Zhang"
 END
@@ -613,23 +613,23 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_POWER_BTUS_PER_MINUTE       "BTU na minut<75>"
-    IDS_POWER_FPS_PER_MINUTE        "Foot-pound na minut<75>"
-    IDS_POWER_HORSEPOWER            "Koni mechanicznych"
-    IDS_POWER_KILOWATTS             "Kilowat<EFBFBD>w"
-    IDS_POWER_MEGAWATTS             "Megawat<EFBFBD>w"
-    IDS_POWER_WATTS                 "Wat<EFBFBD>w"
+    IDS_POWER_FPS_PER_MINUTE        "Stopo-funty na minut<75>"
+    IDS_POWER_HORSEPOWER            "Konie mechaniczne"
+    IDS_POWER_KILOWATTS             "Kilowaty"
+    IDS_POWER_MEGAWATTS             "Megawaty"
+    IDS_POWER_WATTS                 "Waty"
 END
 
 // TYPE OF PRESSURES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES        "Atmosfer"
-    IDS_PRESSURE_BARS               "Bar<EFBFBD>w"
-    IDS_PRESSURE_HECTOPASCALS       "Hektopaskali"
-    IDS_PRESSURE_KILOPASCALS        "Kilopaskali"
-    IDS_PRESSURE_MM_OF_MERCURY      "Millimetr<EFBFBD>w s<>upka rt<72>ci"
-    IDS_PRESSURE_PASCALS            "Paskali"
-    IDS_PRESSURE_PSI                "Funt<EFBFBD>w na cal kwadratowy"
+    IDS_PRESSURE_ATMOSPHERES        "Atmosfery"
+    IDS_PRESSURE_BARS               "Bary"
+    IDS_PRESSURE_HECTOPASCALS       "Hektopaskale"
+    IDS_PRESSURE_KILOPASCALS        "Kilopaskale"
+    IDS_PRESSURE_MM_OF_MERCURY      "Milimetry s<>upka rt<72>ci"
+    IDS_PRESSURE_PASCALS            "Paskale"
+    IDS_PRESSURE_PSI                "Funty na cal kwadratowy"
 END
 
 // TYPES OF TEMPERATURES
@@ -645,60 +645,61 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Dni"
-    IDS_TIME_HOURS        "Godzin"
-    IDS_TIME_MICROSECONDS "Mikrosekund"
-    IDS_TIME_MILLISECONDS "Milisekund"
-    IDS_TIME_MINUTES      "Minut"
-    IDS_TIME_SECONDS      "Sekund"
-    IDS_TIME_WEEKS        "Tygodni"
-    IDS_TIME_YEARS        "Lat"
+    IDS_TIME_HOURS        "Godziny"
+    IDS_TIME_NANOSECONDS  "Nanosekundy"
+    IDS_TIME_MICROSECONDS "Mikrosekundy"
+    IDS_TIME_MILLISECONDS "Milisekundy"
+    IDS_TIME_MINUTES      "Minuty"
+    IDS_TIME_SECONDS      "Sekundy"
+    IDS_TIME_WEEKS        "Tygodnie"
+    IDS_TIME_YEARS        "Lata"
 END
 
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimetr<EFBFBD>w/sekund<6E>"
-    IDS_VELOCITY_FEET_HOUR          "St<EFBFBD>p/godzin<69>"
-    IDS_VELOCITY_FEET_SECOND        "St<EFBFBD>p/sekund<6E>"
-    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometr<EFBFBD>w/godzin<69>"
-    IDS_VELOCITY_KNOTS              "W<>z<EFBFBD><EFBFBD>w"
-    IDS_VELOCITY_MACH               "Mach<EFBFBD>w"
-    IDS_VELOCITY_METERS_SECOND      "Metr<EFBFBD>w/sekund<6E>"
-    IDS_VELOCITY_MILES_HOUR         "Mil/godzin<69>"
+    IDS_VELOCITY_CMS_SECOND         "Centymetry/sekund<6E>"
+    IDS_VELOCITY_FEET_HOUR          "Stopy/godzin<69>"
+    IDS_VELOCITY_FEET_SECOND        "Stopy/sekund<6E>"
+    IDS_VELOCITY_KILOMETERS_HOUR    "Kilometry/godzin<69>"
+    IDS_VELOCITY_KNOTS              "W<>z<EFBFBD>y"
+    IDS_VELOCITY_MACH               "Machy"
+    IDS_VELOCITY_METERS_SECOND      "Metry/sekund<6E>"
+    IDS_VELOCITY_MILES_HOUR         "Mile/godzin<69>"
 END
 
 // TYPES OF VOLUMES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK           "Bary<72>ek (UK)"
-    IDS_VOLUME_BARRELS_OIL          "Bary<72>ek"
+    IDS_VOLUME_BARRELS_UK           "Bary<72>ki (UK)"
+    IDS_VOLUME_BARRELS_OIL          "Bary<72>ki"
     IDS_VOLUME_BUN                  "Bun"
-    IDS_VOLUME_BUSHELS_UK           "Buszli (UK)"
-    IDS_VOLUME_BUSHELS_US           "Buszli (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Centymetr<EFBFBD>w sze<7A>ciennych"
-    IDS_VOLUME_CUBIC_FEET           "St<EFBFBD>p sze<7A>ciennych"
-    IDS_VOLUME_CUBIC_INCHES         "Cali sze<7A>ciennych"
-    IDS_VOLUME_CUBIC_METERS         "Metr<EFBFBD>w sze<7A>ciennych"
-    IDS_VOLUME_CUBIC_YARDS          "Jard<EFBFBD>w sze<7A>ciennych"
+    IDS_VOLUME_BUSHELS_UK           "Buszle (UK)"
+    IDS_VOLUME_BUSHELS_US           "Buszle (US)"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Centymetry sze<7A>cienne"
+    IDS_VOLUME_CUBIC_FEET           "Stopy sze<7A>cienne"
+    IDS_VOLUME_CUBIC_INCHES         "Cale sze<7A>cienne"
+    IDS_VOLUME_CUBIC_METERS         "Metry sze<7A>cienne"
+    IDS_VOLUME_CUBIC_YARDS          "Jardy sze<7A>cienne"
     IDS_VOLUME_DOE                  "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK      "Uncji, p<>yn (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US      "Uncji, p<>yn (US)"
-    IDS_VOLUME_GALLONS_UK           "Galon<EFBFBD>w (UK)"
-    IDS_VOLUME_GALLONS_DRY_US       "Galon<EFBFBD>w, sypkie (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US    "Gallons, p<>yn (US)"
+    IDS_VOLUME_FLUID_OUNCES_UK      "Uncje, p<>yn (UK)"
+    IDS_VOLUME_FLUID_OUNCES_US      "Uncje, p<>yn (US)"
+    IDS_VOLUME_GALLONS_UK           "Galony (UK)"
+    IDS_VOLUME_GALLONS_DRY_US       "Galony, sypkie (US)"
+    IDS_VOLUME_GALLONS_LIQUID_US    "Galony, p<>yn (US)"
     IDS_VOLUME_GOU                  "Gou"
     IDS_VOLUME_HOP                  "Hop"
     IDS_VOLUME_ICCE                 "Icce"
     IDS_VOLUME_KWIAN                "Kwian"
-    IDS_VOLUME_LITERS               "Litr<EFBFBD>w"
+    IDS_VOLUME_LITERS               "Litry"
     IDS_VOLUME_MAL                  "Mal"
-    IDS_VOLUME_MILLILITERS          "Milliliters"
-    IDS_VOLUME_PINTS_UK             "Pint (UK)"
-    IDS_VOLUME_PINTS_DRY_US         "Pint, sypkie (US)"
-    IDS_VOLUME_PINTS_LIQUID_US      "Pint, p<>yn (US)"
-    IDS_VOLUME_QUARTS_UK            "Kwart (UK)"
-    IDS_VOLUME_QUARTS_DRY_US        "Kwart, sypkie (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US     "Kwart, p<>yn (US)"
+    IDS_VOLUME_MILLILITERS          "Mililitry"
+    IDS_VOLUME_PINTS_UK             "Pinty (UK)"
+    IDS_VOLUME_PINTS_DRY_US         "Pinty, sypkie (US)"
+    IDS_VOLUME_PINTS_LIQUID_US      "Pinty, p<>yn (US)"
+    IDS_VOLUME_QUARTS_UK            "Kwarty (UK)"
+    IDS_VOLUME_QUARTS_DRY_US        "Kwarty, sypkie (US)"
+    IDS_VOLUME_QUARTS_LIQUID_US     "Kwarty, p<>yn (US)"
     IDS_VOLUME_SEKI                 "Seki"
     IDS_VOLUME_SYOU                 "Syou"
     IDS_VOLUME_TANANLOUNG           "Tananloung"
@@ -709,26 +710,26 @@ END
 // TYPES OF WEIGHTS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_WEIGHT_BAHT                 "Baht<EFBFBD>w"
-    IDS_WEIGHT_CARATS               "Karat<EFBFBD>w"
+    IDS_WEIGHT_BAHT                 "Bahty"
+    IDS_WEIGHT_CARATS               "Karaty"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"
-    IDS_WEIGHT_GRAMS                "Gram<EFBFBD>w"
+    IDS_WEIGHT_GRAMS                "Gramy"
     IDS_WEIGHT_GWAN                 "Gwan"
     IDS_WEIGHT_HARB                 "Harb"
     IDS_WEIGHT_JIN_CHINA            "Jin (China)"
     IDS_WEIGHT_JIN_TAIWAN           "Jin (Taiwan)"
     IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_KILOGRAMS            "Kilogram<EFBFBD>w"
+    IDS_WEIGHT_KILOGRAMS            "Kilogramy"
     IDS_WEIGHT_KIN                  "Kin"
     IDS_WEIGHT_LIANG_CHINA          "Liang (China)"
     IDS_WEIGHT_LIANG_TAIWAN         "Liang (Taiwan)"
     IDS_WEIGHT_MONME                "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Uncji, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY          "Uncji, aptekarskie"
-    IDS_WEIGHT_POUNDS               "Funt<EFBFBD>w"
-    IDS_WEIGHT_QUINTAL_METRIC       "Kwintali"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Uncje, avoirdupois"
+    IDS_WEIGHT_OUNCES_TROY          "Uncje, aptekarskie"
+    IDS_WEIGHT_POUNDS               "Funty"
+    IDS_WEIGHT_QUINTAL_METRIC       "Kwintale"
     IDS_WEIGHT_SALOUNG              "Saloung"
     IDS_WEIGHT_STONES               "Kamieni"
     IDS_WEIGHT_TAMLUNG              "Tamlung"

reactos/base/applications/calc/lang/ro-RO.rc

@@ -1,5 +1,7 @@
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
+#pragma code_page(65001)
+
 // Dialog
 
 IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
@@ -122,7 +124,7 @@ BEGIN
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON      "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | 
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "<EFBFBD>i",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
+    PUSHBUTTON      "Şi",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | 
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON      "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | 
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
@@ -151,7 +153,7 @@ BEGIN
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON      "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | 
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "<EFBFBD>napoi",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
+    PUSHBUTTON      "Înapoi",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     RTEXT           "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE,
                     WS_EX_CLIENTEDGE
@@ -168,7 +170,7 @@ BEGIN
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON      "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | 
                     BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON      "<EFBFBD>napoi",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
+    PUSHBUTTON      "Înapoi",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     RTEXT           "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE,
                     WS_EX_CLIENTEDGE
@@ -245,7 +247,7 @@ BEGIN
                     BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17
     CONTROL         "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | 
                     BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17
-    CONTROL         "<EFBFBD>napoi",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
+    CONTROL         "Înapoi",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | 
                     BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24,
                     40,17
     RTEXT           "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE,
@@ -349,7 +351,7 @@ BEGIN
     POPUP "Vizualizare"
     BEGIN
         MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<EFBFBD>tiin<EFBFBD>ific",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Ştiințific",                  IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversie",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
@@ -381,7 +383,7 @@ BEGIN
     POPUP "Vizualizare"
     BEGIN
         MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<EFBFBD>tiin<EFBFBD>ific",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Ştiințific",                  IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversie",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5",                     IDM_VIEW_HEX, CHECKED
@@ -414,7 +416,7 @@ BEGIN
     POPUP "Vizualizare"
     BEGIN
         MENUITEM "Standard",                    IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "<EFBFBD>tiin<EFBFBD>ific",                  IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Ştiințific",                  IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversie",                  IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grupare cifre",                IDM_VIEW_GROUP, CHECKED
@@ -431,7 +433,7 @@ END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_STRING_LICENSE      "ReactOS Calc este software liber sub licen<EFBFBD>a GNU GPL. \r\n\r\nG<EFBFBD>si<EFBFBD>i o copie a acestei licen<EFBFBD>e aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea g<EFBFBD>si<EFBFBD>i traduceri ale aceste licen<EFBFBD>e aici:\r\nhttp://www.gnu.org/licenses/translations.html\r\nTraducerea <EFBFBD>n limba rom<EFBFBD>n<EFBFBD> de Petru Dimitriu."
+    IDS_STRING_LICENSE      "ReactOS Calc este software liber sub licența GNU GPL. \r\n\r\nGăsiți o copie a acestei licențe aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea găsiți traduceri ale aceste licențe aici:\r\nhttp://www.gnu.org/licenses/translations.html\r\nTraducerea în limba română de Petru Dimitriu."
     IDS_MATH_ERROR          "Eroare"
     IDS_QUICKHELP           "Ajutor rapid"
 END
@@ -440,18 +442,18 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_CONV_ANGLE          "Unghi"
-    IDS_CONV_AREA           "Suprafa<EFBFBD><EFBFBD>"
+    IDS_CONV_AREA           "Suprafață"
     IDS_CONV_CONSUMPTION    "Consum (motoare)"
-    IDS_CONV_CURRENCY       "Valut<EFBFBD>"
+    IDS_CONV_CURRENCY       "Valută"
     IDS_CONV_ENERGY         "Energie"
     IDS_CONV_LENGTH         "Lungimi"
     IDS_CONV_POWER          "Putere"
     IDS_CONV_PRESSURE       "Presiune"
-    IDS_CONV_TEMPERATURE    "Temperatur<EFBFBD>"
+    IDS_CONV_TEMPERATURE    "Temperatură"
     IDS_CONV_TIME           "Timp"
     IDS_CONV_VELOCITY       "Velocitate"
     IDS_CONV_VOLUME         "Volum"
-    IDS_CONV_WEIGHT         "Mas<EFBFBD>"
+    IDS_CONV_WEIGHT         "Masă"
 END
 
 // TYPES OF ANGLES
@@ -467,7 +469,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_AREA_ACRES                  "Acri"
     IDS_AREA_ACRES_BRAZIL           "Acri (Brazilia)"
-    IDS_AREA_ACRES_FRANCE           "Acri (Fran<EFBFBD>a)"
+    IDS_AREA_ACRES_FRANCE           "Acri (Franța)"
     IDS_AREA_ACRES_SCOTS            "Acri (Scots)"
     IDS_AREA_ACRES_US               "Acri (SUA)"
     IDS_AREA_ARES                   "Ares"
@@ -482,21 +484,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CENTIMETERS     "Centimetri p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_CHR             "Chr p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_FATHOMS         "Fathomi p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathomi p<EFBFBD>tra<EFBFBD>i (Ungaria)"
-    IDS_AREA_SQUARE_FEET            "Picioare p<EFBFBD>trate"
-    IDS_AREA_SQUARE_INCHES          "<EFBFBD>oli p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_KILOMETERS      "Kilometri p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_LAR             "Lar p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_METER           "Metri p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_MILES           "Mile p<EFBFBD>trate"
-    IDS_AREA_SQUARE_MILLIMETERS     "Milimetri p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_SHAKU           "Shaku p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_TSUEN           "Tsuen p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_VA              "Va p<EFBFBD>tra<EFBFBD>i"
-    IDS_AREA_SQUARE_YARD            "Yarzi p<EFBFBD>tra<EFBFBD>i"
+    IDS_AREA_SQUARE_CENTIMETERS     "Centimetri pătrați"
+    IDS_AREA_SQUARE_CHR             "Chr pătrați"
+    IDS_AREA_SQUARE_FATHOMS         "Fathomi pătrați"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathomi pătrați (Ungaria)"
+    IDS_AREA_SQUARE_FEET            "Picioare pătrate"
+    IDS_AREA_SQUARE_INCHES          "țoli pătrați"
+    IDS_AREA_SQUARE_KILOMETERS      "Kilometri pătrați"
+    IDS_AREA_SQUARE_LAR             "Lar pătrați"
+    IDS_AREA_SQUARE_METER           "Metri pătrați"
+    IDS_AREA_SQUARE_MILES           "Mile pătrate"
+    IDS_AREA_SQUARE_MILLIMETERS     "Milimetri pătrați"
+    IDS_AREA_SQUARE_SHAKU           "Shaku pătrați"
+    IDS_AREA_SQUARE_TSUEN           "Tsuen pătrați"
+    IDS_AREA_SQUARE_VA              "Va pătrați"
+    IDS_AREA_SQUARE_YARD            "Yarzi pătrați"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -513,48 +515,48 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "<EFBFBD>iling autriac"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Şiling autriac"
     IDS_CURRENCY_BELGIAN_FRANC      "Franc belgian"
-    IDS_CURRENCY_CYPRIOT_POUND      "Lir<EFBFBD> cipriot<EFBFBD>"
-    IDS_CURRENCY_CZECH_KORUNA       "Coroan<EFBFBD> ceh<EFBFBD>"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Marc<EFBFBD> nem<EFBFBD>easc<EFBFBD>"
+    IDS_CURRENCY_CYPRIOT_POUND      "Liră cipriotă"
+    IDS_CURRENCY_CZECH_KORUNA       "Coroană cehă"
+    IDS_CURRENCY_DEUTSCHE_MARK      "Marcă nemțească"
     IDS_CURRENCY_DUTCH_GUILDER      "Guilder olandez"
     IDS_CURRENCY_EURO               "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA     "Marc<EFBFBD> finlandez<EFBFBD>"
+    IDS_CURRENCY_FINNISH_MARKKA     "Marcă finlandeză"
     IDS_CURRENCY_FRENCH_FRANC       "Franc framcez"
-    IDS_CURRENCY_GREEK_DRACHMA      "Drahm<EFBFBD> greceasc<EFBFBD>"
-    IDS_CURRENCY_IRISH_POUND        "Lir<EFBFBD> irlandez<EFBFBD>"
-    IDS_CURRENCY_ITALIAN_LIRA       "Lir<EFBFBD> italian<EFBFBD>"
+    IDS_CURRENCY_GREEK_DRACHMA      "Drahmă grecească"
+    IDS_CURRENCY_IRISH_POUND        "Liră irlandeză"
+    IDS_CURRENCY_ITALIAN_LIRA       "Liră italiană"
     IDS_CURRENCY_LUXEMBOURG_FRANC   "Franc luxemburghez"
-    IDS_CURRENCY_MALTESE_LIRA       "Litr<EFBFBD> maltez<EFBFBD>"
+    IDS_CURRENCY_MALTESE_LIRA       "Litră malteză"
     IDS_CURRENCY_PORTOGUESE_ESCUDO  "Escudo portughez"
-    IDS_CURRENCY_SLOVAK_KORUNA      "Coroan<EFBFBD> slovac<EFBFBD>"
+    IDS_CURRENCY_SLOVAK_KORUNA      "Coroană slovacă"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Tolar sloven"
-    IDS_CURRENCY_SPANISH_PESETA     "Peseta spaniol<EFBFBD>"
+    IDS_CURRENCY_SPANISH_PESETA     "Peseta spaniolă"
 END
 
 // TYPES OF ENERGIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES        "Calorii 15 <EFBFBD>C"
-    IDS_ENERGY_BTUS                 "Unit<EFBFBD><EFBFBD>i termale britanice"
+    IDS_ENERGY_15_C_CALORIES        "Calorii 15 °C"
+    IDS_ENERGY_BTUS                 "Unități termale britanice"
     IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Electron-Vol<EFBFBD>i"
-    IDS_ENERGY_FOOT_POUNDS          "Picioare-Livr<EFBFBD>"
-    IDS_ENERGY_IT_CALORIES          "Calorii Tabel Interna<EFBFBD>ional"
-    IDS_ENERGY_IT_KILOCALORIES      "Kilocalorii Tabel Interna<EFBFBD>ional"
+    IDS_ENERGY_EVS                  "Electron-Volți"
+    IDS_ENERGY_FOOT_POUNDS          "Picioare-Livră"
+    IDS_ENERGY_IT_CALORIES          "Calorii Tabel Internațional"
+    IDS_ENERGY_IT_KILOCALORIES      "Kilocalorii Tabel Internațional"
     IDS_ENERGY_JOULES               "Jouli"
     IDS_ENERGY_KILOJOULES           "KiloJouli"
     IDS_ENERGY_KILOWATT_HOURS       "Kilowatt ore"
-    IDS_ENERGY_NUTRITION_CALORIES   "Calorii nutri<EFBFBD>ie"
-    IDS_ENERGY_TH_CALORIES          "Calorie termochimic<EFBFBD>"
+    IDS_ENERGY_NUTRITION_CALORIES   "Calorii nutriție"
+    IDS_ENERGY_TH_CALORIES          "Calorie termochimică"
 END
 
 // TYPES OF LENGTHS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LENGTH_ANGSTROMS            "Angstr<EFBFBD>ms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS   "Unit<EFBFBD><EFBFBD>i astronomice"
+    IDS_LENGTH_ANGSTROMS            "Ångströms"
+    IDS_LENGTH_ASTRONOMICAL_UNITS   "Unități astronomice"
     IDS_LENGTH_BARLEYCORNS          "Barleycorns"
     IDS_LENGTH_CENTIMETERS          "Centimetri"
     IDS_LENGTH_CHAINS_UK            "Chains (Marea Britanie)"
@@ -569,7 +571,7 @@ BEGIN
     IDS_LENGTH_GAN                  "Gan"
     IDS_LENGTH_HANDS                "Hands"
     IDS_LENGTH_HUNH                 "Hunh"
-    IDS_LENGTH_INCHES               "Incii (<EFBFBD>oli)"
+    IDS_LENGTH_INCHES               "Incii (țoli)"
     IDS_LENGTH_JA                   "Ja"
     IDS_LENGTH_JEONG                "Jeong"
     IDS_LENGTH_KABIET               "Kabiet"
@@ -577,7 +579,7 @@ BEGIN
     IDS_LENGTH_KEUB                 "Keub"
     IDS_LENGTH_KILOMETERS           "Kilometeri"
     IDS_LENGTH_LAR                  "Lar"
-    IDS_LENGTH_LIGHT_YEARS          "Ani lumin<EFBFBD>"
+    IDS_LENGTH_LIGHT_YEARS          "Ani lumină"
     IDS_LENGTH_LINKS_UK             "Links (Marea Britanie)"
     IDS_LENGTH_METERS               "Metri"
     IDS_LENGTH_MICRONS              "Microni"
@@ -605,12 +607,12 @@ END
 // TYPES OF POWERS
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_POWER_BTUS_PER_MINUTE       "Unit<EFBFBD><EFBFBD>i termice britanice pe minut"
+    IDS_POWER_BTUS_PER_MINUTE       "Unități termice britanice pe minut"
     IDS_POWER_FPS_PER_MINUTE        "Picior-livre pe minut"
     IDS_POWER_HORSEPOWER            "Cai putere"
-    IDS_POWER_KILOWATTS             "Kilowa<EFBFBD>i"
-    IDS_POWER_MEGAWATTS             "Megawa<EFBFBD>i"
-    IDS_POWER_WATTS                 "Wa<EFBFBD>i"
+    IDS_POWER_KILOWATTS             "Kilowați"
+    IDS_POWER_MEGAWATTS             "Megawați"
+    IDS_POWER_WATTS                 "Wați"
 END
 
 // TYPE OF PRESSURES
@@ -620,9 +622,9 @@ BEGIN
     IDS_PRESSURE_BARS               "Bari"
     IDS_PRESSURE_HECTOPASCALS       "Hectopascali"
     IDS_PRESSURE_KILOPASCALS        "Kilopascali"
-    IDS_PRESSURE_MM_OF_MERCURY      "Milimetri coloan<EFBFBD> de mercur"
+    IDS_PRESSURE_MM_OF_MERCURY      "Milimetri coloană de mercur"
     IDS_PRESSURE_PASCALS            "Pascali"
-    IDS_PRESSURE_PSI                "Livre-for<EFBFBD><EFBFBD> pe <EFBFBD>ol p<EFBFBD>trat"
+    IDS_PRESSURE_PSI                "Livre-forță pe țol pătrat"
 END
 
 // TYPES OF TEMPERATURES
@@ -639,25 +641,26 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Zile"
     IDS_TIME_HOURS        "Ore"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsecunde"
     IDS_TIME_MILLISECONDS "Milisecunde"
     IDS_TIME_MINUTES      "Minute"
     IDS_TIME_SECONDS      "Secunde"
-    IDS_TIME_WEEKS        "S<EFBFBD>pt<EFBFBD>m<EFBFBD>ni"
+    IDS_TIME_WEEKS        "Săptămâni"
     IDS_TIME_YEARS        "Ani"
 END
 
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_VELOCITY_CMS_SECOND         "Centimetri/or<EFBFBD>"
-    IDS_VELOCITY_FEET_HOUR          "Picioare/or<EFBFBD>"
-    IDS_VELOCITY_FEET_SECOND        "Picioare/secund<EFBFBD>"
+    IDS_VELOCITY_CMS_SECOND         "Centimetri/oră"
+    IDS_VELOCITY_FEET_HOUR          "Picioare/oră"
+    IDS_VELOCITY_FEET_SECOND        "Picioare/secundă"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometri/ore"
     IDS_VELOCITY_KNOTS              "Nod"
     IDS_VELOCITY_MACH               "Mach"
-    IDS_VELOCITY_METERS_SECOND      "Metri/secund<EFBFBD>"
-    IDS_VELOCITY_MILES_HOUR         "Mile/or<EFBFBD>"
+    IDS_VELOCITY_METERS_SECOND      "Metri/secundă"
+    IDS_VELOCITY_MILES_HOUR         "Mile/oră"
 END
 
 // TYPES OF VOLUMES
@@ -670,7 +673,7 @@ BEGIN
     IDS_VOLUME_BUSHELS_US           "Bushels (SUA)"
     IDS_VOLUME_CUBIC_CENTIMETERS    "Centrimetri cubi"
     IDS_VOLUME_CUBIC_FEET           "Picioare^3"
-    IDS_VOLUME_CUBIC_INCHES         "<EFBFBD>oli cubi"
+    IDS_VOLUME_CUBIC_INCHES         "țoli cubi"
     IDS_VOLUME_CUBIC_METERS         "Metri cubi"
     IDS_VOLUME_CUBIC_YARDS          "Yarzi cubi"
     IDS_VOLUME_DOE                  "Doe"
@@ -729,3 +732,5 @@ BEGIN
     IDS_WEIGHT_TONS_UK              "Tone (Marea Britanie)"
     IDS_WEIGHT_TONS_US              "Tone (SUA)"
 END
+
+#pragma code_page(default)

reactos/base/applications/calc/lang/ru-RU.rc

@@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "<22><><EFBFBD><EFBFBD>"
     IDS_TIME_HOURS        "<22><><EFBFBD>"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MILLISECONDS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

reactos/base/applications/calc/lang/sk-SK.rc

@@ -1,10 +1,9 @@
 /* TRANSLATOR :  M<>rio Ka<4B>m<EFBFBD>r /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  30-01-2008
- * LAST CHANGE:  27-01-2009
+ * LAST CHANGE:  31-05-2010
  * ---------------------------------------
  * TODO:
- * 1. treba usporiada<EFBFBD> jednotky pod<6F>a abecedy
- * 2. pridanie naviga<67>n<EFBFBD>ch zna<6E>iek "&"
+ * pridanie naviga<67>n<EFBFBD>ch zna<6E>iek "&" ?
  */
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -445,30 +444,30 @@ BEGIN
     IDS_QUICKHELP           "R<>chla pomoc"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_TIME           "<22>as"
-    IDS_CONV_LENGTH         "D<><44>ka"
-    IDS_CONV_ENERGY         "Energia"
-    IDS_CONV_WEIGHT         "Hmotnos<6F>"
-    IDS_CONV_CURRENCY       "Mena"
-    IDS_CONV_VOLUME         "Objem"
-    IDS_CONV_AREA           "Plocha"
-    IDS_CONV_VELOCITY       "R<>chlos<6F>"
-    IDS_CONV_CONSUMPTION    "Spotreba motorov" //Spotreba (motory)
-    IDS_CONV_TEMPERATURE    "Teplota"
-    IDS_CONV_PRESSURE       "Tlak"
     IDS_CONV_ANGLE          "Uhol"
+    IDS_CONV_AREA           "Plocha"
+    IDS_CONV_CONSUMPTION    "Spotreba motorov" //Spotreba (motory)
+    IDS_CONV_CURRENCY       "Mena"
+    IDS_CONV_ENERGY         "Energia"
+    IDS_CONV_LENGTH         "D<><44>ka"
     IDS_CONV_POWER          "V<>kon"
+    IDS_CONV_PRESSURE       "Tlak"
+    IDS_CONV_TEMPERATURE    "Teplota"
+    IDS_CONV_TIME           "<22>as"
+    IDS_CONV_VELOCITY       "R<>chlos<6F>"
+    IDS_CONV_VOLUME         "Objem"
+    IDS_CONV_WEIGHT         "Hmotnos<6F>"
 END
 
 // TYPES OF ANGLES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_ANGLE_DEGREES  "Stupne"
     IDS_ANGLE_GRADIANS "Grady"
     IDS_ANGLE_RADIANS  "Radi<64>ny"
-    IDS_ANGLE_DEGREES  "Stupne"
 END
 
 // TYPES OF AREAS
@@ -522,24 +521,24 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Rak<61>sky <20>iling"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgick<63> frank"
     IDS_CURRENCY_CYPRIOT_POUND      "Cypersk<73> libra"
     IDS_CURRENCY_CZECH_KORUNA       "<22>esk<73> koruna"
+    IDS_CURRENCY_DEUTSCHE_MARK      "Nemeck<63> marka"
+    IDS_CURRENCY_DUTCH_GUILDER      "Holandsk<73> gulden"
     IDS_CURRENCY_EURO               "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA     "Finsk<EFBFBD> marka"
+    IDS_CURRENCY_FINNISH_MARKKA     "F<EFBFBD>nska marka"
     IDS_CURRENCY_FRENCH_FRANC       "Franc<6E>zsky frank"
     IDS_CURRENCY_GREEK_DRACHMA      "Gr<47>cka drachma"
-    IDS_CURRENCY_DUTCH_GUILDER      "Holandsk<73> gulden"
-    IDS_CURRENCY_IRISH_POUND        "Irish pound"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembourg franc"
-    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
-    IDS_CURRENCY_DEUTSCHE_MARK      "Nemeck<63> marka"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Rak<61>zsky <20>iling"
+    IDS_CURRENCY_IRISH_POUND        "<22>rska libra"
+    IDS_CURRENCY_ITALIAN_LIRA       "Taliansk<73> l<>ra"
+    IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembursk<EFBFBD> frank"
+    IDS_CURRENCY_MALTESE_LIRA       "Maltsk<EFBFBD> l<EFBFBD>ra"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portugalsk<73> escudo"
     IDS_CURRENCY_SLOVAK_KORUNA      "Slovensk<73> koruna"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovinsk<73> toliar"
     IDS_CURRENCY_SPANISH_PESETA     "<22>panielska peseta"
-    IDS_CURRENCY_ITALIAN_LIRA       "Talianska l<>ra"
 END
 
 // TYPES OF ENERGIES
@@ -571,10 +570,14 @@ BEGIN
     IDS_LENGTH_CHOU                 "Chou"
     IDS_LENGTH_CHR                  "Chr"
     IDS_LENGTH_CUN                  "Cun"
+    IDS_LENGTH_FATHOMS              "Siahy"
+    IDS_LENGTH_FATHOMS_HUNGARY      "Siahy (Ma<4D>arsko)"
+    IDS_LENGTH_FEET                 "Stopy"
     IDS_LENGTH_FURLONGS             "Furlongs"
     IDS_LENGTH_GAN                  "Gan"
     IDS_LENGTH_HANDS                "Hands"
     IDS_LENGTH_HUNH                 "Hunh"
+    IDS_LENGTH_INCHES               "Palce"
     IDS_LENGTH_JA                   "Ja"
     IDS_LENGTH_JEONG                "Jeong"
     IDS_LENGTH_KABIET               "Kabiet"
@@ -582,6 +585,7 @@ BEGIN
     IDS_LENGTH_KEUB                 "Keub"
     IDS_LENGTH_KILOMETERS           "Kilometre"
     IDS_LENGTH_LAR                  "Lar"
+    IDS_LENGTH_LIGHT_YEARS          "Sveteln<6C> roky"
     IDS_LENGTH_LINKS_UK             "Links (UK)"
     IDS_LENGTH_METERS               "Metre"
     IDS_LENGTH_MICRONS              "Mikr<6B>ny"
@@ -589,7 +593,6 @@ BEGIN
     IDS_LENGTH_MILLIMETERS          "Milimetre"
     IDS_LENGTH_NAUTICAL_MILES       "N<>morn<72> m<>le"
     IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_INCHES               "Palce"
     IDS_LENGTH_PARSECS              "Parsecy"
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japonsko)"
@@ -598,12 +601,8 @@ BEGIN
     IDS_LENGTH_SAWK                 "Sawk"
     IDS_LENGTH_SEN                  "Sen"
     IDS_LENGTH_SHAKU                "Shaku"
-    IDS_LENGTH_FATHOMS              "Siahy"
-    IDS_LENGTH_FATHOMS_HUNGARY      "Siahy (Ma<4D>arsko)"
     IDS_LENGTH_SPAN                 "Span"
-    IDS_LENGTH_FEET                 "Stopy"
     IDS_LENGTH_SUN                  "Sun"
-    IDS_LENGTH_LIGHT_YEARS          "Sveteln<6C> roky"
     IDS_LENGTH_TSUEN                "Tsuen"
     IDS_LENGTH_VA                   "Va"
     IDS_LENGTH_YARDS                "Yardy"
@@ -616,8 +615,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_POWER_BTUS_PER_MINUTE       "Britsk<73> term<72>lne jednotky za min<69>tu"
     IDS_POWER_FPS_PER_MINUTE        "Foot-Pounds za min<69>tu"
-    IDS_POWER_KILOWATTS             "Kilowatty"
     IDS_POWER_HORSEPOWER            "Ko<4B>sk<73> sily"
+    IDS_POWER_KILOWATTS             "Kilowatty"
     IDS_POWER_MEGAWATTS             "Megawatty"
     IDS_POWER_WATTS                 "Watty"
 END
@@ -629,9 +628,9 @@ BEGIN
     IDS_PRESSURE_BARS               "Bary"
     IDS_PRESSURE_HECTOPASCALS       "Hektopascals"
     IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_PSI                "Libry na <20>tvorcov<6F> palec"
     IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
     IDS_PRESSURE_PASCALS            "Pascals"
+    IDS_PRESSURE_PSI                "Libry na <20>tvorcov<6F> palec"
 END
 
 // TYPES OF TEMPERATURES
@@ -648,25 +647,26 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Dni"
     IDS_TIME_HOURS        "Hodiny"
+    IDS_TIME_NANOSECONDS  "Nanosekundy"
     IDS_TIME_MICROSECONDS "Mikrosekundy"
     IDS_TIME_MILLISECONDS "Milisekundy"
     IDS_TIME_MINUTES      "Min<69>ty"
-    IDS_TIME_YEARS        "Roky"
     IDS_TIME_SECONDS      "Sekundy"
     IDS_TIME_WEEKS        "T<><54>dne"
+    IDS_TIME_YEARS        "Roky"
 END
 
 // TYPES OF VELOCITIES
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_VELOCITY_CMS_SECOND         "Centimetre/hodinu"
+    IDS_VELOCITY_FEET_HOUR          "Stopy/hodinu"
+    IDS_VELOCITY_FEET_SECOND        "Stopy/sekundu"
     IDS_VELOCITY_KILOMETERS_HOUR    "Kilometre/hodinu"
     IDS_VELOCITY_KNOTS              "Knots"
     IDS_VELOCITY_MACH               "Mach"
     IDS_VELOCITY_METERS_SECOND      "Metre/sekundu"
     IDS_VELOCITY_MILES_HOUR         "M<>le/hodinu"
-    IDS_VELOCITY_FEET_HOUR          "Stopy/hodinu"
-    IDS_VELOCITY_FEET_SECOND        "Stopy/sekundu"
 END
 
 // TYPES OF VOLUMES
@@ -677,6 +677,11 @@ BEGIN
     IDS_VOLUME_BUN                  "Bun"
     IDS_VOLUME_BUSHELS_UK           "Bu<42>ely (UK)" //Bu<42>el, Bu<42>le? Bu<42>ly?
     IDS_VOLUME_BUSHELS_US           "Bu<42>ely (USA)"
+    IDS_VOLUME_CUBIC_CENTIMETERS    "Kubick<63> centimetre"
+    IDS_VOLUME_CUBIC_FEET           "Kubick<63> stopy"
+    IDS_VOLUME_CUBIC_INCHES         "Kubick<63> palce"
+    IDS_VOLUME_CUBIC_METERS         "Kubick<63> metre"
+    IDS_VOLUME_CUBIC_YARDS          "Kubick<63> yardy"
     IDS_VOLUME_DOE                  "Doe"
     IDS_VOLUME_FLUID_OUNCES_UK      "Fluid ounces (UK)"
     IDS_VOLUME_FLUID_OUNCES_US      "Fluid ounces (USA)"
@@ -686,11 +691,6 @@ BEGIN
     IDS_VOLUME_GOU                  "Gou"
     IDS_VOLUME_HOP                  "Hop"
     IDS_VOLUME_ICCE                 "Icce"
-    IDS_VOLUME_CUBIC_CENTIMETERS    "Kubick<63> centimetre"
-    IDS_VOLUME_CUBIC_FEET           "Kubick<63> stopy"
-    IDS_VOLUME_CUBIC_INCHES         "Kubick<63> palce"
-    IDS_VOLUME_CUBIC_METERS         "Kubick<63> metre"
-    IDS_VOLUME_CUBIC_YARDS          "Kubick<63> yardy"
     IDS_VOLUME_KWIAN                "Kwian"
     IDS_VOLUME_LITERS               "Litre"
     IDS_VOLUME_MAL                  "Mal"
@@ -712,7 +712,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_QUINTAL_METRIC       "Cent (metrick<63>)"
+    IDS_WEIGHT_CARATS               "Kar<61>ty"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"
@@ -722,19 +722,19 @@ BEGIN
     IDS_WEIGHT_JIN_CHINA            "Jin (<28><>na)"
     IDS_WEIGHT_JIN_TAIWAN           "Jin (Tchajvan)"
     IDS_WEIGHT_KAN                  "Kan"
-    IDS_WEIGHT_CARATS               "Kar<61>ty"
     IDS_WEIGHT_KILOGRAMS            "Kilogramy"
     IDS_WEIGHT_KIN                  "Kin"
     IDS_WEIGHT_LIANG_CHINA          "Liang (<28><>na)"
     IDS_WEIGHT_LIANG_TAIWAN         "Liang (Tchajvan)"
-    IDS_WEIGHT_POUNDS               "Libry"
     IDS_WEIGHT_MONME                "Monme"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Unce, anglosask<73>"
+    IDS_WEIGHT_OUNCES_TROY          "Unce, tr<74>jska"
+    IDS_WEIGHT_POUNDS               "Libry"
+    IDS_WEIGHT_QUINTAL_METRIC       "Cent (metrick<63>)"
     IDS_WEIGHT_SALOUNG              "Saloung"
     IDS_WEIGHT_STONES               "Stones"
     IDS_WEIGHT_TAMLUNG              "Tamlung"
     IDS_WEIGHT_TONNES               "Tony"
     IDS_WEIGHT_TONS_UK              "Tony (UK)"
     IDS_WEIGHT_TONS_US              "Tony (USA)"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS   "Unce, anglosask<73>"
-    IDS_WEIGHT_OUNCES_TROY          "Unce, tr<74>jska"
 END

reactos/base/applications/calc/lang/th-TH.rc

@@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconds"
     IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"

reactos/base/applications/calc/lang/uk-UA.rc

@@ -647,6 +647,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_TIME_DAYS         "<22><><EFBFBD><EFBFBD>"
     IDS_TIME_HOURS        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MILLISECONDS "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_TIME_MINUTES      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

reactos/base/applications/calc/resource.h

@@ -276,10 +276,11 @@
 #define IDS_TIME_HOURS                  3002
 #define IDS_TIME_MICROSECONDS           3003
 #define IDS_TIME_MILLISECONDS           3004
-#define IDS_TIME_MINUTES                3005
-#define IDS_TIME_SECONDS                3006
-#define IDS_TIME_WEEKS                  3007
-#define IDS_TIME_YEARS                  3008
+#define IDS_TIME_NANOSECONDS            3005
+#define IDS_TIME_MINUTES                3006
+#define IDS_TIME_SECONDS                3007
+#define IDS_TIME_WEEKS                  3008
+#define IDS_TIME_YEARS                  3009
 
 /* TYPES OF VELOCITIES */
 #define IDS_VELOCITY_CMS_SECOND         3100

reactos/base/applications/calc/resource.rc

@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <windows.h>

reactos/base/applications/calc/utl.c

@@ -2,7 +2,6 @@
 
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
 {
-    TCHAR *ptr, *dst;
     calc_number_t tmp;
     int    width;
 
@@ -21,9 +20,12 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
         /* calculate the width of integer number */
         width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
         if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
-            ptr = buffer + _stprintf(buffer, TEXT("%#le"), rpn->f);
+            _stprintf(buffer, TEXT("%#e"), rpn->f);
         else {
-            ptr = buffer + _stprintf(buffer, TEXT("%#*.*lf"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
+            TCHAR *ptr, *dst;
+
+            ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
+            /* format sring ensures there is a '.': */
             dst = _tcschr(buffer, TEXT('.'));
             while (--ptr > dst)
                 if (*ptr != TEXT('0'))

reactos/base/applications/calc/winmain.c

@@ -861,18 +861,18 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
             n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
             if (n == (DWORD)-1)
                 return TRUE;
-			PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
+            PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
             return TRUE;
         case IDC_BUTTON_CD:
             n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
             if (n == (DWORD)-1)
                 return TRUE;
-			SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
+            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
             update_n_stats_items(hWnd, buffer);
             delete_stat_item(n);
             return TRUE;
         case IDC_BUTTON_CAD:
-			SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
+            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
             clean_stat_list();
             update_n_stats_items(hWnd, buffer);
             return TRUE;
@@ -910,20 +910,20 @@ static WPARAM idm_2_idc(int idm)
 static void CopyMemToClipboard(void *ptr)
 {
     if(OpenClipboard(NULL)) {
-	    HGLOBAL  clipbuffer;
-	    TCHAR   *buffer;
+        HGLOBAL  clipbuffer;
+        TCHAR   *buffer;
 
-	    EmptyClipboard();
-	    clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
-	    buffer = (TCHAR *)GlobalLock(clipbuffer);
-	    _tcscpy(buffer, ptr);
-	    GlobalUnlock(clipbuffer);
+        EmptyClipboard();
+        clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
+        buffer = (TCHAR *)GlobalLock(clipbuffer);
+        _tcscpy(buffer, ptr);
+        GlobalUnlock(clipbuffer);
 #ifdef UNICODE
-	    SetClipboardData(CF_UNICODETEXT,clipbuffer);
+        SetClipboardData(CF_UNICODETEXT,clipbuffer);
 #else
-	    SetClipboardData(CF_TEXT,clipbuffer);
+        SetClipboardData(CF_TEXT,clipbuffer);
 #endif
-	    CloseClipboard();
+        CloseClipboard();
     }
 }
 
@@ -942,16 +942,16 @@ static char *ReadClipboard(void)
     char *buffer = NULL;
 
     if (OpenClipboard(NULL)) {
-	    HANDLE  hData = GetClipboardData(CF_TEXT);
+        HANDLE  hData = GetClipboardData(CF_TEXT);
         char   *fromClipboard;
 
         if (hData != NULL) {
             fromClipboard = (char *)GlobalLock(hData);
             if (strlen(fromClipboard))
-    	        buffer = _strupr(_strdup(fromClipboard));
-	        GlobalUnlock( hData );
+                buffer = _strupr(_strdup(fromClipboard));
+            GlobalUnlock( hData );
         }
-	    CloseClipboard();
+        CloseClipboard();
     }
     return buffer;
 }
@@ -1110,20 +1110,20 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
 {
     TCHAR text[64];
     HMENU hMenu = CreatePopupMenu();
-    DWORD idm;
+    BOOL idm;
 
     LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text));
     AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text);
-    idm = (DWORD)TrackPopupMenu(hMenu,
-                                TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
-                                LOWORD(lp),
-                                HIWORD(lp),
-                                0,
-                                hWnd,
-                                NULL);
+    idm = TrackPopupMenu( hMenu,
+                          TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
+                          LOWORD(lp),
+                          HIWORD(lp),
+                          0,
+                          hWnd,
+                          NULL);
     DestroyMenu(hMenu);
 #ifndef DISABLE_HTMLHELP_SUPPORT
-    if (idm != 0) {
+    if (idm) {
         HH_POPUP popup;
 
         memset(&popup, 0, sizeof(popup));
@@ -1139,6 +1139,8 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
         popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID);
         HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup);
     }
+#else
+    (void)idm;
 #endif
 } 
 

reactos/base/applications/charmap/about.c

@@ -1,85 +1,85 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/about.c
- * PURPOSE:     about dialog
- * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-
-#include <precomp.h>
-
-
-static
-INT_PTR
-CALLBACK
-AboutDialogProc(HWND hDlg,
-                UINT message,
-                WPARAM wParam,
-                LPARAM lParam)
-{
-    static HICON hIcon = NULL;
-
-    switch (message)
-    {
-        case WM_INITDIALOG:
-        {
-            HWND  hLicenseEditWnd;
-            WCHAR strLicense[700];
-
-            hIcon = LoadImageW(hInstance,
-                               MAKEINTRESOURCEW(IDI_ICON),
-                               IMAGE_ICON,
-                               16,
-                               16,
-                               0);
-            if (hIcon)
-            {
-                SendMessageW(hDlg,
-                             WM_SETICON,
-                             ICON_SMALL,
-                             (LPARAM)hIcon);
-            }
-
-            hLicenseEditWnd = GetDlgItem(hDlg,
-                                         IDC_LICENSE_EDIT);
-
-            if (LoadStringW(hInstance,
-                            IDS_LICENSE,
-                            strLicense,
-                            sizeof(strLicense) / sizeof(WCHAR)))
-            {
-                SetWindowTextW(hLicenseEditWnd,
-                               strLicense);
-            }
-
-            return TRUE;
-        }
-
-        case WM_COMMAND:
-        {
-            if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
-            {
-                DestroyIcon(hIcon);
-                EndDialog(hDlg,
-                          LOWORD(wParam));
-                return TRUE;
-            }
-
-            break;
-        }
-    }
-
-    return FALSE;
-}
-
-
-VOID
-ShowAboutDlg(HWND hWndParent)
-{
-    DialogBoxW(hInstance,
-               MAKEINTRESOURCEW(IDD_ABOUTBOX),
-               hWndParent,
-               AboutDialogProc);
-}
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/about.c
+ * PURPOSE:     about dialog
+ * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
+ */
+
+
+#include <precomp.h>
+
+
+static
+INT_PTR
+CALLBACK
+AboutDialogProc(HWND hDlg,
+                UINT message,
+                WPARAM wParam,
+                LPARAM lParam)
+{
+    static HICON hIcon = NULL;
+
+    switch (message)
+    {
+        case WM_INITDIALOG:
+        {
+            HWND  hLicenseEditWnd;
+            WCHAR strLicense[700];
+
+            hIcon = LoadImageW(hInstance,
+                               MAKEINTRESOURCEW(IDI_ICON),
+                               IMAGE_ICON,
+                               16,
+                               16,
+                               0);
+            if (hIcon)
+            {
+                SendMessageW(hDlg,
+                             WM_SETICON,
+                             ICON_SMALL,
+                             (LPARAM)hIcon);
+            }
+
+            hLicenseEditWnd = GetDlgItem(hDlg,
+                                         IDC_LICENSE_EDIT);
+
+            if (LoadStringW(hInstance,
+                            IDS_LICENSE,
+                            strLicense,
+                            sizeof(strLicense) / sizeof(WCHAR)))
+            {
+                SetWindowTextW(hLicenseEditWnd,
+                               strLicense);
+            }
+
+            return TRUE;
+        }
+
+        case WM_COMMAND:
+        {
+            if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
+            {
+                DestroyIcon(hIcon);
+                EndDialog(hDlg,
+                          LOWORD(wParam));
+                return TRUE;
+            }
+
+            break;
+        }
+    }
+
+    return FALSE;
+}
+
+
+VOID
+ShowAboutDlg(HWND hWndParent)
+{
+    DialogBoxW(hInstance,
+               MAKEINTRESOURCEW(IDD_ABOUTBOX),
+               hWndParent,
+               AboutDialogProc);
+}

reactos/base/applications/charmap/charmap.c

@@ -1,368 +1,368 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/charmap.c
- * PURPOSE:     main dialog implementation
- * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-#include <precomp.h>
-
-#define ID_ABOUT    0x1
-
-HINSTANCE hInstance;
-
-/* Font-enumeration callback */
-static
-int
-CALLBACK
-EnumFontNames(ENUMLOGFONTEXW *lpelfe,
-              NEWTEXTMETRICEXW *lpntme,
-              DWORD FontType,
-              LPARAM lParam)
-{
-    HWND hwndCombo = (HWND)lParam;
-    LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
-
-    /* make sure font doesn't already exist in our list */
-    if(SendMessageW(hwndCombo,
-                    CB_FINDSTRING,
-                    0,
-                    (LPARAM)pszName) == CB_ERR)
-    {
-        INT idx;
-        BOOL fFixed;
-        BOOL fTrueType;
-
-        /* add the font */
-        idx = (INT)SendMessageW(hwndCombo,
-                                CB_ADDSTRING,
-                                0,
-                                (LPARAM)pszName);
-
-        /* record the font's attributes (Fixedwidth and Truetype) */
-        fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE;
-        fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE;
-
-        /* store this information in the list-item's userdata area */
-        SendMessageW(hwndCombo,
-                     CB_SETITEMDATA,
-                     idx,
-                     MAKEWPARAM(fFixed, fTrueType));
-    }
-
-    return 1;
-}
-
-
-/* Initialize the font-list by enumeration all system fonts */
-static
-VOID
-FillFontStyleComboList(HWND hwndCombo)
-{
-    HDC hdc;
-    LOGFONTW lf;
-
-    /* FIXME: for fun, draw each font in its own style */
-    HFONT hFont = GetStockObject(DEFAULT_GUI_FONT);
-    SendMessageW(hwndCombo,
-                 WM_SETFONT,
-                 (WPARAM)hFont,
-                 0);
-
-    ZeroMemory(&lf, sizeof(lf));
-    lf.lfCharSet = DEFAULT_CHARSET;
-
-    hdc = GetDC(hwndCombo);
-
-    /* store the list of fonts in the combo */
-    EnumFontFamiliesExW(hdc,
-                        &lf,
-                        (FONTENUMPROCW)EnumFontNames,
-                        (LPARAM)hwndCombo,
-                        0);
-
-    ReleaseDC(hwndCombo,
-              hdc);
-
-    SendMessageW(hwndCombo,
-                 CB_SETCURSEL,
-                 0,
-                 0);
-}
-
-
-static
-VOID
-ChangeMapFont(HWND hDlg)
-{
-    HWND hCombo;
-    HWND hMap;
-    LPWSTR lpFontName;
-    INT Len;
-
-    hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO);
-
-    Len = GetWindowTextLengthW(hCombo);
-
-    if (Len != 0)
-    {
-        lpFontName = HeapAlloc(GetProcessHeap(),
-                               0,
-                               (Len + 1) * sizeof(WCHAR));
-
-        if (lpFontName)
-        {
-            SendMessageW(hCombo,
-                         WM_GETTEXT,
-                         Len + 1,
-                         (LPARAM)lpFontName);
-
-            hMap = GetDlgItem(hDlg, IDC_FONTMAP);
-
-            SendMessageW(hMap,
-                         FM_SETFONT,
-                         0,
-                         (LPARAM)lpFontName);
-        }
-
-        HeapFree(GetProcessHeap(),
-                 0,
-                 lpFontName);
-    }
-}
-
-
-static
-VOID
-AddCharToSelection(HWND hText,
-                   WCHAR ch)
-{
-    LPWSTR lpText;
-    INT Len = GetWindowTextLength(hText);
-
-    if (Len != 0)
-    {
-        lpText = HeapAlloc(GetProcessHeap(),
-                           0,
-                           (Len + 2) * sizeof(WCHAR));
-
-        if (lpText)
-        {
-            LPWSTR lpStr = lpText;
-
-            SendMessageW(hText,
-                         WM_GETTEXT,
-                         Len + 1,
-                         (LPARAM)lpStr);
-
-            lpStr += Len;
-            *lpStr = ch;
-            lpStr++;
-            *lpStr = L'\0';
-
-            SendMessageW(hText,
-                         WM_SETTEXT,
-                         0,
-                         (LPARAM)lpText);
-
-            HeapFree(GetProcessHeap(),
-                     0,
-                     lpText);
-        }
-    }
-    else
-    {
-        WCHAR szText[2];
-
-        szText[0] = ch;
-        szText[1] = L'\0';
-
-        SendMessageW(hText,
-                     WM_SETTEXT,
-                     0,
-                     (LPARAM)szText);
-    }
-}
-
-
-static
-INT_PTR
-CALLBACK
-DlgProc(HWND hDlg,
-        UINT Message,
-        WPARAM wParam,
-        LPARAM lParam)
-{
-    static HICON hSmIcon;
-    static HICON hBgIcon;
-    LPWSTR lpAboutText = NULL;
-
-    switch(Message)
-    {
-        case WM_INITDIALOG:
-        {
-            HMENU hSysMenu;
-
-            hSmIcon = LoadImageW(hInstance,
-                                 MAKEINTRESOURCEW(IDI_ICON),
-                                 IMAGE_ICON,
-                                 16,
-                                 16,
-                                 0);
-            if (hSmIcon)
-            {
-                 SendMessageW(hDlg,
-                              WM_SETICON,
-                              ICON_SMALL,
-                              (LPARAM)hSmIcon);
-            }
-
-            hBgIcon = LoadImageW(hInstance,
-                                 MAKEINTRESOURCEW(IDI_ICON),
-                                 IMAGE_ICON,
-                                 32,
-                                 32,
-                                 0);
-            if (hBgIcon)
-            {
-                SendMessageW(hDlg,
-                             WM_SETICON,
-                             ICON_BIG,
-                             (LPARAM)hBgIcon);
-            }
-
-            FillFontStyleComboList(GetDlgItem(hDlg,
-                                              IDC_FONTCOMBO));
-
-            ChangeMapFont(hDlg);
-            hSysMenu = GetSystemMenu(hDlg,
-                                     FALSE);
-            if (hSysMenu != NULL)
-            {
-                if (LoadStringW(hInstance,
-                                IDS_ABOUT,
-                                lpAboutText,
-                                0))
-                {
-                    AppendMenuW(hSysMenu,
-                                MF_SEPARATOR,
-                                0,
-                                NULL);
-                    AppendMenuW(hSysMenu,
-                                MF_STRING,
-                                ID_ABOUT,
-                                lpAboutText);
-                }
-            }
-            return TRUE;
-        }
-
-        case WM_COMMAND:
-        {
-            switch(LOWORD(wParam))
-            {
-                case IDC_FONTMAP:
-                {
-                    switch (HIWORD(wParam))
-                    {
-                        case FM_SETCHAR:
-                            AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                               LOWORD(lParam));
-                            break;
-                    }
-                }
-                break;
-
-                case IDC_FONTCOMBO:
-                {
-                    if (HIWORD(wParam) == CBN_SELCHANGE)
-                    {
-                        ChangeMapFont(hDlg);
-                    }
-                }
-                break;
-
-                case IDC_SELECT:
-                {
-                    WCHAR ch;
-                    HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
-
-                    ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
-
-                    if (ch)
-                    {
-                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                           ch);
-                    }
-
-                    break;
-                }
-
-                case IDOK:
-                    if (hSmIcon)
-                        DestroyIcon(hSmIcon);
-                    if (hBgIcon)
-                        DestroyIcon(hBgIcon);
-                    EndDialog(hDlg, 0);
-                break;
-            }
-        }
-        break;
-
-        case WM_SYSCOMMAND:
-        {
-            switch(wParam)
-            {
-                case ID_ABOUT:
-                    ShowAboutDlg(hDlg);
-                break;
-            }
-        }
-        break;
-
-        case WM_CLOSE:
-            if (hSmIcon)
-                DestroyIcon(hSmIcon);
-            if (hBgIcon)
-                DestroyIcon(hBgIcon);
-            EndDialog(hDlg, 0);
-            break;
-
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-
-INT
-WINAPI
-wWinMain(HINSTANCE hInst,
-         HINSTANCE hPrev,
-         LPWSTR Cmd,
-         int iCmd)
-{
-    INITCOMMONCONTROLSEX iccx;
-    INT Ret = 1;
-
-    hInstance = hInst;
-
-    iccx.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    iccx.dwICC = ICC_TAB_CLASSES;
-    InitCommonControlsEx(&iccx);
-
-    if (RegisterMapClasses(hInstance))
-    {
-        Ret = DialogBoxW(hInstance,
-                         MAKEINTRESOURCEW(IDD_CHARMAP),
-                         NULL,
-                         DlgProc) >= 0;
-
-        UnregisterMapClasses(hInstance);
-    }
-
-    return Ret;
-}
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/charmap.c
+ * PURPOSE:     main dialog implementation
+ * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
+ */
+
+#include <precomp.h>
+
+#define ID_ABOUT    0x1
+
+HINSTANCE hInstance;
+
+/* Font-enumeration callback */
+static
+int
+CALLBACK
+EnumFontNames(ENUMLOGFONTEXW *lpelfe,
+              NEWTEXTMETRICEXW *lpntme,
+              DWORD FontType,
+              LPARAM lParam)
+{
+    HWND hwndCombo = (HWND)lParam;
+    LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
+
+    /* make sure font doesn't already exist in our list */
+    if(SendMessageW(hwndCombo,
+                    CB_FINDSTRING,
+                    0,
+                    (LPARAM)pszName) == CB_ERR)
+    {
+        INT idx;
+        BOOL fFixed;
+        BOOL fTrueType;
+
+        /* add the font */
+        idx = (INT)SendMessageW(hwndCombo,
+                                CB_ADDSTRING,
+                                0,
+                                (LPARAM)pszName);
+
+        /* record the font's attributes (Fixedwidth and Truetype) */
+        fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE;
+        fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE;
+
+        /* store this information in the list-item's userdata area */
+        SendMessageW(hwndCombo,
+                     CB_SETITEMDATA,
+                     idx,
+                     MAKEWPARAM(fFixed, fTrueType));
+    }
+
+    return 1;
+}
+
+
+/* Initialize the font-list by enumeration all system fonts */
+static
+VOID
+FillFontStyleComboList(HWND hwndCombo)
+{
+    HDC hdc;
+    LOGFONTW lf;
+
+    /* FIXME: for fun, draw each font in its own style */
+    HFONT hFont = GetStockObject(DEFAULT_GUI_FONT);
+    SendMessageW(hwndCombo,
+                 WM_SETFONT,
+                 (WPARAM)hFont,
+                 0);
+
+    ZeroMemory(&lf, sizeof(lf));
+    lf.lfCharSet = DEFAULT_CHARSET;
+
+    hdc = GetDC(hwndCombo);
+
+    /* store the list of fonts in the combo */
+    EnumFontFamiliesExW(hdc,
+                        &lf,
+                        (FONTENUMPROCW)EnumFontNames,
+                        (LPARAM)hwndCombo,
+                        0);
+
+    ReleaseDC(hwndCombo,
+              hdc);
+
+    SendMessageW(hwndCombo,
+                 CB_SETCURSEL,
+                 0,
+                 0);
+}
+
+
+static
+VOID
+ChangeMapFont(HWND hDlg)
+{
+    HWND hCombo;
+    HWND hMap;
+    LPWSTR lpFontName;
+    INT Len;
+
+    hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO);
+
+    Len = GetWindowTextLengthW(hCombo);
+
+    if (Len != 0)
+    {
+        lpFontName = HeapAlloc(GetProcessHeap(),
+                               0,
+                               (Len + 1) * sizeof(WCHAR));
+
+        if (lpFontName)
+        {
+            SendMessageW(hCombo,
+                         WM_GETTEXT,
+                         Len + 1,
+                         (LPARAM)lpFontName);
+
+            hMap = GetDlgItem(hDlg, IDC_FONTMAP);
+
+            SendMessageW(hMap,
+                         FM_SETFONT,
+                         0,
+                         (LPARAM)lpFontName);
+        }
+
+        HeapFree(GetProcessHeap(),
+                 0,
+                 lpFontName);
+    }
+}
+
+
+static
+VOID
+AddCharToSelection(HWND hText,
+                   WCHAR ch)
+{
+    LPWSTR lpText;
+    INT Len = GetWindowTextLength(hText);
+
+    if (Len != 0)
+    {
+        lpText = HeapAlloc(GetProcessHeap(),
+                           0,
+                           (Len + 2) * sizeof(WCHAR));
+
+        if (lpText)
+        {
+            LPWSTR lpStr = lpText;
+
+            SendMessageW(hText,
+                         WM_GETTEXT,
+                         Len + 1,
+                         (LPARAM)lpStr);
+
+            lpStr += Len;
+            *lpStr = ch;
+            lpStr++;
+            *lpStr = L'\0';
+
+            SendMessageW(hText,
+                         WM_SETTEXT,
+                         0,
+                         (LPARAM)lpText);
+
+            HeapFree(GetProcessHeap(),
+                     0,
+                     lpText);
+        }
+    }
+    else
+    {
+        WCHAR szText[2];
+
+        szText[0] = ch;
+        szText[1] = L'\0';
+
+        SendMessageW(hText,
+                     WM_SETTEXT,
+                     0,
+                     (LPARAM)szText);
+    }
+}
+
+
+static
+INT_PTR
+CALLBACK
+DlgProc(HWND hDlg,
+        UINT Message,
+        WPARAM wParam,
+        LPARAM lParam)
+{
+    static HICON hSmIcon;
+    static HICON hBgIcon;
+    LPWSTR lpAboutText = NULL;
+
+    switch(Message)
+    {
+        case WM_INITDIALOG:
+        {
+            HMENU hSysMenu;
+
+            hSmIcon = LoadImageW(hInstance,
+                                 MAKEINTRESOURCEW(IDI_ICON),
+                                 IMAGE_ICON,
+                                 16,
+                                 16,
+                                 0);
+            if (hSmIcon)
+            {
+                 SendMessageW(hDlg,
+                              WM_SETICON,
+                              ICON_SMALL,
+                              (LPARAM)hSmIcon);
+            }
+
+            hBgIcon = LoadImageW(hInstance,
+                                 MAKEINTRESOURCEW(IDI_ICON),
+                                 IMAGE_ICON,
+                                 32,
+                                 32,
+                                 0);
+            if (hBgIcon)
+            {
+                SendMessageW(hDlg,
+                             WM_SETICON,
+                             ICON_BIG,
+                             (LPARAM)hBgIcon);
+            }
+
+            FillFontStyleComboList(GetDlgItem(hDlg,
+                                              IDC_FONTCOMBO));
+
+            ChangeMapFont(hDlg);
+            hSysMenu = GetSystemMenu(hDlg,
+                                     FALSE);
+            if (hSysMenu != NULL)
+            {
+                if (LoadStringW(hInstance,
+                                IDS_ABOUT,
+                                lpAboutText,
+                                0))
+                {
+                    AppendMenuW(hSysMenu,
+                                MF_SEPARATOR,
+                                0,
+                                NULL);
+                    AppendMenuW(hSysMenu,
+                                MF_STRING,
+                                ID_ABOUT,
+                                lpAboutText);
+                }
+            }
+            return TRUE;
+        }
+
+        case WM_COMMAND:
+        {
+            switch(LOWORD(wParam))
+            {
+                case IDC_FONTMAP:
+                {
+                    switch (HIWORD(wParam))
+                    {
+                        case FM_SETCHAR:
+                            AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                                               LOWORD(lParam));
+                            break;
+                    }
+                }
+                break;
+
+                case IDC_FONTCOMBO:
+                {
+                    if (HIWORD(wParam) == CBN_SELCHANGE)
+                    {
+                        ChangeMapFont(hDlg);
+                    }
+                }
+                break;
+
+                case IDC_SELECT:
+                {
+                    WCHAR ch;
+                    HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
+
+                    ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
+
+                    if (ch)
+                    {
+                        AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                                           ch);
+                    }
+
+                    break;
+                }
+
+                case IDOK:
+                    if (hSmIcon)
+                        DestroyIcon(hSmIcon);
+                    if (hBgIcon)
+                        DestroyIcon(hBgIcon);
+                    EndDialog(hDlg, 0);
+                break;
+            }
+        }
+        break;
+
+        case WM_SYSCOMMAND:
+        {
+            switch(wParam)
+            {
+                case ID_ABOUT:
+                    ShowAboutDlg(hDlg);
+                break;
+            }
+        }
+        break;
+
+        case WM_CLOSE:
+            if (hSmIcon)
+                DestroyIcon(hSmIcon);
+            if (hBgIcon)
+                DestroyIcon(hBgIcon);
+            EndDialog(hDlg, 0);
+            break;
+
+        default:
+            return FALSE;
+    }
+
+    return FALSE;
+}
+
+
+INT
+WINAPI
+wWinMain(HINSTANCE hInst,
+         HINSTANCE hPrev,
+         LPWSTR Cmd,
+         int iCmd)
+{
+    INITCOMMONCONTROLSEX iccx;
+    INT Ret = 1;
+
+    hInstance = hInst;
+
+    iccx.dwSize = sizeof(INITCOMMONCONTROLSEX);
+    iccx.dwICC = ICC_TAB_CLASSES;
+    InitCommonControlsEx(&iccx);
+
+    if (RegisterMapClasses(hInstance))
+    {
+        Ret = DialogBoxW(hInstance,
+                         MAKEINTRESOURCEW(IDD_CHARMAP),
+                         NULL,
+                         DlgProc) >= 0;
+
+        UnregisterMapClasses(hInstance);
+    }
+
+    return Ret;
+}

reactos/base/applications/charmap/charmap.rbuild

@@ -1,17 +1,16 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
-	<include base="charmap">.</include>
-	<library>gdi32</library>
-	<library>kernel32</library>
-	<library>user32</library>
-	<library>comctl32</library>
-	<compilationunit name="unit.c">
-		<file>about.c</file>
-		<file>charmap.c</file>
-		<file>lrgcell.c</file>
-		<file>map.c</file>
-	</compilationunit>
-	<file>charmap.rc</file>
-	<pch>precomp.h</pch>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
+	<include base="charmap">.</include>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>comctl32</library>
+	<compilationunit name="unit.c">
+		<file>about.c</file>
+		<file>charmap.c</file>
+		<file>lrgcell.c</file>
+		<file>map.c</file>
+	</compilationunit>
+	<file>charmap.rc</file>
+	<pch>precomp.h</pch>
+</module>

reactos/base/applications/charmap/lang/bg-BG.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&<26><>..."
 END

reactos/base/applications/charmap/lang/ca-ES.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&En quant a..."
 END

reactos/base/applications/charmap/lang/cs-CZ.rc

@@ -35,6 +35,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&O programu..."
 END

reactos/base/applications/charmap/lang/de-DE.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "<22>&ber..."
 END

reactos/base/applications/charmap/lang/el-GR.rc

@@ -32,6 +32,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 END

reactos/base/applications/charmap/lang/en-US.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "A&bout..."
 END

reactos/base/applications/charmap/lang/es-ES.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&Acerca de ..."
 END

reactos/base/applications/charmap/lang/fr-FR.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publi<6C>e par la Free Software Foundation; dans sa version 2  (ou selon votre pr<70>f<EFBFBD>rence) toute version ult<6C>rieure.\r\n\r\nCe programme est distribu<62> dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans m<>me une garantie implicite de COMMERCIABILIT<49> ou DE CONFORMIT<49> <20> UNE UTILISATION PARTICULI<4C>RE. \r\n\r\nVoir la Licence Publique G<>n<EFBFBD>rale GNU pour plus de d<>tails. Vous devriez avoir re<72>u un exemplaire de la Licence Publique G<>n<EFBFBD>rale GNU avec ce programme ; si ce n'est pas le cas, <20>crivez <20> la Free Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publi<6C>e par la Free Software Foundation; dans sa version 2  (ou selon votre pr<70>f<EFBFBD>rence) toute version ult<6C>rieure.\r\n\r\nCe programme est distribu<62> dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans m<>me une garantie implicite de COMMERCIABILIT<49> ou DE CONFORMIT<49> <20> UNE UTILISATION PARTICULI<4C>RE. \r\n\r\nVoir la Licence Publique G<>n<EFBFBD>rale GNU pour plus de d<>tails. Vous devriez avoir re<72>u un exemplaire de la Licence Publique G<>n<EFBFBD>rale GNU avec ce programme ; si ce n'est pas le cas, <20>crivez <20> la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "<22> propos..."
 END

reactos/base/applications/charmap/lang/id-ID.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU.  Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU.  Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "Te&ntang..."
 END

reactos/base/applications/charmap/lang/it-IT.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE,  "Questo programma <20> software libero; pu<70> redistribuirlo e/o modificarlo sotto\ni termini della licenza pubblica GNU come pubblicata dalla Free Software Foundation; sia la versione 2 sia una versione successiva (a sua scelta).\r\n\r\nQuesto programma <20> distribuito\nnella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neanche la garanzia implicita\ndi NEGOZIABILITA' o APPLICABILITA' per un particolare scopo.  Si veda la licenza generale pubblica GNU per maggiori dettagli.\r\n\r\nDovrebbe aver ricevuto una copia assieme a questo programma; se cos<6F> non fosse, scriva alla Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE,  "Questo programma <20> software libero; pu<70> redistribuirlo e/o modificarlo sotto\ni termini della licenza pubblica GNU come pubblicata dalla Free Software Foundation; sia la versione 2 sia una versione successiva (a sua scelta).\r\n\r\nQuesto programma <20> distribuito\nnella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neanche la garanzia implicita\ndi NEGOZIABILITA' o APPLICABILITA' per un particolare scopo.  Si veda la licenza generale pubblica GNU per maggiori dettagli.\r\n\r\nDovrebbe aver ricevuto una copia assieme a questo programma; se cos<6F> non fosse, scriva alla Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&Informazioni su..."
 END

reactos/base/applications/charmap/lang/ja-JP.rc

@@ -0,0 +1,35 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
+CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\"
+FONT 9,"MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+BEGIN
+  LTEXT         "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g:", IDC_STATIC, 6, 7, 24, 9
+  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+  PUSHBUTTON    "<22>w<EFBFBD><77><EFBFBD>v", IDC_CMHELP, 249, 5, 35, 13
+  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
+  LTEXT         "<22>R<EFBFBD>s<EFBFBD>[<5B><><EFBFBD>镶<EFBFBD><E995B6>:", IDC_STATIC, 6, 188, 66, 9
+  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  DEFPUSHBUTTON "<22>I<EFBFBD><49>", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "<22>R<EFBFBD>s<EFBFBD>[", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+  //AUTOCHECKBOX  "<22>ڍו\\<5C><>", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,210,182
+CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\<5C>ɂ‚<C982><C282><EFBFBD>"
+FONT 9,"MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+  PUSHBUTTON    "<22>‚<EFBFBD><C282><EFBFBD>", IDOK, 75, 162, 44, 15
+  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_ABOUT     "<22>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)..."
+END

reactos/base/applications/charmap/lang/ko-KR.rc

@@ -33,6 +33,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)"
 END

reactos/base/applications/charmap/lang/lt-LT.rc

@@ -1,44 +1,44 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/lang/lt-LT.rc
- * PURPOSE:     Lithuanian Language File
- * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
- * DATE:        2007-09-23
- */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Simboli<6C> lentel<65>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "<22>riftas:", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "Pagalba", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "Simboliai kopijavimui:", IDC_STATIC, 6, 188, 72, 9
-  EDITTEXT       IDC_TEXTBOX, 81, 186, 107, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "Kopijuoti", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "Apie simboli<6C> lentel<65>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "Simboli<6C> lentel<65> v0.1\n(C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "U<>verti", IDOK, 83, 161, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
-  IDS_ABOUT     "&Apie..."
-END
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File
+ * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ * DATE:        2007-09-23
+ */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
+CAPTION "Simboli<6C> lentel<65>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+BEGIN
+  LTEXT         "<22>riftas:", IDC_STATIC, 6, 7, 24, 9
+  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+  PUSHBUTTON    "Pagalba", IDC_CMHELP, 249, 5, 35, 13
+  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
+  LTEXT         "Simboliai kopijavimui:", IDC_STATIC, 6, 188, 72, 9
+  EDITTEXT       IDC_TEXTBOX, 81, 186, 107, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "Kopijuoti", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,210,182
+CAPTION "Apie simboli<6C> lentel<65>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT         "Simboli<6C> lentel<65> v0.1\n(C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+  PUSHBUTTON    "U<>verti", IDOK, 83, 161, 44, 15
+  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_ABOUT     "&Apie..."
+END

reactos/base/applications/charmap/lang/nl-NL.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "Over..."
 END

reactos/base/applications/charmap/lang/no-NO.rc

@@ -30,6 +30,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation;  version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i h<>p for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORM<52>L.  Se p<> GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation;  version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i h<>p for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORM<52>L.  Se p<> GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "O&m..."
 END

reactos/base/applications/charmap/lang/pl-PL.rc

@@ -3,6 +3,7 @@
 * xxrogers@users.sourceforge.net
 * https://sourceforge.net/projects/reactospl
 */
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
@@ -35,6 +36,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 59 Temple Place, Fifth Floor, Boston, MA  02110-1301  USA."
+  IDS_LICENSE   "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&O programie..."
 END

reactos/base/applications/charmap/lang/ru-RU.rc

@@ -32,6 +32,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> (<28><><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE   "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> (<28><><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 END

reactos/base/applications/charmap/lang/sk-SK.rc

@@ -39,6 +39,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE,  "Tento program je vo<76>n<EFBFBD> softv<74>r; m<><6D>ete ho <20><>ri<72> a/alebo modifikova<76> pod<6F>a podmienok GNU V<>eobecnej verejnej licencie (GNU General Public License) ako bola zverejnen<65> nad<61>ciou Free Software Foundation; bu<62> verzie 2 tejto licencie, alebo (pod<6F>a V<><56>ho uv<75><76>enia) niektorej neskor<6F>ej verzie.\r\n\r\nTento program je distribuovan<61> v n<>deji, <20>e bude u<>ito<74>n<EFBFBD>, av<61>ak BEZ AKEJKO<4B>VEK Z<>RUKY; rovnako bez z<>ruky PREDAJNOSTI alebo VHODNOSTI PRE UR<55>IT<49> <20><>EL. Pre viac detailov si pozrite GNU V<>eobecn<63> verejn<6A> licenciu (GNU General Public License).\r\n\r\nK<6E>piu V<>eobecnej verejnej licencie GNU ste mali dosta<74> spolu s t<>mto programom; ak nie, nap<61><70>te si o <20>u na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_LICENSE,  "Tento program je vo<76>n<EFBFBD> softv<74>r; m<><6D>ete ho <20><>ri<72> a/alebo modifikova<76> pod<6F>a podmienok GNU V<>eobecnej verejnej licencie (GNU General Public License) ako bola zverejnen<65> nad<61>ciou Free Software Foundation; bu<62> verzie 2 tejto licencie, alebo (pod<6F>a V<><56>ho uv<75><76>enia) niektorej neskor<6F>ej verzie.\r\n\r\nTento program je distribuovan<61> v n<>deji, <20>e bude u<>ito<74>n<EFBFBD>, av<61>ak BEZ AKEJKO<4B>VEK Z<>RUKY; rovnako bez z<>ruky PREDAJNOSTI alebo VHODNOSTI PRE UR<55>IT<49> <20><>EL. Pre viac detailov si pozrite GNU V<>eobecn<63> verejn<6A> licenciu (GNU General Public License).\r\n\r\nK<6E>piu V<>eobecnej verejnej licencie GNU ste mali dosta<74> spolu s t<>mto programom; ak nie, nap<61><70>te si o <20>u na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "<22>&o je Mapa znakov"
 END

reactos/base/applications/charmap/lang/uk-UA.rc

@@ -21,12 +21,12 @@ BEGIN
   EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //AUTOCHECKBOX  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+CAPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
@@ -38,6 +38,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> (<28><><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>䳿 <20><> <20><>, <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2> <20><><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 675 Mass Ave, Cambridge, MA 02139, USA."
-  IDS_ABOUT     "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+  IDS_LICENSE   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>䳿 <20><> <20><>, <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2> <20><><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_ABOUT     "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 END

reactos/base/applications/charmap/lang/zh-CN.rc

@@ -0,0 +1,37 @@
+// Chinese (Simplified) language resource file (Elton Chung, elton328@gmail.com)
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+
+IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
+CAPTION "<22>ַ<EFBFBD><D6B7><EFBFBD>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+BEGIN
+  LTEXT         "<22><><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 7, 24, 9
+  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+  PUSHBUTTON    "˵<><CBB5>", IDC_CMHELP, 249, 5, 35, 13
+  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
+  LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5>ַ<EFBFBD>:", IDC_STATIC, 6, 188, 66, 9
+  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  DEFPUSHBUTTON "ѡ<><D1A1>", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,210,182
+CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT         "<22>ַ<EFBFBD><D6B7><EFBFBD> v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+  PUSHBUTTON    "<22>ر<EFBFBD>", IDOK, 75, 162, 44, 15
+  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)..."
+END

reactos/base/applications/charmap/lang/zh-TW.rc

@@ -0,0 +1,37 @@
+// Chinese (Traditional) language resource file (Elton Chung, elton328@gmail.com)
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+
+IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
+CAPTION "<22>r<EFBFBD>Ū<EFBFBD>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+BEGIN
+  LTEXT         "<22>r<EFBFBD><72><EFBFBD>G", IDC_STATIC, 6, 7, 24, 9
+  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDC_CMHELP, 249, 5, 35, 13
+  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
+  LTEXT         "<22>ݽƻs<C6BB><73><EFBFBD>r<EFBFBD>šG", IDC_STATIC, 6, 188, 66, 9
+  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "<22>ƻs", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,210,182
+CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>r<EFBFBD>Ū<EFBFBD>"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT         "<22>r<EFBFBD>Ū<EFBFBD> v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDOK, 75, 162, 44, 15
+  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE   "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 2 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)..."
+END

reactos/base/applications/charmap/lrgcell.c

@@ -1,165 +1,165 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/charmap/lrgcell.c
- * PURPOSE:     large cell window implementation
- * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-#include <precomp.h>
-
-
-static
-HFONT
-SetLrgFont(PMAP infoPtr)
-{
-    LOGFONTW lf;
-    HFONT hFont = NULL;
-    HDC hdc;
-    HWND hCombo;
-    LPWSTR lpFontName;
-    INT Len;
-
-    hCombo = GetDlgItem(infoPtr->hParent,
-                        IDC_FONTCOMBO);
-
-    Len = GetWindowTextLengthW(hCombo);
-
-    if (Len != 0)
-    {
-        lpFontName = HeapAlloc(GetProcessHeap(),
-                               0,
-                               (Len + 1) * sizeof(WCHAR));
-
-        if (lpFontName)
-        {
-            SendMessageW(hCombo,
-                         WM_GETTEXT,
-                         31,
-                         (LPARAM)lpFontName);
-
-            ZeroMemory(&lf,
-                       sizeof(lf));
-
-            hdc = GetDC(infoPtr->hLrgWnd);
-            lf.lfHeight = GetDeviceCaps(hdc,
-                                        LOGPIXELSY) / 2;
-            ReleaseDC(infoPtr->hLrgWnd,
-                      hdc);
-
-            lf.lfCharSet =  DEFAULT_CHARSET;
-            wcscpy(lf.lfFaceName,
-                   lpFontName);
-
-            hFont = CreateFontIndirectW(&lf);
-
-            HeapFree(GetProcessHeap(),
-                     0,
-                     lpFontName);
-        }
-    }
-
-    return hFont;
-}
-
-
-LRESULT CALLBACK
-LrgCellWndProc(HWND hwnd,
-               UINT uMsg,
-               WPARAM wParam,
-               LPARAM lParam)
-{
-    PMAP infoPtr;
-    LRESULT Ret = 0;
-    static INT cxClient, cyClient;
-    static RECT rc;
-    static HFONT hFont = NULL;
-
-    infoPtr = (PMAP)GetWindowLongPtrW(hwnd,
-                                     GWLP_USERDATA);
-
-    if (infoPtr == NULL && uMsg != WM_CREATE)
-    {
-        goto HandleDefaultMessage;
-    }
-
-    switch (uMsg)
-    {
-        case WM_CREATE:
-        {
-            infoPtr = (PMAP)(((LPCREATESTRUCTW)lParam)->lpCreateParams);
-
-            SetWindowLongPtrW(hwnd,
-                              GWLP_USERDATA,
-                              (LONG_PTR)infoPtr);
-
-            hFont = SetLrgFont(infoPtr);
-
-            break;
-        }
-
-        case WM_SIZE:
-        {
-            cxClient = LOWORD(lParam);
-            cyClient = HIWORD(lParam);
-
-            rc.left = 0;
-            rc.top = 0;
-            rc.right = cxClient;
-            rc.bottom = cyClient;
-
-            break;
-        }
-
-        case WM_PAINT:
-        {
-            PAINTSTRUCT ps;
-            HDC hdc;
-            HFONT hOldFont;
-
-            hdc = BeginPaint(hwnd,
-                             &ps);
-
-            Rectangle(hdc,
-                      0,
-                      0,
-                      cxClient,
-                      cyClient);
-
-            hOldFont = SelectObject(hdc, hFont);
-
-            DrawTextW(hdc,
-                      &infoPtr->pActiveCell->ch,
-                      1,
-                      &rc,
-                      DT_CENTER | DT_VCENTER | DT_SINGLELINE);
-
-            SelectObject(hdc, hOldFont);
-
-            EndPaint(hwnd,
-                     &ps);
-
-            break;
-        }
-
-        case WM_DESTROY:
-        {
-            DeleteObject(hFont);
-
-            break;
-        }
-
-        default:
-        {
-HandleDefaultMessage:
-            Ret = DefWindowProcW(hwnd,
-                                 uMsg,
-                                 wParam,
-                                 lParam);
-            break;
-        }
-    }
-
-    return Ret;
-}
+/*
+ * PROJECT:     ReactOS Character Map
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/charmap/lrgcell.c
+ * PURPOSE:     large cell window implementation
+ * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
+ */
+
+#include <precomp.h>
+
+
+static
+HFONT
+SetLrgFont(PMAP infoPtr)
+{
+    LOGFONTW lf;
+    HFONT hFont = NULL;
+    HDC hdc;
+    HWND hCombo;
+    LPWSTR lpFontName;
+    INT Len;
+
+    hCombo = GetDlgItem(infoPtr->hParent,
+                        IDC_FONTCOMBO);
+
+    Len = GetWindowTextLengthW(hCombo);
+
+    if (Len != 0)
+    {
+        lpFontName = HeapAlloc(GetProcessHeap(),
+                               0,
+                               (Len + 1) * sizeof(WCHAR));
+
+        if (lpFontName)
+        {
+            SendMessageW(hCombo,
+                         WM_GETTEXT,
+                         31,
+                         (LPARAM)lpFontName);
+
+            ZeroMemory(&lf,
+                       sizeof(lf));
+
+            hdc = GetDC(infoPtr->hLrgWnd);
+            lf.lfHeight = GetDeviceCaps(hdc,
+                                        LOGPIXELSY) / 2;
+            ReleaseDC(infoPtr->hLrgWnd,
+                      hdc);
+
+            lf.lfCharSet =  DEFAULT_CHARSET;
+            wcscpy(lf.lfFaceName,
+                   lpFontName);
+
+            hFont = CreateFontIndirectW(&lf);
+
+            HeapFree(GetProcessHeap(),
+                     0,
+                     lpFontName);
+        }
+    }
+
+    return hFont;
+}
+
+
+LRESULT CALLBACK
+LrgCellWndProc(HWND hwnd,
+               UINT uMsg,
+               WPARAM wParam,
+               LPARAM lParam)
+{
+    PMAP infoPtr;
+    LRESULT Ret = 0;
+    static INT cxClient, cyClient;
+    static RECT rc;
+    static HFONT hFont = NULL;
+
+    infoPtr = (PMAP)GetWindowLongPtrW(hwnd,
+                                     GWLP_USERDATA);
+
+    if (infoPtr == NULL && uMsg != WM_CREATE)
+    {
+        goto HandleDefaultMessage;
+    }
+
+    switch (uMsg)
+    {
+        case WM_CREATE:
+        {
+            infoPtr = (PMAP)(((LPCREATESTRUCTW)lParam)->lpCreateParams);
+
+            SetWindowLongPtrW(hwnd,
+                              GWLP_USERDATA,
+                              (LONG_PTR)infoPtr);
+
+            hFont = SetLrgFont(infoPtr);
+
+            break;
+        }
+
+        case WM_SIZE:
+        {
+            cxClient = LOWORD(lParam);
+            cyClient = HIWORD(lParam);
+
+            rc.left = 0;
+            rc.top = 0;
+            rc.right = cxClient;
+            rc.bottom = cyClient;
+
+            break;
+        }
+
+        case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+            HDC hdc;
+            HFONT hOldFont;
+
+            hdc = BeginPaint(hwnd,
+                             &ps);
+
+            Rectangle(hdc,
+                      0,
+                      0,
+                      cxClient,
+                      cyClient);
+
+            hOldFont = SelectObject(hdc, hFont);
+
+            DrawTextW(hdc,
+                      &infoPtr->pActiveCell->ch,
+                      1,
+                      &rc,
+                      DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+
+            SelectObject(hdc, hOldFont);
+
+            EndPaint(hwnd,
+                     &ps);
+
+            break;
+        }
+
+        case WM_DESTROY:
+        {
+            DeleteObject(hFont);
+
+            break;
+        }
+
+        default:
+        {
+HandleDefaultMessage:
+            Ret = DefWindowProcW(hwnd,
+                                 uMsg,
+                                 wParam,
+                                 lParam);
+            break;
+        }
+    }
+
+    return Ret;
+}

reactos/base/applications/charmap/precomp.h

@@ -1,57 +1,57 @@
-#ifndef __CHARMAP_PRECOMP_H
-#define __CHARMAP_PRECOMP_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <commctrl.h>
-#include "resource.h"
-
-#define XCELLS 20
-#define YCELLS 10
-#define XLARGE 45
-#define YLARGE 25
-
-#define FM_SETFONT (WM_USER + 1)
-#define FM_GETCHAR (WM_USER + 2)
-#define FM_SETCHAR (WM_USER + 3)
-
-extern HINSTANCE hInstance;
-
-typedef struct _CELL
-{
-    RECT CellExt;
-    RECT CellInt;
-    BOOL bActive;
-    BOOL bLarge;
-    WCHAR ch;
-} CELL, *PCELL;
-
-typedef struct _MAP
-{
-    HWND hMapWnd;
-    HWND hParent;
-    HWND hLrgWnd;
-    SIZE ClientSize;
-    SIZE CellSize;
-    CELL Cells[YCELLS][XCELLS];
-    PCELL pActiveCell;
-    HFONT hFont;
-    LOGFONTW CurrentFont;
-    INT iYStart;
-} MAP, *PMAP;
-
-typedef struct {
-    NMHDR hdr;
-    WCHAR ch;
-} MAPNOTIFY, *LPMAPNOTIFY;
-
-
-LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-VOID ShowAboutDlg(HWND hWndParent);
-
-BOOL RegisterMapClasses(HINSTANCE hInstance);
-VOID UnregisterMapClasses(HINSTANCE hInstance);
-
-#endif /* __CHARMAP_PRECOMP_H */
+#ifndef __CHARMAP_PRECOMP_H
+#define __CHARMAP_PRECOMP_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <commctrl.h>
+#include "resource.h"
+
+#define XCELLS 20
+#define YCELLS 10
+#define XLARGE 45
+#define YLARGE 25
+
+#define FM_SETFONT (WM_USER + 1)
+#define FM_GETCHAR (WM_USER + 2)
+#define FM_SETCHAR (WM_USER + 3)
+
+extern HINSTANCE hInstance;
+
+typedef struct _CELL
+{
+    RECT CellExt;
+    RECT CellInt;
+    BOOL bActive;
+    BOOL bLarge;
+    WCHAR ch;
+} CELL, *PCELL;
+
+typedef struct _MAP
+{
+    HWND hMapWnd;
+    HWND hParent;
+    HWND hLrgWnd;
+    SIZE ClientSize;
+    SIZE CellSize;
+    CELL Cells[YCELLS][XCELLS];
+    PCELL pActiveCell;
+    HFONT hFont;
+    LOGFONTW CurrentFont;
+    INT iYStart;
+} MAP, *PMAP;
+
+typedef struct {
+    NMHDR hdr;
+    WCHAR ch;
+} MAPNOTIFY, *LPMAPNOTIFY;
+
+
+LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+VOID ShowAboutDlg(HWND hWndParent);
+
+BOOL RegisterMapClasses(HINSTANCE hInstance);
+VOID UnregisterMapClasses(HINSTANCE hInstance);
+
+#endif /* __CHARMAP_PRECOMP_H */

reactos/base/applications/charmap/resource.h

@@ -1,19 +1,19 @@
-#define IDC_STATIC       -1
-
-#define IDI_ICON         100
-
-#define IDD_CHARMAP      200
-#define IDD_ABOUTBOX     201
-
-#define IDC_FONTCOMBO    1001
-#define IDC_CMHELP       1002
-#define IDC_FONTMAP      1003
-#define IDC_TEXTBOX      1004
-#define IDC_SELECT       1005
-#define IDC_COPY         1006
-#define IDC_ADVVIEW      1007
-#define IDC_DISPLAY      1008
-#define IDC_LICENSE_EDIT 1009
-
-#define IDS_LICENSE      1010
-#define IDS_ABOUT        1011
+#define IDC_STATIC       -1
+
+#define IDI_ICON         100
+
+#define IDD_CHARMAP      200
+#define IDD_ABOUTBOX     201
+
+#define IDC_FONTCOMBO    1001
+#define IDC_CMHELP       1002
+#define IDC_FONTMAP      1003
+#define IDC_TEXTBOX      1004
+#define IDC_SELECT       1005
+#define IDC_COPY         1006
+#define IDC_ADVVIEW      1007
+#define IDC_DISPLAY      1008
+#define IDC_LICENSE_EDIT 1009
+
+#define IDS_LICENSE      1010
+#define IDS_ABOUT        1011

reactos/base/applications/charmap/rsrc.rc

@@ -8,19 +8,22 @@ IDI_ICON ICON "res/charmap.ico"
 #include "lang/bg-BG.rc"
 #include "lang/ca-ES.rc"
 #include "lang/cs-CZ.rc"
-#include "lang/en-US.rc"
 #include "lang/de-DE.rc"
+#include "lang/el-GR.rc"
+#include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
-#include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
+#include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/pt-BR.rc"
+#include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"
-#include "lang/ru-RU.rc"
-#include "lang/el-GR.rc"
+#include "lang/zh-CN.rc"
+#include "lang/zh-TW.rc"

reactos/base/applications/cmdutils/cmdutils.rbuild

@@ -19,6 +19,9 @@
 	<directory name="more">
 		<xi:include href="more/more.rbuild" />
 	</directory>
+	<directory name="reg">
+		<xi:include href="reg/reg.rbuild" />
+	</directory>
 	<directory name="xcopy">
 		<xi:include href="xcopy/xcopy.rbuild" />
 	</directory>

reactos/base/applications/cmdutils/dbgprint/dbgprint.c

@@ -35,6 +35,7 @@ int _tmain(int argc, TCHAR ** argv)
 	{
 		char   psBuffer[128];
 		char   psBuffer2[128];
+		char   *nlptr2;
 		char   cmd[255];
 		char   test[300];
 		FILE   *pPipe;
@@ -60,7 +61,7 @@ int _tmain(int argc, TCHAR ** argv)
 					{
 						while(fgets(psBuffer2, 128, pPipe2))
 						{
-							char *nlptr2 = strchr(psBuffer2, '\n');
+							nlptr2 = strchr(psBuffer2, '\n');
 							if (nlptr2)
 								*nlptr2 = '\0';
 							puts(psBuffer2);

reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild

@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
-	<library>kernel32</library>
-	<file>dbgprint.c</file>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
+	<file>dbgprint.c</file>
+</module>

reactos/base/applications/cmdutils/doskey/doskey.c

@@ -19,15 +19,27 @@ static VOID SetInsert(DWORD dwFlag)
 static VOID PrintHistory(VOID)
 {
     DWORD Length = GetConsoleCommandHistoryLength(pszExeName);
+    DWORD BufferLength;
+    PBYTE HistBuf;
+    TCHAR *Hist;
+    TCHAR *HistEnd;
+
     /* On Windows, the ANSI version of GetConsoleCommandHistory requires
      * a buffer twice as large as the actual history length. */
-    BYTE HistBuf[Length * (sizeof(WCHAR) / sizeof(TCHAR))];
-    TCHAR *Hist    = (TCHAR *)HistBuf;
-    TCHAR *HistEnd = (TCHAR *)&HistBuf[Length];
+    BufferLength = Length * (sizeof(WCHAR) / sizeof(TCHAR)) * sizeof(BYTE);
 
-    if (GetConsoleCommandHistory(Hist, sizeof HistBuf, pszExeName))
+    HistBuf = HeapAlloc(GetProcessHeap(),
+                        HEAP_ZERO_MEMORY,
+                        BufferLength);
+    if (!HistBuf) return;
+    Hist = (TCHAR *)HistBuf;
+    HistEnd = (TCHAR *)&HistBuf[Length];
+
+    if (GetConsoleCommandHistory(Hist, BufferLength, pszExeName))
         for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1)
             _tprintf(_T("%s\n"), Hist);
+
+    HeapFree(GetProcessHeap(), 0, HistBuf);
 }
 
 static INT SetMacro(LPTSTR definition)
@@ -65,23 +77,39 @@ static INT SetMacro(LPTSTR definition)
 static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent)
 {
     DWORD Length = GetConsoleAliasesLength(pszExeName);
-    BYTE AliasBuf[Length];
-    TCHAR *Alias    = (TCHAR *)AliasBuf;
-    TCHAR *AliasEnd = (TCHAR *)&AliasBuf[Length];
+    PBYTE AliasBuf;
+    TCHAR *Alias;
+    TCHAR *AliasEnd;
 
-    if (GetConsoleAliases(Alias, sizeof AliasBuf, pszExeName))
+    AliasBuf = HeapAlloc(GetProcessHeap(),
+                         HEAP_ZERO_MEMORY,
+                         Length * sizeof(BYTE));
+    if (!AliasBuf) return;
+    Alias = (TCHAR *)AliasBuf;
+    AliasEnd = (TCHAR *)&AliasBuf[Length];
+
+    if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName))
         for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1)
             _tprintf(_T("%s%s\n"), Indent, Alias);
+
+    HeapFree(GetProcessHeap(), 0, AliasBuf);
 }
 
 static VOID PrintAllMacros(VOID)
 {
     DWORD Length = GetConsoleAliasExesLength();
-    BYTE ExeNameBuf[Length];
-    TCHAR *ExeName    = (TCHAR *)ExeNameBuf;
-    TCHAR *ExeNameEnd = (TCHAR *)&ExeNameBuf[Length];
+    PBYTE ExeNameBuf;
+    TCHAR *ExeName;
+    TCHAR *ExeNameEnd;
 
-    if (GetConsoleAliasExes(ExeName, sizeof ExeNameBuf))
+    ExeNameBuf = HeapAlloc(GetProcessHeap(),
+                           HEAP_ZERO_MEMORY,
+                           Length * sizeof(BYTE));
+    if (!ExeNameBuf) return;
+    ExeName = (TCHAR *)ExeNameBuf;
+    ExeNameEnd = (TCHAR *)&ExeNameBuf[Length];
+
+    if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE)))
     {
         for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1)
         {
@@ -90,6 +118,8 @@ static VOID PrintAllMacros(VOID)
             _tprintf(_T("\n"));
         }
     }
+
+    HeapFree(GetProcessHeap(), 0, ExeNameBuf);
 }
 
 static VOID ReadFromFile(LPTSTR param)

reactos/base/applications/cmdutils/doskey/doskey.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes">
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>doskey.c</file>
 	<file>doskey.rc</file>

reactos/base/applications/cmdutils/doskey/doskey.rc

@@ -5,4 +5,8 @@
 
 #include <windows.h>
 #include "doskey.h"
+
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
 #include "lang/en-US.rc"
+#include "lang/uk-UA.rc"

reactos/base/applications/cmdutils/doskey/lang/bg-BG.rc

@@ -0,0 +1,27 @@
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+\n\
+DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]\n\
+       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=<3D><><EFBFBD><EFBFBD>] [macroname=[<5B><><EFBFBD><EFBFBD><EFBFBD>]]\n\
+\n\
+  /INSERT             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /OVERSTRIKE         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /EXENAME=<3D><><EFBFBD><EFBFBD><EFBFBD>exe   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
+                      <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> cmd.exe.\n\
+  /HISTORY            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /LISTSIZE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /REINSTALL          <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROS             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROS:<3A><><EFBFBD><EFBFBD><EFBFBD>exe     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROS:ALL         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROFILE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>.\n\
+  macroname           <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  text                <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
+
+IDS_INVALID_MACRO_DEF, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %s\n"
+
+END

reactos/base/applications/cmdutils/doskey/lang/de-DE.rc

@@ -0,0 +1,28 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "Verwaltet Einstellungen, Verlauf und Makros der Kommandozeile.\n\
+\n\
+DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
+       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\
+\n\
+  /INSERT             Aktiviert den Einfügemodus.\n\
+  /OVERSTRIKE         Deaktiviert den Einfügemodus.\n\
+  /EXENAME=exename    Legt den Namen der Anwendung, auf die die Einstel-\n\
+                      lungen angewendet werden sollen, fest. Der Standard-\n\
+                      wert ist cmd.exe.\n\
+  /HISTORY            Zeigt den Befehlsverlauf an.\n\
+  /LISTSIZE=size      Legt die Anzahl der Befehle per Verlaufspuffer fest.\n\
+  /REINSTALL          Leert den Befehlsverlauf.\n\
+  /MACROS             Zeigt Makrodefinitionen an.\n\
+  /MACROS:exename     Zeigt Makrodefinitionen für eine Anwendung an.\n\
+  /MACROS:ALL         Zeigt Makrodefinitionen für alle Anwendungen an.\n\
+  /MACROFILE=file     Lädt Makrodefinitionen aus einer Datei.\n\
+  macroname           Legt den Namen eines zu erstellenden Makros fest.\n\
+  text                Legt den ersetzenden Text des Makros fest.\n"
+
+IDS_INVALID_MACRO_DEF, "Ungültige Makrodefinition: %s\n"
+
+END

reactos/base/applications/cmdutils/doskey/lang/en-US.rc

@@ -18,7 +18,7 @@ DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
   /MACROS             Displays macro definitions.\n\
   /MACROS:exename     Displays macro definitions for a specific program.\n\
   /MACROS:ALL         Displays macro definitions for all programs.\n\
-  /MACROFILE=filename Loads macro definitions from a file.\n\
+  /MACROFILE=file     Loads macro definitions from a file.\n\
   macroname           Specifies the name of a macro to create.\n\
   text                Specifies the replacement text for the macro.\n"
 

reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc

@@ -0,0 +1,35 @@
+/*
+ * PROJECT:     ReactOS DOSKey
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/doskey/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for ReactOS DOSKey
+ * TRANSLATOR:  Sakara Yevhen
+ */
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+\n\
+DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
+       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\
+\n\
+  /INSERT             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /OVERSTRIKE         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /EXENAME=exename    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
+                      <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cmd.exe.\n\
+  /HISTORY            ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /LISTSIZE=size      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /REINSTALL          <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROS             ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROS:exename     ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROS:ALL         ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  /MACROFILE=filename <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
+  macroname           <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
+  text                <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
+
+IDS_INVALID_MACRO_DEF, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
+
+END

reactos/base/applications/cmdutils/find/find.c

@@ -15,9 +15,9 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 

reactos/base/applications/cmdutils/find/find.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="find" type="win32cui" installbase="system32" installname="find.exe">
-	<library>kernel32</library>
 	<library>user32</library>
 	<file>find.c</file>
 	<file>find.rc</file>

reactos/base/applications/cmdutils/find/lang/it-IT.rc

@@ -1,17 +1,17 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\
-    /C  Conta il numero di linee che contengono la stringa\n\
-    /I  Ignora maiuscole/minuscole\n\
-    /N  Numera le linee visualizzate a partire da 1\n\
-    /V  Visualizza le linee che non contengono la stringa"
-
-IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n"
-
-IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n"
-
-END
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\
+    /C  Conta il numero di linee che contengono la stringa\n\
+    /I  Ignora maiuscole/minuscole\n\
+    /N  Numera le linee visualizzate a partire da 1\n\
+    /V  Visualizza le linee che non contengono la stringa"
+
+IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n"
+
+IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n"
+
+END

reactos/base/applications/cmdutils/find/lang/lt-LT.rc

@@ -1,26 +1,26 @@
-/*
- * PROJECT:     ReactOS find command
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/cmdutils/find/lang/lt-LT.rc
- * PURPOSE:     Lithuanian Language File
- * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
- * DATE:        2007-09-23
- */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ie<69>komas tekstas.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\
-    /C  Skai<61>iuoti eilutes, kuriose yra ie<69>komas tekstas\n\
-    /I  Ignoruoti raid<69>i<EFBFBD> dyd<79>\n\
-    /N  Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\
-    /V  Spausdinti eilutes, kuriose n<>ra ie<69>komo teksto"
-
-IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos n<>ra\n"
-
-IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n"
-
-END
+/*
+ * PROJECT:     ReactOS find command
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/find/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File
+ * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ * DATE:        2007-09-23
+ */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ie<69>komas tekstas.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\
+    /C  Skai<61>iuoti eilutes, kuriose yra ie<69>komas tekstas\n\
+    /I  Ignoruoti raid<69>i<EFBFBD> dyd<79>\n\
+    /N  Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\
+    /V  Spausdinti eilutes, kuriose n<>ra ie<69>komo teksto"
+
+IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos n<>ra\n"
+
+IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n"
+
+END

reactos/base/applications/cmdutils/find/resource.h

@@ -1,3 +1,3 @@
-#define IDS_USAGE                 1000
-#define IDS_NO_SUCH_FILE          1001
-#define IDS_CANNOT_OPEN           1002
+#define IDS_USAGE                 1000
+#define IDS_NO_SUCH_FILE          1001
+#define IDS_CANNOT_OPEN           1002

reactos/base/applications/cmdutils/hostname/hostname.c

@@ -12,9 +12,9 @@
  *  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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* $Id$
  *

reactos/base/applications/cmdutils/hostname/hostname.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe">
-	<library>kernel32</library>
 	<file>hostname.c</file>
 	<file>hostname.rc</file>
 </module>

reactos/base/applications/cmdutils/lodctr/lodctr.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="lodctr" type="win32cui" installbase="system32" installname="lodctr.exe" unicode="yes">
-	<library>kernel32</library>
 	<library>loadperf</library>
 	<library>wine</library>
 	<file>lodctr_main.c</file>

reactos/base/applications/cmdutils/more/lang/it-IT.rc

@@ -1,15 +1,15 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_USAGE, "Visualizza dati una schermata per volta.\n\n\
-  MORE < [Drive:][Path]File\n\
-  Comando | MORE \n\
-  MORE [Drive:][Path]File\n\n\
-  [Drive:][Path]File    Il file da visualizzare.\n\
-  Comando\t\t     Il comando di cui l'output dev'essere visualizzato.\n\n\
-  Alla richiesta ""-- Continua --"" premere un tasto qualsiasi per visualizzare la pagina successiva.\n"
-
-  IDS_CONTINUE, " -- Continua (100%) -- "
-  IDS_FILE_ACCESS, "Impossibile accedere al file %s."
-END
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_USAGE, "Visualizza dati una schermata per volta.\n\n\
+  MORE < [Drive:][Path]File\n\
+  Comando | MORE \n\
+  MORE [Drive:][Path]File\n\n\
+  [Drive:][Path]File    Il file da visualizzare.\n\
+  Comando\t\t     Il comando di cui l'output dev'essere visualizzato.\n\n\
+  Alla richiesta ""-- Continua --"" premere un tasto qualsiasi per visualizzare la pagina successiva.\n"
+
+  IDS_CONTINUE, " -- Continua (100%) -- "
+  IDS_FILE_ACCESS, "Impossibile accedere al file %s."
+END

reactos/base/applications/cmdutils/more/lang/lt-LT.rc

@@ -1,27 +1,27 @@
-/*
- * PROJECT:     ReactOS more command
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/cmdutils/more/lang/lt-LT.rc
- * PURPOSE:     Lithuanian Language File
- * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
- * DATE:        2007-09-23
- */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_USAGE, "Atvaizduoja duomenis puslapiais.\n\n\
-  MORE < [Diskas:][Kelias iki bylos]Bylos vardas\n\
-  Komanda | MORE \n\
-  MORE [Diskas:][Kelias iki bylos]Bylos vardas\n\n\
-  [Diskas:][Kelias iki bylos]Bylos vardas    Byla, kurios turinys turi b<>ti\n\
-                                             atvaizduotas.\n\
-  Komanda                                    Komanda, kurios rezultatas turi\n\
-                                             b<>ti atvaizduotas.\n\n\
-  Pasirod<6F>ius raginimui ""-- Toliau --"" spauskite bet kur<75> klavi<76><69>, kad\n\
-  pamatytum<75>te sekant<6E> puslap<61>.\n"
-
-  IDS_CONTINUE, " -- Toliau (100%) -- "
-  IDS_FILE_ACCESS, "Nepavyko atverti bylos %s."
-END
+/*
+ * PROJECT:     ReactOS more command
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/more/lang/lt-LT.rc
+ * PURPOSE:     Lithuanian Language File
+ * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
+ * DATE:        2007-09-23
+ */
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_USAGE, "Atvaizduoja duomenis puslapiais.\n\n\
+  MORE < [Diskas:][Kelias iki bylos]Bylos vardas\n\
+  Komanda | MORE \n\
+  MORE [Diskas:][Kelias iki bylos]Bylos vardas\n\n\
+  [Diskas:][Kelias iki bylos]Bylos vardas    Byla, kurios turinys turi b<>ti\n\
+                                             atvaizduotas.\n\
+  Komanda                                    Komanda, kurios rezultatas turi\n\
+                                             b<>ti atvaizduotas.\n\n\
+  Pasirod<6F>ius raginimui ""-- Toliau --"" spauskite bet kur<75> klavi<76><69>, kad\n\
+  pamatytum<75>te sekant<6E> puslap<61>.\n"
+
+  IDS_CONTINUE, " -- Toliau (100%) -- "
+  IDS_FILE_ACCESS, "Nepavyko atverti bylos %s."
+END

reactos/base/applications/cmdutils/more/more.rbuild

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="more" type="win32cui" installbase="system32" installname="more.exe">
-	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>
 	<file>more.c</file>

reactos/base/applications/cmdutils/more/resource.h

@@ -1,20 +1,5 @@
-#ifndef RESOURCE_H__ /* resource.h */
-#define RESOURCE_H__
+#pragma once
 
 #define IDS_USAGE           100
 #define IDS_CONTINUE        101
 #define IDS_FILE_ACCESS     102
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif /* EOF of resource.h */

reactos/base/applications/cmdutils/reg/Da.rc

@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * Danish language support
+ *
+ * Copyright 2008 Jens Albretsen <jens@albretsen.dk>
+ *           2010 Thomas Larsen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n"
+    STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n"
+    STRING_SUCCESS, "Operationen blev afsluttet med succes\n"
+    STRING_INVALID_KEY, "Fejl: Ugyldigt nøgle navn\n"
+    STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n"
+    STRING_NO_REMOTE, "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n"
+    STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nøgle eller værdi\n"
+}

reactos/base/applications/cmdutils/reg/De.rc

@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * German language support
+ *
+ * Copyright 2008 Andrej Sinicyn
+ * Copyright 2009 Michael Stefaniuc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_USAGE, "Die Syntax von diesem Befehl ist:\n\nREG [ ADD | DELETE | QUERY ]\nREG Befehl /?\n"
+    STRING_ADD_USAGE, "REG ADD Schlüssel [/v Wert | /ve] [/t Typ] [/s Trenner] [/d Daten] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE Schlüssel [/v Wert | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY Schlüssel [/v Wert | /ve] [/s]\n"
+    STRING_SUCCESS, "Der Vorgang wurde erfolgreich abgeschlossen\n"
+    STRING_INVALID_KEY, "Fehler: Ungültiger Schlüssel\n"
+    STRING_INVALID_CMDLINE, "Fehler: Ungültige Befehlszeilenargumente\n"
+    STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum remote Rechner hinzufügen\n"
+    STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n"
+}

reactos/base/applications/cmdutils/reg/En.rc

@@ -0,0 +1,37 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * English language support
+ *
+ * Copyright 2008 Andrew Riedi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_USAGE, "The syntax of this command is:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n"
+    STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n"
+    STRING_SUCCESS, "The operation completed successfully\n"
+    STRING_INVALID_KEY, "Error: Invalid key name\n"
+    STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n"
+    STRING_NO_REMOTE, "Error: Unable to add keys to remote machine\n"
+    STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry key or value\n"
+}

reactos/base/applications/cmdutils/reg/Es.rc

@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * Spanish language support
+ *
+ * Copyright 2010 José Rostagno
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n"
+    STRING_SUCCESS, "La operación finalizó con éxito\n"
+    STRING_INVALID_KEY, "Error: nombre de clave no válido\n"
+    STRING_INVALID_CMDLINE, "Error: parámetros de línea de comandos inválidos\n"
+    STRING_NO_REMOTE, "Error: No se puede agregar claves al equipo remoto\n"
+    STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n"
+}