[CTFMON][MSCTF][MSCTFIME][MSUTB] Move CTF modules to base/ctf (#8040)

This PR reorganizes the location of the CTF-related modules to improve grep-ability, understanding, and readability. New folder base/ctf will become incomplete Cicero, CTF or TSF (Text Services Framework). JIRA issue: CORE-19360 JIRA issue: CORE-19361 JIRA issue: CORE-19363 - Move ctfmon, msctf, msctfime, and msutb modules to new directory base/ctf. - Adapt CMakeLists.txt to this move. - Modify .github/labeler.yml and media/doc/WINESYNC.txt. - No code content changes except CMakeLists.txt, .github/labeler.yml, and media/doc/WINESYNC.txt.
2025-06-24 03:20:20 +00:00 · 2025-05-28 05:04:03 +09:00 · 2025-05-28 05:04:03 +09:00 · d4c64771cd
commit d4c64771cd
parent 2a0d98c2bc
77 changed files with 9 additions and 11 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -47,10 +47,7 @@ Win32SS:
 "input method":
 - changed-files:
  - any-glob-to-any-file:
-    - base/applications/ctfmon/**
-    - dll/ime/**
-    - dll/win32/msctf/**
-    - dll/win32/msutb/**
+    - base/ctf/**
    - win32ss/user/imm32/**
    - win32ss/user/ntuser/ime.c
    - win32ss/user/user32/misc/imm.c
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@ -1,5 +1,6 @@

 add_subdirectory(applications)
+add_subdirectory(ctf)
 add_subdirectory(services)
 add_subdirectory(setup)
 add_subdirectory(shell)
--- a/base/applications/CMakeLists.txt
+++ b/base/applications/CMakeLists.txt
@ -7,7 +7,6 @@ add_subdirectory(cleanmgr)
 add_subdirectory(clipbrd)
 add_subdirectory(cmdutils)
 add_subdirectory(control)
-add_subdirectory(ctfmon)
 add_subdirectory(drwtsn32)
 add_subdirectory(dxdiag)
 add_subdirectory(extrac32)
--- a/base/ctf/CMakeLists.txt
+++ b/base/ctf/CMakeLists.txt
@ -0,0 +1,5 @@
+
+add_subdirectory(ctfmon)
+add_subdirectory(msctf)
+add_subdirectory(msctfime)
+add_subdirectory(msutb)
--- a/base/applications/ctfmon/CLoaderWnd.cpp
+++ b/base/applications/ctfmon/CLoaderWnd.cpp
--- a/base/applications/ctfmon/CLoaderWnd.h
+++ b/base/applications/ctfmon/CLoaderWnd.h
--- a/base/applications/ctfmon/CMakeLists.txt
+++ b/base/applications/ctfmon/CMakeLists.txt
--- a/base/applications/ctfmon/CRegWatcher.cpp
+++ b/base/applications/ctfmon/CRegWatcher.cpp
--- a/base/applications/ctfmon/CRegWatcher.h
+++ b/base/applications/ctfmon/CRegWatcher.h
--- a/base/applications/ctfmon/ctfmon.cpp
+++ b/base/applications/ctfmon/ctfmon.cpp
--- a/base/applications/ctfmon/ctfmon.rc
+++ b/base/applications/ctfmon/ctfmon.rc
--- a/base/applications/ctfmon/precomp.h
+++ b/base/applications/ctfmon/precomp.h
--- a/base/applications/ctfmon/res/ctfmon.ico
+++ b/base/applications/ctfmon/res/ctfmon.ico
--- a/base/applications/ctfmon/resource.h
+++ b/base/applications/ctfmon/resource.h
--- a/dll/win32/msctf/CMakeLists.txt
+++ b/dll/win32/msctf/CMakeLists.txt
--- a/dll/win32/msctf/categorymgr.c
+++ b/dll/win32/msctf/categorymgr.c
--- a/dll/win32/msctf/compartmentmgr.c
+++ b/dll/win32/msctf/compartmentmgr.c
--- a/dll/win32/msctf/context.c
+++ b/dll/win32/msctf/context.c
--- a/dll/win32/msctf/displayattributemgr.c
+++ b/dll/win32/msctf/displayattributemgr.c
--- a/dll/win32/msctf/documentmgr.c
+++ b/dll/win32/msctf/documentmgr.c
--- a/dll/win32/msctf/inputprocessor.c
+++ b/dll/win32/msctf/inputprocessor.c
--- a/dll/win32/msctf/langbarmgr.c
+++ b/dll/win32/msctf/langbarmgr.c
--- a/dll/win32/msctf/mlng.cpp
+++ b/dll/win32/msctf/mlng.cpp
--- a/dll/win32/msctf/mlng.h
+++ b/dll/win32/msctf/mlng.h
--- a/dll/win32/msctf/msctf.c
+++ b/dll/win32/msctf/msctf.c
--- a/dll/win32/msctf/msctf.spec
+++ b/dll/win32/msctf/msctf.spec
--- a/dll/win32/msctf/msctf_classes.idl
+++ b/dll/win32/msctf/msctf_classes.idl
--- a/dll/win32/msctf/msctf_classes.rgs
+++ b/dll/win32/msctf/msctf_classes.rgs
--- a/dll/win32/msctf/msctf_internal.h
+++ b/dll/win32/msctf/msctf_internal.h
--- a/dll/win32/msctf/precomp.h
+++ b/dll/win32/msctf/precomp.h
--- a/dll/win32/msctf/range.c
+++ b/dll/win32/msctf/range.c
--- a/dll/win32/msctf/threadmgr.c
+++ b/dll/win32/msctf/threadmgr.c
--- a/dll/win32/msctf/utils.cpp
+++ b/dll/win32/msctf/utils.cpp
--- a/dll/win32/msctf/version.rc
+++ b/dll/win32/msctf/version.rc
--- a/base/ctf/msctfime/CMakeLists.txt
+++ b/base/ctf/msctfime/CMakeLists.txt
--- a/base/ctf/msctfime/bridge.cpp
+++ b/base/ctf/msctfime/bridge.cpp
--- a/base/ctf/msctfime/bridge.h
+++ b/base/ctf/msctfime/bridge.h
--- a/base/ctf/msctfime/inputcontext.cpp
+++ b/base/ctf/msctfime/inputcontext.cpp
--- a/base/ctf/msctfime/inputcontext.h
+++ b/base/ctf/msctfime/inputcontext.h
--- a/base/ctf/msctfime/lang/en-US.rc
+++ b/base/ctf/msctfime/lang/en-US.rc
--- a/base/ctf/msctfime/lang/pt-PT.rc
+++ b/base/ctf/msctfime/lang/pt-PT.rc
--- a/base/ctf/msctfime/lang/ro-RO.rc
+++ b/base/ctf/msctfime/lang/ro-RO.rc
--- a/base/ctf/msctfime/lang/ru-RU.rc
+++ b/base/ctf/msctfime/lang/ru-RU.rc
--- a/base/ctf/msctfime/lang/tr-TR.rc
+++ b/base/ctf/msctfime/lang/tr-TR.rc
--- a/base/ctf/msctfime/misc.cpp
+++ b/base/ctf/msctfime/misc.cpp
--- a/base/ctf/msctfime/misc.h
+++ b/base/ctf/msctfime/misc.h
--- a/base/ctf/msctfime/msctfime.cpp
+++ b/base/ctf/msctfime/msctfime.cpp
--- a/base/ctf/msctfime/msctfime.h
+++ b/base/ctf/msctfime/msctfime.h
--- a/base/ctf/msctfime/msctfime.rc
+++ b/base/ctf/msctfime/msctfime.rc
--- a/base/ctf/msctfime/msctfime.spec
+++ b/base/ctf/msctfime/msctfime.spec
--- a/base/ctf/msctfime/profile.cpp
+++ b/base/ctf/msctfime/profile.cpp
--- a/base/ctf/msctfime/profile.h
+++ b/base/ctf/msctfime/profile.h
--- a/base/ctf/msctfime/res/down.ico
+++ b/base/ctf/msctfime/res/down.ico
--- a/base/ctf/msctfime/res/unicode.ico
+++ b/base/ctf/msctfime/res/unicode.ico
--- a/base/ctf/msctfime/resource.h
+++ b/base/ctf/msctfime/resource.h
--- a/base/ctf/msctfime/sinks.cpp
+++ b/base/ctf/msctfime/sinks.cpp
--- a/base/ctf/msctfime/sinks.h
+++ b/base/ctf/msctfime/sinks.h
--- a/base/ctf/msctfime/tls.cpp
+++ b/base/ctf/msctfime/tls.cpp
--- a/base/ctf/msctfime/tls.h
+++ b/base/ctf/msctfime/tls.h
--- a/base/ctf/msctfime/ui.cpp
+++ b/base/ctf/msctfime/ui.cpp
--- a/base/ctf/msctfime/ui.h
+++ b/base/ctf/msctfime/ui.h
--- a/dll/win32/msutb/CMakeLists.txt
+++ b/dll/win32/msutb/CMakeLists.txt
--- a/dll/win32/msutb/lang/en-US.rc
+++ b/dll/win32/msutb/lang/en-US.rc
--- a/dll/win32/msutb/lang/pt-PT.rc
+++ b/dll/win32/msutb/lang/pt-PT.rc
--- a/dll/win32/msutb/lang/ru-RU.rc
+++ b/dll/win32/msutb/lang/ru-RU.rc
--- a/dll/win32/msutb/msutb.cpp
+++ b/dll/win32/msutb/msutb.cpp
--- a/dll/win32/msutb/msutb.rc
+++ b/dll/win32/msutb/msutb.rc
--- a/dll/win32/msutb/msutb.spec
+++ b/dll/win32/msutb/msutb.spec
--- a/dll/win32/msutb/precomp.h
+++ b/dll/win32/msutb/precomp.h
--- a/dll/win32/msutb/res/Bitmap-154.bmp
+++ b/dll/win32/msutb/res/Bitmap-154.bmp
--- a/dll/win32/msutb/res/Bitmap-155.bmp
+++ b/dll/win32/msutb/res/Bitmap-155.bmp
--- a/dll/win32/msutb/res/earth.ico
+++ b/dll/win32/msutb/res/earth.ico
--- a/dll/win32/msutb/resource.h
+++ b/dll/win32/msutb/resource.h
--- a/dll/CMakeLists.txt
+++ b/dll/CMakeLists.txt
@ -3,7 +3,6 @@ add_subdirectory(3rdparty)
 add_subdirectory(appcompat)
 add_subdirectory(cpl)
 add_subdirectory(directx)
-add_subdirectory(ime)
 add_subdirectory(keyboard)
 add_subdirectory(nls)
 add_subdirectory(np)
--- a/dll/ime/CMakeLists.txt
+++ b/dll/ime/CMakeLists.txt
@ -1,2 +0,0 @@
-
-add_subdirectory(msctfime)
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@ -95,7 +95,6 @@ add_subdirectory(msafd)
 add_subdirectory(mscat32)
 add_subdirectory(mscms)
 add_subdirectory(mscoree)
-add_subdirectory(msctf)
 add_subdirectory(msftedit)
 add_subdirectory(msg711.acm)
 add_subdirectory(msgina)
@ -114,7 +113,6 @@ add_subdirectory(msrle32)
 add_subdirectory(mssign32)
 add_subdirectory(mssip32)
 add_subdirectory(mstask)
-add_subdirectory(msutb)
 add_subdirectory(msv1_0)
 add_subdirectory(msvcrt)
 add_subdirectory(msvcrt20)
--- a/media/doc/WINESYNC.txt
+++ b/media/doc/WINESYNC.txt
@ -15,6 +15,8 @@ wine-patches@winehq.com and ros-dev@reactos.org

 The following build tools are shared with Wine.

+base/ctf/msctf                  # Synced to WineStaging-4.18
+
 sdk/tools/unicode               # Synced to WineStaging-4.18
 sdk/tools/widl                  # Synced to WineStaging-4.0
 sdk/tools/wpp                   # Synced to WineStaging-2.9
@ -108,7 +110,6 @@ dll/win32/msadp32.acm         # Synced to WineStaging-4.0
 dll/win32/mscat32             # Synced to WineStaging-4.18
 dll/win32/mscms               # Synced to WineStaging-4.18
 dll/win32/mscoree             # Synced to Wine-1.5.4
-dll/win32/msctf               # Synced to WineStaging-4.18
 dll/win32/msftedit            # Synced to WineStaging-4.18
 dll/win32/msg711.acm          # Synced to WineStaging-4.18
 dll/win32/msgsm32.acm         # Synced to WineStaging-4.0