[CRT] Fix MSVC version of call_handler

[NTOS:MM] Randomly allocate from special pool
[WIN32K:NTUSER] Regularly validate thread window list. CORE-18002
2025-10-08 17:32:43 +02:00 · 2022-01-16 23:31:07 -05:00 · 2022-01-16 23:31:07 -05:00 · 2022-01-16 23:31:07 -05:00 · 2022-01-16 23:30:55 -05:00 · 2022-01-16 23:30:50 -05:00
5124 changed files with 241631 additions and 406083 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,8 +1,4 @@
 # Labelling by the files touched
-
-ATL:
-  - sdk/lib/atl/**
-
 drivers:
  - drivers/**
  - sdk/lib/drivers/**
@@ -17,13 +13,3 @@ freeldr:

 ROSTESTS:
  - modules/rostests/**
-
-shell:
-  - base/shell/explorer/**
-  - base/shell/rshell/**
-  - dll/shellext/**
-  - dll/win32/browseui/**
-  - dll/win32/shell32/**
-
-Win32SS:
-  - win32ss/**
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,12 +8,6 @@ jobs:
        compiler: [gcc, clang]
        arch: [i386, amd64]
        config: [Debug, Release]
-        dllver: ['0x502', '0x600']
-        exclude:
-          - dllver: 0x600
-            compiler: clang
-          - dllver: 0x600
-            config: Release
      fail-fast: false
    runs-on: ubuntu-latest
    steps:
@@ -21,12 +15,12 @@ jobs:
      id: get_rosbe_spec
      run: |
        gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}'
-        echo march-sha=$(gcc -march=native -Q --help=target | sha1sum | awk '{print $1}') >> $GITHUB_OUTPUT
-        echo git-sha=$(git ls-remote https://github.com/zefklop/RosBE.git | grep unix_amd64 | awk '{print $1}') >> $GITHUB_OUTPUT
+        echo ::set-output name=march-sha::$(gcc -march=native -Q --help=target | sha1sum | awk '{print $1}')
+        echo ::set-output name=git-sha::$(git ls-remote https://github.com/zefklop/RosBE.git | grep unix_amd64 | awk '{print $1}')
        wget https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899/raw/build_rosbe_ci.sh
    - name: Get RosBE
      id: get_rosbe
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      with:
        path: RosBE-CI
        key: RosBE-CI-${{runner.os}}-${{steps.get_rosbe_spec.outputs.march-sha}}-${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}
@@ -46,11 +40,11 @@ jobs:
        sudo ./llvm.sh $LLVM_VERSION
        echo "D_CLANG_VERSION=-DCLANG_VERSION=$LLVM_VERSION" >> $GITHUB_ENV
    - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Set up cache for ccache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      with:
        path: ccache
        key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
@@ -66,7 +60,7 @@ jobs:
      if: ${{ matrix.compiler == 'gcc' }}
      run: echo "CCACHE_COMPILERCHECK=string:${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}" >> $GITHUB_ENV
    - name: Configure
-      run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
+      run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
    - name: Build
      run: echo 'cmake --build ${{github.workspace}}/build -- -k0' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
    - name: Generate ISOs
@@ -74,9 +68,9 @@ jobs:
    - name: Print ccache statistics
      run: ccache -s
    - name: Upload ISOs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
-        name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
+        name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
          build/bootcd.iso
          build/livecd.iso
@@ -84,28 +78,14 @@ jobs:
  build-msvc:
    strategy:
      matrix:
-        os: [windows-latest, windows-2019]
-        toolset: ['14.2', '14.1', '14.0'] # VS 2019, 2017, and 2015 (see below)
+        toolset: ['14.2', '14.1'] # VS 2019, 2017
        arch: [i386, amd64]
        config: [Debug, Release]
-        dllver: ['0x502', '0x600']
-        exclude: # VS 2019, 2017 only with windows-latest; VS 2015 only with windows-2019
-          - os: windows-2019
-            toolset: '14.2'
-          - os: windows-2019
-            toolset: '14.1'
-          - os: windows-latest
-            toolset: '14.0'
-          - dllver: 0x600
-            os: windows-2019
-          - dllver: 0x600
-            toolset: '14.1'
-          - dllver: 0x600
-            toolset: '14.0'
-          - dllver: 0x600
-            config: Release
+        include:
+        - arch: i386 # Not compiling on amd64 prompt
+          toolset: '14.0' # VS 2015
      fail-fast: false
-    runs-on: ${{matrix.os}}
+    runs-on: windows-latest
    steps:
    - name: Install ninja
      run: choco install -y ninja
@@ -129,34 +109,34 @@ jobs:
        arch: amd64
        toolset: ${{matrix.toolset}}
    - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Configure
-      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DDLL_EXPORT_VERSION=${{matrix.dllver}}
+      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
    - name: Build
-      run: cmake --build build -- -k0
+      run: cmake --build build  -- -k0
    - name: Generate ISOs
      run: cmake --build build --target bootcd --target livecd
    - name: Upload ISOs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
-        name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
+        name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
          build/bootcd.iso
          build/livecd.iso
    - name: Upload debug symbols
      if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
-        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
+        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: build/msvc_pdb

  build-msvc-arm:
    strategy:
      matrix:
        toolset: ['14.2', '14.1'] # VS 2019, 2017
-        arch: [arm, arm64]
+        arch: [arm]
        config: [Debug, Release]
      fail-fast: false
    runs-on: windows-latest
@@ -171,47 +151,30 @@ jobs:
        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: Activate VS cmd (arm)
-      if: ${{ matrix.arch == 'arm' }}
      uses: ilammy/msvc-dev-cmd@v1
      with:
-        arch: amd64_arm
-        toolset: ${{matrix.toolset}}
-    - name: Activate VS cmd (arm64)
-      if: ${{ matrix.arch == 'arm64' }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64_arm64
+        arch: x86_arm
        toolset: ${{matrix.toolset}}
    - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Configure
      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
-    - name: Build base module
-      if: ${{ matrix.arch == 'arm' }}
-      run: cmake --build build --target base/all
+    - name: Build applications
+      run: cmake --build build --target base/applications/all
    - name: Build control panel applets
-      if: ${{ matrix.arch == 'arm' }}
      run: cmake --build build --target dll/cpl/all
    - name: Build rosapps
-      if: ${{ matrix.arch == 'arm' }}
      run: cmake --build build --target modules/rosapps/all
-    - name: Build subsystems
-      if: ${{ matrix.arch == 'arm' }}
-      run: cmake --build build --target subsystems/all
-    - name: Build some applications (arm64)
-      if: ${{ matrix.arch == 'arm64' }}
-      run: cmake --build build --target calc magnify mstsc notepad osk regedit taskmgr winmine wordpad base/applications/screensavers/all -- -k0
    - name: Upload compiled binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
-          build/base
+          build/base/applications
          build/dll/cpl
          build/modules/rosapps
-          build/subsystems
          !**/CMakeFiles
          !**/cmake_install.cmake
          !**/*.asm
@@ -227,7 +190,7 @@ jobs:
          !**/*.tlb
    - name: Upload debug symbols
      if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: build/msvc_pdb
@@ -244,7 +207,7 @@ jobs:
      run: choco install -y ninja
    - name: Install LLVM
      run: |
-        choco install -y --allow-downgrade llvm --version 13.0.1
+        choco install -y llvm
        echo "LLVM_PATH=${env:PROGRAMFILES}\llvm\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: Install Flex & Bison
      run: |
@@ -268,7 +231,7 @@ jobs:
    - name: Add LLVM to PATH
      run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
    - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Configure
@@ -278,7 +241,7 @@ jobs:
    - name: Generate ISOs
      run: cmake --build build --target bootcd --target livecd
    - name: Upload ISOs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
@@ -286,34 +249,33 @@ jobs:
          build/livecd.iso
    - name: Upload debug symbols
      if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: build/msvc_pdb

-# Disable MSBuild for the moment being until a proper fix is provided -- see CORE-18911
-#  build-msbuild-i386:
-#    name: MSBuild (i386)
-#    runs-on: windows-2019
-#    steps:
-#    - name: Install Flex and Bison
-#      run: |
-#        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
-#        7z x flexbison.7z -O${{github.workspace}}\bin
-#        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-#        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-#        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-#    - name: Add CL to PATH
-#      uses: ilammy/msvc-dev-cmd@v1
-#      with:
-#        arch: amd64_x86
-#    - uses: actions/checkout@v3
-#      with:
-#        path: src
-#    - name: Configure
-#      run: |
-#        mkdir build
-#        cd build
-#        cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
-#    - name: Build
-#      run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
+  build-msbuild-i386:
+    name: MSBuild (i386)
+    runs-on: windows-latest
+    steps:
+    - name: Install Flex and Bison
+      run: |
+        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
+        7z x flexbison.7z -O${{github.workspace}}\bin
+        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+    - name: Add CL to PATH
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: amd64_x86
+    - uses: actions/checkout@v2
+      with:
+        path: src
+    - name: Configure
+      run: |
+        mkdir build
+        cd build
+        cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
+    - name: Build
+      run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,33 +0,0 @@
-# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
-#
-# You can adjust the behavior by modifying this file.
-# For more information, see:
-# https://github.com/actions/stale
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: '43 0 * * *'
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/stale@v5
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 120
-        days-before-issue-stale: -1
-        days-before-close: 14
-        days-before-issue-close: -1
-        exempt-all-assignees: true
-        exempt-draft-pr: true
-        stale-pr-message: 'This PR is stale because it received no updates in the last 4 months. Without removing the stale label, or commenting on this ticket it will be closed in 2 weeks.'
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
-        operations-per-run: 100
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ modules/3rdparty
 modules/[Aa][Hh][Kk]_[Tt]ests
 .cache
 .cproject
-.DS_Store
 .project
 .settings
 .vscode
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,16 +68,12 @@ include(sdk/cmake/config.cmake)
 # Compiler flags handling
 include(sdk/cmake/compilerflags.cmake)

-add_definitions(
-    -D__REACTOS__
-    # swprintf without count argument is used in most of the codebase
-    -D_CRT_NON_CONFORMING_SWPRINTFS
-)
+add_definitions(-D__REACTOS__)

 # 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})
-if (NOT MSVC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
-               OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0")))
+if (GCC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
+    OR ((CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0"))))
    # Thankfully, GCC has this
    add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=)
    add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=)
@@ -147,11 +143,13 @@ if(NOT CMAKE_CROSSCOMPILING)
    endif()
    add_subdirectory(sdk/include/host)

-    add_subdirectory(dll/win32/dbghelp)
+    if(NOT MSVC)
+        add_subdirectory(dll/win32/dbghelp)
+    endif()
    add_subdirectory(sdk/tools)
    add_subdirectory(sdk/lib)

-    set(NATIVE_TARGETS asmpp bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb)
+    set(NATIVE_TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb)
    if(NOT MSVC)
        list(APPEND NATIVE_TARGETS rsym pefixup)
    endif()
@@ -215,11 +213,19 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
        add_definitions(-DDBG=0)
    endif()

+    if(KDBG)
+        add_definitions(-DKDBG)
+    endif()
+
+    if(_WINKD_)
+        add_definitions(-D_WINKD_)
+    endif()
+
    if(ENABLE_CCACHE)
        message(WARNING "-- Disabling precompiled headers support (ccache).")
        option(PCH "Whether to use precompiled headers" OFF)
        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    elseif(GCC)
        message(WARNING "-- Disabling precompiled headers on GCC by default CORE-17108.")
        option(PCH "Whether to use precompiled headers" OFF)
    else()
@@ -232,13 +238,11 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
                    -D_WIN32_WINNT=0x502
                    -D_WIN32_WINDOWS=0x502
                    -D_SETUPAPI_VER=0x502
-                    -DMINGW_HAS_SECURE_API=1
-                    -DDLL_EXPORT_VERSION=${DLL_EXPORT_VERSION})
+                    -DMINGW_HAS_SECURE_API=1)

    # Arch Options
    if(ARCH STREQUAL "i386")
-        # clang-cl defines this one for itself
-        if(NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang"))
+        if(NOT USE_CLANG_CL)
            add_definitions(-D_M_IX86)
        endif()
        add_definitions(-D_X86_ -D__i386__ -Di386)
@@ -272,8 +276,6 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
    elseif(ARCH STREQUAL "arm")
        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
-    elseif(ARCH STREQUAL "arm64")
-        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
    endif()

    # Activate support for assembly source files
--- a/18
+++ b/18
@@ -121,8 +121,8 @@
 #   R: learn-more, learn_more, Mark Jansen
 #   R: ThFabba, Thomas Faber
 #   S: Maintained
-/sdk/cmake/
-*.cmake
+/sdk/cmake/     @learn-more
+*.cmake         @learn-more

 # File Patch API
 #   M: learn-more, learn_more, Mark Jansen
@@ -225,7 +225,7 @@
 #   R: learn-more, learn_more, Mark Jansen
 #   R: ThFabba, Thomas Faber
 #   S: Maintained
-/modules/rostests/apitests/
+/modules/rostests/apitests/ @learn-more

 # ReactOS Kernel-Mode Tests
 #   M: ThFabba, Thomas Faber
@@ -252,16 +252,6 @@
 /modules/rostests/kmtests/ntos_se/   @GeoB99
 /ntoskrnl/se/                        @GeoB99

-# Shell
-#   M:
-#   R: learn-more, learn_more, Mark Jansen
-#   R: yagoulas, Giannis Adamopoulos
-#   S: Maintained
-/base/shell/explorer/   @learn-more @yagoulas
-/base/shell/rshell/     @learn-more @yagoulas
-/dll/win32/browseui/    @learn-more @yagoulas
-/dll/win32/shell32/     @learn-more @yagoulas
-
 # Shell Extensions
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
@@ -282,7 +272,7 @@
 /drivers/filesystems/btrfs/         @HeisSpiter
 /drivers/filesystems/cdfs/          @HeisSpiter
 /drivers/filesystems/ext2/          @HeisSpiter
-/drivers/filesystems/fastfat/       @HeisSpiter
+/drivers/filesystems/fastfat_new/   @HeisSpiter
 /drivers/filesystems/nfs/           @HeisSpiter
 /media/doc/README.FSD               @HeisSpiter
 /sdk/lib/fslib/btrfslib/            @HeisSpiter
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,9 +2,9 @@

 There are several ways to contribute to the development of ReactOS. The most often encountered problem is not knowing where to begin or what to do. If you are able to program or understand the technical information that is pertinent to this project, helping the development can be easy.

- [What To Do?](#what-to-do)
- [How To Contribute?](#how-to-contribute)
- [Where To Start?](#where-to-start)
+- [What To Do?](#what-to-do?)
+- [How To Contribute?](#how-to-contribute?)
+- [Where To Start?](#where-to-start?)

 **Legal notice:** If you have seen Microsoft Windows source code, your contribution won't be accepted because of potential copyright violation. Before contributing, you must affirm that the following is true:
 >I hereby swear that I have not used nor seen the source code to any version of the Windows operating system
@@ -63,19 +63,13 @@ Our commit style is defined in a __[commit template]__. Use it as a reference or

 ### Rules and Recommendations

- *Use your __real name__ and __real email__.* We do not accept anonymous code contributions!
-  - Every commit that changes code or translations should have author's full legal name (in latin letters, diacritics allowed).
-  - It's recommended to have the same full name set in GitHub profile (in the [Name field here][GitHub Profile Settings]) that matches one specified in commits.
- There is an exception for media changes, such as changes of art (wallpapers, themes, icons, sounds) and out-of-code documentation.
-  - In these specific cases it's allowed to use a nickname or alias as author's name, and it's recommended to have the same name set in GitHub profile (in the [Name field here][GitHub Profile Settings]) matching one specified in commits.
- In any case the author must use a real e-mail address, this includes git commits (`user.email` setting) and GitHub [e-mail settings][GitHub Email Settings] - the checkbox "Keep my email addresses private" must be unchecked there.
-  - In order to *keep your privacy*, select appropriate "Primary email address" that will be applied to your commits in GitHub [e-mail settings][GitHub Email Settings].
+- *Use your __real name__ and __real email__.* We do not accept anonymous contributions!
 - *Ensure your contribution is properly described.* Include the relevant issue number if applicable.
 - *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed.
 - *Search for similar pull requests/patches before submitting.* It may be that a similar pull request or issue was opened previously. Comment and review on that one instead.
 - *Keep your contribution small and focused on the topic.* It can be tempting to fix existing issues as you come across them while reading the source code. Resist the temptation and put in a note in the source code instead, or (even better) put the issue in the issue tracking system.
 - *Respect our __[Coding Style]__ and __[Programming Guidelines]__.*
- *Do not be afraid to ask questions.* Ask our developers in the [chat].
+- *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).

@@ -85,7 +79,7 @@ Finding a good project to start with can be a challenge, because when starting o

 - Find a test that fails, and try to make it succeed: <https://reactos.org/testman/>
 - Look around in JIRA, and if you have problems finding nice projects to start with, there is a label for this: <https://jira.reactos.org/issues/?jql=labels%20%3D%20starter-project>
- Ask for help in the [chat]
+- Ask for help on [IRC]
 - Additionally, there are some tests that cause crashes/hangs, but these might be slightly harder: <https://jira.reactos.org/browse/ROSTESTS-125>

  [clean room reverse engineering]:                              https://en.wikipedia.org/wiki/Clean_room_design
@@ -96,14 +90,12 @@ Finding a good project to start with can be a challenge, because when starting o
  [migration to GitHub]:                                         https://reactos.org/project-news/reactos-repository-migrated-github/
  [humans are terrible at tracking large amount of information]: https://www.eurekalert.org/pub_releases/2005-03/aps-hmc030805.php
  [Pull requests]:                                               https://help.github.com/articles/about-pull-requests/
-  [GitHub Profile Settings]:                                     https://github.com/settings/profile
-  [GitHub Email Settings]:                                       https://github.com/settings/emails
  [tips for reviewing patches]:                                  https://www.drupal.org/patch/review
  [missing functionality]:                                       https://reactos.org/wiki/Missing_ReactOS_Functionality
  [patch]:                                                       https://git-scm.com/docs/git-format-patch
  [Submitting Patches]:                                          https://reactos.org/wiki/Submitting_Patches
  [Coding Style]:                                                https://reactos.org/wiki/Coding_Style
-  [chat]:                                                        https://reactos.org/wiki/Mattermost
+  [IRC]:                                                         https://reactos.org/wiki/Connect_to_the_ReactOS_IRC_Channels
  [Programming Guidelines]:                                      https://reactos.org/wiki/Programming_Guidelines
  [3rd Party Files.txt]:                                         /media/doc/3rd_Party_Files.txt
  [README.WINE]:                                                 /media/doc/README.WINE
--- a/PULL_REQUEST_MANAGEMENT.md
+++ b/PULL_REQUEST_MANAGEMENT.md
@@ -14,17 +14,3 @@ In addition, in order to avoid coming off as rude to helpful contributors, pleas
 - Asking the contributor to do unrelated work
 - Closing without providing a reason
 - Merging with the intention to rewrite that code soon after
-
-Before merging a PR, make sure it follows the [contributing rules](CONTRIBUTING.md#rules-and-recommendations), but more importantly:
- Make sure the author has specified a real e-mail in all PR commits
- If PR contains code or translations, make sure the author has not specified a nickname or alias, but a full legal name in all PR commits
- If PR contains media (wallpapers, themes, icons, sounds) or out-of-code documentation, make sure the author has specified the name or alias in all PR commits
- If PR contains mixed code with media changes, handle it as PR with code
- Important notes before using "Squash and merge" strategy on a PR:
-  - Make sure the author's name in GitHub profile matches one in commits. If this is not the case, ask the author to set it accordingly.
-  - If the author does not want to set the name in GitHub profile:
-    - "no squash merge" label needs to be added to a PR.
-	- Make sure every commit message is formatted correctly as in [.gitmessage](https://github.com/reactos/reactos/blob/master/.gitmessage).
-	- Finally in this case a PR has to be merged either using "Rebase and merge" strategy or manually.
-  - By pressing "Squash and merge" button in a PR you can make sure the author does not use no-reply e-mail -
-  under the commit message there will be a text label saying: `This commit will be authored by <address@email.com>`
--- a/README.md
+++ b/README.md
@@ -32,7 +32,6 @@
 [Official chat](https://chat.reactos.org/) &bull;
 [Wiki](https://reactos.org/wiki/) &bull;
 [Forum](https://reactos.org/forum/) &bull;
-[Community Discord](https://discord.gg/7knjvhT) &bull;
 [JIRA Bug Tracker](https://jira.reactos.org/issues/) &bull;
 [ReactOS Git mirror](https://git.reactos.org/) &bull;
 [Testman](https://reactos.org/testman/)
--- a/base/applications/CMakeLists.txt
+++ b/base/applications/CMakeLists.txt
@@ -21,7 +21,7 @@ add_subdirectory(magnify)
 add_subdirectory(mmc)
 add_subdirectory(mplay32)
 add_subdirectory(msconfig)
-#add_subdirectory(msconfig_new) #excluded from the build because it is significantly more buggy than the old msconfig. see CORE-18067 for examples
+add_subdirectory(msconfig_new)
 add_subdirectory(mscutils)
 add_subdirectory(mshta)
 add_subdirectory(mspaint)
@@ -33,7 +33,6 @@ add_subdirectory(rapps)
 add_subdirectory(rapps_com)
 add_subdirectory(regedit)
 add_subdirectory(regedt32)
-add_subdirectory(runas)
 add_subdirectory(sc)
 add_subdirectory(screensavers)
 add_subdirectory(sdbinst)
--- a/base/applications/cacls/lang/zh-CN.rc
+++ b/base/applications/cacls/lang/zh-CN.rc
@@ -13,13 +13,13 @@ BEGIN
    IDS_HELP "显示或者修改文件的访问控制表\n\n\
 CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
               [/P user:perm [...]] [/D user [...]]\n\
-   filename      显示访问控制表。\n\
+   filename      显示 ACLs。\n\
   /T            更改当前目录及其所有子目录中\n\
                 指定文件的 ACL。\n\
-   /E            编辑访问控制表而不替换。\n\
+   /E            编辑 ACL 而不替换。\n\
   /C            在出现拒绝访问错误时继续。\n\
   /G user:perm  赋予指定用户访问权限。\n\
-                 perm 可以是：R  读取\n\
+                 Perm 可以是: R  读取\n\
                              W  写入\n\
                              C  更改(写入)\n\
                              F  完全控制\n\
@@ -33,7 +33,7 @@ CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
   /D user       拒绝指定用户的访问。\n\
 在命令中可以使用通配符指定多个文件。\n\
 您也可以在命令中指定多个用户。\n\n\
-缩写：\n\
+缩写:\n\
   CI - 容器继承。\n\
        ACE会由目录继承。\n\
   OI - 对象继承。\n\
--- a/base/applications/calc/calc.h
+++ b/base/applications/calc/calc.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __CALC_H__
+#define __CALC_H__

 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -279,3 +280,5 @@ 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__ */
--- a/base/applications/calc/lang/bg-BG.rc
+++ b/base/applications/calc/lang/bg-BG.rc
@@ -1,5 +1,5 @@
 /* Превод на Български/ Bulgarian translation
- * https://reactos.org/wiki/Bulgarian_translation
+ * http://www.reactos.org/wiki/Bulgarian_translation
 * FILE: base/applications/calc/lang/bg-BG.rc
 * Недовършен / Incomplete
 */
@@ -8,9 +8,9 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор за ReactOS"
+CAPTION "Изчислителят на РеактОС"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -145,7 +145,7 @@ BEGIN
            NOT WS_VISIBLE, 270, 21, 38, 10
    CONTROL "Градуси", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
    CONTROL "Радиани", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Градиани", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    CONTROL "Градове", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -156,9 +156,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор за ReactOS"
+CAPTION "Изчислителян на РеактОС"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -221,9 +221,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор за ReactOS"
+CAPTION "Изчислителят на РеактОС"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -331,7 +331,7 @@ BEGIN
        MENUITEM SEPARATOR
        MENUITEM "Градуси\tF2", IDM_VIEW_DEG, CHECKED
        MENUITEM "Радиани\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "Градиани\tF4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "Градове\tF4", IDM_VIEW_GRAD, CHECKED
        MENUITEM SEPARATOR
        MENUITEM "Разделяне на хилядите", IDM_VIEW_GROUP, CHECKED
    END
@@ -339,7 +339,7 @@ BEGIN
    BEGIN
        MENUITEM "Помощ", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "За ReactOS Calculator", IDM_HELP_ABOUT
+        MENUITEM "За ReactOS Calc", IDM_HELP_ABOUT
    END
 END

@@ -372,7 +372,7 @@ BEGIN
    BEGIN
        MENUITEM "Помощ", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "За ReactOS Calculator", IDM_HELP_ABOUT
+        MENUITEM "За ReactOS Calc", IDM_HELP_ABOUT
    END
 END

@@ -395,7 +395,7 @@ BEGIN
    BEGIN
        MENUITEM "Помощ", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "За ReactOS Calculator", IDM_HELP_ABOUT
+        MENUITEM "За ReactOS Calc", IDM_HELP_ABOUT
    END
 END

@@ -410,7 +410,7 @@ END
 /* About */
 STRINGTABLE
 BEGIN
-    IDS_CALC_NAME "Калкулатор за ReactOS"
+    IDS_CALC_NAME "Изчислителят на РеактОС"
    IDS_AUTHOR "Написано от Carlo Bramini"
 END

@@ -419,7 +419,7 @@ STRINGTABLE
 BEGIN
    IDS_CONV_ANGLE "Ъгъл"
    IDS_CONV_AREA "Площ"
-    IDS_CONV_CONSUMPTION "Разход (двигатели)"
+    IDS_CONV_CONSUMPTION "Потребление (двигатели)"
    IDS_CONV_CURRENCY "Парични единици"
    IDS_CONV_ENERGY "Енергия"
    IDS_CONV_LENGTH "Дължина"
@@ -435,10 +435,10 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "Минути от arc"
-    IDS_ANGLE_ARCSECONDS "Секунди от arc"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Градуси"
-    IDS_ANGLE_GRADIANS "Градиани"
+    IDS_ANGLE_GRADIANS "Гради"
    IDS_ANGLE_RADIANS "Радиани"
 END

@@ -486,7 +486,7 @@ STRINGTABLE
 BEGIN
    IDS_CONSUMPTION_KM_PER_L "Километри/литър"
    IDS_CONSUMPTION_L_PER_100_KM "Литри/100 километра"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Мили/галон (ВБ)"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Мили/галон (ОК)"
    IDS_CONSUMPTION_MILES_GALLON_US "Мили/галон (САЩ)"
 END

@@ -710,6 +710,6 @@ BEGIN
    IDS_WEIGHT_STONES "Камъни"
    IDS_WEIGHT_TAMLUNG "Tamlung"
    IDS_WEIGHT_TONNES "Тонове"
-    IDS_WEIGHT_TONS_UK "Тонове (ВБ)"
+    IDS_WEIGHT_TONS_UK "Тонове (ОК)"
    IDS_WEIGHT_TONS_US "Тонове (САЩ)"
 END
--- a/base/applications/calc/lang/cs-CZ.rc
+++ b/base/applications/calc/lang/cs-CZ.rc
@@ -7,7 +7,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS kalkulačka"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -155,7 +155,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkulačka"
 MENU IDR_MENU_STANDARD
@@ -220,7 +220,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkulačka"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/de-DE.rc
+++ b/base/applications/calc/lang/de-DE.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Rechner"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Rechner"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Rechner"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/el-GR.rc
+++ b/base/applications/calc/lang/el-GR.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Αριθμομηχανή"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Αριθμομηχανή"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Αριθμομηχανή"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/en-US.rc
+++ b/base/applications/calc/lang/en-US.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/es-ES.rc
+++ b/base/applications/calc/lang/es-ES.rc
@@ -8,7 +8,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora de ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -156,7 +156,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora de ReactOS"
 MENU IDR_MENU_STANDARD
@@ -221,7 +221,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora de ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/fr-FR.rc
+++ b/base/applications/calc/lang/fr-FR.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculatrice ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculatrice ReactOS"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculatrice ReactOS"
 MENU IDR_MENU_STANDARD
@@ -429,8 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "Minute d'arc"
-    IDS_ANGLE_ARCSECONDS "Seconde d'arc"
+    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"
@@ -599,7 +599,7 @@ BEGIN
    IDS_PRESSURE_KILOPASCALS "Kilopascals"
    IDS_PRESSURE_MM_OF_MERCURY "Millimètres de mercure"
    IDS_PRESSURE_PASCALS "Pascals"
-    IDS_PRESSURE_PSI "Livre-force par pouce-carrés"
+    IDS_PRESSURE_PSI "Pounds-force per square inch"
 END

 /* Temperatures */
--- a/base/applications/calc/lang/he-IL.rc
+++ b/base/applications/calc/lang/he-IL.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
 CAPTION "מחשבון ReactOS"
@@ -153,7 +153,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
 CAPTION "מחשבון ReactOS"
@@ -219,7 +219,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
 CAPTION "מחשבון ReactOS"
--- a/base/applications/calc/lang/hu-HU.rc
+++ b/base/applications/calc/lang/hu-HU.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Számológép"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -158,7 +158,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Számológép"
 MENU IDR_MENU_STANDARD
@@ -223,7 +223,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Számológép"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/id-ID.rc
+++ b/base/applications/calc/lang/id-ID.rc
@@ -1,716 +0,0 @@
-/*
- * PROJECT:     ReactOS Calc
- * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
- * PURPOSE:     Indonesian resource file
- * TRANSLATORS: Copyright 2022 Wilson Simanjuntak <wilsontulus5@gmail.com>
- */
-
-LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-
-/* Dialogs */
-
-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
-MENU IDR_MENU_SCIENTIFIC_1
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
-    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
-    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
-    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
-    CTEXT "", IDC_TEXT_PARENT, 93, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    CTEXT "", IDC_TEXT_MEMORY, 126, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    PUSHBUTTON "Sta", IDC_BUTTON_STA, 5, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Ave", IDC_BUTTON_AVE, 5, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Sum", IDC_BUTTON_SUM, 5, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "s", IDC_BUTTON_S, 5, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Dat", IDC_BUTTON_DAT, 5, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "F-E", IDC_BUTTON_FE, 38, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "dms", IDC_BUTTON_DMS, 38, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "sin", IDC_BUTTON_SIN, 38, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "cos", IDC_BUTTON_COS, 38, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "tan", IDC_BUTTON_TAN, 38, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "(", IDC_BUTTON_LEFTPAR, 64, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Exp", IDC_BUTTON_EXP, 64, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "x^y", IDC_BUTTON_XeY, 64, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "x^2", IDC_BUTTON_Xe2, 64, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "x^3", IDC_BUTTON_Xe3, 64, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON ")", IDC_BUTTON_RIGHTPAR, 90, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "ln", IDC_BUTTON_LN, 90, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "log", IDC_BUTTON_LOG, 90, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "n!", IDC_BUTTON_NF, 90, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1/x", IDC_BUTTON_RX, 90, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MC", IDC_BUTTON_MC, 123, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MR", IDC_BUTTON_MR, 123, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MS", IDC_BUTTON_MS, 123, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "M+", IDC_BUTTON_MP, 123, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "pi", IDC_BUTTON_PI, 123, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "7", IDC_BUTTON_7, 156, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "4", IDC_BUTTON_4, 156, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1", IDC_BUTTON_1, 156, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "0", IDC_BUTTON_0, 156, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "A", IDC_BUTTON_A, 156, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "8", IDC_BUTTON_8, 182, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "5", IDC_BUTTON_5, 182, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "2", IDC_BUTTON_2, 182, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+/-", IDC_BUTTON_SIGN, 182, 120, 24, 18,BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "B", IDC_BUTTON_B, 182, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "9", IDC_BUTTON_9, 208, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "6", IDC_BUTTON_6, 208, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "3", IDC_BUTTON_3, 208, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON ",", IDC_BUTTON_DOT, 208, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "C", IDC_BUTTON_C, 208, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "/", IDC_BUTTON_DIV, 234, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "*", IDC_BUTTON_MULT, 234, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "-", IDC_BUTTON_SUB, 234, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+", IDC_BUTTON_ADD, 234, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "D", IDC_BUTTON_D, 234, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Mod", IDC_BUTTON_MOD, 260, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Or", IDC_BUTTON_OR, 260, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Lsh", IDC_BUTTON_LSH, 260, 100, 24, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "=", IDC_BUTTON_EQU, 260, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "E", IDC_BUTTON_E, 260, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "And", IDC_BUTTON_AND, 286, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Xor", IDC_BUTTON_XOR, 286, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Not", IDC_BUTTON_NOT, 286, 100, 24, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Int", IDC_BUTTON_INT, 286, 120, 24, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Derajat", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radian", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradian", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
-    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
-               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 "Kembali", IDC_BUTTON_BACK, 177, 38, 43, 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
-END
-
-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator 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 |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "CE", IDC_BUTTON_CE, 80, 23, 41, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Kembali", IDC_BUTTON_BACK, 36, 23, 42, 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 |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "4", IDC_BUTTON_4, 36, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1", IDC_BUTTON_1, 36, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "0", IDC_BUTTON_0, 36, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "8", IDC_BUTTON_8, 62, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "5", IDC_BUTTON_5, 62, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "2", IDC_BUTTON_2, 62, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+/-", IDC_BUTTON_SIGN, 62, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "9", IDC_BUTTON_9, 88, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "6", IDC_BUTTON_6, 88, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "3", IDC_BUTTON_3, 88, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON ",", IDC_BUTTON_DOT, 88, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "/", IDC_BUTTON_DIV, 114, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "*", IDC_BUTTON_MULT, 114, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "-", IDC_BUTTON_SUB, 114, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+", IDC_BUTTON_ADD, 114, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Sqrt", IDC_BUTTON_SQRT, 140, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "%", IDC_BUTTON_PERCENT, 140, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1/x", IDC_BUTTON_RX, 140, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "=", IDC_BUTTON_EQU, 140, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    CTEXT "", IDC_TEXT_MEMORY, 8, 24, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    PUSHBUTTON "MC", IDC_BUTTON_MC, 5, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MR", IDC_BUTTON_MR, 5, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MS", IDC_BUTTON_MS, 5, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "M+", IDC_BUTTON_MP, 5, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON "Konversi", IDC_BUTTON_CONVERT, 35, 105, 76, 17
-    COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Kategori:", IDC_STATIC, 5, 20, 56, 8
-    COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Konversikan dari:", IDC_STATIC, 5, 49, 56, 8
-    COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Konversikan ke:", 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
-    CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17
-    CONTROL "Kembali", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,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
-    CONTROL "4", IDC_BUTTON_4, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 67, 24, 18
-    CONTROL "1", IDC_BUTTON_1, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 86, 24, 18
-    CONTROL "0", IDC_BUTTON_0, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 105, 24, 18
-    CONTROL "8", IDC_BUTTON_8, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 48, 24, 18
-    CONTROL "5", IDC_BUTTON_5, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 67, 24, 18
-    CONTROL "2", IDC_BUTTON_2, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 86, 24, 18
-    CONTROL "+/-", IDC_BUTTON_SIGN, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 105, 24, 18
-    CONTROL "9", IDC_BUTTON_9, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 48, 24, 18
-    CONTROL "6", IDC_BUTTON_6, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 67, 24, 18
-    CONTROL "3", IDC_BUTTON_3, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 86, 24, 18
-    CONTROL ",", IDC_BUTTON_DOT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 105, 24, 18
-    CONTROL "/", IDC_BUTTON_DIV, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 48, 24, 18
-    CONTROL "*", IDC_BUTTON_MULT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 67, 24, 18
-    CONTROL "-", IDC_BUTTON_SUB, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 86, 24, 18
-    CONTROL "+", IDC_BUTTON_ADD, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 105, 24, 18
-    CONTROL "Sqrt", IDC_BUTTON_SQRT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 48, 24, 18
-    CONTROL "%", IDC_BUTTON_PERCENT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 67, 24, 18
-    CONTROL "1/x", IDC_BUTTON_RX, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 86, 24, 18
-    CONTROL "=", IDC_BUTTON_EQU, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 105, 24, 18
-    CTEXT "", IDC_TEXT_MEMORY, 152, 24, 24, 18, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    CONTROL "MC", IDC_BUTTON_MC, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 48, 24, 18
-    CONTROL "MR", IDC_BUTTON_MR, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 67, 24, 18
-    CONTROL "MS", IDC_BUTTON_MS, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 86, 24, 18
-    CONTROL "M+", IDC_BUTTON_MP, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 105, 24, 18
-    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kotak statistik"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "RET", IDC_BUTTON_RET, 4, 48, 36, 16
-    PUSHBUTTON "LOAD", IDC_BUTTON_LOAD, 44, 48, 36, 16
-    PUSHBUTTON "CD", IDC_BUTTON_CD, 84, 48, 36, 16
-    PUSHBUTTON "CAD", IDC_BUTTON_CAD, 124, 48, 36, 16
-    CTEXT "n=0", IDC_TEXT_NITEMS, 4, 68, 156, 12, SS_CENTERIMAGE | SS_SUNKEN
-END
-
-/* Menus */
-
-IDR_MENU_SCIENTIFIC_1 MENU
-BEGIN
-    POPUP "&Ubah"
-    BEGIN
-        MENUITEM "&Salin\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "&Tempel\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "&Lihat"
-    BEGIN
-        MENUITEM "S&tandar", IDM_VIEW_STANDARD
-        MENUITEM "&Ilmiah", IDM_VIEW_SCIENTIFIC
-        MENUITEM "K&onversi", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "&Desimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Oktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&Biner\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "D&erajat\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "&Radian\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "&Gradian\tF4", IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grup d&igit", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&Bantuan"
-    BEGIN
-        MENUITEM "&Topik Bantuan", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Tentang Kalkulator ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU
-BEGIN
-    POPUP "&Ubah"
-    BEGIN
-        MENUITEM "&Salin\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "&Tempel\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "&Lihat"
-    BEGIN
-        MENUITEM "S&tandar", IDM_VIEW_STANDARD
-        MENUITEM "&Ilmiah", IDM_VIEW_SCIENTIFIC
-        MENUITEM "K&onversi", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "&Desimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Oktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&Biner\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "&Dword\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "&Word\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "B&yte\tF4", IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grup d&igit", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&Bantuan"
-    BEGIN
-        MENUITEM "&Topik Bantuan", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Tentang Kalkulator ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU
-BEGIN
-    POPUP "&Ubah"
-    BEGIN
-        MENUITEM "&Salin\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "&Tempel\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "&Lihat"
-    BEGIN
-        MENUITEM "S&tandar", IDM_VIEW_STANDARD
-        MENUITEM "&Ilmiah", IDM_VIEW_SCIENTIFIC
-        MENUITEM "K&onversi", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Grup d&igit", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&Bantuan"
-    BEGIN
-        MENUITEM "&Topik Bantuan", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Tentang Kalkulator ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-/* String Tables */
-
-STRINGTABLE
-BEGIN
-    IDS_MATH_ERROR "Kesalahan"
-    IDS_QUICKHELP "Bantuan cepat"
-END
-
-/* About */
-STRINGTABLE
-BEGIN
-    IDS_CALC_NAME "Kalkulator ReactOS"
-    IDS_AUTHOR "Dibuat oleh Carlo Bramini"
-END
-
-/* Types of conversion */
-STRINGTABLE
-BEGIN
-    IDS_CONV_ANGLE "Sudut"
-    IDS_CONV_AREA "Area"
-    IDS_CONV_CONSUMPTION "Konsumsi (mesin)"
-    IDS_CONV_CURRENCY "Mata Uang"
-    IDS_CONV_ENERGY "Energi"
-    IDS_CONV_LENGTH "Panjang"
-    IDS_CONV_POWER "Daya"
-    IDS_CONV_PRESSURE "Tekanan"
-    IDS_CONV_TEMPERATURE "Suhu"
-    IDS_CONV_TIME "Waktu"
-    IDS_CONV_VELOCITY "Kecepatan"
-    IDS_CONV_VOLUME "Volume"
-    IDS_CONV_WEIGHT "Berat"
-END
-
-/* Angles */
-STRINGTABLE
-BEGIN
-    IDS_ANGLE_ARCMINUTES "Busur menit"
-    IDS_ANGLE_ARCSECONDS "Busur detik"
-    IDS_ANGLE_DEGREES "Derajat"
-    IDS_ANGLE_GRADIANS "Gradian"
-    IDS_ANGLE_RADIANS "Radian"
-END
-
-/* Areas */
-STRINGTABLE
-BEGIN
-    IDS_AREA_ACRES "Hektar"
-    IDS_AREA_ACRES_BRAZIL "Hektar (Brazil)"
-    IDS_AREA_ACRES_FRANCE "Hektar (Perancis)"
-    IDS_AREA_ACRES_SCOTS "Hektar (Skotlandia)"
-    IDS_AREA_ACRES_US "Hektar (US)"
-    IDS_AREA_ARES "Ares"
-    IDS_AREA_CHOU "Chou"
-    IDS_AREA_DANBO "Danbo"
-    IDS_AREA_HECTARES "Hektar"
-    IDS_AREA_JEONGBO "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY "Morgen (Hungaria)"
-    IDS_AREA_MU "Mu"
-    IDS_AREA_PING "Ping"
-    IDS_AREA_PYEONG "Pyeong"
-    IDS_AREA_PYEONGBANGJA "Pyeongbangja"
-    IDS_AREA_RAI "Rai"
-    IDS_AREA_SE "Se"
-    IDS_AREA_SQUARE_CENTIMETERS "Centimeter persegi"
-    IDS_AREA_SQUARE_CHR "Chr persegi"
-    IDS_AREA_SQUARE_FATHOMS "Fathom persegi"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathom persegi (Hungaria)"
-    IDS_AREA_SQUARE_FEET "Kaki persegi"
-    IDS_AREA_SQUARE_INCHES "Inci persegi"
-    IDS_AREA_SQUARE_KILOMETERS "Kilometer persegi"
-    IDS_AREA_SQUARE_LAR "Lar persegi"
-    IDS_AREA_SQUARE_METER "Meter persegi"
-    IDS_AREA_SQUARE_MILES "Mil persegi"
-    IDS_AREA_SQUARE_MILLIMETERS "Milimeter persegi"
-    IDS_AREA_SQUARE_SHAKU "Shaku persegi"
-    IDS_AREA_SQUARE_TSUEN "Tsuen persegi"
-    IDS_AREA_SQUARE_VA "Va persegi"
-    IDS_AREA_SQUARE_YARD "Yard persegi"
-    IDS_AREA_TAN "Tan"
-    IDS_AREA_TSUBO "Tsubo"
-END
-
-/* Consumptions */
-STRINGTABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L "Kilometer/liter"
-    IDS_CONSUMPTION_L_PER_100_KM "Liter/100 kilometer"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (US)"
-END
-
-/* Currencies */
-STRINGTABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Schilling Austria"
-    IDS_CURRENCY_BELGIAN_FRANC "Franc Belgia"
-    IDS_CURRENCY_CYPRIOT_POUND "Pound Siprus"
-    IDS_CURRENCY_CZECH_KORUNA "Koruna Ceko"
-    IDS_CURRENCY_DEUTSCHE_MARK "Mark Jerman"
-    IDS_CURRENCY_DUTCH_GUILDER "Gulden Belanda"
-    IDS_CURRENCY_ESTONIAN_KROON "Kroon Estonia"
-    IDS_CURRENCY_EURO "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA "Markka Finlandia"
-    IDS_CURRENCY_FRENCH_FRANC "Franc Perancis"
-    IDS_CURRENCY_GREEK_DRACHMA "Drakhma Yunani"
-    IDS_CURRENCY_IRISH_POUND "Pound Irlandia"
-    IDS_CURRENCY_ITALIAN_LIRA "Lira Italia"
-    IDS_CURRENCY_LATVIAN_LATS "Lats Latvia"
-    IDS_CURRENCY_LITHUANIAN_LITAS "Litas Lithuania"
-    IDS_CURRENCY_LUXEMBOURG_FRANC "Franc Luksemburg"
-    IDS_CURRENCY_MALTESE_LIRA "Lira Malta"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugis"
-    IDS_CURRENCY_SLOVAK_KORUNA "Koruna Slovakia"
-    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Slovenia"
-    IDS_CURRENCY_SPANISH_PESETA "Peseta Spanyol"
-END
-
-/* Energies */
-STRINGTABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES "15 °C Kalori"
-    IDS_ENERGY_BTUS "British Thermal Unit"
-    IDS_ENERGY_ERGS "Erg"
-    IDS_ENERGY_EVS "Voltase elektron"
-    IDS_ENERGY_FOOT_POUNDS "Pon kaki"
-    IDS_ENERGY_IT_CALORIES "Tabel Kalori Internasional"
-    IDS_ENERGY_IT_KILOCALORIES "Tabel Kilokalori Internasional"
-    IDS_ENERGY_JOULES "Joule"
-    IDS_ENERGY_KILOJOULES "Kilojoule"
-    IDS_ENERGY_KILOWATT_HOURS "Kilowatt per jam"
-    IDS_ENERGY_NUTRITION_CALORIES "Kalori pangan"
-    IDS_ENERGY_TH_CALORIES "Kalori termokimia"
-END
-
-/* Lengths */
-STRINGTABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS "Ångström"
-    IDS_LENGTH_ASTRONOMICAL_UNITS "Satuan astronomi"
-    IDS_LENGTH_BARLEYCORNS "Barleycorn"
-    IDS_LENGTH_CENTIMETERS "Centimeter"
-    IDS_LENGTH_CHAINS_UK "Rantai (UK)"
-    IDS_LENGTH_CHI "Chi"
-    IDS_LENGTH_CHOU "Chou"
-    IDS_LENGTH_CHR "Chr"
-    IDS_LENGTH_CUN "Cun"
-    IDS_LENGTH_FATHOMS "Fathom"
-    IDS_LENGTH_FATHOMS_HUNGARY "Fathom (Hungaria)"
-    IDS_LENGTH_FEET "Kaki"
-    IDS_LENGTH_FURLONGS "Furlong"
-    IDS_LENGTH_GAN "Gan"
-    IDS_LENGTH_HANDS "Tangan"
-    IDS_LENGTH_HUNH "Hunh"
-    IDS_LENGTH_INCHES "Inci"
-    IDS_LENGTH_JA "Ja"
-    IDS_LENGTH_JEONG "Jeong"
-    IDS_LENGTH_KABIET "Kabiet"
-    IDS_LENGTH_KEN "Ken"
-    IDS_LENGTH_KEUB "Keub"
-    IDS_LENGTH_KILOMETERS "Kilometer"
-    IDS_LENGTH_LAR "Lar"
-    IDS_LENGTH_LIGHT_YEARS "Tahun cahaya"
-    IDS_LENGTH_LINKS_UK "Link (UK)"
-    IDS_LENGTH_METERS "Meter"
-    IDS_LENGTH_MICRONS "Mikron"
-    IDS_LENGTH_MILES "Mil"
-    IDS_LENGTH_MILLIMETERS "Milimeter"
-    IDS_LENGTH_NAUTICAL_MILES "Mil laut"
-    IDS_LENGTH_NIEU "Nieu"
-    IDS_LENGTH_PARSECS "Parsec"
-    IDS_LENGTH_PICAS "Pica"
-    IDS_LENGTH_RI_JAPAN "Ri (Jepang)"
-    IDS_LENGTH_RI_KOREA "Ri (Korea)"
-    IDS_LENGTH_RODS "Rod"
-    IDS_LENGTH_SAWK "Sawk"
-    IDS_LENGTH_SEN "Sen"
-    IDS_LENGTH_SHAKU "Shaku"
-    IDS_LENGTH_SPAN "Jengkal"
-    IDS_LENGTH_SUN "Sun"
-    IDS_LENGTH_TSUEN "Tsuen"
-    IDS_LENGTH_VA "Va"
-    IDS_LENGTH_YARDS "Yard"
-    IDS_LENGTH_YOTE "Yote"
-    IDS_LENGTH_ZHANG "Zhang"
-END
-
-/* Powers */
-STRINGTABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE "British Thermal Unit per menit"
-    IDS_POWER_FPS_PER_MINUTE "Pon Kaki per menit"
-    IDS_POWER_HORSEPOWER "Tenaga kuda"
-    IDS_POWER_KILOWATTS "Kilowatt"
-    IDS_POWER_MEGAWATTS "Megawatt"
-    IDS_POWER_WATTS "Watt"
-END
-
-/* Pressures */
-STRINGTABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES "Atmosfir"
-    IDS_PRESSURE_BARS "Bar"
-    IDS_PRESSURE_HECTOPASCALS "Hektopascal"
-    IDS_PRESSURE_KILOPASCALS "Kilopascal"
-    IDS_PRESSURE_MM_OF_MERCURY "Milimeter merkuri"
-    IDS_PRESSURE_PASCALS "Pascal"
-    IDS_PRESSURE_PSI "Pon per inci persegi"
-END
-
-/* Temperatures */
-STRINGTABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS "Celsius"
-    IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit"
-    IDS_TEMPERATURE_KELVIN "Kelvin"
-    IDS_TEMPERATURE_RANKINE "Rankine"
-END
-
-/* Time */
-STRINGTABLE
-BEGIN
-    IDS_TIME_DAYS "Hari"
-    IDS_TIME_HOURS "Jam"
-    IDS_TIME_NANOSECONDS "Nanodetik"
-    IDS_TIME_MICROSECONDS "Mikrodetik"
-    IDS_TIME_MILLISECONDS "Milidetik"
-    IDS_TIME_MINUTES "Menit"
-    IDS_TIME_SECONDS "Detik"
-    IDS_TIME_WEEKS "Minggu"
-    IDS_TIME_YEARS "Tahun"
-END
-
-/* Velocities */
-STRINGTABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND "Centimeter/jam"
-    IDS_VELOCITY_FEET_HOUR "Kaki/jam"
-    IDS_VELOCITY_FEET_SECOND "Kaki/detik"
-    IDS_VELOCITY_KILOMETERS_HOUR "Kilometer/jam"
-    IDS_VELOCITY_KNOTS "Knot"
-    IDS_VELOCITY_MACH "Mach"
-    IDS_VELOCITY_METERS_SECOND "Meter/detik"
-    IDS_VELOCITY_MILES_HOUR "Mil/jam"
-END
-
-/* Volumes */
-STRINGTABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK "Barel (UK)"
-    IDS_VOLUME_BARRELS_OIL "Barel minyak"
-    IDS_VOLUME_BUN "Bun"
-    IDS_VOLUME_BUSHELS_UK "Bushel (UK)"
-    IDS_VOLUME_BUSHELS_US "Bushel (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS "Centimeter kubik"
-    IDS_VOLUME_CUBIC_FEET "Kaki kubik"
-    IDS_VOLUME_CUBIC_INCHES "Inci Kubik"
-    IDS_VOLUME_CUBIC_METERS "Meter kubik"
-    IDS_VOLUME_CUBIC_YARDS "Yard kubik"
-    IDS_VOLUME_DOE "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK "Ons cairan (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US "Ons cairan (US)"
-    IDS_VOLUME_GALLONS_UK "Galon (UK)"
-    IDS_VOLUME_GALLONS_DRY_US "Galon, beku (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US "Galon, cair (US)"
-    IDS_VOLUME_GOU "Gou"
-    IDS_VOLUME_HOP "Hop"
-    IDS_VOLUME_ICCE "Icce"
-    IDS_VOLUME_KWIAN "Kwian"
-    IDS_VOLUME_LITERS "Liter"
-    IDS_VOLUME_MAL "Mal"
-    IDS_VOLUME_MILLILITERS "Mililiter"
-    IDS_VOLUME_PINTS_UK "Pint (UK)"
-    IDS_VOLUME_PINTS_DRY_US "Pint, beku (US)"
-    IDS_VOLUME_PINTS_LIQUID_US "Pint, cair (US)"
-    IDS_VOLUME_QUARTS_UK "Quart (UK)"
-    IDS_VOLUME_QUARTS_DRY_US "Quart, beku (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US "Quart, cair (US)"
-    IDS_VOLUME_SEKI "Seki"
-    IDS_VOLUME_SYOU "Syou"
-    IDS_VOLUME_TANANLOUNG "Tananloung"
-    IDS_VOLUME_TANG "Tang"
-    IDS_VOLUME_TO "To"
-END
-
-/* Weights */
-STRINGTABLE
-BEGIN
-    IDS_WEIGHT_BAHT "Baht"
-    IDS_WEIGHT_CARATS "Karat"
-    IDS_WEIGHT_CHUNG "Chung"
-    IDS_WEIGHT_DON "Don"
-    IDS_WEIGHT_GEUN "Geun"
-    IDS_WEIGHT_GRAMS "Gram"
-    IDS_WEIGHT_GWAN "Gwan"
-    IDS_WEIGHT_HARB "Harb"
-    IDS_WEIGHT_JIN_CHINA "Jin (China)"
-    IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)"
-    IDS_WEIGHT_KAN "Kan"
-    IDS_WEIGHT_KILOGRAMS "Kilogram"
-    IDS_WEIGHT_KIN "Kin"
-    IDS_WEIGHT_LIANG_CHINA "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"
-    IDS_WEIGHT_MONME "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ons, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY "Ons, troy"
-    IDS_WEIGHT_POUNDS "Pon"
-    IDS_WEIGHT_QUINTAL_METRIC "Kuintal (metrik)"
-    IDS_WEIGHT_SALOUNG "Saloung"
-    IDS_WEIGHT_STONES "Batu"
-    IDS_WEIGHT_TAMLUNG "Tamlung"
-    IDS_WEIGHT_TONNES "Tonne"
-    IDS_WEIGHT_TONS_UK "Ton (UK)"
-    IDS_WEIGHT_TONS_US "Ton (US)"
-END
--- a/base/applications/calc/lang/it-IT.rc
+++ b/base/applications/calc/lang/it-IT.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/ja-JP.rc
+++ b/base/applications/calc/lang/ja-JP.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 電卓"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 電卓"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 電卓"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/ko-KR.rc
+++ b/base/applications/calc/lang/ko-KR.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 계산기"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -152,7 +152,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 계산기"
 MENU IDR_MENU_STANDARD
@@ -217,7 +217,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 계산기 정보"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/nl-NL.rc
+++ b/base/applications/calc/lang/nl-NL.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Rekenmachine"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Rekenmachine"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Rekenmachine"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/no-NO.rc
+++ b/base/applications/calc/lang/no-NO.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkulator"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkulator"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkulator"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/pl-PL.rc
+++ b/base/applications/calc/lang/pl-PL.rc
@@ -1,7 +1,7 @@
 /*
 *    Translated by Caemyr - Olaf Siejka (Feb, Jun 2008)
 *    Use ReactOS forum PM or IRC to contact me
- *    https://reactos.org
+ *    http://www.reactos.org
 *    IRC: irc.freenode.net #reactos-pl;
 *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
 *    UTF-8 conversion by Caemyr (May, 2011)
@@ -11,7 +11,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -159,7 +159,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_STANDARD
@@ -224,7 +224,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/pt-BR.rc
+++ b/base/applications/calc/lang/pt-BR.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -152,7 +152,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
@@ -217,7 +217,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/pt-PT.rc
+++ b/base/applications/calc/lang/pt-PT.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -152,7 +152,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
@@ -217,7 +217,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/ro-RO.rc
+++ b/base/applications/calc/lang/ro-RO.rc
@@ -1,17 +1,13 @@
 /*
- * PROJECT:     ReactOS Calc
- * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri@gmail.com>
- *              Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2022 Andrei Miloiu <miloiuandrei@gmail.com>
+ * Translators: Petru Dimitriu (petrimetri at gmail dot com)
+ *              Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Minicalculator"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -159,7 +155,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Minicalculator"
 MENU IDR_MENU_STANDARD
@@ -224,7 +220,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Minicalculator"
 MENU IDR_MENU_STANDARD
@@ -505,7 +501,7 @@ BEGIN
    IDS_CURRENCY_ESTONIAN_KROON "Coroană estoniană"
    IDS_CURRENCY_EURO "Euro"
    IDS_CURRENCY_FINNISH_MARKKA "Marcă finlandeză"
-    IDS_CURRENCY_FRENCH_FRANC "Franc francez"
+    IDS_CURRENCY_FRENCH_FRANC "Franc framcez"
    IDS_CURRENCY_GREEK_DRACHMA "Drahmă grecească"
    IDS_CURRENCY_IRISH_POUND "Liră irlandeză"
    IDS_CURRENCY_ITALIAN_LIRA "Liră italiană"
--- a/base/applications/calc/lang/ru-RU.rc
+++ b/base/applications/calc/lang/ru-RU.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/sk-SK.rc
+++ b/base/applications/calc/lang/sk-SK.rc
@@ -9,7 +9,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kalkulačka systému ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -157,7 +157,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kalkulačka systému ReactOS"
 MENU IDR_MENU_STANDARD
@@ -222,7 +222,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kalkulačka systému ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/sq-AL.rc
+++ b/base/applications/calc/lang/sq-AL.rc
@@ -6,7 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Makine Llogaritje"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -154,7 +154,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Makine Llogaritje"
 MENU IDR_MENU_STANDARD
@@ -219,7 +219,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Makine Llogaritje"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/sv-SE.rc
+++ b/base/applications/calc/lang/sv-SE.rc
@@ -9,7 +9,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkylator"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -157,7 +157,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkylator"
 MENU IDR_MENU_STANDARD
@@ -222,7 +222,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kalkylator"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/th-TH.rc
+++ b/base/applications/calc/lang/th-TH.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "เครื่องคิดเลข ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -150,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "สถานภาพทั่วไป"
 MENU IDR_MENU_STANDARD
@@ -215,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "เครื่องคิดเลข ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/tr-TR.rc
+++ b/base/applications/calc/lang/tr-TR.rc
@@ -7,7 +7,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Hesap Makinesi"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -155,7 +155,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Hesap Makinesi"
 MENU IDR_MENU_STANDARD
@@ -220,7 +220,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Hesap Makinesi"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/uk-UA.rc
+++ b/base/applications/calc/lang/uk-UA.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -158,7 +158,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
@@ -223,7 +223,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/zh-CN.rc
+++ b/base/applications/calc/lang/zh-CN.rc
@@ -1,16 +1,10 @@
-/*
- * PROJECT:     ReactOS Calc
- * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
- * PURPOSE:     Chinese (Simplified) resource file
- * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0@yahoo.com.cn>
- *              Copyright 2021 Wu Haotian <rigoligo03@gmail.com>
- */
+/* Simplified Chinese translation for calc. By Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 计算器"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -158,7 +152,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 计算器"
 MENU IDR_MENU_STANDARD
@@ -223,7 +217,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 计算器"
 MENU IDR_MENU_STANDARD
@@ -232,13 +226,13 @@ BEGIN
    PUSHBUTTON "转换", IDC_BUTTON_CONVERT, 35, 105, 76, 17
    COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
             WS_TABSTOP | CBS_SORT
-    LTEXT "类别：", IDC_STATIC, 5, 20, 56, 8
+    LTEXT "类别:", IDC_STATIC, 5, 20, 56, 8
    COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
             WS_TABSTOP | CBS_SORT
-    LTEXT "从...转换：", IDC_STATIC, 5, 49, 56, 8
+    LTEXT "从...转换:", IDC_STATIC, 5, 49, 56, 8
    COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
             WS_TABSTOP | CBS_SORT
-    LTEXT "转换为：", IDC_STATIC, 5, 76, 56, 8
+    LTEXT "转换为:", 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
    CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
@@ -421,7 +415,7 @@ STRINGTABLE
 BEGIN
    IDS_CONV_ANGLE "角"
    IDS_CONV_AREA "面积"
-    IDS_CONV_CONSUMPTION "油耗（引擎）"
+    IDS_CONV_CONSUMPTION "油耗 (引擎)"
    IDS_CONV_CURRENCY "货币"
    IDS_CONV_ENERGY "能量"
    IDS_CONV_LENGTH "长度"
@@ -437,8 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "分"
-    IDS_ANGLE_ARCSECONDS "秒"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "角度"
    IDS_ANGLE_GRADIANS "梯度"
    IDS_ANGLE_RADIANS "弧度"
@@ -448,26 +442,26 @@ END
 STRINGTABLE
 BEGIN
    IDS_AREA_ACRES "英亩"
-    IDS_AREA_ACRES_BRAZIL "英亩（巴西）"
-    IDS_AREA_ACRES_FRANCE "英亩（法国）"
-    IDS_AREA_ACRES_SCOTS "英亩（苏格兰）"
-    IDS_AREA_ACRES_US "英亩（美国）"
+    IDS_AREA_ACRES_BRAZIL "英亩 (巴西)"
+    IDS_AREA_ACRES_FRANCE "英亩 (法国)"
+    IDS_AREA_ACRES_SCOTS "英亩 (苏格兰)"
+    IDS_AREA_ACRES_US "英亩 (美国)"
    IDS_AREA_ARES "公亩"
    IDS_AREA_CHOU "畴"
    IDS_AREA_DANBO "大亩"
    IDS_AREA_HECTARES "公顷"
    IDS_AREA_JEONGBO "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY "摩根（匈牙利）"
+    IDS_AREA_MORGEN_HUNGARY "摩根 (匈牙利)"
    IDS_AREA_MU "亩"
    IDS_AREA_PING "坪"
-    IDS_AREA_PYEONG "坪（韩国）"
+    IDS_AREA_PYEONG "坪 (韩国)"
    IDS_AREA_PYEONGBANGJA "Pyeongbangja"
    IDS_AREA_RAI "莱"
-    IDS_AREA_SE "亩（日本）"
+    IDS_AREA_SE "亩 (日本)"
    IDS_AREA_SQUARE_CENTIMETERS "平方厘米"
    IDS_AREA_SQUARE_CHR "Square chr"
    IDS_AREA_SQUARE_FATHOMS "平方英寻"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "平方英寻（匈牙利）"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "平方英寻 (匈牙利)"
    IDS_AREA_SQUARE_FEET "平方英尺"
    IDS_AREA_SQUARE_INCHES "平方英寸"
    IDS_AREA_SQUARE_KILOMETERS "平方千米"
@@ -480,7 +474,7 @@ BEGIN
    IDS_AREA_SQUARE_VA "Square va"
    IDS_AREA_SQUARE_YARD "平方码"
    IDS_AREA_TAN "段"
-    IDS_AREA_TSUBO "坪（日本）"
+    IDS_AREA_TSUBO "坪 (日本)"
 END

 /* Consumptions */
@@ -488,8 +482,8 @@ STRINGTABLE
 BEGIN
    IDS_CONSUMPTION_KM_PER_L "千米/升"
    IDS_CONSUMPTION_L_PER_100_KM "升/100 千米"
-    IDS_CONSUMPTION_MILES_GALLON_UK "英里/加仑（英国）"
-    IDS_CONSUMPTION_MILES_GALLON_US "英里/加仑（美国）"
+    IDS_CONSUMPTION_MILES_GALLON_UK "英里/加仑 (英国)"
+    IDS_CONSUMPTION_MILES_GALLON_US "英里/加仑 (美国)"
 END

 /* Currencies */
@@ -542,20 +536,20 @@ BEGIN
    IDS_LENGTH_ASTRONOMICAL_UNITS "天文单位"
    IDS_LENGTH_BARLEYCORNS "巴利肯"
    IDS_LENGTH_CENTIMETERS "厘米"
-    IDS_LENGTH_CHAINS_UK "链（英国）"
+    IDS_LENGTH_CHAINS_UK "链 (英国)"
    IDS_LENGTH_CHI "尺"
    IDS_LENGTH_CHOU "畴"
    IDS_LENGTH_CHR "Chr"
    IDS_LENGTH_CUN "寸"
    IDS_LENGTH_FATHOMS "英寻"
-    IDS_LENGTH_FATHOMS_HUNGARY "英寻（匈牙利）"
+    IDS_LENGTH_FATHOMS_HUNGARY "英寻 (匈牙利)"
    IDS_LENGTH_FEET "英尺"
    IDS_LENGTH_FURLONGS "浪"
    IDS_LENGTH_GAN "杆"
    IDS_LENGTH_HANDS "掌宽"
    IDS_LENGTH_HUNH "Hunh"
    IDS_LENGTH_INCHES "英尺"
-    IDS_LENGTH_JA "尺（韩国）"
+    IDS_LENGTH_JA "尺 (韩国)"
    IDS_LENGTH_JEONG "Jeong"
    IDS_LENGTH_KABIET "Kabiet"
    IDS_LENGTH_KEN "Ken"
@@ -572,14 +566,14 @@ BEGIN
    IDS_LENGTH_NIEU "Nieu"
    IDS_LENGTH_PARSECS "Parsecs"
    IDS_LENGTH_PICAS "Picas"
-    IDS_LENGTH_RI_JAPAN "里（日本）"
-    IDS_LENGTH_RI_KOREA "里（韩国）"
+    IDS_LENGTH_RI_JAPAN "里 (日本)"
+    IDS_LENGTH_RI_KOREA "里 (韩国)"
    IDS_LENGTH_RODS "杆"
    IDS_LENGTH_SAWK "Sawk"
    IDS_LENGTH_SEN "Sen"
-    IDS_LENGTH_SHAKU "尺（日本）"
+    IDS_LENGTH_SHAKU "尺 (日本)"
    IDS_LENGTH_SPAN "Span"
-    IDS_LENGTH_SUN "寸（日本）"
+    IDS_LENGTH_SUN "寸 (日本)"
    IDS_LENGTH_TSUEN "寸"
    IDS_LENGTH_VA "Va"
    IDS_LENGTH_YARDS "码"
@@ -649,22 +643,22 @@ END
 /* Volumes */
 STRINGTABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK "桶（英国）"
+    IDS_VOLUME_BARRELS_UK "桶 (英国)"
    IDS_VOLUME_BARRELS_OIL "桶油"
    IDS_VOLUME_BUN "Bun"
-    IDS_VOLUME_BUSHELS_UK "蒲式耳（英国）"
-    IDS_VOLUME_BUSHELS_US "蒲式耳（美国）"
+    IDS_VOLUME_BUSHELS_UK "蒲式耳 (英国)"
+    IDS_VOLUME_BUSHELS_US "蒲式耳 (美国)"
    IDS_VOLUME_CUBIC_CENTIMETERS "立方厘米"
    IDS_VOLUME_CUBIC_FEET "立方英尺"
    IDS_VOLUME_CUBIC_INCHES "立方英寸"
    IDS_VOLUME_CUBIC_METERS "立方米"
    IDS_VOLUME_CUBIC_YARDS "立方码"
    IDS_VOLUME_DOE "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK "液盎司（英国）"
-    IDS_VOLUME_FLUID_OUNCES_US "液盎司（美国）"
-    IDS_VOLUME_GALLONS_UK "加仑（英国）"
-    IDS_VOLUME_GALLONS_DRY_US "干量加仑（美国）"
-    IDS_VOLUME_GALLONS_LIQUID_US "液加仑（美国）"
+    IDS_VOLUME_FLUID_OUNCES_UK "液盎司 (英国)"
+    IDS_VOLUME_FLUID_OUNCES_US "液盎司 (美国)"
+    IDS_VOLUME_GALLONS_UK "加仑 (英国)"
+    IDS_VOLUME_GALLONS_DRY_US "干量加仑 (美国)"
+    IDS_VOLUME_GALLONS_LIQUID_US "液加仑 (美国)"
    IDS_VOLUME_GOU "合"
    IDS_VOLUME_HOP "Hop"
    IDS_VOLUME_ICCE "Icce"
@@ -672,17 +666,17 @@ BEGIN
    IDS_VOLUME_LITERS "升"
    IDS_VOLUME_MAL "Mal"
    IDS_VOLUME_MILLILITERS "毫升"
-    IDS_VOLUME_PINTS_UK "品脱（英国）"
-    IDS_VOLUME_PINTS_DRY_US "干量品脱（美国）"
-    IDS_VOLUME_PINTS_LIQUID_US "液品脱（美国）"
-    IDS_VOLUME_QUARTS_UK "夸脱（英国）"
-    IDS_VOLUME_QUARTS_DRY_US "干量夸脱（美国）"
-    IDS_VOLUME_QUARTS_LIQUID_US "液夸脱（美国）"
+    IDS_VOLUME_PINTS_UK "品脱 (英国)"
+    IDS_VOLUME_PINTS_DRY_US "干量品脱 (美国)"
+    IDS_VOLUME_PINTS_LIQUID_US "液品脱 (美国)"
+    IDS_VOLUME_QUARTS_UK "夸脱 (英国)"
+    IDS_VOLUME_QUARTS_DRY_US "干量夸脱 (美国)"
+    IDS_VOLUME_QUARTS_LIQUID_US "液夸脱 (美国)"
    IDS_VOLUME_SEKI "Seki"
    IDS_VOLUME_SYOU "Syou"
    IDS_VOLUME_TANANLOUNG "Tananloung"
    IDS_VOLUME_TANG "Tang"
-    IDS_VOLUME_TO "斗（日本）"
+    IDS_VOLUME_TO "斗 (日本)"
 END

 /* Weights */
@@ -696,14 +690,14 @@ BEGIN
    IDS_WEIGHT_GRAMS "克"
    IDS_WEIGHT_GWAN "Gwan"
    IDS_WEIGHT_HARB "Harb"
-    IDS_WEIGHT_JIN_CHINA "斤（中国）"
-    IDS_WEIGHT_JIN_TAIWAN "斤（中国台湾）"
-    IDS_WEIGHT_KAN "贯（日本）"
+    IDS_WEIGHT_JIN_CHINA "斤 (中国)"
+    IDS_WEIGHT_JIN_TAIWAN "斤 (中国台湾)"
+    IDS_WEIGHT_KAN "贯 (日本)"
    IDS_WEIGHT_KILOGRAMS "千克"
-    IDS_WEIGHT_KIN "斤（日本）"
-    IDS_WEIGHT_LIANG_CHINA "两（中国）"
-    IDS_WEIGHT_LIANG_TAIWAN "两（中国台湾）"
-    IDS_WEIGHT_MONME "两（日本）"
+    IDS_WEIGHT_KIN "斤 (日本)"
+    IDS_WEIGHT_LIANG_CHINA "两 (中国)"
+    IDS_WEIGHT_LIANG_TAIWAN "两 (中国台湾)"
+    IDS_WEIGHT_MONME "两 (日本)"
    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "常衡盎司"
    IDS_WEIGHT_OUNCES_TROY "金衡盎司"
    IDS_WEIGHT_POUNDS "英磅"
@@ -712,6 +706,6 @@ BEGIN
    IDS_WEIGHT_STONES "石"
    IDS_WEIGHT_TAMLUNG "Tamlung"
    IDS_WEIGHT_TONNES "吨"
-    IDS_WEIGHT_TONS_UK "吨（英国）"
-    IDS_WEIGHT_TONS_US "吨（美国）"
+    IDS_WEIGHT_TONS_UK "吨 (英国)"
+    IDS_WEIGHT_TONS_US "吨 (美国)"
 END
--- a/base/applications/calc/lang/zh-HK.rc
+++ b/base/applications/calc/lang/zh-HK.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 計數機"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -158,7 +158,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 計數機"
 MENU IDR_MENU_STANDARD
@@ -223,7 +223,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 計數機"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/lang/zh-TW.rc
+++ b/base/applications/calc/lang/zh-TW.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 計算機"
 MENU IDR_MENU_SCIENTIFIC_1
@@ -152,7 +152,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 計算機"
 MENU IDR_MENU_STANDARD
@@ -217,7 +217,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 計算機"
 MENU IDR_MENU_STANDARD
--- a/base/applications/calc/resource.h
+++ b/base/applications/calc/resource.h
@@ -4,8 +4,6 @@
 #define IDC_STATIC  -1
 #endif

-#define CW_USEDEFAULT16 0x8000
-
 #define IDS_CALC_NAME                   1
 #define IDS_MATH_ERROR                  2
 #define IDS_QUICKHELP                   3
--- a/base/applications/calc/resource.rc
+++ b/base/applications/calc/resource.rc
@@ -63,9 +63,6 @@ IDI_CALC ICON DISCARDABLE "res/calc.ico"
 #ifdef LANGUAGE_HU_HU
    #include "lang/hu-HU.rc"
 #endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
    #include "lang/it-IT.rc"
 #endif
--- a/base/applications/calc/winmain.c
+++ b/base/applications/calc/winmain.c
@@ -1945,9 +1945,9 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
                    hInstance,
                    MAKEINTRESOURCE(IDI_CALC),
                    IMAGE_ICON,
-                    0,
-                    0,
-                    LR_DEFAULTSIZE | LR_SHARED);
+                    GetSystemMetrics(SM_CXICON),
+                    GetSystemMetrics(SM_CYICON),
+                    0);

    calc.hSmIcon = LoadImage(
                    hInstance,
@@ -1955,7 +1955,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
                    IMAGE_ICON,
                    GetSystemMetrics(SM_CXSMICON),
                    GetSystemMetrics(SM_CYSMICON),
-                    LR_SHARED);
+                    0);

    do {
        /* ignore hwnd: dialogs are already visible! */
@@ -1985,6 +1985,12 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
        save_config();
    } while (calc.action != IDC_STATIC);

+    if (calc.hBgIcon != NULL)
+        DestroyIcon(calc.hBgIcon);
+
+    if (calc.hSmIcon != NULL)
+        DestroyIcon(calc.hSmIcon);
+
    stop_rpn_engine();

    Theme_Stop();
--- a/base/applications/charmap/charmap.c
+++ b/base/applications/charmap/charmap.c
@@ -4,6 +4,7 @@
 * FILE:        base/applications/charmap/charmap.c
 * PURPOSE:     main dialog implementation
 * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
 */

 #include "precomp.h"
@@ -566,8 +567,6 @@ PanelOnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
        }
    }

-    SetFocus(hCharmapDlg);
-
    return 0;
 }

@@ -711,14 +710,6 @@ wWinMain(HINSTANCE hInst,
                    break;
                }

-                /* NOTE: CreateDialog needs IsDialogMessage call in message loop */
-                if (hCharmapDlg && IsDialogMessage(hCharmapDlg, &Msg))
-                    continue;
-#ifndef REMOVE_ADVANCED
-                if (hAdvancedDlg && IsDialogMessage(hAdvancedDlg, &Msg))
-                    continue;
-#endif
-
                TranslateMessage(&Msg);
                DispatchMessage(&Msg);
            }
--- a/base/applications/charmap/lang/bg-BG.rc
+++ b/base/applications/charmap/lang/bg-BG.rc
@@ -1,5 +1,5 @@
 /* Превод на Български/ Bulgarian translation */
-/* https://reactos.org/wiki/Bulgarian_translation */
+/* http://www.reactos.org/wiki/Bulgarian_translation */

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

@@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Шрифт :", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Помощ", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/ca-ES.rc
+++ b/base/applications/charmap/lang/ca-ES.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Ajuda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/cs-CZ.rc
+++ b/base/applications/charmap/lang/cs-CZ.rc
@@ -10,7 +10,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Písmo:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Nápověda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/de-DE.rc
+++ b/base/applications/charmap/lang/de-DE.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Schrift:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Hilfe", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/el-GR.rc
+++ b/base/applications/charmap/lang/el-GR.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Γραμματοσειρά :", IDC_STATIC, 6, 7, 60, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Βοήθεια", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/en-US.rc
+++ b/base/applications/charmap/lang/en-US.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Help", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/es-ES.rc
+++ b/base/applications/charmap/lang/es-ES.rc
@@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Fuente:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Ayuda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/et-EE.rc
+++ b/base/applications/charmap/lang/et-EE.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Spikker", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/fr-FR.rc
+++ b/base/applications/charmap/lang/fr-FR.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Police :", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Aide", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/he-IL.rc
+++ b/base/applications/charmap/lang/he-IL.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_LAYOUTRTL
 BEGIN
    LTEXT "גופן", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "עזרה", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/id-ID.rc
+++ b/base/applications/charmap/lang/id-ID.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Fon:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Bantuan", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/it-IT.rc
+++ b/base/applications/charmap/lang/it-IT.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Aiuto", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/ja-JP.rc
+++ b/base/applications/charmap/lang/ja-JP.rc
@@ -5,7 +5,7 @@ FONT 9, "MS UI Gothic", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "フォント:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "ヘルプ", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
@@ -15,7 +15,7 @@ BEGIN
            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
    DEFPUSHBUTTON "選択", IDC_SELECT, 194, 186, 44, 13
    PUSHBUTTON "コピー", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-    CONTROL "詳細表示", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
+    CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
            WS_TABSTOP, 8, 208, 95, 10
 END

@@ -23,13 +23,13 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "文字セット:", IDC_STATIC, 8, 8, 48, 8
+    LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8
    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "分類:", IDC_STATIC, 8, 28, 50, 8
+    LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8
    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "検索", IDC_BUTTON_SEARCH, 200, 44, 50, 14
+    PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14
    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
-    LTEXT "検索文字列:", IDC_STATIC, 8, 48, 42, 8
+    LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8
    LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8
    EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
@@ -48,9 +48,9 @@ END

 STRINGTABLE
 BEGIN
-    IDS_LICENSE "本プログラムはフリーソフトウェアです。フリーソフトウェア財団が発行した GNU 一般公衆利用許諾契約書のバージョン2、またはそれ以降のバージョン（任意選択）の条件の下で再配布、または改変することができます。\r\n\r\n本プログラムは、有用であることを期待して配布されていますが、商品性や特定目的への適合性についての暗黙の保証もなく、いかなる保証もありません。詳細は GNU 一般公衆利用許諾契約書をご覧ください。\r\n\r\nあなたはこのプログラムとともに GNU 一般公衆利用許諾書のコピーを受け取っているはずです。そうでない場合は、フリーソフトウェア財団（Free Software Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA）までご連絡ください。"
+    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
    IDS_ABOUT "バージョン情報(&B)..."
-    IDS_TITLE "文字コード表"
+    IDS_TITLE "Character Map"
    IDS_UNICODE "Unicode"
-    IDS_ALL "すべて"
+    IDS_ALL "All"
 END
--- a/base/applications/charmap/lang/ko-KR.rc
+++ b/base/applications/charmap/lang/ko-KR.rc
@@ -9,7 +9,7 @@ FONT 9, "굴림", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "글꼴:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "도움말", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/lt-LT.rc
+++ b/base/applications/charmap/lang/lt-LT.rc
@@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Šriftas:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Pagalba", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/nl-NL.rc
+++ b/base/applications/charmap/lang/nl-NL.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Lettertype:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Help", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/no-NO.rc
+++ b/base/applications/charmap/lang/no-NO.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Skrift:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Hjelp", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/pl-PL.rc
+++ b/base/applications/charmap/lang/pl-PL.rc
@@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Czci&onka:", IDC_STATIC, 7, 9, 32, 8
-    COMBOBOX IDC_FONTCOMBO, 49, 7, 183, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 49, 7, 183, 60, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Pomo&c", IDC_CMHELP, 237, 7, 50, 14
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/pt-BR.rc
+++ b/base/applications/charmap/lang/pt-BR.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Fonte:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Aj&uda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/ro-RO.rc
+++ b/base/applications/charmap/lang/ro-RO.rc
@@ -1,8 +1,7 @@
 /*
 * FILE:             base/applications/charmap/lang/ro-RO.rc
- *                   ReactOS Project (https://reactos.org)
- * TRANSLATORS:      Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
- *                   Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
+ *                   ReactOS Project (http://www.reactos.org)
+ * TRANSLATOR:       Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -12,7 +11,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "F&ont:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Manual…", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
@@ -59,5 +58,5 @@ BEGIN
    IDS_ABOUT "&Despre…"
    IDS_TITLE "Hartă de caractere"
    IDS_UNICODE "Unicode"
-    IDS_ALL "Toate"
+    IDS_ALL "All"
 END
--- a/base/applications/charmap/lang/ru-RU.rc
+++ b/base/applications/charmap/lang/ru-RU.rc
@@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Шрифт:", IDC_STATIC, 6, 7, 27, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Справка", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/sk-SK.rc
+++ b/base/applications/charmap/lang/sk-SK.rc
@@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Pís&mo:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Pomocník", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/sq-AL.rc
+++ b/base/applications/charmap/lang/sq-AL.rc
@@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Ndihmë", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/sv-SE.rc
+++ b/base/applications/charmap/lang/sv-SE.rc
@@ -12,7 +12,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Typsnitt:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Hjälp", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/tr-TR.rc
+++ b/base/applications/charmap/lang/tr-TR.rc
@@ -10,7 +10,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Yazı Tipi:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Yardım", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
@@ -57,5 +57,5 @@ BEGIN
    IDS_ABOUT "&Hakkında..."
    IDS_TITLE "Karakter Seçici"
    IDS_UNICODE "Unicode"
-    IDS_ALL "Tümü"
+    IDS_ALL "Hepsi"
 END
--- a/base/applications/charmap/lang/uk-UA.rc
+++ b/base/applications/charmap/lang/uk-UA.rc
@@ -13,7 +13,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Шрифт :", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Довідка", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/zh-CN.rc
+++ b/base/applications/charmap/lang/zh-CN.rc
@@ -12,13 +12,13 @@ IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 9, "宋体", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-    LTEXT "字体：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    LTEXT "字体:", IDC_STATIC, 6, 7, 24, 9
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "说明", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
            WS_VSCROLL, 20, 22, 266, 156
-    LTEXT "待复制的字符：", IDC_STATIC, 6, 188, 66, 9
+    LTEXT "待复制的字符:", IDC_STATIC, 6, 188, 66, 9
    CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
    DEFPUSHBUTTON "选择", IDC_SELECT, 194, 186, 44, 13
@@ -31,14 +31,14 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 9, "宋体"
 BEGIN
-    LTEXT "字符集：", IDC_STATIC, 8, 8, 48, 8
+    LTEXT "字符集:", IDC_STATIC, 8, 8, 48, 8
    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "分组：", IDC_STATIC, 8, 28, 50, 8
+    LTEXT "分组:", IDC_STATIC, 8, 28, 50, 8
    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
    PUSHBUTTON "搜索", IDC_BUTTON_SEARCH, 200, 44, 50, 14
    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
-    LTEXT "搜索目标：", IDC_STATIC, 8, 48, 42, 8
-    LTEXT "到 Unicode：", IDC_STATIC, 200, 8, 30, 8
+    LTEXT "搜索目标:", IDC_STATIC, 8, 48, 42, 8
+    LTEXT "到 Unicode:", IDC_STATIC, 200, 8, 30, 8
    EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END

--- a/base/applications/charmap/lang/zh-HK.rc
+++ b/base/applications/charmap/lang/zh-HK.rc
@@ -13,7 +13,7 @@ FONT 9, "新細明體", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "字型：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "説明", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/zh-TW.rc
+++ b/base/applications/charmap/lang/zh-TW.rc
@@ -13,7 +13,7 @@ FONT 9, "新細明體", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "字型：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "說明", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/map.c
+++ b/base/applications/charmap/map.c
@@ -4,7 +4,6 @@
 * FILE:        base/applications/charmap/map.c
 * PURPOSE:     class implementation for painting glyph region
 * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *              Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
 *
 */

@@ -18,118 +17,128 @@ static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd";

 #define MAX_ROWS (0xFFFF / XCELLS) + 1 - YCELLS

+
 static
 VOID
 SetGrid(PMAP infoPtr)
 {
    INT x, y;
+
+    for (y = 0; y < YCELLS; y++)
+    for (x = 0; x < XCELLS; x++)
+    {
+        infoPtr->Cells[y][x].CellExt.left = x * infoPtr->CellSize.cx + 1;
+        infoPtr->Cells[y][x].CellExt.top = y * infoPtr->CellSize.cy + 1;
+        infoPtr->Cells[y][x].CellExt.right = (x + 1) * infoPtr->CellSize.cx + 2;
+        infoPtr->Cells[y][x].CellExt.bottom = (y + 1) * infoPtr->CellSize.cy + 2;
+
+        CopyRect(&infoPtr->Cells[y][x].CellInt,
+                 &infoPtr->Cells[y][x].CellExt);
+
+        InflateRect(&infoPtr->Cells[y][x].CellInt,
+                    -1,
+                    -1);
+    }
+}
+
+
+static
+VOID
+DrawActiveCell(PMAP infoPtr,
+               HDC hdc)
+{
+    Rectangle(hdc,
+              infoPtr->pActiveCell->CellInt.left,
+              infoPtr->pActiveCell->CellInt.top,
+              infoPtr->pActiveCell->CellInt.right,
+              infoPtr->pActiveCell->CellInt.bottom);
+
+}
+
+
+static
+VOID
+DrawGrid(PMAP infoPtr,
+         PAINTSTRUCT *ps)
+{
+    INT x, y;
+    RECT rc;
    PCELL Cell;

    for (y = 0; y < YCELLS; y++)
    for (x = 0; x < XCELLS; x++)
    {
        Cell = &infoPtr->Cells[y][x];
-        Cell->CellExt.left = x * infoPtr->CellSize.cx + 1;
-        Cell->CellExt.top = y * infoPtr->CellSize.cy + 1;
-        Cell->CellExt.right = (x + 1) * infoPtr->CellSize.cx + 2;
-        Cell->CellExt.bottom = (y + 1) * infoPtr->CellSize.cy + 2;

-        Cell->CellInt = Cell->CellExt;
-
-        InflateRect(&Cell->CellInt, -1, -1);
-    }
-}
-
-static
-VOID
-UpdateCells(PMAP infoPtr)
-{
-    INT x, y;
-    INT i = XCELLS * infoPtr->iYStart;
-    WCHAR ch;
-    PCELL Cell;
-
-    for (y = 0; y < YCELLS; ++y)
-    {
-        for (x = 0; x < XCELLS; ++x, ++i)
+        if (!IntersectRect(&rc,
+                           &ps->rcPaint,
+                           &Cell->CellExt))
        {
-            if (i < infoPtr->NumValidGlyphs)
-                ch = (WCHAR)infoPtr->ValidGlyphs[i];
-            else
-                ch = 0xFFFF;
+            continue;
+        }

-            Cell = &infoPtr->Cells[y][x];
-            Cell->ch = ch;
+        Rectangle(ps->hdc,
+                  Cell->CellExt.left,
+                  Cell->CellExt.top,
+                  Cell->CellExt.right,
+                  Cell->CellExt.bottom);
+
+        if (infoPtr->pActiveCell == Cell)
+        {
+            DrawActiveCell(infoPtr, ps->hdc);
        }
    }
 }

+
 static
 VOID
 FillGrid(PMAP infoPtr,
         PAINTSTRUCT *ps)
 {
    HFONT hOldFont;
+    WCHAR ch;
    INT x, y;
    RECT rc;
    PCELL Cell;
-    INT i;
-    HBRUSH hOldBrush, hbrGray = (HBRUSH)GetStockObject(LTGRAY_BRUSH);
-    HPEN hOldPen, hPenGray = CreatePen(PS_SOLID, 1, RGB(140, 140, 140));
+    INT i, added;

-    UpdateCells(infoPtr);
-
-    hOldFont = SelectObject(ps->hdc, infoPtr->hFont);
-    hOldPen = SelectObject(ps->hdc, GetStockObject(BLACK_PEN));
-    hOldBrush = SelectObject(ps->hdc, GetStockObject(WHITE_BRUSH));
+    hOldFont = SelectObject(ps->hdc,
+                            infoPtr->hFont);

    i = XCELLS * infoPtr->iYStart;

+    added = 0;
+
    for (y = 0; y < YCELLS; y++)
+    for (x = 0; x < XCELLS; x++)
    {
-        for (x = 0; x < XCELLS; x++, i++)
+        if (i >= infoPtr->NumValidGlyphs) break;
+
+        ch = (WCHAR)infoPtr->ValidGlyphs[i];
+
+        Cell = &infoPtr->Cells[y][x];
+
+        if (IntersectRect(&rc,
+                            &ps->rcPaint,
+                            &Cell->CellExt))
        {
-            Cell = &infoPtr->Cells[y][x];
-            if (!IntersectRect(&rc, &ps->rcPaint, &Cell->CellExt))
-                continue;
+            Cell->ch = ch;

-            rc = Cell->CellExt;
-            Rectangle(ps->hdc, rc.left, rc.top, rc.right, rc.bottom);
+            DrawTextW(ps->hdc,
+                        &ch,
+                        1,
+                        &Cell->CellInt,
+                        DT_CENTER | DT_VCENTER | DT_SINGLELINE);

-            if (i < infoPtr->NumValidGlyphs)
-            {
-                DrawTextW(ps->hdc, &Cell->ch, 1, &Cell->CellInt,
-                          DT_CENTER | DT_VCENTER | DT_SINGLELINE);
-                if (Cell == infoPtr->pActiveCell)
-                {
-                    rc = Cell->CellInt;
-
-                    /* Draw gray box */
-                    SelectObject(ps->hdc, GetStockObject(NULL_BRUSH));
-                    SelectObject(ps->hdc, hPenGray);
-                    Rectangle(ps->hdc, rc.left, rc.top, rc.right, rc.bottom);
-                    SelectObject(ps->hdc, hOldPen);
-                    SelectObject(ps->hdc, hOldBrush);
-
-                    if (GetFocus() == infoPtr->hMapWnd)
-                    {
-                        /* Draw focus rectangle */
-                        InflateRect(&rc, -1, -1);
-                        DrawFocusRect(ps->hdc, &rc);
-                    }
-                }
-            }
-            else
-            {
-                FillRect(ps->hdc, &Cell->CellInt, hbrGray);
-            }
+            added++;
        }
-    }

-    SelectObject(ps->hdc, hOldFont);
-    SelectObject(ps->hdc, hOldPen);
-    SelectObject(ps->hdc, hOldBrush);
-    DeleteObject(hPenGray);
+        i++;
+        ch = (WCHAR)i;
+    }
+    SelectObject(ps->hdc,
+                 hOldFont);
 }


@@ -137,11 +146,19 @@ static
 BOOL
 CreateLargeCell(PMAP infoPtr)
 {
-    RECT rLarge = infoPtr->pActiveCell->CellExt;
+    RECT rLarge;

-    MapWindowPoints(infoPtr->hMapWnd, infoPtr->hParent, (LPPOINT)&rLarge, 2);
+    CopyRect(&rLarge,
+             &infoPtr->pActiveCell->CellExt);

-    InflateRect(&rLarge, XLARGE - XCELLS, YLARGE - YCELLS);
+    MapWindowPoints(infoPtr->hMapWnd,
+                    infoPtr->hParent,
+                    (VOID*)&rLarge,
+                    2);
+
+    InflateRect(&rLarge,
+                XLARGE - XCELLS,
+                YLARGE - YCELLS);

    infoPtr->hLrgWnd = CreateWindowExW(0,
                                       szLrgCellWndClass,
@@ -166,11 +183,19 @@ static
 VOID
 MoveLargeCell(PMAP infoPtr)
 {
-    RECT rLarge = infoPtr->pActiveCell->CellExt;
+    RECT rLarge;

-    MapWindowPoints(infoPtr->hMapWnd, infoPtr->hParent, (LPPOINT)&rLarge, 2);
+    CopyRect(&rLarge,
+             &infoPtr->pActiveCell->CellExt);

-    InflateRect(&rLarge, XLARGE - XCELLS, YLARGE - YCELLS);
+    MapWindowPoints(infoPtr->hMapWnd,
+                    infoPtr->hParent,
+                    (VOID*)&rLarge,
+                    2);
+
+    InflateRect(&rLarge,
+                XLARGE - XCELLS,
+                YLARGE - YCELLS);

    MoveWindow(infoPtr->hLrgWnd,
               rLarge.left,
@@ -179,7 +204,9 @@ MoveLargeCell(PMAP infoPtr)
               rLarge.bottom - rLarge.top,
               TRUE);

-    InvalidateRect(infoPtr->hLrgWnd, NULL, TRUE);
+    InvalidateRect(infoPtr->hLrgWnd,
+                   NULL,
+                   TRUE);
 }


@@ -189,7 +216,7 @@ GetPossibleCharacters(WCHAR* ch, INT chLen, INT codePageIdx)
 {
    INT i, j;

-    ZeroMemory(ch, sizeof(ch[0]) * chLen);
+    memset(ch, 0, sizeof(ch[0]) * chLen);

    if (codePageIdx <= 0 || codePageIdx > SIZEOF(codePages))
    {
@@ -249,6 +276,11 @@ SetFont(PMAP infoPtr,
                   NULL,
                   TRUE);

+    if (infoPtr->pActiveCell)
+        infoPtr->pActiveCell->bActive = FALSE;
+    infoPtr->pActiveCell = &infoPtr->Cells[0][0];
+    infoPtr->pActiveCell->bActive = TRUE;
+
    // Get all the valid glyphs in this font

    SelectObject(hdc, infoPtr->hFont);
@@ -313,88 +345,14 @@ NotifyParentOfSelection(PMAP infoPtr,
 }


-static
-VOID
-LimitCaretXY(PMAP infoPtr, INT *pX, INT *pY)
-{
-    INT i, X = *pX, Y = *pY, iYStart = infoPtr->iYStart;
-
-    i = XCELLS * (iYStart + Y) + X;
-    while (i >= infoPtr->NumValidGlyphs)
-    {
-        if (X > 0)
-        {
-            --X;
-        }
-        else
-        {
-            X = XCELLS - 1;
-            --Y;
-        }
-        i = XCELLS * (iYStart + Y) + X;
-    }
-
-    *pX = X;
-    *pY = Y;
-}
-
-static
-VOID
-SetCaretXY(PMAP infoPtr, INT X, INT Y, BOOL bLarge, BOOL bInvalidateAll)
-{
-
-    /* set previous active cell to inactive */
-    if (!bInvalidateAll)
-    {
-        InvalidateRect(infoPtr->hMapWnd,
-                       &infoPtr->pActiveCell->CellInt,
-                       FALSE);
-    }
-
-    LimitCaretXY(infoPtr, &X, &Y);
-    infoPtr->CaretX = X;
-    infoPtr->CaretY = Y;
-    UpdateCells(infoPtr);
-
-    /* set new cell to active */
-    infoPtr->pActiveCell = &infoPtr->Cells[Y][X];
-    if (!bInvalidateAll)
-    {
-        InvalidateRect(infoPtr->hMapWnd,
-                       &infoPtr->pActiveCell->CellInt,
-                       FALSE);
-    }
-
-    /* Create if needed */
-    if (bLarge)
-    {
-        if (infoPtr->hLrgWnd)
-            MoveLargeCell(infoPtr);
-        else
-            CreateLargeCell(infoPtr);
-    }
-    else
-    {
-        /* Destroy large window */
-        if (infoPtr->hLrgWnd)
-        {
-            DestroyWindow(infoPtr->hLrgWnd);
-            infoPtr->hLrgWnd = NULL;
-        }
-    }
-
-    if (bInvalidateAll)
-        InvalidateRect(infoPtr->hMapWnd, NULL, FALSE);
-
-    UpdateStatusBar(infoPtr->pActiveCell->ch);
-}
-
 static
 VOID
 OnClick(PMAP infoPtr,
        WORD ptx,
        WORD pty)
 {
+    INT x, y, i;
+
    /*
     * Find the cell the mouse pointer is over.
     * Since each cell is the same size, this can be done quickly using CellSize.
@@ -402,10 +360,47 @@ OnClick(PMAP infoPtr,
     * larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer
     * multiple of infoPtr.CellSize .
     */
-    INT x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx));
-    INT y = min(YCELLS - 1, pty / max(1, infoPtr->CellSize.cy));
+    x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx));
+    y = min(YCELLS - 1, pty / max(1, infoPtr->CellSize.cy));

-    SetCaretXY(infoPtr, x, y, TRUE, FALSE);
+    /* Make sure the mouse is within a valid glyph */
+    i = XCELLS * infoPtr->iYStart + y * XCELLS + x;
+    if (i >= infoPtr->NumValidGlyphs)
+    {
+        if (infoPtr->pActiveCell)
+            infoPtr->pActiveCell->bActive = FALSE;
+        infoPtr->pActiveCell = NULL;
+        return;
+    }
+
+    /* if the cell is not already active */
+    if (!infoPtr->Cells[y][x].bActive)
+    {
+        /* set previous active cell to inactive */
+        if (infoPtr->pActiveCell)
+        {
+            /* invalidate normal cells, required when
+             * moving a small active cell via keyboard */
+            if (!infoPtr->pActiveCell->bLarge)
+            {
+                InvalidateRect(infoPtr->hMapWnd,
+                               &infoPtr->pActiveCell->CellInt,
+                               TRUE);
+            }
+
+            infoPtr->pActiveCell->bActive = FALSE;
+            infoPtr->pActiveCell->bLarge = FALSE;
+        }
+
+        /* set new cell to active */
+        infoPtr->pActiveCell = &infoPtr->Cells[y][x];
+        infoPtr->pActiveCell->bActive = TRUE;
+        infoPtr->pActiveCell->bLarge = TRUE;
+        if (infoPtr->hLrgWnd)
+            MoveLargeCell(infoPtr);
+        else
+            CreateLargeCell(infoPtr);
+    }
 }


@@ -416,30 +411,45 @@ MapOnCreate(PMAP infoPtr,
            HWND hParent)
 {
    RECT rc;
+    BOOL Ret = FALSE;

-    infoPtr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MAP));
-    if (!infoPtr)
-        return FALSE;
+    infoPtr = HeapAlloc(GetProcessHeap(),
+                        0,
+                        sizeof(MAP));
+    if (infoPtr)
+    {
+        SetLastError(0);
+        SetWindowLongPtrW(hwnd,
+                          0,
+                          (DWORD_PTR)infoPtr);
+        if (GetLastError() == 0)
+        {
+            ZeroMemory(infoPtr,
+                       sizeof(MAP));

-    SetWindowLongPtrW(hwnd, 0, (LONG_PTR)infoPtr);
+            infoPtr->hMapWnd = hwnd;
+            infoPtr->hParent = hParent;

-    infoPtr->hMapWnd = hwnd;
-    infoPtr->hParent = hParent;
+            GetClientRect(hwnd, &rc);
+            infoPtr->ClientSize.cx = rc.right;
+            infoPtr->ClientSize.cy = rc.bottom;
+            infoPtr->CellSize.cx = infoPtr->ClientSize.cx / XCELLS;
+            infoPtr->CellSize.cy = infoPtr->ClientSize.cy / YCELLS;

-    GetClientRect(hwnd, &rc);
-    infoPtr->ClientSize.cx = rc.right;
-    infoPtr->ClientSize.cy = rc.bottom;
-    infoPtr->CellSize.cx = infoPtr->ClientSize.cx / XCELLS;
-    infoPtr->CellSize.cy = infoPtr->ClientSize.cy / YCELLS;
+            infoPtr->pActiveCell = NULL;

-    infoPtr->pActiveCell = &infoPtr->Cells[0][0];
+            SetGrid(infoPtr);

-    SetGrid(infoPtr);
+            SetScrollPos(infoPtr->hParent, SB_VERT, 0, TRUE);

-    SetScrollPos(infoPtr->hParent, SB_VERT, 0, TRUE);
-    return TRUE;
+            Ret = TRUE;
+        }
+    }
+
+    return Ret;
 }

+
 static
 VOID
 OnVScroll(PMAP infoPtr,
@@ -447,7 +457,6 @@ OnVScroll(PMAP infoPtr,
          INT Pos)
 {
    INT iYDiff, iOldYStart = infoPtr->iYStart;
-    INT X, Y;

    switch (Value)
    {
@@ -471,30 +480,13 @@ OnVScroll(PMAP infoPtr,
            infoPtr->iYStart = Pos;
            break;

-        case SB_TOP:
-            infoPtr->iYStart = 0;
-            SetCaretXY(infoPtr, 0, 0, FALSE, TRUE);
-            return;
-
-        case SB_BOTTOM:
-            infoPtr->iYStart = infoPtr->NumRows;
-            SetCaretXY(infoPtr, XCELLS - 1, YCELLS - 1, FALSE, TRUE);
+       default:
            break;
-
-        default:
-            break;
-    }
+       }

    infoPtr->iYStart = max(0, infoPtr->iYStart);
    infoPtr->iYStart = min(infoPtr->iYStart, infoPtr->NumRows);

-    UpdateCells(infoPtr);
-
-    X = infoPtr->CaretX;
-    Y = infoPtr->CaretY;
-    LimitCaretXY(infoPtr, &X, &Y);
-    SetCaretXY(infoPtr, X, Y, IsWindow(infoPtr->hLrgWnd), FALSE);
-
    iYDiff = iOldYStart - infoPtr->iYStart;
    if (iYDiff)
    {
@@ -513,7 +505,7 @@ OnVScroll(PMAP infoPtr,
            RECT rect;

            /* Invalidate the rect around the active cell since a new cell will become active */
-            if (infoPtr->pActiveCell)
+            if (infoPtr->pActiveCell && infoPtr->pActiveCell->bActive)
            {
                InvalidateRect(infoPtr->hMapWnd,
                               &infoPtr->pActiveCell->CellExt,
@@ -544,8 +536,6 @@ OnVScroll(PMAP infoPtr,
            ShowWindow(infoPtr->hLrgWnd, SW_SHOW);
        }
    }
-
-    UpdateStatusBar(infoPtr->pActiveCell->ch);
 }


@@ -557,172 +547,38 @@ OnPaint(PMAP infoPtr,
    PAINTSTRUCT ps;
    HDC hdc;

+
    if (wParam != 0)
    {
-        if (!GetUpdateRect(infoPtr->hMapWnd, &ps.rcPaint, TRUE))
+        if (!GetUpdateRect(infoPtr->hMapWnd,
+                           &ps.rcPaint,
+                           TRUE))
+        {
            return;
-
+        }
        ps.hdc = (HDC)wParam;
    }
    else
    {
-        hdc = BeginPaint(infoPtr->hMapWnd, &ps);
+        hdc = BeginPaint(infoPtr->hMapWnd,
+                         &ps);
        if (hdc == NULL)
+        {
            return;
+        }
    }

+    DrawGrid(infoPtr, &ps);
+
    FillGrid(infoPtr, &ps);

    if (wParam == 0)
    {
-        EndPaint(infoPtr->hMapWnd, &ps);
+        EndPaint(infoPtr->hMapWnd,
+                 &ps);
    }
 }

-static
-VOID
-MoveUpDown(PMAP infoPtr, INT DY)
-{
-    INT Y = infoPtr->CaretY;
-
-    if (DY < 0) /* Move Up */
-    {
-        if (Y <= 0)
-        {
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0);
-            return;
-        }
-
-        Y -= 1;
-    }
-    else if (DY > 0) /* Move Down */
-    {
-        if (Y + 1 >= YCELLS)
-        {
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0);
-            return;
-        }
-
-        Y += 1;
-    }
-
-    SetCaretXY(infoPtr, infoPtr->CaretX, Y, IsWindow(infoPtr->hLrgWnd), FALSE);
-}
-
-static
-VOID
-MoveLeftRight(PMAP infoPtr, INT DX)
-{
-    INT X = infoPtr->CaretX;
-    INT Y = infoPtr->CaretY;
-
-    if (DX < 0) /* Move Left */
-    {
-        if (X <= 0) /* at left edge */
-        {
-            if (Y <= 0) /* at top */
-            {
-                Y = 0;
-                if (infoPtr->iYStart > 0)
-                    X = XCELLS - 1;
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0);
-            }
-            else
-            {
-                X = XCELLS - 1;
-                Y -= 1;
-            }
-        }
-        else /* Not at left edge */
-        {
-            X -= 1;
-        }
-    }
-    else if (DX > 0) /* Move Right */
-    {
-        if (X + 1 >= XCELLS) /* at right edge */
-        {
-            if (Y + 1 >= YCELLS) /* at bottom */
-            {
-                Y = YCELLS - 1;
-                if (infoPtr->iYStart < infoPtr->NumRows)
-                    X = 0;
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0);
-            }
-            else
-            {
-                X = 0;
-                Y += 1;
-            }
-        }
-        else
-        {
-            X += 1;
-        }
-    }
-
-    SetCaretXY(infoPtr, X, Y, IsWindow(infoPtr->hLrgWnd), FALSE);
-}
-
-static
-VOID
-OnKeyDown(PMAP infoPtr, WPARAM wParam, LPARAM lParam)
-{
-    BOOL bCtrlDown = (GetKeyState(VK_CONTROL) < 0);
-
-    switch (wParam)
-    {
-        case VK_UP:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, infoPtr->CaretX, 0, FALSE, FALSE);
-            else
-                MoveUpDown(infoPtr, -1);
-            break;
-
-        case VK_DOWN:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, infoPtr->CaretX, YCELLS - 1, FALSE, FALSE);
-            else
-                MoveUpDown(infoPtr, +1);
-            break;
-
-        case VK_LEFT:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, 0, infoPtr->CaretY, FALSE, FALSE);
-            else
-                MoveLeftRight(infoPtr, -1);
-            break;
-
-        case VK_RIGHT:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, XCELLS - 1, infoPtr->CaretY, FALSE, FALSE);
-            else
-                MoveLeftRight(infoPtr, +1);
-            break;
-
-        case VK_PRIOR: /* Page Up */
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_PAGEUP, 0), 0);
-            break;
-
-        case VK_NEXT: /* Page Down */
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_PAGEDOWN, 0), 0);
-            break;
-
-        case VK_HOME:
-            if (bCtrlDown)
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_TOP, 0), 0);
-            else
-                SetCaretXY(infoPtr, 0, infoPtr->CaretY, FALSE, FALSE);
-            break;
-
-        case VK_END:
-            if (bCtrlDown)
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);
-            else
-                SetCaretXY(infoPtr, XCELLS - 1, infoPtr->CaretY, FALSE, FALSE);
-            break;
-    }
-}

 LRESULT
 CALLBACK
@@ -731,10 +587,13 @@ MapWndProc(HWND hwnd,
           WPARAM wParam,
           LPARAM lParam)
 {
-    PMAP infoPtr = (PMAP)GetWindowLongPtrW(hwnd, 0);
+    PMAP infoPtr;
    LRESULT Ret = 0;
    WCHAR lfFaceName[LF_FACESIZE];

+    infoPtr = (PMAP)GetWindowLongPtrW(hwnd,
+                                      0);
+
    switch (uMsg)
    {
        case WM_CREATE:
@@ -749,16 +608,12 @@ MapWndProc(HWND hwnd,
            break;
        }

-        case WM_KEYDOWN:
-        {
-            OnKeyDown(infoPtr, wParam, lParam);
-            break;
-        }
-
        case WM_LBUTTONDOWN:
        {
-            SetFocus(hwnd);
-            OnClick(infoPtr, LOWORD(lParam), HIWORD(lParam));
+            OnClick(infoPtr,
+                    LOWORD(lParam),
+                    HIWORD(lParam));
+
            break;
        }

@@ -766,36 +621,43 @@ MapWndProc(HWND hwnd,
        {
            if (wParam & MK_LBUTTON)
            {
-                OnClick(infoPtr, LOWORD(lParam), HIWORD(lParam));
+                OnClick(infoPtr,
+                        LOWORD(lParam),
+                        HIWORD(lParam));
            }
            break;
        }

        case WM_LBUTTONDBLCLK:
        {
-            if (!infoPtr->pActiveCell || GetFocus() != hwnd)
+            if (!infoPtr->pActiveCell)
                break;

            NotifyParentOfSelection(infoPtr,
                                    FM_SETCHAR,
                                    infoPtr->pActiveCell->ch);

-            if (infoPtr->hLrgWnd)
+            if (infoPtr->pActiveCell->bLarge)
            {
                DestroyWindow(infoPtr->hLrgWnd);
                infoPtr->hLrgWnd = NULL;
            }
+
+            infoPtr->pActiveCell->bLarge = FALSE;
+
            break;
        }

        case WM_VSCROLL:
        {
-            OnVScroll(infoPtr, LOWORD(wParam), HIWORD(wParam));
+            OnVScroll(infoPtr,
+                      LOWORD(wParam),
+                      HIWORD(wParam));
+
            break;
        }

        case FM_SETCHARMAP:
-            infoPtr->CaretX = infoPtr->CaretY = infoPtr->iYStart = 0;
            infoPtr->CharMap = LOWORD(wParam);
            wcsncpy(lfFaceName,
                    infoPtr->CurrentFont.lfFaceName,
@@ -804,7 +666,6 @@ MapWndProc(HWND hwnd,
            break;

        case FM_SETFONT:
-            infoPtr->CaretX = infoPtr->CaretY = infoPtr->iYStart = 0;
            SetFont(infoPtr, (LPWSTR)lParam);
            break;

@@ -818,27 +679,32 @@ MapWndProc(HWND hwnd,
            return (LRESULT)infoPtr->hFont;

        case WM_PAINT:
-            OnPaint(infoPtr, wParam);
+        {
+            OnPaint(infoPtr,
+                    wParam);
            break;
+        }

        case WM_DESTROY:
+        {
            DeleteObject(infoPtr->hFont);
-            HeapFree(GetProcessHeap(), 0, infoPtr);
-            SetWindowLongPtrW(hwnd, 0, (LONG_PTR)NULL);
-            break;
-
-        case WM_GETDLGCODE:
-            return DLGC_WANTARROWS;
-
-        case WM_SETFOCUS:
-        case WM_KILLFOCUS:
-            if (!infoPtr->hLrgWnd)
-                InvalidateRect(hwnd, &(infoPtr->pActiveCell->CellInt), FALSE);
+            HeapFree(GetProcessHeap(),
+                     0,
+                     infoPtr);
+            SetWindowLongPtrW(hwnd,
+                              0,
+                              (DWORD_PTR)NULL);
            break;
+        }

        default:
-            Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam);
+        {
+            Ret = DefWindowProcW(hwnd,
+                                 uMsg,
+                                 wParam,
+                                 lParam);
            break;
+        }
    }

    return Ret;
@@ -874,6 +740,9 @@ RegisterMapClasses(HINSTANCE hInstance)
 VOID
 UnregisterMapClasses(HINSTANCE hInstance)
 {
-    UnregisterClassW(szMapWndClass, hInstance);
-    UnregisterClassW(szLrgCellWndClass, hInstance);
+    UnregisterClassW(szMapWndClass,
+                    hInstance);
+
+    UnregisterClassW(szLrgCellWndClass,
+                    hInstance);
 }
--- a/base/applications/charmap/precomp.h
+++ b/base/applications/charmap/precomp.h
@@ -37,6 +37,8 @@ typedef struct _CELL
 {
    RECT CellExt;
    RECT CellInt;
+    BOOL bActive;
+    BOOL bLarge;
    WCHAR ch;
 } CELL, *PCELL;

@@ -51,13 +53,13 @@ typedef struct _MAP
    PCELL pActiveCell;
    HFONT hFont;
    LOGFONTW CurrentFont;
-    INT CaretX, CaretY;
    INT iYStart;
    INT NumRows;
    INT CharMap;

    USHORT ValidGlyphs[MAX_GLYPHS];
    USHORT NumValidGlyphs;
+
 } MAP, *PMAP;

 typedef struct {
--- a/base/applications/clipbrd/clipbrd.c
+++ b/base/applications/clipbrd/clipbrd.c
@@ -248,11 +248,13 @@ static int OnCommand(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)

        case CMD_ABOUT:
        {
+            HICON hIcon;
            WCHAR szTitle[MAX_STRING_LEN];

+            hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIPBRD_ICON));
            LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle));
-            ShellAboutW(Globals.hMainWnd, szTitle, NULL,
-                        LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(CLIPBRD_ICON)));
+            ShellAboutW(Globals.hMainWnd, szTitle, NULL, hIcon);
+            DeleteObject(hIcon);
            break;
        }

@@ -358,13 +360,6 @@ static void OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
            break;
        }

-        case CF_HDROP:
-        {
-            GetClientRect(hWnd, &rc);
-            HDropFromClipboard(hdc, &rc);
-            break;
-        }
-
        default:
        {
            GetClientRect(hWnd, &rc);
--- a/base/applications/clipbrd/clipbrd.rc
+++ b/base/applications/clipbrd/clipbrd.rc
@@ -50,9 +50,6 @@ CLPFILE_ICON ICON "res/clpfile.ico"
 #ifdef LANGUAGE_IT_IT
    #include "lang/it-IT.rc"
 #endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
 #ifdef LANGUAGE_PL_PL
    #include "lang/pl-PL.rc"
 #endif
--- a/base/applications/clipbrd/cliputils.c
+++ b/base/applications/clipbrd/cliputils.c
@@ -164,8 +164,7 @@ UINT GetAutomaticClipboardFormat(void)
        CF_DSPBITMAP,
        CF_DSPMETAFILEPICT,
        CF_DSPENHMETAFILE,
-        CF_PALETTE,
-        CF_HDROP
+        CF_PALETTE
    };

    return GetPriorityClipboardFormat(uFormatList, ARRAYSIZE(uFormatList));
--- a/base/applications/clipbrd/lang/ja-JP.rc
+++ b/base/applications/clipbrd/lang/ja-JP.rc
@@ -1,65 +0,0 @@
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-ID_ACCEL ACCELERATORS
-BEGIN
-    VK_DELETE, CMD_DELETE, VIRTKEY
-END
-
-MAIN_MENU MENU
-BEGIN
-    POPUP "ファイル(&F)"
-    BEGIN
-        MENUITEM "開く(&O)...", CMD_OPEN
-        MENUITEM "名前を付けて保存(&A)...", CMD_SAVE_AS
-        MENUITEM SEPARATOR
-        MENUITEM "終了(&X)", CMD_EXIT
-    END
-    POPUP "編集(&E)"
-    BEGIN
-        MENUITEM "削除(&D)\tDel", CMD_DELETE
-    END
-    POPUP "表示(&D)"
-    BEGIN
-        MENUITEM "自動(&A)", CMD_AUTOMATIC
-    END
-    POPUP "ヘルプ(&H)"
-    BEGIN
-        MENUITEM "ヘルプ トピック(&H)", CMD_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "バージョン情報(&A)", CMD_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CLIPBOARD "クリップボード ビュア"
-    STRING_CLIPFILE  "クリップボードの要素"
-    STRING_DELETE_MSG "クリップボードの内容をクリアしますか?"
-    STRING_DELETE_TITLE "クリップボードのクリア"
-    STRING_FORMAT_NT "ReactOS 用のクリップボード ファイル (*.clp)"
-    STRING_FORMAT_GEN "クリップボード ファイル (*.clp)"
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CF_UNKNOWN "未知の形式"
-    STRING_CF_TEXT "テキスト"
-    STRING_CF_BITMAP "ビットマップ"
-    STRING_CF_OEMTEXT "OEM テキスト"
-    STRING_CF_UNICODETEXT "Unicode テキスト"
-    STRING_CF_DIB "DIB ビットマップ"
-    STRING_CF_LOCALE "ロケール データ"
-    STRING_CF_ENHMETAFILE "拡張メタファイル"
-    STRING_CF_METAFILEPICT "メタファイル"
-    STRING_CF_PALETTE "カラー パレット"
-    STRING_CF_DIBV5 "DIB ビットマップ (バージョン 5)"
-    STRING_CF_SYLK "シンボリック リンク形式"
-    STRING_CF_DIF "データ交換フォーマット"
-    STRING_CF_HDROP "ドロップ データ"
-END
-
-STRINGTABLE
-BEGIN
-    ERROR_UNSUPPORTED_FORMAT "表示できない形式のデータがクリップボードにあります。"
-    ERROR_INVALID_FILE_FORMAT "選択したファイルは有効なクリップボードファイルではありません。"
-END
--- a/base/applications/clipbrd/lang/zh-CN.rc
+++ b/base/applications/clipbrd/lang/zh-CN.rc
@@ -36,7 +36,7 @@ STRINGTABLE
 BEGIN
    STRING_CLIPBOARD "剪贴板查看程序"
    STRING_CLIPFILE  "剪贴板元素"
-    STRING_DELETE_MSG "清空剪贴板的内容吗？"
+    STRING_DELETE_MSG "清空剪贴板的内容吗?"
    STRING_DELETE_TITLE "清空剪贴板"
    STRING_FORMAT_NT "ReactOS 的剪贴板文件 (*.clp)"
    STRING_FORMAT_GEN "剪贴板文件 (*.clp)"
@@ -54,7 +54,7 @@ BEGIN
    STRING_CF_ENHMETAFILE "增强型元文件"
    STRING_CF_METAFILEPICT "元文件"
    STRING_CF_PALETTE "调色板"
-    STRING_CF_DIBV5 "DIB 位图（第 5 版）"
+    STRING_CF_DIBV5 "DIB 位图 (第 5 版)"
    STRING_CF_SYLK "符号链接格式"
    STRING_CF_DIF "数据交换格式"
    STRING_CF_HDROP "删除数据"
--- a/base/applications/clipbrd/lang/zh-HK.rc
+++ b/base/applications/clipbrd/lang/zh-HK.rc
@@ -20,7 +20,7 @@ BEGIN
        MENUITEM "開啟(&O)...", CMD_OPEN
        MENUITEM "另存新檔(&A)...", CMD_SAVE_AS
        MENUITEM SEPARATOR
-        MENUITEM "結束(&X)", CMD_EXIT
+        MENUITEM "退出(&X)", CMD_EXIT
    END
    POPUP "編輯(&E)"
    BEGIN
@@ -60,7 +60,7 @@ BEGIN
    STRING_CF_ENHMETAFILE "增強型圖元檔案"
    STRING_CF_METAFILEPICT "圖元檔案"
    STRING_CF_PALETTE "調色盤"
-    STRING_CF_DIBV5 "DIB 點陣圖（第 5 版）"
+    STRING_CF_DIBV5 "DIB 點陣圖 (第 5 版)"
    STRING_CF_SYLK "符號連結格式"
    STRING_CF_DIF "資料交換格式"
    STRING_CF_HDROP "刪除資料"
--- a/base/applications/clipbrd/winutils.c
+++ b/base/applications/clipbrd/winutils.c
@@ -331,45 +331,6 @@ void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect)
    PlayEnhMetaFile(hdc, hEmf, lpRect);
 }

-static LPWSTR AllocStrCat(LPWSTR psz, LPCWSTR cat)
-{
-    INT cch;
-    LPWSTR pszNew;
-
-    if (psz == NULL)
-        return _wcsdup(cat);
-
-    cch = lstrlenW(psz) + lstrlenW(cat) + 1;
-    pszNew = realloc(psz, cch * sizeof(WCHAR));
-    if (!pszNew)
-        return psz;
-
-    lstrcatW(pszNew, cat);
-    return pszNew;
-}
-
-void HDropFromClipboard(HDC hdc, const RECT *lpRect)
-{
-    LPWSTR pszAlloc = NULL;
-    WCHAR szFile[MAX_PATH + 2];
-    HDROP hDrop = (HDROP)GetClipboardData(CF_HDROP);
-    UINT iFile, cFiles = DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0);
-    RECT rc = *lpRect;
-
-    FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW + 1));
-
-    for (iFile = 0; iFile < cFiles; ++iFile)
-    {
-        DragQueryFileW(hDrop, iFile, szFile, _countof(szFile));
-        lstrcatW(szFile, L"\r\n");
-        pszAlloc = AllocStrCat(pszAlloc, szFile);
-    }
-
-    DrawTextW(hdc, pszAlloc, -1, &rc,
-              DT_LEFT | DT_NOPREFIX | DT_EXTERNALLEADING | DT_WORD_ELLIPSIS);
-    free(pszAlloc);
-}
-
 BOOL RealizeClipboardPalette(HDC hdc)
 {
    BOOL Success;
--- a/base/applications/clipbrd/winutils.h
+++ b/base/applications/clipbrd/winutils.h
@@ -17,5 +17,4 @@ void BitBltFromClipboard(PAINTSTRUCT ps, SCROLLSTATE state, DWORD dwRop);
 void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state, UINT fuColorUse);
 void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect);
 void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect);
-void HDropFromClipboard(HDC hdc, const RECT *lpRect);
 BOOL RealizeClipboardPalette(HDC hdc);
--- a/base/applications/cmdutils/at/lang/tr-TR.rc
+++ b/base/applications/cmdutils/at/lang/tr-TR.rc
@@ -44,7 +44,7 @@ saat               Komutun çalıştırılma saatini belirtir.\n\

    IDS_YES "Evet"
    IDS_NO "Hayır"
-    IDS_ERROR "HATA"
+    IDS_ERROR "YANLIŞLIK"
    IDS_OK "Tamam"

    IDS_TASKID      "Görev kimliği: %lu\n"
--- a/base/applications/cmdutils/at/lang/zh-CN.rc
+++ b/base/applications/cmdutils/at/lang/zh-CN.rc
@@ -1,11 +1,3 @@
-/*
- * PROJECT:     ReactOS AT utility
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Chinese (Simplified) resource file
- * TRANSLATORS: Copyright 2018 Li Keqing <forucial@icloud.com>
- *              Copyright 2021 Wu Haotian <rigoligo03@gmail.com>
- */
-
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

 STRINGTABLE
@@ -17,24 +9,24 @@ AT [\\\\computername] time [/INTERACTIVE]\n\
    [ /EVERY:date[,...] | /NEXT:date[,...]] ""command""\n\n\
 \\\\computername     指定一个远程计算机。如果省略这个参数命令将运行在本地\n\
                   计算机上。\n\
-id                 分配给被安排命令的标识号码。\n\
-/DELETE            取消一个被安排的命令。如果省略 id，计算机上安排的所有\n\
-                   任务都将被取消。\n\
-/YES               取消任务时使用将不询求确认。\n\
+id                 分配给被安排命令的标示号码。\n\
+/DELETE            取消一个被安排的命令。如果省略 id，计算机上所有被安排的\n\
+                   命令都将被取消。\n\
+/YES               取消任务时使用将不再询求确认。\n\
 time               指定命令运行的时间。\n\
 /INTERACTIVE       允许任务在运行时与登录的用户的桌面交互。\n\
 /EVERY:date[,...]  在每周或每月的特定日子运行指定命令。如果省略 date，则认定是\n\
                   每个月的今天。\n\
-/NEXT:date[,...]   在下一个指定日期到来时候运行指定命令。如果省略 date，则认定\n\
-                   是下个月的今天。\n\
+/NEXT:date[,...]   在下一个日期到来时候运行指定命令。如果省略 date，则认定是\n\
+                   每个月的今天。\n\
 ""command""          将被运行的命令或者批程序。\n"

-    IDS_DELETE_ALL "这个操作将删除所有安排好的任务。\n"
-    IDS_NEW_JOB "添加任务 ID 为 %lu 的新任务\n"
+    IDS_DELETE_ALL "这个操作江删除所有安排好的任务。\n"
+    IDS_NEW_JOB "添加以任务 ID %lu 添加新任务\n"
    IDS_JOBS_LIST "状态 ID   日                     时间          命令行\n"
    IDS_NO_ENTRIES "列表中没有项目。\n"

-    IDS_CONFIRM_QUESTION "您想继续操作吗？(Y/N) [N]："
+    IDS_CONFIRM_QUESTION "您想继续操作吗？(Y/N) [N]: "
    IDS_CONFIRM_INVALID  "\n这是一个无效的回应。\n"
    IDS_CONFIRM_YES "Y"
    IDS_CONFIRM_NO "N"
@@ -49,10 +41,10 @@ time               指定命令运行的时间。\n\
    IDS_ERROR "错误"
    IDS_OK "确定"

-    IDS_TASKID      "任务 ID：      %lu\n"
-    IDS_STATUS      "状态：         %s\n"
-    IDS_SCHEDULE    "安排：         %s\n"
-    IDS_TIME        "今日时间：     %s\n"
-    IDS_INTERACTIVE "交互：         %s\n"
-    IDS_COMMAND     "命令：         %s\n"
+    IDS_TASKID      "任务 ID:       %lu\n"
+    IDS_STATUS      "状态:          %s\n"
+    IDS_SCHEDULE    "安排:          %s\n"
+    IDS_TIME        "今日时间:      %s\n"
+    IDS_INTERACTIVE "交互:          %s\n"
+    IDS_COMMAND     "命令:          %s\n"
 END
--- a/base/applications/cmdutils/attrib/attrib.c
+++ b/base/applications/cmdutils/attrib/attrib.c
@@ -1,10 +1,35 @@
 /*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Displays or changes file attributes recursively.
- * COPYRIGHT:   Copyright 1998-2019 Eric Kohl <eric.kohl@reactos.org>
- *              Copyright 2021 Doug Lyons <douglyons@douglyons.com>
- *              Copyright 2021-2023 Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
+ *  ATTRIB.C - attrib internal command.
+ *
+ *
+ *  History:
+ *
+ *    04-Dec-1998 Eric Kohl
+ *        started
+ *
+ *    09-Dec-1998 Eric Kohl
+ *        implementation works, except recursion ("attrib /s").
+ *
+ *    05-Jan-1999 Eric Kohl
+ *        major rewrite.
+ *        fixed recursion ("attrib /s").
+ *        started directory support ("attrib /s /d").
+ *        updated help text.
+ *
+ *    14-Jan-1999 Eric Kohl
+ *        Unicode ready!
+ *
+ *    19-Jan-1999 Eric Kohl
+ *        Redirection ready!
+ *
+ *    21-Jan-1999 Eric Kohl
+ *        Added check for invalid filenames.
+ *
+ *    23-Jan-1999 Eric Kohl
+ *        Added handling of multiple filenames.
+ *
+ *    02-Apr-2005 (Magnus Olsen <magnus@greatlord.com>)
+ *        Remove all hardcoded strings in En.rc
 */

 #include <stdio.h>
@@ -14,437 +39,415 @@
 #include <winbase.h>
 #include <wincon.h>
 #include <winuser.h>
-#include <strsafe.h>

 #include <conutils.h>

 #include "resource.h"

-/* Enable to support extended attributes.
- * See https://ss64.com/nt/attrib.html for an exhaustive list. */
-// TODO: If you enable this, translations need to be updated as well!
-//#define EXTENDED_ATTRIBUTES
-
-#define ALL_FILES_PATTERN   L"*.*" // It may also be possible to use L"*" (shorter)
-
 CON_SCREEN StdOutScreen = INIT_CON_SCREEN(StdOut);

-static VOID
+static
+VOID
 ErrorMessage(
-    _In_ DWORD dwErrorCode,
-    _In_opt_ PCWSTR pszMsg,
+    DWORD dwErrorCode,
+    LPWSTR szFormat,
    ...)
 {
-    INT Len;
+    WCHAR szMsg[RC_STRING_MAX_SIZE];
+    WCHAR  szMessage[1024];
+    LPWSTR szError;
    va_list arg_ptr;

    if (dwErrorCode == ERROR_SUCCESS)
        return;

-    va_start(arg_ptr, pszMsg);
-    Len = ConMsgPrintfV(StdErr,
-                        FORMAT_MESSAGE_FROM_SYSTEM,
-                        NULL,
-                        dwErrorCode,
-                        LANG_USER_DEFAULT,
-                        &arg_ptr);
-    va_end(arg_ptr);
+    if (szFormat)
+    {
+        va_start(arg_ptr, szFormat);
+        vswprintf(szMessage, szFormat, arg_ptr);
+        va_end(arg_ptr);
+    }
+
+    if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+                       NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                       (LPWSTR)&szError, 0, NULL))
+    {
+        ConPrintf(StdOut, L"%s %s\n", szError, szMessage);
+        if (szError)
+            LocalFree(szError);
+        return;
+    }

    /* Fall back just in case the error is not defined */
-    if (Len <= 0)
-        ConResPrintf(StdErr, STRING_CONSOLE_ERROR, dwErrorCode);
-
-    /* Display the extra optional message if necessary */
-    if (pszMsg)
-        ConPrintf(StdErr, L"  %s\n", pszMsg);
+    LoadStringW(GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg));
+    if (szFormat)
+        ConPrintf(StdOut, L"%s -- %s\n", szMsg, szMessage);
+    else
+        ConPrintf(StdOut, L"%s\n", szMsg);
 }

-
-/**
- * @brief   Displays attributes for the given file.
- * @return  Always TRUE (success).
- **/
-static BOOL
-PrintAttributes(
-    _In_ PWIN32_FIND_DATAW pFindData,
-    _In_ PCWSTR pszFullName,
-    _Inout_opt_ PVOID Context)
+/* Returns TRUE if anything is printed, FALSE otherwise */
+static
+BOOL
+PrintAttribute(
+    LPWSTR pszPath,
+    LPWSTR pszFile,
+    BOOL   bRecurse,
+    BOOL   bDirectories)
 {
-    DWORD dwAttributes = pFindData->dwFileAttributes;
-
-    UNREFERENCED_PARAMETER(Context);
-
-    ConPrintf(StdOut,
-#ifdef EXTENDED_ATTRIBUTES
-              L"%c  %c%c%c  %c    %s\n",
-#else
-              L"%c  %c%c%c     %s\n",
-#endif
-              (dwAttributes & FILE_ATTRIBUTE_ARCHIVE)  ? L'A' : L' ',
-              (dwAttributes & FILE_ATTRIBUTE_SYSTEM)   ? L'S' : L' ',
-              (dwAttributes & FILE_ATTRIBUTE_HIDDEN)   ? L'H' : L' ',
-              (dwAttributes & FILE_ATTRIBUTE_READONLY) ? L'R' : L' ',
-#ifdef EXTENDED_ATTRIBUTES
-              (dwAttributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) ? L'I' : L' ',
-#endif
-              pszFullName);
-
-    return TRUE;
-}
-
-typedef struct _ATTRIBS_MASKS
-{
-    DWORD dwMask;
-    DWORD dwAttrib;
-} ATTRIBS_MASKS, *PATTRIBS_MASKS;
-
-/**
- * @brief   Changes attributes for the given file.
- * @return  TRUE if anything changed, FALSE otherwise.
- **/
-static BOOL
-ChangeAttributes(
-    _In_ PWIN32_FIND_DATAW pFindData,
-    _In_ PCWSTR pszFullName,
-    _Inout_opt_ PVOID Context)
-{
-    PATTRIBS_MASKS AttribsMasks = (PATTRIBS_MASKS)Context;
-    DWORD dwAttributes;
-
-    dwAttributes = ((pFindData->dwFileAttributes & ~AttribsMasks->dwMask) | AttribsMasks->dwAttrib);
-    return SetFileAttributesW(pszFullName, dwAttributes);
-}
-
-
-#define ENUM_RECURSE        0x01
-#define ENUM_DIRECTORIES    0x02
-
-typedef BOOL
-(*PENUMFILES_CALLBACK)(
-    _In_ PWIN32_FIND_DATAW pFindData,
-    _In_ PCWSTR pszFullName,
-    _Inout_opt_ PVOID Context);
-
-typedef struct _ENUMFILES_CTX
-{
-    /* Fixed data */
-    _In_ PCWSTR FileName;
-    _In_ DWORD Flags;
-
-    /* Callback invoked on each enumerated file/directory */
-    _In_ PENUMFILES_CALLBACK Callback;
-    _In_ PVOID Context;
-
-    /* Dynamic data */
    WIN32_FIND_DATAW findData;
-    ULONG uReparseLevel;
-
-    /* The full path buffer the function will act recursively */
-    // PWSTR FullPath; // Use a relocated buffer once long paths become supported!
-    size_t cchBuffer; // Buffer size
-    WCHAR FullPathBuffer[MAX_PATH + _countof("\\" ALL_FILES_PATTERN)];
-
-} ENUMFILES_CTX, *PENUMFILES_CTX;
-
-/* Returns TRUE if anything is done, FALSE otherwise */
-static BOOL
-EnumFilesWorker(
-    _Inout_ PENUMFILES_CTX EnumCtx,
-    _Inout_ off_t offFilePart) // Offset to the file name inside FullPathBuffer
-{
-    BOOL bFound = FALSE;
-    HRESULT hRes;
    HANDLE hFind;
-    PWSTR findFileName = EnumCtx->findData.cFileName;
-    PWSTR pFilePart = EnumCtx->FullPathBuffer + offFilePart;
-    size_t cchRemaining = EnumCtx->cchBuffer - offFilePart;
+    WCHAR  szFullName[MAX_PATH];
+    LPWSTR pszFileName;
+    BOOL   bFound = FALSE;
+    BOOL   bIsDir;
+    BOOL   bExactMatch;
+    DWORD  Error;

-    /* Recurse over all subdirectories */
-    if (EnumCtx->Flags & ENUM_RECURSE)
+    /* prepare full file name buffer */
+    wcscpy(szFullName, pszPath);
+    pszFileName = szFullName + wcslen(szFullName);
+
+    /* display all subdirectories */
+    if (bRecurse)
    {
-        /* Append '*.*' */
-        hRes = StringCchCopyW(pFilePart, cchRemaining, ALL_FILES_PATTERN);
-        if (hRes != S_OK)
-        {
-            if (hRes == STRSAFE_E_INSUFFICIENT_BUFFER)
-            {
-                // TODO: If this fails, try to reallocate EnumCtx->FullPathBuffer by
-                // increasing its size by _countof(EnumCtx->findData.cFileName) + 1
-                // to satisfy this copy, as well as the one made in the loop below.
-            }
-            // else
-            ConPrintf(StdErr, L"Directory level too deep: %s\n", EnumCtx->FullPathBuffer);
-            return FALSE;
-        }
+        /* append *.* */
+        wcscpy(pszFileName, L"*.*");

-        hFind = FindFirstFileW(EnumCtx->FullPathBuffer, &EnumCtx->findData);
+        hFind = FindFirstFileW(szFullName, &findData);
        if (hFind == INVALID_HANDLE_VALUE)
        {
-            DWORD Error = GetLastError();
-            if ((Error != ERROR_DIRECTORY) &&
-                (Error != ERROR_SHARING_VIOLATION) &&
-                (Error != ERROR_FILE_NOT_FOUND))
+            Error = GetLastError();
+            if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION)
+                  && (Error != ERROR_FILE_NOT_FOUND))
            {
-                ErrorMessage(Error, EnumCtx->FullPathBuffer);
+                ErrorMessage(Error, pszFile);
            }
            return FALSE;
        }

        do
        {
-            BOOL bIsReparse;
-            size_t offNewFilePart;
-
-            if (!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+            if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
                continue;

-            if (!wcscmp(findFileName, L".") || !wcscmp(findFileName, L".."))
-                continue;
-
-            /* Allow at most 2 levels of reparse points / symbolic links */
-            bIsReparse = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT);
-            if (bIsReparse)
+            if (!wcscmp(findData.cFileName, L".") ||
+                !wcscmp(findData.cFileName, L".."))
            {
-                if (EnumCtx->uReparseLevel < 2)
-                    EnumCtx->uReparseLevel++;
-                else
-                    continue;
+                continue;
            }

-            hRes = StringCchPrintfExW(pFilePart, cchRemaining,
-                                      NULL, &offNewFilePart, 0,
-                                      L"%s\\", findFileName);
-            /* Offset to the new file name part */
-            offNewFilePart = EnumCtx->cchBuffer - offNewFilePart;
-
-            bFound |= EnumFilesWorker(EnumCtx, offNewFilePart);
-
-            /* Recalculate the file part pointer and the number of characters
-             * remaining: the buffer may have been enlarged and relocated. */
-            pFilePart = EnumCtx->FullPathBuffer + offFilePart;
-            cchRemaining = EnumCtx->cchBuffer - offFilePart;
-
-            /* If we went through a reparse point / symbolic link, decrease level */
-            if (bIsReparse)
-                EnumCtx->uReparseLevel--;
+            wcscpy(pszFileName, findData.cFileName);
+            wcscat(pszFileName, L"\\");
+            bFound |= PrintAttribute(szFullName, pszFile, bRecurse, bDirectories);
        }
-        while (FindNextFileW(hFind, &EnumCtx->findData));
+        while (FindNextFileW(hFind, &findData));
        FindClose(hFind);
    }

-    /* Append the file name pattern to search for */
-    hRes = StringCchCopyW(pFilePart, cchRemaining, EnumCtx->FileName);
+    /* append file name */
+    wcscpy(pszFileName, pszFile);

-    /* Search in the current directory */
-    hFind = FindFirstFileW(EnumCtx->FullPathBuffer, &EnumCtx->findData);
+    /* search current directory */
+    hFind = FindFirstFileW(szFullName, &findData);
    if (hFind == INVALID_HANDLE_VALUE)
+    {
        return bFound;
+    }

    do
    {
-        BOOL bIsDir = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-        BOOL bExactMatch = (wcsicmp(findFileName, EnumCtx->FileName) == 0);
+        bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+        bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0;

-        if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && !bExactMatch)
+        if (bIsDir && !bDirectories && !bExactMatch)
            continue;

-        if (!wcscmp(findFileName, L".") || !wcscmp(findFileName, L".."))
+        if (!wcscmp(findData.cFileName, L".") ||
+            !wcscmp(findData.cFileName, L".."))
+        {
            continue;
+        }

-        /* If we recursively enumerate files excluding directories,
-         * exclude any directory from the enumeration. */
-        if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && (EnumCtx->Flags & ENUM_RECURSE))
-            continue;
+        wcscpy(pszFileName, findData.cFileName);

-        StringCchCopyW(pFilePart, cchRemaining, findFileName);
-        /* bFound = */ EnumCtx->Callback(&EnumCtx->findData, EnumCtx->FullPathBuffer, EnumCtx->Context);
+        ConPrintf(StdOut,
+                  L"%c  %c%c%c     %s\n",
+                  (findData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) ? L'A' : L' ',
+                  (findData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? L'S' : L' ',
+                  (findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? L'H' : L' ',
+                  (findData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? L'R' : L' ',
+                  szFullName);
        bFound = TRUE;
    }
-    while (FindNextFileW(hFind, &EnumCtx->findData));
+    while (FindNextFileW(hFind, &findData));
    FindClose(hFind);

    return bFound;
 }

-static BOOL
-AttribEnumFiles(
-    _In_ PCWSTR pszPath,
-    _In_ PCWSTR pszFile,
-    _In_ DWORD fFlags,
-    _In_ PATTRIBS_MASKS AttribsMasks)
+
+/* Returns TRUE if anything changed, FALSE otherwise */
+static
+BOOL
+ChangeAttribute(
+    LPWSTR pszPath,
+    LPWSTR pszFile,
+    BOOL  bRecurse,
+    BOOL  bDirectories,
+    DWORD dwMask,
+    DWORD dwAttrib)
 {
-    ENUMFILES_CTX EnumContext = {0};
-    size_t offFilePart;
-    HRESULT hRes;
+    WIN32_FIND_DATAW findData;
+    HANDLE hFind;
+    WCHAR  szFullName[MAX_PATH];
+    LPWSTR pszFileName;
+    BOOL   bFound = FALSE;
+    BOOL   bIsDir;
+    BOOL   bExactMatch;
+    DWORD  dwAttribute;
+    DWORD  Error;

-    EnumContext.FileName = pszFile;
-    EnumContext.Flags    = fFlags;
-    EnumContext.Callback = (AttribsMasks->dwMask == 0 ? PrintAttributes : ChangeAttributes);
-    EnumContext.Context  = (AttribsMasks->dwMask == 0 ? NULL : AttribsMasks);
+    /* prepare full file name buffer */
+    wcscpy(szFullName, pszPath);
+    pszFileName = szFullName + wcslen(szFullName);

-    /* Prepare the full file path buffer */
-    EnumContext.cchBuffer = _countof(EnumContext.FullPathBuffer);
-    hRes = StringCchCopyExW(EnumContext.FullPathBuffer,
-                            EnumContext.cchBuffer,
-                            pszPath,
-                            NULL,
-                            &offFilePart,
-                            0);
-    if (hRes != S_OK)
-        return FALSE;
-
-    /* Offset to the file name part */
-    offFilePart = EnumContext.cchBuffer - offFilePart;
-    if (EnumContext.FullPathBuffer[offFilePart - 1] != L'\\')
+    /* display all subdirectories */
+    if (bRecurse)
    {
-        EnumContext.FullPathBuffer[offFilePart] = L'\\';
-        EnumContext.FullPathBuffer[offFilePart + 1] = UNICODE_NULL;
-        offFilePart++;
+        /* append *.* */
+        wcscpy(pszFileName, L"*.*");
+
+        hFind = FindFirstFileW(szFullName, &findData);
+        if (hFind == INVALID_HANDLE_VALUE)
+        {
+            Error = GetLastError();
+            if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION)
+                  && (Error != ERROR_FILE_NOT_FOUND))
+            {
+                ErrorMessage(Error, pszFile);
+            }
+            return FALSE;
+        }
+
+        do
+        {
+            if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+                continue;
+
+            if (!wcscmp(findData.cFileName, L".") ||
+                !wcscmp(findData.cFileName, L".."))
+            {
+                continue;
+            }
+
+            wcscpy(pszFileName, findData.cFileName);
+            wcscat(pszFileName, L"\\");
+            bFound |= ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories,
+                                      dwMask, dwAttrib);
+        }
+        while (FindNextFileW(hFind, &findData));
+        FindClose(hFind);
    }

-    return EnumFilesWorker(&EnumContext, offFilePart);
+    /* append file name */
+    wcscpy(pszFileName, pszFile);
+
+    /* search current directory */
+    hFind = FindFirstFileW(szFullName, &findData);
+    if (hFind == INVALID_HANDLE_VALUE)
+    {
+        return bFound;
+    }
+
+    do
+    {
+        bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+        bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0;
+
+        if (bIsDir && !bDirectories && !bExactMatch)
+            continue;
+
+        if (!wcscmp(findData.cFileName, L".") ||
+            !wcscmp(findData.cFileName, L".."))
+        {
+            continue;
+        }
+
+        if (bRecurse && bIsDir && !bDirectories)
+            continue;
+
+        wcscpy(pszFileName, findData.cFileName);
+
+        dwAttribute = (findData.dwFileAttributes & ~dwMask) | dwAttrib;
+
+        SetFileAttributes(szFullName, dwAttribute);
+        bFound = TRUE;
+    }
+    while (FindNextFileW(hFind, &findData));
+    FindClose(hFind);
+
+    return bFound;
 }

 int wmain(int argc, WCHAR *argv[])
 {
-    INT i;
-    DWORD dwEnumFlags = 0;
-    ATTRIBS_MASKS AttribsMasks = {0};
-    BOOL bFound = FALSE;
-    PWSTR pszFileName;
-    WCHAR szFilePath[MAX_PATH + 2] = L""; // + 2 to reserve an extra path separator and a NULL-terminator.
+    INT    i;
+    WCHAR  szPath[MAX_PATH] = L""; // For case we only use 'attrib +h /s' there is no szPath
+    WCHAR  szFileName [MAX_PATH];
+    BOOL   bRecurse = FALSE;
+    BOOL   bDirectories = FALSE;
+    DWORD  dwAttrib = 0;
+    DWORD  dwMask = 0;
+    LPWSTR p;

    /* Initialize the Console Standard Streams */
    ConInitStdStreams();

-    /* Check for options and file specifications */
+    /* Print help */
+    if (argc > 1 && wcscmp(argv[1], L"/?") == 0)
+    {
+        ConResPuts(StdOut, STRING_ATTRIB_HELP);
+        return 0;
+    }
+
+    /* check for options */
    for (i = 1; i < argc; i++)
    {
-        if (*argv[i] == L'/')
-        {
-            /* Print help and bail out if needed */
-            if (wcscmp(argv[i], L"/?") == 0)
-            {
-                ConResPuts(StdOut, STRING_ATTRIB_HELP);
-                return 0;
-            }
-            else
-            /* Retrieve the enumeration modes */
-            if (wcsicmp(argv[i], L"/s") == 0)
-                dwEnumFlags |= ENUM_RECURSE;
-            else if (wcsicmp(argv[i], L"/d") == 0)
-                dwEnumFlags |= ENUM_DIRECTORIES;
-            else
-            {
-                /* Unknown option */
-                ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]);
-                return -1;
-            }
-        }
-        else
-        /* Build attributes and mask */
-        if ((*argv[i] == L'+') || (*argv[i] == L'-'))
-        {
-            BOOL bAdd = (*argv[i] == L'+');
+        if (wcsicmp(argv[i], L"/s") == 0)
+            bRecurse = TRUE;
+        else if (wcsicmp(argv[i], L"/d") == 0)
+            bDirectories = TRUE;
+    }

+    /* create attributes and mask */
+    for (i = 1; i < argc; i++)
+    {
+        if (*argv[i] == L'+')
+        {
            if (wcslen(argv[i]) != 2)
            {
-                ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]);
+                ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]);
                return -1;
            }

            switch (towupper(argv[i][1]))
            {
                case L'A':
-                    AttribsMasks.dwMask |= FILE_ATTRIBUTE_ARCHIVE;
-                    if (bAdd)
-                        AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_ARCHIVE;
-                    else
-                        AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE;
-                    break;
-
-                case L'S':
-                    AttribsMasks.dwMask |= FILE_ATTRIBUTE_SYSTEM;
-                    if (bAdd)
-                        AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_SYSTEM;
-                    else
-                        AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM;
+                    dwMask   |= FILE_ATTRIBUTE_ARCHIVE;
+                    dwAttrib |= FILE_ATTRIBUTE_ARCHIVE;
                    break;

                case L'H':
-                    AttribsMasks.dwMask |= FILE_ATTRIBUTE_HIDDEN;
-                    if (bAdd)
-                        AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_HIDDEN;
-                    else
-                        AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN;
+                    dwMask   |= FILE_ATTRIBUTE_HIDDEN;
+                    dwAttrib |= FILE_ATTRIBUTE_HIDDEN;
                    break;

                case L'R':
-                    AttribsMasks.dwMask |= FILE_ATTRIBUTE_READONLY;
-                    if (bAdd)
-                        AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_READONLY;
-                    else
-                        AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_READONLY;
+                    dwMask   |= FILE_ATTRIBUTE_READONLY;
+                    dwAttrib |= FILE_ATTRIBUTE_READONLY;
                    break;

-#ifdef EXTENDED_ATTRIBUTES
-                case L'I':
-                    AttribsMasks.dwMask |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
-                    if (bAdd)
-                        AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
-                    else
-                        AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
+                case L'S':
+                    dwMask   |= FILE_ATTRIBUTE_SYSTEM;
+                    dwAttrib |= FILE_ATTRIBUTE_SYSTEM;
                    break;
-#endif

                default:
-                    ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]);
+                    ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]);
                    return -1;
            }
        }
-        else
+        else if (*argv[i] == L'-')
        {
-            /* At least one file specification found */
-            bFound = TRUE;
+            if (wcslen(argv[i]) != 2)
+            {
+                ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]);
+                return -1;
+            }
+
+            switch (towupper(argv[i][1]))
+            {
+                case L'A':
+                    dwMask   |= FILE_ATTRIBUTE_ARCHIVE;
+                    dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE;
+                    break;
+
+                case L'H':
+                    dwMask   |= FILE_ATTRIBUTE_HIDDEN;
+                    dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN;
+                    break;
+
+                case L'R':
+                    dwMask   |= FILE_ATTRIBUTE_READONLY;
+                    dwAttrib &= ~FILE_ATTRIBUTE_READONLY;
+                    break;
+
+                case L'S':
+                    dwMask   |= FILE_ATTRIBUTE_SYSTEM;
+                    dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM;
+                    break;
+
+                default:
+                    ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]);
+                    return -1;
+            }
        }
    }

-    /* If no file specification was found, operate on all files of the current directory */
-    if (!bFound)
+    if (argc == 1)
    {
-        GetCurrentDirectoryW(_countof(szFilePath) - 2, szFilePath);
-        pszFileName = ALL_FILES_PATTERN;
-
-        bFound = AttribEnumFiles(szFilePath, pszFileName, dwEnumFlags, &AttribsMasks);
-        if (!bFound)
-            ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, pszFileName);
+        DWORD len;

+        len = GetCurrentDirectory(MAX_PATH, szPath);
+        if (szPath[len-1] != L'\\')
+        {
+            szPath[len] = L'\\';
+            szPath[len + 1] = UNICODE_NULL;
+        }
+        wcscpy(szFileName, L"*.*");
+        PrintAttribute(szPath, szFileName, bRecurse, bDirectories);
        return 0;
    }

-    /* Operate on each file specification */
+    /* get full file name */
    for (i = 1; i < argc; i++)
    {
-        /* Skip options */
-        if (*argv[i] == L'/' || *argv[i] == L'+' || *argv[i] == L'-')
+        if (*argv[i] == L'+' || *argv[i] == L'-' || *argv[i] == L'/')
            continue;

-        GetFullPathNameW(argv[i], _countof(szFilePath) - 2, szFilePath, &pszFileName);
-        if (pszFileName)
-        {
-            /* Move the file part so as to separate and NULL-terminate the directory */
-            MoveMemory(pszFileName + 1, pszFileName,
-                       sizeof(szFilePath) - (pszFileName -szFilePath + 1) * sizeof(*szFilePath));
-            *pszFileName++ = UNICODE_NULL;
-        }
-        else
-        {
-            pszFileName = L"";
-        }
+        GetFullPathNameW(argv[i], MAX_PATH, szPath, &p);
+        wcscpy(szFileName, p);
+        *p = 0;

-        bFound = AttribEnumFiles(szFilePath, pszFileName, dwEnumFlags, &AttribsMasks);
-        if (!bFound)
+        if (dwMask == 0)
+        {
+            if (!PrintAttribute(szPath, szFileName, bRecurse, bDirectories))
+            {
+                ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]);
+            }
+        }
+        else if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib))
+        {
            ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]);
+        }
+    }
+
+// Code below handles the special case of 'attrib +h /s' and similar
+
+    if (bRecurse && dwMask && (wcscmp(szPath, L"") == 0))
+    {
+        DWORD len;
+
+        len = GetCurrentDirectory(MAX_PATH, szPath);
+        if (szPath[len-1] != L'\\')
+        {
+            szPath[len] = L'\\';
+            szPath[len + 1] = UNICODE_NULL;
+        }
+        wcscpy(szFileName, L"*.*");
+        if (!ChangeAttribute(szPath, szFileName, bRecurse, bDirectories, dwMask, dwAttrib))
+            ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, szFileName);
    }

    return 0;
--- a/base/applications/cmdutils/attrib/lang/cs-CZ.rc
+++ b/base/applications/cmdutils/attrib/lang/cs-CZ.rc
@@ -1,14 +1,13 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Czech resource file
- * TRANSLATORS: Copyright 2015 Radek Liska aka Black_Fox <radekliska@gmail.com>
+/* FILE:       base/shell/cmd/lang/cs-CZ.rc
+ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
+ * UPDATED:    2015-04-12
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +22,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
  /D  Processes directories as well\n\n\
 Type ATTRIB without a parameter to display the attributes of all files.\n"
    STRING_CONSOLE_ERROR "Neznámá chyba: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Neplatný formát parametru - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/de-DE.rc
+++ b/base/applications/cmdutils/attrib/lang/de-DE.rc
@@ -1,14 +1,10 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     German resource file
- * TRANSLATORS: Copyright 2005 Klemens Friedl <frik85@hotmail.com>
- */
+/* German language file by Klemens Friedl <frik85> 2005-06-03 */

 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Zeigt Dateiattribute an oder ändert sie.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +19,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\
  /D  Verarbeitet auch die Ordner.\n\n\
 ATTRIB ohne Parameter zeigt die derzeit gesetzten Attribute aller Dateien an."
    STRING_CONSOLE_ERROR "Unbekannter Fehler: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Ungültiges Parameterformat - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/el-GR.rc
+++ b/base/applications/cmdutils/attrib/lang/el-GR.rc
@@ -1,14 +1,13 @@
 /*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Greek resource file
- * TRANSLATORS: Copyright 2008 Apostolos Alexiadis <djapal@gmail.com>
+ * Αρχική έκδοση - Ημιτελής.
+ * Ελληνική μετάφραση - Απόστολος Αλεξιάδης
 */

 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Προβολή ή αλλαγή των χαρακτηριστικών των αρχείων.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +22,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
  /D  Επεξεργασία καταλόγων επίσης.\n\n\
 Πληκτρολογήστε ATTRIB χωρίς παράμετρο, για να εμφανιστούν τα χαρακτηριστικά όλων των αρχείων.\n"
    STRING_CONSOLE_ERROR "Άγνωστο σφάλμα: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Μη έγκυρο φορμά παραμέτρου - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/en-US.rc
+++ b/base/applications/cmdutils/attrib/lang/en-US.rc
@@ -1,14 +1,8 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     English (United States) resource file
- * TRANSLATORS: Copyright 2005 Magnus Olsen <magnus@greatlord.com>
- */
-
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +17,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
  /D  Processes directories as well\n\n\
 Type ATTRIB without a parameter to display the attributes of all files.\n"
    STRING_CONSOLE_ERROR "Unknown error: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/es-ES.rc
+++ b/base/applications/cmdutils/attrib/lang/es-ES.rc
@@ -1,15 +1,10 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Spanish resource file
- * TRANSLATORS: Copyright 2005 Jose Pedro Fernández Pascual <huma2000@terra.es>
- *              Copyright 2020 Julen Urizar Compains <julenuri@hotmail.com>
- */
+/* Spanish translation by HUMA2000, Jose Pedro Fernández Pascual, Ismael Ferreras Morezuelas (Swyter) y Julen Urizar Compains */

 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "Archivo no encontrado - '%s'\n"
    STRING_ATTRIB_HELP "Muestra o cambia los atributos de los archivos.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
       [/S [/D]]\n\n\
@@ -24,6 +19,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
  /D  Procesa también los directorios\n\n\
 Escriba ATTRIB sin un parámetro para mostrar los atributos de todos los archivos.\n"
    STRING_CONSOLE_ERROR "Error desconocido: %d\n"
-    STRING_FILE_NOT_FOUND "Archivo no encontrado - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Formato de parámetro erróneo - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/fr-FR.rc
+++ b/base/applications/cmdutils/attrib/lang/fr-FR.rc
@@ -1,14 +1,10 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     French resource file
- * TRANSLATORS: Copyright 2005 Sylvain Pétréolle <spetreolle@yahoo.fr>
- */
+/* French translation by Sylvain Pétréolle, Pierre Schweitzer */

 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Affiche ou change des attributs de fichiers.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +19,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
  /D  Traite également les répertoires\n\n\
 Taper ATTRIB sans paramètre pour afficher les attributs de tous les fichiers."
    STRING_CONSOLE_ERROR "Erreur inconnue : %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Format de paramètre incorrect - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/hu-HU.rc
+++ b/base/applications/cmdutils/attrib/lang/hu-HU.rc
@@ -1,14 +1,10 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Hungarian resource file
- * TRANSLATORS: Copyright 2005 Robert Horvath <talley@cubeclub.hu>
- */
+/* Hungarian translation by Robert Horvath (talley at cubeclub.hu) 2005 */

 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Állományok attribútumok megjelenítése vagy beállításai.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] állomány ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +19,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] állomány ...\n\
  /D  Mappákra is érvényesíti\n\n\
 Ha ATTRIB-ot paraméter nélkül írod be, megjeleníti a mappában található összes állományt és annak attribútumát.\n"
    STRING_CONSOLE_ERROR "Ismeretlen hiba: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Érvénytelen paraméter megadás - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/id-ID.rc
+++ b/base/applications/cmdutils/attrib/lang/id-ID.rc
@@ -1,15 +1,10 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Indonesian resource file
- * TRANSLATORS: Copyright 2007 Zaenal Mutaqin <ade999@gmail.com>
- *              Copyright 2020 Mas Ahmad Muhammad <m.charly81@gmail.com>
- */
+/* Indonesian language file by Zaenal Mutaqin <ade999 at gmail dot com> 2007-02-15 and Mas Ahmad Muhammad <m dot charly81 at gmail dot com> */

 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "Berkas tidak ditemukan - '%s'\n"
    STRING_ATTRIB_HELP "Menampilkan atau mengubah atribut file.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
       [/S [/D]]\n\n\
@@ -24,6 +19,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
  /D  Proses direktori juga\n\n\
 Ketik ATTRIB tanpa parameter untuk menampilkan atribut dari semua file.\n"
    STRING_CONSOLE_ERROR "Kesalahan tidak dikenal: %d\n"
-    STRING_FILE_NOT_FOUND "Berkas tidak ditemukan - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Format parameter tidak benar - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/it-IT.rc
+++ b/base/applications/cmdutils/attrib/lang/it-IT.rc
@@ -1,14 +1,8 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Italian resource file
- * TRANSLATORS: Copyright 2007 Paolo Devoti <devotip@tiscali.it>
- */
-
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Visualizza o modifica gli attributi dei file.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +17,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
  /D  Tratta anche le cartelle\n\n\
 Scrivi ATTRIB senza parametri per visualizzare gli attributi di tutti i file.\n"
    STRING_CONSOLE_ERROR "Errore sconosciuto: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Formato dei parametri non valido - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/ja-JP.rc
+++ b/base/applications/cmdutils/attrib/lang/ja-JP.rc
@@ -1,15 +1,8 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Japanese resource file
- * TRANSLATORS: Copyright 2005 tsk <tsk_n@mail.goo.ne.jp>
- *              Copyright 2013 Tomoya Kitagawa (sabiki) <jptomoya@yahoo.co.jp>
- */
-
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "ファイル属性を表示または変更します。\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [ファイル] ...\n\
       [/S [/D]]\n\n\
@@ -24,6 +17,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [ファイル] ...\n\
  /D  フォルダも処理します。\n\n\
 パラメータを指定しないで ATTRIB と入力すると、すべてのファイルの属性を表示します。\n"
    STRING_CONSOLE_ERROR "不明なエラー: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "無効なパラメータの書式です。 - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/no-NO.rc
+++ b/base/applications/cmdutils/attrib/lang/no-NO.rc
@@ -1,15 +1,8 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Norwegian resource file
- * TRANSLATORS: Copyright 2006 Lars Martin Hambro (LMH1) <lars_martin4@hotmail.com>
- *              Copyright 2007 Frode Lillerud (Scalpel78) <frode@enkelt.no>
- */
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Viser eller endrer filattributtene.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\
       [/S [/D]]\n\n\
@@ -24,6 +17,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\
  /D  Bearbeider også mapper.\n\n\
 Skriv ATTRIB uten parametere for å vise attributtene til alle filer.\n"
    STRING_CONSOLE_ERROR "Ukjent feil: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/pl-PL.rc
+++ b/base/applications/cmdutils/attrib/lang/pl-PL.rc
@@ -1,16 +1,18 @@
 /*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Polish resource file
- * TRANSLATORS: Copyright 2008 Olaf Siejka <caemyr@gmail.com>
- *              Copyright 2010 Maciej Bialas <bjauy@o2.pl>
- *              Copyright 2020 Piotr Hetnarowicz <piotrhwz@gmail.com>
+ *    Translated by Caemyr - Olaf Siejka (Jan, 2008)
+ *    Updated by niski - Maciej Bialas (Mar, 2010)
+ *    Use ReactOS forum PM or IRC to contact me
+ *    http://www.reactos.org
+ *    IRC: irc.freenode.net #reactos-pl;
+ *    UTF-8 conversion by Caemyr (May, 2011)
+ *    Updated by pithwz - Piotr Hetnarowicz (piotrhwz@gmail.com) (April, 2020)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "Nie można odnaleźć pliku - '%s'\n"
    STRING_ATTRIB_HELP "Wyświetla lub zmienia atrybuty plików.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\
       [/S [/D]]\n\n\
@@ -25,6 +27,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\
  /D  Przetwarza również katalogi\n\n\
 Wpisz ATTRIB bez żadnego parametru, by wyświetlić atrybuty wszystkich plików.\n"
    STRING_CONSOLE_ERROR "Nieznany błąd: %d\n"
-    STRING_FILE_NOT_FOUND "Nie można odnaleźć pliku - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Niewłaściwy format parametru - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/ro-RO.rc
+++ b/base/applications/cmdutils/attrib/lang/ro-RO.rc
@@ -1,14 +1,10 @@
-/*
- * PROJECT:     ReactOS Attrib Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2014 Ștefan Fulea <stefan.fulea@mail.com>
- */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ATTRIB_HELP "Afișează sau modifică atributele de fișiere.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fișier ...\n\
       [/S [/D]]\n\n\
@@ -23,6 +19,5 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fișier ...\n\
 Tastați ATTRIB fără argumente pentru afișarea atributelor pentru\n\
 toate fișierele.\n"
    STRING_CONSOLE_ERROR "Eroare necunoscută: %d\n"
-    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Formatul argumentului este eronat - %s\n"
 END
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Faber	8294696f3b	[CRT] Fix MSVC version of call_handler	2022-01-16 23:31:07 -05:00
Thomas Faber	3ccbd2a842	[NTOS:MM] Randomly allocate from special pool	2022-01-16 23:31:07 -05:00
Thomas Faber	cf373fbc57	[WIN32K:NTUSER] Regularly validate thread window list. CORE-18002	2022-01-16 23:31:07 -05:00
Thomas Faber	f120239ba1	[PORTCLS] DEBUG: Fill memory on free	2022-01-16 23:30:55 -05:00
Thomas Faber	77cdca0d49	[PORTCLS] HACK: Force zeroing in operator new, even though this is not standard-compliant	2022-01-16 23:30:50 -05:00
Thomas Faber	e7c4b00017	[PORTCLS] Centralize AddRef/Release implementation and make it thread-safe.	2022-01-16 23:30:19 -05:00