[CTFMON][MSCTF][MSUTB][SDK] Add msutb.dll (stub) (#6222)

msutb.dll is the GUI back-end
of Language Bar (Tipbar).
- Add msutb.dll module at
  dll/win32/msutb/.
- The implementation of
  msutb.dll is currently stub.
- Modify msctf.spec and msctf.idl.
- Add <cicero/cicutb.h>.
- Adapt ctfmon.exe to these changes.
CORE-19362, CORE-19363
This commit is contained in:
Katayama Hirofumi MZ 2023-12-25 22:29:57 +09:00 committed by GitHub
parent 5d9f622eeb
commit f4460c3fcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 367 additions and 25 deletions

View file

@ -1,7 +1,7 @@
/*
* PROJECT: ReactOS CTF Monitor
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
* PURPOSE: Cicero TIP Bar loader window
* PURPOSE: Cicero Tipbar (Language Bar) loader window
* COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*/

View file

@ -1,7 +1,7 @@
/*
* PROJECT: ReactOS CTF Monitor
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
* PURPOSE: Cicero TIP Bar loader window
* PURPOSE: Cicero Tipbar (Language Bar) loader window
* COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*/

View file

@ -7,8 +7,8 @@ list(APPEND SOURCE
add_rc_deps(ctfmon.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/ctfmon.ico)
add_executable(ctfmon ${SOURCE} ctfmon.rc)
set_module_type(ctfmon win32gui UNICODE)
add_dependencies(ctfmon msctf)
add_dependencies(ctfmon msctf msutb)
target_link_libraries(ctfmon uuid)
add_importlibs(ctfmon msctf advapi32 shell32 user32 msvcrt kernel32)
add_importlibs(ctfmon msctf msutb advapi32 shell32 user32 msvcrt kernel32)
add_pch(ctfmon precomp.h SOURCE)
add_cd_file(TARGET ctfmon DESTINATION reactos/system32 FOR all)

View file

@ -112,11 +112,11 @@ CRegWatcher::InitEvent(
}
// Start registry watching
error = RegNotifyChangeKeyValue(entry.hKey,
TRUE,
REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_NAME,
s_ahWatchEvents[iEvent],
TRUE);
error = ::RegNotifyChangeKeyValue(entry.hKey,
TRUE,
REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_NAME,
s_ahWatchEvents[iEvent],
TRUE);
return error == ERROR_SUCCESS;
}

View file

@ -26,7 +26,7 @@ BOOL g_bOnWow64 = FALSE; // Is the app running on WoW64?
BOOL g_fNoRunKey = FALSE; // Don't write registry key "Run"?
BOOL g_fJustRunKey = FALSE; // Just write registry key "Run"?
DWORD g_dwOsInfo = 0; // The OS version info. See cicGetOSInfo
CLoaderWnd* g_pLoaderWnd = NULL; // TIP Bar loader window
CLoaderWnd* g_pLoaderWnd = NULL; // Tipbar loader window
static VOID
ParseCommandLine(
@ -209,7 +209,7 @@ InitApp(
if (!g_bOnWow64)
CRegWatcher::Init();
// Create TIP Bar loader window
// Create Tipbar loader window
g_pLoaderWnd = new CLoaderWnd();
if (!g_pLoaderWnd || !g_pLoaderWnd->Init())
return FALSE;
@ -221,7 +221,7 @@ InitApp(
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
}
// Display TIP Bar Popup if x86/x64 native
// Display Tipbar Popup if x86/x64 native and necessary
if (!g_bOnWow64)
GetPopupTipbar(g_pLoaderWnd->m_hWnd, g_fWinLogon);
@ -234,7 +234,7 @@ InitApp(
VOID
UninitApp(VOID)
{
// Close TIP Bar Popup
// Close Tipbar Popup
ClosePopupTipbar();
// Release Cicero

View file

@ -17,6 +17,7 @@
#include <ctfutb.h>
#include <ctffunc.h>
#include <cicero/cicbase.h>
#include <cicero/cicutb.h>
#include "resource.h"
@ -43,13 +44,3 @@ typedef enum WATCH_INDEX
WI_ASSEMBLIES = 11,
WI_DESKTOP_SWITCH = 12,
} WATCH_INDEX;
// FIXME: Use msutb.dll and header
static inline void ClosePopupTipbar(void)
{
}
// FIXME: Use msutb.dll and header
static inline void GetPopupTipbar(HWND hwnd, BOOL fWinLogon)
{
}