Ros-diffs January 2024

ros-diffs@reactos.org

17 participants
181 discussions

[reactos] 01/01: [SHELL32] RegFolder must correctly handle GetDisplayNameOf parsing paths (#6265)
by Whindmar Saksit 08 Jan '24

08 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55a5d7a177b9fc38a506f… commit 55a5d7a177b9fc38a506f8fa57a82870321ca8d9 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Jan 8 17:02:59 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 8 17:02:59 2024 +0100 [SHELL32] RegFolder must correctly handle GetDisplayNameOf parsing paths (#6265) --- dll/win32/shell32/folders/CRegFolder.cpp | 40 +++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 16b0b7325e2..5b2d513569b 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -641,7 +641,8 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, } /* Allocate the buffer for the result */ - LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); + SIZE_T cchPath = MAX_PATH + 1; + LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc(cchPath * sizeof(WCHAR)); if (!pszPath) return E_OUTOFMEMORY; @@ -649,18 +650,41 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) { - wcscpy(pszPath, m_rootPath); - PWCHAR pItemName = &pszPath[wcslen(pszPath)]; + SIZE_T pathlen = 0; + PWCHAR pItemName = pszPath; // GET_SHGDN_RELATION(dwFlags) == SHGDN_INFOLDER + if (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER) + { + hr = StringCchCopyW(pszPath, cchPath, m_rootPath); + if (SUCCEEDED(hr)) + { + pathlen = wcslen(pszPath); + pItemName = &pszPath[pathlen]; + if (pathlen) + { + if (++pathlen < cchPath) + *pItemName++ = L'\\'; + else + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + } + } - /* parsing name like ::{...} */ - pItemName[0] = ':'; - pItemName[1] = ':'; - SHELL32_GUIDToStringW (*clsid, &pItemName[2]); + if (SUCCEEDED(hr) && pathlen + 2 + 38 + 1 < cchPath) + { + /* parsing name like ::{...} */ + pItemName[0] = L':'; + pItemName[1] = L':'; + SHELL32_GUIDToStringW(*clsid, &pItemName[2]); + } + else + { + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } } else { /* user friendly name */ - if (!HCR_GetClassNameW (*clsid, pszPath, MAX_PATH)) + if (!HCR_GetClassNameW(*clsid, pszPath, cchPath)) hr = E_FAIL; }

1 0

[reactos] 01/01: [CONSRV] Don't blink cursor if the console window is not active (#5601)
by Whindmar Saksit 08 Jan '24

08 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c2e8c67f1bd4e9aff9df… commit 7c2e8c67f1bd4e9aff9dfd9e37df21b7a470bbb0 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Jan 8 13:49:28 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 8 13:49:28 2024 +0100 [CONSRV] Don't blink cursor if the console window is not active (#5601) Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 10 ++++++++-- win32ss/user/winsrv/consrv/frontends/gui/conwnd.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 42a8288073e..a677adfd648 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -642,6 +642,7 @@ OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create) GuiData->hWindow = hWnd; GuiData->hSysMenu = GetSystemMenu(hWnd, FALSE); + GuiData->IsWindowActive = FALSE; /* Initialize the fonts */ if (!InitFonts(GuiData, @@ -725,6 +726,8 @@ OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam) DPRINT("WM_ACTIVATE - ActivationState = %d\n", ActivationState); + GuiData->IsWindowActive = (ActivationState != WA_INACTIVE); + if ( ActivationState == WA_ACTIVE || ActivationState == WA_CLICKACTIVE ) { @@ -1324,8 +1327,11 @@ OnTimer(PGUI_CONSOLE_DATA GuiData) if (GetType(Buff) == TEXTMODE_BUFFER) { /* Repaint the caret */ - InvalidateCell(GuiData, Buff->CursorPosition.X, Buff->CursorPosition.Y); - Buff->CursorBlinkOn = !Buff->CursorBlinkOn; + if (GuiData->IsWindowActive || Buff->CursorBlinkOn) + { + InvalidateCell(GuiData, Buff->CursorPosition.X, Buff->CursorPosition.Y); + Buff->CursorBlinkOn = !Buff->CursorBlinkOn; + } if ((GuiData->OldCursor.x != Buff->CursorPosition.X) || (GuiData->OldCursor.y != Buff->CursorPosition.Y)) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h index 826f3fa875d..f6c20f2067f 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h @@ -50,6 +50,7 @@ typedef struct _GUI_CONSOLE_DATA HDESK Desktop; BOOLEAN IsWindowVisible; + BOOLEAN IsWindowActive; POINT OldCursor;

1 0

[reactos] 01/01: [COMCTL32] ToolTip: Expand tabs (#6315)
by Katayama Hirofumi MZ 08 Jan '24

08 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=710df1361ccf3d13e4ced… commit 710df1361ccf3d13e4ced3251ffa9ea939b53ca7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 8 19:51:42 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 8 19:51:42 2024 +0900 [COMCTL32] ToolTip: Expand tabs (#6315) Based on KRosUser's tooltip_tabfix.patch. ToolTip should expand tabs. JIRA issue: CORE-5635, CORE-13651 - Add DT_EXPANDTABS flag for DrawText. --- dll/win32/comctl32/tooltips.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index 8c8ef43eb08..b0857e0b4a4 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -349,6 +349,9 @@ TOOLTIPS_Refresh (const TOOLTIPS_INFO *infoPtr, HDC hdc) } /* draw text */ +#ifdef __REACTOS__ + uFlags |= DT_EXPANDTABS; +#endif DrawTextW (hdc, infoPtr->szTipText, -1, &rc, uFlags); /* Custom draw - Call PostPaint after drawing */ @@ -562,6 +565,9 @@ TOOLTIPS_CalcTipSize (const TOOLTIPS_INFO *infoPtr, LPSIZE lpSize) title.cx += (rcTitle.right - rcTitle.left); } hOldFont = SelectObject (hdc, infoPtr->hFont); +#ifdef __REACTOS__ + uFlags |= DT_EXPANDTABS; +#endif DrawTextW (hdc, infoPtr->szTipText, -1, &rc, uFlags); SelectObject (hdc, hOldFont); ReleaseDC (infoPtr->hwndSelf, hdc);

1 0

[reactos] 01/01: [SDK] cicuif.h: Add CUIFToolTip (#6317)
by Katayama Hirofumi MZ 08 Jan '24

08 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ee54e25194dfc73c1780… commit 4ee54e25194dfc73c1780e97d9efeebe0806fcc2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 8 16:44:38 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 8 16:44:38 2024 +0900 [SDK] cicuif.h: Add CUIFToolTip (#6317) Supporting TIPs... JIRA issue: CORE-19360 - Half-implement CUIFToolTip. - Strengthen some classes. --- sdk/include/reactos/cicero/cicuif.h | 482 +++++++++++++++++++++++++++++++++--- 1 file changed, 452 insertions(+), 30 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 6e41ff1ca8e..637f699325e 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -71,7 +71,7 @@ struct CUIFTheme { LPCWSTR m_pszClassList; INT m_iPartId; - DWORD m_dwUnknown2; //FIXME: name and type + INT m_iStateId; HTHEME m_hTheme; static HINSTANCE s_hUXTHEME; static FN_OpenThemeData s_fnOpenThemeData; @@ -109,7 +109,7 @@ struct CUIFTheme STDMETHOD(GetThemeFont)(HDC hDC, int iStateId, int iPropId, LOGFONTW *pFont); STDMETHOD_(COLORREF, GetThemeSysColor)(INT iColorId); STDMETHOD_(int, GetThemeSysSize)(int iSizeId); - STDMETHOD_(void, SetActiveTheme)(LPCWSTR pszClassList, INT iPartId, DWORD dwUnknown2); + STDMETHOD_(void, SetActiveTheme)(LPCWSTR pszClassList, INT iPartId, INT iStateId); }; // static members @@ -206,6 +206,7 @@ protected: LPWSTR m_pszToolTip; DWORD m_dwUnknown4[2]; //FIXME: name and type friend class CUIFWindow; + friend class CUIFToolTip; public: CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPRECT prc, DWORD style); @@ -221,7 +222,7 @@ public: STDMETHOD_(void, Initialize)(); STDMETHOD_(void, OnPaint)(HDC hDC); - STDMETHOD_(void, OnUnknnown9)() { } // FIXME: name + STDMETHOD_(void, OnUnknown9)() { } // FIXME: name STDMETHOD_(void, OnLButtonDown)(LONG x, LONG y) { } STDMETHOD_(void, OnMButtonDown)(LONG x, LONG y) { } STDMETHOD_(void, OnRButtonDown)(LONG x, LONG y) { } @@ -397,9 +398,10 @@ protected: CUIFToolTip *m_pToolTip; CUIFShadow *m_pShadow; BOOL m_bShowShadow; - CUIFWindow *m_pShadowOwner; + CUIFWindow *m_pShadowOrToolTipOwner; friend class CUIFObject; friend class CUIFShadow; + friend class CUIFToolTip; public: CUIFWindow(HINSTANCE hInst, DWORD style); @@ -468,7 +470,44 @@ public: class CUIFToolTip : public CUIFWindow { - //FIXME +protected: + CUIFObject *m_pToolTipTarget; + LPWSTR m_pszToolTipText; + BOOL m_bShowToolTip; + DWORD m_dwUnknown10; //FIXME: name and type + LONG m_nDelayTimeType2; + LONG m_nDelayTimeType3; + LONG m_nDelayTimeType1; + RECT m_rcToolTipMargin; + LONG m_cxToolTipWidth; + BOOL m_bToolTipHasBkColor; + BOOL m_bToolTipHasTextColor; + COLORREF m_rgbToolTipBkColor; + COLORREF m_rgbToolTipTextColor; + friend class CUIFObject; + +public: + enum { TOOLTIP_TIMER_ID = 0x3216 }; + CUIFToolTip(HINSTANCE hInst, DWORD style, CUIFWindow *pToolTipOwner); + ~CUIFToolTip() override; + + LONG GetDelayTime(UINT uType); + void GetMargin(LPRECT prc); + COLORREF GetTipBkColor(); + COLORREF GetTipTextColor(); + CUIFObject* FindObject(HWND hWnd, POINT pt); + + void ShowTip(); + void HideTip(); + + void GetTipWindowSize(LPSIZE pSize); + void GetTipWindowRect(LPRECT pRect, SIZE toolTipSize, LPCRECT prc); + + void RelayEvent(LPMSG pMsg); + + STDMETHOD_(void, OnPaint)(HDC hDC) override; + STDMETHOD_(void, Enable)(BOOL bEnable) override; + STDMETHOD_(void, OnTimer)(WPARAM wParam) override; }; class CUIFShadow : public CUIFWindow @@ -718,10 +757,10 @@ CUIFTheme::GetThemeSysSize(int iSizeId) /// @unimplemented inline STDMETHODIMP_(void) -CUIFTheme::SetActiveTheme(LPCWSTR pszClassList, INT iPartId, DWORD dwUnknown2) +CUIFTheme::SetActiveTheme(LPCWSTR pszClassList, INT iPartId, INT iStateId) { m_iPartId = iPartId; - m_dwUnknown2 = dwUnknown2; //FIXME: name and type + m_iStateId = iStateId; m_pszClassList = pszClassList; } @@ -770,7 +809,9 @@ CUIFObject::~CUIFObject() { if (m_pWindow) { - //FIXME + CUIFToolTip *pToolTip = m_pWindow->m_pToolTip; + if (pToolTip && pToolTip->m_pToolTipTarget == this) + pToolTip->m_pToolTipTarget = NULL; } if (m_pszToolTip) @@ -925,7 +966,7 @@ inline STDMETHODIMP_(void) CUIFObject::SetToolTip(LPCWSTR pszToolTip) size_t cch = wcslen(pszToolTip); m_pszToolTip = new(cicNoThrow) WCHAR[cch + 1]; if (m_pszToolTip) - wcscpy(m_pszToolTip, pszToolTip); + lstrcpynW(m_pszToolTip, pszToolTip, cch + 1); } } @@ -994,16 +1035,14 @@ inline LRESULT CUIFObject::NotifyCommand(WPARAM wParam, LPARAM lParam) return 0; } -/// @unimplemented inline void CUIFObject::DetachWndObj() { if (m_pWindow) { CUIFToolTip *pToolTip = m_pWindow->m_pToolTip; - if (pToolTip) - { - //FIXME - } + if (pToolTip && pToolTip->m_pToolTipTarget == this) + pToolTip->m_pToolTipTarget = NULL; + m_pWindow->RemoveUIObj(this); m_pWindow = NULL; } @@ -1487,7 +1526,6 @@ inline CUIFWindow::~CUIFWindow() } } -/// @unimplemented inline STDMETHODIMP_(void) CUIFWindow::Initialize() { @@ -1519,11 +1557,17 @@ CUIFWindow::Initialize() if (m_style & UIF_STYLE_TOOLTIP) { - //FIXME: Create m_pToolTip + DWORD style = (m_style & UIF_STYLE_RTL) | UIF_STYLE_TOPMOST | 0x10; + m_pToolTip = new(cicNoThrow) CUIFToolTip(m_hInst, style, this); + if (m_pToolTip) + m_pToolTip->Initialize(); } + if (m_style & UIF_STYLE_SHADOW) { - //FIXME: Create m_pShadow + m_pShadow = new(cicNoThrow) CUIFShadow(m_hInst, UIF_STYLE_TOPMOST, this); + if (m_pShadow) + m_pShadow->Initialize(); } return CUIFObject::Initialize(); @@ -1935,14 +1979,14 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) m_pShadow->Show(FALSE); if (!(pwp->flags & SWP_NOZORDER) && pwp->hwndInsertAfter == m_pShadow->m_hWnd) pwp->flags |= SWP_NOZORDER; - //m_pShadow->OnOwnerWndMoved(!(pwp->flags & SWP_NOSIZE)); //FIXME + m_pShadow->OnOwnerWndMoved(!(pwp->flags & SWP_NOSIZE)); return OnWindowPosChanging(hWnd, WM_WINDOWPOSCHANGING, wParam, lParam); } case WM_WINDOWPOSCHANGED: { - //WINDOWPOS *pwp = (WINDOWPOS *)lParam; - //if (m_pShadow) //FIXME - // m_pShadow->OnOwnerWndMoved(!(pwp->flags & SWP_NOSIZE)); + WINDOWPOS *pwp = (WINDOWPOS *)lParam; + if (m_pShadow) + m_pShadow->OnOwnerWndMoved(!(pwp->flags & SWP_NOSIZE)); return OnWindowPosChanged(hWnd, WM_WINDOWPOSCHANGED, wParam, lParam); } case WM_NOTIFY: @@ -2052,11 +2096,27 @@ CUIFWindow::GetWorkArea(LPCRECT prcWnd, LPRECT prcWorkArea) return FALSE; } -/// @unimplemented inline void CUIFWindow::AdjustWindowPosition() { - //FIXME + RECT rc; + rc.left = m_nLeft; + rc.right = m_nLeft + m_nWidth; + rc.top = m_nTop; + rc.bottom = m_nTop + m_nHeight; + + RECT rcWorkArea; + if (!GetWorkArea(&rc, &rcWorkArea)) + return; + + if (m_nLeft < rcWorkArea.left) + m_nLeft = rcWorkArea.left; + if (m_nTop < rcWorkArea.top) + m_nTop = rcWorkArea.top; + if (m_nLeft + m_nWidth >= rcWorkArea.right) + m_nLeft = rcWorkArea.right - m_nWidth; + if (m_nTop + m_nHeight >= rcWorkArea.bottom) + m_nTop = rcWorkArea.bottom - m_nHeight; } /// @unimplemented @@ -2087,9 +2147,9 @@ CUIFWindow::PaintObject(HDC hDC, LPCRECT prc) ::SetViewportOrgEx(hMemDC, -pRect->left, -pRect->top, NULL); if ((FAILED(CUIFTheme::EnsureThemeData(m_hWnd)) || - !(m_style & 1) || + !(m_style & UIF_STYLE_CHILD) || FAILED(DrawThemeParentBackground(m_hWnd, hMemDC, &m_rc))) && - FAILED(DrawThemeBackground(hMemDC, m_dwUnknown2, &m_rc, 0))) + FAILED(DrawThemeBackground(hMemDC, m_iStateId, &m_rc, 0))) { //if (m_pScheme) // m_pScheme->FillRect(hMemDC, pRect, 22); //FIXME @@ -2297,7 +2357,7 @@ CUIFWindow::OnAnimationStart() inline CUIFShadow::CUIFShadow(HINSTANCE hInst, DWORD style, CUIFWindow *pShadowOwner) : CUIFWindow(hInst, (style | UIF_STYLE_TOOLWINDOW)) { - m_pShadowOwner = pShadowOwner; + m_pShadowOrToolTipOwner = pShadowOwner; m_rgbShadowColor = RGB(0, 0, 0); m_dwUnknown11[0] = 0; m_dwUnknown11[1] = 0; @@ -2307,8 +2367,8 @@ inline CUIFShadow::CUIFShadow(HINSTANCE hInst, DWORD style, CUIFWindow *pShadowO inline CUIFShadow::~CUIFShadow() { - if (m_pShadowOwner) - m_pShadowOwner->m_pShadow = NULL; + if (m_pShadowOrToolTipOwner) + m_pShadowOrToolTipOwner->m_pShadow = NULL; } /// @unimplemented @@ -2330,7 +2390,7 @@ inline void CUIFShadow::InitShadow() inline void CUIFShadow::AdjustWindowPos() { - HWND hwndOwner = m_pShadowOwner->m_hWnd; + HWND hwndOwner = m_pShadowOrToolTipOwner->m_hWnd; if (!::IsWindow(m_hWnd)) return; @@ -2383,7 +2443,7 @@ inline STDMETHODIMP_(LRESULT) CUIFShadow::OnWindowPosChanging(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { WINDOWPOS *wp = (WINDOWPOS *)lParam; - wp->hwndInsertAfter = m_pShadowOwner->m_hWnd; + wp->hwndInsertAfter = m_pShadowOrToolTipOwner->m_hWnd; return ::DefWindowProc(hWnd, Msg, wParam, lParam); } @@ -2421,3 +2481,365 @@ CUIFShadow::Show(BOOL bVisible) ::ShowWindow(m_hWnd, (bVisible ? SW_SHOWNOACTIVATE : SW_HIDE)); } } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFToolTip::CUIFToolTip(HINSTANCE hInst, DWORD style, CUIFWindow *pToolTipOwner) + : CUIFWindow(hInst, style) +{ + m_pShadowOrToolTipOwner = pToolTipOwner; + m_rcToolTipMargin.left = 2; + m_rcToolTipMargin.top = 2; + m_rcToolTipMargin.right = 2; + m_rcToolTipMargin.bottom = 2; + m_pToolTipTarget = NULL; + m_pszToolTipText = NULL; + m_dwUnknown10 = 0; //FIXME: name and type + m_nDelayTimeType2 = -1; + m_nDelayTimeType3 = -1; + m_nDelayTimeType1 = -1; + m_cxToolTipWidth = -1; + m_bToolTipHasBkColor = 0; + m_bToolTipHasTextColor = 0; + m_rgbToolTipBkColor = 0; + m_rgbToolTipTextColor = 0; +} + +inline +CUIFToolTip::~CUIFToolTip() +{ + if (m_pShadowOrToolTipOwner) + m_pShadowOrToolTipOwner->m_pToolTip = NULL; + if (m_pszToolTipText) + delete[] m_pszToolTipText; +} + +inline LONG +CUIFToolTip::GetDelayTime(UINT uType) +{ + LONG nDelayTime; + switch (uType) + { + case 1: + { + nDelayTime = m_nDelayTimeType1; + if (nDelayTime == -1) + return ::GetDoubleClickTime() / 5; + return nDelayTime; + } + case 2: + { + nDelayTime = m_nDelayTimeType2; + if (nDelayTime == -1) + return 10 * ::GetDoubleClickTime(); + return nDelayTime; + } + case 3: + { + nDelayTime = m_nDelayTimeType3; + if (nDelayTime == -1) + return ::GetDoubleClickTime(); + return nDelayTime; + } + } +} + +inline void CUIFToolTip::GetMargin(LPRECT prc) +{ + if (prc) + *prc = m_rcToolTipMargin; +} + +inline COLORREF +CUIFToolTip::GetTipBkColor() +{ + if (m_bToolTipHasBkColor) + return m_rgbToolTipBkColor; + return ::GetSysColor(COLOR_INFOBK); +} + +inline COLORREF +CUIFToolTip::GetTipTextColor() +{ + if (m_bToolTipHasTextColor) + return m_rgbToolTipTextColor; + return ::GetSysColor(COLOR_INFOTEXT); +} + +inline CUIFObject* +CUIFToolTip::FindObject(HWND hWnd, POINT pt) +{ + if (hWnd == m_pShadowOrToolTipOwner->m_hWnd) + return m_pShadowOrToolTipOwner->ObjectFromPoint(pt); + return NULL; +} + +/// @unimplemented +inline void +CUIFToolTip::ShowTip() +{ + ::KillTimer(m_hWnd, TOOLTIP_TIMER_ID); + + if (!m_pToolTipTarget) + return; + + LPCWSTR pszText = m_pToolTipTarget->GetToolTip(); + if (!pszText) + return; + + if (!m_pToolTipTarget || m_pToolTipTarget->OnShowToolTip()) + return; + + POINT Point; + ::GetCursorPos(&Point); + ::ScreenToClient(m_pToolTipTarget->m_pWindow->m_hWnd, &Point); + + RECT rc; + m_pToolTipTarget->GetRect(&rc); + if (!::PtInRect(&rc, Point)) + return; + + size_t cchText = wcslen(pszText); + m_pszToolTipText = new(cicNoThrow) WCHAR[cchText + 1]; + if (!m_pszToolTipText) + return; + + lstrcpynW(m_pszToolTipText, pszText, cchText + 1); + + SIZE size; + GetTipWindowSize(&size); + + RECT rc2 = rc; + ::ClientToScreen(m_pToolTipTarget->m_pWindow->m_hWnd, (LPPOINT)&rc); + ::ClientToScreen(m_pToolTipTarget->m_pWindow->m_hWnd, (LPPOINT)&rc.right); + GetTipWindowRect(&rc2, size, &rc); + + m_bShowToolTip = TRUE; + Move(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); + Show(TRUE); +} + +inline void +CUIFToolTip::HideTip() +{ + ::KillTimer(m_hWnd, TOOLTIP_TIMER_ID); + m_bShowToolTip = FALSE; + + if (m_pToolTipTarget) + m_pToolTipTarget->OnHideToolTip(); + + if (m_bVisible) + { + if (m_pszToolTipText) + { + delete[] m_pszToolTipText; + m_pszToolTipText = NULL; + } + Show(FALSE); + } +} + +inline void +CUIFToolTip::GetTipWindowSize(LPSIZE pSize) +{ + if (!m_pszToolTipText) + return; + + HDC hDC = ::GetDC(m_hWnd); + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + + RECT rcText = { 0, 0, 0, 0 }; + INT cyText; + if (m_cxToolTipWidth <= 0) + { + cyText = ::DrawTextW(hDC, m_pszToolTipText, -1, &rcText, DT_CALCRECT | DT_SINGLELINE); + } + else + { + rcText.right = m_cxToolTipWidth; + cyText = ::DrawTextW(hDC, m_pszToolTipText, -1, &rcText, DT_CALCRECT | DT_WORDBREAK); + } + + RECT rcMargin; + GetMargin(&rcMargin); + + RECT rc; + rc.left = rcText.left - rcMargin.left; + rc.top = rcText.top - rcMargin.top; + rc.right = rcText.right + rcMargin.right; + rc.bottom = rcText.top + cyText + rcMargin.bottom; + ClientRectToWindowRect(&rc); + + pSize->cx = rc.right - rc.left; + pSize->cy = rc.bottom - rc.top; + + ::SelectObject(hDC, hFontOld); + ::ReleaseDC(m_hWnd, hDC); +} + +inline void +CUIFToolTip::GetTipWindowRect(LPRECT pRect, SIZE toolTipSize, LPCRECT prc) +{ + POINT Point; + GetCursorPos(&Point); + + HCURSOR hCursor = ::GetCursor(); + ICONINFO IconInfo; + INT yHotspot = 0; + INT cyCursor = ::GetSystemMetrics(SM_CYCURSOR); + if (hCursor && ::GetIconInfo(hCursor, &IconInfo)) + { + BITMAP bm; + ::GetObject(IconInfo.hbmMask, sizeof(bm), &bm); + if (!IconInfo.fIcon) + { + cyCursor = bm.bmHeight; + yHotspot = IconInfo.yHotspot; + if (!IconInfo.hbmColor) + cyCursor = bm.bmHeight / 2; + } + if (IconInfo.hbmColor) + ::DeleteObject(IconInfo.hbmColor); + if (IconInfo.hbmMask) + ::DeleteObject(IconInfo.hbmMask); + } + + RECT rcMonitor; + rcMonitor.left = 0; + rcMonitor.top = 0; + rcMonitor.right = GetSystemMetrics(SM_CXSCREEN); + rcMonitor.bottom = GetSystemMetrics(SM_CYSCREEN); + + HMONITOR hMon = ::MonitorFromPoint(Point, MONITOR_DEFAULTTONEAREST); + MONITORINFO mi; + if (hMon) + { + mi.cbSize = sizeof(MONITORINFO); + if (::GetMonitorInfo(hMon, &mi)) + rcMonitor = mi.rcMonitor; + } + + pRect->left = Point.x; + pRect->right = pRect->left + toolTipSize.cx; + pRect->top = Point.y + cyCursor - yHotspot; + pRect->bottom = pRect->top + toolTipSize.cy; + + if (rcMonitor.right < pRect->right) + { + pRect->left = rcMonitor.right - toolTipSize.cx; + pRect->right = rcMonitor.right; + } + if (pRect->left < rcMonitor.left) + { + pRect->left = rcMonitor.left; + pRect->right = rcMonitor.left + toolTipSize.cx; + } + if (rcMonitor.bottom < pRect->bottom) + { + pRect->top = rcMonitor.bottom - toolTipSize.cy; + pRect->bottom = rcMonitor.bottom; + } + if (pRect->top < rcMonitor.top) + { + pRect->top = rcMonitor.top; + pRect->bottom = rcMonitor.top + toolTipSize.cy; + } +} + +inline void +CUIFToolTip::RelayEvent(LPMSG pMsg) +{ + if (!pMsg) + return; + + switch (pMsg->message) + { + case WM_MOUSEMOVE: + { + if (m_bEnable && + ::GetKeyState(VK_LBUTTON) >= 0 && + ::GetKeyState(VK_MBUTTON) >= 0 && + ::GetKeyState(VK_RBUTTON) >= 0) + { + POINT pt = { (SHORT)LOWORD(pMsg->lParam), (SHORT)HIWORD(pMsg->lParam) }; + CUIFObject *pFound = CUIFToolTip::FindObject(pMsg->hwnd, pt); + if (pFound) + { + if (m_pToolTipTarget != pFound) + { + HideTip(); + + LONG DelayTime; + if (!m_bVisible) + DelayTime = GetDelayTime(3); + else + DelayTime = GetDelayTime(1); + ::SetTimer(m_hWnd, TOOLTIP_TIMER_ID, DelayTime, NULL); + } + } + else + { + HideTip(); + } + m_pToolTipTarget = pFound; + } + break; + } + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + { + HideTip(); + break; + } + } +} + +inline STDMETHODIMP_(void) CUIFToolTip::OnPaint(HDC hDC) +{ + HGDIOBJ hFontOld = SelectObject(hDC, m_hFont); + INT iBkModeOld = SetBkMode(hDC, TRANSPARENT); + + COLORREF rgbTextColor = GetTipTextColor(); + COLORREF rgbOldTextColor = ::SetTextColor(hDC, rgbTextColor); + + COLORREF rgbBkColor = GetTipBkColor(); + HBRUSH hbrBack = ::CreateSolidBrush(rgbBkColor); + RECT rc = m_rc; + if (hbrBack) + { + ::FillRect(hDC, &rc, hbrBack); + ::DeleteObject(hbrBack); + } + + RECT rcMargin; + GetMargin(&rcMargin); + + rc.left += rcMargin.left; + rc.top += rcMargin.top; + rc.right -= rcMargin.right; + rc.bottom -= rcMargin.bottom; + + if (m_cxToolTipWidth <= 0) + ::DrawTextW(hDC, m_pszToolTipText, -1, &rc, DT_SINGLELINE); + else + ::DrawTextW(hDC, m_pszToolTipText, -1, &rc, DT_WORDBREAK); + + ::SetTextColor(hDC, rgbOldTextColor); + ::SetBkMode(hDC, iBkModeOld); + ::SelectObject(hDC, hFontOld); +} + +inline STDMETHODIMP_(void) CUIFToolTip::Enable(BOOL bEnable) +{ + if (!bEnable) + HideTip(); + CUIFObject::Enable(bEnable); +} + +inline STDMETHODIMP_(void) CUIFToolTip::OnTimer(WPARAM wParam) +{ + if (wParam == TOOLTIP_TIMER_ID) + ShowTip(); +}

1 0

[reactos] 01/01: [SDK] cicuif.h: Add CUIFShadow (#6316)
by Katayama Hirofumi MZ 08 Jan '24

08 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7898297c532f5a9846a3a… commit 7898297c532f5a9846a3a4378b0b4df41a108230 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 8 12:52:37 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 8 12:52:37 2024 +0900 [SDK] cicuif.h: Add CUIFShadow (#6316) Supporting TIPs... JIRA issue: CORE-19360 - Half-implement CUIFShadow class. --- sdk/include/reactos/cicero/cicuif.h | 157 +++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 9a6e1fe6b6a..6e41ff1ca8e 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -397,8 +397,9 @@ protected: CUIFToolTip *m_pToolTip; CUIFShadow *m_pShadow; BOOL m_bShowShadow; - DWORD m_dwUnknown10; + CUIFWindow *m_pShadowOwner; friend class CUIFObject; + friend class CUIFShadow; public: CUIFWindow(HINSTANCE hInst, DWORD style); @@ -472,7 +473,28 @@ class CUIFToolTip : public CUIFWindow class CUIFShadow : public CUIFWindow { - //FIXME +protected: + COLORREF m_rgbShadowColor; + DWORD m_dwUnknown11[2]; + INT m_xShadowDelta; + INT m_yShadowDelta; + BOOL m_bLayerAvailable; + +public: + CUIFShadow(HINSTANCE hInst, DWORD style, CUIFWindow *pShadowOwner); + ~CUIFShadow() override; + + void InitSettings(); + void InitShadow(); + void AdjustWindowPos(); + void OnOwnerWndMoved(BOOL bDoSize); + + STDMETHOD_(void, Initialize)() override; + STDMETHOD_(DWORD, GetWndStyleEx)() override; + STDMETHOD_(void, OnPaint)(HDC hDC) override; + STDMETHOD_(LRESULT, OnWindowPosChanging)(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnSettingChange)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(void, Show)(BOOL bVisible) override; }; ///////////////////////////////////////////////////////////////////////////// @@ -2268,3 +2290,134 @@ inline STDMETHODIMP_(void) CUIFWindow::OnAnimationStart() { } + +///////////////////////////////////////////////////////////////////////////// + +/// @unimplemented +inline CUIFShadow::CUIFShadow(HINSTANCE hInst, DWORD style, CUIFWindow *pShadowOwner) + : CUIFWindow(hInst, (style | UIF_STYLE_TOOLWINDOW)) +{ + m_pShadowOwner = pShadowOwner; + m_rgbShadowColor = RGB(0, 0, 0); + m_dwUnknown11[0] = 0; + m_dwUnknown11[1] = 0; + m_xShadowDelta = m_yShadowDelta = 0; + m_bLayerAvailable = FALSE; +} + +inline CUIFShadow::~CUIFShadow() +{ + if (m_pShadowOwner) + m_pShadowOwner->m_pShadow = NULL; +} + +/// @unimplemented +inline void CUIFShadow::InitSettings() +{ + m_bLayerAvailable = FALSE; + m_rgbShadowColor = RGB(128, 128, 128); + m_xShadowDelta = m_yShadowDelta = 2; +} + +/// @unimplemented +inline void CUIFShadow::InitShadow() +{ + if (m_bLayerAvailable) + { + //FIXME + } +} + +inline void CUIFShadow::AdjustWindowPos() +{ + HWND hwndOwner = m_pShadowOwner->m_hWnd; + if (!::IsWindow(m_hWnd)) + return; + + RECT rc; + ::GetWindowRect(hwndOwner, &rc); + ::SetWindowPos(m_hWnd, hwndOwner, + rc.left + m_xShadowDelta, + rc.top + m_yShadowDelta, + rc.right - rc.left, + rc.bottom - rc.top, + SWP_NOOWNERZORDER | SWP_NOACTIVATE); +} + +inline void CUIFShadow::OnOwnerWndMoved(BOOL bDoSize) +{ + if (::IsWindow(m_hWnd) && ::IsWindowVisible(m_hWnd)) + { + AdjustWindowPos(); + if (bDoSize) + InitShadow(); + } +} + +inline STDMETHODIMP_(void) +CUIFShadow::Initialize() +{ + InitSettings(); + CUIFWindow::Initialize(); +} + +inline STDMETHODIMP_(DWORD) +CUIFShadow::GetWndStyleEx() +{ + DWORD exstyle = CUIFWindow::GetWndStyleEx(); + if (m_bLayerAvailable) + exstyle |= WS_EX_LAYERED; + return exstyle; +} + +inline STDMETHODIMP_(void) +CUIFShadow::OnPaint(HDC hDC) +{ + RECT rc = m_rc; + HBRUSH hBrush = ::CreateSolidBrush(m_rgbShadowColor); + ::FillRect(hDC, &rc, hBrush); + ::DeleteObject(hBrush); +} + +inline STDMETHODIMP_(LRESULT) +CUIFShadow::OnWindowPosChanging(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + WINDOWPOS *wp = (WINDOWPOS *)lParam; + wp->hwndInsertAfter = m_pShadowOwner->m_hWnd; + return ::DefWindowProc(hWnd, Msg, wParam, lParam); +} + +inline STDMETHODIMP_(LRESULT) +CUIFShadow::OnSettingChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + InitSettings(); + + DWORD exstyle; + if (m_bLayerAvailable) + exstyle = ::GetWindowLongPtr(m_hWnd, GWL_EXSTYLE) | WS_EX_LAYERED; + else + exstyle = ::GetWindowLongPtr(m_hWnd, GWL_EXSTYLE) & ~WS_EX_LAYERED; + + ::SetWindowLongPtr(m_hWnd, GWL_EXSTYLE, exstyle); + + AdjustWindowPos(); + InitShadow(); + + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +inline STDMETHODIMP_(void) +CUIFShadow::Show(BOOL bVisible) +{ + if (bVisible && ::IsWindow(m_hWnd) && !::IsWindowVisible(m_hWnd)) + { + AdjustWindowPos(); + InitShadow(); + } + + if (::IsWindow(m_hWnd)) + { + m_bVisible = bVisible; + ::ShowWindow(m_hWnd, (bVisible ? SW_SHOWNOACTIVATE : SW_HIDE)); + } +}

1 0

[reactos] 01/01: [CMAKE] Add GCC options to make a long double 64 bits
by Timo Kreuzer 07 Jan '24

07 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9be24a9d517b80bb1e54e… commit 9be24a9d517b80bb1e54ea234c8fd4e29dd957dc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Nov 1 20:09:44 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 7 11:03:08 2024 +0200 [CMAKE] Add GCC options to make a long double 64 bits This adds -mlong-double-64 to make the size of a long double 64 bits in GCC builds to match MSVC builds. --- modules/rostests/winetests/msvcrt/CMakeLists.txt | 2 +- sdk/cmake/gcc.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index 44f4b3bf9cb..40e532ab653 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -28,7 +28,7 @@ target_compile_definitions(msvcrt_winetest PRIVATE __msvcrt_ulong=ULONG) if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_compile_options(msvcrt_winetest PRIVATE -Wno-format -Wno-stringop-truncation) + target_compile_options(msvcrt_winetest PRIVATE -Wno-format -Wno-stringop-truncation -Wno-overflow) endif() set_module_type(msvcrt_winetest win32cui) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 0eefc577a60..384aec75e8d 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -42,6 +42,9 @@ endif() # note: -fno-common is default since GCC 10 add_compile_options(-pipe -fms-extensions -fno-strict-aliasing -fno-common) +# A long double is 64 bits +add_compile_options(-mlong-double-64) + # Prevent GCC from searching any of the default directories. # The case for C++ is handled through the reactos_c++ INTERFACE library add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:CXX>>:-nostdinc>")

1 0

[reactos] 01/01: [SDK] cicuif.h: Add CUIFWindow (#6313)
by Katayama Hirofumi MZ 07 Jan '24

07 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=469e7c6d4ee9123e03eee… commit 469e7c6d4ee9123e03eee38e01aab054948fa016 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 7 16:49:31 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 7 16:49:31 2024 +0900 [SDK] cicuif.h: Add CUIFWindow (#6313) Supporting TIPs... JIRA issue: CORE-19360 - Strengthen CUIFObject. - Add CUIFWindow. --- sdk/include/reactos/cicero/cicuif.h | 1133 +++++++++++++++++++++++++++++++++-- 1 file changed, 1089 insertions(+), 44 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 6bc52280640..9a6e1fe6b6a 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -13,6 +13,8 @@ class CUIFSystemInfo; struct CUIFTheme; class CUIFObject; class CUIFWindow; + class CUIFToolTip; + class CUIFShadow; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; @@ -176,6 +178,17 @@ public: ///////////////////////////////////////////////////////////////////////////// +// Flags for CUIFObject::m_style +enum +{ + UIF_STYLE_CHILD = 0x1, + UIF_STYLE_TOPMOST = 0x2, + UIF_STYLE_TOOLWINDOW = 0x4, + UIF_STYLE_TOOLTIP = 0x20, + UIF_STYLE_SHADOW = 0x40, + UIF_STYLE_RTL = 0x200, +}; + class CUIFObject : public CUIFTheme { protected: @@ -192,28 +205,37 @@ protected: BOOL m_bHasCustomFont; LPWSTR m_pszToolTip; DWORD m_dwUnknown4[2]; //FIXME: name and type + friend class CUIFWindow; public: CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPRECT prc, DWORD style); virtual ~CUIFObject(); + void StartCapture(); + void EndCapture(); + BOOL IsCapture(); + BOOL IsRTL(); + LRESULT NotifyCommand(WPARAM wParam, LPARAM lParam); + CUIFObject* ObjectFromPoint(POINT pt); + void SetScheme(CUIFScheme *scheme); + STDMETHOD_(void, Initialize)(); - STDMETHOD_(void, OnPaint)(HWND hWnd); - STDMETHOD_(void, OnHideToolTip)() { } // FIXME: name - STDMETHOD_(void, OnLButtonDown)(POINT pt) { } - STDMETHOD_(void, OnMButtonDown)(POINT pt) { } - STDMETHOD_(void, OnRButtonDown)(POINT pt) { } - STDMETHOD_(void, OnLButtonUp)(POINT pt) { } - STDMETHOD_(void, OnMButtonUp)(POINT pt) { } - STDMETHOD_(void, OnRButtonUp)(POINT pt) { } - STDMETHOD_(void, OnMouseMove)(POINT pt) { } - STDMETHOD_(void, OnRButtonDblClk)(POINT pt) { } //FIXME: name - STDMETHOD_(void, OnRButtonUp2)(POINT pt) { } //FIXME: name - STDMETHOD_(void, OnUnknown)(DWORD x1, DWORD x2, DWORD x3); //FIXME: name and type + STDMETHOD_(void, OnPaint)(HDC hDC); + STDMETHOD_(void, OnUnknnown9)() { } // FIXME: name + STDMETHOD_(void, OnLButtonDown)(LONG x, LONG y) { } + STDMETHOD_(void, OnMButtonDown)(LONG x, LONG y) { } + STDMETHOD_(void, OnRButtonDown)(LONG x, LONG y) { } + STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) { } + STDMETHOD_(void, OnMButtonUp)(LONG x, LONG y) { } + STDMETHOD_(void, OnRButtonUp)(LONG x, LONG y) { } + STDMETHOD_(void, OnMouseMove)(LONG x, LONG y) { } + STDMETHOD_(void, OnPoint)(LONG x, LONG y) { } + STDMETHOD_(void, OnUnPoint)(LONG x, LONG y) { } + STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y); STDMETHOD_(void, GetRect)(LPRECT prc); STDMETHOD_(void, SetRect)(LPCRECT prc); STDMETHOD_(BOOL, PtInObject)(POINT pt); - STDMETHOD_(void, PaintObject)(HWND hWnd, LPCRECT prc); + STDMETHOD_(void, PaintObject)(HDC hDC, LPCRECT prc); STDMETHOD_(void, CallOnPaint)(); STDMETHOD_(void, Enable)(BOOL bEnable); STDMETHOD_(void, Show)(BOOL bVisible); @@ -226,11 +248,11 @@ public: STDMETHOD_(void, SetToolTip)(LPCWSTR pszToolTip); STDMETHOD_(LPCWSTR, GetToolTip)(); STDMETHOD_(LRESULT, OnShowToolTip)(); - STDMETHOD_(void, OnHideToolTip2)() { } // FIXME: name + STDMETHOD_(void, OnHideToolTip)() { } STDMETHOD_(void, DetachWndObj)(); STDMETHOD_(void, ClearWndObj)(); - STDMETHOD_(LRESULT, OnPaintTheme)(HWND hWnd); - STDMETHOD_(void, OnSetFocus)(HWND hWnd); + STDMETHOD_(LRESULT, OnPaintTheme)(HDC hDC); + STDMETHOD_(void, DoPaint)(HDC hDC); STDMETHOD_(void, ClearTheme)(); }; @@ -344,6 +366,8 @@ class CUIFScheme public: static CUIFColorTableSys *s_pColorTableSys; static CUIFColorTableOff10 *s_pColorTableOff10; + + CUIFScheme(DWORD type); }; DECLSPEC_SELECTANY CUIFColorTableSys *CUIFScheme::s_pColorTableSys = NULL; @@ -352,10 +376,101 @@ DECLSPEC_SELECTANY CUIFColorTableOff10 *CUIFScheme::s_pColorTableOff10 = NULL; void cicInitUIFScheme(void); void cicUpdateUIFScheme(void); void cicDoneUIFScheme(void); +CUIFScheme *cicCreateUIFScheme(DWORD type); ///////////////////////////////////////////////////////////////////////////// class CUIFWindow : public CUIFObject +{ +protected: + INT m_nLeft; + INT m_nTop; + INT m_nHeight; + INT m_nWidth; + HINSTANCE m_hInst; + HWND m_hWnd; + CUIFWindow *m_pUnknown7; + CUIFObject *m_pCaptured; + CUIFObject *m_pPointed; + DWORD m_dwUnknown8; + DWORD m_dwUnknown9; + CUIFToolTip *m_pToolTip; + CUIFShadow *m_pShadow; + BOOL m_bShowShadow; + DWORD m_dwUnknown10; + friend class CUIFObject; + +public: + CUIFWindow(HINSTANCE hInst, DWORD style); + ~CUIFWindow() override; + + static CUIFWindow* GetThis(HWND hWnd); + static void SetThis(HWND hWnd, LONG_PTR dwNewLong); + + STDMETHOD_(void, Initialize)() override; + STDMETHOD_(void, Show)(BOOL bVisible) override; + STDMETHOD_(void, SetRect)(LPCRECT prc) override; + STDMETHOD_(void, PaintObject)(HDC hDC, LPCRECT prc) override; + STDMETHOD_(void, RemoveUIObj)(CUIFObject *pRemove) override; + + void SetCaptureObject(CUIFObject *pCaptured); + void SetObjectPointed(CUIFObject *pPointed, POINT pt); + void CreateScheme(); + BOOL GetWorkArea(LPCRECT prcWnd, LPRECT prcWorkArea); + void AdjustWindowPosition(); + + static LRESULT CALLBACK WindowProcedure(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + + STDMETHOD_(LPCTSTR, GetClassName)(); + STDMETHOD_(LPCTSTR, GetWndText)(); + STDMETHOD_(DWORD, GetWndStyle)(); + STDMETHOD_(DWORD, GetWndStyleEx)(); + STDMETHOD_(HWND, CreateWnd)(HWND hwndParent); + 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, OnLButtonDown2)(LONG x, LONG y); + STDMETHOD_(void, OnCreate)(HWND hWnd); + STDMETHOD_(void, OnDestroy)(HWND hWnd); + STDMETHOD_(void, OnNCDestroy)(HWND hWnd); + STDMETHOD_(void, OnSetFocus)(HWND hWnd); + STDMETHOD_(void, OnKillFocus)(HWND hWnd); + STDMETHOD_(void, OnNotify)(HWND hWnd, WPARAM wParam, LPARAM lParam); + STDMETHOD_(void, OnTimer)(WPARAM wParam); + STDMETHOD_(void, OnSysColorChange)(); + STDMETHOD_(void, OnEndSession)(HWND hWnd, WPARAM wParam, LPARAM lParam); + STDMETHOD_(void, OnKeyDown)(HWND hWnd, WPARAM wParam, LPARAM lParam); + STDMETHOD_(void, OnKeyUp)(HWND, WPARAM wParam, LPARAM lParam); + STDMETHOD_(void, OnUser)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnActivate)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnWindowPosChanged)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnWindowPosChanging)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnNotifyFormat)(HWND hWnd, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnShowWindow)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnSettingChange)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnDisplayChange)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, OnGetObject)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(LRESULT, WindowProc)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(BOOL, OnEraseBkGnd)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(void, OnThemeChanged)(HWND hWnd, WPARAM wParam, LPARAM lParam); + STDMETHOD_(void, UpdateUI)(LPCRECT prc); + STDMETHOD_(void, SetCapture)(int); + STDMETHOD_(void, OnSetCapture)(HWND hWnd, UINT, LONG); + STDMETHOD_(void, OnAnimationStart)(); + STDMETHOD_(void, OnAnimationEnd)(); + STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y); + STDMETHOD_(void, ClientRectToWindowRect)(LPRECT pRect); + STDMETHOD_(void, GetWindowFrameSize)(LPSIZE pSize); +}; + +///////////////////////////////////////////////////////////////////////////// + +class CUIFToolTip : public CUIFWindow +{ + //FIXME +}; + +class CUIFShadow : public CUIFWindow { //FIXME }; @@ -579,6 +694,7 @@ CUIFTheme::GetThemeSysSize(int iSizeId) return s_fnGetThemeSysSize(m_hTheme, iSizeId); } +/// @unimplemented inline STDMETHODIMP_(void) CUIFTheme::SetActiveTheme(LPCWSTR pszClassList, INT iPartId, DWORD dwUnknown2) { @@ -622,8 +738,8 @@ CUIFObject::CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPRECT prc, DWORD m_pszToolTip = NULL; - m_dwUnknown4[0] = -1; //FIXME - m_dwUnknown4[1] = -1; //FIXME + m_dwUnknown4[0] = -1; //FIXME: name + m_dwUnknown4[1] = -1; //FIXME: name } /// @unimplemented @@ -661,14 +777,15 @@ inline STDMETHODIMP_(void) CUIFObject::Initialize() { } -inline STDMETHODIMP_(void) CUIFObject::OnPaint(HWND hWnd) +inline STDMETHODIMP_(void) CUIFObject::OnPaint(HDC hDC) { - if (!(m_pWindow->m_style & 0x80000000) || !OnPaintTheme(hWnd)) - OnSetFocus(hWnd); + if (!(m_pWindow->m_style & 0x80000000) || !OnPaintTheme(hDC)) + DoPaint(hDC); } -inline STDMETHODIMP_(void) CUIFObject::OnUnknown(DWORD x1, DWORD x2, DWORD x3) +inline STDMETHODIMP_(BOOL) CUIFObject::OnSetCursor(UINT uMsg, LONG x, LONG y) { + return FALSE; } inline STDMETHODIMP_(void) CUIFObject::GetRect(LPRECT prc) @@ -676,20 +793,12 @@ inline STDMETHODIMP_(void) CUIFObject::GetRect(LPRECT prc) *prc = m_rc; } -/// @unimplemented -inline STDMETHODIMP_(void) CUIFObject::SetRect(LPCRECT prc) -{ - m_rc = *prc; - // FIXME - CallOnPaint(); -} - inline STDMETHODIMP_(BOOL) CUIFObject::PtInObject(POINT pt) { return m_bVisible && ::PtInRect(&m_rc, pt); } -inline STDMETHODIMP_(void) CUIFObject::PaintObject(HWND hWnd, LPCRECT prc) +inline STDMETHODIMP_(void) CUIFObject::PaintObject(HDC hDC, LPCRECT prc) { if (!m_bVisible) return; @@ -697,21 +806,21 @@ inline STDMETHODIMP_(void) CUIFObject::PaintObject(HWND hWnd, LPCRECT prc) if (!prc) prc = &m_rc; - OnPaint(hWnd); + OnPaint(hDC); for (size_t iItem = 0; iItem < m_ObjectArray.size(); ++iItem) { CUIFObject *pObject = m_ObjectArray[iItem]; RECT rc; if (::IntersectRect(&rc, prc, &pObject->m_rc)) - pObject->PaintObject(hWnd, &rc); + pObject->PaintObject(hDC, &rc); } } -/// @unimplemented inline STDMETHODIMP_(void) CUIFObject::CallOnPaint() { - //FIXME + if (m_pWindow) + m_pWindow->UpdateUI(&m_rc); } inline STDMETHODIMP_(void) CUIFObject::Enable(BOOL bEnable) @@ -808,13 +917,6 @@ inline STDMETHODIMP_(LRESULT) CUIFObject::OnShowToolTip() return 0; } -/// @unimplemented -inline STDMETHODIMP_(void) CUIFObject::DetachWndObj() -{ - //FIXME - m_pWindow = NULL; -} - inline STDMETHODIMP_(void) CUIFObject::ClearWndObj() { m_pWindow = NULL; @@ -822,12 +924,12 @@ inline STDMETHODIMP_(void) CUIFObject::ClearWndObj() m_ObjectArray[iItem]->ClearWndObj(); } -inline STDMETHODIMP_(LRESULT) CUIFObject::OnPaintTheme(HWND hWnd) +inline STDMETHODIMP_(LRESULT) CUIFObject::OnPaintTheme(HDC hDC) { return 0; } -inline STDMETHODIMP_(void) CUIFObject::OnSetFocus(HWND hWnd) +inline STDMETHODIMP_(void) CUIFObject::DoPaint(HDC hDC) { } @@ -838,6 +940,84 @@ inline STDMETHODIMP_(void) CUIFObject::ClearTheme() m_ObjectArray[iItem]->ClearTheme(); } +inline void CUIFObject::StartCapture() +{ + if (m_pWindow) + m_pWindow->SetCaptureObject(this); +} + +inline void CUIFObject::EndCapture() +{ + if (m_pWindow) + m_pWindow->SetCaptureObject(NULL); +} + +inline BOOL CUIFObject::IsCapture() +{ + return m_pWindow && (m_pWindow->m_pCaptured == this); +} + +inline void CUIFObject::SetRect(LPCRECT prc) +{ + m_rc = *prc; + if (m_pWindow) + m_pWindow->OnObjectMoved(this); + CallOnPaint(); +} + +inline LRESULT CUIFObject::NotifyCommand(WPARAM wParam, LPARAM lParam) +{ + if (m_pParent) + return m_pParent->OnObjectNotify(this, wParam, lParam); + return 0; +} + +/// @unimplemented +inline void CUIFObject::DetachWndObj() +{ + if (m_pWindow) + { + CUIFToolTip *pToolTip = m_pWindow->m_pToolTip; + if (pToolTip) + { + //FIXME + } + m_pWindow->RemoveUIObj(this); + m_pWindow = NULL; + } +} + +inline BOOL CUIFObject::IsRTL() +{ + if (!m_pWindow) + return FALSE; + return !!(m_pWindow->m_style & UIF_STYLE_RTL); +} + +inline CUIFObject* CUIFObject::ObjectFromPoint(POINT pt) +{ + if (!PtInObject(pt)) + return NULL; + + CUIFObject *pFound = this; + for (size_t i = 0; i < m_ObjectArray.size(); ++i) + { + CUIFObject *pObject = m_ObjectArray[i]->ObjectFromPoint(pt); + if (pObject) + pFound = pObject; + } + return pFound; +} + +inline void CUIFObject::SetScheme(CUIFScheme *scheme) +{ + m_pScheme = scheme; + for (size_t i = 0; i < m_ObjectArray.size(); ++i) + { + m_ObjectArray[i]->SetScheme(scheme); + } +} + ///////////////////////////////////////////////////////////////////////////// inline STDMETHODIMP_(void) CUIFColorTableSys::InitColor() @@ -988,6 +1168,17 @@ inline void cicDoneUIFScheme(void) } } +/// @unimplemented +inline CUIFScheme *cicCreateUIFScheme(DWORD type) +{ + return new(cicNoThrow) CUIFScheme(type); +} + +/// @unimplemented +inline CUIFScheme::CUIFScheme(DWORD type) +{ +} + ///////////////////////////////////////////////////////////////////////////// inline CUIFBitmapDC::CUIFBitmapDC(BOOL bMemory) @@ -1223,3 +1414,857 @@ cicCreateShadowMaskBmp(LPRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr1, HBRU CUIFBitmapDC::s_phdcDst->Uninit(TRUE); return CUIFBitmapDC::s_phdcDst->DetachBitmap(); } + +///////////////////////////////////////////////////////////////////////////// + +inline CUIFWindow::CUIFWindow(HINSTANCE hInst, DWORD style) + : CUIFObject(NULL, 0, NULL, style) +{ + m_hInst = hInst; + m_nLeft = 200; + m_nTop = 200; + m_nWidth = 200; + m_nHeight = 200; + m_hWnd = 0; + m_pWindow = this; + m_pCaptured = NULL; + m_pUnknown7 = NULL; + m_pPointed = NULL; + m_dwUnknown8 = 0; + m_pToolTip = NULL; + m_pShadow = NULL; + m_bShowShadow = TRUE; + m_dwUnknown9 = 0; + CUIFWindow::CreateScheme(); +} + +inline CUIFWindow::~CUIFWindow() +{ + if (m_pToolTip) + { + delete m_pToolTip; + m_pToolTip = NULL; + } + if (m_pShadow) + { + delete m_pShadow; + m_pShadow = NULL; + } + for (size_t i = m_ObjectArray.size(); i > 0; ) + { + --i; + CUIFObject *pObject = m_ObjectArray[i]; + m_ObjectArray[i] = NULL; + m_ObjectArray.Remove(pObject); + delete pObject; + } + if (m_pScheme) + { + delete m_pScheme; + m_pScheme = NULL; + } +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFWindow::Initialize() +{ + LPCTSTR pszClass = GetClassName(); + + WNDCLASSEX wcx; + ZeroMemory(&wcx, sizeof(wcx)); + wcx.cbSize = sizeof(WNDCLASSEXW); + if (!::GetClassInfoEx(m_hInst, pszClass, &wcx)) + { + ZeroMemory(&wcx, sizeof(wcx)); + wcx.cbSize = sizeof(wcx); + wcx.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wcx.lpfnWndProc = CUIFWindow::WindowProcedure; + wcx.cbClsExtra = 0; + wcx.cbWndExtra = sizeof(LONG_PTR) * 2; + wcx.hInstance = m_hInst; + wcx.hIcon = NULL; + wcx.hCursor = ::LoadCursor(NULL, IDC_ARROW); + wcx.lpszClassName = pszClass; + wcx.hbrBackground = NULL; + wcx.lpszMenuName = NULL; + wcx.hIconSm = NULL; + ::RegisterClassEx(&wcx); + } + + cicUpdateUIFSys(); + cicUpdateUIFScheme(); + + if (m_style & UIF_STYLE_TOOLTIP) + { + //FIXME: Create m_pToolTip + } + if (m_style & UIF_STYLE_SHADOW) + { + //FIXME: Create m_pShadow + } + + return CUIFObject::Initialize(); +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnUser(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + ; +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnSettingChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +inline void CUIFWindow::UpdateUI(LPCRECT prc) +{ + if (::IsWindow(m_hWnd)) + ::InvalidateRect(m_hWnd, prc, FALSE); +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnCreate(HWND hWnd) +{ +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnDestroy(HWND hWnd) +{ + +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnNCDestroy(HWND hWnd) +{ +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnKeyUp(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ +} + +inline CUIFWindow* +CUIFWindow::GetThis(HWND hWnd) +{ + return (CUIFWindow *)GetWindowLongPtr(hWnd, GWLP_USERDATA); +} + +inline void +CUIFWindow::SetThis(HWND hWnd, LONG_PTR dwNewLong) +{ + ::SetWindowLongPtr(hWnd, GWLP_USERDATA, dwNewLong); +} + +inline void CUIFWindow::CreateScheme() +{ + if (m_pScheme) + { + delete m_pScheme; + m_pScheme = NULL; + } + + INT iScheme = 0; + if (m_style & 0x10000000) + iScheme = 1; + else if (m_style & 0x20000000) + iScheme = 2; + else if (m_style & 0x40000000) + iScheme = 3; + else + iScheme = 0; + + m_pScheme = cicCreateUIFScheme(iScheme); + SetScheme(m_pScheme); +} + +inline LPCTSTR CUIFWindow::GetClassName() +{ + return TEXT("CiceroUIWndFrame"); +} + +inline LPCTSTR CUIFWindow::GetWndText() +{ + return TEXT("CiceroUIWndFrame"); +} + +inline STDMETHODIMP_(DWORD) +CUIFWindow::GetWndStyle() +{ + DWORD ret; + + if (m_style & UIF_STYLE_CHILD) + ret = WS_CHILD | WS_CLIPSIBLINGS; + else + ret = WS_POPUP | WS_DISABLED; + + if (m_style & 0x10000000) + ret |= WS_BORDER; + else if (m_style & 8) + ret |= WS_DLGFRAME; + else if ((m_style & 0x20000000) || (m_style & 0x10)) + ret |= WS_BORDER; + + return ret; +} + +inline STDMETHODIMP_(DWORD) +CUIFWindow::GetWndStyleEx() +{ + DWORD ret = 0; + if (m_style & UIF_STYLE_TOPMOST) + ret = WS_EX_TOPMOST; + if (m_style & UIF_STYLE_TOOLWINDOW) + ret |= WS_EX_TOOLWINDOW; + if (m_style & UIF_STYLE_RTL) + ret |= WS_EX_LAYOUTRTL; + return ret; +} + +inline STDMETHODIMP_(HWND) +CUIFWindow::CreateWnd(HWND hwndParent) +{ + DWORD style = GetWndStyle(); + LPCTSTR text = GetWndText(); + LPCTSTR clsName = GetClassName(); + DWORD exstyle = GetWndStyleEx(); + HWND hWnd = CreateWindowEx(exstyle, + clsName, + text, + style, + m_nLeft, + m_nTop, + m_nWidth, + m_nHeight, + hwndParent, + NULL, + m_hInst, + this); + if (m_pToolTip) + m_pToolTip->CreateWnd(hWnd); + if (m_pShadow) + m_pShadow->CreateWnd(hWnd); + return hWnd; +} + +inline void CUIFWindow::Show(BOOL bVisible) +{ + if (!IsWindow(m_hWnd)) + return; + + if (bVisible && (m_style & 2)) + ::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); + + m_bVisible = bVisible; + ::ShowWindow(m_hWnd, (bVisible ? SW_SHOWNOACTIVATE : 0)); +} + +inline STDMETHODIMP_(BOOL) +CUIFWindow::AnimateWnd(DWORD dwTime, DWORD dwFlags) +{ + if (!::IsWindow(m_hWnd)) + return FALSE; + + BOOL bVisible = !(dwFlags & 0x10000); + OnAnimationStart(); + BOOL ret = ::AnimateWindow(m_hWnd, dwTime, dwFlags); + if (!ret) + m_bVisible = bVisible; + OnAnimationEnd(); + return ret; +} + +inline void CUIFWindow::SetCaptureObject(CUIFObject *pCaptured) +{ + if (pCaptured) + { + m_pCaptured = pCaptured; + SetCapture(TRUE); + } + else + { + m_pCaptured = NULL; + SetCapture(FALSE); + } +} + +inline STDMETHODIMP_(void) +CUIFWindow::SetCapture(BOOL bSet) +{ + if (bSet) + ::SetCapture(m_hWnd); + else + ::ReleaseCapture(); +} + +inline void CUIFWindow::SetObjectPointed(CUIFObject *pPointed, POINT pt) +{ + if (pPointed == m_pPointed) + return; + + if (m_pCaptured) + { + if (m_pCaptured == m_pPointed) + { + if (m_pPointed->m_bEnable) + m_pPointed->OnUnPoint(pt.x, pt.y); + } + } + else if (m_pPointed) + { + if (m_pPointed->m_bEnable) + m_pPointed->OnUnPoint(pt.x, pt.y); + } + + m_pPointed = pPointed; + + if (m_pCaptured) + { + if (m_pCaptured == m_pPointed) + { + if (m_pPointed->m_bEnable) + m_pPointed->OnPoint(pt.x, pt.y); + } + } + else if (!m_pPointed) + { + if (m_pPointed->m_bEnable) + m_pPointed->OnPoint(pt.x, pt.y); + } +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnObjectMoved(CUIFObject *pObject) +{ + if (!::IsWindow(m_hWnd)) + return; + + POINT pt; + ::GetCursorPos(&pt); + ::ScreenToClient(m_hWnd, &pt); + POINT pt2 = pt; + CUIFObject *pFound = ObjectFromPoint(pt); + SetObjectPointed(pFound, pt2); +} + +inline STDMETHODIMP_(void) +CUIFWindow::SetRect(LPCRECT prc) +{ + RECT Rect; + ::SetRectEmpty(&Rect); + + if (::IsWindow(m_hWnd)) + ::GetClientRect(m_hWnd, &Rect); + + CUIFObject::SetRect(&Rect); +} + +inline STDMETHODIMP_(void) +CUIFWindow::ClientRectToWindowRect(LPRECT lpRect) +{ + DWORD style, exstyle; + if (::IsWindow(m_hWnd)) + { + style = ::GetWindowLongPtr(m_hWnd, GWL_STYLE); + exstyle = ::GetWindowLongPtr(m_hWnd, GWL_EXSTYLE); + } + else + { + style = GetWndStyle(); + exstyle = GetWndStyleEx(); + } + ::AdjustWindowRectEx(lpRect, style, FALSE, exstyle); +} + +inline STDMETHODIMP_(void) +CUIFWindow::GetWindowFrameSize(LPSIZE pSize) +{ + RECT rc; + ::SetRectEmpty(&rc); + + ClientRectToWindowRect(&rc); + pSize->cx = (rc.right - rc.left) / 2; + pSize->cy = (rc.bottom - rc.top) / 2; +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnAnimationEnd() +{ + if (m_pShadow && m_bShowShadow) + m_pShadow->Show(m_bVisible); +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnThemeChanged(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + ClearTheme(); +} + +/// @unimplemented +inline LRESULT +CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_GETOBJECT: + return OnGetObject(hWnd, WM_GETOBJECT, wParam, lParam); + + case WM_SYSCOLORCHANGE: + cicUpdateUIFScheme(); + OnSysColorChange(); + return 0; + + case WM_ENDSESSION: + OnEndSession(hWnd, wParam, lParam); + return 0; + + case WM_SHOWWINDOW: + if (m_pShadow && m_bShowShadow) + m_pShadow->Show(wParam); + return OnShowWindow(hWnd, WM_SHOWWINDOW, wParam, lParam); + + case WM_SETTINGCHANGE: + cicUpdateUIFSys(); + cicUpdateUIFScheme(); + return OnSettingChange(hWnd, WM_SETTINGCHANGE, wParam, lParam); + case WM_SETCURSOR: + { + POINT Point; + ::GetCursorPos(&Point); + ::ScreenToClient(m_hWnd, &Point); + //FIXME + return 1; + } + case WM_MOUSEACTIVATE: + return MA_NOACTIVATE; + case WM_ERASEBKGND: + return OnEraseBkGnd(hWnd, WM_ERASEBKGND, wParam, lParam); + case WM_CREATE: + SetRect(NULL); + OnCreate(hWnd); + return 0; + case WM_DESTROY: + if (m_pToolTip && ::IsWindow(m_pToolTip->m_hWnd)) + ::DestroyWindow(m_pToolTip->m_hWnd); + if (m_pShadow && ::IsWindow(m_pShadow->m_hWnd)) + { + ::DestroyWindow(m_pShadow->m_hWnd); + } + OnDestroy(hWnd); + return 0; + case WM_SIZE: + SetRect(NULL); + return 0; + case WM_ACTIVATE: + return OnActivate(hWnd, WM_ACTIVATE, wParam, lParam); + case WM_SETFOCUS: + OnSetFocus(hWnd); + return 0; + case WM_KILLFOCUS: + OnKillFocus(hWnd); + return 0; + case WM_PAINT: + { + PAINTSTRUCT Paint; + HDC hDC = ::BeginPaint(hWnd, &Paint); + PaintObject(hDC, &Paint.rcPaint); + ::EndPaint(hWnd, &Paint); + return 0; + } + case WM_PRINTCLIENT: + { + PaintObject((HDC)wParam, NULL); + return 0; + } + case WM_THEMECHANGED: + { + OnThemeChanged(hWnd, wParam, lParam); + return 0; + } + case WM_COMMAND: + return 0; + case WM_TIMER: + //FIXME + return 0; + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONDBLCLK: + case WM_LBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONDBLCLK: + case WM_MBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONDBLCLK: + case WM_RBUTTONUP: + { + //FIXME + HandleMouseMsg(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return 0; + } + case WM_KEYUP: + OnKeyUp(hWnd, wParam, lParam); + return 0; + case WM_WINDOWPOSCHANGING: + { + WINDOWPOS *pwp = (WINDOWPOS *)lParam; + if (m_pShadow && (pwp->flags & SWP_HIDEWINDOW)) + m_pShadow->Show(FALSE); + if (!(pwp->flags & SWP_NOZORDER) && pwp->hwndInsertAfter == m_pShadow->m_hWnd) + pwp->flags |= SWP_NOZORDER; + //m_pShadow->OnOwnerWndMoved(!(pwp->flags & SWP_NOSIZE)); //FIXME + return OnWindowPosChanging(hWnd, WM_WINDOWPOSCHANGING, wParam, lParam); + } + case WM_WINDOWPOSCHANGED: + { + //WINDOWPOS *pwp = (WINDOWPOS *)lParam; + //if (m_pShadow) //FIXME + // m_pShadow->OnOwnerWndMoved(!(pwp->flags & SWP_NOSIZE)); + return OnWindowPosChanged(hWnd, WM_WINDOWPOSCHANGED, wParam, lParam); + } + case WM_NOTIFY: + OnNotify(hWnd, wParam, lParam); + return 0; + case WM_NOTIFYFORMAT: + return OnNotifyFormat(hWnd, wParam, lParam); + case WM_DISPLAYCHANGE: + cicUpdateUIFSys(); + cicUpdateUIFScheme(); + return OnDisplayChange(hWnd, WM_DISPLAYCHANGE, wParam, lParam); + case WM_NCDESTROY: + OnNCDestroy(hWnd); + return 0; + case WM_KEYDOWN: + OnKeyDown(hWnd, wParam, lParam); + return 0; + default: + { + if (uMsg >= WM_USER) + { + CUIFWindow *pThis = CUIFWindow::GetThis(hWnd); + pThis->OnUser(hWnd, uMsg, wParam, lParam); + return 0; + } + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); + } + } + + return 0; +} + +inline LRESULT CALLBACK +CUIFWindow::WindowProcedure(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CUIFWindow *This; + + if (uMsg == WM_NCCREATE) + { + This = (CUIFWindow*)((CREATESTRUCT*)lParam)->lpCreateParams; + CUIFWindow::SetThis(hWnd, (LONG_PTR)This); + This->m_hWnd = hWnd; + } + else + { + This = CUIFWindow::GetThis(hWnd); + } + + if (uMsg == WM_GETMINMAXINFO) + { + if (This) + return This->WindowProc(hWnd, uMsg, wParam, lParam); + else + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); + } + + if (!This) + return 0; + + if (uMsg == WM_NCDESTROY) + { + This->m_hWnd = NULL; + ::SetWindowLongPtr(hWnd, GWLP_USERDATA, 0); + } + + return This->WindowProc(hWnd, uMsg, wParam, lParam); +} + +inline BOOL +CUIFWindow::GetWorkArea(LPCRECT prcWnd, LPRECT prcWorkArea) +{ + if (!(m_style & 0x180)) + return 0; + + HMONITOR hMon = ::MonitorFromRect(prcWnd, MONITOR_DEFAULTTONEAREST); + MONITORINFO mi; + mi.cbSize = sizeof(MONITORINFO); + if (!hMon || !::GetMonitorInfo(hMon, &mi)) + { + if (m_style & 0x80) + return ::SystemParametersInfo(SPI_GETWORKAREA, 0, prcWorkArea, 0); + + if (m_style & 0x100) + { + prcWorkArea->top = 0; + prcWorkArea->left = 0; + prcWorkArea->right = ::GetSystemMetrics(SM_CXSCREEN); + prcWorkArea->bottom = ::GetSystemMetrics(SM_CYSCREEN); + return TRUE; + } + + return FALSE; + } + + if (m_style & 0x80) + { + *prcWorkArea = mi.rcWork; + return TRUE; + } + + if (m_style & 0x100) + { + *prcWorkArea = mi.rcMonitor; + return TRUE; + } + + return FALSE; +} + +/// @unimplemented +inline void +CUIFWindow::AdjustWindowPosition() +{ + //FIXME +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFWindow::PaintObject(HDC hDC, LPCRECT prc) +{ + BOOL bGotDC = FALSE; + if (!hDC) + { + hDC = ::GetDC(m_hWnd); + bGotDC = TRUE; + } + + LPCRECT pRect = prc; + if (!pRect) + pRect = &m_rc; + + HDC hMemDC = ::CreateCompatibleDC(hDC); + if (!hMemDC) + return; + + HBITMAP hbmMem = ::CreateCompatibleBitmap(hDC, + pRect->right - pRect->left, + pRect->bottom - pRect->top); + if (hbmMem) + { + HGDIOBJ hbmOld = ::SelectObject(hMemDC, hbmMem); + ::SetViewportOrgEx(hMemDC, -pRect->left, -pRect->top, NULL); + + if ((FAILED(CUIFTheme::EnsureThemeData(m_hWnd)) || + !(m_style & 1) || + FAILED(DrawThemeParentBackground(m_hWnd, hMemDC, &m_rc))) && + FAILED(DrawThemeBackground(hMemDC, m_dwUnknown2, &m_rc, 0))) + { + //if (m_pScheme) + // m_pScheme->FillRect(hMemDC, pRect, 22); //FIXME + } + CUIFObject::PaintObject(hMemDC, pRect); + ::BitBlt(hDC, + pRect->left, pRect->top, + pRect->right - pRect->left, pRect->bottom - pRect->top, + hMemDC, + pRect->left, pRect->top, + SRCCOPY); + ::SelectObject(hMemDC, hbmOld); + ::DeleteObject(hbmMem); + } + ::DeleteDC(hMemDC); + + if (bGotDC) + ::ReleaseDC(m_hWnd, hDC); +} + +inline STDMETHODIMP_(void) +CUIFWindow::Move(INT x, INT y, INT nWidth, INT nHeight) +{ + m_nLeft = x; + m_nTop = y; + if (nWidth >= 0) + m_nWidth = nWidth; + if (nHeight >= 0) + m_nHeight = nHeight; + if (::IsWindow(m_hWnd)) + { + AdjustWindowPosition(); + ::MoveWindow(m_hWnd, m_nLeft, m_nTop, m_nWidth, m_nHeight, TRUE); + } +} + +inline STDMETHODIMP_(void) +CUIFWindow::RemoveUIObj(CUIFObject *pRemove) +{ + if (pRemove == m_pCaptured) + SetCaptureObject(NULL); + if (pRemove == m_pUnknown7) + { + m_pUnknown7 = NULL; + ::KillTimer(m_hWnd, 0x5461); + } + if (pRemove == m_pPointed) + m_pPointed = NULL; + CUIFObject::RemoveUIObj(pRemove); +} + +inline STDMETHODIMP_(void) +CUIFWindow::HandleMouseMsg(UINT uMsg, LONG x, LONG y) +{ + POINT pt = { x, y }; + + CUIFObject *pFound = (CUIFWindow *)ObjectFromPoint(pt); + + SetObjectPointed(pFound, pt); + + if (m_pCaptured) + pFound = m_pCaptured; + + if (!pFound || OnSetCursor(uMsg, pt.x, pt.y)) + { + HCURSOR hCursor = ::LoadCursor(NULL, IDC_ARROW); + ::SetCursor(hCursor); + } + + if (pFound && pFound->m_bEnable) + { + switch (uMsg) + { + case WM_MOUSEMOVE: + pFound->OnMouseMove(pt.x, pt.y); + break; + case WM_LBUTTONDOWN: + pFound->OnLButtonDown(pt.x, pt.y); + break; + case WM_LBUTTONUP: + pFound->OnLButtonUp(pt.x, pt.y); + break; + case WM_RBUTTONDOWN: + pFound->OnRButtonDown(pt.x, pt.y); + break; + case WM_RBUTTONUP: + pFound->OnRButtonUp(pt.x, pt.y); + break; + case WM_MBUTTONDOWN: + pFound->OnMButtonDown(pt.x, pt.y); + break; + case WM_MBUTTONUP: + pFound->OnMButtonUp(pt.x, pt.y); + break; + } + } +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnSetFocus(HWND hWnd) +{ +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFWindow::OnLButtonDown2(LONG x, LONG y) +{ + //FIXME +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnKillFocus(HWND hWnd) +{ +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnNotify(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFWindow::OnTimer(WPARAM wParam) +{ + //FIXME +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnSysColorChange() +{ +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnEndSession(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnKeyDown(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnActivate(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnWindowPosChanging(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnNotifyFormat(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnShowWindow(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnDisplayChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +inline STDMETHODIMP_(LRESULT) +CUIFWindow::OnGetObject(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +inline STDMETHODIMP_(BOOL) +CUIFWindow::OnEraseBkGnd(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFWindow::OnSetCapture(HWND hWnd, UINT, LONG) +{ +} + +inline STDMETHODIMP_(void) +CUIFWindow::OnAnimationStart() +{ +}

1 0

[reactos] 01/01: [LABEL] Update Romanian (ro-RO) translation (#6258)
by Andrei Miloiu 06 Jan '24

06 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55bc06fa7ab14ba4862de… commit 55bc06fa7ab14ba4862de3e6b67329467dd0f4d1 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Jan 7 00:01:23 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 23:01:23 2024 +0100 [LABEL] Update Romanian (ro-RO) translation (#6258) --- base/applications/cmdutils/label/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/cmdutils/label/lang/ro-RO.rc b/base/applications/cmdutils/label/lang/ro-RO.rc index 4060f2abb2b..fe1df81ad2a 100644 --- a/base/applications/cmdutils/label/lang/ro-RO.rc +++ b/base/applications/cmdutils/label/lang/ro-RO.rc @@ -11,10 +11,10 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN // STRING_LABEL_HELP "Afișează sau modifică eticheta unei unități (de stocare).\n\nLABEL [unitate:][etichetă]\n" - STRING_LABEL_HELP "Crează, schimbă sau șterge denumirea unui dispozitiv.\n\n\ -LABEL [dispozitiv:][denumire]\n\n\ - dispozitiv: Specifică litera unui dispozitiv.\n\ - denumire Specifică denumirea unui dispozitiv." + STRING_LABEL_HELP "Crează, schimbă sau șterge denumirea unui disc.\n\n\ +LABEL [disc:][denumire]\n\n\ + disc: Specifică litera unui disc.\n\ + denumire Specifică denumirea unui disc." STRING_LABEL_TEXT1 "Volumul unității %c: este denumit ca %s\n" STRING_LABEL_TEXT2 "Volumul unității %c: nu este denumit.\n" STRING_LABEL_TEXT3 "Numărul de serie al volumului este %04X-%04X\n"

1 0

[reactos] 01/01: [IPCONFIG] Update Romanian (ro-RO) translation (#6281)
by Andrei Miloiu 06 Jan '24

06 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0103c55fa85688852ad8d… commit 0103c55fa85688852ad8d4f033bfecfe8d5a8fab Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jan 6 23:58:31 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 22:58:31 2024 +0100 [IPCONFIG] Update Romanian (ro-RO) translation (#6281) --- base/applications/network/ipconfig/lang/ro-RO.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index 12bb29f70bc..45a52ea7871 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -139,6 +139,6 @@ BEGIN au numele începând cu ""EL"".\n\ > ipconfig /release *Con* ... Detașează conexiunile care conțin în\n\ numele lor secvența ""Con"".\n\ - ex. ""Local Area Connection 1"" sau\n\ - ""Local Area Connection 2""\n" + ex. ""Conexiune locală 1"" sau\n\ + ""Conexiune locală 2""\n" END

1 0

[reactos] 01/01: [APPWIZ] Improve Romanian (ro-RO) translation (#6272)
by Andrei Miloiu 06 Jan '24

06 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d882d57046eff5a921fde… commit d882d57046eff5a921fde51696ed955c060df50a Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jan 6 23:56:56 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 6 22:56:56 2024 +0100 [APPWIZ] Improve Romanian (ro-RO) translation (#6272) --- dll/cpl/appwiz/lang/ro-RO.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 075537b22af..7efb8dc83ee 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -88,8 +88,8 @@ BEGIN IDS_INVALID_SHA "Suma de control a fișierului descărcat nu corespunde. Deoarece fișierul a fost corupt, instalarea trebuie abandonată." IDS_NEW_INTERNET_SHORTCUT "Creare scurtătură la Internet" IDS_DWL_FAILED "Descărcarea pachetului Gecko a eșuat. Asigurați-vă că aveți conexiune la internet pentru a putea descărca. Expertul va continua fără a instala pachetul Gecko." - IDS_CANTMAKEINETSHORTCUT "Eșec în crearea scurtăturii la Internet." - IDS_CANTMAKESHORTCUT "Eșec în crearea scurtăturii." + IDS_CANTMAKEINETSHORTCUT "Nu s-a putut crea scurtătura la Internet." + IDS_CANTMAKESHORTCUT "Nu s-a putut crea scurtătura." IDS_NO_MEMORY "Nu a putut fi alocată memorie!" IDS_NO_DIRECTORY "Nu a fost dat niciun director!" IDS_INVALID_PATH "Calea dată este nevalidă!"

1 0

← Newer
1
...
12
13
14
15
16
17
18
19
Older →

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 January 2024