Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NETSHELL] Trivial tweaks (#6484)
by Joachim Henze 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=874b5a4e00872bb6ba0c9… commit 874b5a4e00872bb6ba0c9d4ce695290dfe7e552a Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Feb 11 22:51:54 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 11 22:51:54 2024 +0100 [NETSHELL] Trivial tweaks (#6484) Some trivial tweaks that I saw while backporting other stuff: - es-ES.rc/pt-PT.rc: undesired spaces at the end of groupboxes, which were used as a historic workaround ~ 10 years ago - zh-TW.rc: wrong indentation (tabs instead of spaces) - shfldr_netconnect.cpp: superfluous GPL duplication, unneeded exclamation-marks in dbg-prints, undesired double-space formatting saves a few bytes --- dll/shellext/netshell/lang/es-ES.rc | 8 +++---- dll/shellext/netshell/lang/pt-PT.rc | 8 +++---- dll/shellext/netshell/lang/zh-TW.rc | 2 +- dll/shellext/netshell/shfldr_netconnect.cpp | 34 ++++++----------------------- 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dll/shellext/netshell/lang/es-ES.rc b/dll/shellext/netshell/lang/es-ES.rc index 7c4431da9a8..2f1b0ef3025 100644 --- a/dll/shellext/netshell/lang/es-ES.rc +++ b/dll/shellext/netshell/lang/es-ES.rc @@ -21,7 +21,7 @@ BEGIN PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 105, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 105, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 105, 65, 14 - GROUPBOX "Descripción ", -1, 9, 128, 230, 46, BS_GROUPBOX + GROUPBOX "Descripción", -1, 9, 128, 230, 46, BS_GROUPBOX LTEXT "", IDC_DESCRIPTION, 15, 140, 217, 28, WS_GROUP AUTOCHECKBOX "Mostrar icono en el área de notificación al conectarse", IDC_SHOWTASKBAR, 9, 181, 230, 12, WS_TABSTOP AUTOCHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP @@ -39,11 +39,11 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Conexión ", -1, 9, 8, 190, 58, BS_GROUPBOX + GROUPBOX "Conexión", -1, 9, 8, 190, 58, BS_GROUPBOX LTEXT "Estado:", -1, 22, 20, 65, 8 LTEXT "Duración:", -1, 22, 34, 65, 8 LTEXT "Velocidad:", -1, 22, 48, 65, 8 - GROUPBOX "Actividad ", -1, 9, 74, 190, 70, BS_GROUPBOX + GROUPBOX "Actividad", -1, 9, 74, 190, 70, BS_GROUPBOX LTEXT "Enviados", -1, 60, 90, 60, 8 ICON "", IDC_NETSTAT, 110, 85, 32, 32 RTEXT "Recibidos", -1, 146, 90, 44, 8 @@ -62,7 +62,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Soporte" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Estado de la conexión ", -1, 9, 8, 190, 88, BS_GROUPBOX + GROUPBOX "Estado de la conexión", -1, 9, 8, 190, 88, BS_GROUPBOX LTEXT "Tipo de dirección:", -1, 22, 20, 80, 8 LTEXT "Dirección IP:", -1, 22, 34, 80, 8 LTEXT "Máscara de subred:", -1, 22, 48, 80, 8 diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc index d41575b8963..dfc3af61ad3 100644 --- a/dll/shellext/netshell/lang/pt-PT.rc +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -13,7 +13,7 @@ BEGIN PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 105, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 105, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Propriedades", IDC_PROPERTIES, 174, 105, 65, 14 - GROUPBOX "Descrição ", -1, 9, 128, 230, 46, BS_GROUPBOX + GROUPBOX "Descrição", -1, 9, 128, 230, 46, BS_GROUPBOX LTEXT "", IDC_DESCRIPTION, 15, 140, 217, 28, WS_GROUP AUTOCHECKBOX "&Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 181, 230, 12, WS_TABSTOP AUTOCHECKBOX "&Notificar-me quando a conectividade desta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 195, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP @@ -31,11 +31,11 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ligação ", -1, 9, 8, 190, 58, BS_GROUPBOX + GROUPBOX "Ligação", -1, 9, 8, 190, 58, BS_GROUPBOX LTEXT "Estado:", -1, 22, 20, 65, 8 LTEXT "Duração:", -1, 22, 34, 65, 8 LTEXT "Velocidade:", -1, 22, 48, 65, 8 - GROUPBOX "Actividade ", -1, 9, 74, 190, 70, BS_GROUPBOX + GROUPBOX "Actividade", -1, 9, 74, 190, 70, BS_GROUPBOX LTEXT "Enviados", -1, 60, 90, 60, 8 ICON "", IDC_NETSTAT, 110, 85, 32, 32 RTEXT "Recebidos", -1, 146, 90, 44, 8 @@ -54,7 +54,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Suporte" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Estado de ligação ", -1, 9, 8, 190, 88, BS_GROUPBOX + GROUPBOX "Estado de ligação", -1, 9, 8, 190, 88, BS_GROUPBOX LTEXT "Tipo de endereço:", -1, 22, 20, 80, 8 LTEXT "Endereço IP:", -1, 22, 34, 80, 8 LTEXT "Máscara de sub-rede:", -1, 22, 48, 80, 8 diff --git a/dll/shellext/netshell/lang/zh-TW.rc b/dll/shellext/netshell/lang/zh-TW.rc index eb73e47c058..225bf0c1691 100644 --- a/dll/shellext/netshell/lang/zh-TW.rc +++ b/dll/shellext/netshell/lang/zh-TW.rc @@ -93,7 +93,7 @@ BEGIN LTEXT "請問您想使用一般或自訂設定：", IDC_STATIC, 53, 7, 240, 20 AUTORADIOBUTTON "一般設定", IDC_NETWORK_TYPICAL, 53, 27, 253, 18, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "自訂設定", IDC_NETWORK_CUSTOM, 53, 72, 253, 18, WS_TABSTOP - LTEXT "使用 ReactOS 網路用戶端、ReactOS 網絡檔案和列印共享及具有自動指派位址功能的 TCP/IP 傳輸協議來建立網路連接。", IDC_STATIC, 65, 45, 240, 30 + LTEXT "使用 ReactOS 網路用戶端、ReactOS 網絡檔案和列印共享及具有自動指派位址功能的 TCP/IP 傳輸協議來建立網路連接。", IDC_STATIC, 65, 45, 240, 30 LTEXT "可讓您手動更改網路元件。", IDC_STATIC, 65, 90, 243, 20 END diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index f4f1986d0d6..7c90907f7ac 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -2,27 +2,7 @@ * PROJECT: ReactOS Shell * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: CNetworkConnections Shell Folder - * COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald(a)reactos.org) - */ - -/* - * Network Connections Shell Folder - * - * Copyright 2008 Johannes Anderwald <johannes.anderwald(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * COPYRIGHT: Copyright 2008 Johannes Anderwald <johannes.anderwald(a)reactos.org> */ #include "precomp.h" @@ -256,7 +236,7 @@ HRESULT WINAPI CNetworkConnections::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD PWCHAR pwchName = ILGetConnName(pidl); if (!pwchName) { - ERR("Got invalid pidl!\n"); + ERR("Got invalid pidl\n"); return E_INVALIDARG; } @@ -473,7 +453,7 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu( PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl); if (!pdata) { - ERR("Got invalid pidl!\n"); + ERR("Got invalid pidl\n"); return E_FAIL; } @@ -511,7 +491,7 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu( if (pdata->Status == NCS_CONNECTED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); else - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } @@ -542,7 +522,7 @@ ShowNetConnectionStatus( PNETCONIDSTRUCT pdata = ILGetConnData(pidl); if (!pdata) { - ERR("Got invalid pidl!\n"); + ERR("Got invalid pidl\n"); return E_FAIL; } @@ -758,7 +738,7 @@ HRESULT WINAPI CNetConUiObject::GetIconLocation( PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl); if (!pdata) { - ERR("Got invalid pidl!\n"); + ERR("Got invalid pidl\n"); return E_FAIL; } @@ -832,7 +812,7 @@ HRESULT WINAPI CNetworkConnections::Execute(LPSHELLEXECUTEINFOW pei) PNETCONIDSTRUCT pdata = ILGetConnData(pidl); if (!pdata) { - ERR("Got invalid pidl!\n"); + ERR("Got invalid pidl\n"); return E_FAIL; }

1 0

[reactos] 01/01: [MSI] Update Romanian (ro-RO) translation (#6429)
by Andrei Miloiu 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edf3cc7a7a34eb8d2df3f… commit edf3cc7a7a34eb8d2df3f830ea2629373d6f02a3 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Feb 11 23:51:15 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 11 22:51:15 2024 +0100 [MSI] Update Romanian (ro-RO) translation (#6429) --- dll/win32/msi/lang/msi_Ro.rc | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dll/win32/msi/lang/msi_Ro.rc b/dll/win32/msi/lang/msi_Ro.rc index aaa0cca0e07..89721e4a56d 100644 --- a/dll/win32/msi/lang/msi_Ro.rc +++ b/dll/win32/msi/lang/msi_Ro.rc @@ -2,7 +2,7 @@ * Copyright 2005 Mike McCormack * Copyright 2009 Michael Stefaniuc * 2011 Ștefan Fulea - * 2023 Andrei Miloiu + * 2023-2024 Andrei Miloiu * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,7 @@ STRINGTABLE 13 "lipsește unitatea de rețea pentru această caracteristică" 14 "caracteristică de la:" 15 "selectați fișierul care conține %s" - 100 "New Folder" + 100 "Folder nou" } /* Error messages */ @@ -77,9 +77,9 @@ STRINGTABLE IDS_DESC_CCPSEARCH "Căutare produse de calificare" IDS_DESC_COSTFINALIZE "Calculare spațiu necesar" IDS_DESC_COSTINITIALIZE "Calculare spațiu necesar" - IDS_DESC_CREATEFOLDERS "Creare dosare" + IDS_DESC_CREATEFOLDERS "Creare foldere" IDS_DESC_CREATESHORTCUTS "Creare scurtături" - IDS_DESC_DELETESERVICES "Înlăturare servicii" + IDS_DESC_DELETESERVICES "Eliminare servicii" IDS_DESC_DUPLICATEFILES "Creare fișiere duplicate" IDS_DESC_FILECOST "Calculare spațiu necesar" IDS_DESC_FINDRELATEDPRODUCTS "Căutare aplicații conexe" @@ -108,31 +108,31 @@ STRINGTABLE IDS_DESC_REGISTERPROGIDINFO "Înregistrare identificatori de program" IDS_DESC_REGISTERTYPELIBRARIES "Înregistrare biblioteci de tip" IDS_DESC_REGISTERUSER "Înregistrare utilizatori" - IDS_DESC_REMOVEDUPLICATEFILES "Înlăturare fișiere duplicate" + IDS_DESC_REMOVEDUPLICATEFILES "Elminare fișiere duplicate" IDS_DESC_REMOVEENVIRONMENTSTRINGS "Actualizare informații de mediu" - IDS_DESC_REMOVEEXISTINGPRODUCTS "Înlăturare aplicații" - IDS_DESC_REMOVEFILES "Înlăturare fișiere" - IDS_DESC_REMOVEFOLDERS "Înlăturare dosare" - IDS_DESC_REMOVEINIVALUES "Înlăturare înregistrări din fișiere INI" - IDS_DESC_REMOVEODBC "Înlăturare componente ODBC" - IDS_DESC_REMOVEREGISTRYVALUES "Înlăturare valori din registru de sistem" - IDS_DESC_REMOVESHORTCUTS "Înlăturare scurtături" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Elminare aplicații" + IDS_DESC_REMOVEFILES "Elminare fișiere" + IDS_DESC_REMOVEFOLDERS "Elminare foldere" + IDS_DESC_REMOVEINIVALUES "Elminare înregistrări din fișiere INI" + IDS_DESC_REMOVEODBC "Elminare componente ODBC" + IDS_DESC_REMOVEREGISTRYVALUES "Elminare valori din registru de sistem" + IDS_DESC_REMOVESHORTCUTS "Elminare scurtături" IDS_DESC_RMCCPSEARCH "Căutare produse de calificare" IDS_DESC_SELFREGMODULES "Înregistrare module" - IDS_DESC_SELFUNREGMODULES "Deregistrare module" - IDS_DESC_SETODBCFOLDERS "Inițializare directoaer ODBC" + IDS_DESC_SELFUNREGMODULES "Anulare întregistrare module" + IDS_DESC_SETODBCFOLDERS "Inițializare directoare ODBC" IDS_DESC_STARTSERVICES "Pornire servicii" IDS_DESC_STOPSERVICES "Oprire servicii" IDS_DESC_UNPUBLISHCOMPONENTS "Retragere componente de calificare" IDS_DESC_UNPUBLISHFEATURES "Retragere funcționalități de produs" IDS_DESC_UNPUBLISHPRODUCT "Retragere informații de produs" - IDS_DESC_UNREGISTERCLASSINFO "Deregistrare servere de clase" - IDS_DESC_UNREGISTERCOMPLUS "Deregistrare componente și aplicații COM+" - IDS_DESC_UNREGISTEREXTENSIONINFO "Deregistrare servere de extensie" - IDS_DESC_UNREGISTERFONTS "Deregistrare fonturi" - IDS_DESC_UNREGISTERMIMEINFO "Deregistrare informații MIME" - IDS_DESC_UNREGISTERPROGIDINFO "Deregistrare identificatori de program" - IDS_DESC_UNREGISTERTYPELIBRARIES "Deregistrare biblioteci de tip" + IDS_DESC_UNREGISTERCLASSINFO "Anulare întregistrare servere de clase" + IDS_DESC_UNREGISTERCOMPLUS "Anulare întregistrare componente și aplicații COM+" + IDS_DESC_UNREGISTEREXTENSIONINFO "Anulare întregistrare servere de extensie" + IDS_DESC_UNREGISTERFONTS "Anulare întregistrare fonturi" + IDS_DESC_UNREGISTERMIMEINFO "Anulare întregistrare informații MIME" + IDS_DESC_UNREGISTERPROGIDINFO "Anulare întregistrare identificatori de program" + IDS_DESC_UNREGISTERTYPELIBRARIES "Anulare întregistrare biblioteci de tip" IDS_DESC_WRITEENVIRONMENTSTRINGS "Actualizare informații de mediu" IDS_DESC_WRITEINIVALUES "Scriere în fișiere INI" IDS_DESC_WRITEREGISTRYVALUES "Scriere valori în registru de sistem" @@ -144,7 +144,7 @@ STRINGTABLE IDS_TEMP_ALLOCATEREGISTRYSPACE "Spațiu liber: [1]" IDS_TEMP_APPSEARCH "Proprietate: [1], Semnătură: [2]" IDS_TEMP_BINDIMAGE "Fișier: [1]" - IDS_TEMP_CREATEFOLDERS "Dosar: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" IDS_TEMP_CREATESHORTCUTS "Scurtătură: [1]" IDS_TEMP_DELETESERVICES "Serviciu: [1]" IDS_TEMP_DUPLICATEFILES "Fișier: [1], Director: [9], Mărime: [6]" @@ -171,12 +171,12 @@ STRINGTABLE IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Nume: [1], Valoare: [2], Acțiune [3]" IDS_TEMP_REMOVEEXISTINGPRODUCTS "Aplicație: [1], Linie de comandă: [2]" IDS_TEMP_REMOVEFILES "Fișier: [1], Director: [9]" - IDS_TEMP_REMOVEFOLDERS "Dosar: [1]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" IDS_TEMP_REMOVEINIVALUES "Fișier: [1], Secțiune: [2], Cheie: [3], Valoare: [4]" IDS_TEMP_REMOVEREGISTRYVALUES "Cheie: [1], Nume: [2]" IDS_TEMP_REMOVESHORTCUTS "Scurtătură: [1]" - IDS_TEMP_SELFREGMODULES "Fișier: [1], Dosar: [2]" - IDS_TEMP_SELFUNREGMODULES "File: [1], Dosar: [2]" + IDS_TEMP_SELFREGMODULES "Fișier: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "Fișier: [1], Folder: [2]" IDS_TEMP_STARTSERVICES "Serviciu: [1]" IDS_TEMP_STOPSERVICES "Serviciu: [1]" IDS_TEMP_UNPUBLISHCOMPONENTS "ID de componentă: [1], Calificator: [2]"

1 0

[reactos] 01/01: [USETUP] Update Romanian (ro-RO) translation (#6428)
by Andrei Miloiu 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1756b347e1279010c9ed… commit a1756b347e1279010c9ed7417ea6e06f5fd1524b Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Feb 11 23:50:49 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 11 22:50:49 2024 +0100 [USETUP] Update Romanian (ro-RO) translation (#6428) --- base/setup/usetup/lang/ro-RO.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index e4ce8ced178..afab207ffde 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -7,7 +7,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> * Copyright 2018 George Bișoc <george.bisoc(a)reactos.org> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ #pragma once @@ -1366,7 +1366,7 @@ static MUI_ENTRY roROInstallDirectoryEntries[] = { 6, 9, - "Aici vor fi amplasate fi\272ierele sistemului ReactOS:", + "Alege\376i un director \356n care va fi instalat ReactOS:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

1 0

[reactos] 01/01: [HAL] HalInitializeBios() should not explicitly call HalpBiosDisplayReset().
by Hermès Bélusca-Maïto 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46831c537fdb7468ea016… commit 46831c537fdb7468ea0168ebada38986728feecd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Feb 6 20:01:53 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 11 18:51:40 2024 +0100 [HAL] HalInitializeBios() should not explicitly call HalpBiosDisplayReset(). While the BIOS support for INT10h emulation has been set up, any modification of the display should wait until the kernel requests video initialization with INBV/bootvid. The latter will call HalResetDisplay() (that calls HalpBiosDisplayReset()) at the correct time. This avoids an useless video mode change and reset when booting ReactOS. --- hal/halx86/generic/x86bios.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hal/halx86/generic/x86bios.c b/hal/halx86/generic/x86bios.c index 6e033e34124..9d583c78789 100644 --- a/hal/halx86/generic/x86bios.c +++ b/hal/halx86/generic/x86bios.c @@ -143,8 +143,6 @@ HalInitializeBios( //DbgDumpPage(x86BiosMemoryMapping, 0xc351); x86BiosIsInitialized = TRUE; - - HalpBiosDisplayReset(); } }

1 0

[reactos] 02/02: [NTOS:IO] Initialize InterruptObject to NULL on failure
by Dmitry Borisov 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adf534b28418fc18f66fa… commit adf534b28418fc18f66fa1ea7cd4726a86873fba Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Feb 6 19:45:24 2024 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Feb 11 20:24:15 2024 +0300 [NTOS:IO] Initialize InterruptObject to NULL on failure Fixes a pool corruption when trying to handle IRP_MN_REMOVE_DEVICE in the driver CORE-17256 --- ntoskrnl/io/iomgr/irq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/io/iomgr/irq.c b/ntoskrnl/io/iomgr/irq.c index f82d58d44c1..2fed5d1703c 100644 --- a/ntoskrnl/io/iomgr/irq.c +++ b/ntoskrnl/io/iomgr/irq.c @@ -112,6 +112,7 @@ IoConnectInterrupt(OUT PKINTERRUPT *InterruptObject, } /* And fail */ + *InterruptObject = NULL; return STATUS_INVALID_PARAMETER; }

1 0

[reactos] 01/02: [KMTESTS:NTOS_IO] Add a simple test for IoConnectInterrupt
by Dmitry Borisov 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4a38a05ec49f0872e06a… commit f4a38a05ec49f0872e06ad414b92a77f11375d25 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Feb 6 19:39:42 2024 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Feb 11 20:24:15 2024 +0300 [KMTESTS:NTOS_IO] Add a simple test for IoConnectInterrupt CORE-17256 --- modules/rostests/kmtests/ntos_io/IoInterrupt.c | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/rostests/kmtests/ntos_io/IoInterrupt.c b/modules/rostests/kmtests/ntos_io/IoInterrupt.c index 6003384789e..9b82b020f1d 100644 --- a/modules/rostests/kmtests/ntos_io/IoInterrupt.c +++ b/modules/rostests/kmtests/ntos_io/IoInterrupt.c @@ -91,7 +91,34 @@ TestSynchronizeExecution(VOID) } } +static +VOID +TestConnectInterrupt(VOID) +{ + PKINTERRUPT InterruptObject; + NTSTATUS Status; + + /* If the IoConnectInterrupt() fails, the interrupt object should be set to NULL */ + InterruptObject = KmtInvalidPointer; + + /* Test for invalid interrupt */ + Status = IoConnectInterrupt(&InterruptObject, + (PKSERVICE_ROUTINE)TestConnectInterrupt, + NULL, + NULL, + 0, + 0, + 0, + LevelSensitive, + TRUE, + (KAFFINITY)-1, + FALSE); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + ok_eq_pointer(InterruptObject, NULL); +} + START_TEST(IoInterrupt) { TestSynchronizeExecution(); + TestConnectInterrupt(); }

1 0

[reactos] 01/01: [MSUTB][SDK] Add CTipbarWnd Part 4 (#6478)
by Katayama Hirofumi MZ 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8cb6458e482a797e70ca… commit f8cb6458e482a797e70cae777b8510d9f8e6926b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 11 17:21:14 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 11 17:21:14 2024 +0900 [MSUTB][SDK] Add CTipbarWnd Part 4 (#6478) Supporting the Language bar... JIRA issue: CORE-19363 - Add implementation to CTipbarWnd. - Implement GetLibTls function. --- dll/win32/msutb/msutb.cpp | 770 ++++++++++++++++++++++++++++++------ sdk/include/reactos/cicero/cicutb.h | 8 +- 2 files changed, 663 insertions(+), 115 deletions(-) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 31b05578656..c5e3c337614 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -20,6 +20,7 @@ LONG g_DllRefCount = 0; BOOL g_bWinLogon = FALSE; BOOL g_fInClosePopupTipbar = FALSE; HWND g_hwndParent = NULL; +LIBTHREAD g_libTLS = { NULL, NULL }; #ifdef ENABLE_DESKBAND BOOL g_bEnableDeskBand = TRUE; #else @@ -76,6 +77,23 @@ class CMsUtbModule : public CComModule CMsUtbModule gModule; +void TFUninitLib_Thread(LIBTHREAD *libThread) +{ + if (!libThread) + return; + + if (libThread->m_pUnknown1) + { + libThread->m_pUnknown1->Release(); + libThread->m_pUnknown1 = NULL; + } + if (libThread->m_pDisplayAttrMgr) + { + libThread->m_pDisplayAttrMgr->Release(); + libThread->m_pDisplayAttrMgr = NULL; + } +} + class CCicLibMenuItem; class CTipbarAccItem; class CUTBMenuItem; @@ -1259,6 +1277,7 @@ public: /***********************************************************************/ class CTipbarItem; +class CTipbarBalloonItem; class CTipbarThread { @@ -1306,6 +1325,18 @@ public: LONG _AddRef() { return ++m_cRefs; } LONG _Release(); + /// @unimplemented + BOOL SetFocus(CTipbarBalloonItem *pTarget) + { + return FALSE; + } + + /// @unimplemented + HRESULT CallOnUpdateHandler() + { + return E_NOTIMPL; + } + //FIXME }; @@ -1383,6 +1414,24 @@ public: class CTipbarCtrlButtonHolder; class CDeskBand; +// Flags for m_dwTipbarWndFlags +enum +{ + TIPBAR_ATTACHED = 0x1, + TIPBAR_CHILD = 0x2, + TIPBAR_VERTICAL = 0x4, + TIPBAR_HIGHCONTRAST = 0x10, + TIPBAR_TRAYICON = 0x20, + TIPBAR_UPDATING = 0x400, + TIPBAR_ENSURING = 0x2000, + TIPBAR_NODESKBAND = 0x4000, + TIPBAR_TOOLBARENDED = 0x10000, + TIPBAR_TOPFIT = 0x40000, + TIPBAR_BOTTOMFIT = 0x80000, + TIPBAR_RIGHTFIT = 0x100000, + TIPBAR_LEFTFIT = 0x200000, +}; + class CTipbarWnd : public ITfLangBarEventSink , public ITfLangBarEventSink_P @@ -1434,6 +1483,7 @@ class CTipbarWnd friend class CTipbarGripper; friend class CTipbarThread; friend class CTipbarItem; + friend class CLBarInatItem; friend VOID WINAPI ClosePopupTipbar(VOID); friend BOOL GetTipbarInternal(HWND hWnd, DWORD dwFlags, CDeskBand *pDeskBand); friend LONG MyWaitForInputIdle(DWORD dwThreadId, DWORD dwMilliseconds); @@ -1522,6 +1572,12 @@ public: void OnTerminateToolbar(); HRESULT OnThreadTerminateInternal(DWORD dwThreadId); + /// @unimplemented + HRESULT OnThreadItemChangeInternal(DWORD dwThreadId) + { + return E_NOTIMPL; + } + // IUnknown methods STDMETHOD(QueryInterface)(REFIID riid, void **ppvObj); STDMETHOD_(ULONG, AddRef)(); @@ -2807,7 +2863,7 @@ CUTBMenuWnd *CUTBContextMenu::CreateMenuUI(BOOL bFlag) CUTBMenuItem *pVertical = InsertItem(pMenuUI, ID_VERTICAL, IDS_VERTICAL); if (pVertical) - pVertical->Check(!!(m_pTipbarWnd->m_dwTipbarWndFlags & 0x800000)); + pVertical->Check(!!(m_pTipbarWnd->m_dwTipbarWndFlags & TIPBAR_VERTICAL)); } } @@ -2940,12 +2996,12 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) } case ID_EXTRAICONS: - m_pTipbarWnd->m_dwTipbarWndFlags &= ~0x4000; + m_pTipbarWnd->m_dwTipbarWndFlags &= ~TIPBAR_NODESKBAND; m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_EXTRAICONSONMINIMIZED); break; case ID_NOEXTRAICONS: - m_pTipbarWnd->m_dwTipbarWndFlags &= ~0x4000; + m_pTipbarWnd->m_dwTipbarWndFlags &= ~TIPBAR_NODESKBAND; m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_NOEXTRAICONSONMINIMIZED); break; @@ -2954,7 +3010,7 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) break; case ID_VERTICAL: - m_pTipbarWnd->SetVertical((m_pTipbarWnd->m_dwTipbarWndFlags & 0x4) ? TRUE : FALSE); + m_pTipbarWnd->SetVertical(!!(m_pTipbarWnd->m_dwTipbarWndFlags & TIPBAR_VERTICAL)); break; case ID_ADJUSTDESKBAND: @@ -3759,7 +3815,6 @@ STDMETHODIMP CLBarInatItem::InitMenu(ITfMenu *pMenu) } } -#if 0 // FIXME: g_pTipbarWnd DWORD dwStatus; if (g_pTipbarWnd && g_pTipbarWnd->m_pLangBarMgr && @@ -3772,7 +3827,6 @@ STDMETHODIMP CLBarInatItem::InitMenu(ITfMenu *pMenu) ::LoadStringW(g_hInst, IDS_RESTORELANGBAR2, szText, _countof(szText)); LangBarInsertMenu(pMenu, 2000, szText, FALSE, NULL); } -#endif return S_OK; } @@ -3785,18 +3839,14 @@ STDMETHODIMP CLBarInatItem::OnMenuSelect(INT nCommandId) { if (g_pTipbarWnd) { -#if 0 // FIXME: g_pTipbarWnd ITfLangBarMgr *pLangBarMgr = g_pTipbarWnd->m_pLangBarMgr; if (pLangBarMgr) pLangBarMgr->ShowFloating(TF_SFT_SHOWNORMAL); -#endif } } else if (TF_GetMlngHKL(nCommandId, &hKL, NULL, 0)) { -#if 0 // FIXME: g_pTipbarWnd - g_pTipbarWnd->RestoreLastFocus(0, (g_pTipbarWnd->m_dwTipbarWndFlags & 2) != 0); -#endif + g_pTipbarWnd->RestoreLastFocus(NULL, !!(g_pTipbarWnd->m_dwTipbarWndFlags & TIPBAR_CHILD)); HWND hwndFore = ::GetForegroundWindow(); if (m_dwThreadId == ::GetWindowThreadProcessId(hwndFore, NULL)) { @@ -3912,7 +3962,6 @@ CTipbarWnd::CTipbarWnd(DWORD style) m_cRefs = 1; } -/// @unimplemented CTipbarWnd::~CTipbarWnd() { UnInit(); @@ -3922,23 +3971,66 @@ CTipbarWnd::~CTipbarWnd() if (m_hTextFont) ::DeleteObject(m_hTextFont); - //TFUninitLib_Thread(&g_libTLS); //FIXME + TFUninitLib_Thread(&g_libTLS); } /// @unimplemented void CTipbarWnd::Init(BOOL bChild, CDeskBand *pDeskBand) { + if (bChild) + m_dwTipbarWndFlags |= TIPBAR_CHILD; + else + m_dwTipbarWndFlags &= ~TIPBAR_CHILD; + + if (m_dwTipbarWndFlags & TIPBAR_CHILD) + m_dwTipbarWndFlags &= TIPBAR_HIGHCONTRAST; + + m_pDeskBand = pDeskBand; + + RECT rc = { 0, 0, 0, 0 }; + + if (g_bNewLook && !m_pWndFrame && (m_style & 0x20000000)) + { + CUIFWndFrame *pWndFrame = new(cicNoThrow) CUIFWndFrame(GetWindow(), &rc, 0); + if (pWndFrame) + { + pWndFrame->Initialize(); + AddUIObj(m_pWndFrame); + } + } + + if (!m_pTipbarGripper && !(m_dwTipbarWndFlags & TIPBAR_CHILD)) + { + m_pTipbarGripper = + new(cicNoThrow) CTipbarGripper(this, &rc, !!(m_dwTipbarWndFlags & TIPBAR_VERTICAL)); + if (m_pTipbarGripper) + { + m_pTipbarGripper->Initialize(); + AddUIObj(m_pTipbarGripper); + } + } + + //FIXME: CTipbarCtrlButtonHolder + + if (m_dwTipbarWndFlags & TIPBAR_VERTICAL) + { + Move(m_nLeft, m_nTop, GetTipbarHeight(), 0); + } + else + { + Move(m_nLeft, m_nTop, 0, GetTipbarHeight()); + } } void CTipbarWnd::InitHighContrast() { - m_dwTipbarWndFlags &= ~0x10; + m_dwTipbarWndFlags &= ~TIPBAR_HIGHCONTRAST; HIGHCONTRAST HiCon = { sizeof(HiCon) }; if (::SystemParametersInfo(SPI_GETHIGHCONTRAST, sizeof(HiCon), &HiCon, 0)) { if (HiCon.dwFlags & HCF_HIGHCONTRASTON) - m_dwTipbarWndFlags |= 0x10; + m_dwTipbarWndFlags |= TIPBAR_HIGHCONTRAST; } } @@ -3999,9 +4091,29 @@ void CTipbarWnd::InitThemeMargins() theme.CloseThemeData(); } -/// @unimplemented void CTipbarWnd::UnInit() { + SetFocusThread(NULL); + for (size_t iItem = 0; iItem < m_Threads.size(); ++iItem) + { + CTipbarThread* pThread = m_Threads[iItem]; + if (pThread) + { + pThread->_UninitItemList(TRUE); + pThread->m_pTipbarWnd = NULL; + pThread->_Release(); + } + } + m_Threads.clear(); + + if (m_pLangBarMgr) + m_pLangBarMgr->UnAdviseEventSink(m_dwSinkCookie); + + if (m_pLangBarMgr) + { + m_pLangBarMgr->Release(); + m_pLangBarMgr = NULL; + } } BOOL CTipbarWnd::IsFullScreenWindow(HWND hWnd) @@ -4029,10 +4141,11 @@ BOOL CTipbarWnd::IsHKLToSkipRedrawOnNoItem() return IsSkipRedrawHKL(hKL); } -/// @unimplemented BOOL CTipbarWnd::IsInItemChangeOrDirty(CTipbarThread *pTarget) { - return FALSE; + if (pTarget->m_dwThreadId == m_dwChangingThreadId) + return TRUE; + return pTarget->IsDirtyItem(); } void CTipbarWnd::AddThreadToThreadCreatingList(CTipbarThread *pThread) @@ -4047,9 +4160,30 @@ void CTipbarWnd::RemoveThredFromThreadCreatingList(CTipbarThread *pTarget) m_ThreadCreatingList.Remove(iItem); } -/// @unimplemented void CTipbarWnd::MoveToStub(BOOL bFlag) { + m_dwTipbarWndFlags |= 0x40; + + RECT rcWorkArea; + ::SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); + + if (bFlag) + { + m_nLeft = rcWorkArea.right - 38; + m_dwTipbarWndFlags &= ~0x80; + } + else + { + RECT Rect; + ::GetWindowRect(m_hWnd, &Rect); + m_nLeft = rcWorkArea.right + Rect.left - Rect.right; + m_dwTipbarWndFlags |= 0x80; + } + + m_nTop = rcWorkArea.bottom - m_cyDlgFrameX2 - GetTipbarHeight(); + + if (m_pFocusThread) + m_pFocusThread->MyMoveWnd(0, 0); } void CTipbarWnd::RestoreFromStub() @@ -4099,10 +4233,23 @@ INT CTipbarWnd::GetTipbarHeight() return m_cySmallIcon + cy + (2 * size.cy); } -/// @unimplemented BOOL CTipbarWnd::AutoAdjustDeskBandSize() { - return FALSE; + if ((m_dwTipbarWndFlags & TIPBAR_NODESKBAND) || + !m_pFocusThread || + (m_pFocusThread->m_dwFlags1 & 0x800)) + { + return FALSE; + } + + DWORD dwOldWndFlags = m_dwTipbarWndFlags; + m_dwTipbarWndFlags &= ~0x8000; + + if (!AdjustDeskBandSize(!(dwOldWndFlags & 0x8000))) + return FALSE; + + m_dwTipbarWndFlags |= TIPBAR_NODESKBAND; + return TRUE; } /// @unimplemented @@ -4124,13 +4271,13 @@ void CTipbarWnd::AdjustPosOnDisplayChange() return; INT x = m_nLeft, y = m_nTop; - if (m_dwTipbarWndFlags & 0x200000) + if (m_dwTipbarWndFlags & TIPBAR_LEFTFIT) x = rcWorkArea.left; - if (m_dwTipbarWndFlags & 0x40000) + if (m_dwTipbarWndFlags & TIPBAR_TOPFIT) y = rcWorkArea.top; - if (m_dwTipbarWndFlags & 0x100000) + if (m_dwTipbarWndFlags & TIPBAR_RIGHTFIT) x = rcWorkArea.right - m_nWidth; - if (m_dwTipbarWndFlags & 0x80000) + if (m_dwTipbarWndFlags & TIPBAR_BOTTOMFIT) y = rcWorkArea.bottom - m_nHeight; if (x != m_nLeft || y != m_nTop) Move(x, y, m_nWidth, m_nHeight); @@ -4139,9 +4286,9 @@ void CTipbarWnd::AdjustPosOnDisplayChange() void CTipbarWnd::SetVertical(BOOL bVertical) { if (bVertical) - m_dwTipbarWndFlags |= 0x4; + m_dwTipbarWndFlags |= TIPBAR_VERTICAL; else - m_dwTipbarWndFlags &= ~0x4; + m_dwTipbarWndFlags &= ~TIPBAR_VERTICAL; if (m_pTipbarGripper) { @@ -4154,11 +4301,11 @@ void CTipbarWnd::SetVertical(BOOL bVertical) } if (g_fTaskbarTheme) - SetActiveTheme(L"TASKBAR", !!(m_dwTipbarWndFlags & 0x4), 1); + SetActiveTheme(L"TASKBAR", !!(m_dwTipbarWndFlags & TIPBAR_VERTICAL), 1); - if (!(m_dwTipbarWndFlags & 2)) + if (!(m_dwTipbarWndFlags & TIPBAR_CHILD)) { - if (m_dwTipbarWndFlags & 4) + if (m_dwTipbarWndFlags & TIPBAR_VERTICAL) { Move(m_nLeft, m_nTop, GetTipbarHeight(), 0); } @@ -4177,37 +4324,48 @@ void CTipbarWnd::SetVertical(BOOL bVertical) void CTipbarWnd::UpdatePosFlags() { - if (m_dwTipbarWndFlags & 0x2) + if (m_dwTipbarWndFlags & TIPBAR_CHILD) return; RECT rc = { m_nLeft, m_nTop, m_nLeft + m_nWidth, m_nTop + m_nHeight }, rcWorkArea; if (!GetWorkArea(&rc, &rcWorkArea)) return; - if (m_nLeft > rcWorkArea.left + 2) - m_dwTipbarWndFlags &= ~0x200000; + if (rcWorkArea.left + 2 < m_nLeft) + m_dwTipbarWndFlags &= ~TIPBAR_LEFTFIT; else - m_dwTipbarWndFlags |= 0x200000; + m_dwTipbarWndFlags |= TIPBAR_LEFTFIT; - if ( m_nTop> rcWorkArea.top + 2 ) - m_dwTipbarWndFlags &= ~0x40000; + if (rcWorkArea.top + 2 < m_nTop) + m_dwTipbarWndFlags &= ~TIPBAR_TOPFIT; else - m_dwTipbarWndFlags |= 0x40000; + m_dwTipbarWndFlags |= TIPBAR_TOPFIT; if (m_nLeft + m_nWidth < rcWorkArea.right - 2) - m_dwTipbarWndFlags &= ~0x100000; + m_dwTipbarWndFlags &= ~TIPBAR_RIGHTFIT; else - m_dwTipbarWndFlags |= 0x100000; + m_dwTipbarWndFlags |= TIPBAR_RIGHTFIT; if (m_nTop + m_nHeight < rcWorkArea.bottom - 2) - m_dwTipbarWndFlags &= ~0x80000; + m_dwTipbarWndFlags &= ~TIPBAR_BOTTOMFIT; else - m_dwTipbarWndFlags |= 0x80000; + m_dwTipbarWndFlags |= TIPBAR_BOTTOMFIT; } -/// @unimplemented void CTipbarWnd::CancelMenu() { + if (!m_pThread) + return; + + CTipbarWnd *pTipbarWnd = m_pThread->m_pTipbarWnd; + if (pTipbarWnd) + { + if (pTipbarWnd->m_pLangBarMgr) + pTipbarWnd->StartModalInput(NULL, m_pThread->m_dwThreadId); + } + + m_pModalMenu->CancelMenu(); + StartBackToAlphaTimer(); } BOOL CTipbarWnd::CheckExcludeCaptionButtonMode(LPRECT prc1, LPCRECT prc2) @@ -4215,9 +4373,11 @@ BOOL CTipbarWnd::CheckExcludeCaptionButtonMode(LPRECT prc1, LPCRECT prc2) return (prc1->top < prc2->top + 5) && (prc2->right <= prc1->right + (5 * m_ButtonWidth)); } -/// @unimplemented void CTipbarWnd::ClearLBItemList() { + m_TipbarGUIDArray.clear(); + if (m_pFocusThread) + OnThreadItemChange(m_pFocusThread->m_dwThreadId); } HFONT CTipbarWnd::CreateVerticalFont() @@ -4253,7 +4413,7 @@ HFONT CTipbarWnd::CreateVerticalFont() void CTipbarWnd::UpdateVerticalFont() { - if (m_dwTipbarWndFlags & 4) + if (m_dwTipbarWndFlags & TIPBAR_VERTICAL) { if (m_hTextFont) { @@ -4273,6 +4433,7 @@ void CTipbarWnd::UpdateVerticalFont() /// @unimplemented void CTipbarWnd::ShowOverScreenSizeBalloon() { + //FIXME: CTipbarCtrlButtonHolder } void CTipbarWnd::DestroyOverScreenSizeBalloon() @@ -4292,15 +4453,26 @@ void CTipbarWnd::DestroyWnd() ::DestroyWindow(m_hWnd); } -/// @unimplemented HKL CTipbarWnd::GetFocusKeyboardLayout() { - return NULL; + DWORD dwThreadId = 0; + if (m_pFocusThread) + dwThreadId = m_pFocusThread->m_dwThreadId; + return ::GetKeyboardLayout(dwThreadId); } -/// @unimplemented void CTipbarWnd::KillOnTheadItemChangeTimer() { + DWORD dwChangingThreadId = m_dwChangingThreadId; + m_dwChangingThreadId = 0; + KillTimer(4); + + if (dwChangingThreadId) + { + CTipbarThread *pThread = _FindThread(dwChangingThreadId); + if (pThread) + pThread->m_dwUnknown34 |= 0x1; + } } UINT_PTR CTipbarWnd::SetTimer(UINT_PTR nIDEvent, UINT uElapse) @@ -4347,7 +4519,7 @@ void CTipbarWnd::SavePosition() ::ClientToScreen(m_hWnd, &pt); regKey.SetDword(TEXT("Left"), pt.x); regKey.SetDword(TEXT("Top"), pt.y); - regKey.SetDword(TEXT("Vertical"), !!(m_dwTipbarWndFlags & 4)); + regKey.SetDword(TEXT("Vertical"), !!(m_dwTipbarWndFlags & TIPBAR_VERTICAL)); } } @@ -4379,13 +4551,10 @@ BOOL CTipbarWnd::SetLangBand(BOOL bDeskBand, BOOL bFlag2) ret = FALSE; } - if (!(m_dwTipbarWndFlags & 2)) + if (!(m_dwTipbarWndFlags & TIPBAR_CHILD) && bDeskBand) { - if (bDeskBand) - { - KillTimer(7); - SetTimer(7, g_uTimerElapseSYSCOLORCHANGED); - } + KillTimer(7); + SetTimer(7, g_uTimerElapseSYSCOLORCHANGED); } return ret; @@ -4393,7 +4562,7 @@ BOOL CTipbarWnd::SetLangBand(BOOL bDeskBand, BOOL bFlag2) void CTipbarWnd::SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight) { - if (m_dwTipbarWndFlags & 0x2) + if (m_dwTipbarWndFlags & TIPBAR_CHILD) { m_nWidth = nWidth; m_nHeight = nHeight; @@ -4402,7 +4571,7 @@ void CTipbarWnd::SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight) ++m_bInCallOn; - m_dwTipbarWndFlags |= 0x400; + m_dwTipbarWndFlags |= TIPBAR_UPDATING; m_X = X; m_Y = Y; @@ -4420,7 +4589,7 @@ void CTipbarWnd::SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight) if (m_pTipbarGripper) { - if (m_dwTipbarWndFlags & 4) + if (m_dwTipbarWndFlags & TIPBAR_VERTICAL) { INT GripperWidth = GetGripperWidth(); ::SetRect(&rc, size.cx, size.cy, nWidth - m_cxDlgFrameX2 - size.cx, size.cy + GripperWidth); @@ -4437,19 +4606,27 @@ void CTipbarWnd::SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight) --m_bInCallOn; } -/// @unimplemented void CTipbarWnd::SetShowText(BOOL bShow) { + if (bShow) + m_dwTipbarWndFlags |= TIPBAR_HIGHCONTRAST; + else + m_dwTipbarWndFlags &= ~TIPBAR_HIGHCONTRAST; + + if (m_pFocusThread) + OnThreadItemChange(m_pFocusThread->m_dwThreadId); + + TerminateAllThreads(FALSE); } void CTipbarWnd::SetShowTrayIcon(BOOL bShow) { - if (m_dwTipbarWndFlags & 0x20) - m_dwTipbarWndFlags &= ~0x20; + if (m_dwTipbarWndFlags & TIPBAR_TRAYICON) + m_dwTipbarWndFlags &= ~TIPBAR_TRAYICON; else - m_dwTipbarWndFlags |= 0x20; + m_dwTipbarWndFlags |= TIPBAR_TRAYICON; - if ((m_dwTipbarWndFlags & 0x20) && m_pFocusThread) + if ((m_dwTipbarWndFlags & TIPBAR_TRAYICON) && m_pFocusThread) { KillTimer(10); SetTimer(10, g_uTimerElapseMOVETOTRAY); @@ -4461,9 +4638,45 @@ void CTipbarWnd::SetShowTrayIcon(BOOL bShow) } } -/// @unimplemented void CTipbarWnd::ShowContextMenu(POINT pt, LPCRECT prc, BOOL bFlag) { + AddRef(); + + RECT rc; + if (!prc) + { + rc = { pt.x, pt.y, pt.x, pt.y }; + prc = &rc; + } + + if (m_pFocusThread) + { + CUTBContextMenu *pContextMenu = new(cicNoThrow) CUTBContextMenu(this); + if (pContextMenu) + { + if (pContextMenu->Init()) + { + m_pThread = m_pFocusThread; + StartModalInput(this, m_pFocusThread->m_dwThreadId); + + m_pModalMenu = pContextMenu; + DWORD dwCommandId = pContextMenu->ShowPopup(GetWindow(), pt, prc, bFlag); + m_pModalMenu = NULL; + + if (m_pThread) + StopModalInput(m_pThread->m_dwThreadId); + + m_pThread = NULL; + + if (dwCommandId != (DWORD)-1) + pContextMenu->SelectMenuItem(dwCommandId); + } + + delete pContextMenu; + } + } + + Release(); } void CTipbarWnd::StartBackToAlphaTimer() @@ -4472,10 +4685,17 @@ void CTipbarWnd::StartBackToAlphaTimer() ::SetTimer(m_hWnd, 3, 3 * uTime, NULL); } -/// @unimplemented BOOL CTipbarWnd::StartDoAccDefaultActionTimer(CTipbarItem *pTarget) { - return FALSE; + if (!m_pTipbarAccessible) + return FALSE; + INT IDOfItem = m_pTipbarAccessible->GetIDOfItem(pTarget); + m_nID = IDOfItem; + if (!IDOfItem || IDOfItem == -1) + return FALSE; + KillTimer(11); + SetTimer(11, g_uTimerElapseDOACCDEFAULTACTION); + return TRUE; } void CTipbarWnd::StartModalInput(ITfLangBarEventSink *pSink, DWORD dwThreadId) @@ -4504,27 +4724,87 @@ void CTipbarWnd::StopModalInput(DWORD dwThreadId) m_pLangBarMgr->SetModalInput(NULL, dwCurThreadId, 0); } -/// @unimplemented +LONG MyWaitForInputIdle(DWORD dwThreadId, DWORD dwMilliseconds) +{ + if (g_pTipbarWnd && (g_pTipbarWnd->m_dwShowType & TF_SFT_DESKBAND)) + return 0; + + if (TF_IsInMarshaling(dwThreadId)) + return STATUS_TIMEOUT; + + DWORD dwFlags1 = 0, dwFlags2 = 0; + if (!TF_GetThreadFlags(dwThreadId, &dwFlags1, &dwFlags2, NULL) && dwFlags2) + return -1; + + return TF_CheckThreadInputIdle(dwThreadId, dwMilliseconds); +} + CTipbarThread *CTipbarWnd::_CreateThread(DWORD dwThreadId) { - return NULL; + CTipbarThread *pTarget = _FindThread(dwThreadId); + if (pTarget) + return pTarget; + + MyWaitForInputIdle(dwThreadId, 2000); + + pTarget = new(cicNoThrow) CTipbarThread(this); + if (!pTarget) + return NULL; + + AddThreadToThreadCreatingList(pTarget); + + HRESULT hr = pTarget->Init(dwThreadId); + + RemoveThredFromThreadCreatingList(pTarget); + + if (SUCCEEDED(hr) && !m_Threads.Add(pTarget)) + { + pTarget->_UninitItemList(TRUE); + pTarget->m_pTipbarWnd = NULL; + pTarget->_Release(); + return NULL; + } + + return pTarget; } -/// @unimplemented CTipbarThread *CTipbarWnd::_FindThread(DWORD dwThreadId) { - return NULL; + if (g_bWinLogon) + return NULL; + + CTipbarThread *pTarget = NULL; + for (size_t iItem = 0; iItem < m_Threads.size(); ++iItem) + { + CTipbarThread *pThread = m_Threads[iItem]; + if (pThread && pThread->m_dwThreadId == dwThreadId) + { + pTarget = pThread; + break; + } + } + + if (!pTarget) + return NULL; + + DWORD dwFlags1, dwFlags2, dwFlags3; + TF_GetThreadFlags(dwThreadId, &dwFlags1, &dwFlags2, &dwFlags3); + + if (!dwFlags2 || (dwFlags2 != pTarget->m_dwFlags2) || (dwFlags3 != pTarget->m_dwFlags3)) + { + OnThreadTerminateInternal(dwThreadId); + return NULL; + } + + return pTarget; } void CTipbarWnd::EnsureFocusThread() { - if (m_pFocusThread) - return; - - if (m_dwTipbarWndFlags & 0x12000) + if (m_pFocusThread || (m_dwTipbarWndFlags & (TIPBAR_TOOLBARENDED | TIPBAR_ENSURING))) return; - m_dwTipbarWndFlags |= 0x2000; + m_dwTipbarWndFlags |= TIPBAR_ENSURING; HWND hwndFore = ::GetForegroundWindow(); if (!hwndFore) @@ -4534,19 +4814,41 @@ void CTipbarWnd::EnsureFocusThread() if (dwThreadId) OnSetFocus(dwThreadId); - m_dwTipbarWndFlags &= ~0x2000; + m_dwTipbarWndFlags &= ~TIPBAR_ENSURING; } -/// @unimplemented HRESULT CTipbarWnd::SetFocusThread(CTipbarThread *pFocusThread) { - return E_NOTIMPL; + if (pFocusThread == m_pFocusThread) + return S_OK; + + DWORD dwThreadId = ::GetCurrentThreadId(); + DestroyOverScreenSizeBalloon(); + + if (m_pFocusThread) + { + m_pFocusThread->SetFocus(NULL); + ::AttachThreadInput(dwThreadId, m_pFocusThread->m_dwThreadId, FALSE); + } + + m_dwTipbarWndFlags &= ~TIPBAR_ATTACHED; + m_pFocusThread = pFocusThread; + return S_OK; } -/// @unimplemented HRESULT CTipbarWnd::AttachFocusThread() { - return E_NOTIMPL; + if (m_dwTipbarWndFlags & TIPBAR_ATTACHED) + return S_FALSE; + + if (m_pFocusThread) + { + DWORD dwThreadId = ::GetCurrentThreadId(); + ::AttachThreadInput(dwThreadId, m_pFocusThread->m_dwThreadId, TRUE); + m_dwTipbarWndFlags |= TIPBAR_ATTACHED; + } + + return S_OK; } void CTipbarWnd::RestoreLastFocus(DWORD *pdwThreadId, BOOL fPrev) @@ -4574,9 +4876,31 @@ void CTipbarWnd::CleanUpThreadPointer(CTipbarThread *pThread, BOOL bRemove) m_pUnknownThread = NULL; } -/// @unimplemented void CTipbarWnd::TerminateAllThreads(BOOL bFlag) { + const size_t cItems = m_Threads.size(); + + DWORD *pdwThreadIds = new(cicNoThrow) DWORD[cItems]; + if (!pdwThreadIds) + return; + + for (size_t iItem = 0; iItem < cItems; ++iItem) + { + pdwThreadIds[iItem] = 0; + CTipbarThread* pThread = m_Threads[iItem]; + if (pThread && (bFlag || (pThread != m_pFocusThread))) + { + pdwThreadIds[iItem] = pThread->m_dwThreadId; + } + } + + for (size_t iItem = 0; iItem < cItems; ++iItem) + { + if (pdwThreadIds[iItem]) + OnThreadTerminateInternal(pdwThreadIds[iItem]); + } + + delete[] pdwThreadIds; } STDMETHODIMP CTipbarWnd::QueryInterface(REFIID riid, void **ppvObj) @@ -4632,16 +4956,61 @@ STDMETHODIMP CTipbarWnd::OnThreadTerminate(DWORD dwThreadId) return hr; } -/// @unimplemented HRESULT CTipbarWnd::OnThreadTerminateInternal(DWORD dwThreadId) { - return E_NOTIMPL; + for (size_t iItem = 0; iItem < m_Threads.size(); ++iItem) + { + CTipbarThread *pThread = m_Threads[iItem]; + if (pThread && pThread->m_dwThreadId == dwThreadId) + { + m_Threads.Remove(iItem); + pThread->RemoveUIObjs(); + CleanUpThreadPointer(pThread, FALSE); + pThread->_UninitItemList(TRUE); + pThread->m_pTipbarWnd = NULL; + pThread->_Release(); + break; + } + } + + return S_OK; } -/// @unimplemented STDMETHODIMP CTipbarWnd::OnThreadItemChange(DWORD dwThreadId) { - return E_NOTIMPL; + if (m_dwTipbarWndFlags & TIPBAR_TOOLBARENDED) + return S_OK; + if (!(m_dwTipbarWndFlags & TIPBAR_CHILD) && (m_dwShowType & TF_SFT_DESKBAND)) + return S_OK; + + CTipbarThread *pThread = _FindThread(dwThreadId); + if (pThread) + { + if ((!m_dwUnknown23 || m_dwUnknown23 == dwThreadId) && pThread == m_pFocusThread) + { + KillOnTheadItemChangeTimer(); + m_dwChangingThreadId = dwThreadId; + KillTimer(6); + SetTimer(4, g_uTimerElapseONTHREADITEMCHANGE); + } + else + { + pThread->m_dwUnknown34 |= 0x1; + } + } + else + { + for (size_t iItem = 0; iItem < m_ThreadCreatingList.size(); ++iItem) + { + CTipbarThread *pItem = m_ThreadCreatingList[iItem]; + if (pItem && pItem->m_dwThreadId == dwThreadId) + { + pItem->m_dwUnknown34 |= 0x1; + } + } + } + + return S_OK; } STDMETHODIMP CTipbarWnd::OnModalInput(DWORD dwThreadId, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -4700,10 +5069,28 @@ STDMETHODIMP CTipbarWnd::ShowFloating(DWORD dwFlags) return E_NOTIMPL; } -/// @unimplemented STDMETHODIMP CTipbarWnd::GetItemFloatingRect(DWORD dwThreadId, REFGUID rguid, RECT *prc) { - return E_NOTIMPL; + if (m_dwTipbarWndFlags & TIPBAR_TRAYICON) + return E_UNEXPECTED; + + if (!m_pFocusThread || (m_pFocusThread->m_dwThreadId != dwThreadId)) + return E_FAIL; + + for (size_t iItem = 0; iItem < m_pFocusThread->m_UIObjects.size(); ++iItem) + { + CTipbarItem* pItem = m_pFocusThread->m_UIObjects[iItem]; + if (pItem) + { + if ((pItem->m_dwItemFlags & 0x8) && IsEqualGUID(pItem->m_ItemInfo.guidItem, rguid)) + { + pItem->OnUnknown57(prc); + return S_OK; + } + } + } + + return E_FAIL; } /// @unimplemented @@ -4724,9 +5111,20 @@ STDMETHODIMP_(void) CTipbarWnd::GetAccLocation(LPRECT lprc) GetRect(lprc); } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::PaintObject(HDC hDC, LPCRECT prc) { + if (m_dwTipbarWndFlags & TIPBAR_UPDATING) + { + Move(m_X, m_Y, m_CX, m_CY); + m_dwTipbarWndFlags &= ~TIPBAR_UPDATING; + } + + if (!m_pFocusThread || !m_pFocusThread->IsDirtyItem()) + { + m_pFocusThread->CallOnUpdateHandler(); + if (g_pTipbarWnd) + CUIFWindow::PaintObject(hDC, prc); + } } STDMETHODIMP_(DWORD) CTipbarWnd::GetWndStyle() @@ -4775,6 +5173,140 @@ STDMETHODIMP_(void) CTipbarWnd::OnDestroy(HWND hWnd) /// @unimplemented STDMETHODIMP_(void) CTipbarWnd::OnTimer(WPARAM wParam) { + AddRef(); + switch (wParam) + { + case 1: + KillTimer(1); + MoveToStub(FALSE); + break; + case 2: + KillTimer(2); + MoveToStub(TRUE); + break; + case 3: + KillTimer(3); + SetAlpha((BYTE)m_dwAlphaValue, TRUE); + break; + case 4: + { + LONG status = MyWaitForInputIdle(m_dwChangingThreadId, 2000); + if (status) + { + if (status != STATUS_TIMEOUT) + { + KillTimer(4); + m_dwChangingThreadId = 0; + } + } + else if (!m_pThread) + { + KillTimer(4); + DWORD dwOldThreadId = m_dwChangingThreadId; + m_dwChangingThreadId = 0; + OnThreadItemChangeInternal(dwOldThreadId); + } + break; + } + case 5: + KillTimer(5); + ::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); + break; + case 6: + KillTimer(6); + if (m_pFocusThread) + { + if (m_pFocusThread->m_dwThreadId != m_dwChangingThreadId && + !m_pFocusThread->CallOnUpdateHandler()) + { + if (m_pFocusThread) + OnThreadItemChange(m_pFocusThread->m_dwThreadId); + } + } + break; + case 7: + { + DWORD dwThreadId = 0; + if (KillTimer(7)) + { + if (m_pFocusThread) + dwThreadId = m_pFocusThread->m_dwThreadId; + + TerminateAllThreads(TRUE); + UpdateVerticalFont(); + + if (dwThreadId) + OnSetFocus(dwThreadId); + + InitMetrics(); + // FIXME: CTipbarCtrlButtonHolder + + InitHighContrast(); + SetAlpha(0xFF, TRUE); + ::RedrawWindow(m_hWnd, NULL, NULL, (RDW_FRAME | RDW_UPDATENOW | RDW_INVALIDATE)); + } + break; + } + case 8: + KillTimer(8); + UpdateUI(NULL); + break; + case 9: + KillTimer(9); + //FIXME + if (m_pUnknownThread == m_pFocusThread) + Show(!!(m_dwUnknown23_5[3] & 0x80000000)); + m_pUnknownThread = NULL; + if ((m_dwUnknown23_5[3] & 0x2)) + ShowOverScreenSizeBalloon(); + break; + case 10: + KillTimer(10); + MoveToTray(); + break; + case 11: + KillTimer(11); + if (m_pTipbarAccessible) + { + if (m_nID) + { + m_pTipbarAccessible->DoDefaultActionReal(m_nID); + m_nID = 0; + } + } + break; + case 12: + KillTimer(12); + AdjustPosOnDisplayChange(); + break; + case 13: +#ifdef ENABLE_DESKBAND + if (!m_pDeskBand || !m_pDeskBand->m_dwUnknown19) + { + KillTimer(13); + if (!m_pFocusThread) + EnsureFocusThread(); + } +#endif + break; + case 14: + if (SetLangBand(TRUE, TRUE)) + { + m_dwShowType = TF_SFT_DESKBAND; + KillTimer(14); + } + break; + default: + { + if ((10000 <= wParam) && (wParam <= 10049)) + { + // FIXME: CLangBarItemList + } + break; + } + } + + Release(); } STDMETHODIMP_(void) CTipbarWnd::OnSysColorChange() @@ -4785,10 +5317,10 @@ STDMETHODIMP_(void) CTipbarWnd::OnSysColorChange() void CTipbarWnd::OnTerminateToolbar() { - m_dwTipbarWndFlags |= 0x10000; + m_dwTipbarWndFlags |= TIPBAR_TOOLBARENDED; DestroyOverScreenSizeBalloon(); TerminateAllThreads(TRUE); - if (!(m_dwTipbarWndFlags & 0x2)) + if (!(m_dwTipbarWndFlags & TIPBAR_CHILD)) SavePosition(); } @@ -4829,11 +5361,20 @@ STDMETHODIMP_(void) CTipbarWnd::OnUser(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR } } -/// @unimplemented STDMETHODIMP_(LRESULT) CTipbarWnd::OnWindowPosChanged(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return 0; + if (m_pFocusThread) + { + for (size_t iItem = 0; iItem < m_pFocusThread->m_UIObjects.size(); ++iItem) + { + CTipbarItem *pItem = m_pFocusThread->m_UIObjects[iItem]; + if (pItem) + pItem->OnUnknown44(); + } + } + + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); } STDMETHODIMP_(LRESULT) @@ -4880,7 +5421,7 @@ CTipbarWnd::OnSettingChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) STDMETHODIMP_(LRESULT) CTipbarWnd::OnDisplayChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - if (!(m_dwTipbarWndFlags & 2)) + if (!(m_dwTipbarWndFlags & TIPBAR_CHILD)) { KillTimer(12); SetTimer(12, g_uTimerElapseDISPLAYCHANGE); @@ -4927,9 +5468,25 @@ STDMETHODIMP_(void) CTipbarWnd::OnThemeChanged(HWND hWnd, WPARAM wParam, LPARAM CUIFWindow::OnThemeChanged(hWnd, wParam, lParam); } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::UpdateUI(LPCRECT prc) { + KillTimer(8); + + if (m_dwChangingThreadId || m_bInCallOn || (m_pFocusThread && m_pFocusThread->IsDirtyItem())) + { + SetTimer(8, g_uTimerElapseUPDATEUI); + return; + } + + if (m_dwTipbarWndFlags & TIPBAR_UPDATING) + { + ++m_bInCallOn; + Move(m_X, m_Y, m_CX, m_CY); + m_dwTipbarWndFlags &= ~TIPBAR_UPDATING; + --m_bInCallOn; + } + + CUIFWindow::UpdateUI(NULL); } /// @unimplemented @@ -4984,21 +5541,6 @@ HRESULT CTipbarThread::InitItemList() return E_NOTIMPL; } -LONG MyWaitForInputIdle(DWORD dwThreadId, DWORD dwMilliseconds) -{ - if (g_pTipbarWnd && (g_pTipbarWnd->m_dwShowType & TF_SFT_DESKBAND)) - return 0; - - if (TF_IsInMarshaling(dwThreadId)) - return STATUS_TIMEOUT; - - DWORD dwFlags1 = 0, dwFlags2 = 0; - if (!TF_GetThreadFlags(dwThreadId, &dwFlags1, &dwFlags2, NULL) && dwFlags2) - return -1; - - return TF_CheckThreadInputIdle(dwThreadId, dwMilliseconds); -} - HRESULT CTipbarThread::_UninitItemList(BOOL bUnAdvise) { for (size_t iItem = 0; iItem < m_UIObjects.size(); ++iItem) @@ -5175,7 +5717,7 @@ BOOL CTipbarThread::IsVertical() { if (!m_pTipbarWnd) return FALSE; - return !!(m_pTipbarWnd->m_dwTipbarWndFlags & 0x20000000); + return !!(m_pTipbarWnd->m_dwTipbarWndFlags & TIPBAR_VERTICAL); } /// @unimplemented @@ -5522,7 +6064,7 @@ BOOL GetTipbarInternal(HWND hWnd, DWORD dwFlags, CDeskBand *pDeskBand) g_pTipbarWnd->ShowFloating(dwStatus); if (!bParent && (dwOldStatus & TF_SFT_DESKBAND)) - g_pTipbarWnd->m_dwTipbarWndFlags |= 0x4000; + g_pTipbarWnd->m_dwTipbarWndFlags |= TIPBAR_NODESKBAND; g_hwndParent = hWnd; return TRUE; @@ -5531,13 +6073,13 @@ BOOL GetTipbarInternal(HWND hWnd, DWORD dwFlags, CDeskBand *pDeskBand) /*********************************************************************** * GetLibTls (MSUTB.@) * - * @unimplemented + * @implemented */ -EXTERN_C LPVOID WINAPI +EXTERN_C PLIBTHREAD WINAPI GetLibTls(VOID) { - FIXME("stub:()\n"); - return NULL; + TRACE("()\n"); + return &g_libTLS; } /*********************************************************************** diff --git a/sdk/include/reactos/cicero/cicutb.h b/sdk/include/reactos/cicero/cicutb.h index 774be036cb4..abda6e7baff 100644 --- a/sdk/include/reactos/cicero/cicutb.h +++ b/sdk/include/reactos/cicero/cicutb.h @@ -18,7 +18,13 @@ DEFINE_GUID(IID_ITfLangBarEventSink_P, 0x7A460360, 0xDA21, 0x4B09, 0xA8, DEFINE_GUID(CLSID_MSUTBDeskBand, 0x540D8A8B, 0x1C3F, 0x4E32, 0x81, 0x32, 0x53, 0x0F, 0x6A, 0x50, 0x20, 0x90); DEFINE_GUID(CATID_DeskBand, 0x00021492, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); -EXTERN_C LPVOID WINAPI GetLibTls(VOID); +typedef struct LIBTHREAD +{ + IUnknown *m_pUnknown1; + ITfDisplayAttributeMgr *m_pDisplayAttrMgr; +} LIBTHREAD, *PLIBTHREAD; + +EXTERN_C PLIBTHREAD WINAPI GetLibTls(VOID); EXTERN_C BOOL WINAPI GetPopupTipbar(HWND hWnd, BOOL fWinLogon); EXTERN_C HRESULT WINAPI SetRegisterLangBand(BOOL bRegister); EXTERN_C VOID WINAPI ClosePopupTipbar(VOID);

1 0

[reactos] 01/01: [MSCTF][MSUTB][SDK] Add CTipbarItem and CTipbarThread (#6477)
by Katayama Hirofumi MZ 11 Feb '24

11 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23db429e42a6c0505882f… commit 23db429e42a6c0505882fe3a9017f0b341d9eff0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 11 13:24:41 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 11 13:24:41 2024 +0900 [MSCTF][MSUTB][SDK] Add CTipbarItem and CTipbarThread (#6477) Supporting the Language bar... JIRA issue: CORE-19363 - Modify msctf.spec. - Add CTipbarThread and CTipbarItem classes. --- dll/win32/msctf/msctf.spec | 6 +- dll/win32/msutb/msutb.cpp | 668 +++++++++++++++++++++++++++++++++++- sdk/include/psdk/msctf.idl | 3 + sdk/include/reactos/cicero/cicuif.h | 13 + 4 files changed, 686 insertions(+), 4 deletions(-) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index 975acdb2118..a2cb7984b72 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -6,7 +6,7 @@ @ stub SetInputScopeXML @ stdcall SetInputScopes(long ptr long ptr long wstr wstr) @ stub TF_CUASAppFix -@ stub TF_CheckThreadInputIdle +@ stdcall -stub TF_CheckThreadInputIdle(long long) @ stub TF_ClearLangBarAddIns @ stdcall -stub TF_CreateCategoryMgr(ptr) @ stdcall -stub TF_CreateCicLoadMutex(ptr) @@ -21,7 +21,7 @@ @ stdcall -stub TF_GetLangIcon(long ptr long) @ stdcall -stub TF_GetMlngHKL(long ptr ptr long) @ stdcall -stub TF_GetMlngIconIndex(long) -@ stub TF_GetThreadFlags +@ stdcall -stub TF_GetThreadFlags(long ptr ptr ptr) @ stdcall TF_GetThreadMgr(ptr) @ stdcall -stub TF_InatExtractIcon(long) @ stdcall TF_InitMlngInfo() @@ -30,7 +30,7 @@ @ stdcall -stub TF_InvalidAssemblyListCache() @ stdcall TF_InvalidAssemblyListCacheIfExist() @ stdcall TF_IsCtfmonRunning() -@ stub TF_IsInMarshaling +@ stdcall -stub TF_IsInMarshaling(long) @ stdcall -stub TF_MlngInfoCount() @ stdcall TF_RunInputCPL() @ stdcall -stub TF_PostAllThreadMsg(long long) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 9d5e6d8f557..31b05578656 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -1259,7 +1259,127 @@ public: /***********************************************************************/ class CTipbarItem; -class CTipbarThread; + +class CTipbarThread +{ +protected: + CTipbarWnd *m_pTipbarWnd; + ITfLangBarItemMgr *m_pLangBarItemMgr; + CicArray<CTipbarItem*> m_UIObjects; + CicArray<CUIFObject*> m_Separators; + DWORD m_dwUnknown32; + DWORD m_dwThreadId; + DWORD m_dwFlags1; + DWORD m_dwFlags2; + INT m_cxGrip; + INT m_cyGrip; + DWORD m_dwFlags3; + DWORD m_dwUnknown34; + LONG m_cRefs; + friend class CTipbarWnd; + friend class CTipbarItem; + +public: + CTipbarThread(CTipbarWnd *pTipbarWnd); + virtual ~CTipbarThread(); + + HRESULT Init(DWORD dwThreadId); + + HRESULT InitItemList(); + HRESULT _UninitItemList(BOOL bUnAdvise); + + DWORD IsDirtyItem(); + BOOL IsFocusThread(); + BOOL IsVertical(); + + void AddAllSeparators(); + void RemoveAllSeparators(); + + void AddUIObjs(); + void RemoveUIObjs(); + + void GetTextSize(BSTR bstr, LPSIZE pSize); + void LocateItems(); + void MyMoveWnd(LONG xDelta, LONG yDelta); + + HRESULT _UnadviseItemsSink(); + LONG _AddRef() { return ++m_cRefs; } + LONG _Release(); + + //FIXME +}; + +/***********************************************************************/ + +class CTipbarItem : public CTipbarAccItem +{ +protected: + DWORD m_dwCookie; + TF_LANGBARITEMINFO m_ItemInfo; + DWORD m_dwUnknown16; + DWORD m_dwUnknown17; + CTipbarThread *m_pTipbarThread; + ITfLangBarItem *m_pLangBarItem; + DWORD m_dwUnknown18[2]; + DWORD m_dwItemFlags; + DWORD m_dwDirty; + DWORD m_dwUnknown19[4]; + friend class CTipbarThread; + friend class CTipbarWnd; + +public: + CTipbarItem( + CTipbarThread *pThread, + ITfLangBarItem *pLangBarItem, + TF_LANGBARITEMINFO *pItemInfo, + DWORD dwUnknown16); + ~CTipbarItem() override; + + void _AddedToUI(); + void _RemovedToUI(); + void AddRemoveMeToUI(BOOL bFlag); + + BOOL IsConnected(); + void ClearConnections(); + + void StartDemotingTimer(BOOL bStarted); + + void MyClientToScreen(LPPOINT ppt, LPRECT prc); + void MyClientToScreen(LPRECT prc) { return MyClientToScreen(NULL, prc); } + + STDMETHOD_(BSTR, GetAccName)() override; + STDMETHOD_(void, GetAccLocation)(LPRECT prc) override; + STDMETHOD_(BOOL, DoAccDefaultAction)() override; + STDMETHOD(OnUnknown40)() { return S_OK; } + STDMETHOD(OnUnknown41)() { return S_OK; } + STDMETHOD(OnUnknown42)() { return S_OK; } + STDMETHOD(OnUnknown43)() { return S_OK; } + STDMETHOD(OnUpdate)(DWORD dwDirty); + STDMETHOD(OnUnknown44)() { return S_OK; } + STDMETHOD_(void, OnUnknown45)(DWORD dwDirty, DWORD dwStatus) { } + STDMETHOD_(void, OnUpdateHandler)(ULONG, ULONG); + STDMETHOD(OnUnknown46)(CUIFWindow *pWindow) { return S_OK; } + STDMETHOD(OnUnknown47)(CUIFWindow *pWindow) { return S_OK; } + STDMETHOD(OnUnknown48)() { return S_OK; } + STDMETHOD(OnUnknown49)() { return S_OK; } + STDMETHOD(OnUnknown50)() { return S_OK; } + STDMETHOD(OnUnknown51)() { return S_OK; } + STDMETHOD(OnUnknown52)() { return S_OK; } + STDMETHOD(OnUnknown53)(BSTR bstr) { return S_OK; } + STDMETHOD_(LPCWSTR, OnUnknown55)() { return NULL; } + STDMETHOD(OnUnknown56)() { return S_OK; } + STDMETHOD_(LPCWSTR, GetToolTip)(); + STDMETHOD(OnUnknown57)(LPRECT prc) { return S_OK; } + STDMETHOD(OnUnknown58)() { return S_OK; } + STDMETHOD_(void, OnUnknown59)() { } + STDMETHOD_(void, OnUnknown60)() { } + STDMETHOD_(void, OnUnknown61)(HWND) { } + STDMETHOD_(void, OnUnknown62)(HWND) { } + STDMETHOD(OnUnknown63)() { return S_OK; } +}; + +/***********************************************************************/ + class CTipbarCtrlButtonHolder; class CDeskBand; @@ -1312,8 +1432,11 @@ class CTipbarWnd LONG m_cRefs; friend class CUTBContextMenu; friend class CTipbarGripper; + friend class CTipbarThread; + friend class CTipbarItem; friend VOID WINAPI ClosePopupTipbar(VOID); friend BOOL GetTipbarInternal(HWND hWnd, DWORD dwFlags, CDeskBand *pDeskBand); + friend LONG MyWaitForInputIdle(DWORD dwThreadId, DWORD dwMilliseconds); public: CTipbarWnd(DWORD style); @@ -4814,6 +4937,549 @@ STDMETHODIMP_(void) CTipbarWnd::HandleMouseMsg(UINT uMsg, LONG x, LONG y) { } +/*********************************************************************** + * CTipbarThread + */ + +CTipbarThread::CTipbarThread(CTipbarWnd *pTipbarWnd) +{ + m_pTipbarWnd = pTipbarWnd; + m_dwThreadId = 0; + m_pLangBarItemMgr = NULL; + m_cRefs = 1; +} + +CTipbarThread::~CTipbarThread() +{ + if (m_pTipbarWnd) + { + RemoveUIObjs(); + m_pTipbarWnd->CleanUpThreadPointer(this, 1); + } + + _UninitItemList(1); + + if (m_pLangBarItemMgr) + { + m_pLangBarItemMgr->Release(); + m_pLangBarItemMgr = NULL; + } +} + +HRESULT CTipbarThread::Init(DWORD dwThreadId) +{ + m_dwThreadId = dwThreadId; + if (!TF_GetThreadFlags(dwThreadId, &m_dwFlags1, &m_dwFlags2, &m_dwFlags3)) + return E_FAIL; + if (m_dwFlags1 & 0x8) + return S_OK; + return m_pTipbarWnd->m_pLangBarMgr->GetThreadLangBarItemMgr(m_dwThreadId, + &m_pLangBarItemMgr, + &dwThreadId); +} + +/// @unimplemented +HRESULT CTipbarThread::InitItemList() +{ + return E_NOTIMPL; +} + +LONG MyWaitForInputIdle(DWORD dwThreadId, DWORD dwMilliseconds) +{ + if (g_pTipbarWnd && (g_pTipbarWnd->m_dwShowType & TF_SFT_DESKBAND)) + return 0; + + if (TF_IsInMarshaling(dwThreadId)) + return STATUS_TIMEOUT; + + DWORD dwFlags1 = 0, dwFlags2 = 0; + if (!TF_GetThreadFlags(dwThreadId, &dwFlags1, &dwFlags2, NULL) && dwFlags2) + return -1; + + return TF_CheckThreadInputIdle(dwThreadId, dwMilliseconds); +} + +HRESULT CTipbarThread::_UninitItemList(BOOL bUnAdvise) +{ + for (size_t iItem = 0; iItem < m_UIObjects.size(); ++iItem) + { + CTipbarItem* pItem = m_UIObjects[iItem]; + if (pItem) + pItem->m_dwItemFlags |= 0x10; + } + + HRESULT hr = S_OK; + if (bUnAdvise) + { + if (m_dwThreadId == ::GetCurrentThreadId() || !MyWaitForInputIdle(m_dwThreadId, 2000)) + hr = _UnadviseItemsSink(); + } + + for (size_t iItem = 0; iItem < m_UIObjects.size(); ++iItem) + { + CTipbarItem* pItem = m_UIObjects[iItem]; + if (pItem) + { + if (m_pTipbarWnd) + pItem->OnUnknown47(m_pTipbarWnd->GetWindow()); + + pItem->ClearConnections(); + + if (m_pTipbarWnd) + pItem->OnUnknown50(); + else + pItem->OnUnknown51(); + + pItem->OnUnknown59(); + pItem->OnUnknown42(); + } + } + + m_UIObjects.clear(); + + RemoveAllSeparators(); + + return hr; +} + +void CTipbarThread::AddAllSeparators() +{ + for (size_t iItem = 0; iItem < m_Separators.size(); ++iItem) + { + CUIFObject *pItem = m_Separators[iItem]; + if (pItem) + m_pTipbarWnd->AddUIObj(pItem); + } +} + +void CTipbarThread::RemoveAllSeparators() +{ + for (size_t iItem = 0; iItem < m_Separators.size(); ++iItem) + { + CUIFObject *pItem = m_Separators[iItem]; + if (pItem) + { + if (m_pTipbarWnd) + m_pTipbarWnd->RemoveUIObj(pItem); + delete pItem; + } + } + m_Separators.clear(); +} + +void CTipbarThread::AddUIObjs() +{ + _AddRef(); + + for (size_t iItem = 0; iItem < m_UIObjects.size(); ++iItem) + { + CTipbarItem* pItem = m_UIObjects[iItem]; + if (pItem && (pItem->m_dwItemFlags & 0x8)) + { + pItem->OnUnknown46(m_pTipbarWnd ? m_pTipbarWnd->GetWindow() : NULL); + } + } + + AddAllSeparators(); + MyMoveWnd(0, 0); + + _Release(); +} + +void CTipbarThread::RemoveUIObjs() +{ + for (size_t iItem = 0; iItem < m_UIObjects.size(); ++iItem) + { + CTipbarItem* pItem = m_UIObjects[iItem]; + if (pItem) + { + pItem->OnUnknown47(m_pTipbarWnd ? m_pTipbarWnd->GetWindow() : NULL); + } + } + RemoveAllSeparators(); +} + +void CTipbarThread::GetTextSize(BSTR bstr, LPSIZE pSize) +{ + HWND hWnd = *m_pTipbarWnd->GetWindow(); + + HGDIOBJ hFontOld = NULL; + + HDC hDC = ::GetDC(hWnd); + if (FAILED(m_pTipbarWnd->EnsureThemeData(*m_pTipbarWnd->GetWindow()))) + { + HFONT hFont = m_pTipbarWnd->m_hFont; + if (hFont) + hFontOld = ::SelectObject(hDC, hFont); + INT cch = ::SysStringLen(bstr); + ::GetTextExtentPoint32W(hDC, bstr, cch, pSize); + if (hFontOld) + ::SelectObject(hDC, hFontOld); + } + else + { + CUIFTheme theme; + theme.m_iPartId = 1; + theme.m_iStateId = 0; + theme.m_pszClassList = L"TOOLBAR"; + + HFONT hFont = NULL; + + if (SUCCEEDED(theme.InternalOpenThemeData(hWnd))) + { + LOGFONTW lf; + if (SUCCEEDED(::GetThemeFont(theme.m_hTheme, NULL, theme.m_iPartId, 0, 210, &lf))) + { + hFont = ::CreateFontIndirectW(&lf); + if (hFont) + hFontOld = ::SelectObject(hDC, hFont); + } + + RECT rc; + INT cch = ::SysStringLen(bstr); + ::GetThemeTextExtent(theme.m_hTheme, hDC, theme.m_iPartId, 0, bstr, cch, 0, NULL, &rc); + + pSize->cx = rc.right; + pSize->cy = rc.bottom; + } + + if (hFontOld) + ::SelectObject(hDC, hFontOld); + if (hFont) + ::DeleteObject(hFont); + } + + ::ReleaseDC(hWnd, hDC); +} + +DWORD CTipbarThread::IsDirtyItem() +{ + DWORD dwDirty = 0; + for (size_t iItem = 0; iItem < m_UIObjects.size(); ++iItem) + { + CTipbarItem* pItem = m_UIObjects[iItem]; + if (pItem) + dwDirty |= pItem->m_dwDirty; + } + return dwDirty; +} + +BOOL CTipbarThread::IsFocusThread() +{ + if (!m_pTipbarWnd) + return FALSE; + return this == m_pTipbarWnd->m_pFocusThread; +} + +BOOL CTipbarThread::IsVertical() +{ + if (!m_pTipbarWnd) + return FALSE; + return !!(m_pTipbarWnd->m_dwTipbarWndFlags & 0x20000000); +} + +/// @unimplemented +void CTipbarThread::LocateItems() +{ +} + +LONG CTipbarThread::_Release() +{ + if (--m_cRefs == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +HRESULT CTipbarThread::_UnadviseItemsSink() +{ + if (!m_pLangBarItemMgr) + return E_FAIL; + + DWORD *pdwCoolkies = new(cicNoThrow) DWORD[m_UIObjects.size()]; + if (!pdwCoolkies) + return E_OUTOFMEMORY; + + const size_t cItems = m_UIObjects.size(); + for (size_t iItem = 0; iItem < cItems; ++iItem) + { + CTipbarItem* pItem = m_UIObjects[iItem]; + if (pItem) + pdwCoolkies[iItem] = pItem->m_dwCookie; + } + + HRESULT hr = m_pLangBarItemMgr->UnadviseItemsSink((LONG)cItems, pdwCoolkies); + + delete[] pdwCoolkies; + + return hr; +} + +void CTipbarThread::MyMoveWnd(LONG xDelta, LONG yDelta) +{ + if (!m_pTipbarWnd || (m_pTipbarWnd->m_pFocusThread != this)) + return; + + RECT Rect, rcWorkArea; + m_pTipbarWnd->GetRect(&Rect); + POINT pt = { Rect.left, Rect.top }; + cicGetWorkAreaRect(pt, &rcWorkArea); + + ::GetWindowRect(*m_pTipbarWnd->GetWindow(), &Rect); + + LONG X0 = Rect.left + xDelta, Y0 = Rect.top + yDelta; + if (m_pTipbarWnd->m_dwTipbarWndFlags & 0x1000) + { + if (m_pTipbarWnd->CheckExcludeCaptionButtonMode(&Rect, &rcWorkArea)) + { + X0 = rcWorkArea.right - (3 * m_pTipbarWnd->m_ButtonWidth + + m_pTipbarWnd->m_cxDlgFrameX2 + m_cxGrip); + Y0 = 0; + } + else + { + m_pTipbarWnd->m_dwTipbarWndFlags &= ~0x1000; + } + } + + if (IsVertical()) + { + LONG width = m_pTipbarWnd->m_cxDlgFrameX2 + m_pTipbarWnd->GetTipbarHeight(); + LONG height = m_cyGrip + m_pTipbarWnd->m_cyDlgFrameX2; + m_pTipbarWnd->SetMoveRect(X0, Y0, width, height); + } + else + { + LONG width = m_cxGrip + m_pTipbarWnd->m_cxDlgFrameX2; + LONG height = m_pTipbarWnd->m_cyDlgFrameX2 + m_pTipbarWnd->GetTipbarHeight(); + m_pTipbarWnd->SetMoveRect(X0, Y0, width, height); + } + + SIZE frameSize = { 0, 0 }; + if (m_pTipbarWnd->m_pWndFrame) + m_pTipbarWnd->m_pWndFrame->GetFrameSize(&frameSize); + + m_pTipbarWnd->LocateCtrlButtons(); + m_pTipbarWnd->AutoAdjustDeskBandSize(); +} + +/*********************************************************************** + * CTipbarItem + */ + +CTipbarItem::CTipbarItem( + CTipbarThread *pThread, + ITfLangBarItem *pLangBarItem, + TF_LANGBARITEMINFO *pItemInfo, + DWORD dwUnknown16) +{ + m_dwUnknown19[1] = 0; + m_dwUnknown19[2] = 0; + m_dwUnknown19[3] = 0; + m_pTipbarThread = pThread; + m_ItemInfo = *pItemInfo; + m_pLangBarItem = pLangBarItem; + m_pLangBarItem->AddRef(); + m_dwItemFlags = 0; + m_dwUnknown16 = dwUnknown16; + m_dwDirty = 0x1001F; +} + +CTipbarItem::~CTipbarItem() +{ + if (g_pTipbarWnd) + { + if (g_pTipbarWnd->m_pTipbarAccessible) + g_pTipbarWnd->m_pTipbarAccessible->RemoveAccItem(this); + } + + if (m_pLangBarItem) + m_pLangBarItem->Release(); +} + +void CTipbarItem::_AddedToUI() +{ + if (!IsConnected()) + return; + + OnUnknown41(); + + m_dwItemFlags |= 0x2; + + DWORD dwStatus; + if (m_dwDirty) + { + if (m_dwDirty & 0x10000) + m_pLangBarItem->GetStatus(&dwStatus); + else + dwStatus = 0; + OnUnknown45(m_dwDirty, dwStatus); + m_dwDirty = 0; + } + + if (m_pTipbarThread) + { + CTipbarWnd *pTipbarWnd = m_pTipbarThread->m_pTipbarWnd; + if (pTipbarWnd) + { + CTipbarAccessible *pTipbarAccessible = pTipbarWnd->m_pTipbarAccessible; + if (pTipbarAccessible) + pTipbarAccessible->AddAccItem(this); + } + } + + OnUnknown42(); +} + +void CTipbarItem::_RemovedToUI() +{ + m_dwItemFlags &= ~0x2; + + if (g_pTipbarWnd) + { + CTipbarAccessible *pAccessible = g_pTipbarWnd->m_pTipbarAccessible; + if (pAccessible) + pAccessible->RemoveAccItem(this); + } +} + +void CTipbarItem::AddRemoveMeToUI(BOOL bFlag) +{ + if (!IsConnected()) + return; + + m_pTipbarThread->LocateItems(); + + if (!IsConnected()) + return; + + m_pTipbarThread->AddAllSeparators(); + + CTipbarWnd *pTipbarWnd = m_pTipbarThread->m_pTipbarWnd; + if (bFlag) + OnUnknown46(pTipbarWnd ? pTipbarWnd->GetWindow() : NULL); + else + OnUnknown47(pTipbarWnd ? pTipbarWnd->GetWindow() : NULL); +} + +BOOL CTipbarItem::IsConnected() +{ + return (!(m_dwItemFlags & 0x10) && m_pTipbarThread && m_pTipbarThread->m_pTipbarWnd && + m_pLangBarItem); +} + +void CTipbarItem::ClearConnections() +{ + m_pTipbarThread = NULL; + if (m_pLangBarItem) + { + m_pLangBarItem->Release(); + m_pLangBarItem = NULL; + } +} + +/// @unimplemented +void CTipbarItem::StartDemotingTimer(BOOL bStarted) +{ + if (!g_bIntelliSense) + return; + + if (!m_pTipbarThread) + return; + + CTipbarWnd *pTipbarWnd = m_pTipbarThread->m_pTipbarWnd; + if (!pTipbarWnd) + return; + + //FIXME +} + +STDMETHODIMP_(BOOL) CTipbarItem::DoAccDefaultAction() +{ + if (!m_pTipbarThread) + return FALSE; + CTipbarWnd *pTipbarWnd = m_pTipbarThread->m_pTipbarWnd; + if (!pTipbarWnd) + return FALSE; + pTipbarWnd->StartDoAccDefaultActionTimer(this); + return TRUE; +} + +/// @unimplemented +STDMETHODIMP_(void) CTipbarItem::OnUpdateHandler(ULONG, ULONG) +{ +} + +STDMETHODIMP_(void) CTipbarItem::GetAccLocation(LPRECT prc) +{ + OnUnknown57(prc); +} + +STDMETHODIMP_(BSTR) CTipbarItem::GetAccName() +{ + return ::SysAllocString(m_ItemInfo.szDescription); +} + +STDMETHODIMP_(LPCWSTR) CTipbarItem::GetToolTip() +{ + OnUnknown41(); + + if (!(m_dwItemFlags & 0x1)) + { + m_dwItemFlags |= 0x1; + + BSTR bstrString; + if (FAILED(m_pLangBarItem->GetTooltipString(&bstrString))) + return NULL; + + if (bstrString) + { + OnUnknown53(bstrString); + ::SysFreeString(bstrString); + } + } + + LPCWSTR pszToolTip = OnUnknown55(); + + OnUnknown42(); + + return pszToolTip; +} + +HRESULT CTipbarItem::OnUpdate(DWORD dwDirty) +{ + if (!IsConnected()) + return S_OK; + + m_dwDirty |= dwDirty; + m_dwItemFlags |= 0x20; + + if ((dwDirty & 0x10000) || (m_dwItemFlags & 0x6)) + { + if (m_pTipbarThread) + { + CTipbarWnd *pTipBarWnd = m_pTipbarThread->m_pTipbarWnd; + if (pTipBarWnd && *pTipBarWnd) + { + pTipBarWnd->KillTimer(6); + pTipBarWnd->SetTimer(6, g_uTimerElapseONUPDATECALLED); + } + } + } + + return S_OK; +} + +void CTipbarItem::MyClientToScreen(LPPOINT ppt, LPRECT prc) +{ + if (!m_pTipbarThread) + return; + if (m_pTipbarThread->m_pTipbarWnd) + m_pTipbarThread->m_pTipbarWnd->MyClientToScreen(ppt, prc); +} + /*********************************************************************** * GetTipbarInternal */ diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index 5ff4b4b090c..f7f3b12327d 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -68,6 +68,9 @@ cpp_quote("EXTERN_C BOOL WINAPI TF_GetMlngHKL(_In_ INT iKL, _Out_ HKL *phKL, _Ou cpp_quote("EXTERN_C INT WINAPI TF_GetMlngIconIndex(_In_ INT iKL);") cpp_quote("EXTERN_C HICON WINAPI TF_InatExtractIcon(_In_ INT iKL);") cpp_quote("EXTERN_C HRESULT WINAPI TF_RunInputCPL(VOID);") +cpp_quote("EXTERN_C BOOL WINAPI TF_GetThreadFlags(_In_ DWORD dwThreadId, _Out_ LPDWORD pdwFlags1, _Out_ LPDWORD pdwFlags2, _Out_ LPDWORD pdwFlags3);") +cpp_quote("EXTERN_C LONG WINAPI TF_CheckThreadInputIdle(_In_ DWORD dwThreadId, _In_ DWORD dwMilliseconds);") +cpp_quote("EXTERN_C BOOL WINAPI TF_IsInMarshaling(_In_ DWORD dwThreadId);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("EXTERN_C const GUID GUID_PROP_ATTRIBUTE;") diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 777c26cea2e..c240027aad5 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -65,6 +65,19 @@ void cicInitUIFSys(void); void cicDoneUIFSys(void); void cicUpdateUIFSys(void); +inline void cicGetWorkAreaRect(POINT pt, LPRECT prc) +{ + ::SystemParametersInfo(SPI_GETWORKAREA, 0, prc, 0); + + HMONITOR hMon = ::MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST); + if (hMon) + { + MONITORINFO mi = { sizeof(mi) }; + if (::GetMonitorInfo(hMon, &mi)) + *prc = mi.rcWork; + } +} + ///////////////////////////////////////////////////////////////////////////// #include <uxtheme.h>

1 0

[reactos] 01/01: [GITHUB] build.yml: Re-enable 'build-msbuild-i386' (#6470)
by Serge Gautherie 10 Feb '24

10 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb55d984c0c03dcdaa5cd… commit eb55d984c0c03dcdaa5cd27b34e8b7a3544eae6a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Feb 10 11:36:38 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 13:36:38 2024 +0300 [GITHUB] build.yml: Re-enable 'build-msbuild-i386' (#6470) Something fixed it in the meantime. Revert 0.4.15-dev-6069-g 56a45014. CORE-18911 --- .github/workflows/build.yml | 51 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31c8af9fd33..e9953ef7f4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -291,29 +291,28 @@ jobs: name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: build/msvc_pdb -# Disable MSBuild for the moment being until a proper fix is provided -- see CORE-18911 -# build-msbuild-i386: -# name: MSBuild (i386) -# runs-on: windows-2019 -# steps: -# - name: Install Flex and Bison -# run: | -# curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z -# 7z x flexbison.7z -O${{github.workspace}}\bin -# echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append -# echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -# echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -# - name: Add CL to PATH -# uses: ilammy/msvc-dev-cmd@v1 -# with: -# arch: amd64_x86 -# - uses: actions/checkout@v4 -# with: -# path: src -# - name: Configure -# run: | -# mkdir build -# cd build -# cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src -# - name: Build -# run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd + build-msbuild-i386: + name: MSBuild (i386) + runs-on: windows-2019 + steps: + - name: Install Flex and Bison + run: | + curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z + 7z x flexbison.7z -O${{github.workspace}}\bin + echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Add CL to PATH + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64_x86 + - uses: actions/checkout@v4 + with: + path: src + - name: Configure + run: | + mkdir build + cd build + cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src + - name: Build + run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd

1 0

[reactos] 01/01: [GITHUB] build.yml: Use all matrix values to restore Linux build cache (#5595)
by Serge Gautherie 10 Feb '24

10 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24dea07c3cc72c5480c2f… commit 24dea07c3cc72c5480c2f12619cf96c49ef1e029 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Feb 10 11:32:27 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 13:32:27 2024 +0300 [GITHUB] build.yml: Use all matrix values to restore Linux build cache (#5595) Do not mix different build configurations. Extend cache key. Addendum to 0.4.15-dev-2996-g f777e6bd and 0.4.15-dev-6472-g 732f223c. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a58c3a7e4b..31c8af9fd33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,9 +53,9 @@ jobs: uses: actions/cache@v4 with: path: ccache - key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} + key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}} restore-keys: | - ccache-${{matrix.compiler}}-${{matrix.arch}}- + ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}- - name: Set ccache settings run: | echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV @@ -133,7 +133,7 @@ jobs: with: path: src - name: Configure - run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DDLL_EXPORT_VERSION=${{matrix.dllver}} + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 - name: Build run: cmake --build build -- -k0 - name: Generate ISOs

1 0

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