Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSCTF][SDK] Implement TF_RegisterLangBarAddIn etc. (#6229)
by Katayama Hirofumi MZ 26 Dec '23

26 Dec '23

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); +}

1 0

[reactos] 01/01: [NTOS:INBV:PO] Consolidate shutdown logo routines where all the boot theming is implemented.
by Hermès Bélusca-Maïto 25 Dec '23

25 Dec '23

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 */

1 0

[reactos] 01/01: [CTFMON][MSCTF][MSUTB][SDK] Add msutb.dll (stub) (#6222)
by Katayama Hirofumi MZ 25 Dec '23

25 Dec '23

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);

1 0

[reactos] 01/01: [SHLWAPI] Fix SHCreateMemStream corner case (#6224)
by Katayama Hirofumi MZ 24 Dec '23

24 Dec '23

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; }

1 0

[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 24 Dec '23

24 Dec '23

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"

1 0

[reactos] 01/02: [NTOS:KE:EX] Fix comment typo.
by Hermès Bélusca-Maïto 24 Dec '23

24 Dec '23

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();

1 0

[reactos] 03/03: [NTOS:INBV] Don't hardcode the off-screen rot-bar-bits buffer size.
by Hermès Bélusca-Maïto 24 Dec '23

24 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b410fb8cadb8184cdf25… commit 7b410fb8cadb8184cdf25272148812ab979b5cf0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 2 01:26:48 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 24 21:54:24 2023 +0100 [NTOS:INBV] Don't hardcode the off-screen rot-bar-bits buffer size. --- ntoskrnl/inbv/bootanim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/inbv/bootanim.c b/ntoskrnl/inbv/bootanim.c index 68351e6de9b..bc8b9a3960c 100644 --- a/ntoskrnl/inbv/bootanim.c +++ b/ntoskrnl/inbv/bootanim.c @@ -476,7 +476,7 @@ DisplayBootBitmap( PVOID BootCopy = NULL, BootProgress = NULL, BootLogo = NULL, Header = NULL, Footer = NULL; #ifdef INBV_ROTBAR_IMPLEMENTED - UCHAR Buffer[24 * 9]; + UCHAR Buffer[RTL_NUMBER_OF(RotBarBuffer)]; PVOID Bar = NULL, LineBmp = NULL; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; NTSTATUS Status;

1 0

[reactos] 02/03: [NTOS:INBV] Improve comment & define name.
by Hermès Bélusca-Maïto 24 Dec '23

24 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81dc30a434b251420fd9b… commit 81dc30a434b251420fd9b972d165caed8dcb6c88 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 2 02:48:46 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 24 21:54:23 2023 +0100 [NTOS:INBV] Improve comment & define name. --- ntoskrnl/ex/init.c | 4 ++-- ntoskrnl/inbv/inbv.c | 2 +- ntoskrnl/include/resource.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 734960a206a..0bbda8a62cd 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1389,9 +1389,9 @@ Phase1InitializationDiscard(IN PVOID Context) /* Get the SOS setting */ SosEnabled = (CommandLine && strstr(CommandLine, "SOS") != NULL); - /* Setup the boot driver */ + /* Setup the boot video driver */ InbvEnableBootDriver(!NoGuiBoot); - InbvDriverInitialize(LoaderBlock, IDB_MAX_RESOURCE); + InbvDriverInitialize(LoaderBlock, IDB_MAX_RESOURCES); /* Check if GUI boot is enabled */ if (!NoGuiBoot) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 69f40d5444c..9c51098284f 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -48,7 +48,7 @@ static INBV_PROGRESS_STATE InbvProgressState; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; static ULONG ResourceCount = 0; -static PUCHAR ResourceList[1 + IDB_MAX_RESOURCE]; // First entry == NULL, followed by 'ResourceCount' entries. +static PUCHAR ResourceList[1 + IDB_MAX_RESOURCES]; // First entry == NULL, followed by 'ResourceCount' entries. /* diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index e2537b465f5..55c900bbcb1 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -43,4 +43,4 @@ #define IDB_PROGRESS_BAR 20 #define IDB_COPYRIGHT 21 -#define IDB_MAX_RESOURCE IDB_COPYRIGHT +#define IDB_MAX_RESOURCES IDB_COPYRIGHT

1 0

[reactos] 01/03: [NTOS:INBV] Minor code style.
by Hermès Bélusca-Maïto 24 Dec '23

24 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7aec73a76cb22a5a899a6… commit 7aec73a76cb22a5a899a61de1930ad503cc06dbf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 2 03:11:41 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 24 21:54:16 2023 +0100 [NTOS:INBV] Minor code style. --- ntoskrnl/inbv/bootanim.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/inbv/bootanim.c b/ntoskrnl/inbv/bootanim.c index 331825315b2..68351e6de9b 100644 --- a/ntoskrnl/inbv/bootanim.c +++ b/ntoskrnl/inbv/bootanim.c @@ -28,13 +28,6 @@ */ // #define REACTOS_SKUS -typedef enum _ROT_BAR_TYPE -{ - RB_UNSPECIFIED, - RB_SQUARE_CELLS, - RB_PROGRESS_BAR -} ROT_BAR_TYPE; - /* * BitBltAligned() alignments */ @@ -81,6 +74,13 @@ typedef enum _ROT_BAR_STATUS RBS_STATUS_MAX } ROT_BAR_STATUS; +typedef enum _ROT_BAR_TYPE +{ + RB_UNSPECIFIED, + RB_SQUARE_CELLS, + RB_PROGRESS_BAR +} ROT_BAR_TYPE; + static BOOLEAN RotBarThreadActive = FALSE; static ROT_BAR_TYPE RotBarSelection = RB_UNSPECIFIED; static ROT_BAR_STATUS PltRotBarStatus = 0; @@ -346,6 +346,8 @@ InbvRotationThread( ULONG X, Y, Index, Total; LARGE_INTEGER Delay = {{0}}; + UNREFERENCED_PARAMETER(Context); + InbvAcquireLock(); if (RotBarSelection == RB_SQUARE_CELLS) { @@ -378,7 +380,7 @@ InbvRotationThread( if (RotBarSelection == RB_SQUARE_CELLS) { - Delay.QuadPart = -800000; // 80 ms + Delay.QuadPart = -800000LL; // 80 ms Total = 18; Index %= Total; @@ -409,7 +411,7 @@ InbvRotationThread( } else if (RotBarSelection == RB_PROGRESS_BAR) { - Delay.QuadPart = -600000; // 60 ms + Delay.QuadPart = -600000LL; // 60 ms Total = SCREEN_WIDTH; Index %= Total;

1 0

[reactos] 02/02: [BOOTVID] Fix definition of GetFontPtr().
by Hermès Bélusca-Maïto 24 Dec '23

24 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b956a0a1fd859db6b966… commit 7b956a0a1fd859db6b96666ff34309ed09c08bef Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Apr 28 03:08:57 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 24 21:41:09 2023 +0100 [BOOTVID] Fix definition of GetFontPtr(). --- drivers/base/bootvid/precomp.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/base/bootvid/precomp.h b/drivers/base/bootvid/precomp.h index c3c40a397be..d8ffc0306c9 100644 --- a/drivers/base/bootvid/precomp.h +++ b/drivers/base/bootvid/precomp.h @@ -61,18 +61,18 @@ extern const RGBQUAD VidpDefaultPalette[BV_MAX_COLORS]; #define RGB(r, g, b) ((RGBQUAD)(((UCHAR)(b) | ((USHORT)((UCHAR)(g))<<8)) | (((ULONG)(UCHAR)(r))<<16))) -#define GetRValue(quad) ((UCHAR)(((quad)>>16) & 0xFF)) -#define GetGValue(quad) ((UCHAR)(((quad)>>8) & 0xFF)) -#define GetBValue(quad) ((UCHAR)((quad) & 0xFF)) +#define GetRValue(quad) ((UCHAR)(((quad)>>16) & 0xFF)) +#define GetGValue(quad) ((UCHAR)(((quad)>>8) & 0xFF)) +#define GetBValue(quad) ((UCHAR)((quad) & 0xFF)) -#define InitializePalette() InitPaletteWithTable((PULONG)VidpDefaultPalette, BV_MAX_COLORS) +#define InitializePalette() InitPaletteWithTable((PULONG)VidpDefaultPalette, BV_MAX_COLORS) #ifdef CHAR_GEN_UPSIDE_DOWN -# define GetFontPtr(_Char) &VidpFontData[_Char * BOOTCHAR_HEIGHT] + BOOTCHAR_HEIGHT - 1; -# define FONT_PTR_DELTA (-1) +# define GetFontPtr(_Char) (&VidpFontData[(_Char) * BOOTCHAR_HEIGHT] + BOOTCHAR_HEIGHT - 1) +# define FONT_PTR_DELTA (-1) #else -# define GetFontPtr(_Char) &VidpFontData[_Char * BOOTCHAR_HEIGHT]; -# define FONT_PTR_DELTA (1) +# define GetFontPtr(_Char) (&VidpFontData[(_Char) * BOOTCHAR_HEIGHT]) +# define FONT_PTR_DELTA (1) #endif #endif /* _BOOTVID_PCH_ */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs