Ros-diffs

ros-diffs@reactos.org

11 participants
81011 discussions

[reactos] 01/01: [MSUTB][SDK] Add CUTBMenuWnd and CUTBMenuItem (#6420)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1001b59a06ae73f39a5dc… commit 1001b59a06ae73f39a5dc779e8ba81c06bd2389d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 29 18:38:59 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 29 18:38:59 2024 +0900 [MSUTB][SDK] Add CUTBMenuWnd and CUTBMenuItem (#6420) Supporting Language Bar... JIRA issue: CORE-19363 - Implement CUTBMenuWnd and CUTBMenuItem classes. - Add IDS_MENUWND and IDS_LEFTCLICK resource strings. --- dll/win32/msutb/lang/en-US.rc | 2 + dll/win32/msutb/msutb.cpp | 294 +++++++++++++++++++++++++++++++++++- dll/win32/msutb/precomp.h | 4 +- dll/win32/msutb/resource.h | 2 + sdk/include/reactos/cicero/cicuif.h | 48 +++--- 5 files changed, 317 insertions(+), 33 deletions(-) diff --git a/dll/win32/msutb/lang/en-US.rc b/dll/win32/msutb/lang/en-US.rc index 646ca61f2c1..c45c6e28438 100644 --- a/dll/win32/msutb/lang/en-US.rc +++ b/dll/win32/msutb/lang/en-US.rc @@ -16,4 +16,6 @@ BEGIN IDS_IGNORE "&Ignore" IDS_YES "&Yes" IDS_NO "&No" + IDS_MENUWND "Menu Window" + IDS_LEFTCLICK "Left Click" END diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 6ab8eb45b21..615e7c47450 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -33,6 +33,7 @@ CMsUtbModule gModule; class CCicLibMenuItem; class CTipbarAccItem; +class CUTBMenuItem; /***********************************************************************/ @@ -100,6 +101,7 @@ protected: BOOL m_bInitialized; CicArray<CTipbarAccItem*> m_AccItems; LONG m_cSelection; + friend class CUTBMenuWnd; public: CTipbarAccessible(CTipbarAccItem *pItem); @@ -206,9 +208,9 @@ public: { return NULL; } - STDMETHOD(DoAccDefaultAction)() + STDMETHOD_(BOOL, DoAccDefaultAction)() { - return S_OK; + return FALSE; } STDMETHOD_(BOOL, DoAccDefaultActionReal)() { @@ -218,6 +220,96 @@ public: /***********************************************************************/ +class CTipbarCoInitialize +{ +public: + BOOL m_bCoInit; + + CTipbarCoInitialize() : m_bCoInit(FALSE) { } + ~CTipbarCoInitialize() { CoUninit(); } + + HRESULT EnsureCoInit() + { + if (m_bCoInit) + return S_OK; + HRESULT hr = ::CoInitialize(NULL); + if (FAILED(hr)) + return hr; + m_bCoInit = TRUE; + return S_OK; + } + + void CoUninit() + { + if (m_bCoInit) + { + ::CoUninitialize(); + m_bCoInit = FALSE; + } + } +}; + +/***********************************************************************/ + +class CUTBMenuWnd : public CTipbarAccItem, public CUIFMenu +{ +protected: + CTipbarCoInitialize m_coInit; + CTipbarAccessible *m_pAccessible; + UINT m_nMenuWndID; + friend class CUTBMenuItem; + +public: + CUTBMenuWnd(HINSTANCE hInst, DWORD style, DWORD dwUnknown14); + + BOOL StartDoAccDefaultActionTimer(CUTBMenuItem *pTarget); + + CTipbarAccItem* GetAccItem() + { + return static_cast<CTipbarAccItem*>(this); + } + CUIFMenu* GetMenu() + { + return static_cast<CUIFMenu*>(this); + } + + STDMETHOD_(BSTR, GetAccName)() override; + STDMETHOD_(INT, GetAccRole)() override; + STDMETHOD_(void, Initialize)() override; + STDMETHOD_(void, OnCreate)(HWND hWnd) override; + STDMETHOD_(void, OnDestroy)(HWND hWnd) override; + STDMETHOD_(HRESULT, OnGetObject)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnShowWindow)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(void, OnTimer)(WPARAM wParam) override; +}; + +/***********************************************************************/ + +class CUTBMenuItem : public CTipbarAccItem, public CUIFMenuItem +{ +protected: + CUTBMenuWnd *m_pMenuWnd; + friend class CUTBMenuWnd; + +public: + CUTBMenuItem(CUTBMenuWnd *pMenuWnd); + ~CUTBMenuItem() override; + + CUIFMenuItem* GetMenuItem() + { + return static_cast<CUIFMenuItem*>(this); + } + + STDMETHOD_(BOOL, DoAccDefaultAction)() override; + STDMETHOD_(BOOL, DoAccDefaultActionReal)() override; + STDMETHOD_(BSTR, GetAccDefaultAction)() override; + STDMETHOD_(void, GetAccLocation)(LPRECT lprc) override; + STDMETHOD_(BSTR, GetAccName)() override; + STDMETHOD_(INT, GetAccRole)() override; +}; + +/***********************************************************************/ + class CTrayIconWnd { public: @@ -954,7 +1046,7 @@ STDMETHODIMP CTipbarAccessible::accDoDefaultAction(VARIANT varID) CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); if (!pItem) return DISP_E_MEMBERNOTFOUND; - return pItem->DoAccDefaultAction() == 0; + return (pItem->DoAccDefaultAction() ? S_OK : S_FALSE); } STDMETHODIMP CTipbarAccessible::put_accName(VARIANT varID, BSTR name) @@ -967,6 +1059,202 @@ STDMETHODIMP CTipbarAccessible::put_accValue(VARIANT varID, BSTR value) return S_FALSE; } +/*********************************************************************** + * CUTBMenuWnd + */ + +CUTBMenuWnd::CUTBMenuWnd(HINSTANCE hInst, DWORD style, DWORD dwUnknown14) + : CUIFMenu(hInst, style, dwUnknown14) +{ +} + +BOOL CUTBMenuWnd::StartDoAccDefaultActionTimer(CUTBMenuItem *pTarget) +{ + if (!m_pAccessible) + return FALSE; + + m_nMenuWndID = m_pAccessible->GetIDOfItem(pTarget); + if (!m_nMenuWndID || m_nMenuWndID == (UINT)-1) + return FALSE; + + if (::IsWindow(m_hWnd)) + { + ::KillTimer(m_hWnd, 11); + ::SetTimer(m_hWnd, 11, 200, NULL); + } + + return TRUE; +} + +STDMETHODIMP_(BSTR) CUTBMenuWnd::GetAccName() +{ + WCHAR szText[64]; + LoadStringW(g_hInst, IDS_MENUWND, szText, _countof(szText)); + return ::SysAllocString(szText); +} + +STDMETHODIMP_(INT) CUTBMenuWnd::GetAccRole() +{ + return 9; +} + +STDMETHODIMP_(void) CUTBMenuWnd::Initialize() +{ + CTipbarAccessible *pAccessible = new(cicNoThrow) CTipbarAccessible(GetAccItem()); + if (pAccessible) + m_pAccessible = pAccessible; + + return CUIFObject::Initialize(); +} + +STDMETHODIMP_(void) CUTBMenuWnd::OnCreate(HWND hWnd) +{ + if (m_pAccessible) + m_pAccessible->SetWindow(hWnd); +} + +STDMETHODIMP_(void) CUTBMenuWnd::OnDestroy(HWND hWnd) +{ + if (m_pAccessible) + { + m_pAccessible->NotifyWinEvent(EVENT_OBJECT_DESTROY, GetAccItem()); + m_pAccessible->ClearAccItems(); + m_pAccessible->Release(); + m_pAccessible = NULL; + } + m_coInit.CoUninit(); +} + +STDMETHODIMP_(HRESULT) +CUTBMenuWnd::OnGetObject(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (lParam != -4) + return S_OK; + + if (!m_pAccessible) + return E_OUTOFMEMORY; + + if (m_pAccessible->m_bInitialized) + return m_pAccessible->CreateRefToAccObj(wParam); + + if (SUCCEEDED(m_coInit.EnsureCoInit())) + { + HRESULT hr = m_pAccessible->Initialize(); + if (FAILED(hr)) + { + m_pAccessible->Release(); + m_pAccessible = NULL; + return hr; + } + + m_pAccessible->NotifyWinEvent(EVENT_OBJECT_CREATE, GetAccItem()); + return m_pAccessible->CreateRefToAccObj(wParam); + } + + return S_OK; +} + +STDMETHODIMP_(LRESULT) +CUTBMenuWnd::OnShowWindow(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (m_pAccessible) + { + if (wParam) + { + m_pAccessible->NotifyWinEvent(EVENT_OBJECT_SHOW, GetAccItem()); + m_pAccessible->NotifyWinEvent(EVENT_OBJECT_FOCUS, GetAccItem()); + } + else + { + m_pAccessible->NotifyWinEvent(EVENT_OBJECT_HIDE, GetAccItem()); + } + } + + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +STDMETHODIMP_(void) CUTBMenuWnd::OnTimer(WPARAM wParam) +{ + if (wParam == 11) + { + ::KillTimer(m_hWnd, 11); + if (m_pAccessible && m_nMenuWndID) + { + m_pAccessible->DoDefaultActionReal(m_nMenuWndID); + m_nMenuWndID = 0; + } + } +} + +/*********************************************************************** + * CUTBMenuItem + */ + +CUTBMenuItem::CUTBMenuItem(CUTBMenuWnd *pMenuWnd) + : CUIFMenuItem(pMenuWnd ? pMenuWnd->GetMenu() : NULL) +{ + m_pMenuWnd = pMenuWnd; +} + +CUTBMenuItem::~CUTBMenuItem() +{ + if (m_hbmColor) + { + ::DeleteObject(m_hbmColor); + m_hbmColor = NULL; + } + if (m_hbmMask) + { + ::DeleteObject(m_hbmMask); + m_hbmMask = NULL; + } +} + +STDMETHODIMP_(BOOL) CUTBMenuItem::DoAccDefaultAction() +{ + if (!m_pMenuWnd) + return FALSE; + + m_pMenuWnd->StartDoAccDefaultActionTimer(this); + return TRUE; +} + +STDMETHODIMP_(BOOL) CUTBMenuItem::DoAccDefaultActionReal() +{ + if (!m_pSubMenu) + OnLButtonUp(0, 0); + else + ShowSubPopup(); + return TRUE; +} + +STDMETHODIMP_(BSTR) CUTBMenuItem::GetAccDefaultAction() +{ + WCHAR szText[64]; + ::LoadStringW(g_hInst, IDS_LEFTCLICK, szText, _countof(szText)); + return ::SysAllocString(szText); +} + +STDMETHODIMP_(void) CUTBMenuItem::GetAccLocation(LPRECT lprc) +{ + GetRect(lprc); + ::ClientToScreen(m_pMenuWnd->m_hWnd, (LPPOINT)lprc); + ::ClientToScreen(m_pMenuWnd->m_hWnd, (LPPOINT)&lprc->right); +} + +STDMETHODIMP_(BSTR) CUTBMenuItem::GetAccName() +{ + return ::SysAllocString(m_pszMenuItemLeft); +} + +/// @unimplemented +STDMETHODIMP_(INT) CUTBMenuItem::GetAccRole() +{ + if (FALSE) //FIXME + return 21; + return 12; +} + /*********************************************************************** * CTrayIconItem */ diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index 7e880a30d57..2f3ca726f7b 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -25,8 +25,8 @@ #include <atlcom.h> #include <strsafe.h> #undef STATUS_NO_MEMORY + +#include "resource.h" #include <cicero/cicuif.h> #include <wine/debug.h> - -#include "resource.h" diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h index c91662cb293..65532689e47 100644 --- a/dll/win32/msutb/resource.h +++ b/dll/win32/msutb/resource.h @@ -7,3 +7,5 @@ #define IDS_IGNORE 104 #define IDS_YES 105 #define IDS_NO 106 +#define IDS_MENUWND 322 +#define IDS_LEFTCLICK 323 diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index b4715f93263..218587d3296 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -617,8 +617,8 @@ public: STDMETHOD_(LRESULT, OnSettingChange)(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_(HRESULT, OnGetObject)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { return S_OK; } STDMETHOD_(LRESULT, WindowProc)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); STDMETHOD_(BOOL, OnEraseBkGnd)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return FALSE; } @@ -786,7 +786,7 @@ protected: void DrawUnderline(HDC hDC, INT xText, INT yText, HBRUSH hbr); public: - CUIFMenuItem(CUIFMenu *pMenu, BOOL bDisabled); + CUIFMenuItem(CUIFMenu *pMenu, BOOL bDisabled = FALSE); ~CUIFMenuItem() override; BOOL Init(UINT nMenuItemID, LPCWSTR pszText); @@ -2484,7 +2484,6 @@ inline BOOL cicGetIconBitmaps(HICON hIcon, HBITMAP *hbm1, HBITMAP *hbm2, const S if (!CUIFBitmapDC::s_fInitBitmapDCs) return NULL; - LONG cx, cy; SIZE size; if (pSize) { @@ -2496,8 +2495,8 @@ inline BOOL cicGetIconBitmaps(HICON hIcon, HBITMAP *hbm1, HBITMAP *hbm2, const S return FALSE; } - CUIFBitmapDC::s_phdcSrc->SetDIB(cx, cy, 1, 32); - CUIFBitmapDC::s_phdcMask->SetBitmap(cx, cy, 1, 1); + CUIFBitmapDC::s_phdcSrc->SetDIB(size.cx, size.cy, 1, 32); + CUIFBitmapDC::s_phdcMask->SetBitmap(size.cx, size.cy, 1, 1); RECT rc = { 0, 0, size.cx, size.cy }; ::FillRect(*CUIFBitmapDC::s_phdcSrc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); @@ -5177,31 +5176,24 @@ CUIFBalloonWindow::AddButton(UINT nCommandId) pButton->Initialize(); pButton->m_nCommandID = nCommandId; - LPCWSTR pszText; // FIXME: Use resource strings + LPCWSTR pszText; +#ifdef IDS_OK + extern HINSTANCE g_hInst; + WCHAR szText[64]; + ::LoadStringW(g_hInst, IDS_OK + nCommandId, szText, _countof(szText)); + pszText = szText; +#else switch (nCommandId) { - case IDOK: - pszText = L"OK"; - break; - case IDCANCEL: - pszText = L"Cancel"; - break; - case IDABORT: - pszText = L"&Abort"; - break; - case IDRETRY: - pszText = L"&Retry"; - break; - case IDIGNORE: - pszText = L"&Ignore"; - break; - case IDYES: - pszText = L"&Yes"; - break; - default: - pszText = L"&No"; - break; + case IDOK: pszText = L"OK"; break; + case IDCANCEL: pszText = L"Cancel"; break; + case IDABORT: pszText = L"&Abort"; break; + case IDRETRY: pszText = L"&Retry"; break; + case IDIGNORE: pszText = L"&Ignore"; break; + case IDYES: pszText = L"&Yes"; break; + default: pszText = L"&No"; break; } +#endif pButton->SetText(pszText);

11 months, 2 weeks

[reactos] 01/01: [MSUTB] Add CTipbarAccessible (#6417)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0020b68219c438d47f80… commit c0020b68219c438d47f80f9580d82710ab514f26 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 28 11:35:44 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 28 11:35:44 2024 +0900 [MSUTB] Add CTipbarAccessible (#6417) Supporting Language Bar... JIRA issue: CORE-19363 - Implement CTipbarAccessible class. - Add delay link to oleacc.dll. --- dll/win32/msutb/CMakeLists.txt | 2 +- dll/win32/msutb/msutb.cpp | 628 ++++++++++++++++++++++++++++++++++++++++- dll/win32/msutb/precomp.h | 1 + 3 files changed, 619 insertions(+), 12 deletions(-) diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index dd79a30d8c5..978742390a4 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -15,5 +15,5 @@ set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) add_importlibs(msutb user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msutb comctl32 msctf ole32 oleaut32 shell32) +add_delay_importlibs(msutb comctl32 msctf ole32 oleacc oleaut32 shell32) add_cd_file(TARGET msutb DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 605fc6130d4..6ab8eb45b21 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS msutb.dll * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Language Bar (Tipbar) - * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 2023-2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" @@ -14,6 +14,7 @@ UINT g_wmTaskbarCreated = 0; UINT g_uACP = CP_ACP; DWORD g_dwOSInfo = 0; CRITICAL_SECTION g_cs; +LONG g_DllRefCount = 0; EXTERN_C void __cxa_pure_virtual(void) { @@ -31,12 +32,13 @@ END_OBJECT_MAP() CMsUtbModule gModule; class CCicLibMenuItem; +class CTipbarAccItem; /***********************************************************************/ class CCicLibMenu : public ITfMenu { -public: +protected: CicArray<CCicLibMenuItem*> m_MenuItems; LONG m_cRefs; @@ -63,7 +65,7 @@ public: class CCicLibMenuItem { -public: +protected: DWORD m_uId; DWORD m_dwFlags; HBITMAP m_hbmp; @@ -88,6 +90,92 @@ public: /***********************************************************************/ +class CTipbarAccessible : public IAccessible +{ +protected: + LONG m_cRefs; + HWND m_hWnd; + IAccessible *m_pStdAccessible; + ITypeInfo *m_pTypeInfo; + BOOL m_bInitialized; + CicArray<CTipbarAccItem*> m_AccItems; + LONG m_cSelection; + +public: + CTipbarAccessible(CTipbarAccItem *pItem); + virtual ~CTipbarAccessible(); + + HRESULT Initialize(); + + BOOL AddAccItem(CTipbarAccItem *pItem); + HRESULT RemoveAccItem(CTipbarAccItem *pItem); + void ClearAccItems(); + CTipbarAccItem *AccItemFromID(INT iItem); + INT GetIDOfItem(CTipbarAccItem *pTarget); + + LONG_PTR CreateRefToAccObj(WPARAM wParam); + BOOL DoDefaultActionReal(INT nID); + void NotifyWinEvent(DWORD event, CTipbarAccItem *pItem); + void SetWindow(HWND hWnd); + + // IUnknown methods + STDMETHOD(QueryInterface)(REFIID riid, void **ppvObject); + STDMETHOD_(ULONG, AddRef)(); + STDMETHOD_(ULONG, Release)(); + + // IDispatch methods + STDMETHOD(GetTypeInfoCount)(UINT *pctinfo); + STDMETHOD(GetTypeInfo)( + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo); + STDMETHOD(GetIDsOfNames)( + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId); + STDMETHOD(Invoke)( + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr); + + // IAccessible methods + STDMETHOD(get_accParent)(IDispatch **ppdispParent); + STDMETHOD(get_accChildCount)(LONG *pcountChildren); + STDMETHOD(get_accChild)(VARIANT varChildID, IDispatch **ppdispChild); + STDMETHOD(get_accName)(VARIANT varID, BSTR *pszName); + STDMETHOD(get_accValue)(VARIANT varID, BSTR *pszValue); + STDMETHOD(get_accDescription)(VARIANT varID, BSTR *description); + STDMETHOD(get_accRole)(VARIANT varID, VARIANT *role); + STDMETHOD(get_accState)(VARIANT varID, VARIANT *state); + STDMETHOD(get_accHelp)(VARIANT varID, BSTR *help); + STDMETHOD(get_accHelpTopic)(BSTR *helpfile, VARIANT varID, LONG *pidTopic); + STDMETHOD(get_accKeyboardShortcut)(VARIANT varID, BSTR *shortcut); + STDMETHOD(get_accFocus)(VARIANT *pvarID); + STDMETHOD(get_accSelection)(VARIANT *pvarID); + STDMETHOD(get_accDefaultAction)(VARIANT varID, BSTR *action); + STDMETHOD(accSelect)(LONG flagsSelect, VARIANT varID); + STDMETHOD(accLocation)( + LONG *left, + LONG *top, + LONG *width, + LONG *height, + VARIANT varID); + STDMETHOD(accNavigate)(LONG dir, VARIANT varStart, VARIANT *pvarEnd); + STDMETHOD(accHitTest)(LONG left, LONG top, VARIANT *pvarID); + STDMETHOD(accDoDefaultAction)(VARIANT varID); + STDMETHOD(put_accName)(VARIANT varID, BSTR name); + STDMETHOD(put_accValue)(VARIANT varID, BSTR value); +}; + +/***********************************************************************/ + class CTipbarAccItem { public: @@ -98,9 +186,9 @@ public: { return SysAllocString(L""); } - STDMETHOD(UnknownMethod1)() // FIXME: Name + STDMETHOD_(BSTR, GetAccValue)() { - return S_OK; + return NULL; } STDMETHOD_(INT, GetAccRole)() { @@ -114,17 +202,17 @@ public: { *lprc = { 0, 0, 0, 0 }; } - STDMETHOD(UnknownMethod2)() // FIXME: Name + STDMETHOD_(BSTR, GetAccDefaultAction)() { - return S_OK; + return NULL; } - STDMETHOD(UnknownMethod3)() // FIXME: Name + STDMETHOD(DoAccDefaultAction)() { return S_OK; } - STDMETHOD(UnknownMethod4)() // FIXME: Name + STDMETHOD_(BOOL, DoAccDefaultActionReal)() { - return S_OK; + return FALSE; } }; @@ -361,6 +449,524 @@ HBITMAP CCicLibMenuItem::CreateBitmap(HANDLE hBitmap) return hbmMem; } +/*********************************************************************** + * CTipbarAccessible + */ + +CTipbarAccessible::CTipbarAccessible(CTipbarAccItem *pItem) +{ + m_cRefs = 1; + m_hWnd = NULL; + m_pTypeInfo = NULL; + m_pStdAccessible = NULL; + m_bInitialized = FALSE; + m_cSelection = 1; + m_AccItems.Add(pItem); + ++g_DllRefCount; +} + +CTipbarAccessible::~CTipbarAccessible() +{ + m_pTypeInfo = m_pTypeInfo; + if (m_pTypeInfo) + { + m_pTypeInfo->Release(); + m_pTypeInfo = NULL; + } + if (m_pStdAccessible) + { + m_pStdAccessible->Release(); + m_pStdAccessible = NULL; + } + --g_DllRefCount; +} + +HRESULT CTipbarAccessible::Initialize() +{ + m_bInitialized = TRUE; + + HRESULT hr = ::CreateStdAccessibleObject(m_hWnd, OBJID_CLIENT, IID_IAccessible, + (void **)&m_pStdAccessible); + if (FAILED(hr)) + return hr; + + ITypeLib *pTypeLib; + hr = ::LoadRegTypeLib(LIBID_Accessibility, 1, 0, 0, &pTypeLib); + if (FAILED(hr)) + hr = ::LoadTypeLib(L"OLEACC.DLL", &pTypeLib); + + if (SUCCEEDED(hr)) + { + hr = pTypeLib->GetTypeInfoOfGuid(IID_IAccessible, &m_pTypeInfo); + pTypeLib->Release(); + } + + return hr; +} + +BOOL CTipbarAccessible::AddAccItem(CTipbarAccItem *pItem) +{ + return m_AccItems.Add(pItem); +} + +HRESULT CTipbarAccessible::RemoveAccItem(CTipbarAccItem *pItem) +{ + for (size_t iItem = 0; iItem < m_AccItems.size(); ++iItem) + { + if (m_AccItems[iItem] == pItem) + { + m_AccItems.Remove(iItem, 1); + break; + } + } + return S_OK; +} + +void CTipbarAccessible::ClearAccItems() +{ + m_AccItems.clear(); +} + +CTipbarAccItem *CTipbarAccessible::AccItemFromID(INT iItem) +{ + if (iItem < 0 || (INT)m_AccItems.size() <= iItem) + return NULL; + return m_AccItems[iItem]; +} + +INT CTipbarAccessible::GetIDOfItem(CTipbarAccItem *pTarget) +{ + for (size_t iItem = 0; iItem < m_AccItems.size(); ++iItem) + { + if (pTarget == m_AccItems[iItem]) + return (INT)iItem; + } + return -1; +} + +LONG_PTR CTipbarAccessible::CreateRefToAccObj(WPARAM wParam) +{ + return ::LresultFromObject(IID_IAccessible, wParam, this); +} + +BOOL CTipbarAccessible::DoDefaultActionReal(INT nID) +{ + CTipbarAccItem *pItem = AccItemFromID(nID); + if (!pItem) + return FALSE; + return pItem->DoAccDefaultActionReal(); +} + +void CTipbarAccessible::NotifyWinEvent(DWORD event, CTipbarAccItem *pItem) +{ + INT nID = GetIDOfItem(pItem); + if (nID < 0) + return; + + ::NotifyWinEvent(event, m_hWnd, -4, nID); +} + +void CTipbarAccessible::SetWindow(HWND hWnd) +{ + m_hWnd = hWnd; +} + +STDMETHODIMP CTipbarAccessible::QueryInterface( + REFIID riid, + void **ppvObject) +{ + if (IsEqualIID(riid, IID_IUnknown) || + IsEqualIID(riid, IID_IDispatch) || + IsEqualIID(riid, IID_IAccessible)) + { + *ppvObject = this; + AddRef(); + return S_OK; + } + return E_NOINTERFACE; +} + +STDMETHODIMP_(ULONG) CTipbarAccessible::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +STDMETHODIMP_(ULONG) CTipbarAccessible::Release() +{ + LONG count = ::InterlockedDecrement(&m_cRefs); + if (count == 0) + { + delete this; + return 0; + } + return count; +} + +STDMETHODIMP CTipbarAccessible::GetTypeInfoCount(UINT *pctinfo) +{ + if (!pctinfo) + return E_INVALIDARG; + *pctinfo = (m_pTypeInfo == NULL); + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::GetTypeInfo( + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo) +{ + if (!ppTInfo) + return E_INVALIDARG; + *ppTInfo = NULL; + if (iTInfo != 0) + return TYPE_E_ELEMENTNOTFOUND; + if (!m_pTypeInfo) + return E_NOTIMPL; + *ppTInfo = m_pTypeInfo; + m_pTypeInfo->AddRef(); + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::GetIDsOfNames( + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId) +{ + if (!m_pTypeInfo) + return E_NOTIMPL; + return m_pTypeInfo->GetIDsOfNames(rgszNames, cNames, rgDispId); +} + +STDMETHODIMP CTipbarAccessible::Invoke( + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + if (!m_pTypeInfo) + return E_NOTIMPL; + return m_pTypeInfo->Invoke(this, + dispIdMember, + wFlags, + pDispParams, + pVarResult, + pExcepInfo, + puArgErr); +} + +STDMETHODIMP CTipbarAccessible::get_accParent(IDispatch **ppdispParent) +{ + return m_pStdAccessible->get_accParent(ppdispParent); +} + +STDMETHODIMP CTipbarAccessible::get_accChildCount(LONG *pcountChildren) +{ + if (!pcountChildren) + return E_INVALIDARG; + INT cItems = (INT)m_AccItems.size(); + if (!cItems) + return E_FAIL; + *pcountChildren = cItems - 1; + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::get_accChild( + VARIANT varChildID, + IDispatch **ppdispChild) +{ + if (!ppdispChild) + return E_INVALIDARG; + *ppdispChild = NULL; + return S_FALSE; +} + +STDMETHODIMP CTipbarAccessible::get_accName( + VARIANT varID, + BSTR *pszName) +{ + if (!pszName) + return E_INVALIDARG; + CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); + if (!pItem) + return E_INVALIDARG; + *pszName = pItem->GetAccName(); + if (!*pszName) + return DISP_E_MEMBERNOTFOUND; + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::get_accValue( + VARIANT varID, + BSTR *pszValue) +{ + if (!pszValue) + return E_INVALIDARG; + CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); + if (!pItem) + return E_INVALIDARG; + *pszValue = pItem->GetAccValue(); + if (!*pszValue) + return DISP_E_MEMBERNOTFOUND; + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::get_accDescription( + VARIANT varID, + BSTR *description) +{ + if (!description) + return E_INVALIDARG; + return m_pStdAccessible->get_accDescription(varID, description); +} + +STDMETHODIMP CTipbarAccessible::get_accRole( + VARIANT varID, + VARIANT *role) +{ + if (!role) + return E_INVALIDARG; + CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); + if (!pItem) + return E_INVALIDARG; + V_VT(role) = VT_I4; + V_I4(role) = pItem->GetAccRole(); + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::get_accState( + VARIANT varID, + VARIANT *state) +{ + if (!state) + return E_INVALIDARG; + CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); + if (!pItem) + return E_INVALIDARG; + V_VT(state) = VT_I4; + V_I4(state) = pItem->GetAccState(); + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::get_accHelp(VARIANT varID, BSTR *help) +{ + return DISP_E_MEMBERNOTFOUND; +} + +STDMETHODIMP CTipbarAccessible::get_accHelpTopic( + BSTR *helpfile, + VARIANT varID, + LONG *pidTopic) +{ + return DISP_E_MEMBERNOTFOUND; +} + +STDMETHODIMP CTipbarAccessible::get_accKeyboardShortcut(VARIANT varID, BSTR *shortcut) +{ + return DISP_E_MEMBERNOTFOUND; +} + +STDMETHODIMP CTipbarAccessible::get_accFocus(VARIANT *pvarID) +{ + if (!pvarID) + return E_INVALIDARG; + V_VT(pvarID) = VT_EMPTY; + return S_FALSE; +} + +STDMETHODIMP CTipbarAccessible::get_accSelection(VARIANT *pvarID) +{ + if (!pvarID) + return E_INVALIDARG; + + V_VT(pvarID) = VT_EMPTY; + + INT cItems = (INT)m_AccItems.size(); + if (cItems < m_cSelection) + return S_FALSE; + + if (cItems > m_cSelection) + { + V_VT(pvarID) = VT_I4; + V_I4(pvarID) = m_cSelection; + } + + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::get_accDefaultAction( + VARIANT varID, + BSTR *action) +{ + if (!action) + return E_INVALIDARG; + *action = NULL; + + if (V_VT(&varID) != VT_I4) + return E_INVALIDARG; + + CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); + if (!pItem) + return DISP_E_MEMBERNOTFOUND; + *action = pItem->GetAccDefaultAction(); + if (!*action) + return S_FALSE; + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::accSelect( + LONG flagsSelect, + VARIANT varID) +{ + if ((flagsSelect & SELFLAG_ADDSELECTION) && (flagsSelect & SELFLAG_REMOVESELECTION)) + return E_INVALIDARG; + if (flagsSelect & (SELFLAG_TAKEFOCUS | SELFLAG_ADDSELECTION | SELFLAG_EXTENDSELECTION)) + return S_FALSE; + if (flagsSelect & SELFLAG_REMOVESELECTION) + return S_OK; + if (V_VT(&varID) != VT_I4) + return E_INVALIDARG; + if (flagsSelect & SELFLAG_TAKESELECTION) + { + m_cSelection = V_I4(&varID); + return S_OK; + } + return S_FALSE; +} + +STDMETHODIMP CTipbarAccessible::accLocation( + LONG *left, + LONG *top, + LONG *width, + LONG *height, + VARIANT varID) +{ + if (!left || !top || !width || !height) + return E_INVALIDARG; + + if (!V_I4(&varID)) + return m_pStdAccessible->accLocation(left, top, width, height, varID); + + RECT rc; + CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); + pItem->GetAccLocation(&rc); + + *left = rc.left; + *top = rc.top; + *width = rc.right - rc.left; + *height = rc.bottom - rc.top; + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::accNavigate( + LONG dir, + VARIANT varStart, + VARIANT *pvarEnd) +{ + if (m_AccItems.size() <= 1) + { + V_VT(pvarEnd) = VT_EMPTY; + return S_OK; + } + + switch (dir) + { + case NAVDIR_UP: + case NAVDIR_LEFT: + case NAVDIR_PREVIOUS: + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = V_I4(&varStart) - 1; + if (V_I4(&varStart) - 1 <= 0) + V_I4(pvarEnd) = (INT)(m_AccItems.size() - 1); + return S_OK; + + case NAVDIR_DOWN: + case NAVDIR_RIGHT: + case NAVDIR_NEXT: + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = V_I4(&varStart) + 1; + if ((INT)m_AccItems.size() <= V_I4(&varStart) + 1) + V_I4(pvarEnd) = 1; + return S_OK; + + case NAVDIR_FIRSTCHILD: + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = 1; + return S_OK; + + case NAVDIR_LASTCHILD: + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = (INT)(m_AccItems.size() - 1); + return S_OK; + + default: + break; + } + + V_VT(pvarEnd) = VT_EMPTY; + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::accHitTest(LONG left, LONG top, VARIANT *pvarID) +{ + if (!pvarID) + return E_INVALIDARG; + POINT Point = { left, top }; + RECT Rect; + ::ScreenToClient(m_hWnd, &Point); + ::GetClientRect(m_hWnd, &Rect); + + if (!::PtInRect(&Rect, Point)) + { + V_VT(pvarID) = VT_EMPTY; + return S_OK; + } + + V_VT(pvarID) = VT_I4; + V_I4(pvarID) = 0; + + for (size_t iItem = 1; iItem < m_AccItems.size(); ++iItem) + { + CTipbarAccItem *pItem = m_AccItems[iItem]; + if (pItem) + { + pItem->GetAccLocation(&Rect); + if (::PtInRect(&Rect, Point)) + { + V_I4(pvarID) = iItem; + break; + } + } + } + + return S_OK; +} + +STDMETHODIMP CTipbarAccessible::accDoDefaultAction(VARIANT varID) +{ + if (V_VT(&varID) != VT_I4) + return E_INVALIDARG; + CTipbarAccItem *pItem = AccItemFromID(V_I4(&varID)); + if (!pItem) + return DISP_E_MEMBERNOTFOUND; + return pItem->DoAccDefaultAction() == 0; +} + +STDMETHODIMP CTipbarAccessible::put_accName(VARIANT varID, BSTR name) +{ + return S_FALSE; +} + +STDMETHODIMP CTipbarAccessible::put_accValue(VARIANT varID, BSTR value) +{ + return S_FALSE; +} + /*********************************************************************** * CTrayIconItem */ @@ -509,7 +1115,7 @@ STDAPI DllUnregisterServer(VOID) STDAPI DllCanUnloadNow(VOID) { TRACE("()\n"); - return gModule.DllCanUnloadNow(); + return gModule.DllCanUnloadNow() && (g_DllRefCount == 0); } /*********************************************************************** diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index d4579a7511b..7e880a30d57 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -14,6 +14,7 @@ #define INITGUID #include <windows.h> +#include <oleacc.h> #include <imm.h> #include <ddk/immdev.h> #include <cguid.h>

11 months, 2 weeks

[reactos] 01/01: [DESK][SHELL32] Improve French (fr-FR) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b50dfbcee48b34f4255f5… commit b50dfbcee48b34f4255f56931f1ebfb28e857006 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jan 27 15:06:12 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jan 27 15:06:12 2024 +0300 [DESK][SHELL32] Improve French (fr-FR) translation Make "My Network Places" translation consistent. Fix suggested by Hermès Bélusca-Maïto. --- dll/cpl/desk/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index c2431b54b87..9f2fc9dd55e 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -162,7 +162,7 @@ BEGIN GROUPBOX "Icônes du Bureau", IDC_STATIC, 6, 4, 212, 40 CONTROL "&Mes documents", IDC_ICONS_MYDOCS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 - CONTROL "&Favoris réseau", IDC_ICONS_MYNET, "button", + CONTROL "Mon &réseau", IDC_ICONS_MYNET, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 CONTROL "P&oste de travail", IDC_ICONS_MYCOMP, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 240305a6654..0a4e63adbb4 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -886,7 +886,7 @@ BEGIN IDS_COMMON_PICTURES "Documents\\Mes images" IDS_COMMON_VIDEO "Documents\\Mes vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "Mes emplacements réseau" + IDS_NETWORKPLACE "Mon réseau" IDS_NEWFOLDER "Nouveau dossier" IDS_NEWITEMFORMAT "New %s" @@ -989,7 +989,7 @@ BEGIN IDS_OBJECTS_SELECTED "%d objet(s) sélectionné(s)" IDS_TITLE_MYCOMP "Poste de travail" - IDS_TITLE_MYNET "Mes emplacements réseau" + IDS_TITLE_MYNET "Mon réseau" IDS_TITLE_BIN_1 "Corbeille (pleine)" IDS_TITLE_BIN_0 "Corbeille (vide)"

11 months, 2 weeks

[reactos] 01/01: [MSUTB] Add CTipbarAccItem (#6415)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=883863fa509d4dbd35cc0… commit 883863fa509d4dbd35cc062990395512e12a659b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 27 19:25:17 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 27 19:25:17 2024 +0900 [MSUTB] Add CTipbarAccItem (#6415) Supporting Language Bar... JIRA issue: CORE-19363 Half-implement CTipbarAccItem class. --- dll/win32/msutb/msutb.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 1283165d078..605fc6130d4 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -88,6 +88,48 @@ public: /***********************************************************************/ +class CTipbarAccItem +{ +public: + CTipbarAccItem() { } + virtual ~CTipbarAccItem() { } + + STDMETHOD_(BSTR, GetAccName)() + { + return SysAllocString(L""); + } + STDMETHOD(UnknownMethod1)() // FIXME: Name + { + return S_OK; + } + STDMETHOD_(INT, GetAccRole)() + { + return 10; + } + STDMETHOD_(INT, GetAccState)() + { + return 256; + } + STDMETHOD_(void, GetAccLocation)(LPRECT lprc) + { + *lprc = { 0, 0, 0, 0 }; + } + STDMETHOD(UnknownMethod2)() // FIXME: Name + { + return S_OK; + } + STDMETHOD(UnknownMethod3)() // FIXME: Name + { + return S_OK; + } + STDMETHOD(UnknownMethod4)() // FIXME: Name + { + return S_OK; + } +}; + +/***********************************************************************/ + class CTrayIconWnd { public:

11 months, 2 weeks

[reactos] 01/01: [MSUTB] Add CCicLibMenu and CCicLibMenuItem (#6414)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6caac30567dfee433d1c… commit d6caac30567dfee433d1c5ef8dce182b4106e97f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 27 14:06:25 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 27 14:06:25 2024 +0900 [MSUTB] Add CCicLibMenu and CCicLibMenuItem (#6414) Supporting Language Bar... JIRA issue: CORE-19363 - Implement CCicLibMenu and CCicLibMenuItem classes. --- dll/win32/msutb/msutb.cpp | 253 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index ec7e1ea24cb..1283165d078 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -30,6 +30,62 @@ END_OBJECT_MAP() CMsUtbModule gModule; +class CCicLibMenuItem; + +/***********************************************************************/ + +class CCicLibMenu : public ITfMenu +{ +public: + CicArray<CCicLibMenuItem*> m_MenuItems; + LONG m_cRefs; + +public: + CCicLibMenu(); + virtual ~CCicLibMenu(); + + STDMETHOD(QueryInterface)(REFIID riid, LPVOID *ppvObj) override; + STDMETHOD_(ULONG, AddRef)() override; + STDMETHOD_(ULONG, Release)() override; + STDMETHOD(AddMenuItem)( + UINT uId, + DWORD dwFlags, + HBITMAP hbmp, + HBITMAP hbmpMask, + const WCHAR *pch, + ULONG cch, + ITfMenu **ppSubMenu) override; + STDMETHOD_(CCicLibMenu*, CreateSubMenu)(); + STDMETHOD_(CCicLibMenuItem*, CreateMenuItem)(); +}; + +/***********************************************************************/ + +class CCicLibMenuItem +{ +public: + DWORD m_uId; + DWORD m_dwFlags; + HBITMAP m_hbmp; + HBITMAP m_hbmpMask; + BSTR m_bstrText; + ITfMenu *m_pMenu; + +public: + CCicLibMenuItem(); + virtual ~CCicLibMenuItem(); + + BOOL Init( + UINT uId, + DWORD dwFlags, + HBITMAP hbmp, + HBITMAP hbmpMask, + const WCHAR *pch, + ULONG cch, + ITfMenu *pMenu); + HBITMAP CreateBitmap(HANDLE hBitmap); +}; + /***********************************************************************/ class CTrayIconWnd @@ -66,6 +122,203 @@ protected: STDMETHOD_(LRESULT, OnDelayMsg)(LPARAM lParam) { return 0; }; }; +/*********************************************************************** + * CCicLibMenu + */ + +CCicLibMenu::CCicLibMenu() : m_cRefs(1) +{ +} + +CCicLibMenu::~CCicLibMenu() +{ + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + delete m_MenuItems[iItem]; + m_MenuItems[iItem] = NULL; + } +} + +STDMETHODIMP CCicLibMenu::QueryInterface(REFIID riid, LPVOID *ppvObj) +{ + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfMenu)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + return E_NOINTERFACE; +} + +STDMETHODIMP_(ULONG) CCicLibMenu::AddRef() +{ + return ++m_cRefs; +} + +STDMETHODIMP_(ULONG) CCicLibMenu::Release() +{ + if (--m_cRefs == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +STDMETHODIMP_(CCicLibMenu*) CCicLibMenu::CreateSubMenu() +{ + return new(cicNoThrow) CCicLibMenu(); +} + +STDMETHODIMP_(CCicLibMenuItem*) CCicLibMenu::CreateMenuItem() +{ + return new(cicNoThrow) CCicLibMenuItem(); +} + +STDMETHODIMP CCicLibMenu::AddMenuItem( + UINT uId, + DWORD dwFlags, + HBITMAP hbmp, + HBITMAP hbmpMask, + const WCHAR *pch, + ULONG cch, + ITfMenu **ppSubMenu) +{ + if (ppSubMenu) + *ppSubMenu = NULL; + + CCicLibMenu *pSubMenu = NULL; + if (dwFlags & TF_LBMENUF_SUBMENU) + { + if (!ppSubMenu) + return E_INVALIDARG; + pSubMenu = CreateSubMenu(); + } + + CCicLibMenuItem *pMenuItem = CreateMenuItem(); + if (!pMenuItem) + return E_OUTOFMEMORY; + + if (!pMenuItem->Init(uId, dwFlags, hbmp, hbmpMask, pch, cch, pSubMenu)) + return E_FAIL; + + if (ppSubMenu && pSubMenu) + { + *ppSubMenu = pSubMenu; + pSubMenu->AddRef(); + } + + *m_MenuItems.Append(1) = pMenuItem; + return S_OK; +} + +/*********************************************************************** + * CCicLibMenuItem + */ + +CCicLibMenuItem::CCicLibMenuItem() +{ + m_uId = 0; + m_dwFlags = 0; + m_hbmp = NULL; + m_hbmpMask = NULL; + m_bstrText = NULL; + m_pMenu = NULL; +} + +CCicLibMenuItem::~CCicLibMenuItem() +{ + if (m_pMenu) + { + m_pMenu->Release(); + m_pMenu = NULL; + } + + if (m_hbmp) + { + ::DeleteObject(m_hbmp); + m_hbmp = NULL; + } + + if (m_hbmpMask) + { + ::DeleteObject(m_hbmpMask); + m_hbmpMask = NULL; + } + + ::SysFreeString(m_bstrText); + m_bstrText = NULL; +} + +BOOL CCicLibMenuItem::Init( + UINT uId, + DWORD dwFlags, + HBITMAP hbmp, + HBITMAP hbmpMask, + const WCHAR *pch, + ULONG cch, + ITfMenu *pMenu) +{ + m_uId = uId; + m_dwFlags = dwFlags; + m_bstrText = ::SysAllocStringLen(pch, cch); + if (!m_bstrText && cch) + return FALSE; + + m_pMenu = pMenu; + m_hbmp = CreateBitmap(hbmp); + m_hbmpMask = CreateBitmap(hbmpMask); + if (hbmp) + ::DeleteObject(hbmp); + if (hbmpMask) + ::DeleteObject(hbmpMask); + + return TRUE; +} + +HBITMAP CCicLibMenuItem::CreateBitmap(HANDLE hBitmap) +{ + if (!hBitmap) + return NULL; + + HDC hDC = ::CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL); + if (!hDC) + return NULL; + + HBITMAP hbmMem = NULL; + + BITMAP bm; + ::GetObject(hBitmap, sizeof(bm), &bm); + + HGDIOBJ hbmOld1 = NULL; + HDC hdcMem1 = ::CreateCompatibleDC(hDC); + if (hdcMem1) + hbmOld1 = ::SelectObject(hdcMem1, hBitmap); + + HGDIOBJ hbmOld2 = NULL; + HDC hdcMem2 = ::CreateCompatibleDC(hDC); + if (hdcMem2) + { + hbmMem = ::CreateCompatibleBitmap(hDC, bm.bmWidth, bm.bmHeight); + hbmOld2 = ::SelectObject(hdcMem2, hbmMem); + } + + ::BitBlt(hdcMem2, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem1, 0, 0, SRCCOPY); + + if (hbmOld1) + ::SelectObject(hdcMem1, hbmOld1); + if (hbmOld2) + ::SelectObject(hdcMem2, hbmOld2); + + ::DeleteDC(hDC); + if (hdcMem1) + ::DeleteDC(hdcMem1); + if (hdcMem2) + ::DeleteDC(hdcMem2); + + return hbmMem; +} + /*********************************************************************** * CTrayIconItem */

11 months, 2 weeks

[reactos] 04/04: [REGEDIT] edit.c: Display bus number as signed (it can be -1)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=deee8aaec17fe841054cd… commit deee8aaec17fe841054cd5e8d4936e0279a3f47d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 26 01:18:20 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jan 26 01:18:20 2024 +0300 [REGEDIT] edit.c: Display bus number as signed (it can be -1) --- base/applications/regedit/edit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/regedit/edit.c b/base/applications/regedit/edit.c index ebcf410f67c..786eefc11b3 100644 --- a/base/applications/regedit/edit.c +++ b/base/applications/regedit/edit.c @@ -800,7 +800,7 @@ ParseResources(HWND hwnd) SetDlgItemTextW(hwnd, IDC_INTERFACETYPE, buffer); /* Busnumber */ - SetDlgItemInt(hwnd, IDC_BUSNUMBER, (UINT)pFullDescriptor->BusNumber, FALSE); + SetDlgItemInt(hwnd, IDC_BUSNUMBER, (UINT)pFullDescriptor->BusNumber, TRUE); /* Version */ SetDlgItemInt(hwnd, IDC_VERSION, (UINT)pPartialResourceList->Version, FALSE); @@ -1383,7 +1383,7 @@ AddRequirementsToList(HWND hwndDlg, HWND hwnd) GetInterfaceType(requirementsValueData->InterfaceType, buffer, 80); SetDlgItemTextW(hwndDlg, IDC_REQINTERFACETYPE, buffer); - SetDlgItemInt(hwndDlg, IDC_REQBUSNUMBER, (UINT)requirementsValueData->BusNumber, FALSE); + SetDlgItemInt(hwndDlg, IDC_REQBUSNUMBER, (UINT)requirementsValueData->BusNumber, TRUE); SetDlgItemInt(hwndDlg, IDC_REQSLOTNUMBER, (UINT)requirementsValueData->SlotNumber, FALSE); }

11 months, 3 weeks

[reactos] 03/04: [REGEDIT] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9985e48d378a0ce52ed1… commit c9985e48d378a0ce52ed18a8ec2600fad1ad9668 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 26 01:08:43 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jan 26 01:08:43 2024 +0300 [REGEDIT] Update Russian (ru-RU) translation --- base/applications/regedit/lang/ru-RU.rc | 138 ++++++++++++++++---------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index 4c0cfb75775..87875a88a27 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -280,10 +280,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | CAPTION "Ресурсы" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Канал DMA:", IDC_STATIC, 10, 5, 20, 8 + LTEXT "Канал DMA:", IDC_STATIC, 10, 5, 40, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 - LTEXT "Прерывание:", IDC_STATIC, 10, 48, 35, 8 + LTEXT "Прерывание:", IDC_STATIC, 10, 48, 44, 8 CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 LTEXT "Память:", IDC_STATIC, 10, 91, 32, 8 @@ -296,7 +296,7 @@ BEGIN CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 GROUPBOX "Назначение", IDC_STATIC, 10, 219, 125, 39 - LTEXT "Не определено", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "Не определено", IDC_UNDETERMINED, 18, 230, 52, 8, WS_DISABLED LTEXT "Общий ресурс", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED LTEXT "Для устройства", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED LTEXT "Для драйвера", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED @@ -314,100 +314,100 @@ END IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Requirements List" +CAPTION "Список необходимых ресурсов" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66 - RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8 + RTEXT "Тип интерфейса:", IDC_STATIC, 10, 80, 62, 8 LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8 - RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8 + RTEXT "Номер шины:", IDC_STATIC, 10, 90, 62, 8 LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8 - RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8 + RTEXT "Номер гнезда:", IDC_STATIC, 10, 100, 62, 8 LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8 DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14 - PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED + PUSHBUTTON "Показать...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED END IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Port" +CAPTION "Порт" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Тип:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8 - RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Длина:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8 - RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Выравнивание:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8 - RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Мин. адрес:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8 - RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8 + RTEXT "Макс. адрес:", IDC_STATIC, 10, 50, 61, 8 LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 60, 61, 8 LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_PORT_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Memory" +CAPTION "Память" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Доступ:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8 - RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Длина:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8 - RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Выравнивание:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8 - RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Мин. адрес:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8 - RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8 + RTEXT "Макс. адрес:", IDC_STATIC, 10, 50, 61, 8 LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 60, 61, 8 LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_MEMORY_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Interrupt" +CAPTION "Прерывание" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Тип:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8 - RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Мин. вектор:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8 - RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Макс. вектор:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_INT_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_INT_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "DMA" +CAPTION "Канал DMA" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Мин. канал:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8 - RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Макс. канал:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_DMA_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END @@ -619,39 +619,39 @@ END STRINGTABLE BEGIN - IDS_FIELD_KEY_NAME "Key Name:" - IDS_FIELD_CLASS_NAME "Class Name:" - IDS_NO_CLASS_NAME "<NO CLASS>" - IDS_NULL_TIMESTAMP "<NULL>" - IDS_FIELD_NAME " Name:" - IDS_FIELD_TYPE " Type:" - IDS_FIELD_DATA " Data:" - IDS_FIELD_LASTWRITE "Last Write Time:" - IDS_UNKNOWN "<UNKNOWN>" - IDS_VALUE_INDEX "Value %d" + IDS_FIELD_KEY_NAME "Раздел:" + IDS_FIELD_CLASS_NAME "Название класса:" + IDS_NO_CLASS_NAME "<Класс отсутствует>" + IDS_NULL_TIMESTAMP "<НЕТ>" + IDS_FIELD_NAME " Название:" + IDS_FIELD_TYPE " Тип:" + IDS_FIELD_DATA " Значение:" + IDS_FIELD_LASTWRITE "Последнее время записи:" + IDS_UNKNOWN "<НЕИЗВЕСТНО>" + IDS_VALUE_INDEX "Значение %d" END STRINGTABLE BEGIN - IDS_REQALTERNATIVELIST "Alternative List" - IDS_REQRESOURCELIST "Resource List" - IDS_REQDESCRIPTOR "Descriptor" - IDS_REQDEVICETYPE "Device Type" - IDS_TYPE_PORT "Port" - IDS_TYPE_INTERRUPT "Interrupt" - IDS_TYPE_MEMORY "Memory" - IDS_TYPE_DMA "DMA" - IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive" - IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive" - IDS_SHARE_SHARED "Shared" - IDS_SHARE_UNDETERMINED "Undetermined" + IDS_REQALTERNATIVELIST "Дополнительный список" + IDS_REQRESOURCELIST "Список ресурсов" + IDS_REQDESCRIPTOR "Дескриптор" + IDS_REQDEVICETYPE "Тип устройства" + IDS_TYPE_PORT "Порт" + IDS_TYPE_INTERRUPT "Прерывание" + IDS_TYPE_MEMORY "Память" + IDS_TYPE_DMA "Канал DMA" + IDS_SHARE_DEVICE_EXCLUSIVE "Для устройства" + IDS_SHARE_DRIVER_EXCLUSIVE "Для драйвера" + IDS_SHARE_SHARED "Общий ресурс" + IDS_SHARE_UNDETERMINED "Не определено" END /*****************************************************************/ /* Dialogs */ -IDD_EXPORTRANGE DIALOGEX 50, 50, 268, 98 +IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -666,13 +666,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Загрузить куст" FONT 8, "Ms Shell Dlg" BEGIN - LTEXT "&Значение:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT - EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + LTEXT "&Значение:", IDC_STATIC, 4, 4, 33, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 42, 2, 148, 13 DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 PUSHBUTTON "Отмена", IDCANCEL, 89, 17, 50, 14 END -IDD_ADDFAVORITES DIALOGEX 0, 0, 187, 95 +IDD_ADDFAVORITES DIALOGEX 0, 0, 186, 46 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Добавить в избранное" FONT 8, "MS Shell Dlg"

11 months, 3 weeks

[reactos] 02/04: [FORMAT] Fix translation headers (+ miscellaneous fixes)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=889cfee653fabf8aef1ab… commit 889cfee653fabf8aef1ab27f279d66ec9f54f889 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 26 00:02:38 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jan 26 00:02:38 2024 +0300 [FORMAT] Fix translation headers (+ miscellaneous fixes) --- base/system/format/lang/bg-BG.rc | 12 ++++++++++-- base/system/format/lang/cs-CZ.rc | 8 +++++--- base/system/format/lang/de-DE.rc | 11 +++++++++++ base/system/format/lang/el-GR.rc | 7 ++++++- base/system/format/lang/en-US.rc | 7 +++++++ base/system/format/lang/es-ES.rc | 7 ++++++- base/system/format/lang/fr-FR.rc | 7 ++++++- base/system/format/lang/hu-HU.rc | 8 +++++++- base/system/format/lang/id-ID.rc | 8 ++++++++ base/system/format/lang/it-IT.rc | 7 +++++++ base/system/format/lang/ja-JP.rc | 7 +++++++ base/system/format/lang/lt-LT.rc | 8 +++++++- base/system/format/lang/no-NO.rc | 9 ++++++++- base/system/format/lang/pl-PL.rc | 9 +++++---- base/system/format/lang/ro-RO.rc | 2 +- base/system/format/lang/ru-RU.rc | 10 ++++++++-- base/system/format/lang/sk-SK.rc | 8 +++++--- base/system/format/lang/sq-AL.rc | 9 ++++++--- base/system/format/lang/tr-TR.rc | 9 ++++++++- base/system/format/lang/uk-UA.rc | 9 ++++----- base/system/format/lang/zh-CN.rc | 8 +++++++- base/system/format/lang/zh-TW.rc | 9 +++++++-- 22 files changed, 146 insertions(+), 33 deletions(-) diff --git a/base/system/format/lang/bg-BG.rc b/base/system/format/lang/bg-BG.rc index eeabc866595..75fe6e4d804 100644 --- a/base/system/format/lang/bg-BG.rc +++ b/base/system/format/lang/bg-BG.rc @@ -1,11 +1,19 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATORS: Copyright 2007-2012 S. Stanev (CCTAHEB) <sstpr(a)narod.ru> + * Copyright 2023 Nikolay Dimitrov <nikolay.dimitrov(a)extremesoft.eu> + */ + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN STRING_HELP "Употреба: %s устройство: [-FS:файлова_система] [-V:етикет] [-Q] [-A:размер] [-C]\n\n\ - [drive:] Указва устройството за оразмеряване.\n\ + [устройство:] Указва устройството за оразмеряване.\n\ -FS:файлова_система Указва вида на файловата система (%s).\n\ - -V:етикет Указва етикет за тома.\n\ + -V:етикет Указва етикет за тома.\n\ -Q Извършва бързо оразмеряване (форматиране).\n\ -A:размер Потиска подразбрания размер на чепката. Подразбраните настройки\n\ са силно препоръчителни за обща употреба.\n\ diff --git a/base/system/format/lang/cs-CZ.rc b/base/system/format/lang/cs-CZ.rc index fb52fa3cd7f..329893e7c1d 100644 --- a/base/system/format/lang/cs-CZ.rc +++ b/base/system/format/lang/cs-CZ.rc @@ -1,6 +1,8 @@ -/* FILE: base/system/format/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-04-21 +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATOR: Copyright 2008 Radek Liška (Black_Fox) <radekliska(a)gmail.com> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/system/format/lang/de-DE.rc b/base/system/format/lang/de-DE.rc index 22e102984ba..3242887f855 100644 --- a/base/system/format/lang/de-DE.rc +++ b/base/system/format/lang/de-DE.rc @@ -1,3 +1,14 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2005 Kevin Schnabel (FooDerGrosse) <kevin_schnabel(a)gmx.de> + * Copyright 2008 Fabian Maurer <dark_shadow(a)gmx.at> + * Copyright 2008 Matthias Kupfer <mkupfer(a)reactos.org> + * Copyright 2010 Sven Knurr (tux.) <forenkrams(a)tuxproject.de> + * Copyright 2014 Zehnvor <sixlivezehn(a)googlemail.com> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/system/format/lang/el-GR.rc b/base/system/format/lang/el-GR.rc index dd143638e53..f25a676d79f 100644 --- a/base/system/format/lang/el-GR.rc +++ b/base/system/format/lang/el-GR.rc @@ -1,4 +1,9 @@ -/* Ελληνική μετάφραση - Απόστολος Αλεξιάδης */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Greek resource file + * TRANSLATOR: Copyright 2008 Apostolos Alexiadis <djapal(a)gmail.com> + */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT diff --git a/base/system/format/lang/en-US.rc b/base/system/format/lang/en-US.rc index 4356abca1be..2990400cd74 100644 --- a/base/system/format/lang/en-US.rc +++ b/base/system/format/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2005 Magnus Olsen <magnus(a)greatlord.com> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE diff --git a/base/system/format/lang/es-ES.rc b/base/system/format/lang/es-ES.rc index e82a4a84c0c..7930c1794b3 100644 --- a/base/system/format/lang/es-ES.rc +++ b/base/system/format/lang/es-ES.rc @@ -1,4 +1,9 @@ -/* Spanish translation by Javier Remacha 2007-12-19 */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Spanish resource file + * TRANSLATOR: Copyright 2007 Javier Remacha <remialdo(a)gmail.com> + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/system/format/lang/fr-FR.rc b/base/system/format/lang/fr-FR.rc index 74447b46072..70385a8bb97 100644 --- a/base/system/format/lang/fr-FR.rc +++ b/base/system/format/lang/fr-FR.rc @@ -1,4 +1,9 @@ -/* Translation made by Jerome Signouret, 2005. */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: French resource file + * TRANSLATOR: Copyright 2005 Jerome Signouret <ggcom(a)tele2.fr> + */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/base/system/format/lang/hu-HU.rc b/base/system/format/lang/hu-HU.rc index 4cf8f2bb988..9105327e755 100644 --- a/base/system/format/lang/hu-HU.rc +++ b/base/system/format/lang/hu-HU.rc @@ -1,4 +1,10 @@ -/* Hungarian translation by Peter Nagy <nagylakas(a)gmail.com> */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hungarian resource file + * TRANSLATORS: Copyright 2005 Peter Nagy <nagylakas(a)gmail.com> + * Copyright 2022 Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> + */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/base/system/format/lang/id-ID.rc b/base/system/format/lang/id-ID.rc index bddde264e7e..8369ece9de6 100644 --- a/base/system/format/lang/id-ID.rc +++ b/base/system/format/lang/id-ID.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Indonesian resource file + * TRANSLATORS: Copyright 2007 Zaenal Mutaqin <ade999(a)gmail.com> + * Copyright 2019 Mas Ahmad Muhammad <m.charly81(a)gmail.com> + */ + LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/system/format/lang/it-IT.rc b/base/system/format/lang/it-IT.rc index 34918cb5b9f..0add43bd09a 100644 --- a/base/system/format/lang/it-IT.rc +++ b/base/system/format/lang/it-IT.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Italian resource file + * TRANSLATOR: Copyright 2007 Paolo Devoti (devpao) <devotip(a)tiscali.it> + */ + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/system/format/lang/ja-JP.rc b/base/system/format/lang/ja-JP.rc index 6b4c6954446..f0203afbcbb 100644 --- a/base/system/format/lang/ja-JP.rc +++ b/base/system/format/lang/ja-JP.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Japanese resource file + * TRANSLATOR: Copyright 2005 tsk <tsk_n(a)mail.goo.ne.jp> + */ + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/system/format/lang/lt-LT.rc b/base/system/format/lang/lt-LT.rc index 13b9e4d80f2..30819ecb5a3 100644 --- a/base/system/format/lang/lt-LT.rc +++ b/base/system/format/lang/lt-LT.rc @@ -1,4 +1,10 @@ -/* Translation by Vytis 'CMan' Girdžijauskas cman(a)cman.us */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Lithuanian resource file + * TRANSLATORS: Copyright 2008 Vytis Girdžijauskas <cman(a)cman.us> + * Copyright 2011 Edijs Kolesnikovics <terminedijs(a)yahoo.com> + */ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT diff --git a/base/system/format/lang/no-NO.rc b/base/system/format/lang/no-NO.rc index e7020f1fc28..d3e5b10f4f6 100644 --- a/base/system/format/lang/no-NO.rc +++ b/base/system/format/lang/no-NO.rc @@ -1,9 +1,16 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Norwegian resource file + * TRANSLATOR: Copyright 2006 Lars Martin Hambro (LMH1) <lars_martin4(a)hotmail.com> + */ + LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN STRING_HELP "bruk: %s stasjon: [-FS:fil-system] [-V:merke] [-Q] [-A:størrelse] [-C]\n\n\ - [stasjon:] Spesifisere stasjon til formater.\n\ + [stasjon:] Spesifisere stasjon til formater.\n\ -FS:file-system Spesifisere typen av fil system (%s).\n\ -V:merke Spesifisere volum merke.\n\ -Q Fullføre en rask formatering.\n\ diff --git a/base/system/format/lang/pl-PL.rc b/base/system/format/lang/pl-PL.rc index d8abe78f03f..aa4a70720cf 100644 --- a/base/system/format/lang/pl-PL.rc +++ b/base/system/format/lang/pl-PL.rc @@ -1,8 +1,9 @@ /* - * Translated by xrogers - * xxrogers(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * UTF-8 conversion by Caemyr (May, 2011) + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2007 Lech Groblewicz <xxrogers(a)users.sourceforge.net> + * Copyright 2007 Janusz Tomczak <januszt29(a)interia.pl> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/base/system/format/lang/ro-RO.rc b/base/system/format/lang/ro-RO.rc index 61a55fd22f7..3a4103eaf0d 100644 --- a/base/system/format/lang/ro-RO.rc +++ b/base/system/format/lang/ro-RO.rc @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Format + * PROJECT: Disk Format Utility * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2018 Ștefan Fulea <stefan.fulea(a)mail.com> diff --git a/base/system/format/lang/ru-RU.rc b/base/system/format/lang/ru-RU.rc index 64d541da008..fcedd2654b6 100644 --- a/base/system/format/lang/ru-RU.rc +++ b/base/system/format/lang/ru-RU.rc @@ -1,11 +1,17 @@ -/* Russian translation by Dmitry Chapyshev, 2007-06-10 */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2007 Dmitry Chapyshev <lentind(a)yandex.ru> + * Copyright 2014 Kudratov Olimjon <olim98(a)bk.ru> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN STRING_HELP "Использование: %s том: [-FS:система] [-V:метка] [-Q] [-A:размер] [-C]\n\n\ - том: Указывает букву диска (с последующим двоеточием),\n\ + [том:] Указывает букву диска (с последующим двоеточием),\n\ точку подключения или имя тома.\n\ -FS:система Указывает тип файловой системы (%s).\n\ -V:метка Метка тома.\n\ diff --git a/base/system/format/lang/sk-SK.rc b/base/system/format/lang/sk-SK.rc index 8ea2aafdfb9..7411a75db96 100644 --- a/base/system/format/lang/sk-SK.rc +++ b/base/system/format/lang/sk-SK.rc @@ -1,6 +1,8 @@ -/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 15-02-2008 - * LAST CHANGE: 10-08-2010 +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Slovak resource file + * TRANSLATOR: Copyright 2008-2010 Mário Kačmár <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT diff --git a/base/system/format/lang/sq-AL.rc b/base/system/format/lang/sq-AL.rc index 871913260f9..a8a93e55a02 100644 --- a/base/system/format/lang/sq-AL.rc +++ b/base/system/format/lang/sq-AL.rc @@ -1,6 +1,9 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 -*/ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATOR: Copyright 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/base/system/format/lang/tr-TR.rc b/base/system/format/lang/tr-TR.rc index 2581ee7c885..9504a3dd5d7 100644 --- a/base/system/format/lang/tr-TR.rc +++ b/base/system/format/lang/tr-TR.rc @@ -1,4 +1,11 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2015 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2018 Ercan Ersoy <ercanersoy(a)ercanersoy.net> + * Copyright 2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/system/format/lang/uk-UA.rc b/base/system/format/lang/uk-UA.rc index 7604cee65ce..f6ccf704148 100644 --- a/base/system/format/lang/uk-UA.rc +++ b/base/system/format/lang/uk-UA.rc @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS CMD Format - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/format/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for Format command - * TRANSLATOR: Rostislav Zabolotny + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATOR: Copyright 2007 Rostislav Zabolotny <rstzab(a)yandex.ru> */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/base/system/format/lang/zh-CN.rc b/base/system/format/lang/zh-CN.rc index e8307c11776..1f5bba51926 100644 --- a/base/system/format/lang/zh-CN.rc +++ b/base/system/format/lang/zh-CN.rc @@ -1,4 +1,10 @@ -/* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + * Copyright 2022 Wu Haotian <rigoligo03(a)gmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED diff --git a/base/system/format/lang/zh-TW.rc b/base/system/format/lang/zh-TW.rc index 61349085870..c9de9f4827c 100644 --- a/base/system/format/lang/zh-TW.rc +++ b/base/system/format/lang/zh-TW.rc @@ -1,5 +1,10 @@ -/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ -/* Translation improved by Chan Chilung 2020 - 2021 (eason066(a)gmail.com) */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Traditional) resource file + * TRANSLATORS: Copyright 2016 Henry Tang Ih <henrytang2(a)hotmail.com> + * Copyright 2020-2021 Chan Chilung <eason066(a)gmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

11 months, 3 weeks

[reactos] 01/04: [INF] Shortcuts: Remove remaining trailing dots. Addendum to 92a36b36131.

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e480a7d17c9cc5ebcdc71… commit e480a7d17c9cc5ebcdc717e4b7888a768deccb4c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jan 25 21:58:40 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jan 25 21:58:40 2024 +0300 [INF] Shortcuts: Remove remaining trailing dots. Addendum to 92a36b36131. --- media/inf/shortcuts.inf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 3e6307c2204..efde782435d 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -467,7 +467,7 @@ README_DESC=Documento Léame de ReactOS CMD_TITLE=Consola CMD_DESC=Abre una consola de comandos EXPLORER_TITLE=Explorador de ReactOS -EXPLORER_DESC=Ejecuta una nueva ventana del explorador de archivos. +EXPLORER_DESC=Ejecuta una nueva ventana del explorador de archivos RAPPS_TITLE=Administrador de aplicaciones de ReactOS RAPPS_TITLE_SHORT=Administrador de aplicaciones RAPPS_DESC=Descarga e instala varias aplicaciones @@ -890,7 +890,7 @@ KBSWITCH_DESC=Cambia il layout di tastiera REGEDIT_TITLE=Editor del registro REGEDIT_DESC=Lancia l'editor del registro DXDIAG_TITLE=ReactX Diagnostica -DXDIAG_DESC=Esegui il programma di diagnostica ReactX- +DXDIAG_DESC=Esegui il programma di diagnostica ReactX MAGNIFY_TITLE=Lente d'ingrandimento MAGNIFY_DESC=Ingrandisce parti dello schermo OSK_TITLE=Tastiera su schermo @@ -1327,7 +1327,7 @@ CLIPBRD_DESC=Inspector de Clipboard KBSWITCH_TITLE=Comutator aranjamente de tastatură KBSWITCH_DESC=Program pentru comutarea aranjamentelor de tastatură REGEDIT_TITLE=Editor de registru -REGEDIT_DESC=Program pentru editarea registrului de sistem. +REGEDIT_DESC=Program pentru editarea registrului de sistem TASKMGR_TITLE=Manager de activități TASKMGR_DESC=Program de gestiune a activităților DXDIAG_TITLE=Diagnosticare ReactX @@ -1645,7 +1645,7 @@ WORDPAD_DESC=Hasi testu dokumentu editorea MSPAINT_TITLE=Paint MSPAINT_DESC=Hasi irudiaren editore funtsezkoa CHARMAP_TITLE=Karaktere-mapa -CHARMAP_DESC=Karaktere-mapa hasi. +CHARMAP_DESC=Karaktere-mapa hasi CLIPBRD_TITLE=Arbel-ikustailea CLIPBRD_DESC=Controla lo que copias y pegas en el visor del portapapeles de ReactOS KBSWITCH_TITLE=Teklatuen diztribuzio aukerak @@ -1655,7 +1655,7 @@ REGEDIT_DESC=Ejecuta la utilidad de configuración del Registro del sistema oper TASKMGR_TITLE=Ataza-kudeatzaile TASKMGR_DESC=Administre y gestione las tareas y procesos en funcionamiento DXDIAG_TITLE=ReactX analisia -DXDIAG_DESC=Hasi ReactX analisia. +DXDIAG_DESC=Hasi ReactX analisia MAGNIFY_TITLE=Lupa MAGNIFY_DESC=Zabaldu pantailaren atalak eta hobetu irisgarritasuna OSK_TITLE=Pantailako teklatua

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Add CUIFMenuItemSeparator (#6411)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b0ee735c739764cd7f52… commit 6b0ee735c739764cd7f523bbc723a7d57e0998bb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 25 12:35:04 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 25 12:35:04 2024 +0900 [SDK] cicuif.h: Add CUIFMenuItemSeparator (#6411) Supporting Language Bar... JIRA issue: CORE-19363 - Add CUIFMenuItemSeparator class. - Implement CUIFMenu::InsertSeparator method. --- sdk/include/reactos/cicero/cicarray.h | 9 +++++ sdk/include/reactos/cicero/cicuif.h | 70 +++++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/sdk/include/reactos/cicero/cicarray.h b/sdk/include/reactos/cicero/cicarray.h index 880188b5186..1d2142f1c59 100644 --- a/sdk/include/reactos/cicero/cicarray.h +++ b/sdk/include/reactos/cicero/cicarray.h @@ -57,6 +57,15 @@ public: using CicArrayBase::Insert; using CicArrayBase::Remove; + BOOL Add(const T_ITEM& item) + { + T_ITEM *pItem = Append(1); + if (!pItem) + return FALSE; + CopyMemory(pItem, &item, sizeof(T_ITEM)); + return TRUE; + } + ssize_t Find(const T_ITEM& item) const { for (size_t iItem = 0; iItem < m_cItems; ++iItem) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index c1e2f337027..b4715f93263 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -34,6 +34,7 @@ class CUIFTheme; class CUIFWndFrame; class CUIFGripper; class CUIFMenuItem; + class CUIFMenuItemSeparator; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; @@ -806,13 +807,25 @@ public: STDMETHOD_(void, OnTimer)() override; STDMETHOD_(void, InitMenuExtent)(); - STDMETHOD_(void, OnPaintO10)(HDC hDC); STDMETHOD_(void, OnPaintDef)(HDC hDC); + STDMETHOD_(void, OnPaintO10)(HDC hDC); STDMETHOD_(void, OnUnknownMethod)() { } // FIXME: method name }; ///////////////////////////////////////////////////////////////////////////// +class CUIFMenuItemSeparator : public CUIFMenuItem +{ +public: + CUIFMenuItemSeparator(CUIFMenu *pMenu); + + STDMETHOD_(void, InitMenuExtent)() override; + STDMETHOD_(void, OnPaintDef)(HDC hDC) override; + STDMETHOD_(void, OnPaintO10)(HDC hDC) override; +}; + +///////////////////////////////////////////////////////////////////////////// + // m_style flags for CUIFButton enum { @@ -5733,20 +5746,27 @@ CUIFMenu::InitShow(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag, BOOL bDoAnimati inline BOOL CUIFMenu::InsertItem(CUIFMenuItem *pItem) { - CUIFMenuItem **ppAdded = m_MenuItems.Append(1); - if (!ppAdded) + if (!m_MenuItems.Add(pItem)) return FALSE; - *ppAdded = pItem; pItem->SetFont(m_hFont); return TRUE; } -/// @unimplemented inline BOOL CUIFMenu::InsertSeparator() { - //FIXME - return FALSE; + CUIFMenuItemSeparator *pSep = new(cicNoThrow) CUIFMenuItemSeparator(this); + if (!pSep) + return FALSE; + + if (!m_MenuItems.Add(pSep)) + { + delete pSep; + return FALSE; + } + + pSep->Initialize(); + return TRUE; } inline STDMETHODIMP_(void) @@ -6370,3 +6390,39 @@ inline void CUIFMenuItem::ShowSubPopup() ::ClientToScreen(*m_pWindow, (LPPOINT)&rc.right); m_pSubMenu->ShowSubPopup(m_pMenu, &rc, FALSE); } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFMenuItemSeparator::CUIFMenuItemSeparator(CUIFMenu *pMenu) : CUIFMenuItem(pMenu, TRUE) +{ + m_nMenuItemID = -1; +} + +inline STDMETHODIMP_(void) +CUIFMenuItemSeparator::InitMenuExtent() +{ + m_MenuLeftExtent.cx = 0; + m_MenuLeftExtent.cy = 6; +} + +inline STDMETHODIMP_(void) +CUIFMenuItemSeparator::OnPaintDef(HDC hDC) +{ + if (!m_pScheme) + return; + + RECT rc; + rc.left = m_rc.left + 2; + rc.top = m_rc.top + (m_rc.bottom - m_rc.top - 2) / 2; + rc.right = m_rc.right - 2; + rc.bottom = rc.top + 2; + m_pScheme->DrawMenuSeparator(hDC, &rc); +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFMenuItemSeparator::OnPaintO10(HDC hDC) +{ + //FIXME +}

11 months, 3 weeks

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