diff --git a/.github/labeler.yml b/.github/labeler.yml index 9ccc6878f14..87a4d9df7a7 100644 --- 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 diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 5dafa0b5aff..691c2c158d5 100644 --- 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) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 03679ac33f9..10e49159451 100644 --- 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) diff --git a/base/ctf/CMakeLists.txt b/base/ctf/CMakeLists.txt new file mode 100644 index 00000000000..48d4197faa0 --- /dev/null +++ b/base/ctf/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_subdirectory(ctfmon) +add_subdirectory(msctf) +add_subdirectory(msctfime) +add_subdirectory(msutb) diff --git a/base/applications/ctfmon/CLoaderWnd.cpp b/base/ctf/ctfmon/CLoaderWnd.cpp similarity index 100% rename from base/applications/ctfmon/CLoaderWnd.cpp rename to base/ctf/ctfmon/CLoaderWnd.cpp diff --git a/base/applications/ctfmon/CLoaderWnd.h b/base/ctf/ctfmon/CLoaderWnd.h similarity index 100% rename from base/applications/ctfmon/CLoaderWnd.h rename to base/ctf/ctfmon/CLoaderWnd.h diff --git a/base/applications/ctfmon/CMakeLists.txt b/base/ctf/ctfmon/CMakeLists.txt similarity index 100% rename from base/applications/ctfmon/CMakeLists.txt rename to base/ctf/ctfmon/CMakeLists.txt diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/ctf/ctfmon/CRegWatcher.cpp similarity index 100% rename from base/applications/ctfmon/CRegWatcher.cpp rename to base/ctf/ctfmon/CRegWatcher.cpp diff --git a/base/applications/ctfmon/CRegWatcher.h b/base/ctf/ctfmon/CRegWatcher.h similarity index 100% rename from base/applications/ctfmon/CRegWatcher.h rename to base/ctf/ctfmon/CRegWatcher.h diff --git a/base/applications/ctfmon/ctfmon.cpp b/base/ctf/ctfmon/ctfmon.cpp similarity index 100% rename from base/applications/ctfmon/ctfmon.cpp rename to base/ctf/ctfmon/ctfmon.cpp diff --git a/base/applications/ctfmon/ctfmon.rc b/base/ctf/ctfmon/ctfmon.rc similarity index 100% rename from base/applications/ctfmon/ctfmon.rc rename to base/ctf/ctfmon/ctfmon.rc diff --git a/base/applications/ctfmon/precomp.h b/base/ctf/ctfmon/precomp.h similarity index 100% rename from base/applications/ctfmon/precomp.h rename to base/ctf/ctfmon/precomp.h diff --git a/base/applications/ctfmon/res/ctfmon.ico b/base/ctf/ctfmon/res/ctfmon.ico similarity index 100% rename from base/applications/ctfmon/res/ctfmon.ico rename to base/ctf/ctfmon/res/ctfmon.ico diff --git a/base/applications/ctfmon/resource.h b/base/ctf/ctfmon/resource.h similarity index 100% rename from base/applications/ctfmon/resource.h rename to base/ctf/ctfmon/resource.h diff --git a/dll/win32/msctf/CMakeLists.txt b/base/ctf/msctf/CMakeLists.txt similarity index 100% rename from dll/win32/msctf/CMakeLists.txt rename to base/ctf/msctf/CMakeLists.txt diff --git a/dll/win32/msctf/categorymgr.c b/base/ctf/msctf/categorymgr.c similarity index 100% rename from dll/win32/msctf/categorymgr.c rename to base/ctf/msctf/categorymgr.c diff --git a/dll/win32/msctf/compartmentmgr.c b/base/ctf/msctf/compartmentmgr.c similarity index 100% rename from dll/win32/msctf/compartmentmgr.c rename to base/ctf/msctf/compartmentmgr.c diff --git a/dll/win32/msctf/context.c b/base/ctf/msctf/context.c similarity index 100% rename from dll/win32/msctf/context.c rename to base/ctf/msctf/context.c diff --git a/dll/win32/msctf/displayattributemgr.c b/base/ctf/msctf/displayattributemgr.c similarity index 100% rename from dll/win32/msctf/displayattributemgr.c rename to base/ctf/msctf/displayattributemgr.c diff --git a/dll/win32/msctf/documentmgr.c b/base/ctf/msctf/documentmgr.c similarity index 100% rename from dll/win32/msctf/documentmgr.c rename to base/ctf/msctf/documentmgr.c diff --git a/dll/win32/msctf/inputprocessor.c b/base/ctf/msctf/inputprocessor.c similarity index 100% rename from dll/win32/msctf/inputprocessor.c rename to base/ctf/msctf/inputprocessor.c diff --git a/dll/win32/msctf/langbarmgr.c b/base/ctf/msctf/langbarmgr.c similarity index 100% rename from dll/win32/msctf/langbarmgr.c rename to base/ctf/msctf/langbarmgr.c diff --git a/dll/win32/msctf/mlng.cpp b/base/ctf/msctf/mlng.cpp similarity index 100% rename from dll/win32/msctf/mlng.cpp rename to base/ctf/msctf/mlng.cpp diff --git a/dll/win32/msctf/mlng.h b/base/ctf/msctf/mlng.h similarity index 100% rename from dll/win32/msctf/mlng.h rename to base/ctf/msctf/mlng.h diff --git a/dll/win32/msctf/msctf.c b/base/ctf/msctf/msctf.c similarity index 100% rename from dll/win32/msctf/msctf.c rename to base/ctf/msctf/msctf.c diff --git a/dll/win32/msctf/msctf.spec b/base/ctf/msctf/msctf.spec similarity index 100% rename from dll/win32/msctf/msctf.spec rename to base/ctf/msctf/msctf.spec diff --git a/dll/win32/msctf/msctf_classes.idl b/base/ctf/msctf/msctf_classes.idl similarity index 100% rename from dll/win32/msctf/msctf_classes.idl rename to base/ctf/msctf/msctf_classes.idl diff --git a/dll/win32/msctf/msctf_classes.rgs b/base/ctf/msctf/msctf_classes.rgs similarity index 100% rename from dll/win32/msctf/msctf_classes.rgs rename to base/ctf/msctf/msctf_classes.rgs diff --git a/dll/win32/msctf/msctf_internal.h b/base/ctf/msctf/msctf_internal.h similarity index 100% rename from dll/win32/msctf/msctf_internal.h rename to base/ctf/msctf/msctf_internal.h diff --git a/dll/win32/msctf/precomp.h b/base/ctf/msctf/precomp.h similarity index 100% rename from dll/win32/msctf/precomp.h rename to base/ctf/msctf/precomp.h diff --git a/dll/win32/msctf/range.c b/base/ctf/msctf/range.c similarity index 100% rename from dll/win32/msctf/range.c rename to base/ctf/msctf/range.c diff --git a/dll/win32/msctf/threadmgr.c b/base/ctf/msctf/threadmgr.c similarity index 100% rename from dll/win32/msctf/threadmgr.c rename to base/ctf/msctf/threadmgr.c diff --git a/dll/win32/msctf/utils.cpp b/base/ctf/msctf/utils.cpp similarity index 100% rename from dll/win32/msctf/utils.cpp rename to base/ctf/msctf/utils.cpp diff --git a/dll/win32/msctf/version.rc b/base/ctf/msctf/version.rc similarity index 100% rename from dll/win32/msctf/version.rc rename to base/ctf/msctf/version.rc diff --git a/dll/ime/msctfime/CMakeLists.txt b/base/ctf/msctfime/CMakeLists.txt similarity index 100% rename from dll/ime/msctfime/CMakeLists.txt rename to base/ctf/msctfime/CMakeLists.txt diff --git a/dll/ime/msctfime/bridge.cpp b/base/ctf/msctfime/bridge.cpp similarity index 100% rename from dll/ime/msctfime/bridge.cpp rename to base/ctf/msctfime/bridge.cpp diff --git a/dll/ime/msctfime/bridge.h b/base/ctf/msctfime/bridge.h similarity index 100% rename from dll/ime/msctfime/bridge.h rename to base/ctf/msctfime/bridge.h diff --git a/dll/ime/msctfime/inputcontext.cpp b/base/ctf/msctfime/inputcontext.cpp similarity index 100% rename from dll/ime/msctfime/inputcontext.cpp rename to base/ctf/msctfime/inputcontext.cpp diff --git a/dll/ime/msctfime/inputcontext.h b/base/ctf/msctfime/inputcontext.h similarity index 100% rename from dll/ime/msctfime/inputcontext.h rename to base/ctf/msctfime/inputcontext.h diff --git a/dll/ime/msctfime/lang/en-US.rc b/base/ctf/msctfime/lang/en-US.rc similarity index 100% rename from dll/ime/msctfime/lang/en-US.rc rename to base/ctf/msctfime/lang/en-US.rc diff --git a/dll/ime/msctfime/lang/pt-PT.rc b/base/ctf/msctfime/lang/pt-PT.rc similarity index 100% rename from dll/ime/msctfime/lang/pt-PT.rc rename to base/ctf/msctfime/lang/pt-PT.rc diff --git a/dll/ime/msctfime/lang/ro-RO.rc b/base/ctf/msctfime/lang/ro-RO.rc similarity index 100% rename from dll/ime/msctfime/lang/ro-RO.rc rename to base/ctf/msctfime/lang/ro-RO.rc diff --git a/dll/ime/msctfime/lang/ru-RU.rc b/base/ctf/msctfime/lang/ru-RU.rc similarity index 100% rename from dll/ime/msctfime/lang/ru-RU.rc rename to base/ctf/msctfime/lang/ru-RU.rc diff --git a/dll/ime/msctfime/lang/tr-TR.rc b/base/ctf/msctfime/lang/tr-TR.rc similarity index 100% rename from dll/ime/msctfime/lang/tr-TR.rc rename to base/ctf/msctfime/lang/tr-TR.rc diff --git a/dll/ime/msctfime/misc.cpp b/base/ctf/msctfime/misc.cpp similarity index 100% rename from dll/ime/msctfime/misc.cpp rename to base/ctf/msctfime/misc.cpp diff --git a/dll/ime/msctfime/misc.h b/base/ctf/msctfime/misc.h similarity index 100% rename from dll/ime/msctfime/misc.h rename to base/ctf/msctfime/misc.h diff --git a/dll/ime/msctfime/msctfime.cpp b/base/ctf/msctfime/msctfime.cpp similarity index 100% rename from dll/ime/msctfime/msctfime.cpp rename to base/ctf/msctfime/msctfime.cpp diff --git a/dll/ime/msctfime/msctfime.h b/base/ctf/msctfime/msctfime.h similarity index 100% rename from dll/ime/msctfime/msctfime.h rename to base/ctf/msctfime/msctfime.h diff --git a/dll/ime/msctfime/msctfime.rc b/base/ctf/msctfime/msctfime.rc similarity index 100% rename from dll/ime/msctfime/msctfime.rc rename to base/ctf/msctfime/msctfime.rc diff --git a/dll/ime/msctfime/msctfime.spec b/base/ctf/msctfime/msctfime.spec similarity index 100% rename from dll/ime/msctfime/msctfime.spec rename to base/ctf/msctfime/msctfime.spec diff --git a/dll/ime/msctfime/profile.cpp b/base/ctf/msctfime/profile.cpp similarity index 100% rename from dll/ime/msctfime/profile.cpp rename to base/ctf/msctfime/profile.cpp diff --git a/dll/ime/msctfime/profile.h b/base/ctf/msctfime/profile.h similarity index 100% rename from dll/ime/msctfime/profile.h rename to base/ctf/msctfime/profile.h diff --git a/dll/ime/msctfime/res/down.ico b/base/ctf/msctfime/res/down.ico similarity index 100% rename from dll/ime/msctfime/res/down.ico rename to base/ctf/msctfime/res/down.ico diff --git a/dll/ime/msctfime/res/unicode.ico b/base/ctf/msctfime/res/unicode.ico similarity index 100% rename from dll/ime/msctfime/res/unicode.ico rename to base/ctf/msctfime/res/unicode.ico diff --git a/dll/ime/msctfime/resource.h b/base/ctf/msctfime/resource.h similarity index 100% rename from dll/ime/msctfime/resource.h rename to base/ctf/msctfime/resource.h diff --git a/dll/ime/msctfime/sinks.cpp b/base/ctf/msctfime/sinks.cpp similarity index 100% rename from dll/ime/msctfime/sinks.cpp rename to base/ctf/msctfime/sinks.cpp diff --git a/dll/ime/msctfime/sinks.h b/base/ctf/msctfime/sinks.h similarity index 100% rename from dll/ime/msctfime/sinks.h rename to base/ctf/msctfime/sinks.h diff --git a/dll/ime/msctfime/tls.cpp b/base/ctf/msctfime/tls.cpp similarity index 100% rename from dll/ime/msctfime/tls.cpp rename to base/ctf/msctfime/tls.cpp diff --git a/dll/ime/msctfime/tls.h b/base/ctf/msctfime/tls.h similarity index 100% rename from dll/ime/msctfime/tls.h rename to base/ctf/msctfime/tls.h diff --git a/dll/ime/msctfime/ui.cpp b/base/ctf/msctfime/ui.cpp similarity index 100% rename from dll/ime/msctfime/ui.cpp rename to base/ctf/msctfime/ui.cpp diff --git a/dll/ime/msctfime/ui.h b/base/ctf/msctfime/ui.h similarity index 100% rename from dll/ime/msctfime/ui.h rename to base/ctf/msctfime/ui.h diff --git a/dll/win32/msutb/CMakeLists.txt b/base/ctf/msutb/CMakeLists.txt similarity index 100% rename from dll/win32/msutb/CMakeLists.txt rename to base/ctf/msutb/CMakeLists.txt diff --git a/dll/win32/msutb/lang/en-US.rc b/base/ctf/msutb/lang/en-US.rc similarity index 100% rename from dll/win32/msutb/lang/en-US.rc rename to base/ctf/msutb/lang/en-US.rc diff --git a/dll/win32/msutb/lang/pt-PT.rc b/base/ctf/msutb/lang/pt-PT.rc similarity index 100% rename from dll/win32/msutb/lang/pt-PT.rc rename to base/ctf/msutb/lang/pt-PT.rc diff --git a/dll/win32/msutb/lang/ru-RU.rc b/base/ctf/msutb/lang/ru-RU.rc similarity index 100% rename from dll/win32/msutb/lang/ru-RU.rc rename to base/ctf/msutb/lang/ru-RU.rc diff --git a/dll/win32/msutb/msutb.cpp b/base/ctf/msutb/msutb.cpp similarity index 100% rename from dll/win32/msutb/msutb.cpp rename to base/ctf/msutb/msutb.cpp diff --git a/dll/win32/msutb/msutb.rc b/base/ctf/msutb/msutb.rc similarity index 100% rename from dll/win32/msutb/msutb.rc rename to base/ctf/msutb/msutb.rc diff --git a/dll/win32/msutb/msutb.spec b/base/ctf/msutb/msutb.spec similarity index 100% rename from dll/win32/msutb/msutb.spec rename to base/ctf/msutb/msutb.spec diff --git a/dll/win32/msutb/precomp.h b/base/ctf/msutb/precomp.h similarity index 100% rename from dll/win32/msutb/precomp.h rename to base/ctf/msutb/precomp.h diff --git a/dll/win32/msutb/res/Bitmap-154.bmp b/base/ctf/msutb/res/Bitmap-154.bmp similarity index 100% rename from dll/win32/msutb/res/Bitmap-154.bmp rename to base/ctf/msutb/res/Bitmap-154.bmp diff --git a/dll/win32/msutb/res/Bitmap-155.bmp b/base/ctf/msutb/res/Bitmap-155.bmp similarity index 100% rename from dll/win32/msutb/res/Bitmap-155.bmp rename to base/ctf/msutb/res/Bitmap-155.bmp diff --git a/dll/win32/msutb/res/earth.ico b/base/ctf/msutb/res/earth.ico similarity index 100% rename from dll/win32/msutb/res/earth.ico rename to base/ctf/msutb/res/earth.ico diff --git a/dll/win32/msutb/resource.h b/base/ctf/msutb/resource.h similarity index 100% rename from dll/win32/msutb/resource.h rename to base/ctf/msutb/resource.h diff --git a/dll/CMakeLists.txt b/dll/CMakeLists.txt index 47c8bf28ff2..2e913af571e 100644 --- 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) diff --git a/dll/ime/CMakeLists.txt b/dll/ime/CMakeLists.txt deleted file mode 100644 index 1c5abaad63a..00000000000 --- a/dll/ime/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ - -add_subdirectory(msctfime) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index fb438b43590..801e303ca37 100644 --- 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) diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index 030d83b0322..5b9b547506f 100644 --- 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