Ros-diffs January 2024

ros-diffs@reactos.org

17 participants
181 discussions

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenu::SetMenuFont (#6403)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3056f253e430e13f4ad1a… commit 3056f253e430e13f4ad1a8c80b3ffe2705247424 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 15:57:45 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 15:57:45 2024 +0900 [SDK] cicuif.h: Fix CUIFMenu::SetMenuFont (#6403) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenu::SetMenuFont method. --- sdk/include/reactos/cicero/cicuif.h | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index e48cdbad0ab..7ae16842900 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -4487,9 +4487,8 @@ CUIFToolbarMenuButton::CUIFToolbarMenuButton( { m_pToolbarButton = pParent; - HFONT hFont = ::CreateFont(8, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SYMBOL_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, - DEFAULT_PITCH | FF_DONTCARE, TEXT("Marlett")); + HFONT hFont = ::CreateFontW(8, 8, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, + 0, 0, 0, 0, L"Marlett"); SetFont(hFont); SetText(L"u"); // downward triangle } @@ -5791,10 +5790,26 @@ inline void CUIFMenu::PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam) } } -/// @unimplemented inline void CUIFMenu::SetMenuFont() { - //FIXME + LONG height = 14; + + NONCLIENTMETRICS ncm = { sizeof(ncm) }; + if (::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0)) + { + HFONT hFont = ::CreateFontIndirect(&ncm.lfMenuFont); + SetFont(hFont); + + LONG lfHeight = ncm.lfMenuFont.lfHeight; + if (lfHeight < 0) + lfHeight = -lfHeight; + height = (ncm.iMenuHeight + lfHeight) / 2; + } + + m_hMenuFont = ::CreateFontW(height, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, + 0, 0, 0, 0, L"Marlett"); + INT cxSmallIcon = ::GetSystemMetrics(SM_CXSMICON); + m_cxyMargin = max(height, cxSmallIcon) + 2; } inline void CUIFMenu::SetSelectedId(UINT nSelectID)

11 months

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::Init (#6405)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f465035cd91c5d543fd01… commit f465035cd91c5d543fd013ff6bc2adfb80b2229d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 14:42:17 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 14:42:17 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::Init (#6405) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::Init method. --- sdk/include/reactos/cicero/cicuif.h | 50 +++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 46a63d8462d..e48cdbad0ab 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5911,10 +5911,56 @@ inline CUIFMenuItem::~CUIFMenuItem() } } -/// @unimplemented inline BOOL CUIFMenuItem::Init(UINT nMenuItemID, LPCWSTR pszText) { - //FIXME + m_nMenuItemID = nMenuItemID; + + if (!pszText) + { + m_pszMenuItemLeft = NULL; + m_cchMenuItemLeft = 0; + return TRUE; + } + + INT cch = lstrlenW(pszText); + m_pszMenuItemLeft = new(cicNoThrow) WCHAR[cch + 1]; + if (!m_pszMenuItemLeft) + return FALSE; + + const WCHAR *pch0 = pszText; + INT ich1, ich2; + for (ich1 = 0; *pch0 && *pch0 != L'\t'; ++ich1, ++pch0) + { + if (*pch0 == L'&' && *++pch0 != L'&') + { + m_nMenuItemVKey = ::VkKeyScanW(*pch0); + if (!m_nMenuItemVKey) + m_nMenuItemVKey = (BYTE)VkKeyScanA(*(BYTE*)pch0); + m_ichMenuItemPrefix = ich1; + } + m_pszMenuItemLeft[ich1] = *pch0; + } + m_pszMenuItemLeft[ich1] = 0; + m_cchMenuItemLeft = lstrlenW(m_pszMenuItemLeft); + + if (*pch0 == L'\t') + { + m_cchMenuItemRight = 0; + m_pszMenuItemRight = new(cicNoThrow) WCHAR[cch + 1]; + if (m_pszMenuItemRight) + { + ++pch0; + WCHAR wch = *pch0; + for (ich2 = 0; *pch0; ++ich2) + { + m_pszMenuItemRight[ich2] = wch; + wch = *++pch0; + } + m_pszMenuItemRight[ich2] = 0; + m_cchMenuItemRight = lstrlenW(m_pszMenuItemRight); + } + } + return TRUE; }

11 months

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::DrawBitmapProc (#6404)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21e759735ea386077540b… commit 21e759735ea386077540bffd44b193b4b3745d81 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 14:41:46 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 14:41:46 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::DrawBitmapProc (#6404) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::DrawBitmapProc method. --- sdk/include/reactos/cicero/cicuif.h | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index ba366c6f674..46a63d8462d 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5940,10 +5940,38 @@ inline void CUIFMenuItem::DrawArrow(HDC hDC, INT xLeft, INT yTop) ::SelectObject(hDC, hFontOld); } -/// @unimplemented inline void CUIFMenuItem::DrawBitmapProc(HDC hDC, INT xLeft, INT yTop) { - //FIXME + if (!m_pScheme || !m_hbmColor) + return; + + BITMAP bm; + ::GetObject(m_hbmColor, sizeof(bm), &bm); + + INT width = m_pMenu->m_cxyMargin, height = m_rc.bottom - m_rc.top; + if (width > bm.bmWidth) + { + width = bm.bmWidth; + xLeft += (width - bm.bmWidth) / 2; + } + if (height > bm.bmHeight) + { + height = bm.bmHeight; + yTop += (height - bm.bmHeight) / 2; + } + + RECT rc = { xLeft, yTop, xLeft + width, yTop + height }; + + if (IsRTL()) + m_pScheme->m_bMirroring = TRUE; + + if (m_pMenu->m_pSelectedItem != this || m_bMenuItemDisabled) + m_pScheme->DrawFrameCtrlBitmap(hDC, &rc, m_hbmColor, m_hbmMask, 0); + else + m_pScheme->DrawFrameCtrlBitmap(hDC, &rc, m_hbmColor, m_hbmMask, UIF_DRAW_PRESSED); + + if (IsRTL()) + m_pScheme->m_bMirroring = FALSE; } inline void CUIFMenuItem::DrawCheck(HDC hDC, INT xLeft, INT yTop)

11 months

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenu::InitShow (#6402)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f170276fd263b4c697400… commit f170276fd263b4c69740042beda9fa534abd45f4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 14:41:04 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 14:41:04 2024 +0900 [SDK] cicuif.h: Fix CUIFMenu::InitShow (#6402) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenu::InitShow method. --- sdk/include/reactos/cicero/cicuif.h | 149 +++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 257df7162d8..ba366c6f674 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5579,11 +5579,156 @@ inline void CUIFMenu::HandleMouseMsg(UINT uMsg, LONG x, LONG y) CUIFWindow::HandleMouseMsg(uMsg, x, y); } -/// @unimplemented inline STDMETHODIMP_(BOOL) CUIFMenu::InitShow(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag, BOOL bDoAnimation) { - //FIXME + HWND hWnd = NULL; + if (pWindow) + hWnd = *pWindow; + + CreateWnd(hWnd); + + m_bHasMargin = FALSE; + + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + if (m_MenuItems[iItem]) + m_MenuItems[iItem]->InitMenuExtent(); + } + + INT cxMax = 0; + + m_cxMenuExtent = 0; + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + CUIFMenuItem *pItem = m_MenuItems[iItem]; + if (!pItem) + continue; + + INT cxItem = m_cxyMargin + pItem->m_MenuLeftExtent.cx; + if (cxMax < cxItem) + cxMax = cxItem; + m_cxMenuExtent = max(m_cxMenuExtent, pItem->m_MenuRightExtent.cx); + if (!m_bHasMargin && pItem->m_hbmColor && pItem->IsCheck()) + m_bHasMargin = TRUE; + } + + RECT rcItem = { 0, 0, 0, 0 }; + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + CUIFMenuItem *pItem = m_MenuItems[iItem]; + if (!pItem) + continue; + + INT cyItem = pItem->m_MenuLeftExtent.cy; + rcItem.right = rcItem.left + cxMax + m_cxMenuExtent; + rcItem.bottom = rcItem.top + cyItem; + pItem->SetRect(&rcItem); + rcItem.top += cyItem; + AddUIObj(pItem); + } + + rcItem.top = 0; + DWORD style = ::GetWindowLongPtr(hWnd, GWL_STYLE); + cxMax = rcItem.right; + INT cyMax = rcItem.bottom; + if (style & WS_DLGFRAME) + { + cxMax = rcItem.right + 2 * ::GetSystemMetrics(SM_CXDLGFRAME); + cyMax += 2 * ::GetSystemMetrics(SM_CYDLGFRAME); + } + else if (style & WS_BORDER) + { + cxMax = rcItem.right + 2 * ::GetSystemMetrics(SM_CXBORDER); + cyMax += 2 * ::GetSystemMetrics(SM_CYBORDER); + } + + RECT rc = { 0, 0, ::GetSystemMetrics(SM_CXSCREEN), ::GetSystemMetrics(SM_CYSCREEN) }; + + RECT rc3 = *prc; + HMONITOR hMon = ::MonitorFromRect(&rc3, MONITOR_DEFAULTTONEAREST); + if (hMon) + { + MONITORINFO mi = { sizeof(mi) }; + if (::GetMonitorInfo(hMon, &mi)) + rc = mi.rcMonitor; + } + + if (m_style & 0x200) + rcItem.left -= cxMax; + + INT x, y; + DWORD dwFlags2 = 0; + + if (bFlag) + { + INT bottom = prc->bottom; + x = rcItem.left + prc->left; + if (rcItem.top + bottom + cyMax > rc.bottom) + { + bottom = prc->top - cyMax; + dwFlags2 = 8; + } + else + { + dwFlags2 = 4; + } + + y = rcItem.top + bottom; + + if (rcItem.left + cxMax + prc->right > rc.right) + x = rc.right - cxMax; + } + else + { + y = rcItem.top + prc->top; + if (rcItem.left + prc->right + cxMax > rc.right) + { + x = rcItem.left + prc->left - cxMax; + dwFlags2 = 2; + } + else + { + x = rcItem.left + prc->right; + dwFlags2 = 1; + } + if (rcItem.top + cyMax + prc->bottom > rc.bottom) + y = rc.bottom - cyMax; + } + + if (x > rc.right - cxMax) + x = rc.right - cxMax; + if (x < rc.left) + x = rc.left; + if (y > rc.bottom - cyMax) + y = rc.bottom - cyMax; + if (y < rc.top) + y = rc.top; + + Move(x, y, cxMax, -1); + + SetRect(NULL); + + BOOL bAnimation = FALSE; + if (bDoAnimation && + ::SystemParametersInfo(SPI_GETMENUANIMATION, 0, &bAnimation, 0) && bAnimation) + { + BOOL bMenuFade = FALSE; + if (!::SystemParametersInfoA(SPI_GETMENUFADE, 0, &bMenuFade, 0)) + bMenuFade = FALSE; + + DWORD dwFlags = (bMenuFade ? 0x80000 : dwFlags2) | 0x40000; + if (!AnimateWnd(200, dwFlags)) + Show(TRUE); + } + else + { + Show(TRUE); + } + + if (m_pVisibleSubMenu) + m_pVisibleSubMenu->m_pParentMenu = this; + return TRUE; }

11 months

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFBalloonWindow::CreateRegion (#6401)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3ae595df9739cd95d220… commit f3ae595df9739cd95d220bd28c3a778fc27bdf8f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 14:40:31 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 14:40:31 2024 +0900 [SDK] cicuif.h: Fix CUIFBalloonWindow::CreateRegion (#6401) Implementing Language Bar... JIRA issue: CORE-19363 - Implement CUIFBalloonWindow::CreateRegion method. --- sdk/include/reactos/cicero/cicuif.h | 54 ++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 52305dcef14..257df7162d8 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5204,12 +5204,60 @@ CUIFBalloonWindow::AdjustPos() //FIXME } -/// @unimplemented inline HRGN CUIFBalloonWindow::CreateRegion(LPCRECT prc) { - //FIXME - return NULL; + POINT Points[4]; + HRGN hRgn; + BOOL bFlag = FALSE; + LONG x, y; + + switch (m_nBalloonType) + { + case 1: + hRgn = ::CreateRoundRectRgn(prc->left, prc->top + 16, prc->right, prc->bottom, 16, 16); + y = prc->top + 16; + bFlag = TRUE; + break; + + case 2: + hRgn = ::CreateRoundRectRgn(prc->left, prc->top, prc->right - 16, prc->bottom, 16, 16); + x = prc->right - 17; + break; + + case 3: + hRgn = ::CreateRoundRectRgn(prc->left + 16, prc->top, prc->right, prc->bottom, 16, 16); + x = prc->left + 16; + break; + + default: + hRgn = ::CreateRoundRectRgn(prc->left, prc->top, prc->right, prc->bottom - 16, 16, 16); + y = prc->bottom - 17; + bFlag = TRUE; + break; + } + + if (bFlag) + { + x = Points[1].x = m_ptBalloon.x; + Points[1].y = m_ptBalloon.y; + Points[0].y = Points[2].y = Points[3].y = y; + Points[2].x = x + 10 * (2 * (m_dwUnknown8[0] == 0) - 1); + } + else + { + Points[2].x = x; + y = Points[0].y = Points[1].y = Points[3].y = m_ptBalloon.y; + Points[1].x = m_ptBalloon.x; + Points[2].y = y + 10 * (2 * (m_dwUnknown8[0] == 2) - 1); + } + + Points[0].x = Points[3].x = x; + + HRGN hPolygonRgn = ::CreatePolygonRgn(Points, _countof(Points), WINDING); + ::CombineRgn(hRgn, hRgn, hPolygonRgn, RGN_OR); + ::DeleteObject(hPolygonRgn); + return hRgn; } inline void

11 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFMenu and CUIFMenuItem (#6400)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=062890ac5f29cdd6ddad3… commit 062890ac5f29cdd6ddad3601cbcbec8451a5e455 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 23 20:33:43 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 23 20:33:43 2024 +0900 [SDK] cicuif.h: Add CUIFMenu and CUIFMenuItem (#6400) Supporting Language Bar... JIRA issue: CORE-19363 - Half-implement CUIFMenu and CUIFMenuItem. - Reduce lines. --- sdk/include/reactos/cicero/cicarray.h | 6 + sdk/include/reactos/cicero/cicuif.h | 920 ++++++++++++++++++++++++---------- 2 files changed, 659 insertions(+), 267 deletions(-) diff --git a/sdk/include/reactos/cicero/cicarray.h b/sdk/include/reactos/cicero/cicarray.h index a9d4f4963ad..880188b5186 100644 --- a/sdk/include/reactos/cicero/cicarray.h +++ b/sdk/include/reactos/cicero/cicarray.h @@ -33,6 +33,12 @@ public: T_ITEM* data() const { return (T_ITEM*)m_pb; } size_t size() const { return m_cItems; } bool empty() const { return !size(); } + void clear() + { + cicMemFree(m_pb); + m_pb = NULL; + m_cItems = m_cCapacity = 0; + } T_ITEM& operator[](size_t iItem) { diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index fc05fb72f33..52305dcef14 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -24,6 +24,7 @@ class CUIFTheme; class CUIFToolTip; class CUIFShadow; class CUIFBalloonWindow; + class CUIFMenu; class CUIFButton; class CUIFButton2; class CUIFToolbarMenuButton; @@ -32,6 +33,7 @@ class CUIFTheme; class CUIFToolbarButton; class CUIFWndFrame; class CUIFGripper; + class CUIFMenuItem; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; @@ -51,7 +53,7 @@ public: BOOL m_bHighContrast1; BOOL m_bHighContrast2; - CUIFSystemInfo(); + CUIFSystemInfo() { } void GetSystemMetrics(); void Initialize(); }; @@ -230,10 +232,12 @@ public: LRESULT NotifyCommand(WPARAM wParam, LPARAM lParam); CUIFObject* ObjectFromPoint(POINT pt); void SetScheme(CUIFScheme *scheme); + void StartTimer(WPARAM wParam); + void EndTimer(); - STDMETHOD_(void, Initialize)(); + STDMETHOD_(void, Initialize)() { } STDMETHOD_(void, OnPaint)(HDC hDC); - STDMETHOD_(void, OnUnknown9)() { } // FIXME: name + STDMETHOD_(void, OnTimer)() { } STDMETHOD_(void, OnLButtonDown)(LONG x, LONG y) { } STDMETHOD_(void, OnMButtonDown)(LONG x, LONG y) { } STDMETHOD_(void, OnRButtonDown)(LONG x, LONG y) { } @@ -258,13 +262,13 @@ public: STDMETHOD_(void, RemoveUIObj)(CUIFObject *pObject); STDMETHOD_(LRESULT, OnObjectNotify)(CUIFObject *pObject, WPARAM wParam, LPARAM lParam); STDMETHOD_(void, SetToolTip)(LPCWSTR pszToolTip); - STDMETHOD_(LPCWSTR, GetToolTip)(); - STDMETHOD_(LRESULT, OnShowToolTip)(); + STDMETHOD_(LPCWSTR, GetToolTip)() { return m_pszToolTip; } + STDMETHOD_(LRESULT, OnShowToolTip)() { return 0; } STDMETHOD_(void, OnHideToolTip)() { } STDMETHOD_(void, DetachWndObj)(); STDMETHOD_(void, ClearWndObj)(); - STDMETHOD_(BOOL, OnPaintTheme)(HDC hDC); - STDMETHOD_(void, OnPaintNoTheme)(HDC hDC); + STDMETHOD_(BOOL, OnPaintTheme)(HDC hDC) { return FALSE; } + STDMETHOD_(void, OnPaintNoTheme)(HDC hDC) { } STDMETHOD_(void, ClearTheme)(); }; @@ -485,8 +489,8 @@ public: STDMETHOD_(INT, CyMenuItem)(INT cyText) override; STDMETHOD_(INT, CxSizeFrame)() override; STDMETHOD_(INT, CySizeFrame)() override; - STDMETHOD_(INT, CxWndBorder)() override; - STDMETHOD_(INT, CyWndBorder)() override; + STDMETHOD_(INT, CxWndBorder)() override { return 1; } + STDMETHOD_(INT, CyWndBorder)() override { return 1; } STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) override; STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD dwDrawFlags, LPSIZE pSize) override; STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) override; @@ -540,11 +544,11 @@ protected: INT m_nWidth; HINSTANCE m_hInst; HWND m_hWnd; - CUIFWindow *m_pUnknown7; + CUIFObject *m_pTimerObject; CUIFObject *m_pCaptured; CUIFObject *m_pPointed; BOOL m_bPointing; - CUIFWindow *m_pPointingWindow; + CUIFWindow *m_pBehindModal; CUIFToolTip *m_pToolTip; CUIFShadow *m_pShadow; BOOL m_bShowShadow; @@ -552,9 +556,10 @@ protected: friend class CUIFShadow; friend class CUIFToolTip; friend class CUIFButton; + friend class CUIFMenu; public: - enum { POINTING_TIMER_ID = 0x7982 }; + enum { POINTING_TIMER_ID = 0x7982, USER_TIMER_ID = 0x5461 }; operator HWND() const { return m_hWnd; } CUIFWindow(HINSTANCE hInst, DWORD style); ~CUIFWindow() override; @@ -573,45 +578,54 @@ public: void CreateScheme(); BOOL GetWorkArea(LPCRECT prcWnd, LPRECT prcWorkArea); void AdjustWindowPosition(); + void SetBehindModal(CUIFWindow *pBehindModal); + void SetTimerObject(CUIFObject *pTimerObject, UINT uElapse); static LRESULT CALLBACK WindowProcedure(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - STDMETHOD_(LPCTSTR, GetClassName)(); - STDMETHOD_(LPCTSTR, GetWndTitle)(); + STDMETHOD_(LPCTSTR, GetClassName)() { return TEXT("CiceroUIWndFrame"); } + STDMETHOD_(LPCTSTR, GetWndTitle)() { return TEXT("CiceroUIWndFrame"); } 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, OnPointingEnded)(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_(void, OnPointingEnded)(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) + { return 0; } + STDMETHOD_(LRESULT, OnWindowPosChanged)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { return 0; } + STDMETHOD_(LRESULT, OnWindowPosChanging)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { return 0; } + STDMETHOD_(LRESULT, OnNotifyFormat)(HWND hWnd, WPARAM wParam, LPARAM lParam) { return 0; } + STDMETHOD_(LRESULT, OnShowWindow)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { return 0; } 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, OnDisplayChange)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { return 0; } + STDMETHOD_(LRESULT, OnGetObject)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { return 0; } STDMETHOD_(LRESULT, WindowProc)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - STDMETHOD_(BOOL, OnEraseBkGnd)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + STDMETHOD_(BOOL, OnEraseBkGnd)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { return FALSE; } STDMETHOD_(void, OnThemeChanged)(HWND hWnd, WPARAM wParam, LPARAM lParam); STDMETHOD_(void, UpdateUI)(LPCRECT prc); STDMETHOD_(void, SetCapture)(int); - STDMETHOD_(void, OnPointingMouse)(UINT uMsg, LONG x, LONG y); - STDMETHOD_(void, OnAnimationStart)(); + STDMETHOD_(void, ModalMouseNotify)(UINT uMsg, LONG x, LONG y) { } + STDMETHOD_(void, OnAnimationStart)() { } STDMETHOD_(void, OnAnimationEnd)(); STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y); STDMETHOD_(void, ClientRectToWindowRect)(LPRECT pRect); @@ -692,6 +706,113 @@ public: ///////////////////////////////////////////////////////////////////////////// +// m_style flags for CUIFMenu +enum +{ + UIF_MENU_USE_OFF10 = 0x10000000, +}; + +class CUIFMenu : public CUIFWindow +{ +public: + CUIFMenu *m_pVisibleSubMenu; + CUIFMenu *m_pParentMenu; + CUIFMenuItem *m_pSelectedItem; + UINT m_nSelectedID; + CicArray<CUIFMenuItem*> m_MenuItems; + HFONT m_hMenuFont; + BOOL m_bModal; + BOOL m_bHasMargin; + DWORD m_dwUnknown14; + LONG m_cxyMargin; + LONG m_cxMenuExtent; + friend class CUIFMenuItem; + +public: + CUIFMenu(HINSTANCE hInst, DWORD style, DWORD dwUnknown14); + ~CUIFMenu() override; + + void CancelMenu(); + void ClearMenuFont(); + CUIFMenuItem* GetNextItem(CUIFMenuItem *pItem); + CUIFMenuItem* GetPrevItem(CUIFMenuItem *pItem); + CUIFMenu* GetTopSubMenu(); + BOOL InsertItem(CUIFMenuItem *pItem); + BOOL InsertSeparator(); + void PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam); + void SetMenuFont(); + void SetSelectedId(UINT nSelectID); + void SetSelectedItem(CUIFMenuItem *pItem); + UINT ShowModalPopup(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag); + void ShowSubPopup(CUIFMenu *pSubMenu, LPCRECT prc, BOOL bFlag); + + STDMETHOD_(void, OnKeyDown)(HWND hWnd, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y) override; + STDMETHOD_(void, ModalMouseNotify)(UINT uMsg, LONG x, LONG y) override; + + STDMETHOD_(void, ModalMessageLoop)(); + STDMETHOD_(BOOL, InitShow)(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag, BOOL bDoAnimation); + STDMETHOD_(BOOL, UninitShow)(); +}; + +///////////////////////////////////////////////////////////////////////////// + +class CUIFMenuItem : public CUIFObject +{ +protected: + UINT m_nMenuItemID; + LPWSTR m_pszMenuItemLeft; + INT m_cchMenuItemLeft; + LPWSTR m_pszMenuItemRight; + INT m_cchMenuItemRight; + UINT m_nMenuItemVKey; + UINT m_ichMenuItemPrefix; + HBITMAP m_hbmColor; + HBITMAP m_hbmMask; + BOOL m_bMenuItemChecked; + BOOL m_bMenuItemForceChecked; + BOOL m_bMenuItemGrayed; + BOOL m_bMenuItemDisabled; + CUIFMenu *m_pMenu; + CUIFMenu *m_pSubMenu; + SIZE m_MenuLeftExtent; + SIZE m_MenuRightExtent; + friend class CUIFMenu; + + void DrawArrow(HDC hDC, INT x, INT y); + void DrawBitmapProc(HDC hDC, INT xLeft, INT yTop); + void DrawCheck(HDC hDC, INT xLeft, INT yTop); + void DrawUnderline(HDC hDC, INT cxMargin, INT cyMargin, HBRUSH hbr); + +public: + CUIFMenuItem(CUIFMenu *pMenu, BOOL bDisabled); + ~CUIFMenuItem() override; + + BOOL Init(UINT nMenuItemID, LPCWSTR pszText); + + BOOL IsCheck(); + void Check(BOOL bChecked) { m_bMenuItemChecked = bChecked; } + void Gray(BOOL bGrayed) { m_bMenuItemGrayed = bGrayed; } + + void SetBitmap(HBITMAP hbmColor) { m_hbmColor = hbmColor; } + void SetBitmapMask(HBITMAP hbmMask); + void SetSub(CUIFMenu *pSubMenu) { m_pSubMenu = pSubMenu; } + + void ShowSubPopup(); + + STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; + STDMETHOD_(void, OnMouseIn)(LONG x, LONG y) override; + STDMETHOD_(void, OnPaint)(HDC hDC) override; + STDMETHOD_(void, OnTimer)() override; + + STDMETHOD_(void, InitMenuExtent)(); + STDMETHOD_(void, OnPaintO10)(HDC hDC); + STDMETHOD_(void, OnPaintDef)(HDC hDC); + STDMETHOD_(void, OnUnknownMethod)() { } // FIXME: method name +}; + +///////////////////////////////////////////////////////////////////////////// + // m_style flags for CUIFButton enum { @@ -931,8 +1052,8 @@ public: ~CUIFBalloonWindow() override; STDMETHOD_(void, Initialize)() override; - STDMETHOD_(LPCTSTR, GetClassName)() override; - STDMETHOD_(LPCTSTR, GetWndTitle)() override; + STDMETHOD_(LPCTSTR, GetClassName)() override { return TEXT("MSIME_PopupMessage"); } + STDMETHOD_(LPCTSTR, GetWndTitle)() override { return TEXT("MSIME_PopupMessage"); } STDMETHOD_(void, OnCreate)(HWND hWnd) override; STDMETHOD_(void, OnDestroy)(HWND hWnd) override; STDMETHOD_(void, OnKeyDown)(HWND hWnd, WPARAM wParam, LPARAM lParam) override; @@ -979,16 +1100,6 @@ inline void cicDoneUIFLib(void) ///////////////////////////////////////////////////////////////////////////// -inline CUIFSystemInfo::CUIFSystemInfo() -{ - dwMajorVersion = 4; - dwMinorVersion = 0; - dwBuildNumber = 0; - dwPlatformId = VER_PLATFORM_WIN32_WINDOWS; - m_cBitsPixels = 8; - m_bHighContrast1 = m_bHighContrast2 = FALSE; -} - inline void CUIFSystemInfo::GetSystemMetrics() { HDC hDC = ::GetDC(NULL); @@ -1243,15 +1354,12 @@ CUIFObject::~CUIFObject() m_pszToolTip = NULL; } - for (;;) + for (size_t iObj = m_ObjectArray.size(); iObj > 0; ) { - CUIFObject *pLast = m_ObjectArray.GetLast(); - if (!pLast) - break; - - m_ObjectArray.Remove(pLast); - delete pLast; + --iObj; + delete m_ObjectArray[iObj]; } + m_ObjectArray.clear(); if (m_pWindow) m_pWindow->RemoveUIObj(this); @@ -1259,10 +1367,6 @@ CUIFObject::~CUIFObject() CloseThemeData(); } -inline STDMETHODIMP_(void) CUIFObject::Initialize() -{ -} - inline STDMETHODIMP_(void) CUIFObject::OnPaint(HDC hDC) { if (!(m_pWindow->m_style & UIF_WINDOW_ENABLETHEMED) || !OnPaintTheme(hDC)) @@ -1393,16 +1497,6 @@ inline STDMETHODIMP_(void) CUIFObject::SetToolTip(LPCWSTR pszToolTip) } } -inline STDMETHODIMP_(LPCWSTR) CUIFObject::GetToolTip() -{ - return m_pszToolTip; -} - -inline STDMETHODIMP_(LRESULT) CUIFObject::OnShowToolTip() -{ - return 0; -} - inline STDMETHODIMP_(void) CUIFObject::ClearWndObj() { m_pWindow = NULL; @@ -1410,15 +1504,6 @@ inline STDMETHODIMP_(void) CUIFObject::ClearWndObj() m_ObjectArray[iItem]->ClearWndObj(); } -inline STDMETHODIMP_(BOOL) CUIFObject::OnPaintTheme(HDC hDC) -{ - return FALSE; -} - -inline STDMETHODIMP_(void) CUIFObject::OnPaintNoTheme(HDC hDC) -{ -} - inline STDMETHODIMP_(void) CUIFObject::ClearTheme() { CloseThemeData(); @@ -1502,6 +1587,18 @@ inline void CUIFObject::SetScheme(CUIFScheme *scheme) } } +inline void CUIFObject::StartTimer(WPARAM wParam) +{ + if (m_pWindow) + m_pWindow->SetTimerObject(this, wParam); +} + +inline void CUIFObject::EndTimer() +{ + if (m_pWindow) + m_pWindow->SetTimerObject(NULL, 0); +} + ///////////////////////////////////////////////////////////////////////////// inline STDMETHODIMP_(void) CUIFColorTableSys::InitColor() @@ -1688,16 +1785,6 @@ inline STDMETHODIMP_(INT) CUIFSchemeDef::CySizeFrame() return ::GetSystemMetrics(SM_CYSIZEFRAME); } -inline STDMETHODIMP_(INT) CUIFSchemeDef::CxWndBorder() -{ - return 1; -} - -inline STDMETHODIMP_(INT) CUIFSchemeDef::CyWndBorder() -{ - return 1; -} - inline STDMETHODIMP_(void) CUIFScheme::FillRect(HDC hDC, LPCRECT prc, INT iColor) { ::FillRect(hDC, prc, GetBrush(iColor)); @@ -1888,7 +1975,7 @@ CUIFSchemeDef::DrawCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, else { UINT uFlags = DST_BITMAP; - if (dwDrawFlags & 0x20) + if (dwDrawFlags & UIF_DRAW_DISABLED) uFlags |= (DSS_MONO | DSS_DISABLED); ::DrawState(hDC, NULL, NULL, (LPARAM)hbm1, 0, @@ -2425,13 +2512,13 @@ inline CUIFWindow::CUIFWindow(HINSTANCE hInst, DWORD style) m_hWnd = 0; m_pWindow = this; m_pCaptured = NULL; - m_pUnknown7 = NULL; + m_pTimerObject = NULL; m_pPointed = NULL; m_bPointing = FALSE; m_pToolTip = NULL; m_pShadow = NULL; m_bShowShadow = TRUE; - m_pPointingWindow = NULL; + m_pBehindModal = NULL; CUIFWindow::CreateScheme(); } @@ -2509,12 +2596,6 @@ CUIFWindow::Initialize() 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) { @@ -2527,31 +2608,10 @@ inline void CUIFWindow::UpdateUI(LPCRECT prc) ::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); + return (CUIFWindow*)GetWindowLongPtr(hWnd, GWLP_USERDATA); } inline void @@ -2582,16 +2642,6 @@ inline void CUIFWindow::CreateScheme() SetScheme(m_pScheme); } -inline LPCTSTR CUIFWindow::GetClassName() -{ - return TEXT("CiceroUIWndFrame"); -} - -inline LPCTSTR CUIFWindow::GetWndTitle() -{ - return TEXT("CiceroUIWndFrame"); -} - inline STDMETHODIMP_(DWORD) CUIFWindow::GetWndStyle() { @@ -2813,9 +2863,9 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ::GetCursorPos(&Point); ::ScreenToClient(m_hWnd, &Point); - if (m_pPointingWindow) + if (m_pBehindModal) { - m_pPointingWindow->OnPointingMouse(HIWORD(lParam), Point.x, Point.y); + m_pBehindModal->ModalMouseNotify(HIWORD(lParam), Point.x, Point.y); return TRUE; } @@ -2888,10 +2938,10 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (wParam) { - case 0x5461: + case USER_TIMER_ID: { - if (m_pUnknown7) - m_pUnknown7->OnUnknown9(); + if (m_pTimerObject) + m_pTimerObject->OnTimer(); break; } case POINTING_TIMER_ID: @@ -2907,7 +2957,7 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (::PtInRect(&rc, pt) && ::WindowFromPoint(pt) == m_hWnd) { - m_pPointingWindow->OnPointingMouse(WM_MOUSEMOVE, pt2.x, pt2.y); + m_pBehindModal->ModalMouseNotify(WM_MOUSEMOVE, pt2.x, pt2.y); } else { @@ -2943,8 +2993,8 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_RBUTTONDBLCLK: case WM_RBUTTONUP: { - if (m_pPointingWindow) - m_pPointingWindow->OnPointingMouse(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + if (m_pBehindModal) + m_pBehindModal->ModalMouseNotify(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); else HandleMouseMsg(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); break; @@ -3090,6 +3140,25 @@ CUIFWindow::AdjustWindowPosition() m_nTop = rcWorkArea.bottom - m_nHeight; } +inline void CUIFWindow::SetBehindModal(CUIFWindow *pBehindModal) +{ + m_pBehindModal = pBehindModal; +} + +inline void CUIFWindow::SetTimerObject(CUIFObject *pTimerObject, UINT uElapse) +{ + if (pTimerObject) + { + m_pTimerObject = pTimerObject; + ::SetTimer(m_hWnd, USER_TIMER_ID, uElapse, NULL); + } + else + { + m_pTimerObject = NULL; + ::KillTimer(m_hWnd, USER_TIMER_ID); + } +} + /// @unimplemented inline STDMETHODIMP_(void) CUIFWindow::PaintObject(HDC hDC, LPCRECT prc) @@ -3163,14 +3232,15 @@ CUIFWindow::RemoveUIObj(CUIFObject *pRemove) if (pRemove == m_pCaptured) SetCaptureObject(NULL); - if (pRemove == m_pUnknown7) + if (pRemove == m_pTimerObject) { - m_pUnknown7 = NULL; - ::KillTimer(m_hWnd, 0x5461); + m_pTimerObject = NULL; + ::KillTimer(m_hWnd, USER_TIMER_ID); } if (pRemove == m_pPointed) m_pPointed = NULL; + CUIFObject::RemoveUIObj(pRemove); } @@ -3221,104 +3291,6 @@ CUIFWindow::HandleMouseMsg(UINT uMsg, LONG x, LONG y) } } -inline STDMETHODIMP_(void) -CUIFWindow::OnSetFocus(HWND hWnd) -{ -} - -inline STDMETHODIMP_(void) -CUIFWindow::OnPointingEnded(LONG x, LONG y) -{ -} - -inline STDMETHODIMP_(void) -CUIFWindow::OnKillFocus(HWND hWnd) -{ -} - -inline STDMETHODIMP_(void) -CUIFWindow::OnNotify(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ -} - -inline STDMETHODIMP_(void) -CUIFWindow::OnTimer(WPARAM wParam) -{ -} - -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; -} - -inline STDMETHODIMP_(void) -CUIFWindow::OnPointingMouse(UINT uMsg, LONG x, LONG y) -{ -} - -inline STDMETHODIMP_(void) -CUIFWindow::OnAnimationStart() -{ -} - ///////////////////////////////////////////////////////////////////////////// /// @unimplemented @@ -3769,8 +3741,8 @@ CUIFToolTip::RelayEvent(LPMSG pMsg) inline STDMETHODIMP_(void) CUIFToolTip::OnPaint(HDC hDC) { - HGDIOBJ hFontOld = SelectObject(hDC, m_hFont); - INT iBkModeOld = SetBkMode(hDC, TRANSPARENT); + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + INT iBkModeOld = ::SetBkMode(hDC, TRANSPARENT); COLORREF rgbTextColor = GetTipTextColor(); COLORREF rgbOldTextColor = ::SetTextColor(hDC, rgbTextColor); @@ -3858,7 +3830,7 @@ CUIFButton::DrawBitmapProc(HDC hDC, LPCRECT prc, BOOL bPressed) ::DrawState(hDC, NULL, NULL, (LPARAM)hbmMask, 0, prc->left + bPressed, prc->top + bPressed, width - bPressed, height - bPressed, - (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED)) | DST_BITMAP); + DST_BITMAP | (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED))); ::DeleteObject(hbmMask); } else @@ -3866,7 +3838,7 @@ CUIFButton::DrawBitmapProc(HDC hDC, LPCRECT prc, BOOL bPressed) ::DrawState(hDC, NULL, NULL, (LPARAM)m_hbmButton1, 0, prc->left + bPressed, prc->top + bPressed, width - bPressed, height - bPressed, - (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED)) | DST_BITMAP); + DST_BITMAP | (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED))); } } @@ -3929,7 +3901,7 @@ inline void CUIFButton::DrawIconProc(HDC hDC, LPRECT prc, BOOL bPressed) ::SelectObject(hMemDC, hbmOld); ::DrawState(hDC, NULL, NULL, (LPARAM)hbmMem, 0, prc->left, prc->top, width, height, - (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED)) | DST_BITMAP); + DST_BITMAP | (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED))); ::DeleteObject(hbmMem); ::DeleteDC(hMemDC); } @@ -5048,22 +5020,16 @@ CUIFBalloonWindow::CUIFBalloonWindow(HINSTANCE hInst, DWORD style) : CUIFWindow( m_nActionID = -1; m_hRgn = NULL; m_pszBalloonText = NULL; - m_bHasBkColor = FALSE; - m_bHasTextColor = FALSE; + m_bHasBkColor = m_bHasTextColor = FALSE; m_rgbBkColor = 0; m_rgbTextColor = 0; - m_ptTarget.x = 0; - m_ptTarget.y = 0; - m_rcExclude.left = 0; - m_rcExclude.right = 0; - m_rcExclude.top = 0; - m_rcExclude.bottom = 0; + m_ptTarget.x = m_ptTarget.y = 0; + ZeroMemory(&m_rcExclude, sizeof(m_rcExclude)); m_dwUnknown7 = 0; m_nBalloonType = 0; m_dwUnknown8[0] = 0; m_dwUnknown8[1] = 0; - m_ptBalloon.x = 0; - m_ptBalloon.y = 0; + m_ptBalloon.x = m_ptBalloon.y = 0; m_cButtons = 0; m_hwndNotif = NULL; m_uNotifMsg = 0; @@ -5099,18 +5065,6 @@ CUIFBalloonWindow::Initialize() } } -inline STDMETHODIMP_(LPCTSTR) -CUIFBalloonWindow::GetClassName() -{ - return TEXT("MSIME_PopupMessage"); -} - -inline STDMETHODIMP_(LPCTSTR) -CUIFBalloonWindow::GetWndTitle() -{ - return TEXT("MSIME_PopupMessage"); -} - inline STDMETHODIMP_(void) CUIFBalloonWindow::OnCreate(HWND hWnd) { @@ -5296,7 +5250,7 @@ CUIFBalloonWindow::FindUIObject(UINT nObjectID) inline COLORREF CUIFBalloonWindow::GetBalloonBkColor() { - if (m_bHasBkColor ) + if (m_bHasBkColor) return m_rgbBkColor; else return ::GetSysColor(COLOR_INFOBK); @@ -5457,3 +5411,435 @@ CUIFBalloonWindow::SendNotification(WPARAM wParam) if (m_hwndNotif) ::PostMessage(m_hwndNotif, m_uNotifMsg, wParam, 0); } + +///////////////////////////////////////////////////////////////////////////// + +inline CUIFMenu::CUIFMenu( + HINSTANCE hInst, + DWORD style, + DWORD dwUnknown14) : CUIFWindow(hInst, style) +{ + m_nSelectedID = -1; + m_dwUnknown14 = dwUnknown14; + SetMenuFont(); +} + +inline CUIFMenu::~CUIFMenu() +{ + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + delete m_MenuItems[iItem]; + + ::DeleteObject(m_hMenuFont); + ClearMenuFont(); +} + +inline void CUIFMenu::CancelMenu() +{ + if (m_pVisibleSubMenu) + { + UninitShow(); + } + else if (m_bModal) + { + SetSelectedId(0xFFFFFFFF); + ::PostMessage(m_hWnd, WM_NULL, 0, 0); + } +} + +inline void CUIFMenu::ClearMenuFont() +{ + SetFont(NULL); + ::DeleteObject(m_hFont); +} + +inline CUIFMenuItem* +CUIFMenu::GetNextItem(CUIFMenuItem *pItem) +{ + size_t iItem, cItems = m_MenuItems.size(); + + if (cItems == 0) + return NULL; + + if (!m_pSelectedItem) + return m_MenuItems[0]; + + for (iItem = 0; iItem < cItems; ) + { + if (m_MenuItems[iItem++] == pItem) + break; + } + + for (;;) + { + if (iItem == cItems) + iItem = 0; + if (!m_MenuItems[iItem] || !m_MenuItems[iItem]->m_bMenuItemDisabled) + break; + ++iItem; + } + + return m_MenuItems[iItem]; +} + +inline CUIFMenuItem* +CUIFMenu::GetPrevItem(CUIFMenuItem *pItem) +{ + ssize_t iItem, cItems = m_MenuItems.size(); + + if (cItems == 0) + return NULL; + + if (!m_pSelectedItem) + return m_MenuItems[cItems - 1]; + + for (iItem = cItems - 1; iItem >= 0; ) + { + if (m_MenuItems[iItem--] == pItem) + break; + } + + for (;;) + { + if (iItem < 0) + iItem = cItems - 1; + if (!m_MenuItems[iItem] || !m_MenuItems[iItem]->m_bMenuItemDisabled) + break; + --iItem; + } + + return m_MenuItems[iItem]; +} + +inline CUIFMenu* +CUIFMenu::GetTopSubMenu() +{ + CUIFMenu *pMenu; + for (pMenu = this; pMenu->m_pParentMenu; pMenu = pMenu->m_pParentMenu) + ; + return pMenu; +} + +inline void CUIFMenu::HandleMouseMsg(UINT uMsg, LONG x, LONG y) +{ + POINT pt = { x, y }; + if (!::PtInRect(&m_rc, pt) && + (uMsg == WM_LBUTTONDOWN || uMsg == WM_RBUTTONDOWN || uMsg == WM_LBUTTONUP || uMsg == WM_RBUTTONUP)) + { + SetSelectedId(-1); + PostMessage(m_hWnd, WM_NULL, 0, 0); + } + CUIFWindow::HandleMouseMsg(uMsg, x, y); +} + +/// @unimplemented +inline STDMETHODIMP_(BOOL) +CUIFMenu::InitShow(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag, BOOL bDoAnimation) +{ + //FIXME + return TRUE; +} + +inline BOOL CUIFMenu::InsertItem(CUIFMenuItem *pItem) +{ + CUIFMenuItem **ppAdded = m_MenuItems.Append(1); + if (!ppAdded) + return FALSE; + + *ppAdded = pItem; + pItem->SetFont(m_hFont); + return TRUE; +} + +/// @unimplemented +inline BOOL CUIFMenu::InsertSeparator() +{ + //FIXME + return FALSE; +} + +inline STDMETHODIMP_(void) +CUIFMenu::ModalMessageLoop() +{ + MSG msg; + + while (::GetMessage(&msg, 0, 0, 0) && msg.message != WM_NULL && + (msg.hwnd == m_hWnd || msg.message <= WM_MOUSEFIRST || WM_MOUSELAST <= msg.message)) + { + if (!msg.hwnd && WM_KEYFIRST <= msg.message && msg.message <= WM_KEYLAST) + msg.hwnd = GetTopSubMenu()->m_hWnd; + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } +} + +inline STDMETHODIMP_(void) +CUIFMenu::ModalMouseNotify(UINT uMsg, LONG x, LONG y) +{ + if (uMsg == WM_LBUTTONDOWN || uMsg == WM_RBUTTONDOWN) + CancelMenu(); +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFMenu::OnKeyDown(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + //FIXME +} + +inline void CUIFMenu::PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam) +{ + if (m_bModal) + { + // NOTE: hWnd parameter will be populated in CUIFMenu::ModalMessageLoop. + if (bUp) + ::PostMessage(NULL, WM_KEYUP, wParam, lParam); + else + ::PostMessage(NULL, WM_KEYDOWN, wParam, lParam); + } +} + +/// @unimplemented +inline void CUIFMenu::SetMenuFont() +{ + //FIXME +} + +inline void CUIFMenu::SetSelectedId(UINT nSelectID) +{ + CUIFMenu *pMenu = this; + + while (pMenu->m_pVisibleSubMenu) + pMenu = pMenu->m_pVisibleSubMenu; + + pMenu->m_nSelectedID = nSelectID; +} + +inline void CUIFMenu::SetSelectedItem(CUIFMenuItem *pItem) +{ + CUIFMenuItem *pOldItem = m_pSelectedItem; + if (pOldItem == pItem) + return; + + m_pSelectedItem = pItem; + if (pOldItem) + pOldItem->CallOnPaint(); + if (m_pSelectedItem) + m_pSelectedItem->CallOnPaint(); +} + +inline UINT CUIFMenu::ShowModalPopup(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag) +{ + CUIFObject *pCaptured = NULL; + if (pWindow) + { + pCaptured = pWindow->m_pCaptured; + CUIFWindow::SetCaptureObject(NULL); + } + + UINT nSelectedID = -1; + if (InitShow(pWindow, prc, bFlag, TRUE)) + { + m_bModal = TRUE; + pWindow->SetBehindModal(this); + ModalMessageLoop(); + nSelectedID = m_nSelectedID; + pWindow->SetBehindModal(NULL); + m_bModal = FALSE; + } + + UninitShow(); + + if (pWindow) + pWindow->SetCaptureObject(pCaptured); + + return nSelectedID; +} + +inline void CUIFMenu::ShowSubPopup(CUIFMenu *pSubMenu, LPCRECT prc, BOOL bFlag) +{ + m_pVisibleSubMenu = pSubMenu; + InitShow(pSubMenu, prc, bFlag, TRUE); +} + +inline STDMETHODIMP_(BOOL) +CUIFMenu::UninitShow() +{ + if (m_pParentMenu) + m_pParentMenu->UninitShow(); + + Show(FALSE); + + if (m_pVisibleSubMenu) + m_pVisibleSubMenu->m_pParentMenu = NULL; + + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + RemoveUIObj(m_MenuItems[iItem]); + + ::DestroyWindow(m_hWnd); + return TRUE; +} + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFMenuItem::CUIFMenuItem( + CUIFMenu *pMenu, + BOOL bDisabled) : CUIFObject(pMenu, 0, NULL, 0) +{ + m_ichMenuItemPrefix = -1; + m_nMenuItemID = 0; + m_pszMenuItemLeft = m_pszMenuItemRight = NULL; + m_cchMenuItemLeft = m_cchMenuItemRight = 0; + m_nMenuItemVKey = 0; + m_hbmColor = m_hbmMask = NULL; + m_bMenuItemChecked = m_bMenuItemGrayed = FALSE; + m_bMenuItemDisabled = bDisabled; + m_pMenu = pMenu; +} + +inline CUIFMenuItem::~CUIFMenuItem() +{ + if (m_pszMenuItemLeft) + { + delete[] m_pszMenuItemLeft; + m_pszMenuItemLeft = NULL; + } + + if (m_pszMenuItemRight) + { + delete[] m_pszMenuItemRight; + m_pszMenuItemRight = NULL; + } + + if (m_pSubMenu) + { + delete m_pSubMenu; + m_pSubMenu = NULL; + } +} + +/// @unimplemented +inline BOOL CUIFMenuItem::Init(UINT nMenuItemID, LPCWSTR pszText) +{ + //FIXME + return TRUE; +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFMenuItem::InitMenuExtent() +{ + //FIXME +} + +inline BOOL CUIFMenuItem::IsCheck() +{ + return m_bMenuItemChecked || m_bMenuItemForceChecked; +} + +inline void CUIFMenuItem::DrawArrow(HDC hDC, INT xLeft, INT yTop) +{ + if (!m_pSubMenu) + return; + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_pMenu->m_hMenuFont); + ::TextOutW(hDC, xLeft, yTop, L"4", 1); // rightward triangle + ::SelectObject(hDC, hFontOld); +} + +/// @unimplemented +inline void CUIFMenuItem::DrawBitmapProc(HDC hDC, INT xLeft, INT yTop) +{ + //FIXME +} + +inline void CUIFMenuItem::DrawCheck(HDC hDC, INT xLeft, INT yTop) +{ + if (!IsCheck()) + return; + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_pMenu->m_hMenuFont); + WCHAR wch = (m_bMenuItemChecked ? L'a' : L'h'); // checkmark or bullet + ::TextOutW(hDC, xLeft, yTop, &wch, 1); + ::SelectObject(hDC, hFontOld); +} + +/// @unimplemented +inline void +CUIFMenuItem::DrawUnderline(HDC hDC, INT cxMargin, INT cyMargin, HBRUSH hbr) +{ + //FIXME +} + +inline STDMETHODIMP_(void) +CUIFMenuItem::OnLButtonUp(LONG x, LONG y) +{ + if (!m_bMenuItemGrayed && !m_bMenuItemDisabled && !m_pSubMenu) + { + m_pMenu->SetSelectedId(m_nMenuItemID); + ::PostMessage(*m_pWindow, WM_NULL, 0, 0); + } +} + +inline STDMETHODIMP_(void) +CUIFMenuItem::OnMouseIn(LONG x, LONG y) +{ + if (m_pMenu->m_pParentMenu) + m_pMenu->m_pParentMenu->CancelMenu(); + + if (m_pSubMenu) + { + DWORD Delay; + if (!::SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &Delay, 0)) + Delay = 300; + + CUIFObject::StartTimer(Delay); + } + + m_pMenu->SetSelectedItem(this); +} + +inline STDMETHODIMP_(void) +CUIFMenuItem::OnPaint(HDC hDC) +{ + if (m_pMenu->m_style & UIF_MENU_USE_OFF10) + OnPaintO10(hDC); + else + OnPaintDef(hDC); +} + +/// unimplemented +inline STDMETHODIMP_(void) +CUIFMenuItem::OnPaintO10(HDC hDC) +{ + //FIXME +} + +/// unimplemented +inline STDMETHODIMP_(void) +CUIFMenuItem::OnPaintDef(HDC hDC) +{ + //FIXME +} + +inline STDMETHODIMP_(void) +CUIFMenuItem::OnTimer() +{ + CUIFObject::EndTimer(); + if (m_pMenu->m_pPointed == this) + ShowSubPopup(); +} + +inline void CUIFMenuItem::SetBitmapMask(HBITMAP hbmMask) +{ + m_hbmMask = hbmMask; + CallOnPaint(); +} + +inline void CUIFMenuItem::ShowSubPopup() +{ + RECT rc = m_rc; + ::ClientToScreen(*m_pWindow, (LPPOINT)&rc); + ::ClientToScreen(*m_pWindow, (LPPOINT)&rc.right); + m_pSubMenu->ShowSubPopup(m_pMenu, &rc, FALSE); +}

11 months

[reactos] 01/01: [DOC] Update Romanian translation notes.txt (#6239)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4344ad152161b6f6bb65… commit e4344ad152161b6f6bb65774f88e88e77d173e33 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Jan 21 23:53:35 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 21 22:53:35 2024 +0100 [DOC] Update Romanian translation notes.txt (#6239) --- media/doc/Romanian translation notes.txt | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/media/doc/Romanian translation notes.txt b/media/doc/Romanian translation notes.txt index 4465f470b68..07e6f21fe95 100644 --- a/media/doc/Romanian translation notes.txt +++ b/media/doc/Romanian translation notes.txt @@ -18,34 +18,32 @@ Astfel: 3. În relația utilizator - calculator este adoptată o atitudine informal-autoritară (cu verbe la modul imperativ singular). 4. În relația utilizator - calculator, în cazul etapelor intermediare (având texte delimitate de puncte de suspensie), (în cazul verbelor) este folosit modul infinitiv lung. 5. În relația calculator - utilizator este adoptată o atitudine formal-politicoasă (cu verbe la modul indicativ/conjunctiv, persoana a 2-a, plural). - 6. (omis, vezi 20 de la Particularizări locale) - 7. Este evitată politețea excesivă prin omiterea expresiilor de politețe explicite. - 8. Este recomandată o formulare independentă de gen (gramatical). - 9. Este evitată utilizarea diacriticelor ca taste active (acceleratori sau taste de acces). + 6. Este evitată politețea excesivă prin omiterea expresiilor de politețe explicite. + 7. Este evitată utilizarea diacriticelor ca taste active (acceleratori sau taste de acces). + 8. Este evitată utilizarea diacriticelor ca taste active (acceleratori sau taste de acces). + 9. Este recomandată o formulare independentă de gen (gramatical) dacă nu se cununoaște genul substantivului. 10. Pentru tastele de acces (care răspund la combinația de taste «Alt» + «tastă», evidențiate prin sublinierea tastei respective): - Sunt folosite doar litere sau cifre (recomandare de la Microsoft [2]: „Access keys are alphanumeric keys”). Sunt deci de evitat alte simboluri sau semne de punctuație. - Sunt de evitat (tot conform aceiași recomandări [2]) literele sau cifrele care fac reperarea lor un exercițiu dificil, cum e grupul „l”, „1”, „i” și „I” (din cauza lățimii lor reduse), sau „g”, „j”, „p”, „q” și „y” (care intersectează marcajul de evidențiere). 11. Ghilimelele folosite în limba română sunt perechea ghilimelele-deschise (99 jos) cu ghilimele-închise (99 sus), și ghilimelele unghiulare. La acestea se adaugă și câteva norme (deduse) din „greșeli frecvente” raportate tot la i18n.ro [3]. - 12. Este de evitat articularea inutilă, însă adaptarea mesajelor traduse trebuie totuși să primeze. - 13. Nu sunt traduse numele proprii (cu excepția numelor traductibile ale componentelor/subcomponentelor unui program sau pachet de programe). - 14. Nu este capitalizată decât prima literă dintr-un text. + 12. Nu sunt traduse numele proprii (cu excepția numelor traductibile ale componentelor/subcomponentelor unui program sau pachet de programe). + 13. Nu este capitalizată decât prima literă dintr-un text. * Particularizări locale În resursele românești din ReactOS există și o serie de particularizări care fie nu se regăsesc în alte traduceri fie din cauza diferențelor de natură ale proiectelor, fie e vorba de termeni încă disputați sau neadoptați în localizările altor proiecte din diverse motive. Multe dintre acestea au fost menționate/discutate în grupul „Diacritice” [4]. Câteva dintre cele mai relevante: - 15. În glosar sunt preferate: + 14. În glosar sunt preferate: - „Confirmă”/„Anulează” vs. „OK”/„Renunță” - 16. Acceleratorii (combinațiile de taste de gen „«Ctrl» + «tastă»”) rămân aceiași ca în limba engleză. - 17. Tastele de acces (combinațiile de taste de gen „«Alt» + «tastă»”) nu rămân neapărat la fel ca în limba engleză. În mulțimea de taste cu această utilizare: - - Este recomandată evitarea utilizării literelor „s” și „t” pe post de taste de acces pentru a preveni confuzia între acestea și diacriticele „ș” și „ț”. + 15. Acceleratorii (combinațiile de taste de gen „«Ctrl» + «tastă»”) rămân aceiași ca în limba engleză. + 16. Tastele de acces (combinațiile de taste de gen „«Alt» + «tastă»”) nu rămân neapărat la fel ca în limba engleză. În mulțimea de taste cu această utilizare: - „f” și „n” sunt rezervate pentru „Confirmă” și respectiv „Anulează”; „a” pentru „Aplică” (dacă există în aceiași fereastră). În cazul ferestrelor de tip asistent, „a”, „o”, „f” și „n” sunt rezervate respectiv pentru „Înainte”, „Înapoi”, „Sfârșit” și „Anulează”. [NOTĂ] - În cazul interfețelor grafice opțiunilor „Da” și „Nu” le corespund tastele de acces „a” și „u”. (În cazul interfețelor linie-de-comandă, corespunzătoare opțiunilor „Da/Nu”, care NU sunt taste de acces, rămân „d” și „n”.) - 18. Din considerente de lizibilitate, în cazul programelor executate în linie-de-comandă sunt folosite doar ghilimele unghiulare. Tot ghilimelele unghiulare sunt preferate și pentru citarea tastelor fizice în mesajele elementelor GUI. - 19. Enunțul de la convenția 2 poate fi extins la „traducerile trebuiesc adaptate respectând (și beneficiind de) particularitățile limbii române”, iar următoarele zece coonvenții ce urmează după el (3-13) definesc de fapt reguli implicite aplicabile în lipsa unui context bine definit în toate aspectele sale. Unde este posibil, o adaptare la context este dezirabilă: + 17. Din considerente de lizibilitate, în cazul programelor executate în linie-de-comandă sunt folosite doar ghilimele unghiulare. Tot ghilimelele unghiulare sunt preferate și pentru citarea tastelor fizice în mesajele elementelor GUI. + 18. Enunțul de la convenția 2 poate fi extins la „traducerile trebuiesc adaptate respectând (și beneficiind de) particularitățile limbii române”, iar următoarele zece coonvenții ce urmează după el (3-13) definesc de fapt reguli implicite aplicabile în lipsa unui context bine definit în toate aspectele sale. Unde este posibil, o adaptare la context este dezirabilă: - În cazul opțiunilor despre care există suficiente informații de context, este recomandată flexionarea. De exemplu, opțiunea nulă pentru lista de animații pentru ecran inactiv se poate flexiona în siguranță specificându-i-se genul gramatical feminin - „(nespecificată)”. - În cazul unor subiecte unice (dintr-un context local sau global), este folosită forma articulată. Exemple: „Calculatorul meu” (numai unul, conținut concret), „Sistemul de operare” (unic în cadrul său), „Documentele mele” (conținut concret) vs. „Locații în rețea” (nedefinit), „Linie de comandă” (cu multiple posibile instanțe distincte/independente), etc. - 20. În relația calculator - utilizator, la raportarea de informații, sunt folosite verbe la diateza pasivă (nu reflexivă). Astfel, pentru „Receiving data from %s” vor fi greșite atât „Primesc date de la %s” cât și „Se primesc date de la %s”, deoarece calculatorul nu este un actor ci un instrument, precum și, cu rare excepții, ca spre exemplu în cazul erorilor care pot fi considerate a avea capacitatea de a surveni în execuția unui proces, datele sau alte obiecte nu au nici o capacitate [...] + 19. Diateza reflexivă va fi folosită doar atunci când e necesar. [1] https://web.archive.org/web/20170307094948/http://i18n.ro/Ghidul_traduc%C4%… [2] https://msdn.microsoft.com/en-us/library/ms971323.aspx#atg_keyboardshortcut…

11 months, 1 week

[reactos] 01/01: [SYSSETUP] Update Romanian (ro-RO) translation (#6344)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62f645b7530693bc6fb61… commit 62f645b7530693bc6fb617d5dd57bc9ad9adc2a1 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Jan 21 23:44:42 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 21 22:44:42 2024 +0100 [SYSSETUP] Update Romanian (ro-RO) translation (#6344) --- dll/win32/syssetup/lang/ro-RO.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 1a1cae8c6a0..c29adaaf9be 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -3,8 +3,8 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> - * Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2022-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -16,7 +16,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bun venit la etapa secundă de instalare ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 LTEXT "Acest expert va finaliza instalarea ReactOS. În cele ce urmează expertul va culege niște informații despre calculator pentru a instala ReactOS corect.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Apăsați Înainte pentru a continua.", IDC_STATIC, 115, 169, 195, 17 END IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 @@ -28,7 +28,7 @@ BEGIN LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOS este oferit sub licența GPL, astfel reutilizarea sau redistribuția sa (sau a părților sale componente), cere respectarea licenței GPL.", IDC_STATIC, 15, 110, 234, 19 PUSHBUTTON "Afișează &GPL", IDC_VIEWGPL, 251, 110, 50, 19 - LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 15, 136, 195, 17 + LTEXT "Apăsați Înainte pentru a continua.", IDC_STATIC, 15, 136, 195, 17 END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 @@ -134,9 +134,9 @@ CAPTION "Expert de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Sfârșit de instalare ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Instalarea ReactOS a fost finalizată cu succes.\nDupă apasarea butonului „Sfârșit”, calculatorul va reporni.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Instalarea ReactOS a fost finalizată cu succes.\nDupă apasarea butonului Sfârșit, calculatorul va reporni.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Dacă aveți vreun CD introdus în calculator, scoateți-l. Pentru a reporni calculatorul, apăsați „Sfârșit”.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Dacă aveți vreun CD introdus în calculator, scoateți-l. Pentru a reporni calculatorul, apăsați Sfârșit.", IDC_STATIC, 115, 169, 195, 17 END IDD_GPL DIALOGEX 0, 0, 333, 230

11 months, 1 week

[reactos] 01/01: [CHKSDK] Update Romanian (ro-RO) translation (#6354)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d77a9713e9d54cf7202e… commit 7d77a9713e9d54cf7202e876f018ddc61e13990c Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Jan 21 23:42:41 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 21 22:42:41 2024 +0100 [CHKSDK] Update Romanian (ro-RO) translation (#6354) --- base/system/chkdsk/lang/ro-RO.rc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/system/chkdsk/lang/ro-RO.rc b/base/system/chkdsk/lang/ro-RO.rc index ee85bd05328..8b7e5b7a174 100644 --- a/base/system/chkdsk/lang/ro-RO.rc +++ b/base/system/chkdsk/lang/ro-RO.rc @@ -1,8 +1,9 @@ /* - * PROJECT: Check Disk utility - * LICENSE: See COPYING in the top level directory + * PROJECT: ReactOS Disk Checking Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file - * COPYRIGHT: Copyright 2018 George Bișoc (george.bisoc(a)reactos.org) + * TRANSLATORS: Copyright 2018 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -10,8 +11,8 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "\n\ -Uz: %s [drive:] [-F] [-V] [-R] [-C]\n\n\ -[drive:] Specifică unitatea de stocare pentru control.\n\ +Uz: %s [disc:] [-F] [-V] [-R] [-C]\n\n\ +[disc:] Specifică unitatea de stocare pentru control.\n\ -F Rezolvă erorile discului.\n\ -V Vizualizează calea tuturor fișierelor de pe disc.\n\ -R Găsește sectoarele defecte și recuperează informațiile care pot fi citite.\n\

11 months, 1 week

[reactos] 01/01: [SERVICES] Separate the start tag and the service tag of the manages services

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3d67bf5bd99c03371f82… commit d3d67bf5bd99c03371f82497bf82f0c84e98658b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 21 22:42:26 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 21 22:42:26 2024 +0100 [SERVICES] Separate the start tag and the service tag of the manages services This fixes two winetest errors. --- base/system/services/database.c | 8 ++++---- base/system/services/services.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 3ec18104158..1b7b2e67af9 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -4,7 +4,7 @@ * FILE: base/system/services/database.c * PURPOSE: Database control interface * COPYRIGHT: Copyright 2002-2006 Eric Kohl - * Copyright 2006 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright 2006 Hervé Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * Gregor Brunmar <gregor.brunmar(a)home.se> * @@ -201,7 +201,7 @@ ScmGetServiceNameFromTag(IN PTAG_INFO_NAME_FROM_TAG_IN_PARAMS InParams, ServiceListEntry); /* We must match the tag */ - if (CurrentService->dwTag == InParams->dwTag && + if (CurrentService->dwServiceTag == InParams->dwTag && CurrentService->lpImage != NULL) { CurrentImage = CurrentService->lpImage; @@ -757,7 +757,7 @@ ScmGenerateServiceTag(PSERVICE lpServiceRecord) /* Increment the tag counter and set it */ ServiceTag = ServiceTag % 0xFFFFFFFF + 1; - lpServiceRecord->dwTag = ServiceTag; + lpServiceRecord->dwServiceTag = ServiceTag; return ERROR_SUCCESS; } @@ -1536,7 +1536,7 @@ ScmSendStartCommand(PSERVICE Service, ? SERVICE_CONTROL_START_OWN : SERVICE_CONTROL_START_SHARE; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; - ControlPacket->dwServiceTag = Service->dwTag; + ControlPacket->dwServiceTag = Service->dwServiceTag; /* Copy the start command line */ ControlPacket->dwServiceNameOffset = sizeof(SCM_CONTROL_PACKET); diff --git a/base/system/services/services.h b/base/system/services/services.h index 204375c17c6..c333c10d476 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -73,6 +73,7 @@ typedef struct _SERVICE DWORD dwTag; DWORD dwServiceBits; + DWORD dwServiceTag; ULONG Flags;

11 months, 1 week

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2024