Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [CRT] Add vadefs macros for arm64 (#4123)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dfc13e411795976c94fa… commit 6dfc13e411795976c94fafdeeff1acff604cb605 Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Thu Dec 9 06:16:20 2021 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 9 17:16:20 2021 +0300 [CRT] Add vadefs macros for arm64 (#4123) CORE-17621 CORE-17518 --- sdk/include/crt/vadefs.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sdk/include/crt/vadefs.h b/sdk/include/crt/vadefs.h index b714f59ab7b..17ab6f61b59 100644 --- a/sdk/include/crt/vadefs.h +++ b/sdk/include/crt/vadefs.h @@ -70,6 +70,15 @@ extern "C" { #define _crt_va_arg(ap,t) (*(t*)((ap += _SLOTSIZEOF(t) + _APALIGN(t,ap)) - _SLOTSIZEOF(t))) #define _crt_va_end(ap) ( ap = (va_list)0 ) #define __va_copy(d,s) ((void)((d) = (s))) +#elif defined(_M_ARM64) +extern void __cdecl __va_start(va_list*, ...); +#define __crt_va_start(ap,v) ((void)(__va_start(&ap, _ADDRESSOF(v), _SLOTSIZEOF(v), __alignof(v), _ADDRESSOF(v)))) +#define __crt_va_arg(ap, t) \ + ((sizeof(t) > (2 * sizeof(__int64))) \ + ? **(t**)((ap += sizeof(__int64)) - sizeof(__int64)) \ + : *(t*)((ap += _SLOTSIZEOF(t) + _APALIGN(t,ap)) - _SLOTSIZEOF(t))) +#define __crt_va_end(ap) ((void)(ap = (va_list)0)) +#define __va_copy(d,s) ((void)((d) = (s))) #else //if defined(_M_IA64) || defined(_M_CEE) #error Please implement me #endif

3 years

[reactos] 01/01: [UNIATA] Fix copy-pasta on 5 Promise device ids

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd991e3d63d05581eba9d… commit cd991e3d63d05581eba9d0299654b8c4e3a24bc3 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Dec 7 07:26:19 2021 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Dec 9 17:10:09 2021 +0300 [UNIATA] Fix copy-pasta on 5 Promise device ids Addendum to 5783342 (r62493). CORE-17898 --- drivers/storage/ide/uniata/bm_devs.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/storage/ide/uniata/bm_devs.h b/drivers/storage/ide/uniata/bm_devs.h index 8136f475178..a8b9e3fe300 100644 --- a/drivers/storage/ide/uniata/bm_devs.h +++ b/drivers/storage/ide/uniata/bm_devs.h @@ -562,11 +562,19 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 6620, 105a, 0x00, ATA_UDMA6, "Promise PDC20620" , PRMIO | 0x00 | UNIATA_RAID_CONTROLLER), /* PCI_DEV_HW_SPEC_BM( 6621, 105a, 0x00, ATA_UDMA6, "Promise PDC20621" , PRMIO | PRSX4X | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 6622, 105a, 0x00, ATA_UDMA6, "Promise PDC20622" , PRMIO | PRSX4X | UNIATA_RAID_CONTROLLER),*/ +#ifndef __REACTOS__ PCI_DEV_HW_SPEC_BM( 3571, 105a, 0x00, ATA_SA150, "Promise PDC40518" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 3d75, 105a, 0x00, ATA_SA150, "Promise PDC40519" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 3574, 105a, 0x00, ATA_SA150, "Promise PDC40718" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 3570, 105a, 0x00, ATA_SA300, "Promise PDC40719" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 3d73, 105a, 0x00, ATA_SA300, "Promise PDC40779" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), +#else + PCI_DEV_HW_SPEC_BM( 3d18, 105a, 0x00, ATA_SA150, "Promise PDC40518" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 3519, 105a, 0x00, ATA_SA150, "Promise PDC40519" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 3d17, 105a, 0x00, ATA_SA150, "Promise PDC40718" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 3515, 105a, 0x00, ATA_SA300, "Promise PDC40719" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 3577, 105a, 0x00, ATA_SA300, "Promise PDC40779" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), +#endif PCI_DEV_HW_SPEC_BM( 3781, 105a, 0x00, ATA_SA300, "Promise TX8660" , UNIATA_SATA | UNIATA_AHCI), PCI_DEV_HW_SPEC_BM( 0211, 1166, 0x00, ATA_UDMA2, "ServerWorks ROSB4", SWKS33 | UNIATA_NO_DPC ),

3 years

[reactos] 01/01: [W32TIME] Restore remaining translations

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a616b0a14a5abc629c36… commit 2a616b0a14a5abc629c3692d8e031868248a30d1 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Dec 9 16:10:42 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Dec 9 16:10:42 2021 +0300 [W32TIME] Restore remaining translations They were unintentionally dropped in commit 3d8d88ea. Also add corresponding translation authors. References: e4898e6e, c81af08f, 05c39d8d --- base/services/w32time/lang/de-DE.rc | 7 +++++++ base/services/w32time/lang/en-US.rc | 8 ++++++++ base/services/w32time/lang/pl-PL.rc | 14 ++++++++++++++ base/services/w32time/lang/tr-TR.rc | 14 ++++++++++++++ base/services/w32time/w32time.rc | 6 ++++++ 5 files changed, 49 insertions(+) diff --git a/base/services/w32time/lang/de-DE.rc b/base/services/w32time/lang/de-DE.rc index b4b7f2f2663..8cc1b3bf7ac 100644 --- a/base/services/w32time/lang/de-DE.rc +++ b/base/services/w32time/lang/de-DE.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2021 Eric Kohl <ekohl(a)reactos.org> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/services/w32time/lang/en-US.rc b/base/services/w32time/lang/en-US.rc index 3aef0f2a641..b91b7f96271 100644 --- a/base/services/w32time/lang/en-US.rc +++ b/base/services/w32time/lang/en-US.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: English resource file + * TRANSLATORS: Copyright 2019 Doug Lyons <douglyons(a)douglyons.com> + * Copyright 2021 Eric Kohl <ekohl(a)reactos.org> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE diff --git a/base/services/w32time/lang/pl-PL.rc b/base/services/w32time/lang/pl-PL.rc new file mode 100644 index 00000000000..181a1c64d36 --- /dev/null +++ b/base/services/w32time/lang/pl-PL.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2019 Adam Słaboń <asaillen456esx(a)gmail.com> + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "Usługa Czas" + IDS_DESCRIPTION "Maintains date and time synchronization on all clients and servers on the network." +END diff --git a/base/services/w32time/lang/tr-TR.rc b/base/services/w32time/lang/tr-TR.rc new file mode 100644 index 00000000000..b727f9a02ac --- /dev/null +++ b/base/services/w32time/lang/tr-TR.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "Zaman Hizmeti" + IDS_DESCRIPTION "Maintains date and time synchronization on all clients and servers on the network." +END diff --git a/base/services/w32time/w32time.rc b/base/services/w32time/w32time.rc index ae963d23cc1..305338435e2 100644 --- a/base/services/w32time/w32time.rc +++ b/base/services/w32time/w32time.rc @@ -21,3 +21,9 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif

3 years

[reactos] 01/01: [W32TIME] Add Spanish (es-ES) translation (#4149)

by Javier Fernandez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b794e761512ff62659f60… commit b794e761512ff62659f609a132d6905c37dd4aca Author: Javier Fernandez <elhoir(a)gmail.com> AuthorDate: Wed Dec 8 13:03:29 2021 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Dec 9 15:52:02 2021 +0300 [W32TIME] Add Spanish (es-ES) translation (#4149) Restore initial translation by Julen committed in ea6e7740 which was then dropped in 3d8d88ea. Add translation for IDS_DESCRIPTION. --- base/services/w32time/lang/es-ES.rc | 15 +++++++++++++++ base/services/w32time/w32time.rc | 3 +++ 2 files changed, 18 insertions(+) diff --git a/base/services/w32time/lang/es-ES.rc b/base/services/w32time/lang/es-ES.rc new file mode 100644 index 00000000000..2a6d89a87e1 --- /dev/null +++ b/base/services/w32time/lang/es-ES.rc @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish resource file + * TRANSLATORS: Copyright 2021 Julen Urizar Compains <julenuri(a)hotmail.com> + * Copyright 2021 Javier Fernandez <elhoir(a)gmail.com> + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "Servicio de hora" + IDS_DESCRIPTION "Mantiene la sincronización de fecha y hora en todos los servidores y clientes de la red." +END diff --git a/base/services/w32time/w32time.rc b/base/services/w32time/w32time.rc index 4b0b320485d..ae963d23cc1 100644 --- a/base/services/w32time/w32time.rc +++ b/base/services/w32time/w32time.rc @@ -18,3 +18,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif

3 years

[reactos] 01/01: Revert "[VIDEOPRT] Fix updating of new registry path values"

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5dc56dd1d67c95dd52a3c… commit 5dc56dd1d67c95dd52a3cf9803e24b0a0b3ca69c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Dec 8 18:36:34 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Dec 8 18:36:34 2021 +0100 Revert "[VIDEOPRT] Fix updating of new registry path values" This reverts commit ecf3416f492c4b664586de89bc36f831437fe23f. This commit was meant to fix CORE-17688. While its effectively fixed the problem, it introduced another regression CORE-17719. In the mean time, commit c05a45e17eda057d8b92ba76feecf3532d8324c1 fixed things properly. CORE-17719 --- win32ss/drivers/videoprt/registry.c | 62 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/win32ss/drivers/videoprt/registry.c b/win32ss/drivers/videoprt/registry.c index 4fed31e451d..f5d7f4084b1 100644 --- a/win32ss/drivers/videoprt/registry.c +++ b/win32ss/drivers/videoprt/registry.c @@ -557,41 +557,41 @@ IntCreateNewRegistryPath( ERR_(VIDEOPRT, "Failed create key '%wZ'\n", &DeviceExtension->NewRegistryPath); return Status; } - } - /* Open the new key */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceExtension->NewRegistryPath, - OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); - return Status; - } + /* Open the new key */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->NewRegistryPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); + return Status; + } - /* Open the device profile key */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceExtension->RegistryPath, - OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&SettingsKey, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); - ObCloseHandle(NewKey, KernelMode); - return Status; - } + /* Open the device profile key */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceExtension->RegistryPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&SettingsKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); + ObCloseHandle(NewKey, KernelMode); + return Status; + } - /* Copy the registry data from the legacy key */ - Status = IntCopyRegistryKey(SettingsKey, NewKey); + /* Copy the registry data from the legacy key */ + Status = IntCopyRegistryKey(SettingsKey, NewKey); - /* Close the key handles */ - ObCloseHandle(SettingsKey, KernelMode); - ObCloseHandle(NewKey, KernelMode); + /* Close the key handles */ + ObCloseHandle(SettingsKey, KernelMode); + ObCloseHandle(NewKey, KernelMode); + } return Status; }

3 years

[reactos] 01/01: [NTUSER][USER32] Simplify user32.IsHungAppWindow (#4150)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee3659d5d50b08755dd97… commit ee3659d5d50b08755dd97e785214ad36e33036b8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 9 00:39:57 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 9 00:39:57 2021 +0900 [NTUSER][USER32] Simplify user32.IsHungAppWindow (#4150) Check FNID_GHOST and MsqIsHung. CORE-17894 --- win32ss/user/ntuser/window.c | 2 +- win32ss/user/user32/windows/window.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 7d2a97f3584..8e42d693d45 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3991,7 +3991,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) break; case QUERY_WINDOW_ISHUNG: - Result = (DWORD_PTR)MsqIsHung(pWnd->head.pti, MSQ_HUNG); + Result = (pWnd->fnid == FNID_GHOST) || MsqIsHung(pWnd->head.pti, MSQ_HUNG); break; case QUERY_WINDOW_REAL_ID: diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 078e496a0ea..8aa237ba397 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1875,22 +1875,7 @@ InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount) BOOL WINAPI IsHungAppWindow(HWND hwnd) { - PWND Window; - UNICODE_STRING ClassName; - WCHAR szClass[16]; - static const UNICODE_STRING GhostClass = RTL_CONSTANT_STRING(L"Ghost"); - - /* Ghost is a hung window */ - RtlInitEmptyUnicodeString(&ClassName, szClass, sizeof(szClass)); - Window = ValidateHwnd(hwnd); - if (Window && Window->fnid == FNID_GHOST && - NtUserGetClassName(hwnd, FALSE, &ClassName) && - RtlEqualUnicodeString(&ClassName, &GhostClass, TRUE)) - { - return TRUE; - } - - return (NtUserQueryWindow(hwnd, QUERY_WINDOW_ISHUNG) != 0); + return !!NtUserQueryWindow(hwnd, QUERY_WINDOW_ISHUNG); } /*

3 years

[reactos] 01/01: [BOOTDATA][USBSTOR] Add device definitions for SFF-8070i (ARMD-style devices)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07c534c8639cf916cbf94… commit 07c534c8639cf916cbf943135eea5a4bc1005bcf Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 8 17:52:07 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Dec 8 17:52:07 2021 +0300 [BOOTDATA][USBSTOR] Add device definitions for SFF-8070i (ARMD-style devices) Confirmed working with our usbstor driver by Vort. CORE-17895 --- boot/bootdata/hivesys.inf | 3 +++ boot/bootdata/txtsetup.sif | 1 + drivers/usb/usbstor/usbstor.inf | 1 + 3 files changed, 5 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 4f2024799b2..39b0175b8b7 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -50,6 +50,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubCl HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_02&Prot_50","Service",0x00000000,"usbstor" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_02&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_05&Prot_50","Service",0x00000000,"usbstor" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_05&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 8929c94a698..f4930254853 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -168,6 +168,7 @@ PCI\CC_0C0300 = usbuhci PCI\CC_0C0310 = usbohci PCI\CC_0C0320 = usbehci USB\Class_08&SubClass_06&Prot_50 = usbstor +USB\Class_08&SubClass_05&Prot_50 = usbstor HID_DEVICE_SYSTEM_KEYBOARD = kbdhid,{4D36E96B-E325-11CE-BFC1-08002BE10318} USB\COMPOSITE = usbccgp GenDisk = disk,{4D36E967-E325-11CE-BFC1-08002BE10318} diff --git a/drivers/usb/usbstor/usbstor.inf b/drivers/usb/usbstor/usbstor.inf index a42f5371ef4..d6bc94ac7b6 100644 --- a/drivers/usb/usbstor/usbstor.inf +++ b/drivers/usb/usbstor/usbstor.inf @@ -21,6 +21,7 @@ DefaultDestDir = 12 %GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_06&Prot_50 ; SCSI devices ; usbstor.sys supports usb-cdroms but cdrom.sys from ReactOS does not like it %GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_02&Prot_50 ; SFF-8020i (ATAPI) +%GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_05&Prot_50 ; SFF-8070i (ATAPI Removable/Rewritable) ;-------------------------- USB STORAGE DRIVER --------------------------

3 years

[reactos] 01/01: [NTUSER] Implement HSHELL_RUDEAPPACTIVATE notification (#4147)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79c926c893c563ba5f701… commit 79c926c893c563ba5f701eecf4c73640a2192834 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 8 18:26:22 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 8 18:26:22 2021 +0900 [NTUSER] Implement HSHELL_RUDEAPPACTIVATE notification (#4147) - Add IntIsWindowFullscreen function to judge whether the window is fullscreen. - Add IntCheckFullscreen function to notify HSHELL_RUDEAPPACTIVATE if fullscreen. - Add IntCheckFullscreen call in UpdateShellHook function. - Add IntCheckFullscreen call in co_WinPosSetWindowPos function. CORE-16130 --- win32ss/user/ntuser/focus.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/focus.h | 1 + win32ss/user/ntuser/winpos.c | 4 ++++ 3 files changed, 54 insertions(+) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 3c5ee19ed87..a9ea0965177 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -15,6 +15,7 @@ PTHREADINFO gptiForeground = NULL; PPROCESSINFO gppiLockSFW = NULL; ULONG guSFWLockCount = 0; // Rule #8, No menus are active. So should be zero. PTHREADINFO ptiLastInput = NULL; +HWND ghwndOldFullscreen = NULL; /* Check locking of a process or one or more menus are active. @@ -48,9 +49,57 @@ IntGetThreadFocusWindow(VOID) return ThreadQueue->spwndFocus ? UserHMGetHandle(ThreadQueue->spwndFocus) : 0; } +BOOL FASTCALL IntIsWindowFullscreen(PWND Window) +{ + RECTL rclAnd, rclMonitor, rclWindow; + PMONITOR pMonitor; + + if (!Window || !(Window->style & WS_VISIBLE) || (Window->style & WS_CHILD) || + (Window->ExStyle & WS_EX_TOOLWINDOW) || !IntGetWindowRect(Window, &rclWindow)) + { + return FALSE; + } + + pMonitor = UserGetPrimaryMonitor(); + if (!pMonitor) + { + RECTL_vSetRect(&rclMonitor, 0, 0, + UserGetSystemMetrics(SM_CXSCREEN), UserGetSystemMetrics(SM_CYSCREEN)); + } + else + { + rclMonitor = *(LPRECTL)&pMonitor->rcMonitor; + } + + RECTL_bIntersectRect(&rclAnd, &rclMonitor, &rclWindow); + return RtlEqualMemory(&rclAnd, &rclMonitor, sizeof(RECTL)); +} + +BOOL FASTCALL IntCheckFullscreen(PWND Window) +{ + HWND hWnd; + + if (ghwndOldFullscreen && !IntIsWindowFullscreen(ValidateHwndNoErr(ghwndOldFullscreen))) + ghwndOldFullscreen = NULL; + + if (!IntIsWindowFullscreen(Window)) + return FALSE; + + hWnd = UserHMGetHandle(Window); + if (ghwndOldFullscreen != hWnd) + { + co_IntShellHookNotify(HSHELL_RUDEAPPACTIVATED, (WPARAM)hWnd, TRUE); + ghwndOldFullscreen = hWnd; + } + return TRUE; +} + VOID FASTCALL UpdateShellHook(PWND Window) { + if (IntCheckFullscreen(Window)) + return; + if ( Window->spwndParent == UserGetDesktopWindow() && (!(Window->ExStyle & WS_EX_TOOLWINDOW) || (Window->ExStyle & WS_EX_APPWINDOW))) diff --git a/win32ss/user/ntuser/focus.h b/win32ss/user/ntuser/focus.h index 821d7b4db57..37ada347dc0 100644 --- a/win32ss/user/ntuser/focus.h +++ b/win32ss/user/ntuser/focus.h @@ -29,3 +29,4 @@ VOID FASTCALL IntActivateWindow(PWND,PTHREADINFO,HANDLE,DWORD); BOOL FASTCALL IntDeactivateWindow(PTHREADINFO,HANDLE); BOOL FASTCALL co_IntSetForegroundMessageQueue(PWND,PTHREADINFO,BOOL,DWORD ); VOID FASTCALL UpdateShellHook(PWND); +BOOL FASTCALL IntCheckFullscreen(PWND Window); diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 550a074c6c1..da70805ed9c 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1926,6 +1926,10 @@ co_WinPosSetWindowPos( Window->head.pti->cVisWindows++; IntNotifyWinEvent(EVENT_OBJECT_SHOW, Window, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); } + else + { + IntCheckFullscreen(Window); + } if (Window->hrgnUpdate != NULL && Window->hrgnUpdate != HRGN_WINDOW) {

3 years

[reactos] 01/01: [USETUP][TRANSLATION] Improve Japanese

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=821223b3d5fc08f303afa… commit 821223b3d5fc08f303afada2ee7ec62c28a5ec18 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 8 15:16:16 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Dec 8 15:21:17 2021 +0900 [USETUP][TRANSLATION] Improve Japanese --- base/setup/usetup/lang/ja-JP.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index a0817056070..461281ffa2a 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1531,14 +1531,14 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, { 0, 0, - "Installing the bootloader onto the media, please wait...", + "\322\303\336\250\261 \306 \314\336\260\304\333\260\300\336\260\246 \262\335\275\304\260\331 \274\303\262\317\275\241 \265\317\301\270\300\336\273\262...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -2221,14 +2221,14 @@ MUI_STRING jaJPStrings[] = {STRING_PLEASEWAIT, " \265\317\301 \270\300\336\273\262..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + " ENTER = \262\335\275\304\260\331 P = \314\337\327\262\317\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, // " ENTER = �ݽİ� C = �߰è�� F3 = ��"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = \262\335\275\304\260\331 L = \333\335\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, {STRING_INSTALLDELETEPARTITION, " ENTER = \262\335\275\304\260\331 D = \312\337\260\303\250\274\256\335 \273\270\274\336\256 F3 = \301\255\263\274"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = \312\337\260\303\250\274\256\335 \273\270\274\336\256 F3 = \301\255\263\274"}, {STRING_PARTITIONSIZE, "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 \273\262\275\336:"}, {STRING_CHOOSENEWPARTITION, @@ -2263,7 +2263,7 @@ MUI_STRING jaJPStrings[] = {STRING_MOVING, " \314\247\262\331 \311 \262\304\336\263: %S \266\327: %S"}, {STRING_RENAMING, - " \305\317\264 \311 \315\335\272\263: %S to: %S"}, + " \305\317\264 \311 \315\335\272\263: %S \266\327: %S"}, {STRING_COPYING, " \272\313\337\260 \301\255\263\311 \314\247\262\331: %S"}, {STRING_SETUPCOPYINGFILES,

3 years

[reactos] 01/01: [RAPPS] Fix Ctrl+F hotkey not working regression

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6edd653b02ab6479f0ac… commit f6edd653b02ab6479f0ac69d14b2d45bac21c058 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Dec 7 20:36:49 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Dec 7 20:36:49 2021 +0300 [RAPPS] Fix Ctrl+F hotkey not working regression Addendum to 4c7bd34a. CORE-17881 --- base/applications/rapps/appview.cpp | 5 +++++ base/applications/rapps/gui.cpp | 4 ++++ base/applications/rapps/include/appview.h | 1 + 3 files changed, 10 insertions(+) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index a9fe2922254..d548504c1cb 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1713,6 +1713,11 @@ void CApplicationView::SetRedraw(BOOL bRedraw) m_ListView->SetRedraw(bRedraw); } +void CApplicationView::SetFocusOnSearchBar() +{ + m_SearchBar->SetFocus(); +} + VOID CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { if (wParam == SIZE_MINIMIZED) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 80cd779bed1..8b26bc2a2f1 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -545,6 +545,10 @@ VOID CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) PostMessageW(WM_CLOSE, 0, 0); break; + case ID_SEARCH: + m_ApplicationView->SetFocusOnSearchBar(); + break; + case ID_INSTALL: if (IsAvailableEnum(SelectedEnumType)) { diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 9042a361d33..7a6374ccafa 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -367,6 +367,7 @@ public: HWND Create(HWND hwndParent); void SetRedraw(BOOL bRedraw); + void SetFocusOnSearchBar(); BOOL SetDisplayAppType(APPLICATION_VIEW_TYPE AppType); BOOL AddInstalledApplication(CInstalledApplicationInfo *InstAppInfo, LPVOID param);

3 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2021