[SDK] Raise KERNEL_VERSION_PATCH_LEVEL to 13 in the version.cmake

Addendum to 00ff951. CORE-13020

.gitignore

@@ -4,6 +4,8 @@ modules/bootcd_extras
 modules/livecd_extras
 modules/hybridcd_extras
 modules/3rdparty
+modules/ahk_tests
+modules/AHK_Tests
 .cproject
 .project
 .settings

.travis.yml

@@ -6,7 +6,7 @@ git:
 before_script:
   - wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz -O RosBE.tar.gz
   - tar -xzf RosBE.tar.gz
-  - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && cd reactos && ninja -k 0 && ninja bootcd' > tmp_file
+  - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && ninja -k 0 && ninja bootcd' > tmp_file
 
 script:
   - ./RosBEBinFull/RosBE.sh < tmp_file

CMakeLists.txt

@@ -17,6 +17,11 @@ if(POLICY CMP0058)
     cmake_policy(SET CMP0058 OLD)
 endif()
 
+if(POLICY CMP0065)
+    # Do not add flags to export symbols from executables without the ENABLE_EXPORTS target property
+    cmake_policy(SET CMP0065 NEW)
+endif()
+
 project(REACTOS)
 
 # Versioning
@@ -25,6 +30,7 @@ include(sdk/include/reactos/version.cmake)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
+set(CMAKE_SHARED_MODULE_PREFIX "")
 set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
@@ -58,6 +64,14 @@ include(sdk/cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)
 
+# Double escape, since CMake unescapes before putting it on the command-line, where it's unescaped again by GCC/CL.
+add_definitions(-DREACTOS_SOURCE_DIR="\\\"${REACTOS_SOURCE_DIR}\\\"")
+add_definitions(-DREACTOS_BINARY_DIR="\\\"${REACTOS_BINARY_DIR}\\\"")
+
+# There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime.
+file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR})
+add_compile_flags(-D__RELFILE__="&__FILE__[__FILE__[0] == '.' ? sizeof \\\"${_PATH_PREFIX}\\\" - 1 : sizeof REACTOS_SOURCE_DIR]")
+
 if(MSVC_IDE)
     add_compile_flags("/MP")
 endif()
@@ -75,7 +89,9 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     if(MSVC)
         if(ARCH STREQUAL "i386")
-            add_definitions(/D_X86_ /DWIN32 /D_WINDOWS)
+            add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS)
+        elseif(ARCH STREQUAL "amd64")
+            add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS)
         endif()
         if(MSVC_VERSION GREATER 1699)
             add_definitions(/D_ALLOW_KEYWORD_MACROS)

CONTRIBUTING.md

@@ -71,6 +71,8 @@ Our commit style is defined in a __[commit template]__. Use it as a reference or
 - *Respect our __[Coding Style]__ and __[Programming Guidelines]__.*
 - *Do not be afraid to ask questions.* Ask our developers on JIRA or [IRC] channel.
 
+To amend your commit with your name and e-mail (in any case you've forgot to set your name/e-mail) please take a look at this [guide](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Amending_your_commit_with_name.2FE-mail). To set your name/e-mail globally for future commits that you push, [read this](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Assign_commits_with_your_name_.26_E-mail_automatically).
+
 ## Where To Start?
 
 Finding a good project to start with can be a challenge, because when starting out you are (usually) not aware of all the possibilities. To help you find a project, here are some ideas to try:

Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.13
+# Doxyfile 1.8.15
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,11 +17,11 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
@@ -94,6 +94,14 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -237,7 +245,12 @@ TAB_SIZE               = 4
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
 # "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -275,17 +288,26 @@ OPTIMIZE_FOR_FORTRAN   = NO
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. 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.
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files), VHDL, tcl. 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.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -296,7 +318,7 @@ EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -338,7 +360,7 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
 # will parse them like normal C++ but will assume all classes use public instead
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.
@@ -709,7 +731,7 @@ LAYOUT_FILE            =
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
 # extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
@@ -754,7 +776,8 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -796,7 +819,7 @@ INPUT                  =
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
 # possible encodings.
 # The default value is: UTF-8.
 
@@ -814,7 +837,7 @@ INPUT_ENCODING         = UTF-8
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
 # *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c *.cc *.cxx *.cpp *.h *.hh *.hxx *.hpp *.idl
 
@@ -969,7 +992,7 @@ INLINE_SOURCES         = YES
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = YES
@@ -1001,12 +1024,12 @@ SOURCE_TOOLTIPS        = YES
 # If the USE_HTAGS tag is set to YES then the references to source code will
 # point to the HTML generated by the htags(1) tool instead of doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
+# (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1028,25 +1051,6 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse-libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1165,7 +1169,7 @@ HTML_EXTRA_FILES       =
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
 # Minimum value: 0, maximum value: 359, default value: 220.
@@ -1201,6 +1205,17 @@ HTML_COLORSTYLE_GAMMA  = 80
 
 HTML_TIMESTAMP         = YES
 
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
@@ -1224,13 +1239,13 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
 # Makefile in the HTML output directory. Running make will produce the docset in
 # that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1269,7 +1284,7 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
 # Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
@@ -1345,7 +1360,7 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1353,7 +1368,7 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
 # folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
@@ -1362,7 +1377,7 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1370,7 +1385,7 @@ QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1378,7 +1393,7 @@ QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
@@ -1471,7 +1486,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1483,7 +1498,7 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side Javascript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1510,11 +1525,11 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
@@ -1572,7 +1587,7 @@ SERVER_BASED_SEARCH    = YES
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
+# Xapian (see: https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1585,7 +1600,7 @@ EXTERNAL_SEARCH        = YES
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1637,21 +1652,34 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# 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.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_CMD_NAME         = latex
+LATEX_CMD_NAME         =
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: \makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = \makeindex
+
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@@ -1772,7 +1800,7 @@ LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1786,6 +1814,14 @@ LATEX_BIB_STYLE        = plain
 
 LATEX_TIMESTAMP        = NO
 
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1825,9 +1861,9 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1836,8 +1872,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -1923,6 +1959,13 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -1955,9 +1998,9 @@ DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -2170,7 +2213,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
-# The default value is: YES.
+# The default value is: NO.
 
 HAVE_DOT               = YES
 
@@ -2326,9 +2369,7 @@ DIRECTORY_GRAPH        = YES
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
-# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
 # png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
 # png:gdiplus:gdiplus.
 # The default value is: png.

MAINTAINERS

@@ -57,6 +57,24 @@ Descriptions of section entries used here:
 	   this area
 	C: Comments
 
+3rd Party File Format Libraries
+	M: ThFabba, Thomas Faber
+	S: Upstream
+	F: dll/3rdparty/libjpeg/
+	F: dll/3rdparty/libpng/
+	F: dll/3rdparty/libtiff/
+	F: dll/3rdparty/libxslt/
+	F: sdk/include/reactos/libs/libjpeg/
+	F: sdk/include/reactos/libs/libmpg123/
+	F: sdk/include/reactos/libs/libpng/
+	F: sdk/include/reactos/libs/libtiff/
+	F: sdk/include/reactos/libs/libxml/
+	F: sdk/include/reactos/libs/libxslt/
+	F: sdk/lib/3rdparty/libmpg123/
+	F: sdk/lib/3rdparty/libsamplerate/
+	F: sdk/lib/3rdparty/libxml2/
+	C: See media/doc/3rd Party Files.txt
+
 ACPI
 	M:
 	R: ThFabba, Thomas Faber
@@ -100,6 +118,11 @@ CMake Build Scripts
 	F: */CMakeLists.txt
 	F: */*.cmake
 
+File Patch API
+	M: learn-more, learn_more, Mark Jansen
+	S: Maintained
+	F: dll/win32/mspatcha
+
 File Systems
 	M: HeisSpiter, Pierre Schweitzer
 	S: Maintained
@@ -128,6 +151,13 @@ Kernel
 	S: Maintained
 	F: ntoskrnl/
 
+mbed TLS
+	M: ThFabba, Thomas Faber
+	S: Upstream
+	F: dll/3rdparty/mbedtls/
+	F: sdk/include/reactos/libs/mbedtls/
+	C: See media/doc/3rd Party Files.txt
+
 Network Drivers
 	M:
 	R: ThFabba, Thomas Faber
@@ -208,6 +238,7 @@ Virtual CD-ROM
 	M: HeisSpiter, Pierre Schweitzer
 	S: Maintained
 	F: modules/rosapps/applications/cmdutils/vcdcli/
+	F: modules/rosapps/applications/vcdcontroltool/
 	F: modules/rosapps/drivers/vcdrom/
 
 Virtual Floppy Disk
@@ -231,3 +262,10 @@ Wine Tests
 	R: ThFabba, Thomas Faber
 	S: Upstream
 	F: modules/rostests/winetests/
+
+zlib
+	M: ThFabba, Thomas Faber
+	S: Upstream
+	F: sdk/include/reactos/libs/zlib/
+	F: sdk/lib/3rdparty/zlib/
+	C: See media/doc/3rd Party Files.txt

README.md

@@ -7,8 +7,8 @@
 ---
 
 <p align=center>
-  <a href="https://reactos.org/project-news/reactos-0410-released">
-    <img alt="ReactOS 0.4.10 Release" src="https://img.shields.io/badge/release-0.4.10-0688CB.svg">
+  <a href="https://reactos.org/project-news/reactos-0411-released">
+    <img alt="ReactOS 0.4.11 Release" src="https://img.shields.io/badge/release-0.4.11-0688CB.svg">
   </a>
   <a href="https://reactos.org/download">
     <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">
@@ -28,13 +28,14 @@
 </p>
 
 ## Quick Links
+[Website](https://reactos.org) &bull; 
+[Official chat](https://chat.reactos.org) &bull; 
+[Wiki](https://reactos.org/wiki) &bull; 
+[Forum](https://reactos.org/forum) &bull; 
+[JIRA Bug Tracker](https://jira.reactos.org/issues) &bull; 
+[ReactOS Git mirror](https://git.reactos.org) &bull; 
+[Testman](https://reactos.org/testman/)
 
-- [Website](https://reactos.org)
-- [Wiki](https://reactos.org/wiki)
-- [Forum](https://reactos.org/forum)
-- [JIRA Bug Tracker](https://jira.reactos.org/issues)
-- [ReactOS Git mirror](https://git.reactos.org)
-- [Testman](https://reactos.org/testman/)
 
 ## What is ReactOS?
 

base/applications/atactl/atactl.cpp

@@ -445,7 +445,7 @@ ata_str_to_mode(
     )
 {
     int mode;
-    int len;
+    size_t len;
 
     if(!_stricmp(str, "SATA600"))
         return ATA_SA600;
@@ -1688,7 +1688,8 @@ main (
     )
 {
     //ULONG Flags = 0;
-    int i, j;
+    int i;
+    uintptr_t j;
     char a;
     int bus_id = -1;
     int dev_id = -1;

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

@@ -18,21 +18,21 @@ CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                  指定文件的 ACL。\n\
    /E            編輯 ACL 而不替換。\n\
    /C            在出現拒絕訪問錯誤時繼續。\n\
-   /G user:perm  賦予指定用戶訪問權限。\n\
+   /G user:perm  賦予指定使用者訪問權限。\n\
                  Perm 可以是: R  讀取\n\
                               W  寫入\n\
                               C  更改(寫入)\n\
                               F  完全控制\n\
-   /R user       撤銷指定用戶的訪問權限(僅在与 /E 一起使用時合法)。\n\
-   /P user:perm  替換指定用戶的訪問權限。\n\
+   /R user       撤銷指定使用者的訪問權限(僅在与 /E 一起使用時合法)。\n\
+   /P user:perm  替換指定使用者的訪問權限。\n\
                  Perm 可以是: N  無\n\
                               R  讀取\n\
                               W  寫入\n\
                               C  更改(寫入) \n\
                               F  完全控制 \n\
-   /D user       拒絕指定用戶的訪問。\n\
+   /D user       拒絕指定使用者的訪問。\n\
 在命令中可以使用通配符指定多個文件。\n\
-您也可以在命令中指定多個用戶。\n\n\
+您也可以在命令中指定多個使用者。\n\n\
 縮寫: \n\
    CI - 容器繼承。\n\
         ACE會由目錄繼承。\n\

base/applications/calc/CMakeLists.txt

@@ -3,10 +3,12 @@ add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 
 list(APPEND SOURCE
     convert.c
-    function.c
-    rpn.c
-    utl.c
+    fun_ieee.c
+    rpn_ieee.c
+    utl_ieee.c
     winmain.c
+    htmlhelp.c
+    theme.c
     calc.h)
 
 file(GLOB calc_rc_deps res/*.*)

base/applications/calc/calc.h

@@ -1,16 +1,24 @@
-#ifndef _CALC_H
-#define _CALC_H
+#ifndef __CALC_H__
+#define __CALC_H__
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winuser.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <tchar.h>
+#include <commctrl.h>
+#include <shellapi.h>
+
+#include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include <float.h>
 #include <malloc.h>
 #ifndef DISABLE_HTMLHELP_SUPPORT
 #include <htmlhelp.h>
 #endif
+#include <limits.h>
+
+/* RESOURCES */
+#include "resource.h"
 
 /* Messages reserved for the main dialog */
 #define WM_CLOSE_STATS      (WM_APP+1)
@@ -21,8 +29,9 @@
 #define WM_HANDLE_FROM      (WM_APP+6)
 #define WM_HANDLE_TO        (WM_APP+7)
 
+/* GNU MULTI-PRECISION LIBRARY support */
 #ifdef ENABLE_MULTI_PRECISION
-#include <mpfr.h>
+#include "mpfr.h"
 
 #ifndef MPFR_DEFAULT_RND
 #define MPFR_DEFAULT_RND mpfr_get_default_rounding_mode ()
@@ -35,14 +44,54 @@
 
 #endif
 
-#include "resource.h"
-
-#ifndef IDC_STATIC
-#define IDC_STATIC  ((DWORD)-1)
-#endif
+#define CALC_VERSION        _T("1.12")
 
 #define MAX_CALC_SIZE       256
 
+/* HTMLHELP SUPPORT */
+typedef HWND (WINAPI* type_HtmlHelpA)(HWND, LPCSTR, UINT, DWORD);
+typedef HWND (WINAPI* type_HtmlHelpW)(HWND, LPCWSTR, UINT, DWORD);
+
+extern type_HtmlHelpA calc_HtmlHelpA;
+extern type_HtmlHelpW calc_HtmlHelpW;
+
+#ifndef UNICODE
+#define calc_HtmlHelp   calc_HtmlHelpA
+#else
+#define calc_HtmlHelp   calc_HtmlHelpW
+#endif
+
+void HtmlHelp_Start(HINSTANCE hInstance);
+void HtmlHelp_Stop(void);
+
+/* THEMING SUPPORT */
+#if (_WIN32_WINNT >= 0x0600)
+#include <vssym32.h>
+#include <vsstyle.h>
+#else
+#include <tmschema.h>
+#endif
+#include <uxtheme.h>
+
+void Theme_Start(HINSTANCE hInstance);
+void Theme_Stop(void);
+
+typedef HTHEME   (WINAPI* type_OpenThemeData)(HWND,const WCHAR*);
+typedef HRESULT  (WINAPI* type_CloseThemeData)(HTHEME);
+typedef HRESULT  (WINAPI* type_DrawThemeBackground)(HTHEME,HDC,int,int,const RECT*,const RECT*);
+typedef BOOL     (WINAPI* type_IsAppThemed)(void);
+typedef BOOL     (WINAPI* type_IsThemeActive)(void);
+typedef BOOL     (WINAPI* type_IsThemeBackgroundPartiallyTransparent)(HTHEME, int, int);
+typedef HRESULT  (WINAPI* type_DrawThemeParentBackground)(HWND, HDC, RECT *);
+
+extern type_OpenThemeData                   calc_OpenThemeData;
+extern type_CloseThemeData                  calc_CloseThemeData;
+extern type_DrawThemeBackground             calc_DrawThemeBackground;
+extern type_IsAppThemed                     calc_IsAppThemed;
+extern type_IsThemeActive                   calc_IsThemeActive;
+extern type_IsThemeBackgroundPartiallyTransparent calc_IsThemeBackgroundPartiallyTransparent;
+extern type_DrawThemeParentBackground       calc_DrawThemeParentBackground;
+
 /*#define USE_KEYBOARD_HOOK*/
 
 #define SIZEOF(_ar)     (sizeof(_ar)/sizeof(_ar[1]))
@@ -120,6 +169,8 @@ typedef struct {
     HHOOK         hKeyboardHook;
 #endif
     HWND          hWnd;
+    HICON         hBgIcon;
+    HICON         hSmIcon;
     DWORD         layout;
     TCHAR         buffer[MAX_CALC_SIZE];
     TCHAR         source[MAX_CALC_SIZE];
@@ -155,11 +206,11 @@ typedef struct {
 
 extern calc_t calc;
 
-#define CALC_E      2.7182818284590452354
-
-#define CALC_PI_2   1.57079632679489661923
-#define CALC_PI     3.14159265358979323846
-#define CALC_3_PI_2 4.71238898038468985769
+/* IEEE constants */
+#define CALC_E      2.718281828459045235360
+#define CALC_PI_2   1.570796326794896619231
+#define CALC_PI     3.141592653589793238462
+#define CALC_3_PI_2 4.712388980384689857694
 #define CALC_2_PI   6.283185307179586476925
 
 #define MODIFIER_INV    0x01
@@ -167,14 +218,9 @@ extern calc_t calc;
 #define NO_CHAIN        0x04
 
 void apply_int_mask(calc_number_t *a);
-#ifdef ENABLE_MULTI_PRECISION
-void validate_rad2angle(calc_number_t *c);
-void validate_angle2rad(calc_number_t *c);
-#else
+#ifndef ENABLE_MULTI_PRECISION
 __int64 logic_dbl2int(calc_number_t *a);
 double logic_int2dbl(calc_number_t *a);
-double validate_rad2angle(double a);
-double validate_angle2rad(calc_number_t *c);
 #endif
 void rpn_sin(calc_number_t *c);
 void rpn_cos(calc_number_t *c);
@@ -206,7 +252,9 @@ void rpn_exp10(calc_number_t *c);
 void rpn_ln(calc_number_t *c);
 void rpn_log(calc_number_t *c);
 void rpn_ave(calc_number_t *c);
+void rpn_ave2(calc_number_t *c);
 void rpn_sum(calc_number_t *c);
+void rpn_sum2(calc_number_t *c);
 void rpn_s(calc_number_t *c);
 void rpn_s_m1(calc_number_t *c);
 void rpn_dms2dec(calc_number_t *c);
@@ -217,14 +265,20 @@ int  rpn_is_zero(calc_number_t *c);
 void rpn_alloc(calc_number_t *c);
 void rpn_free(calc_number_t *c);
 
+//
+
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base);
 void convert_text2number_2(calc_number_t *a);
 void convert_real_integer(unsigned int base);
 
+//
+
 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 /* _CALC_H */
+#endif /* __CALC_H__ */

base/applications/calc/convert.c

@@ -1,3 +1,23 @@
+/*
+ * ReactOS Calc (Unit conversion engine)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
 #include "calc.h"
 
 /*
@@ -44,13 +64,17 @@ typedef struct {
     { 0, NULL, NULL },
 
 /*
-    1 gradian = 0.9 deg
-    1 radian = 57.29577951308233 deg
+    1 arcminute ....... = 1/60 deg
+    1 arcsecond ....... = 1/3600 deg
+    1 gradian ......... = 0.9 deg
+    1 radian .......... = 57.29577951308233 deg
 */
 static const conv_t conv_ANGLE[] = {
-    DECLARE_CONV_UNIT(ANGLE, DEGREES,  "$", "$")
-    DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9")
-    DECLARE_CONV_UNIT(ANGLE, RADIANS,  "$/P*180", "$*P/180")
+    DECLARE_CONV_UNIT(ANGLE, ARCMINUTES, "$/60",    "$*60")
+    DECLARE_CONV_UNIT(ANGLE, ARCSECONDS, "$/3600",  "$*3600")
+    DECLARE_CONV_UNIT(ANGLE, DEGREES,    "$",       "$")
+    DECLARE_CONV_UNIT(ANGLE, GRADIANS,   "$*0.9",   "$/0.9")
+    DECLARE_CONV_UNIT(ANGLE, RADIANS,    "$/P*180", "$*P/180")
     DECLARE_CONV_END
 };
 
@@ -62,13 +86,13 @@ static const conv_t conv_ANGLE[] = {
     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 ............... = 991.74 mq
     1 ha .................. = 10000 mq
-    1 jeongbo ............. =
-    1 morgen hungary ...... =
+    1 jeongbo ............. = 9917.4 mq
+    1 morgen hungary ...... = 5754.642 mq
     1 mu .................. = 2000/3 mq
     1 ping ................ =
-    1 pyeong .............. =
+    1 pyeong .............. = 400/121 mq
     1 pyeongbangja ........ =
     1 rai ................. = 1600 mq
     1 se .................. = 1080*(10/33)^2 mq
@@ -84,7 +108,7 @@ static const conv_t conv_ANGLE[] = {
     1 square mm ........... = 0,000001 mq
     1 square shaku ........ = (10/33)^2 mq
     1 square tsuen ........ =
-    1 square va ........... =
+    1 square va ........... = 4 mq
     1 square yard ......... = 0,83612736 mq
     1 tan ................. = 10800*(10/33)^2 mq
     1 tsubo ............... = 36*(10/33)^2 mq
@@ -97,15 +121,15 @@ static const conv_t conv_AREA[] = {
     DECLARE_CONV_UNIT(AREA, ACRES_SCOTS,            "$*5000",            "$/5000")
     DECLARE_CONV_UNIT(AREA, ARES,                   "$*100",             "$/100")
     DECLARE_CONV_UNIT(AREA, CHOU,                   "$*10800000/1089",   "$*1089/10800000")
-//    DECLARE_CONV_UNIT(AREA, DANBO,                  "$", "$")
+    DECLARE_CONV_UNIT(AREA, DANBO,                  "$*991.74",          "$/991.74")
     DECLARE_CONV_UNIT(AREA, HECTARES,               "$*10000",           "$/10000")
-//    DECLARE_CONV_UNIT(AREA, JEONGBO,                "$", "$")
+    DECLARE_CONV_UNIT(AREA, JEONGBO,                "$*9917.4",          "$/9917.4")
 //    DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY,         "$", "$")
-    DECLARE_CONV_UNIT(AREA, MU,                     "$*(2000/3)", "$/(2000/3)")
+    DECLARE_CONV_UNIT(AREA, MU,                     "$*(2000/3)",        "$/(2000/3)")
 //    DECLARE_CONV_UNIT(AREA, PING,                   "$", "$")
-//    DECLARE_CONV_UNIT(AREA, PYEONG,                 "$", "$")
+    DECLARE_CONV_UNIT(AREA, PYEONG,                 "$*400/121",         "$*121/400")
 //    DECLARE_CONV_UNIT(AREA, PYEONGBANGJA,           "$", "$")
-    DECLARE_CONV_UNIT(AREA, RAI,                    "$*1600", "$/1600")
+    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,             "$", "$")
@@ -120,7 +144,7 @@ static const conv_t conv_AREA[] = {
     DECLARE_CONV_UNIT(AREA, SQUARE_MILLIMETERS,     "$*1000000",         "$/1000000")
     DECLARE_CONV_UNIT(AREA, SQUARE_SHAKU,           "$*100/1089",        "$/1089*100")
 //    DECLARE_CONV_UNIT(AREA, SQUARE_TSUEN,           "$", "$")
-//    DECLARE_CONV_UNIT(AREA, SQUARE_VA,              "$", "$")
+    DECLARE_CONV_UNIT(AREA, SQUARE_VA,              "$*4",               "$/4")
     DECLARE_CONV_UNIT(AREA, SQUARE_YARD,            "$*0,83612736",      "$/0,83612736")
     DECLARE_CONV_UNIT(AREA, TAN,                    "$*1080000/1089",    "$*1089/1080000")
     DECLARE_CONV_UNIT(AREA, TSUBO,                  "$*1188/1089",       "$*1089/1188")
@@ -168,7 +192,7 @@ static const conv_t conv_CURRENCY[] = {
     1 cal15 .... = 4.1855 J
     1 BTU ...... = 1055.056 J
     1 ERG ...... = 0.0000001 J
-    1 EV ....... = 0.000000000000000000160217653 J
+    1 eV ....... = 0.000000000000000000160217653 J
     1 Foot-Pound = 1.3558179483314004 J
     1 IT calorie = 4.1868 J
     1 KCa ...... = 4186.8 J
@@ -181,7 +205,7 @@ static const conv_t conv_ENERGY[] = {
     DECLARE_CONV_UNIT(ENERGY, 15_C_CALORIES,        "$*4.1855",   "$/4.1855")
     DECLARE_CONV_UNIT(ENERGY, BTUS,                 "$*1055.056", "$/1055.056")
     DECLARE_CONV_UNIT(ENERGY, ERGS,                 "$*.0000001", "$/.0000001")
-    DECLARE_CONV_UNIT(ENERGY, EVS,                  "$*.000000000000000000160217653", "$/.000000000000000000160217653")
+    DECLARE_CONV_UNIT(ENERGY, EVS,                  "$*1.60217653/1X19", "$/1.60217653*1X19")
     DECLARE_CONV_UNIT(ENERGY, FOOT_POUNDS,          "$*1.3558179483314004",   "$/1.3558179483314004")
     DECLARE_CONV_UNIT(ENERGY, IT_CALORIES,          "$*4.1868",   "$/4.1868")
     DECLARE_CONV_UNIT(ENERGY, IT_KILOCALORIES,      "$*4186.8",   "$/4186.8")
@@ -209,13 +233,13 @@ static const conv_t conv_ENERGY[] = {
     1 furlong ........ = 10 chains = 220*0.9144 m
     1 gan ............ =
     1 hand ........... = 4 inches = 0.9144/9 m
-    1 hunh ........... =
+    1 hunh ........... = 1/8 nieu = 9.144/3456 m
     1 inch ........... = yard/36 = 0.9144/36 m
     1 ja ............. =
     1 jeong .......... =
-    1 kabiet ......... =
+    1 kabiet ......... = 1/4 nieu = 9.144/1728 m
     1 ken ............ = 60/33 m
-    1 keub ........... =
+    1 keub ........... = 12 nieu = 10 inch = 9.144/36 m
     1 km ............. = 1000 m
     1 lar ............ =
     1 light year ..... = 9460730472580800 m
@@ -224,25 +248,25 @@ static const conv_t conv_ENERGY[] = {
     1 mile ........... = 1760 yards = 1609.344 m
     1 millimeter ..... = 1/1000 m
     1 nautical mile .. = 1852 m
-    1 nieu ........... =
+    1 nieu ........... = 10/12 inch = 9.144/432 m
     1 parsec ......... = 30856800000000000 m
     1 pica ........... = yard/216 = 0.9144/216 m
-    1 ri japan ....... =
-    1 ri korea ....... =
+    1 ri japan ....... = 129600/33 m
+    1 ri korea ....... = 12960/33 m
     1 rod ............ = 5.0292 m
-    1 sawk ........... =
-    1 sen ............ =
+    1 sawk ........... = 2 keub = 20 inch = 9.144/18 m
+    1 sen ............ = 20 va = 40.64 m
     1 shaku .......... = 10/33 m
     1 span ........... = 9 inches = 0.9144/4 m
     1 sun ............ = 1/33 m
     1 tsuen .......... =
-    1 va ............. =
+    1 va ............. = 4 sawk = 80 inch = 2.032 m
     1 yard ........... = 0.9144 m
-    1 yote ........... =
-    1 zhang .......... =
+    1 yote ........... = 400 sen = 16256 m
+    1 zhang .......... = 3+1/3 m = 10/3 m
 */
 static const conv_t conv_LENGTH[] = {
-    DECLARE_CONV_UNIT(LENGTH, ANGSTROMS,            "$*0.0000000001",   "$/0.0000000001")
+    DECLARE_CONV_UNIT(LENGTH, ANGSTROMS,            "$/1X10",           "$*1X10")
     DECLARE_CONV_UNIT(LENGTH, ASTRONOMICAL_UNITS,   "$*149598000000",   "$/149598000000")
     DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS,          "$*0.9144/108",     "$/0.9144*108")
     DECLARE_CONV_UNIT(LENGTH, CENTIMETERS,          "$/100",            "$*100")
@@ -257,13 +281,13 @@ static const conv_t conv_LENGTH[] = {
     DECLARE_CONV_UNIT(LENGTH, FURLONGS,             "$*201.168",        "$/201.168")
 //    DECLARE_CONV_UNIT(LENGTH, GAN,                  "$", "$")
     DECLARE_CONV_UNIT(LENGTH, HANDS,                "$*0,1016",         "$/0,1016")
-//    DECLARE_CONV_UNIT(LENGTH, HUNH,                 "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, HUNH,                 "$*9.144/3456",     "$/9.144*3456")
     DECLARE_CONV_UNIT(LENGTH, INCHES,               "$*0.0254",         "$/0.0254")
 //    DECLARE_CONV_UNIT(LENGTH, JA,                   "$", "$")
 //    DECLARE_CONV_UNIT(LENGTH, JEONG,                "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, KABIET,               "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, KABIET,               "$*9.144/1728",     "$/9.144*1728")
     DECLARE_CONV_UNIT(LENGTH, KEN,                  "$*60/33",          "$*33/60")
-//    DECLARE_CONV_UNIT(LENGTH, KEUB,                 "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, KEUB,                 "$*9.144/36",       "$/9.144*36")
     DECLARE_CONV_UNIT(LENGTH, KILOMETERS,           "$*1000",           "$/1000")
 //    DECLARE_CONV_UNIT(LENGTH, LAR,                  "$", "$")
     DECLARE_CONV_UNIT(LENGTH, LIGHT_YEARS,          "$*9460730472580800", "$/9460730472580800")
@@ -273,22 +297,22 @@ static const conv_t conv_LENGTH[] = {
     DECLARE_CONV_UNIT(LENGTH, MILES,                "$*1609.344",       "$/1609.344")
     DECLARE_CONV_UNIT(LENGTH, MILLIMETERS,          "$/1000",           "$*1000")
     DECLARE_CONV_UNIT(LENGTH, NAUTICAL_MILES,       "$*1852",           "$/1852")
-//    DECLARE_CONV_UNIT(LENGTH, NIEU,                 "$", "$")
-    DECLARE_CONV_UNIT(LENGTH, PARSECS,              "$*30856800000000000", "$/30856800000000000")
+    DECLARE_CONV_UNIT(LENGTH, NIEU,                 "$*9.144/432",      "$/9.144*432")
+    DECLARE_CONV_UNIT(LENGTH, PARSECS,              "$*3.085678X16",    "$/3.085678X16")
     DECLARE_CONV_UNIT(LENGTH, PICAS,                "$*0.9144/216",     "$/0.9144*216")
     DECLARE_CONV_UNIT(LENGTH, RODS,                 "$*5.0292",         "$/5.0292")
-//    DECLARE_CONV_UNIT(LENGTH, RI_JAPAN,             "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, RI_KOREA,             "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, SAWK,                 "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, SEN,                  "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, RI_JAPAN,             "$*129600/33",      "$*33/129600")
+    DECLARE_CONV_UNIT(LENGTH, RI_KOREA,             "$*12960/33",       "$*33/12960")
+    DECLARE_CONV_UNIT(LENGTH, SAWK,                 "$*9.144/18",       "$/9.144*18")
+    DECLARE_CONV_UNIT(LENGTH, SEN,                  "$*40.64",          "$/40.64")
     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,                  "$*1/33",            "$*33")
 //    DECLARE_CONV_UNIT(LENGTH, TSUEN,                "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, VA,                   "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, VA,                   "$*2.032",          "$/2.032")
     DECLARE_CONV_UNIT(LENGTH, YARDS,                "$*0.9144",         "$/0.9144")
-//    DECLARE_CONV_UNIT(LENGTH, YOTE,                 "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, ZHANG,                "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, YOTE,                 "$*16256",          "$/16256")
+    DECLARE_CONV_UNIT(LENGTH, ZHANG,                "$/0.3",            "$*0.3")
     DECLARE_CONV_END
 };
 
@@ -387,7 +411,7 @@ static const conv_t conv_VELOCITY[] = {
 /*
     1 barrel uk ...... = 163.65924 l
     1 barrel oil ..... = 158.987295 l
-    1 bun ............ =
+    1 bun ............ = 1000 l
     1 bushel uk ...... = 36.36872 l
     1 bushel us ...... = 35.23907017 l
     1 cubic cm  ...... = 0.001 l
@@ -404,7 +428,7 @@ static const conv_t conv_VELOCITY[] = {
     1 gou ............ = 0.1809 l
     1 hop ............ =
     1 icce ........... =
-    1 kwian .......... =
+    1 kwian .......... = 2000 l
     1 mal ............ =
     1 milliliter ..... = 0.001 l
     1 pint uk ........ = 0.56826125 l
@@ -415,14 +439,14 @@ static const conv_t conv_VELOCITY[] = {
     1 quart liquid us  = 0.946352946 l
     1 seki ........... =
     1 syou ........... =
-    1 tananloung ..... =
-    1 tang ........... =
+    1 tananloung ..... = 1 l
+    1 tang ........... = 20 l
     1 to ............. = 18040 l
 */
 static const conv_t conv_VOLUME[] = {
     DECLARE_CONV_UNIT(VOLUME, BARRELS_UK,           "$*163.65924",       "$/163.65924")
     DECLARE_CONV_UNIT(VOLUME, BARRELS_OIL,          "$*158.987295",      "$/158.987295")
-//    DECLARE_CONV_UNIT(VOLUME, BUN,                  "$", "$")
+    DECLARE_CONV_UNIT(VOLUME, BUN,                  "$*1000",            "$/1000")
     DECLARE_CONV_UNIT(VOLUME, BUSHELS_UK,           "$*36.36872",        "$/36.36872")
     DECLARE_CONV_UNIT(VOLUME, BUSHELS_US,           "$*35.23907017",     "$/35.23907017")
     DECLARE_CONV_UNIT(VOLUME, CUBIC_CENTIMETERS,    "$*0.001",           "$/0.001")
@@ -439,7 +463,7 @@ static const conv_t conv_VOLUME[] = {
     DECLARE_CONV_UNIT(VOLUME, GOU,                  "$*0.1809",          "$/0.1809")
 //    DECLARE_CONV_UNIT(VOLUME, HOP,                  "$", "$")
 //    DECLARE_CONV_UNIT(VOLUME, ICCE,                 "$", "$")
-//    DECLARE_CONV_UNIT(VOLUME, KWIAN,                "$", "$")
+    DECLARE_CONV_UNIT(VOLUME, KWIAN,                "$*2000",            "$/2000")
     DECLARE_CONV_UNIT(VOLUME, LITERS,               "$",                 "$")
 //    DECLARE_CONV_UNIT(VOLUME, MAL,                  "$", "$")
     DECLARE_CONV_UNIT(VOLUME, MILLILITERS,          "$*0.001",           "$/0.001")
@@ -451,8 +475,8 @@ static const conv_t conv_VOLUME[] = {
     DECLARE_CONV_UNIT(VOLUME, QUARTS_LIQUID_US,     "$*0.946352946",     "$/0.946352946")
 //    DECLARE_CONV_UNIT(VOLUME, SEKI,                 "$", "$")
 //    DECLARE_CONV_UNIT(VOLUME, SYOU,                 "$", "$")
-//    DECLARE_CONV_UNIT(VOLUME, TANANLOUNG,           "$", "$")
-//    DECLARE_CONV_UNIT(VOLUME, TANG,                 "$", "$")
+    DECLARE_CONV_UNIT(VOLUME, TANANLOUNG,           "$",                 "$")
+    DECLARE_CONV_UNIT(VOLUME, TANG,                 "$*20",              "$/20")
     DECLARE_CONV_UNIT(VOLUME, TO,                   "$*18040",           "$/18040")
     DECLARE_CONV_END
 };
@@ -484,6 +508,17 @@ static const conv_t conv_VOLUME[] = {
     1 ton uk .......... = 1016046.9088 g  // long ton
     1 ton us .......... = 907184.74 g     // short ton
 */
+/*
+1 chang = 20 tamlung
+1 tamlung = 4 baht
+1 baht = 4 saloung
+1 saloung = 
+
+1 chang = 6/5 kg = 1200 g
+1 tamlung = 1/20 chang = 60 g
+1 baht = 1/4 tamlung = 15 g
+1 saloung = 1/4 bath = 15/4 g
+*/
 static const conv_t conv_WEIGHT[] = {
     DECLARE_CONV_UNIT(WEIGHT, BAHT,                 "$*12.244",       "$/12.244")
     DECLARE_CONV_UNIT(WEIGHT, CARATS,               "$*0.2",          "$/0.2")

base/applications/calc/fun_ieee.c

@@ -1,6 +1,27 @@
+/*
+ * ReactOS Calc (Math functions, IEEE-754 engine)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
 #include "calc.h"
 
-#include <limits.h>
+static double validate_rad2angle(double a);
+static double validate_angle2rad(calc_number_t *c);
 
 void apply_int_mask(calc_number_t *r)
 {
@@ -47,7 +68,7 @@ double atanh(double x)
     return log((1.0+x)/(1.0-x))/2.0;
 }
 
-double validate_rad2angle(double a)
+static double validate_rad2angle(double a)
 {
     switch (calc.degr) {
     case IDC_RADIO_DEG:
@@ -62,7 +83,7 @@ double validate_rad2angle(double a)
     return a;
 }
 
-double validate_angle2rad(calc_number_t *c)
+static double validate_angle2rad(calc_number_t *c)
 {
     switch (calc.degr) {
     case IDC_RADIO_DEG:
@@ -250,6 +271,7 @@ __int64 logic_dbl2int(calc_number_t *a)
     }
     return (__int64)int_part;
 }
+
 double logic_int2dbl(calc_number_t *a)
 {
     return (double)a->i;
@@ -315,9 +337,9 @@ static unsigned __int64 sqrti(unsigned __int64 number)
     unsigned __int64 n, n1;
 
 #ifdef __GNUC__
-    if (number == 0xffffffffffffffffLL)
+    if (number == 0xffffffffffffffffULL)
 #else
-    if (number == 0xffffffffffffffff)
+    if (number == 0xffffffffffffffffUI64)
 #endif
         return 0xffffffff;
 
@@ -427,6 +449,21 @@ static double stat_sum(void)
     return sum;
 }
 
+static double stat_sum2(void)
+{
+    double       sum = 0;
+    statistic_t *p = calc.stat;
+
+    while (p != NULL) {
+        if (p->base == IDC_RADIO_DEC)
+            sum += p->num.f * p->num.f;
+        else
+            sum += (double)p->num.i * (double)p->num.i;
+        p = (statistic_t *)(p->next);
+    }
+    return sum;
+}
+
 void rpn_ave(calc_number_t *c)
 {
     double       ave = 0;
@@ -443,6 +480,22 @@ void rpn_ave(calc_number_t *c)
         c->i = (__int64)ave;
 }
 
+void rpn_ave2(calc_number_t *c)
+{
+    double       ave = 0;
+    int          n;
+
+    ave = stat_sum2();
+    n = SendDlgItemMessage(calc.hStatWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);
+
+    if (n)
+        ave = ave / (double)n;
+    if (calc.base == IDC_RADIO_DEC)
+        c->f = ave;
+    else
+        c->i = (__int64)ave;
+}
+
 void rpn_sum(calc_number_t *c)
 {
     double sum = stat_sum();
@@ -453,6 +506,16 @@ void rpn_sum(calc_number_t *c)
         c->i = (__int64)sum;
 }
 
+void rpn_sum2(calc_number_t *c)
+{
+    double sum = stat_sum2();
+
+    if (calc.base == IDC_RADIO_DEC)
+        c->f = sum;
+    else
+        c->i = (__int64)sum;
+}
+
 static void rpn_s_ex(calc_number_t *c, int pop_type)
 {
     double       ave = 0;

base/applications/calc/fun_mpfr.c

@@ -1,5 +1,28 @@
+/*
+ * ReactOS Calc (Math functions, GMP/MPFR engine)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
 #include "calc.h"
 
+static void validate_rad2angle(calc_number_t *c);
+static void validate_angle2rad(calc_number_t *c);
+
 void apply_int_mask(calc_number_t *r)
 {
     mpz_t a, mask;
@@ -28,7 +51,7 @@ void apply_int_mask(calc_number_t *r)
     mpz_clear(mask);
 }
 
-void validate_rad2angle(calc_number_t *r)
+static void validate_rad2angle(calc_number_t *r)
 {
     mpfr_t mult, divs;
 
@@ -55,7 +78,7 @@ void validate_rad2angle(calc_number_t *r)
     mpfr_clear(divs);
 }
 
-void validate_angle2rad(calc_number_t *r)
+static void validate_angle2rad(calc_number_t *r)
 {
     mpfr_t mult, divs;
 
@@ -341,6 +364,21 @@ static void stat_sum(mpfr_t sum)
     }
 }
 
+static void stat_sum2(mpfr_t sum)
+{
+    statistic_t *p = calc.stat;
+    mpfr_t       sqr;
+
+    mpfr_init(sqr);
+    mpfr_set_ui(sum, 0, MPFR_DEFAULT_RND);
+    while (p != NULL) {
+        mpfr_mul(sqr, p->num.mf, p->num.mf, MPFR_DEFAULT_RND);
+        mpfr_add(sum, sum, sqr, MPFR_DEFAULT_RND);
+        p = (statistic_t *)(p->next);
+    }
+    mpfr_clear(sqr);
+}
+
 void rpn_ave(calc_number_t *c)
 {
     int     n;
@@ -355,6 +393,20 @@ void rpn_ave(calc_number_t *c)
         mpfr_trunc(c->mf, c->mf);
 }
 
+void rpn_ave2(calc_number_t *c)
+{
+    int     n;
+
+    stat_sum2(c->mf);
+    n = SendDlgItemMessage(calc.hStatWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);
+
+    if (n)
+        mpfr_div_ui(c->mf, c->mf, n, MPFR_DEFAULT_RND);
+
+    if (calc.base != IDC_RADIO_DEC)
+        mpfr_trunc(c->mf, c->mf);
+}
+
 void rpn_sum(calc_number_t *c)
 {
     stat_sum(c->mf);
@@ -363,6 +415,14 @@ void rpn_sum(calc_number_t *c)
         mpfr_trunc(c->mf, c->mf);
 }
 
+void rpn_sum2(calc_number_t *c)
+{
+    stat_sum2(c->mf);
+
+    if (calc.base != IDC_RADIO_DEC)
+        mpfr_trunc(c->mf, c->mf);
+}
+
 static void rpn_s_ex(calc_number_t *c, int pop_type)
 {
     mpfr_t        dev;

base/applications/calc/help.txt

@@ -204,10 +204,16 @@ It deletes all numbers currently stored into the list.
 While the statistical window is shown, four additional buttons are enabled:
 [Ave]
 It calculates the arithmetic average of the numbers stored into the list.
+[Ave] + [Inv]
+It calculates the arithmetic average of the squares of the numbers stored into the list.
 [Sum]
 It calculates the sum of all numbers stored into the list.
+[Sum] + [Inv]
+It calculates the sum of the squares of all numbers stored into the list.
 [s]
-It calculates the population standard deviations of the numbers stored into the list.
+It calculates the population standard deviations with base 'n-1' of the numbers stored into the list.
+[s] + [Inv]
+It calculates the population standard deviations with base 'n' of the numbers stored into the list.
 [Dat]
 It inserts the number shown into the output display into the list.
 
@@ -483,10 +489,12 @@ Shortcut from keyboard: CTRL-S
 
 Ave
 It calculates the arithmetic average of the numbers stored into the statistical box.
+When used with [Inv] modifier it calculates the average of squares.
 Shortcut from keyboard: CTRL-A
 
 Sum
 It calculates the sum of the numbers stored into the statistical box.
+When used with [Inv] modifier it calculates the summation of squares.
 Shortcut from keyboard: CTRL-T
 
 s

base/applications/calc/htmlhelp.c

@@ -0,0 +1,67 @@
+/*
+ * ReactOS Calc (HtmlHelp support)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
+#include "calc.h"
+
+#define GET_CB(name) \
+    calc_##name = (type_##name)GetProcAddress(hHtmlHelp, #name); \
+    if (calc_##name == NULL) calc_##name = dummy_##name;
+
+static HWND WINAPI
+dummy_HtmlHelpA(HWND hWnd, LPCSTR pszFile, UINT uCommand, DWORD dwData);
+
+static HWND WINAPI
+dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, DWORD dwData);
+
+type_HtmlHelpA calc_HtmlHelpA = dummy_HtmlHelpA;
+type_HtmlHelpW calc_HtmlHelpW = dummy_HtmlHelpW;
+
+static HMODULE hHtmlHelp;
+
+static HWND WINAPI
+dummy_HtmlHelpA(HWND hWnd, LPCSTR pszFile, UINT uCommand, DWORD dwData)
+{
+    return NULL;
+}
+
+static HWND WINAPI
+dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, DWORD dwData)
+{
+    return NULL;
+}
+
+void HtmlHelp_Start(HINSTANCE hInstance)
+{
+    hHtmlHelp = LoadLibrary(_T("HTMLHELP"));
+    if (hHtmlHelp == NULL)
+        return;
+
+    GET_CB(HtmlHelpW)
+    GET_CB(HtmlHelpA)
+}
+
+void HtmlHelp_Stop(void)
+{
+    if(hHtmlHelp == NULL)
+        return;
+
+    FreeLibrary(hHtmlHelp);
+    hHtmlHelp = NULL;
+}

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

@@ -435,6 +435,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Градуси"
     IDS_ANGLE_GRADIANS "Гради"
     IDS_ANGLE_RADIANS "Радиани"

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

@@ -434,6 +434,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Stupně"
     IDS_ANGLE_GRADIANS "Grady"
     IDS_ANGLE_RADIANS "Radiány"

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

@@ -429,6 +429,8 @@ END
 /* Winkeltypen */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Grad"
     IDS_ANGLE_GRADIANS "Gon"
     IDS_ANGLE_RADIANS "Radiant"

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

@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Βαθμοί"
     IDS_ANGLE_GRADIANS "Ακτίνια"
     IDS_ANGLE_RADIANS "Μοίρες"

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

@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Degrees"
     IDS_ANGLE_GRADIANS "Gradians"
     IDS_ANGLE_RADIANS "Radians"

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

@@ -435,6 +435,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES  "Grados"
     IDS_ANGLE_GRADIANS "Gradianes"
     IDS_ANGLE_RADIANS  "Radianes"

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

@@ -144,7 +144,7 @@ BEGIN
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
+    PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 166, 38, 54, 18, BS_CENTER |
                BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
@@ -156,11 +156,11 @@ CAPTION "Calculatrice ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    PUSHBUTTON "C", IDC_BUTTON_CANC, 123, 23, 41, 18, BS_CENTER | BS_VCENTER |
+    PUSHBUTTON "C", IDC_BUTTON_CANC, 128, 23, 36, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "CE", IDC_BUTTON_CE, 80, 23, 41, 18, BS_CENTER | BS_VCENTER |
+    PUSHBUTTON "CE", IDC_BUTTON_CE, 90, 23, 36, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 36, 23, 42, 18, BS_CENTER | BS_VCENTER |
+    PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 36, 23, 52, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 159, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
     PUSHBUTTON "7", IDC_BUTTON_7, 36, 45, 24, 18, BS_CENTER | BS_VCENTER |
@@ -232,11 +232,11 @@ BEGIN
              WS_TABSTOP | CBS_SORT
     LTEXT "Convertir en :", IDC_STATIC, 5, 76, 56, 8
     CONTROL "C", IDC_BUTTON_CANC, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17
+            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 280, 24, 36, 17
     CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17
+            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 242, 24, 36, 17
     CONTROL "Retour arrière", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17
+            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 52, 17
     RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
     CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 48, 24, 18
@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Degrés"
     IDS_ANGLE_GRADIANS "Grades"
     IDS_ANGLE_RADIANS "Radians"

base/applications/calc/lang/he-IL.rc

@@ -435,6 +435,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "מעלות"
     IDS_ANGLE_GRADIANS "גרדיאנים"
     IDS_ANGLE_RADIANS "רדיאנים"

base/applications/calc/lang/hu-HU.rc

@@ -437,6 +437,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Fok"
     IDS_ANGLE_GRADIANS "Gradián"
     IDS_ANGLE_RADIANS "Radián"

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

@@ -429,6 +429,8 @@ END
 /* Tipi di angoli */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minuti d'arco"
+    IDS_ANGLE_ARCSECONDS "Secondi d'arco"
     IDS_ANGLE_DEGREES "Sessagesimali"
     IDS_ANGLE_GRADIANS "Centesimali (Gradienti)"
     IDS_ANGLE_RADIANS "Radianti"

base/applications/calc/lang/ja-JP.rc

@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Degrees"
     IDS_ANGLE_GRADIANS "Gradians"
     IDS_ANGLE_RADIANS "Radians"

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

@@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Degrees"
     IDS_ANGLE_GRADIANS "Gradians"
     IDS_ANGLE_RADIANS "Radians"

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

@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Graden"
     IDS_ANGLE_GRADIANS "Gradiënten"
     IDS_ANGLE_RADIANS "Radialen"

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

@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Grader"
     IDS_ANGLE_GRADIANS "Gradianer"
     IDS_ANGLE_RADIANS "Radianer"

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

@@ -438,6 +438,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minuty kątowe"
+    IDS_ANGLE_ARCSECONDS "Sekundy kątowe"
     IDS_ANGLE_DEGREES "Stopnie"
     IDS_ANGLE_GRADIANS "Gradiany"
     IDS_ANGLE_RADIANS "Radiany"
@@ -500,15 +502,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Czeska korona"
     IDS_CURRENCY_DEUTSCHE_MARK "Niemiecka marka"
     IDS_CURRENCY_DUTCH_GUILDER "Holenderki gulden"
-    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
+    IDS_CURRENCY_ESTONIAN_KROON "Estońska korona"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Fińska marka"
     IDS_CURRENCY_FRENCH_FRANC "Francuski frank"
     IDS_CURRENCY_GREEK_DRACHMA "Grecka drachma"
     IDS_CURRENCY_IRISH_POUND "Irlandzki funt"
     IDS_CURRENCY_ITALIAN_LIRA "Włoskie liry"
-    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
-    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
+    IDS_CURRENCY_LATVIAN_LATS "Łotewski łat"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Litewski lit"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank"
     IDS_CURRENCY_MALTESE_LIRA "Maltańskie liry"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo"
@@ -521,7 +523,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_ENERGY_15_C_CALORIES "15 °C kalorie"
-    IDS_ENERGY_BTUS "British Thermal Unit"
+    IDS_ENERGY_BTUS "Jednostki BTU"
     IDS_ENERGY_ERGS "Ergi"
     IDS_ENERGY_EVS "Elektronowolty"
     IDS_ENERGY_FOOT_POUNDS "Stopo-funty"
@@ -541,7 +543,7 @@ BEGIN
     IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostki Astronomiczne"
     IDS_LENGTH_BARLEYCORNS "Palce"
     IDS_LENGTH_CENTIMETERS "Centymetry"
-    IDS_LENGTH_CHAINS_UK "Chains (UK)"
+    IDS_LENGTH_CHAINS_UK "Łańcuchy (UK)"
     IDS_LENGTH_CHI "Chi"
     IDS_LENGTH_CHOU "Chou"
     IDS_LENGTH_CHR "Chr"
@@ -549,7 +551,7 @@ BEGIN
     IDS_LENGTH_FATHOMS "Sążnie"
     IDS_LENGTH_FATHOMS_HUNGARY "Sążnie (Węgry)"
     IDS_LENGTH_FEET "Stopy"
-    IDS_LENGTH_FURLONGS "Furlongs"
+    IDS_LENGTH_FURLONGS "Furlongi"
     IDS_LENGTH_GAN "Gan"
     IDS_LENGTH_HANDS "Dłonie"
     IDS_LENGTH_HUNH "Hunh"
@@ -562,7 +564,7 @@ BEGIN
     IDS_LENGTH_KILOMETERS "Kilometry"
     IDS_LENGTH_LAR "Lar"
     IDS_LENGTH_LIGHT_YEARS "Lata świetlne"
-    IDS_LENGTH_LINKS_UK "Links (UK)"
+    IDS_LENGTH_LINKS_UK "Linki (UK)"
     IDS_LENGTH_METERS "Metry"
     IDS_LENGTH_MICRONS "Mikrometry"
     IDS_LENGTH_MILES "Mile"
@@ -571,13 +573,13 @@ BEGIN
     IDS_LENGTH_NIEU "Nieu"
     IDS_LENGTH_PARSECS "Parseki"
     IDS_LENGTH_PICAS "Picas"
-    IDS_LENGTH_RI_JAPAN "Ri (Japan)"
+    IDS_LENGTH_RI_JAPAN "Ri (Japonia)"
     IDS_LENGTH_RI_KOREA "Ri (Korea)"
-    IDS_LENGTH_RODS "Rods"
+    IDS_LENGTH_RODS "Pręty"
     IDS_LENGTH_SAWK "Sawk"
     IDS_LENGTH_SEN "Sen"
     IDS_LENGTH_SHAKU "Shaku"
-    IDS_LENGTH_SPAN "Span"
+    IDS_LENGTH_SPAN "Piędź"
     IDS_LENGTH_SUN "Sun"
     IDS_LENGTH_TSUEN "Tsuen"
     IDS_LENGTH_VA "Va"
@@ -695,22 +697,22 @@ BEGIN
     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_JIN_CHINA "Jin (Chiny)"
+    IDS_WEIGHT_JIN_TAIWAN "Jin (Tajwan)"
     IDS_WEIGHT_KAN "Kan"
     IDS_WEIGHT_KILOGRAMS "Kilogramy"
     IDS_WEIGHT_KIN "Kin"
-    IDS_WEIGHT_LIANG_CHINA "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"
+    IDS_WEIGHT_LIANG_CHINA "Liang (Chiny)"
+    IDS_WEIGHT_LIANG_TAIWAN "Liang (Tajwan)"
     IDS_WEIGHT_MONME "Monme"
     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_STONES "Kamienie"
     IDS_WEIGHT_TAMLUNG "Tamlung"
-    IDS_WEIGHT_TONNES "Ton"
-    IDS_WEIGHT_TONS_UK "Ton (UK)"
-    IDS_WEIGHT_TONS_US "Ton (US)"
+    IDS_WEIGHT_TONNES "Tony"
+    IDS_WEIGHT_TONS_UK "Tony (UK)"
+    IDS_WEIGHT_TONS_US "Tony (US)"
 END

base/applications/calc/lang/pt-BR.rc

@@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Graus"
     IDS_ANGLE_GRADIANS "Grados"
     IDS_ANGLE_RADIANS "Radianos"

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

@@ -434,6 +434,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Grade"
     IDS_ANGLE_GRADIANS "Gradiani"
     IDS_ANGLE_RADIANS "Radiani"

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

@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "градус"
     IDS_ANGLE_GRADIANS "град"
     IDS_ANGLE_RADIANS "радиан"

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

@@ -436,6 +436,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Stupne"
     IDS_ANGLE_GRADIANS "Grady"
     IDS_ANGLE_RADIANS "Radiány"

base/applications/calc/lang/sq-AL.rc

@@ -433,6 +433,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Gradë"
     IDS_ANGLE_GRADIANS "Gradian"
     IDS_ANGLE_RADIANS "Radians"

base/applications/calc/lang/sv-SE.rc

@@ -436,6 +436,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Grader"
     IDS_ANGLE_GRADIANS "Gradianer"
     IDS_ANGLE_RADIANS "Radianer"

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

@@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "องศา"
     IDS_ANGLE_GRADIANS "เกรเดียน"
     IDS_ANGLE_RADIANS "เรเดียน"

base/applications/calc/lang/tr-TR.rc

@@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Derece"
     IDS_ANGLE_GRADIANS "Gradyan"
     IDS_ANGLE_RADIANS "Radyan"

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

@@ -437,6 +437,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "Градус"
     IDS_ANGLE_GRADIANS "Град"
     IDS_ANGLE_RADIANS "Радіан"

base/applications/calc/lang/zh-CN.rc

@@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
     IDS_ANGLE_DEGREES "角度"
     IDS_ANGLE_GRADIANS "梯度"
     IDS_ANGLE_RADIANS "弧度"

base/applications/calc/resource.h

@@ -1,126 +1,136 @@
 #pragma once
 
-#define IDS_CALC_NAME         1
-#define IDS_MATH_ERROR        2
-#define IDS_QUICKHELP         3
-#define IDS_AUTHOR            4
-#define IDD_DIALOG_SCIENTIFIC 101
-#define IDD_DIALOG_STANDARD   102
-#define IDD_DIALOG_STAT       104
-#define IDD_DIALOG_CONVERSION 105
-#define IDR_MENU_SCIENTIFIC_1 106
-#define IDR_MENU_SCIENTIFIC_2 107
-#define IDR_MENU_STANDARD     108
-#define IDI_CALC_BIG          110
-#define IDI_CALC_SMALL        111
-#define IDC_RADIO_HEX         1002
-#define IDC_RADIO_DEC         1003
-#define IDC_RADIO_OCT         1004
-#define IDC_RADIO_BIN         1005
-#define IDC_CHECK_INV         1006
-#define IDC_CHECK_HYP         1007
-#define IDC_BUTTON_STA        1009
-#define IDC_BUTTON_AVE        1010
-#define IDC_BUTTON_SUM        1011
-#define IDC_BUTTON_S          1012
-#define IDC_BUTTON_DAT        1013
-#define IDC_BUTTON_FE         1014
-#define IDC_BUTTON_DMS        1015
-#define IDC_BUTTON_SIN        1016
-#define IDC_BUTTON_COS        1017
-#define IDC_BUTTON_TAN        1018
-#define IDC_BUTTON_LEFTPAR    1019
-#define IDC_BUTTON_EXP        1020
-#define IDC_BUTTON_XeY        1021
-#define IDC_BUTTON_Xe2        1022
-#define IDC_BUTTON_Xe3        1023
-#define IDC_BUTTON_RIGHTPAR   1024
-#define IDC_BUTTON_LN         1025
-#define IDC_BUTTON_LOG        1026
-#define IDC_BUTTON_NF         1027
-#define IDC_BUTTON_RX         1028
-#define IDC_BUTTON_MC         1029
-#define IDC_BUTTON_MR         1030
-#define IDC_BUTTON_MS         1031
-#define IDC_BUTTON_MP         1032
-#define IDC_BUTTON_PI         1033
-#define IDC_BUTTON_7          1034
-#define IDC_BUTTON_4          1035
-#define IDC_BUTTON_1          1036
-#define IDC_BUTTON_0          1037
-#define IDC_BUTTON_A          1038
-#define IDC_BUTTON_8          1039
-#define IDC_BUTTON_5          1040
-#define IDC_BUTTON_2          1041
-#define IDC_BUTTON_SIGN       1042
-#define IDC_BUTTON_B          1043
-#define IDC_BUTTON_9          1044
-#define IDC_BUTTON_6          1045
-#define IDC_BUTTON_3          1046
-#define IDC_BUTTON_DOT        1047
-#define IDC_BUTTON_C          1048
-#define IDC_BUTTON_DIV        1049
-#define IDC_BUTTON_MULT       1050
-#define IDC_BUTTON_SUB        1051
-#define IDC_BUTTON_ADD        1052
-#define IDC_BUTTON_D          1053
-#define IDC_BUTTON_MOD        1054
-#define IDC_BUTTON_OR         1055
-#define IDC_BUTTON_LSH        1056
-#define IDC_BUTTON_EQU        1057
-#define IDC_BUTTON_E          1058
-#define IDC_BUTTON_AND        1059
-#define IDC_BUTTON_XOR        1060
-#define IDC_BUTTON_NOT        1061
-#define IDC_BUTTON_INT        1062
-#define IDC_BUTTON_F          1063
-#define IDC_RADIO_QWORD       1064
-#define IDC_RADIO_DWORD       1065
-#define IDC_RADIO_WORD        1066
-#define IDC_RADIO_BYTE        1067
-#define IDC_RADIO_DEG         1068
-#define IDC_RADIO_RAD         1069
-#define IDC_RADIO_GRAD        1070
-#define IDC_BUTTON_CANC       1071
-#define IDC_BUTTON_CE         1072
-#define IDC_BUTTON_BACK       1073
-#define IDC_TEXT_OUTPUT       1074
-#define IDC_TEXT_PARENT       1075
-#define IDC_TEXT_MEMORY       1076
-#define IDC_LIST_STAT         1079
-#define IDC_BUTTON_RET        1080
-#define IDC_BUTTON_LOAD       1081
-#define IDC_BUTTON_CD         1082
-#define IDC_BUTTON_CAD        1083
-#define IDC_TEXT_NITEMS       1084
-#define IDC_BUTTON_SQRT       1085
-#define IDC_BUTTON_PERCENT    1086
-#define IDC_BUTTON_CONVERT    1087
-#define IDC_BUTTON_FOCUS      1089
-#define IDC_COMBO_CATEGORY    1090
-#define IDC_COMBO_FROM        1091
-#define IDC_COMBO_TO          1092
-#define IDC_BUTTON_RSH        1093
+#ifndef IDC_STATIC
+#define IDC_STATIC  -1
+#endif
+
+#define IDS_CALC_NAME                   1
+#define IDS_MATH_ERROR                  2
+#define IDS_QUICKHELP                   3
+#define IDS_AUTHOR                      4
+#define IDD_DIALOG_SCIENTIFIC           101
+#define IDD_DIALOG_STANDARD             102
+// #define IDD_DIALOG_ABOUT                103
+#define IDD_DIALOG_STAT                 104
+#define IDD_DIALOG_CONVERSION           105
+#define IDR_MENU_SCIENTIFIC_1           106
+#define IDR_MENU_SCIENTIFIC_2           107
+#define IDR_MENU_STANDARD               108
+// #define IDB_BITMAP_ROS                  109
+#define IDI_CALC                        110
+#define IDC_RADIO_HEX                   1002
+#define IDC_RADIO_DEC                   1003
+#define IDC_RADIO_OCT                   1004
+#define IDC_RADIO_BIN                   1005
+#define IDC_CHECK_INV                   1006
+#define IDC_CHECK_HYP                   1007
+#define IDC_BUTTON_STA                  1009
+#define IDC_BUTTON_AVE                  1010
+#define IDC_BUTTON_SUM                  1011
+#define IDC_BUTTON_S                    1012
+#define IDC_BUTTON_DAT                  1013
+#define IDC_BUTTON_FE                   1014
+#define IDC_BUTTON_DMS                  1015
+#define IDC_BUTTON_SIN                  1016
+#define IDC_BUTTON_COS                  1017
+#define IDC_BUTTON_TAN                  1018
+#define IDC_BUTTON_LEFTPAR              1019
+#define IDC_BUTTON_EXP                  1020
+#define IDC_BUTTON_XeY                  1021
+#define IDC_BUTTON_Xe2                  1022
+#define IDC_BUTTON_Xe3                  1023
+#define IDC_BUTTON_RIGHTPAR             1024
+#define IDC_BUTTON_LN                   1025
+#define IDC_BUTTON_LOG                  1026
+#define IDC_BUTTON_NF                   1027
+#define IDC_BUTTON_RX                   1028
+#define IDC_BUTTON_MC                   1029
+#define IDC_BUTTON_MR                   1030
+#define IDC_BUTTON_MS                   1031
+#define IDC_BUTTON_MP                   1032
+#define IDC_BUTTON_PI                   1033
+#define IDC_BUTTON_7                    1034
+#define IDC_BUTTON_4                    1035
+#define IDC_BUTTON_1                    1036
+#define IDC_BUTTON_0                    1037
+#define IDC_BUTTON_A                    1038
+#define IDC_BUTTON_8                    1039
+#define IDC_BUTTON_5                    1040
+#define IDC_BUTTON_2                    1041
+#define IDC_BUTTON_SIGN                 1042
+#define IDC_BUTTON_B                    1043
+#define IDC_BUTTON_9                    1044
+#define IDC_BUTTON_6                    1045
+#define IDC_BUTTON_3                    1046
+#define IDC_BUTTON_DOT                  1047
+#define IDC_BUTTON_C                    1048
+#define IDC_BUTTON_DIV                  1049
+#define IDC_BUTTON_MULT                 1050
+#define IDC_BUTTON_SUB                  1051
+#define IDC_BUTTON_ADD                  1052
+#define IDC_BUTTON_D                    1053
+#define IDC_BUTTON_MOD                  1054
+#define IDC_BUTTON_OR                   1055
+#define IDC_BUTTON_LSH                  1056
+#define IDC_BUTTON_EQU                  1057
+#define IDC_BUTTON_E                    1058
+#define IDC_BUTTON_AND                  1059
+#define IDC_BUTTON_XOR                  1060
+#define IDC_BUTTON_NOT                  1061
+#define IDC_BUTTON_INT                  1062
+#define IDC_BUTTON_F                    1063
+#define IDC_RADIO_QWORD                 1064
+#define IDC_RADIO_DWORD                 1065
+#define IDC_RADIO_WORD                  1066
+#define IDC_RADIO_BYTE                  1067
+#define IDC_RADIO_DEG                   1068
+#define IDC_RADIO_RAD                   1069
+#define IDC_RADIO_GRAD                  1070
+#define IDC_BUTTON_CANC                 1071
+#define IDC_BUTTON_CE                   1072
+#define IDC_BUTTON_BACK                 1073
+#define IDC_TEXT_OUTPUT                 1074
+#define IDC_TEXT_PARENT                 1075
+#define IDC_TEXT_MEMORY                 1076
+// #define IDC_EDIT_LICENSE                1078
+#define IDC_LIST_STAT                   1079
+#define IDC_BUTTON_RET                  1080
+#define IDC_BUTTON_LOAD                 1081
+#define IDC_BUTTON_CD                   1082
+#define IDC_BUTTON_CAD                  1083
+#define IDC_TEXT_NITEMS                 1084
+#define IDC_BUTTON_SQRT                 1085
+#define IDC_BUTTON_PERCENT              1086
+#define IDC_BUTTON_CONVERT              1087
+// #define IDC_TEXT_VERSION                1088
+#define IDC_BUTTON_FOCUS                1089
+#define IDC_COMBO_CATEGORY              1090
+#define IDC_COMBO_FROM                  1091
+#define IDC_COMBO_TO                    1092
+#define IDC_BUTTON_RSH                  1093
+#define IDC_BUTTON_XrY                  1094
 
 /* TYPES OF CONVERSIONS */
-#define IDS_CONV_ANGLE       2000
-#define IDS_CONV_AREA        2001
-#define IDS_CONV_CONSUMPTION 2002
-#define IDS_CONV_CURRENCY    2003
-#define IDS_CONV_ENERGY      2004
-#define IDS_CONV_LENGTH      2005
-#define IDS_CONV_POWER       2006
-#define IDS_CONV_PRESSURE    2007
-#define IDS_CONV_TEMPERATURE 2008
-#define IDS_CONV_TIME        2009
-#define IDS_CONV_VELOCITY    2010
-#define IDS_CONV_VOLUME      2011
-#define IDS_CONV_WEIGHT      2012
+#define IDS_CONV_ANGLE                  2000
+#define IDS_CONV_AREA                   2001
+#define IDS_CONV_CONSUMPTION            2002
+#define IDS_CONV_CURRENCY               2003
+#define IDS_CONV_ENERGY                 2004
+#define IDS_CONV_LENGTH                 2005
+#define IDS_CONV_POWER                  2006
+#define IDS_CONV_PRESSURE               2007
+#define IDS_CONV_TEMPERATURE            2008
+#define IDS_CONV_TIME                   2009
+#define IDS_CONV_VELOCITY               2010
+#define IDS_CONV_VOLUME                 2011
+#define IDS_CONV_WEIGHT                 2012
 
 /* TYPES OF ANGLES */
-#define IDS_ANGLE_DEGREES  2100
-#define IDS_ANGLE_GRADIANS 2101
-#define IDS_ANGLE_RADIANS  2102
+#define IDS_ANGLE_ARCMINUTES            2100
+#define IDS_ANGLE_ARCSECONDS            2101
+#define IDS_ANGLE_DEGREES               2102
+#define IDS_ANGLE_GRADIANS              2103
+#define IDS_ANGLE_RADIANS               2104
 
 /* TYPES OF AREAS */
 #define IDS_AREA_ACRES                  2200
@@ -188,193 +198,193 @@
 #define IDS_CURRENCY_SPANISH_PESETA     2420
 
 /* TYPES OF ENERGIES */
-#define IDS_ENERGY_15_C_CALORIES      2500
-#define IDS_ENERGY_BTUS               2501
-#define IDS_ENERGY_ERGS               2502
-#define IDS_ENERGY_EVS                2503
-#define IDS_ENERGY_FOOT_POUNDS        2504
-#define IDS_ENERGY_IT_CALORIES        2505
-#define IDS_ENERGY_IT_KILOCALORIES    2506
-#define IDS_ENERGY_JOULES             2507
-#define IDS_ENERGY_KILOJOULES         2508
-#define IDS_ENERGY_KILOWATT_HOURS     2509
-#define IDS_ENERGY_NUTRITION_CALORIES 2510
-#define IDS_ENERGY_TH_CALORIES        2511
+#define IDS_ENERGY_15_C_CALORIES        2500
+#define IDS_ENERGY_BTUS                 2501
+#define IDS_ENERGY_ERGS                 2502
+#define IDS_ENERGY_EVS                  2503
+#define IDS_ENERGY_FOOT_POUNDS          2504
+#define IDS_ENERGY_IT_CALORIES          2505
+#define IDS_ENERGY_IT_KILOCALORIES      2506
+#define IDS_ENERGY_JOULES               2507
+#define IDS_ENERGY_KILOJOULES           2508
+#define IDS_ENERGY_KILOWATT_HOURS       2509
+#define IDS_ENERGY_NUTRITION_CALORIES   2510
+#define IDS_ENERGY_TH_CALORIES          2511
 
 /* TYPES OF LENGTHS */
-#define IDS_LENGTH_ANGSTROMS          2600
-#define IDS_LENGTH_ASTRONOMICAL_UNITS 2601
-#define IDS_LENGTH_BARLEYCORNS        2602
-#define IDS_LENGTH_CENTIMETERS        2603
-#define IDS_LENGTH_CHAINS_UK          2604
-#define IDS_LENGTH_CHI                2605
-#define IDS_LENGTH_CHOU               2606
-#define IDS_LENGTH_CHR                2607
-#define IDS_LENGTH_CUN                2608
-#define IDS_LENGTH_FATHOMS            2609
-#define IDS_LENGTH_FATHOMS_HUNGARY    2610
-#define IDS_LENGTH_FEET               2611
-#define IDS_LENGTH_FURLONGS           2612
-#define IDS_LENGTH_GAN                2613
-#define IDS_LENGTH_HANDS              2614
-#define IDS_LENGTH_HUNH               2615
-#define IDS_LENGTH_INCHES             2616
-#define IDS_LENGTH_JA                 2617
-#define IDS_LENGTH_JEONG              2618
-#define IDS_LENGTH_KABIET             2619
-#define IDS_LENGTH_KEN                2620
-#define IDS_LENGTH_KEUB               2621
-#define IDS_LENGTH_KILOMETERS         2622
-#define IDS_LENGTH_LAR                2623
-#define IDS_LENGTH_LIGHT_YEARS        2624
-#define IDS_LENGTH_LINKS_UK           2625
-#define IDS_LENGTH_METERS             2626
-#define IDS_LENGTH_MICRONS            2627
-#define IDS_LENGTH_MILES              2628
-#define IDS_LENGTH_MILLIMETERS        2629
-#define IDS_LENGTH_NAUTICAL_MILES     2630
-#define IDS_LENGTH_NIEU               2631
-#define IDS_LENGTH_PARSECS            2632
-#define IDS_LENGTH_PICAS              2633
-#define IDS_LENGTH_RODS               2634
-#define IDS_LENGTH_RI_JAPAN           2635
-#define IDS_LENGTH_RI_KOREA           2636
-#define IDS_LENGTH_SAWK               2637
-#define IDS_LENGTH_SEN                2638
-#define IDS_LENGTH_SHAKU              2639
-#define IDS_LENGTH_SPAN               2640
-#define IDS_LENGTH_SUN                2641
-#define IDS_LENGTH_TSUEN              2642
-#define IDS_LENGTH_VA                 2643
-#define IDS_LENGTH_YARDS              2644
-#define IDS_LENGTH_YOTE               2645
-#define IDS_LENGTH_ZHANG              2646
+#define IDS_LENGTH_ANGSTROMS            2600
+#define IDS_LENGTH_ASTRONOMICAL_UNITS   2601
+#define IDS_LENGTH_BARLEYCORNS          2602
+#define IDS_LENGTH_CENTIMETERS          2603
+#define IDS_LENGTH_CHAINS_UK            2604
+#define IDS_LENGTH_CHI                  2605
+#define IDS_LENGTH_CHOU                 2606
+#define IDS_LENGTH_CHR                  2607
+#define IDS_LENGTH_CUN                  2608
+#define IDS_LENGTH_FATHOMS              2609
+#define IDS_LENGTH_FATHOMS_HUNGARY      2610
+#define IDS_LENGTH_FEET                 2611
+#define IDS_LENGTH_FURLONGS             2612
+#define IDS_LENGTH_GAN                  2613
+#define IDS_LENGTH_HANDS                2614
+#define IDS_LENGTH_HUNH                 2615
+#define IDS_LENGTH_INCHES               2616
+#define IDS_LENGTH_JA                   2617
+#define IDS_LENGTH_JEONG                2618
+#define IDS_LENGTH_KABIET               2619
+#define IDS_LENGTH_KEN                  2620
+#define IDS_LENGTH_KEUB                 2621
+#define IDS_LENGTH_KILOMETERS           2622
+#define IDS_LENGTH_LAR                  2623
+#define IDS_LENGTH_LIGHT_YEARS          2624
+#define IDS_LENGTH_LINKS_UK             2625
+#define IDS_LENGTH_METERS               2626
+#define IDS_LENGTH_MICRONS              2627
+#define IDS_LENGTH_MILES                2628
+#define IDS_LENGTH_MILLIMETERS          2629
+#define IDS_LENGTH_NAUTICAL_MILES       2630
+#define IDS_LENGTH_NIEU                 2631
+#define IDS_LENGTH_PARSECS              2632
+#define IDS_LENGTH_PICAS                2633
+#define IDS_LENGTH_RODS                 2634
+#define IDS_LENGTH_RI_JAPAN             2635
+#define IDS_LENGTH_RI_KOREA             2636
+#define IDS_LENGTH_SAWK                 2637
+#define IDS_LENGTH_SEN                  2638
+#define IDS_LENGTH_SHAKU                2639
+#define IDS_LENGTH_SPAN                 2640
+#define IDS_LENGTH_SUN                  2641
+#define IDS_LENGTH_TSUEN                2642
+#define IDS_LENGTH_VA                   2643
+#define IDS_LENGTH_YARDS                2644
+#define IDS_LENGTH_YOTE                 2645
+#define IDS_LENGTH_ZHANG                2646
 
 /* TYPES OF POWERS */
-#define IDS_POWER_BTUS_PER_MINUTE 2700
-#define IDS_POWER_FPS_PER_MINUTE  2701
-#define IDS_POWER_HORSEPOWER      2702
-#define IDS_POWER_KILOWATTS       2703
-#define IDS_POWER_MEGAWATTS       2704
-#define IDS_POWER_WATTS           2705
+#define IDS_POWER_BTUS_PER_MINUTE       2700
+#define IDS_POWER_FPS_PER_MINUTE        2701
+#define IDS_POWER_HORSEPOWER            2702
+#define IDS_POWER_KILOWATTS             2703
+#define IDS_POWER_MEGAWATTS             2704
+#define IDS_POWER_WATTS                 2705
 
 /* TYPE OF PRESSURES */
-#define IDS_PRESSURE_ATMOSPHERES   2800
-#define IDS_PRESSURE_BARS          2801
-#define IDS_PRESSURE_HECTOPASCALS  2802
-#define IDS_PRESSURE_KILOPASCALS   2803
-#define IDS_PRESSURE_MM_OF_MERCURY 2804
-#define IDS_PRESSURE_PASCALS       2805
-#define IDS_PRESSURE_PSI           2806
+#define IDS_PRESSURE_ATMOSPHERES        2800
+#define IDS_PRESSURE_BARS               2801
+#define IDS_PRESSURE_HECTOPASCALS       2802
+#define IDS_PRESSURE_KILOPASCALS        2803
+#define IDS_PRESSURE_MM_OF_MERCURY      2804
+#define IDS_PRESSURE_PASCALS            2805
+#define IDS_PRESSURE_PSI                2806
 
 /* TYPES OF TEMPERATURES */
-#define IDS_TEMPERATURE_CELSIUS    2900
-#define IDS_TEMPERATURE_FAHRENHEIT 2901
-#define IDS_TEMPERATURE_KELVIN     2902
-#define IDS_TEMPERATURE_RANKINE    2903
+#define IDS_TEMPERATURE_CELSIUS         2900
+#define IDS_TEMPERATURE_FAHRENHEIT      2901
+#define IDS_TEMPERATURE_KELVIN          2902
+#define IDS_TEMPERATURE_RANKINE         2903
 
 /* TYPE OF TIME */
-#define IDS_TIME_DAYS         3001
-#define IDS_TIME_HOURS        3002
-#define IDS_TIME_MICROSECONDS 3003
-#define IDS_TIME_MILLISECONDS 3004
-#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
+#define IDS_TIME_DAYS                   3001
+#define IDS_TIME_HOURS                  3002
+#define IDS_TIME_MICROSECONDS           3003
+#define IDS_TIME_MILLISECONDS           3004
+#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
-#define IDS_VELOCITY_FEET_SECOND     3101
-#define IDS_VELOCITY_FEET_HOUR       3102
-#define IDS_VELOCITY_KILOMETERS_HOUR 3103
-#define IDS_VELOCITY_KNOTS           3104
-#define IDS_VELOCITY_MACH            3105
-#define IDS_VELOCITY_METERS_SECOND   3106
-#define IDS_VELOCITY_MILES_HOUR      3107
+#define IDS_VELOCITY_CMS_SECOND         3100
+#define IDS_VELOCITY_FEET_SECOND        3101
+#define IDS_VELOCITY_FEET_HOUR          3102
+#define IDS_VELOCITY_KILOMETERS_HOUR    3103
+#define IDS_VELOCITY_KNOTS              3104
+#define IDS_VELOCITY_MACH               3105
+#define IDS_VELOCITY_METERS_SECOND      3106
+#define IDS_VELOCITY_MILES_HOUR         3107
 
 /* TYPES OF VOLUMES */
-#define IDS_VOLUME_BARRELS_UK        3200
-#define IDS_VOLUME_BARRELS_OIL       3201
-#define IDS_VOLUME_BUN               3202
-#define IDS_VOLUME_BUSHELS_UK        3203
-#define IDS_VOLUME_BUSHELS_US        3204
-#define IDS_VOLUME_CUBIC_CENTIMETERS 3205
-#define IDS_VOLUME_CUBIC_FEET        3206
-#define IDS_VOLUME_CUBIC_INCHES      3207
-#define IDS_VOLUME_CUBIC_METERS      3208
-#define IDS_VOLUME_CUBIC_YARDS       3209
-#define IDS_VOLUME_DOE               3210
-#define IDS_VOLUME_FLUID_OUNCES_UK   3211
-#define IDS_VOLUME_FLUID_OUNCES_US   3212
-#define IDS_VOLUME_GALLONS_UK        3213
-#define IDS_VOLUME_GALLONS_DRY_US    3214
-#define IDS_VOLUME_GALLONS_LIQUID_US 3215
-#define IDS_VOLUME_GOU               3216
-#define IDS_VOLUME_HOP               3217
-#define IDS_VOLUME_ICCE              3218
-#define IDS_VOLUME_KWIAN             3219
-#define IDS_VOLUME_LITERS            3220
-#define IDS_VOLUME_MAL               3221
-#define IDS_VOLUME_MILLILITERS       3222
-#define IDS_VOLUME_PINTS_UK          3223
-#define IDS_VOLUME_PINTS_DRY_US      3224
-#define IDS_VOLUME_PINTS_LIQUID_US   3225
-#define IDS_VOLUME_QUARTS_UK         3226
-#define IDS_VOLUME_QUARTS_DRY_US     3227
-#define IDS_VOLUME_QUARTS_LIQUID_US  3228
-#define IDS_VOLUME_SEKI              3229
-#define IDS_VOLUME_SYOU              3230
-#define IDS_VOLUME_TANANLOUNG        3231
-#define IDS_VOLUME_TANG              3232
-#define IDS_VOLUME_TO                3233
+#define IDS_VOLUME_BARRELS_UK           3200
+#define IDS_VOLUME_BARRELS_OIL          3201
+#define IDS_VOLUME_BUN                  3202
+#define IDS_VOLUME_BUSHELS_UK           3203
+#define IDS_VOLUME_BUSHELS_US           3204
+#define IDS_VOLUME_CUBIC_CENTIMETERS    3205
+#define IDS_VOLUME_CUBIC_FEET           3206
+#define IDS_VOLUME_CUBIC_INCHES         3207
+#define IDS_VOLUME_CUBIC_METERS         3208
+#define IDS_VOLUME_CUBIC_YARDS          3209
+#define IDS_VOLUME_DOE                  3210
+#define IDS_VOLUME_FLUID_OUNCES_UK      3211
+#define IDS_VOLUME_FLUID_OUNCES_US      3212
+#define IDS_VOLUME_GALLONS_UK           3213
+#define IDS_VOLUME_GALLONS_DRY_US       3214
+#define IDS_VOLUME_GALLONS_LIQUID_US    3215
+#define IDS_VOLUME_GOU                  3216
+#define IDS_VOLUME_HOP                  3217
+#define IDS_VOLUME_ICCE                 3218
+#define IDS_VOLUME_KWIAN                3219
+#define IDS_VOLUME_LITERS               3220
+#define IDS_VOLUME_MAL                  3221
+#define IDS_VOLUME_MILLILITERS          3222
+#define IDS_VOLUME_PINTS_UK             3223
+#define IDS_VOLUME_PINTS_DRY_US         3224
+#define IDS_VOLUME_PINTS_LIQUID_US      3225
+#define IDS_VOLUME_QUARTS_UK            3226
+#define IDS_VOLUME_QUARTS_DRY_US        3227
+#define IDS_VOLUME_QUARTS_LIQUID_US     3228
+#define IDS_VOLUME_SEKI                 3229
+#define IDS_VOLUME_SYOU                 3230
+#define IDS_VOLUME_TANANLOUNG           3231
+#define IDS_VOLUME_TANG                 3232
+#define IDS_VOLUME_TO                   3233
 
 /* TYPES OF WEIGHTS */
-#define IDS_WEIGHT_BAHT               3300
-#define IDS_WEIGHT_CARATS             3301
-#define IDS_WEIGHT_CHUNG              3302
-#define IDS_WEIGHT_DON                3303
-#define IDS_WEIGHT_GEUN               3304
-#define IDS_WEIGHT_GRAMS              3305
-#define IDS_WEIGHT_GWAN               3306
-#define IDS_WEIGHT_HARB               3307
-#define IDS_WEIGHT_JIN_CHINA          3308
-#define IDS_WEIGHT_JIN_TAIWAN         3309
-#define IDS_WEIGHT_KAN                3310
-#define IDS_WEIGHT_KILOGRAMS          3311
-#define IDS_WEIGHT_KIN                3312
-#define IDS_WEIGHT_LIANG_CHINA        3313
-#define IDS_WEIGHT_LIANG_TAIWAN       3314
-#define IDS_WEIGHT_MONME              3315
-#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3316
-#define IDS_WEIGHT_OUNCES_TROY        3317
-#define IDS_WEIGHT_POUNDS             3318
-#define IDS_WEIGHT_QUINTAL_METRIC     3319
-#define IDS_WEIGHT_SALOUNG            3320
-#define IDS_WEIGHT_STONES             3321
-#define IDS_WEIGHT_TAMLUNG            3322
-#define IDS_WEIGHT_TONNES             3323
-#define IDS_WEIGHT_TONS_UK            3324
-#define IDS_WEIGHT_TONS_US            3325
+#define IDS_WEIGHT_BAHT                 3300
+#define IDS_WEIGHT_CARATS               3301
+#define IDS_WEIGHT_CHUNG                3302
+#define IDS_WEIGHT_DON                  3303
+#define IDS_WEIGHT_GEUN                 3304
+#define IDS_WEIGHT_GRAMS                3305
+#define IDS_WEIGHT_GWAN                 3306
+#define IDS_WEIGHT_HARB                 3307
+#define IDS_WEIGHT_JIN_CHINA            3308
+#define IDS_WEIGHT_JIN_TAIWAN           3309
+#define IDS_WEIGHT_KAN                  3310
+#define IDS_WEIGHT_KILOGRAMS            3311
+#define IDS_WEIGHT_KIN                  3312
+#define IDS_WEIGHT_LIANG_CHINA          3313
+#define IDS_WEIGHT_LIANG_TAIWAN         3314
+#define IDS_WEIGHT_MONME                3315
+#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS   3316
+#define IDS_WEIGHT_OUNCES_TROY          3317
+#define IDS_WEIGHT_POUNDS               3318
+#define IDS_WEIGHT_QUINTAL_METRIC       3319
+#define IDS_WEIGHT_SALOUNG              3320
+#define IDS_WEIGHT_STONES               3321
+#define IDS_WEIGHT_TAMLUNG              3322
+#define IDS_WEIGHT_TONNES               3323
+#define IDS_WEIGHT_TONS_UK              3324
+#define IDS_WEIGHT_TONS_US              3325
 
 /* MENU */
-#define IDM_EDIT_COPY       40002
-#define IDM_EDIT_PASTE      40003
-#define IDM_VIEW_STANDARD   40004
-#define IDM_VIEW_SCIENTIFIC 40005
-#define IDM_VIEW_HEX        40006
-#define IDM_VIEW_DEC        40007
-#define IDM_VIEW_OCT        40008
-#define IDM_VIEW_BIN        40009
-#define IDM_VIEW_DEG        40010
-#define IDM_VIEW_RAD        40011
-#define IDM_VIEW_GRAD       40012
-#define IDM_VIEW_GROUP      40013
-#define IDM_HELP_HELP       40014
-#define IDM_HELP_ABOUT      40015
-#define IDM_VIEW_QWORD      40016
-#define IDM_VIEW_WORD       40017
-#define IDM_VIEW_BYTE       40018
-#define IDM_VIEW_DWORD      40019
-#define IDM_VIEW_CONVERSION 40020
+#define IDM_EDIT_COPY                   40002
+#define IDM_EDIT_PASTE                  40003
+#define IDM_VIEW_STANDARD               40004
+#define IDM_VIEW_SCIENTIFIC             40005
+#define IDM_VIEW_HEX                    40006
+#define IDM_VIEW_DEC                    40007
+#define IDM_VIEW_OCT                    40008
+#define IDM_VIEW_BIN                    40009
+#define IDM_VIEW_DEG                    40010
+#define IDM_VIEW_RAD                    40011
+#define IDM_VIEW_GRAD                   40012
+#define IDM_VIEW_GROUP                  40013
+#define IDM_HELP_HELP                   40014
+#define IDM_HELP_ABOUT                  40015
+#define IDM_VIEW_QWORD                  40016
+#define IDM_VIEW_WORD                   40017
+#define IDM_VIEW_BYTE                   40018
+#define IDM_VIEW_DWORD                  40019
+#define IDM_VIEW_CONVERSION             40020

base/applications/calc/resource.rc

@@ -1,8 +1,21 @@
 /*
- * PROJECT: ReactOS Calc
- * LICENSE: LGPL - See COPYING.LIB in the top level directory
- * FILE:    base/applications/calc/resource.rc
- * PURPOSE: Global resource file
+ * ReactOS Calc (global resource file)
+ *
+ * Copyright 2007, Carlo Bramini
+ *
+ * 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 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
  */
 
 #include <windef.h>
@@ -10,18 +23,14 @@
 
 #include "resource.h"
 
-#ifndef IDC_STATIC
-#define IDC_STATIC -1
-#endif
-
 /* Common resources */
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* Icons */
-IDI_CALC_BIG ICON "res/calc.ico"
-IDI_CALC_SMALL ICON "res/calc_sm.ico"
+IDI_CALC ICON DISCARDABLE "res/calc.ico"
 
+/* Manifest */
 #include <reactos/manifest_exe.rc>
 
 /* UTF-8 */

base/applications/calc/rpn_ieee.c

@@ -1,3 +1,23 @@
+/*
+ * ReactOS Calc (RPN encoder/decoder for IEEE-754 engine)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
 #include "calc.h"
 
 typedef struct {
@@ -15,7 +35,7 @@ typedef struct {
 } calc_operator_t;
 
 static stack_node_t *stack;
-static stack_node_t  temp;
+static calc_node_t   temp;
 static BOOL          percent_mode;
 
 static void rpn_add_f(calc_number_t *r, calc_number_t *a, calc_number_t *b);
@@ -67,14 +87,20 @@ static const calc_operator_t operator_list[] = {
     { 7, rpn_sqr_f, NULL,      NULL,      }, // RPN_OPERATOR_SQR
 };
 
-static stack_node_t *pop(void)
+static calc_node_t *pop(void)
 {
+    void *next;
+
     if (stack == NULL)
         return NULL;
 
-    temp = *stack;
+    /* copy the node */
+    temp = stack->node;
+    next = stack->next;
+
+    /* free the node */
     free(stack);
-    stack = temp.next;
+    stack = next;
 
     return &temp;
 }
@@ -84,11 +110,11 @@ static int is_stack_empty(void)
     return (stack == NULL);
 }
 
-static void push(stack_node_t *op)
+static void push(calc_node_t *op)
 {
     stack_node_t *z = (stack_node_t *)malloc(sizeof(stack_node_t));
 
-    *z = *op;
+    z->node = *op;
     z->next = stack;
     stack = z;
 }
@@ -330,20 +356,20 @@ void run_operator(calc_node_t *result,
 
 static void evalStack(calc_number_t *number)
 {
-    stack_node_t *op, ip;
+    calc_node_t *op, ip;
     unsigned int prec;
 
     op = pop();
     ip = *op;
-    prec = operator_list[ip.node.operation].prec;
+    prec = operator_list[ip.operation].prec;
     while (!is_stack_empty()) {
         op = pop();
 
-        if (prec <= operator_list[op->node.operation].prec) {
-            if (op->node.operation == RPN_OPERATOR_PARENT) continue;
+        if (prec <= operator_list[op->operation].prec) {
+            if (op->operation == RPN_OPERATOR_PARENT) continue;
 
-            calc.prev = ip.node.number;
-            run_operator(&ip.node, &op->node, &ip.node, op->node.operation);
+            calc.prev = ip.number;
+            run_operator(&ip, op, &ip, op->operation);
             if (calc.is_nan) {
                 flush_postfix();
                 return;
@@ -354,17 +380,17 @@ static void evalStack(calc_number_t *number)
         }
     }
 
-    if(ip.node.operation != RPN_OPERATOR_EQUAL && ip.node.operation != RPN_OPERATOR_PERCENT)
+    if (ip.operation != RPN_OPERATOR_EQUAL && ip.operation != RPN_OPERATOR_PERCENT)
         push(&ip);
 
-    calc.prev_operator = op->node.operation;
+    calc.prev_operator = op->operation;
 
-    *number = ip.node.number;
+    *number = ip.number;
 }
 
 int exec_infix2postfix(calc_number_t *number, unsigned int func)
 {
-    stack_node_t tmp;
+    calc_node_t tmp;
 
     if (is_stack_empty() && func == RPN_OPERATOR_EQUAL) {
         /* if a number has been entered with exponential */
@@ -377,10 +403,9 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func)
     if (func == RPN_OPERATOR_PERCENT)
         percent_mode = TRUE;
 
-    tmp.node.number = *number;
-    tmp.node.base = calc.base;
-    tmp.node.operation = func;
-    tmp.next = NULL;
+    tmp.number = *number;
+    tmp.base = calc.base;
+    tmp.operation = func;
 
     push(&tmp);
 
@@ -410,23 +435,23 @@ void exec_change_infix(void)
 
 void exec_closeparent(calc_number_t *number)
 {
-    stack_node_t *op, ip;
+    calc_node_t *op, ip;
 
-    ip.node.number = *number;
-    ip.node.base = calc.base;
+    ip.number = *number;
+    ip.base = calc.base;
     while (!is_stack_empty()) {
         op = pop();
 
-        if (op->node.operation == RPN_OPERATOR_PARENT)
+        if (op->operation == RPN_OPERATOR_PARENT)
             break;
 
-        run_operator(&ip.node, &op->node, &ip.node, op->node.operation);
+        run_operator(&ip, op, &ip, op->operation);
         if (calc.is_nan) {
             flush_postfix();
             return;
         }
     }
-    *number = ip.node.number;
+    *number = ip.number;
 }
 
 int eval_parent_count(void)
@@ -442,7 +467,7 @@ int eval_parent_count(void)
     return n;
 }
 
-void flush_postfix()
+void flush_postfix(void)
 {
     while (!is_stack_empty())
         pop();
@@ -459,4 +484,3 @@ void start_rpn_engine(void)
 void stop_rpn_engine(void)
 {
 }
-

base/applications/calc/rpn_mpfr.c

@@ -1,3 +1,23 @@
+/*
+ * ReactOS Calc (RPN encoder/decoder for GMP/MPFR engine)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
 #include "calc.h"
 
 typedef struct {
@@ -15,7 +35,7 @@ typedef struct {
 } calc_operator_t;
 
 static stack_node_t *stack;
-static stack_node_t  temp;
+static calc_node_t   temp;
 static BOOL          percent_mode;
 
 static void rpn_add_f(calc_number_t *r, calc_number_t *a, calc_number_t *b);
@@ -61,25 +81,27 @@ static const calc_operator_t operator_list[] = {
     { 7, rpn_sqr_f, NULL,      NULL,      }, // RPN_OPERATOR_SQR
 };
 
-static void node_copy(stack_node_t *dst, stack_node_t *src)
+static void node_copy(calc_node_t *dst, calc_node_t *src)
 {
-    mpfr_set(dst->node.number.mf,src->node.number.mf,MPFR_DEFAULT_RND);
-    dst->node.operation = src->node.operation;
-    dst->next = src->next;
+    mpfr_set(dst->number.mf, src->number.mf, MPFR_DEFAULT_RND);
+    dst->operation = src->operation;
 }
 
-static stack_node_t *pop()
+static calc_node_t *pop(void)
 {
+    void *next;
+
     if (stack == NULL)
         return NULL;
 
     /* copy the node */
-    node_copy(&temp, stack);
+    node_copy(&temp, &stack->node);
+    next = stack->next;
 
     /* free the node */
     mpfr_clear(stack->node.number.mf);
     free(stack);
-    stack = temp.next;
+    stack = next;
 
     return &temp;
 }
@@ -89,12 +111,12 @@ static int is_stack_empty(void)
     return (stack == NULL);
 }
 
-static void push(stack_node_t *op)
+static void push(calc_node_t *op)
 {
     stack_node_t *z = (stack_node_t *)malloc(sizeof(stack_node_t));
 
-    mpfr_init_set(z->node.number.mf,op->node.number.mf,MPFR_DEFAULT_RND);
-    z->node.operation = op->node.operation;
+    mpfr_init_set(z->node.number.mf, op->number.mf, MPFR_DEFAULT_RND);
+    z->node.operation = op->operation;
     z->next = stack;
     stack = z;
 }
@@ -109,8 +131,7 @@ static unsigned int get_prec(unsigned int opc)
 }
 */
 
-typedef
-__GMP_DECLSPEC void (*exec_call_t)
+typedef void (*exec_call_t)
 __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
 
 static void rpn_exec_int(calc_number_t *r, calc_number_t *a, calc_number_t *b, exec_call_t cb)
@@ -286,7 +307,6 @@ static void rpn_div_p(calc_number_t *r, calc_number_t *a, calc_number_t *b)
     }
 }
 
-
 void run_operator(calc_node_t *result,
                   calc_node_t *a,
                   calc_node_t *b,
@@ -307,44 +327,44 @@ void run_operator(calc_node_t *result,
 
 static void evalStack(calc_number_t *number)
 {
-    stack_node_t *op, ip;
+    calc_node_t *op, ip;
     unsigned int prec;
 
-    mpfr_init(ip.node.number.mf);
+    mpfr_init(ip.number.mf);
     op = pop();
     node_copy(&ip, op);
-    prec = operator_list[ip.node.operation].prec;
+    prec = operator_list[ip.operation].prec;
     while (!is_stack_empty()) {
         op = pop();
 
-        if (prec <= operator_list[op->node.operation].prec) {
-            if (op->node.operation == RPN_OPERATOR_PARENT) continue;
+        if (prec <= operator_list[op->operation].prec) {
+            if (op->operation == RPN_OPERATOR_PARENT) continue;
 
-            rpn_copy(&calc.prev, &ip.node.number);
-            run_operator(&ip.node, &op->node, &ip.node, op->node.operation);
+            rpn_copy(&calc.prev, &ip.number);
+            run_operator(&ip, op, &ip, op->operation);
             if (calc.is_nan) {
                 flush_postfix();
-                mpfr_clear(ip.node.number.mf);
+                mpfr_clear(ip.number.mf);
                 return;
             }
         } else {
             push(op);
             break;
-        }  
+        }
     }
 
-    if(ip.node.operation != RPN_OPERATOR_EQUAL && ip.node.operation != RPN_OPERATOR_PERCENT)
+    if (ip.operation != RPN_OPERATOR_EQUAL && ip.operation != RPN_OPERATOR_PERCENT)
         push(&ip);
 
-    calc.prev_operator = op->node.operation;
+    calc.prev_operator = op->operation;
 
-    rpn_copy(number, &ip.node.number);
-    mpfr_clear(ip.node.number.mf);
+    rpn_copy(number, &ip.number);
+    mpfr_clear(ip.number.mf);
 }
 
 int exec_infix2postfix(calc_number_t *number, unsigned int func)
 {
-    stack_node_t tmp;
+    calc_node_t tmp;
 
     if (is_stack_empty() && func == RPN_OPERATOR_EQUAL) {
         /* if a number has been entered with exponential */
@@ -357,12 +377,12 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func)
     if (func == RPN_OPERATOR_PERCENT)
         percent_mode = TRUE;
 
-    mpfr_init(tmp.node.number.mf);
-    rpn_copy(&tmp.node.number, number);
-    tmp.node.operation = func;
+    mpfr_init(tmp.number.mf);
+    rpn_copy(&tmp.number, number);
+    tmp.operation = func;
 
     push(&tmp);
-    mpfr_clear(tmp.node.number.mf);
+    mpfr_clear(tmp.number.mf);
 
     if (func == RPN_OPERATOR_NONE)
         return 0;
@@ -390,24 +410,24 @@ void exec_change_infix(void)
 
 void exec_closeparent(calc_number_t *number)
 {
-    stack_node_t *op, ip;
+    calc_node_t *op, ip;
 
-    rpn_alloc(&ip.node.number);
-    rpn_copy(&ip.node.number, number);
+    rpn_alloc(&ip.number);
+    rpn_copy(&ip.number, number);
     while (!is_stack_empty()) {
         op = pop();
 
-        if (op->node.operation == RPN_OPERATOR_PARENT)
+        if (op->operation == RPN_OPERATOR_PARENT)
             break;
 
-        run_operator(&ip.node, &op->node, &ip.node, op->node.operation);
+        run_operator(&ip, op, &ip, op->operation);
         if (calc.is_nan) {
             flush_postfix();
             return;
         }
     }
-    rpn_copy(number, &ip.node.number);
-    rpn_free(&ip.node.number);
+    rpn_copy(number, &ip.number);
+    rpn_free(&ip.number);
 }
 
 int eval_parent_count(void)
@@ -423,12 +443,12 @@ int eval_parent_count(void)
     return n;
 }
 
-void flush_postfix()
+void flush_postfix(void)
 {
     while (!is_stack_empty())
         pop();
     /* clear prev and last typed operators */
-    calc.prev_operator = 
+    calc.prev_operator =
     calc.last_operator = 0;
 }
 
@@ -440,7 +460,7 @@ void start_rpn_engine(void)
     mpfr_init(calc.code.mf);
     mpfr_init(calc.prev.mf);
     mpfr_init(calc.memory.number.mf);
-    mpfr_init(temp.node.number.mf);
+    mpfr_init(temp.number.mf);
     rpn_zero(&calc.memory.number);
 }
 
@@ -449,5 +469,5 @@ void stop_rpn_engine(void)
     mpfr_clear(calc.code.mf);
     mpfr_clear(calc.prev.mf);
     mpfr_clear(calc.memory.number.mf);
-    mpfr_clear(temp.node.number.mf);
+    mpfr_clear(temp.number.mf);
 }

base/applications/calc/theme.c

@@ -0,0 +1,127 @@
+/*
+ * ReactOS Calc (Theming support)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
+#include "calc.h"
+
+#define GET_CB(name) \
+    calc_##name = (type_##name)GetProcAddress(hUxTheme, #name); \
+    if (calc_##name == NULL) calc_##name = dummy_##name;
+
+static HTHEME WINAPI
+dummy_OpenThemeData(HWND hwnd, const WCHAR *pszClassList);
+
+static HRESULT WINAPI
+dummy_CloseThemeData(HTHEME hTheme);
+
+static HRESULT WINAPI
+dummy_DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId,
+    const RECT *prc, const RECT *prcClip);
+
+static BOOL WINAPI
+dummy_IsAppThemed(void);
+
+static BOOL WINAPI
+dummy_IsThemeActive(void);
+
+static BOOL WINAPI
+dummy_IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, int iStateId);
+
+static HRESULT WINAPI
+dummy_DrawThemeParentBackground(HWND hWnd, HDC hdc, RECT *prc);
+
+
+type_OpenThemeData       calc_OpenThemeData       = dummy_OpenThemeData;
+type_CloseThemeData      calc_CloseThemeData      = dummy_CloseThemeData;
+type_DrawThemeBackground calc_DrawThemeBackground = dummy_DrawThemeBackground;
+type_IsAppThemed         calc_IsAppThemed         = dummy_IsAppThemed;
+type_IsThemeActive       calc_IsThemeActive       = dummy_IsThemeActive;
+type_IsThemeBackgroundPartiallyTransparent calc_IsThemeBackgroundPartiallyTransparent = \
+    dummy_IsThemeBackgroundPartiallyTransparent;
+type_DrawThemeParentBackground calc_DrawThemeParentBackground = \
+    dummy_DrawThemeParentBackground;
+
+static HMODULE hUxTheme;
+
+static HTHEME WINAPI
+dummy_OpenThemeData(HWND hwnd, const WCHAR* pszClassList)
+{
+    return NULL;
+}
+
+static HRESULT WINAPI
+dummy_CloseThemeData(HTHEME hTheme)
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI
+dummy_DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId,
+            const RECT* prc, const RECT* prcClip)
+{
+    return E_NOTIMPL;
+}
+
+static BOOL WINAPI
+dummy_IsAppThemed(void)
+{
+    return FALSE;
+}
+
+static BOOL WINAPI
+dummy_IsThemeActive(void)
+{
+    return FALSE;
+}
+
+static BOOL WINAPI
+dummy_IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, int iStateId)
+{
+    return FALSE;
+}
+
+static HRESULT WINAPI
+dummy_DrawThemeParentBackground(HWND hWnd, HDC hdc, RECT *prc)
+{
+    return E_NOTIMPL;
+}
+
+void Theme_Start(HINSTANCE hInstance)
+{
+    hUxTheme = LoadLibrary(_T("UXTHEME"));
+    if (hUxTheme == NULL)
+        return;
+
+    GET_CB(OpenThemeData)
+    GET_CB(CloseThemeData)
+    GET_CB(DrawThemeBackground)
+    GET_CB(IsAppThemed)
+    GET_CB(IsThemeActive)
+    GET_CB(IsThemeBackgroundPartiallyTransparent)
+    GET_CB(DrawThemeParentBackground)
+}
+
+void Theme_Stop(void)
+{
+    if(hUxTheme == NULL)
+        return;
+
+    FreeLibrary(hUxTheme);
+    hUxTheme = NULL;
+}

base/applications/calc/utl_ieee.c

@@ -1,3 +1,23 @@
+/*
+ * ReactOS Calc (Utility functions for IEEE-754 engine)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
 #include "calc.h"
 
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
@@ -7,7 +27,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
 
     switch (base) {
     case IDC_RADIO_HEX:
-        _stprintf(buffer, TEXT("%I64X"), rpn->i);
+        _stprintf(buffer, _T("%I64X"), rpn->i);
         break;
     case IDC_RADIO_DEC:
 /*
@@ -19,44 +39,44 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
 #define MAX_LD_WIDTH    16
         /* calculate the width of integer number */
         width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
-        if ((calc.sci_out != FALSE) || (width > MAX_LD_WIDTH) || (width < -MAX_LD_WIDTH))
-            _stprintf(buffer, TEXT("%#e"), rpn->f);
+        if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
+            _stprintf(buffer, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f);
         else {
             TCHAR *ptr, *dst;
 
-            ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
+            ptr = buffer + _stprintf(buffer, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
             /* format string ensures there is a '.': */
-            dst = _tcschr(buffer, TEXT('.'));
+            dst = _tcschr(buffer, _T('.'));
             while (--ptr > dst)
-                if (*ptr != TEXT('0'))
+                if (*ptr != _T('0'))
                     break;
 
             /* put the string terminator for removing the final '0' (if any) */
-            ptr[1] = TEXT('\0');
+            ptr[1] = _T('\0');
             /* check if the number finishes with '.' */
             if (ptr == dst)
                 /* remove the dot (it will be re-added later) */
-                ptr[0] = TEXT('\0');
+                ptr[0] = _T('\0');
         }
 #undef MAX_LD_WIDTH
         break;
     case IDC_RADIO_OCT:
-        _stprintf(buffer, TEXT("%I64o"), rpn->i);
+        _stprintf(buffer, _T("%I64o"), rpn->i);
         break;
     case IDC_RADIO_BIN:
         if (rpn->i == 0) {
-            buffer[0] = TEXT('0');
-            buffer[1] = TEXT('\0');
+            buffer[0] = _T('0');
+            buffer[1] = _T('\0');
             break;
         }
         tmp = *rpn;
-        buffer[0] = TEXT('\0');
+        buffer[0] = _T('\0');
         while (tmp.u) {
             memmove(buffer+1, buffer, (size-1)*sizeof(TCHAR));
             if (tmp.u & 1)
-                calc.buffer[0] = TEXT('1');
+                buffer[0] = _T('1');
             else
-                calc.buffer[0] = TEXT('0');
+                buffer[0] = _T('0');
             tmp.u >>= 1;
         }
         break;
@@ -69,20 +89,20 @@ void convert_text2number_2(calc_number_t *a)
 
     switch (calc.base) {
     case IDC_RADIO_HEX:
-        _stscanf(calc.buffer, TEXT("%I64X"), &(a->i));
+        _stscanf(calc.buffer, _T("%I64X"), &(a->i));
         break;
     case IDC_RADIO_DEC:
-        _stscanf(calc.buffer, TEXT("%lf"), &(a->f));
+        _stscanf(calc.buffer, _T("%lf"), &(a->f));
         break;
     case IDC_RADIO_OCT:
-        _stscanf(calc.buffer, TEXT("%I64o"), &(a->i));
+        _stscanf(calc.buffer, _T("%I64o"), &(a->i));
         break;
     case IDC_RADIO_BIN:
         ptr = calc.buffer;
         a->i = 0;
-        while (*ptr != TEXT('\0')) {
+        while (*ptr != _T('\0')) {
             a->i <<= 1;
-            if (*ptr++ == TEXT('1'))
+            if (*ptr++ == _T('1'))
                 a->i |= 1;
         }
         break;

base/applications/calc/utl_mpfr.c

@@ -1,3 +1,23 @@
+/*
+ * ReactOS Calc (Utility functions for GMP/MPFR engine)
+ *
+ * Copyright 2007-2017, Carlo Bramini
+ *
+ * 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 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
+ */
+
 #include "calc.h"
 
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
@@ -39,7 +59,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
             width = 1 + mpfr_get_si(t, MPFR_DEFAULT_RND);
             mpfr_clear(t);
         }
-        if ((calc.sci_out != FALSE) || (width > max_ld_width) || (width < -max_ld_width))
+        if (calc.sci_out == TRUE || width > max_ld_width || width < -max_ld_width)
             ptr = temp + gmp_sprintf(temp, "%*.*#Fe", 1, max_ld_width, ff);
         else {
             ptr = temp + gmp_sprintf(temp, "%#*.*Ff", width, ((max_ld_width-width-1)>=0) ? max_ld_width-width-1 : 0, ff);
@@ -62,8 +82,8 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
     case IDC_RADIO_BIN:
         /* if the number is zero, just write 0 ;) */
         if (rpn_is_zero(rpn)) {
-            temp[0] = TEXT('0');
-            temp[1] = TEXT('\0');
+            temp[0] = _T('0');
+            temp[1] = _T('\0');
             break;
         }
         /* repeat until a bit set to '1' is found */
@@ -78,8 +98,8 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
         } while (1);
         /* now revert the string into TCHAR buffer */
         for (q=0; q<n; q++)
-            buffer[n-q-1] = (temp[q] == '1') ? TEXT('1') : TEXT('0');
-        buffer[n] = TEXT('\0');
+            buffer[n-q-1] = (temp[q] == '1') ? _T('1') : _T('0');
+        buffer[n] = _T('\0');
 
         mpz_clear(zz);
         mpf_clear(ff);
@@ -87,7 +107,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
     }
     mpz_clear(zz);
     mpf_clear(ff);
-    _sntprintf(buffer, SIZEOF(calc.buffer), TEXT("%s"), temp);
+    _sntprintf(buffer, SIZEOF(calc.buffer), _T("%hs"), temp);
 }
 
 void convert_text2number_2(calc_number_t *a)
@@ -135,4 +155,3 @@ void convert_real_integer(unsigned int base)
         break;
     }
 }
-

base/applications/calc/whatsnew.txt

@@ -1,4 +1,33 @@
-1.11 (20080813)
+1.12 (20181104)
+=======================
+* Fixed bug 12.37 13/06/2009 into multiprecision display (unicode only).
+* Added support for average of squares and mean of squares into statistical functions.
+* pop() and push() functions in RPN engines now work with nodes instead of stack units.
+* Updated translations from ReactOS' repository.
+* Added support for new conversion units:
+   - ANGLE: 'minute of arc', 'second of arc'.
+   - AREA: 'mu', 'rai'.
+   - LENGTH: 'chi', 'cun'. 'sun' optimized.
+   - TIME: 'nanoseconds'.
+   - WEIGHT: 'Kan', 'Kin'.
+* Added support for thailand measure system:
+
+  Invaluable help from this page:
+  http://www.eppo.go.th/ref/UNIT-ALL.html
+
+* Moved the POW and SQR operations near the operators.
+* Rewritten some units formula by using scientific notation.
+* Improved precision of parsec unit conversion formula.
+* Fixed bug when calculator was closed with statistics dialog open.
+* Do not append decimal separator if "ERROR" messages are printed.
+* Improve code readability by using SetDlgItemText and GetDlgItemText functions
+* Colours are now declared though RGB() macro.
+* Remove call to _tcslen() and use return value of GetDlgItemText() where possible.
+* Added theming support. Requires Windows XP or later.
+* Configuration is read from WIN.INI under W32S/Win9x/Me and from the registry for all NT platforms.
+* Removed safe DS_SHELLFONT declaration.
+
+1.11 (20090404)
 =======================
 * Updated translations (thanks to the friends at ReactOS' community).
 * Added DS_SHELLFONT to some dialogs into various translations (sometimes it was specified, sometimes it was not).
@@ -16,7 +45,7 @@
 * Fixed some unsignaled overflow errors.
 * Fixed conversion method, now scientific notation is recognized too.
 * Added compilation for UNICODE executables.
-* Plain MINGW toolchain do not support wWinMain function, so I switched to old WinMain if it is not under ReactOS' build tree.
+* Plain MINGW toolchain does not support wWinMain function, so I switched to old WinMain if it is not under ReactOS' build tree.
 * Detect error if UNICODE version is launched into Win9x (avoid the lock).
 
 1.09 (20080630)
@@ -103,7 +132,7 @@
 * The version number of the programme has been moved from the resource files to ABOUT.C.
 * "DOT" function can be used for starting a number (integer part will be zero).
 * Added repeat function.
-* If the number is grater than maximum resolution, it will be displayed with exponential notation.
+* If the number is greater than maximum resolution, it will be displayed with exponential notation.
 * Removed mouse and keyboard focuses from displayed buttons. 
 * Added normal and small icons.
 

base/applications/charmap_new/CMakeLists.txt

@@ -16,7 +16,7 @@ list(APPEND SOURCE
     MainWindow.cpp
 	)
 
-add_library(charmap SHARED
+add_library(charmap MODULE
     ${SOURCE}
     charmap.rc)
 

base/applications/clipbrd/lang/zh-TW.rc

@@ -24,9 +24,9 @@ BEGIN
     BEGIN
         MENUITEM "自動(&A)", CMD_AUTOMATIC
     END
-    POPUP "幫助(&H)"
+    POPUP "說明(&H)"
     BEGIN
-        MENUITEM "幫助主題(&H)", CMD_HELP
+        MENUITEM "說明主題(&H)", CMD_HELP
         MENUITEM SEPARATOR
         MENUITEM "關於(&A)", CMD_ABOUT
     END

base/applications/cmdutils/at/lang/ru-RU.rc

@@ -31,6 +31,7 @@ id                 Порядковый номер запланированно
     IDS_CONFIRM_YES "Y"
     IDS_CONFIRM_NO "N"
 
+    IDS_DELETE_ALL "This operation will delete all scheduled jobs.\n"
     IDS_NEW_JOB "Добавлено новое задание с ID = %lu\n"
     IDS_JOBS_LIST "Статус ID   День                     Время          Команда\n"
     IDS_NO_ENTRIES "В списке нет запланированных задач.\n"

base/applications/cmdutils/find/lang/zh-TW.rc

@@ -11,5 +11,5 @@ BEGIN
     /N  從 1 開始為顯示的行編號\n\
     /V  輸出不包含該指定字串的行"
     IDS_NO_SUCH_FILE "FIND: %s: 沒有這個檔\n"
-    IDS_CANNOT_OPEN "FIND: %s: 無法打開檔\n"
+    IDS_CANNOT_OPEN "FIND: %s: 無法開啟檔\n"
 END

base/applications/cmdutils/help/lang/zh-TW.rc

@@ -30,7 +30,7 @@ COPY     將一個或多個檔案複製到另一個位置。\n\
 DATE     顯示或設置日期。\n\
 DELETE   刪除一個或多個檔。\n\
 DIR      顯示一個目錄中的檔案清單和子目錄。\n\
-ECHO     顯示消息，或打開/關閉命令回顯。\n\
+ECHO     顯示消息，或開啟/關閉命令回顯。\n\
 ERASE    刪除一個或多個檔。\n\
 EXIT     退出 CMD.EXE 程式 (命令直譯器)。\n\
 FOR      為一組檔中的每一個檔執行指定命令。\n\
@@ -47,7 +47,7 @@ MOVE     將一個或多個檔從一個資料夾移動到另一個資料夾。\n
 PATH     顯示或設置可執行檔的搜索路徑。\n\
 PAUSE    掛起批次檔的執行並顯示一條消息。\n\
 POPD     恢復由 PUSHD 存儲的前一個目前的目錄的值。\n\
-PROMPT   更改命令提示符。\n\
+PROMPT   更改命令提示字元。\n\
 PUSHD    保存目前的目錄然後更改。\n\
 RD       刪除一個目錄。\n\
 REM      在批次檔中記錄注釋 (評論)。\n\

base/applications/cmdutils/reg/lang/zh-TW.rc

@@ -11,7 +11,7 @@ STRINGTABLE
     STRING_SUCCESS, "操作已成功完成\n"
     STRING_INVALID_KEY, "錯誤: 無效的金鑰名稱\n"
     STRING_INVALID_CMDLINE, "錯誤: 無效的命令列參數\n"
-    STRING_NO_REMOTE, "錯誤: 無法訪問遠端計算機\n"
+    STRING_NO_REMOTE, "錯誤: 無法訪問遠端電腦\n"
     STRING_CANNOT_FIND, "錯誤: 系統是無法找到指定的註冊表項或值\n"
     STRING_UNSUPPORTED_TYPE, "錯誤: 不支援的類型\n"
     STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n"

base/applications/cmdutils/taskkill/lang/zh-TW.rc

@@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 STRINGTABLE
 {
-    STRING_USAGE, "用法: taskkill [/?] [/f] [/im 進程名稱 | /pid 進程 ID]\n"
+    STRING_USAGE, "用法: taskkill [/?] [/f] [/im 處理序名稱 | /pid 處理序 ID]\n"
     STRING_INVALID_OPTION, "錯誤: 未知或不正確命令列選項指定。\n"
     STRING_INVALID_PARAM, "錯誤: 不正確命令列參數指定。\n"
     STRING_MISSING_OPTION, "錯誤: 選項 /im 或 /pid 之一必須指定。\n"
@@ -14,8 +14,8 @@ STRINGTABLE
     STRING_CLOSE_PROC_SRCH, "關閉消息發送到頂級視窗的過程 ""%1"" 與 PID %2!u!.\n"
     STRING_TERM_PID_SEARCH, "過程與 PID %1!u! 被強行終止。\n"
     STRING_TERM_PROC_SEARCH, " ""%1"" 過程與 PID %2!u! 被強行終止。\n"
-    STRING_SEARCH_FAILED, "錯誤: 找不到進程 ""%1""。\n"
-    STRING_ENUM_FAILED, "錯誤: 無法枚舉進程清單。\n"
-    STRING_TERMINATE_FAILED, "錯誤: 無法終止進程 ""%1""。\n"
-    STRING_SELF_TERMINATION, "錯誤: 不允許自我終止的進程。\n"
+    STRING_SEARCH_FAILED, "錯誤: 找不到處理序 ""%1""。\n"
+    STRING_ENUM_FAILED, "錯誤: 無法枚舉處理序清單。\n"
+    STRING_TERMINATE_FAILED, "錯誤: 無法終止處理序 ""%1""。\n"
+    STRING_SELF_TERMINATION, "錯誤: 不允許自我終止的處理序。\n"
 }

base/applications/cmdutils/wmic/main.c

@@ -121,45 +121,55 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop )
     return ret;
 }
 
-static int output_string( const WCHAR *msg, ... )
+static int output_string( HANDLE handle, const WCHAR *msg, ... )
 {
     va_list va_args;
-    int wlen;
-    DWORD count, ret;
+    int len;
+    DWORD count;
     WCHAR buffer[8192];
 
     va_start( va_args, msg );
-    vsprintfW( buffer, msg, va_args );
+    len = vsnprintfW( buffer, ARRAY_SIZE(buffer), msg, va_args );
     va_end( va_args );
 
-    wlen = strlenW( buffer );
-    ret = WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, wlen, &count, NULL );
-    if (!ret)
-    {
-        DWORD len;
-        char *msgA;
+    if (!WriteConsoleW( handle, buffer, len, &count, NULL ))
+        WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE );
 
-        /* On Windows WriteConsoleW() fails if the output is redirected. So fall
-         * back to WriteFile(), assuming the console encoding is still the right
-         * one in that case.
-         */
-        len = WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, NULL, 0, NULL, NULL );
-        if (!(msgA = HeapAlloc( GetProcessHeap(), 0, len * sizeof(char) ))) return 0;
-
-        WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, msgA, len, NULL, NULL );
-        WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE );
-        HeapFree( GetProcessHeap(), 0, msgA );
-    }
     return count;
 }
 
-static int output_message( int msg )
+static int output_error( int msg )
 {
     static const WCHAR fmtW[] = {'%','s',0};
     WCHAR buffer[8192];
 
     LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer));
-    return output_string( fmtW, buffer );
+    return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer );
+}
+
+static int output_header( const WCHAR *prop, ULONG column_width )
+{
+    static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','-','*','s','\r','\n',0};
+    int len;
+    DWORD count;
+    WCHAR buffer[8192];
+
+    len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop );
+
+    if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */
+    {
+        WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), bomW, sizeof(bomW), &count, FALSE );
+        WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len * sizeof(WCHAR), &count, FALSE );
+        count += sizeof(bomW);
+    }
+
+    return count;
+}
+
+static int output_line( const WCHAR *str, ULONG column_width )
+{
+    static const WCHAR fmtW[] = {'%','-','*','s','\r','\n',0};
+    return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, column_width, str );
 }
 
 static int query_prop( const WCHAR *class, const WCHAR *propname )
@@ -167,8 +177,6 @@ static int query_prop( const WCHAR *class, const WCHAR *propname )
     static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0};
     static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0};
     static const WCHAR wqlW[] = {'W','Q','L',0};
-    static const WCHAR newlineW[] = {'\n',0};
-    static const WCHAR fmtW[] = {'%','s','\n',0};
     HRESULT hr;
     IWbemLocator *locator = NULL;
     IWbemServices *services = NULL;
@@ -178,6 +186,9 @@ static int query_prop( const WCHAR *class, const WCHAR *propname )
     WCHAR *prop = NULL;
     BOOL first = TRUE;
     int len, ret = -1;
+    IWbemClassObject *obj;
+    ULONG count, width = 0;
+    VARIANT v;
 
     WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propname));
 
@@ -202,34 +213,45 @@ static int query_prop( const WCHAR *class, const WCHAR *propname )
     hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result );
     if (hr != S_OK) goto done;
 
+    for (;;) /* get column width */
+    {
+        IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count );
+        if (!count) break;
+
+        if (!prop && !(prop = find_prop( obj, propname )))
+        {
+            output_error( STRING_INVALID_QUERY );
+            goto done;
+        }
+        if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR)
+        {
+            VariantChangeType( &v, &v, 0, VT_BSTR );
+            width = max( strlenW( V_BSTR( &v ) ), width );
+            VariantClear( &v );
+        }
+        IWbemClassObject_Release( obj );
+    }
+    width += 2;
+
+    IEnumWbemClassObject_Reset( result );
     for (;;)
     {
-        IWbemClassObject *obj;
-        ULONG count;
-        VARIANT v;
-
         IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count );
         if (!count) break;
 
         if (first)
         {
-            if (!(prop = find_prop( obj, propname )))
-            {
-                output_message( STRING_INVALID_QUERY );
-                goto done;
-            }
-            output_string( fmtW, prop );
+            output_header( prop, width );
             first = FALSE;
         }
         if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR)
         {
             VariantChangeType( &v, &v, 0, VT_BSTR );
-            output_string( fmtW, V_BSTR( &v ) );
+            output_line( V_BSTR( &v ), width );
             VariantClear( &v );
         }
         IWbemClassObject_Release( obj );
     }
-    output_string( newlineW );
     ret = 0;
 
 done:
@@ -278,7 +300,7 @@ int wmain(int argc, WCHAR *argv[])
     {
         if (++i >= argc)
         {
-            output_message( STRING_INVALID_PATH );
+            output_error( STRING_INVALID_PATH );
             return 1;
         }
         class = argv[i];
@@ -288,7 +310,7 @@ int wmain(int argc, WCHAR *argv[])
         class = find_class( argv[i] );
         if (!class)
         {
-            output_message( STRING_ALIAS_NOT_FOUND );
+            output_error( STRING_ALIAS_NOT_FOUND );
             return 1;
         }
     }
@@ -305,6 +327,6 @@ int wmain(int argc, WCHAR *argv[])
     }
 
 not_supported:
-    output_message( STRING_CMDLINE_NOT_SUPPORTED );
+    output_error( STRING_CMDLINE_NOT_SUPPORTED );
     return 1;
 }

base/applications/cmdutils/xcopy/lang/ro-RO.rc

@@ -49,7 +49,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 [/A]  Copiază numai fișierele cu atributul de arhivă activat.\n\
 [/M]  Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\
 \tapoi atributul.\n\
-[/K]  Copy file attributes, without this attributes are not preserved.\n\
+[/K]  Copiază atributele de fișier, altfel acestea sunt desconsiderate.\n\
 [/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\
 \t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\
 \t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\

base/applications/drwtsn32/sysinfo.cpp

@@ -59,8 +59,20 @@ void PrintSystemInfo(FILE* output, DumpData& data)
     xfprintf(output, "    When: %d/%d/%d @ %02d:%02d:%02d.%d" NEWLINE,
              LocalTime.wDay, LocalTime.wMonth, LocalTime.wYear,
              LocalTime.wHour, LocalTime.wMinute, LocalTime.wSecond, LocalTime.wMilliseconds);
-    DWORD ExceptionCode = data.ExceptionInfo.ExceptionRecord.ExceptionCode;
-    xfprintf(output, "    Exception number: 0x%8x (%s)" NEWLINE, ExceptionCode, Exception2Str(ExceptionCode));
+
+    xfprintf(output, "    First chance: %u" NEWLINE, data.ExceptionInfo.dwFirstChance);
+    EXCEPTION_RECORD& Record = data.ExceptionInfo.ExceptionRecord;
+    xfprintf(output, "    Exception number: 0x%08x (%s)" NEWLINE, Record.ExceptionCode, Exception2Str(Record.ExceptionCode));
+    xfprintf(output, "    Exception flags: 0x%08x" NEWLINE, Record.ExceptionFlags);
+    xfprintf(output, "    Exception address: %p" NEWLINE, Record.ExceptionAddress);
+    if (Record.NumberParameters)
+    {
+        xfprintf(output, "    Exception parameters: %u" NEWLINE, Record.NumberParameters);
+        for (DWORD n = 0; n < std::min<DWORD>(EXCEPTION_MAXIMUM_PARAMETERS, Record.NumberParameters); ++n)
+        {
+            xfprintf(output, "      Parameter %u: 0x%p" NEWLINE, n, Record.ExceptionInformation[n]);
+        }
+    }
 
     char Buffer[MAX_PATH];
     DWORD count = sizeof(Buffer);

base/applications/extrac32/CMakeLists.txt

@@ -1,4 +1,5 @@
 
+add_definitions(-D__WINESRC__)
 add_executable(extrac32 extrac32.c)
 target_link_libraries(extrac32 wine)
 set_module_type(extrac32 win32gui UNICODE)

base/applications/extrac32/extrac32.c

@@ -118,7 +118,7 @@ static void copy_file(LPCWSTR source, LPCWSTR destination)
         static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0};
         static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0};
         WCHAR msg[MAX_PATH+100];
-        snprintfW(msg, sizeof(msg)/sizeof(msg[0]), overwriteMsg, destination);
+        snprintfW(msg, ARRAY_SIZE(msg), overwriteMsg, destination);
         if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES)
             return;
     }

base/applications/findstr/lang/zh-TW.rc

@@ -17,5 +17,5 @@ BEGIN
     /N  顯示的行編號 (由 1 開始)\n\
     /V  輸出不包含該指定字串的行"
     IDS_NO_SUCH_FILE "FINDSTR: %s: 沒有這個檔案\n"
-    IDS_CANNOT_OPEN "FINDSTR: %s: 無法打開檔案\n"
+    IDS_CANNOT_OPEN "FINDSTR: %s: 無法開啟檔案\n"
 END

base/applications/fltmc/lang/bg-BG.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/cs-CZ.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/de-DE.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/en-US.rc

@@ -7,7 +7,6 @@ BEGIN
                unload      Unloads a Filter driver\n\
                filters     Lists the Filters currently registered in the system\n\
                volumes     Lists all volumes\n\n"
-    
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"

base/applications/fltmc/lang/es-ES.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/fr-FR.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/it-IT.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/pl-PL.rc

@@ -3,25 +3,29 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 STRINGTABLE
 BEGIN
     IDS_USAGE "\nPrawidłowe polecenia:\n\
-               load        Ładuje sterownik filtra\n\
-               unload      Wyładowuje sterownik filtra\n\
-               filters     Wyświetla listę aktualnie zarejestrowanych filtrów\n\n"
+               load        Ładuje sterownik filtru\n\
+               unload      Zwalnia sterownik filtru\n\
+               filters     Wyświetla listę aktualnie zarejestrowanych filtrów\n\n\
+               volumes     Wyświetla listę wszystkich woluminów\n\n"
 
-    IDS_USAGE_LOAD      "Ładuje sterownik filtra\n"
-    IDS_USAGE_UNLOAD    "Wyładowuje sterownik filtra\n"
+    IDS_USAGE_LOAD      "Ładuje sterownik filtru\n"
+    IDS_USAGE_UNLOAD    "Zwalnia sterownik filtru\n"
     IDS_USAGE_FILTERS   "Wyświetla listę zarejestrowanych filtrów\n"
+    IDS_USAGE_VOLUMES   "Wyświetla listę wszystkich woluminów\n"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_DISPLAY_FILTERS1    "Nazwa filtra                    Liczba wystąpień    Wysokość    Ramka\n"
-    IDS_DISPLAY_FILTERS2    "Nazwa filtra                    Liczba wystąpień   Ramka\n"
+    IDS_DISPLAY_FILTERS1    "Nazwa filtru                    Liczba wystąpień    Wysokość    Ramka\n"
+    IDS_DISPLAY_FILTERS2    "Nazwa filtru                    Liczba wystąpień   Ramka\n"
+    IDS_DISPLAY_VOLUMES     "Nazwa systemu DOS               Nazwa woluminu                           System plików   Stan\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_ERROR_PRIV      "Nie udało się ustawić uprawnienia do załadowania sterownika (0x%X)\n"
     IDS_ERROR_FILTERS   "Nie udało się wyświetlić listy filtrów (0x%X)\n"
-    IDS_ERROR_LOAD      "Nie udało się załadować filtra (0x%X)\n"
-    IDS_ERROR_UNLOAD    "Nie udało się wyładować filtra (0x%X)\n"
+    IDS_ERROR_LOAD      "Nie udało się załadować filtru (0x%X)\n"
+    IDS_ERROR_UNLOAD    "Nie udało się zwolnić filtru (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Nie udało się wyświetlić listy woluminów (0x%X)\n"
 END

base/applications/fltmc/lang/ro-RO.rc

@@ -7,17 +7,20 @@ BEGIN
     IDS_USAGE "\nComenzi valide:\n\
                load        Încarcă un modul-pilot de tip filtru\n\
                unload      Descarcă un modul-pilot de tip filtru\n\
-               filters     Afișează filtrele înregistrate acum în sistem\n\n"
+               filters     Afișează filtrele înregistrate acum în sistem\n\n\
+               volumes     Afișează toate volumele\n\n"
 
     IDS_USAGE_LOAD      "Încarcă un modul-pilot de tip filtru\n"
     IDS_USAGE_UNLOAD    "Descarcă un modul-pilot de tip filtru\n"
     IDS_USAGE_FILTERS   "Afișează toate filtrele înregistrate\n"
+    IDS_USAGE_VOLUMES   "Afișează toate volumele\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Nume de filtru                  Num Instanțe     Altitudine  Cadru\n"
     IDS_DISPLAY_FILTERS2    "Nume de filtru                  Num Instanțe    Cadru\n"
+    IDS_DISPLAY_VOLUMES     "Nume DOS                        Nume de volum                            Sist.fișr.   Stare\n"
 END
 
 STRINGTABLE
@@ -26,4 +29,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Eșec la afișarea filtrelor (0x%X)\n"
     IDS_ERROR_LOAD      "Eșec la încărcarea filtrului (0x%X)\n"
     IDS_ERROR_UNLOAD    "Eșec la descărcarea filtrului (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Eșec la afișarea volumelor (0x%X)\n"
 END

base/applications/fltmc/lang/ru-RU.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nДопустимые команды :\n\
                load        Загрузить драйвер фильтра\n\
                unload      Выгрузить драйвер фильтра\n\
-               filters     Список фильтров, зарегистрированных в системе\n\n"
+               filters     Список фильтров, зарегистрированных в системе\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Загружает драйвер фильтра\n"
     IDS_USAGE_UNLOAD    "Выгружает драйвер фильтра\n"
     IDS_USAGE_FILTERS   "Выводит список всех зарегистрированных фильтров\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Не удалось получить список фильтров (0x%X)\n"
     IDS_ERROR_LOAD      "Не удалось загрузить фильтр (0x%X)\n"
     IDS_ERROR_UNLOAD    "Не удалось выгрузить фильтр (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/sq-AL.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/sv-SE.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/tr-TR.rc

@@ -7,17 +7,20 @@ BEGIN
     IDS_USAGE "\nGeçerli komutlar:\n\
                load        Bir süzgeç sürücüsünü yükler\n\
                unload      Bir süzgeç sürücüsünü kaldırır\n\
-               filters     Dizgede şimdilik kayıtlı süzgeçleri dizelgeler\n\n"
+               filters     Dizgede şimdilik kayıtlı süzgeçleri dizelgeler\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Bir süzgeç sürücüsünü yükler\n"
     IDS_USAGE_UNLOAD    "Bir süzgeç sürücüsünü kaldırır\n"
     IDS_USAGE_FILTERS   "Kayıtlı tüm süzgeçleri dizelgeler\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Süzgeç Adı                      Örnek Sayısı     Yükseklik    Kare\n"
     IDS_DISPLAY_FILTERS2    "Süzgeç Adı                      Örnek Sayısı       Kare\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -26,4 +29,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Süzgeçleri dizelgeleme başarısız (0x%X)\n"
     IDS_ERROR_LOAD      "Süzgeçleri yükleme başarısız (0x%X)\n"
     IDS_ERROR_UNLOAD    "Süzgeçleri kaldırma başarısız (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/uk-UA.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/zh-CN.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\n有效的命令 :\n\
                load        加载一个过滤驱动\n\
                unload      卸载一个过滤驱动\n\
-               filters     显示已在系统中注册的过滤驱动列表\n\n"
+               filters     显示已在系统中注册的过滤驱动列表\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "加载一个过滤驱动\n"
     IDS_USAGE_UNLOAD    "卸载一个过滤驱动\n"
     IDS_USAGE_FILTERS   "显示已在系统中注册的过滤驱动列表\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "过滤驱动名称                   数目 实例         权值        帧\n"
     IDS_DISPLAY_FILTERS2    "过滤驱动名称                   数目 实例        帧\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "无法列举过滤驱动列表 (0x%X)\n"
     IDS_ERROR_LOAD      "无法加载过滤驱动 (0x%X)\n"
     IDS_ERROR_UNLOAD    "无法卸载过滤驱动 (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fltmc/lang/zh-TW.rc

@@ -5,17 +5,20 @@ BEGIN
     IDS_USAGE "\nValid commands :\n\
                load        Loads a Filter driver\n\
                unload      Unloads a Filter driver\n\
-               filters     Lists the Filters currently registered in the system\n\n"
+               filters     Lists the Filters currently registered in the system\n\n\
+               volumes     Lists all volumes\n\n"
 
     IDS_USAGE_LOAD      "Loads a filter driver\n"
     IDS_USAGE_UNLOAD    "Unloads a filter driver\n"
     IDS_USAGE_FILTERS   "Lists all registered filters\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END
 
 STRINGTABLE
 BEGIN
     IDS_DISPLAY_FILTERS1    "Filter Name                     Num Instances    Altitude    Frame\n"
     IDS_DISPLAY_FILTERS2    "Filter Name                     Num Instances   Frame\n"
+    IDS_DISPLAY_VOLUMES     "Dos Name                        Volume Name                              FileSystem   Status\n"
 END
 
 STRINGTABLE
@@ -24,4 +27,5 @@ BEGIN
     IDS_ERROR_FILTERS   "Failed to list the filters (0x%X)\n"
     IDS_ERROR_LOAD      "Failed to load the filter (0x%X)\n"
     IDS_ERROR_UNLOAD    "Failed to unload the filter (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END

base/applications/fontview/lang/zh-TW.rc

@@ -12,19 +12,19 @@ STRINGTABLE
 BEGIN
     IDS_INSTALL "安裝"
     IDS_PRINT "列印"
-    IDS_STRING "ReactOS 給所有人一個自由的操作系統！ 1234567890"
-    IDS_OPEN "打開字體..."
+    IDS_STRING "路曼曼其脩遠兮，吾將上下而求索。1234567890"
+    IDS_OPEN "開啟字型..."
     IDS_ERROR "錯誤"
     IDS_ERROR_NOMEM "沒有足夠的記憶體來完成操作。"
     IDS_ERROR_NOFONT "%1 不是一個有效的字體檔案。"
-    IDS_ERROR_NOCLASS "窗口無法初始化。"
-    IDS_FILTER_LIST "所有支援的字體 (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
-字體檔 (*.fon;*.fnt)\0*.fon;*.fnt\0\
-TrueType 字體 (*.ttf)\0*.ttf\0\
-TrueType Font Collection (*.ttc)\0*.ttc\0\
-OpenType 字體 (*.otf)\0*.otf\0\
-OpenType Font Collection (*.otc)\0*.otc\0\
+    IDS_ERROR_NOCLASS "視窗無法初始化。"
+    IDS_FILTER_LIST "所有支援的字型 (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
+字型檔案 (*.fon;*.fnt)\0*.fon;*.fnt\0\
+TrueType 字型 (*.ttf)\0*.ttf\0\
+TrueType 字型集合 (*.ttc)\0*.ttc\0\
+OpenType 字型 (*.otf)\0*.otf\0\
+OpenType 字型集合 (*.otc)\0*.otc\0\
 所有檔 (*.*)\0*.*\0"
-    IDS_PREVIOUS "< P&revious"
-    IDS_NEXT "&Next >"
+    IDS_PREVIOUS "< 上一步(&R)"
+    IDS_NEXT "下一步(&N) >"
 END

base/applications/games/solitaire/lang/zh-TW.rc

@@ -76,7 +76,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "結束(&X)", IDM_GAME_EXIT
     END
-    POPUP "幫助(&H)"
+    POPUP "說明(&H)"
     BEGIN
         MENUITEM "目錄(&C)\tF1", IDM_HELP_CONTENTS
         MENUITEM "關於接龍(&A)", IDM_HELP_ABOUT

base/applications/kbswitch/kbsdll/CMakeLists.txt

@@ -6,7 +6,7 @@ list(APPEND SOURCE
     kbsdll.rc
     ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
 
-add_library(kbsdll SHARED ${SOURCE})
+add_library(kbsdll MODULE ${SOURCE})
 set_module_type(kbsdll win32dll UNICODE)
 add_importlibs(kbsdll user32 comctl32 msvcrt kernel32)
 add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all)

base/applications/magnify/lang/pl-PL.rc

@@ -68,8 +68,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14
     ICON IDI_ICON, IDC_STATIC, 7, 17, 20, 20
-    LTEXT "Lupa ma za zadanie dostarczyć podstawowy poziom funkcjonalności dla osób z niewielkimi problemami ze wzrokiem. Użytkownicy ze znaczniejszymi problemami ze wzrokiem mogą być zmuszeni użyć bardziej zaawansowanego narzędzia.", IDC_STATIC, 36, 7, 207, 33
-    CONTROL "Nie pokazuj więcej tej wiadomości", IDC_SHOWWARNINGCHECK, "Button",
+    LTEXT "Lupa ma za zadanie zapewnić podstawowy poziom funkcjonalności dla osób z niewielkimi problemami ze wzrokiem. Użytkownicy ze znaczniejszymi problemami ze wzrokiem mogą potrzebować bardziej zaawansowanego narzędzia.", IDC_STATIC, 36, 7, 207, 33
+    CONTROL "Nie pokazuj więcej tego komunikatu", IDC_SHOWWARNINGCHECK, "Button",
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 

base/applications/mplay32/lang/he-IL.rc

@@ -14,7 +14,7 @@ BEGIN
         MENUITEM "נגינה/&השהייה\tCtrl+P", IDC_PLAY
         MENUITEM "&עצירה\tCtrl+S", IDC_STOP
         MENUITEM SEPARATOR
-        MENUITEM "&חזרה\tCtrl+T", IDM_REPEAT
+        MENUITEM "&ניגון חוזר\tCtrl+T", IDM_REPEAT
     END
     POPUP "&תצוגה"
     BEGIN

base/applications/mplay32/lang/zh-TW.rc

@@ -53,7 +53,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MODE_UNKNOWN "未知"
-    IDS_MODE_OPEN "已打開"
+    IDS_MODE_OPEN "已開啟"
     IDS_MODE_STOP "已停止"
     IDS_MODE_PLAY "播放中"
     IDS_MODE_PAUSE "已暫停"

base/applications/mplay32/mplay32.c

@@ -12,6 +12,12 @@
 #define MAIN_WINDOW_MIN_WIDTH 250
 #define MAX_MCISTR            256
 
+#ifdef UNICODE
+#define argv __wargv
+#else
+#define argv __argv
+#endif
+
 HINSTANCE hInstance = NULL;
 HWND hTrackBar = NULL;
 HWND hToolBar = NULL;
@@ -1537,7 +1543,14 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow)
     ShowWindow(hwnd, SW_SHOW);
     UpdateWindow(hwnd);
 
-    OpenMediaFile(hwnd, lpCmdLine, NULL);
+    if (*lpCmdLine == _T('"'))
+    {
+        OpenMediaFile(hwnd, argv[1], NULL);
+    }
+    else
+    {
+        OpenMediaFile(hwnd, lpCmdLine, NULL);
+    }
 
     /* Message Loop */
     while (GetMessage(&msg, NULL, 0, 0))

base/applications/msconfig/lang/zh-TW.rc

@@ -153,7 +153,7 @@ BEGIN
     IDS_TOOLS_INFO_DESCR "顯示版本訊息。"
     IDS_TOOLS_INFO_CMD "winver.exe"
     IDS_TOOLS_REGEDIT_NAME "登錄表編輯器"
-    IDS_TOOLS_REGEDIT_DESCR "打開登錄表編輯器。"
+    IDS_TOOLS_REGEDIT_DESCR "開啟登錄表編輯器。"
     IDS_TOOLS_REGEDIT_CMD "regedit.exe"
     IDS_TOOLS_SYSDM_NAME "系統內容"
     IDS_TOOLS_SYSDM_DESCR "顯示這台電腦的內容"

base/applications/msconfig/msconfig.c

@@ -21,7 +21,8 @@ HINSTANCE hInst = 0;
 HWND hMainWnd;                   /* Main Window */
 HWND hTabWnd;                    /* Tab Control Window */
 UINT uXIcon = 0, uYIcon = 0;     /* Icon sizes */
-HICON hDialogIcon = NULL;
+HICON hDialogIconBig = NULL;
+HICON hDialogIconSmall = NULL;
 
 void MsConfig_OnTabWndSelChange(void);
 
@@ -203,18 +204,25 @@ static
 VOID
 SetDialogIcon(HWND hDlg)
 {
-    if (hDialogIcon) DestroyIcon(hDialogIcon);
+    if (hDialogIconBig) DestroyIcon(hDialogIconBig);
+    if (hDialogIconSmall) DestroyIcon(hDialogIconSmall);
 
-    hDialogIcon = LoadImage(GetModuleHandle(NULL),
-                            MAKEINTRESOURCE(IDI_APPICON),
-                            IMAGE_ICON,
-                            uXIcon,
-                            uYIcon,
-                            0);
+    hDialogIconBig = LoadIconW(GetModuleHandle(NULL),
+                               MAKEINTRESOURCE(IDI_APPICON));
+    hDialogIconSmall = LoadImage(GetModuleHandle(NULL),
+                                 MAKEINTRESOURCE(IDI_APPICON),
+                                 IMAGE_ICON,
+                                 uXIcon,
+                                 uYIcon,
+                                 0);
+    SendMessage(hDlg,
+                WM_SETICON,
+                ICON_BIG,
+                (LPARAM)hDialogIconBig);
     SendMessage(hDlg,
                 WM_SETICON,
                 ICON_SMALL,
-                (LPARAM)hDialogIcon);
+                (LPARAM)hDialogIconSmall);
 }
 
 
@@ -292,8 +300,10 @@ MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                 DestroyWindow(hFreeLdrPage);
             if (hSystemPage)
                 DestroyWindow(hSystemPage);
-            if (hDialogIcon)
-                DestroyIcon(hDialogIcon);
+            if (hDialogIconBig)
+                DestroyIcon(hDialogIconBig);
+            if (hDialogIconSmall)
+                DestroyIcon(hDialogIconSmall);
             return DefWindowProc(hDlg, message, wParam, lParam);
     }
 

base/applications/msconfig_new/comctl32ex/comctl32supp.h

@@ -10,10 +10,6 @@
 #define __COMCTL32SUPP_H__
 
 #include <windowsx.h>
-/*
-#define GET_X_LPARAM(lp)    ((int)(short)LOWORD(lp))
-#define GET_Y_LPARAM(lp)    ((int)(short)HIWORD(lp))
-*/
 
 #define Button_IsEnabled(hwndCtl) IsWindowEnabled((hwndCtl))
 

base/applications/msconfig_new/lang/ro-RO.rc

@@ -84,7 +84,7 @@ BEGIN
     LTEXT           "secunde", IDC_STATIC, 330, 104, 31, 10
     CONTROL         "&Permanenizează configurația de inițializare", 292,
                     "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
-    PUSHBUTTON      "Ș&terge", IDC_BTN_DELETE, 295, 68, 66, 14
+    PUSHBUTTON      "Șt&erge", IDC_BTN_DELETE, 295, 68, 66, 14
 END
 
 IDD_SERVICES_PAGE DIALOGEX 0, 0, 366, 175

base/applications/mscutils/servman/lang/zh-TW.rc

@@ -314,7 +314,7 @@ BEGIN
     IDS_HINT_EDIT " 編輯選定服務的屬性。"
     IDS_HINT_CREATE " 創建一個新的服務。"
     IDS_HINT_DELETE " 刪除選定的服務。"
-    IDS_HINT_PROP " 為當前選擇專案打開屬性頁。"
+    IDS_HINT_PROP " 為當前選擇專案開啟屬性頁。"
     IDS_HINT_LARGE " 用大圖示顯示條目。"
     IDS_HINT_SMALL " 用小圖示顯示條目。"
     IDS_HINT_LIST " 用清單顯示條目。"

base/applications/mspaint/lang/he-IL.rc

@@ -218,6 +218,6 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
-    IDS_LOADERRORTEXT, "The file %s could not be loaded."
+    IDS_LOADERRORTEXT, ".%s לא היה ניתן לטעון את הקובץ"
     IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?"
 END

base/applications/mspaint/lang/zh-TW.rc

@@ -57,7 +57,7 @@ BEGIN
         MENUITEM SEPARATOR
         POPUP "縮放"
         BEGIN
-            POPUP "用戶自定義"
+            POPUP "使用者自訂"
             BEGIN
                 MENUITEM "12.5%", IDM_VIEWZOOM125
                 MENUITEM "25%", IDM_VIEWZOOM25

base/applications/mstsc/lang/zh-TW.rc

@@ -16,7 +16,7 @@ BEGIN
     ICON "", IDC_LOGONICON, 15, 19, 20, 20
     LTEXT "輸入伺服器地址", IDC_STATIC, 47, 24, 81, 8
     LTEXT "伺服器：", IDC_STATIC, 47, 41, 25, 8
-    LTEXT "用戶名：", IDC_STATIC, 47, 58, 38, 8
+    LTEXT "使用者名稱：", IDC_STATIC, 47, 58, 38, 8
     COMBOBOX IDC_SERVERCOMBO, 79, 39, 141, 13, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_NAMEEDIT, 79, 55, 141, 14, WS_TABSTOP | ES_AUTOHSCROLL
     PUSHBUTTON "儲存", IDC_SAVE, 67, 139, 50, 14

base/applications/network/net/CMakeLists.txt

@@ -6,9 +6,11 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 list(APPEND SOURCE
     main.c
     cmdAccounts.c
+    cmdComputer.c
     cmdConfig.c
     cmdContinue.c
     cmdGroup.c
+    cmdHelp.c
     cmdHelpMsg.c
     cmdLocalGroup.c
     cmdPause.c
@@ -17,12 +19,12 @@ list(APPEND SOURCE
     cmdStop.c
     cmdUse.c
     cmdUser.c
-    help.c
     net.h)
 
 add_executable(net ${SOURCE} net.rc)
 set_module_type(net win32cui UNICODE)
 target_link_libraries(net conutils ${PSEH_LIB})
+add_dependencies(net net_msg)
 add_importlibs(net advapi32 netapi32 mpr msvcrt kernel32 ntdll)
 add_pch(net net.h SOURCE)
 add_cd_file(TARGET net DESTINATION reactos/system32 FOR all)

base/applications/network/net/cmdAccounts.c

@@ -37,7 +37,7 @@ cmdAccounts(
         {
             /* Print short syntax help */
             ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
-            ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX);
+            PrintNetMessage(MSG_ACCOUNTS_SYNTAX);
             return 0;
         }
 
@@ -45,18 +45,8 @@ cmdAccounts(
         {
             /* Print full help text*/
             ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
-            ConResPuts(StdOut, IDS_ACCOUNTS_SYNTAX);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_1);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_2);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_3);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_4);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_5);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_6);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_7);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_8);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_9);
-            ConResPuts(StdOut, IDS_ACCOUNTS_HELP_10);
-            ConResPuts(StdOut, IDS_GENERIC_PAGE);
+            PrintNetMessage(MSG_ACCOUNTS_SYNTAX);
+            PrintNetMessage(MSG_ACCOUNTS_HELP);
             return 0;
         }
 
@@ -189,36 +179,36 @@ cmdAccounts(
             ConResPrintf(StdOut, IDS_ACCOUNTS_LOGOFF_SECONDS, Info0->usrmod0_force_logoff);
         ConPuts(StdOut, L"\n");
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_AGE, nPaddedLength);
+        PrintPaddedMessageString(4572, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_min_passwd_age / 86400);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_MAX_PW_AGE, nPaddedLength);
+        PrintPaddedMessageString(4573, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_max_passwd_age / 86400);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_MIN_PW_LENGTH, nPaddedLength);
+        PrintPaddedMessageString(4574, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info0->usrmod0_min_passwd_len);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_PW_HIST_LENGTH, nPaddedLength);
+        PrintPaddedMessageString(4575, nPaddedLength);
         if (Info0->usrmod0_password_hist_len == 0)
             ConResPuts(StdOut, IDS_GENERIC_NONE);
         else
             ConPrintf(StdOut, L"%lu", Info0->usrmod0_password_hist_len);
         ConPuts(StdOut, L"\n");
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_THRESHOLD, nPaddedLength);
+        PrintPaddedMessageString(4578, nPaddedLength);
         if (Info3->usrmod3_lockout_threshold == 0)
             ConResPuts(StdOut, IDS_GENERIC_NEVER);
         else
             ConPrintf(StdOut, L"%lu", Info3->usrmod3_lockout_threshold);
         ConPuts(StdOut, L"\n");
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_DURATION, nPaddedLength);
+        PrintPaddedMessageString(4579, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info3->usrmod3_lockout_duration / 60);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_LOCKOUT_WINDOW, nPaddedLength);
+        PrintPaddedMessageString(4580, nPaddedLength);
         ConPrintf(StdOut, L"%lu\n", Info3->usrmod3_lockout_observation_window / 60);
 
-        PrintPaddedResourceString(IDS_ACCOUNTS_COMPUTER_ROLE, nPaddedLength);
+        PrintPaddedMessageString(4576, nPaddedLength);
         if (Info1->usrmod1_role == UAS_ROLE_PRIMARY)
         {
             if (ProductType == NtProductLanManNt)

base/applications/network/net/cmdComputer.c

@@ -0,0 +1,146 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS net command
+ * FILE:            base/applications/network/net/cmdComputer.c
+ * PROGRAMMERS:     Eric Kohl <eric.kohl@reactos.org>
+ */
+
+#include "net.h"
+
+INT
+cmdComputer(
+    INT argc,
+    WCHAR **argv)
+{
+    WCHAR ComputerAccountName[MAX_PATH + 2];
+    WCHAR ComputerPassword[LM20_PWLEN + 1];
+    USER_INFO_1 UserInfo;
+    INT i, result = 0;
+    BOOL bAdd = FALSE;
+    BOOL bDelete = FALSE;
+    PWSTR pComputerName = NULL;
+    NET_API_STATUS Status = NERR_Success;
+/*
+    OSVERSIONINFOEX VersionInfo;
+
+    VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo);
+    if (!GetVersionEx((LPOSVERSIONINFO)&VersionInfo))
+    {
+        PrintErrorMessage(GetLastError());
+        return 1;
+    }
+
+    if (VersionInfo.wProductType != VER_NT_DOMAIN_CONTROLLER)
+    {
+        PrintErrorMessage(3515);
+        return 1;
+    }
+*/
+
+    i = 2;
+    if (argc > 2 && argv[i][0] == L'\\' && argv[i][1] == L'\\')
+    {
+        pComputerName = argv[i];
+        i++;
+    }
+
+    for (; i < argc; i++)
+    {
+        if (_wcsicmp(argv[i], L"help") == 0)
+        {
+            /* Print short syntax help */
+            ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
+            PrintNetMessage(MSG_COMPUTER_SYNTAX);
+            return 0;
+        }
+
+        if (_wcsicmp(argv[i], L"/help") == 0)
+        {
+            /* Print full help text*/
+            ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
+            PrintNetMessage(MSG_COMPUTER_SYNTAX);
+            PrintNetMessage(MSG_COMPUTER_HELP);
+            return 0;
+        }
+
+        if (_wcsicmp(argv[i], L"/add") == 0)
+        {
+            bAdd = TRUE;
+            continue;
+        }
+        else if (_wcsicmp(argv[i], L"/del") == 0)
+        {
+            bDelete = TRUE;
+            continue;
+        }
+        else
+        {
+            PrintErrorMessage(3506/*, argv[i]*/);
+            return 1;
+        }
+    }
+
+    if (pComputerName == NULL ||
+        (bAdd == FALSE && bDelete == FALSE) ||
+        (bAdd == TRUE && bDelete == TRUE))
+    {
+        ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
+        PrintNetMessage(MSG_COMPUTER_SYNTAX);
+        return 1;
+    }
+
+    /*
+     * Create the computer account name:
+     *  Skip the leading '\\' and appand a '$'.
+     */
+    wcscpy(ComputerAccountName, &pComputerName[2]);
+    wcscat(ComputerAccountName, L"$");
+
+    if (bAdd)
+    {
+        /*
+         * Create the computer password:
+         *   Skip the leading '\\', shorten to a maximum of 14 characters
+         *   and convert to lower case
+         */
+        wcsncpy(ComputerPassword, &pComputerName[2], LM20_PWLEN);
+        ComputerPassword[LM20_PWLEN] = UNICODE_NULL;
+        _wcslwr(ComputerPassword);
+
+        /* Set the account data */
+        UserInfo.usri1_name = ComputerAccountName;
+        UserInfo.usri1_password = ComputerPassword;
+        UserInfo.usri1_password_age = 0;
+        UserInfo.usri1_priv = USER_PRIV_USER;
+        UserInfo.usri1_home_dir = NULL;
+        UserInfo.usri1_comment = NULL;
+        UserInfo.usri1_flags = UF_SCRIPT | UF_WORKSTATION_TRUST_ACCOUNT;
+        UserInfo.usri1_script_path = NULL;
+
+        /* Add the computer account */
+        Status = NetUserAdd(NULL,
+                            1,
+                            (LPBYTE)&UserInfo,
+                            NULL);
+    }
+    else if (bDelete)
+    {
+        /* Delete the coputer account */
+        Status = NetUserDel(NULL,
+                            ComputerAccountName);
+    }
+
+    if (Status == NERR_Success)
+    {
+        PrintErrorMessage(ERROR_SUCCESS);
+    }
+    else
+    {
+        PrintErrorMessage(Status);
+        result = 1;
+    }
+
+    return result;
+}
+
+/* EOF */