[KMTEST] Handle ReactOS / Vista+ style of reserved mappings

This fixes kmtest:MmReservedMapping failures and hang.
Based on mm-implement-mappingaddress.patch by Thomas Faber and some changes by Oleg Dubinskiy.

Signed-off-by: Oleg Dubinskiy <oleg.dubinskij30@gmail.com>
Signed-off-by: Thomas Faber <thomas.faber@reactos.org>

.gitattributes

@@ -30,9 +30,6 @@
 *.TXT text
 *.y text
 
-# Files with these extensions must always have LF (Unix) line endings.
-*.sh text eol=lf
-
 # Files with these extensions end up in the built ReactOS system, so they
 # need to have CRLF line endings.
 *.bat text eol=crlf

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,8 +17,3 @@ _Use a TODO when your pull request is Work in Progress._
 
 - [ ] 
 - [ ] 
-
-## Testbot runs (Filled in by Devs)
-
-- [ ] KVM x86:
-- [ ] KVM x64:

.github/labeler.yml

@@ -47,7 +47,10 @@ Win32SS:
 "input method":
 - changed-files:
   - any-glob-to-any-file:
-    - base/ctf/**
-    - win32ss/user/imm32/**
+    - base/applications/ctfmon/**
+    - dll/ime/**
+    - dll/win32/imm32/**
+    - dll/win32/msctf/**
+    - dll/win32/msutb/**
     - win32ss/user/ntuser/ime.c
     - win32ss/user/user32/misc/imm.c

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
           - dllver: 0x600
             config: Release
       fail-fast: false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - name: Get RosBE build specifics
       id: get_rosbe_spec
@@ -165,7 +165,6 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: amd64_arm
-        sdk: 10.0.22621.0   # Windows SDK 10.0.26100.0 dropped support for 32-bit ARM
         toolset: ${{matrix.toolset}}
     - name: Activate VS cmd (arm64)
       if: ${{ matrix.arch == 'arm64' }}

CMakeLists.txt

@@ -68,9 +68,6 @@ include(sdk/cmake/config.cmake)
 # Compiler flags handling
 include(sdk/cmake/compilerflags.cmake)
 
-# set_wine_module function
-include(sdk/cmake/set_wine_module.cmake)
-
 add_definitions(
     -D__REACTOS__
     # swprintf without count argument is used in most of the codebase
@@ -143,10 +140,6 @@ if(NOT CMAKE_CROSSCOMPILING)
             add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS)
         elseif(ARCH STREQUAL "amd64")
             add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS)
-        elseif(ARCH STREQUAL "arm")
-            add_definitions(-D__arm__)
-        elseif(ARCH STREQUAL "arm64")
-            add_definitions(-D__aarch64__)
         endif()
         if(MSVC_VERSION GREATER 1699)
             add_definitions(/D_ALLOW_KEYWORD_MACROS)
@@ -160,10 +153,7 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     set(NATIVE_TARGETS asmpp bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb)
     if(NOT MSVC)
-        list(APPEND NATIVE_TARGETS pefixup)
-        if (ARCH STREQUAL "i386")
-            list(APPEND NATIVE_TARGETS rsym)
-        endif()
+        list(APPEND NATIVE_TARGETS rsym pefixup)
     endif()
 
     install(TARGETS ${NATIVE_TARGETS})
@@ -262,7 +252,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
     elseif(ARCH STREQUAL "amd64")
         # clang-cl defines this one for itself
         if (NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang"))
-            add_compile_definitions(_M_AMD64 _M_X64)
+            add_compile_definitions(_M_AMD64)
         endif()
         add_definitions(-D_AMD64_ -D__x86_64__ -D_WIN64)
     elseif(ARCH STREQUAL "arm")
@@ -334,8 +324,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
         sdk/include/ddk
         sdk/include/ndk
         sdk/include/reactos
-        sdk/include/reactos/libs
-        sdk/lib/pseh/include)
+        sdk/include/reactos/libs)
 
     if(ARCH STREQUAL "arm")
         include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
@@ -347,11 +336,12 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
     add_subdirectory(sdk/include/xdk)
     add_subdirectory(sdk/include/psdk)
     add_subdirectory(sdk/include/dxsdk)
-    add_subdirectory(sdk/include/reactos)
+    add_subdirectory(sdk/include/reactos/wine)
+    add_subdirectory(sdk/include/reactos/mc)
     add_subdirectory(sdk/include/asm)
 
     if(ARCH MATCHES "64$")
-        include(sdk/cmake/baseaddress64.cmake)
+        include(sdk/cmake/baseaddress64.cmake)  
     elseif(NO_ROSSYM)
         include(sdk/cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)

CODEOWNERS

@@ -116,20 +116,6 @@
 #   S: Abandoned
 /ntoskrnl/cache/
 
-# Client/Server Runtime Subsystem
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/sdk/include/reactos/subsys/csr/    @HBelusca
-/subsystems/csr/                    @HBelusca
-/win32ss/user/ntuser/csr.*          @HBelusca
-
-# Clipboard Viewer
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: Mondgestein, Ricardo Hanke
-#   S: Maintained
-/base/applications/clipbrd/         @HBelusca
-/base/applications/cmdutils/clip/   @HBelusca
-
 # CMake Build Scripts
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
@@ -138,58 +124,6 @@
 /sdk/cmake/
 *.cmake
 
-# Command-line Utilities
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/applications/cmdutils/attrib/         @HBelusca
-/base/applications/cmdutils/chcp/           @HBelusca
-/base/applications/cmdutils/doskey/         @HBelusca
-/base/applications/cmdutils/eventcreate/    @HBelusca
-/base/applications/cmdutils/find/           @HBelusca
-/base/applications/cmdutils/help/           @HBelusca
-/base/applications/cmdutils/mode/           @HBelusca
-/base/applications/cmdutils/more/           @HBelusca
-/base/applications/cmdutils/taskkill/       @HBelusca
-/base/applications/cmdutils/timeout/        @HBelusca
-/sdk/lib/conutils/                          @HBelusca
-
-# Command-line Prompt Interpreter
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/shell/cmd/    @HBelusca
-
-# Console Client/Server Subsystem, Terminal Emulator / Text-Mode
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/dll/cpl/console/                           @HBelusca
-/dll/win32/kernel32/client/console/         @HBelusca
-/dll/win32/kernel32/include/console.h       @HBelusca
-/drivers/base/condrv/                       @HBelusca
-/drivers/setup/blue/                        @HBelusca
-/modules/rostests/winetests/kernel32/console.c  @HBelusca
-/sdk/include/psdk/wincon.h                  @HBelusca
-/sdk/include/reactos/wincon_undoc.h         @HBelusca
-/sdk/include/reactos/drivers/condrv/        @HBelusca
-/sdk/include/reactos/drivers/blue/          @HBelusca
-/sdk/include/reactos/subsys/win/conmsg.h    @HBelusca
-/sdk/include/reactos/subsys/win/console.h   @HBelusca
-/win32ss/user/ntuser/console.c              @HBelusca
-/win32ss/user/winsrv/concfg/                @HBelusca
-/win32ss/user/winsrv/consrv/                @HBelusca
-
-# Event Log Subsystem
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   M: EricKohl, ekohl, Eric Kohl
-#   S: Maintained
-/base/services/eventlog/                @EricKohl @HBelusca
-/dll/win32/advapi32/service/eventlog.c  @EricKohl @HBelusca
-/sdk/lib/evtlib/                        @HBelusca
-
-# Event Log Viewer
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/applications/mscutils/eventvwr/   @HBelusca
-
 # File Patch API
 #   M: learn-more, learn_more, Mark Jansen
 #   S: Maintained
@@ -205,7 +139,7 @@
 # Filesystem Filter Manager
 #   M: gedmurphy, Ged, Ged Murphy
 #   S: Maintained
-/drivers/filters/fltmgr/    @gedmurphy
+/drivers/filters/fltmgr/ @gedmurphy
 
 # File Systems Run Time Library
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
@@ -216,13 +150,11 @@
 /sdk/lib/drivers/ntoskrnl_vista/fsrtl.c     @HeisSpiter
 
 # Freeloader
-#   M: HBelusca, Hermès Bélusca-Maïto
+#   M:
 #   R: tkreuzer, ThePhysicist, Timo Kreuzer
 #   R: Extravert-ir, extravert34, Victor Perevertkin
 #   S: Maintained
-/boot/freeldr/freeldr/  @HBelusca @tkreuzer @Extravert-ir
-/boot/rtl/              @HBelusca
-/ntoskrnl/config/cmboot.c   @HBelusca
+/boot/freeldr/freeldr/  @tkreuzer @Extravert-ir
 
 # HAL / APIC
 #   M: tkreuzer, ThePhysicist, Timo Kreuzer
@@ -255,12 +187,6 @@
 #   S: Maintained
 /drivers/storage/mountmgr/ @HeisSpiter
 
-# MSConfig
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/applications/msconfig/        @HBelusca
-/base/applications/msconfig_new/    @HBelusca
-
 # Network Drivers
 #   M:
 #   R: ThFabba, Thomas Faber
@@ -289,29 +215,11 @@
 #   S: Maintained
 /dll/ntdll/ @HeisSpiter @learn-more @ThFabba @tkreuzer
 
-# NT Virtual DOS Machine
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: reactos573, aandrejevic, Aleksandar Andrejevic
-#   S: Maintained
-/dll/win32/kernel32/client/vdm.c        @reactos573 @HBelusca
-/dll/win32/kernel32/include/vdm.h       @reactos573 @HBelusca
-/sdk/include/reactos/subsys/win/vdm.h   @reactos573 @HBelusca
-/ntoskrnl/vdm/                          @reactos573 @HBelusca
-/sdk/include/reactos/libs/fast486/      @reactos573 @HBelusca
-/sdk/lib/fast486/                       @reactos573 @HBelusca
-/subsystems/mvdm/                       @reactos573 @HBelusca
-/subsystems/win/basesrv/vdm.*           @reactos573 @HBelusca
-
 # Printing
 #   M: ColinFinck, Colin Finck
 #   S: Maintained
 /win32ss/printing/ @ColinFinck
 
-# Program Manager
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/shell/progman/    @HBelusca
-
 # ReactOS API Tests
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
@@ -324,25 +232,7 @@
 #   S: Maintained
 /modules/rostests/kmtests/  @ThFabba
 
-# ReactOS Setup
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: EricKohl, ekohl, Eric Kohl
-#   S: Maintained
-/base/setup/                        @HBelusca
-/base/system/winlogon/setup.c       @EricKohl
-/dll/win32/setupapi/
-/dll/win32/syssetup/                @EricKohl
-/drivers/setup/                     @HBelusca
-/sdk/include/reactos/libs/syssetup/ @EricKohl
-
-# ReactOS miscellaneous tools
-#   M:
-#   R: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/modules/rosapps/applications/cmdutils/cat/             @HBelusca
-/modules/rosapps/applications/sysutils/utils/partinfo/  @HBelusca
-
-# ReactOS internals tools
+# ROS internals tools
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
 #   S: Maintained
 /modules/rosapps/applications/rosinternals/ @HeisSpiter
@@ -362,26 +252,15 @@
 /modules/rostests/kmtests/ntos_se/   @GeoB99
 /ntoskrnl/se/                        @GeoB99
 
-# Session Manager Subsystem
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/system/smss/              @HBelusca
-/sdk/include/reactos/subsys/sm/ @HBelusca
-/sdk/lib/smlib/                 @HBelusca
-
 # Shell
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
 #   R: yagoulas, Giannis Adamopoulos
-#   R: HBelusca, Hermès Bélusca-Maïto
 #   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
-/dll/win32/shell32/CShellLink.*         @HBelusca
-/dll/win32/shell32/CUserNotification.*  @HBelusca
-/dll/win32/shell32/systray.cpp          @HBelusca
 
 # Shell Extensions
 #   M:
@@ -430,34 +309,10 @@
 /modules/rosapps/applications/cmdutils/vfdcmd/  @HeisSpiter
 /modules/rosapps/drivers/vfd/                   @HeisSpiter
 
-# Win32 Subsystem
-#   M:
-#   R: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/sdk/include/reactos/winbase_undoc.h        @HBelusca
-/subsystems/win/basesrv/
-/win32ss/user/winsrv/
-/win32ss/user/winsrv/usersrv/harderror.c    @HBelusca
-
-# Win32 Subsystem - File functions
+# Win32 file functions
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
-#   R: HBelusca, Hermès Bélusca-Maïto
 #   S: Maintained
-/dll/win32/kernel32/client/file/        @HeisSpiter
-/dll/win32/kernel32/client/file/find.c  @HBelusca
-
-# Win32 Subsystem - Shutdown
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: EricKohl, ekohl, Eric Kohl
-#   S: Maintained
-/base/system/winlogon/sas.c             @EricKohl @HBelusca
-/base/system/winlogon/shutdown.c        @EricKohl @HBelusca
-/dll/win32/advapi32/misc/shutdown.c     @EricKohl
-/dll/win32/msgina/shutdown.c            @EricKohl @HBelusca
-/win32ss/user/ntuser/shutdown.*         @HBelusca
-/win32ss/user/user32/misc/exit.c        @HBelusca
-/win32ss/user/winsrv/consrv/shutdown.c  @HBelusca
-/win32ss/user/winsrv/usersrv/shutdown.c @HBelusca
+/dll/win32/kernel32/client/file/    @HeisSpiter
 
 # Windows Network File Systems functions
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
@@ -483,11 +338,6 @@
 amd64/                                      @tkreuzer
 /boot/freeldr/freeldr/arch/realmode/amd64.S @tkreuzer
 
-# Wine DirectX
-#   M: DarkFire01, The_DarkFire_, Justin Miller
-#   S: Upstream
-/dll/directx/wine/  @DarkFire01
-
 # Translations
 # This is the list of translation teams in ReactOS GitHub organization.
 # If you want to be part of one - hit us at https://chat.reactos.org/

CODING_STYLE.md

@@ -1,356 +0,0 @@
-# Coding Style
-
-This article describes general coding style guidelines, which should be used for new ReactOS code. These guidelines apply exclusively to C and C++ source files. The Members of ReactOS agreed on this document in the October 2013 meeting.
-
-As much existing ReactOS code as possible should be converted to this style unless there are reasons against doing this (like if the code is going to be rewritten from scratch in the near future). See [Notes on reformatting existing code](#notes-on-reformatting-existing-code) for more details.
-
-Code synchronized with other sources (like Wine) must not be rewritten. [3rd Party Files.txt](https://github.com/reactos/reactos/blob/master/media/doc/3rd%20Party%20Files.txt) and [WINESYNC.txt](https://github.com/reactos/reactos/blob/master/media/doc/WINESYNC.txt) files can be used for tracking synchronized files.
-
-## File Structure
-
-1. Every ReactOS source code file should include a file header like this:
-
-```
-/*
- * PROJECT:     ReactOS Kernel
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Does cool things like Memory Management
- * COPYRIGHT:   Copyright 2017 Arno Nymous <abc@mailaddress.com>
- *              Copyright 2017 Mike Blablabla <mike@blabla.com>
- */
-```
-
-Please use SPDX license identifiers available at https://spdx.org/licenses.
-This makes our source file parseable by licensing tools!
-
-You should add yourself to the `COPYRIGHT` section of a file if you did a major contribution to it and could take responsibility for the whole file or a part of it. Not more than 3 people shall be in that list for each file.
-
-`FILE` line of the old header should be removed.
-
-2. [Doxygen](https://doxygen.reactos.org/) documentation generator is used for ReactOS codebase, so use a proper header for functions, see [API Documentation](https://reactos.org/wiki/Documentation_Guidelines#API_Documentation) for details.
-
-## Indentation and line width
-
-1. Line width must be at most **100 characters**.
-2. Do not add a space or tab at the end of any line.
-3. Indent with **4 spaces**, don't use tabs!
-4. Indent both a case label and the case statement of a switch statement.
-
-**Right:**
-```c
-switch (Condition)
-{
-    case 1:
-        DoSomething();
-        break;
-
-    case 2:
-    {
-        DoMany();
-        ManyMore();
-        OtherThings();
-        break;
-    }
-}
-```
-
-**Wrong:**
-```c
-switch(Condition)
-{
-case 1:
-     DoSomething();
-     break;
-case 2:
-    DoMany();
-    ManyMore();
-    OtherThings();
-    break;
-}
-```
-
-5. When a function call does not fit onto a line, align arguments like this:
-```c
-FunctionCall(arg1,
-             arg2,
-             arg3);
-```
-
-6. Function headers should have this format (preserving the order as in the example):
-```c
-static    // scope identifier
-CODE_SEG("PAGE")    // section placement
-// other attributes
-BOOLEAN    // return type
-FASTCALL    // calling convention
-IsOdd(
-    _In_ UINT32 Number);
-```
-
-## Spacing
-
-1. Do not use spaces around unary operators.  
-**Right:** `i++;`  
-**Wrong:** `i ++;`
-
-2. Place spaces around binary and ternary operators.  
-**Right:** `a = b + c;`  
-**Wrong:** `a=b+c;`
-
-3. Do not place spaces before comma and semicolon.
-
-**Right:**
-```c
-for (int i = 0; i < 5; i++)
-    DoSomething();
-
-func1(a, b);
-```
-
-**Wrong:**
-```c
-for (int i = 0; i < 5 ; i++)
-    DoSomething();
-
-func1(a , b) ;
-```
-
-4. Place spaces between control statements and their parentheses.
-
-**Right:**
-```c
-if (Condition)
-    DoSomething();
-```
-
-**Wrong:**
-```c
-if(Condition)
-    DoSomething();
-```
-
-5. Do not place spaces between a function and its parentheses, or between a parenthesis and its content.
-
-**Right:**
-```c
-func(a, b);
-```
-
-**Wrong:**
-```c
-func (a, b);
-func( a, b );
-```
-
-## Line breaking
-
-1. Each statement should get its own line.
-
-**Right:**
-```c
-x++;
-y++;
-
-if (Condition)
-    DoSomething();
-```
-
-**Wrong:**
-```c
-x++; y++;
-
-if (Condition) DoSomething();
-```
-
-## Braces
-
-1. Always put braces (`{` and `}`) on their own lines.
-2. One-line control clauses may use braces, but this is not a requirement. An exception are one-line control clauses including additional comments.
-
-**Right:**
-```c
-if (Condition)
-    DoSomething();
-
-if (Condition)
-{
-    DoSomething();
-}
-
-if (Condition)
-{
-    // This is a comment
-    DoSomething();
-}
-
-if (A_Very || (Very && Long || Condition) &&
-    On_Many && Lines)
-{
-    DoSomething();
-}
-
-if (Condition)
-    DoSomething();
-else
-    DoSomethingElse();
-
-if (Condition)
-{
-    DoSomething();
-}
-else
-{
-    DoSomethingElse();
-    YetAnother();
-}
-```
-
-**Wrong:**
-```c
-if (Condition) {
-    DoSomething();
-}
-
-if (Condition)
-    // This is a comment
-    DoSomething();
-
-if (A_Very || (Very && Long || Condition) &&
-    On_Many && Lines)
-    DoSomething();
-
-if (Condition)
-    DoSomething();
-else {
-    DoSomethingElse();
-    YetAnother();
-}
-```
-
-## Control structures
-
-1. Don't use inverse logic in control clauses.  
-**Right:** `if (i == 1)`  
-**Wrong:** `if (1 == i)`
-
-2. Avoid too many levels of cascaded control structures. Prefer a "linear style" over a "tree style". Use `goto` when it helps to make the code cleaner (e.g. for cleanup paths).
-
-**Right:**
-```c
-if (!func1())
-    return;
-
-i = func2();
-if (i == 0)
-    return;
-
-j = func3();
-if (j == 1)
-    return;
-...
-```
-
-**Wrong:**
-```c
-if (func1())
-{
-    i = func2();
-    if (func2())
-    {
-        j = func3();
-        if (func3())
-        {
-            ...
-        }
-    }
-}
-```
-
-## Naming
-
-1. Capitalize names of variables and functions. Hungarian Notation may be used when developing for Win32, but it is not required. If you don't use it, the first letter of a name must be a capital too (no lowerCamelCase). Do not use underscores as separators either.
-
-**Right:**
-```c
-PLIST_ENTRY FirstEntry;
-VOID NTAPI IopDeleteIoCompletion(PVOID ObjectBody);
-PWSTR pwszTest;
-```
-
-**Wrong:**
-```c
-PLIST_ENTRY first_entry;
-VOID NTAPI iop_delete_io_completion(PVOID objectBody);
-PWSTR pwsztest;
-```
-
-2. Avoid abbreviating function and variable names, use descriptive verbs where possible.
-
-3. Precede boolean values with meaningful verbs like "is" and "did" if possible and if it fits the usage.
-
-**Right:**
-```c
-BOOLEAN IsValid;
-BOOLEAN DidSendData;
-```
-
-**Wrong:**
-```c
-BOOLEAN Valid;
-BOOLEAN SentData;
-```
-
-## Commenting
-
-1. Avoid line-wasting comments, which could fit into a single line.
-
-**Right:**
-```c
-// This is a one-line comment
-
-/* This is a C-style comment */
-
-// This is a comment over multiple lines.
-// We don't define any strict rules for it.
-```
-
-**Wrong:**
-```c
-//
-// This comment wastes two lines
-//
-```
-
-## Null, false and 0
-
-1. The null pointer should be written as `NULL`. In the rare case that your environment recommends a different null pointer (e.g. C++11 `nullptr`), you may use this one of course. Just don't use the value `0`.
-
-2. Win32/NT Boolean values should be written as `TRUE` and `FALSE`. In the rare case that you use C/C++ `bool` variables, you should write them as `true` and `false`.
-
-3. When you need to terminate ANSI or OEM string, or check for its terminator, use `ANSI_NULL`. If the string is Unicode or Wide string, use `UNICODE_NULL`.
-
-## Notes on reformatting existing code
-
-- Never totally reformat a file and put a code change into it. Do this in separate commits.
-- If a commit only consists of formatting changes, say this clearly in the commit message by preceding it with *[FORMATTING]*.
-
-## Other points
-
-- Do not use `LARGE_INTEGER`/`ULARGE_INTEGER` unless needed for using APIs. Use `INT64`/`UINT64` instead
-- Use `#pragma once` instead of guard defines in headers
-- Don't specify a calling convention for a function unless required (usually for APIs or exported symbols)
-
-## Using an automatic code style tool
-
-TO BE ADDED BY User:Zefklop
-
-## Points deliberately left out
-
-Additional ideas were suggested during the discussion of this document, but a consensus couldn't be reached on them. Therefore we refrain from enforcing any rules on these points:
-
-- TO BE ADDED BY User:Hbelusca
-
-## See also
-
-- [Kernel Coding Style](https://reactos.org/wiki/Kernel_Coding_Style)
-- [GNU Indent](https://reactos.org/wiki/GNU_Indent)

README.md

@@ -7,8 +7,8 @@
 ---
 
 <p align=center>
-  <a href="https://reactos.org/project-news/reactos-0415-released/">
-    <img alt="ReactOS 0.4.15 Release" src="https://img.shields.io/badge/release-0.4.15-0688CB.svg"></a>
+  <a href="https://reactos.org/project-news/reactos-0414-released/">
+    <img alt="ReactOS 0.4.14 Release" src="https://img.shields.io/badge/release-0.4.14-0688CB.svg"></a>
   <a href="https://reactos.org/download/">
     <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg"></a>
   <a href="https://sourceforge.net/projects/reactos/">

base/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_subdirectory(applications)
-add_subdirectory(ctf)
 add_subdirectory(services)
 add_subdirectory(setup)
 add_subdirectory(shell)

base/applications/CMakeLists.txt

@@ -3,10 +3,10 @@ add_subdirectory(atactl)
 add_subdirectory(cacls)
 add_subdirectory(calc)
 add_subdirectory(charmap)
-add_subdirectory(cleanmgr)
 add_subdirectory(clipbrd)
 add_subdirectory(cmdutils)
 add_subdirectory(control)
+add_subdirectory(ctfmon)
 add_subdirectory(drwtsn32)
 add_subdirectory(dxdiag)
 add_subdirectory(extrac32)

base/applications/calc/resource.rc

@@ -28,7 +28,7 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* Icons */
-IDI_CALC ICON "res/calc.ico"
+IDI_CALC ICON DISCARDABLE "res/calc.ico"
 
 /* Manifest */
 #include <reactos/manifest_exe.rc>

base/applications/calc/winmain.c

@@ -1015,16 +1015,10 @@ static void handle_copy_command(HWND hWnd)
     TCHAR display[MAX_CALC_SIZE];
     UINT  n;
 
-    // Read current text from output display
     n = GetDlgItemText(hWnd, IDC_TEXT_OUTPUT, display, SIZEOF(display));
 
-    // Check if result is a true number
-    if (!calc.is_nan)
-    {
-        // Remove trailing decimal point if no decimal digits exist
-        if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, _T('.')) == NULL)
-            display[n - calc.sDecimal_len] = _T('\0');
-    }
+    if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, _T('.')) == NULL)
+        display[n - calc.sDecimal_len] = _T('\0');
 
     CopyMemToClipboard(display);
 }

base/applications/charmap/map.c

@@ -801,13 +801,11 @@ MapWndProc(HWND hwnd,
                     infoPtr->CurrentFont.lfFaceName,
                     SIZEOF(lfFaceName));
             SetFont(infoPtr, lfFaceName);
-            SetCaretXY(infoPtr, infoPtr->CaretX, infoPtr->CaretY, FALSE, TRUE);
             break;
 
         case FM_SETFONT:
             infoPtr->CaretX = infoPtr->CaretY = infoPtr->iYStart = 0;
             SetFont(infoPtr, (LPWSTR)lParam);
-            SetCaretXY(infoPtr, infoPtr->CaretX, infoPtr->CaretY, FALSE, TRUE);
             break;
 
         case FM_GETCHAR:

base/applications/cleanmgr/CMakeLists.txt

@@ -1,9 +0,0 @@
-
-project(cleanmgr)
-
-# The main application
-add_subdirectory(cleanmgr)
-
-# Cleanup handlers
-#add_subdirectory(dataclen)     # Data Driven Cleaner
-

base/applications/cleanmgr/cleanmgr/CCleanupHandler.cpp

@@ -1,212 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandler implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-
-CCleanupHandler::CCleanupHandler(CRegKey &subKey, const CStringW &keyName, const GUID &guid)
-    : hSubKey(subKey)
-    , KeyName(keyName)
-    , Guid(guid)
-    , dwFlags(0)
-    , Priority(0)
-    , StateFlags(0)
-    , SpaceUsed(0)
-    , ShowHandler(true)
-    , hIcon(NULL)
-{
-}
-
-CCleanupHandler::~CCleanupHandler()
-{
-    Deactivate();
-    ::DestroyIcon(hIcon);
-}
-
-void
-CCleanupHandler::Deactivate()
-{
-    if (Handler)
-    {
-        DWORD dwFlags = 0;
-        Handler->Deactivate(&dwFlags);
-        if (dwFlags & EVCF_REMOVEFROMLIST)
-            UNIMPLEMENTED_DBGBREAK();
-    }
-}
-
-bool
-CCleanupHandler::Initialize(LPCWSTR pcwszVolume)
-{
-    if (FAILED_UNEXPECTEDLY(
-            ::CoCreateInstance(Guid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IEmptyVolumeCache, &Handler))))
-    {
-        return false;
-    }
-
-    DWORD dwSize = sizeof(Priority);
-    if (hSubKey.QueryBinaryValue(L"Priority", &Priority, &dwSize) != ERROR_SUCCESS)
-    {
-        if (hSubKey.QueryDWORDValue(L"Priority", Priority) != ERROR_SUCCESS)
-            Priority = 200;
-    }
-
-    dwSize = sizeof(StateFlags);
-    if (hSubKey.QueryDWORDValue(L"StateFlags", StateFlags) != ERROR_SUCCESS)
-        StateFlags = 0;
-
-    WCHAR PathBuffer[MAX_PATH] = {};
-    ULONG nChars = _countof(PathBuffer);
-    if (hSubKey.QueryStringValue(L"IconPath", PathBuffer, &nChars) != ERROR_SUCCESS)
-    {
-        CStringW Tmp;
-        WCHAR GuidStr[50] = {};
-        if (StringFromGUID2(Guid, GuidStr, _countof(GuidStr)))
-        {
-            Tmp.Format(L"CLSID\\%s\\DefaultIcon", GuidStr);
-            CRegKey clsid;
-            nChars = _countof(PathBuffer);
-            if (clsid.Open(HKEY_CLASSES_ROOT, Tmp, KEY_READ) != ERROR_SUCCESS ||
-                clsid.QueryStringValue(NULL, PathBuffer, &nChars) != ERROR_SUCCESS)
-            {
-                PathBuffer[0] = UNICODE_NULL;
-            }
-        }
-    }
-    if (!PathBuffer[0])
-        StringCchCopyW(PathBuffer, _countof(PathBuffer), L"%systemroot%\\system32\\shell32.dll");
-
-    int Index = 0;
-    WCHAR *ptr = wcschr(PathBuffer, L',');
-    if (ptr)
-    {
-        *ptr++ = UNICODE_NULL;
-        Index = wcstol(ptr, NULL, 10);
-    }
-    HICON Large, Small;
-    UINT Result = ExtractIconExW(PathBuffer, Index, &Large, &Small, 1);
-    if (Result < 1)
-        Result = ExtractIconExW(L"%systemroot%\\system32\\shell32.dll", 0, &Large, &Small, 1);
-    if (Result >= 1)
-    {
-        hIcon = Small;
-        if (!hIcon)
-        {
-            hIcon = Large;
-        }
-        else
-        {
-            ::DestroyIcon(Large);
-        }
-    }
-
-    // These options should come from the command line
-    // dwFlags |= EVCF_SETTINGSMODE;
-    // dwFlags |= EVCF_OUTOFDISKSPACE;
-
-    CComPtr<IEmptyVolumeCache2> spHandler2;
-    HRESULT hr = Handler->QueryInterface(IID_PPV_ARG(IEmptyVolumeCache2, &spHandler2));
-    if (SUCCEEDED(hr))
-    {
-        hr = spHandler2->InitializeEx(
-            hSubKey, pcwszVolume, KeyName, &wszDisplayName, &wszDescription, &wszBtnText, &dwFlags);
-        if (FAILED_UNEXPECTEDLY(hr))
-            return false;
-
-        // No files to clean will return S_FALSE;
-        if (hr != S_OK)
-            return false;
-    }
-    else
-    {
-        // Observed behavior:
-        // When Initialize is called, wszDescription is actually pointing to data
-        // wszDescription.AllocateBytes(0x400u);
-        hr = Handler->Initialize(hSubKey, pcwszVolume, &wszDisplayName, &wszDescription, &dwFlags);
-        if (FAILED_UNEXPECTEDLY(hr))
-            return false;
-
-        // No files to clean will return S_FALSE;
-        if (hr != S_OK)
-            return false;
-
-        CComPtr<IPropertyBag> spBag;
-        WCHAR GuidStr[50] = {};
-        nChars = _countof(GuidStr);
-        if (hSubKey.QueryStringValue(L"PropertyBag", GuidStr, &nChars) == ERROR_SUCCESS)
-        {
-            GUID guid = {};
-            if (!FAILED_UNEXPECTEDLY(CLSIDFromString(GuidStr, &guid)))
-            {
-                FAILED_UNEXPECTEDLY(
-                    CoCreateInstance(guid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IPropertyBag, &spBag)));
-            }
-        }
-        ReadProperty(L"Display", spBag, wszDisplayName);
-        ReadProperty(L"Description", spBag, wszDescription);
-
-        if (dwFlags & EVCF_HASSETTINGS)
-        {
-            ReadProperty(L"AdvancedButtonText", spBag, wszBtnText);
-        }
-    }
-
-    if ((dwFlags & EVCF_ENABLEBYDEFAULT) && !(StateFlags & HANDLER_STATE_SELECTED))
-    {
-        StateFlags |= HANDLER_STATE_SELECTED;
-    }
-
-    // For convenience
-    if (!wszDisplayName)
-        SHStrDupW(KeyName, &wszDisplayName);
-
-    return true;
-}
-
-void
-CCleanupHandler::ReadProperty(LPCWSTR Name, IPropertyBag *pBag, CComHeapPtr<WCHAR> &storage)
-{
-    if (storage)
-        return;
-
-    if (pBag)
-    {
-        CComVariant tmp;
-        tmp.vt = VT_BSTR;
-        HRESULT hr = pBag->Read(Name, &tmp, NULL);
-        if (!FAILED_UNEXPECTEDLY(hr) && tmp.vt == VT_BSTR)
-        {
-            SHStrDupW(tmp.bstrVal, &storage);
-        }
-    }
-
-    if (!storage)
-    {
-        WCHAR TmpStr[0x200] = {};
-        DWORD dwSize = _countof(TmpStr);
-
-        if (hSubKey.QueryStringValue(Name, TmpStr, &dwSize) == ERROR_SUCCESS)
-        {
-            WCHAR ResolvedStr[0x200] = {};
-            SHLoadIndirectString(TmpStr, ResolvedStr, _countof(ResolvedStr), NULL);
-            SHStrDupW(ResolvedStr, &storage);
-        }
-    }
-}
-
-BOOL
-CCleanupHandler::HasSettings() const
-{
-    return !!(dwFlags & EVCF_HASSETTINGS);
-}
-
-BOOL
-CCleanupHandler::DontShowIfZero() const
-{
-    return !!(dwFlags & EVCF_DONTSHOWIFZERO);
-}
-

base/applications/cleanmgr/cleanmgr/CCleanupHandler.hpp

@@ -1,48 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandler definition
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#define HANDLER_STATE_SELECTED 1
-
-
-struct CCleanupHandler
-{
-    CCleanupHandler(CRegKey &subKey, const CStringW &keyName, const GUID &guid);
-    ~CCleanupHandler();
-
-    void Deactivate();
-
-    bool
-    Initialize(LPCWSTR pcwszVolume);
-
-    void
-    ReadProperty(LPCWSTR Name, IPropertyBag *pBag, CComHeapPtr<WCHAR> &storage);
-
-    BOOL
-    HasSettings() const;
-
-    BOOL
-    DontShowIfZero() const;
-
-    CRegKey hSubKey;
-    CStringW KeyName;
-    GUID Guid;
-
-    CComHeapPtr<WCHAR> wszDisplayName;
-    CComHeapPtr<WCHAR> wszDescription;
-    CComHeapPtr<WCHAR> wszBtnText;
-
-    CStringW IconPath;
-    DWORD dwFlags;
-    DWORD Priority;
-    DWORD StateFlags;
-
-    CComPtr<IEmptyVolumeCache> Handler;
-    DWORDLONG SpaceUsed;
-    bool ShowHandler;
-    HICON hIcon;
-};
-

base/applications/cleanmgr/cleanmgr/CCleanupHandlerList.cpp

@@ -1,163 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandlerList implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-void CCleanupHandlerList::LoadHandlers(WCHAR Drive)
-{
-    m_DriveStr.Format(L"%c:", Drive);
-
-    CRegKey VolumeCaches;
-    if (VolumeCaches.Open(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VolumeCaches", KEY_READ) != ERROR_SUCCESS)
-        return;
-
-    LONG ItemIndex = 0;
-    WCHAR szKeyName[MAX_PATH];
-
-    WCHAR wszVolume[] = { Drive, L':', L'\\', UNICODE_NULL };
-
-    while (TRUE)
-    {
-        DWORD dwSize = _countof(szKeyName);
-        if (VolumeCaches.EnumKey(ItemIndex++, szKeyName, &dwSize) != ERROR_SUCCESS)
-        {
-            break;
-        }
-
-
-        CRegKey hSubKey;
-        if (hSubKey.Open(VolumeCaches, szKeyName, KEY_READ) == ERROR_SUCCESS)
-        {
-            WCHAR GuidStr[50] = {};
-            dwSize = _countof(GuidStr);
-            if (hSubKey.QueryStringValue(NULL, GuidStr, &dwSize) != ERROR_SUCCESS)
-            {
-                continue;
-            }
-
-            GUID guid = {};
-            if (FAILED_UNEXPECTEDLY(CLSIDFromString(GuidStr, &guid)))
-                continue;
-
-            CCleanupHandler* handler = new CCleanupHandler(hSubKey, szKeyName, guid);
-
-            if (!handler->Initialize(wszVolume))
-            {
-                delete handler;
-                continue;
-            }
-
-            m_Handlers.AddTail(handler);
-        }
-    }
-
-    // Sort handlers
-    BOOL fChanged = m_Handlers.GetCount() > 0;
-    while (fChanged)
-    {
-        fChanged = FALSE;
-
-        for (size_t n = 0; n < m_Handlers.GetCount() - 1; n++)
-        {
-            POSITION leftPos = m_Handlers.FindIndex(n);
-            POSITION rightPos = m_Handlers.FindIndex(n+1);
-            CCleanupHandler* left = m_Handlers.GetAt(leftPos);
-            CCleanupHandler* right = m_Handlers.GetAt(rightPos);
-
-            if (right->Priority < left->Priority)
-            {
-                m_Handlers.SwapElements(leftPos, rightPos);
-                fChanged = TRUE;
-            }
-            else if (right->Priority == left->Priority)
-            {
-                CStringW leftStr(left->wszDisplayName);
-                if (leftStr.Compare(right->wszDisplayName) > 0)
-                {
-                    m_Handlers.SwapElements(leftPos, rightPos);
-                    fChanged = TRUE;
-                }
-            }
-        }
-    }
-}
-
-
-DWORDLONG
-CCleanupHandlerList::ScanDrive(IEmptyVolumeCacheCallBack *picb)
-{
-    CProgressDlg progress;
-    CString Caption;
-    Caption.Format(IDS_CALCULATING, m_DriveStr.GetString());
-    CStringW Title(MAKEINTRESOURCE(IDS_DISK_CLEANUP));
-    progress.Start((DWORD)m_Handlers.GetCount(), Title, Caption);
-    int ItemIndex = 0;
-    DWORDLONG TotalSpaceUsed = 0;
-    ForEach(
-        [&](CCleanupHandler *current)
-        {
-            Caption.Format(IDS_SCANNING, current->wszDisplayName.m_pData);
-            progress.Step(++ItemIndex, Caption);
-
-            HRESULT hr = current->Handler->GetSpaceUsed(&current->SpaceUsed, picb);
-
-            if (FAILED_UNEXPECTEDLY(hr))
-            {
-                current->ShowHandler = false;
-                current->StateFlags &= ~HANDLER_STATE_SELECTED;
-                return;
-            }
-
-            if (current->SpaceUsed == 0 && current->DontShowIfZero())
-            {
-                current->ShowHandler = false;
-                current->StateFlags &= ~HANDLER_STATE_SELECTED;
-            }
-            TotalSpaceUsed += current->SpaceUsed;
-        });
-    progress.Stop();
-
-    return TotalSpaceUsed;
-}
-
-void
-CCleanupHandlerList::ExecuteCleanup(IEmptyVolumeCacheCallBack *picb)
-{
-    CProgressDlg progress;
-    CString Caption;
-    Caption.Format(IDS_CLEANING_CAPTION, m_DriveStr.GetString());
-
-    DWORD TotalSelected = 0;
-    ForEach(
-        [&](CCleanupHandler *current)
-        {
-            if (current->StateFlags & HANDLER_STATE_SELECTED)
-                TotalSelected++;
-        });
-
-    CStringW Title(MAKEINTRESOURCE(IDS_DISK_CLEANUP));
-    progress.Start(TotalSelected, Title, Caption);
-    int ItemIndex = 0;
-    ForEach(
-        [&](CCleanupHandler *current)
-        {
-            if (!(current->StateFlags & HANDLER_STATE_SELECTED))
-                return;
-
-            Caption.Format(IDS_CLEANING, current->wszDisplayName.m_pData);
-            progress.Step(++ItemIndex, Caption);
-
-            // If there is nothing to clean, we might get STG_E_NOMOREFILES
-            if (current->SpaceUsed > 0)
-            {
-                HRESULT hr = current->Handler->Purge(-1, picb);
-                if (FAILED_UNEXPECTEDLY(hr))
-                    return;
-            }
-        });
-    progress.Stop();
-}

base/applications/cleanmgr/cleanmgr/CCleanupHandlerList.hpp

@@ -1,31 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandlerList definition
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-
-class CCleanupHandlerList
-{
-private:
-    CAtlList<CCleanupHandler *> m_Handlers;
-    CStringW m_DriveStr;
-
-public:
-
-    void LoadHandlers(WCHAR Drive);
-    DWORDLONG ScanDrive(IEmptyVolumeCacheCallBack* picb);
-    void ExecuteCleanup(IEmptyVolumeCacheCallBack *picb);
-
-    template<typename Fn>
-    void ForEach(Fn callback)
-    {
-        for (POSITION it = m_Handlers.GetHeadPosition(); it; m_Handlers.GetNext(it))
-        {
-            CCleanupHandler *current = m_Handlers.GetAt(it);
-
-            callback(current);
-        }
-    }
-};

base/applications/cleanmgr/cleanmgr/CEmptyVolumeCacheCallBack.hpp

@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CEmptyVolumeCacheCallBack definition / implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-
-// We don't really use this, but some windows handlers crash without it
-struct CEmptyVolumeCacheCallBack
-    : public IEmptyVolumeCacheCallBack
-{
-
-    STDMETHOD_(ULONG, AddRef)() throw()
-    {
-        return 2;
-    }
-    STDMETHOD_(ULONG, Release)() throw()
-    {
-        return 1;
-    }
-    STDMETHOD(QueryInterface)(
-        REFIID riid,
-        _COM_Outptr_ void** ppvObject) throw()
-    {
-        if (riid == IID_IUnknown || riid == IID_IEmptyVolumeCacheCallBack)
-        {
-            *ppvObject = (IUnknown*)this;
-            return S_OK;
-        }
-        *ppvObject = NULL;
-        return E_NOINTERFACE;
-    }
-
-
-    STDMETHODIMP ScanProgress(
-        _In_ DWORDLONG dwlSpaceUsed,
-        _In_ DWORD dwFlags,
-        _In_ LPCWSTR pcwszStatus) override
-    {
-        DPRINT("dwlSpaceUsed: %lld, dwFlags: %x\n", dwlSpaceUsed, dwFlags);
-        return S_OK;
-    }
-
-    STDMETHODIMP PurgeProgress(
-        _In_ DWORDLONG dwlSpaceFreed,
-        _In_ DWORDLONG dwlSpaceToFree,
-        _In_ DWORD dwFlags,
-        _In_ LPCWSTR pcwszStatus) override
-    {
-        DPRINT("dwlSpaceFreed: %lld, dwlSpaceToFree: %lld, dwFlags: %x\n", dwlSpaceFreed, dwlSpaceToFree, dwFlags);
-        return S_OK;
-    }
-};

base/applications/cleanmgr/cleanmgr/CMakeLists.txt

@@ -1,19 +0,0 @@
-
-add_executable(cleanmgr
-    cleanmgr.cpp
-    cleanmgr.h
-    cleanmgr.rc
-    resource.h
-    CEmptyVolumeCacheCallBack.hpp
-    CProgressDlg.hpp
-    CSelectDriveDlg.cpp
-    CCleanupHandler.cpp
-    CCleanupHandler.hpp
-    CCleanupHandlerList.cpp
-    CCleanupHandlerList.hpp
-)
-set_module_type(cleanmgr win32gui UNICODE)
-target_link_libraries(cleanmgr uuid cpprt atl_classes)
-add_importlibs(cleanmgr shlwapi oleaut32 ole32 shell32 comctl32 user32 advapi32 msvcrt kernel32 ntdll)
-add_dependencies(cleanmgr psdk)
-add_cd_file(TARGET cleanmgr DESTINATION reactos/system32 FOR all)

base/applications/cleanmgr/cleanmgr/CProgressDlg.hpp

@@ -1,50 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Progress dialog implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#pragma once
-
-class CProgressDlg
-{
-    CComPtr<IProgressDialog> m_spProgress;
-    DWORD m_dwTotal = 0;
-public:
-
-    ~CProgressDlg()
-    {
-        Stop();
-    }
-
-
-    void Start(DWORD dwTotalSteps, LPCWSTR Title, LPCWSTR Text)
-    {
-        HRESULT hr = CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_INPROC, IID_PPV_ARG(IProgressDialog, &m_spProgress));
-        if (FAILED_UNEXPECTEDLY(hr))
-            return;
-
-        m_dwTotal = dwTotalSteps;
-
-        m_spProgress->SetTitle(Title);
-        m_spProgress->SetLine(2, Text, TRUE, NULL);
-        m_spProgress->StartProgressDialog(NULL, NULL, PROGDLG_NOMINIMIZE, NULL);
-        m_spProgress->SetProgress(0, m_dwTotal);
-    }
-
-    void Step(DWORD dwProgress, LPCWSTR Text)
-    {
-        m_spProgress->SetProgress(dwProgress, m_dwTotal);
-        m_spProgress->SetLine(1, Text, TRUE, NULL);
-    }
-
-    void Stop()
-    {
-        if (m_spProgress)
-        {
-            m_spProgress->StopProgressDialog();
-            m_spProgress.Release();
-        }
-    }
-};

base/applications/cleanmgr/cleanmgr/CSelectDriveDlg.cpp

@@ -1,80 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Drive selection dialog
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-class CSelectDriveDlg : public CDialogImpl<CSelectDriveDlg>
-{
-public:
-    enum { IDD = IDD_SELECTDRIVE };
-
-    BEGIN_MSG_MAP(CSelectDriveDlg)
-        MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
-        COMMAND_ID_HANDLER(IDOK, OnEndDialog)
-        COMMAND_ID_HANDLER(IDCANCEL, OnEndDialog)
-    END_MSG_MAP()
-
-    CSelectDriveDlg()
-        :m_SelectedDrive(UNICODE_NULL)
-    {
-    }
-
-    LRESULT OnInitDialog(UINT, WPARAM, LPARAM, BOOL&)
-    {
-        // Try to find an existing instance of this dialog
-        WCHAR buf[300];
-        GetWindowTextW(buf, _countof(buf));
-        for (HWND hNext = NULL, hFind; (hFind = ::FindWindowExW(NULL, hNext, NULL, buf)) != NULL; hNext = hFind)
-        {
-            if (hFind != *this && ::IsWindowVisible(hFind))
-            {
-                ::SetForegroundWindow(hFind);
-                EndDialog(IDCANCEL);
-                return FALSE;
-            }
-        }
-
-        CWindow cbo = GetDlgItem(IDC_DRIVES);
-        WCHAR VolumeNameBuffer[MAX_PATH + 1];
-        CStringW Tmp;
-        for (WCHAR Drive = 'A'; Drive <= 'Z'; ++Drive)
-        {
-            WCHAR RootPathName[] = { Drive,':','\\',0 };
-            UINT Type = GetDriveTypeW(RootPathName);
-            if (Type == DRIVE_FIXED)
-            {
-                GetVolumeInformationW(RootPathName, VolumeNameBuffer, _countof(VolumeNameBuffer), 0, 0, 0, 0, 0);
-                Tmp.Format(L"%s (%.2s)", VolumeNameBuffer, RootPathName);
-
-                int index = (int)cbo.SendMessage(CB_ADDSTRING, NULL, (LPARAM)Tmp.GetString());
-                cbo.SendMessage(CB_SETITEMDATA, index, Drive);
-            }
-        }
-        cbo.SendMessage(CB_SETCURSEL, 0);
-        return 1;
-    }
-    LRESULT OnEndDialog(WORD, WORD wID, HWND, BOOL&)
-    {
-        CWindow cbo = GetDlgItem(IDC_DRIVES);
-        m_SelectedDrive = (WCHAR)cbo.SendMessage(CB_GETITEMDATA, cbo.SendMessage(CB_GETCURSEL));
-        EndDialog(wID);
-        return 0;
-    }
-
-    WCHAR m_SelectedDrive;
-};
-
-
-void
-SelectDrive(WCHAR &Drive)
-{
-    CSelectDriveDlg dlgSelectDrive;
-    if (dlgSelectDrive.DoModal() == IDOK)
-    {
-        Drive = dlgSelectDrive.m_SelectedDrive;
-    }
-}

base/applications/cleanmgr/cleanmgr/cleanmgr.cpp

@@ -1,328 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Disk cleanup entrypoint
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-// for listview with extend style LVS_EX_CHECKBOXES, State image 1 is the unchecked box, and state image 2 is the
-// checked box. see this: https://docs.microsoft.com/en-us/windows/win32/controls/extended-list-view-styles
-#define STATEIMAGETOINDEX(x) (((x)&LVIS_STATEIMAGEMASK) >> 12)
-#define STATEIMAGE_UNCHECKED 1
-#define STATEIMAGE_CHECKED 2
-
-
-struct CCleanMgrProperties :
-    public CPropertyPageImpl<CCleanMgrProperties>
-{
-    enum { IDD = IDD_PROPERTIES_MAIN };
-    CWindow m_HandlerListControl;
-    WCHAR m_Drive;
-    DWORDLONG m_TotalSpaceUsed;
-    CCleanupHandlerList* m_HandlerList;
-    bool m_IgnoreChanges = true;
-
-
-    CCleanMgrProperties(WCHAR Drive, DWORDLONG TotalSpaceUsed, CCleanupHandlerList *handlerList)
-        : m_Drive(Drive)
-        , m_TotalSpaceUsed(TotalSpaceUsed)
-        , m_HandlerList(handlerList)
-    {
-    }
-
-    int OnApply()
-    {
-        CStringW Title(MAKEINTRESOURCE(IDS_DISK_CLEANUP));
-        CStringW Text(MAKEINTRESOURCE(IDS_CONFIRM_DELETE));
-
-        if (MessageBoxW(Text, Title, MB_YESNO | MB_ICONQUESTION) != IDYES)
-            return PSNRET_INVALID;
-
-        return PSNRET_NOERROR;
-    }
-
-    LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-    {
-        HICON hIcon = (HICON)::LoadImageW(
-            _AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCEW(IDI_CLEANMGR), IMAGE_ICON, 0, 0,
-            LR_DEFAULTSIZE | LR_SHARED);
-        SendDlgItemMessage(IDC_DISKICON, STM_SETICON, (WPARAM)hIcon);
-
-        m_HandlerListControl = GetDlgItem(IDC_HANDLERLIST);
-        RECT rc;
-        m_HandlerListControl.GetClientRect(&rc);
-        rc.right -= GetSystemMetrics(SM_CXVSCROLL);
-
-        LV_COLUMN column = {};
-        column.mask = LVCF_FMT | LVCF_WIDTH;
-        column.fmt = LVCFMT_LEFT;
-        column.cx = rc.right * 80 / 100;
-        ListView_InsertColumn(m_HandlerListControl, 0, &column);
-        column.fmt = LVCFMT_RIGHT;
-        column.cx = rc.right * 20 / 100;
-
-        ListView_InsertColumn(m_HandlerListControl, 1, &column);
-        HIMAGELIST hImagelist = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 1, 1);
-        ListView_SetImageList(m_HandlerListControl, hImagelist, LVSIL_SMALL);
-
-        ListView_SetExtendedListViewStyleEx(m_HandlerListControl, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
-
-        m_HandlerList->ForEach(
-            [&](CCleanupHandler *current)
-            {
-                if (!current->ShowHandler)
-                    return;
-
-                LV_ITEM item = {};
-                item.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;
-                item.lParam = (LPARAM)current;
-                item.pszText = (LPWSTR)current->wszDisplayName;
-                item.iItem = ListView_GetItemCount(m_HandlerListControl);
-                item.iImage = ImageList_AddIcon(hImagelist, current->hIcon);
-                item.iItem = ListView_InsertItem(m_HandlerListControl, &item);
-                ListView_SetCheckState(
-                    m_HandlerListControl, item.iItem, !!(current->StateFlags & HANDLER_STATE_SELECTED));
-
-                item.mask = LVIF_TEXT;
-                WCHAR ByteSize[100] = {};
-                StrFormatByteSizeW(current->SpaceUsed, ByteSize, _countof(ByteSize));
-                ListView_SetItemText(m_HandlerListControl, item.iItem, 1, ByteSize);
-            });
-
-        // Now we should start responding to changes
-        m_IgnoreChanges = false;
-
-        // Select the first item
-        ListView_SetItemState(m_HandlerListControl, 0, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
-
-        UpdateSpaceUsed();
-        return TRUE;
-    }
-
-    CCleanupHandler* GetHandler(int Index)
-    {
-        LVITEMW item = {};
-        item.iItem = Index;
-        if (item.iItem >= 0)
-        {
-            item.mask = LVIF_PARAM;
-            ListView_GetItem(m_HandlerListControl, &item);
-            return (CCleanupHandler*)item.lParam;
-        }
-        return nullptr;
-    }
-
-
-    LRESULT OnDetails(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
-    {
-        CCleanupHandler *handler = GetHandler(ListView_GetNextItem(m_HandlerListControl, -1, LVIS_FOCUSED));
-        if (handler)
-        {
-            handler->Handler->ShowProperties(m_hWnd);
-        }
-        return 0L;
-    }
-
-    LRESULT OnHandlerItemchanged(int idCtrl, LPNMHDR pnmh, BOOL& bHandled)
-    {
-        if (idCtrl == IDC_HANDLERLIST)
-        {
-            // We are still initializing, don't respond to changes just yet!
-            if (m_IgnoreChanges)
-                return 0L;
-
-            LPNMLISTVIEW pnic = (LPNMLISTVIEW)pnmh;
-
-            // We only care about state changes
-            if (!(pnic->uChanged & LVIF_STATE))
-                return 0L;
-
-
-            INT ItemIndex = pnic->iItem;
-            if (ItemIndex == -1 || ItemIndex >= ListView_GetItemCount(pnic->hdr.hwndFrom))
-            {
-                return 0L;
-            }
-
-            bool GotSelected = (pnic->uNewState & LVIS_SELECTED) && !(pnic->uOldState & LVIS_SELECTED);
-            if (GotSelected)
-            {
-                CWindow DetailsButton = GetDlgItem(IDC_DETAILS);
-                CCleanupHandler* handler = (CCleanupHandler*)pnic->lParam;
-
-                SetDlgItemText(IDC_DESCRIPTION, handler->wszDescription ? handler->wszDescription : L"");
-                if (handler->HasSettings())
-                {
-                    DetailsButton.ShowWindow(SW_SHOW);
-                    DetailsButton.SetWindowText(handler->wszBtnText);
-                }
-                else
-                {
-                    DetailsButton.ShowWindow(SW_HIDE);
-                }
-            }
-
-            int iOldState = STATEIMAGETOINDEX(pnic->uOldState);
-            int iNewState = STATEIMAGETOINDEX(pnic->uNewState);
-
-            if ((iOldState ^ iNewState) == (STATEIMAGE_UNCHECKED ^ STATEIMAGE_CHECKED))
-            {
-                CCleanupHandler* handler = (CCleanupHandler*)pnic->lParam;
-                if (iNewState == STATEIMAGE_CHECKED)
-                    handler->StateFlags |= HANDLER_STATE_SELECTED;
-                else
-                    handler->StateFlags &= ~HANDLER_STATE_SELECTED;
-                UpdateSpaceUsed();
-            }
-        }
-        return 0L;
-    }
-
-    void UpdateSpaceUsed()
-    {
-        CStringW tmp;
-        WCHAR ByteSize[100];
-        StrFormatByteSizeW(m_TotalSpaceUsed, ByteSize, _countof(ByteSize));
-
-        tmp.Format(IDS_TOTAL_CLEANABLE_CAPTION, ByteSize, m_Drive);
-        SetDlgItemText(IDC_TOTAL_CLEANABLE, tmp);
-
-        DWORDLONG SelectedGained = 0;
-
-        m_HandlerList->ForEach(
-            [&](CCleanupHandler *current)
-            {
-                if (current->StateFlags & HANDLER_STATE_SELECTED)
-                {
-                    SelectedGained += current->SpaceUsed;
-                }
-            });
-
-        StrFormatByteSizeW(SelectedGained, ByteSize, _countof(ByteSize));
-        SetDlgItemText(IDC_SELECTED_GAINED, ByteSize);
-    }
-
-    BEGIN_MSG_MAP(CCleanMgrProperties)
-        MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
-        COMMAND_ID_HANDLER(IDC_DETAILS, OnDetails)
-        NOTIFY_HANDLER(IDC_HANDLERLIST, LVN_ITEMCHANGED, OnHandlerItemchanged)
-        CHAIN_MSG_MAP(CPropertyPageImpl<CCleanMgrProperties>)  // Allow the default handler to call 'OnApply' etc
-    END_MSG_MAP()
-};
-
-
-
-class CCleanMgrModule : public ATL::CAtlExeModuleT< CCleanMgrModule >
-{
-public:
-    WCHAR m_Drive = UNICODE_NULL;
-
-    bool ParseCommandLine(
-        _In_z_ LPCTSTR lpCmdLine,
-        _Out_ HRESULT* pnRetCode) throw()
-    {
-        int argc = 0;
-        CLocalPtr<LPWSTR> argv(CommandLineToArgvW(lpCmdLine, &argc));
-
-        for (int n = 1; n < argc; ++n)
-        {
-            if ((argv[n][0] == '/' || argv[n][0] == '-') && towlower(argv[n][1]) == 'd')
-            {
-                if (iswalpha(argv[n][2]))
-                {
-                    m_Drive = towupper(argv[n][2]);
-                    continue;
-                }
-                if ((n + 1) < argc)
-                {
-                    m_Drive = towupper(argv[n + 1][0]);
-                    ++n;
-                    continue;
-                }
-            }
-        }
-        *pnRetCode = S_OK;
-        return true;
-    }
-
-    static inline UINT GetWindowProcessId(_In_ HWND hWnd)
-    {
-        DWORD pid;
-        return GetWindowThreadProcessId(hWnd, &pid) ? pid : 0;
-    }
-
-    static BOOL CALLBACK EnumSingleInstanceCallback(_In_ HWND hWnd, _In_ LPARAM lParam)
-    {
-        if (::IsWindowVisible(hWnd) && (LPARAM)GetWindowProcessId(hWnd) == lParam)
-        {
-            ::SetForegroundWindow(hWnd);
-            return FALSE;
-        }
-        return TRUE;
-    }
-
-    HRESULT Run(_In_ int nShowCmd) throw()
-    {
-        if (m_Drive == UNICODE_NULL)
-        {
-            SelectDrive(m_Drive);
-        }
-
-        if (m_Drive == UNICODE_NULL)
-            return E_FAIL;
-
-        CStringW Title;
-        Title.Format(IDS_PROPERTIES_MAIN_TITLE, m_Drive);
-
-        HWND hWndInstance = ::CreateWindowExW(WS_EX_TOOLWINDOW, WC_STATIC, Title, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
-        for (HWND hNext = NULL, hFind; (hFind = ::FindWindowExW(NULL, hNext, WC_STATIC, Title)) != NULL; hNext = hFind)
-        {
-            if (hFind != hWndInstance)
-            {
-                ::EnumWindows(EnumSingleInstanceCallback, GetWindowProcessId(hFind));
-                return S_FALSE;
-            }
-        }
-
-        CCleanupHandlerList Handlers;
-        CEmptyVolumeCacheCallBack CacheCallBack;
-
-        Handlers.LoadHandlers(m_Drive);
-        DWORDLONG TotalSpaceUsed = Handlers.ScanDrive(&CacheCallBack);
-
-        CCleanMgrProperties cleanMgr(m_Drive, TotalSpaceUsed, &Handlers);
-        HPROPSHEETPAGE hpsp[1] = { cleanMgr.Create() };
-
-        PROPSHEETHEADERW psh = {  };
-        psh.dwSize = sizeof(psh);
-        psh.dwFlags = PSH_NOAPPLYNOW | PSH_USEICONID | PSH_NOCONTEXTHELP;
-        psh.hInstance = _AtlBaseModule.GetResourceInstance();
-        psh.pszIcon = MAKEINTRESOURCEW(IDI_CLEANMGR);
-        psh.pszCaption = Title;
-        psh.nPages = _countof(hpsp);
-        psh.phpage = hpsp;
-
-        if (PropertySheetW(&psh) >= 1)
-        {
-            ::DestroyWindow(hWndInstance); // Allow new "cleanmgr /D" without waiting for these handlers
-            Handlers.ExecuteCleanup(&CacheCallBack);
-        }
-        else
-        {
-            ::DestroyWindow(hWndInstance);
-        }
-        return S_OK;
-    }
-};
-
-CCleanMgrModule _AtlModule;
-
-
-
-extern "C" int WINAPI wWinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/,
-								LPWSTR /*lpCmdLine*/, int nShowCmd)
-{
-    return _AtlModule.WinMain(nShowCmd);
-}

base/applications/cleanmgr/cleanmgr/cleanmgr.h

@@ -1,66 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Main header file
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#pragma once
-
-#ifndef STRICT
-#define STRICT
-#endif
-
-#define _ATL_APARTMENT_THREADED
-#define _ATL_NO_AUTOMATIC_NAMESPACE
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
-#define ATL_NO_ASSERT_ON_DESTROY_NONEXISTENT_WINDOW
-
-#define _FORCENAMELESSUNION
-
-#include <ndk/rtlfuncs.h>
-#include <windef.h>
-#include <winbase.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <atlstr.h>
-#include <strsafe.h>
-#include <emptyvc.h>
-#include <atlcoll.h>
-
-
-using namespace ATL;
-
-#define NDEBUG
-#include <reactos/debug.h>
-#include <reactos/shellutils.h>
-#include <ui/rosdlgs.h>
-
-
-template <class T> class CLocalPtr
-    : public CHeapPtr<T, CLocalAllocator>
-{
-public:
-    CLocalPtr() throw()
-    {
-    }
-
-    explicit CLocalPtr(_In_ T* pData) throw() :
-        CHeapPtr<T, CLocalAllocator>(pData)
-    {
-    }
-};
-
-#include "resource.h"
-#include "CProgressDlg.hpp"
-#include "CCleanupHandler.hpp"
-#include "CCleanupHandlerList.hpp"
-#include "CEmptyVolumeCacheCallBack.hpp"
-
-// CSelectDriveDlg.cpp
-void
-SelectDrive(WCHAR &Drive);

base/applications/cleanmgr/cleanmgr/cleanmgr.rc

@@ -1,64 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Resources
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include <windef.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include "resource.h"
-
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Disk Cleanup"
-#define REACTOS_STR_INTERNAL_NAME     "cleanmgr"
-#define REACTOS_STR_ORIGINAL_FILENAME "cleanmgr.exe"
-#include <reactos/version.rc>
-
-#include <reactos/manifest_exe.rc>
-
-IDI_CLEANMGR ICON "resources/cleanmgr.ico"
-
-#pragma code_page(65001)
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE
-BEGIN
-    IDS_PROPERTIES_MAIN_TITLE "Disk Cleanup for (%c:)"
-    IDS_TOTAL_CLEANABLE_CAPTION "You can use Disk Cleanup to free up to %s of disk space on (%c:)."
-    IDS_DISK_CLEANUP "Disk Cleanup"
-    IDS_CONFIRM_DELETE "Are you sure you want to delete these files permanently?"
-    IDS_CALCULATING "Disk Cleanup is calculating how much space can be gained on (%s)."
-    IDS_SCANNING "Scanning: %s"
-    IDS_CLEANING_CAPTION "Disk Cleanup is cleaning up files on %s."
-    IDS_CLEANING "Cleaning: %s"
-END
-
-IDD_PROPERTIES_MAIN DIALOGEX 0, 0, 235, 215
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Disk Cleanup"
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    CONTROL         "",IDC_DISKICON,"Static",SS_ICON,6,6,20,20
-    LTEXT           "You can use Disk Cleanup to free up to 0.0MB of disk space on drive C.",IDC_TOTAL_CLEANABLE,36,6,192,18
-    LTEXT           "Files to delete:",IDC_STATIC,6,30,222,8
-    CONTROL         "",IDC_HANDLERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,6,42,222,66
-    LTEXT           "Total amount of disk space gained:",IDC_STATIC,6,114,144,8
-    RTEXT           "",IDC_SELECTED_GAINED,156,114,73,8
-    GROUPBOX        "Description",IDC_STATIC,6,126,222,84
-    LTEXT           "",IDC_DESCRIPTION,12,138,210,54
-    PUSHBUTTON      "Details...",IDC_DETAILS,150,192,74,14
-END
-
-IDD_SELECTDRIVE DIALOGEX 0, 0, 177, 74
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Disk Cleanup - Select Drive"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,30,48,50,14
-    PUSHBUTTON      "E&xit",IDCANCEL,96,48,50,14
-    LTEXT           "Select the drive to clean up.",IDC_STATIC,12,6,150,8
-    COMBOBOX        IDC_DRIVES,12,24,150,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-END
-

base/applications/cleanmgr/cleanmgr/resource.h

@@ -1,30 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Resource definitions
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#define IDC_STATIC                      -1
-
-#define IDI_CLEANMGR                    100
-
-#define IDD_PROPERTIES_MAIN             200
-#define IDC_DISKICON                    201
-#define IDC_TOTAL_CLEANABLE             202
-#define IDC_HANDLERLIST                 203
-#define IDC_SELECTED_GAINED             204
-#define IDC_DESCRIPTION                 205
-#define IDC_DETAILS                     206
-
-#define IDD_SELECTDRIVE                 220
-#define IDC_DRIVES                      221
-
-#define IDS_PROPERTIES_MAIN_TITLE       1000
-#define IDS_TOTAL_CLEANABLE_CAPTION     1001
-#define IDS_DISK_CLEANUP                1002
-#define IDS_CONFIRM_DELETE              1003
-#define IDS_CALCULATING                 1004
-#define IDS_SCANNING                    1005
-#define IDS_CLEANING_CAPTION            1006
-#define IDS_CLEANING                    1007

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

@@ -3,7 +3,6 @@
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     Implementation of Italian language for Clipboard Viewer
  * COPYRIGHT:   Copyright 2018 George Bișoc (george.bisoc@reactos.org)
- *              Copyright 2025 Gabriele Lo Re (gabrolr70@gmail.com)
  */
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
@@ -40,12 +39,12 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_CLIPBOARD "Visualizzatore Appunti condivisi"
-    STRING_CLIPFILE  "Elemento appunti condivisi"
-    STRING_DELETE_MSG "Cancella i contenuti degli appunti condivisi?"
-    STRING_DELETE_TITLE "Cancella appunti condivisi"
-    STRING_FORMAT_NT "Appunti condivisi di ReactOS (*.clp)"
-    STRING_FORMAT_GEN "Appunti condivisi (*.clp)"
+    STRING_CLIPBOARD "Visualizzatore di Clipboard"
+    STRING_CLIPFILE  "Elemento Clipboard"
+    STRING_DELETE_MSG "Cancella i contenuti del Clipboard?"
+    STRING_DELETE_TITLE "Cancella Clipboard"
+    STRING_FORMAT_NT "I file del Clipboard di ReactOS (*.clp)"
+    STRING_FORMAT_GEN "I file Clipboard (*.clp)"
 END
 
 STRINGTABLE
@@ -68,6 +67,6 @@ END
 
 STRINGTABLE
 BEGIN
-    ERROR_UNSUPPORTED_FORMAT "Gli appunti Condivisi contengono informazioni in formato data, che non possono essere visualizzate."
-    ERROR_INVALID_FILE_FORMAT "Il file selezionato non è un file di tipo appunti condivisi valido."
+    ERROR_UNSUPPORTED_FORMAT "Il Clipboard contiene informazioni in formato data, che non può essere visualizzato."
+    ERROR_INVALID_FILE_FORMAT "Il file selezionato non è un file di tipo clipboard valido."
 END

base/applications/clipbrd/winutils.c

@@ -257,9 +257,9 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE st
          *
          * FIXME: investigate!!
          * ANSWER: this is a Windows bug; part of the answer is there:
-         * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609-4478-b86a-976dab44c271/bug-clipboard-format-conversions-cfdib-cfdibv5-cfdib (DEAD_LINK)
+         * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609-4478-b86a-976dab44c271/bug-clipboard-format-conversions-cfdib-cfdibv5-cfdib
          * May be related:
-         * https://blog.talosintelligence.com/dangerous-clipboard/
+         * https://blog.talosintelligence.com/2015/10/dangerous-clipboard.html
          */
 #if 0
         if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) &&

base/applications/cmdutils/at/at.rc

@@ -9,7 +9,6 @@
 
 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

base/applications/cmdutils/certutil/CMakeLists.txt

@@ -2,14 +2,12 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
 
 list(APPEND SOURCE
-    asn.cpp
-    certutil.cpp
-    hashfile.cpp
+    certutil.c
     precomp.h)
 
 add_executable(certutil ${SOURCE})
 set_module_type(certutil win32cui UNICODE)
 target_link_libraries(certutil conutils ${PSEH_LIB})
-add_importlibs(certutil crypt32 advapi32 msvcrt kernel32)
+add_importlibs(certutil advapi32 msvcrt kernel32)
 add_pch(certutil precomp.h SOURCE)
 add_cd_file(TARGET certutil DESTINATION reactos/system32 FOR all)

base/applications/cmdutils/certutil/asn.cpp

@@ -1,508 +0,0 @@
-/*
- * PROJECT:     ReactOS certutil
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CertUtil asn implementation
- * COPYRIGHT:   Copyright 2020 Mark Jansen (mark.jansen@reactos.org)
- *
- * NOTES:
- *  To keep it simple, Tag and Class are combined in one identifier
- *  See for more details:
- *      https://en.wikipedia.org/wiki/X.690#BER_encoding
- *      https://www.strozhevsky.com/free_docs/asn1_by_simple_words.pdf
- *      http://mikk.net/~chris/asn1.pdf
- *
- *  And for a test suite:
- *      https://github.com/YuryStrozhevsky/asn1-test-suite
- */
-
-#include "precomp.h"
-#include <math.h>
-#include <wincrypt.h>
-#include <stdlib.h>
-
-
-#define ASN_TAG_IS_CONSTRUCTED          0x20
-
-
-#define ASN_TAG_BITSTRING               0x03
-#define ASN_TAG_OCTET_STRING            0x04
-#define ASN_TAG_OBJECT_ID               0x06
-
-#define ASN_TAG_SEQUENCE_RAW            0x10
-#define ASN_TAG_SET_RAW                 0x11
-
-#define ASN_TAG_SEQUENCE                0x30
-#define ASN_TAG_SET                     0x31
-
-
-#define ASN_TAG_CONTEXT_SPECIFIC        0x80
-#define ASN_TAG_CONTEXT_SPECIFIC_N(n)   (ASN_TAG_CONTEXT_SPECIFIC | (n))
-
-#define ASN_TAG_OPTIONAL                0xA0
-#define ASN_TAG_OPTIONAL_N(n)           (ASN_TAG_OPTIONAL | (n))
-
-/* NOTE: These names are not the names listed in f.e. the wikipedia pages,
-   they are made to look like MS's names for this */
-LPCWSTR TagToName(DWORD dwTag)
-{
-    switch (dwTag)
-    {
-    case 0x0: return L"EOC";
-    case 0x1: return L"BOOL";
-    case 0x2: return L"INTEGER";
-    case ASN_TAG_BITSTRING: return L"BIT_STRING";
-    case ASN_TAG_OCTET_STRING: return L"OCTET_STRING";
-    case 0x5: return L"NULL";
-    case ASN_TAG_OBJECT_ID: return L"OBJECT_ID";
-    case 0x7: return L"Object Descriptor";
-    case 0x8: return L"EXTERNAL";
-    case 0x9: return L"REAL";
-    case 0xA: return L"ENUMERATED";
-    case 0xB: return L"EMBEDDED PDV";
-    case 0xC: return L"UTF8String";
-    case 0xD: return L"RELATIVE-OID";
-    case 0xE: return L"TIME";
-    case 0xF: return L"Reserved";
-    case ASN_TAG_SEQUENCE_RAW: __debugbreak(); return L"SEQUENCE_RAW";
-    case ASN_TAG_SET_RAW: __debugbreak(); return L"SET_RAW";
-    case 0x12: return L"NumericString";
-    case 0x13: return L"PRINTABLE_STRING";
-    case 0x14: return L"T61String";
-    case 0x15: return L"VideotexString";
-    case 0x16: return L"IA5String";
-    case 0x17: return L"UTC_TIME";
-    case 0x18: return L"GeneralizedTime";
-    case 0x19: return L"GraphicString";
-    case 0x1A: return L"VisibleString";
-    case 0x1B: return L"GeneralString";
-    case 0x1C: return L"UniversalString";
-    case 0x1D: return L"CHARACTER STRING";
-    case 0x1E: return L"BMPString";
-    case 0x1F: return L"DATE";
-    case 0x20: return L"CONSTRUCTED";
-
-    case ASN_TAG_SEQUENCE: return L"SEQUENCE";
-    case ASN_TAG_SET: return L"SET";
-
-
-    case ASN_TAG_CONTEXT_SPECIFIC_N(0): return L"CONTEXT_SPECIFIC[0]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(1): return L"CONTEXT_SPECIFIC[1]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(2): return L"CONTEXT_SPECIFIC[2]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(3): return L"CONTEXT_SPECIFIC[3]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(4): return L"CONTEXT_SPECIFIC[4]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(5): return L"CONTEXT_SPECIFIC[5]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(6): return L"CONTEXT_SPECIFIC[6]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(7): return L"CONTEXT_SPECIFIC[7]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(8): return L"CONTEXT_SPECIFIC[8]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(9): return L"CONTEXT_SPECIFIC[9]";
-    /* Experiments show that Windows' certutil only goes up to 9 */
-
-
-    case ASN_TAG_OPTIONAL_N(0): return L"OPTIONAL[0]";
-    case ASN_TAG_OPTIONAL_N(1): return L"OPTIONAL[1]";
-    case ASN_TAG_OPTIONAL_N(2): return L"OPTIONAL[2]";
-    case ASN_TAG_OPTIONAL_N(3): return L"OPTIONAL[3]";
-    case ASN_TAG_OPTIONAL_N(4): return L"OPTIONAL[4]";
-    case ASN_TAG_OPTIONAL_N(5): return L"OPTIONAL[5]";
-    case ASN_TAG_OPTIONAL_N(6): return L"OPTIONAL[6]";
-    case ASN_TAG_OPTIONAL_N(7): return L"OPTIONAL[7]";
-    case ASN_TAG_OPTIONAL_N(8): return L"OPTIONAL[8]";
-    case ASN_TAG_OPTIONAL_N(9): return L"OPTIONAL[9]";
-    /* Experiments show that Windows' certutil only goes up to 9 */
-
-    default:
-        return L"???";
-    }
-}
-
-BOOL Move(DWORD dwLen, PBYTE& pData, DWORD& dwSize)
-{
-    if (dwSize < dwLen)
-        return FALSE;
-
-    pData += dwLen;
-    dwSize -= dwLen;
-
-    return TRUE;
-}
-
-BOOL ParseTag(PBYTE& pData, DWORD& dwSize, DWORD& dwTagAndClass)
-{
-    if (dwSize == 0)
-        return FALSE;
-
-    /* Is this a long form? */
-    if ((pData[0] & 0x1f) != 0x1f)
-    {
-        /* No, so extract the tag and class (in one identifier) */
-        dwTagAndClass = pData[0];
-        return Move(1, pData, dwSize);
-    }
-
-    DWORD dwClass = (pData[0] & 0xE0) >> 5;
-    dwTagAndClass = 0;
-    DWORD n;
-    for (n = 1; n < dwSize; ++n)
-    {
-        dwTagAndClass <<= 7;
-        dwTagAndClass |= (pData[n] & 0x7f);
-
-        if (!(pData[n] & 0x80))
-        {
-            break;
-        }
-    }
-
-    Move(n, pData, dwSize);
-
-    /* Any number bigger than this, we shift data out! */
-    if (n > 4)
-        return FALSE;
-
-    /* Just drop this in the hightest bits*/
-    dwTagAndClass |= (dwClass << (32-3));
-
-    return TRUE;
-}
-
-BOOL ParseLength(PBYTE& pData, DWORD& dwSize, DWORD& dwLength)
-{
-    if (dwSize == 0)
-        return FALSE;
-
-    if (!(pData[0] & 0x80))
-    {
-        dwLength = pData[0];
-        return Move(1, pData, dwSize);
-    }
-
-    DWORD dwBytes = pData[0] & 0x7f;
-    if (dwBytes == 0 || dwBytes > 8 || dwBytes + 1 > dwSize)
-    {
-        return FALSE;
-    }
-
-    dwLength = 0;
-    for (DWORD n = 0; n < dwBytes; ++n)
-    {
-        dwLength <<= 8;
-        dwLength += pData[1 + n];
-    }
-
-    return Move(dwBytes + 1, pData, dwSize);
-}
-
-
-DWORD HexDump(PBYTE pRoot, PBYTE pData, DWORD dwSize, PWSTR wszPrefix)
-{
-    while (TRUE)
-    {
-        SIZE_T Address = pData - pRoot;
-        ConPrintf(StdOut, L"%04x: ", Address);
-        ConPuts(StdOut, wszPrefix);
-
-        for (DWORD n = 0; n < min(dwSize, 0x10); ++n)
-        {
-            ConPrintf(StdOut, L"%02x ", pData[n]);
-        }
-
-        if (dwSize <= 0x10)
-            break;
-
-        Move(0x10, pData, dwSize);
-        ConPuts(StdOut, L"\n");
-    }
-
-    return 3 * dwSize;
-}
-
-void PrintTag(PBYTE pRoot, PBYTE pHeader, DWORD dwTag, DWORD dwTagLength, PBYTE pData, PWSTR wszPrefix)
-{
-    DWORD dwRemainder = HexDump(pRoot, pHeader, pData - pHeader, wszPrefix);
-
-    LPCWSTR wszTag = TagToName(dwTag);
-    DWORD dwPadding = dwRemainder + wcslen(wszPrefix);
-    while (dwPadding > 50)
-        dwPadding -= 50;
-    ConPrintf(StdOut, L"%*s; %s (%x Bytes)\n", 50 - dwPadding, L"", wszTag, dwTagLength);
-}
-
-struct OID_NAMES
-{
-    CHAR* Oid;
-    LPCWSTR Names[20];
-    DWORD NumberOfNames;
-};
-
-BOOL WINAPI CryptOIDEnumCallback(_In_ PCCRYPT_OID_INFO pInfo, _Inout_opt_ void *pvArg)
-{
-    OID_NAMES* Names = (OID_NAMES*)pvArg;
-
-    if (pInfo && pInfo->pszOID && !_stricmp(pInfo->pszOID, Names->Oid))
-    {
-        if (Names->NumberOfNames < RTL_NUMBER_OF(Names->Names))
-        {
-            for (DWORD n = 0; n < Names->NumberOfNames; ++n)
-            {
-                // We already have this..
-                if (!_wcsicmp(Names->Names[n], pInfo->pwszName))
-                    return TRUE;
-            }
-
-            Names->Names[Names->NumberOfNames++] = pInfo->pwszName;
-        }
-    }
-
-    return TRUE;
-}
-
-void PrintOID(PBYTE pRoot, PBYTE pHeader, PBYTE pData, DWORD dwSize, PWSTR wszPrefix)
-{
-    /* CryptFindOIDInfo expects the OID to be in ANSI.. */
-    CHAR szOID[250];
-    CHAR* ptr = szOID;
-    size_t cchRemaining = RTL_NUMBER_OF(szOID);
-
-    /* CryptFindOIDInfo just returns the first, we want multiple */
-    OID_NAMES Names = {0};
-
-    if (dwSize == 0)
-        return;
-
-    DWORD dwValue = 0, count = 0;
-    for (DWORD n = 0; n < dwSize; ++n)
-    {
-        dwValue <<= 7;
-        dwValue |= pData[n] & 0x7f;
-
-        if (pData[n] & 0x80)
-        {
-            if (++count >= 4)
-                break;
-            continue;
-        }
-        count = 0;
-
-        /* First & second octet have a special encoding */
-        if (ptr == szOID)
-        {
-            DWORD id1 = dwValue / 40;
-            DWORD id2 = dwValue % 40;
-
-            /* The first one can only be 0, 1 or 2, so handle special case: tc24.ber */
-            if (id1 > 2)
-            {
-                id2 += (id1 - 2) * 40;
-                id1 = 2;
-            }
-            StringCchPrintfExA(ptr, cchRemaining, &ptr, &cchRemaining, 0, "%d.%d", id1, id2);
-        }
-        else
-        {
-            StringCchPrintfExA(ptr, cchRemaining, &ptr, &cchRemaining, 0, ".%d", dwValue);
-        }
-
-        dwValue = 0;
-    }
-
-    if (dwValue || count)
-    {
-        /* We cannot format this, so just add abort */
-        return;
-    }
-
-    SIZE_T Address = pData - pRoot;
-    /* Pad with spaces instead of printing the address again */
-    DWORD addrDigits = (DWORD)log10((double)Address) + 1;
-    ConPrintf(StdOut, L"%*s  ", max(addrDigits, 4), L"");
-    ConPrintf(StdOut, L"%s; %S", wszPrefix, szOID);
-
-    Names.Oid = szOID;
-
-    /* The order does not match a naive call with '0'... */
-    CryptEnumOIDInfo(0, 0, &Names, CryptOIDEnumCallback);
-
-    for (DWORD n = 0; n < Names.NumberOfNames; ++n)
-    {
-        if (n == 0)
-            ConPrintf(StdOut, L" %s", Names.Names[n]);
-        else if (n == 1)
-            ConPrintf(StdOut, L" (%s", Names.Names[n]);
-        else
-            ConPrintf(StdOut, L" / %s", Names.Names[n]);
-    }
-
-    ConPrintf(StdOut, L"%s\n", Names.NumberOfNames > 1 ? L")" : L"");
-}
-
-
-BOOL ParseAsn(PBYTE pRoot, PBYTE pData, DWORD dwSize, PWSTR wszPrefix, BOOL fPrint)
-{
-    while (dwSize)
-    {
-        PBYTE pHeader = pData;
-        DWORD dwTagAndClass;
-
-        if (!ParseTag(pData, dwSize, dwTagAndClass))
-        {
-            if (fPrint)
-                ConPrintf(StdOut, L"CertUtil: -asn command failed to parse tag near 0x%x\n", pHeader - pRoot);
-            return FALSE;
-        }
-
-        DWORD dwTagLength;
-        if (!ParseLength(pData, dwSize, dwTagLength))
-        {
-            if (fPrint)
-                ConPrintf(StdOut, L"CertUtil: -asn command failed to parse tag length near 0x%x\n", pHeader - pRoot);
-            return FALSE;
-        }
-
-        if (dwTagLength > dwSize)
-        {
-            if (fPrint)
-                ConPrintf(StdOut, L"CertUtil: -asn command malformed tag length near 0x%x\n", pHeader - pRoot);
-            return FALSE;
-        }
-
-
-        if (fPrint)
-            PrintTag(pRoot, pHeader, dwTagAndClass, dwTagLength, pData, wszPrefix);
-
-        size_t len = wcslen(wszPrefix);
-        StringCchCatW(wszPrefix, MAX_PATH, dwTagLength != dwSize ? L"|  " : L"   ");
-
-        if (dwTagAndClass & ASN_TAG_IS_CONSTRUCTED)
-        {
-            if (!ParseAsn(pRoot, pData, dwTagLength, wszPrefix, fPrint))
-            {
-                return FALSE;
-            }
-        }
-        else
-        {
-            if (fPrint)
-            {
-                /* Special case for a bit string / octet string */
-                if ((dwTagAndClass == ASN_TAG_BITSTRING || dwTagAndClass == ASN_TAG_OCTET_STRING) && dwTagLength)
-                {
-                    if (dwTagAndClass == ASN_TAG_BITSTRING)
-                    {
-                        /* First, we print the 'unused bits' field of the bit string */
-                        HexDump(pRoot, pData, 1, wszPrefix);
-                        ConPuts(StdOut, L"\n");
-
-                        /* Move past it */
-                        Move(1, pData, dwSize);
-                        dwTagLength--;
-                    }
-
-                    /* Do we have any data left? */
-                    if (dwTagLength)
-                    {
-                        /* Try to parse this as ASN */
-                        if (ParseAsn(pRoot, pData, dwTagLength, wszPrefix, FALSE))
-                        {
-                            /* We succeeded, this _could_ be ASN, so display it as if it is */
-                            if (!ParseAsn(pRoot, pData, dwTagLength, wszPrefix, TRUE))
-                            {
-                                /* Uhhh, did someone edit the data? */
-                                ConPrintf(StdOut, L"CertUtil: -asn command unexpected failure parsing tag near 0x%x\n", pData - pRoot);
-                                return FALSE;
-                            }
-
-                            /* Move past what we just parsed */
-                            Move(dwTagLength, pData, dwSize);
-                            /* Lie about this so that we don't also print a hexdump */
-                            dwTagLength = 0;
-                        }
-                    }
-                }
-
-                /* Is there any data (left) to print? */
-                if (dwTagLength)
-                {
-                    HexDump(pRoot, pData, dwTagLength, wszPrefix);
-                    ConPuts(StdOut, L"\n");
-
-                    StringCchCatW(wszPrefix, MAX_PATH, L"   ");
-
-                    /* Do we have additional formatters? */
-                    switch (dwTagAndClass)
-                    {
-                    case ASN_TAG_OBJECT_ID:
-                        PrintOID(pRoot, pHeader, pData, dwTagLength, wszPrefix);
-                        break;
-                    default:
-                        break;
-                    }
-                }
-            }
-        }
-
-        wszPrefix[len] = '\0';
-
-        if (!Move(dwTagLength, pData, dwSize))
-        {
-            /* This should not be possible, it was checked before! */
-            return FALSE;
-        }
-    }
-
-    return TRUE;
-}
-
-
-BOOL asn_dump(LPCWSTR Filename)
-{
-    HANDLE hFile = CreateFileW(Filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-                               OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
-
-    if (hFile == INVALID_HANDLE_VALUE)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to open: %d\n", GetLastError());
-        return FALSE;
-    }
-
-    DWORD dwSize = GetFileSize(hFile, NULL);
-    if (dwSize == INVALID_FILE_SIZE)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to get file size: %d\n", GetLastError());
-        CloseHandle(hFile);
-        return FALSE;
-    }
-
-    if (dwSize == 0)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command got an empty file\n");
-        CloseHandle(hFile);
-        return FALSE;
-    }
-
-    PBYTE pData = (PBYTE)LocalAlloc(0, dwSize);
-    if (!pData)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to allocate: %d\n", GetLastError());
-        CloseHandle(hFile);
-        return FALSE;
-    }
-
-    DWORD cbRead;
-    BOOL fRead = ReadFile(hFile, pData, dwSize, &cbRead, NULL);
-    DWORD dwErr = GetLastError();
-    CloseHandle(hFile);
-
-    if (!fRead || cbRead != dwSize)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to read: %d\n", dwErr);
-        LocalFree(pData);
-        return FALSE;
-    }
-
-    WCHAR Buffer[MAX_PATH] = {0};
-    BOOL fSucceeded = ParseAsn(pData, pData, dwSize, Buffer, TRUE);
-
-    LocalFree(pData);
-    return fSucceeded;
-}
-

base/applications/cmdutils/certutil/certutil.c

@@ -1,8 +1,10 @@
 /*
  * PROJECT:     ReactOS certutil
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CertUtil hashfile implementation
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     CertUtil stub
  * COPYRIGHT:   Copyright 2020 Mark Jansen (mark.jansen@reactos.org)
+ *
+ * Note: Only -hashfile is implemented for now, the rest is not present!
  */
 
 #include "precomp.h"
@@ -10,7 +12,7 @@
 #include <stdlib.h>
 
 
-BOOL hash_file(LPCWSTR Filename)
+static BOOL hash_file(LPCWSTR Filename)
 {
     HCRYPTPROV hProv;
     BOOL bSuccess = FALSE;
@@ -85,3 +87,69 @@ BOOL hash_file(LPCWSTR Filename)
     return bSuccess;
 }
 
+
+static void print_usage()
+{
+    ConPuts(StdOut, L"Verbs:\n");
+    ConPuts(StdOut, L"  -hashfile           -- Display cryptographic hash over a file\n");
+    ConPuts(StdOut, L"\n");
+    ConPuts(StdOut, L"CertUtil -?           -- Display a list of all verbs\n");
+    ConPuts(StdOut, L"CertUtil -hashfile -? -- Display help text for the 'hashfile' verb\n");
+}
+
+int wmain(int argc, WCHAR *argv[])
+{
+    int n;
+
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
+    if (argc == 1) /* i.e. no commandline arguments given */
+    {
+        print_usage();
+        return EXIT_SUCCESS;
+    }
+
+    for (n = 1; n < argc; ++n)
+    {
+        if (!_wcsicmp(argv[n], L"-?"))
+        {
+            print_usage();
+            return EXIT_SUCCESS;
+        }
+        else if (!_wcsicmp(argv[n], L"-hashfile"))
+        {
+            if (argc == 3)
+            {
+                if (!_wcsicmp(argv[n+1], L"-?"))
+                {
+                    print_usage();
+                    return EXIT_SUCCESS;
+                }
+                else
+                {
+                    if (!hash_file(argv[n+1]))
+                    {
+                        /* hash_file prints the failure itself */
+                        return EXIT_FAILURE;
+                    }
+
+                    ConPuts(StdOut, L"CertUtil: -hashfile command completed successfully\n");
+                    return EXIT_SUCCESS;
+                }
+            }
+            else
+            {
+                ConPrintf(StdOut, L"CertUtil: -hashfile expected 1 argument, got %d\n", argc - 2);
+                return EXIT_FAILURE;
+            }
+        }
+        else
+        {
+            ConPrintf(StdOut, L"CertUtil: Unknown verb: %s\n", argv[n]);
+            return EXIT_FAILURE;
+        }
+    }
+
+    return EXIT_SUCCESS;
+}

base/applications/cmdutils/certutil/certutil.cpp

@@ -1,107 +0,0 @@
-/*
- * PROJECT:     ReactOS certutil
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CertUtil commandline handling
- * COPYRIGHT:   Copyright 2020 Mark Jansen (mark.jansen@reactos.org)
- *
- * Note: Only -hashfile and -asn are implemented for now, the rest is not present!
- */
-
-#include "precomp.h"
-#include <wincrypt.h>
-#include <stdlib.h>
-
-typedef struct
-{
-    LPCWSTR Name;
-    BOOL (*pfn)(LPCWSTR Filename);
-} Verb;
-
-
-Verb verbs[] = {
-    { L"hashfile", hash_file },
-    { L"asn", asn_dump },
-};
-
-static void print_usage()
-{
-    ConPuts(StdOut, L"Verbs:\n");
-    ConPuts(StdOut, L"  -hashfile           -- Display cryptographic hash over a file\n");
-    ConPuts(StdOut, L"  -asn                -- Display ASN.1 encoding of a file\n");
-    ConPuts(StdOut, L"\n");
-    ConPuts(StdOut, L"CertUtil -?           -- Display a list of all verbs\n");
-    ConPuts(StdOut, L"CertUtil -hashfile -? -- Display help text for the 'hashfile' verb\n");
-}
-
-
-Verb* MatchVerb(LPCWSTR arg)
-{
-    if (arg[0] != '-' && arg[0] != '/')
-        return NULL;
-
-    for (size_t n = 0; n < RTL_NUMBER_OF(verbs); ++n)
-    {
-        if (!_wcsicmp(verbs[n].Name, arg + 1))
-        {
-            return verbs + n;
-        }
-    }
-
-    return NULL;
-}
-
-int wmain(int argc, WCHAR *argv[])
-{
-    int n;
-
-    /* Initialize the Console Standard Streams */
-    ConInitStdStreams();
-
-    if (argc == 1) /* i.e. no commandline arguments given */
-    {
-        print_usage();
-        return EXIT_SUCCESS;
-    }
-
-    for (n = 1; n < argc; ++n)
-    {
-        if (!_wcsicmp(argv[n], L"-?"))
-        {
-            print_usage();
-            return EXIT_SUCCESS;
-        }
-
-        Verb* verb = MatchVerb(argv[n]);
-
-        if (verb)
-        {
-            if (argc != 3)
-            {
-                ConPrintf(StdOut, L"CertUtil: -%s expected 1 argument, got %d\n", verb->Name, argc - 2);
-                return EXIT_FAILURE;
-            }
-
-            if (!_wcsicmp(argv[n+1], L"-?"))
-            {
-                print_usage();
-                return EXIT_SUCCESS;
-            }
-
-            if (!verb->pfn(argv[n+1]))
-            {
-                /* The verb prints the failure */
-                return EXIT_FAILURE;
-            }
-
-            ConPrintf(StdOut, L"CertUtil: -%s command completed successfully\n", verb->Name);
-            return EXIT_SUCCESS;
-        }
-        else
-        {
-            ConPrintf(StdOut, L"CertUtil: Unknown verb: %s\n", argv[n]);
-            return EXIT_FAILURE;
-        }
-    }
-
-    return EXIT_SUCCESS;
-}

base/applications/cmdutils/certutil/precomp.h

@@ -7,14 +7,10 @@
 
 #include <windef.h>
 #include <winbase.h>
-#include <strsafe.h>
+#include <winreg.h>
+#include <winuser.h>
 
 #include <conutils.h>
 
 
-BOOL hash_file(LPCWSTR Filename);
-BOOL asn_dump(LPCWSTR Filename);
-
-
-
 #endif /* __CERTUTIL_PRECOMP_H */

base/applications/cmdutils/cscript/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-add_definitions(-DCSCRIPT_BUILD)
+add_definitions(-DCSCRIPT_BUILD -D__WINESRC__)
 set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript)
 include_directories(${wscript_folder})
 
@@ -20,4 +20,3 @@ add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 nt
 add_dependencies(cscript stdole2 cscript_idlheader)
 add_pch(cscript ${wscript_folder}/precomp.h SOURCE)
 add_cd_file(TARGET cscript DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(cscript) # CORE-5743: No ARRAY_SIZE macro

base/applications/cmdutils/doskey/doskey.c

@@ -15,7 +15,28 @@
 #include <winbase.h>
 #include <winuser.h>
 #include <wincon.h>
-#include <wincon_undoc.h>
+
+/* Console API functions which are absent from wincon.h */
+#define EXENAME_LENGTH (255 + 1)
+
+VOID
+WINAPI
+ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName);
+
+DWORD
+WINAPI
+GetConsoleCommandHistoryW(LPWSTR lpHistory,
+                          DWORD cbHistory,
+                          LPCWSTR lpExeName);
+
+DWORD
+WINAPI
+GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName);
+
+BOOL
+WINAPI
+SetConsoleNumberOfCommandsW(DWORD dwNumCommands,
+                            LPCWSTR lpExeName);
 
 #include "doskey.h"
 

base/applications/cmdutils/fc/fc.rc

@@ -6,9 +6,7 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "fc.exe"
 #include <reactos/version.rc>
 
-/* UTF-8 */
-#pragma code_page(65001)
-
+#pragma code_page(65001) /* UTF-8 */
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif

base/applications/cmdutils/fc/lang/fr-FR.rc

@@ -2,40 +2,40 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "Compare deux fichiers ou un ensemble de fichiers et affiche les différences\n\
-entre eux.\n\
+    IDS_USAGE "Compares two files or sets of files and displays the differences between\n\
+them.\n\
 \n\
 FC [/A] [/C] [/L] [/LBn] [/N] [/OFF[LINE]] [/T] [/U] [/W] [/nnnn]\n\
    [drive1:][path1]filename1 [drive2:][path2]filename2\n\
 FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\
 \n\
-  /A         Affiche uniquement la première et la dernière ligne pour chaque ensemble de différences.\n\
-  /B         Effectue une comparaison binaire.\n\
-  /C         Ne tient pas compte de la casse des lettres.\n\
-  /L         Compare les fichiers sous forme de texte ASCII.\n\
-  /LBn       Définit le nombre maximal de différences consécutives\n\
-             au nombre de lignes spécifié (par défaut : 100).\n\
-  /N         Affiche les numéros de ligne sur une comparaison ASCII.\n\
-  /OFF[LINE] N'ignore pas les fichiers ayant l'attribut hors-ligne.\n\
-  /T         Ne transforme pas les tabulations en espaces (par défaut : transformer).\n\
-  /U         Compare les fichiers en tant que fichiers texte UNICODE.\n\
-  /W         Compresse les espaces blancs (tabulations et espaces) pour la comparaison.\n\
-  /nnnn      Spécifie le nombre de lignes consécutives qui doivent correspondre\n\
-             après une différence (par défaut : 2).\n\
+  /A         Displays only first and last lines for each set of differences.\n\
+  /B         Performs a binary comparison.\n\
+  /C         Disregards the case of letters.\n\
+  /L         Compares files as ASCII text.\n\
+  /LBn       Sets the maximum consecutive mismatches to the specified\n\
+             number of lines (default: 100).\n\
+  /N         Displays the line numbers on an ASCII comparison.\n\
+  /OFF[LINE] Doesn't skip files with offline attribute set.\n\
+  /T         Doesn't expand tabs to spaces (default: expand).\n\
+  /U         Compare files as UNICODE text files.\n\
+  /W         Compresses white space (tabs and spaces) for comparison.\n\
+  /nnnn      Specifies the number of consecutive lines that must match\n\
+             after a mismatch (default: 2).\n\
   [drive1:][path1]filename1\n\
-             Spécifie le premier fichier ou ensemble de fichiers à comparer.\n\
+             Specifies the first file or set of files to compare.\n\
   [drive2:][path2]filename2\n\
-             Spécifie le second fichier ou ensemble de fichiers à comparer.\n"
-    IDS_NO_DIFFERENCE "FC: Aucune différence constatée\n"
-    IDS_LONGER_THAN "FC: %ls plus grand que %ls\n"
-    IDS_COMPARING "Compare les fichiers %ls et %ls\n"
-    IDS_OUT_OF_MEMORY "FC: Dépassement de mémoire\n"
-    IDS_CANNOT_READ "FC: Ne peut pas lire depuis %ls\n"
-    IDS_INVALID_SWITCH "FC: Option invalide\n"
-    IDS_CANNOT_OPEN "FC: Ne peut pas ouvrir %ls - Fichier ou répertoire inexistant\n"
-    IDS_NEEDS_FILES "FC: Nombre insuffisant de fichiers spécifiés\n"
-    IDS_CANT_USE_WILDCARD "Les caractères joker ('*' et '?') ne sont pas encore supportés\n"
-    IDS_DIFFERENT "FC: Les fichiers %ls et %ls sont différents\n"
-    IDS_TOO_LARGE "FC: Fichier %ls trop grand\n"
-    IDS_RESYNC_FAILED "La resynchronisation a échoué. Les fichiers sont trop différents.\n"
+             Specifies the second file or set of files to compare.\n"
+    IDS_NO_DIFFERENCE "FC: no differences encountered\n"
+    IDS_LONGER_THAN "FC: %ls longer than %ls\n"
+    IDS_COMPARING "Comparing files %ls and %ls\n"
+    IDS_OUT_OF_MEMORY "FC: Out of memory\n"
+    IDS_CANNOT_READ "FC: cannot read from %ls\n"
+    IDS_INVALID_SWITCH "FC: Invalid Switch\n"
+    IDS_CANNOT_OPEN "FC: cannot open %ls - No such file or folder\n"
+    IDS_NEEDS_FILES "FC: Insufficient number of file specifications\n"
+    IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n"
+    IDS_DIFFERENT "FC: File %ls and %ls are different\n"
+    IDS_TOO_LARGE "FC: File %ls too large\n"
+    IDS_RESYNC_FAILED "Resync failed.  Files are too different.\n"
 END

base/applications/cmdutils/fc/lang/ja-JP.rc

@@ -2,39 +2,40 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "2つのファイルまたはファイル セットを比較し、それらの違いを表示します。\n\
+    IDS_USAGE "Compares two files or sets of files and displays the differences between\n\
+them.\n\
 \n\
 FC [/A] [/C] [/L] [/LBn] [/N] [/OFF[LINE]] [/T] [/U] [/W] [/nnnn]\n\
-   [ドライブ1:][パス1]ファイル名1 [ドライブ2:][パス2]ファイル名2\n\
-FC /B [ドライブ1:][パス1]ファイル名1 [ドライブ2:][パス2]ファイル名2\n\
+   [drive1:][path1]filename1 [drive2:][path2]filename2\n\
+FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\
 \n\
-  /A         各差分集合の最初の行と最後の行のみを表示します。\n\
-  /B         バイナリ比較を実行します。\n\
-  /C         大文字と小文字を区別しません。\n\
-  /L         ファイルを ASCII テキストとして比較します。\n\
-  /LBn       連続する不一致の最大数を指定された行数に設定します\n\
-             (デフォルト: 100)。\n\
-  /N         ASCII 比較の行番号を表示します。\n\
-  /OFF[LINE] オフライン属性が設定されたファイルをスキップしません。\n\
-  /T         タブをスペースに展開しません (デフォルト: 展開する)。\n\
-  /U         ファイルを UNICODE テキスト ファイルとして比較します。\n\
-  /W         比較のために空白 (タブとスペース) を圧縮します。\n\
-  /nnnn      不一致の後に一致する必要がある連続行の数を指定します\n\
-             (デフォルト: 2)。\n\
-  [ドライブ1:][パス1]ファイル名1\n\
-             比較する最初のファイルまたはファイル集合を指定します。\n\
-  [ドライブ2:][パス2]ファイル名2\n\
-             比較する 2 番目のファイルまたはファイル集合を指定します。\n"
-    IDS_NO_DIFFERENCE "FC: 違いは見つかりませんでした\n"
-    IDS_LONGER_THAN "FC: %ls は %ls より長いです\n"
-    IDS_COMPARING "ファイル %ls と %ls を比較しています\n"
-    IDS_OUT_OF_MEMORY "FC: メモリ不足\n"
-    IDS_CANNOT_READ "FC: %ls から読み取れません\n"
-    IDS_INVALID_SWITCH "FC: 無効なスイッチ\n"
-    IDS_CANNOT_OPEN "FC: %ls を開けません - そのようなファイルまたはフォルダはありません\n"
-    IDS_NEEDS_FILES "FC: ファイル指定が必要です\n"
-    IDS_CANT_USE_WILDCARD "ワイルドカード（「*」と「?」）はまだサポートされていません\n"
-    IDS_DIFFERENT "FC: ファイル %ls と %ls は異なります\n"
-    IDS_TOO_LARGE "FC: ファイル %ls が大きすぎます\n"
-    IDS_RESYNC_FAILED "再同期に失敗しました。ファイルが違いすぎます。\n"
+  /A         Displays only first and last lines for each set of differences.\n\
+  /B         Performs a binary comparison.\n\
+  /C         Disregards the case of letters.\n\
+  /L         Compares files as ASCII text.\n\
+  /LBn       Sets the maximum consecutive mismatches to the specified\n\
+             number of lines (default: 100).\n\
+  /N         Displays the line numbers on an ASCII comparison.\n\
+  /OFF[LINE] Doesn't skip files with offline attribute set.\n\
+  /T         Doesn't expand tabs to spaces (default: expand).\n\
+  /U         Compare files as UNICODE text files.\n\
+  /W         Compresses white space (tabs and spaces) for comparison.\n\
+  /nnnn      Specifies the number of consecutive lines that must match\n\
+             after a mismatch (default: 2).\n\
+  [drive1:][path1]filename1\n\
+             Specifies the first file or set of files to compare.\n\
+  [drive2:][path2]filename2\n\
+             Specifies the second file or set of files to compare.\n"
+    IDS_NO_DIFFERENCE "FC: no differences encountered\n"
+    IDS_LONGER_THAN "FC: %ls longer than %ls\n"
+    IDS_COMPARING "Comparing files %ls and %ls\n"
+    IDS_OUT_OF_MEMORY "FC: Out of memory\n"
+    IDS_CANNOT_READ "FC: cannot read from %ls\n"
+    IDS_INVALID_SWITCH "FC: Invalid Switch\n"
+    IDS_CANNOT_OPEN "FC: cannot open %ls - No such file or folder\n"
+    IDS_NEEDS_FILES "FC: Insufficient number of file specifications\n"
+    IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n"
+    IDS_DIFFERENT "FC: File %ls and %ls are different\n"
+    IDS_TOO_LARGE "FC: File %ls too large\n"
+    IDS_RESYNC_FAILED "Resync failed.  Files are too different.\n"
 END

base/applications/cmdutils/find/find.rc

@@ -9,7 +9,6 @@
 
 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif

base/applications/cmdutils/help/help.rc

@@ -12,7 +12,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

base/applications/cmdutils/help/lang/ja-JP.rc

@@ -4,14 +4,14 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_NO_ENTRY "このコマンドはヘルプ ユーティリティではサポートされていません。\n「%s /?」を試してください。\n"
+    IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "ReactOS コマンドのヘルプ情報を提供します。\n\n\
-HELP [コマンド]\n\n\
-  コマンド - このコマンドのヘルプ情報を表示します。\n"
+    IDS_USAGE "Provides Help information for ReactOS commands.\n\n\
+HELP [command]\n\n\
+  command - Display help information for this command.\n"
     IDS_HELP1 "利用可能なすべてのコマンドの一覧と、その説明。\n\n\
   help コマンド\n\
   コマンド /?     特定のコマンドに関する詳細情報\n\n\
@@ -43,7 +43,7 @@ IF       バッチ プログラム中で条件処理を実行します。\n\
 LABEL    ディスクのボリューム ラベルを表示または変更します。\n\
 MD       ディレクトリを作成します。\n\
 MKDIR    ディレクトリを作成します。\n\
-MKLINK   ファイルシステム リンク オブジェクトを作成します。\n\
+MKLINK   Creates a filesystem link object.\n\
 MOVE     ファイルを移動およびファイルとディレクトリ名を変更します。\n\
 PATH     実行可能ファイルの検索パスを表示または設定します。\n\
 PAUSE    バッチ プログラムの処理を一時停止し、メッセージを表示します。\n\

base/applications/cmdutils/more/more.c

@@ -487,7 +487,7 @@ Restart:
  * See base/applications/cmdutils/clip/clip.c!IsDataUnicode()
  * and base/applications/notepad/text.c!ReadText() for more details.
  * Also some good code example can be found at:
- * https://github.com/AutoItConsulting/text-encoding-detect
+ * https://github.com/AutoIt/text-encoding-detect
  */
 typedef enum
 {

base/applications/cmdutils/reg/CMakeLists.txt

@@ -2,9 +2,9 @@
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
+add_definitions(-D__WINESRC__)
 add_executable(reg add.c copy.c delete.c export.c import.c query.c reg.c reg.rc)
 set_module_type(reg win32cui UNICODE)
 target_link_libraries(reg wine oldnames)
 add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(reg) # CORE-5743: No ARRAY_SIZE macro

base/applications/cmdutils/reg/lang/ja-JP.rc

@@ -2,180 +2,180 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "使い方:\n\
-  REG [操作] [引数]\n\n\
-サポートされた操作:\n\
+    STRING_USAGE, "Usage:\n\
+  REG [operation] [parameters]\n\n\
+Supported operations:\n\
   ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n\n\
-特定の操作に関するヘルプを表示するには、次のように入力します。\n\
-  REG [操作] /?\n\n"
+For help on a specific operation, type:\n\
+  REG [operation] /?\n\n"
 
-    STRING_ADD_USAGE, "REG ADD <キー> [/v 値名 | /ve] [/t 種類] [/s 区切り] [/d データ] [/f]\n\n\
-  レジストリにキーを追加するか、指定されたレジストリ キーに新しい値を追加します。\n\n\
-  <キー>\n\
-     追加するレジストリ キー、または [/v] または [/ve] のいずれかが指定されて\n\
-     いる場合は、新しいレジストリ データを追加するキー。\n\n\
-     形式: <ルート>\\<サブキー>\n\n\
-     <ルート>: 定義済みのレジストリ キー。次のいずれかである必要があります。\n\n\
+    STRING_ADD_USAGE, "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n\n\
+  Adds a key to the registry or adds a new value to a given registry key.\n\n\
+  <key>\n\
+     The registry key to add or, if either [/v] or [/ve] is specified,\n\
+     the key in which to add the new registry data.\n\n\
+     Format: ROOT\\Subkey\n\n\
+     ROOT: A predefined registry key. This must be one of the following:\n\n\
          HKEY_LOCAL_MACHINE  | HKLM\n\
          HKEY_CURRENT_USER   | HKCU\n\
          HKEY_CLASSES_ROOT   | HKCR\n\
          HKEY_USERS          | HKU\n\
          HKEY_CURRENT_CONFIG | HKCC\n\n\
-     <サブキー>: 指定された <ルート> キーの下のレジストリ キーへの完全なパス。\n\n\
-  /v <値名>\n\
-     追加するレジストリ値の名前。\n\n\
+     Subkey: The full path to a registry key under a given ROOT key.\n\n\
+  /v <value_name>\n\
+     The name of the registry value to add.\n\n\
   /ve\n\
-     名前のないレジストリ値を追加します。このオプションは（既定の）レジストリ\n\
-     値を変更します。\n\n\
-  /t <種類>\n\
-     レジストリに追加するデータの種類。 [/t] が指定されている場合、<種類> は\n\
-     次のいずれかである必要があります。\n\n\
+     Add an unnamed registry value. This option modifies the (Default)\n\
+     registry value.\n\n\
+  /t <type>\n\
+     The type of data to add to the registry. If [/t] is specified,\n\
+     <type> must be one of the following:\n\n\
          REG_SZ    | REG_MULTI_SZ | REG_EXPAND_SZ\n\
          REG_DWORD | REG_BINARY   | REG_NONE\n\n\
-     [/t]が指定されていない場合、デフォルトのデータ型は REG_SZ になります。\n\n\
-  /s <区切り>\n\
-     REG_MULTI_SZ データ内の文字列を区切るために使用される文字。\n\
-     [/s] が指定されていない場合、デフォルトの区切り文字は \\0 になります。\n\n\
-  /d <データ>\n\
-     新しいレジストリ値に追加するデータ。\n\n\
+     If [/t] is not specified, the default data type is REG_SZ.\n\n\
+  /s <separator>\n\
+     The character used to separate strings in REG_MULTI_SZ data.\n\
+     If [/s] is not specified, the default separator is \\0.\n\n\
+  /d <data>\n\
+     The data to add to the new registry value.\n\n\
   /f\n\
-     確認を求めずにレジストリを変更します。\n\n"
+     Modify the registry without prompting for confirmation.\n\n"
 
-    STRING_DELETE_USAGE, "REG DELETE <キー> [/v 値名 | /ve | /va] [/f]\n\n\
-  レジストリ キー (すべてのサブキーと値を含む) を削除するか、指定された\n\
-  レジストリ キーから 1 つ以上の値を削除します。\n\n\
+    STRING_DELETE_USAGE, "REG DELETE <key> [/v value_name | /ve | /va] [/f]\n\n\
+  Deletes a registry key (including all subkeys and values), or deletes\n\
+  one or more values from a given registry key.\n\n\
   <key>\n\
-     削除するレジストリ キー、または [/v]、[/ve]、[/va] のいずれかが指定されて\n\
-     いる場合は、1 つ以上の値を削除するレジストリ キー。\n\n\
-     形式: <ルート>\\<サブキー>\n\n\
-     ルート: 定義済みのレジストリ キー。次のいずれかである必要があります。\n\n\
+     The registry key to delete or, if one of [/v], [/ve] or [/va] is\n\
+     specified, the registry key in which to delete one or more values.\n\n\
+     Format: ROOT\\Subkey\n\n\
+     ROOT: A predefined registry key. This must be one of the following:\n\n\
          HKEY_LOCAL_MACHINE  | HKLM\n\
          HKEY_CURRENT_USER   | HKCU\n\
          HKEY_CLASSES_ROOT   | HKCR\n\
          HKEY_USERS          | HKU\n\
          HKEY_CURRENT_CONFIG | HKCC\n\n\
-     サブキー: 指定された <ルート> キーの下のレジストリ キーへの完全なパス。\n\n\
-  /v <値名>\n\
-     削除するレジストリ値の名前。\n\n\
+     Subkey: The full path to a registry key under a given ROOT key.\n\n\
+  /v <value_name>\n\
+     The name of the registry value to delete.\n\n\
   /ve\n\
-     名前のないレジストリ値を削除します。このオプションは、(既定の) \n\
-     レジストリ値を削除します。\n\n\
+     Delete an unnamed registry value. This option deletes the (Default)\n\
+     registry value.\n\n\
   /va\n\
-     レジストリ キーからすべての値を削除します。\n\n\
+     Delete all values from a registry key.\n\n\
   /f\n\
-     確認を求めることなくレジストリ キー (すべてのサブキーと値を含む) を削除します。\n\n"
+     Delete a registry key (including all subkeys and values) without\n\
+     prompting for confirmation.\n\n"
 
-    STRING_QUERY_USAGE, "REG QUERY <キー> [/v 値名 | /ve] [/s]\n\n\
-  指定されたレジストリキーを照会し、そのキーに含まれるすべてのサブキー、値、\n\
-  およびデータを一覧表示します。[/s] を使用すると、各サブキーを再帰的に照会できます。\n\n\
-  <キー>\n\
-     照会するレジストリ キー。\n\n\
-     形式: <ルート>\\<サブキー>\n\n\
-     <ルート>: 定義済みのレジストリ キー。次のいずれかである必要があります。\n\n\
+    STRING_QUERY_USAGE, "REG QUERY <key> [/v value_name | /ve] [/s]\n\n\
+  Queries a specified registry key and lists all immediate subkeys, values\n\
+  and data within that key. Use [/s] to recursively query each subkey.\n\n\
+  <key>\n\
+     The registry key to query.\n\n\
+     Format: ROOT\\Subkey\n\n\
+     ROOT: A predefined registry key. This must be one of the following:\n\n\
          HKEY_LOCAL_MACHINE  | HKLM\n\
          HKEY_CURRENT_USER   | HKCU\n\
          HKEY_CLASSES_ROOT   | HKCR\n\
          HKEY_USERS          | HKU\n\
          HKEY_CURRENT_CONFIG | HKCC\n\n\
-     <サブキー>: 指定された <ルート> キーの下のレジストリ キーへの完全なパス。\n\n\
-  /v <値名>\n\
-     照会するレジストリ値の名前。[/v] も [/ve] も指定されていない場合は、\n\
-     <キー> の下のすべての値がリストされます。\n\n\
+     Subkey: The full path to a registry key under a given ROOT key.\n\n\
+  /v <value_name>\n\
+     The name of the registry value to query. If neither [/v] nor [/ve] is\n\
+     specified, all values under <key> are listed.\n\n\
  /ve\n\
-     名前のないレジストリ値を照会します。このオプションは、(既定の) \n\
-     レジストリ値を照会します。\n\n\
+     Query an unnamed registry value. This option queries the (Default)\n\
+     registry value.\n\n\
   /s\n\
-     <キー> とそのサブキーの下にあるすべてのレジストリ エントリを一覧表示します。\n\n"
+     List all registry entries under <key> and its subkeys.\n\n"
 
     STRING_SUCCESS, "操作は正常に完了しました\n"
     STRING_INVALID_KEY, "エラー: キー名が無効です\n"
     STRING_INVALID_CMDLINE, "エラー: コマンド ライン引数が無効です\n"
     STRING_NO_REMOTE, "エラー: リモート マシンにキーを追加できませんでした\n"
     STRING_VALUE_NONEXIST, "エラー: システムは指定されたキーまたは値を見つけられませんでした\n"
-    STRING_UNSUPPORTED_TYPE, "reg: サポートされていないレジストリ データ型 [%1]\n"
-    STRING_MISSING_NUMBER, "reg: オプション[/d]の後には有効な数値を続ける必要があります\n"
-    STRING_MISSING_HEXDATA, "reg: オプション[/d]の後には有効な16進数値を続ける必要があります\n"
-    STRING_UNHANDLED_TYPE, "reg: 未処理のレジストリデータ型 [/t 0x%1!x!, /d %2]\n"
-    STRING_OVERWRITE_VALUE, "レジストリ値 '%1' は既に存在します。上書きしますか?"
+    STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n"
+    STRING_MISSING_NUMBER, "reg: The option [/d] must be followed by a valid numeric value\n"
+    STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
+    STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
+    STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?"
     STRING_YES, "Y"
     STRING_NO, "N"
     STRING_ALL, "A"
-    STRING_YESNO, " (はい(Y)|いいえ(N))"
-    STRING_YESNOALL, " (はい(Y)|いいえ(N)|すべて(A))"
-    STRING_CANCELLED, "reg: レジストリ操作はキャンセルされました\n"
-    STRING_DEFAULT_VALUE, "(デフォルト)"
-    STRING_DELETE_VALUE, "レジストリ値 '%1' を削除してもよろしいですか?"
-    STRING_DELETE_VALUEALL, "'%1' 内のすべてのレジストリ値を削除してもよろしいですか?"
-    STRING_DELETE_SUBKEY, "レジストリ キー '%1' を削除してもよろしいですか?"
-    STRING_INVALID_STRING, "reg: オプション[/d]の後に有効な文字列を続ける必要があります\n"
-    STRING_VALUEALL_FAILED, "reg: '%1' のすべてのレジストリ値を削除できません\n"
-    STRING_MATCHES_FOUND, "検索が完了しました。一致した件数: %1!d!\n"
-    STRING_INVALID_SYNTAX, "reg: 無効な文法"
-    STRING_INVALID_OPTION, "reg: 無効なオプション [%1]. "
-    STRING_REG_HELP, "ヘルプを表示するには、「REG /?」と入力してください。\n"
-    STRING_FUNC_HELP, "ヘルプを表示するには「REG %1 /?」と入力してください.\n"
-    STRING_VALUE_NOT_SET, "(未設定の値)"
+    STRING_YESNO, " (Yes|No)"
+    STRING_YESNOALL, " (Yes|No|All)"
+    STRING_CANCELLED, "reg: The registry operation was cancelled\n"
+    STRING_DEFAULT_VALUE, "(Default)"
+    STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?"
+    STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?"
+    STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?"
+    STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n"
+    STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'\n"
+    STRING_MATCHES_FOUND, "Search complete. Number of matches found: %1!d!\n"
+    STRING_INVALID_SYNTAX, "reg: Invalid syntax. "
+    STRING_INVALID_OPTION, "reg: Invalid option [%1]. "
+    STRING_REG_HELP, "Type ""REG /?"" for help.\n"
+    STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n"
+    STRING_VALUE_NOT_SET, "(value not set)"
 
-    STRING_IMPORT_USAGE, "REG IMPORT <ファイル>\n\n\
-  指定されたファイルからキー、値、データをレジストリにインポートします。\n\n\
-  <ファイル>\n\
-     インポートするレジストリ ファイルの名前とパス。\n\n"
+    STRING_IMPORT_USAGE, "REG IMPORT <file>\n\n\
+  Imports keys, values and data from a given file into the registry.\n\n\
+  <file>\n\
+     The name and path of the registry file to import.\n\n"
 
-    STRING_FILE_NOT_FOUND, "reg: ファイル '%1' が見つかりませんでした。\n"
-    STRING_ESCAPE_SEQUENCE, "reg: 認識されないエスケープシーケンス [\\%1!c!]\n"
+    STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n"
+    STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n"
 
-    STRING_EXPORT_USAGE, "REG EXPORT <キー> <ファイル> [/y]\n\n\
-  指定されたレジストリ キー (すべてのサブキーと値を含む) をファイルに\n\
-  エクスポートします。\n\n\
-  <キー>\n\
-     エクスポートするレジストリ キー。\n\n\
-     形式: <ルート>\\<サブキー>\n\n\
-     <ルート>: 定義済みのレジストリ キー。次のいずれかである必要があります。\n\n\
+    STRING_EXPORT_USAGE, "REG EXPORT <key> <file> [/y]\n\n\
+  Exports a specified registry key (including all subkeys and values)\n\
+  to a file.\n\n\
+  <key>\n\
+     The registry key to export.\n\n\
+     Format: ROOT\\Subkey\n\n\
+     ROOT: A predefined registry key. This must be one of the following:\n\n\
          HKEY_LOCAL_MACHINE  | HKLM\n\
          HKEY_CURRENT_USER   | HKCU\n\
          HKEY_CLASSES_ROOT   | HKCR\n\
          HKEY_USERS          | HKU\n\
          HKEY_CURRENT_CONFIG | HKCC\n\n\
-     <サブキー>: 指定された <ルート> キーの下のレジストリ キーへの完全なパス。\n\n\
-  <ファイル>\n\
-     作成されるレジストリ ファイルの名前とパス。\n\
-     このファイルには .reg 拡張子が必要です。\n\n\
+     Subkey: The full path to a registry key under a given ROOT key.\n\n\
+  <file>\n\
+     The name and path of the registry file that will be created.\n\
+     This file must have a .reg extension.\n\n\
   /y\n\
-     確認のプロンプトを表示せずに <ファイル> を上書きします。\n\n"
+     Overwrite <file> without prompting for confirmation.\n\n"
 
-    STRING_INVALID_SYSTEM_KEY, "reg: 無効なシステム キー\n"
-    STRING_OVERWRITE_FILE, "ファイル '%1' は既に存在します。上書きしますか?"
-    STRING_KEY_NONEXIST, "reg: 指定されたレジストリキーが見つかりません\n"
-    STRING_KEY_IMPORT_FAILED, "reg: レジストリキーをインポートできません '%1'\n"
+    STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key\n"
+    STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?"
+    STRING_KEY_NONEXIST, "reg: Unable to find the specified registry key\n"
+    STRING_KEY_IMPORT_FAILED, "reg: Unable to import the registry key '%1'\n"
 
     STRING_REG_VIEW_USAGE, "  /reg:32\n\
-     32 ビット ビューを使用してレジストリにアクセスします。\n\n\
+     Access the registry using the 32-bit view.\n\n\
   /reg:64\n\
-     64 ビット ビューを使用してレジストリにアクセスします。\n\n"
-    STRING_ACCESS_DENIED, "reg: 指定されたレジストリキーにアクセスまたは作成できません\n"
+     Access the registry using the 64-bit view.\n\n"
+    STRING_ACCESS_DENIED, "reg: Unable to access or create the specified registry key\n"
 
-    STRING_COPY_USAGE, "REG COPY <キー1> <キー2> [/s] [/f]\n\n\
-  指定されたレジストリ キーの内容を別の場所にコピーします。\n\
-  デフォルトでは、この操作はレジストリ値のみをコピーします。[/s] を使用して、\n\
-  すべてのサブキーと値を再帰的にコピーします。\n\n\
-  <キー1>, <キー2>\n\
-     データのコピー元(<キー1>) とコピー先 (<キー2>) を指定するレジストリ キー。\n\
-     <キー2> が存在しない場合は作成されます。\n\n\
-     形式: <ルート>\\<サブキー>\n\n\
-     <ルート>: 定義済みのレジストリ キー。次のいずれかである必要があります。\n\n\
+    STRING_COPY_USAGE, "REG COPY <key1> <key2> [/s] [/f]\n\n\
+  Copies the contents of a specified registry key to another location.\n\
+  By default, this operation only copies registry values. Use [/s] to\n\
+  recursively copy all subkeys and values.\n\n\
+  <key1>, <key2>\n\
+     Registry keys specifying the source (<key1>) and destination (<key2>)\n\
+     of the data. If <key2> does not exist, it is created.\n\n\
+     Format: ROOT\\Subkey\n\n\
+     ROOT: A predefined registry key. This must be one of the following:\n\n\
          HKEY_LOCAL_MACHINE  | HKLM\n\
          HKEY_CURRENT_USER   | HKCU\n\
          HKEY_CLASSES_ROOT   | HKCR\n\
          HKEY_USERS          | HKU\n\
          HKEY_CURRENT_CONFIG | HKCC\n\n\
-     <サブキー>: 指定された <ルート> キーの下のレジストリ キーへの完全なパス。\n\n\
+     Subkey: The full path to a registry key under a given ROOT key.\n\n\
   /s\n\
-     <キー1> から <キー2> にすべてのサブキーと値をコピーします。\n\n\
+     Copy all subkeys and values from <key1> to <key2>.\n\n\
   /f\n\
-     確認のプロンプトを表示せずに、<キー2> 内のすべてのレジストリ\n\
-     データを上書きします。\n\
-     このオプションは、<キー2> にのみ存在するサブキーと値を変更しません。\n\n"
+     Overwrite all registry data in <key2> without prompting for confirmation.\n\
+     This option does not modify subkeys and values that only exist in <key2>.\n\n"
 
-    STRING_COPY_SRC_DEST_SAME, "reg: コピー元キーとコピー先キーは同じにすることはできません\n"
-    STRING_COPY_CONFIRM, "値 '%1\\%2' はコピー先キーに既に存在します。上書きしますか?"
+    STRING_COPY_SRC_DEST_SAME, "reg: The source and destination keys cannot be the same\n"
+    STRING_COPY_CONFIRM, "The value '%1\\%2' already exists in the destination key. Do you want to overwrite it?"
 }

base/applications/cmdutils/taskkill/CMakeLists.txt

@@ -1,7 +1,7 @@
 
+add_definitions(-D__WINESRC__)
 add_executable(taskkill taskkill.c taskkill.rc)
 target_link_libraries(taskkill wine)
 set_module_type(taskkill win32cui UNICODE)
-add_importlibs(taskkill user32 msvcrt kernel32 ntdll)
+add_importlibs(taskkill psapi user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET taskkill DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(taskkill) # CORE-5743: No ARRAY_SIZE macro

base/applications/cmdutils/taskkill/lang/de-DE.rc

@@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-    STRING_USAGE, "Usage: taskkill [/?] [/f] [/im Prozess Name | /pid Prozess ID] [/t]\n"
+    STRING_USAGE, "Usage: taskkill [/?] [/f] [/im Prozess Name | /pid Prozess ID]\n"
     STRING_INVALID_OPTION, "Fehler: Unbekannte oder ungülige Kommandozeilenoption angegeben.\n"
     STRING_INVALID_PARAM, "Fehler: Ungültiger Kommandozeilenparameter angegeben.\n"
     STRING_MISSING_OPTION, "Fehler: Eine der Optionen /im oder /pid muss angegeben werden.\n"
@@ -16,10 +16,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "Fehler: Prozessliste kann nicht aufgebaut werden.\n"
     STRING_TERMINATE_FAILED, "Fehler: Prozess ""%1"" kann nicht beendet werden.\n"
     STRING_SELF_TERMINATION, "Fehler: Der Prozess kann sich nicht selbst beenden.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
     STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
 }

base/applications/cmdutils/taskkill/lang/en-US.rc

@@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID] [/t]\n"
+    STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n"
     STRING_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n"
     STRING_INVALID_PARAM, "Error: Invalid command line parameter specified.\n"
     STRING_MISSING_OPTION, "Error: One of options /im or /pid must be specified.\n"
@@ -10,16 +10,12 @@ STRINGTABLE
     STRING_MUTUAL_EXCLUSIVE, "Error: Options /im and /pid are mutually exclusive.\n"
     STRING_CLOSE_PID_SEARCH, "Close message sent to top-level windows of process with PID %1!u!.\n"
     STRING_CLOSE_PROC_SRCH, "Close message sent to top-level windows of process ""%1"" with PID %2!u!.\n"
-    STRING_TERM_PID_SEARCH, "The process with PID %1!u! has been terminated.\n"
-    STRING_TERM_PROC_SEARCH, "The process ""%1"" with PID %2!u! has been terminated.\n"
+    STRING_TERM_PID_SEARCH, "Process with PID %1!u! was forcibly terminated.\n"
+    STRING_TERM_PROC_SEARCH, "Process ""%1"" with PID %2!u! was forcibly terminated.\n"
     STRING_SEARCH_FAILED, "Error: Could not find process ""%1"".\n"
     STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n"
     STRING_TERMINATE_FAILED, "Error: Unable to terminate process ""%1"".\n"
     STRING_SELF_TERMINATION, "Error: Process self-termination is not permitted.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
     STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
 }

base/applications/cmdutils/taskkill/lang/it-IT.rc

@@ -9,7 +9,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-    STRING_USAGE, "Uso: taskkill [/?] [/f] [/im NomeProcesso | /pid IDProcesso] [/t]\n"
+    STRING_USAGE, "Uso: taskkill [/?] [/f] [/im NomeProcesso | /pid IDProcesso]\n"
     STRING_INVALID_OPTION, "Errore: L'opzione specificata è invalida o sconosciuta.\n"
     STRING_INVALID_PARAM, "Errore: Il parametro di comando a riga è invalido.\n"
     STRING_MISSING_OPTION, "Errore: Specifica una delle opzioni /im oppure /pid.\n"
@@ -23,10 +23,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "Errore: Impossibile enumerare la lista dei processi.\n"
     STRING_TERMINATE_FAILED, "Errore: Impossibile terminare il processo ""%1"".\n"
     STRING_SELF_TERMINATION, "Errore: L'auto-terminazione non è consentita.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
     STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
 }

base/applications/cmdutils/taskkill/lang/pl-PL.rc

@@ -9,7 +9,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "Sposób użycia: taskkill [/?] [/f] [/im nazwa_procesu | /pid id_procesu] [/t]\n"
+    STRING_USAGE, "Sposób użycia: taskkill [/?] [/f] [/im nazwa_procesu | /pid id_procesu]\n"
     STRING_INVALID_OPTION, "Błąd: Określono nieznaną lub nieprawidłową opcję.\n"
     STRING_INVALID_PARAM, "Błąd: Nieprawidłowy parametr.\n"
     STRING_MISSING_OPTION, "Błąd: Nie określono opcji /im ani /pid.\n"
@@ -23,10 +23,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "Błąd: Nie można wyliczyć listy procesów.\n"
     STRING_TERMINATE_FAILED, "Błąd: Nie można zakończyć procesu ""%1"".\n"
     STRING_SELF_TERMINATION, "Błąd: Proces nie może zakończyć sam siebie.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Błąd: Nieprawidłowa składnia. Opcja '%1' nie jest dozwolona więcej niż '%2!d!' razy.\n"
     STRING_INVALID_SYNTAX, "Błąd: Nieprawidłowa składnia.\n"
 }

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

@@ -10,7 +10,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-    STRING_USAGE, "Utilizare: taskkill [/?] [/f] [/im NumeProces | /pid IdProces] [/t]\n"
+    STRING_USAGE, "Utilizare: taskkill [/?] [/f] [/im NumeProces | /pid IdProces]\n"
     STRING_INVALID_OPTION, "Eroare: Opțiune specificată nevalidă sau necunoscută.\n"
     STRING_INVALID_PARAM, "Eroare: Parametrul de comandă specificat este nevalid.\n"
     STRING_MISSING_OPTION, "Eroare: Trebuie specificată una dintre opțiunile /im sau /pid.\n"
@@ -24,10 +24,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "Eroare: Nu se poate enumera lista de procese.\n"
     STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n"
     STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Eroare: Sintaxă nevalidă. Opțiunea '%1' nu este permisă mai mult de '%2!d!' dată(dăți).\n"
     STRING_INVALID_SYNTAX, "Eroare: Sintaxă nevalidă.\n"
 }

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

@@ -4,7 +4,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "Использование: TASKKILL [/F] [/IM <образ> | /PID <процесс>] [/t]\n"
+    STRING_USAGE, "Использование: TASKKILL [/F] [/IM <образ> | /PID <процесс>]\n"
     STRING_INVALID_OPTION, "Ошибка: Указаны неверные параметры командной строки.\n"
     STRING_INVALID_PARAM, "Ошибка: Указаны неверные параметры командной строки.\n"
     STRING_MISSING_OPTION, "Ошибка: Должен быть указан параметр /im или /pid.\n"
@@ -18,10 +18,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "Ошибка: Не удается получить список процессов.\n"
     STRING_TERMINATE_FAILED, "Ошибка: Не удается завершить процесс ""%1"".\n"
     STRING_SELF_TERMINATION, "Ошибка: Процесс не может завершить сам себя.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Ошибка: Неверный синтаксис. Нельзя использовать опцию '%1' больше '%2!d!' раз(а).\n"
     STRING_INVALID_SYNTAX, "Ошибка: Неверный синтаксис.\n"
 }

base/applications/cmdutils/taskkill/lang/sq-AL.rc

@@ -6,7 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-    STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID] [/t]\n"
+    STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n"
     STRING_INVALID_OPTION, "Gabim: Panjohur ose i pavlefshëm opsioni linjes komandes i specifikuar.\n"
     STRING_INVALID_PARAM, "Gabim: Pavlefshëm parametri i specifikuar ne linjen e komandes.\n"
     STRING_MISSING_OPTION, "Gabim: Njera nga opsionet /im ose /pid duhet te specifikohet.\n"
@@ -20,10 +20,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "Gabim: Në pamundësi për të numëruar listën proceseve.\n"
     STRING_TERMINATE_FAILED, "Gabim: Pamundur mbyllja e proceseve ""%1"".\n"
     STRING_SELF_TERMINATION, "Gabim: Procesi vetë-përfundimi nuk është i lejuar.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
     STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
 }

base/applications/cmdutils/taskkill/lang/tr-TR.rc

@@ -4,7 +4,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 {
-    STRING_USAGE, "Kullanım: taskkill [/?] [/f] [/im işlem adı | /pid işlem kimliği] [/t]\n"
+    STRING_USAGE, "Kullanım: taskkill [/?] [/f] [/im işlem adı | /pid işlem kimliği]\n"
     STRING_INVALID_OPTION, "Hata: Bilinmeyen veya geçersiz komut satırı seçeneği belirtildi.\n"
     STRING_INVALID_PARAM, "Hata: Geçersiz komut satırı değişkeni belirtildi.\n"
     STRING_MISSING_OPTION, "Hata: /im ve /pid seçeneklerinden biri belirtilmeli.\n"
@@ -18,10 +18,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "Hata: İşlem numaralandırılamıyor.\n"
     STRING_TERMINATE_FAILED, "Hata: ""%1"" işlemi sonlandırılamıyor.\n"
     STRING_SELF_TERMINATION, "Hata: İşlemi kendi kendine sonlandırmaya izin verilmedi.\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "Hata: Geçersiz sözdizimi. '%1' seçeneğine '%2!d!'den fazla kez izin verilmiyor..\n"
     STRING_INVALID_SYNTAX, "Hata: Geçersiz sözdizimi.\n"
 }

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

@@ -7,7 +7,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 STRINGTABLE
 {
-    STRING_USAGE, "用法：taskkill [/?] [/f] [/im 进程名称 | /pid 进程 ID] [/t]\n"
+    STRING_USAGE, "用法：taskkill [/?] [/f] [/im 进程名称 | /pid 进程 ID]\n"
     STRING_INVALID_OPTION, "错误：指定了未知或无效的命令行选项。\n"
     STRING_INVALID_PARAM, "错误：指定了无效的命令行参数。\n"
     STRING_MISSING_OPTION, "错误：必须指定选项 /im 或 /pid。\n"
@@ -21,10 +21,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "错误：无法枚举进程列表。\n"
     STRING_TERMINATE_FAILED, "错误：无法终止进程“%1”。\n"
     STRING_SELF_TERMINATION, "错误：不允许终止自身。\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "错误：无效语法。选项“%1”不允许超过“%2!d!”次。\n"
     STRING_INVALID_SYNTAX, "错误：无效语法。\n"
 }

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

@@ -11,7 +11,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 STRINGTABLE
 {
-    STRING_USAGE, "用法: taskkill [/?] [/f] [/im 處理程序名稱 | /pid PID] [/t]\n"
+    STRING_USAGE, "用法: taskkill [/?] [/f] [/im 處理程序名稱 | /pid PID]\n"
     STRING_INVALID_OPTION, "錯誤: 指定了不明或不正確的命令列選項。\n"
     STRING_INVALID_PARAM, "錯誤: 指定了不正確的命令列參數。\n"
     STRING_MISSING_OPTION, "錯誤: 必須指定選項 /im 或 /pid 的其中之一。\n"
@@ -25,10 +25,6 @@ STRINGTABLE
     STRING_ENUM_FAILED, "錯誤: 無法列舉處理程序清單。\n"
     STRING_TERMINATE_FAILED, "錯誤: 無法終止處理程序 '%1'。\n"
     STRING_SELF_TERMINATION, "錯誤: 處理程序不允許自我終止。\n"
-    // STRING_CLOSE_CHILD, "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_CLOSE_CHILD, "Close message sent to top-level windows of process with PID %1!u!, child of PID %2!u!.\n"
-    STRING_TERM_CHILD, "The process with PID %1!u! (child process of PID %2!u!) has been terminated.\n"
-    STRING_TERM_CHILD_FAILED, "Error: Unable to terminate process with PID %1!u!, child of PID %2!u!.\n"
     STRING_PARAM_TOO_MUCH, "錯誤: 無效的語法。'%1' 選項不允許超過 '%2!d!' 次。\n"
     STRING_INVALID_SYNTAX, "錯誤: 無效的語法。\n"
 }

base/applications/cmdutils/taskkill/taskkill.h

@@ -35,8 +35,6 @@
 #define STRING_ENUM_FAILED      112
 #define STRING_TERMINATE_FAILED 113
 #define STRING_SELF_TERMINATION 114
-#define STRING_CLOSE_CHILD      115
-#define STRING_TERM_CHILD       116
-#define STRING_TERM_CHILD_FAILED 117
-#define STRING_PARAM_TOO_MUCH   118
-#define STRING_INVALID_SYNTAX   119
+#define STRING_PARAM_TOO_MUCH   115
+#define STRING_INVALID_SYNTAX   116
+

base/applications/cmdutils/tasklist/tasklist.rc

@@ -9,7 +9,6 @@
 
 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif

base/applications/cmdutils/tree/tree.rc

@@ -11,7 +11,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

base/applications/cmdutils/where/where.rc

@@ -6,8 +6,7 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "where.exe"
 #include <reactos/version.rc>
 
-/* UTF-8 */
-#pragma code_page(65001)
+#pragma code_page(65001) /* UTF-8 */
 
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"

base/applications/cmdutils/wmic/CMakeLists.txt

@@ -1,7 +1,7 @@
 
+add_definitions(-D__WINESRC__)
 add_executable(wmic main.c wmic.rc)
 target_link_libraries(wmic wine)
 set_module_type(wmic win32cui UNICODE)
 add_importlibs(wmic oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wmic DESTINATION reactos/system32/wbem FOR all)
-set_wine_module_FIXME(wmic) # CORE-5743: No ARRAY_SIZE macro

base/applications/cmdutils/wscript/CMakeLists.txt

@@ -1,4 +1,6 @@
 
+add_definitions(-D__WINESRC__)
+
 list(APPEND SOURCE
     arguments.c
     host.c
@@ -16,4 +18,3 @@ add_importlibs(wscript shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32 nt
 add_dependencies(wscript stdole2 wscript_idlheader)
 add_pch(wscript precomp.h SOURCE)
 add_cd_file(TARGET wscript DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(wscript) # CORE-5743: No ARRAY_SIZE macro

base/applications/cmdutils/xcopy/CMakeLists.txt

@@ -1,7 +1,7 @@
 
+add_definitions(-D__WINESRC__)
 add_executable(xcopy xcopy.c xcopy.rc)
 target_link_libraries(xcopy wine)
 set_module_type(xcopy win32cui UNICODE)
 add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET xcopy DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(xcopy) # CORE-5743: No ARRAY_SIZE macro

base/applications/cmdutils/xcopy/lang/fr-FR.rc

@@ -50,7 +50,7 @@ où :\n\
 [/A]  Copie uniquement les fichiers qui ont l'attribut archive défini\n\
 [/M]  Copie uniquement les fichiers qui ont l'attribut archive défini ; supprime\n\
 \tensuite l'attribut\n\
-[/K]  Copie les attributs de fichiers. Sans ce paramètre les attributs ne sont pas conservés.\n\
+[/K]  Copy file attributes, without this attributes are not preserved.\n\
 [/D | /D:m-d-y] Copie uniquement les nouveaux fichiers, ou ceux modifiés après la date spécifiée.\n\
 \t\tSi aucune date n'est spécifiée, copie uniquement lorsque le fichier de destination est plus ancien\n\
 \t\tque le fichier source\n\n"

base/applications/ctfmon/CRegWatcher.cpp

@@ -7,7 +7,6 @@
 
 #include "precomp.h"
 #include "CRegWatcher.h"
-#include <ime/indicml.h>
 
 // The event handles to use in watching
 HANDLE CRegWatcher::s_ahWatchEvents[WATCHENTRY_MAX] = { NULL };
@@ -207,7 +206,7 @@ CRegWatcher::KillInternat()
     }
 
     // Kill the "Indicator" window (that internat.exe creates)
-    HWND hwndInternat = ::FindWindow(INDICATOR_CLASS, NULL);
+    HWND hwndInternat = ::FindWindow(TEXT("Indicator"), NULL);
     if (hwndInternat)
         ::PostMessage(hwndInternat, WM_CLOSE, 0, 0);
 }

base/applications/ctfmon/precomp.h

@@ -15,7 +15,6 @@
 #include <tchar.h>
 #include <strsafe.h>
 #include <msctf.h>
-#include <msctf_undoc.h>
 #include <ctfutb.h>
 #include <ctffunc.h>
 #include <cicbase.h>

base/applications/drwtsn32/drwtsn32.rc

@@ -40,9 +40,6 @@
 #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

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

@@ -1,7 +0,0 @@
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    IDS_APP_TITLE "ReactOS クラッシュレポーター"
-    IDS_USER_ALERT_MESSAGE "アプリケーション %ls がクラッシュしました。このクラッシュに関する情報は次の場所に保存されました:\n\n%ls"
-END

base/applications/dxdiag/d3dtest.c

@@ -13,11 +13,11 @@
 #define WIDTH   800
 #define HEIGHT  600
 
-BOOL D3D7Test(GUID *lpDevice, HWND hWnd);
-BOOL D3D8Test(GUID *lpDevice, HWND hWnd);
-BOOL D3D9Test(GUID *lpDevice, HWND hWnd);
+BOOL D3D7Test(HWND hWnd);
+BOOL D3D8Test(HWND hWnd);
+BOOL D3D9Test(HWND hWnd);
 
-BOOL StartD3DTest(GUID *lpDevice, HWND hWnd, HINSTANCE hInstance, WCHAR* pszCaption, INT TestNr)
+BOOL StartD3DTest(HWND hWnd, HINSTANCE hInstance, WCHAR* pszCaption, INT TestNr)
 {
     WCHAR szTestDescriptionRaw[256];
     WCHAR szTestDescription[256];
@@ -39,13 +39,13 @@ BOOL StartD3DTest(GUID *lpDevice, HWND hWnd, HINSTANCE hInstance, WCHAR* pszCapt
 
     switch(TestNr){
         case 7:
-            Result = D3D7Test(lpDevice, hWnd);
+            Result = D3D7Test(hWnd);
             break;
         case 8:
-            Result = D3D8Test(lpDevice, hWnd);
+            Result = D3D8Test(hWnd);
             break;
         case 9:
-            Result = D3D9Test(lpDevice, hWnd);
+            Result = D3D9Test(hWnd);
             break;
         default:
             Result = FALSE;
@@ -70,7 +70,7 @@ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP
     return DefWindowProc(hWnd, msg, wParam, lParam);
 }
 
-VOID D3DTests(GUID *lpDevice)
+VOID D3DTests()
 {
     WNDCLASSEX winClass;
     HWND hWnd;
@@ -116,9 +116,9 @@ VOID D3DTests(GUID *lpDevice)
     if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO)
         goto cleanup;
 
-    StartD3DTest(lpDevice, hWnd, hInstance, szCaption, 7);
-    StartD3DTest(lpDevice, hWnd, hInstance, szCaption, 8);
-    StartD3DTest(lpDevice, hWnd, hInstance, szCaption, 9);
+    StartD3DTest(hWnd, hInstance, szCaption, 7);
+    StartD3DTest(hWnd, hInstance, szCaption, 8);
+    StartD3DTest(hWnd, hInstance, szCaption, 9);
 
 cleanup:
     DestroyWindow(hWnd);

base/applications/dxdiag/d3dtest7.c

@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-BOOL D3D7Test(GUID *lpDevice, HWND hWnd)
+BOOL D3D7Test(HWND hWnd)
 {
     return FALSE;
 }

base/applications/dxdiag/d3dtest8.c

@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-BOOL D3D8Test(GUID *lpDevice, HWND hWnd)
+BOOL D3D8Test(HWND hWnd)
 {
     return FALSE;
 }

base/applications/dxdiag/d3dtest9.c

@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-BOOL D3D9Test(GUID *lpDevice, HWND hWnd)
+BOOL D3D9Test(HWND hWnd)
 {
     return FALSE;
 }

base/applications/dxdiag/ddtest.c

@@ -8,8 +8,8 @@
 
 #include "precomp.h"
 
-BOOL DDPrimarySurfaceTest(GUID *lpDevice, HWND hWnd);
-BOOL DDOffscreenBufferTest(GUID *lpDevice, HWND hWnd, BOOL Fullscreen);
+BOOL DDPrimarySurfaceTest(HWND hWnd);
+BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen);
 VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface);
 VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT *rectDD);
 
@@ -21,7 +21,7 @@ VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE l
 #define DD_SQUARE_STEP 2
 
 
-BOOL StartDDTest(GUID *lpDevice, HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult, INT TestNr)
+BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult, INT TestNr)
 {
     WCHAR szTestDescription[256];
     WCHAR szCaption[256];
@@ -41,13 +41,13 @@ BOOL StartDDTest(GUID *lpDevice, HWND hWnd, HINSTANCE hInstance, INT resTestDesc
 
     switch(TestNr){
         case 1:
-            Result = DDPrimarySurfaceTest(lpDevice, hWnd);
+            Result = DDPrimarySurfaceTest(hWnd);
             break;
         case 2:
-            Result = DDOffscreenBufferTest(lpDevice, hWnd, FALSE);
+            Result = DDOffscreenBufferTest(hWnd, FALSE);
             break;
         case 3:
-            Result = DDOffscreenBufferTest(lpDevice, hWnd, TRUE);
+            Result = DDOffscreenBufferTest(hWnd, TRUE);
             break;
         default:
             Result = FALSE;
@@ -67,7 +67,7 @@ BOOL StartDDTest(GUID *lpDevice, HWND hWnd, HINSTANCE hInstance, INT resTestDesc
     return FALSE;
 }
 
-VOID DDTests(GUID *lpDevice)
+VOID DDTests()
 {
     WNDCLASSEX winClass;
     HWND hWnd;
@@ -105,15 +105,15 @@ VOID DDTests(GUID *lpDevice)
     if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO)
         return;
 
-    StartDDTest(lpDevice, hWnd, hInstance, IDS_DDPRIMARY_DESCRIPTION, IDS_DDPRIMARY_RESULT, 1);
-    StartDDTest(lpDevice, hWnd, hInstance, IDS_DDOFFSCREEN_DESCRIPTION, IDS_DDOFFSCREEN_RESULT, 2);
-    StartDDTest(lpDevice, hWnd, hInstance, IDS_DDFULLSCREEN_DESCRIPTION, IDS_DDFULLSCREEN_RESULT, 3);
+    StartDDTest(hWnd, hInstance, IDS_DDPRIMARY_DESCRIPTION, IDS_DDPRIMARY_RESULT, 1);
+    StartDDTest(hWnd, hInstance, IDS_DDOFFSCREEN_DESCRIPTION, IDS_DDOFFSCREEN_RESULT, 2);
+    StartDDTest(hWnd, hInstance, IDS_DDFULLSCREEN_DESCRIPTION, IDS_DDFULLSCREEN_RESULT, 3);
 
     DestroyWindow(hWnd);
     UnregisterClass(winClass.lpszClassName, hInstance);
 }
 
-BOOL DDPrimarySurfaceTest(GUID *lpDevice, HWND hWnd){
+BOOL DDPrimarySurfaceTest(HWND hWnd){
     UINT TimerID;
     MSG msg;
 
@@ -121,7 +121,7 @@ BOOL DDPrimarySurfaceTest(GUID *lpDevice, HWND hWnd){
     LPDIRECTDRAWSURFACE lpDDSurface = NULL;
     DDSURFACEDESC DDSurfaceDesc;
 
-    if(DirectDrawCreate(lpDevice, &lpDD, NULL) != DD_OK)
+    if(DirectDrawCreate(NULL, &lpDD, NULL) != DD_OK)
         return FALSE;
 
     if(lpDD->lpVtbl->SetCooperativeLevel(lpDD, hWnd, DDSCL_NORMAL) != DD_OK)
@@ -197,7 +197,7 @@ VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface)
 }
 
 
-BOOL DDOffscreenBufferTest(GUID *lpDevice, HWND hWnd, BOOL Fullscreen){
+BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
     UINT_PTR TimerID, TimerIDUpdate;
     LPDIRECTDRAW lpDD;
     LPDIRECTDRAWSURFACE lpDDPrimarySurface;
@@ -210,7 +210,7 @@ BOOL DDOffscreenBufferTest(GUID *lpDevice, HWND hWnd, BOOL Fullscreen){
     POINT wndPoint;
     INT posX = 0, posY = 10, xGain = DD_SQUARE_STEP, yGain = DD_SQUARE_STEP;
 
-    if(DirectDrawCreate(lpDevice, &lpDD, NULL) != DD_OK)
+    if(DirectDrawCreate(NULL, &lpDD, NULL) != DD_OK)
         return FALSE;
 
     ZeroMemory(&DDSurfaceDesc, sizeof(DDSurfaceDesc));

base/applications/dxdiag/display.c

@@ -305,89 +305,56 @@ InitializeDialog(HWND hwndDlg, PDISPLAY_DEVICEW pDispDevice)
     return TRUE;
 }
 
-
-static BOOL WINAPI
-DDEnumerateCallback(
-    IN GUID *lpGuid,
-    IN LPSTR lpDriverName,
-    IN LPSTR lpDriverDescription,
-    IN LPVOID lpContext,
-    IN HMONITOR hMonitor)
+void InitializeDisplayAdapters(PDXDIAG_CONTEXT pContext)
 {
     DISPLAY_DEVICEW DispDevice;
-    LPWSTR lpDriverDescriptionW;
-    PDXDIAG_CONTEXT pContext = lpContext;
-    PDXDIAG_DISPLAY *pDisplayAdapters;
-    PDXDIAG_DISPLAY pDisplayAdapter;
+    HWND * hDlgs;
     HWND hwndDlg;
     WCHAR szDisplay[20];
     WCHAR szText[30];
-    int len;
-    BOOL ret;
+    DWORD dwOffset = 0;
 
-    /* Convert lpDriverDescription to WCHAR */
-    len = MultiByteToWideChar(CP_ACP, 0, lpDriverDescription, strlen(lpDriverDescription), NULL, 0);
-    if (!len)
-        return FALSE;
-    lpDriverDescriptionW = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR));
-    if (!lpDriverDescriptionW)
-        return FALSE;
-    MultiByteToWideChar(CP_ACP, 0, lpDriverDescription, strlen(lpDriverDescription), lpDriverDescriptionW, len);
-    lpDriverDescriptionW[len] = UNICODE_NULL;
-
-    /* Get associated display device */
-    ZeroMemory(&DispDevice, sizeof(DispDevice));
-    DispDevice.cb = sizeof(DispDevice);
-    ret = EnumDisplayDevicesW(lpDriverDescriptionW, 0, &DispDevice, 0);
-    HeapFree(GetProcessHeap(), 0, lpDriverDescriptionW);
-    if (!ret)
-        return TRUE;
-
-    pDisplayAdapter = HeapAlloc(GetProcessHeap(), 0, sizeof(DXDIAG_DISPLAY));
-    if (!pDisplayAdapter)
-        return FALSE;
-
-    if (pContext->NumDisplayAdapter)
-        pDisplayAdapters = HeapReAlloc(GetProcessHeap(), 0, pContext->DisplayAdapters, (pContext->NumDisplayAdapter + 1) * sizeof(PDXDIAG_DISPLAY));
-    else
-        pDisplayAdapters = HeapAlloc(GetProcessHeap(), 0, (pContext->NumDisplayAdapter + 1) * sizeof(PDXDIAG_DISPLAY));
-
-    if (!pDisplayAdapters)
+    while(TRUE)
     {
-        HeapFree(GetProcessHeap(), 0, pDisplayAdapter);
-        return FALSE;
+        ZeroMemory(&DispDevice, sizeof(DISPLAY_DEVICEW));
+        DispDevice.cb = sizeof(DISPLAY_DEVICEW);
+        if (!EnumDisplayDevicesW(NULL, pContext->NumDisplayAdapter + dwOffset, &DispDevice, 0))
+            return;
+
+        /* skip devices not attached to the desktop and mirror drivers */
+        if (!(DispDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) || (DispDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER))
+        {
+            dwOffset++;
+            continue;
+        }
+        if (pContext->NumDisplayAdapter)
+            hDlgs = HeapReAlloc(GetProcessHeap(), 0, pContext->hDisplayWnd, (pContext->NumDisplayAdapter + 1) * sizeof(HWND));
+        else
+            hDlgs = HeapAlloc(GetProcessHeap(), 0, (pContext->NumDisplayAdapter + 1) * sizeof(HWND));
+
+        if (!hDlgs)
+            break;
+
+        pContext->hDisplayWnd = hDlgs;
+        hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); EnableDialogTheme(hwndDlg);
+        if (!hwndDlg)
+           break;
+
+        /* initialize the dialog */
+        InitializeDialog(hwndDlg, &DispDevice);
+
+        szDisplay[0] = L'\0';
+        LoadStringW(hInst, IDS_DISPLAY_DIALOG, szDisplay, sizeof(szDisplay)/sizeof(WCHAR));
+        szDisplay[(sizeof(szDisplay)/sizeof(WCHAR))-1] = L'\0';
+
+        wsprintfW (szText, L"%s %u", szDisplay, pContext->NumDisplayAdapter + 1);
+        InsertTabCtrlItem(GetDlgItem(pContext->hMainDialog, IDC_TAB_CONTROL), pContext->NumDisplayAdapter + 1, szText);
+
+        hDlgs[pContext->NumDisplayAdapter] = hwndDlg;
+        pContext->NumDisplayAdapter++;
     }
 
-    pContext->DisplayAdapters = pDisplayAdapters;
-    hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pDisplayAdapter);
-    EnableDialogTheme(hwndDlg);
-    if (!hwndDlg)
-    {
-        HeapFree(GetProcessHeap(), 0, pDisplayAdapter);
-        return FALSE;
-    }
 
-    /* initialize the dialog */
-    InitializeDialog(hwndDlg, &DispDevice);
-
-    szDisplay[0] = UNICODE_NULL;
-    LoadStringW(hInst, IDS_DISPLAY_DIALOG, szDisplay, ARRAYSIZE(szDisplay));
-    szDisplay[ARRAYSIZE(szDisplay) - 1] = UNICODE_NULL;
-
-    wsprintfW(szText, L"%s %u", szDisplay, pContext->NumDisplayAdapter + 1);
-    InsertTabCtrlItem(GetDlgItem(pContext->hMainDialog, IDC_TAB_CONTROL), pContext->NumDisplayAdapter + 1, szText);
-
-    pDisplayAdapter->hDisplayWnd = hwndDlg;
-    if (lpGuid)
-        pDisplayAdapter->guid = *lpGuid;
-    pContext->DisplayAdapters[pContext->NumDisplayAdapter++] = pDisplayAdapter;
-    return TRUE;
-}
-
-
-void InitializeDisplayAdapters(PDXDIAG_CONTEXT pContext)
-{
-    DirectDrawEnumerateExA(DDEnumerateCallback, pContext, DDENUM_ATTACHEDSECONDARYDEVICES);
 }
 
 
@@ -395,14 +362,13 @@ INT_PTR CALLBACK
 DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     RECT rect;
-    HWND hMainDialog;
-    PDXDIAG_DISPLAY pDisplay = (PDXDIAG_DISPLAY)GetWindowLongPtr(hDlg, DWLP_USER);
+    PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER);
     switch (message)
     {
         case WM_INITDIALOG:
         {
-            pDisplay = (PDXDIAG_DISPLAY) lParam;
-            SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pDisplay);
+            pContext = (PDXDIAG_CONTEXT) lParam;
+            SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pContext);
             SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
             return TRUE;
         }
@@ -412,14 +378,13 @@ DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
             {
                 case IDC_BUTTON_TESTDD:
                 case IDC_BUTTON_TEST3D:
-                    hMainDialog = GetWindow(hDlg, GW_OWNER);
-                    GetWindowRect(hMainDialog, &rect);
+                    GetWindowRect(pContext->hMainDialog, &rect);
                     /* FIXME log result errors */
                     if (IDC_BUTTON_TESTDD == LOWORD(wParam))
-                        DDTests(&pDisplay->guid);
+                        DDTests();
                     else if (IDC_BUTTON_TEST3D == LOWORD(wParam))
-                        D3DTests(&pDisplay->guid);
-                    SetWindowPos(hMainDialog, NULL, rect.left, rect.top, rect.right, rect.bottom, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
+                        D3DTests();
+                    SetWindowPos(pContext->hMainDialog, NULL, rect.left, rect.top, rect.right, rect.bottom, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
                     break;
             }
             break;

base/applications/dxdiag/dxdiag.c

@@ -84,8 +84,8 @@ DestroyTabCtrlDialogs(PDXDIAG_CONTEXT pContext)
     /* destroy display dialogs */
     for(Index = 0; Index < pContext->NumDisplayAdapter; Index++)
     {
-       if (pContext->DisplayAdapters[Index]->hDisplayWnd)
-           DestroyWindow(pContext->DisplayAdapters[Index]->hDisplayWnd);
+       if (pContext->hDisplayWnd[Index])
+           DestroyWindow(pContext->hDisplayWnd[Index]);
     }
 
     /* destroy audio dialogs */
@@ -142,7 +142,7 @@ TabCtrl_OnSelChange(PDXDIAG_CONTEXT pContext)
         ShowWindow(pContext->hDialogs[Index], SW_HIDE);
 
     for(Index = 0; Index < pContext->NumDisplayAdapter; Index++)
-        ShowWindow(pContext->DisplayAdapters[Index]->hDisplayWnd, SW_HIDE);
+        ShowWindow(pContext->hDisplayWnd[Index], SW_HIDE);
 
     for(Index = 0; Index < pContext->NumSoundAdapter; Index++)
         ShowWindow(pContext->hSoundWnd[Index], SW_HIDE);
@@ -158,7 +158,7 @@ TabCtrl_OnSelChange(PDXDIAG_CONTEXT pContext)
 
     if (CurSel -1 < pContext->NumDisplayAdapter)
     {
-        ShowWindow(pContext->DisplayAdapters[CurSel-1]->hDisplayWnd, SW_SHOW);
+        ShowWindow(pContext->hDisplayWnd[CurSel-1], SW_SHOW);
         return;
     }
 

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

@@ -42,7 +42,7 @@ BEGIN
     EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CHECKBOX "WHQL デジタル署名を確認する", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
@@ -127,7 +127,7 @@ BEGIN
     EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     GROUPBOX "ReactX の機能", IDC_STATIC, 5, 97, 452, 70
     CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
-    RTEXT "ハードウェア音声\n加速レベル:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    RTEXT "Hardware Sound\nAcceleration Level:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
     PUSHBUTTON "DirectSound のテスト", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
     GROUPBOX "注意", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
@@ -137,17 +137,17 @@ IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    RTEXT "General MIDI DLS コレクション:", IDC_STATIC, 0, 0, 100, 10
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
     EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    GROUPBOX "音楽ポート", IDC_STATIC, 5, 10, 452, 85
-    GROUPBOX "ReactXの機能", IDC_STATIC, 5, 97, 452, 70
-    LTEXT "デフォルトのポート高速化:", IDC_STATIC, 15, 120, 95, 17
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17
     LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
-    PUSHBUTTON "無効にする", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
-    LTEXT "このポートを使用してテストします:", IDC_STATIC, 180, 105, 100, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10
     LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "DirectMusic をテストする", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
-    GROUPBOX "注記", IDC_STATIC, 5, 170, 452, 50
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
@@ -170,11 +170,11 @@ FONT 9, "MS UI Gothic"
 BEGIN
     GROUPBOX "登録済み DirectPlay サービス プロバイダ", IDC_STATIC, 5, 0, 452, 75
     CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
-    GROUPBOX "登録済みのロビー可能な DirectPlay アプリ", IDC_STATIC, 5, 77, 452, 55
-    GROUPBOX "ReactX の機能", IDC_STATIC, 5, 133, 452, 35
-    PUSHBUTTON "DirectPlay 音声オプション", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
-    PUSHBUTTON "DirectPlay をテストする", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
-    GROUPBOX "注記", IDC_STATIC, 5, 170, 452, 50
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
@@ -182,11 +182,11 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "探している情報がまだ見つかりませんか？ 以下の方法をお試しください。", IDC_STATIC, 5, 0, 300, 10
-    PUSHBUTTON "システム情報", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
-    LTEXT "追加のシステム情報を表示します", IDC_STATIC, 90, 23, 300, 10
-    PUSHBUTTON "リフレッシュ レートのオーバーライド", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
-    LTEXT "DirectDrawのリフレッシュ レートを上書きします", IDC_STATIC, 90, 43, 300, 10
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10
 END
 
 STRINGTABLE
@@ -238,17 +238,17 @@ BEGIN
     IDS_DDFULLSCREEN_DESCRIPTION "このテストでは、DirectDraw を使って全画面表示モードで描画します。移動している白い矩形が描画されます。続行しますか?"
     IDS_DDFULLSCREEN_RESULT "全画面表示モードで移動している白い矩形が見えましたか?"
     IDS_FORMAT_ADAPTER_MEM "%u MB"
-    IDS_FORMAT_ADAPTER_MODE "%d x %d (%u ビット) (%uHz)"
+    IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)"
     IDS_OPTION_NO "いいえ"
     IDS_D3DTEST_DESCRIPTION "Direct3D インタフェーステストを開始しようとしています。続行しますか?"
     IDS_D3DTEST_D3Dx "このテストはハードウェア アクセラーレータ Direct3D %u インターフェイスを使います。"
-    IDS_OS_VERSION "%s %s (%d.%d, ビルド %d)"
-    IDS_DMUSIC_DESC "説明"
-    IDS_DMUSIC_TYPE "種類"
-    IDS_DMUSIC_KERNEL "カーネル　モード"
-    IDS_DMUSIC_IO "入出力"
-    IDS_DMUSIC_DLS "DLS をサポート"
-    IDS_DMUSIC_EXT "外部"
-    IDS_DMUSIC_PORT "デフォルトのポート"
-    IDS_DDDISABLE_MSG "これにより、すべてのディスプレイ デバイス上の DirectDraw のすべてのハードウェア アクセラレーションが無効になります。\n続行しますか?\n"
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n"
 END

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

@@ -3,7 +3,7 @@
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Romanian resource file
  * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023-2025 Andrei Miloiu <miloiuandrei@gmail.com>
+ *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -11,22 +11,22 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 IDD_MAIN_DIALOG DIALOGEX 0, 0, 478, 280
 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
       WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
-CAPTION "Instrument de diagnosticare ReactX"
+CAPTION "Diagnostic ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Ajutor", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
-    DEFPUSHBUTTON "&Pagina următoare", IDC_BUTTON_NEXT, 187, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Salvare a tuturor informațiilor…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
-    PUSHBUTTON "Î&nchidere", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Manual…", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&Următorul compartiment", IDC_BUTTON_NEXT, 187, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "S&alvare informații…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "Î&nchide", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Acest instrument raportează informații detaliate despre componentele ReactX și driverele instalate pe sistem.", IDC_STATIC, 5, 0, 443, 17
-    LTEXT "Dacă întâmpinați o problemă cu ReactX și știți ce este, atunci faceți clic pe fila corespunzătoare de mai sus. Dacă nu, puteți face clic pe butonul ""Pagina următoare"" de mai jos pentru a vizita fiecare pagină în succesiune.", IDC_STATIC, 5, 15, 443, 25
+    LTEXT "Acest instrument oferă informații detaliate despre componentele ReactX și drivere instalate în sistem.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Dacă aveți la cunoștință careva probleme la o anumită categorie, mergeți la compartimentul corespunzător de mai sus. Altfel, puteți utiliza butonul „Următorul compartiment” de mai jos pentru a trece secvențial prin fiecare categorie.", IDC_STATIC, 5, 15, 443, 25
     GROUPBOX "Informații despre sistem", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
     LTEXT "Data/Ora curentă:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
     LTEXT "Numele calculatorului:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
@@ -60,11 +60,11 @@ BEGIN
     GROUPBOX "Dispozitiv", IDC_STATIC, 5, 0, 250, 95
     RTEXT "Nume:", IDC_STATIC, 20, 10, 70, 10
     RTEXT "Producător:", IDC_STATIC, 20, 20, 70, 10
-    RTEXT "Tipul chip-ului:", IDC_STATIC, 20, 30, 70, 10
-    RTEXT "Tipul DAC:", IDC_STATIC, 20, 40, 70, 10
-    RTEXT "Mem. tot. aprox.:", IDC_STATIC, 20, 50, 70, 10
-    RTEXT "Mod afișare curentă:", IDC_STATIC, 20, 60, 70, 10
-    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    RTEXT "Tipul cipului:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Tipul CDA:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Memorie aprox.:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Afișare curentă:", IDC_STATIC, 20, 60, 70, 10
+    RTEXT "Ecran:", IDC_STATIC, 20, 70, 70, 10
     EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -73,10 +73,10 @@ BEGIN
     EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
-    RTEXT "Driver principal:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Driver primar:", IDC_STATIC, 275, 10, 55, 10
     RTEXT "Versiune:", IDC_STATIC, 275, 20, 55, 10
     RTEXT "Dată:", IDC_STATIC, 275, 30, 55, 10
-    RTEXT "Logo WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Semnăt. WHQL:", IDC_STATIC, 275, 40, 55, 10
     RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
     RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
     RTEXT "Versiune DDI:", IDC_STATIC, 275, 70, 55, 10
@@ -87,18 +87,18 @@ BEGIN
     EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 97, 452, 70
+    GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70
     RTEXT "Accelerare DirectDraw:", IDC_STATIC, 15, 115, 110, 12
     RTEXT "Accelerare Direct3D:", IDC_STATIC, 15, 130, 110, 12
-    RTEXT "Accelerare a texturilor AGP:", IDC_STATIC, 15, 145, 110, 12
+    RTEXT "Accelerare Textură AGP:", IDC_STATIC, 15, 145, 110, 12
     LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
     LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
     LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
-    PUSHBUTTON "Activare", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
-    PUSHBUTTON "Activare", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
-    PUSHBUTTON "Activare", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
-    PUSHBUTTON "Testare DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
-    PUSHBUTTON "Testare Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    PUSHBUTTON "Activează", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Activează", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Activează", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Testează DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Testează Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
     GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
@@ -124,7 +124,7 @@ BEGIN
     RTEXT "Nume:", IDC_STATIC, 275, 10, 55, 10
     RTEXT "Versiune:", IDC_STATIC, 275, 20, 55, 10
     RTEXT "Dată:", IDC_STATIC, 275, 30, 55, 10
-    RTEXT "Logo WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Semnătură WHQL:", IDC_STATIC, 275, 40, 55, 10
     RTEXT "Alte fișiere:", IDC_STATIC, 275, 50, 55, 10
     RTEXT "Furnizor:", IDC_STATIC, 275, 60, 55, 10
     EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -133,10 +133,10 @@ BEGIN
     EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 97, 452, 70
+    GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70
     CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
-    RTEXT "Hardware de sunet\nNivel de accelerare:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
-    PUSHBUTTON "Testare DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    RTEXT "Echipament de sunet\nNivel de accelerare::", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Testează DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
     GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
@@ -148,13 +148,13 @@ BEGIN
     RTEXT "Colecție de MIDI DLS generală:", IDC_STATIC, 0, 0, 100, 10
     EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     GROUPBOX "Porturi de muzică", IDC_STATIC, 5, 10, 452, 85
-    GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 97, 452, 70
+    GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70
     LTEXT "Port de accelerare implicit:", IDC_STATIC, 15, 120, 95, 17
     LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
     PUSHBUTTON "Dezactivează", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
     LTEXT "Testare utilizare port:", IDC_STATIC, 180, 105, 100, 10
     LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "Testare DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    PUSHBUTTON "Testează DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
     GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
@@ -176,12 +176,12 @@ IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Furnizori de servicii DirectPlay înregistrați", IDC_STATIC, 5, 0, 452, 75
+    GROUPBOX "Furnizori înregistrați de servicii DirectPlay", IDC_STATIC, 5, 0, 452, 75
     CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
-    GROUPBOX "Aplicații Lobbyable DirectPlay înregistrate", IDC_STATIC, 5, 77, 452, 55
-    GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 133, 452, 35
+    GROUPBOX "Aplicații înregistrate pentru DirectPlay", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 133, 452, 35
     PUSHBUTTON "Opțiuni de voce DirectPlay", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
-    PUSHBUTTON "Testare DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    PUSHBUTTON "Testează DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
     GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
@@ -190,73 +190,73 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Încă nu găsiți informațiile pe care le căutați? Iată câteva lucruri suplimentare pe care le puteți face:", IDC_STATIC, 5, 0, 300, 10
+    LTEXT "Încă nu ați găsit informația necesară? Iată câteva lucruri suplimentare pe care le puteți face:", IDC_STATIC, 5, 0, 300, 10
     PUSHBUTTON "Informații de sistem", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
-    LTEXT "Afișează informații suplimentare de sistem", IDC_STATIC, 90, 23, 300, 10
-    PUSHBUTTON "Ajust. rata de împrosp.", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
-    LTEXT "Ignoră rata de reîmprospătare pentru DirectDraw", IDC_STATIC, 90, 43, 300, 10
+    LTEXT "Afișează informații suplimantare de sistem", IDC_STATIC, 90, 23, 300, 10
+    PUSHBUTTON "Ajustează rata de împrospătare", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Ajustează rata de împrospătare pentru DirectDraw", IDC_STATIC, 90, 43, 300, 10
 END
 
 STRINGTABLE
 BEGIN
-    IDS_MAIN_DIALOG "Instrument de diagnosticare ReactX"
+    IDS_MAIN_DIALOG "Diagnostic ReactX"
     IDS_SYSTEM_DIALOG "Sistem"
-    IDS_DISPLAY_DIALOG "Afișaj"
+    IDS_DISPLAY_DIALOG "Ecran"
     IDS_SOUND_DIALOG "Sunet"
     IDS_MUSIC_DIALOG "Muzică"
-    IDS_INPUT_DIALOG "Intrare"
+    IDS_INPUT_DIALOG "Intrări"
     IDS_NETWORK_DIALOG "Rețea"
-    IDS_HELP_DIALOG "Ajutor"
-    IDS_FORMAT_MB "%I64uMB de RAM"
-    IDS_FORMAT_SWAP "%I64u (de) MB folosit (folosiți), %I64u (de) MB disponibil(i)"
-    IDS_FORMAT_UNIPROC "%s (%u CPU)"
-    IDS_FORMAT_MPPROC "%s (%u CPUs)"
-    IDS_VERSION_UNKNOWN "Versiune necunoscută"
+    IDS_HELP_DIALOG "Asistență"
+    IDS_FORMAT_MB "%I64u Mo memorie"
+    IDS_FORMAT_SWAP "%I64u Mo utilizată, %I64u Mo disponibilă"
+    IDS_FORMAT_UNIPROC "%s (%u procesor)"
+    IDS_FORMAT_MPPROC "%s (%u procesoare)"
+    IDS_VERSION_UNKNOWN "Versiune neidentificată"
     IDS_DEVICE_STATUS_ATTACHED "Conectat"
     IDS_DEVICE_STATUS_MISSING "Deconectat"
-    IDS_DEVICE_STATUS_UNKNOWN "Necunoscut"
-    IDS_DEVICE_NAME "Numele dispozitivului"
+    IDS_DEVICE_STATUS_UNKNOWN "Neidentificat"
+    IDS_DEVICE_NAME "Nume dispozitiv"
     IDS_DEVICE_STATUS "Stare"
-    IDS_DEVICE_CONTROLLER "ID controller-ului"
-    IDS_DEVICE_MANUFACTURER "ID-ul producătorului"
-    IDS_DEVICE_PRODUCT "ID-ul produsului"
-    IDS_DEVICE_FORCEFEEDBACK "Forțare a driverului de feedback"
+    IDS_DEVICE_CONTROLLER "ID controlor"
+    IDS_DEVICE_MANUFACTURER "ID producător"
+    IDS_DEVICE_PRODUCT "ID produs"
+    IDS_DEVICE_FORCEFEEDBACK "Forțează reacția driverului"
     IDS_NOT_APPLICABLE "n/a"
     IDS_OPTION_YES "Da"
     IDS_DIRECTPLAY_COL_NAME1 "Nume"
     IDS_DIRECTPLAY_COL_NAME2 "Registru"
     IDS_DIRECTPLAY_COL_NAME3 "Fișier"
     IDS_DIRECTPLAY_COL_NAME4 "Versiune"
-    IDS_DIRECTPLAY8_MODEMSP "Furnizor de servicii de modem DirectPlay8"
-    IDS_DIRECTPLAY8_SERIALSP "Furnizor de servicii seriale DirectPlay8"
-    IDS_DIRECTPLAY8_IPXSP "Furnizor de servicii DirectPlay8 IPX"
-    IDS_DIRECTPLAY8_TCPSP "DirectPlay8 TCP/IP Service Provider"
+    IDS_DIRECTPLAY8_MODEMSP "Furnizor de serviciu Modem-DirectPlay8"
+    IDS_DIRECTPLAY8_SERIALSP "Furnizor de serviciu Serial-DirectPlay8"
+    IDS_DIRECTPLAY8_IPXSP "Furnizor de serviciu IPX-DirectPlay8"
+    IDS_DIRECTPLAY8_TCPSP "Furnizor de serviciu TCP/IP-DirectPlay8"
     IDS_DIRECTPLAY_TCPCONN "Conexiune de Internet TCP/IP pentru DirectPlay"
     IDS_DIRECTPLAY_IPXCONN "Conexiune IPX pentru DirectPlay"
-    IDS_DIRECTPLAY_MODEMCONN "Conexiune de modem pentru DirectPlay"
-    IDS_DIRECTPLAY_SERIALCONN "Conexiune serială pentru DirectPlay"
-    IDS_REG_SUCCESS "OK"
+    IDS_DIRECTPLAY_MODEMCONN "Conexiune Modem pentru DirectPlay"
+    IDS_DIRECTPLAY_SERIALCONN "Conexiune Serială pentru DirectPlay"
+    IDS_REG_SUCCESS "Î&nchide"
     IDS_REG_FAIL "Eroare"
-    IDS_DDTEST_ERROR "Testul de randare DirectDraw a eșuat.\nVă rugăm să consultați notele pentru mai multe informații."
-    IDS_DDTEST_DESCRIPTION "Acesta va porni testarea interfeței DirectDraw. Doriți să continuați?"
-    IDS_DDPRIMARY_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena pe suprafața principală.\nAr trebui desenate dreptunghiuri alb-negru. Doriți să continuați?"
-    IDS_DDPRIMARY_RESULT "Ați văzut dreptunghiuri alb-negru?"
-    IDS_DDOFFSCREEN_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena un tampon în afara ecranului. Ar trebui desenat un dreptunghi alb în mișcare. Doriți să continuați?"
-    IDS_DDOFFSCREEN_RESULT "Ați văzut dreptunghi alb în mișcare?"
-    IDS_DDFULLSCREEN_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena în modul ecran complet. Ar trebui desenat un dreptunghi alb în mișcare. Doriți să continuați?"
-    IDS_DDFULLSCREEN_RESULT "Ați văzut dreptunghi alb în mișcare în modul ecran complet?"
-    IDS_FORMAT_ADAPTER_MEM "%u (de) MB"
-    IDS_FORMAT_ADAPTER_MODE "%d x %d (%u (de) biți)(%uHz)"
+    IDS_DDTEST_ERROR "Testul a eșuat!"
+    IDS_DDTEST_DESCRIPTION "Urmează testele de interfață DirectDraw. Continuați?"
+    IDS_DDPRIMARY_DESCRIPTION "Testul următor va utiliza DirectDraw pentru a desena dreptunghiuri albe și negre pe suprafața primară. Continuați?"
+    IDS_DDPRIMARY_RESULT "Dreptunghiurile albe și negre au fost vizibile?"
+    IDS_DDOFFSCREEN_DESCRIPTION "Testul următor va utiliza DirectDraw pentru desenarea unui dreptunghi alb în mișcare utilizând o memorie tampon din afara ecranului. Continuați?"
+    IDS_DDOFFSCREEN_RESULT "Dreptunghiul alb în mișcare a fost vizibil?"
+    IDS_DDFULLSCREEN_DESCRIPTION "Testul următor va utiliza DirectDraw pentru desenarea unui dreptunghi alb în mișcare utilizând tot ecranul. Continuați?"
+    IDS_DDFULLSCREEN_RESULT "Pe ecranul complet, dreptunghiul alb în mișcare a fost vizibil?"
+    IDS_FORMAT_ADAPTER_MEM "%u Mo"
+    IDS_FORMAT_ADAPTER_MODE "%d x %d (%u biți)(%uHz)"
     IDS_OPTION_NO "Nu"
-    IDS_D3DTEST_DESCRIPTION "Acesta va porni testarea interfeței Direct3D. Doriți să continuați?"
-    IDS_D3DTEST_D3Dx "Acest test va folosi interfața Direct3D %u accelerată hardware."
-    IDS_OS_VERSION "%s %s (%d.%d, Subversiunea %d)"
+    IDS_D3DTEST_DESCRIPTION "Urmează testul de interfață Direct3D. Continuați?"
+    IDS_D3DTEST_D3Dx "Testul următor va utiliza interfața Direct3D %u cu accelerare de echipament fizic."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
     IDS_DMUSIC_DESC "Descriere"
     IDS_DMUSIC_TYPE "Tip"
-    IDS_DMUSIC_KERNEL "Modul nucleu"
-    IDS_DMUSIC_IO "I/E"
-    IDS_DMUSIC_DLS "Suportă DLS"
+    IDS_DMUSIC_KERNEL "Mod nucleu"
+    IDS_DMUSIC_IO "In/Ex"
+    IDS_DMUSIC_DLS "DLS de suport"
     IDS_DMUSIC_EXT "Extern"
     IDS_DMUSIC_PORT "Port implicit"
-    IDS_DDDISABLE_MSG "Acesta va dezactiva toată accelerarea hardware pentru DirectDraw pe toate dispozitivele de afișare.\nDoriți să continuați?\n"
+    IDS_DDDISABLE_MSG "Accelerările fizice DirectDraw vor fi dezactivate pentru toate dispozitivele.\nDoriți să continuați?\n"
 END

base/applications/dxdiag/precomp.h

@@ -26,18 +26,12 @@
 
 #include "resource.h"
 
-typedef struct
-{
-    HWND hDisplayWnd;
-    GUID guid;
-} DXDIAG_DISPLAY, *PDXDIAG_DISPLAY;
-
 typedef struct
 {
     HWND hMainDialog;
     HWND hTabCtrl;
     ULONG NumDisplayAdapter;
-    PDXDIAG_DISPLAY * DisplayAdapters;
+    HWND * hDisplayWnd;
     ULONG NumSoundAdapter;
     HWND * hSoundWnd;
     HWND hDialogs[5];
@@ -59,10 +53,10 @@ INT_PTR CALLBACK NetworkPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 INT_PTR CALLBACK HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 /* DirectDraw tests */
-VOID DDTests(GUID *lpDevice);
+VOID DDTests(VOID);
 
 /* Direct3D tests */
-VOID D3DTests(GUID *lpDevice);
+VOID D3DTests(VOID);
 
 /* DirectSound initialization */
 void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext);

base/applications/extrac32/CMakeLists.txt

@@ -1,7 +1,7 @@
 
+add_definitions(-D__WINESRC__)
 add_executable(extrac32 extrac32.c)
 target_link_libraries(extrac32 wine)
 set_module_type(extrac32 win32gui UNICODE)
 add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET extrac32 DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(extrac32) # CORE-5743: No ARRAY_SIZE macro

base/applications/findstr/findstr.rc

@@ -40,9 +40,6 @@
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
 #ifdef LANGUAGE_LT_LT
     #include "lang/lt-LT.rc"
 #endif

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

@@ -1,13 +0,0 @@
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    IDS_USAGE "FINDSTR: 文字列を含むファイルのすべての行を出力します。\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""文字列"" [ ファイル... ]\n\
-    /C  文字列を含む行の個数を数えます\n\
-    /I  大文字小文字を無視します\n\
-    /N  表示される行に1から番号を付けます\n\
-    /V  文字列を含まない行を出力します"
-    IDS_NO_SUCH_FILE "FINDSTR: %s: そのようなファイルはありません\n"
-    IDS_CANNOT_OPEN "FINDSTR: %s: ファイルが開けません\n"
-END

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

@@ -18,12 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "Mémoire insuffisante pour terminer l'opération."
     IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier de polices valide."
     IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenêtre."
-    IDS_ERROR_ISINSTALLED "Cette police est déjà installée !"
-    IDS_ERROR_FONTCPY "Échec lors de la copie du fichier police !"
-    IDS_ERROR_OPENKEY "Échec lors de l'ouverture de la clé de registre de la police !"
-    IDS_ERROR_REGISTER "Échec lors de l'enregistrement de la nouvelle police !"
-    IDS_SUCCESS "Succès"
-    IDS_COMPLETED "Installation de la police effectuée."
+    IDS_ERROR_ISINSTALLED "This font is already installed!" 
+    IDS_ERROR_FONTCPY "Failed to copy the font file!"
+    IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
+    IDS_ERROR_REGISTER "Failed to register the new font!"
+    IDS_SUCCESS "Success"
+    IDS_COMPLETED "Font installation completed."
     IDS_FILTER_LIST "Toutes polices supportées (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\
 Fichier de polices (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Fichier de polices TrueType (*.ttf)\0*.ttf\0\

base/applications/games/solitaire/ReadMe.txt

@@ -7,7 +7,7 @@ card-game library.
 Freeware
 Copyright J Brown 2001
 
-Updates at https://www.catch22.net/
+Updates at http://www.catch22.net
 
 ******************************************/
 

base/applications/games/solitaire/lang/cs-CZ.rc

@@ -1,11 +1,7 @@
-/*
- * PROJECT:     ReactOS Solitaire
- * LICENSE:     Freeware, permission to use under Public Domain
- * PURPOSE:     Czech resource file
- * TRANSLATORS: Copyright 2008 Radek Liška (Black_Fox) <radekliska@gmail.com>
- *              Copyright 2008 Mário Kačmár <kario@szm.sk>
- *              Copyright 2011-2017 Kamil Horníček <kamil.hornicek@reactos.org>
- *              Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik@seznam.cz>
+/* FILE:       applications/games/solitaire/lang/cs-CZ.rc
+ * PURPOSE:    Czech Language File
+ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
+ * UPDATED:    2008-11-30 by Kario
  */
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -17,13 +13,13 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Možnosti"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Sejmout", -1, 7, 7, 90, 40
+    GROUPBOX "Karty", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Sejmout &jednu", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "Sejmout &tři", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    GROUPBOX "Skórování", -1, 100, 7, 75, 53
+    GROUPBOX "Scoring", -1, 100, 7, 75, 53
     AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
-    AUTORADIOBUTTON "Žá&dné", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
     AUTOCHECKBOX "Zobrazit č&as", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "Stavový řád&ek", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
     AUTOCHECKBOX "&Ponechat skóre", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
@@ -59,7 +55,7 @@ BEGIN
     IDS_SOL_NAME "Solitaire"
     IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib verze 1.0"
     IDS_SOL_QUIT "Ukončit rozehranou hru?"
-    IDS_SOL_WIN "Gratulujeme, zvítězili jste!"
+    IDS_SOL_WIN "Gratulujeme, zvítězili jste!!"
     IDS_SOL_DEAL "Rozdat znova?"
     IDS_SOL_SCORE "Skóre: %d"
     IDS_SOL_TIME "Čas: %d"
@@ -73,8 +69,8 @@ BEGIN
     BEGIN
         MENUITEM "&Rozdat\tF2", IDM_GAME_NEW
         MENUITEM SEPARATOR
-        MENUITEM "&Zpět", IDM_GAME_UNDO, GRAYED
-        MENUITEM "Ru&b karet...", IDM_GAME_DECK
+        MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED
+        MENUITEM "Rub& karet...", IDM_GAME_DECK
         MENUITEM "&Možnosti...", IDM_GAME_OPTIONS
         MENUITEM SEPARATOR
         MENUITEM "&Konec", IDM_GAME_EXIT

base/applications/games/winmine/rc/Sounds_License.txt

@@ -1,29 +1,24 @@
 box.wav
-By: amitYunger123 <https://freesound.org/people/amitYunger123/>
-License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
+License: CC0 1.0 Universal
 URL: https://freesound.org/people/amitYunger123/sounds/737638/
 Date: 30-May-2024
 
 explode.wav
-By: hoffy1138 <https://freesound.org/people/hoffy1138/>
-License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
+License: CC0 1.0 Universal
 URL: https://freesound.org/people/hoffy1138/sounds/276968/
 Date: 31-May-2024
 
 flag.wav
-By: ProfoundSounds <https://freesound.org/people/profoundsounds/>
-License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
+License: CC0 1.0 Universal
 URL: https://freesound.org/people/profoundsounds/sounds/733230/
 Date: 30-May-2024
 
 question.wav
-By: Irolan <https://freesound.org/people/Irolan/>
-License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
+License: CC0 1.0 Universal
 URL: https://freesound.org/people/Irolan/sounds/737510/
 Date: 30-May-2024
 
 win.wav
-By: David819 <https://freesound.org/people/David819/>
-License: CC0 1.0 Universal <https://creativecommons.org/publicdomain/zero/1.0/>
+License: CC0 1.0 Universal
 URL: https://freesound.org/people/David819/sounds/668436/
 Date: 31-May-2024

base/applications/kbswitch/CMakeLists.txt

@@ -1,10 +1,8 @@
 
 add_rc_deps(kbswitch.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/kbswitch.ico)
-add_executable(kbswitch kbswitch.c imemenu.c kbswitch.rc)
+add_executable(kbswitch kbswitch.c kbswitch.rc)
 set_module_type(kbswitch win32gui UNICODE)
-target_link_libraries(kbswitch wine)
-add_importlibs(kbswitch advapi32 imm32 user32 shell32 shlwapi gdi32 msvcrt kernel32 ntdll)
+add_importlibs(kbswitch advapi32 imm32 user32 shell32 shlwapi gdi32 msvcrt kernel32)
 add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all)
 
-add_subdirectory(indicdll)
-add_dependencies(kbswitch indicdll)
+add_subdirectory(kbsdll)

base/applications/kbswitch/imemenu.c

@@ -1,260 +0,0 @@
-/*
- * PROJECT:     ReactOS Keyboard Layout Switcher
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     IME menu handling
- * COPYRIGHT:   Copyright 2025 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
- */
-
-#include "kbswitch.h"
-#include "imemenu.h"
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(internat);
-
-PIMEMENUNODE g_pMenuList = NULL;
-INT g_nNextMenuID = 0;
-
-static BOOL MakeImeMenu(_In_ HMENU hMenu, _In_ const IMEMENUNODE *pMenu);
-
-static VOID
-AddImeMenuNode(_In_ PIMEMENUNODE pMenu)
-{
-    if (!g_pMenuList)
-    {
-        g_pMenuList = pMenu;
-        return;
-    }
-
-    pMenu->m_pNext = g_pMenuList;
-    g_pMenuList = pMenu;
-}
-
-static PIMEMENUNODE
-AllocateImeMenu(_In_ DWORD itemCount)
-{
-    SIZE_T cbMenu = sizeof(IMEMENUNODE) + (itemCount - 1) * sizeof(IMEMENUITEM);
-    PIMEMENUNODE pMenu = LocalAlloc(LPTR, cbMenu);
-    if (!pMenu)
-        return NULL;
-    pMenu->m_nItems = itemCount;
-    AddImeMenuNode(pMenu);
-    return pMenu;
-}
-
-static VOID
-GetImeMenuItem(
-    _In_ HIMC hIMC,
-    _Out_ PIMEMENUITEMINFO lpImeParentMenu,
-    _In_ BOOL bRightMenu,
-    _Out_ PIMEMENUITEM pItem)
-{
-    ZeroMemory(pItem, sizeof(IMEMENUITEM));
-    pItem->m_Info = *lpImeParentMenu;
-
-    if (lpImeParentMenu->fType & IMFT_SUBMENU)
-        pItem->m_pSubMenu = CreateImeMenu(hIMC, lpImeParentMenu, bRightMenu);
-
-    pItem->m_nRealID = pItem->m_Info.wID;
-    pItem->m_Info.wID = ID_STARTIMEMENU + g_nNextMenuID++;
-}
-
-PIMEMENUNODE
-CreateImeMenu(
-    _In_ HIMC hIMC,
-    _Inout_opt_ PIMEMENUITEMINFO lpImeParentMenu,
-    _In_ BOOL bRightMenu)
-{
-    const DWORD dwFlags = (bRightMenu ? IGIMIF_RIGHTMENU : 0);
-    const DWORD dwTypes = IGIMII_CMODE     |
-                          IGIMII_SMODE     |
-                          IGIMII_CONFIGURE |
-                          IGIMII_TOOLS     |
-                          IGIMII_HELP      |
-                          IGIMII_OTHER;
-    DWORD itemCount = ImmGetImeMenuItems(hIMC, dwFlags, dwTypes, lpImeParentMenu, NULL, 0);
-    if (!itemCount)
-        return NULL;
-
-    PIMEMENUNODE pMenu = AllocateImeMenu(itemCount);
-    if (!pMenu)
-        return NULL;
-
-    DWORD cbItems = sizeof(IMEMENUITEMINFO) * itemCount;
-    PIMEMENUITEMINFO pImeMenuItems = LocalAlloc(LPTR, cbItems);
-    if (!pImeMenuItems)
-    {
-        LocalFree(pMenu);
-        return NULL;
-    }
-
-    itemCount = ImmGetImeMenuItems(hIMC, dwFlags, dwTypes, lpImeParentMenu, pImeMenuItems, cbItems);
-    if (!itemCount)
-    {
-        LocalFree(pImeMenuItems);
-        LocalFree(pMenu);
-        return NULL;
-    }
-
-    PIMEMENUITEM pItems = pMenu->m_Items;
-    for (DWORD iItem = 0; iItem < itemCount; ++iItem)
-    {
-        GetImeMenuItem(hIMC, &pImeMenuItems[iItem], bRightMenu, &pItems[iItem]);
-    }
-
-    LocalFree(pImeMenuItems);
-    return pMenu;
-}
-
-static BOOL
-FillImeMenuItem(_Out_ LPMENUITEMINFO pItemInfo, _In_ const IMEMENUITEM *pItem)
-{
-    ZeroMemory(pItemInfo, sizeof(MENUITEMINFO));
-    pItemInfo->cbSize = sizeof(MENUITEMINFO);
-    pItemInfo->fMask = MIIM_ID | MIIM_STATE | MIIM_DATA;
-    pItemInfo->wID = pItem->m_Info.wID;
-    pItemInfo->fState = pItem->m_Info.fState;
-    pItemInfo->dwItemData = pItem->m_Info.dwItemData;
-
-    if (pItem->m_Info.fType)
-    {
-        pItemInfo->fMask |= MIIM_FTYPE;
-        pItemInfo->fType = 0;
-        if (pItem->m_Info.fType & IMFT_RADIOCHECK)
-            pItemInfo->fType |= MFT_RADIOCHECK;
-        if (pItem->m_Info.fType & IMFT_SEPARATOR)
-            pItemInfo->fType |= MFT_SEPARATOR;
-    }
-
-    if (pItem->m_Info.fType & IMFT_SUBMENU)
-    {
-        pItemInfo->fMask |= MIIM_SUBMENU;
-        pItemInfo->hSubMenu = CreatePopupMenu();
-        if (!MakeImeMenu(pItemInfo->hSubMenu, pItem->m_pSubMenu))
-        {
-            DestroyMenu(pItemInfo->hSubMenu);
-            pItemInfo->hSubMenu = NULL;
-            return FALSE;
-        }
-    }
-
-    if (pItem->m_Info.hbmpChecked && pItem->m_Info.hbmpUnchecked)
-    {
-        pItemInfo->fMask |= MIIM_CHECKMARKS;
-        pItemInfo->hbmpChecked = pItem->m_Info.hbmpChecked;
-        pItemInfo->hbmpUnchecked = pItem->m_Info.hbmpUnchecked;
-    }
-
-    if (pItem->m_Info.hbmpItem)
-    {
-        pItemInfo->fMask |= MIIM_BITMAP;
-        pItemInfo->hbmpItem = pItem->m_Info.hbmpItem;
-    }
-
-    PCTSTR szString = pItem->m_Info.szString;
-    if (szString && szString[0])
-    {
-        pItemInfo->fMask |= MIIM_STRING;
-        pItemInfo->dwTypeData = (PTSTR)szString;
-        pItemInfo->cch = lstrlen(szString);
-    }
-
-    return TRUE;
-}
-
-static BOOL
-MakeImeMenu(_In_ HMENU hMenu, _In_ const IMEMENUNODE *pMenu)
-{
-    if (!pMenu || !pMenu->m_nItems)
-        return FALSE;
-
-    for (INT iItem = 0; iItem < pMenu->m_nItems; ++iItem)
-    {
-        MENUITEMINFO mi = { sizeof(mi) };
-        if (!FillImeMenuItem(&mi, &pMenu->m_Items[iItem]))
-        {
-            ERR("FillImeMenuItem failed\n");
-            return FALSE;
-        }
-        if (!InsertMenuItem(hMenu, iItem, TRUE, &mi))
-        {
-            ERR("InsertMenuItem failed\n");
-            return FALSE;
-        }
-    }
-
-    return TRUE;
-}
-
-HMENU MenuFromImeMenu(_In_ const IMEMENUNODE *pMenu)
-{
-    HMENU hMenu = CreatePopupMenu();
-    if (!pMenu)
-        return hMenu;
-    if (!MakeImeMenu(hMenu, pMenu))
-    {
-        DestroyMenu(hMenu);
-        return NULL;
-    }
-    return hMenu;
-}
-
-INT
-GetRealImeMenuID(_In_ const IMEMENUNODE *pMenu, _In_ INT nFakeID)
-{
-    if (!pMenu || !pMenu->m_nItems || nFakeID < ID_STARTIMEMENU)
-        return 0;
-
-    for (INT iItem = 0; iItem < pMenu->m_nItems; ++iItem)
-    {
-        const IMEMENUITEM *pItem = &pMenu->m_Items[iItem];
-        if (pItem->m_Info.wID == nFakeID)
-            return pItem->m_nRealID;
-
-        if (pItem->m_pSubMenu)
-        {
-            INT nRealID = GetRealImeMenuID(pItem->m_pSubMenu, nFakeID);
-            if (nRealID)
-                return nRealID;
-        }
-    }
-
-    return 0;
-}
-
-static BOOL
-FreeMenuNode(_In_ PIMEMENUNODE pMenuNode)
-{
-    if (!pMenuNode)
-        return FALSE;
-
-    for (INT iItem = 0; iItem < pMenuNode->m_nItems; ++iItem)
-    {
-        PIMEMENUITEM pItem = &pMenuNode->m_Items[iItem];
-        if (pItem->m_Info.hbmpChecked)
-            DeleteObject(pItem->m_Info.hbmpChecked);
-        if (pItem->m_Info.hbmpUnchecked)
-            DeleteObject(pItem->m_Info.hbmpUnchecked);
-        if (pItem->m_Info.hbmpItem)
-            DeleteObject(pItem->m_Info.hbmpItem);
-    }
-
-    LocalFree(pMenuNode);
-    return TRUE;
-}
-
-VOID
-CleanupImeMenus(VOID)
-{
-    if (!g_pMenuList)
-        return;
-
-    PIMEMENUNODE pNext;
-    for (PIMEMENUNODE pNode = g_pMenuList; pNode; pNode = pNext)
-    {
-        pNext = pNode->m_pNext;
-        FreeMenuNode(pNode);
-    }
-
-    g_pMenuList = NULL;
-    g_nNextMenuID = 0;
-}

base/applications/kbswitch/imemenu.h

@@ -1,38 +0,0 @@
-/*
- * PROJECT:     ReactOS Keyboard Layout Switcher
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     IME menu handling
- * COPYRIGHT:   Copyright 2025 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
- */
-
-#pragma once
-
-#include <immdev.h>
-
-#define ID_STARTIMEMENU 1000
-
-struct tagIMEMENUNODE;
-
-typedef struct tagIMEMENUITEM
-{
-    IMEMENUITEMINFO m_Info;
-    UINT m_nRealID;
-    struct tagIMEMENUNODE *m_pSubMenu;
-} IMEMENUITEM, *PIMEMENUITEM;
-
-typedef struct tagIMEMENUNODE
-{
-    struct tagIMEMENUNODE *m_pNext;
-    INT m_nItems;
-    IMEMENUITEM m_Items[ANYSIZE_ARRAY];
-} IMEMENUNODE, *PIMEMENUNODE;
-
-PIMEMENUNODE
-CreateImeMenu(
-    _In_ HIMC hIMC,
-    _Inout_opt_ PIMEMENUITEMINFO lpImeParentMenu,
-    _In_ BOOL bRightMenu);
-
-HMENU MenuFromImeMenu(_In_ const IMEMENUNODE *pMenu);
-INT GetRealImeMenuID(_In_ const IMEMENUNODE *pMenu, _In_ INT nFakeID);
-VOID CleanupImeMenus(VOID);

base/applications/kbswitch/indicdll/CMakeLists.txt

@@ -1,15 +0,0 @@
-
-spec2def(indicdll.dll indicdll.spec)
-
-file(GLOB indicdll_rc_deps res/*.*)
-add_rc_deps(indicdll.rc ${indicdll_rc_deps})
-
-list(APPEND SOURCE
-    indicdll.c
-    indicdll.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/indicdll.def)
-
-add_library(indicdll MODULE ${SOURCE})
-set_module_type(indicdll win32dll UNICODE)
-add_importlibs(indicdll user32 comctl32 msvcrt kernel32)
-add_cd_file(TARGET indicdll DESTINATION reactos/system32 FOR all)

base/applications/kbswitch/indicdll/indicdll.c

@@ -1,217 +0,0 @@
-/*
- * PROJECT:     ReactOS Keyboard Layout Switcher
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Switching Keyboard Layouts
- * COPYRIGHT:   Copyright Dmitry Chapyshev (dmitry@reactos.org)
- *              Copyright Colin Finck (mail@colinfinck.de)
- *              Copyright 2022-2025 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
- */
-
-#include "../kbswitch.h"
-#include "resource.h"
-
-typedef struct tagSHARED_DATA
-{
-    HHOOK hWinHook;
-    HHOOK hShellHook;
-    HHOOK hKeyboardHook;
-    HWND hKbSwitchWnd;
-    UINT nHotID;
-    DWORD_PTR dwHotMenuItemData;
-    CRITICAL_SECTION csLock;
-} SHARED_DATA, *PSHARED_DATA;
-
-HINSTANCE g_hInstance = NULL;
-HANDLE g_hShared = NULL;
-PSHARED_DATA g_pShared = NULL;
-BOOL g_bCriticalSectionInitialized = 0;
-
-static VOID
-PostMessageToMainWnd(UINT Msg, WPARAM wParam, LPARAM lParam)
-{
-    PostMessage(g_pShared->hKbSwitchWnd, Msg, wParam, lParam);
-}
-
-static LRESULT CALLBACK
-WinHookProc(INT code, WPARAM wParam, LPARAM lParam)
-{
-    if (code < 0)
-        return CallNextHookEx(g_pShared->hWinHook, code, wParam, lParam);
-
-    switch (code)
-    {
-        case HCBT_ACTIVATE:
-        case HCBT_SETFOCUS:
-        {
-            HWND hwndFocus = (HWND)wParam;
-            if (hwndFocus && hwndFocus != g_pShared->hKbSwitchWnd)
-                PostMessageToMainWnd(WM_WINDOW_ACTIVATE, (WPARAM)hwndFocus, 0);
-            break;
-        }
-    }
-
-    return CallNextHookEx(g_pShared->hWinHook, code, wParam, lParam);
-}
-
-static LRESULT CALLBACK
-ShellHookProc(INT code, WPARAM wParam, LPARAM lParam)
-{
-    if (code < 0)
-        return CallNextHookEx(g_pShared->hShellHook, code, wParam, lParam);
-
-    switch (code)
-    {
-        case HSHELL_WINDOWACTIVATED:
-        {
-            PostMessageToMainWnd(WM_WINDOW_ACTIVATE, wParam, 0);
-            break;
-        }
-        case HSHELL_LANGUAGE:
-        {
-            PostMessageToMainWnd(WM_LANG_CHANGED, wParam, lParam);
-            break;
-        }
-    }
-
-    return CallNextHookEx(g_pShared->hShellHook, code, wParam, lParam);
-}
-
-static inline BOOL
-CheckVirtualKey(UINT vKey, UINT vKey0, UINT vKey1, UINT vKey2)
-{
-    return vKey == vKey0 || vKey == vKey1 || vKey == vKey2;
-}
-
-static LRESULT CALLBACK
-KeyboardProc(INT code, WPARAM wParam, LPARAM lParam)
-{
-    if (code < 0)
-        return CallNextHookEx(g_pShared->hKeyboardHook, code, wParam, lParam);
-
-    if (code == HC_ACTION)
-    {
-        UINT vKey = (UINT)wParam;
-        LONG keyFlags = HIWORD(lParam);
-        if (!(keyFlags & KF_UP) && !(keyFlags & KF_REPEAT))
-        {
-            BOOL bShiftPressed = (GetKeyState(VK_SHIFT) < 0);
-            BOOL bAltPressed = (keyFlags & KF_ALTDOWN) || (GetKeyState(VK_MENU) < 0);
-            BOOL bCtrlPressed = (GetKeyState(VK_CONTROL) < 0);
-            // Detect Alt+Shift and Ctrl+Shift
-            if ((bAltPressed && CheckVirtualKey(vKey, VK_SHIFT, VK_LSHIFT, VK_RSHIFT)) ||
-                (bShiftPressed && CheckVirtualKey(vKey, VK_MENU, VK_LMENU, VK_RMENU)) ||
-                (bCtrlPressed && CheckVirtualKey(vKey, VK_SHIFT, VK_LSHIFT, VK_RSHIFT)) ||
-                (bShiftPressed && CheckVirtualKey(vKey, VK_CONTROL, VK_LCONTROL, VK_RCONTROL)))
-            {
-                PostMessageToMainWnd(WM_LANG_CHANGED, 0, 0);
-            }
-        }
-    }
-
-    return CallNextHookEx(g_pShared->hKeyboardHook, code, wParam, lParam);
-}
-
-BOOL APIENTRY
-KbSwitchSetHooks(_In_ BOOL bDoHook)
-{
-    EnterCriticalSection(&g_pShared->csLock);
-    if (bDoHook)
-    {
-        g_pShared->hWinHook = SetWindowsHookEx(WH_CBT, WinHookProc, g_hInstance, 0);
-        g_pShared->hShellHook = SetWindowsHookEx(WH_SHELL, ShellHookProc, g_hInstance, 0);
-        g_pShared->hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, g_hInstance, 0);
-
-        if (g_pShared->hWinHook &&
-            g_pShared->hShellHook &&
-            g_pShared->hKeyboardHook)
-        {
-            LeaveCriticalSection(&g_pShared->csLock);
-            return TRUE;
-        }
-    }
-
-    /* Unhook */
-    if (g_pShared->hKeyboardHook)
-    {
-        UnhookWindowsHookEx(g_pShared->hKeyboardHook);
-        g_pShared->hKeyboardHook = NULL;
-    }
-    if (g_pShared->hShellHook)
-    {
-        UnhookWindowsHookEx(g_pShared->hShellHook);
-        g_pShared->hShellHook = NULL;
-    }
-    if (g_pShared->hWinHook)
-    {
-        UnhookWindowsHookEx(g_pShared->hWinHook);
-        g_pShared->hWinHook = NULL;
-    }
-
-    LeaveCriticalSection(&g_pShared->csLock);
-    return !bDoHook;
-}
-
-// indicdll!12
-VOID APIENTRY
-GetPenMenuData(PUINT pnID, PDWORD_PTR pdwItemData)
-{
-    EnterCriticalSection(&g_pShared->csLock);
-    *pnID = g_pShared->nHotID;
-    *pdwItemData = g_pShared->dwHotMenuItemData;
-    LeaveCriticalSection(&g_pShared->csLock);
-}
-
-// indicdll!14
-VOID APIENTRY
-SetPenMenuData(_In_ UINT nID, _In_ DWORD_PTR dwItemData)
-{
-    EnterCriticalSection(&g_pShared->csLock);
-    g_pShared->nHotID = nID;
-    g_pShared->dwHotMenuItemData = dwItemData;
-    LeaveCriticalSection(&g_pShared->csLock);
-}
-
-BOOL WINAPI
-DllMain(IN HINSTANCE hinstDLL,
-        IN DWORD dwReason,
-        IN LPVOID lpvReserved)
-{
-    switch (dwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-        {
-            g_hInstance = hinstDLL;
-            g_hShared = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
-                                          0, sizeof(SHARED_DATA), TEXT("InternatSHData"));
-            if (!g_hShared)
-                return FALSE;
-
-            BOOL bAlreadyExists = GetLastError() == ERROR_ALREADY_EXISTS;
-
-            g_pShared = (PSHARED_DATA)MapViewOfFile(g_hShared, FILE_MAP_WRITE, 0, 0, 0);
-            if (!g_pShared)
-                return FALSE;
-
-            if (!bAlreadyExists)
-            {
-                ZeroMemory(g_pShared, sizeof(*g_pShared));
-                g_pShared->hKbSwitchWnd = FindWindow(INDICATOR_CLASS, NULL);
-                InitializeCriticalSection(&g_pShared->csLock);
-                g_bCriticalSectionInitialized = TRUE;
-            }
-            break;
-        }
-        case DLL_PROCESS_DETACH:
-        {
-            if (g_bCriticalSectionInitialized)
-            {
-                DeleteCriticalSection(&g_pShared->csLock);
-            }
-            UnmapViewOfFile(g_pShared);
-            CloseHandle(g_hShared);
-            break;
-        }
-    }
-
-    return TRUE;
-}