Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CRT_APITEST] Add tests for _mbsncmp and _mbsstr. CORE-16933

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8aba5a172da641b47ded… commit c8aba5a172da641b47dedb2ed708c574027b873f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Jan 12 12:31:12 2024 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Jan 12 12:36:43 2024 -0500 [CRT_APITEST] Add tests for _mbsncmp and _mbsstr. CORE-16933 --- modules/rostests/apitests/crt/_mbsncmp.c | 70 +++++++++++++++++ modules/rostests/apitests/crt/_mbsstr.c | 87 ++++++++++++++++++++++ .../rostests/apitests/crt/crtdll_crt_apitest.cmake | 4 +- .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 4 +- modules/rostests/apitests/crt/testlist.c | 4 + 5 files changed, 165 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/crt/_mbsncmp.c b/modules/rostests/apitests/crt/_mbsncmp.c new file mode 100644 index 00000000000..7aa099cde3c --- /dev/null +++ b/modules/rostests/apitests/crt/_mbsncmp.c @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Tests for _mbsncmp + * COPYRIGHT: Copyright 2024 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include <apitest.h> +#include <mbstring.h> +#define WIN32_NO_STATUS +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> + +/* + * cmp functions can either return 1/-1 or the actual difference between the + * first two differing characters. + * On Win2003, both crtdll and msvcrt always return 1/-1. + * On Win10, msvcrt returns the diff, crtdll returns 1/-1. + */ +#ifdef TEST_CRTDLL +#define RETURN_DIFF 0 +#else +#define RETURN_DIFF (GetVersion() >= 0x0600) +#endif + +#define DIFF_RETURN(sign, absolute) (sign (RETURN_DIFF ? absolute : 1)) + +START_TEST(_mbsncmp) +{ + int ret; + + /* Zero length always returns true */ + ret = _mbsncmp(NULL, NULL, 0); + ok(ret == 0, "ret = %d\n", ret); + + ret = _mbsncmp("a", "c", 0); + ok(ret == 0, "ret = %d\n", ret); + + /* No null checks - length 1 crashes */ + StartSeh() + (void)_mbsncmp("a", NULL, 1); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + (void)_mbsncmp(NULL, "c", 1); + EndSeh(STATUS_ACCESS_VIOLATION); + + /* Strings longer than or equal to length */ + ret = _mbsncmp("a", "c", 1); + ok(ret == DIFF_RETURN(-, 2), "ret = %d\n", ret); + + ret = _mbsncmp("a", "a", 1); + ok(ret == 0, "ret = %d\n", ret); + + ret = _mbsncmp("ab", "aB", 1); + ok(ret == 0, "ret = %d\n", ret); + + ret = _mbsncmp("aa", "ac", 2); + ok(ret == DIFF_RETURN(-, 2), "ret = %d\n", ret); + + /* Length longer than one of the strings */ + ret = _mbsncmp("a", "ac", 2); + ok(ret == DIFF_RETURN(-, 'c'), "ret = %d\n", ret); + + ret = _mbsncmp("aa", "a", 2); + ok(ret == DIFF_RETURN(+, 'a'), "ret = %d\n", ret); + + ret = _mbsncmp("ab", "ab", 100); + ok(ret == 0, "ret = %d\n", ret); +} diff --git a/modules/rostests/apitests/crt/_mbsstr.c b/modules/rostests/apitests/crt/_mbsstr.c new file mode 100644 index 00000000000..fc926c1cee8 --- /dev/null +++ b/modules/rostests/apitests/crt/_mbsstr.c @@ -0,0 +1,87 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Tests for _mbsstr + * COPYRIGHT: Copyright 2024 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include <apitest.h> +#include <mbstring.h> +#define WIN32_NO_STATUS +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> + +START_TEST(_mbsstr) +{ + unsigned char *haystack; + unsigned char *ret; + + /* NULL pointers are not handled */ + StartSeh() + (void)_mbsstr(NULL, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + haystack = "hello"; + (void)_mbsstr(haystack, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + haystack = ""; + (void)_mbsstr(haystack, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + /* Empty needle returns haystack, empty haystack returns NULL... */ + haystack = "hello"; + ret = _mbsstr(haystack, ""); + ok(ret == haystack, "ret = %p, haystack = %p\n", ret, haystack); + + haystack = ""; + ret = _mbsstr(haystack, "a"); + ok(ret == NULL, "ret = %p, haystack = %p\n", ret, haystack); + + /* ... but if both are empty, behavior differs */ + haystack = ""; + ret = _mbsstr(haystack, ""); +#ifdef TEST_CRTDLL + ok(ret == NULL, "ret = %p, haystack = %p\n", ret, haystack); +#else + ok(ret == haystack, "ret = %p, haystack = %p\n", ret, haystack); +#endif + + /* Simple "found" cases */ + haystack = "abcdefg"; + ret = _mbsstr(haystack, "abc"); + ok(ret == haystack, "ret = %p, haystack = %p\n", ret, haystack); + + haystack = "abcdefg"; + ret = _mbsstr(haystack, "g"); + ok(ret == haystack + 6, "ret = %p, haystack = %p\n", ret, haystack); + + haystack = "abcdefg"; + ret = _mbsstr(haystack, "abcdefg"); + ok(ret == haystack, "ret = %p, haystack = %p\n", ret, haystack); + + /* Simple "not found" cases */ + haystack = "abcdefg"; + ret = _mbsstr(haystack, "h"); + ok(ret == NULL, "ret = %p, haystack = %p\n", ret, haystack); + + haystack = "abcdefg"; + ret = _mbsstr(haystack, "gh"); + ok(ret == NULL, "ret = %p, haystack = %p\n", ret, haystack); + + haystack = "abcdefg"; + ret = _mbsstr(haystack, "abcD"); + ok(ret == NULL, "ret = %p, haystack = %p\n", ret, haystack); + + /* Needle longer than haystack */ + haystack = "abcdefg"; + ret = _mbsstr(haystack, "abcdefgh"); + ok(ret == NULL, "ret = %p, haystack = %p\n", ret, haystack); + + haystack = "abcdefg"; + ret = _mbsstr(haystack, "xxxxxxxx"); + ok(ret == NULL, "ret = %p, haystack = %p\n", ret, haystack); +} + diff --git a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake index c6f60ea1d56..cc9a32d004b 100644 --- a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -212,7 +212,7 @@ list(APPEND SOURCE_CRTDLL # _mbsnbset.c # _mbsncat.c # _mbsnccnt.c -# _mbsncmp.c + _mbsncmp.c # _mbsncpy.c # _mbsnextc.c # _mbsnicmp.c @@ -224,7 +224,7 @@ list(APPEND SOURCE_CRTDLL # _mbsset.c # _mbsspn.c # _mbsspnp.c -# _mbsstr.c + _mbsstr.c # _mbstok.c # _mbstrlen.c # _mbsupr.c diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 919a7b01b64..0d1984b5d17 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -549,7 +549,7 @@ list(APPEND SOURCE_MSVCRT # _mbsncat_s_l # _mbsnccnt.c # _mbsnccnt_l -# _mbsncmp.c + _mbsncmp.c # _mbsncmp_l # _mbsncoll.c # _mbsncoll_l @@ -585,7 +585,7 @@ list(APPEND SOURCE_MSVCRT # _mbsspn_l # _mbsspnp.c # _mbsspnp_l -# _mbsstr.c + _mbsstr.c # _mbsstr_l # _mbstok.c # _mbstok_l diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index 14f0bb97ad3..e1592928611 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -3,6 +3,8 @@ #define STANDALONE #include <apitest.h> +extern void func__mbsncmp(void); +extern void func__mbsstr(void); #if defined(TEST_MSVCRT) extern void func__vscprintf(void); extern void func__vscwprintf(void); @@ -60,6 +62,8 @@ const struct test winetest_testlist[] = { "strlen", func_strlen }, { "strtoul", func_strtoul }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) + { "_mbsncmp", func__mbsncmp }, + { "_mbsstr", func__mbsstr }, { "system", func_system }, #endif #if defined(TEST_MSVCRT)

1 year, 5 months

[reactos] 01/01: [SHELL32] Improve error message on copying files (#6290)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4490a053d01b54f957627… commit 4490a053d01b54f957627bc0e1c59a471638ae49 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 12 16:01:21 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 12 16:01:21 2024 +0900 [SHELL32] Improve error message on copying files (#6290) Based on KRosUser's copyerrorfix.patch. JIRA issue: CORE-19414 - If feFrom->szFilename was empty, then use feFrom->szFullPath instead. --- dll/win32/shell32/shlfileop.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 3480cfd2af0..f1ecc455428 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1883,6 +1883,8 @@ static void check_flags(FILEOP_FLAGS fFlags) FIXME("Unsupported flags: %04x\n", fFlags); } +#define GET_FILENAME(fe) ((fe)->szFilename[0] ? (fe)->szFilename : (fe)->szFullPath) + static DWORD validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo) { @@ -1922,14 +1924,14 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT { strTitle.LoadStringW(IDS_MOVEERRORTITLE); if (IsAttribDir(feFrom->attributes)) - strText.Format(IDS_MOVEERRORSAMEFOLDER, feFrom->szFilename); + strText.Format(IDS_MOVEERRORSAMEFOLDER, GET_FILENAME(feFrom)); else - strText.Format(IDS_MOVEERRORSAME, feFrom->szFilename); + strText.Format(IDS_MOVEERRORSAME, GET_FILENAME(feFrom)); } else { strTitle.LoadStringW(IDS_COPYERRORTITLE); - strText.Format(IDS_COPYERRORSAME, feFrom->szFilename); + strText.Format(IDS_COPYERRORSAME, GET_FILENAME(feFrom)); return ERROR_SUCCESS; } MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR); @@ -1957,12 +1959,12 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT if (wFunc == FO_MOVE) { strTitle.LoadStringW(IDS_MOVEERRORTITLE); - strText.Format(IDS_MOVEERRORSUBFOLDER, feFrom->szFilename); + strText.Format(IDS_MOVEERRORSUBFOLDER, GET_FILENAME(feFrom)); } else { strTitle.LoadStringW(IDS_COPYERRORTITLE); - strText.Format(IDS_COPYERRORSUBFOLDER, feFrom->szFilename); + strText.Format(IDS_COPYERRORSUBFOLDER, GET_FILENAME(feFrom)); } MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR); return DE_DESTSUBTREE;

1 year, 5 months

[reactos] 01/01: [SDK] cicuif.h: Reduce magic numbers (#6334)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f51258ae5173e7b5629ad… commit f51258ae5173e7b5629add52b38405dba9360420 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 12 13:40:28 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 12 13:40:28 2024 +0900 [SDK] cicuif.h: Reduce magic numbers (#6334) Improve human readability. JIRA issue: CORE-19360 - Define some flags of m_style. - Define some flags of dwDrawFlags. - Reduce some magic numbers. --- sdk/include/reactos/cicero/cicuif.h | 185 ++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 82 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 457fe782536..23f0bac68e8 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -193,19 +193,6 @@ public: ///////////////////////////////////////////////////////////////////////////// -// Flags for CUIFObject::m_style -enum -{ - UIF_STYLE_CHILD = 0x1, - UIF_STYLE_TOPMOST = 0x2, - UIF_STYLE_TOOLWINDOW = 0x4, - UIF_STYLE_TOOLTIP = 0x20, - UIF_STYLE_SHADOW = 0x40, - UIF_STYLE_RTL = 0x200, - UIF_STYLE_VERTICAL = 0x400, - UIF_STYLE_THEMED = 0x80000000, -}; - class CUIFObject : public CUIFTheme { protected: @@ -432,6 +419,13 @@ BOOL cicGetIconBitmaps(HICON hIcon, HBITMAP *hbm1, HBITMAP *hbm2, const SIZE *pS ///////////////////////////////////////////////////////////////////////////// +// Flags for dwDrawFlags +enum +{ + UIF_DRAW_PRESSED = 0x10, + UIF_DRAW_DISABLED = 0x20, +}; + class CUIFScheme { public: @@ -514,6 +508,22 @@ CUIFScheme *cicCreateUIFScheme(DWORD type); ///////////////////////////////////////////////////////////////////////////// +// m_style flags for CUIFWindow +enum +{ + UIF_WINDOW_CHILD = 0x1, + UIF_WINDOW_TOPMOST = 0x2, + UIF_WINDOW_TOOLWINDOW = 0x4, + UIF_WINDOW_DLGFRAME = 0x8, + UIF_WINDOW_TOOLTIP = 0x20, + UIF_WINDOW_SHADOW = 0x40, + UIF_WINDOW_WORKAREA = 0x80, + UIF_WINDOW_MONITOR = 0x100, + UIF_WINDOW_LAYOUTRTL = 0x200, + UIF_WINDOW_NOMOUSEMSG = 0x400, + UIF_WINDOW_ENABLETHEMED = 0x80000000, +}; + class CUIFWindow : public CUIFObject { protected: @@ -674,6 +684,21 @@ public: ///////////////////////////////////////////////////////////////////////////// +// m_style flags for CUIFButton +enum +{ + UIF_BUTTON_H_ALIGN_LEFT = 0, + UIF_BUTTON_H_ALIGN_CENTER = 0x1, + UIF_BUTTON_H_ALIGN_RIGHT = 0x2, + UIF_BUTTON_H_ALIGN_MASK = UIF_BUTTON_H_ALIGN_CENTER | UIF_BUTTON_H_ALIGN_RIGHT, + UIF_BUTTON_V_ALIGN_TOP = 0, + UIF_BUTTON_V_ALIGN_MIDDLE = 0x4, + UIF_BUTTON_V_ALIGN_BOTTOM = 0x8, + UIF_BUTTON_V_ALIGN_MASK = UIF_BUTTON_V_ALIGN_MIDDLE | UIF_BUTTON_V_ALIGN_BOTTOM, + UIF_BUTTON_LARGE_ICON = 0x100, + UIF_BUTTON_VERTICAL = 0x400, +}; + class CUIFButton : public CUIFObject { protected: @@ -729,6 +754,12 @@ public: ///////////////////////////////////////////////////////////////////////////// +// m_style flags for CUIFGripper +enum +{ + UIF_GRIPPER_VERTICAL = 0x1, +}; + class CUIFGripper : public CUIFObject { protected: @@ -1051,7 +1082,7 @@ inline STDMETHODIMP_(void) CUIFObject::Initialize() inline STDMETHODIMP_(void) CUIFObject::OnPaint(HDC hDC) { - if (!(m_pWindow->m_style & UIF_STYLE_THEMED) || !OnPaintTheme(hDC)) + if (!(m_pWindow->m_style & UIF_WINDOW_ENABLETHEMED) || !OnPaintTheme(hDC)) OnPaintNoTheme(hDC); } @@ -1261,7 +1292,7 @@ inline BOOL CUIFObject::IsRTL() { if (!m_pWindow) return FALSE; - return !!(m_pWindow->m_style & UIF_STYLE_RTL); + return !!(m_pWindow->m_style & UIF_WINDOW_LAYOUTRTL); } inline CUIFObject* CUIFObject::ObjectFromPoint(POINT pt) @@ -1510,7 +1541,7 @@ CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlag { ::FillRect(hDC, prc, GetBrush(9)); - if (!(dwDrawFlags & 0x10) && (dwDrawFlags & 0x2)) + if (!(dwDrawFlags & UIF_DRAW_PRESSED) && (dwDrawFlags & 0x2)) return; HBRUSH hbrDither = cicCreateDitherBrush(); @@ -1552,7 +1583,7 @@ CUIFSchemeDef::DrawCtrlText( cchText = lstrlenW(pszText); RECT rc = *prc; - if (dwDrawFlags & 0x20) + if (dwDrawFlags & UIF_DRAW_DISABLED) { ::OffsetRect(&rc, 1, 1); ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNHIGHLIGHT)); @@ -1585,7 +1616,7 @@ CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags else { UINT uFlags = DST_PREFIXTEXT | DST_TEXT; - if (dwDrawFlags & 0x20) + if (dwDrawFlags & UIF_DRAW_DISABLED) uFlags |= (DSS_MONO | DSS_DISABLED); ::DrawState(hDC, 0, 0, (LPARAM)hIcon, 0, prc->left, prc->top, 0, 0, uFlags); } @@ -2182,17 +2213,17 @@ CUIFWindow::Initialize() cicUpdateUIFSys(); cicUpdateUIFScheme(); - if (m_style & UIF_STYLE_TOOLTIP) + if (m_style & UIF_WINDOW_TOOLTIP) { - DWORD style = (m_style & UIF_STYLE_RTL) | UIF_STYLE_TOPMOST | 0x10; + DWORD style = (m_style & UIF_WINDOW_LAYOUTRTL) | UIF_WINDOW_TOPMOST | 0x10; m_pToolTip = new(cicNoThrow) CUIFToolTip(m_hInst, style, this); if (m_pToolTip) m_pToolTip->Initialize(); } - if (m_style & UIF_STYLE_SHADOW) + if (m_style & UIF_WINDOW_SHADOW) { - m_pShadow = new(cicNoThrow) CUIFShadow(m_hInst, UIF_STYLE_TOPMOST, this); + m_pShadow = new(cicNoThrow) CUIFShadow(m_hInst, UIF_WINDOW_TOPMOST, this); if (m_pShadow) m_pShadow->Initialize(); } @@ -2288,14 +2319,14 @@ CUIFWindow::GetWndStyle() { DWORD ret; - if (m_style & UIF_STYLE_CHILD) + if (m_style & UIF_WINDOW_CHILD) ret = WS_CHILD | WS_CLIPSIBLINGS; else ret = WS_POPUP | WS_DISABLED; if (m_style & 0x10000000) ret |= WS_BORDER; - else if (m_style & 0x8) + else if (m_style & UIF_WINDOW_DLGFRAME) ret |= WS_DLGFRAME; else if ((m_style & 0x20000000) || (m_style & 0x10)) ret |= WS_BORDER; @@ -2307,11 +2338,11 @@ inline STDMETHODIMP_(DWORD) CUIFWindow::GetWndStyleEx() { DWORD ret = 0; - if (m_style & UIF_STYLE_TOPMOST) - ret = WS_EX_TOPMOST; - if (m_style & UIF_STYLE_TOOLWINDOW) + if (m_style & UIF_WINDOW_TOPMOST) + ret |= WS_EX_TOPMOST; + if (m_style & UIF_WINDOW_TOOLWINDOW) ret |= WS_EX_TOOLWINDOW; - if (m_style & UIF_STYLE_RTL) + if (m_style & UIF_WINDOW_LAYOUTRTL) ret |= WS_EX_LAYOUTRTL; return ret; } @@ -2334,7 +2365,7 @@ inline void CUIFWindow::Show(BOOL bVisible) if (!IsWindow(m_hWnd)) return; - if (bVisible && (m_style & UIF_STYLE_TOPMOST)) + if (bVisible && (m_style & UIF_WINDOW_TOPMOST)) ::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); m_bVisible = bVisible; @@ -2522,7 +2553,7 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) m_pToolTip->RelayEvent(&msg); } - if (!(m_style & UIF_STYLE_VERTICAL)) + if (!(m_style & UIF_WINDOW_NOMOUSEMSG)) HandleMouseMsg(HIWORD(lParam), Point.x, Point.y); return TRUE; @@ -2731,42 +2762,31 @@ CUIFWindow::WindowProcedure(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) inline BOOL CUIFWindow::GetWorkArea(LPCRECT prcWnd, LPRECT prcWorkArea) { - if (!(m_style & 0x180)) - return 0; + if (!(m_style & (UIF_WINDOW_WORKAREA | UIF_WINDOW_MONITOR))) + return FALSE; HMONITOR hMon = ::MonitorFromRect(prcWnd, MONITOR_DEFAULTTONEAREST); MONITORINFO mi; mi.cbSize = sizeof(MONITORINFO); if (!hMon || !::GetMonitorInfo(hMon, &mi)) { - if (m_style & 0x80) + if (m_style & UIF_WINDOW_WORKAREA) return ::SystemParametersInfo(SPI_GETWORKAREA, 0, prcWorkArea, 0); - if (m_style & 0x100) - { - prcWorkArea->top = 0; - prcWorkArea->left = 0; - prcWorkArea->right = ::GetSystemMetrics(SM_CXSCREEN); - prcWorkArea->bottom = ::GetSystemMetrics(SM_CYSCREEN); - return TRUE; - } - - return FALSE; - } - - if (m_style & 0x80) - { - *prcWorkArea = mi.rcWork; + prcWorkArea->left = prcWorkArea->top = 0; + prcWorkArea->right = ::GetSystemMetrics(SM_CXSCREEN); + prcWorkArea->bottom = ::GetSystemMetrics(SM_CYSCREEN); return TRUE; } - if (m_style & 0x100) + if (m_style & UIF_WINDOW_WORKAREA) { - *prcWorkArea = mi.rcMonitor; + *prcWorkArea = mi.rcWork; return TRUE; } - return FALSE; + *prcWorkArea = mi.rcMonitor; + return TRUE; } inline void @@ -2820,7 +2840,7 @@ CUIFWindow::PaintObject(HDC hDC, LPCRECT prc) ::SetViewportOrgEx(hMemDC, -pRect->left, -pRect->top, NULL); if ((FAILED(CUIFTheme::EnsureThemeData(m_hWnd)) || - !(m_style & UIF_STYLE_CHILD) || + !(m_style & UIF_WINDOW_CHILD) || FAILED(DrawThemeParentBackground(m_hWnd, hMemDC, &m_rc))) && FAILED(DrawThemeBackground(hMemDC, m_iStateId, &m_rc, 0))) { @@ -3025,7 +3045,7 @@ CUIFWindow::OnAnimationStart() /// @unimplemented inline CUIFShadow::CUIFShadow(HINSTANCE hInst, DWORD style, CUIFWindow *pShadowOwner) - : CUIFWindow(hInst, (style | UIF_STYLE_TOOLWINDOW)) + : CUIFWindow(hInst, (style | UIF_WINDOW_TOOLWINDOW)) { m_pShadowOrToolTipOwner = pShadowOwner; m_rgbShadowColor = RGB(0, 0, 0); @@ -3610,7 +3630,7 @@ inline void CUIFButton::DrawIconProc(HDC hDC, LPRECT prc, BOOL bPressed) ::FillRect(hMemDC, &rc, hbrWhite); } - if (m_style & 0x100) + if (m_style & UIF_BUTTON_LARGE_ICON) { ::DrawIconEx(hMemDC, 2 + bPressed, 2 + bPressed, @@ -3636,6 +3656,7 @@ inline void CUIFButton::DrawIconProc(HDC hDC, LPRECT prc, BOOL bPressed) ::DeleteDC(hMemDC); } +/// @unimplemented inline void CUIFButton::DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed) { @@ -3648,16 +3669,16 @@ CUIFButton::DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed) ::GetTextExtentPoint32W(hDC, m_pszButtonText, cchText, &textSize); INT xText, yText; - if ((m_style & (UIF_STYLE_CHILD | UIF_STYLE_TOPMOST)) == UIF_STYLE_CHILD) + if ((m_style & UIF_BUTTON_H_ALIGN_MASK) == UIF_BUTTON_H_ALIGN_CENTER) xText = (m_rc.right - m_rc.left - textSize.cx) / 2; - else if ((m_style & (UIF_STYLE_CHILD | UIF_STYLE_TOPMOST)) == UIF_STYLE_TOPMOST) + else if ((m_style & UIF_BUTTON_H_ALIGN_MASK) == UIF_BUTTON_H_ALIGN_RIGHT) xText = m_rc.right - m_rc.left - textSize.cx; else xText = 0; - if ((m_style & 0xC) == UIF_STYLE_TOOLWINDOW) + if ((m_style & UIF_BUTTON_V_ALIGN_MASK) == UIF_BUTTON_V_ALIGN_MIDDLE) yText = (m_rc.bottom - m_rc.top - textSize.cy) / 2; - else if ((m_style & 0xC) == 0x8) + else if ((m_style & UIF_BUTTON_V_ALIGN_MASK) == UIF_BUTTON_V_ALIGN_BOTTOM) yText = m_rc.bottom - m_rc.top - textSize.cy; else yText = 0; @@ -3741,7 +3762,7 @@ CUIFButton::GetTextSize(LPCWSTR pszText, LPSIZE pSize) ::GetTextExtentPoint32W(hDC, pszText, cchText, pSize); } - if (m_style & UIF_STYLE_VERTICAL) + if (m_style & UIF_BUTTON_VERTICAL) { INT tmp = pSize->cx; pSize->cx = pSize->cy; @@ -3757,7 +3778,7 @@ CUIFButton::OnLButtonDown(LONG x, LONG y) { SetStatus(1); StartCapture(); - if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) + if ((m_style & 0x30) == 0x20) NotifyCommand(1, 0); } @@ -3770,7 +3791,7 @@ CUIFButton::OnLButtonUp(LONG x, LONG y) if (bCapture) EndCapture(); - BOOL bNotInObject = (m_style & 0x30) == UIF_STYLE_TOOLTIP; + BOOL bNotInObject = (m_style & 0x30) == 0x20; if ((m_style & 0x30) != 0x10) { bNotInObject = !PtInObject(pt); @@ -3807,7 +3828,7 @@ CUIFButton::OnLButtonUp(LONG x, LONG y) inline void CUIFButton::OnMouseIn(LONG x, LONG y) { - if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) + if ((m_style & 0x30) == 0x20) { if (IsCapture()) SetStatus(0); @@ -3825,7 +3846,7 @@ inline void CUIFButton::OnMouseIn(LONG x, LONG y) inline void CUIFButton::OnMouseOut(LONG x, LONG y) { - if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) + if ((m_style & 0x30) == 0x20) SetStatus(0); else if (IsCapture()) SetStatus(3); @@ -3935,13 +3956,13 @@ inline DWORD CUIFButton2::MakeDrawFlag() { DWORD dwDrawFlags = 0; if (m_bPressed) - dwDrawFlags |= 0x10; + dwDrawFlags |= UIF_DRAW_PRESSED; if (m_uButtonStatus == 1) dwDrawFlags |= 0x2; else if (2 <= m_uButtonStatus && m_uButtonStatus <= 3) dwDrawFlags |= 0x1; if (!m_bEnable) - dwDrawFlags |= 0x20; + dwDrawFlags |= UIF_DRAW_DISABLED; return dwDrawFlags; } @@ -3999,7 +4020,7 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) cyContent = m_BitmapSize.cy; } - if (m_style & 0x400) + if (m_style & UIF_BUTTON_VERTICAL) { cxyBorders = ((cyText && cyContent) ? 2 : 0); @@ -4019,31 +4040,31 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) } INT xOffset, yOffset; - if ((m_style & 3) == 1) // center + if ((m_style & UIF_BUTTON_H_ALIGN_MASK) == UIF_BUTTON_H_ALIGN_CENTER) xOffset = (rcBack.left + rcBack.right - cxButton) / 2; - else if ((m_style & 3) == 2) // right + else if ((m_style & UIF_BUTTON_H_ALIGN_MASK) == UIF_BUTTON_H_ALIGN_RIGHT) xOffset = rcBack.right - cxText - 2; - else // left + else xOffset = rcBack.left + 2; - if ((m_style & 0xC) == 4) // middle + if ((m_style & UIF_BUTTON_V_ALIGN_MASK) == UIF_BUTTON_V_ALIGN_MIDDLE) yOffset = (rcBack.top + rcBack.bottom - cyButton) / 2; - else if ((m_style & 0xC) == 8) // bottom + else if ((m_style & UIF_BUTTON_V_ALIGN_MASK) == UIF_BUTTON_V_ALIGN_BOTTOM) yOffset = rcBack.bottom - cyButton - 2; - else // top + else 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), + m_pScheme->GetCtrlFaceOffset(((m_style & 0x200) ? 165 : 84), dwDrawFlags, &offsetSize); ::OffsetRect(&rc, offsetSize.cx, offsetSize.cy); RECT rcImage, rcText; - if (m_style & UIF_STYLE_VERTICAL) // vertical + if (m_style & UIF_BUTTON_VERTICAL) { rcImage.left = (rc.left + rc.right - cxContent) / 2; rcImage.top = rc.top; @@ -4071,12 +4092,12 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) m_pScheme->DrawCtrlBkgd(hdcMem, &rcBack, - ((m_style & UIF_STYLE_RTL) ? 165 : 84), + ((m_style & 0x200) ? 165 : 84), dwDrawFlags); if (m_pszButtonText) { m_pScheme->DrawCtrlText(hdcMem, &rcText, m_pszButtonText, -1, dwDrawFlags, - !!(m_style & UIF_STYLE_VERTICAL)); + !!(m_style & UIF_BUTTON_VERTICAL)); } if (m_ButtonIcon.m_hIcon) @@ -4089,7 +4110,7 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) m_pScheme->DrawCtrlEdge(hdcMem, &rcBack, - ((m_style & UIF_STYLE_RTL) ? 165 : 84), + ((m_style & 0x200) ? 165 : 84), dwDrawFlags); ::BitBlt(hDC, m_rc.left, m_rc.top, width, height, hdcMem, 0, 0, SRCCOPY); @@ -4106,7 +4127,7 @@ CUIFGripper::CUIFGripper(CUIFObject *pParent, LPCRECT prc, DWORD style) { m_iStateId = 0; m_pszClassList = L"REBAR"; - if (m_style & 1) + if (m_style & UIF_GRIPPER_VERTICAL) m_iPartId = RP_GRIPPERVERT; else m_iPartId = RP_GRIPPER; @@ -4153,7 +4174,7 @@ CUIFGripper::OnPaintTheme(HDC hDC) if (FAILED(EnsureThemeData(*m_pWindow))) return FALSE; - if (m_style & 1) + if (m_style & UIF_GRIPPER_VERTICAL) { m_rc.top += 2; m_rc.bottom -= 2; @@ -4175,12 +4196,12 @@ CUIFGripper::OnPaintNoTheme(HDC hDC) { if (m_pScheme) { - m_pScheme->DrawDragHandle(hDC, &m_rc, !!(m_style & 1)); + m_pScheme->DrawDragHandle(hDC, &m_rc, !!(m_style & UIF_GRIPPER_VERTICAL)); return; } RECT rc; - if (m_style & 1) + if (m_style & UIF_GRIPPER_VERTICAL) rc = { m_rc.left, m_rc.top + 1, m_rc.right, m_rc.top + 4 }; else rc = { m_rc.left + 1, m_rc.top, m_rc.left + 4, m_rc.bottom }; @@ -4200,7 +4221,7 @@ inline STDMETHODIMP_(void) CUIFGripper::SetStyle(DWORD style) { m_style = style; - if (m_style & 1) + if (m_style & UIF_GRIPPER_VERTICAL) SetActiveTheme(L"REBAR", RP_GRIPPERVERT, 0); else SetActiveTheme(L"REBAR", RP_GRIPPER, 0);

1 year, 5 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFGripper (#6332)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4287f07c757136b86a684… commit 4287f07c757136b86a6847ff4b118b0f693e5b1f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 11 22:09:19 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 11 22:09:19 2024 +0900 [SDK] cicuif.h: Add CUIFGripper (#6332) Supporting TIPs... JIRA issue: CORE-19360 - Add CUIFGripper class. --- sdk/include/reactos/cicero/cicuif.h | 174 +++++++++++++++++++++++++++++++----- 1 file changed, 151 insertions(+), 23 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 0beab5656d7..457fe782536 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -23,8 +23,9 @@ class CUIFTheme; class CUIFWindow; class CUIFToolTip; class CUIFShadow; - class CUIFButton; - class CUIFButton2; + class CUIFButton; + class CUIFButton2; + class CUIFGripper; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; @@ -465,8 +466,8 @@ public: 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; + STDMETHOD_(void, DrawDragHandle)(HDC hDC, LPCRECT prc, BOOL bVertical) = 0; + STDMETHOD_(void, DrawSeparator)(HDC hDC, LPCRECT prc, BOOL bVertical) = 0; }; class CUIFSchemeDef : public CUIFScheme @@ -499,8 +500,8 @@ public: 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; + STDMETHOD_(void, DrawDragHandle)(HDC hDC, LPCRECT prc, BOOL bVertical) override; + STDMETHOD_(void, DrawSeparator)(HDC hDC, LPCRECT prc, BOOL bVertical) override; }; DECLSPEC_SELECTANY CUIFColorTableSys *CUIFScheme::s_pColorTableSys = NULL; @@ -538,6 +539,7 @@ protected: public: enum { POINTING_TIMER_ID = 0x7982 }; + operator HWND() const { return m_hWnd; } CUIFWindow(HINSTANCE hInst, DWORD style); ~CUIFWindow() override; @@ -727,6 +729,26 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFGripper : public CUIFObject +{ +protected: + POINT m_ptGripper; + +public: + CUIFGripper(CUIFObject *pParent, LPCRECT prc, DWORD style); + ~CUIFGripper() override; + + STDMETHOD_(void, OnMouseMove)(LONG x, LONG y) override; + STDMETHOD_(void, OnLButtonDown)(LONG x, LONG y) override; + STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; + STDMETHOD_(BOOL, OnPaintTheme)(HDC hDC) override; + STDMETHOD_(void, OnPaintNoTheme)(HDC hDC) override; + STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y) override; + STDMETHOD_(void, SetStyle)(DWORD style) override; +}; + +///////////////////////////////////////////////////////////////////////////// + inline void cicInitUIFLib(void) { cicInitUIFSys(); @@ -1629,10 +1651,10 @@ CUIFSchemeDef::DrawWndFrame(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWO } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawDragHandle(HDC hDC, LPCRECT prc, BOOL bFlag) +CUIFSchemeDef::DrawDragHandle(HDC hDC, LPCRECT prc, BOOL bVertical) { RECT rc; - if (bFlag) + if (bVertical) rc = { prc->left, prc->top + 1, prc->right, prc->top + 4 }; else rc = { prc->left + 1, prc->top, prc->left + 4, prc->bottom }; @@ -1640,7 +1662,7 @@ CUIFSchemeDef::DrawDragHandle(HDC hDC, LPCRECT prc, BOOL bFlag) } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawSeparator(HDC hDC, LPCRECT prc, BOOL bFlag) +CUIFSchemeDef::DrawSeparator(HDC hDC, LPCRECT prc, BOOL bVertical) { HPEN hLightPen = ::CreatePen(PS_SOLID, 0, ::GetSysColor(COLOR_BTNHIGHLIGHT)); if (!hLightPen) @@ -1654,7 +1676,7 @@ CUIFSchemeDef::DrawSeparator(HDC hDC, LPCRECT prc, BOOL bFlag) } HGDIOBJ hPenOld = ::SelectObject(hDC, hShadowPen); - if (bFlag) + if (bVertical) { ::MoveToEx(hDC, prc->left, prc->top + 1, NULL); ::LineTo(hDC, prc->right, prc->top + 1); @@ -2514,12 +2536,10 @@ CUIFWindow::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) OnCreate(hWnd); return 0; case WM_DESTROY: - if (m_pToolTip && ::IsWindow(m_pToolTip->m_hWnd)) - ::DestroyWindow(m_pToolTip->m_hWnd); - if (m_pShadow && ::IsWindow(m_pShadow->m_hWnd)) - { - ::DestroyWindow(m_pShadow->m_hWnd); - } + if (m_pToolTip && ::IsWindow(*m_pToolTip)) + ::DestroyWindow(*m_pToolTip); + if (m_pShadow && ::IsWindow(*m_pShadow)) + ::DestroyWindow(*m_pShadow); OnDestroy(hWnd); return 0; case WM_SIZE: @@ -3040,7 +3060,7 @@ inline void CUIFShadow::InitShadow() inline void CUIFShadow::AdjustWindowPos() { - HWND hwndOwner = m_pShadowOrToolTipOwner->m_hWnd; + HWND hwndOwner = *m_pShadowOrToolTipOwner; if (!::IsWindow(m_hWnd)) return; @@ -3093,7 +3113,7 @@ inline STDMETHODIMP_(LRESULT) CUIFShadow::OnWindowPosChanging(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { WINDOWPOS *wp = (WINDOWPOS *)lParam; - wp->hwndInsertAfter = m_pShadowOrToolTipOwner->m_hWnd; + wp->hwndInsertAfter = *m_pShadowOrToolTipOwner; return ::DefWindowProc(hWnd, Msg, wParam, lParam); } @@ -3224,7 +3244,7 @@ CUIFToolTip::GetTipTextColor() inline CUIFObject* CUIFToolTip::FindObject(HWND hWnd, POINT pt) { - if (hWnd == m_pShadowOrToolTipOwner->m_hWnd) + if (hWnd == *m_pShadowOrToolTipOwner) return m_pShadowOrToolTipOwner->ObjectFromPoint(pt); return NULL; } @@ -3246,7 +3266,7 @@ CUIFToolTip::ShowTip() POINT Point; ::GetCursorPos(&Point); - ::ScreenToClient(m_pToolTipTarget->m_pWindow->m_hWnd, &Point); + ::ScreenToClient(*m_pToolTipTarget->m_pWindow, &Point); RECT rc; m_pToolTipTarget->GetRect(&rc); @@ -3264,8 +3284,8 @@ CUIFToolTip::ShowTip() GetTipWindowSize(&size); RECT rc2 = rc; - ::ClientToScreen(m_pToolTipTarget->m_pWindow->m_hWnd, (LPPOINT)&rc); - ::ClientToScreen(m_pToolTipTarget->m_pWindow->m_hWnd, (LPPOINT)&rc.right); + ::ClientToScreen(*m_pToolTipTarget->m_pWindow, (LPPOINT)&rc); + ::ClientToScreen(*m_pToolTipTarget->m_pWindow, (LPPOINT)&rc.right); GetTipWindowRect(&rc2, size, &rc); m_bShowToolTip = TRUE; @@ -3709,7 +3729,7 @@ CUIFButton::GetTextSize(LPCWSTR pszText, LPSIZE pSize) INT cchText = lstrlenW(pszText); HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); - if (!m_bHasCustomFont && SUCCEEDED(EnsureThemeData(m_pWindow->m_hWnd))) + if (!m_bHasCustomFont && SUCCEEDED(EnsureThemeData(*m_pWindow))) { RECT rc; GetThemeTextExtent(hDC, 0, pszText, cchText, 0, NULL, &rc); @@ -4077,3 +4097,111 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) ::SelectObject(hdcMem, hbmOld); ::DeleteObject(hbmMem); } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFGripper::CUIFGripper(CUIFObject *pParent, LPCRECT prc, DWORD style) + : CUIFObject(pParent, 0, prc, style) +{ + m_iStateId = 0; + m_pszClassList = L"REBAR"; + if (m_style & 1) + m_iPartId = RP_GRIPPERVERT; + else + m_iPartId = RP_GRIPPER; +} + +inline CUIFGripper::~CUIFGripper() +{ +} + +inline STDMETHODIMP_(void) +CUIFGripper::OnMouseMove(LONG x, LONG y) +{ + if (IsCapture()) + { + POINT pt; + ::GetCursorPos(&pt); + m_pWindow->Move(pt.x - m_ptGripper.x, pt.y - m_ptGripper.y, -1, -1); + } +} + +inline STDMETHODIMP_(void) +CUIFGripper::OnLButtonDown(LONG x, LONG y) +{ + StartCapture(); + m_ptGripper.x = x; + m_ptGripper.y = y; + ::ScreenToClient(*m_pWindow, &m_ptGripper); + RECT rc; + ::GetWindowRect(*m_pWindow, &rc); + m_ptGripper.x -= rc.left; + m_ptGripper.y -= rc.top; +} + +inline STDMETHODIMP_(void) +CUIFGripper::OnLButtonUp(LONG x, LONG y) +{ + if (IsCapture()) + EndCapture(); +} + +inline STDMETHODIMP_(BOOL) +CUIFGripper::OnPaintTheme(HDC hDC) +{ + if (FAILED(EnsureThemeData(*m_pWindow))) + return FALSE; + + if (m_style & 1) + { + m_rc.top += 2; + m_rc.bottom -= 2; + } + else + { + m_rc.left += 2; + m_rc.right -= 2; + } + + if (FAILED(DrawThemeBackground(hDC, 1, &m_rc, 0))) + return FALSE; + + return TRUE; +} + +inline STDMETHODIMP_(void) +CUIFGripper::OnPaintNoTheme(HDC hDC) +{ + if (m_pScheme) + { + m_pScheme->DrawDragHandle(hDC, &m_rc, !!(m_style & 1)); + return; + } + + RECT rc; + if (m_style & 1) + rc = { m_rc.left, m_rc.top + 1, m_rc.right, m_rc.top + 4 }; + else + rc = { m_rc.left + 1, m_rc.top, m_rc.left + 4, m_rc.bottom }; + + ::DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT); +} + +inline STDMETHODIMP_(BOOL) +CUIFGripper::OnSetCursor(UINT uMsg, LONG x, LONG y) +{ + HCURSOR hCursor = ::LoadCursor(NULL, IDC_SIZEALL); + ::SetCursor(hCursor); + return TRUE; +} + +inline STDMETHODIMP_(void) +CUIFGripper::SetStyle(DWORD style) +{ + m_style = style; + if (m_style & 1) + SetActiveTheme(L"REBAR", RP_GRIPPERVERT, 0); + else + SetActiveTheme(L"REBAR", RP_GRIPPER, 0); +}

1 year, 5 months

[reactos] 01/01: [KERNEL32] OpenFile(): Use InitializeObjectAttributes (#6323)

by Muhammad Faathin Abdurrahman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5391eaadff005718cb2b4… commit 5391eaadff005718cb2b434207678c4a9d23ca74 Author: Muhammad Faathin Abdurrahman <kaw411gh0st(a)gmail.com> AuthorDate: Thu Jan 11 18:31:12 2024 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 11 12:31:12 2024 +0100 [KERNEL32] OpenFile(): Use InitializeObjectAttributes (#6323) Use InitializeObjectAttributes macro instead of initializing the members manually. --- dll/win32/kernel32/client/file/create.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dll/win32/kernel32/client/file/create.c b/dll/win32/kernel32/client/file/create.c index ec6411e4ec2..9a9c97d6839 100644 --- a/dll/win32/kernel32/client/file/create.c +++ b/dll/win32/kernel32/client/file/create.c @@ -513,12 +513,11 @@ OpenFile(LPCSTR lpFileName, // FILE_SHARE_READ // FILE_NO_INTERMEDIATE_BUFFERING - ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES); - ObjectAttributes.RootDirectory = NULL; - ObjectAttributes.ObjectName = &FileNameString; - ObjectAttributes.Attributes = OBJ_CASE_INSENSITIVE| OBJ_INHERIT; - ObjectAttributes.SecurityDescriptor = NULL; - ObjectAttributes.SecurityQualityOfService = NULL; + InitializeObjectAttributes(&ObjectAttributes, + &FileNameString, + OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + NULL, + NULL); errCode = NtOpenFile (&FileHandle, GENERIC_READ | SYNCHRONIZE,

1 year, 5 months

[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)

1 year, 5 months

[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"

1 year, 5 months

[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); +}

1 year, 5 months

[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);

1 year, 5 months

[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

1 year, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs