Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSUTB][SDK] Add CTipbarWnd Part 2 (#6466)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afaa05e36644eac97c039… commit afaa05e36644eac97c039f9118d3a60abcffc8b6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 9 18:28:24 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 9 18:28:24 2024 +0900 [MSUTB][SDK] Add CTipbarWnd Part 2 (#6466) Supporting Language Bar... JIRA issue: CORE-19363 - Add implementation to CTipbarWnd class. - Add delay link to uxtheme.dll. --- dll/win32/msutb/CMakeLists.txt | 2 +- dll/win32/msutb/lang/en-US.rc | 1 + dll/win32/msutb/msutb.cpp | 425 +++++++++++++++++++++++++++++----- dll/win32/msutb/resource.h | 1 + sdk/include/reactos/cicero/cicarray.h | 2 +- sdk/include/reactos/cicero/cicuif.h | 23 ++ sdk/include/reactos/cicero/cicutb.h | 7 + 7 files changed, 401 insertions(+), 60 deletions(-) diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index 978742390a4..b425c8d0328 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -15,5 +15,5 @@ set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) add_importlibs(msutb user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msutb comctl32 msctf ole32 oleacc oleaut32 shell32) +add_delay_importlibs(msutb uxtheme comctl32 msctf ole32 oleacc oleaut32 shell32) 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 index 97a03d501df..5dc13e43ce7 100644 --- a/dll/win32/msutb/lang/en-US.rc +++ b/dll/win32/msutb/lang/en-US.rc @@ -26,6 +26,7 @@ BEGIN IDS_MINIMIZE "&Minimize" IDS_CLOSELANGBAR "&Close Language Bar" IDS_EXTRAICONS "&Additional icons in taskbar" + IDS_LANGUAGEBAR "Language Bar" IDS_RESTORELANGBAR2 "&Restore Language Bar" IDS_MENUWND "Menu Window" IDS_VERTICAL "&Vertical" diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 2ca74b357a9..cfdfb54d8a7 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -78,8 +78,10 @@ class CMainIconItem; class CTrayIconItem; class CTipbarWnd; class CButtonIconItem; +class CTrayIconWnd; CTipbarWnd *g_pTipbarWnd = NULL; +CTrayIconWnd *g_pTrayIconWnd = NULL; CicArray<HKL> *g_prghklSkipRedrawing = NULL; @@ -542,6 +544,11 @@ struct CShellWndThread m_hProgmanWnd = ::FindWindowW(L"Progman", NULL); return m_hProgmanWnd; } + + void clear() + { + m_hTrayWnd = m_hProgmanWnd = NULL; + } }; /***********************************************************************/ @@ -991,6 +998,7 @@ protected: CicArray<CButtonIconItem*> m_Items; UINT m_uCallbackMsg; UINT m_uNotifyIconID; + friend class CTipbarWnd; static BOOL CALLBACK EnumChildWndProc(HWND hWnd, LPARAM lParam); static LRESULT CALLBACK _WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -1200,7 +1208,7 @@ class CTipbarWnd INT m_cyDlgFrameX2; HFONT m_hMarlettFont; HFONT m_hTextFont; - ITfLangBarMgr *m_pLangBarMgr; + ITfLangBarMgr_P *m_pLangBarMgr; DWORD m_dwUnknown23; CTipbarCtrlButtonHolder *m_pTipbarCtrlButtonHolder; DWORD m_dwUnknown23_1[8]; @@ -1212,7 +1220,7 @@ class CTipbarWnd LONG m_CX; LONG m_CY; CTipbarAccessible *m_pTipbarAccessible; - UINT m_nID; + INT m_nID; MARGINS m_Margins; DWORD m_dwUnknown23_5[4]; CTipbarThread *m_pUnknownThread; @@ -1226,6 +1234,11 @@ public: CTipbarWnd(DWORD style); ~CTipbarWnd() override; + CUIFWindow *GetWindow() + { + return static_cast<CUIFWindow*>(this); + } + void Init(BOOL bFlag, CDeskBand *pDeskBand); void InitHighContrast(); void InitMetrics(); @@ -1282,7 +1295,7 @@ public: void StartBackToAlphaTimer(); BOOL StartDoAccDefaultActionTimer(CTipbarItem *pTarget); - void StartModalInput(ITfLangBarEventSink *pSink, DWORD dwFlags); + void StartModalInput(ITfLangBarEventSink *pSink, DWORD dwThreadId); void StopModalInput(DWORD dwThreadId); CTipbarThread *_CreateThread(DWORD dwThreadId); @@ -1293,6 +1306,8 @@ public: void RestoreLastFocus(DWORD *pdwThreadId, BOOL fPrev); void CleanUpThreadPointer(CTipbarThread *pThread, BOOL bRemove); void TerminateAllThreads(BOOL bFlag); + void OnTerminateToolbar(); + HRESULT OnThreadTerminateInternal(DWORD dwThreadId); // IUnknown methods STDMETHOD(QueryInterface)(REFIID riid, void **ppvObj); @@ -2639,7 +2654,6 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) { switch (nCommandId) { -#if 0 // FIXME: g_pTipbarWnd case ID_TRANS: m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_LOWTRANSPARENCY); break; @@ -2658,6 +2672,7 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) case ID_DESKBAND: { + DWORD dwStatus; m_pTipbarWnd->m_pLangBarMgr->GetShowFloatingStatus(&dwStatus); if (dwStatus & TF_SFT_DESKBAND) @@ -2668,7 +2683,7 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) CUTBMinimizeLangBarDlg *pDialog = new(cicNoThrow) CUTBMinimizeLangBarDlg(); if (pDialog) { - pDialog->DoModal(m_pTipbarWnd->m_Window); + pDialog->DoModal(*m_pTipbarWnd->GetWindow()); pDialog->_Release(); } break; @@ -2679,7 +2694,7 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) CUTBCloseLangBarDlg *pDialog = new(cicNoThrow) CUTBCloseLangBarDlg(); if (pDialog) { - BOOL bOK = pDialog->DoModal(m_pTipbarWnd->m_Window); + BOOL bOK = pDialog->DoModal(*m_pTipbarWnd->GetWindow()); pDialog->_Release(); if (!bOK) DoCloseLangbar(); @@ -2708,7 +2723,6 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) case ID_ADJUSTDESKBAND: m_pTipbarWnd->AdjustDeskBandSize(TRUE); break; -#endif case ID_SETTINGS: TF_RunInputCPL(); @@ -3561,10 +3575,8 @@ STDMETHODIMP CLBarInatItem::OnMenuSelect(INT nCommandId) * CTipbarGripper */ -/// @unimplemented CTipbarGripper::CTipbarGripper(CTipbarWnd *pTipbarWnd, LPCRECT prc, DWORD style) - // : CUIFGripper((pTipbarWnd ? pTipbarWnd->GetWindow() : NULL), prc, style) - : CUIFGripper(NULL, prc, style) + : CUIFGripper((pTipbarWnd ? pTipbarWnd->GetWindow() : NULL), prc, style) { m_bInDebugMenu = FALSE; m_pTipbarWnd = pTipbarWnd; @@ -3615,11 +3627,63 @@ STDMETHODIMP_(BOOL) CTipbarGripper::OnSetCursor(UINT uMsg, LONG x, LONG y) CTipbarWnd::CTipbarWnd(DWORD style) : CUIFWindow(g_hInst, style) { + m_dwUnknown19[0] = 0; + + m_dwUnknown23_1[4] = 0; + m_dwUnknown23_1[5] = 0; + m_dwUnknown23_1[6] = 0; + m_dwUnknown23_1[7] = 0; + + RECT rc; + cicGetScreenRect(g_ptTipbar, &rc); + + //FIXME: Fix g_ptTipbar + + Move(g_ptTipbar.x, g_ptTipbar.y, 100, 24); + UpdatePosFlags(); + + m_hMarlettFont = ::CreateFontW(8, 8, 0, 0, FW_NORMAL, 0, 0, 0, + SYMBOL_CHARSET, 0, 0, 0, 0, L"Marlett"); + + ITfLangBarMgr *pLangBarMgr = NULL; + if (SUCCEEDED(TF_CreateLangBarMgr(&pLangBarMgr)) && pLangBarMgr) + { + pLangBarMgr->QueryInterface(IID_ITfLangBarMgr_P, (void **)&m_pLangBarMgr); + pLangBarMgr->Release(); + } + + if (style & UIF_WINDOW_ENABLETHEMED) + { + if (g_fTaskbarTheme) + { + m_iPartId = 1; + m_iStateId = 1; + m_pszClassList = L"TASKBAR"; + } + else + { + m_iPartId = 0; + m_iStateId = 1; + m_pszClassList = L"REBAR"; + } + } + + SetVertical(g_fVertical); + + m_cRefs = 1; } /// @unimplemented CTipbarWnd::~CTipbarWnd() { + UnInit(); + + if (m_hMarlettFont) + ::DeleteObject(m_hMarlettFont); + if (m_hTextFont) + ::DeleteObject(m_hTextFont); + + //TFUninitLib_Thread(&g_libTLS); //FIXME } /// @unimplemented @@ -3627,19 +3691,73 @@ void CTipbarWnd::Init(BOOL bFlag, CDeskBand *pDeskBand) { } -/// @unimplemented void CTipbarWnd::InitHighContrast() { + m_dwTipbarWndFlags &= ~0x10; + + HIGHCONTRAST HiCon = { sizeof(HiCon) }; + if (::SystemParametersInfo(SPI_GETHIGHCONTRAST, sizeof(HiCon), &HiCon, 0)) + { + if (HiCon.dwFlags & HCF_HIGHCONTRASTON) + m_dwTipbarWndFlags |= 0x10; + } } -/// @unimplemented void CTipbarWnd::InitMetrics() { + m_cxSmallIcon = ::GetSystemMetrics(SM_CXSMICON); + m_cySmallIcon = ::GetSystemMetrics(SM_CYSMICON); + + DWORD_PTR style = ::GetWindowLongPtr(m_hWnd, GWL_STYLE); + if (style & WS_DLGFRAME) + { + m_cxDlgFrameX2 = 2 * ::GetSystemMetrics(SM_CXDLGFRAME); + m_cyDlgFrameX2 = 2 * ::GetSystemMetrics(SM_CYDLGFRAME); + } + else if (style & WS_BORDER) + { + m_cxDlgFrameX2 = 2 * ::GetSystemMetrics(SM_CXBORDER); + m_cyDlgFrameX2 = 2 * ::GetSystemMetrics(SM_CYBORDER); + } + else + { + m_cxDlgFrameX2 = m_cyDlgFrameX2 = 0; + } } -/// @unimplemented void CTipbarWnd::InitThemeMargins() { + ZeroMemory(&m_Margins, sizeof(m_Margins)); + + CUIFTheme theme; + m_dwUnknown23_5[0] = 6; + m_dwUnknown23_5[1] = 6; + m_dwUnknown23_5[2] = 0; + m_ButtonWidth = GetSystemMetrics(SM_CXSIZE); + + theme.m_iPartId = 1; + theme.m_iStateId = 0; + theme.m_pszClassList = L"TOOLBAR"; + if (SUCCEEDED(theme.InternalOpenThemeData(m_hWnd))) + { + ::GetThemeMargins(theme.m_hTheme, NULL, theme.m_iPartId, 1, 3602, NULL, &m_Margins); + m_dwUnknown23_5[0] = 4; + m_dwUnknown23_5[1] = 2; + m_dwUnknown23_5[2] = 1; + } + theme.CloseThemeData(); + + theme.m_iPartId = 18; + theme.m_iStateId = 0; + theme.m_pszClassList = L"WINDOW"; + if (SUCCEEDED(theme.InternalOpenThemeData(m_hWnd))) + { + SIZE partSize; + ::GetThemePartSize(theme.m_hTheme, NULL, theme.m_iPartId, 1, 0, TS_TRUE, &partSize); + INT size = ::GetThemeSysSize(theme.m_hTheme, 31); + m_ButtonWidth = MulDiv(size, partSize.cx, partSize.cy); + } + theme.CloseThemeData(); } /// @unimplemented @@ -3647,16 +3765,29 @@ void CTipbarWnd::UnInit() { } -/// @unimplemented BOOL CTipbarWnd::IsFullScreenWindow(HWND hWnd) { - return FALSE; + if (g_fPolicyEnableLanguagebarInFullscreen) + return FALSE; + + DWORD_PTR style = ::GetWindowLongPtr(hWnd, GWL_STYLE); + if (!(style & WS_VISIBLE) || (style & WS_CAPTION)) + return FALSE; + + DWORD_PTR exstyle = ::GetWindowLongPtr(hWnd, GWL_EXSTYLE); + if (exstyle & WS_EX_LAYERED) + return FALSE; + + if ((exstyle & WS_EX_TOOLWINDOW) && (hWnd == m_ShellWndThread.GetWndProgman())) + return FALSE; + + return !!cicIsFullScreenSize(hWnd); } -/// @unimplemented BOOL CTipbarWnd::IsHKLToSkipRedrawOnNoItem() { - return FALSE; + HKL hKL = GetFocusKeyboardLayout(); + return IsSkipRedrawHKL(hKL); } /// @unimplemented @@ -3665,14 +3796,16 @@ BOOL CTipbarWnd::IsInItemChangeOrDirty(CTipbarThread *pTarget) return FALSE; } -/// @unimplemented void CTipbarWnd::AddThreadToThreadCreatingList(CTipbarThread *pThread) { + m_ThreadCreatingList.Add(pThread); } -/// @unimplemented void CTipbarWnd::RemoveThredFromThreadCreatingList(CTipbarThread *pTarget) { + ssize_t iItem = m_ThreadCreatingList.Find(pTarget); + if (iItem >= 0) + m_ThreadCreatingList.Remove(iItem); } /// @unimplemented @@ -3757,9 +3890,23 @@ HFONT CTipbarWnd::CreateVerticalFont() return NULL; } -/// @unimplemented void CTipbarWnd::UpdateVerticalFont() { + if (m_dwTipbarWndFlags & 4) + { + if (m_hTextFont) + { + ::DeleteObject(m_hTextFont); + SetFontToThis(NULL); + m_hTextFont = NULL; + } + m_hTextFont = CreateVerticalFont(); + SetFontToThis(m_hTextFont); + } + else + { + SetFontToThis(NULL); + } } /// @unimplemented @@ -3767,14 +3914,21 @@ void CTipbarWnd::ShowOverScreenSizeBalloon() { } -/// @unimplemented void CTipbarWnd::DestroyOverScreenSizeBalloon() { + if (m_pBalloon) + { + if (::IsWindow(*m_pBalloon)) + ::DestroyWindow(*m_pBalloon); + delete m_pBalloon; + m_pBalloon = NULL; + } } -/// @unimplemented void CTipbarWnd::DestroyWnd() { + if (::IsWindow(m_hWnd)) + ::DestroyWindow(m_hWnd); } /// @unimplemented @@ -3788,15 +3942,17 @@ void CTipbarWnd::KillOnTheadItemChangeTimer() { } -/// @unimplemented UINT_PTR CTipbarWnd::SetTimer(UINT_PTR nIDEvent, UINT uElapse) { + if (::IsWindow(m_hWnd)) + return ::SetTimer(m_hWnd, nIDEvent, uElapse, NULL); return 0; } -/// @unimplemented BOOL CTipbarWnd::KillTimer(UINT_PTR uIDEvent) { + if (::IsWindow(m_hWnd)) + return ::KillTimer(m_hWnd, uIDEvent); return FALSE; } @@ -3805,14 +3961,29 @@ void CTipbarWnd::MoveToTray() { } -/// @unimplemented void CTipbarWnd::MyClientToScreen(LPPOINT lpPoint, LPRECT prc) { + if (lpPoint) + ::ClientToScreen(m_hWnd, lpPoint); + + if (prc) + { + ::ClientToScreen(m_hWnd, (LPPOINT)prc); + ::ClientToScreen(m_hWnd, (LPPOINT)&prc->right); + } } -/// @unimplemented void CTipbarWnd::SavePosition() { + CicRegKey regKey; + if (regKey.Create(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\"))) + { + POINT pt = { 0, 0 }; + ::ClientToScreen(m_hWnd, &pt); + regKey.SetDword(TEXT("Left"), pt.x); + regKey.SetDword(TEXT("Top"), pt.y); + regKey.SetDword(TEXT("Vertical"), !!(m_dwTipbarWndFlags & 4)); + } } /// @unimplemented @@ -3836,9 +4007,23 @@ void CTipbarWnd::SetShowText(BOOL bShow) { } -/// @unimplemented void CTipbarWnd::SetShowTrayIcon(BOOL bShow) { + if (m_dwTipbarWndFlags & 0x20) + m_dwTipbarWndFlags &= ~0x20; + else + m_dwTipbarWndFlags |= 0x20; + + if ((m_dwTipbarWndFlags & 0x20) && m_pFocusThread) + { + KillTimer(10); + SetTimer(10, g_uTimerElapseMOVETOTRAY); + } + else if (g_pTrayIconWnd) + { + g_pTrayIconWnd->SetMainIcon(NULL); + g_pTrayIconWnd->RemoveAllIcon(0); + } } /// @unimplemented @@ -3846,9 +4031,10 @@ void CTipbarWnd::ShowContextMenu(POINT pt, LPCRECT prc, BOOL bFlag) { } -/// @unimplemented void CTipbarWnd::StartBackToAlphaTimer() { + UINT uTime = ::GetDoubleClickTime(); + ::SetTimer(m_hWnd, 3, 3 * uTime, NULL); } /// @unimplemented @@ -3857,14 +4043,30 @@ BOOL CTipbarWnd::StartDoAccDefaultActionTimer(CTipbarItem *pTarget) return FALSE; } -/// @unimplemented -void CTipbarWnd::StartModalInput(ITfLangBarEventSink *pSink, DWORD dwFlags) +void CTipbarWnd::StartModalInput(ITfLangBarEventSink *pSink, DWORD dwThreadId) { + if (!m_pLangBarMgr) + return; + + m_pLangBarMgr->SetModalInput(pSink, dwThreadId, 0); + if (g_pTrayIconWnd) + m_pLangBarMgr->SetModalInput(pSink, g_pTrayIconWnd->m_dwTrayWndThreadId, 0); + + DWORD dwCurThreadId = ::GetCurrentThreadId(); + m_pLangBarMgr->SetModalInput(pSink, dwCurThreadId, 1); } -/// @unimplemented void CTipbarWnd::StopModalInput(DWORD dwThreadId) { + if (!m_pLangBarMgr) + return; + + m_pLangBarMgr->SetModalInput(NULL, dwThreadId, 0); + if (g_pTrayIconWnd) + m_pLangBarMgr->SetModalInput(NULL, g_pTrayIconWnd->m_dwTrayWndThreadId, 0); + + DWORD dwCurThreadId = ::GetCurrentThreadId(); + m_pLangBarMgr->SetModalInput(NULL, dwCurThreadId, 0); } /// @unimplemented @@ -3879,9 +4081,25 @@ CTipbarThread *CTipbarWnd::_FindThread(DWORD dwThreadId) return NULL; } -/// @unimplemented void CTipbarWnd::EnsureFocusThread() { + if (m_pFocusThread) + return; + + if (m_dwTipbarWndFlags & 0x12000) + return; + + m_dwTipbarWndFlags |= 0x2000; + + HWND hwndFore = ::GetForegroundWindow(); + if (!hwndFore) + return; + + DWORD dwThreadId = ::GetWindowThreadProcessId(hwndFore, NULL); + if (dwThreadId) + OnSetFocus(dwThreadId); + + m_dwTipbarWndFlags &= ~0x2000; } /// @unimplemented @@ -3896,14 +4114,29 @@ HRESULT CTipbarWnd::AttachFocusThread() return E_NOTIMPL; } -/// @unimplemented void CTipbarWnd::RestoreLastFocus(DWORD *pdwThreadId, BOOL fPrev) { + if (m_pLangBarMgr) + m_pLangBarMgr->RestoreLastFocus(pdwThreadId, fPrev); } -/// @unimplemented void CTipbarWnd::CleanUpThreadPointer(CTipbarThread *pThread, BOOL bRemove) { + if (bRemove) + { + ssize_t iItem = m_Threads.Find(pThread); + if (iItem >= 0) + m_Threads.Remove(iItem); + } + + if (pThread == m_pFocusThread) + SetFocusThread(NULL); + + if (pThread == m_pThread) + m_pThread = NULL; + + if (pThread == m_pUnknownThread) + m_pUnknownThread = NULL; } /// @unimplemented @@ -3911,22 +4144,36 @@ void CTipbarWnd::TerminateAllThreads(BOOL bFlag) { } -/// @unimplemented STDMETHODIMP CTipbarWnd::QueryInterface(REFIID riid, void **ppvObj) { - return E_NOTIMPL; + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfLangBarEventSink)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + if (IsEqualIID(riid, IID_ITfLangBarEventSink_P)) + { + *ppvObj = static_cast<ITfLangBarEventSink_P*>(this); + AddRef(); + return S_OK; + } + return E_NOINTERFACE; } -/// @unimplemented STDMETHODIMP_(ULONG) CTipbarWnd::AddRef() { - return 0; + return ++m_cRefs; } -/// @unimplemented STDMETHODIMP_(ULONG) CTipbarWnd::Release() { - return 0; + if (--m_cRefs == 0) + { + delete this; + return 0; + } + return m_cRefs; } /// @unimplemented @@ -3935,8 +4182,23 @@ STDMETHODIMP CTipbarWnd::OnSetFocus(DWORD dwThreadId) return E_NOTIMPL; } -/// @unimplemented STDMETHODIMP CTipbarWnd::OnThreadTerminate(DWORD dwThreadId) +{ + HRESULT hr; + ++m_bInCallOn; + AddRef(); + { + hr = OnThreadTerminateInternal(dwThreadId); + if (!m_pFocusThread) + EnsureFocusThread(); + } + --m_bInCallOn; + Release(); + return hr; +} + +/// @unimplemented +HRESULT CTipbarWnd::OnThreadTerminateInternal(DWORD dwThreadId) { return E_NOTIMPL; } @@ -3971,15 +4233,16 @@ STDMETHODIMP CTipbarWnd::OnLangBarUpdate(TfLBIClick click, BOOL bFlag) return E_NOTIMPL; } -/// @unimplemented STDMETHODIMP_(BSTR) CTipbarWnd::GetAccName() { - return NULL; + WCHAR szText[256]; + ::LoadStringW(g_hInst, IDS_LANGUAGEBAR, szText, _countof(szText)); + return ::SysAllocString(szText); } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::GetAccLocation(LPRECT lprc) { + GetRect(lprc); } /// @unimplemented @@ -3987,20 +4250,21 @@ STDMETHODIMP_(void) CTipbarWnd::PaintObject(HDC hDC, LPCRECT prc) { } -/// @unimplemented STDMETHODIMP_(DWORD) CTipbarWnd::GetWndStyle() { - return 0; + return CUIFWindow::GetWndStyle() & ~WS_BORDER; } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::Move(INT x, INT y, INT nWidth, INT nHeight) { + CUIFWindow::Move(x, y, nWidth, nHeight); } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::OnMouseOutFromWindow(LONG x, LONG y) { + StartBackToAlphaTimer(); + if ((m_dwTipbarWndFlags & 0x40) && (m_dwTipbarWndFlags & 0x80)) + SetTimer(2, g_uTimerElapseSTUBEND); } /// @unimplemented @@ -4018,19 +4282,52 @@ STDMETHODIMP_(void) CTipbarWnd::OnTimer(WPARAM wParam) { } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::OnSysColorChange() { + KillTimer(7); + SetTimer(7, g_uTimerElapseSYSCOLORCHANGED); } /// @unimplemented +void CTipbarWnd::OnTerminateToolbar() +{ +} + STDMETHODIMP_(void) CTipbarWnd::OnEndSession(HWND hWnd, WPARAM wParam, LPARAM lParam) { + if (!g_bWinLogon) + OnTerminateToolbar(); + + if (wParam) // End session? + { + if (lParam & ENDSESSION_LOGOFF) + { + KillTimer(9); + Show(FALSE); + } + else + { + OnTerminateToolbar(); + + AddRef(); + ::DestroyWindow(hWnd); + Release(); + } + } } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::OnUser(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + if (uMsg == WM_USER + 1) + { + POINT pt = { (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam) }; + ::ClientToScreen(m_hWnd, &pt); + ShowContextMenu(pt, NULL, TRUE); + } + else if (uMsg == g_wmTaskbarCreated) + { + m_ShellWndThread.clear(); + } } /// @unimplemented @@ -4040,11 +4337,16 @@ CTipbarWnd::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara return 0; } -/// @unimplemented STDMETHODIMP_(LRESULT) CTipbarWnd::OnWindowPosChanging(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return 0; + LPWINDOWPOS pWP = (LPWINDOWPOS)lParam; + if (!(pWP->flags & SWP_NOZORDER)) + { + if (!m_pThread && (!m_pToolTip || !m_pToolTip->m_bShowToolTip)) + pWP->hwndInsertAfter = NULL; + } + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); } /// @unimplemented @@ -4054,18 +4356,26 @@ CTipbarWnd::OnShowWindow(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } -/// @unimplemented STDMETHODIMP_(LRESULT) CTipbarWnd::OnSettingChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + if (!wParam || wParam == SPI_SETNONCLIENTMETRICS || wParam == SPI_SETHIGHCONTRAST) + { + KillTimer(7); + SetTimer(7, g_uTimerElapseSYSCOLORCHANGED); + } return 0; } -/// @unimplemented STDMETHODIMP_(LRESULT) CTipbarWnd::OnDisplayChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return 0; + if (!(m_dwTipbarWndFlags & 2)) + { + KillTimer(12); + SetTimer(12, g_uTimerElapseDISPLAYCHANGE); + } + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); } /// @unimplemented @@ -4075,15 +4385,14 @@ CTipbarWnd::OnGetObject(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return E_NOTIMPL; } -/// @unimplemented STDMETHODIMP_(BOOL) CTipbarWnd::OnEraseBkGnd(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return FALSE; + return TRUE; } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::OnThemeChanged(HWND hWnd, WPARAM wParam, LPARAM lParam) { + CUIFWindow::OnThemeChanged(hWnd, wParam, lParam); } /// @unimplemented diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h index 4a911d35967..40f76d3441b 100644 --- a/dll/win32/msutb/resource.h +++ b/dll/win32/msutb/resource.h @@ -19,6 +19,7 @@ #define IDS_MINIMIZE 314 #define IDS_CLOSELANGBAR 315 #define IDS_EXTRAICONS 318 +#define IDS_LANGUAGEBAR 320 #define IDS_RESTORELANGBAR2 321 #define IDS_MENUWND 322 #define IDS_VERTICAL 324 diff --git a/sdk/include/reactos/cicero/cicarray.h b/sdk/include/reactos/cicero/cicarray.h index 1d2142f1c59..2df46e51c26 100644 --- a/sdk/include/reactos/cicero/cicarray.h +++ b/sdk/include/reactos/cicero/cicarray.h @@ -21,7 +21,7 @@ public: BOOL Insert(size_t iItem, size_t cGrow); LPVOID Append(size_t cGrow); - void Remove(size_t iItem, size_t cRemove); + void Remove(size_t iItem, size_t cRemove = 1); }; template <typename T_ITEM> diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 614a5aa2808..777c26cea2e 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -653,6 +653,7 @@ protected: COLORREF m_rgbToolTipBkColor; COLORREF m_rgbToolTipTextColor; friend class CUIFObject; + friend class CTipbarWnd; public: enum { TOOLTIP_TIMER_ID = 0x3216 }; @@ -1111,6 +1112,28 @@ inline void cicDoneUIFLib(void) cicDoneUIFUtil(); } +inline void cicGetScreenRect(POINT pt, LPRECT prc) +{ + *prc = { 0, 0, ::GetSystemMetrics(SM_CXSCREEN), ::GetSystemMetrics(SM_CYSCREEN) }; + HMONITOR hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST); + if (hMon) + { + MONITORINFO mi = { sizeof(mi) }; + GetMonitorInfo(hMon, &mi); + *prc = mi.rcMonitor; + } +} + +inline BOOL cicIsFullScreenSize(HWND hWnd) +{ + RECT rc; + + ::GetWindowRect(hWnd, &rc); + return (rc.left <= 0) && (rc.top <= 0) && + (rc.right >= GetSystemMetrics(SM_CXFULLSCREEN)) && + (rc.bottom >= GetSystemMetrics(SM_CYFULLSCREEN)); +} + ///////////////////////////////////////////////////////////////////////////// inline void CUIFSystemInfo::GetSystemMetrics() diff --git a/sdk/include/reactos/cicero/cicutb.h b/sdk/include/reactos/cicero/cicutb.h index c58a25db8bb..e1f517d1915 100644 --- a/sdk/include/reactos/cicero/cicutb.h +++ b/sdk/include/reactos/cicero/cicutb.h @@ -13,12 +13,19 @@ DEFINE_GUID(GUID_LBI_INATITEM, 0xCDBC683A, 0x55CE, 0x4717, 0xBA, DEFINE_GUID(GUID_LBI_CTRL, 0x58C99D96, 0x2F9B, 0x42CE, 0x91, 0xBE, 0x37, 0xEF, 0x18, 0x60, 0xF8, 0x82); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745C63, 0xB2F0, 0x4784, 0x8B, 0x67, 0x5E, 0x12, 0xC8, 0x70, 0x1A, 0x31); DEFINE_GUID(CLSID_SYSTEMLANGBARITEM, 0xBEBACC94, 0x5CD3, 0x4662, 0xA1, 0xE0, 0xF3, 0x31, 0x99, 0x49, 0x36, 0x69); +DEFINE_GUID(IID_ITfLangBarMgr_P, 0xD72C0FA9, 0xADD5, 0x4AF0, 0x87, 0x06, 0x4F, 0xA9, 0xAE, 0x3E, 0x2E, 0xFF); +DEFINE_GUID(IID_ITfLangBarEventSink_P, 0x7A460360, 0xDA21, 0x4B09, 0xA8, 0xA0, 0x8A, 0x69, 0xE7, 0x28, 0xD8, 0x93); 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); +struct ITfLangBarMgr_P : ITfLangBarMgr +{ + STDMETHOD(GetPrevShowFloatingStatus)(DWORD*) = 0; +}; + struct ITfLangBarEventSink_P : IUnknown { STDMETHOD(OnLangBarUpdate)(TfLBIClick click, BOOL bFlag) = 0;

1 year, 4 months

[reactos] 01/01: [MSUTB][SDK] Add CTipbarWnd (stub) (#6465)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8b62abf16abd912ae0ff… commit f8b62abf16abd912ae0ff5c8fdd7ed67faa89d24 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 9 15:04:45 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 9 15:04:45 2024 +0900 [MSUTB][SDK] Add CTipbarWnd (stub) (#6465) Supporting Language Bar... JIRA issue: CORE-19363 - Add CTipbarWnd class (stub; empty implementation). --- dll/win32/msutb/msutb.cpp | 676 +++++++++++++++++++++++++++++++++++- sdk/include/reactos/cicero/cicutb.h | 5 + 2 files changed, 666 insertions(+), 15 deletions(-) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 4424debb8ff..2ca74b357a9 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -1166,6 +1166,177 @@ public: STDMETHOD(GetText)(BSTR *pbstr) override; }; +/***********************************************************************/ + +class CTipbarItem; +class CTipbarThread; +class CTipbarCtrlButtonHolder; +class CDeskBand; + +class CTipbarWnd + : public ITfLangBarEventSink + , public ITfLangBarEventSink_P + , public CTipbarAccItem + , public CUIFWindow +{ + DWORD m_dwUnknown19[2]; + CModalMenu *m_pModalMenu; + CTipbarThread *m_pThread; + CicArray<GUID*> m_TipbarGUIDArray; + DWORD m_dwUnknown20; + CUIFWndFrame *m_pWndFrame; + CTipbarGripper *m_pTipbarGripper; + CTipbarThread *m_pFocusThread; + CicArray<CTipbarThread*> m_Threads; + CicArray<CTipbarThread*> m_ThreadCreatingList; + DWORD m_dwAlphaValue; + DWORD m_dwTipbarWndFlags; + LONG m_ButtonWidth; + DWORD m_dwShowType; + DWORD m_dwUnknown21; + INT m_cxSmallIcon; + INT m_cySmallIcon; + INT m_cxDlgFrameX2; + INT m_cyDlgFrameX2; + HFONT m_hMarlettFont; + HFONT m_hTextFont; + ITfLangBarMgr *m_pLangBarMgr; + DWORD m_dwUnknown23; + CTipbarCtrlButtonHolder *m_pTipbarCtrlButtonHolder; + DWORD m_dwUnknown23_1[8]; + CUIFWindow *m_pBalloon; + DWORD m_dwChangingThreadId; + LONG m_bInCallOn; + LONG m_X; + LONG m_Y; + LONG m_CX; + LONG m_CY; + CTipbarAccessible *m_pTipbarAccessible; + UINT m_nID; + MARGINS m_Margins; + DWORD m_dwUnknown23_5[4]; + CTipbarThread *m_pUnknownThread; + CDeskBand *m_pDeskBand; + CShellWndThread m_ShellWndThread; + LONG m_cRefs; + friend class CUTBContextMenu; + friend class CTipbarGripper; + +public: + CTipbarWnd(DWORD style); + ~CTipbarWnd() override; + + void Init(BOOL bFlag, CDeskBand *pDeskBand); + void InitHighContrast(); + void InitMetrics(); + void InitThemeMargins(); + void UnInit(); + + BOOL IsFullScreenWindow(HWND hWnd); + BOOL IsHKLToSkipRedrawOnNoItem(); + BOOL IsInItemChangeOrDirty(CTipbarThread *pTarget); + + void AddThreadToThreadCreatingList(CTipbarThread *pThread); + void RemoveThredFromThreadCreatingList(CTipbarThread *pTarget); + + void MoveToStub(BOOL bFlag); + void RestoreFromStub(); + + INT GetCtrlButtonWidth(); + INT GetGripperWidth(); + INT GetTipbarHeight(); + BOOL AutoAdjustDeskBandSize(); + INT AdjustDeskBandSize(BOOL bFlag); + void LocateCtrlButtons(); + void AdjustPosOnDisplayChange(); + void SetVertical(BOOL bVertical); + void UpdatePosFlags(); + + void CancelMenu(); + BOOL CheckExcludeCaptionButtonMode(LPRECT prc1, LPCRECT prc2); + void ClearLBItemList(); + + HFONT CreateVerticalFont(); + void UpdateVerticalFont(); + + void ShowOverScreenSizeBalloon(); + void DestroyOverScreenSizeBalloon(); + void DestroyWnd(); + + HKL GetFocusKeyboardLayout(); + void KillOnTheadItemChangeTimer(); + + UINT_PTR SetTimer(UINT_PTR nIDEvent, UINT uElapse); + BOOL KillTimer(UINT_PTR uIDEvent); + + void MoveToTray(); + void MyClientToScreen(LPPOINT lpPoint, LPRECT prc); + void SavePosition(); + void SetAlpha(BYTE bAlpha, BOOL bFlag); + BOOL SetLangBand(BOOL bFlag1, BOOL bFlag2); + void SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight); + void SetShowText(BOOL bShow); + void SetShowTrayIcon(BOOL bShow); + + void ShowContextMenu(POINT pt, LPCRECT prc, BOOL bFlag); + void StartBackToAlphaTimer(); + BOOL StartDoAccDefaultActionTimer(CTipbarItem *pTarget); + + void StartModalInput(ITfLangBarEventSink *pSink, DWORD dwFlags); + void StopModalInput(DWORD dwThreadId); + + CTipbarThread *_CreateThread(DWORD dwThreadId); + CTipbarThread *_FindThread(DWORD dwThreadId); + void EnsureFocusThread(); + HRESULT SetFocusThread(CTipbarThread *pFocusThread); + HRESULT AttachFocusThread(); + void RestoreLastFocus(DWORD *pdwThreadId, BOOL fPrev); + void CleanUpThreadPointer(CTipbarThread *pThread, BOOL bRemove); + void TerminateAllThreads(BOOL bFlag); + + // IUnknown methods + STDMETHOD(QueryInterface)(REFIID riid, void **ppvObj); + STDMETHOD_(ULONG, AddRef)(); + STDMETHOD_(ULONG, Release)(); + + // ITfLangBarEventSink methods + STDMETHOD(OnSetFocus)(DWORD dwThreadId) override; + STDMETHOD(OnThreadTerminate)(DWORD dwThreadId) override; + STDMETHOD(OnThreadItemChange)(DWORD dwThreadId) override; + STDMETHOD(OnModalInput)(DWORD dwThreadId, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD(ShowFloating)(DWORD dwFlags) override; + STDMETHOD(GetItemFloatingRect)(DWORD dwThreadId, REFGUID rguid, RECT *prc) override; + + // ITfLangBarEventSink_P methods + STDMETHOD(OnLangBarUpdate)(TfLBIClick click, BOOL bFlag) override; + + // CTipbarAccItem methods + STDMETHOD_(BSTR, GetAccName)() override; + STDMETHOD_(void, GetAccLocation)(LPRECT lprc) override; + + // CUIFWindow methods + STDMETHOD_(void, PaintObject)(HDC hDC, LPCRECT prc) override; + STDMETHOD_(DWORD, GetWndStyle)() override; + STDMETHOD_(void, Move)(INT x, INT y, INT nWidth, INT nHeight) override; + STDMETHOD_(void, OnMouseOutFromWindow)(LONG x, LONG y) override; + STDMETHOD_(void, OnCreate)(HWND hWnd) override; + STDMETHOD_(void, OnDestroy)(HWND hWnd) override; + STDMETHOD_(void, OnTimer)(WPARAM wParam) override; + STDMETHOD_(void, OnSysColorChange)() override; + STDMETHOD_(void, OnEndSession)(HWND hWnd, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(void, OnUser)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnWindowPosChanged)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnWindowPosChanging)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnShowWindow)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnSettingChange)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnDisplayChange)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(HRESULT, OnGetObject)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(BOOL, OnEraseBkGnd)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(void, OnThemeChanged)(HWND hWnd, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(void, UpdateUI)(LPCRECT prc) override; + STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y) override; +}; + /*********************************************************************** * CUTBLangBarDlg */ @@ -2334,12 +2505,8 @@ CUTBContextMenu::CUTBContextMenu(CTipbarWnd *pTipbarWnd) /// @unimplemented BOOL CUTBContextMenu::Init() { -#if 0 // FIXME: m_pTipbarWnd m_pTipbarThread = m_pTipbarWnd->m_pFocusThread; return !!m_pTipbarThread; -#else - return TRUE; -#endif } /// @unimplemented @@ -2347,11 +2514,9 @@ CUTBMenuWnd *CUTBContextMenu::CreateMenuUI(BOOL bFlag) { DWORD dwStatus = 0; -#if 0 // FIXME: m_pTipbarWnd if (FAILED(m_pTipbarWnd->m_pLangBarMgr->GetShowFloatingStatus(&dwStatus))) return NULL; -#endif - + CUTBMenuWnd *pMenuUI = new (cicNoThrow) CUTBMenuWnd(g_hInst, g_dwMenuStyle, 0); if (!pMenuUI) return NULL; @@ -2361,11 +2526,8 @@ CUTBMenuWnd *CUTBContextMenu::CreateMenuUI(BOOL bFlag) if (dwStatus & (TF_SFT_DESKBAND | TF_SFT_MINIMIZED)) { CUTBMenuItem *pRestoreLangBar = InsertItem(pMenuUI, ID_RESTORELANGBAR, IDS_RESTORELANGBAR2); -#if 0 // FIXME: m_pTipbarWnd if (pRestoreLangBar && !m_pTipbarWnd->m_dwUnknown20) pRestoreLangBar->Gray(TRUE); -#endif - pRestoreLangBar = pRestoreLangBar; } else { @@ -2399,11 +2561,8 @@ CUTBMenuWnd *CUTBContextMenu::CreateMenuUI(BOOL bFlag) } CUTBMenuItem *pVertical = InsertItem(pMenuUI, ID_VERTICAL, IDS_VERTICAL); -#if 0 // FIXME: m_pTipbarWnd if (pVertical) pVertical->Check(!!(m_pTipbarWnd->m_dwTipbarWndFlags & 0x800000)); -#endif - pVertical = pVertical; } } @@ -3414,7 +3573,6 @@ CTipbarGripper::CTipbarGripper(CTipbarWnd *pTipbarWnd, LPCRECT prc, DWORD style) /// @unimplemented STDMETHODIMP_(void) CTipbarGripper::OnLButtonUp(LONG x, LONG y) { -#if 0 // FIXME: m_pTipbarWnd m_pTipbarWnd->RestoreFromStub(); APPBARDATA AppBar = { sizeof(AppBar) }; @@ -3430,7 +3588,6 @@ STDMETHODIMP_(void) CTipbarGripper::OnLButtonUp(LONG x, LONG y) CUIFGripper::OnLButtonUp(x, y); m_pTipbarWnd->UpdatePosFlags(); -#endif } /// @unimplemented @@ -3450,6 +3607,495 @@ STDMETHODIMP_(BOOL) CTipbarGripper::OnSetCursor(UINT uMsg, LONG x, LONG y) return CUIFGripper::OnSetCursor(uMsg, x, y); } +/*********************************************************************** + * CTipbarWnd + */ + +/// @unimplemented +CTipbarWnd::CTipbarWnd(DWORD style) + : CUIFWindow(g_hInst, style) +{ +} + +/// @unimplemented +CTipbarWnd::~CTipbarWnd() +{ +} + +/// @unimplemented +void CTipbarWnd::Init(BOOL bFlag, CDeskBand *pDeskBand) +{ +} + +/// @unimplemented +void CTipbarWnd::InitHighContrast() +{ +} + +/// @unimplemented +void CTipbarWnd::InitMetrics() +{ +} + +/// @unimplemented +void CTipbarWnd::InitThemeMargins() +{ +} + +/// @unimplemented +void CTipbarWnd::UnInit() +{ +} + +/// @unimplemented +BOOL CTipbarWnd::IsFullScreenWindow(HWND hWnd) +{ + return FALSE; +} + +/// @unimplemented +BOOL CTipbarWnd::IsHKLToSkipRedrawOnNoItem() +{ + return FALSE; +} + +/// @unimplemented +BOOL CTipbarWnd::IsInItemChangeOrDirty(CTipbarThread *pTarget) +{ + return FALSE; +} + +/// @unimplemented +void CTipbarWnd::AddThreadToThreadCreatingList(CTipbarThread *pThread) +{ +} + +/// @unimplemented +void CTipbarWnd::RemoveThredFromThreadCreatingList(CTipbarThread *pTarget) +{ +} + +/// @unimplemented +void CTipbarWnd::MoveToStub(BOOL bFlag) +{ +} + +/// @unimplemented +void CTipbarWnd::RestoreFromStub() +{ +} + +/// @unimplemented +INT CTipbarWnd::GetCtrlButtonWidth() +{ + return 0; +} + +/// @unimplemented +INT CTipbarWnd::GetGripperWidth() +{ + return 0; +} + +/// @unimplemented +INT CTipbarWnd::GetTipbarHeight() +{ + return 0; +} + +/// @unimplemented +BOOL CTipbarWnd::AutoAdjustDeskBandSize() +{ + return FALSE; +} + +/// @unimplemented +INT CTipbarWnd::AdjustDeskBandSize(BOOL bFlag) +{ + return 0; +} + +/// @unimplemented +void CTipbarWnd::LocateCtrlButtons() +{ +} + +/// @unimplemented +void CTipbarWnd::AdjustPosOnDisplayChange() +{ +} + +/// @unimplemented +void CTipbarWnd::SetVertical(BOOL bVertical) +{ +} + +/// @unimplemented +void CTipbarWnd::UpdatePosFlags() +{ +} + +/// @unimplemented +void CTipbarWnd::CancelMenu() +{ +} + +/// @unimplemented +BOOL CTipbarWnd::CheckExcludeCaptionButtonMode(LPRECT prc1, LPCRECT prc2) +{ + return FALSE; +} + +/// @unimplemented +void CTipbarWnd::ClearLBItemList() +{ +} + +/// @unimplemented +HFONT CTipbarWnd::CreateVerticalFont() +{ + return NULL; +} + +/// @unimplemented +void CTipbarWnd::UpdateVerticalFont() +{ +} + +/// @unimplemented +void CTipbarWnd::ShowOverScreenSizeBalloon() +{ +} + +/// @unimplemented +void CTipbarWnd::DestroyOverScreenSizeBalloon() +{ +} + +/// @unimplemented +void CTipbarWnd::DestroyWnd() +{ +} + +/// @unimplemented +HKL CTipbarWnd::GetFocusKeyboardLayout() +{ + return NULL; +} + +/// @unimplemented +void CTipbarWnd::KillOnTheadItemChangeTimer() +{ +} + +/// @unimplemented +UINT_PTR CTipbarWnd::SetTimer(UINT_PTR nIDEvent, UINT uElapse) +{ + return 0; +} + +/// @unimplemented +BOOL CTipbarWnd::KillTimer(UINT_PTR uIDEvent) +{ + return FALSE; +} + +/// @unimplemented +void CTipbarWnd::MoveToTray() +{ +} + +/// @unimplemented +void CTipbarWnd::MyClientToScreen(LPPOINT lpPoint, LPRECT prc) +{ +} + +/// @unimplemented +void CTipbarWnd::SavePosition() +{ +} + +/// @unimplemented +void CTipbarWnd::SetAlpha(BYTE bAlpha, BOOL bFlag) +{ +} + +/// @unimplemented +BOOL CTipbarWnd::SetLangBand(BOOL bFlag1, BOOL bFlag2) +{ + return FALSE; +} + +/// @unimplemented +void CTipbarWnd::SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight) +{ +} + +/// @unimplemented +void CTipbarWnd::SetShowText(BOOL bShow) +{ +} + +/// @unimplemented +void CTipbarWnd::SetShowTrayIcon(BOOL bShow) +{ +} + +/// @unimplemented +void CTipbarWnd::ShowContextMenu(POINT pt, LPCRECT prc, BOOL bFlag) +{ +} + +/// @unimplemented +void CTipbarWnd::StartBackToAlphaTimer() +{ +} + +/// @unimplemented +BOOL CTipbarWnd::StartDoAccDefaultActionTimer(CTipbarItem *pTarget) +{ + return FALSE; +} + +/// @unimplemented +void CTipbarWnd::StartModalInput(ITfLangBarEventSink *pSink, DWORD dwFlags) +{ +} + +/// @unimplemented +void CTipbarWnd::StopModalInput(DWORD dwThreadId) +{ +} + +/// @unimplemented +CTipbarThread *CTipbarWnd::_CreateThread(DWORD dwThreadId) +{ + return NULL; +} + +/// @unimplemented +CTipbarThread *CTipbarWnd::_FindThread(DWORD dwThreadId) +{ + return NULL; +} + +/// @unimplemented +void CTipbarWnd::EnsureFocusThread() +{ +} + +/// @unimplemented +HRESULT CTipbarWnd::SetFocusThread(CTipbarThread *pFocusThread) +{ + return E_NOTIMPL; +} + +/// @unimplemented +HRESULT CTipbarWnd::AttachFocusThread() +{ + return E_NOTIMPL; +} + +/// @unimplemented +void CTipbarWnd::RestoreLastFocus(DWORD *pdwThreadId, BOOL fPrev) +{ +} + +/// @unimplemented +void CTipbarWnd::CleanUpThreadPointer(CTipbarThread *pThread, BOOL bRemove) +{ +} + +/// @unimplemented +void CTipbarWnd::TerminateAllThreads(BOOL bFlag) +{ +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::QueryInterface(REFIID riid, void **ppvObj) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP_(ULONG) CTipbarWnd::AddRef() +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP_(ULONG) CTipbarWnd::Release() +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::OnSetFocus(DWORD dwThreadId) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::OnThreadTerminate(DWORD dwThreadId) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::OnThreadItemChange(DWORD dwThreadId) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::OnModalInput(DWORD dwThreadId, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::ShowFloating(DWORD dwFlags) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::GetItemFloatingRect(DWORD dwThreadId, REFGUID rguid, RECT *prc) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP CTipbarWnd::OnLangBarUpdate(TfLBIClick click, BOOL bFlag) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP_(BSTR) CTipbarWnd::GetAccName() +{ + return NULL; +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::GetAccLocation(LPRECT lprc) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::PaintObject(HDC hDC, LPCRECT prc) +{ +} + +/// @unimplemented +STDMETHODIMP_(DWORD) CTipbarWnd::GetWndStyle() +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::Move(INT x, INT y, INT nWidth, INT nHeight) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnMouseOutFromWindow(LONG x, LONG y) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnCreate(HWND hWnd) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnDestroy(HWND hWnd) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnTimer(WPARAM wParam) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnSysColorChange() +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnEndSession(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnUser(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ +} + +/// @unimplemented +STDMETHODIMP_(LRESULT) +CTipbarWnd::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP_(LRESULT) +CTipbarWnd::OnWindowPosChanging(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP_(LRESULT) +CTipbarWnd::OnShowWindow(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP_(LRESULT) +CTipbarWnd::OnSettingChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP_(LRESULT) +CTipbarWnd::OnDisplayChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +/// @unimplemented +STDMETHODIMP_(HRESULT) +CTipbarWnd::OnGetObject(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return E_NOTIMPL; +} + +/// @unimplemented +STDMETHODIMP_(BOOL) CTipbarWnd::OnEraseBkGnd(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::OnThemeChanged(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::UpdateUI(LPCRECT prc) +{ +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarWnd::HandleMouseMsg(UINT uMsg, LONG x, LONG y) +{ +} + /*********************************************************************** * GetLibTls (MSUTB.@) * diff --git a/sdk/include/reactos/cicero/cicutb.h b/sdk/include/reactos/cicero/cicutb.h index 6df17b7c0f2..c58a25db8bb 100644 --- a/sdk/include/reactos/cicero/cicutb.h +++ b/sdk/include/reactos/cicero/cicutb.h @@ -18,3 +18,8 @@ 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); + +struct ITfLangBarEventSink_P : IUnknown +{ + STDMETHOD(OnLangBarUpdate)(TfLBIClick click, BOOL bFlag) = 0; +};

1 year, 4 months

[reactos] 03/03: [SETUP:REACTOS] Temporarily use USETUP file/cabinet extraction routines.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87df3b548eb0d0214012a… commit 87df3b548eb0d0214012a0347c5b61d3f1671d36 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 23 18:54:11 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 8 19:08:46 2024 +0100 [SETUP:REACTOS] Temporarily use USETUP file/cabinet extraction routines. Do this until Wine's setupapi cabinet extraction becomes faster... --- base/setup/reactos/CMakeLists.txt | 1 + base/setup/reactos/spapisup/fileqsup.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt index 75418ede517..aa862fa236e 100644 --- a/base/setup/reactos/CMakeLists.txt +++ b/base/setup/reactos/CMakeLists.txt @@ -20,5 +20,6 @@ add_executable(reactos ${SOURCE} reactos.rc) set_module_type(reactos win32gui UNICODE) add_pch(reactos reactos.h SOURCE) target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib) +target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd) diff --git a/base/setup/reactos/spapisup/fileqsup.c b/base/setup/reactos/spapisup/fileqsup.c index ea46c03f75f..95c789de085 100644 --- a/base/setup/reactos/spapisup/fileqsup.c +++ b/base/setup/reactos/spapisup/fileqsup.c @@ -13,6 +13,29 @@ #define NDEBUG #include <debug.h> +#ifndef WINE_SETUPAPI_CAB_EXTRACTION_IS_NOT_SLOW_ANYMORE + +#define _USETUP_PCH_ // Disable USetup header inclusion + +#define NTOS_MODE_USER +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> + +#include <ntstrsafe.h> + +#include "../../usetup/spapisup/cabinet.h" +#include "../../usetup/spapisup/cabinet.c" + +#define SetupOpenFileQueue _SetupOpenFileQueue +#define SetupCloseFileQueue _SetupCloseFileQueue +#define SetupQueueDeleteW _SetupQueueDeleteW +#define SetupQueueRenameW _SetupQueueRenameW +#define SetupCommitFileQueueW _SetupCommitFileQueueW + +#include "../../usetup/spapisup/fileqsup.c" + +#else + /* SETUP* API COMPATIBILITY FUNCTIONS ****************************************/ /* A simplified version of SetupQueueCopyW that wraps Cabinet support around */ @@ -157,4 +180,6 @@ pSpFileQueueDelete SpFileQueueDelete = SpFileQueueDelete_NtToWin32; pSpFileQueueRename SpFileQueueRename = SpFileQueueRename_NtToWin32; pSpFileQueueCommit SpFileQueueCommit = SetupCommitFileQueueW; +#endif + /* EOF */

1 year, 4 months

[reactos] 02/03: [USETUP] Make the "SpApiSup" files usable from e.g. the GUI setup.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bff31569e60101936426f… commit bff31569e60101936426f0bdb0eecdbd7b8f795c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 23 18:45:59 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 8 19:08:39 2024 +0100 [USETUP] Make the "SpApiSup" files usable from e.g. the GUI setup. --- base/setup/usetup/spapisup/cabinet.c | 6 ++++++ base/setup/usetup/spapisup/fileqsup.c | 2 ++ base/setup/usetup/spapisup/infsupp.c | 2 ++ 3 files changed, 10 insertions(+) diff --git a/base/setup/usetup/spapisup/cabinet.c b/base/setup/usetup/spapisup/cabinet.c index c9efdbc5431..414008163a5 100644 --- a/base/setup/usetup/spapisup/cabinet.c +++ b/base/setup/usetup/spapisup/cabinet.c @@ -8,7 +8,9 @@ * CSH 15/08-2003 Created */ +#ifndef _USETUP_PCH_ #include "usetup.h" +#endif #define Z_SOLO #include <zlib.h> @@ -136,6 +138,8 @@ typedef struct _CFDATA /* FUNCTIONS ****************************************************************/ +#if !defined(_INC_MALLOC) && !defined(_INC_STDLIB) + /* Needed by zlib, but we don't want the dependency on the CRT */ void *__cdecl malloc(size_t size) @@ -155,6 +159,8 @@ calloc(size_t nmemb, size_t size) return (void *)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, nmemb * size); } +#endif // !_INC_MALLOC && !_INC_STDLIB + /* Codecs */ diff --git a/base/setup/usetup/spapisup/fileqsup.c b/base/setup/usetup/spapisup/fileqsup.c index d6846881d96..10fc5d335ac 100644 --- a/base/setup/usetup/spapisup/fileqsup.c +++ b/base/setup/usetup/spapisup/fileqsup.c @@ -27,7 +27,9 @@ /* INCLUDES *****************************************************************/ +#ifndef _USETUP_PCH_ #include "usetup.h" +#endif #define NDEBUG #include <debug.h> diff --git a/base/setup/usetup/spapisup/infsupp.c b/base/setup/usetup/spapisup/infsupp.c index 98212975cb4..012b29b9e63 100644 --- a/base/setup/usetup/spapisup/infsupp.c +++ b/base/setup/usetup/spapisup/infsupp.c @@ -27,7 +27,9 @@ /* INCLUDES ******************************************************************/ +#ifndef _USETUP_PCH_ #include "usetup.h" +#endif #define NDEBUG #include <debug.h>

1 year, 4 months

[reactos] 01/03: [SDK:CRT] malloc.h: Use MS PSDK-compatible guard name instead of MinGW one.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=864aed6bcd87b377cb90b… commit 864aed6bcd87b377cb90b5074485d046a808b03c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 8 17:15:58 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 8 17:48:58 2024 +0100 [SDK:CRT] malloc.h: Use MS PSDK-compatible guard name instead of MinGW one. Use the MS PSDK-compatible name _INC_MALLOC, instead of the MinGW one _MALLOC_H_, so that code that may depend on this to determine whether malloc.h functions are defined, can compile without problems. --- sdk/include/crt/malloc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/include/crt/malloc.h b/sdk/include/crt/malloc.h index 77854f3b7c7..16329997837 100644 --- a/sdk/include/crt/malloc.h +++ b/sdk/include/crt/malloc.h @@ -3,8 +3,8 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#ifndef _MALLOC_H_ -#define _MALLOC_H_ +#ifndef _INC_MALLOC +#define _INC_MALLOC #include <crtdefs.h> @@ -383,4 +383,4 @@ extern "C" { #pragma pack(pop) -#endif /* _MALLOC_H_ */ +#endif /* _INC_MALLOC */

1 year, 4 months

[reactos] 01/01: [MSUTB] Add CShellWndThread (#6463)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=362804169d8b8a4106ef8… commit 362804169d8b8a4106ef8f784d8f0d966e4337a3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 8 22:13:44 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 8 22:13:44 2024 +0900 [MSUTB] Add CShellWndThread (#6463) Supporting Language Bar... JIRA issue: CORE-19363 - Implement CShellWndThread class. --- dll/win32/msutb/msutb.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index b582e7421fd..4424debb8ff 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -524,6 +524,28 @@ BOOL InitFromReg(void) /***********************************************************************/ +struct CShellWndThread +{ + HWND m_hTrayWnd = NULL; + HWND m_hProgmanWnd = NULL; + + HWND GetWndTray() + { + if (!m_hTrayWnd || !::IsWindow(m_hTrayWnd)) + m_hTrayWnd = ::FindWindowW(L"Shell_TrayWnd", NULL); + return m_hTrayWnd; + } + + HWND GetWndProgman() + { + if (!m_hProgmanWnd || !::IsWindow(m_hProgmanWnd)) + m_hProgmanWnd = ::FindWindowW(L"Progman", NULL); + return m_hProgmanWnd; + } +}; + +/***********************************************************************/ + class CUTBLangBarDlg { protected:

1 year, 4 months

[reactos] 01/01: [MSUTB] Add CTipbarGripper (#6462)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5901716c078e06d517986… commit 5901716c078e06d517986b8992fc8d7ce7f781bd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 8 20:31:01 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 8 20:31:01 2024 +0900 [MSUTB] Add CTipbarGripper (#6462) Supporting Language Bar... JIRA issue: CORE-19363 - Half-implement CTipbarGripper class. --- dll/win32/msutb/msutb.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 899d51d5442..b582e7421fd 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -934,6 +934,22 @@ public: /***********************************************************************/ +class CTipbarGripper : public CUIFGripper +{ +protected: + CTipbarWnd *m_pTipbarWnd; + BOOL m_bInDebugMenu; + +public: + CTipbarGripper(CTipbarWnd *pTipbarWnd, LPCRECT prc, DWORD style); + + STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; + STDMETHOD_(void, OnRButtonUp)(LONG x, LONG y) override; + STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y) override; +}; + +/***********************************************************************/ + class CTrayIconWnd { protected: @@ -3360,6 +3376,58 @@ STDMETHODIMP CLBarInatItem::OnMenuSelect(INT nCommandId) return S_OK; } +/*********************************************************************** + * CTipbarGripper + */ + +/// @unimplemented +CTipbarGripper::CTipbarGripper(CTipbarWnd *pTipbarWnd, LPCRECT prc, DWORD style) + // : CUIFGripper((pTipbarWnd ? pTipbarWnd->GetWindow() : NULL), prc, style) + : CUIFGripper(NULL, prc, style) +{ + m_bInDebugMenu = FALSE; + m_pTipbarWnd = pTipbarWnd; +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarGripper::OnLButtonUp(LONG x, LONG y) +{ +#if 0 // FIXME: m_pTipbarWnd + m_pTipbarWnd->RestoreFromStub(); + + APPBARDATA AppBar = { sizeof(AppBar) }; + AppBar.hWnd = ::FindWindowW(L"Shell_TrayWnd", NULL); + if (::SHAppBarMessage(ABM_GETTASKBARPOS, &AppBar)) + { + RECT rc = AppBar.rc; + POINT pt; + ::GetCursorPos(&pt); + if (g_pTipbarWnd && ::PtInRect(&rc, pt)) + g_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_DESKBAND | TF_SFT_EXTRAICONSONMINIMIZED); + } + + CUIFGripper::OnLButtonUp(x, y); + m_pTipbarWnd->UpdatePosFlags(); +#endif +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarGripper::OnRButtonUp(LONG x, LONG y) +{ + if (g_bShowDebugMenu) + { + // FIXME: Debugging feature + } +} + +STDMETHODIMP_(BOOL) CTipbarGripper::OnSetCursor(UINT uMsg, LONG x, LONG y) +{ + if (m_bInDebugMenu) + return FALSE; + + return CUIFGripper::OnSetCursor(uMsg, x, y); +} + /*********************************************************************** * GetLibTls (MSUTB.@) *

1 year, 4 months

[reactos] 01/01: [SDK] cicutf.h: s/OnPointingEnded/OnMouseOutFromWindow/ (#6461)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3581a79ebf1f86b9f90c6… commit 3581a79ebf1f86b9f90c6e8e2a971223e7e7b905 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 8 14:13:59 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 8 14:13:59 2024 +0900 [SDK] cicutf.h: s/OnPointingEnded/OnMouseOutFromWindow/ (#6461) Supporting Language Bar... JIRA issue: CORE-19363 Renaming method. --- sdk/include/reactos/cicero/cicuif.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index ba9e9d8ab42..614a5aa2808 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -592,7 +592,7 @@ public: STDMETHOD_(void, Move)(INT x, INT y, INT nWidth, INT nHeight); STDMETHOD_(BOOL, AnimateWnd)(DWORD dwTime, DWORD dwFlags); STDMETHOD_(void, OnObjectMoved)(CUIFObject *pObject); - STDMETHOD_(void, OnPointingEnded)(LONG x, LONG y) { } + STDMETHOD_(void, OnMouseOutFromWindow)(LONG x, LONG y) { } STDMETHOD_(void, OnCreate)(HWND hWnd) { } STDMETHOD_(void, OnDestroy)(HWND hWnd) { } STDMETHOD_(void, OnNCDestroy)(HWND hWnd) { } @@ -2976,7 +2976,7 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ::KillTimer(m_hWnd, POINTING_TIMER_ID); m_bPointing = FALSE; SetObjectPointed(NULL, pt2); - OnPointingEnded(pt2.x, pt2.y); + OnMouseOutFromWindow(pt2.x, pt2.y); } if (m_pToolTip)

1 year, 5 months

[reactos] 01/01: [NTOS:FSTUB] Pack the MASTER_BOOT_RECORD structure (#6416)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f28f715ba14d2f3c99e0… commit 1f28f715ba14d2f3c99e016a1a9e5e710d2b6809 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Wed Feb 7 23:02:19 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 8 01:02:19 2024 +0300 [NTOS:FSTUB] Pack the MASTER_BOOT_RECORD structure (#6416) Otherwise the USHORT members are aligned to 4-byte boundary space which overflows the disk sector buffer and ultimately results in crash. This can be reproduced by trying to format the USB drive with Rufus. Also put some additional C_ASSERT checks for extra safety. --- ntoskrnl/fstub/fstubex.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index 1904d32339a..00d4ae30fd4 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -41,6 +41,7 @@ typedef struct _EFI_PARTITION_HEADER ULONG SizeOfPartitionEntry; // 84 ULONG PartitionEntryCRC32; // 88 } EFI_PARTITION_HEADER, *PEFI_PARTITION_HEADER; +C_ASSERT(sizeof(EFI_PARTITION_HEADER) == 92); #include <poppack.h> typedef struct _EFI_PARTITION_ENTRY @@ -52,6 +53,7 @@ typedef struct _EFI_PARTITION_ENTRY ULONGLONG Attributes; // 48 WCHAR Name[0x24]; // 56 } EFI_PARTITION_ENTRY, *PEFI_PARTITION_ENTRY; +C_ASSERT(sizeof(EFI_PARTITION_ENTRY) == 128); typedef struct _PARTITION_TABLE_ENTRY { @@ -66,7 +68,9 @@ typedef struct _PARTITION_TABLE_ENTRY ULONG SectorCountBeforePartition; ULONG PartitionSectorCount; } PARTITION_TABLE_ENTRY, *PPARTITION_TABLE_ENTRY; +C_ASSERT(sizeof(PARTITION_TABLE_ENTRY) == 16); +#include <pshpack1.h> typedef struct _MASTER_BOOT_RECORD { UCHAR MasterBootRecordCodeAndData[0x1B8]; // 0 @@ -75,6 +79,8 @@ typedef struct _MASTER_BOOT_RECORD PARTITION_TABLE_ENTRY PartitionTable[4]; // 446 USHORT MasterBootRecordMagic; // 510 } MASTER_BOOT_RECORD, *PMASTER_BOOT_RECORD; +C_ASSERT(sizeof(MASTER_BOOT_RECORD) == 512); +#include <poppack.h> /* Partition entry size (bytes) - FIXME: It's hardcoded as Microsoft does, but according to specs, it shouldn't be */ #define PARTITION_ENTRY_SIZE 128

1 year, 5 months

[reactos] 01/01: [MSUTB][SDK] Add CUTBContextMenu (#6452)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dd33088282e7029f3a81… commit 7dd33088282e7029f3a81f939dbd24835954f953 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 7 16:47:10 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 7 16:47:10 2024 +0900 [MSUTB][SDK] Add CUTBContextMenu (#6452) Supporting Language Bar... JIRA issue: CORE-19363 - Add some resource strings. - Half-implement CUTBContextMenu class. --- dll/win32/msutb/lang/en-US.rc | 10 +- dll/win32/msutb/msutb.cpp | 326 +++++++++++++++++++++++++++++++++++++++++- dll/win32/msutb/resource.h | 21 +++ sdk/include/psdk/msctf.idl | 13 +- 4 files changed, 360 insertions(+), 10 deletions(-) diff --git a/dll/win32/msutb/lang/en-US.rc b/dll/win32/msutb/lang/en-US.rc index 8b09fb014c3..97a03d501df 100644 --- a/dll/win32/msutb/lang/en-US.rc +++ b/dll/win32/msutb/lang/en-US.rc @@ -17,11 +17,19 @@ BEGIN IDS_YES "&Yes" IDS_NO "&No" + IDS_SETTINGS "S&ettings..." IDS_RESTORELANGBAR "Restore Language Bar" IDS_LANGUAGE "Language" - IDS_RESTORELANGBAR2 "&Restore Language Bar" IDS_LANGUAGEBUTTON "Language Button" + IDS_TRANSPARENCY "&Transparency" + IDS_TEXTLABELS "Tex&t Labels" + IDS_MINIMIZE "&Minimize" + IDS_CLOSELANGBAR "&Close Language Bar" + IDS_EXTRAICONS "&Additional icons in taskbar" + IDS_RESTORELANGBAR2 "&Restore Language Bar" IDS_MENUWND "Menu Window" + IDS_VERTICAL "&Vertical" + IDS_ADJUSTLANGBAND "&Adjust Language Band position" IDS_LEFTCLICK "Left Click" END diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index ba2b71e43ca..899d51d5442 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -15,6 +15,7 @@ UINT g_uACP = CP_ACP; DWORD g_dwOSInfo = 0; CRITICAL_SECTION g_cs; LONG g_DllRefCount = 0; +BOOL g_bWinLogon = FALSE; BOOL g_bShowTipbar = TRUE; BOOL g_bShowDebugMenu = FALSE; @@ -307,6 +308,60 @@ HRESULT LangBarInsertSeparator(_In_ ITfMenu *pMenu) return pMenu->AddMenuItem(-1, TF_LBMENUF_SEPARATOR, NULL, NULL, NULL, 0, NULL); } +// Is it a Far-East language ID? +BOOL IsFELangId(LANGID LangID) +{ + switch (LangID) + { + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED): // Chinese (Simplified) + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL): // Chinese (Traditional) + case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT): // Japanese + case MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT): // Korean + return TRUE; + default: + return FALSE; + } +} + +BOOL CheckCloseMenuAvailable(void) +{ + BOOL ret = FALSE; + ITfInputProcessorProfiles *pProfiles = NULL; + LANGID *pLangIds = NULL; + ULONG iItem, cItems; + + if (g_fPolicyDisableCloseButton) + return FALSE; + + if (g_bShowCloseMenu) + return TRUE; + + if (SUCCEEDED(TF_CreateInputProcessorProfiles(&pProfiles)) && + SUCCEEDED(pProfiles->GetLanguageList(&pLangIds, &cItems))) + { + for (iItem = 0; iItem < cItems; ++iItem) + { + if (IsFELangId(pLangIds[iItem])) + break; + } + + ret = (iItem == cItems); + } + + if (pLangIds) + CoTaskMemFree(pLangIds); + if (pProfiles) + pProfiles->Release(); + + return ret; +} + +/// @unimplemented +BOOL IsTransparecyAvailable(void) +{ + return FALSE; +} + BOOL InitFromReg(void) { DWORD dwValue; @@ -814,13 +869,38 @@ public: CModalMenu() { } virtual ~CModalMenu() { } - CUTBMenuItem *InsertItem(CUTBMenuWnd *pMenuUI, SIZE_T uBytes, INT nStringID); + CUTBMenuItem *InsertItem(CUTBMenuWnd *pMenuUI, INT nCommandId, INT nStringID); void PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam); void CancelMenu(); }; /***********************************************************************/ +class CTipbarThread; + +class CUTBContextMenu : public CModalMenu +{ +public: + CTipbarWnd *m_pTipbarWnd; + CTipbarThread *m_pTipbarThread; + +public: + CUTBContextMenu(CTipbarWnd *pTipbarWnd); + + BOOL Init(); + CUTBMenuWnd *CreateMenuUI(BOOL bFlag); + + UINT ShowPopup( + CUIFWindow *pWindow, + POINT pt, + LPCRECT prc, + BOOL bFlag); + + BOOL SelectMenuItem(UINT nCommandId); +}; + +/***********************************************************************/ + class CUTBLBarMenuItem; class CUTBLBarMenu : public CCicLibMenu @@ -2173,7 +2253,7 @@ STDMETHODIMP_(INT) CUTBMenuItem::GetAccRole() */ CUTBMenuItem * -CModalMenu::InsertItem(CUTBMenuWnd *pMenuUI, SIZE_T uBytes, INT nStringID) +CModalMenu::InsertItem(CUTBMenuWnd *pMenuUI, INT nCommandId, INT nStringID) { CUTBMenuItem *pMenuItem = new(cicNoThrow) CUTBMenuItem(pMenuUI); if (!pMenuItem) @@ -2183,7 +2263,7 @@ CModalMenu::InsertItem(CUTBMenuWnd *pMenuUI, SIZE_T uBytes, INT nStringID) ::LoadStringW(g_hInst, nStringID, szText, _countof(szText)); if (pMenuItem->Initialize() && - pMenuItem->Init(uBytes, szText) && + pMenuItem->Init(nCommandId, szText) && pMenuUI->InsertItem(pMenuItem)) { return pMenuItem; @@ -2204,6 +2284,246 @@ void CModalMenu::CancelMenu() m_pMenuUI->CancelMenu(); } +/*********************************************************************** + * CUTBContextMenu + */ + +CUTBContextMenu::CUTBContextMenu(CTipbarWnd *pTipbarWnd) +{ + m_pTipbarWnd = pTipbarWnd; +} + +/// @unimplemented +BOOL CUTBContextMenu::Init() +{ +#if 0 // FIXME: m_pTipbarWnd + m_pTipbarThread = m_pTipbarWnd->m_pFocusThread; + return !!m_pTipbarThread; +#else + return TRUE; +#endif +} + +/// @unimplemented +CUTBMenuWnd *CUTBContextMenu::CreateMenuUI(BOOL bFlag) +{ + DWORD dwStatus = 0; + +#if 0 // FIXME: m_pTipbarWnd + if (FAILED(m_pTipbarWnd->m_pLangBarMgr->GetShowFloatingStatus(&dwStatus))) + return NULL; +#endif + + CUTBMenuWnd *pMenuUI = new (cicNoThrow) CUTBMenuWnd(g_hInst, g_dwMenuStyle, 0); + if (!pMenuUI) + return NULL; + + pMenuUI->Initialize(); + + if (dwStatus & (TF_SFT_DESKBAND | TF_SFT_MINIMIZED)) + { + CUTBMenuItem *pRestoreLangBar = InsertItem(pMenuUI, ID_RESTORELANGBAR, IDS_RESTORELANGBAR2); +#if 0 // FIXME: m_pTipbarWnd + if (pRestoreLangBar && !m_pTipbarWnd->m_dwUnknown20) + pRestoreLangBar->Gray(TRUE); +#endif + pRestoreLangBar = pRestoreLangBar; + } + else + { + InsertItem(pMenuUI, ID_DESKBAND, IDS_MINIMIZE); + + if (bFlag) + { + if (IsTransparecyAvailable()) + { + if (dwStatus & TF_LBI_BALLOON) + { + InsertItem(pMenuUI, ID_TRANS, IDS_TRANSPARENCY); + } + else + { + CUTBMenuItem *pTransparency = InsertItem(pMenuUI, ID_NOTRANS, IDS_TRANSPARENCY); + if (pTransparency) + pTransparency->Check(TRUE); + } + } + + if (!(dwStatus & TF_SFT_LABELS)) + { + InsertItem(pMenuUI, ID_LABELS, IDS_TEXTLABELS); + } + else + { + CUTBMenuItem *pTextLabels = InsertItem(pMenuUI, ID_NOLABELS, IDS_TEXTLABELS); + if (pTextLabels) + pTextLabels->Check(TRUE); + } + + CUTBMenuItem *pVertical = InsertItem(pMenuUI, ID_VERTICAL, IDS_VERTICAL); +#if 0 // FIXME: m_pTipbarWnd + if (pVertical) + pVertical->Check(!!(m_pTipbarWnd->m_dwTipbarWndFlags & 0x800000)); +#endif + pVertical = pVertical; + } + } + + if (bFlag) + { + CUTBMenuItem *pExtraIcons = NULL; + + if (dwStatus & TF_SFT_EXTRAICONSONMINIMIZED) + { + pExtraIcons = InsertItem(pMenuUI, ID_NOEXTRAICONS, IDS_EXTRAICONS); + if (pExtraIcons) + pExtraIcons->Check(TRUE); + } + else + { + pExtraIcons = CModalMenu::InsertItem(pMenuUI, ID_EXTRAICONS, IDS_EXTRAICONS); + } + + if (pExtraIcons) + { + if (::GetKeyboardLayoutList(0, NULL) == 1) + { + pExtraIcons->Check(TRUE); + pExtraIcons->Gray(TRUE); + } + else + { + pExtraIcons->Gray(FALSE); + } + } + + if (dwStatus & TF_SFT_DESKBAND) + InsertItem(pMenuUI, ID_ADJUSTDESKBAND, IDS_ADJUSTLANGBAND); + + InsertItem(pMenuUI, ID_SETTINGS, IDS_SETTINGS); + + if (CheckCloseMenuAvailable()) + InsertItem(pMenuUI, ID_CLOSELANGBAR, IDS_CLOSELANGBAR); + } + + return pMenuUI; +} + +UINT +CUTBContextMenu::ShowPopup( + CUIFWindow *pWindow, + POINT pt, + LPCRECT prc, + BOOL bFlag) +{ + if (g_bWinLogon) + return 0; + + if (m_pMenuUI) + return -1; + + m_pMenuUI = CreateMenuUI(bFlag); + if (!m_pMenuUI) + return 0; + + UINT nCommandId = m_pMenuUI->ShowModalPopup(pWindow, prc, TRUE); + + if (m_pMenuUI) + { + delete m_pMenuUI; + m_pMenuUI = NULL; + } + + return nCommandId; +} + +/// @unimplemented +BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) +{ + switch (nCommandId) + { +#if 0 // FIXME: g_pTipbarWnd + case ID_TRANS: + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_LOWTRANSPARENCY); + break; + + case ID_NOTRANS: + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_NOTRANSPARENCY); + break; + + case ID_LABELS: + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_LABELS); + break; + + case ID_NOLABELS: + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_NOLABELS); + break; + + case ID_DESKBAND: + { + m_pTipbarWnd->m_pLangBarMgr->GetShowFloatingStatus(&dwStatus); + + if (dwStatus & TF_SFT_DESKBAND) + break; + + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_DESKBAND); + + CUTBMinimizeLangBarDlg *pDialog = new(cicNoThrow) CUTBMinimizeLangBarDlg(); + if (pDialog) + { + pDialog->DoModal(m_pTipbarWnd->m_Window); + pDialog->_Release(); + } + break; + } + + case ID_CLOSELANGBAR: + { + CUTBCloseLangBarDlg *pDialog = new(cicNoThrow) CUTBCloseLangBarDlg(); + if (pDialog) + { + BOOL bOK = pDialog->DoModal(m_pTipbarWnd->m_Window); + pDialog->_Release(); + if (!bOK) + DoCloseLangbar(); + } + break; + } + + case ID_EXTRAICONS: + m_pTipbarWnd->m_dwTipbarWndFlags &= ~0x4000; + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_EXTRAICONSONMINIMIZED); + break; + + case ID_NOEXTRAICONS: + m_pTipbarWnd->m_dwTipbarWndFlags &= ~0x4000; + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_NOEXTRAICONSONMINIMIZED); + break; + + case ID_RESTORELANGBAR: + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_LBI_ICON); + break; + + case ID_VERTICAL: + m_pTipbarWnd->SetVertical((m_pTipbarWnd->m_dwTipbarWndFlags & 0x4) ? TRUE : FALSE); + break; + + case ID_ADJUSTDESKBAND: + m_pTipbarWnd->AdjustDeskBandSize(TRUE); + break; +#endif + + case ID_SETTINGS: + TF_RunInputCPL(); + break; + + default: + break; + } + + return TRUE; +} + /*********************************************************************** * CTrayIconItem */ diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h index ee02ba159b2..4a911d35967 100644 --- a/dll/win32/msutb/resource.h +++ b/dll/win32/msutb/resource.h @@ -10,13 +10,34 @@ #define IDI_MAINICON 100 +#define IDS_SETTINGS 300 #define IDS_RESTORELANGBAR 308 #define IDS_LANGUAGE 309 #define IDS_LANGUAGEBUTTON 310 +#define IDS_TRANSPARENCY 312 +#define IDS_TEXTLABELS 313 +#define IDS_MINIMIZE 314 +#define IDS_CLOSELANGBAR 315 +#define IDS_EXTRAICONS 318 #define IDS_RESTORELANGBAR2 321 #define IDS_MENUWND 322 +#define IDS_VERTICAL 324 +#define IDS_ADJUSTLANGBAND 326 #define IDS_LEFTCLICK 323 +#define ID_TRANS 208 +#define ID_NOTRANS 209 +#define ID_LABELS 210 +#define ID_NOLABELS 211 +#define ID_DESKBAND 212 +#define ID_CLOSELANGBAR 213 +#define ID_EXTRAICONS 214 +#define ID_NOEXTRAICONS 215 +#define ID_RESTORELANGBAR 216 +#define ID_VERTICAL 217 +#define ID_ADJUSTDESKBAND 219 +#define ID_SETTINGS 2000 + #define IDD_CLOSELANGBAR 1001 #define IDD_MINIMIZELANGBAR 1004 diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index f9f6e6fe17d..5ff4b4b090c 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -59,14 +59,15 @@ 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 HICON WINAPI TF_GetLangIcon(LANGID LangID, LPWSTR pszText, INT cchText);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateCategoryMgr(_Out_ ITfCategoryMgr **ppcat);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateDisplayAttributeMgr(_Out_ ITfDisplayAttributeMgr **ppdam);") +cpp_quote("EXTERN_C HICON WINAPI TF_GetLangIcon(_In_ LANGID LangID, _Out_ LPWSTR pszText, _In_ INT cchText);") cpp_quote("EXTERN_C HRESULT WINAPI TF_InitMlngInfo(VOID);") cpp_quote("EXTERN_C INT WINAPI TF_MlngInfoCount(VOID);") -cpp_quote("EXTERN_C BOOL WINAPI TF_GetMlngHKL(INT iKL, HKL *phKL, LPWSTR pszText, INT cchText);") -cpp_quote("EXTERN_C INT WINAPI TF_GetMlngIconIndex(INT iKL);") -cpp_quote("EXTERN_C HICON WINAPI TF_InatExtractIcon(INT iKL);") +cpp_quote("EXTERN_C BOOL WINAPI TF_GetMlngHKL(_In_ INT iKL, _Out_ HKL *phKL, _Out_ LPWSTR pszText, _In_ INT cchText);") +cpp_quote("EXTERN_C INT WINAPI TF_GetMlngIconIndex(_In_ INT iKL);") +cpp_quote("EXTERN_C HICON WINAPI TF_InatExtractIcon(_In_ INT iKL);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_RunInputCPL(VOID);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("EXTERN_C const GUID GUID_PROP_ATTRIBUTE;")

1 year, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs