Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [OPENGLCFG] Update Romanian (ro-RO) translation (#6304)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5adb252fea7bf39273f1a… commit 5adb252fea7bf39273f1a871fe87d95b9644d3bb Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jan 9 12:01:30 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 9 11:01:30 2024 +0100 [OPENGLCFG] Update Romanian (ro-RO) translation (#6304) --- dll/cpl/openglcfg/lang/ro-RO.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/openglcfg/lang/ro-RO.rc b/dll/cpl/openglcfg/lang/ro-RO.rc index 0a4f26117dc..15f27024383 100644 --- a/dll/cpl/openglcfg/lang/ro-RO.rc +++ b/dll/cpl/openglcfg/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -14,10 +14,10 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 - GROUPBOX "Opțiuni de redare", -1, 5, 25, 230, 90 + GROUPBOX "Setări de redare", -1, 5, 25, 230, 90 LTEXT "&Motor de redare:", -1, 15, 42, 65, 10 COMBOBOX IDC_RENDERER, 80, 40, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Acesta va înlocui configurația implicită pentru driverul grafic! Alegeți „Implicit” pentru a reveni la configurația originală.", -1, 15, 60, 210, 40 + LTEXT "Acesta va înlocui setările implicite pentru driverul grafic! Alegeți „Implicit” pentru a reveni la setările originale.", -1, 15, 60, 210, 40 GROUPBOX "Depanare", -1, 5, 125, 230, 90 LTEXT "DEBUGCHANNEL:", -1, 15, 142, 65, 10 COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST

1 year, 5 months

[reactos] 01/01: [WINMM] Update Romanian (ro-RO) translation (#6309)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84de5693493480bd53a1b… commit 84de5693493480bd53a1b6bfa3ae711ddefc5d14 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jan 9 12:00:42 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 9 11:00:42 2024 +0100 [WINMM] Update Romanian (ro-RO) translation (#6309) --- dll/win32/winmm/lang/winmm_Ro.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/winmm/lang/winmm_Ro.rc b/dll/win32/winmm/lang/winmm_Ro.rc index 6a3890e6740..edefe49f197 100644 --- a/dll/win32/winmm/lang/winmm_Ro.rc +++ b/dll/win32/winmm/lang/winmm_Ro.rc @@ -1,7 +1,7 @@ /* * Copyright 1999 Eric Pouech * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -72,7 +72,7 @@ MCIERR_INTERNAL, "A apărut o problemă la inițializarea MCI. MCIERR_DRIVER, "A apărut o problemă la driverul dispozitivului. Driverul este închis. Eroarea nu poate fi accesată." MCIERR_CANNOT_USE_ALL, "În această comandă „all” ca nume de dispozitiv nu este permis." MCIERR_MULTIPLE, "Au apărut erori în mai mult de un dispozitiv. Specificați separat fiecare comandă și dispozitiv pentru a identifica dispozitivul care a cauzat eroarea." -MCIERR_EXTENSION_NOT_FOUND, "Nu a putut fi identificat tipul dispozitivului din extensia fișierului dat." +MCIERR_EXTENSION_NOT_FOUND, "Nu s-a putut identifica tipul dispozitivului din extensia fișierului dat." MCIERR_OUTOFRANGE, "Parametrul este în afara valorilor permise pentru comanda specificată." MCIERR_FLAGS_NOT_COMPATIBLE, "Parametrii specificați nu pot fi utilizați împreună." MCIERR_FILE_NOT_SAVED, "Fișierul specificat nu poate fi stocat. Asigurați suficient spațiu disponibil pe unitatea de stocare precum și conectivitatea rețelei."

1 year, 5 months

[reactos] 01/01: [INF] Update Romanian (ro-RO) translation (#6310)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d0080db9b66714879394… commit 4d0080db9b66714879394fefbf4a8fb0d8c63d04 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jan 9 12:00:25 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 9 11:00:25 2024 +0100 [INF] Update Romanian (ro-RO) translation (#6310) --- boot/bootdata/hivesys.inf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 418b568f5e2..18d3c2a20fc 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2869,8 +2869,8 @@ AUDIO_SERVICE_DESCRIPTION="Oferă aplicațiilor funcționalități audio." BITS_SERVICE="Serviciu de transfer inteligent în fundal" BITS_SERVICE_DESCRIPTION="Transferă fișiere în fundal utilizând lățimea de bandă nefolosită a rețelei." -DCOMLAUNCH_SERVICE="DcomLaunch service" -DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub." +DCOMLAUNCH_SERVICE="Serviciul DcomLaunch" +DCOMLAUNCH_SERVICE_DESCRIPTION="Serviciu simulat de lansare Dcom." EVENTLOG_SERVICE="Jurnal de evenimente" EVENTLOG_SERVICE_DESCRIPTION="Jurnalizează mesajele sau evenimentele transmise de sistemul de operare într-o bază de date accesibilă cu instrumentul „observator de evenimente”." @@ -2879,22 +2879,22 @@ MSISERVER_SERVICE="Instalare ReactOS" MSISERVER_SERVICE_DESCRIPTION="Controlează instalarea, mentenanța, și eliminarea de programe de instalare MSI (Windows Installer)." NETLOGON_SERVICE="Autentificare în rețea" -NETLOGON_SERVICE_DESCRIPTION="Stabilește un canal securizat către un controlor de domentiu pentru autentificarea domeniului." +NETLOGON_SERVICE_DESCRIPTION="Stabilește un canal securizat către un dispozitiv de control de domeniu pentru autentificarea domeniului." PLUGPLAY_SERVICE="Plug and Play" -PLUGPLAY_SERVICE_DESCRIPTION="Detectează schimbările în configurația fizică și instalează programele necesare dacă este posibil." +PLUGPLAY_SERVICE_DESCRIPTION="Detectează schimbările hardware și instalează software-ul necesar dacă este posibil." RPCSS_SERVICE="Apel procedural la distanță" RPCSS_SERVICE_DESCRIPTION="Subsistemul responsabil pentru apel procedural la distanță în calculatorul local." -SAMSS_SERVICE="Security Accounts Manager" -SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services that the Security Accounts Manager (SAM) is ready to accept requests. Disabling this service will prevent other services in the system from being notified when the SAM is ready, which may in turn cause those services to fail to start correctly. This service should not be disabled." +SAMSS_SERVICE="Manager de conturi de securitate" +SAMSS_SERVICE_DESCRIPTION="Pornirea acestui serviciu semnalează altor servicii că Managerul de conturi de securitate (SAM) este gata să accepte cereri. Dezactivarea acestui serviciu va împiedica alte servicii din sistem să fie notificate atunci când SAM e gata ceea ce, la rândul său, poate face ca acele servicii să nu pornească corect. Acest serviciu nu ar trebui dezactivat." SCHEDULE_SERVICE="Serviciu de planificare" SCHEDULE_SERVICE_DESCRIPTION="Permite pornirea de programe la o anumită oră." -SECLOGON_SERVICE="Secondary Logon" -SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." +SECLOGON_SERVICE="Conectare secundară" +SECLOGON_SERVICE_DESCRIPTION="Permite pornirea proceselor cu acreditări alternative." SERVER_SERVICE="Server" SERVER_SERVICE_DESCRIPTION="Permite partajarea în rețea a fișierelor, imprimantelor și a altor resurse." @@ -2920,8 +2920,8 @@ WLANSVC_SERVICE_DESCRIPTION="Serviciu pentru rețele locale fără fir." WORKSTATION_SERVICE="Stație de lucru" WORKSTATION_SERVICE_DESCRIPTION="Serviciu responsabil pentru crearea și menținerea conexiunilor la servere în rețea." -WUAUSERV_SERVICE="Automatic Updates" -WUAUSERV_SERVICE_DESCRIPTION="AutoUpdate Service stub." +WUAUSERV_SERVICE="Actualizări autmoate" +WUAUSERV_SERVICE_DESCRIPTION="Un înlocuitor pentru serviciul de actualizări automate." ; Keyboard layouts ALBANIAN = "Albaneză"

1 year, 5 months

[reactos] 01/01: [MSCONFIG_NEW] Update Romanian (ro-RO) translation (#6311)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a5fe3818eafa00e22393… commit 8a5fe3818eafa00e2239359f38c716b557619246 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jan 9 11:58:40 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 9 10:58:40 2024 +0100 [MSCONFIG_NEW] Update Romanian (ro-RO) translation (#6311) --- .../msconfig_new/lang/mscfgtl/ro-RO.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml b/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml index 03f9ce956ed..1940de74893 100644 --- a/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml +++ b/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml @@ -8,19 +8,19 @@ <MSCONFIGTOOLS> <TOOL _locID="About ReactOS" NAME="Despre ReactOS" PATH="%windir%\system32\winver.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Afișare informații de versiune a ReactOS."/> <TOOL _locID="Action Center" NAME="Centru de acțiune" PATH="%windir%\System32\wscui.cpl" DEFAULT_OPT="" ADV_OPT="" HELP="Deschidere Centru de acțiune."/> - <TOOL _locID="Computer Management" NAME="Gestiune calculator" PATH="%windir%\System32\compmgmt.msc" DEFAULT_OPT="" ADV_OPT="" HELP="Inspectare și configurare sistem și componente."/> - <TOOL _locID="System Information" NAME="Informații de sistem" PATH="%windir%\System32\msinfo32.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Inspectare informații avansate despre configurația fizică și de program."/> - <TOOL _locID="Event Viewer" NAME="Observator de evenimente" PATH="%windir%\System32\eventvwr.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Monitorizarea și depanarea mesajelor."/> + <TOOL _locID="Computer Management" NAME="Gestiune calculator" PATH="%windir%\System32\compmgmt.msc" DEFAULT_OPT="" ADV_OPT="" HELP="Vizualizează și configurează setările de sistem și componentele."/> + <TOOL _locID="System Information" NAME="Informații de sistem" PATH="%windir%\System32\msinfo32.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Vizualizează informații avansate despre setările hardware și software."/> + <TOOL _locID="Event Viewer" NAME="Observator de evenimente" PATH="%windir%\System32\eventvwr.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Vizualizează monitorizarea și depanarea mesajelor."/> <TOOL _locID="Programs" NAME="Programe" PATH="%windir%\System32\appwiz.cpl" DEFAULT_OPT="" ADV_OPT="" HELP="Lansare, adăugare sau eliminare de programe și componente ReactOS."/> - <TOOL _locID="System Properties" NAME="Proprietăți de sistem" PATH="%windir%\System32\control.exe" DEFAULT_OPT="system" ADV_OPT="" HELP="Afișare informații de bază despre configurația de sistem al calculatorului."/> - <TOOL _locID="Internet Options" NAME="Opțiuni de Internet" PATH="%windir%\System32\inetcpl.cpl" DEFAULT_OPT="" ADV_OPT="" HELP="Afișare opțiune de Internet."/> - <TOOL _locID="Internet Protocol Configuration" NAME="Configurație protocol de Internet" PATH="%windir%\System32\cmd.exe" DEFAULT_OPT="/k %windir%\system32\ipconfig.exe" ADV_OPT="/k %windir%\system32\ipconfig.exe /all" HELP="Afișare și configurare proprietăți ale adresei de rețea."/> - <TOOL _locID="Performance Monitor" NAME="Monitor de performanță" PATH="%windir%\System32\perfmon.exe" DEFAULT_OPT="" ADV_OPT="/sys" HELP="Monitorizare performanță pentru calculatoare locale sau la distanță."/> - <TOOL _locID="Resource Monitor" NAME="Monitor de resurse" PATH="%windir%\System32\resmon.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Monitorizare utilizare de resurse pentru calculatoare locale."/> - <TOOL _locID="Task Manager" NAME="Gestionar de activități" PATH="%windir%\System32\taskmgr.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Gestiune programelor și proceselor din calculatorul dumneavoastră."/> + <TOOL _locID="System Properties" NAME="Proprietăți de sistem" PATH="%windir%\System32\control.exe" DEFAULT_OPT="system" ADV_OPT="" HELP="Vizualizează informații de bază despre configurația de sistem al calculatorului dvs."/> + <TOOL _locID="Internet Options" NAME="Opțiuni de Internet" PATH="%windir%\System32\inetcpl.cpl" DEFAULT_OPT="" ADV_OPT="" HELP="Vizualizează opțiunile de Internet."/> + <TOOL _locID="Internet Protocol Configuration" NAME="Configurație protocol de Internet" PATH="%windir%\System32\cmd.exe" DEFAULT_OPT="/k %windir%\system32\ipconfig.exe" ADV_OPT="/k %windir%\system32\ipconfig.exe /all" HELP="Vizualizează și configurează setările adresei de rețea."/> + <TOOL _locID="Performance Monitor" NAME="Monitor de performanță" PATH="%windir%\System32\perfmon.exe" DEFAULT_OPT="" ADV_OPT="/sys" HELP="Monitorizarea performanței pentru calculatoare locale sau la distanță."/> + <TOOL _locID="Resource Monitor" NAME="Monitor de resurse" PATH="%windir%\System32\resmon.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Monitorizarea utilizării de resurse pentru calculatoare locale."/> + <TOOL _locID="Task Manager" NAME="Gestionar de activități" PATH="%windir%\System32\taskmgr.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Gestioanarea programelor și proceselor din calculatorul dumneavoastră."/> <TOOL _locID="Command Prompt" NAME="Linie de comandă" PATH="%windir%\System32\cmd.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Lansare linie de comandă."/> - <TOOL _locID="Registry Editor" NAME="Editor de registru" PATH="%windir%\System32\regedt32.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Efectuare schimbări în registrul ReactOS."/> - <TOOL _locID="Remote Assistance" NAME="Asistență la distanță" PATH="%windir%\System32\msra.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Obținere (sau oferire) asistență prin Internet de la (sau către) un prieten."/> + <TOOL _locID="Registry Editor" NAME="Editor de registru" PATH="%windir%\System32\regedt32.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Efectuarea schimbărilor în registrul ReactOS."/> + <TOOL _locID="Remote Assistance" NAME="Asistență la distanță" PATH="%windir%\System32\msra.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Obținere (sau oferire) de asistență prin Internet de la (sau către) un prieten."/> <TOOL _locID="System Restore" NAME="Restaurare sistem" PATH="%windir%\System32\rstrui.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Restaurare a sistemului de operare la o stare anterioară."/> </MSCONFIGTOOLS>

1 year, 5 months

[reactos] 01/01: [MSCTFIME][MSUTB][SDK] cicuif.h: Add CUIFButton (#6320)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b3756044f1b0bc40115e… commit 0b3756044f1b0bc40115e40133dca7f7430bbfb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 9 16:57:30 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 9 16:57:30 2024 +0900 [MSCTFIME][MSUTB][SDK] cicuif.h: Add CUIFButton (#6320) Supporing TIPs... JIRA issue: CORE-19268 - Add CUIFButton, CUIFSolidBrush, and CUIFIcon classes. --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/win32/msutb/CMakeLists.txt | 4 +- sdk/include/reactos/cicero/cicuif.h | 685 +++++++++++++++++++++++++++++++++++- 3 files changed, 677 insertions(+), 14 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index b2ec562e673..a3955cea141 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -18,5 +18,5 @@ set_module_type(msctfime win32dll UNICODE) set_target_properties(msctfime PROPERTIES SUFFIX ".ime") target_link_libraries(msctfime wine uuid) add_importlibs(msctfime user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msctfime msctf oleaut32 imm32) +add_delay_importlibs(msctfime comctl32 msctf oleaut32 imm32) add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index 3e48eb33311..d4259dc7cda 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -14,6 +14,6 @@ add_library(msutb MODULE set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) -add_importlibs(msutb user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) -add_delay_importlibs(msutb msctf ole32 oleaut32) +add_importlibs(msutb user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_delay_importlibs(msutb comctl32 msctf ole32 oleaut32) add_cd_file(TARGET msutb DESTINATION reactos/system32 FOR all) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 637f699325e..e9c12852bbe 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Cicero * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Cicero UI interface + * PURPOSE: Cicero UIF Library * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -9,17 +9,28 @@ #include "cicarray.h" +// This is Cicero UIF Library to support the IME UI interface. +// Cicero UIF Library implements some GUI parts for IMEs and Language Bar. +// The GUI parts of UIF Library requires special handling because: +// +// 1. To avoid interfering with IME input, the GUI part should not receive focus. +// 2. The IME popup window has WS_DISABLED style, so it cannot receive mouse messages +// directly. + class CUIFSystemInfo; -struct CUIFTheme; +class CUIFTheme; class CUIFObject; class CUIFWindow; class CUIFToolTip; class CUIFShadow; + class CUIFButton; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; class CUIFColorTableOff10; class CUIFBitmapDC; +class CUIFIcon; +class CUIFSolidBrush; class CUIFScheme; ///////////////////////////////////////////////////////////////////////////// @@ -67,8 +78,9 @@ using FN_GetThemeSysSize = decltype(&GetThemeSysSize); ///////////////////////////////////////////////////////////////////////////// -struct CUIFTheme +class CUIFTheme { +public: LPCWSTR m_pszClassList; INT m_iPartId; INT m_iStateId; @@ -187,6 +199,8 @@ enum UIF_STYLE_TOOLTIP = 0x20, UIF_STYLE_SHADOW = 0x40, UIF_STYLE_RTL = 0x200, + UIF_STYLE_VERTICAL = 0x400, + UIF_STYLE_THEMED = 0x80000000, }; class CUIFObject : public CUIFTheme @@ -209,7 +223,7 @@ protected: friend class CUIFToolTip; public: - CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPRECT prc, DWORD style); + CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); virtual ~CUIFObject(); void StartCapture(); @@ -253,7 +267,7 @@ public: STDMETHOD_(void, DetachWndObj)(); STDMETHOD_(void, ClearWndObj)(); STDMETHOD_(LRESULT, OnPaintTheme)(HDC hDC); - STDMETHOD_(void, DoPaint)(HDC hDC); + STDMETHOD_(void, OnPaintNoTheme)(HDC hDC); STDMETHOD_(void, ClearTheme)(); }; @@ -313,6 +327,53 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFSolidBrush +{ +public: + HBRUSH m_hBrush; + + operator HBRUSH() const { return m_hBrush; } + + CUIFSolidBrush(COLORREF rgbColor) + { + m_hBrush = ::CreateSolidBrush(rgbColor); + } + ~CUIFSolidBrush() + { + if (m_hBrush) + { + ::DeleteObject(m_hBrush); + m_hBrush = NULL; + } + } +}; + +///////////////////////////////////////////////////////////////////////////// + +class CUIFIcon +{ +public: + HICON m_hIcon; + HIMAGELIST m_hImageList; + + CUIFIcon& operator=(HICON hIcon) + { + m_hIcon = hIcon; + if (m_hImageList) + { + ImageList_Destroy(m_hImageList); + m_hImageList = NULL; + } + return *this; + } + + HIMAGELIST GetImageList(BOOL bMirror); +}; + +BOOL cicGetIconSize(HICON hIcon, LPSIZE pSize); + +///////////////////////////////////////////////////////////////////////////// + class CUIFBitmapDC { protected: @@ -359,6 +420,10 @@ HBRUSH cicCreateDitherBrush(VOID); HBITMAP cicCreateDisabledBitmap(LPCRECT prc, HBITMAP hbmMask, HBRUSH hbr1, HBRUSH hbr2, BOOL bPressed); HBITMAP cicCreateShadowMaskBmp(LPRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr1, HBRUSH hbr2); +HBITMAP cicChangeBitmapColor(LPCRECT prc, HBITMAP hbm, COLORREF rgbBack, COLORREF rgbFore); +HBITMAP cicConvertBlackBKGBitmap(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hBrush); +HBITMAP cicCreateMaskBmp(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr, + COLORREF rgbColor, COLORREF rgbBack); ///////////////////////////////////////////////////////////////////////////// @@ -402,6 +467,7 @@ protected: friend class CUIFObject; friend class CUIFShadow; friend class CUIFToolTip; + friend class CUIFButton; public: CUIFWindow(HINSTANCE hInst, DWORD style); @@ -538,6 +604,45 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFButton : public CUIFObject +{ +protected: + UINT m_uButtonStatus; + LPWSTR m_pszButtonText; + CUIFIcon m_ButtonIcon; + DWORD m_dwUnknown9; + HBITMAP m_hbmButton1; + HBITMAP m_hbmButton2; + DWORD m_dwUnknown10; + SIZE m_IconSize; + SIZE m_TextSize; + + void DrawBitmapProc(HDC hDC, LPCRECT prc, BOOL bPressed); + void DrawEdgeProc(HDC hDC, LPCRECT prc, BOOL bPressed); + void DrawIconProc(HDC hDC, LPRECT prc, BOOL bPressed); + void DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed); + +public: + CUIFButton(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); + ~CUIFButton() override; + + void SetIcon(HICON hIcon); + void SetText(LPCWSTR pszText); + + 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, OnLButtonDown)(LONG x, LONG y) override; + STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; + STDMETHOD_(void, OnPaintNoTheme)(HDC hDC) override; + STDMETHOD_(void, SetStatus)(UINT uStatus); +}; + +///////////////////////////////////////////////////////////////////////////// + inline void cicInitUIFLib(void) { cicInitUIFSys(); @@ -768,7 +873,7 @@ CUIFTheme::SetActiveTheme(LPCWSTR pszClassList, INT iPartId, INT iStateId) /// @unimplemented inline -CUIFObject::CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPRECT prc, DWORD style) +CUIFObject::CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style) { m_pszClassList = NULL; m_hTheme = NULL; @@ -842,8 +947,8 @@ inline STDMETHODIMP_(void) CUIFObject::Initialize() inline STDMETHODIMP_(void) CUIFObject::OnPaint(HDC hDC) { - if (!(m_pWindow->m_style & 0x80000000) || !OnPaintTheme(hDC)) - DoPaint(hDC); + if (!(m_pWindow->m_style & UIF_STYLE_THEMED) || !OnPaintTheme(hDC)) + OnPaintNoTheme(hDC); } inline STDMETHODIMP_(BOOL) CUIFObject::OnSetCursor(UINT uMsg, LONG x, LONG y) @@ -992,7 +1097,7 @@ inline STDMETHODIMP_(LRESULT) CUIFObject::OnPaintTheme(HDC hDC) return 0; } -inline STDMETHODIMP_(void) CUIFObject::DoPaint(HDC hDC) +inline STDMETHODIMP_(void) CUIFObject::OnPaintNoTheme(HDC hDC) { } @@ -1242,6 +1347,47 @@ inline CUIFScheme::CUIFScheme(DWORD type) ///////////////////////////////////////////////////////////////////////////// +inline BOOL cicGetIconSize(HICON hIcon, LPSIZE pSize) +{ + ICONINFO IconInfo; + if (!GetIconInfo(hIcon, &IconInfo)) + return FALSE; + + BITMAP bm; + ::GetObject(IconInfo.hbmColor, sizeof(bm), &bm); + ::DeleteObject(IconInfo.hbmColor); + ::DeleteObject(IconInfo.hbmMask); + pSize->cx = bm.bmWidth; + pSize->cy = bm.bmHeight; + return TRUE; +} + +inline HIMAGELIST CUIFIcon::GetImageList(BOOL bMirror) +{ + if (!m_hImageList) + return NULL; + + if (m_hIcon) + { + SIZE iconSize; + cicGetIconSize(m_hIcon, &iconSize); + + UINT flags = ILC_COLOR32 | ILC_MASK; + if (bMirror) + flags |= ILC_MIRROR; + + m_hImageList = ImageList_Create(iconSize.cx, iconSize.cy, flags, 1, 0); + if (m_hImageList) + ImageList_ReplaceIcon(m_hImageList, -1, m_hIcon); + + return m_hImageList; + } + + return NULL; +} + +///////////////////////////////////////////////////////////////////////////// + inline CUIFBitmapDC::CUIFBitmapDC(BOOL bMemory) { m_hBitmap = NULL; @@ -1476,6 +1622,112 @@ cicCreateShadowMaskBmp(LPRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hbr1, HBRU return CUIFBitmapDC::s_phdcDst->DetachBitmap(); } +inline HBITMAP +cicChangeBitmapColor(LPCRECT prc, HBITMAP hbm, COLORREF rgbBack, COLORREF rgbFore) +{ + if (!CUIFBitmapDC::s_fInitBitmapDCs) + return NULL; + + INT width = prc->right - prc->left; + INT height = prc->bottom - prc->top; + + CUIFSolidBrush brush(rgbFore); + + CUIFBitmapDC::s_phdcDst->SetDIB(width, height, 1, 32); + CUIFBitmapDC::s_phdcSrc->SetBitmap(hbm); + CUIFBitmapDC::s_phdcMask->SetBitmap(width, height, 1, 1); + + ::BitBlt(*CUIFBitmapDC::s_phdcDst, 0, 0, width, height, *CUIFBitmapDC::s_phdcSrc, 0, 0, SRCCOPY); + ::SelectObject(*CUIFBitmapDC::s_phdcDst, (HBRUSH)brush); + ::SetBkColor(*CUIFBitmapDC::s_phdcDst, rgbBack); + + ::BitBlt(*CUIFBitmapDC::s_phdcMask, 0, 0, width, height, *CUIFBitmapDC::s_phdcDst, 0, 0, MERGECOPY); + ::SetBkColor(*CUIFBitmapDC::s_phdcDst, RGB(255, 255, 255)); + ::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_phdcDst->Uninit(TRUE); + return CUIFBitmapDC::s_phdcDst->DetachBitmap(); +} + +inline HBITMAP +cicConvertBlackBKGBitmap(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, HBRUSH hBrush) +{ + if (!CUIFBitmapDC::s_fInitBitmapDCs) + return NULL; + + if (IS_INTRESOURCE(hBrush)) + hBrush = ::GetSysColorBrush(HandleToLong(hBrush) - 1); + + LOGBRUSH lb; + ::GetObject(hBrush, sizeof(lb), &lb); + if (lb.lbStyle || lb.lbColor) + return NULL; + + INT width = prc->right - prc->left; + INT height = prc->bottom - prc->top; + + HBITMAP hBitmap = cicChangeBitmapColor(prc, hbm1, 0, RGB(255, 255, 255)); + if ( !hBitmap ) + return NULL; + + CUIFBitmapDC::s_phdcDst->SetDIB(width, height, 1, 32); + CUIFBitmapDC::s_phdcSrc->SetBitmap(hBitmap); + CUIFBitmapDC::s_phdcMask->SetBitmap(hbm2); + + RECT rc; + ::SetRect(&rc, 0, 0, width, height); + + HBRUSH hbrWhite = (HBRUSH)GetStockObject(WHITE_BRUSH); + ::FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbrWhite); + + ::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_phdcDst->Uninit(TRUE); + ::DeleteObject(hBitmap); + return CUIFBitmapDC::s_phdcDst->DetachBitmap(); +} + +inline HBITMAP +cicCreateMaskBmp(LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, + HBRUSH hbr, COLORREF rgbColor, COLORREF rgbBack) +{ + if (!CUIFBitmapDC::s_fInitBitmapDCs) + return NULL; + + INT width = prc->right - prc->left; + INT height = prc->bottom - prc->top; + HBITMAP hBitmap = cicConvertBlackBKGBitmap(prc, hbm1, hbm2, hbr); + if (hBitmap) + return hBitmap; + + CUIFBitmapDC::s_phdcDst->SetDIB(width, height, 1, 32); + CUIFBitmapDC::s_phdcSrc->SetBitmap(hbm1); + CUIFBitmapDC::s_phdcMask->SetBitmap(hbm2); + + RECT rc; + ::SetRect(&rc, 0, 0, width, height); + + COLORREF OldTextColor = ::SetTextColor(*CUIFBitmapDC::s_phdcDst, rgbColor); + COLORREF OldBkColor = ::SetBkColor(*CUIFBitmapDC::s_phdcDst, rgbBack); + ::FillRect(*CUIFBitmapDC::s_phdcDst, &rc, hbr); + ::SetTextColor(*CUIFBitmapDC::s_phdcDst, OldTextColor); + ::SetBkColor(*CUIFBitmapDC::s_phdcDst, OldBkColor); + + ::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_phdcDst->Uninit(TRUE); + + return CUIFBitmapDC::s_phdcDst->DetachBitmap(); +} + ///////////////////////////////////////////////////////////////////////////// inline CUIFWindow::CUIFWindow(HINSTANCE hInst, DWORD style) @@ -1668,7 +1920,7 @@ CUIFWindow::GetWndStyle() if (m_style & 0x10000000) ret |= WS_BORDER; - else if (m_style & 8) + else if (m_style & 0x8) ret |= WS_DLGFRAME; else if ((m_style & 0x20000000) || (m_style & 0x10)) ret |= WS_BORDER; @@ -1720,7 +1972,7 @@ inline void CUIFWindow::Show(BOOL bVisible) if (!IsWindow(m_hWnd)) return; - if (bVisible && (m_style & 2)) + if (bVisible && (m_style & UIF_STYLE_TOPMOST)) ::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); m_bVisible = bVisible; @@ -2843,3 +3095,414 @@ inline STDMETHODIMP_(void) CUIFToolTip::OnTimer(WPARAM wParam) if (wParam == TOOLTIP_TIMER_ID) ShowTip(); } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFButton::CUIFButton( + CUIFObject *pParent, + DWORD dwUnknown3, + LPCRECT prc, + DWORD style) : CUIFObject(pParent, dwUnknown3, prc, style) +{ + m_ButtonIcon.m_hIcon = NULL; + m_ButtonIcon.m_hImageList = NULL; + m_dwUnknown9 = 0; + m_uButtonStatus = 0; + m_dwUnknown10 = 0; + m_hbmButton1 = NULL; + m_hbmButton2 = NULL; + m_pszButtonText = NULL; +} + +inline CUIFButton::~CUIFButton() +{ + if (m_pszButtonText) + { + delete[] m_pszButtonText; + m_pszButtonText = NULL; + } + + if (m_ButtonIcon.m_hImageList) + ImageList_Destroy(m_ButtonIcon.m_hImageList); +} + +inline void +CUIFButton::DrawBitmapProc(HDC hDC, LPCRECT prc, BOOL bPressed) +{ + INT width = m_rc.right - m_rc.left; + INT height = m_rc.bottom - m_rc.top; + if (m_hbmButton2) + { + HBITMAP hbmMask = cicCreateMaskBmp(&m_rc, m_hbmButton1, m_hbmButton2, + (HBRUSH)UlongToHandle(COLOR_BTNFACE + 1), 0, 0); + ::DrawState(hDC, NULL, NULL, (LPARAM)hbmMask, 0, + prc->left + bPressed, prc->top + bPressed, + width - bPressed, height - bPressed, + (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED)) | DST_BITMAP); + ::DeleteObject(hbmMask); + } + else + { + ::DrawState(hDC, NULL, NULL, (LPARAM)m_hbmButton1, 0, + prc->left + bPressed, prc->top + bPressed, + width - bPressed, height - bPressed, + (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED)) | DST_BITMAP); + } +} + +inline void +CUIFButton::DrawEdgeProc(HDC hDC, LPCRECT prc, BOOL bPressed) +{ + RECT rc = *prc; + if (bPressed) + ::DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_RECT); + else + ::DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT); +} + +inline void CUIFButton::DrawIconProc(HDC hDC, LPRECT prc, BOOL bPressed) +{ + INT width = prc->right - prc->left; + INT height = prc->bottom - prc->top; + RECT rc = { 0, 0, width, height }; + + HDC hMemDC = ::CreateCompatibleDC(hDC); + if (!hMemDC) + return; + + HBITMAP hbmMem = ::CreateCompatibleBitmap(hDC, width, height); + if (!hbmMem) + { + ::DeleteDC(hMemDC); + return; + } + + HGDIOBJ hbmOld = ::SelectObject(hMemDC, hbmMem); + if (m_bEnable) + { + ::BitBlt(hMemDC, rc.left, rc.top, width, height, hDC, prc->left, prc->top, SRCCOPY); + } + else + { + HBRUSH hbrWhite = (HBRUSH)::GetStockObject(WHITE_BRUSH); + ::FillRect(hMemDC, &rc, hbrWhite); + } + + if (m_style & 0x100) + { + ::DrawIconEx(hMemDC, + 2 + bPressed, 2 + bPressed, + m_ButtonIcon.m_hIcon, + width - 4, height - 4, + 0, NULL, DI_NORMAL); + } + else + { + ::DrawIconEx(hMemDC, + (width - 16) / 2 + bPressed, + (height - 16) / 2 + bPressed, + m_ButtonIcon.m_hIcon, + 16, 16, + 0, NULL, DI_NORMAL); + } + + ::SelectObject(hMemDC, hbmOld); + ::DrawState(hDC, NULL, NULL, (LPARAM)hbmMem, 0, + prc->left, prc->top, width, height, + (m_bEnable ? 0 : (DSS_MONO | DSS_DISABLED)) | DST_BITMAP); + ::DeleteObject(hbmMem); + ::DeleteDC(hMemDC); +} + +inline void +CUIFButton::DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed) +{ + if (!m_pszButtonText) + return; + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + INT cchText = lstrlenW(m_pszButtonText); + SIZE textSize; + ::GetTextExtentPoint32W(hDC, m_pszButtonText, cchText, &textSize); + + INT xText, yText; + if ((m_style & (UIF_STYLE_CHILD | UIF_STYLE_TOPMOST)) == UIF_STYLE_CHILD) + xText = (m_rc.right - m_rc.left - textSize.cx) / 2; + else if ((m_style & (UIF_STYLE_CHILD | UIF_STYLE_TOPMOST)) == UIF_STYLE_TOPMOST) + xText = m_rc.right - m_rc.left - textSize.cx; + else + xText = 0; + + if ((m_style & 0xC) == UIF_STYLE_TOOLWINDOW) + yText = (m_rc.bottom - m_rc.top - textSize.cy) / 2; + else if ((m_style & 0xC) == 0x8) + yText = m_rc.bottom - m_rc.top - textSize.cy; + else + yText = 0; + + ::SetBkMode(hDC, TRANSPARENT); + + if (m_bEnable) + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNTEXT)); + ::ExtTextOutW(hDC, + xText + prc->left + bPressed, yText + prc->top + bPressed, + ETO_CLIPPED, prc, + m_pszButtonText, cchText, NULL); + } + else + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNHILIGHT)); + ::ExtTextOutW(hDC, + xText + prc->left + bPressed + 1, yText + prc->top + bPressed + 1, + ETO_CLIPPED, prc, + m_pszButtonText, cchText, NULL); + + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNSHADOW)); + ::ExtTextOutW(hDC, + xText + prc->left + bPressed, yText + prc->top + bPressed, + ETO_CLIPPED, prc, + m_pszButtonText, cchText, NULL); + } + + ::SelectObject(hDC, hFontOld); +} + +inline STDMETHODIMP_(void) +CUIFButton::Enable(BOOL bEnable) +{ + CUIFObject::Enable(bEnable); + if (!m_bEnable) + { + SetStatus(0); + if (IsCapture()) + CUIFObject::EndCapture(); + } +} + +inline void +CUIFButton::GetIconSize(HICON hIcon, LPSIZE pSize) +{ + ICONINFO IconInfo; + if (::GetIconInfo(hIcon, &IconInfo)) + { + BITMAP bm; + ::GetObject(IconInfo.hbmColor, sizeof(bm), &bm); + ::DeleteObject(IconInfo.hbmColor); + ::DeleteObject(IconInfo.hbmMask); + pSize->cx = bm.bmWidth; + pSize->cy = bm.bmHeight; + } + else + { + pSize->cx = ::GetSystemMetrics(SM_CXSMICON); + pSize->cy = ::GetSystemMetrics(SM_CYSMICON); + } +} + +inline void +CUIFButton::GetTextSize(LPCWSTR pszText, LPSIZE pSize) +{ + HDC hDC = ::GetDC(NULL); + INT cchText = lstrlenW(pszText); + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + + if (!m_bHasCustomFont && SUCCEEDED(EnsureThemeData(m_pWindow->m_hWnd))) + { + RECT rc; + GetThemeTextExtent(hDC, 0, pszText, cchText, 0, NULL, &rc); + pSize->cx = rc.right; + pSize->cy = rc.bottom; + } + else + { + ::GetTextExtentPoint32W(hDC, pszText, cchText, pSize); + } + + if (m_style & UIF_STYLE_VERTICAL) + { + INT tmp = pSize->cx; + pSize->cx = pSize->cy; + pSize->cy = tmp; + } + + ::SelectObject(hDC, hFontOld); + ::ReleaseDC(NULL, hDC); +} + +inline STDMETHODIMP_(void) +CUIFButton::OnLButtonDown(LONG x, LONG y) +{ + SetStatus(1); + StartCapture(); + if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) + NotifyCommand(1, 0); +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFButton::OnLButtonUp(LONG x, LONG y) +{ + POINT pt = { x, y }; + BOOL bCapture = IsCapture(); + if (bCapture) + EndCapture(); + + BOOL bNotInObject = (m_style & 0x30) == UIF_STYLE_TOOLTIP; + if ((m_style & 0x30) != 0x10) + { + bNotInObject = !PtInObject(pt); + if (bNotInObject) + { + SetStatus(0); + return; + } + } + else + { + if (!bNotInObject) + { + bNotInObject = !PtInObject(pt); + if (!bNotInObject) + { + SetStatus(2); + NotifyCommand(1, 0); + return; + } + } + SetStatus(0); + return; + } + + SetStatus(2); + + if (bCapture) + { + m_dwUnknown10 = !m_dwUnknown10; + NotifyCommand(1, 0); + } +} + +inline void CUIFButton::OnMouseIn(POINT pt) +{ + if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) + { + if (IsCapture()) + SetStatus(0); + else + SetStatus(2); + } + else + { + if (IsCapture()) + SetStatus(1); + else + SetStatus(2); + } +} + +inline void CUIFButton::OnMouseOut(POINT pt) +{ + if ((m_style & 0x30) == UIF_STYLE_TOOLTIP) + { + SetStatus(0); + } + else + { + if (IsCapture()) + SetStatus(3); + else + SetStatus(0); + } +} + +inline STDMETHODIMP_(void) +CUIFButton::OnPaintNoTheme(HDC hDC) +{ + ::FillRect(hDC, &m_rc, (HBRUSH)UlongToHandle(COLOR_BTNFACE + 1)); + + if (m_dwUnknown10 && ((m_uButtonStatus == 0) || (m_uButtonStatus == 3))) + { + HBRUSH hbr = cicCreateDitherBrush(); + if (hbr) + { + COLORREF OldTextColor = ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNFACE)); + COLORREF OldBkColor = ::SetBkColor(hDC, ::GetSysColor(COLOR_BTNHIGHLIGHT)); + RECT rc = m_rc; + ::InflateRect(&rc, -2, -2); + ::FillRect(hDC, &rc, hbr); + ::SetTextColor(hDC, OldTextColor); + ::SetBkColor(hDC, OldBkColor); + ::DeleteObject(hbr); + } + } + + BOOL bPressed = (m_dwUnknown10 || (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)) + { + DrawEdgeProc(hDC, &m_rc, TRUE); + } + else if (2 <= m_uButtonStatus && m_uButtonStatus <= 3) + { + DrawEdgeProc(hDC, &m_rc, FALSE); + } +} + +inline void CUIFButton::SetIcon(HICON hIcon) +{ + m_ButtonIcon = hIcon; + + if (m_ButtonIcon.m_hIcon) + GetIconSize(m_ButtonIcon.m_hIcon, &m_IconSize); + else + m_IconSize.cx = m_IconSize.cy = 0; + + CallOnPaint(); +} + +inline void CUIFButton::SetStatus(UINT uStatus) +{ + if (uStatus != m_uButtonStatus) + { + m_uButtonStatus = uStatus; + CallOnPaint(); + } +} + +inline void CUIFButton::SetText(LPCWSTR pszText) +{ + if (m_pszButtonText) + { + delete[] m_pszButtonText; + m_pszButtonText = NULL; + } + + m_TextSize.cx = m_TextSize.cy = 0; + + if (pszText) + { + INT cch = lstrlenW(pszText); + m_pszButtonText = new(cicNoThrow) WCHAR[cch + 1]; + if (!m_pszButtonText) + return; + + lstrcpynW(m_pszButtonText, pszText, cch + 1); + GetTextSize(m_pszButtonText, &m_TextSize); + } + + CallOnPaint(); +}

1 year, 5 months

[reactos] 01/01: [SHELL32] RegFolder must correctly handle GetDisplayNameOf parsing paths (#6265)

by Whindmar Saksit

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

1 year, 5 months

[reactos] 01/01: [CONSRV] Don't blink cursor if the console window is not active (#5601)

by Whindmar Saksit

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

1 year, 5 months

[reactos] 01/01: [COMCTL32] ToolTip: Expand tabs (#6315)

by Katayama Hirofumi MZ

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

1 year, 5 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFToolTip (#6317)

by Katayama Hirofumi MZ

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

1 year, 5 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFShadow (#6316)

by Katayama Hirofumi MZ

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

1 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