Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Sync HCR_RegGetIconW() function to Wine 9.1 (#6418)
by Oleg Dubinskiy 02 Feb '24

02 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=290221ef5bf486face9c9… commit 290221ef5bf486face9c992dca757b871c5e9550 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Fri Feb 2 16:10:36 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 2 18:10:36 2024 +0300 [SHELL32] Sync HCR_RegGetIconW() function to Wine 9.1 (#6418) Import the following fixes: - Use the number of bytes instead of the number of characters in the length passed to RegQueryValueExW. Calculate this by multiplying the number of characters on the size of one wide character in bytes, since only length of characters is passed to the function. This fixes ERROR_MORE_DATA returned from RegQueryValueExW, because the passed number of bytes was less than the actual length of the output buffer, since it was calculated incorrectly, so the function failed even when it received the correct number of wide characters. This partially imports Wine commit: https://github.com/wine-mirror/wine/commit/32584bb521bd9dd14030a663671bea16…. - Limit the number of characters in registry icon index buffer from 7 to 5, as it done in ANSI version of this function, since registry index number can contain up to 4 digits + space for the null-terminator. This fixes problems when loading custom (user-defined) icons from registry, like icons defined by the current user or for all users, instead of just default icons from the root classes. CORE-14758 Co-authored-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dll/win32/shell32/wine/classes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c index df2099914da..ede060044c4 100644 --- a/dll/win32/shell32/wine/classes.c +++ b/dll/win32/shell32/wine/classes.c @@ -239,11 +239,11 @@ BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) static BOOL HCR_RegGetIconW(HKEY hkey, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx) { - DWORD dwType; + DWORD dwType, size = len * sizeof(WCHAR); WCHAR sTemp[MAX_PATH]; - WCHAR sNum[7]; + WCHAR sNum[5]; - if (!RegQueryValueExW(hkey, szName, 0, &dwType, (LPBYTE)szDest, &len)) + if (!RegQueryValueExW(hkey, szName, 0, &dwType, (LPBYTE)szDest, &size)) { if (dwType == REG_EXPAND_SZ) {

1 0

[reactos] 04/04: [ACPI] Return success even if AcpiInterfaceNotificationsRegister is not implemented
by Hervé Poussineau 01 Feb '24

01 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=913235952c165c916cfd5… commit 913235952c165c916cfd5f5e45e6fae8243d0ec2 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Feb 1 10:02:36 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Feb 1 10:08:58 2024 +0100 [ACPI] Return success even if AcpiInterfaceNotificationsRegister is not implemented Drivers calling this function still won't be notified in case of event, but they will at least succeed their initialization. CORE-18309 --- drivers/bus/acpi/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/acpi/interface.c b/drivers/bus/acpi/interface.c index eede95d1943..817f56095b1 100644 --- a/drivers/bus/acpi/interface.c +++ b/drivers/bus/acpi/interface.c @@ -79,7 +79,7 @@ AcpiInterfaceNotificationsRegister(PDEVICE_OBJECT Context, { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } VOID

1 0

[reactos] 03/04: [CMBATT] Send correct tag on IoAcquireRemoveLock
by Hervé Poussineau 01 Feb '24

01 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f1025dccec6d8b0d5d47… commit 7f1025dccec6d8b0d5d471354392563eb6e08c31 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Feb 1 09:57:55 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Feb 1 10:08:58 2024 +0100 [CMBATT] Send correct tag on IoAcquireRemoveLock This prevents an assert in IoReleaseRemoveLock in debug builds, which already receives the 'Irp' tag. --- drivers/bus/acpi/cmbatt/cmbatt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index 257af8e4eb3..2da8f5d6f05 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -358,7 +358,7 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 2) DbgPrint("CmBattIoctl\n"); /* Acquire the remove lock */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, 0); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); if (!NT_SUCCESS(Status)) { /* It's too late, fail */

1 0

[reactos] 02/04: [BATTC] Make input buffer on IOCTL_BATTERY_QUERY_TAG optional
by Hervé Poussineau 01 Feb '24

01 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b5ee5ccc79c3104327da… commit 6b5ee5ccc79c3104327dab6df5ebba5449e1a503 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Feb 1 09:57:35 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Feb 1 10:08:51 2024 +0100 [BATTC] Make input buffer on IOCTL_BATTERY_QUERY_TAG optional In that case, don't wait to get battery tag. --- drivers/battery/battc/battc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/battery/battc/battc.c b/drivers/battery/battc/battc.c index d07db5f4953..2ad86b9d9e9 100644 --- a/drivers/battery/battc/battc.c +++ b/drivers/battery/battc/battc.c @@ -214,14 +214,14 @@ BatteryClassIoctl(PVOID ClassData, switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_BATTERY_QUERY_TAG: - if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG) || + if ((IrpSp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG) && IrpSp->Parameters.DeviceIoControl.InputBufferLength != 0) || IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) { Status = STATUS_BUFFER_TOO_SMALL; break; } - WaitTime = *(PULONG)Irp->AssociatedIrp.SystemBuffer; + WaitTime = IrpSp->Parameters.DeviceIoControl.InputBufferLength == sizeof(ULONG) ? *(PULONG)Irp->AssociatedIrp.SystemBuffer : 0; Timeout.QuadPart = Int32x32To64(WaitTime, -1000);

1 0

[reactos] 01/04: [DEVMGR] Fix diagnostic message when device is failing with CM_PROB_FAILED_ADD
by Hervé Poussineau 01 Feb '24

01 Feb '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=385ac5d4d253d1db4d94a… commit 385ac5d4d253d1db4d94a933962ef558fe371d72 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Feb 1 09:57:02 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Feb 1 09:57:02 2024 +0100 [DEVMGR] Fix diagnostic message when device is failing with CM_PROB_FAILED_ADD In this specific case, we don't have more information to show. This prevents using "FIXME" string as a placeholder for device details. CORE-18309 --- dll/win32/devmgr/lang/bg-BG.rc | 2 +- dll/win32/devmgr/lang/cs-CZ.rc | 2 +- dll/win32/devmgr/lang/de-DE.rc | 2 +- dll/win32/devmgr/lang/el-GR.rc | 2 +- dll/win32/devmgr/lang/en-US.rc | 2 +- dll/win32/devmgr/lang/es-ES.rc | 2 +- dll/win32/devmgr/lang/et-EE.rc | 2 +- dll/win32/devmgr/lang/fr-FR.rc | 2 +- dll/win32/devmgr/lang/he-IL.rc | 2 +- dll/win32/devmgr/lang/hu-HU.rc | 2 +- dll/win32/devmgr/lang/id-ID.rc | 2 +- dll/win32/devmgr/lang/it-IT.rc | 2 +- dll/win32/devmgr/lang/ja-JP.rc | 2 +- dll/win32/devmgr/lang/no-NO.rc | 2 +- dll/win32/devmgr/lang/pl-PL.rc | 2 +- dll/win32/devmgr/lang/pt-BR.rc | 2 +- dll/win32/devmgr/lang/pt-PT.rc | 2 +- dll/win32/devmgr/lang/ro-RO.rc | 2 +- dll/win32/devmgr/lang/ru-RU.rc | 2 +- dll/win32/devmgr/lang/sk-SK.rc | 2 +- dll/win32/devmgr/lang/sq-AL.rc | 2 +- dll/win32/devmgr/lang/tr-TR.rc | 2 +- dll/win32/devmgr/lang/uk-UA.rc | 2 +- dll/win32/devmgr/lang/zh-CN.rc | 2 +- dll/win32/devmgr/lang/zh-HK.rc | 2 +- dll/win32/devmgr/lang/zh-TW.rc | 2 +- dll/win32/devmgr/properties/devprblm.cpp | 5 ----- 27 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index c7ec9608599..7fc1b01d60b 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -74,7 +74,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Водачите за това устройство не са сложени." IDS_DEV_HARDWARE_DISABLED "Устройството е изключено, понеже БИОСът му не му е дал никакви ресурси." IDS_DEV_CANT_SHARE_IRQ "Това устройство ползва заявка за прекъсване (IRQ), която се ползва от друго устройство и не може да бъде споделена.\nТрябва да смените спорната настройка или да махнете водача за реално време, причиняващ неразбирателството." - IDS_DEV_FAILED_ADD "Това устройство не работи правилно, понеже %1 не работи правилно." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "РеактОС не може да сложи водачите за устройството, понеже няма достъп до устройството или мрежовото местоположение, което съдържа нужните файлове." IDS_DEV_TRANSLATION_FAILED "Устройството не отговаря на своя водач (драйвер)." IDS_DEV_NO_SOFTCONFIG "РеактОС не може да определи настройките на устройството. Вижте документацията на устройството и използвайте подпрозореца ""Ресурси"" за да го настроите." diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index 7ea12cccda2..eac630946e4 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -79,7 +79,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Ovladače tohoto zařízení nejsou naintalovány." IDS_DEV_HARDWARE_DISABLED "Toto zařízení je vypnuto, protože mu BIOS nepřiřadil žádné zdroje." IDS_DEV_CANT_SHARE_IRQ "Toto zařízení využívá IRQ, které je využíváno jiným zařízením a nemůže být sdíleno.\nJe potřeba změnit konfliktní nastavení nebo odebrat ovladač způsobující konflikt." - IDS_DEV_FAILED_ADD "Toto zařízení nepracuje správně, protože %1 nepracuje správně." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS nemůže nainstalovat ovladače tohoto zařízení, protože nemá přístup na disk nebo síťové umístění, na kterém se nacházejí instalační soubory." IDS_DEV_TRANSLATION_FAILED "Toto zařízení neodpovídá svému ovladači." IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáže určit nastavení tohoto zařízení. Konzultujte manuál, který byl přibalen k zařízení a použijte záložku ""Zdroje"" k vybrání nastavení." diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index 79b8da95d40..1e341dcc2a0 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Die Treiber für dieses Gerät sind nicht installiert." IDS_DEV_HARDWARE_DISABLED "Dieses Gerät ist deaktiviert, weil das BIOS für dieses Gerät keine Ressourcen zugeteilt hat." IDS_DEV_CANT_SHARE_IRQ "Dieses Gerät benutzt einen Interrupt (IRQ), der bereits von einem anderen Gerät benutzt wird und nicht geteilt werden kann. Sie müssen die kollidierenden Einstellungen ändern, oder den real-mode Treiber entfernen, der den Konflikt verursacht." - IDS_DEV_FAILED_ADD "Dieses Gerät arbeitet nicht korrekt, weil %1 nicht korrekt funktioniert." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS kann die Treiber für dieses Gerät nicht installieren, weil auf das (Netz-)Laufwerk, auf dem die Installationsdateien abgelegt sind, nicht zugegriffen werden kann." IDS_DEV_TRANSLATION_FAILED "Dieses Gerät reagiert nicht auf seinen Treiber." IDS_DEV_NO_SOFTCONFIG "ReactOS kann die Einstellungen für dieses Gerät nicht feststellen. Lesen Sie die Dokumentation, die mit diesem Gerät kam und benutzen Sie den Reiter ""Ressourcen"" umd die Konfiguration vorzunehmen." diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 99e5d1d9c3a..c6b70a7b3ae 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." - IDS_DEV_FAILED_ADD "This device is not working properly because %1 is not working properly." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index 5d5686bbadc..c2da4b467ce 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -74,7 +74,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." - IDS_DEV_FAILED_ADD "This device is not working properly because %1 is not working properly." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index adace42dd18..41b898b2dbb 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -83,7 +83,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Los controladores para este dispositivo no están instalados." IDS_DEV_HARDWARE_DISABLED "Este dispositivo se ha deshabilitado porque la BIOS no ha proporcionado ningún recurso al dispositivo." IDS_DEV_CANT_SHARE_IRQ "Este dispositivo está utilizando un recurso de petición de interrupción (IRQ) que usa otro dispositivo y no puede compartirlo. Cambie la opción conflictiva o desinstale el controlador en tiempo real que causa el conflicto." - IDS_DEV_FAILED_ADD "Este dispositivo no está funcionando correctamente porque %1 no funciona." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS no puede instalar los controladores porque no se puede acceder al disco o ubicación en red que contiene los archivos de instalación." IDS_DEV_TRANSLATION_FAILED "Este dispositivo no está respondiendo a su controlador." IDS_DEV_NO_SOFTCONFIG "ReactOS no puede determinar las propiedades de este dispositivo. Consulte la documentación proporcionada por el dispositivo y utilice la pestaña de recursos para establecer la configuración correcta." diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index 61d47b5c0b4..85cb255a969 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -81,7 +81,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Draiverid selle seadme jaoks ei ole installitud." IDS_DEV_HARDWARE_DISABLED "See seade on keelatud, sest BIOS ei andnud sellele ühtegi ressursi." IDS_DEV_CANT_SHARE_IRQ "See seade kasutab IRQ ressursi, mis on teise seadme poolt kasutuses ja ei saa jagada.\nTe peate muutma konflikteeriva sätte või eemaldama reealajas draiveri mis põhjustab seda konflikti." - IDS_DEV_FAILED_ADD "See seade ei tööta korralikult, sest %1 ei tööta korralikult." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS ei saa installida draivereid selle seadme jaoks, sest juurdepääs kettale või võrgukohale kus paigalduse failid asuvad puudub." IDS_DEV_TRANSLATION_FAILED "See seade ei reageeri draiverile." IDS_DEV_NO_SOFTCONFIG "ReactOS ei saanud määrata seadistada seda seadet. Uuri dokumentatsiooni, mis kaasnes seadmega ja kasuta ressursi vahekaarti selle seadistamiseks." diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 183c09623c9..ea9155328e2 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -75,7 +75,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Les pilotes de ce périphérique ne sont pas installés." IDS_DEV_HARDWARE_DISABLED "Ce périphérique est désactivé car le BIOS ne lui a pas donné de ressources." IDS_DEV_CANT_SHARE_IRQ "Ce périphérique utilise une Interruption Matérielle (IRQ) qui est utilisée par un autre périphérique et ne peut être partagée.\nVous devez changer les réglages en conflit ou enlever le pilote en mode-réel causant le conflit." - IDS_DEV_FAILED_ADD "Ce périphérique ne fonctionne pas correctement parce que %1 ne fonctionne pas correctement." + IDS_DEV_FAILED_ADD "Ce périphérique ne fonctionne pas correctement parce que ReactOS ne peut pas charger les pilotes requis pour ce périphérique." IDS_DEV_DISABLED_SERVICE "ReactOS ne peut pas installer les pilotes pour ce périphérique car il ne peut pas accéder au lecteur ou à l'emplacement réseau contenant les fichiers d'installation." IDS_DEV_TRANSLATION_FAILED "Ce périphérique ne répond pas à son pilote." IDS_DEV_NO_SOFTCONFIG "ReactOS ne peut pas déterminer les réglages de ce périphérique. Consultez la documentation accompagnant ce périphérique et utilisez la page des Ressources pour modifier la configuration." diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index 6d2723856e6..2c43c050c95 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "מנהלי ההתקנים של התקן זה אינם מותקנים." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." - IDS_DEV_FAILED_ADD "This device is not working properly because %1 is not working properly." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 7fc86b5fc73..ca3384c9a56 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -75,7 +75,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Az eszközhöz nincsenek illesztőprogramok telepítve." IDS_DEV_HARDWARE_DISABLED "Az eszköz le van tiltva, mivel a BIOS-a nem adott neki erőforrást." IDS_DEV_CANT_SHARE_IRQ "Ez az eszköz egy olyan megszakítást (IRQ) igényel, amit egy másik eszköz használ és nem osztható meg.\nMódosítsa az ütköző beállításokat vagy távolítsa el az ütközést okozó valós módú illesztőprogramot." - IDS_DEV_FAILED_ADD "Ez az eszköz nem tud megfelelően működni, mivel a(z) %1 sem működik megfelelően." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "A ReactOS nem tudja feltelepíteni az eszköz illesztőprogramjait, mivel a telepítő fájlokat tartalmazó meghajtó vagy hálózati hely nem elérhető." IDS_DEV_TRANSLATION_FAILED "Ez az eszköz nem válaszol a illesztőprogramjának." IDS_DEV_NO_SOFTCONFIG "A ReactOS nem tudja meghatározni a beállításokat ehhez az eszközhöz. Olvassa át a hozzá kapott dokumentációt és az erőforrások fülön végezze el a beállításokat." diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index 86d44ad468e..6219a40f917 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Driver untuk perangkat ini tidak dipasang." IDS_DEV_HARDWARE_DISABLED "Perangkat ini dimatikan karena BIOS untuk perangkat ini tidak memberikan sumber dayanya." IDS_DEV_CANT_SHARE_IRQ "Perangkat ini menggunakan sumber daya Interrupt Request (IRQ) yang dipakai oleh perangkat lain dan tidak bisa berbagi.\nAnda harus mengubah setelan yang konflik atau menghapus real-mode driver penyebab konflik." - IDS_DEV_FAILED_ADD "Perangkat ini tidak bekerja dengan benar karena %1 tidak bekerja dengan baik." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS tidak bisa memasang driver untuk perangkat ini karena ia tidak bisa mengakses drive atau lokasi jaringan di mana berkas setelannya berada di dalamnya." IDS_DEV_TRANSLATION_FAILED "Perangkat ini tidak merespon terhadap driver-nya." IDS_DEV_NO_SOFTCONFIG "ReactOS tidak bisa memeriksa setelan untuk perangkat ini. Lihat dokumentasi yang terdapat pada perangkat ini dan gunakan tab Sumber Daya untuk menyetel konfigurasi." diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index 09b5d6a3b60..0d930cbf99a 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "I driver non sono installati." IDS_DEV_HARDWARE_DISABLED "Disabilitato perchè il BIOS del dispositivo non ha assegnato nessuna risorsa." IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver ""real-mode"" che provoca il conflitto." - IDS_DEV_FAILED_ADD "Non funziona regolarmente a causa di %1 ." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS non può installare i driver del dispositivo perchè non è possibile accedere al disco o alla rete dove si trovano i file di setup." IDS_DEV_TRANSLATION_FAILED "Il dispositivo non risponde ai suoi driver." IDS_DEV_NO_SOFTCONFIG "ReactOS non può individuare le impostazioni necessarie. Verificate la documentazione e usate il tab Risorse per impostare la configurazione." diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index 1fc049d01d4..da0477b9274 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -74,7 +74,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "このデバイスに対するドライバは、インストールされていません。" IDS_DEV_HARDWARE_DISABLED "このデバイスは、BIOS がリソースを提供しなかったため、無効になっています。" IDS_DEV_CANT_SHARE_IRQ "このデバイスは、他のデバイスが使用中のIRQ (Interrupt Request) リソースを使っており、共有できません。\nあなたは、競合する設定を変更するか、競合を引き起こしているリアルモードドライバを除去する必要があります。" - IDS_DEV_FAILED_ADD "%1 が正しく動作していないため、このデバイスは、正しく動作していません。" + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "セットアップファイルがあるドライブかネットワークの場所にアクセスできないため、ReactOS は、このデバイスに対するドライバをインストールできません。" IDS_DEV_TRANSLATION_FAILED "このデバイスは、このドライバに応答していません。" IDS_DEV_NO_SOFTCONFIG "ReactOS は、このデバイスに対する設定を決定できません。このデバイスに付属する文書と相談するか、構成をセットするためにリソースタブを使用して下さい。" diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index cb027cc7d2d..b1bf6dfac0f 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Driveren for denne enheten er ikke installert." IDS_DEV_HARDWARE_DISABLED "Denne enheten er deaktivert fordi BIOS for enheten gir ikke andre ressurser." IDS_DEV_CANT_SHARE_IRQ "Denne enheten bruker en Interrupt Request (IRQ) ressurs som er i bruk av en annen enhet og kan ikke bli delt.\nDu må endre konflikt innstillingen eller fjerne ekte-modus driver som forårsaker konflikten." - IDS_DEV_FAILED_ADD "Denne enheten vil ikke fungere som den skal fordi %1 vil ikke fungere som den skal." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS kan ikke installere driveren for denne enheten, fordi den får ikke tilgang til driveren eller nettverks plasseringen som har installering filen." IDS_DEV_TRANSLATION_FAILED "Denne enheten vil ikke svare på grunn av driveren." IDS_DEV_NO_SOFTCONFIG "ReactOS kan ikke oppdage innstillingene for denne enheten. Ta hensyn til dokumentasjon som kommer med denne enheten og bruker ressursen tab for å sette konfigurasjonen." diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index 5f37465a4dc..551077f3365 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -85,7 +85,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Nie zainstalowano sterownika dla tego urządzenia." IDS_DEV_HARDWARE_DISABLED "Urządzenie jest wyłączone, ponieważ BIOS nie przydzielił żadnych zasobów dla tego urządzenia." IDS_DEV_CANT_SHARE_IRQ "Urządzenie żąda przerwania (IRQ), którego używa inne urządzenia i którego nie można współdzielić. Musisz zmienić ustawienia lub usunąć sterownik powodujący konflikt." - IDS_DEV_FAILED_ADD "Urządzenie nie działa prawidłowo, ponieważ %1 również nie działa poprawnie." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS nie mógł zainstalować sterownika dla urządzenia, ponieważ nie mógł uzyskać dostępu do lokacji zawartej w pliku instalacyjnym." IDS_DEV_TRANSLATION_FAILED "Sterownik nie jest przeznaczony dla tego urządzenia." IDS_DEV_NO_SOFTCONFIG "ReactOS nie mógł określić ustawień dla tego urządzenia. Poszukaj rozwiązania w dokumentacji urządzenia i użyj ustawień zasobów, aby skonfigurować je ręcznie." diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index e6ecb1f8f82..9a827214a45 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Os drivers para este dispositivo não estão instalados." IDS_DEV_HARDWARE_DISABLED "Este dispositivo está desativado porque a BIOS para o dispositivo não lhe deu nenhum recurso." IDS_DEV_CANT_SHARE_IRQ "Este dispositivo está utilizando um recurso de Requisição de Interrupção (IRQ) que está em uso por outro dispositivo e não pode ser compartilhado.\nVocê pode alterar a configuração conflitante ou remover o driver de modo real que está causando o conflito." - IDS_DEV_FAILED_ADD "Este dispositivo não está funcionando corretamente porque %1 não está funcionando corretamente." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "O ReactOS não pode instalar os drivers para este dispositivo porque não consegue acessar o drive ou local de rede que possui os arquivos de configuração." IDS_DEV_TRANSLATION_FAILED "Este dispositivo não está respondendo ao seu driver." IDS_DEV_NO_SOFTCONFIG "O ReactOS não pode determinar as configurações para este dispositivo. Consulte a documentação que veio com este dispositivo e utilize a guia Recursos para definir a configuração." diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index d58c67ab136..d1267d2022e 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Os controladores para este dispositivo não estão instalados." IDS_DEV_HARDWARE_DISABLED "Este dispositivo está desactivado porque a BIOS para o dispositivo não lhe deu nenhum recurso." IDS_DEV_CANT_SHARE_IRQ "Este dispositivo utiliza um recurso de Requisição de Interrupção (IRQ) que está em uso por outro dispositivo e não pode ser compartilhado.\nDeve alterar a configuração conflitante ou remover o controlador de modo real que está a causar o conflito." - IDS_DEV_FAILED_ADD "Este dispositivo não está a funcionar correctamente porque %1 não está a funcionar correctamente." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "O ReactOS não pode instalar os controladores para este dispositivo porque não consegue acessar o controlador ou local de rede que possui os ficheiros de configuração." IDS_DEV_TRANSLATION_FAILED "Este dispositivo não está a responder ao seu controlador." IDS_DEV_NO_SOFTCONFIG "O ReactOS não pode determinar as configurações para este dispositivo. Consulte a documentação que veio com este dispositivo e utilize o guia de recursos para definir a configuração." diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index ff646dfe07c..f346fb140a2 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -83,7 +83,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Driverele ale acestui dispozitiv nu sunt instalate." IDS_DEV_HARDWARE_DISABLED "Acest dispozitiv este dezactivat deoarece BIOS nu i-a alocat resursele necesare." IDS_DEV_CANT_SHARE_IRQ "Acest dispozitiv necesită o cerere de întrerupere (IRQ) care este folosită deja de alt dispozitiv și care nu poate fi folosită în comun.\nFie modificați configurația dispozitivelor pentru a rezolva problema gestiunii cererilor de întreruperi, fie eliminați Driverul de mod-real care provoacă acest conflict." - IDS_DEV_FAILED_ADD "Acest dispozitiv nu funcționează corect deoarcere %1 nu funcționează corect." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS nu poate instala driverele pentru acest dispozitiv deoarece locația de stocare a fișierelor necesare pentru instalare nu a putut fi accesată." IDS_DEV_TRANSLATION_FAILED "Acest dispozitiv nu răspunde la comenzile driverului." IDS_DEV_NO_SOFTCONFIG "ReactOS nu poate determina setările acestui dispozitiv. Consultați-i documentația din dotare și utilizați compartimentul „Resurse” pentru a-i stabili configurația corectă." diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index 32a798665fa..0b9feea8c0a 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Драйверы для этого устройства не установлены." IDS_DEV_HARDWARE_DISABLED "Это устройство отключено, поскольку BIOS устройства не предоставил никаких ресурсов." IDS_DEV_CANT_SHARE_IRQ "Это устройство использует IRQ-ресурс, который используется другим устройством и не может быть общим.\nВы должны изменить конфликтную настройку или удалить драйвер реального режима, создающий конфликт." - IDS_DEV_FAILED_ADD "Устройство работает неправильно, поскольку %1 неисправен." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS не может установить драйвера для этого устройства, потому что не может получить доступ к месту расположения установочных файлов." IDS_DEV_TRANSLATION_FAILED "Это устройство не отвечает своему драйверу." IDS_DEV_NO_SOFTCONFIG "ReactOS не удалось определить настройки для этого устройства. Ознакомтесь с его документацией и воспользуйтесь вкладкой Ресурсы для настройки." diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index 74b95fa6590..617fc5c0b26 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -79,7 +79,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." - IDS_DEV_FAILED_ADD "This device is not working properly because %1 is not working properly." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index a92819f36e1..ef2f22b9dfa 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -78,7 +78,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Komanduesit për këtë pajisje nuk janë instaluar." IDS_DEV_HARDWARE_DISABLED "Kjo pajisje është me aftësi të kufizuara, sepse BIOS për pajisjen nuk jep asnjë burimeve." IDS_DEV_CANT_SHARE_IRQ "Kjo pajisje po përdorur një kërkesë interrupt (IRQ) e burimeve që është në përdorim nga një tjetër pajisje dhe nuk mund të ndahet.\nJu duhet të ndryshoni vendosjen konfliktuale ose hiqni menyren-reale e komanduesit që shkakton konfliktin." - IDS_DEV_FAILED_ADD "Kjo pajisje nuk punon si duhet për shkak %1 nuk është duke punuar si duhet." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS nuk mund të instaloni komanduesin për këtë pajisje, sepse ajo nuk mund të hyje ne driverin apo vendin e rrjetit që ka dokumentat e instalimit në të." IDS_DEV_TRANSLATION_FAILED "Kjo pajisje nuk i përgjigjer komanduesit të saj." IDS_DEV_NO_SOFTCONFIG "ReactOS nuk mund të përcaktojë parametrat për këtë pajisje. Konsultoni dokumentacionin që erdhi me këtë pajisje dhe të përdorin tabelen e Burimeve për të vendosur konfigurimin." diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index b3ba51800b9..819c4e26d05 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -76,7 +76,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Bu aygıt için sürücüler kurulu değil." IDS_DEV_HARDWARE_DISABLED "Bu aygıtın BIOS'u, aygıta kaynak vermediği için bu aygıt devre dışı." IDS_DEV_CANT_SHARE_IRQ "Bu aygıt, başka bir aygıt tarafından kullanımda olan ve paylaşılamayan bir Kesme İsteği (IRQ) kaynağı kullanıyor.\nÇakışan ayarı değiştirmeli ya da çakışmaya neden olan sürücüyü kaldırmalısınız." - IDS_DEV_FAILED_ADD "%1 düzgün çalışmadığı için bu aygıt düzgün çalışmıyor." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS, kurulum dosyalarının üzerinde bulunduğu sürücüye ya da ağ konumuna erişemediği için, bu aygıt için sürücüleri kuramıyor." IDS_DEV_TRANSLATION_FAILED "Bu aygıt, sürücüsüne yanıt vermiyor." IDS_DEV_NO_SOFTCONFIG "ReactOS, bu aygıt için ayarları belirleyemiyor. Bu aygıtla gelen belgelere bakınız ve yapılandırmayı yapmak için ""Kaynaklar"" sekmesini kullanınız." diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index c84b01481ff..dd4c1f3f68f 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -82,7 +82,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "Драйвери для цього пристрою не встановлені." IDS_DEV_HARDWARE_DISABLED "Цей пристрій вимкнено, оскільки BIOS не виділив для пристрою ресурсів." IDS_DEV_CANT_SHARE_IRQ "Цей пристрій використувує ресурс Запиту Переривань (IRQ), який використовується іншим пристроєм та не може бути спільним.\nВи повинні змінити конфліктуючі налаштування або видалити драйвер реального режиму, що спричинює конфлікт." - IDS_DEV_FAILED_ADD "Цей пристрій працює неправильно, оскільки %1 працює неправильно." + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS не може встановити драйвери для цього пристрою, оскільки не має доступу до диску чи мережного ресурсу, які містять файли установки." IDS_DEV_TRANSLATION_FAILED "Цей пристрій не відповідає його драйверу." IDS_DEV_NO_SOFTCONFIG "ReactOS не може визначити налаштуванн для цього пристрою. Зверніться до документації пристрою, і використовуйте вкладку Ресурси для налаштування конфігурації." diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index ee8db668545..78578b0c591 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -83,7 +83,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "此设备的驱动程序未安装。" IDS_DEV_HARDWARE_DISABLED "此设备被禁用，因为该设备的 BIOS 没有给它任何资源。" IDS_DEV_CANT_SHARE_IRQ "此设备正在使用的另一个设备正在使用，无法共享中断请求（IRQ）资源。\n您必须更改冲突的设置，或删除造成冲突的实模式驱动程序。" - IDS_DEV_FAILED_ADD "此设备不能正常工作，因为 %1 工作不正常。" + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS 不能安装此设备的驱动程序，因为它不能访问已安装文件的驱动器或网络上的位置。" IDS_DEV_TRANSLATION_FAILED "此设备对驱动程序没有响应。" IDS_DEV_NO_SOFTCONFIG "ReactOS 不能确定此设备的设置。请参考此设备附带的文档，使用资源选项卡来设置配置。" diff --git a/dll/win32/devmgr/lang/zh-HK.rc b/dll/win32/devmgr/lang/zh-HK.rc index 96bdc5655fa..833da6c7e38 100644 --- a/dll/win32/devmgr/lang/zh-HK.rc +++ b/dll/win32/devmgr/lang/zh-HK.rc @@ -82,7 +82,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "這個裝置的驅動程式尚未安裝。" IDS_DEV_HARDWARE_DISABLED "這個裝置已停用，因為該裝置的 BIOS 沒有給它任何資源。" IDS_DEV_CANT_SHARE_IRQ "這個裝置正在使用另一個裝置使用中的插斷請求（IRQ）資源。\n您必須更改衝突的設定，或刪除造成衝突的真實模式驅動程式。" - IDS_DEV_FAILED_ADD "這個裝置未正常工作，因為 %1 工作不正常。" + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS 無法安裝這個裝置的驅動程式，因為它不能訪問已安裝檔案的驅動器或網路上的位置。" IDS_DEV_TRANSLATION_FAILED "這個裝置沒有對其驅動程式回應。" IDS_DEV_NO_SOFTCONFIG "ReactOS 無法判定這個裝置的設定值。請參考隨這個裝置附送的檔案，使用資源索引標籤來進行設定。" diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 76f1ba1db40..f0565d556e8 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -82,7 +82,7 @@ BEGIN IDS_DEV_FAILED_INSTALL "這個裝置的驅動程式尚未安裝。" IDS_DEV_HARDWARE_DISABLED "這個裝置已停用，因為該裝置的 BIOS 沒有給它任何資源。" IDS_DEV_CANT_SHARE_IRQ "這個裝置正在使用另一個裝置使用中的插斷請求（IRQ）資源。\n您必須更改衝突的設定，或刪除造成衝突的真實模式驅動程式。" - IDS_DEV_FAILED_ADD "這個裝置未正常工作，因為 %1 工作不正常。" + IDS_DEV_FAILED_ADD "This device is not working properly because ReactOS cannot load the drivers required for this device." IDS_DEV_DISABLED_SERVICE "ReactOS 無法安裝這個裝置的驅動程式，因為它不能訪問已安裝檔案的驅動器或網路上的位置。" IDS_DEV_TRANSLATION_FAILED "這個裝置沒有對其驅動程式回應。" IDS_DEV_NO_SOFTCONFIG "ReactOS 無法判定這個裝置的設定值。請參考隨這個裝置附送的檔案，使用資源索引標籤來進行設定。" diff --git a/dll/win32/devmgr/properties/devprblm.cpp b/dll/win32/devmgr/properties/devprblm.cpp index b2017003009..55e4a676255 100644 --- a/dll/win32/devmgr/properties/devprblm.cpp +++ b/dll/win32/devmgr/properties/devprblm.cpp @@ -573,11 +573,6 @@ DeviceProblemTextW(IN HMACHINE hMachine OPTIONAL, case CM_PROB_DISABLED: /* FIXME - if the device was disabled by the system use IDS_DEV_DISABLED2 */ break; - - case CM_PROB_FAILED_ADD: - /* FIXME - get the name of the sub-device with the error */ - AdvFormat = TRUE; - break; } if (AdvFormat)

1 0

[reactos] 01/01: [MSUTB][SDK] Add InitFromReg (#6425)
by Katayama Hirofumi MZ 31 Jan '24

31 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1dfd580ab6900eb72550… commit c1dfd580ab6900eb725502d2125ff42028dbcb1f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 31 20:32:21 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 31 20:32:21 2024 +0900 [MSUTB][SDK] Add InitFromReg (#6425) Supporting Language Bar... JIRA issue: CORE-19363 - Add many global variables to add UTB settings. - Add IsSkipRedrawHKL, IsBiDiLocalizedSystem, InitSkipRedrawHKLArray helper functions. - Add InitFromReg helper function to load the settings from registry. - Add CicRegKey::EnumValue method. --- dll/win32/msutb/msutb.cpp | 291 +++++++++++++++++++++++++++++++++--- sdk/include/reactos/cicero/cicreg.h | 13 ++ 2 files changed, 287 insertions(+), 17 deletions(-) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 26816ecb962..1a8ee45cc03 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -16,7 +16,42 @@ DWORD g_dwOSInfo = 0; CRITICAL_SECTION g_cs; LONG g_DllRefCount = 0; +BOOL g_bShowTipbar = TRUE; +BOOL g_bShowDebugMenu = FALSE; +BOOL g_bNewLook = TRUE; +BOOL g_bIntelliSense = FALSE; +BOOL g_bShowCloseMenu = FALSE; +UINT g_uTimeOutNonIntentional = 60 * 1000; +UINT g_uTimeOutIntentional = 10 * 60 * 1000; +UINT g_uTimeOutMax = 60 * 60 * 1000; +BOOL g_bShowMinimizedBalloon = TRUE; +POINT g_ptTipbar = { -1, -1 }; +BOOL g_bExcludeCaptionButtons = TRUE; +BOOL g_bShowShadow = FALSE; +BOOL g_fTaskbarTheme = TRUE; +BOOL g_fVertical = FALSE; +UINT g_uTimerElapseSTUBSTART = 100; +UINT g_uTimerElapseSTUBEND = 2 * 1000; +UINT g_uTimerElapseBACKTOALPHA = 3 * 1000; +UINT g_uTimerElapseONTHREADITEMCHANGE = 200; +UINT g_uTimerElapseSETWINDOWPOS = 100; +UINT g_uTimerElapseONUPDATECALLED = 50; +UINT g_uTimerElapseSYSCOLORCHANGED = 20; +UINT g_uTimerElapseDISPLAYCHANGE = 20; +UINT g_uTimerElapseUPDATEUI = 70; +UINT g_uTimerElapseSHOWWINDOW = 50; +UINT g_uTimerElapseMOVETOTRAY = 50; +UINT g_uTimerElapseTRAYWNDONDELAYMSG = 50; UINT g_uTimerElapseDOACCDEFAULTACTION = 200; +UINT g_uTimerElapseENSUREFOCUS = 50; +BOOL g_bShowDeskBand = FALSE; +UINT g_uTimerElapseSHOWDESKBAND = 3 * 1000; +BOOL g_fPolicyDisableCloseButton = FALSE; +BOOL g_fPolicyEnableLanguagebarInFullscreen = FALSE; +DWORD g_dwWndStyle = 0; +DWORD g_dwMenuStyle = 0; +DWORD g_dwChildWndStyle = 0; +BOOL g_fRTL = FALSE; #define TIMER_ID_DOACCDEFAULTACTION 11 @@ -45,6 +80,76 @@ class CButtonIconItem; CTipbarWnd *g_pTipbarWnd = NULL; +CicArray<HKL> *g_prghklSkipRedrawing = NULL; + +BOOL IsSkipRedrawHKL(HKL hSkipKL) +{ + if (LOWORD(hSkipKL) == MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT)) + return FALSE; // Japanese HKL will be skipped + if (!g_prghklSkipRedrawing) + return FALSE; + + for (size_t iItem = 0; iItem < g_prghklSkipRedrawing->size(); ++iItem) + { + if ((*g_prghklSkipRedrawing)[iItem] == hSkipKL) + return TRUE; // To be skipped + } + + return FALSE; // To be not skipped +} + +BOOL IsBiDiLocalizedSystem(void) +{ + LOCALESIGNATURE Sig; + LANGID LangID = ::GetUserDefaultUILanguage(); + if (!LangID) + return FALSE; + + INT size = sizeof(Sig) / sizeof(WCHAR); + if (!::GetLocaleInfoW(LangID, LOCALE_FONTSIGNATURE, (LPWSTR)&Sig, size)) + return FALSE; + return (Sig.lsUsb[3] & 0x8000000) != 0; +} + +void InitSkipRedrawHKLArray(void) +{ + g_prghklSkipRedrawing = new(cicNoThrow) CicArray<HKL>(); + if (!g_prghklSkipRedrawing) + return; + + g_prghklSkipRedrawing->Add((HKL)UlongToHandle(0xE0010411)); // Japanese IME will be skipped + + CicRegKey regKey; + LSTATUS error = regKey.Open(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\SkipRedrawHKL")); + if (error != ERROR_SUCCESS) + return; + + TCHAR szValueName[256]; + for (DWORD dwIndex = 0; ; ++dwIndex) + { + error = regKey.EnumValue(dwIndex, szValueName, _countof(szValueName)); + if (error != ERROR_SUCCESS) + break; + + if (szValueName[0] == TEXT('0') && + (szValueName[1] == TEXT('x') || szValueName[1] == TEXT('X'))) + { + HKL hKL = (HKL)UlongToHandle(_tcstoul(szValueName, NULL, 16)); + g_prghklSkipRedrawing->Add(hKL); // This hKL will be skipped + } + } +} + +void UninitSkipRedrawHKLArray(void) +{ + if (g_prghklSkipRedrawing) + { + delete g_prghklSkipRedrawing; + g_prghklSkipRedrawing = NULL; + } +} + HRESULT GetGlobalCompartment(REFGUID rguid, ITfCompartment **ppComp) { ITfCompartmentMgr *pCompMgr = NULL; @@ -123,6 +228,166 @@ void DoCloseLangbar(void) ::RegDeleteValue(regKey, TEXT("ctfmon.exe")); } +BOOL InitFromReg(void) +{ + DWORD dwValue; + LSTATUS error; + + CicRegKey regKey1; + error = regKey1.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\")); + if (error == ERROR_SUCCESS) + { + error = regKey1.QueryDword(TEXT("ShowTipbar"), &dwValue); + if (error == ERROR_SUCCESS) + g_bShowTipbar = !!dwValue; + } + + CicRegKey regKey2; + error = regKey2.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\")); + if (error == ERROR_SUCCESS) + { + error = regKey2.QueryDword(TEXT("ShowDebugMenu"), &dwValue); + if (error == ERROR_SUCCESS) + g_bShowDebugMenu = !!dwValue; + error = regKey2.QueryDword(TEXT("NewLook"), &dwValue); + if (error == ERROR_SUCCESS) + g_bNewLook = !!dwValue; + error = regKey2.QueryDword(TEXT("IntelliSense"), &dwValue); + if (error == ERROR_SUCCESS) + g_bIntelliSense = !!dwValue; + error = regKey2.QueryDword(TEXT("ShowCloseMenu"), &dwValue); + if (error == ERROR_SUCCESS) + g_bShowCloseMenu = !!dwValue; + error = regKey2.QueryDword(TEXT("TimeOutNonIntentional"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimeOutNonIntentional = 1000 * dwValue; + error = regKey2.QueryDword(TEXT("TimeOutIntentional"), &dwValue); + if (error == ERROR_SUCCESS) + { + g_uTimeOutIntentional = 1000 * dwValue; + g_uTimeOutMax = 6000 * dwValue; + } + error = regKey2.QueryDword(TEXT("ShowMinimizedBalloon"), &dwValue); + if (error == ERROR_SUCCESS) + g_bShowMinimizedBalloon = !!dwValue; + error = regKey2.QueryDword(TEXT("Left"), &dwValue); + if (error == ERROR_SUCCESS) + g_ptTipbar.x = dwValue; + error = regKey2.QueryDword(TEXT("Top"), &dwValue); + if (error == ERROR_SUCCESS) + g_ptTipbar.y = dwValue; + error = regKey2.QueryDword(TEXT("ExcludeCaptionButtons"), &dwValue); + if (error == ERROR_SUCCESS) + g_bExcludeCaptionButtons = !!dwValue; + error = regKey2.QueryDword(TEXT("ShowShadow"), &dwValue); + if (error == ERROR_SUCCESS) + g_bShowShadow = !!dwValue; + error = regKey2.QueryDword(TEXT("TaskbarTheme"), &dwValue); + if (error == ERROR_SUCCESS) + g_fTaskbarTheme = !!dwValue; + error = regKey2.QueryDword(TEXT("Vertical"), &dwValue); + if (error == ERROR_SUCCESS) + g_fVertical = !!dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseSTUBSTART"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseSTUBSTART = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseSTUBEND"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseSTUBEND = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseBACKTOALPHA"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseBACKTOALPHA = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseONTHREADITEMCHANGE"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseONTHREADITEMCHANGE = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseSETWINDOWPOS"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseSETWINDOWPOS = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseONUPDATECALLED"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseONUPDATECALLED = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseSYSCOLORCHANGED"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseSYSCOLORCHANGED = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseDISPLAYCHANGE"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseDISPLAYCHANGE = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseUPDATEUI"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseUPDATEUI = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseSHOWWINDOW"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseSHOWWINDOW = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseMOVETOTRAY"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseMOVETOTRAY = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseTRAYWNDONDELAYMSG"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseTRAYWNDONDELAYMSG = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseDOACCDEFAULTACTION"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseDOACCDEFAULTACTION = dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseENSUREFOCUS"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseENSUREFOCUS = dwValue; + error = regKey2.QueryDword(TEXT("ShowDeskBand"), &dwValue); + if (error == ERROR_SUCCESS) + g_bShowDeskBand = !!dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseSHOWWDESKBAND"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseSHOWDESKBAND = dwValue; + } + + CicRegKey regKey3; + error = regKey3.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Policies\\Microsoft\\MSCTF")); + if (error == ERROR_SUCCESS) + { + error = regKey3.QueryDword(TEXT("DisableCloseButton"), &dwValue); + if (error == ERROR_SUCCESS) + g_fPolicyDisableCloseButton = !!dwValue; + } + + CicRegKey regKey4; + error = regKey4.Open(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Policies\\Microsoft\\MSCTF")); + if (error == ERROR_SUCCESS) + { + error = regKey4.QueryDword(TEXT("EnableLanguagebarInFullscreen"), &dwValue); + if (error == ERROR_SUCCESS) + g_fPolicyEnableLanguagebarInFullscreen = !!dwValue; + } + + InitSkipRedrawHKLArray(); + + if (g_bNewLook) + { + g_dwWndStyle = UIF_WINDOW_ENABLETHEMED | UIF_WINDOW_WORKAREA | UIF_WINDOW_TOOLTIP | + UIF_WINDOW_TOOLWINDOW | UIF_WINDOW_TOPMOST; + if (g_bShowShadow) + g_dwWndStyle |= UIF_WINDOW_SHADOW; + g_dwMenuStyle = 0x10000000 | UIF_WINDOW_MONITOR | UIF_WINDOW_SHADOW | + UIF_WINDOW_TOOLWINDOW | UIF_WINDOW_TOPMOST; + } + else + { + g_dwWndStyle = UIF_WINDOW_WORKAREA | UIF_WINDOW_TOOLTIP | UIF_WINDOW_DLGFRAME | + UIF_WINDOW_TOPMOST; + g_dwMenuStyle = UIF_WINDOW_MONITOR | UIF_WINDOW_DLGFRAME | UIF_WINDOW_TOPMOST; + } + + g_dwChildWndStyle = + UIF_WINDOW_ENABLETHEMED | UIF_WINDOW_NOMOUSEMSG | UIF_WINDOW_TOOLTIP | UIF_WINDOW_CHILD; + + if (IsBiDiLocalizedSystem()) + { + g_dwWndStyle |= UIF_WINDOW_LAYOUTRTL; + g_dwChildWndStyle |= UIF_WINDOW_LAYOUTRTL; + g_dwMenuStyle |= UIF_WINDOW_LAYOUTRTL; + g_fRTL = TRUE; + } + + return TRUE; +} + /***********************************************************************/ class CUTBLangBarDlg @@ -487,7 +752,10 @@ public: CTrayIconWnd(); ~CTrayIconWnd(); - BOOL RegisterClass(); + static BOOL RegisterClass(); + static CTrayIconWnd *GetThis(HWND hWnd); + static void SetThis(HWND hWnd, LPCREATESTRUCT pCS); + HWND CreateWnd(); void DestroyWnd(); @@ -502,9 +770,6 @@ public: HWND GetNotifyWnd(); BOOL OnIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); - static CTrayIconWnd *GetThis(HWND hWnd); - static void SetThis(HWND hWnd, LPCREATESTRUCT pCS); - void CallOnDelayMsg(); }; @@ -2188,9 +2453,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return gModule.DllGetClassObject(rclsid, riid, ppv); } -/** - * @implemented - */ +/// @implemented HRESULT APIENTRY MsUtbCoCreateInstance( REFCLSID rclsid, @@ -2206,9 +2469,7 @@ MsUtbCoCreateInstance( return cicRealCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); } -/** - * @unimplemented - */ +/// @implemented BOOL ProcessAttach(HINSTANCE hinstDLL) { ::InitializeCriticalSectionAndSpinCount(&g_cs, 0); @@ -2220,7 +2481,7 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) TFInitLib(MsUtbCoCreateInstance); cicInitUIFLib(); - //CTrayIconWnd::RegisterClassW(); //FIXME + CTrayIconWnd::RegisterClass(); g_wmTaskbarCreated = RegisterWindowMessageW(L"TaskbarCreated"); @@ -2230,9 +2491,7 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) return TRUE; } -/** - * @implemented - */ +/// @implemented VOID ProcessDetach(HINSTANCE hinstDLL) { cicDoneUIFLib(); @@ -2241,9 +2500,7 @@ VOID ProcessDetach(HINSTANCE hinstDLL) gModule.Term(); } -/** - * @implemented - */ +/// @implemented EXTERN_C BOOL WINAPI DllMain( _In_ HINSTANCE hinstDLL, diff --git a/sdk/include/reactos/cicero/cicreg.h b/sdk/include/reactos/cicero/cicreg.h index ec3718da046..b5a99658a15 100644 --- a/sdk/include/reactos/cicero/cicreg.h +++ b/sdk/include/reactos/cicero/cicreg.h @@ -65,6 +65,8 @@ public: } LSTATUS RecurseDeleteKey(LPCTSTR lpSubKey); + + LSTATUS EnumValue(DWORD dwIndex, LPTSTR lpValueName, DWORD cchValueName); }; /******************************************************************************/ @@ -162,3 +164,14 @@ CicRegKey::RecurseDeleteKey(LPCTSTR lpSubKey) return DeleteSubKey(lpSubKey); } + +inline LSTATUS +CicRegKey::EnumValue(DWORD dwIndex, LPTSTR lpValueName, DWORD cchValueName) +{ + DWORD dwSaveLen = cchValueName; + LSTATUS error = ::RegEnumValue(m_hKey, dwIndex, lpValueName, &cchValueName, + NULL, NULL, NULL, NULL); + if (dwSaveLen) + lpValueName[error == ERROR_SUCCESS ? dwSaveLen - 1 : 0] = 0; + return error; +}

1 0

[reactos] 01/01: [MSCTF][MSUTB][SDK] Add CTrayIconWnd and CMainIconItem (#6424)
by Katayama Hirofumi MZ 31 Jan '24

31 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e4fe2cf4036499038ebd… commit 5e4fe2cf4036499038ebdb0f33bbf64536545323 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 31 16:52:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 31 16:52:02 2024 +0900 [MSCTF][MSUTB][SDK] Add CTrayIconWnd and CMainIconItem (#6424) Supporting Language Bar... JIRA issue: CORE-19363 - Add CTrayIconWnd, CMainIconItem, and CButtonIconItem classes. - Modify msctf.spec for TF_GetLangIcon function. - Add main icon IDI_MAINICON ("res/earth.ico"). --- dll/win32/msctf/msctf.spec | 2 +- dll/win32/msutb/lang/en-US.rc | 2 + dll/win32/msutb/msutb.cpp | 459 ++++++++++++++++++++++++++++++++++-- dll/win32/msutb/msutb.rc | 2 + dll/win32/msutb/precomp.h | 1 + dll/win32/msutb/res/earth.ico | Bin 0 -> 22382 bytes dll/win32/msutb/resource.h | 4 + sdk/include/psdk/msctf.idl | 1 + sdk/include/reactos/cicero/cicutb.h | 4 + 9 files changed, 455 insertions(+), 20 deletions(-) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index 569f8701e8b..52288129e1c 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -18,7 +18,7 @@ @ stdcall -stub TF_DllDetachInOther() @ stdcall -stub TF_GetGlobalCompartment(ptr) @ stub TF_GetInputScope -@ stub TF_GetLangIcon +@ stdcall -stub TF_GetLangIcon(long ptr long) @ stub TF_GetMlngHKL @ stub TF_GetMlngIconIndex @ stub TF_GetThreadFlags diff --git a/dll/win32/msutb/lang/en-US.rc b/dll/win32/msutb/lang/en-US.rc index 98a9ea10f96..3c3a7a579dd 100644 --- a/dll/win32/msutb/lang/en-US.rc +++ b/dll/win32/msutb/lang/en-US.rc @@ -16,6 +16,8 @@ BEGIN IDS_IGNORE "&Ignore" IDS_YES "&Yes" IDS_NO "&No" + + IDS_RESTORELANGBAR "Restore Language Bar" IDS_MENUWND "Menu Window" IDS_LEFTCLICK "Left Click" END diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 9a4a96e8553..26816ecb962 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -16,6 +16,10 @@ DWORD g_dwOSInfo = 0; CRITICAL_SECTION g_cs; LONG g_DllRefCount = 0; +UINT g_uTimerElapseDOACCDEFAULTACTION = 200; + +#define TIMER_ID_DOACCDEFAULTACTION 11 + EXTERN_C void __cxa_pure_virtual(void) { ERR("__cxa_pure_virtual\n"); @@ -34,6 +38,12 @@ CMsUtbModule gModule; class CCicLibMenuItem; class CTipbarAccItem; class CUTBMenuItem; +class CMainIconItem; +class CTrayIconItem; +class CTipbarWnd; +class CButtonIconItem; + +CTipbarWnd *g_pTipbarWnd = NULL; HRESULT GetGlobalCompartment(REFGUID rguid, ITfCompartment **ppComp) { @@ -98,9 +108,8 @@ void DoCloseLangbar(void) if (pLangBarMgr) { - hr = pLangBarMgr->ShowFloating(8); + hr = pLangBarMgr->ShowFloating(TF_SFT_HIDDEN); pLangBarMgr->Release(); - pLangBarMgr = NULL; } if (SUCCEEDED(hr)) @@ -453,9 +462,50 @@ public: class CTrayIconWnd { +protected: + DWORD m_dwUnknown20; + BOOL m_bBusy; + UINT m_uCallbackMessage; + UINT m_uMsg; + HWND m_hWnd; + DWORD m_dwUnknown21[2]; + HWND m_hTrayWnd; + HWND m_hNotifyWnd; + DWORD m_dwTrayWndThreadId; + DWORD m_dwUnknown22; + HWND m_hwndProgman; + DWORD m_dwProgmanThreadId; + CMainIconItem *m_pMainIconItem; + CicArray<CButtonIconItem*> m_Items; + UINT m_uCallbackMsg; + UINT m_uNotifyIconID; + + static BOOL CALLBACK EnumChildWndProc(HWND hWnd, LPARAM lParam); + static LRESULT CALLBACK _WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + public: - //FIXME - HWND GetNotifyWnd() { return NULL; }; + CTrayIconWnd(); + ~CTrayIconWnd(); + + BOOL RegisterClass(); + HWND CreateWnd(); + void DestroyWnd(); + + BOOL SetMainIcon(HKL hKL); + BOOL SetIcon(REFGUID rguid, DWORD dwUnknown24, HICON hIcon, LPCWSTR psz); + + void RemoveAllIcon(DWORD dwFlags); + void RemoveUnusedIcons(int unknown); + + CButtonIconItem *FindIconItem(REFGUID rguid); + BOOL FindTrayEtc(); + HWND GetNotifyWnd(); + BOOL OnIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); + + static CTrayIconWnd *GetThis(HWND hWnd); + static void SetThis(HWND hWnd, LPCREATESTRUCT pCS); + + void CallOnDelayMsg(); }; /***********************************************************************/ @@ -469,20 +519,50 @@ protected: DWORD m_dwIconAddOrModify; BOOL m_bIconAdded; CTrayIconWnd *m_pTrayIconWnd; - DWORD m_dw; + DWORD m_dwUnknown25; GUID m_guid; RECT m_rcMenu; POINT m_ptCursor; + friend class CTrayIconWnd; +public: CTrayIconItem(CTrayIconWnd *pTrayIconWnd); + virtual ~CTrayIconItem() { } BOOL _Init(HWND hWnd, UINT uCallbackMessage, UINT uNotifyIconID, const GUID& rguid); BOOL UpdateMenuRectPoint(); BOOL RemoveIcon(); - STDMETHOD_(BOOL, SetIcon)(HICON hIcon, LPCTSTR pszTip); - STDMETHOD_(LRESULT, OnMsg)(WPARAM wParam, LPARAM lParam) { return 0; }; - STDMETHOD_(LRESULT, OnDelayMsg)(LPARAM lParam) { return 0; }; + STDMETHOD_(BOOL, SetIcon)(HICON hIcon, LPCWSTR pszTip); + STDMETHOD_(BOOL, OnMsg)(WPARAM wParam, LPARAM lParam) { return FALSE; }; + STDMETHOD_(BOOL, OnDelayMsg)(UINT uMsg) { return 0; }; +}; + +/***********************************************************************/ + +class CButtonIconItem : public CTrayIconItem +{ +protected: + DWORD m_dwUnknown24; + HKL m_hKL; + friend class CTrayIconWnd; + +public: + CButtonIconItem(CTrayIconWnd *pWnd, DWORD dwUnknown24); + + STDMETHOD_(BOOL, OnMsg)(WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(BOOL, OnDelayMsg)(UINT uMsg) override; +}; + +/***********************************************************************/ + +class CMainIconItem : public CButtonIconItem +{ +public: + CMainIconItem(CTrayIconWnd *pWnd); + + BOOL Init(HWND hWnd); + STDMETHOD_(BOOL, OnDelayMsg)(UINT uMsg) override; }; /*********************************************************************** @@ -780,7 +860,7 @@ STDMETHODIMP CCicLibMenu::AddMenuItem( pSubMenu->AddRef(); } - *m_MenuItems.Append(1) = pMenuItem; + m_MenuItems.Add(pMenuItem); return S_OK; } @@ -1429,8 +1509,8 @@ BOOL CUTBMenuWnd::StartDoAccDefaultActionTimer(CUTBMenuItem *pTarget) if (::IsWindow(m_hWnd)) { - ::KillTimer(m_hWnd, 11); - ::SetTimer(m_hWnd, 11, 200, NULL); + ::KillTimer(m_hWnd, TIMER_ID_DOACCDEFAULTACTION); + ::SetTimer(m_hWnd, TIMER_ID_DOACCDEFAULTACTION, g_uTimerElapseDOACCDEFAULTACTION, NULL); } return TRUE; @@ -1525,9 +1605,9 @@ CUTBMenuWnd::OnShowWindow(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) STDMETHODIMP_(void) CUTBMenuWnd::OnTimer(WPARAM wParam) { - if (wParam == 11) + if (wParam == TIMER_ID_DOACCDEFAULTACTION) { - ::KillTimer(m_hWnd, 11); + ::KillTimer(m_hWnd, TIMER_ID_DOACCDEFAULTACTION); if (m_pAccessible && m_nMenuWndID) { m_pAccessible->DoDefaultActionReal(m_nMenuWndID); @@ -1633,10 +1713,10 @@ BOOL CTrayIconItem::RemoveIcon() { if (m_dwIconAddOrModify == NIM_MODIFY) { - NOTIFYICONDATA NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; + NOTIFYICONDATAW NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; NotifyIcon.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; NotifyIcon.uCallbackMessage = m_uCallbackMessage; - ::Shell_NotifyIcon(NIM_DELETE, &NotifyIcon); + ::Shell_NotifyIconW(NIM_DELETE, &NotifyIcon); } m_dwIconAddOrModify = NIM_ADD; @@ -1644,22 +1724,22 @@ BOOL CTrayIconItem::RemoveIcon() return TRUE; } -BOOL CTrayIconItem::SetIcon(HICON hIcon, LPCTSTR pszTip) +BOOL CTrayIconItem::SetIcon(HICON hIcon, LPCWSTR pszTip) { if (!hIcon) return FALSE; - NOTIFYICONDATA NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; + NOTIFYICONDATAW NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; NotifyIcon.uFlags = NIF_ICON | NIF_MESSAGE; NotifyIcon.uCallbackMessage = m_uCallbackMessage; NotifyIcon.hIcon = hIcon; if (pszTip) { NotifyIcon.uFlags |= NIF_TIP; - StringCchCopy(NotifyIcon.szTip, _countof(NotifyIcon.szTip), pszTip); + StringCchCopyW(NotifyIcon.szTip, _countof(NotifyIcon.szTip), pszTip); } - ::Shell_NotifyIcon(m_dwIconAddOrModify, &NotifyIcon); + ::Shell_NotifyIconW(m_dwIconAddOrModify, &NotifyIcon); m_dwIconAddOrModify = NIM_MODIFY; m_bIconAdded = NIM_MODIFY; @@ -1676,6 +1756,347 @@ BOOL CTrayIconItem::UpdateMenuRectPoint() return TRUE; } +/*********************************************************************** + * CButtonIconItem + */ + +CButtonIconItem::CButtonIconItem(CTrayIconWnd *pWnd, DWORD dwUnknown24) + : CTrayIconItem(pWnd) +{ + m_dwUnknown24 = dwUnknown24; +} + +/// @unimplemented +STDMETHODIMP_(BOOL) CButtonIconItem::OnMsg(WPARAM wParam, LPARAM lParam) +{ + switch (lParam) + { + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_LBUTTONDBLCLK: + case WM_RBUTTONDBLCLK: + break; + default: + return TRUE; + } + + //FIXME + return TRUE; +} + +/// @unimplemented +STDMETHODIMP_(BOOL) CButtonIconItem::OnDelayMsg(UINT uMsg) +{ + //FIXME + return FALSE; +} + +/*********************************************************************** + * CMainIconItem + */ + +CMainIconItem::CMainIconItem(CTrayIconWnd *pWnd) + : CButtonIconItem(pWnd, 1) +{ +} + +BOOL CMainIconItem::Init(HWND hWnd) +{ + return CTrayIconItem::_Init(hWnd, WM_USER, 0, GUID_LBI_TRAYMAIN); +} + +/// @unimplemented +STDMETHODIMP_(BOOL) CMainIconItem::OnDelayMsg(UINT uMsg) +{ + if (!CButtonIconItem::OnDelayMsg(uMsg)) + return 0; + + if (uMsg == WM_LBUTTONDBLCLK) + { + //FIXME + //if (g_pTipbarWnd->m_dwUnknown20) + // g_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_SHOWNORMAL); + } + else if (uMsg == WM_LBUTTONDOWN || uMsg == WM_RBUTTONDOWN) + { + //FIXME + //g_pTipbarWnd->ShowContextMenu(m_ptCursor, &m_rcClient, uMsg == WM_RBUTTONDOWN); + } + return TRUE; +} + +/*********************************************************************** + * CTrayIconWnd + */ + +CTrayIconWnd::CTrayIconWnd() +{ + m_uCallbackMsg = WM_USER + 0x1000; + m_uNotifyIconID = 0x1000; +} + +CTrayIconWnd::~CTrayIconWnd() +{ + for (size_t iItem = 0; iItem < m_Items.size(); ++iItem) + { + auto& pItem = m_Items[iItem]; + if (pItem) + { + delete pItem; + pItem = NULL; + } + } +} + +void CTrayIconWnd::CallOnDelayMsg() +{ + for (size_t iItem = 0; iItem < m_Items.size(); ++iItem) + { + auto pItem = m_Items[iItem]; + if (pItem && m_uCallbackMessage == pItem->m_uCallbackMessage) + { + pItem->OnDelayMsg(m_uMsg); + break; + } + } +} + +HWND CTrayIconWnd::CreateWnd() +{ + m_hWnd = ::CreateWindowEx(0, TEXT("CTrayIconWndClass"), NULL, WS_DISABLED, + 0, 0, 0, 0, NULL, NULL, g_hInst, this); + FindTrayEtc(); + + m_pMainIconItem = new(cicNoThrow) CMainIconItem(this); + if (m_pMainIconItem) + { + m_pMainIconItem->Init(m_hWnd); + m_Items.Add(m_pMainIconItem); + } + + return m_hWnd; +} + +void CTrayIconWnd::DestroyWnd() +{ + ::DestroyWindow(m_hWnd); + m_hWnd = NULL; +} + +BOOL CALLBACK CTrayIconWnd::EnumChildWndProc(HWND hWnd, LPARAM lParam) +{ + CTrayIconWnd *pWnd = (CTrayIconWnd *)lParam; + + TCHAR ClassName[60]; + ::GetClassName(hWnd, ClassName, _countof(ClassName)); + if (lstrcmp(ClassName, TEXT("TrayNotifyWnd")) != 0) + return TRUE; + + pWnd->m_hNotifyWnd = hWnd; + return FALSE; +} + +CButtonIconItem *CTrayIconWnd::FindIconItem(REFGUID rguid) +{ + for (size_t iItem = 0; iItem < m_Items.size(); ++iItem) + { + auto pItem = m_Items[iItem]; + if (IsEqualGUID(rguid, pItem->m_guid)) + return pItem; + } + return NULL; +} + +BOOL CTrayIconWnd::FindTrayEtc() +{ + m_hTrayWnd = ::FindWindow(TEXT("Shell_TrayWnd"), NULL); + if (!m_hTrayWnd) + return FALSE; + + ::EnumChildWindows(m_hTrayWnd, EnumChildWndProc, (LPARAM)this); + if (!m_hNotifyWnd) + return FALSE; + m_dwTrayWndThreadId = ::GetWindowThreadProcessId(m_hTrayWnd, NULL); + m_hwndProgman = FindWindow(TEXT("Progman"), NULL); + m_dwProgmanThreadId = ::GetWindowThreadProcessId(m_hwndProgman, NULL); + return TRUE; +} + +HWND CTrayIconWnd::GetNotifyWnd() +{ + if (!::IsWindow(m_hNotifyWnd)) + FindTrayEtc(); + return m_hNotifyWnd; +} + +/// @unimplemented +BOOL CTrayIconWnd::OnIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + //FIXME + //if (g_pTipbarWnd) + // g_pTipbarWnd->AttachFocusThread(); + + for (size_t iItem = 0; iItem < m_Items.size(); ++iItem) + { + auto pItem = m_Items[iItem]; + if (pItem) + { + if (uMsg == pItem->m_uCallbackMessage) + { + pItem->OnMsg(wParam, lParam); + return TRUE; + } + } + } + return FALSE; +} + +BOOL CTrayIconWnd::RegisterClass() +{ + WNDCLASSEX wc = { sizeof(wc) }; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.hInstance = g_hInst; + wc.hCursor = ::LoadCursor(NULL, (LPCTSTR)IDC_ARROW); + wc.lpfnWndProc = CTrayIconWnd::_WndProc; + wc.lpszClassName = TEXT("CTrayIconWndClass"); + ::RegisterClassEx(&wc); + return TRUE; +} + +void CTrayIconWnd::RemoveAllIcon(DWORD dwFlags) +{ + for (size_t iItem = 0; iItem < m_Items.size(); ++iItem) + { + auto pItem = m_Items[iItem]; + if (dwFlags & 0x1) + { + if (IsEqualGUID(pItem->m_guid, GUID_LBI_INATITEM) || + IsEqualGUID(pItem->m_guid, GUID_LBI_CTRL)) + { + continue; + } + } + + if (dwFlags & 0x2) + { + if (IsEqualGUID(pItem->m_guid, GUID_TFCAT_TIP_KEYBOARD)) + continue; + } + + if (pItem->m_uNotifyIconID < 0x1000) + continue; + + pItem->RemoveIcon(); + } +} + +/// @unimplemented +void CTrayIconWnd::RemoveUnusedIcons(int unknown) +{ + //FIXME +} + +BOOL CTrayIconWnd::SetIcon(REFGUID rguid, DWORD dwUnknown24, HICON hIcon, LPCWSTR psz) +{ + CButtonIconItem *pItem = FindIconItem(rguid); + if (!pItem) + { + if (!hIcon) + return FALSE; + pItem = new(cicNoThrow) CButtonIconItem(this, dwUnknown24); + if (!pItem) + return FALSE; + + pItem->_Init(m_hWnd, m_uCallbackMsg, m_uNotifyIconID, rguid); + m_uCallbackMsg += 2; + ++m_uNotifyIconID; + m_Items.Add(pItem); + } + + if (!hIcon) + return pItem->RemoveIcon(); + + return pItem->SetIcon(hIcon, psz); +} + +BOOL CTrayIconWnd::SetMainIcon(HKL hKL) +{ + if (!hKL) + { + m_pMainIconItem->RemoveIcon(); + m_pMainIconItem->m_hKL = NULL; + return TRUE; + } + + if (hKL != m_pMainIconItem->m_hKL) + { + WCHAR szText[64]; + HICON hIcon = TF_GetLangIcon(LOWORD(hKL), szText, _countof(szText)); + if (hIcon) + { + m_pMainIconItem->SetIcon(hIcon, szText); + ::DestroyIcon(hIcon); + } + else + { + ::LoadStringW(g_hInst, IDS_RESTORELANGBAR, szText, _countof(szText)); + hIcon = ::LoadIconW(g_hInst, MAKEINTRESOURCEW(IDI_MAINICON)); + m_pMainIconItem->SetIcon(hIcon, szText); + } + + m_pMainIconItem->m_hKL = hKL; + } + + return TRUE; +} + +CTrayIconWnd *CTrayIconWnd::GetThis(HWND hWnd) +{ + return (CTrayIconWnd *)::GetWindowLongPtr(hWnd, GWL_USERDATA); +} + +void CTrayIconWnd::SetThis(HWND hWnd, LPCREATESTRUCT pCS) +{ + if (pCS) + ::SetWindowLongPtr(hWnd, GWL_USERDATA, (LONG_PTR)pCS->lpCreateParams); + else + ::SetWindowLongPtr(hWnd, GWL_USERDATA, 0); +} + +LRESULT CALLBACK +CTrayIconWnd::_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CTrayIconWnd *pThis; + switch (uMsg) + { + case WM_CREATE: + CTrayIconWnd::SetThis(hWnd, (LPCREATESTRUCT)lParam); + break; + case WM_DESTROY: + ::SetWindowLongPtr(hWnd, GWL_USERDATA, 0); + break; + case WM_TIMER: + if (wParam == 100) + { + ::KillTimer(hWnd, 100); + pThis = CTrayIconWnd::GetThis(hWnd); + if (pThis) + pThis->CallOnDelayMsg(); + } + break; + default: + { + if (uMsg < WM_USER) + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); + pThis = CTrayIconWnd::GetThis(hWnd); + if (pThis && pThis->OnIconMessage(uMsg, wParam, lParam)) + break; + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); + } + } + return 0; +} + /*********************************************************************** * GetLibTls (MSUTB.@) * diff --git a/dll/win32/msutb/msutb.rc b/dll/win32/msutb/msutb.rc index 21964d264da..82ae823ce07 100644 --- a/dll/win32/msutb/msutb.rc +++ b/dll/win32/msutb/msutb.rc @@ -20,6 +20,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include <reactos/manifest_hosted.rc> +IDI_MAINICON ICON "res/earth.ico" + /* UTF-8 */ #pragma code_page(65001) diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index d198ded03f1..05b2a826e27 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -20,6 +20,7 @@ #include <cguid.h> #include <msctf.h> #include <ctffunc.h> +#include <ctfutb.h> #include <shlwapi.h> #include <atlbase.h> #include <atlcom.h> diff --git a/dll/win32/msutb/res/earth.ico b/dll/win32/msutb/res/earth.ico new file mode 100644 index 00000000000..7d47171f990 Binary files /dev/null and b/dll/win32/msutb/res/earth.ico differ diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h index 6808bd02597..c3abc6b696c 100644 --- a/dll/win32/msutb/resource.h +++ b/dll/win32/msutb/resource.h @@ -7,6 +7,10 @@ #define IDS_IGNORE 104 #define IDS_YES 105 #define IDS_NO 106 + +#define IDI_MAINICON 100 + +#define IDS_RESTORELANGBAR 308 #define IDS_MENUWND 322 #define IDS_LEFTCLICK 323 diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index 60219b328e0..c9cc9908474 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -43,6 +43,7 @@ cpp_quote("EXTERN_C HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(VOID);") cpp_quote("EXTERN_C HRESULT WINAPI TF_DllDetachInOther(VOID);") cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateCategoryMgr(ITfCategoryMgr **ppcat);") cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateDisplayAttributeMgr(ITfDisplayAttributeMgr **ppdam);") +cpp_quote("EXTERN_C HICON WINAPI TF_GetLangIcon(LANGID LangID, LPWSTR pszText, INT cchText);") 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/cicutb.h b/sdk/include/reactos/cicero/cicutb.h index 9c0ff831530..916b0c4befb 100644 --- a/sdk/include/reactos/cicero/cicutb.h +++ b/sdk/include/reactos/cicero/cicutb.h @@ -8,6 +8,10 @@ #pragma once DEFINE_GUID(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0x544D6A63, 0xE2E8, 0x4752, 0xBB, 0xD1, 0x00, 0x09, 0x60, 0xBC, 0xA0, 0x83); +DEFINE_GUID(GUID_LBI_TRAYMAIN, 0xE0B724E9, 0x6F76, 0x45F7, 0xB4, 0xC1, 0xB1, 0xC0, 0xFA, 0xBC, 0xE2, 0x3E); +DEFINE_GUID(GUID_LBI_INATITEM, 0xCDBC683A, 0x55CE, 0x4717, 0xBA, 0xC0, 0x50, 0xBF, 0x44, 0xA3, 0x27, 0x0C); +DEFINE_GUID(GUID_LBI_CTRL, 0x58C99D96, 0x2F9B, 0x42CE, 0x91, 0xBE, 0x37, 0xEF, 0x18, 0x60, 0xF8, 0x82); +DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745C63, 0xB2F0, 0x4784, 0x8B, 0x67, 0x5E, 0x12, 0xC8, 0x70, 0x1A, 0x31); EXTERN_C LPVOID WINAPI GetLibTls(VOID); EXTERN_C BOOL WINAPI GetPopupTipbar(HWND hWnd, BOOL fWinLogon);

1 0

[reactos] 01/01: [MSUTB][SDK] Implement DoCloseLangbar (#6423)
by Katayama Hirofumi MZ 31 Jan '24

31 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=131153743504a3c290d5c… commit 131153743504a3c290d5cf724d9c5123017dc0a5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 31 12:21:09 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 31 12:21:09 2024 +0900 [MSUTB][SDK] Implement DoCloseLangbar (#6423) Supporting Language Bar... JIRA issue: CORE-19363 - Implement GetGlobalCompartment function. - Implement GetGlobalCompartmentDWORD and SetGlobalCompartmentDWORD helper functions. - Implement TurnOffSpeechIfItsOn and DoCloseLangbar functions. --- dll/win32/msutb/msutb.cpp | 85 ++++++++++++++++++++++++++++++++++--- dll/win32/msutb/precomp.h | 1 + sdk/include/reactos/cicero/cicutb.h | 2 + 3 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index d6344a59a0c..9a4a96e8553 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -35,6 +35,85 @@ class CCicLibMenuItem; class CTipbarAccItem; class CUTBMenuItem; +HRESULT GetGlobalCompartment(REFGUID rguid, ITfCompartment **ppComp) +{ + ITfCompartmentMgr *pCompMgr = NULL; + HRESULT hr = TF_GetGlobalCompartment(&pCompMgr); + if (FAILED(hr)) + return hr; + + if (!pCompMgr) + return E_FAIL; + + hr = pCompMgr->GetCompartment(rguid, ppComp); + pCompMgr->Release(); + return hr; +} + +HRESULT GetGlobalCompartmentDWORD(REFGUID rguid, LPDWORD pdwValue) +{ + *pdwValue = 0; + ITfCompartment *pComp; + HRESULT hr = GetGlobalCompartment(rguid, &pComp); + if (SUCCEEDED(hr)) + { + VARIANT vari; + hr = pComp->GetValue(&vari); + if (hr == S_OK) + *pdwValue = V_I4(&vari); + pComp->Release(); + } + return hr; +} + +HRESULT SetGlobalCompartmentDWORD(REFGUID rguid, DWORD dwValue) +{ + VARIANT vari; + ITfCompartment *pComp; + HRESULT hr = GetGlobalCompartment(rguid, &pComp); + if (SUCCEEDED(hr)) + { + V_VT(&vari) = VT_I4; + V_I4(&vari) = dwValue; + hr = pComp->SetValue(0, &vari); + pComp->Release(); + } + return hr; +} + +void TurnOffSpeechIfItsOn(void) +{ + DWORD dwValue = 0; + HRESULT hr = GetGlobalCompartmentDWORD(GUID_COMPARTMENT_SPEECH_OPENCLOSE, &dwValue); + if (SUCCEEDED(hr) && dwValue) + SetGlobalCompartmentDWORD(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0); +} + +void DoCloseLangbar(void) +{ + ITfLangBarMgr *pLangBarMgr = NULL; + HRESULT hr = TF_CreateLangBarMgr(&pLangBarMgr); + if (FAILED(hr)) + return; + + if (pLangBarMgr) + { + hr = pLangBarMgr->ShowFloating(8); + pLangBarMgr->Release(); + pLangBarMgr = NULL; + } + + if (SUCCEEDED(hr)) + TurnOffSpeechIfItsOn(); + + CicRegKey regKey; + LSTATUS error = regKey.Open(HKEY_CURRENT_USER, + TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Run"), + KEY_ALL_ACCESS); + if (error == ERROR_SUCCESS) + ::RegDeleteValue(regKey, TEXT("ctfmon.exe")); +} + /***********************************************************************/ class CUTBLangBarDlg @@ -511,12 +590,6 @@ STDMETHODIMP_(BOOL) CUTBCloseLangBarDlg::DoModal(HWND hDlg) return TRUE; } -/// @unimplemented -void DoCloseLangbar(void) -{ - //FIXME -} - STDMETHODIMP_(BOOL) CUTBCloseLangBarDlg::OnCommand(HWND hDlg, WPARAM wParam, LPARAM lParam) { switch (LOWORD(wParam)) diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index 8bc4c4140a9..d198ded03f1 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -28,6 +28,7 @@ #include "resource.h" #include <cicero/cicreg.h> +#include <cicero/cicutb.h> #include <cicero/cicuif.h> #include <wine/debug.h> diff --git a/sdk/include/reactos/cicero/cicutb.h b/sdk/include/reactos/cicero/cicutb.h index 1865cbdaf7c..9c0ff831530 100644 --- a/sdk/include/reactos/cicero/cicutb.h +++ b/sdk/include/reactos/cicero/cicutb.h @@ -7,6 +7,8 @@ #pragma once +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0x544D6A63, 0xE2E8, 0x4752, 0xBB, 0xD1, 0x00, 0x09, 0x60, 0xBC, 0xA0, 0x83); + EXTERN_C LPVOID WINAPI GetLibTls(VOID); EXTERN_C BOOL WINAPI GetPopupTipbar(HWND hWnd, BOOL fWinLogon); EXTERN_C HRESULT WINAPI SetRegisterLangBand(BOOL bRegister);

1 0

[reactos] 01/01: [MSUTB][SDK] Add Language Bar dialogs (#6422)
by Katayama Hirofumi MZ 30 Jan '24

30 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=934cd46df59bdc2bbd0b4… commit 934cd46df59bdc2bbd0b4e52282b498b56310a50 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 30 15:38:53 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 30 15:38:53 2024 +0900 [MSUTB][SDK] Add Language Bar dialogs (#6422) Supporting Language Bar... JIRA issue: CORE-19363 - Add IDD_CLOSELANGBAR and IDD_MINIMIZELANGBAR resource dialogs. - Implement CUTBLangBarDlg class. - Implement CUTBCloseLangBarDlg and CUTBMinimizeLangBarDlg classes. --- dll/win32/msutb/lang/en-US.rc | 21 +++ dll/win32/msutb/msutb.cpp | 277 ++++++++++++++++++++++++++++++++++++ dll/win32/msutb/precomp.h | 1 + dll/win32/msutb/resource.h | 6 + sdk/include/reactos/cicero/cicuif.h | 2 +- 5 files changed, 306 insertions(+), 1 deletion(-) diff --git a/dll/win32/msutb/lang/en-US.rc b/dll/win32/msutb/lang/en-US.rc index c45c6e28438..98a9ea10f96 100644 --- a/dll/win32/msutb/lang/en-US.rc +++ b/dll/win32/msutb/lang/en-US.rc @@ -19,3 +19,24 @@ BEGIN IDS_MENUWND "Menu Window" IDS_LEFTCLICK "Left Click" END + +IDD_CLOSELANGBAR DIALOGEX 0, 0, 200, 105 +CAPTION "Language Bar" +STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME +FONT 8, "MS Shell Dlg" +{ + LTEXT "You have closed Language Bar.\r\n\r\nTo use Language Bar later, check ""Show Language Bar on the desktop"" in Language Bar Settings dialog, which you can find within Regional and Language Options control panel.", -1, 5, 5, 190, 60 + AUTOCHECKBOX "&Don't show me this message again", IDC_CLOSELANGBAR_CHECK, 5, 70, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 80, 85, 55, 15 + PUSHBUTTON "Cancel", IDCANCEL, 140, 85, 55, 15 +} + +IDD_MINIMIZELANGBAR DIALOGEX 0, 0, 205, 84 +CAPTION "Language Bar" +STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME +FONT 8, "MS Shell Dlg" +{ + LTEXT "You have minimized Language Bar. To restore it, just click Language Bar icon (near the clock) and choose ""Restore Language Bar"" from the pop-up menu.", -1, 5, 5, 190, 50 + AUTOCHECKBOX "Don't show me this message again", IDC_MINIMIZELANGBAR_CHECK, 5, 65, 125, 10 + DEFPUSHBUTTON "OK", IDOK, 140, 65, 60, 15 +} diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 615e7c47450..d6344a59a0c 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -37,6 +37,68 @@ class CUTBMenuItem; /***********************************************************************/ +class CUTBLangBarDlg +{ +protected: + LPTSTR m_pszDialogName; + LONG m_cRefs; + +public: + CUTBLangBarDlg() { } + virtual ~CUTBLangBarDlg() { } + + static CUTBLangBarDlg *GetThis(HWND hDlg); + static void SetThis(HWND hDlg, CUTBLangBarDlg *pThis); + static DWORD WINAPI s_ThreadProc(LPVOID pParam); + static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + + BOOL StartThread(); + LONG _Release(); + + STDMETHOD_(BOOL, DoModal)(HWND hDlg) = 0; + STDMETHOD_(BOOL, OnCommand)(HWND hDlg, WPARAM wParam, LPARAM lParam) = 0; + STDMETHOD_(BOOL, IsDlgShown)() = 0; + STDMETHOD_(void, SetDlgShown)(BOOL bShown) = 0; + STDMETHOD_(BOOL, ThreadProc)(); +}; + +/***********************************************************************/ + +class CUTBCloseLangBarDlg : public CUTBLangBarDlg +{ +public: + CUTBCloseLangBarDlg(); + + static BOOL s_bIsDlgShown; + + STDMETHOD_(BOOL, DoModal)(HWND hDlg) override; + STDMETHOD_(BOOL, OnCommand)(HWND hDlg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(BOOL, IsDlgShown)() override; + STDMETHOD_(void, SetDlgShown)(BOOL bShown) override; +}; + +BOOL CUTBCloseLangBarDlg::s_bIsDlgShown = FALSE; + +/***********************************************************************/ + +class CUTBMinimizeLangBarDlg : public CUTBLangBarDlg +{ +public: + CUTBMinimizeLangBarDlg(); + + static BOOL s_bIsDlgShown; + + STDMETHOD_(BOOL, DoModal)(HWND hDlg) override; + STDMETHOD_(BOOL, OnCommand)(HWND hDlg, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(BOOL, IsDlgShown)() override; + STDMETHOD_(void, SetDlgShown)(BOOL bShown) override; + STDMETHOD_(BOOL, ThreadProc)() override; +}; + +BOOL CUTBMinimizeLangBarDlg::s_bIsDlgShown = FALSE; + +/***********************************************************************/ + class CCicLibMenu : public ITfMenu { protected: @@ -344,6 +406,221 @@ protected: STDMETHOD_(LRESULT, OnDelayMsg)(LPARAM lParam) { return 0; }; }; +/*********************************************************************** + * CUTBLangBarDlg + */ + +CUTBLangBarDlg *CUTBLangBarDlg::GetThis(HWND hDlg) +{ + return (CUTBLangBarDlg*)::GetWindowLongPtr(hDlg, DWLP_USER); +} + +void CUTBLangBarDlg::SetThis(HWND hDlg, CUTBLangBarDlg *pThis) +{ + ::SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pThis); +} + +DWORD WINAPI CUTBLangBarDlg::s_ThreadProc(LPVOID pParam) +{ + return ((CUTBLangBarDlg *)pParam)->ThreadProc(); +} + +BOOL CUTBLangBarDlg::StartThread() +{ + if (IsDlgShown()) + return FALSE; + + SetDlgShown(TRUE); + + DWORD dwThreadId; + HANDLE hThread = ::CreateThread(NULL, 0, s_ThreadProc, this, 0, &dwThreadId); + if (!hThread) + { + SetDlgShown(FALSE); + return TRUE; + } + + ++m_cRefs; + ::CloseHandle(hThread); + return TRUE; +} + +LONG CUTBLangBarDlg::_Release() +{ + if (--m_cRefs == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +STDMETHODIMP_(BOOL) CUTBLangBarDlg::ThreadProc() +{ + extern HINSTANCE g_hInst; + ::DialogBoxParam(g_hInst, m_pszDialogName, NULL, DlgProc, (LPARAM)this); + SetDlgShown(FALSE); + _Release(); + return TRUE; +} + +INT_PTR CALLBACK +CUTBLangBarDlg::DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == WM_INITDIALOG) + { + SetThis(hDlg, (CUTBLangBarDlg *)lParam); + ::ShowWindow(hDlg, SW_RESTORE); + ::UpdateWindow(hDlg); + return TRUE; + } + + if (uMsg == WM_COMMAND) + { + CUTBLangBarDlg *pThis = CUTBLangBarDlg::GetThis(hDlg); + pThis->OnCommand(hDlg, wParam, lParam); + return TRUE; + } + + return FALSE; +} + +/*********************************************************************** + * CUTBCloseLangBarDlg + */ + +CUTBCloseLangBarDlg::CUTBCloseLangBarDlg() +{ + m_cRefs = 1; + m_pszDialogName = MAKEINTRESOURCE(IDD_CLOSELANGBAR); +} + +STDMETHODIMP_(BOOL) CUTBCloseLangBarDlg::DoModal(HWND hDlg) +{ + CicRegKey regKey; + LSTATUS error; + DWORD dwValue = FALSE; + error = regKey.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\")); + if (error == ERROR_SUCCESS) + regKey.QueryDword(TEXT("DontShowCloseLangBarDlg"), &dwValue); + + if (dwValue) + return FALSE; + + StartThread(); + return TRUE; +} + +/// @unimplemented +void DoCloseLangbar(void) +{ + //FIXME +} + +STDMETHODIMP_(BOOL) CUTBCloseLangBarDlg::OnCommand(HWND hDlg, WPARAM wParam, LPARAM lParam) +{ + switch (LOWORD(wParam)) + { + case IDOK: + DoCloseLangbar(); + if (::IsDlgButtonChecked(hDlg, IDC_CLOSELANGBAR_CHECK)) + { + CicRegKey regKey; + LSTATUS error; + error = regKey.Create(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\")); + if (error == ERROR_SUCCESS) + regKey.SetDword(TEXT("DontShowCloseLangBarDlg"), TRUE); + } + ::EndDialog(hDlg, TRUE); + break; + + case IDCANCEL: + ::EndDialog(hDlg, FALSE); + break; + + default: + return FALSE; + } + return TRUE; +} + +STDMETHODIMP_(BOOL) CUTBCloseLangBarDlg::IsDlgShown() +{ + return s_bIsDlgShown; +} + +STDMETHODIMP_(void) CUTBCloseLangBarDlg::SetDlgShown(BOOL bShown) +{ + s_bIsDlgShown = bShown; +} + +/*********************************************************************** + * CUTBMinimizeLangBarDlg + */ + +CUTBMinimizeLangBarDlg::CUTBMinimizeLangBarDlg() +{ + m_cRefs = 1; + m_pszDialogName = MAKEINTRESOURCE(IDD_MINIMIZELANGBAR); +} + +STDMETHODIMP_(BOOL) CUTBMinimizeLangBarDlg::DoModal(HWND hDlg) +{ + CicRegKey regKey; + LSTATUS error; + + DWORD dwValue = FALSE; + error = regKey.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\")); + if (error == ERROR_SUCCESS) + regKey.QueryDword(TEXT("DontShowMinimizeLangBarDlg"), &dwValue); + + if (dwValue) + return FALSE; + + StartThread(); + return TRUE; +} + +STDMETHODIMP_(BOOL) CUTBMinimizeLangBarDlg::OnCommand(HWND hDlg, WPARAM wParam, LPARAM lParam) +{ + switch (LOWORD(wParam)) + { + case IDOK: + if (::IsDlgButtonChecked(hDlg, IDC_MINIMIZELANGBAR_CHECK)) + { + LSTATUS error; + CicRegKey regKey; + error = regKey.Create(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\")); + if (error == ERROR_SUCCESS) + regKey.SetDword(TEXT("DontShowMinimizeLangBarDlg"), TRUE); + } + ::EndDialog(hDlg, TRUE); + break; + case IDCANCEL: + ::EndDialog(hDlg, FALSE); + break; + default: + return FALSE; + } + return TRUE; +} + +STDMETHODIMP_(BOOL) CUTBMinimizeLangBarDlg::IsDlgShown() +{ + return s_bIsDlgShown; +} + +STDMETHODIMP_(void) CUTBMinimizeLangBarDlg::SetDlgShown(BOOL bShown) +{ + s_bIsDlgShown = bShown; +} + +STDMETHODIMP_(BOOL) CUTBMinimizeLangBarDlg::ThreadProc() +{ + ::Sleep(700); + return CUTBLangBarDlg::ThreadProc(); +} + /*********************************************************************** * CCicLibMenu */ diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index 2f3ca726f7b..8bc4c4140a9 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -27,6 +27,7 @@ #undef STATUS_NO_MEMORY #include "resource.h" +#include <cicero/cicreg.h> #include <cicero/cicuif.h> #include <wine/debug.h> diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h index 65532689e47..6808bd02597 100644 --- a/dll/win32/msutb/resource.h +++ b/dll/win32/msutb/resource.h @@ -9,3 +9,9 @@ #define IDS_NO 106 #define IDS_MENUWND 322 #define IDS_LEFTCLICK 323 + +#define IDD_CLOSELANGBAR 1001 +#define IDD_MINIMIZELANGBAR 1004 + +#define IDC_CLOSELANGBAR_CHECK 1002 +#define IDC_MINIMIZELANGBAR_CHECK 1002 diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 218587d3296..996f48230c6 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5180,7 +5180,7 @@ CUIFBalloonWindow::AddButton(UINT nCommandId) #ifdef IDS_OK extern HINSTANCE g_hInst; WCHAR szText[64]; - ::LoadStringW(g_hInst, IDS_OK + nCommandId, szText, _countof(szText)); + ::LoadStringW(g_hInst, IDS_OK + (nCommandId - IDOK), szText, _countof(szText)); pszText = szText; #else switch (nCommandId)

1 0

[reactos] 01/01: [MSUTB][SDK] Add CUTBMenuWnd and CUTBMenuItem (#6420)
by Katayama Hirofumi MZ 29 Jan '24

29 Jan '24

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

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