Ros-diffs January 2024

ros-diffs@reactos.org

17 participants
181 discussions

[reactos] 01/01: [NTOSKRNL_VISTA] IoQueueWorkItemEx: Pass new context for the queue (#6276)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d1beca11925d36b2eb0c… commit 8d1beca11925d36b2eb0c977adb5cd0afa5f709a Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Thu Jan 11 12:29:53 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 11 12:29:53 2024 +0100 [NTOSKRNL_VISTA] IoQueueWorkItemEx: Pass new context for the queue (#6276) Passing parameter-provided context results in missing WorkerRoutine and WorkItem when callback is executed. --- sdk/lib/drivers/ntoskrnl_vista/io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/ntoskrnl_vista/io.c b/sdk/lib/drivers/ntoskrnl_vista/io.c index e3686abd12e..a0ec83bda9a 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/io.c +++ b/sdk/lib/drivers/ntoskrnl_vista/io.c @@ -63,7 +63,7 @@ IoQueueWorkItemEx( newContext->WorkItemRoutineEx = WorkerRoutine; newContext->Context = Context; - IoQueueWorkItem(IoWorkItem, IopWorkItemExCallback, QueueType, Context); + IoQueueWorkItem(IoWorkItem, IopWorkItemExCallback, QueueType, newContext); } _IRQL_requires_max_(PASSIVE_LEVEL)

11 months, 2 weeks

[reactos] 01/01: [BOOTDATA] Add Portuguese (pt-PT) translation to hivecls.inf (#6218)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f2167abb0bad3e0988d6… commit 2f2167abb0bad3e0988d65c7d1141d9170f40c42 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Jan 11 10:59:11 2024 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 11 11:59:11 2024 +0100 [BOOTDATA] Add Portuguese (pt-PT) translation to hivecls.inf (#6218) --- boot/bootdata/hivecls.inf | 43 +++++++++++++++++++++++++++++++++++++++++++ boot/bootdata/hivesys.inf | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 3dda5a8c7ce..19861ab539b 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -1008,6 +1008,49 @@ REPAIR="Napraw" TEST="Testuj" ;------------------------------------------------------------------------ + +; LANG_PORTUGUESE SUBLANG_NEUTRAL +[Strings.0016] +;; In shell32.dll +CPLFILE_OPENWITH="Abrir com o Painel de Control" + +;; In hhctrl.ocx +CHMFILE="Ficheiro de ajuda HTML compilado" + +;; In msxml3r.dll +XMLFILE="Documento XML" +XSLFILE="Folha de estilos XSL" + +;; In msi.dll +MSIPACK="Pacote de instalação do ReactOS" + +;; In themeui.dll +MSSTYLESFILE="Ficheiro de estilo visual" +THEMEFILE="Ficheiro de temas" + +;; In some multimedia exe/dll +WAVFILE="Ficheiro de audio" +MIDFILE="Sequência MIDI" +CDAFILE="Pista de audio CD" +AVIFILE="Sequência de vídeo" + +;; Misc file types without friendly (localized in .dll resources) name +CSSFILE="Folha de estilos em cascada" +SCFFILE="Comando do Explorador ReactOS" +WMZFILE="Metarquivo aprimorado compactado" + +;; For .reg files, right-click menu +MERGE="Combinar" + +;; For screensaver (*.scr) and MSI install package (*.msi) files, right-click menu +CONFIGURE="Configurar" +INSTALL="Instalar" +UNINSTALL="Desinstalar" +REPAIR="Reparar" +TEST="Testar" + +;------------------------------------------------------------------------ + ; LANG_ROMANIAN SUBLANG_NEUTRAL [Strings.0018] ;; In shell32.dll diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 18d3c2a20fc..eb22a18637b 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2746,7 +2746,7 @@ SECLOGON_SERVICE_DESCRIPTION="Activa processos de início sob credenciais altern SERVER_SERVICE="Servidor" SERVER_SERVICE_DESCRIPTION="Suporta a partilha de ficheiros, impressoras e recursos de rede." -SPOOLER_SERVICE="Spooler de impressão" +SPOOLER_SERVICE="Fila de impressão" SPOOLER_SERVICE_DESCRIPTION="Carrega ficheiros na memória para impressão posterior." TCPSVCS_SERVICE="Serviços TCP/IP simples"

11 months, 2 weeks

[reactos] 01/01: [SDK] cicuif.h: Add CUIFButton2 (#6331)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74ff3844ccac60b2580c9… commit 74ff3844ccac60b2580c9c9018786624f3bd7f42 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 11 18:44:43 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 11 18:44:43 2024 +0900 [SDK] cicuif.h: Add CUIFButton2 (#6331) Supporting TIPs... JIRA issue: CORE-19360 - Improve CUIFScheme class. - Add CUIFButton2 class. --- sdk/include/reactos/cicero/cicuif.h | 231 +++++++++++++++++++++++++++++++++--- 1 file changed, 217 insertions(+), 14 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 92675de7866..0beab5656d7 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 CUIFButton; + class CUIFButton2; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; @@ -57,6 +58,7 @@ void cicUpdateUIFSys(void); ///////////////////////////////////////////////////////////////////////////// #include <uxtheme.h> +#include <vsstyle.h> // uxtheme.dll using FN_OpenThemeData = decltype(&OpenThemeData); @@ -266,7 +268,7 @@ public: STDMETHOD_(void, OnHideToolTip)() { } STDMETHOD_(void, DetachWndObj)(); STDMETHOD_(void, ClearWndObj)(); - STDMETHOD_(LRESULT, OnPaintTheme)(HDC hDC); + STDMETHOD_(BOOL, OnPaintTheme)(HDC hDC); STDMETHOD_(void, OnPaintNoTheme)(HDC hDC); STDMETHOD_(void, ClearTheme)(); }; @@ -434,8 +436,9 @@ class CUIFScheme public: static CUIFColorTableSys *s_pColorTableSys; static CUIFColorTableOff10 *s_pColorTableOff10; + BOOL m_bMirroring; - CUIFScheme() { } + CUIFScheme() : m_bMirroring(FALSE) { } virtual ~CUIFScheme() { } STDMETHOD_(DWORD, GetType)() = 0; @@ -451,14 +454,14 @@ public: STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) = 0; STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD dwDrawFlags, LPSIZE pSize) = 0; STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; - STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD, DWORD) = 0; + STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD dwDrawFlags, BOOL bRight) = 0; STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) = 0; STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawMenuBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) = 0; STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; - STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) = 0; + STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) = 0; STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) = 0; @@ -469,11 +472,10 @@ public: class CUIFSchemeDef : public CUIFScheme { protected: - DWORD m_dwFlags; DWORD m_dwType; public: - CUIFSchemeDef(DWORD dwType) : m_dwFlags(0), m_dwType(dwType) { } + CUIFSchemeDef(DWORD dwType) : m_dwType(dwType) { } STDMETHOD_(DWORD, GetType)() override; STDMETHOD_(COLORREF, GetColor)(INT iColor) override; @@ -486,14 +488,14 @@ public: 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 unused, DWORD dwDrawFlags) override; - STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD, DWORD) override; + STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD dwDrawFlags, BOOL bRight) override; STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) override; STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawMenuBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) override; STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; - STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) override; + STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) override; STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) override; @@ -709,6 +711,22 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFButton2 : public CUIFButton +{ +protected: + SIZE m_BitmapSize; + +public: + CUIFButton2(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); + ~CUIFButton2() override; + + DWORD MakeDrawFlag(); + STDMETHOD_(BOOL, OnPaintTheme)(HDC hDC) override; + STDMETHOD_(void, OnPaintNoTheme)(HDC hDC) override; +}; + +///////////////////////////////////////////////////////////////////////////// + inline void cicInitUIFLib(void) { cicInitUIFSys(); @@ -1156,9 +1174,9 @@ inline STDMETHODIMP_(void) CUIFObject::ClearWndObj() m_ObjectArray[iItem]->ClearWndObj(); } -inline STDMETHODIMP_(LRESULT) CUIFObject::OnPaintTheme(HDC hDC) +inline STDMETHODIMP_(BOOL) CUIFObject::OnPaintTheme(HDC hDC) { - return 0; + return FALSE; } inline STDMETHODIMP_(void) CUIFObject::OnPaintNoTheme(HDC hDC) @@ -1489,7 +1507,7 @@ CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlag } /// @unimplemented -inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlEdge(HDC hDC, LPCRECT prc, DWORD, DWORD) +inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlEdge(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) { //FIXME RECT rc = *prc; @@ -1532,7 +1550,7 @@ CUIFSchemeDef::DrawCtrlText( inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) { - if (m_dwFlags & 1) + if (m_bMirroring) { HBITMAP hbm1, hbm2; if (cicGetIconBitmaps(hIcon, &hbm1, &hbm2, pSize)) @@ -1583,9 +1601,9 @@ CUIFSchemeDef::DrawFrameCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDra } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawFrameCtrlEdge(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) +CUIFSchemeDef::DrawFrameCtrlEdge(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) { - DrawCtrlEdge(hDC, prc, dw1, dw2); + DrawCtrlEdge(hDC, prc, unused, dwDrawFlags); } inline STDMETHODIMP_(void) @@ -3874,3 +3892,188 @@ inline void CUIFButton::SetText(LPCWSTR pszText) CallOnPaint(); } + +///////////////////////////////////////////////////////////////////////////// + +inline CUIFButton2::CUIFButton2( + CUIFObject *pParent, + DWORD dwUnknown3, + LPCRECT prc, + DWORD style) : CUIFButton(pParent, dwUnknown3, prc, style) +{ + m_iStateId = 0; + m_iPartId = BP_PUSHBUTTON; + m_pszClassList = L"TOOLBAR"; +} + +inline CUIFButton2::~CUIFButton2() +{ + CloseThemeData(); +} + +inline DWORD CUIFButton2::MakeDrawFlag() +{ + DWORD dwDrawFlags = 0; + if (m_bPressed) + dwDrawFlags |= 0x10; + if (m_uButtonStatus == 1) + dwDrawFlags |= 0x2; + else if (2 <= m_uButtonStatus && m_uButtonStatus <= 3) + dwDrawFlags |= 0x1; + if (!m_bEnable) + dwDrawFlags |= 0x20; + return dwDrawFlags; +} + +/// @unimplemented +inline STDMETHODIMP_(BOOL) +CUIFButton2::OnPaintTheme(HDC hDC) +{ + //FIXME + return FALSE; +} + +inline STDMETHODIMP_(void) +CUIFButton2::OnPaintNoTheme(HDC hDC) +{ + if (!m_pScheme) + return; + + INT width = m_rc.right - m_rc.left; + INT height = m_rc.bottom - m_rc.top; + HDC hdcMem = ::CreateCompatibleDC(hDC); + if (!hdcMem) + return; + + HBITMAP hbmMem = ::CreateCompatibleBitmap(hDC, width, height); + if ( !hbmMem ) + { + ::DeleteDC(hdcMem); + return; + } + + HGDIOBJ hbmOld = ::SelectObject(hdcMem, hbmMem); + HGDIOBJ hFontOld = ::SelectObject(hdcMem, m_hFont); + RECT rcBack = { 0, 0, width, height }; + + INT cxText, cyText, cxContent, cyContent, cxyBorders, cxButton, cyButton; + if (m_pszButtonText) + { + cxText = m_TextSize.cx; + cyText = m_TextSize.cy; + } + else + { + cxText = 0; + cyText = cyText; + } + + if (m_ButtonIcon.m_hIcon) + { + cxContent = m_IconSize.cx; + cyContent = m_IconSize.cy; + } + else if (m_hbmButton1) + { + cxContent = m_BitmapSize.cx; + cyContent = m_BitmapSize.cy; + } + + if (m_style & 0x400) + { + cxyBorders = ((cyText && cyContent) ? 2 : 0); + + cxButton = cxContent; + cyButton = cyText + cyContent + cxyBorders; + if (cxText > cxContent) + cxButton = cxText; + } + else + { + cxyBorders = ((cxText && cxContent) ? 2 : 0); + + cyButton = cyContent; + cxButton = cxText + cxContent + cxyBorders; + if (cyText > cyButton) + cyButton = cyText; + } + + INT xOffset, yOffset; + if ((m_style & 3) == 1) // center + xOffset = (rcBack.left + rcBack.right - cxButton) / 2; + else if ((m_style & 3) == 2) // right + xOffset = rcBack.right - cxText - 2; + else // left + xOffset = rcBack.left + 2; + + + if ((m_style & 0xC) == 4) // middle + yOffset = (rcBack.top + rcBack.bottom - cyButton) / 2; + else if ((m_style & 0xC) == 8) // bottom + yOffset = rcBack.bottom - cyButton - 2; + else // top + yOffset = rcBack.top + 2; + + RECT rc = { xOffset, yOffset, xOffset + cxButton, cyButton + yOffset }; + SIZE offsetSize = { 0, 0 }; + DWORD dwDrawFlags = MakeDrawFlag(); + m_pScheme->GetCtrlFaceOffset(((m_style & UIF_STYLE_RTL) ? 165 : 84), + dwDrawFlags, + &offsetSize); + ::OffsetRect(&rc, offsetSize.cx, offsetSize.cy); + + RECT rcImage, rcText; + if (m_style & UIF_STYLE_VERTICAL) // vertical + { + rcImage.left = (rc.left + rc.right - cxContent) / 2; + rcImage.top = rc.top; + rcImage.right = rcImage.left + cxContent; + rcImage.bottom = rc.top + cyContent; + rcText.left = (rc.left + rc.right - cxText) / 2; + rcText.top = rc.bottom - cyText; + rcText.right = rcText.left + cxText; + rcText.bottom = rc.bottom; + } + else + { + rcImage.left = rc.left; + rcImage.top = (rc.top + rc.bottom - cyContent) / 2; + rcImage.bottom = rcImage.top + cyContent; + rcImage.right = rc.left + cxContent; + rcText.left = rc.right - cxText; + rcText.top = (rc.top + rc.bottom - cyText) / 2; + rcText.right = rc.right; + rcText.bottom = rcText.top + cyText; + } + + if (IsRTL()) + m_pScheme->m_bMirroring = TRUE; + + m_pScheme->DrawCtrlBkgd(hdcMem, + &rcBack, + ((m_style & UIF_STYLE_RTL) ? 165 : 84), + dwDrawFlags); + if (m_pszButtonText) + { + m_pScheme->DrawCtrlText(hdcMem, &rcText, m_pszButtonText, -1, dwDrawFlags, + !!(m_style & UIF_STYLE_VERTICAL)); + } + + if (m_ButtonIcon.m_hIcon) + m_pScheme->DrawCtrlIcon(hdcMem, &rcImage, m_ButtonIcon.m_hIcon, dwDrawFlags, &m_IconSize); + else if (m_hbmButton1) + m_pScheme->DrawCtrlBitmap(hdcMem, &rcImage, m_hbmButton1, m_hbmButton2, dwDrawFlags); + + if (IsRTL()) + m_pScheme->m_bMirroring = FALSE; + + m_pScheme->DrawCtrlEdge(hdcMem, + &rcBack, + ((m_style & UIF_STYLE_RTL) ? 165 : 84), + dwDrawFlags); + + ::BitBlt(hDC, m_rc.left, m_rc.top, width, height, hdcMem, 0, 0, SRCCOPY); + ::SelectObject(hdcMem, hFontOld); + ::SelectObject(hdcMem, hbmOld); + ::DeleteObject(hbmMem); +}

11 months, 2 weeks

[reactos] 01/01: [SDK] cicuif.h: Refactoring Part 2 (#6330)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5719896650f0a51ddf18a… commit 5719896650f0a51ddf18a2dd3c85a8dea9f08d5c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 10 13:13:21 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 10 13:13:21 2024 +0900 [SDK] cicuif.h: Refactoring Part 2 (#6330) Supporting TIPs... JIRA issue: CORE-19360 - Fix some mistakes of CUIFButton::OnMouseIn and CUIFButton::OnMouseOut. - Fix some mistakes of CUIFObject and CUIFWindow. --- sdk/include/reactos/cicero/cicuif.h | 163 ++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 89 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 465b3048cf6..92675de7866 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -244,8 +244,8 @@ public: STDMETHOD_(void, OnMButtonUp)(LONG x, LONG y) { } STDMETHOD_(void, OnRButtonUp)(LONG x, LONG y) { } STDMETHOD_(void, OnMouseMove)(LONG x, LONG y) { } - STDMETHOD_(void, OnPoint)(LONG x, LONG y) { } - STDMETHOD_(void, OnUnPoint)(LONG x, LONG y) { } + STDMETHOD_(void, OnMouseIn)(LONG x, LONG y) { } + STDMETHOD_(void, OnMouseOut)(LONG x, LONG y) { } STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y); STDMETHOD_(void, GetRect)(LPRECT prc); STDMETHOD_(void, SetRect)(LPCRECT prc); @@ -449,18 +449,18 @@ public: STDMETHOD_(void, FillRect)(HDC hDC, LPCRECT prc, INT iColor); STDMETHOD_(void, FrameRect)(HDC hDC, LPCRECT prc, INT iColor); STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) = 0; - STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD, LPSIZE pSize) = 0; - STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) = 0; + STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD dwDrawFlags, LPSIZE pSize) = 0; + STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD, DWORD) = 0; - STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD flags, BOOL bRight) = 0; - STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) = 0; - STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) = 0; - STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) = 0; + STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD dwDrawFlags, BOOL bRight) = 0; + STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) = 0; + STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; + STDMETHOD_(void, DrawMenuBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) = 0; - STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) = 0; + STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) = 0; - STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) = 0; - STDMETHOD_(void, DrawFrameCtrlBitmap2)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) = 0; + STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) = 0; + STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) = 0; STDMETHOD_(void, DrawDragHandle)(HDC hDC, LPCRECT prc, BOOL bFlag) = 0; STDMETHOD_(void, DrawSeparator)(HDC hDC, LPCRECT prc, BOOL bFlag) = 0; @@ -484,18 +484,18 @@ public: STDMETHOD_(INT, CxWndBorder)() override; STDMETHOD_(INT, CyWndBorder)() override; STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) override; - STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD, LPSIZE pSize) override; - STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) override; + STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD dwDrawFlags, LPSIZE pSize) override; + STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD, DWORD) override; - STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD flags, BOOL bRight) override; - STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) override; - STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) override; - STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) override; + STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD dwDrawFlags, BOOL bRight) override; + STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) override; + STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; + STDMETHOD_(void, DrawMenuBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) override; - STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) override; + STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) override; - STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) override; - STDMETHOD_(void, DrawFrameCtrlBitmap2)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) override; + STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) override; + STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) override; STDMETHOD_(void, DrawDragHandle)(HDC hDC, LPCRECT prc, BOOL bFlag) override; STDMETHOD_(void, DrawSeparator)(HDC hDC, LPCRECT prc, BOOL bFlag) override; @@ -523,7 +523,7 @@ protected: CUIFWindow *m_pUnknown7; CUIFObject *m_pCaptured; CUIFObject *m_pPointed; - BOOL m_bPointingStarted; + BOOL m_bPointing; CUIFWindow *m_pPointingWindow; CUIFToolTip *m_pToolTip; CUIFShadow *m_pShadow; @@ -590,7 +590,7 @@ public: STDMETHOD_(void, OnThemeChanged)(HWND hWnd, WPARAM wParam, LPARAM lParam); STDMETHOD_(void, UpdateUI)(LPCRECT prc); STDMETHOD_(void, SetCapture)(int); - STDMETHOD_(void, OnPointingStarted)(UINT uMsg, LONG x, LONG y); + STDMETHOD_(void, OnPointingMouse)(UINT uMsg, LONG x, LONG y); STDMETHOD_(void, OnAnimationStart)(); STDMETHOD_(void, OnAnimationEnd)(); STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y); @@ -697,10 +697,10 @@ public: void GetIconSize(HICON hIcon, LPSIZE pSize); void GetTextSize(LPCWSTR pszText, LPSIZE pSize); - void OnMouseIn(POINT pt); - void OnMouseOut(POINT pt); STDMETHOD_(void, Enable)(BOOL bEnable) override; + STDMETHOD_(void, OnMouseIn)(LONG x, LONG y) override; + STDMETHOD_(void, OnMouseOut)(LONG x, LONG y) override; STDMETHOD_(void, OnLButtonDown)(LONG x, LONG y) override; STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; STDMETHOD_(void, OnPaintNoTheme)(HDC hDC) override; @@ -1460,16 +1460,17 @@ inline STDMETHODIMP_(void) CUIFSchemeDef::DrawSelectionRect(HDC hDC, LPCRECT prc } /// @unimplemented -inline STDMETHODIMP_(INT) CUIFSchemeDef::GetCtrlFaceOffset(DWORD, DWORD, LPSIZE pSize) +inline STDMETHODIMP_(INT) CUIFSchemeDef::GetCtrlFaceOffset(DWORD, DWORD dwDrawFlags, LPSIZE pSize) { return 0; } -inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) { ::FillRect(hDC, prc, GetBrush(9)); - if (!(flags & 0x10) && (flags & 0x2)) + if (!(dwDrawFlags & 0x10) && (dwDrawFlags & 0x2)) return; HBRUSH hbrDither = cicCreateDitherBrush(); @@ -1501,7 +1502,7 @@ CUIFSchemeDef::DrawCtrlText( LPCRECT prc, LPCWSTR pszText, INT cchText, - DWORD flags, + DWORD dwDrawFlags, BOOL bRight) { COLORREF rgbOldText = ::GetTextColor(hDC); @@ -1511,7 +1512,7 @@ CUIFSchemeDef::DrawCtrlText( cchText = lstrlenW(pszText); RECT rc = *prc; - if (flags & 0x20) + if (dwDrawFlags & 0x20) { ::OffsetRect(&rc, 1, 1); ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNHIGHLIGHT)); @@ -1529,14 +1530,14 @@ CUIFSchemeDef::DrawCtrlText( } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) +CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) { if (m_dwFlags & 1) { HBITMAP hbm1, hbm2; if (cicGetIconBitmaps(hIcon, &hbm1, &hbm2, pSize)) { - DrawCtrlBitmap(hDC, prc, hbm1, hbm2, flags); + DrawCtrlBitmap(hDC, prc, hbm1, hbm2, dwDrawFlags); ::DeleteObject(hbm1); ::DeleteObject(hbm2); } @@ -1544,7 +1545,7 @@ CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSI else { UINT uFlags = DST_PREFIXTEXT | DST_TEXT; - if (flags & 0x20) + if (dwDrawFlags & 0x20) uFlags |= (DSS_MONO | DSS_DISABLED); ::DrawState(hDC, 0, 0, (LPARAM)hIcon, 0, prc->left, prc->top, 0, 0, uFlags); } @@ -1552,15 +1553,15 @@ CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSI /// @unimplemented inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) +CUIFSchemeDef::DrawCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) { //FIXME } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawFrameCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) +CUIFSchemeDef::DrawMenuBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) { - DrawCtrlBitmap(hDC, prc, hbm1, hbm2, flags); + DrawCtrlBitmap(hDC, prc, hbm1, hbm2, dwDrawFlags); } inline STDMETHODIMP_(void) @@ -1576,9 +1577,9 @@ CUIFSchemeDef::DrawMenuSeparator(HDC hDC, LPCRECT prc) } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawFrameCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) +CUIFSchemeDef::DrawFrameCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) { - DrawCtrlBkgd(hDC, prc, unused, flags); + DrawCtrlBkgd(hDC, prc, unused, dwDrawFlags); } inline STDMETHODIMP_(void) @@ -1588,15 +1589,15 @@ CUIFSchemeDef::DrawFrameCtrlEdge(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawFrameCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) +CUIFSchemeDef::DrawFrameCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) { - DrawCtrlIcon(hDC, prc, hIcon, flags, pSize); + DrawCtrlIcon(hDC, prc, hIcon, dwDrawFlags, pSize); } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawFrameCtrlBitmap2(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) +CUIFSchemeDef::DrawFrameCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) { - DrawFrameCtrlBitmap(hDC, prc, hbm1, hbm2, flags); + DrawCtrlBitmap(hDC, prc, hbm1, hbm2, dwDrawFlags); } inline STDMETHODIMP_(void) @@ -1684,11 +1685,11 @@ inline HIMAGELIST CUIFIcon::GetImageList(BOOL bMirror) SIZE iconSize; cicGetIconSize(m_hIcon, &iconSize); - UINT flags = ILC_COLOR32 | ILC_MASK; + UINT uFlags = ILC_COLOR32 | ILC_MASK; if (bMirror) - flags |= ILC_MIRROR; + uFlags |= ILC_MIRROR; - m_hImageList = ImageList_Create(iconSize.cx, iconSize.cy, flags, 1, 0); + m_hImageList = ImageList_Create(iconSize.cx, iconSize.cy, uFlags, 1, 0); if (m_hImageList) ImageList_ReplaceIcon(m_hImageList, -1, m_hIcon); @@ -1724,11 +1725,13 @@ inline void CUIFBitmapDC::Uninit(BOOL bKeep) ::SelectObject(m_hDC, m_hOldBitmap); m_hOldBitmap = NULL; } + if (m_hOldObject) { ::SelectObject(m_hDC, m_hOldObject); m_hOldObject = NULL; } + if (!bKeep) { if (m_hBitmap) @@ -1790,11 +1793,13 @@ inline void cicDoneUIFUtil(void) delete CUIFBitmapDC::s_phdcSrc; CUIFBitmapDC::s_phdcSrc = NULL; } + if (CUIFBitmapDC::s_phdcMask) { delete CUIFBitmapDC::s_phdcMask; CUIFBitmapDC::s_phdcMask = NULL; } + if (CUIFBitmapDC::s_phdcDst) { delete CUIFBitmapDC::s_phdcDst; @@ -1869,9 +1874,11 @@ cicCreateDisabledBitmap(LPCRECT prc, HBITMAP hbmMask, HBRUSH hbr1, HBRUSH hbr2, ::BitBlt(*CUIFBitmapDC::s_phdcSrc, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCINVERT); if (bPressed) - BitBlt(*CUIFBitmapDC::s_phdcDst, 1, 1, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCPAINT); + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 1, 1, width, height, + *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCPAINT); else - BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCPAINT); + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, + *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCPAINT); ::FillRect(*CUIFBitmapDC::s_phdcSrc, &rc, hbr2); @@ -2071,7 +2078,7 @@ inline CUIFWindow::CUIFWindow(HINSTANCE hInst, DWORD style) m_pCaptured = NULL; m_pUnknown7 = NULL; m_pPointed = NULL; - m_bPointingStarted = FALSE; + m_bPointing = FALSE; m_pToolTip = NULL; m_pShadow = NULL; m_bShowShadow = TRUE; @@ -2272,22 +2279,9 @@ CUIFWindow::GetWndStyleEx() inline STDMETHODIMP_(HWND) CUIFWindow::CreateWnd(HWND hwndParent) { - DWORD style = GetWndStyle(); - LPCTSTR text = GetWndText(); - LPCTSTR clsName = GetClassName(); - DWORD exstyle = GetWndStyleEx(); - HWND hWnd = CreateWindowEx(exstyle, - clsName, - text, - style, - m_nLeft, - m_nTop, - m_nWidth, - m_nHeight, - hwndParent, - NULL, - m_hInst, - this); + HWND hWnd = CreateWindowEx(GetWndStyleEx(), GetClassName(), GetWndText(), GetWndStyle(), + m_nLeft, m_nTop, m_nWidth, m_nHeight, + hwndParent, NULL, m_hInst, this); if (m_pToolTip) m_pToolTip->CreateWnd(hWnd); if (m_pShadow) @@ -2352,32 +2346,24 @@ inline void CUIFWindow::SetObjectPointed(CUIFObject *pPointed, POINT pt) if (m_pCaptured) { - if (m_pCaptured == m_pPointed) - { - if (m_pPointed->m_bEnable) - m_pPointed->OnUnPoint(pt.x, pt.y); - } + if (m_pCaptured == m_pPointed && m_pPointed->m_bEnable) + m_pPointed->OnMouseOut(pt.x, pt.y); } - else if (m_pPointed) + else if (m_pPointed && m_pPointed->m_bEnable) { - if (m_pPointed->m_bEnable) - m_pPointed->OnUnPoint(pt.x, pt.y); + m_pPointed->OnMouseOut(pt.x, pt.y); } m_pPointed = pPointed; if (m_pCaptured) { - if (m_pCaptured == m_pPointed) - { - if (m_pPointed->m_bEnable) - m_pPointed->OnPoint(pt.x, pt.y); - } + if (m_pCaptured == m_pPointed && m_pPointed->m_bEnable) + m_pPointed->OnMouseIn(pt.x, pt.y); } - else if (!m_pPointed) + else if (m_pPointed && m_pPointed->m_bEnable) { - if (m_pPointed->m_bEnable) - m_pPointed->OnPoint(pt.x, pt.y); + m_pPointed->OnMouseIn(pt.x, pt.y); } } @@ -2480,14 +2466,14 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (m_pPointingWindow) { - m_pPointingWindow->OnPointingStarted(HIWORD(lParam), Point.x, Point.y); + m_pPointingWindow->OnPointingMouse(HIWORD(lParam), Point.x, Point.y); return TRUE; } - if (!m_bPointingStarted) + if (!m_bPointing) { ::SetTimer(m_hWnd, POINTING_TIMER_ID, 1000, NULL); - m_bPointingStarted = TRUE; + m_bPointing = TRUE; } if (m_pToolTip) @@ -2574,12 +2560,12 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (::PtInRect(&rc, pt) && ::WindowFromPoint(pt) == m_hWnd) { - m_pPointingWindow->OnPointingStarted(WM_MOUSEMOVE, pt2.x, pt2.y); + m_pPointingWindow->OnPointingMouse(WM_MOUSEMOVE, pt2.x, pt2.y); } else { ::KillTimer(m_hWnd, POINTING_TIMER_ID); - m_bPointingStarted = FALSE; + m_bPointing = FALSE; SetObjectPointed(NULL, pt2); OnPointingEnded(pt2.x, pt2.y); } @@ -2611,10 +2597,9 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_RBUTTONUP: { if (m_pPointingWindow) - m_pPointingWindow->OnPointingStarted(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + m_pPointingWindow->OnPointingMouse(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); else HandleMouseMsg(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); - break; } case WM_KEYUP: @@ -2989,7 +2974,7 @@ CUIFWindow::OnEraseBkGnd(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } inline STDMETHODIMP_(void) -CUIFWindow::OnPointingStarted(UINT uMsg, LONG x, LONG y) +CUIFWindow::OnPointingMouse(UINT uMsg, LONG x, LONG y) { } @@ -3782,7 +3767,7 @@ CUIFButton::OnLButtonUp(LONG x, LONG y) } } -inline void CUIFButton::OnMouseIn(POINT pt) +inline void CUIFButton::OnMouseIn(LONG x, LONG y) { if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) { @@ -3800,7 +3785,7 @@ inline void CUIFButton::OnMouseIn(POINT pt) } } -inline void CUIFButton::OnMouseOut(POINT pt) +inline void CUIFButton::OnMouseOut(LONG x, LONG y) { if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) SetStatus(0);

11 months, 3 weeks

[reactos] 01/01: [RAPPS] Don't download database at startup if appwiz mode (#6319)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e694e247204f85b759081… commit e694e247204f85b7590813bb81acb77eb7d357e4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 10 11:36:30 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 10 11:36:30 2024 +0900 [RAPPS] Don't download database at startup if appwiz mode (#6319) Providing quick access of Control Panel "Add/Remove Programs". JIRA issue: CORE-19419 - Don't download the database if bAppwizMode in ParseCmdAndExecute function. - Add CAppDB::GetAvailableCount method. - Add CMainWindow::CheckAvailable method. - Use CMainWindow::CheckAvailable in some cases of TVN_SELCHANGED handling. --- base/applications/rapps/gui.cpp | 49 +++++++++++++++++++++------------ base/applications/rapps/include/appdb.h | 5 ++++ base/applications/rapps/include/gui.h | 5 +++- base/applications/rapps/unattended.cpp | 17 ++++-------- 4 files changed, 46 insertions(+), 30 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 3283c71ef79..d0b518967df 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -293,6 +293,16 @@ CMainWindow::UninstallSelectedApp(BOOL bModify) return InstalledApp->UninstallApplication(bModify); } +VOID +CMainWindow::CheckAvailable() +{ + if (m_Db->GetAvailableCount() == 0) + { + m_Db->RemoveCached(); + m_Db->UpdateAvailable(); + } +} + BOOL CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT &theResult, DWORD dwMapId) { @@ -346,71 +356,71 @@ CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lPa break; case IDS_AVAILABLEFORINST: - UpdateApplicationsList(ENUM_ALL_AVAILABLE); + UpdateApplicationsList(ENUM_ALL_AVAILABLE, FALSE, TRUE); break; case IDS_CAT_AUDIO: - UpdateApplicationsList(ENUM_CAT_AUDIO); + UpdateApplicationsList(ENUM_CAT_AUDIO, FALSE, TRUE); break; case IDS_CAT_DEVEL: - UpdateApplicationsList(ENUM_CAT_DEVEL); + UpdateApplicationsList(ENUM_CAT_DEVEL, FALSE, TRUE); break; case IDS_CAT_DRIVERS: - UpdateApplicationsList(ENUM_CAT_DRIVERS); + UpdateApplicationsList(ENUM_CAT_DRIVERS, FALSE, TRUE); break; case IDS_CAT_EDU: - UpdateApplicationsList(ENUM_CAT_EDU); + UpdateApplicationsList(ENUM_CAT_EDU, FALSE, TRUE); break; case IDS_CAT_ENGINEER: - UpdateApplicationsList(ENUM_CAT_ENGINEER); + UpdateApplicationsList(ENUM_CAT_ENGINEER, FALSE, TRUE); break; case IDS_CAT_FINANCE: - UpdateApplicationsList(ENUM_CAT_FINANCE); + UpdateApplicationsList(ENUM_CAT_FINANCE, FALSE, TRUE); break; case IDS_CAT_GAMES: - UpdateApplicationsList(ENUM_CAT_GAMES); + UpdateApplicationsList(ENUM_CAT_GAMES, FALSE, TRUE); break; case IDS_CAT_GRAPHICS: - UpdateApplicationsList(ENUM_CAT_GRAPHICS); + UpdateApplicationsList(ENUM_CAT_GRAPHICS, FALSE, TRUE); break; case IDS_CAT_INTERNET: - UpdateApplicationsList(ENUM_CAT_INTERNET); + UpdateApplicationsList(ENUM_CAT_INTERNET, FALSE, TRUE); break; case IDS_CAT_LIBS: - UpdateApplicationsList(ENUM_CAT_LIBS); + UpdateApplicationsList(ENUM_CAT_LIBS, FALSE, TRUE); break; case IDS_CAT_OFFICE: - UpdateApplicationsList(ENUM_CAT_OFFICE); + UpdateApplicationsList(ENUM_CAT_OFFICE, FALSE, TRUE); break; case IDS_CAT_OTHER: - UpdateApplicationsList(ENUM_CAT_OTHER); + UpdateApplicationsList(ENUM_CAT_OTHER, FALSE, TRUE); break; case IDS_CAT_SCIENCE: - UpdateApplicationsList(ENUM_CAT_SCIENCE); + UpdateApplicationsList(ENUM_CAT_SCIENCE, FALSE, TRUE); break; case IDS_CAT_TOOLS: - UpdateApplicationsList(ENUM_CAT_TOOLS); + UpdateApplicationsList(ENUM_CAT_TOOLS, FALSE, TRUE); break; case IDS_CAT_VIDEO: - UpdateApplicationsList(ENUM_CAT_VIDEO); + UpdateApplicationsList(ENUM_CAT_VIDEO, FALSE, TRUE); break; case IDS_CAT_THEMES: - UpdateApplicationsList(ENUM_CAT_THEMES); + UpdateApplicationsList(ENUM_CAT_THEMES, FALSE, TRUE); break; case IDS_SELECTEDFORINST: @@ -591,10 +601,13 @@ CMainWindow::AddApplicationsToView(CAtlList<CAppInfo *> &List) } VOID -CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload) +CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload, BOOL bCheckAvailable) { bUpdating = TRUE; + if (bCheckAvailable) + CheckAvailable(); + if (SelectedEnumType != EnumType) SelectedEnumType = EnumType; diff --git a/base/applications/rapps/include/appdb.h b/base/applications/rapps/include/appdb.h index 4e9c5386b3b..1f6bf531a35 100644 --- a/base/applications/rapps/include/appdb.h +++ b/base/applications/rapps/include/appdb.h @@ -32,4 +32,9 @@ class CAppDB BOOL RemoveInstalledAppFromRegistry(const CAppInfo *Info); + + size_t GetAvailableCount() const + { + return m_Available.GetCount(); + } }; diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index e81b4eb8227..cf6fc90859a 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -90,6 +90,9 @@ class CMainWindow : public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> VOID OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam); + VOID + CheckAvailable(); + BOOL RemoveSelectedAppFromRegistry(); BOOL @@ -105,7 +108,7 @@ class CMainWindow : public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> UpdateStatusBarText(); VOID - UpdateApplicationsList(AppsCategories EnumType, BOOL bReload = FALSE); + UpdateApplicationsList(AppsCategories EnumType, BOOL bReload = FALSE, BOOL bCheckAvailable = FALSE); VOID AddApplicationsToView(CAtlList<CAppInfo *> &List); diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 1525e4b07b9..ab6aaec676e 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -222,27 +222,22 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) { INT argc; LPWSTR *argv = CommandLineToArgvW(lpCmdLine, &argc); - BOOL bAppwizMode = FALSE; - if (!argv) - { return FALSE; - } CStringW Directory; GetStorageDirectory(Directory); CAppDB db(Directory); - if (argc > 1 && MatchCmdOption(argv[1], CMD_KEY_APPWIZ)) + BOOL bAppwizMode = (argc > 1 && MatchCmdOption(argv[1], CMD_KEY_APPWIZ)); + if (!bAppwizMode) { - bAppwizMode = TRUE; - } + if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) + db.RemoveCached(); - if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) - { - db.RemoveCached(); + db.UpdateAvailable(); } - db.UpdateAvailable(); + db.UpdateInstalled(); if (argc == 1 || bAppwizMode) // RAPPS is launched without options or APPWIZ mode is requested

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Add CUIFSchemeDef (#6329)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3ae8258c203bb6bd0bde… commit d3ae8258c203bb6bd0bdea34da0b37236e0086cb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 10 11:25:59 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 10 11:25:59 2024 +0900 [SDK] cicuif.h: Add CUIFSchemeDef (#6329) Supporting TIPs... JIRA issue: CORE-19360 - Add CUIFSchemeDef class. - Improve CUIFWindow class. --- sdk/include/reactos/cicero/cicuif.h | 573 +++++++++++++++++++++++++++++++----- 1 file changed, 497 insertions(+), 76 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index fc0e46617ef..465b3048cf6 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -302,6 +302,7 @@ protected: public: CUIFColorTableSys() { } + COLORREF GetColor(INT iColor) const { return m_rgbColors[iColor]; } HBRUSH GetBrush(INT iColor); STDMETHOD_(void, InitColor)() override; @@ -318,6 +319,7 @@ protected: public: CUIFColorTableOff10() { } + COLORREF GetColor(INT iColor) const { return m_rgbColors[iColor]; } HBRUSH GetBrush(INT iColor); STDMETHOD_(void, InitColor)() override; @@ -423,6 +425,7 @@ HBITMAP cicChangeBitmapColor(LPCRECT prc, HBITMAP hbm, COLORREF rgbBack, COLORRE HBITMAP cicConvertBlackBKGBitmap(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hBrush); HBITMAP cicCreateMaskBmp(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr, COLORREF rgbColor, COLORREF rgbBack); +BOOL cicGetIconBitmaps(HICON hIcon, HBITMAP *hbm1, HBITMAP *hbm2, const SIZE *pSize); ///////////////////////////////////////////////////////////////////////////// @@ -432,7 +435,70 @@ public: static CUIFColorTableSys *s_pColorTableSys; static CUIFColorTableOff10 *s_pColorTableOff10; - CUIFScheme(DWORD type); + CUIFScheme() { } + virtual ~CUIFScheme() { } + + STDMETHOD_(DWORD, GetType)() = 0; + STDMETHOD_(COLORREF, GetColor)(INT iColor) = 0; + STDMETHOD_(HBRUSH, GetBrush)(INT iColor) = 0; + STDMETHOD_(INT, CyMenuItem)(INT cyText) = 0; + STDMETHOD_(INT, CxSizeFrame)() = 0; + STDMETHOD_(INT, CySizeFrame)() = 0; + STDMETHOD_(INT, CxWndBorder)() = 0; + STDMETHOD_(INT, CyWndBorder)() = 0; + STDMETHOD_(void, FillRect)(HDC hDC, LPCRECT prc, INT iColor); + STDMETHOD_(void, FrameRect)(HDC hDC, LPCRECT prc, INT iColor); + STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) = 0; + STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD, LPSIZE pSize) = 0; + STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) = 0; + STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD, DWORD) = 0; + STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD flags, BOOL bRight) = 0; + STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) = 0; + STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) = 0; + STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) = 0; + STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) = 0; + STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) = 0; + STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) = 0; + STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) = 0; + STDMETHOD_(void, DrawFrameCtrlBitmap2)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) = 0; + STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) = 0; + STDMETHOD_(void, DrawDragHandle)(HDC hDC, LPCRECT prc, BOOL bFlag) = 0; + STDMETHOD_(void, DrawSeparator)(HDC hDC, LPCRECT prc, BOOL bFlag) = 0; +}; + +class CUIFSchemeDef : public CUIFScheme +{ +protected: + DWORD m_dwFlags; + DWORD m_dwType; + +public: + CUIFSchemeDef(DWORD dwType) : m_dwFlags(0), m_dwType(dwType) { } + + STDMETHOD_(DWORD, GetType)() override; + STDMETHOD_(COLORREF, GetColor)(INT iColor) override; + STDMETHOD_(HBRUSH, GetBrush)(INT iColor) override; + STDMETHOD_(INT, CyMenuItem)(INT cyText) override; + STDMETHOD_(INT, CxSizeFrame)() override; + STDMETHOD_(INT, CySizeFrame)() override; + STDMETHOD_(INT, CxWndBorder)() override; + STDMETHOD_(INT, CyWndBorder)() override; + STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) override; + STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD, LPSIZE pSize) override; + STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) override; + STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD, DWORD) override; + STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD flags, BOOL bRight) override; + STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) override; + STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) override; + STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) override; + STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) override; + STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) override; + STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) override; + STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) override; + STDMETHOD_(void, DrawFrameCtrlBitmap2)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) override; + STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) override; + STDMETHOD_(void, DrawDragHandle)(HDC hDC, LPCRECT prc, BOOL bFlag) override; + STDMETHOD_(void, DrawSeparator)(HDC hDC, LPCRECT prc, BOOL bFlag) override; }; DECLSPEC_SELECTANY CUIFColorTableSys *CUIFScheme::s_pColorTableSys = NULL; @@ -457,8 +523,8 @@ protected: CUIFWindow *m_pUnknown7; CUIFObject *m_pCaptured; CUIFObject *m_pPointed; - DWORD m_dwUnknown8; - DWORD m_dwUnknown9; + BOOL m_bPointingStarted; + CUIFWindow *m_pPointingWindow; CUIFToolTip *m_pToolTip; CUIFShadow *m_pShadow; BOOL m_bShowShadow; @@ -469,6 +535,7 @@ protected: friend class CUIFButton; public: + enum { POINTING_TIMER_ID = 0x7982 }; CUIFWindow(HINSTANCE hInst, DWORD style); ~CUIFWindow() override; @@ -497,7 +564,7 @@ public: STDMETHOD_(void, Move)(INT x, INT y, INT nWidth, INT nHeight); STDMETHOD_(BOOL, AnimateWnd)(DWORD dwTime, DWORD dwFlags); STDMETHOD_(void, OnObjectMoved)(CUIFObject *pObject); - STDMETHOD_(void, OnLButtonDown2)(LONG x, LONG y); + STDMETHOD_(void, OnPointingEnded)(LONG x, LONG y); STDMETHOD_(void, OnCreate)(HWND hWnd); STDMETHOD_(void, OnDestroy)(HWND hWnd); STDMETHOD_(void, OnNCDestroy)(HWND hWnd); @@ -523,7 +590,7 @@ public: STDMETHOD_(void, OnThemeChanged)(HWND hWnd, WPARAM wParam, LPARAM lParam); STDMETHOD_(void, UpdateUI)(LPCRECT prc); STDMETHOD_(void, SetCapture)(int); - STDMETHOD_(void, OnSetCapture)(HWND hWnd, UINT, LONG); + STDMETHOD_(void, OnPointingStarted)(UINT uMsg, LONG x, LONG y); STDMETHOD_(void, OnAnimationStart)(); STDMETHOD_(void, OnAnimationEnd)(); STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y); @@ -1185,22 +1252,22 @@ inline void CUIFObject::SetScheme(CUIFScheme *scheme) inline STDMETHODIMP_(void) CUIFColorTableSys::InitColor() { - m_rgbColors[0] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[1] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[2] = GetSysColor(COLOR_ACTIVEBORDER); - m_rgbColors[3] = GetSysColor(COLOR_ACTIVECAPTION); - m_rgbColors[4] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[5] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[6] = GetSysColor(COLOR_BTNTEXT); - m_rgbColors[7] = GetSysColor(COLOR_CAPTIONTEXT); - m_rgbColors[8] = GetSysColor(COLOR_GRAYTEXT); - m_rgbColors[9] = GetSysColor(COLOR_HIGHLIGHT); - m_rgbColors[10] = GetSysColor(COLOR_HIGHLIGHTTEXT); - m_rgbColors[11] = GetSysColor(COLOR_INACTIVECAPTION); - m_rgbColors[12] = GetSysColor(COLOR_INACTIVECAPTIONTEXT); - m_rgbColors[13] = GetSysColor(COLOR_MENUTEXT); - m_rgbColors[14] = GetSysColor(COLOR_WINDOW); - m_rgbColors[15] = GetSysColor(COLOR_WINDOWTEXT); + m_rgbColors[0] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[1] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[2] = ::GetSysColor(COLOR_ACTIVEBORDER); + m_rgbColors[3] = ::GetSysColor(COLOR_ACTIVECAPTION); + m_rgbColors[4] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[5] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[6] = ::GetSysColor(COLOR_BTNTEXT); + m_rgbColors[7] = ::GetSysColor(COLOR_CAPTIONTEXT); + m_rgbColors[8] = ::GetSysColor(COLOR_GRAYTEXT); + m_rgbColors[9] = ::GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[10] = ::GetSysColor(COLOR_HIGHLIGHTTEXT); + m_rgbColors[11] = ::GetSysColor(COLOR_INACTIVECAPTION); + m_rgbColors[12] = ::GetSysColor(COLOR_INACTIVECAPTIONTEXT); + m_rgbColors[13] = ::GetSysColor(COLOR_MENUTEXT); + m_rgbColors[14] = ::GetSysColor(COLOR_WINDOW); + m_rgbColors[15] = ::GetSysColor(COLOR_WINDOWTEXT); } inline STDMETHODIMP_(void) CUIFColorTableSys::InitBrush() @@ -1237,38 +1304,38 @@ inline HBRUSH CUIFColorTableOff10::GetBrush(INT iColor) /// @unimplemented inline STDMETHODIMP_(void) CUIFColorTableOff10::InitColor() { - m_rgbColors[0] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[1] = GetSysColor(COLOR_WINDOW); - m_rgbColors[2] = GetSysColor(COLOR_WINDOW); - m_rgbColors[3] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[4] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[5] = GetSysColor(COLOR_WINDOW); - m_rgbColors[6] = GetSysColor(COLOR_HIGHLIGHT); - m_rgbColors[7] = GetSysColor(COLOR_WINDOWTEXT); - m_rgbColors[8] = GetSysColor(COLOR_HIGHLIGHT); - m_rgbColors[9] = GetSysColor(COLOR_HIGHLIGHT); - m_rgbColors[10] = GetSysColor(COLOR_HIGHLIGHTTEXT); - m_rgbColors[11] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[12] = GetSysColor(COLOR_BTNTEXT); - m_rgbColors[13] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[14] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[15] = GetSysColor(COLOR_WINDOW); - m_rgbColors[16] = GetSysColor(COLOR_HIGHLIGHT); - m_rgbColors[17] = GetSysColor(COLOR_BTNTEXT); - m_rgbColors[18] = GetSysColor(COLOR_WINDOW); - m_rgbColors[19] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[20] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[21] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[22] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[23] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[24] = GetSysColor(COLOR_CAPTIONTEXT); - m_rgbColors[25] = GetSysColor(COLOR_HIGHLIGHT); - m_rgbColors[26] = GetSysColor(COLOR_HIGHLIGHTTEXT); - m_rgbColors[27] = GetSysColor(COLOR_BTNFACE); - m_rgbColors[28] = GetSysColor(COLOR_BTNTEXT); - m_rgbColors[29] = GetSysColor(COLOR_BTNSHADOW); - m_rgbColors[30] = GetSysColor(COLOR_BTNTEXT); - m_rgbColors[31] = GetSysColor(COLOR_WINDOWTEXT); + m_rgbColors[0] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[1] = ::GetSysColor(COLOR_WINDOW); + m_rgbColors[2] = ::GetSysColor(COLOR_WINDOW); + m_rgbColors[3] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[4] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[5] = ::GetSysColor(COLOR_WINDOW); + m_rgbColors[6] = ::GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[7] = ::GetSysColor(COLOR_WINDOWTEXT); + m_rgbColors[8] = ::GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[9] = ::GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[10] = ::GetSysColor(COLOR_HIGHLIGHTTEXT); + m_rgbColors[11] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[12] = ::GetSysColor(COLOR_BTNTEXT); + m_rgbColors[13] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[14] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[15] = ::GetSysColor(COLOR_WINDOW); + m_rgbColors[16] = ::GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[17] = ::GetSysColor(COLOR_BTNTEXT); + m_rgbColors[18] = ::GetSysColor(COLOR_WINDOW); + m_rgbColors[19] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[20] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[21] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[22] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[23] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[24] = ::GetSysColor(COLOR_CAPTIONTEXT); + m_rgbColors[25] = ::GetSysColor(COLOR_HIGHLIGHT); + m_rgbColors[26] = ::GetSysColor(COLOR_HIGHLIGHTTEXT); + m_rgbColors[27] = ::GetSysColor(COLOR_BTNFACE); + m_rgbColors[28] = ::GetSysColor(COLOR_BTNTEXT); + m_rgbColors[29] = ::GetSysColor(COLOR_BTNSHADOW); + m_rgbColors[30] = ::GetSysColor(COLOR_BTNTEXT); + m_rgbColors[31] = ::GetSysColor(COLOR_WINDOWTEXT); } inline STDMETHODIMP_(void) CUIFColorTableOff10::InitBrush() @@ -1334,12 +1401,260 @@ inline void cicDoneUIFScheme(void) /// @unimplemented inline CUIFScheme *cicCreateUIFScheme(DWORD type) { - return new(cicNoThrow) CUIFScheme(type); + return new(cicNoThrow) CUIFSchemeDef(type); +} + +inline STDMETHODIMP_(DWORD) CUIFSchemeDef::GetType() +{ + return m_dwType; +} + +inline STDMETHODIMP_(COLORREF) CUIFSchemeDef::GetColor(INT iColor) +{ + return s_pColorTableSys->GetColor(iColor); +} + +inline STDMETHODIMP_(HBRUSH) CUIFSchemeDef::GetBrush(INT iColor) +{ + return s_pColorTableSys->GetBrush(iColor); +} + +inline STDMETHODIMP_(INT) CUIFSchemeDef::CyMenuItem(INT cyText) +{ + return cyText + 2; +} + +inline STDMETHODIMP_(INT) CUIFSchemeDef::CxSizeFrame() +{ + return ::GetSystemMetrics(SM_CXSIZEFRAME); +} + +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)); +} + +inline STDMETHODIMP_(void) CUIFScheme::FrameRect(HDC hDC, LPCRECT prc, INT iColor) +{ + ::FrameRect(hDC, prc, GetBrush(iColor)); +} + +inline STDMETHODIMP_(void) CUIFSchemeDef::DrawSelectionRect(HDC hDC, LPCRECT prc, int) +{ + ::FillRect(hDC, prc, GetBrush(6)); +} + +/// @unimplemented +inline STDMETHODIMP_(INT) CUIFSchemeDef::GetCtrlFaceOffset(DWORD, DWORD, LPSIZE pSize) +{ + return 0; +} + +inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) +{ + ::FillRect(hDC, prc, GetBrush(9)); + + if (!(flags & 0x10) && (flags & 0x2)) + return; + + HBRUSH hbrDither = cicCreateDitherBrush(); + if (!hbrDither) + return; + + COLORREF rgbOldText = ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNFACE)); + COLORREF rgbOldBack = ::SetBkColor(hDC, ::GetSysColor(COLOR_BTNHIGHLIGHT)); + + RECT rc = *prc; + ::InflateRect(&rc, -2, -2); + ::FillRect(hDC, &rc, hbrDither); + ::SetTextColor(hDC, rgbOldText); + ::SetBkColor(hDC, rgbOldBack); + ::DeleteObject(hbrDither); +} + +/// @unimplemented +inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlEdge(HDC hDC, LPCRECT prc, DWORD, DWORD) +{ + //FIXME + RECT rc = *prc; + ::DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawCtrlText( + HDC hDC, + LPCRECT prc, + LPCWSTR pszText, + INT cchText, + DWORD flags, + BOOL bRight) +{ + COLORREF rgbOldText = ::GetTextColor(hDC); + INT OldBkMode = ::SetBkMode(hDC, TRANSPARENT); + + if (cchText == -1) + cchText = lstrlenW(pszText); + + RECT rc = *prc; + if (flags & 0x20) + { + ::OffsetRect(&rc, 1, 1); + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNHIGHLIGHT)); + ::ExtTextOutW(hDC, (bRight ? rc.right : rc.left), rc.top, ETO_CLIPPED, &rc, + pszText, cchText, NULL); + ::OffsetRect(&rc, -1, -1); + } + + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNTEXT)); + ::ExtTextOutW(hDC, (bRight ? rc.right : rc.left), rc.top, ETO_CLIPPED, &rc, + pszText, cchText, NULL); + + ::SetTextColor(hDC, rgbOldText); + ::SetBkMode(hDC, OldBkMode); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) +{ + if (m_dwFlags & 1) + { + HBITMAP hbm1, hbm2; + if (cicGetIconBitmaps(hIcon, &hbm1, &hbm2, pSize)) + { + DrawCtrlBitmap(hDC, prc, hbm1, hbm2, flags); + ::DeleteObject(hbm1); + ::DeleteObject(hbm2); + } + } + else + { + UINT uFlags = DST_PREFIXTEXT | DST_TEXT; + if (flags & 0x20) + uFlags |= (DSS_MONO | DSS_DISABLED); + ::DrawState(hDC, 0, 0, (LPARAM)hIcon, 0, prc->left, prc->top, 0, 0, uFlags); + } } /// @unimplemented -inline CUIFScheme::CUIFScheme(DWORD type) +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) +{ + //FIXME +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawFrameCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) +{ + DrawCtrlBitmap(hDC, prc, hbm1, hbm2, flags); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawMenuSeparator(HDC hDC, LPCRECT prc) +{ + RECT rc = *prc; + rc.bottom = rc.top + (rc.bottom - rc.top) / 2; + ::FillRect(hDC, &rc, (HBRUSH)UlongToHandle(COLOR_BTNSHADOW + 1)); + + rc = *prc; + rc.top += (rc.bottom - rc.top) / 2; + ::FillRect(hDC, &rc, (HBRUSH)UlongToHandle(COLOR_BTNHIGHLIGHT + 1)); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawFrameCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD flags) +{ + DrawCtrlBkgd(hDC, prc, unused, flags); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawFrameCtrlEdge(HDC hDC, LPCRECT prc, DWORD dw1, DWORD dw2) +{ + DrawCtrlEdge(hDC, prc, dw1, dw2); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawFrameCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD flags, LPSIZE pSize) { + DrawCtrlIcon(hDC, prc, hIcon, flags, pSize); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawFrameCtrlBitmap2(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD flags) +{ + DrawFrameCtrlBitmap(hDC, prc, hbm1, hbm2, flags); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawWndFrame(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) +{ + RECT rc = *prc; + if (type && type <= 2) + ::DrawEdge(hDC, &rc, BDR_RAISED, BF_RECT); + else + FrameRect(hDC, &rc, 14); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawDragHandle(HDC hDC, LPCRECT prc, BOOL bFlag) +{ + RECT rc; + if (bFlag) + rc = { prc->left, prc->top + 1, prc->right, prc->top + 4 }; + else + rc = { prc->left + 1, prc->top, prc->left + 4, prc->bottom }; + ::DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT); +} + +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawSeparator(HDC hDC, LPCRECT prc, BOOL bFlag) +{ + HPEN hLightPen = ::CreatePen(PS_SOLID, 0, ::GetSysColor(COLOR_BTNHIGHLIGHT)); + if (!hLightPen) + return; + + HPEN hShadowPen = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNSHADOW)); + if (!hShadowPen) + { + ::DeleteObject(hLightPen); + return; + } + + HGDIOBJ hPenOld = ::SelectObject(hDC, hShadowPen); + if (bFlag) + { + ::MoveToEx(hDC, prc->left, prc->top + 1, NULL); + ::LineTo(hDC, prc->right, prc->top + 1); + ::SelectObject(hDC, hLightPen); + ::MoveToEx(hDC, prc->left, prc->top + 2, NULL); + ::LineTo(hDC, prc->right, prc->top + 2); + } + else + { + ::MoveToEx(hDC, prc->left + 1, prc->top, NULL); + ::LineTo(hDC, prc->left + 1, prc->bottom); + ::SelectObject(hDC, hLightPen); + ::MoveToEx(hDC, prc->left + 2, prc->top, NULL); + ::LineTo(hDC, prc->left + 2, prc->bottom); + } + ::SelectObject(hDC, hPenOld); + + ::DeleteObject(hShadowPen); + ::DeleteObject(hLightPen); } ///////////////////////////////////////////////////////////////////////////// @@ -1708,6 +2023,39 @@ cicCreateMaskBmp(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, return CUIFBitmapDC::s_phdcDst->DetachBitmap(); } +inline BOOL cicGetIconBitmaps(HICON hIcon, HBITMAP *hbm1, HBITMAP *hbm2, const SIZE *pSize) +{ + if (!CUIFBitmapDC::s_fInitBitmapDCs) + return NULL; + + LONG cx, cy; + SIZE size; + if (pSize) + { + size = *pSize; + } + else + { + if (!cicGetIconSize(hIcon, &size)) + return FALSE; + } + + CUIFBitmapDC::s_phdcSrc->SetDIB(cx, cy, 1, 32); + CUIFBitmapDC::s_phdcMask->SetBitmap(cx, cy, 1, 1); + + RECT rc = { 0, 0, size.cx, size.cy }; + ::FillRect(*CUIFBitmapDC::s_phdcSrc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); + + ::DrawIconEx(*CUIFBitmapDC::s_phdcSrc, 0, 0, hIcon, size.cx, size.cy, 0, 0, DI_NORMAL); + ::DrawIconEx(*CUIFBitmapDC::s_phdcMask, 0, 0, hIcon, size.cx, size.cy, 0, 0, DI_MASK); + + CUIFBitmapDC::s_phdcSrc->Uninit(TRUE); + CUIFBitmapDC::s_phdcMask->Uninit(TRUE); + *hbm1 = CUIFBitmapDC::s_phdcSrc->DetachBitmap(); + *hbm2 = CUIFBitmapDC::s_phdcMask->DetachBitmap(); + return TRUE; +} + ///////////////////////////////////////////////////////////////////////////// inline CUIFWindow::CUIFWindow(HINSTANCE hInst, DWORD style) @@ -1723,11 +2071,11 @@ inline CUIFWindow::CUIFWindow(HINSTANCE hInst, DWORD style) m_pCaptured = NULL; m_pUnknown7 = NULL; m_pPointed = NULL; - m_dwUnknown8 = 0; + m_bPointingStarted = FALSE; m_pToolTip = NULL; m_pShadow = NULL; m_bShowShadow = TRUE; - m_dwUnknown9 = 0; + m_pPointingWindow = NULL; CUIFWindow::CreateScheme(); } @@ -2098,7 +2446,6 @@ CUIFWindow::OnThemeChanged(HWND hWnd, WPARAM wParam, LPARAM lParam) ClearTheme(); } -/// @unimplemented inline LRESULT CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -2130,8 +2477,29 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) POINT Point; ::GetCursorPos(&Point); ::ScreenToClient(m_hWnd, &Point); - //FIXME - return 1; + + if (m_pPointingWindow) + { + m_pPointingWindow->OnPointingStarted(HIWORD(lParam), Point.x, Point.y); + return TRUE; + } + + if (!m_bPointingStarted) + { + ::SetTimer(m_hWnd, POINTING_TIMER_ID, 1000, NULL); + m_bPointingStarted = TRUE; + } + + if (m_pToolTip) + { + MSG msg = { m_hWnd, HIWORD(lParam), 0, MAKELPARAM(Point.x, Point.y) }; + m_pToolTip->RelayEvent(&msg); + } + + if (!(m_style & UIF_STYLE_VERTICAL)) + HandleMouseMsg(HIWORD(lParam), Point.x, Point.y); + + return TRUE; } case WM_MOUSEACTIVATE: return MA_NOACTIVATE; @@ -2180,10 +2548,57 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } case WM_COMMAND: + { return 0; + } case WM_TIMER: - //FIXME - return 0; + { + switch (wParam) + { + case 0x5461: + { + if (m_pUnknown7) + m_pUnknown7->OnUnknown9(); + break; + } + case POINTING_TIMER_ID: + { + POINT pt; + ::GetCursorPos(&pt); + + POINT pt2 = pt; + ::ScreenToClient(m_hWnd, &pt2); + + RECT rc; + ::GetWindowRect(m_hWnd, &rc); + + if (::PtInRect(&rc, pt) && ::WindowFromPoint(pt) == m_hWnd) + { + m_pPointingWindow->OnPointingStarted(WM_MOUSEMOVE, pt2.x, pt2.y); + } + else + { + ::KillTimer(m_hWnd, POINTING_TIMER_ID); + m_bPointingStarted = FALSE; + SetObjectPointed(NULL, pt2); + OnPointingEnded(pt2.x, pt2.y); + } + + if (m_pToolTip) + { + MSG msg = { m_hWnd, WM_MOUSEMOVE, 0, MAKELPARAM(pt2.x, pt2.y) }; + m_pToolTip->RelayEvent(&msg); + } + break; + } + default: + { + OnTimer(wParam); + break; + } + } + break; + } case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONDBLCLK: @@ -2195,13 +2610,18 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_RBUTTONDBLCLK: case WM_RBUTTONUP: { - //FIXME - HandleMouseMsg(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); - return 0; + if (m_pPointingWindow) + m_pPointingWindow->OnPointingStarted(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + else + HandleMouseMsg(uMsg, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + + break; } case WM_KEYUP: + { OnKeyUp(hWnd, wParam, lParam); - return 0; + break; + } case WM_WINDOWPOSCHANGING: { WINDOWPOS *pwp = (WINDOWPOS *)lParam; @@ -2240,7 +2660,7 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { CUIFWindow *pThis = CUIFWindow::GetThis(hWnd); pThis->OnUser(hWnd, uMsg, wParam, lParam); - return 0; + break; } return ::DefWindowProc(hWnd, uMsg, wParam, lParam); } @@ -2381,8 +2801,8 @@ CUIFWindow::PaintObject(HDC hDC, LPCRECT prc) FAILED(DrawThemeParentBackground(m_hWnd, hMemDC, &m_rc))) && FAILED(DrawThemeBackground(hMemDC, m_iStateId, &m_rc, 0))) { - //if (m_pScheme) - // m_pScheme->FillRect(hMemDC, pRect, 22); //FIXME + if (m_pScheme) + m_pScheme->FillRect(hMemDC, pRect, 22); } CUIFObject::PaintObject(hMemDC, pRect); ::BitBlt(hDC, @@ -2421,11 +2841,13 @@ CUIFWindow::RemoveUIObj(CUIFObject *pRemove) { if (pRemove == m_pCaptured) SetCaptureObject(NULL); + if (pRemove == m_pUnknown7) { m_pUnknown7 = NULL; ::KillTimer(m_hWnd, 0x5461); } + if (pRemove == m_pPointed) m_pPointed = NULL; CUIFObject::RemoveUIObj(pRemove); @@ -2483,11 +2905,9 @@ CUIFWindow::OnSetFocus(HWND hWnd) { } -/// @unimplemented inline STDMETHODIMP_(void) -CUIFWindow::OnLButtonDown2(LONG x, LONG y) +CUIFWindow::OnPointingEnded(LONG x, LONG y) { - //FIXME } inline STDMETHODIMP_(void) @@ -2500,11 +2920,9 @@ CUIFWindow::OnNotify(HWND hWnd, WPARAM wParam, LPARAM lParam) { } -/// @unimplemented inline STDMETHODIMP_(void) CUIFWindow::OnTimer(WPARAM wParam) { - //FIXME } inline STDMETHODIMP_(void) @@ -2570,9 +2988,8 @@ CUIFWindow::OnEraseBkGnd(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return FALSE; } -/// @unimplemented inline STDMETHODIMP_(void) -CUIFWindow::OnSetCapture(HWND hWnd, UINT, LONG) +CUIFWindow::OnPointingStarted(UINT uMsg, LONG x, LONG y) { } @@ -2772,6 +3189,10 @@ CUIFToolTip::GetDelayTime(UINT uType) return ::GetDoubleClickTime(); return nDelayTime; } + default: + { + return 0; + } } }

11 months, 3 weeks

[reactos] 01/01: [NTUSER] Check class name existence on IntGetAtomFromStringOrAtom (#6184)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a9b22aac1279c69b2d1c… commit 9a9b22aac1279c69b2d1c373093ca64251d71077 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 10 08:01:37 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 10 08:01:37 2024 +0900 [NTUSER] Check class name existence on IntGetAtomFromStringOrAtom (#6184) Based on I_Kill_Bugs' class_error.patch. JIRA issue: CORE-13422, CORE-7531, CORE-18639 --- win32ss/user/ntuser/class.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/class.c b/win32ss/user/ntuser/class.c index 548bef255e6..1ad90351265 100644 --- a/win32ss/user/ntuser/class.c +++ b/win32ss/user/ntuser/class.c @@ -1355,9 +1355,17 @@ IntGetAtomFromStringOrAtom( } else { - ASSERT(IS_ATOM(ClassName->Buffer)); - *Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); - Ret = TRUE; + if (ClassName->Buffer) + { + *Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); + Ret = TRUE; + } + else + { + *Atom = 0; + EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); + Ret = FALSE; + } } return Ret;

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Refactoring (#6321)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b5c5fb913f84439ef27a… commit 8b5c5fb913f84439ef27a2e544b20b369c79ffc1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 10 03:05:38 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 10 03:05:38 2024 +0900 [SDK] cicuif.h: Refactoring (#6321) Improve readability and reduce code. JIRA issue: CORE-19268 - Delete cicSetLayout function and use gdi32!SetLayout function directly. - Don't use ::SetRect and ::SetRectEmpty. - s/CUIFButton::m_dwUnknown10/CUIFButton::m_bPressed/. - Reduce lines. --- sdk/include/reactos/cicero/cicuif.h | 114 ++++++++++++------------------------ 1 file changed, 38 insertions(+), 76 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index e9c12852bbe..fc0e46617ef 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -392,7 +392,7 @@ public: ~CUIFBitmapDC(); operator HDC() const { return m_hDC; } - void Uninit(BOOL bKeep); + void Uninit(BOOL bKeep = FALSE); BOOL SetBitmap(HBITMAP hBitmap); BOOL SetBitmap(LONG cx, LONG cy, WORD cPlanes, WORD cBitCount); @@ -414,7 +414,6 @@ DECLSPEC_SELECTANY CUIFBitmapDC *CUIFBitmapDC::s_phdcDst = NULL; void cicInitUIFUtil(void); void cicDoneUIFUtil(void); -BOOL cicSetLayout(HDC hDC, BOOL bLayout); HBITMAP cicMirrorBitmap(HBITMAP hBitmap, HBRUSH hbrBack); HBRUSH cicCreateDitherBrush(VOID); HBITMAP cicCreateDisabledBitmap(LPCRECT prc, HBITMAP hbmMask, HBRUSH hbr1, HBRUSH hbr2, @@ -613,7 +612,7 @@ protected: DWORD m_dwUnknown9; HBITMAP m_hbmButton1; HBITMAP m_hbmButton2; - DWORD m_dwUnknown10; + BOOL m_bPressed; SIZE m_IconSize; SIZE m_TextSize; @@ -860,7 +859,6 @@ CUIFTheme::GetThemeSysSize(int iSizeId) return s_fnGetThemeSysSize(m_hTheme, iSizeId); } -/// @unimplemented inline STDMETHODIMP_(void) CUIFTheme::SetActiveTheme(LPCWSTR pszClassList, INT iPartId, INT iStateId) { @@ -884,7 +882,7 @@ CUIFObject::CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD if (prc) m_rc = *prc; else - ::SetRect(&m_rc, 0, 0, 0, 0); + m_rc = { 0, 0, 0, 0 }; if (m_pParent) { @@ -908,7 +906,6 @@ CUIFObject::CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD m_dwUnknown4[1] = -1; //FIXME: name } -/// @unimplemented inline CUIFObject::~CUIFObject() { @@ -1401,7 +1398,7 @@ inline CUIFBitmapDC::CUIFBitmapDC(BOOL bMemory) inline CUIFBitmapDC::~CUIFBitmapDC() { - Uninit(FALSE); + Uninit(); ::DeleteDC(m_hDC); } @@ -1492,18 +1489,6 @@ inline void cicDoneUIFUtil(void) CUIFBitmapDC::s_fInitBitmapDCs = FALSE; } -inline BOOL cicSetLayout(HDC hDC, DWORD dwLayout) -{ - typedef BOOL (WINAPI *FN_SetLayout)(HDC hDC, DWORD dwLayout); - static HINSTANCE s_hGdi32 = NULL; - static FN_SetLayout s_fnSetLayout = NULL; - - if (!cicGetFN(s_hGdi32, s_fnSetLayout, TEXT("gdi32.dll"), "SetLayout")) - return FALSE; - - return s_fnSetLayout(hDC, dwLayout); -} - inline HBITMAP cicMirrorBitmap(HBITMAP hBitmap, HBRUSH hbrBack) { BITMAP bm; @@ -1514,31 +1499,30 @@ inline HBITMAP cicMirrorBitmap(HBITMAP hBitmap, HBRUSH hbrBack) CUIFBitmapDC::s_phdcDst->SetDIB(bm.bmWidth, bm.bmHeight, 1, 32); CUIFBitmapDC::s_phdcMask->SetDIB(bm.bmWidth, bm.bmHeight, 1, 32); - RECT rc; - ::SetRect(&rc, 0, 0, bm.bmWidth, bm.bmHeight); + RECT rc = { 0, 0, bm.bmWidth, bm.bmHeight }; FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbrBack); - cicSetLayout(*CUIFBitmapDC::s_phdcMask, LAYOUT_RTL); + ::SetLayout(*CUIFBitmapDC::s_phdcMask, LAYOUT_RTL); ::BitBlt(*CUIFBitmapDC::s_phdcMask, 0, 0, bm.bmWidth, bm.bmHeight, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCCOPY); - cicSetLayout(*CUIFBitmapDC::s_phdcMask, LAYOUT_LTR); + ::SetLayout(*CUIFBitmapDC::s_phdcMask, LAYOUT_LTR); ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, bm.bmWidth, bm.bmHeight, *CUIFBitmapDC::s_phdcMask, 1, 0, SRCCOPY); - CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); - CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcSrc->Uninit(); + CUIFBitmapDC::s_phdcMask->Uninit(); CUIFBitmapDC::s_phdcDst->Uninit(TRUE); return CUIFBitmapDC::s_phdcDst->DetachBitmap(); } inline HBRUSH cicCreateDitherBrush(VOID) { - BYTE Bits[16]; - ZeroMemory(&Bits, sizeof(Bits)); - Bits[0] = Bits[4] = Bits[8] = Bits[12] = 'U'; - Bits[2] = Bits[6] = Bits[10] = Bits[14] = 0xAA; - HBITMAP hBitmap = ::CreateBitmap(8, 8, 1, 1, Bits); + BYTE bytes[16]; + ZeroMemory(&bytes, sizeof(bytes)); + bytes[0] = bytes[4] = bytes[8] = bytes[12] = 0x55; + bytes[2] = bytes[6] = bytes[10] = bytes[14] = 0xAA; + HBITMAP hBitmap = ::CreateBitmap(8, 8, 1, 1, bytes); if (!hBitmap) return NULL; @@ -1562,8 +1546,7 @@ cicCreateDisabledBitmap(LPCRECT prc, HBITMAP hbmMask, HBRUSH hbr1, HBRUSH hbr2, CUIFBitmapDC::s_phdcMask->SetBitmap(hbmMask); CUIFBitmapDC::s_phdcSrc->SetDIB(width, height, 1, 32); - RECT rc; - ::SetRect(&rc, 0, 0, width, height); + RECT rc = { 0, 0, width, height }; ::FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbr1); HBRUSH hbrWhite = (HBRUSH)GetStockObject(WHITE_BRUSH); @@ -1580,8 +1563,8 @@ cicCreateDisabledBitmap(LPCRECT prc, HBITMAP hbmMask, HBRUSH hbr1, HBRUSH hbr2, ::BitBlt(*CUIFBitmapDC::s_phdcSrc, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCPAINT); ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCAND); - CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); - CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcSrc->Uninit(); + CUIFBitmapDC::s_phdcMask->Uninit(); CUIFBitmapDC::s_phdcDst->Uninit(TRUE); return CUIFBitmapDC::s_phdcDst->DetachBitmap(); } @@ -1605,8 +1588,7 @@ cicCreateShadowMaskBmp(LPRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr1, HBRU CUIFBitmapDC::s_phdcMask->SetBitmap(hbm2); bitmapDC.SetDIB(width, height, 1, 32); - RECT rc; - ::SetRect(&rc, 0, 0, width, height); + RECT rc = { 0, 0, width, height }; ::FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbr1); ::FillRect(bitmapDC, &rc, hbr2); @@ -1616,8 +1598,8 @@ cicCreateShadowMaskBmp(LPRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr1, HBRU ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCAND); ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCINVERT); - CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); - CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcSrc->Uninit(); + CUIFBitmapDC::s_phdcMask->Uninit(); CUIFBitmapDC::s_phdcDst->Uninit(TRUE); return CUIFBitmapDC::s_phdcDst->DetachBitmap(); } @@ -1646,8 +1628,8 @@ cicChangeBitmapColor(LPCRECT prc, HBITMAP hbm, COLORREF rgbBack, COLORREF rgbFor ::SetTextColor(*CUIFBitmapDC::s_phdcDst, RGB(0, 0, 0)); ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, 0xE20746u); - CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); - CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcSrc->Uninit(); + CUIFBitmapDC::s_phdcMask->Uninit(); CUIFBitmapDC::s_phdcDst->Uninit(TRUE); return CUIFBitmapDC::s_phdcDst->DetachBitmap(); } @@ -1677,8 +1659,7 @@ cicConvertBlackBKGBitmap(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hBrush) CUIFBitmapDC::s_phdcSrc->SetBitmap(hBitmap); CUIFBitmapDC::s_phdcMask->SetBitmap(hbm2); - RECT rc; - ::SetRect(&rc, 0, 0, width, height); + RECT rc = { 0, 0, width, height }; HBRUSH hbrWhite = (HBRUSH)GetStockObject(WHITE_BRUSH); ::FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbrWhite); @@ -1686,8 +1667,8 @@ cicConvertBlackBKGBitmap(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hBrush) ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, 0x660046u); ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, 0x8800C6u); - CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); - CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcSrc->Uninit(); + CUIFBitmapDC::s_phdcMask->Uninit(); CUIFBitmapDC::s_phdcDst->Uninit(TRUE); ::DeleteObject(hBitmap); return CUIFBitmapDC::s_phdcDst->DetachBitmap(); @@ -1710,8 +1691,7 @@ cicCreateMaskBmp(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, CUIFBitmapDC::s_phdcSrc->SetBitmap(hbm1); CUIFBitmapDC::s_phdcMask->SetBitmap(hbm2); - RECT rc; - ::SetRect(&rc, 0, 0, width, height); + RECT rc = { 0, 0, width, height }; COLORREF OldTextColor = ::SetTextColor(*CUIFBitmapDC::s_phdcDst, rgbColor); COLORREF OldBkColor = ::SetBkColor(*CUIFBitmapDC::s_phdcDst, rgbBack); @@ -1721,8 +1701,8 @@ cicCreateMaskBmp(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcMask, 0, 0, SRCAND); ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCINVERT); - CUIFBitmapDC::s_phdcSrc->Uninit(FALSE); - CUIFBitmapDC::s_phdcMask->Uninit(FALSE); + CUIFBitmapDC::s_phdcSrc->Uninit(); + CUIFBitmapDC::s_phdcMask->Uninit(); CUIFBitmapDC::s_phdcDst->Uninit(TRUE); return CUIFBitmapDC::s_phdcDst->DetachBitmap(); @@ -2070,8 +2050,7 @@ CUIFWindow::OnObjectMoved(CUIFObject *pObject) inline STDMETHODIMP_(void) CUIFWindow::SetRect(LPCRECT prc) { - RECT Rect; - ::SetRectEmpty(&Rect); + RECT Rect = { 0, 0, 0, 0 }; if (::IsWindow(m_hWnd)) ::GetClientRect(m_hWnd, &Rect); @@ -2099,8 +2078,7 @@ CUIFWindow::ClientRectToWindowRect(LPRECT lpRect) inline STDMETHODIMP_(void) CUIFWindow::GetWindowFrameSize(LPSIZE pSize) { - RECT rc; - ::SetRectEmpty(&rc); + RECT rc = { 0, 0, 0, 0 }; ClientRectToWindowRect(&rc); pSize->cx = (rc.right - rc.left) / 2; @@ -2827,7 +2805,6 @@ CUIFToolTip::FindObject(HWND hWnd, POINT pt) return NULL; } -/// @unimplemented inline void CUIFToolTip::ShowTip() { @@ -3109,7 +3086,7 @@ CUIFButton::CUIFButton( m_ButtonIcon.m_hImageList = NULL; m_dwUnknown9 = 0; m_uButtonStatus = 0; - m_dwUnknown10 = 0; + m_bPressed = FALSE; m_hbmButton1 = NULL; m_hbmButton2 = NULL; m_pszButtonText = NULL; @@ -3379,7 +3356,7 @@ CUIFButton::OnLButtonUp(LONG x, LONG y) if (bCapture) { - m_dwUnknown10 = !m_dwUnknown10; + m_bPressed = !m_bPressed; NotifyCommand(1, 0); } } @@ -3405,16 +3382,11 @@ inline void CUIFButton::OnMouseIn(POINT pt) inline void CUIFButton::OnMouseOut(POINT pt) { if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) - { SetStatus(0); - } + else if (IsCapture()) + SetStatus(3); else - { - if (IsCapture()) - SetStatus(3); - else - SetStatus(0); - } + SetStatus(0); } inline STDMETHODIMP_(void) @@ -3422,7 +3394,7 @@ CUIFButton::OnPaintNoTheme(HDC hDC) { ::FillRect(hDC, &m_rc, (HBRUSH)UlongToHandle(COLOR_BTNFACE + 1)); - if (m_dwUnknown10 && ((m_uButtonStatus == 0) || (m_uButtonStatus == 3))) + if (m_bPressed && ((m_uButtonStatus == 0) || (m_uButtonStatus == 3))) { HBRUSH hbr = cicCreateDitherBrush(); if (hbr) @@ -3438,28 +3410,18 @@ CUIFButton::OnPaintNoTheme(HDC hDC) } } - BOOL bPressed = (m_dwUnknown10 || (m_uButtonStatus == 1)); + BOOL bPressed = (m_bPressed || (m_uButtonStatus == 1)); if (m_hbmButton1) - { DrawBitmapProc(hDC, &m_rc, bPressed); - } else if (m_ButtonIcon.m_hIcon) - { DrawIconProc(hDC, &m_rc, bPressed); - } else - { DrawTextProc(hDC, &m_rc, bPressed); - } - if (m_dwUnknown10 || (m_uButtonStatus == 1)) - { + if (m_bPressed || (m_uButtonStatus == 1)) DrawEdgeProc(hDC, &m_rc, TRUE); - } else if (2 <= m_uButtonStatus && m_uButtonStatus <= 3) - { DrawEdgeProc(hDC, &m_rc, FALSE); - } } inline void CUIFButton::SetIcon(HICON hIcon)

11 months, 3 weeks

[reactos] 01/01: [SHELL32] SHFileOperation: Fail elegantly if source doesn't exist (#6318)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3299e96e91da7c4abe171… commit 3299e96e91da7c4abe17182bc56e6953d95184b7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 9 19:38:34 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 9 19:38:34 2024 +0900 [SHELL32] SHFileOperation: Fail elegantly if source doesn't exist (#6318) Based on KRosUser's dragdropfixpart2.patch. JIRA issue: CORE-19417, CORE-19211 - Check source file existence. --- dll/win32/shell32/shlfileop.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index cc3bc40748c..3480cfd2af0 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1735,11 +1735,13 @@ static BOOL move_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH /* moves a file or directory to another directory */ static void move_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo) { - WCHAR szDestPath[MAX_PATH]; + if (feFrom->attributes == INVALID_FILE_ATTRIBUTES) + return; if (!PathFileExistsW(feTo->szFullPath)) SHNotifyCreateDirectoryW(feTo->szFullPath, NULL); + WCHAR szDestPath[MAX_PATH]; PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); if (IsAttribFile(feFrom->attributes)) @@ -1763,6 +1765,9 @@ static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flF if (!flTo->dwNumFiles) return ERROR_FILE_NOT_FOUND; + if (flFrom->bAnyDontExist) + return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + if (!(multiDest) && flTo->dwNumFiles > 1 && flFrom->dwNumFiles > 1) {

11 months, 3 weeks

[reactos] 01/01: [ZIPFLDR] Update Romanian (ro-RO) translation (#6271)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f105b50c4f1f331d9fdde… commit f105b50c4f1f331d9fdde2c0b30d45b14c4f02c8 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jan 9 12:12:01 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 9 11:12:01 2024 +0100 [ZIPFLDR] Update Romanian (ro-RO) translation (#6271) --- dll/shellext/zipfldr/lang/ro-RO.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index fa72e571677..6c121f2a380 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -3,21 +3,21 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2018 George Bișoc <george.bisoc(a)reactos.org> - * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Selectați o Destinație" +CAPTION "Selectați o destinație" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Selectați folderul de destinație",IDC_STATIC,86,12,154,8 EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL PUSHBUTTON "Răsfoiți...",IDC_BROWSE,189,42,54,14 PUSHBUTTON "Parolă",IDC_PASSWORD,189,66,54,14 - LTEXT "Clic „Înainte” pentru a extrage",IDC_STATUSTEXT,86,114,100,8 + LTEXT "Apăsați Înainte pentru a extrage",IDC_STATUSTEXT,86,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END @@ -30,18 +30,18 @@ BEGIN LTEXT "Fișierele au fost extrase în folderul respectiv:",IDC_STATIC,86,12,157,18 LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Afișează fișierele extrase",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,95,10 - LTEXT "Apăsați Termină pentru a continua.",IDC_STATIC,86,84,124,8 + LTEXT "Apăsați pe Termină pentru a continua.",IDC_STATIC,86,84,124,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Confirmați Înlocuirea Fișier" +CAPTION "Confirmați înlocuirea fișierelor" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Da",IDYES,6,36,62,14 PUSHBUTTON "Anulează",IDCANCEL,204,36,62,14 - PUSHBUTTON "Da &Toți",IDYESALL,72,36,62,14 + PUSHBUTTON "Da &toate",IDYESALL,72,36,62,14 PUSHBUTTON "&Nu",IDNO,138,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 @@ -74,17 +74,17 @@ BEGIN IDS_ERRORTITLE "Eroare de dosare comprimate (zipate)." IDS_CANTSTARTTHREAD "Nu se poate porni firul de execuție pentru a comprima fișierele." IDS_NOFILES "Directorul specificat '%s' este gol, deci Dosarele comprimate (zipate) nu îl pot adăuga în arhivă." - IDS_CANTCREATEZIP "Nu a putut fi creat un dosar comprimat '%s' (cod de eroare: %d)." - IDS_CANTREADFILE "Nu a putut fi citit fișierul '%s'." + IDS_CANTCREATEZIP "Nu s-a putut crea un dosar comprimat '%s' (cod de eroare: %d)." + IDS_CANTREADFILE "Nu s-a putut citi fișierul '%s'." IDS_EXTRACTING "Extragere..." - IDS_CANTEXTRACTFILE "Nu a putut fi extras fișierul '%1'." + IDS_CANTEXTRACTFILE "Nu s-a putut extrage fișierul '%1'." IDS_DECOMPRESSERROR "Metoda de compresie %d nu este suportată. Doriți să continuați?" IDS_UNKNOWNERROR "Eroare necunoscută 0x%08x." IDS_WIZ_TITLE "Expert de extracție" - IDS_WIZ_DEST_TITLE "Selectați o Destinație" + IDS_WIZ_DEST_TITLE "Selectați o destinație" IDS_WIZ_DEST_SUBTITLE "Fișierele din arhiva zip vor fi extrase în destinația specificată." - IDS_WIZ_COMPL_TITLE "Extragere Completă" + IDS_WIZ_COMPL_TITLE "Extragere completă" IDS_WIZ_COMPL_SUBTITLE "Fișierele din arhiva zip au fost extrase." IDS_WIZ_BROWSE_TITLE "Selectați destinația unde doriți să extrageți elementele selectate." @@ -92,7 +92,7 @@ BEGIN IDS_PASSWORD_FILE_TEXT "Fișierul '%1' este protejat de parolă. Vă rugăm, introduceți parola." IDS_PASSWORD_ZIP_TEXT "Vă rugăm să specificați parola pe care doriți să o folosiți când extrageți acest fișier zip." - IDS_MENUITEM "Extrage &Tot..." + IDS_MENUITEM "Extrage &tot..." IDS_HELPTEXT "Extrage conținutul dosarului" IDS_FRIENDLYNAME "Dosar comprimat (zip)" END

11 months, 3 weeks

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

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