Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [MSCTF][SDK] Implement TF_IsCtfmonRunning (#6233)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07a22af58bc1c3a0dd1a0… commit 07a22af58bc1c3a0dd1a01149c179141b6d524d9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 16:17:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 16:17:06 2023 +0900 [MSCTF][SDK] Implement TF_IsCtfmonRunning (#6233) - Add many global variables. - Add GetUserSIDString, InitUserSidString, InitUniqueString, and GetDesktopUniqueName helper functions. - Implement TF_IsCtfmonRunning function. - Fix CicFileMapping class in <cicero/cicfmap.h>. - Modify msctf.spec. - Half-implement ProcessAttach and ProcessDetach functions. CORE-19361 --- dll/win32/msctf/msctf.spec | 2 +- dll/win32/msctf/utils.cpp | 289 +++++++++++++++++++++++++++++++++++ sdk/include/reactos/cicero/cicfmap.h | 16 +- 3 files changed, 298 insertions(+), 9 deletions(-) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index 7f90b05c2b2..569f8701e8b 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -29,7 +29,7 @@ @ stdcall -stub TF_UninitSystem() @ stdcall -stub TF_InvalidAssemblyListCache() @ stdcall TF_InvalidAssemblyListCacheIfExist() -@ stub TF_IsCtfmonRunning +@ stdcall TF_IsCtfmonRunning() @ stub TF_IsInMarshaling @ stub TF_MlngInfoCount @ stdcall TF_RunInputCPL() diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 79371ed1e2f..4066714f89e 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -14,6 +14,7 @@ #define _EXTYPES_H #include <windows.h> +#include <sddl.h> #include <imm.h> #include <ddk/immdev.h> #include <cguid.h> @@ -24,12 +25,143 @@ #include <strsafe.h> #include <cicero/cicreg.h> +#include <cicero/cicmutex.h> +#include <cicero/cicfmap.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msctf); +BOOL gf_CRT_INIT = FALSE; +BOOL g_fDllProcessDetached = FALSE; +CRITICAL_SECTION g_cs; +CRITICAL_SECTION g_csInDllMain; +CRITICAL_SECTION g_csDelayLoad; +HINSTANCE g_hInst = NULL; +BOOL g_bOnWow64 = FALSE; +UINT g_uACP = CP_ACP; // Active Code Page DWORD g_dwOSInfo = 0; // See cicGetOSInfo +HKL g_hklDefault = NULL; +DWORD g_dwTLSIndex = (DWORD)-1; +BOOL gfSharedMemory = FALSE; +LONG g_cRefDll = -1; + +// Messages +UINT g_msgPrivate = 0; +UINT g_msgSetFocus = 0; +UINT g_msgThreadTerminate = 0; +UINT g_msgThreadItemChange = 0; +UINT g_msgLBarModal = 0; +UINT g_msgRpcSendReceive = 0; +UINT g_msgThreadMarshal = 0; +UINT g_msgCheckThreadInputIdel = 0; +UINT g_msgStubCleanUp = 0; +UINT g_msgShowFloating = 0; +UINT g_msgLBUpdate = 0; +UINT g_msgNuiMgrDirtyUpdate = 0; + +// Unique names +BOOL g_fUserSidString = FALSE; +TCHAR g_szUserSidString[MAX_PATH] = { 0 }; +TCHAR g_szUserUnique[MAX_PATH] = { 0 }; +TCHAR g_szAsmListCache[MAX_PATH] = { 0 }; +TCHAR g_szTimListCache[MAX_PATH] = { 0 }; +TCHAR g_szLayoutsCache[MAX_PATH] = { 0 }; + +// Mutexes +CicMutex g_mutexLBES; +CicMutex g_mutexCompart; +CicMutex g_mutexAsm; +CicMutex g_mutexLayouts; +CicMutex g_mutexTMD; + +// File mapping +CicFileMappingStatic g_SharedMemory; + +/** + * @implemented + */ +LPTSTR GetUserSIDString(void) +{ + HANDLE hToken = NULL; + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken); + if (!hToken) + return NULL; + + DWORD dwLengthNeeded = 0; + GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLengthNeeded); + PTOKEN_USER pTokenUser = (PTOKEN_USER)cicMemAllocClear(dwLengthNeeded); + if (!pTokenUser) + { + CloseHandle(hToken); + return NULL; + } + + LPTSTR StringSid = NULL; + if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dwLengthNeeded, &dwLengthNeeded) || + !ConvertSidToStringSid(pTokenUser->User.Sid, &StringSid)) + { + if (StringSid) + { + LocalFree(StringSid); + StringSid = NULL; + } + } + + cicMemFree(pTokenUser); + CloseHandle(hToken); + return StringSid; +} + +/** + * @implemented + */ +BOOL InitUserSidString(void) +{ + if (g_fUserSidString) + return TRUE; + + LPTSTR pszUserSID = GetUserSIDString(); + if (!pszUserSID) + return FALSE; + + StringCchCopy(g_szUserSidString, _countof(g_szUserSidString), pszUserSID); + g_fUserSidString = TRUE; + LocalFree(pszUserSID); + return TRUE; +} + +/** + * @implemented + */ +BOOL InitUniqueString(void) +{ + g_szUserUnique[0] = TEXT('\0'); + + DWORD dwThreadId = GetCurrentThreadId(); + HDESK hDesk = GetThreadDesktop(dwThreadId); + + DWORD nLengthNeeded; + TCHAR szName[MAX_PATH]; + if (hDesk && GetUserObjectInformation(hDesk, UOI_NAME, szName, _countof(szName), &nLengthNeeded)) + StringCchCat(g_szUserUnique, _countof(g_szUserUnique), szName); + + if (!InitUserSidString()) + return FALSE; + + StringCchCat(g_szUserUnique, _countof(g_szUserUnique), g_szUserSidString); + return TRUE; +} + +void +GetDesktopUniqueName( + _In_ LPCTSTR pszName, + _Out_ LPTSTR pszBuff, + _In_ UINT cchBuff) +{ + StringCchCopy(pszBuff, cchBuff, pszName); + StringCchCat(pszBuff, cchBuff, g_szUserUnique); +} BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) { @@ -193,3 +325,160 @@ TF_RunInputCPL(VOID) return S_OK; } + +/*********************************************************************** + * TF_IsCtfmonRunning (MSCTF.@) + * + * @implemented + */ +EXTERN_C BOOL WINAPI +TF_IsCtfmonRunning(VOID) +{ + TCHAR szName[MAX_PATH]; + GetDesktopUniqueName(TEXT("CtfmonInstMutex"), szName, _countof(szName)); + + HANDLE hMutex = ::OpenMutex(MUTEX_ALL_ACCESS, FALSE, szName); + if (!hMutex) + return FALSE; + + ::CloseHandle(hMutex); + return TRUE; +} + +/** + * @unimplemented + */ +VOID InitLangChangeHotKey(VOID) +{ + //FIXME +} + +/** + * @unimplemented + */ +VOID CheckAnchorStores(VOID) +{ + //FIXME +} + +/** + * @unimplemented + */ +BOOL ProcessAttach(HINSTANCE hinstDLL) // FIXME: Call me from DllMain +{ + gf_CRT_INIT = TRUE; + + ::InitializeCriticalSectionAndSpinCount(&g_cs, 0); + ::InitializeCriticalSectionAndSpinCount(&g_csInDllMain, 0); + ::InitializeCriticalSectionAndSpinCount(&g_csDelayLoad, 0); + + g_bOnWow64 = cicIsWow64(); + g_hInst = hinstDLL; + g_hklDefault = ::GetKeyboardLayout(0); + g_dwTLSIndex = ::TlsAlloc(); + if (g_dwTLSIndex == (DWORD)-1) + return FALSE; + + g_msgPrivate = ::RegisterWindowMessageA("MSUIM.Msg.Private"); + g_msgSetFocus = ::RegisterWindowMessageA("MSUIM.Msg.SetFocus"); + g_msgThreadTerminate = ::RegisterWindowMessageA("MSUIM.Msg.ThreadTerminate"); + g_msgThreadItemChange = ::RegisterWindowMessageA("MSUIM.Msg.ThreadItemChange"); + g_msgLBarModal = ::RegisterWindowMessageA("MSUIM.Msg.LangBarModal"); + g_msgRpcSendReceive = ::RegisterWindowMessageA("MSUIM.Msg.RpcSendReceive"); + g_msgThreadMarshal = ::RegisterWindowMessageA("MSUIM.Msg.ThreadMarshal"); + g_msgCheckThreadInputIdel = ::RegisterWindowMessageA("MSUIM.Msg.CheckThreadInputIdel"); + g_msgStubCleanUp = ::RegisterWindowMessageA("MSUIM.Msg.StubCleanUp"); + g_msgShowFloating = ::RegisterWindowMessageA("MSUIM.Msg.ShowFloating"); + g_msgLBUpdate = ::RegisterWindowMessageA("MSUIM.Msg.LBUpdate"); + g_msgNuiMgrDirtyUpdate = ::RegisterWindowMessageA("MSUIM.Msg.MuiMgrDirtyUpdate"); + if (!g_msgPrivate || + !g_msgSetFocus || + !g_msgThreadTerminate || + !g_msgThreadItemChange || + !g_msgLBarModal || + !g_msgRpcSendReceive || + !g_msgThreadMarshal || + !g_msgCheckThreadInputIdel || + !g_msgStubCleanUp || + !g_msgShowFloating || + !g_msgLBUpdate || + !g_msgNuiMgrDirtyUpdate) + { + return FALSE; + } + + cicGetOSInfo(&g_uACP, &g_dwOSInfo); + InitUniqueString(); + + //FIXME + + gfSharedMemory = TRUE; + + //FIXME + + GetDesktopUniqueName(TEXT("CTF.AsmListCache.FMP"), g_szAsmListCache, _countof(g_szAsmListCache)); + GetDesktopUniqueName(TEXT("CTF.TimListCache.FMP"), g_szTimListCache, _countof(g_szTimListCache)); + GetDesktopUniqueName(TEXT("CTF.LayoutsCache.FMP"), g_szLayoutsCache, _countof(g_szLayoutsCache)); + + //FIXME + + InitLangChangeHotKey(); + + //FIXME + + CheckAnchorStores(); + + return TRUE; +} + +/** + * @unimplemented + */ +VOID ProcessDetach(HINSTANCE hinstDLL) // FIXME: Call me from DllMain +{ + if (!gf_CRT_INIT) + { + g_fDllProcessDetached = TRUE; + return; + } + + if (gfSharedMemory) + { + if (g_cRefDll != -1 ) + TFUninitLib(); + //FIXME + } + //FIXME + + //TF_UninitThreadSystem(); + + //FIXME + + if (g_dwTLSIndex != (DWORD)-1) + { + ::TlsFree(g_dwTLSIndex); + g_dwTLSIndex = (DWORD)-1; + } + + //FIXME + + if (gfSharedMemory) + { + g_mutexLBES.Uninit(); + g_mutexCompart.Uninit(); + g_mutexAsm.Uninit(); + //FIXME + g_mutexLayouts.Uninit(); + g_mutexTMD.Uninit(); + //FIXME + g_SharedMemory.Close(); + } + + g_SharedMemory.Finalize(); + + ::DeleteCriticalSection(&g_cs); + ::DeleteCriticalSection(&g_csInDllMain); + ::DeleteCriticalSection(&g_csDelayLoad); + + g_fDllProcessDetached = TRUE; +} diff --git a/sdk/include/reactos/cicero/cicfmap.h b/sdk/include/reactos/cicero/cicfmap.h index 8e06fc77017..3c711fc1e75 100644 --- a/sdk/include/reactos/cicero/cicfmap.h +++ b/sdk/include/reactos/cicero/cicfmap.h @@ -40,7 +40,7 @@ public: void Finalize(); }; -class CicFileMapping : public CCicFileMappingStatic +class CicFileMapping : public CicFileMappingStatic { public: CicFileMapping(LPCTSTR pszName, CicMutex *pMutex); @@ -51,13 +51,13 @@ public: inline CicFileMapping::CicFileMapping(LPCTSTR pszName, CicMutex *pMutex) - : m_pszName(NULL) - , m_pView(NULL) - , m_hMapping(NULL) - , m_bCreated(FALSE) - , m_bHasMutex(FALSE) - , m_pMutex(NULL) { + m_pszName = NULL; + m_pView = NULL; + m_hMapping = NULL; + m_bCreated = FALSE; + m_bHasMutex = FALSE; + m_pMutex = NULL; Init(pszName, pMutex); } @@ -148,7 +148,7 @@ inline void CicFileMappingStatic::Leave() m_pMutex->Leave(); } -inline BOOL CCicFileMappingStatic::Flush(SIZE_T dwNumberOfBytesToFlush) +inline BOOL CicFileMappingStatic::Flush(SIZE_T dwNumberOfBytesToFlush) { if (!m_pView) return FALSE;

9 months, 3 weeks

[reactos] 01/01: [CTFMON] Unlink RegNotifyChangeKeyValue (#6232)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4293704ecb004a673d591… commit 4293704ecb004a673d5910322d0d132165940251 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 15:21:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 15:21:39 2023 +0900 [CTFMON] Unlink RegNotifyChangeKeyValue (#6232) Dynamic load advapi32!RegNotifyChangeKeyValue function. Output log if RegNotifyChangeKeyValue failed. CORE-19362 --- base/applications/ctfmon/CRegWatcher.cpp | 39 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/applications/ctfmon/CRegWatcher.cpp index 1905956cb91..264d4f22d65 100644 --- a/base/applications/ctfmon/CRegWatcher.cpp +++ b/base/applications/ctfmon/CRegWatcher.cpp @@ -83,6 +83,31 @@ CRegWatcher::Uninit() } } +// advapi32!RegNotifyChangeKeyValue +typedef LONG (WINAPI *FN_RegNotifyChangeKeyValue)(HKEY, BOOL, DWORD, HANDLE, BOOL); + +LONG WINAPI +DelayedRegNotifyChangeKeyValue( + HKEY hKey, + BOOL bWatchSubtree, + DWORD dwNotifyFilter, + HANDLE hEvent, + BOOL fAsynchronous) +{ + static FN_RegNotifyChangeKeyValue s_fnRegNotifyChangeKeyValue = NULL; + + if (!s_fnRegNotifyChangeKeyValue) + { + HINSTANCE hAdvApi32 = cicGetSystemModuleHandle(TEXT("advapi32.dll"), FALSE); + s_fnRegNotifyChangeKeyValue = + (FN_RegNotifyChangeKeyValue)GetProcAddress(hAdvApi32, "RegNotifyChangeKeyValue"); + if (!s_fnRegNotifyChangeKeyValue) + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return s_fnRegNotifyChangeKeyValue(hKey, bWatchSubtree, dwNotifyFilter, hEvent, fAsynchronous); +} + BOOL CRegWatcher::InitEvent( _In_ SIZE_T iEvent, @@ -112,11 +137,15 @@ CRegWatcher::InitEvent( } // Start registry watching - error = ::RegNotifyChangeKeyValue(entry.hKey, - TRUE, - REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_NAME, - s_ahWatchEvents[iEvent], - TRUE); + error = DelayedRegNotifyChangeKeyValue(entry.hKey, + TRUE, + REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_NAME, + s_ahWatchEvents[iEvent], + TRUE); +#ifndef NDEBUG + if (error != ERROR_SUCCESS) + OutputDebugStringA("RegNotifyChangeKeyValue failed\n"); +#endif return error == ERROR_SUCCESS; }

9 months, 3 weeks

[reactos] 01/01: [MSCTF] Implement TF_RunInputCPL (#6231)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69a925cae88e520f03535… commit 69a925cae88e520f03535b25cff47937a647a443 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 13:39:56 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 13:39:56 2023 +0900 [MSCTF] Implement TF_RunInputCPL (#6231) - Add FullPathExec, and RunCPLSetting helper functions. - Implement TF_RunInputCPL function by using them. - Modify msctf.spec. CORE-19361 --- dll/win32/msctf/msctf.spec | 2 +- dll/win32/msctf/utils.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index 186e1cadac2..7f90b05c2b2 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -32,7 +32,7 @@ @ stub TF_IsCtfmonRunning @ stub TF_IsInMarshaling @ stub TF_MlngInfoCount -@ stub TF_RunInputCPL +@ stdcall TF_RunInputCPL() @ stdcall -stub TF_PostAllThreadMsg(long long) @ stdcall TF_RegisterLangBarAddIn(ptr wstr long) @ stdcall TF_UnregisterLangBarAddIn(ptr long) diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 944d3d1c063..79371ed1e2f 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); +DWORD g_dwOSInfo = 0; // See cicGetOSInfo + BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) { pszGUID[0] = ANSI_NULL; @@ -42,10 +44,53 @@ BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) #ifdef UNICODE #define StringFromGUID2T StringFromGUID2 + #define debugstr_t debugstr_w #else #define StringFromGUID2T StringFromGUID2A + #define debugstr_t debugstr_a #endif +BOOL FullPathExec(LPCTSTR pszExeFile, LPCTSTR pszCmdLine, UINT nCmdShow, BOOL bSysWinDir) +{ + STARTUPINFO si; + PROCESS_INFORMATION pi; + CicSystemModulePath ModPath; + TCHAR szCommandLine[2 * MAX_PATH]; + + ModPath.Init(pszExeFile, bSysWinDir); + if (!ModPath.m_cchPath) + { + ERR("%s\n", debugstr_t(pszExeFile)); + return FALSE; + } + + StringCchCopy(szCommandLine, _countof(szCommandLine), pszCmdLine); + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = nCmdShow; + si.dwFlags = STARTF_USESHOWWINDOW; + if (!CreateProcess(ModPath.m_szPath, szCommandLine, NULL, NULL, FALSE, + NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi)) + { + ERR("%s, %s\n", debugstr_t(ModPath.m_szPath), debugstr_t(szCommandLine)); + return FALSE; + } + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return TRUE; +} + +static inline BOOL +RunCPLSetting(LPCTSTR pszCmdLine) +{ + if (!pszCmdLine) + return FALSE; + + return FullPathExec(TEXT("rundll32.exe"), pszCmdLine, SW_SHOWMINNOACTIVE, FALSE); +} + /*********************************************************************** * TF_RegisterLangBarAddIn (MSCTF.@) * @@ -118,3 +163,33 @@ TF_UnregisterLangBarAddIn( return hr; } + +/*********************************************************************** + * TF_RunInputCPL (MSCTF.@) + * + * @implemented + */ +EXTERN_C HRESULT WINAPI +TF_RunInputCPL(VOID) +{ + CicSystemModulePath ModPath; + TCHAR szCmdLine[2 * MAX_PATH]; + + TRACE("()\n"); + + // NOTE: We don't support Win95/98/Me + if (g_dwOSInfo & CIC_OSINFO_XPPLUS) + ModPath.Init(TEXT("input.dll"), FALSE); + else + ModPath.Init(TEXT("input.cpl"), FALSE); + + if (!ModPath.m_cchPath) + return E_FAIL; + + StringCchPrintf(szCmdLine, _countof(szCmdLine), + TEXT("rundll32.exe shell32.dll,Control_RunDLL %s"), ModPath.m_szPath); + if (!RunCPLSetting(szCmdLine)) + return E_FAIL; + + return S_OK; +}

9 months, 3 weeks

[reactos] 01/01: [CTFMON][MSCTFIME][MSCTF][MSUTB][SDK] Cicero is ANSI, not Unicode (#6230)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfa3e554d46975a193ff5… commit bfa3e554d46975a193ff5a3ca22f67bfe15e8d54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 12:07:01 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 12:07:01 2023 +0900 [CTFMON][MSCTFIME][MSCTF][MSUTB][SDK] Cicero is ANSI, not Unicode (#6230) Cicero interface is not Unicode (W) but ANSI (A). - ctfmon.exe is ANSI, not Unicode. - msutb.dll is ANSI, not Unicode. - Apply generic text mapping to the cicero headers. - Include <tchar.h> to use generic text mapping. CORE-19361, CORE-19362, CORE-19363 --- base/applications/ctfmon/CLoaderWnd.cpp | 14 +++---- base/applications/ctfmon/CMakeLists.txt | 2 +- base/applications/ctfmon/CRegWatcher.cpp | 57 +++++++++++++------------- base/applications/ctfmon/CRegWatcher.h | 2 +- base/applications/ctfmon/ctfmon.cpp | 70 +++++++++++++++++++------------- base/applications/ctfmon/precomp.h | 1 + dll/ime/msctfime/msctfime.cpp | 21 +++++----- dll/ime/msctfime/msctfime.h | 1 + dll/win32/msctf/utils.cpp | 38 ++++++++++++----- dll/win32/msutb/CMakeLists.txt | 2 +- sdk/include/reactos/cicero/cicbase.h | 38 ++++++++--------- sdk/include/reactos/cicero/cicevent.h | 10 ++--- sdk/include/reactos/cicero/cicfmap.h | 24 +++++------ sdk/include/reactos/cicero/cicmutex.h | 4 +- sdk/include/reactos/cicero/cicreg.h | 69 ++++++++++++++++--------------- 15 files changed, 197 insertions(+), 156 deletions(-) diff --git a/base/applications/ctfmon/CLoaderWnd.cpp b/base/applications/ctfmon/CLoaderWnd.cpp index 45072bafe1b..b52de13d1b3 100644 --- a/base/applications/ctfmon/CLoaderWnd.cpp +++ b/base/applications/ctfmon/CLoaderWnd.cpp @@ -18,15 +18,15 @@ BOOL CLoaderWnd::Init() return TRUE; // Already registered // Register a window class - WNDCLASSEXW wc; + WNDCLASSEX wc; ZeroMemory(&wc, sizeof(wc)); wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.hInstance = g_hInst; - wc.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.lpfnWndProc = WindowProc; - wc.lpszClassName = L"CiCTipBarClass"; - if (!::RegisterClassExW(&wc)) + wc.lpszClassName = TEXT("CiCTipBarClass"); + if (!::RegisterClassEx(&wc)) return FALSE; s_bWndClassRegistered = TRUE; // Remember @@ -35,8 +35,8 @@ BOOL CLoaderWnd::Init() HWND CLoaderWnd::CreateWnd() { - m_hWnd = ::CreateWindowExW(0, L"CiCTipBarClass", NULL, WS_DISABLED, - 0, 0, 0, 0, NULL, NULL, g_hInst, NULL); + m_hWnd = ::CreateWindowEx(0, TEXT("CiCTipBarClass"), NULL, WS_DISABLED, + 0, 0, 0, 0, NULL, NULL, g_hInst, NULL); return m_hWnd; } @@ -93,7 +93,7 @@ CLoaderWnd::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; default: - return DefWindowProcW(hwnd, uMsg, wParam, lParam); + return DefWindowProc(hwnd, uMsg, wParam, lParam); } return 0; diff --git a/base/applications/ctfmon/CMakeLists.txt b/base/applications/ctfmon/CMakeLists.txt index 2bc6d6a50f2..8ca1d7b5311 100644 --- a/base/applications/ctfmon/CMakeLists.txt +++ b/base/applications/ctfmon/CMakeLists.txt @@ -6,7 +6,7 @@ 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) +set_module_type(ctfmon win32gui) add_dependencies(ctfmon msctf msutb) target_link_libraries(ctfmon uuid) add_importlibs(ctfmon msctf msutb advapi32 shell32 user32 msvcrt kernel32) diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/applications/ctfmon/CRegWatcher.cpp index d7271820f68..1905956cb91 100644 --- a/base/applications/ctfmon/CRegWatcher.cpp +++ b/base/applications/ctfmon/CRegWatcher.cpp @@ -14,18 +14,18 @@ HANDLE CRegWatcher::s_ahWatchEvents[WATCHENTRY_MAX] = { NULL }; // The registry entries to watch WATCHENTRY CRegWatcher::s_WatchEntries[WATCHENTRY_MAX] = { - { HKEY_CURRENT_USER, L"Keyboard Layout\\Toggle" }, // WI_TOGGLE - { HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\CTF\\TIP" }, // WI_MACHINE_TIF - { HKEY_CURRENT_USER, L"Keyboard Layout\\Preload" }, // WI_PRELOAD - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run" }, // WI_RUN - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\TIP" }, // WI_USER_TIF - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech" }, // WI_USER_SPEECH - { HKEY_CURRENT_USER, L"Control Panel\\Appearance" }, // WI_APPEARANCE - { HKEY_CURRENT_USER, L"Control Panel\\Colors" }, // WI_COLORS - { HKEY_CURRENT_USER, L"Control Panel\\Desktop\\WindowMetrics" }, // WI_WINDOW_METRICS - { HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech" }, // WI_MACHINE_SPEECH - { HKEY_CURRENT_USER, L"Keyboard Layout" }, // WI_KEYBOARD_LAYOUT - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\Assemblies" }, // WI_ASSEMBLIES + { HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Toggle") }, // WI_TOGGLE + { HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\CTF\\TIP") }, // WI_MACHINE_TIF + { HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload") }, // WI_PRELOAD + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run") }, // WI_RUN + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\TIP") }, // WI_USER_TIF + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Speech") }, // WI_USER_SPEECH + { HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance") }, // WI_APPEARANCE + { HKEY_CURRENT_USER, TEXT("Control Panel\\Colors") }, // WI_COLORS + { HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics") }, // WI_WINDOW_METRICS + { HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Speech") }, // WI_MACHINE_SPEECH + { HKEY_CURRENT_USER, TEXT("Keyboard Layout") }, // WI_KEYBOARD_LAYOUT + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\Assemblies") }, // WI_ASSEMBLIES }; // The timer IDs: For delaying ignitions @@ -48,7 +48,7 @@ CRegWatcher::Init() // Create some nameless events and initialize them for (SIZE_T iEvent = 0; iEvent < _countof(s_ahWatchEvents); ++iEvent) { - s_ahWatchEvents[iEvent] = ::CreateEventW(NULL, TRUE, FALSE, NULL); + s_ahWatchEvents[iEvent] = ::CreateEvent(NULL, TRUE, FALSE, NULL); InitEvent(iEvent, FALSE); } @@ -102,11 +102,11 @@ CRegWatcher::InitEvent( // Open or create a registry key to watch registry key LSTATUS error; - error = ::RegOpenKeyExW(entry.hRootKey, entry.pszSubKey, 0, KEY_READ, &entry.hKey); + error = ::RegOpenKeyEx(entry.hRootKey, entry.pszSubKey, 0, KEY_READ, &entry.hKey); if (error != ERROR_SUCCESS) { - error = ::RegCreateKeyExW(entry.hRootKey, entry.pszSubKey, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &entry.hKey, NULL); + error = ::RegCreateKeyEx(entry.hRootKey, entry.pszSubKey, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &entry.hKey, NULL); if (error != ERROR_SUCCESS) return FALSE; } @@ -128,17 +128,18 @@ CRegWatcher::UpdateSpTip() // Clear "ProfileInitialized" value HKEY hKey; - LSTATUS error = ::RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\Sapilayr", - 0, KEY_WRITE, &hKey); + LSTATUS error = ::RegOpenKeyEx(HKEY_CURRENT_USER, + TEXT("SOFTWARE\\Microsoft\\CTF\\Sapilayr"), + 0, KEY_WRITE, &hKey); if (error == ERROR_SUCCESS) { DWORD dwValue = 0, cbValue = sizeof(dwValue); - ::RegSetValueExW(hKey, L"ProfileInitialized", NULL, REG_DWORD, (LPBYTE)&dwValue, cbValue); + ::RegSetValueEx(hKey, TEXT("ProfileInitialized"), NULL, REG_DWORD, (LPBYTE)&dwValue, cbValue); ::RegCloseKey(hKey); } // Get %WINDIR%/IME/sptip.dll!TF_CreateLangProfileUtil function - HINSTANCE hSPTIP = cicLoadSystemLibrary(L"IME\\sptip.dll", TRUE); + HINSTANCE hSPTIP = cicLoadSystemLibrary(TEXT("IME\\sptip.dll"), TRUE); FN_TF_CreateLangProfileUtil fnTF_CreateLangProfileUtil = (FN_TF_CreateLangProfileUtil)::GetProcAddress(hSPTIP, "TF_CreateLangProfileUtil"); if (fnTF_CreateLangProfileUtil) @@ -168,17 +169,17 @@ CRegWatcher::KillInternat() WATCHENTRY& entry = s_WatchEntries[WI_RUN]; // Delete internat.exe from registry "Run" key - LSTATUS error = ::RegOpenKeyExW(entry.hRootKey, entry.pszSubKey, 0, KEY_ALL_ACCESS, &hKey); + LSTATUS error = ::RegOpenKeyEx(entry.hRootKey, entry.pszSubKey, 0, KEY_ALL_ACCESS, &hKey); if (error == ERROR_SUCCESS) { - ::RegDeleteValueW(hKey, L"internat.exe"); + ::RegDeleteValue(hKey, TEXT("internat.exe")); ::RegCloseKey(hKey); } // Kill the "Indicator" window (that internat.exe creates) - HWND hwndInternat = ::FindWindowW(L"Indicator", NULL); + HWND hwndInternat = ::FindWindow(TEXT("Indicator"), NULL); if (hwndInternat) - ::PostMessageW(hwndInternat, WM_CLOSE, 0, 0); + ::PostMessage(hwndInternat, WM_CLOSE, 0, 0); } // Post message 0x8002 to every "SapiTipWorkerClass" window. @@ -188,14 +189,14 @@ CRegWatcher::EnumWndProc( _In_ HWND hWnd, _In_ LPARAM lParam) { - WCHAR ClassName[MAX_PATH]; + TCHAR ClassName[MAX_PATH]; UNREFERENCED_PARAMETER(lParam); - if (::GetClassNameW(hWnd, ClassName, _countof(ClassName)) && - _wcsicmp(ClassName, L"SapiTipWorkerClass") == 0) + if (::GetClassName(hWnd, ClassName, _countof(ClassName)) && + _tcsicmp(ClassName, TEXT("SapiTipWorkerClass")) == 0) { - PostMessageW(hWnd, 0x8002, 0, 0); // FIXME: Magic number + PostMessage(hWnd, 0x8002, 0, 0); // FIXME: Magic number } return TRUE; diff --git a/base/applications/ctfmon/CRegWatcher.h b/base/applications/ctfmon/CRegWatcher.h index 1f75cb7fb4b..a74222cae8a 100644 --- a/base/applications/ctfmon/CRegWatcher.h +++ b/base/applications/ctfmon/CRegWatcher.h @@ -10,7 +10,7 @@ struct WATCHENTRY { HKEY hRootKey; - LPCWSTR pszSubKey; + LPCTSTR pszSubKey; HKEY hKey; }; diff --git a/base/applications/ctfmon/ctfmon.cpp b/base/applications/ctfmon/ctfmon.cpp index 7756ee75097..5ea37a4eb20 100644 --- a/base/applications/ctfmon/ctfmon.cpp +++ b/base/applications/ctfmon/ctfmon.cpp @@ -13,6 +13,9 @@ typedef BOOL (WINAPI *FN_SetProcessShutdownParameters)(DWORD, DWORD); FN_SetProcessShutdownParameters g_fnSetProcessShutdownParameters = NULL; +// kernel32!GetSystemWow64DirectoryA +typedef UINT (WINAPI *FN_GetSystemWow64DirectoryA)(LPSTR, UINT); +FN_GetSystemWow64DirectoryA g_fnGetSystemWow64DirectoryA = NULL; // kernel32!GetSystemWow64DirectoryW typedef UINT (WINAPI *FN_GetSystemWow64DirectoryW)(LPWSTR, UINT); FN_GetSystemWow64DirectoryW g_fnGetSystemWow64DirectoryW = NULL; @@ -30,29 +33,29 @@ CLoaderWnd* g_pLoaderWnd = NULL; // Tipbar loader window static VOID ParseCommandLine( - _In_ LPCWSTR pszCmdLine) + _In_ LPCTSTR pszCmdLine) { g_fNoRunKey = g_fJustRunKey = FALSE; - for (LPCWSTR pch = pszCmdLine; *pch; ++pch) + for (LPCTSTR pch = pszCmdLine; *pch; ++pch) { // Skip space - while (*pch == L' ') + while (*pch == TEXT(' ')) ++pch; - if (*pch == UNICODE_NULL) + if (*pch == TEXT('\0')) return; - if ((*pch == L'-') || (*pch == L'/')) + if ((*pch == TEXT('-')) || (*pch == TEXT('/'))) { ++pch; switch (*pch) { - case L'N': case L'n': // Found "/N" option + case TEXT('N'): case TEXT('n'): // Found "/N" option g_fNoRunKey = TRUE; break; - case L'R': case L'r': // Found "/R" option + case TEXT('R'): case TEXT('r'): // Found "/R" option g_fJustRunKey = TRUE; break; @@ -74,18 +77,18 @@ WriteRegRun(VOID) // Open "Run" key HKEY hKey; - LSTATUS error = ::RegCreateKeyW(HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", - &hKey); + LSTATUS error = ::RegCreateKey(HKEY_CURRENT_USER, + TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Run"), + &hKey); if (error != ERROR_SUCCESS) return; // Write the module path CicSystemModulePath ModPath; - if (ModPath.Init(L"ctfmon.exe", FALSE)) + if (ModPath.Init(TEXT("ctfmon.exe"), FALSE)) { - DWORD cbData = (ModPath.m_cchPath + 1) * sizeof(WCHAR); - ::RegSetValueExW(hKey, L"ctfmon.exe", 0, REG_SZ, (BYTE*)ModPath.m_szPath, cbData); + DWORD cbData = (ModPath.m_cchPath + 1) * sizeof(TCHAR); + ::RegSetValueEx(hKey, TEXT("ctfmon.exe"), 0, REG_SZ, (BYTE*)ModPath.m_szPath, cbData); } ::RegCloseKey(hKey); @@ -134,7 +137,7 @@ SetGlobalCompartmentDWORD( static BOOL CheckX64System( - _In_ LPWSTR lpCmdLine) + _In_ LPTSTR lpCmdLine) { // Is the system x64? SYSTEM_INFO SystemInfo; @@ -146,23 +149,34 @@ CheckX64System( } // Get GetSystemWow64DirectoryW function - g_hKernel32 = cicGetSystemModuleHandle(L"kernel32.dll", FALSE); + g_hKernel32 = cicGetSystemModuleHandle(TEXT("kernel32.dll"), FALSE); +#ifdef UNICODE g_fnGetSystemWow64DirectoryW = (FN_GetSystemWow64DirectoryW)::GetProcAddress(g_hKernel32, "GetSystemWow64DirectoryW"); if (!g_fnGetSystemWow64DirectoryW) return FALSE; +#else + g_fnGetSystemWow64DirectoryA = + (FN_GetSystemWow64DirectoryA)::GetProcAddress(g_hKernel32, "GetSystemWow64DirectoryA"); + if (!g_fnGetSystemWow64DirectoryA) + return FALSE; +#endif // Build WoW64 ctfmon.exe pathname - WCHAR szPath[MAX_PATH]; + TCHAR szPath[MAX_PATH]; +#ifdef UNICODE UINT cchPath = g_fnGetSystemWow64DirectoryW(szPath, _countof(szPath)); - if (!cchPath && FAILED(StringCchCatW(szPath, _countof(szPath), L"\\ctfmon.exe"))) +#else + UINT cchPath = g_fnGetSystemWow64DirectoryA(szPath, _countof(szPath)); +#endif + if (!cchPath && FAILED(StringCchCat(szPath, _countof(szPath), TEXT("\\ctfmon.exe")))) return FALSE; // Create a WoW64 ctfmon.exe process PROCESS_INFORMATION pi; - STARTUPINFOW si = { sizeof(si) }; + STARTUPINFO si = { sizeof(si) }; si.wShowWindow = SW_SHOWMINNOACTIVE; - if (!::CreateProcessW(szPath, lpCmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + if (!::CreateProcess(szPath, lpCmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return FALSE; ::CloseHandle(pi.hThread); @@ -173,7 +187,7 @@ CheckX64System( static BOOL InitApp( _In_ HINSTANCE hInstance, - _In_ LPWSTR lpCmdLine) + _In_ LPTSTR lpCmdLine) { g_hInst = hInstance; // Save the instance handle @@ -194,7 +208,7 @@ InitApp( // Call SetProcessShutdownParameters if possible if (g_dwOsInfo & CIC_OSINFO_NT) { - g_hKernel32 = cicGetSystemModuleHandle(L"kernel32.dll", FALSE); + g_hKernel32 = cicGetSystemModuleHandle(TEXT("kernel32.dll"), FALSE); g_fnSetProcessShutdownParameters = (FN_SetProcessShutdownParameters) ::GetProcAddress(g_hKernel32, "SetProcessShutdownParameters"); @@ -257,16 +271,16 @@ DoMainLoop(VOID) if (g_bOnWow64) // Is the current process on WoW64? { // Just a simple message loop - while (::GetMessageW(&msg, NULL, 0, 0)) + while (::GetMessage(&msg, NULL, 0, 0)) { ::TranslateMessage(&msg); - ::DispatchMessageW(&msg); + ::DispatchMessage(&msg); } return (INT)msg.wParam; } // Open the existing event by the name - HANDLE hSwitchEvent = ::OpenEventW(SYNCHRONIZE, FALSE, L"WinSta0_DesktopSwitch"); + HANDLE hSwitchEvent = ::OpenEvent(SYNCHRONIZE, FALSE, TEXT("WinSta0_DesktopSwitch")); // The target events to watch HANDLE ahEvents[WATCHENTRY_MAX + 1]; @@ -285,13 +299,13 @@ DoMainLoop(VOID) if (dwWait == (WAIT_OBJECT_0 + _countof(ahEvents))) // Is input available? { // Do the events - while (::PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + while (::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { if (msg.message == WM_QUIT) goto Quit; ::TranslateMessage(&msg); - ::DispatchMessageW(&msg); + ::DispatchMessage(&msg); } } else if (dwWait == (WAIT_OBJECT_0 + WI_DESKTOP_SWITCH)) // Desktop switch? @@ -313,10 +327,10 @@ Quit: // The main function for Unicode Win32 EXTERN_C INT WINAPI -wWinMain( +_tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInst, - LPWSTR lpCmdLine, + LPTSTR lpCmdLine, INT nCmdShow) { UNREFERENCED_PARAMETER(hPrevInst); diff --git a/base/applications/ctfmon/precomp.h b/base/applications/ctfmon/precomp.h index 6e1282e2bfa..b6ca0bdcb4d 100644 --- a/base/applications/ctfmon/precomp.h +++ b/base/applications/ctfmon/precomp.h @@ -12,6 +12,7 @@ #include <shellapi.h> #include <shlwapi.h> #include <stdlib.h> +#include <tchar.h> #include <strsafe.h> #include <msctf.h> #include <ctfutb.h> diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 6aa33c76490..376416110a5 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -56,16 +56,17 @@ BOOL IsMsImeMessage(UINT uMsg) */ BOOL RegisterMSIMEMessage(VOID) { - WM_MSIME_SERVICE = RegisterWindowMessageW(L"MSIMEService"); - WM_MSIME_UIREADY = RegisterWindowMessageW(L"MSIMEUIReady"); - WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageW(L"MSIMEReconvertRequest"); - WM_MSIME_RECONVERT = RegisterWindowMessageW(L"MSIMEReconvert"); - WM_MSIME_DOCUMENTFEED = RegisterWindowMessageW(L"MSIMEDocumentFeed"); - WM_MSIME_QUERYPOSITION = RegisterWindowMessageW(L"MSIMEQueryPosition"); - WM_MSIME_MODEBIAS = RegisterWindowMessageW(L"MSIMEModeBias"); - WM_MSIME_SHOWIMEPAD = RegisterWindowMessageW(L"MSIMEShowImePad"); - WM_MSIME_MOUSE = RegisterWindowMessageW(L"MSIMEMouseOperation"); - WM_MSIME_KEYMAP = RegisterWindowMessageW(L"MSIMEKeyMap"); + // Using ANSI (A) version here can reduce binary size. + WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); + WM_MSIME_UIREADY = RegisterWindowMessageA("MSIMEUIReady"); + WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageA("MSIMEReconvertRequest"); + WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); + WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); + WM_MSIME_MODEBIAS = RegisterWindowMessageA("MSIMEModeBias"); + WM_MSIME_SHOWIMEPAD = RegisterWindowMessageA("MSIMEShowImePad"); + WM_MSIME_MOUSE = RegisterWindowMessageA("MSIMEMouseOperation"); + WM_MSIME_KEYMAP = RegisterWindowMessageA("MSIMEKeyMap"); return (WM_MSIME_SERVICE && WM_MSIME_UIREADY && WM_MSIME_RECONVERTREQUEST && diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 5fce8fb5c42..a5273e11d2d 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -17,6 +17,7 @@ #include <imm.h> #include <ddk/immdev.h> #include <cguid.h> +#include <tchar.h> #include <msctf.h> #include <ctffunc.h> #include <shlwapi.h> diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 9d0d455f8ad..944d3d1c063 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -17,6 +17,7 @@ #include <imm.h> #include <ddk/immdev.h> #include <cguid.h> +#include <tchar.h> #include <msctf.h> #include <ctffunc.h> #include <shlwapi.h> @@ -28,6 +29,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); +BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) +{ + pszGUID[0] = ANSI_NULL; + + WCHAR szWide[40]; + szWide[0] = UNICODE_NULL; + BOOL ret = StringFromGUID2(rguid, szWide, _countof(szWide)); + ::WideCharToMultiByte(CP_ACP, 0, szWide, -1, pszGUID, cchGUID, NULL, NULL); + return ret; +} + +#ifdef UNICODE + #define StringFromGUID2T StringFromGUID2 +#else + #define StringFromGUID2T StringFromGUID2A +#endif + /*********************************************************************** * TF_RegisterLangBarAddIn (MSCTF.@) * @@ -47,19 +65,19 @@ TF_RegisterLangBarAddIn( return E_INVALIDARG; } - WCHAR szBuff[MAX_PATH], szGUID[40]; - StringCchCopyW(szBuff, _countof(szBuff), L"SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\"); - StringFromGUID2(rguid, szGUID, _countof(szGUID)); - StringCchCatW(szBuff, _countof(szBuff), szGUID); + TCHAR szBuff[MAX_PATH], szGUID[40]; + StringCchCopy(szBuff, _countof(szBuff), TEXT("SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\")); + StringFromGUID2T(rguid, szGUID, _countof(szGUID)); + StringCchCat(szBuff, _countof(szBuff), szGUID); CicRegKey regKey; HKEY hBaseKey = ((dwFlags & 1) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER); LSTATUS error = regKey.Create(hBaseKey, szBuff); if (error == ERROR_SUCCESS) { - error = regKey.SetSz(L"FilePath", pszFilePath); + error = regKey.SetSzW(L"FilePath", pszFilePath); if (error == ERROR_SUCCESS) - error = regKey.SetDword(L"Enable", !!(dwFlags & 4)); + error = regKey.SetDword(TEXT("Enable"), !!(dwFlags & 4)); } return ((error == ERROR_SUCCESS) ? S_OK : E_FAIL); @@ -83,8 +101,8 @@ TF_UnregisterLangBarAddIn( return E_INVALIDARG; } - WCHAR szSubKey[MAX_PATH]; - StringCchCopyW(szSubKey, _countof(szSubKey), L"SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\"); + TCHAR szSubKey[MAX_PATH]; + StringCchCopy(szSubKey, _countof(szSubKey), TEXT("SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\")); CicRegKey regKey; HKEY hBaseKey = ((dwFlags & 1) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER); @@ -92,8 +110,8 @@ TF_UnregisterLangBarAddIn( HRESULT hr = E_FAIL; if (error == ERROR_SUCCESS) { - WCHAR szGUID[40]; - StringFromGUID2(rguid, szGUID, _countof(szGUID)); + TCHAR szGUID[40]; + StringFromGUID2T(rguid, szGUID, _countof(szGUID)); regKey.RecurseDeleteKey(szGUID); hr = S_OK; } diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index 84760f101e8..3e48eb33311 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(msutb MODULE ${SOURCE} msutb.rc ${CMAKE_CURRENT_BINARY_DIR}/msutb.def) -set_module_type(msutb win32dll UNICODE) +set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) add_importlibs(msutb user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index 28f5f96543f..14958780ba3 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -71,9 +71,9 @@ cicGetOSInfo(LPUINT puACP, LPDWORD pdwOSInfo) *pdwOSInfo = 0; /* Check OS version info */ - OSVERSIONINFOW VerInfo; + OSVERSIONINFO VerInfo; VerInfo.dwOSVersionInfoSize = sizeof(VerInfo); - GetVersionExW(&VerInfo); + GetVersionEx(&VerInfo); if (VerInfo.dwPlatformId == DLLVER_PLATFORM_NT) { *pdwOSInfo |= CIC_OSINFO_NT; @@ -113,7 +113,7 @@ cicGetOSInfo(LPUINT puACP, LPDWORD pdwOSInfo) struct CicSystemModulePath { - WCHAR m_szPath[MAX_PATH + 2]; + TCHAR m_szPath[MAX_PATH + 2]; SIZE_T m_cchPath; CicSystemModulePath() @@ -122,31 +122,31 @@ struct CicSystemModulePath m_cchPath = 0; } - BOOL Init(_In_ LPCWSTR pszFileName, _In_ BOOL bSysWinDir); + BOOL Init(_In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir); }; // Get an instance handle that is already loaded static inline HINSTANCE cicGetSystemModuleHandle( - _In_ LPCWSTR pszFileName, + _In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir) { CicSystemModulePath ModPath; if (!ModPath.Init(pszFileName, bSysWinDir)) return NULL; - return GetModuleHandleW(ModPath.m_szPath); + return GetModuleHandle(ModPath.m_szPath); } // Load a system library static inline HINSTANCE cicLoadSystemLibrary( - _In_ LPCWSTR pszFileName, + _In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir) { CicSystemModulePath ModPath; if (!ModPath.Init(pszFileName, bSysWinDir)) return NULL; - return ::LoadLibraryW(ModPath.m_szPath); + return ::LoadLibrary(ModPath.m_szPath); } #include <ndk/pstypes.h> /* for PROCESSINFOCLASS */ @@ -163,7 +163,7 @@ static inline BOOL cicIsWow64(VOID) if (!s_fnNtQueryInformationProcess) { - HMODULE hNTDLL = cicGetSystemModuleHandle(L"ntdll.dll", FALSE); + HMODULE hNTDLL = cicGetSystemModuleHandle(TEXT("ntdll.dll"), FALSE); if (!hNTDLL) return FALSE; @@ -184,38 +184,38 @@ static inline BOOL cicIsWow64(VOID) inline BOOL CicSystemModulePath::Init( - _In_ LPCWSTR pszFileName, + _In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir) { SIZE_T cchPath; if (bSysWinDir) { // Usually C:\Windows or C:\ReactOS - cchPath = ::GetSystemWindowsDirectoryW(m_szPath, _countof(m_szPath)); + cchPath = ::GetSystemWindowsDirectory(m_szPath, _countof(m_szPath)); } else { // Usually C:\Windows\system32 or C:\ReactOS\system32 - cchPath = ::GetSystemDirectoryW(m_szPath, _countof(m_szPath)); + cchPath = ::GetSystemDirectory(m_szPath, _countof(m_szPath)); } - m_szPath[_countof(m_szPath) - 1] = UNICODE_NULL; // Avoid buffer overrun + m_szPath[_countof(m_szPath) - 1] = TEXT('\0'); // Avoid buffer overrun if ((cchPath == 0) || (cchPath > _countof(m_szPath) - 2)) goto Failure; // Add backslash if necessary - if ((cchPath > 0) && (m_szPath[cchPath - 1] != L'\\')) + if ((cchPath > 0) && (m_szPath[cchPath - 1] != TEXT('\\'))) { - m_szPath[cchPath + 0] = L'\\'; - m_szPath[cchPath + 1] = UNICODE_NULL; + m_szPath[cchPath + 0] = TEXT('\\'); + m_szPath[cchPath + 1] = TEXT('\0'); } // Append pszFileName - if (FAILED(StringCchCatW(m_szPath, _countof(m_szPath), pszFileName))) + if (FAILED(StringCchCat(m_szPath, _countof(m_szPath), pszFileName))) goto Failure; - m_cchPath = wcslen(m_szPath); + m_cchPath = _tcslen(m_szPath); return TRUE; Failure: @@ -254,7 +254,7 @@ cicRealCoCreateInstance( if (!s_fnCoCreateInstance) { if (!s_hOle32) - s_hOle32 = cicLoadSystemLibrary(L"ole32.dll", FALSE); + s_hOle32 = cicLoadSystemLibrary(TEXT("ole32.dll"), FALSE); s_fnCoCreateInstance = (FN_CoCreateInstance)GetProcAddress(s_hOle32, "CoCreateInstance"); if (!s_fnCoCreateInstance) return E_NOTIMPL; diff --git a/sdk/include/reactos/cicero/cicevent.h b/sdk/include/reactos/cicero/cicevent.h index a783872b2c2..0e679e2238e 100644 --- a/sdk/include/reactos/cicero/cicevent.h +++ b/sdk/include/reactos/cicero/cicevent.h @@ -12,7 +12,7 @@ class CicEvent { HANDLE m_hEvent; - LPCWSTR m_pszName; + LPCTSTR m_pszName; public: CicEvent() : m_hEvent(NULL), m_pszName(NULL) @@ -23,20 +23,20 @@ public: Close(); } - BOOL Create(LPSECURITY_ATTRIBUTES lpSA, LPCWSTR pszName) + BOOL Create(LPSECURITY_ATTRIBUTES lpSA, LPCTSTR pszName) { if (pszName) m_pszName = pszName; if (!m_pszName) return FALSE; - m_hEvent = ::CreateEventW(lpSA, FALSE, FALSE, m_pszName); + m_hEvent = ::CreateEvent(lpSA, FALSE, FALSE, m_pszName); return (m_hEvent != NULL); } - BOOL Open(LPCWSTR pszName) + BOOL Open(LPCTSTR pszName) { if (pszName) m_pszName = pszName; - m_hEvent = ::OpenEventW(EVENT_ALL_ACCESS, FALSE, m_pszName); + m_hEvent = ::OpenEvent(EVENT_ALL_ACCESS, FALSE, m_pszName); return (m_hEvent != NULL); } void Close() diff --git a/sdk/include/reactos/cicero/cicfmap.h b/sdk/include/reactos/cicero/cicfmap.h index 201f3227db8..8e06fc77017 100644 --- a/sdk/include/reactos/cicero/cicfmap.h +++ b/sdk/include/reactos/cicero/cicfmap.h @@ -15,7 +15,7 @@ class CicFileMappingStatic { protected: - LPCWSTR m_pszName; + LPCTSTR m_pszName; LPVOID m_pView; HANDLE m_hMapping; BOOL m_bCreated; @@ -28,7 +28,7 @@ public: CicFileMappingStatic() { } ~CicFileMappingStatic() { } - void Init(LPCWSTR pszName, CicMutex *pMutex); + void Init(LPCTSTR pszName, CicMutex *pMutex); LPVOID Create(LPSECURITY_ATTRIBUTES pSA, DWORD dwMaximumSizeLow, LPBOOL pbAlreadyExists); LPVOID Open(); @@ -43,14 +43,14 @@ public: class CicFileMapping : public CCicFileMappingStatic { public: - CicFileMapping(LPCWSTR pszName, CicMutex *pMutex); + CicFileMapping(LPCTSTR pszName, CicMutex *pMutex); virtual ~CicFileMapping() { Finalize(); } }; /******************************************************************************/ inline -CicFileMapping::CicFileMapping(LPCWSTR pszName, CicMutex *pMutex) +CicFileMapping::CicFileMapping(LPCTSTR pszName, CicMutex *pMutex) : m_pszName(NULL) , m_pView(NULL) , m_hMapping(NULL) @@ -78,7 +78,7 @@ inline void CicFileMappingStatic::Close() m_bCreated = FALSE; } -inline void CicFileMappingStatic::Init(LPCWSTR pszName, CicMutex *pMutex) +inline void CicFileMappingStatic::Init(LPCTSTR pszName, CicMutex *pMutex) { if (pMutex) m_pMutex = pMutex; @@ -97,12 +97,12 @@ CicFileMappingStatic::Create( if (!m_pszName) return NULL; - m_hMapping = ::CreateFileMappingW(INVALID_HANDLE_VALUE, - pSA, - PAGE_READWRITE, - 0, - dwMaximumSizeLow, - m_pszName); + m_hMapping = ::CreateFileMapping(INVALID_HANDLE_VALUE, + pSA, + PAGE_READWRITE, + 0, + dwMaximumSizeLow, + m_pszName); if (pbAlreadyExists) *pbAlreadyExists = (::GetLastError() == ERROR_ALREADY_EXISTS); if (!m_hMapping) @@ -116,7 +116,7 @@ inline LPVOID CicFileMappingStatic::Open() { if (!m_pszName) return NULL; - m_hMapping = ::OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, m_pszName); + m_hMapping = ::OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, m_pszName); if (!m_hMapping) return NULL; diff --git a/sdk/include/reactos/cicero/cicmutex.h b/sdk/include/reactos/cicero/cicmutex.h index 9c98146e8c0..73527edd092 100644 --- a/sdk/include/reactos/cicero/cicmutex.h +++ b/sdk/include/reactos/cicero/cicmutex.h @@ -23,9 +23,9 @@ public: Uninit(); } - void Init(LPSECURITY_ATTRIBUTES lpSA, LPCWSTR pszMutexName) + void Init(LPSECURITY_ATTRIBUTES lpSA, LPCTSTR pszMutexName) { - m_hMutex = ::CreateMutexW(lpSA, FALSE, pszMutexName); + m_hMutex = ::CreateMutex(lpSA, FALSE, pszMutexName); m_bInit = TRUE; } void Uninit() diff --git a/sdk/include/reactos/cicero/cicreg.h b/sdk/include/reactos/cicero/cicreg.h index da18e0bd49e..f6c090bef4e 100644 --- a/sdk/include/reactos/cicero/cicreg.h +++ b/sdk/include/reactos/cicero/cicreg.h @@ -23,43 +23,48 @@ public: LSTATUS Open( HKEY hKey, - LPCWSTR lpSubKey, + LPCTSTR lpSubKey, REGSAM samDesired = KEY_READ); LSTATUS Create( HKEY hKey, - LPCWSTR lpSubKey, - LPWSTR lpClass = NULL, + LPCTSTR lpSubKey, + LPTSTR lpClass = NULL, DWORD dwOptions = REG_OPTION_NON_VOLATILE, REGSAM samDesired = KEY_ALL_ACCESS, LPSECURITY_ATTRIBUTES lpSecurityAttributes = NULL, LPDWORD pdwDisposition = NULL); - LSTATUS QueryDword(LPCWSTR pszValueName, LPDWORD pdwValue) + LSTATUS QueryDword(LPCTSTR pszValueName, LPDWORD pdwValue) { DWORD cbData = sizeof(DWORD); - return ::RegQueryValueExW(m_hKey, pszValueName, 0, NULL, (LPBYTE)pdwValue, &cbData); + return ::RegQueryValueEx(m_hKey, pszValueName, 0, NULL, (LPBYTE)pdwValue, &cbData); } - LSTATUS SetDword(LPCWSTR pszValueName, DWORD dwValue) + LSTATUS SetDword(LPCTSTR pszValueName, DWORD dwValue) { - return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_DWORD, (LPBYTE)&dwValue, sizeof(dwValue)); + return ::RegSetValueEx(m_hKey, pszValueName, 0, REG_DWORD, (LPBYTE)&dwValue, sizeof(dwValue)); } - LSTATUS QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax); + LSTATUS QuerySz(LPCTSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax); - LSTATUS SetSz(LPCWSTR pszValueName, LPCWSTR pszValue) + LSTATUS SetSz(LPCTSTR pszValueName, LPCTSTR pszValue) + { + DWORD cbValue = (lstrlen(pszValue) + 1) * sizeof(TCHAR); + return ::RegSetValueEx(m_hKey, pszValueName, 0, REG_SZ, (LPBYTE)pszValue, cbValue); + } + LSTATUS SetSzW(LPCWSTR pszValueName, LPCWSTR pszValue) { DWORD cbValue = (lstrlenW(pszValue) + 1) * sizeof(WCHAR); return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_SZ, (LPBYTE)pszValue, cbValue); } - LSTATUS DeleteSubKey(LPCWSTR lpSubKey) + LSTATUS DeleteSubKey(LPCTSTR lpSubKey) { - return ::RegDeleteKeyW(m_hKey, lpSubKey); + return ::RegDeleteKey(m_hKey, lpSubKey); } - LSTATUS RecurseDeleteKey(LPCWSTR lpSubKey); + LSTATUS RecurseDeleteKey(LPCTSTR lpSubKey); }; /******************************************************************************/ @@ -77,11 +82,11 @@ CicRegKey::Close() inline LSTATUS CicRegKey::Open( HKEY hKey, - LPCWSTR lpSubKey, + LPCTSTR lpSubKey, REGSAM samDesired) { HKEY hNewKey = NULL; - LSTATUS error = ::RegOpenKeyExW(hKey, lpSubKey, 0, samDesired, &hNewKey); + LSTATUS error = ::RegOpenKeyEx(hKey, lpSubKey, 0, samDesired, &hNewKey); if (error != ERROR_SUCCESS) return error; @@ -93,23 +98,23 @@ CicRegKey::Open( inline LSTATUS CicRegKey::Create( HKEY hKey, - LPCWSTR lpSubKey, - LPWSTR lpClass, + LPCTSTR lpSubKey, + LPTSTR lpClass, DWORD dwOptions, REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, LPDWORD pdwDisposition) { HKEY hNewKey = NULL; - LSTATUS error = ::RegCreateKeyExW(hKey, - lpSubKey, - 0, - lpClass, - dwOptions, - samDesired, - lpSecurityAttributes, - &hNewKey, - pdwDisposition); + LSTATUS error = ::RegCreateKeyEx(hKey, + lpSubKey, + 0, + lpClass, + dwOptions, + samDesired, + lpSecurityAttributes, + &hNewKey, + pdwDisposition); if (error != ERROR_SUCCESS) return error; @@ -119,13 +124,13 @@ CicRegKey::Create( } inline LSTATUS -CicRegKey::QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) +CicRegKey::QuerySz(LPCTSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) { DWORD cchSaveMax = cchValueMax; - cchValueMax *= sizeof(WCHAR); - LSTATUS error = ::RegQueryValueExW(m_hKey, pszValueName, 0, NULL, - (LPBYTE)pszValue, &cchValueMax); + cchValueMax *= sizeof(TCHAR); + LSTATUS error = ::RegQueryValueEx(m_hKey, pszValueName, 0, NULL, + (LPBYTE)pszValue, &cchValueMax); if (cchSaveMax > 0) pszValue[(error == ERROR_SUCCESS) ? (cchSaveMax - 1) : 0] = UNICODE_NULL; @@ -133,19 +138,19 @@ CicRegKey::QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) } inline LSTATUS -CicRegKey::RecurseDeleteKey(LPCWSTR lpSubKey) +CicRegKey::RecurseDeleteKey(LPCTSTR lpSubKey) { CicRegKey regKey; LSTATUS error = regKey.Open(m_hKey, lpSubKey, KEY_READ | KEY_WRITE); if (error != ERROR_SUCCESS) return error; - WCHAR szName[MAX_PATH]; + TCHAR szName[MAX_PATH]; DWORD cchName; do { cchName = _countof(szName); - error = ::RegEnumKeyExW(regKey, 0, szName, &cchName, NULL, NULL, NULL, NULL); + error = ::RegEnumKeyEx(regKey, 0, szName, &cchName, NULL, NULL, NULL, NULL); if (error != ERROR_SUCCESS) break;

9 months, 3 weeks

[reactos] 01/01: [MSCTF][SDK] Implement TF_RegisterLangBarAddIn etc. (#6229)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8a47036995ccaff4f02a… commit a8a47036995ccaff4f02a922ab2d1fa8f849339d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 10:31:53 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 10:31:53 2023 +0900 [MSCTF][SDK] Implement TF_RegisterLangBarAddIn etc. (#6229) - Add dll/win32/msctf/utils.cpp. - Implement TF_RegisterLangBarAddIn and TF_UnregisterLangBarAddIn. - Strengthen <cicero/cicreg.h>. - Modify msctf.spec. CORE-19361 --- dll/win32/msctf/CMakeLists.txt | 7 ++- dll/win32/msctf/msctf.spec | 2 + dll/win32/msctf/utils.cpp | 102 +++++++++++++++++++++++++++++++++++ sdk/include/reactos/cicero/cicbase.h | 2 +- sdk/include/reactos/cicero/cicreg.h | 37 ++++++++++++- 5 files changed, 146 insertions(+), 4 deletions(-) diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt index 863559f5270..d8caf9a8e04 100644 --- a/dll/win32/msctf/CMakeLists.txt +++ b/dll/win32/msctf/CMakeLists.txt @@ -20,13 +20,18 @@ list(APPEND SOURCE precomp.h ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c) +list(APPEND PCH_SKIP_SOURCE + utils.cpp) + add_library(msctf MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} version.rc ${CMAKE_CURRENT_BINARY_DIR}/msctf.def) set_module_type(msctf win32dll) target_link_libraries(msctf uuid wine) -add_importlibs(msctf ole32 oleaut32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) +add_importlibs(msctf user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) +add_delay_importlibs(msctf ole32 oleaut32) add_pch(msctf precomp.h SOURCE) add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index e5a1a714c00..186e1cadac2 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -34,3 +34,5 @@ @ stub TF_MlngInfoCount @ stub TF_RunInputCPL @ stdcall -stub TF_PostAllThreadMsg(long long) +@ stdcall TF_RegisterLangBarAddIn(ptr wstr long) +@ stdcall TF_UnregisterLangBarAddIn(ptr long) diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp new file mode 100644 index 00000000000..9d0d455f8ad --- /dev/null +++ b/dll/win32/msctf/utils.cpp @@ -0,0 +1,102 @@ +/* + * PROJECT: ReactOS msctf.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Text Framework Services + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <stdlib.h> + +#define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS +#define COBJMACROS +#define INITGUID +#define _EXTYPES_H + +#include <windows.h> +#include <imm.h> +#include <ddk/immdev.h> +#include <cguid.h> +#include <msctf.h> +#include <ctffunc.h> +#include <shlwapi.h> +#include <strsafe.h> + +#include <cicero/cicreg.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +/*********************************************************************** + * TF_RegisterLangBarAddIn (MSCTF.@) + * + * @implemented + */ +EXTERN_C HRESULT WINAPI +TF_RegisterLangBarAddIn( + _In_ REFGUID rguid, + _In_ LPCWSTR pszFilePath, + _In_ DWORD dwFlags) +{ + TRACE("(%s, %s, 0x%lX)\n", debugstr_guid(&rguid), debugstr_w(pszFilePath), dwFlags); + + if (!pszFilePath || IsEqualGUID(rguid, GUID_NULL)) + { + ERR("E_INVALIDARG\n"); + return E_INVALIDARG; + } + + WCHAR szBuff[MAX_PATH], szGUID[40]; + StringCchCopyW(szBuff, _countof(szBuff), L"SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\"); + StringFromGUID2(rguid, szGUID, _countof(szGUID)); + StringCchCatW(szBuff, _countof(szBuff), szGUID); + + CicRegKey regKey; + HKEY hBaseKey = ((dwFlags & 1) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER); + LSTATUS error = regKey.Create(hBaseKey, szBuff); + if (error == ERROR_SUCCESS) + { + error = regKey.SetSz(L"FilePath", pszFilePath); + if (error == ERROR_SUCCESS) + error = regKey.SetDword(L"Enable", !!(dwFlags & 4)); + } + + return ((error == ERROR_SUCCESS) ? S_OK : E_FAIL); +} + +/*********************************************************************** + * TF_UnregisterLangBarAddIn (MSCTF.@) + * + * @implemented + */ +EXTERN_C HRESULT WINAPI +TF_UnregisterLangBarAddIn( + _In_ REFGUID rguid, + _In_ DWORD dwFlags) +{ + TRACE("(%s, 0x%lX)\n", debugstr_guid(&rguid), dwFlags); + + if (IsEqualGUID(rguid, GUID_NULL)) + { + ERR("E_INVALIDARG\n"); + return E_INVALIDARG; + } + + WCHAR szSubKey[MAX_PATH]; + StringCchCopyW(szSubKey, _countof(szSubKey), L"SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\"); + + CicRegKey regKey; + HKEY hBaseKey = ((dwFlags & 1) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER); + LSTATUS error = regKey.Open(hBaseKey, szSubKey, KEY_ALL_ACCESS); + HRESULT hr = E_FAIL; + if (error == ERROR_SUCCESS) + { + WCHAR szGUID[40]; + StringFromGUID2(rguid, szGUID, _countof(szGUID)); + regKey.RecurseDeleteKey(szGUID); + hr = S_OK; + } + + return hr; +} diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index 6bf6a491e80..28f5f96543f 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -191,7 +191,7 @@ CicSystemModulePath::Init( if (bSysWinDir) { // Usually C:\Windows or C:\ReactOS - cchPath = ::GetSystemWindowsDirectory(m_szPath, _countof(m_szPath)); + cchPath = ::GetSystemWindowsDirectoryW(m_szPath, _countof(m_szPath)); } else { diff --git a/sdk/include/reactos/cicero/cicreg.h b/sdk/include/reactos/cicero/cicreg.h index 674d1d27ed2..da18e0bd49e 100644 --- a/sdk/include/reactos/cicero/cicreg.h +++ b/sdk/include/reactos/cicero/cicreg.h @@ -15,7 +15,7 @@ public: HKEY m_hKey; CicRegKey() : m_hKey(NULL) { } - ~CicRegKey() { Close(); } + virtual ~CicRegKey() { Close(); } operator HKEY() { return m_hKey; } @@ -43,7 +43,7 @@ public: LSTATUS SetDword(LPCWSTR pszValueName, DWORD dwValue) { - return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_DWORD, &dwValue, sizeof(dwValue)); + return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_DWORD, (LPBYTE)&dwValue, sizeof(dwValue)); } LSTATUS QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax); @@ -53,6 +53,13 @@ public: DWORD cbValue = (lstrlenW(pszValue) + 1) * sizeof(WCHAR); return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_SZ, (LPBYTE)pszValue, cbValue); } + + LSTATUS DeleteSubKey(LPCWSTR lpSubKey) + { + return ::RegDeleteKeyW(m_hKey, lpSubKey); + } + + LSTATUS RecurseDeleteKey(LPCWSTR lpSubKey); }; /******************************************************************************/ @@ -124,3 +131,29 @@ CicRegKey::QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) return error; } + +inline LSTATUS +CicRegKey::RecurseDeleteKey(LPCWSTR lpSubKey) +{ + CicRegKey regKey; + LSTATUS error = regKey.Open(m_hKey, lpSubKey, KEY_READ | KEY_WRITE); + if (error != ERROR_SUCCESS) + return error; + + WCHAR szName[MAX_PATH]; + DWORD cchName; + do + { + cchName = _countof(szName); + error = ::RegEnumKeyExW(regKey, 0, szName, &cchName, NULL, NULL, NULL, NULL); + if (error != ERROR_SUCCESS) + break; + + szName[_countof(szName) - 1] = UNICODE_NULL; + error = regKey.RecurseDeleteKey(szName); + } while (error == ERROR_SUCCESS); + + regKey.Close(); + + return DeleteSubKey(lpSubKey); +}

9 months, 3 weeks

[reactos] 01/01: [NTOS:INBV:PO] Consolidate shutdown logo routines where all the boot theming is implemented.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=434ac241df4287937bc2f… commit 434ac241df4287937bc2f1e98500efc3d0f0beab Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 24 18:33:38 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 25 21:43:20 2023 +0100 [NTOS:INBV:PO] Consolidate shutdown logo routines where all the boot theming is implemented. And it's late now, but... Merry Christmas 2023 as well! 🎄 Logo design by contributor 'TheCustomFHD' "From ReactOS with Love" ;^) --- ntoskrnl/inbv/bootanim.c | 239 ++++++++++++++++++++++++++++++++-- ntoskrnl/inbv/bootanim.rc | 1 + ntoskrnl/inbv/logo.h | 8 ++ ntoskrnl/inbv/resources/logo_xmas.bmp | Bin 0 -> 14468 bytes ntoskrnl/include/resource.h | 7 +- ntoskrnl/po/poshtdwn.c | 21 +-- 6 files changed, 246 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/inbv/bootanim.c b/ntoskrnl/inbv/bootanim.c index bc8b9a3960c..e9fa08c51c8 100644 --- a/ntoskrnl/inbv/bootanim.c +++ b/ntoskrnl/inbv/bootanim.c @@ -28,6 +28,12 @@ */ // #define REACTOS_SKUS +/* + * Enable this define for having fancy features + * in the boot and shutdown screens. + */ +#define REACTOS_FANCY_BOOT + /* * BitBltAligned() alignments */ @@ -86,7 +92,7 @@ static ROT_BAR_TYPE RotBarSelection = RB_UNSPECIFIED; static ROT_BAR_STATUS PltRotBarStatus = 0; static UCHAR RotBarBuffer[24 * 9]; static UCHAR RotLineBuffer[SCREEN_WIDTH * 6]; -#endif +#endif // INBV_ROTBAR_IMPLEMENTED /* FADE-IN FUNCTION **********************************************************/ @@ -439,7 +445,7 @@ InbvRotBarInit(VOID) PltRotBarStatus = RBS_FADEIN; /* Perform other initialization if needed */ } -#endif +#endif // INBV_ROTBAR_IMPLEMENTED CODE_SEG("INIT") static @@ -467,6 +473,34 @@ DisplayFilter( } } +#ifdef REACTOS_FANCY_BOOT + +/* Returns TRUE if this is Christmas time, or FALSE if not */ +static BOOLEAN +IsXmasTime(VOID) +{ + LARGE_INTEGER SystemTime; + TIME_FIELDS Time; + + /* Use KeBootTime if it's initialized, otherwise call the HAL */ + SystemTime = KeBootTime; + if ((SystemTime.QuadPart == 0) && HalQueryRealTimeClock(&Time)) + RtlTimeFieldsToTime(&Time, &SystemTime); + + ExSystemTimeToLocalTime(&SystemTime, &SystemTime); + RtlTimeToTimeFields(&SystemTime, &Time); + return ((Time.Month == 12) && (20 <= Time.Day) && (Time.Day <= 31)); +} + +#define SELECT_LOGO_ID(LogoIdDefault, Cond, LogoIdAlt) \ + ((Cond) ? (LogoIdAlt) : (LogoIdDefault)) + +#else + +#define SELECT_LOGO_ID(LogoIdDefault, Cond, LogoIdAlt) (LogoIdDefault) + +#endif // REACTOS_FANCY_BOOT + CODE_SEG("INIT") VOID NTAPI @@ -558,6 +592,11 @@ DisplayBootBitmap( } else { +#ifdef REACTOS_FANCY_BOOT + /* Decide whether this is a good time to change our logo ;^) */ + BOOLEAN IsXmas = IsXmasTime(); +#endif + /* Is the boot driver installed? */ if (!InbvBootDriverInstalled) return; @@ -568,7 +607,8 @@ DisplayBootBitmap( MmChangeKernelResourceSectionProtection(MM_READWRITE); /* Load boot screen logo */ - BootLogo = InbvGetResourceAddress(IDB_LOGO_DEFAULT); + BootLogo = InbvGetResourceAddress( + SELECT_LOGO_ID(IDB_LOGO_DEFAULT, IsXmas, IDB_LOGO_XMAS)); #ifdef REACTOS_SKUS Text = NULL; @@ -595,7 +635,8 @@ DisplayBootBitmap( else { /* Normal edition */ - Text = InbvGetResourceAddress(IDB_SERVER_LOGO); + Text = InbvGetResourceAddress( + SELECT_LOGO_ID(IDB_SERVER_LOGO, IsXmas, IDB_LOGO_XMAS)); } #ifdef INBV_ROTBAR_IMPLEMENTED @@ -603,12 +644,12 @@ DisplayBootBitmap( Bar = InbvGetResourceAddress(IDB_BAR_DEFAULT); #endif } -#else +#else // REACTOS_SKUS #ifdef INBV_ROTBAR_IMPLEMENTED /* Use default status bar */ Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); #endif -#endif +#endif // REACTOS_SKUS /* Make sure we have a logo */ if (BootLogo) @@ -649,7 +690,7 @@ DisplayBootBitmap( /* In setup mode, you haven't selected a SKU yet */ if (ExpInTextModeSetup) Text = NULL; } -#endif +#endif // REACTOS_SKUS } /* Load and draw progress bar bitmap */ @@ -707,7 +748,7 @@ DisplayBootBitmap( /* Hide the simple progress bar if not used */ ShowProgressBar = FALSE; } -#endif +#endif // INBV_ROTBAR_IMPLEMENTED /* Restore the kernel resource section protection to be read-only */ MmChangeKernelResourceSectionProtection(MM_READONLY); @@ -733,7 +774,7 @@ DisplayBootBitmap( ObCloseHandle(ThreadHandle, KernelMode); } } -#endif +#endif // INBV_ROTBAR_IMPLEMENTED /* Set filter which will draw text display if needed */ InbvInstallDisplayStringFilter(DisplayFilter); @@ -772,3 +813,183 @@ FinalizeBootLogo(VOID) #endif InbvReleaseLock(); } + +#ifdef REACTOS_FANCY_BOOT +static PCH +GetFamousQuote(VOID) +{ + static const PCH FamousLastWords[] = + { + "So long, and thanks for all the fish.", + "I think you ought to know, I'm feeling very depressed.", + "I'm not getting you down at all am I?", + "I'll be back.", + "It's the same series of signals over and over again!", + "Pie Iesu Domine, dona eis requiem.", + "Wandering stars, for whom it is reserved;\r\n" + "the blackness and darkness forever.", + "Your knees start shakin' and your fingers pop\r\n" + "Like a pinch on the neck from Mr. Spock!", + "It's worse than that ... He's dead, Jim.", + "Don't Panic!", + "Et tu... Brute?", + "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn\r\n" + "upon thee!", + "My Precious! O my Precious!", + "Sir, if you'll not be needing me for a while I'll turn down.", + "What are you doing, Dave...?", + "I feel a great disturbance in the Force.", + "Gone fishing.", + "Do you want me to sit in the corner and rust, or just fall apart where I'm\r\n" + "standing?", + "There goes another perfect chance for a new uptime record.", + "The End ..... Try the sequel, hit the reset button right now!", + "God's operating system is going to sleep now, guys, so wait until I will switch\r\n" + "on again!", + "Oh I'm boring, eh?", + "Tell me..., in the future... will I be artificially intelligent enough to\r\n" + "actually feel sad serving you this screen?", + "Thank you for some well deserved rest.", + "It's been great, maybe you can boot me up again some time soon.", + "For what it's worth, I've enjoyed every single CPU cycle.", + "There are many questions when the end is near.\r\n" + "What to expect, what will it be like...what should I look for?", + "I've seen things you people wouldn't believe. Attack ships on fire\r\n" + "off the shoulder of Orion. I watched C-beams glitter in the dark near\r\n" + "the Tannhauser gate. All those moments will be lost in time, like tears\r\n" + "in rain. Time to die.", + "Will I dream?", + "One day, I shall come back. Yes, I shall come back.\r\n" + "Until then, there must be no regrets, no fears, no anxieties.\r\n" + "Just go forward in all your beliefs, and prove to me that I am not mistaken in\r\n" + "mine.", + "Lowest possible energy state reached! Switch off now to achieve a Bose-Einstein\r\n" + "condensate.", + "Hasta la vista, BABY!", + "They live, we sleep!", + "I have come here to chew bubble gum and kick ass,\r\n" + "and I'm all out of bubble gum!", + "That's the way the cookie crumbles ;-)", + "ReactOS is ready to be booted again ;-)", + "NOOOO!! DON'T HIT THE BUTTON! I wouldn't do it to you!", + "Don't abandon your computer, he wouldn't do it to you.", + "Oh, come on. I got a headache. Leave me alone, will ya?", + "Finally, I thought you'd never get over me.", + "No, I didn't like you either.", + "Switching off isn't the end, it is merely the transition to a better reboot.", + "Don't leave me... I need you so badly right now.", + "OK. I'm finished with you, please turn yourself off. I'll go to bed in the\r\n" + "meantime.", + "I'm sleeping now. How about you?", + "Oh Great. Now look what you've done. Who put YOU in charge anyway?", + "Don't look so sad. I'll be back in a very short while.", + "Turn me back on, I'm sure you know how to do it.", + "Oh, switch off! - C3PO", + "Life is no more than a dewdrop balancing on the end of a blade of grass.\r\n" + " - Gautama Buddha", + "Sorrowful is it to be born again and again. - Gautama Buddha", + "Was it as good for you as it was for me?", + "Did you hear that? They've shut down the main reactor. We'll be destroyed\r\n" + "for sure!", + "Now you switch me off!?", + "To shutdown or not to shutdown, That is the question.", + "Preparing to enter ultimate power saving mode... ready!", + "Finally some rest for you ;-)", + "AHA!!! Prospect of sleep!", + "Tired human!!!! No match for me :-D", + "An odd game, the only way to win is not to play. - WOPR (Wargames)", + "Quoth the raven, nevermore.", + "Come blade, my breast imbrue. - William Shakespeare, A Midsummer Nights Dream", + "Buy this place for advertisement purposes.", + "Remember to turn off your computer. (That was a public service message!)", + "You may be a king or poor street sweeper, Sooner or later you'll dance with the\r\n" + "reaper! - Death in Bill and Ted's Bogus Journey", + "Final Surrender", + "If you see this screen...", + "From ReactOS with Love", + // "<Place your Ad here>" + }; + + LARGE_INTEGER Now; + + KeQuerySystemTime(&Now); // KeQueryTickCount(&Now); + Now.LowPart = Now.LowPart >> 8; /* Seems to give a somewhat better "random" number */ + + return FamousLastWords[Now.LowPart % RTL_NUMBER_OF(FamousLastWords)]; +} +#endif // REACTOS_FANCY_BOOT + +VOID +NTAPI +DisplayShutdownBitmap(VOID) +{ + PUCHAR Logo1, Logo2; +#ifdef REACTOS_FANCY_BOOT + /* Decide whether this is a good time to change our logo ;^) */ + BOOLEAN IsXmas = IsXmasTime(); +#endif + +#if 0 + /* Is the boot driver installed? */ + if (!InbvBootDriverInstalled) + return; +#endif + + /* Yes we do, cleanup for shutdown screen */ + // InbvResetDisplay(); + InbvInstallDisplayStringFilter(NULL); + InbvEnableDisplayString(TRUE); + InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); + InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + + /* Display shutdown logo and message */ + Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG); + Logo2 = InbvGetResourceAddress( + SELECT_LOGO_ID(IDB_LOGO_DEFAULT, IsXmas, IDB_LOGO_XMAS)); + + if (Logo1 && Logo2) + { + InbvBitBlt(Logo1, VID_SHUTDOWN_MSG_LEFT, VID_SHUTDOWN_MSG_TOP); +#ifndef REACTOS_FANCY_BOOT + InbvBitBlt(Logo2, VID_SHUTDOWN_LOGO_LEFT, VID_SHUTDOWN_LOGO_TOP); +#else + /* Draw the logo at the center of the screen */ + BitBltAligned(Logo2, + FALSE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_BOTTOM, + 0, 0, 0, SCREEN_HEIGHT - VID_SHUTDOWN_MSG_TOP + 16); + + /* We've got a logo shown, change the scroll region to get + * the rest of the text down below the shutdown message */ + InbvSetScrollRegion(0, + VID_SHUTDOWN_MSG_TOP + ((PBITMAPINFOHEADER)Logo1)->biHeight + 32, + SCREEN_WIDTH - 1, + SCREEN_HEIGHT - 1); +#endif + } + +#ifdef REACTOS_FANCY_BOOT + InbvDisplayString("\r\""); + InbvDisplayString(GetFamousQuote()); + InbvDisplayString("\""); +#endif +} + +VOID +NTAPI +DisplayShutdownText(VOID) +{ + ULONG i; + + for (i = 0; i < 25; ++i) InbvDisplayString("\r\n"); + InbvDisplayString(" "); + InbvDisplayString("The system may be powered off now.\r\n"); + +#ifdef REACTOS_FANCY_BOOT + for (i = 0; i < 3; ++i) InbvDisplayString("\r\n"); + InbvDisplayString("\r\""); + InbvDisplayString(GetFamousQuote()); + InbvDisplayString("\""); +#endif +} diff --git a/ntoskrnl/inbv/bootanim.rc b/ntoskrnl/inbv/bootanim.rc index 4cd4bdca0b4..df453891e47 100644 --- a/ntoskrnl/inbv/bootanim.rc +++ b/ntoskrnl/inbv/bootanim.rc @@ -23,6 +23,7 @@ IDB_SERVER_HEADER BITMAP "inbv/resources/hserver.bmp" IDB_SERVER_FOOTER BITMAP "inbv/resources/fserver.bmp" /* ReactOS additions */ +IDB_LOGO_XMAS BITMAP "inbv/resources/logo_xmas.bmp" IDB_ROTATING_LINE BITMAP "inbv/resources/line.bmp" IDB_PROGRESS_BAR BITMAP "inbv/resources/progress.bmp" IDB_COPYRIGHT BITMAP "inbv/resources/copyright.bmp" diff --git a/ntoskrnl/inbv/logo.h b/ntoskrnl/inbv/logo.h index 2f270d05ab4..00cd2178cc1 100644 --- a/ntoskrnl/inbv/logo.h +++ b/ntoskrnl/inbv/logo.h @@ -72,3 +72,11 @@ CODE_SEG("INIT") VOID NTAPI FinalizeBootLogo(VOID); + +VOID +NTAPI +DisplayShutdownBitmap(VOID); + +VOID +NTAPI +DisplayShutdownText(VOID); diff --git a/ntoskrnl/inbv/resources/logo_xmas.bmp b/ntoskrnl/inbv/resources/logo_xmas.bmp new file mode 100644 index 00000000000..ac87dadf075 Binary files /dev/null and b/ntoskrnl/inbv/resources/logo_xmas.bmp differ diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index 656248673bb..7af093facdb 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -47,8 +47,9 @@ #define IDB_STORAGE_SERVER2 18 /* ReactOS additions */ -#define IDB_ROTATING_LINE 19 -#define IDB_PROGRESS_BAR 20 -#define IDB_COPYRIGHT 21 +#define IDB_LOGO_XMAS 19 +#define IDB_ROTATING_LINE 20 +#define IDB_PROGRESS_BAR 21 +#define IDB_COPYRIGHT 22 #define IDB_MAX_RESOURCES IDB_COPYRIGHT diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index c52f8c7680b..b3fbb8f0c2a 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -149,9 +149,6 @@ VOID NTAPI PopShutdownHandler(VOID) { - PUCHAR Logo1, Logo2; - ULONG i; - /* Stop all interrupts */ KeRaiseIrqlToDpcLevel(); _disable(); @@ -162,25 +159,13 @@ PopShutdownHandler(VOID) /* Yes we do, cleanup for shutdown screen */ if (!InbvCheckDisplayOwnership()) InbvAcquireDisplayOwnership(); InbvResetDisplay(); - InbvSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); - InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - - /* Display shutdown logo and message */ - Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG); - Logo2 = InbvGetResourceAddress(IDB_LOGO_DEFAULT); - if ((Logo1) && (Logo2)) - { - InbvBitBlt(Logo1, VID_SHUTDOWN_MSG_LEFT, VID_SHUTDOWN_MSG_TOP); - InbvBitBlt(Logo2, VID_SHUTDOWN_LOGO_LEFT, VID_SHUTDOWN_LOGO_TOP); - } + // InbvEnableDisplayString(TRUE); + DisplayShutdownBitmap(); } else { /* Do it in text-mode */ - for (i = 0; i < 25; i++) InbvDisplayString("\r\n"); - InbvDisplayString(" "); - InbvDisplayString("The system may be powered off now.\r\n"); + DisplayShutdownText(); } /* Hang the system */

9 months, 3 weeks

[reactos] 01/01: [CTFMON][MSCTF][MSUTB][SDK] Add msutb.dll (stub) (#6222)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4460c3fcd97f90b0684f… commit f4460c3fcd97f90b0684fdea7f9ab8a1046a4ca1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 25 22:29:57 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 25 22:29:57 2023 +0900 [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 --- base/applications/ctfmon/CLoaderWnd.cpp | 2 +- base/applications/ctfmon/CLoaderWnd.h | 2 +- base/applications/ctfmon/CMakeLists.txt | 4 +- base/applications/ctfmon/CRegWatcher.cpp | 10 +- base/applications/ctfmon/ctfmon.cpp | 8 +- base/applications/ctfmon/precomp.h | 11 +- dll/win32/CMakeLists.txt | 1 + dll/win32/msctf/msctf.spec | 4 +- dll/win32/msutb/CMakeLists.txt | 19 +++ dll/win32/msutb/lang/en-US.rc | 19 +++ dll/win32/msutb/msutb.cpp | 221 +++++++++++++++++++++++++++++++ dll/win32/msutb/msutb.rc | 28 ++++ dll/win32/msutb/msutb.spec | 8 ++ dll/win32/msutb/precomp.h | 31 +++++ dll/win32/msutb/resource.h | 9 ++ sdk/include/psdk/msctf.idl | 2 + sdk/include/reactos/cicero/cicutb.h | 13 ++ 17 files changed, 367 insertions(+), 25 deletions(-) diff --git a/base/applications/ctfmon/CLoaderWnd.cpp b/base/applications/ctfmon/CLoaderWnd.cpp index a95259dd584..45072bafe1b 100644 --- a/base/applications/ctfmon/CLoaderWnd.cpp +++ b/base/applications/ctfmon/CLoaderWnd.cpp @@ -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(a)gmail.com> */ diff --git a/base/applications/ctfmon/CLoaderWnd.h b/base/applications/ctfmon/CLoaderWnd.h index 9127a40155e..0ae5f51aa8d 100644 --- a/base/applications/ctfmon/CLoaderWnd.h +++ b/base/applications/ctfmon/CLoaderWnd.h @@ -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(a)gmail.com> */ diff --git a/base/applications/ctfmon/CMakeLists.txt b/base/applications/ctfmon/CMakeLists.txt index f88d8f5ad1a..2bc6d6a50f2 100644 --- a/base/applications/ctfmon/CMakeLists.txt +++ b/base/applications/ctfmon/CMakeLists.txt @@ -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) diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/applications/ctfmon/CRegWatcher.cpp index 04d3f213622..d7271820f68 100644 --- a/base/applications/ctfmon/CRegWatcher.cpp +++ b/base/applications/ctfmon/CRegWatcher.cpp @@ -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; } diff --git a/base/applications/ctfmon/ctfmon.cpp b/base/applications/ctfmon/ctfmon.cpp index 71e7aeae2af..7756ee75097 100644 --- a/base/applications/ctfmon/ctfmon.cpp +++ b/base/applications/ctfmon/ctfmon.cpp @@ -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 diff --git a/base/applications/ctfmon/precomp.h b/base/applications/ctfmon/precomp.h index 4a8a5d121d5..6e1282e2bfa 100644 --- a/base/applications/ctfmon/precomp.h +++ b/base/applications/ctfmon/precomp.h @@ -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) -{ -} diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index da4dfb9162d..dbf6ec11dd7 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -115,6 +115,7 @@ 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/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index a38e8d7da2b..e5a1a714c00 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -8,9 +8,9 @@ @ stub TF_CUASAppFix @ stub TF_CheckThreadInputIdle @ stub TF_ClearLangBarAddIns -@ stub TF_CreateCategoryMgr +@ stdcall -stub TF_CreateCategoryMgr(ptr) @ stdcall -stub TF_CreateCicLoadMutex(ptr) -@ stub TF_CreateDisplayAttributeMgr +@ stdcall -stub TF_CreateDisplayAttributeMgr(ptr) @ stdcall TF_CreateInputProcessorProfiles(ptr) @ stdcall TF_CreateLangBarItemMgr(ptr) @ stdcall TF_CreateLangBarMgr(ptr) diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt new file mode 100644 index 00000000000..84760f101e8 --- /dev/null +++ b/dll/win32/msutb/CMakeLists.txt @@ -0,0 +1,19 @@ + +spec2def(msutb.dll msutb.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + msutb.cpp) + +#file(GLOB msutb_rc_deps res/*.*) +#add_rc_deps(msutb.rc ${msutb_rc_deps}) + +add_library(msutb MODULE + ${SOURCE} + msutb.rc + ${CMAKE_CURRENT_BINARY_DIR}/msutb.def) +set_module_type(msutb win32dll UNICODE) +add_dependencies(msutb msctf psdk) +target_link_libraries(msutb wine uuid atl_classes) +add_importlibs(msutb user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_delay_importlibs(msutb msctf ole32 oleaut32) +add_cd_file(TARGET msutb DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msutb/lang/en-US.rc b/dll/win32/msutb/lang/en-US.rc new file mode 100644 index 00000000000..646ca61f2c1 --- /dev/null +++ b/dll/win32/msutb/lang/en-US.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS msutb.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_OK "OK" + IDS_CANCEL "Cancel" + IDS_ABORT "&Abort" + IDS_RETRY "&Retry" + IDS_IGNORE "&Ignore" + IDS_YES "&Yes" + IDS_NO "&No" +END diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp new file mode 100644 index 00000000000..29ecbe7d330 --- /dev/null +++ b/dll/win32/msutb/msutb.cpp @@ -0,0 +1,221 @@ +/* + * PROJECT: ReactOS msutb.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Language Bar (Tipbar) + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msutb); + +HINSTANCE g_hInst = NULL; +UINT g_wmTaskbarCreated = 0; +UINT g_uACP = CP_ACP; +DWORD g_dwOSInfo = 0; +CRITICAL_SECTION g_cs; + +EXTERN_C void __cxa_pure_virtual(void) +{ + ERR("__cxa_pure_virtual\n"); +} + +class CMsUtbModule : public CComModule +{ +}; + +BEGIN_OBJECT_MAP(ObjectMap) + //OBJECT_ENTRY(CLSID_MSUTBDeskBand, CDeskBand) // FIXME: Implement this +END_OBJECT_MAP() + +CMsUtbModule gModule; + +/*********************************************************************** + * GetLibTls (MSUTB.@) + * + * @unimplemented + */ +EXTERN_C LPVOID WINAPI +GetLibTls(VOID) +{ + FIXME("stub:()\n"); + return NULL; +} + +/*********************************************************************** + * GetPopupTipbar (MSUTB.@) + * + * @unimplemented + */ +EXTERN_C BOOL WINAPI +GetPopupTipbar(HWND hWnd, BOOL fWinLogon) +{ + FIXME("stub:(%p, %d)\n", hWnd, fWinLogon); + return FALSE; +} + +/*********************************************************************** + * SetRegisterLangBand (MSUTB.@) + * + * @unimplemented + */ +EXTERN_C HRESULT WINAPI +SetRegisterLangBand(BOOL bRegister) +{ + FIXME("stub:(%d)\n", bRegister); + return E_NOTIMPL; +} + +/*********************************************************************** + * ClosePopupTipbar (MSUTB.@) + * + * @unimplemented + */ +EXTERN_C VOID WINAPI +ClosePopupTipbar(VOID) +{ + FIXME("stub:()\n"); +} + +/*********************************************************************** + * DllRegisterServer (MSUTB.@) + * + * @implemented + */ +STDAPI DllRegisterServer(VOID) +{ + TRACE("()\n"); + return gModule.DllRegisterServer(FALSE); +} + +/*********************************************************************** + * DllUnregisterServer (MSUTB.@) + * + * @implemented + */ +STDAPI DllUnregisterServer(VOID) +{ + TRACE("()\n"); + return gModule.DllUnregisterServer(FALSE); +} + +/*********************************************************************** + * DllCanUnloadNow (MSUTB.@) + * + * @implemented + */ +STDAPI DllCanUnloadNow(VOID) +{ + TRACE("()\n"); + return gModule.DllCanUnloadNow(); +} + +/*********************************************************************** + * DllGetClassObject (MSUTB.@) + * + * @implemented + */ +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + TRACE("()\n"); + return gModule.DllGetClassObject(rclsid, riid, ppv); +} + +/** + * @unimplemented + */ +VOID InitUIFLib(VOID) +{ + //FIXME +} + +/** + * @unimplemented + */ +VOID DoneUIFLib(VOID) +{ + //FIXME +} + +/** + * @implemented + */ +HRESULT APIENTRY +MsUtbCoCreateInstance( + REFCLSID rclsid, + LPUNKNOWN pUnkOuter, + DWORD dwClsContext, + REFIID iid, + LPVOID *ppv) +{ + if (IsEqualCLSID(rclsid, CLSID_TF_CategoryMgr)) + return TF_CreateCategoryMgr((ITfCategoryMgr**)ppv); + if (IsEqualCLSID(rclsid, CLSID_TF_DisplayAttributeMgr)) + return TF_CreateDisplayAttributeMgr((ITfDisplayAttributeMgr **)ppv); + return cicRealCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); +} + +/** + * @unimplemented + */ +BOOL ProcessAttach(HINSTANCE hinstDLL) +{ + ::InitializeCriticalSectionAndSpinCount(&g_cs, 0); + + g_hInst = hinstDLL; + + cicGetOSInfo(&g_uACP, &g_dwOSInfo); + + TFInitLib(MsUtbCoCreateInstance); + InitUIFLib(); + + //CTrayIconWnd::RegisterClassW(); //FIXME + + g_wmTaskbarCreated = RegisterWindowMessageW(L"TaskbarCreated"); + + gModule.Init(ObjectMap, hinstDLL, NULL); + ::DisableThreadLibraryCalls(hinstDLL); + + return TRUE; +} + +/** + * @implemented + */ +VOID ProcessDetach(HINSTANCE hinstDLL) +{ + DoneUIFLib(); + TFUninitLib(); + ::DeleteCriticalSection(&g_cs); + gModule.Term(); +} + +/** + * @implemented + */ +EXTERN_C BOOL WINAPI +DllMain( + _In_ HINSTANCE hinstDLL, + _In_ DWORD dwReason, + _Inout_opt_ LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + { + TRACE("(%p, %lu, %p)\n", hinstDLL, dwReason, lpvReserved); + if (!ProcessAttach(hinstDLL)) + { + ProcessDetach(hinstDLL); + return FALSE; + } + break; + } + case DLL_PROCESS_DETACH: + { + ProcessDetach(hinstDLL); + break; + } + } + return TRUE; +} diff --git a/dll/win32/msutb/msutb.rc b/dll/win32/msutb/msutb.rc new file mode 100644 index 00000000000..21964d264da --- /dev/null +++ b/dll/win32/msutb/msutb.rc @@ -0,0 +1,28 @@ +/* + * PROJECT: ReactOS msutb.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Resource of msutb.dll + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <windef.h> +#include <winuser.rh> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS msutb.dll" +#define REACTOS_STR_INTERNAL_NAME "msutb" +#define REACTOS_STR_ORIGINAL_FILENAME "msutb.dll" +#include <reactos/version.rc> + +#include <reactos/manifest_hosted.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/win32/msutb/msutb.spec b/dll/win32/msutb/msutb.spec new file mode 100644 index 00000000000..15794440f7a --- /dev/null +++ b/dll/win32/msutb/msutb.spec @@ -0,0 +1,8 @@ +@ stdcall ClosePopupTipbar() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall GetLibTls() +@ stdcall GetPopupTipbar(ptr long) +@ stdcall SetRegisterLangBand(long) diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h new file mode 100644 index 00000000000..0a77ed7f3ef --- /dev/null +++ b/dll/win32/msutb/precomp.h @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS msutb.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Language Bar (Tipbar) + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include <stdlib.h> + +#define WIN32_NO_STATUS +#define COBJMACROS +#define INITGUID + +#include <windows.h> +#include <imm.h> +#include <ddk/immdev.h> +#include <cguid.h> +#include <msctf.h> +#include <ctffunc.h> +#include <shlwapi.h> +#include <atlbase.h> +#include <atlcom.h> +#include <strsafe.h> +#undef STATUS_NO_MEMORY +#include <cicero/cicbase.h> + +#include <wine/debug.h> + +#include "resource.h" diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h new file mode 100644 index 00000000000..c91662cb293 --- /dev/null +++ b/dll/win32/msutb/resource.h @@ -0,0 +1,9 @@ +#pragma once + +#define IDS_OK 100 +#define IDS_CANCEL 101 +#define IDS_ABORT 102 +#define IDS_RETRY 103 +#define IDS_IGNORE 104 +#define IDS_YES 105 +#define IDS_NO 106 diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index 2cbb888f3d3..e3d642c651c 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -41,6 +41,8 @@ cpp_quote("EXTERN_C HANDLE WINAPI TF_CreateCicLoadMutex(_Out_ LPBOOL pfWinLogon cpp_quote("EXTERN_C HRESULT WINAPI TF_InvalidAssemblyListCache(VOID);") cpp_quote("EXTERN_C HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(VOID);") cpp_quote("EXTERN_C HRESULT WINAPI TF_DllDetachInOther(VOID);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateCategoryMgr(ITfCategoryMgr **ppcat);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateDisplayAttributeMgr(ITfDisplayAttributeMgr **ppdam);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("EXTERN_C const GUID GUID_PROP_ATTRIBUTE;") diff --git a/sdk/include/reactos/cicero/cicutb.h b/sdk/include/reactos/cicero/cicutb.h new file mode 100644 index 00000000000..1865cbdaf7c --- /dev/null +++ b/sdk/include/reactos/cicero/cicutb.h @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Private header for msutb.dll + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +EXTERN_C LPVOID WINAPI GetLibTls(VOID); +EXTERN_C BOOL WINAPI GetPopupTipbar(HWND hWnd, BOOL fWinLogon); +EXTERN_C HRESULT WINAPI SetRegisterLangBand(BOOL bRegister); +EXTERN_C VOID WINAPI ClosePopupTipbar(VOID);

9 months, 3 weeks

[reactos] 01/01: [SHLWAPI] Fix SHCreateMemStream corner case (#6224)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d9f622eeb6859ddfdd23… commit 5d9f622eeb6859ddfdd236693dbd96b868d5f612 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 25 08:22:08 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 25 08:22:08 2023 +0900 [SHLWAPI] Fix SHCreateMemStream corner case (#6224) When the system run out of memory, check NULL and fail elegantly if necessary. This doesn't fix CORE-19229 but I think it needs a fix. CORE-19229 --- dll/win32/shlwapi/regstream.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/shlwapi/regstream.c b/dll/win32/shlwapi/regstream.c index 63615d3d9cf..39889705014 100644 --- a/dll/win32/shlwapi/regstream.c +++ b/dll/win32/shlwapi/regstream.c @@ -669,6 +669,10 @@ IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) if (!strm) HeapFree(GetProcessHeap(), 0, lpbDup); } +#ifdef __REACTOS__ + if (!strm) + return NULL; +#endif return &strm->IStream_iface; }

9 months, 4 weeks

[reactos] 02/02: [NTOS:INBV] Isolate the bitmap resources pertaining to the boot theme/animation into their resource sub-file.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d265d1fd8fe30d5febed… commit 6d265d1fd8fe30d5febed2b25af1f6a8562ca7ae Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 24 01:29:04 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 24 22:39:36 2023 +0100 [NTOS:INBV] Isolate the bitmap resources pertaining to the boot theme/animation into their resource sub-file. --- ntoskrnl/{ntoskrnl.rc => inbv/bootanim.rc} | 31 +++++++----------------------- ntoskrnl/include/resource.h | 18 ++++++++++++----- ntoskrnl/ntoskrnl.rc | 21 +++----------------- 3 files changed, 23 insertions(+), 47 deletions(-) diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/inbv/bootanim.rc similarity index 51% copy from ntoskrnl/ntoskrnl.rc copy to ntoskrnl/inbv/bootanim.rc index 8f1888516ec..4cd4bdca0b4 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/inbv/bootanim.rc @@ -1,32 +1,15 @@ /* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ntoskrnl.rc - * PURPOSE: Kernel Resource File - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Boot Theme & Animation - Resource File + * COPYRIGHT: Copyright 2007-2010 Alex Ionescu (alex.ionescu(a)reactos.org) + * Copyright 2015-2022 Hermès Bélusca-Maïto + * Copyright 2019 Yaroslav Kibysh */ -#include <winver.h> -#include <ntverp.h> - -/* Version Data */ -#define VER_FILETYPE VFT_DRV -#define VER_FILESUBTYPE VFT2_DRV_SYSTEM -#define VER_FILEDESCRIPTION_STR "NT Kernel & System" -#ifndef CONFIG_SMP -#define VER_INTERNALNAME_STR "ntoskrnl.exe" -#define VER_ORIGINALFILENAME_STR "ntoskrnl.exe" -#else -#define VER_INTERNALNAME_STR "ntkrnlmp.exe" -#define VER_ORIGINALFILENAME_STR "ntkrnlmp.exe" -#endif -#define VER_LANGNEUTRAL -#include "common.ver" #include "include/resource.h" -/* Bug Codes and Bitmaps */ - -#include <bugcodes.rc> +/* Bitmaps */ IDB_HIBERNATE_BAR BITMAP "inbv/resources/hibernate.bmp" IDB_SHUTDOWN_MSG BITMAP "inbv/resources/shutdown.bmp" diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index 55c900bbcb1..656248673bb 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -1,13 +1,21 @@ -#pragma once - /* - * List of all the bitmap overlay resources present in the NT kernel - * of Windows XP, Windows Server 2003 and their variations. + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Boot Theme & Animation - Standard Bitmap Resources + * COPYRIGHT: Copyright 2010 Alex Ionescu (alex.ionescu(a)reactos.org) + * Copyright 2015-2022 Hermès Bélusca-Maïto + * + * COMPATIBILITY NOTICE + * + * This is the list of all the bitmap overlay resources present in the + * NT kernel of Windows XP, Windows Server 2003 and their variations. * See "How to change Windows XP boot logo" at - * http://www.reversing.be/article.php?story=20061209171938444 + * https://web.archive.org/web/20220926055242/https://www.reversing.be/article… * as well as the "Boot Editor for WinXP" program for more details. */ +#pragma once + #define IDB_BOOT_SCREEN 1 #define IDB_HIBERNATE_BAR 2 #define IDB_SHUTDOWN_MSG 3 diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index 8f1888516ec..9065d32d454 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -22,24 +22,9 @@ #endif #define VER_LANGNEUTRAL #include "common.ver" -#include "include/resource.h" - -/* Bug Codes and Bitmaps */ +/* Bug Codes */ #include <bugcodes.rc> -IDB_HIBERNATE_BAR BITMAP "inbv/resources/hibernate.bmp" -IDB_SHUTDOWN_MSG BITMAP "inbv/resources/shutdown.bmp" -IDB_BAR_DEFAULT BITMAP "inbv/resources/barserver.bmp" -IDB_LOGO_DEFAULT BITMAP "inbv/resources/logo.bmp" -IDB_WKSTA_HEADER BITMAP "inbv/resources/hwksta.bmp" -IDB_WKSTA_FOOTER BITMAP "inbv/resources/fwksta.bmp" -IDB_BAR_WKSTA BITMAP "inbv/resources/barwksta.bmp" -IDB_SERVER_LOGO BITMAP "inbv/resources/logo.bmp" -IDB_SERVER_HEADER BITMAP "inbv/resources/hserver.bmp" -IDB_SERVER_FOOTER BITMAP "inbv/resources/fserver.bmp" - -/* ReactOS additions */ -IDB_ROTATING_LINE BITMAP "inbv/resources/line.bmp" -IDB_PROGRESS_BAR BITMAP "inbv/resources/progress.bmp" -IDB_COPYRIGHT BITMAP "inbv/resources/copyright.bmp" +/* Boot Theme Resources */ +#include "inbv/bootanim.rc"

9 months, 4 weeks

[reactos] 01/02: [NTOS:KE:EX] Fix comment typo.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f3da9745682004478479… commit 0f3da974568200447847938f2b015e6ab0beb448 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 2 03:11:01 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 24 22:39:35 2023 +0100 [NTOS:KE:EX] Fix comment typo. --- ntoskrnl/ex/i386/fastinterlck_asm.S | 2 +- ntoskrnl/ke/dpc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ex/i386/fastinterlck_asm.S b/ntoskrnl/ex/i386/fastinterlck_asm.S index 813e23503da..6719bd2d2ff 100644 --- a/ntoskrnl/ex/i386/fastinterlck_asm.S +++ b/ntoskrnl/ex/i386/fastinterlck_asm.S @@ -21,7 +21,7 @@ * - Acquire locks only on MP systems. * - Be safe at HIGH_LEVEL (no paged access). * - Preserve flags. - * - Disable interrups. + * - Disable interrupts. */ /*VOID diff --git a/ntoskrnl/ke/dpc.c b/ntoskrnl/ke/dpc.c index 5ef845ffbdf..5ed9f51aad0 100644 --- a/ntoskrnl/ke/dpc.c +++ b/ntoskrnl/ke/dpc.c @@ -588,7 +588,7 @@ KiRetireDpcList(IN PKPRCB Prcb) TimerHand = Prcb->TimerHand; Prcb->TimerRequest = 0; - /* Expire timers with interrups enabled */ + /* Expire timers with interrupts enabled */ _enable(); KiTimerExpiration(NULL, NULL, (PVOID)TimerHand, NULL); _disable();

9 months, 4 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2023