Ros-diffs October 2020

ros-diffs@reactos.org

22 participants
156 discussions

[reactos] 01/01: [WINED3D] Fix build with lower optimization levels

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68dcd87d38fbe90c9fc16… commit 68dcd87d38fbe90c9fc16a8b93509f170a3d2ae6 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 15 11:36:01 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Oct 15 11:36:01 2020 +0200 [WINED3D] Fix build with lower optimization levels --- dll/directx/wine/wined3d/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index e00033ea397..ea4f46059a6 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -52,3 +52,7 @@ target_link_libraries(d3dwine wine) add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(d3dwine precomp.h SOURCE) add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all) + +if (NOT MSVC) + target_compile_options(d3dwine PRIVATE -Wno-format-overflow) +endif()

4 years, 2 months

[reactos] 01/01: [UDFS] Fix build with lower optimization level

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=612b1f2e6e4025600db47… commit 612b1f2e6e4025600db4715a4478a0b36d5b647b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 15 11:29:09 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Oct 15 11:29:09 2020 +0200 [UDFS] Fix build with lower optimization level --- drivers/filesystems/udfs/Include/mem_tools.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/filesystems/udfs/Include/mem_tools.h b/drivers/filesystems/udfs/Include/mem_tools.h index 11d92544dbc..ff64d7a3b4d 100644 --- a/drivers/filesystems/udfs/Include/mem_tools.h +++ b/drivers/filesystems/udfs/Include/mem_tools.h @@ -221,6 +221,12 @@ VOID inline MyFreePool__(PVOID addr) { #endif //MY_MEM_BOUNDS_CHECK +/* This function just scares the hell out of GCC */ +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstringop-overflow" +#endif + ULONG inline MyReallocPool__(PCHAR addr, ULONG len, PCHAR *pnewaddr, ULONG newlen) { ULONG _len, _newlen; _newlen = MyAlignSize__(newlen); @@ -292,6 +298,9 @@ ULONG inline MyReallocPool__(PCHAR addr, ULONG len, PCHAR *pnewaddr, ULONG newle */ return newlen; } +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif #ifndef MY_USE_ALIGN #undef MyAlignSize__

4 years, 2 months

[reactos] 01/01: [BOOTDATA] Update display names for the GMT+0 time zones.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c2114d9d8a031057644c… commit 2c2114d9d8a031057644ca5cf4366707f3592d78 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 13 18:17:34 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 13 18:17:36 2020 +0200 [BOOTDATA] Update display names for the GMT+0 time zones. Following advice from https://support.microsoft.com/en-us/help/3162835/june-2016-dst-and-time-zon… --- boot/bootdata/hivesft.inf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index f07e82339b3..228d8b1bd7e 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -2179,11 +2179,11 @@ GMT_MINUS_01_B_DESC ="(GMT-01:00) Cape Verde Is." GMT_MINUS_01_B_DAYLIGHT="Cape Verde Daylight Time" GMT_MINUS_01_B_STANDARD="Cape Verde Standard Time" -GMT_PLUS_00_A_DESC ="(GMT) Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London" +GMT_PLUS_00_A_DESC ="(GMT+00:00) Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London" GMT_PLUS_00_A_DAYLIGHT="GMT Daylight Time" GMT_PLUS_00_A_STANDARD="GMT Standard Time" -GMT_PLUS_00_B_DESC ="(GMT) Casablanca, Monrovia, Reykjavik" +GMT_PLUS_00_B_DESC ="(GMT+00:00) Casablanca, Monrovia, Reykjavik" GMT_PLUS_00_B_DAYLIGHT="Greenwich Daylight Time" GMT_PLUS_00_B_STANDARD="Greenwich Standard Time" @@ -3171,11 +3171,11 @@ GMT_MINUS_01_B_DESC ="(GMT-01:00) Wyspy Zielonego Przylądka." GMT_MINUS_01_B_DAYLIGHT="Wyspy Zielonego Przylądka (czas letni)" GMT_MINUS_01_B_STANDARD="Wyspy Zielonego Przylądka (czas standardowy)" -GMT_PLUS_00_A_DESC ="(GMT) Czas uniwersalny Greenwich: Dublin, Edynburg, Lizbona, Londyn" +GMT_PLUS_00_A_DESC ="(GMT+00:00) Czas uniwersalny Greenwich: Dublin, Edynburg, Lizbona, Londyn" GMT_PLUS_00_A_DAYLIGHT="GMT (czas letni)" GMT_PLUS_00_A_STANDARD="GMT (czas standardowy)" -GMT_PLUS_00_B_DESC ="(GMT) Casablanca, Monrovia, Reykjavik" +GMT_PLUS_00_B_DESC ="(GMT+00:00) Casablanca, Monrovia, Reykjavik" GMT_PLUS_00_B_DAYLIGHT="Greenwich (czas letni)" GMT_PLUS_00_B_STANDARD="Greenwich (czas standardowy)" @@ -3755,11 +3755,11 @@ GMT_MINUS_01_B_DESC ="(UTC-01:00) Insula Capului Verde" GMT_MINUS_01_B_DAYLIGHT="Ora insulei Capul Verde diurnă" GMT_MINUS_01_B_STANDARD="Ora insulei Capul Verde standard" -GMT_PLUS_00_A_DESC ="(UTC) Ora medie Greenwich (GMT): Dublin, Edinburg, Lisabona, Londra" +GMT_PLUS_00_A_DESC ="(UTC+00:00) Ora medie Greenwich (GMT): Dublin, Edinburg, Lisabona, Londra" GMT_PLUS_00_A_DAYLIGHT="Ora medie Greenwich (GMT) diurnă" GMT_PLUS_00_A_STANDARD="Ora medie Greenwich (GMT) standard" -GMT_PLUS_00_B_DESC ="Ora medie Greenwich (GMT): Casablanca, Monrovia, Reykjavik" +GMT_PLUS_00_B_DESC ="(UTC+00:00) Casablanca, Monrovia, Reykjavik" GMT_PLUS_00_B_DAYLIGHT="Ora medie Greenwich (GMT) diurnă" GMT_PLUS_00_B_STANDARD="Ora medie Greenwich (GMT) standard" @@ -4264,8 +4264,8 @@ GMT_MINUS_03_D_DESC ="(GMT-03:00) Гренландия" GMT_MINUS_02_A_DESC ="(GMT-02:00) Среднеатлантическое время" GMT_MINUS_01_A_DESC ="(GMT-01:00) Азорские о-ва" GMT_MINUS_01_B_DESC ="(GMT-01:00) о-ва Зеленого мыса" -GMT_PLUS_00_A_DESC ="(GMT) Время по Гринвичу: Дублин, Лондон, Лиссабон, Эдинбург" -GMT_PLUS_00_B_DESC ="(GMT) Касабланка, Монровия, Рейкьявик" +GMT_PLUS_00_A_DESC ="(GMT+00:00) Время по Гринвичу: Дублин, Лондон, Лиссабон, Эдинбург" +GMT_PLUS_00_B_DESC ="(GMT+00:00) Касабланка, Монровия, Рейкьявик" GMT_PLUS_01_A_DESC ="(GMT+01:00) Белград, Братислава, Будапешт, Любляна, Прага" GMT_PLUS_01_B_DESC ="(GMT+01:00) Варшава, Загреб, Сараево, Скопье" GMT_PLUS_01_C_DESC ="(GMT+01:00) Брюссель, Копенгаген, Мадрид, Париж"

4 years, 2 months

[reactos] 01/01: [BOOTDATA] Update some time zones for Russia. CORE-17336

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf93097514dad3328bea0… commit cf93097514dad3328bea005c536c107d71ef5973 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 13 18:04:02 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 13 18:04:23 2020 +0200 [BOOTDATA] Update some time zones for Russia. CORE-17336 - Move Novosibirsk to GMT+07:00 (was GMT+06:00 previously). - Move Magadan to GMT+11:00 (was GMT+10:00 previously). - Add Omsk time zone GMT+06:00 - Add Tomsk time zone GMT+07:00 --- boot/bootdata/hivesft.inf | 171 +++++++++++++++++++++++++++++----------------- 1 file changed, 108 insertions(+), 63 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 0983a45edcb..f07e82339b3 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1229,11 +1229,11 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Asia Stand 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,%GMT_PLUS_06_B_DESC% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Dlt",0x00000000,%GMT_PLUS_06_B_DAYLIGHT% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Std",0x00000000,%GMT_PLUS_06_B_STANDARD% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Index",0x00010001,201 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","TZI",0x00000001,\ +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Omsk Standard Time","Display",0x00000000,%GMT_PLUS_06_B_DESC% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Omsk Standard Time","Dlt",0x00000000,%GMT_PLUS_06_B_DAYLIGHT% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Omsk Standard Time","Std",0x00000000,%GMT_PLUS_06_B_STANDARD% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Omsk Standard Time","Index",0x00010001,201 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Omsk Standard Time","TZI",0x00000001,\ 0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -1247,24 +1247,42 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard T 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","Display",0x00000000,%GMT_PLUS_07_A_DESC% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","Dlt",0x00000000,%GMT_PLUS_07_A_DAYLIGHT% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","Std",0x00000000,%GMT_PLUS_07_A_STANDARD% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,%GMT_PLUS_07_A_DESC% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Dlt",0x00000000,%GMT_PLUS_07_A_DAYLIGHT% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Std",0x00000000,%GMT_PLUS_07_A_STANDARD% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Index",0x00010001,204 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","TZI",0x00000001,\ +0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","Display",0x00000000,%GMT_PLUS_07_B_DESC% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","Dlt",0x00000000,%GMT_PLUS_07_B_DAYLIGHT% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","Std",0x00000000,%GMT_PLUS_07_B_STANDARD% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","Index",0x00010001,205 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\SE Asia Standard Time","TZI",0x00000001,\ 0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,%GMT_PLUS_07_B_DESC% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Dlt",0x00000000,%GMT_PLUS_07_B_DAYLIGHT% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Std",0x00000000,%GMT_PLUS_07_B_STANDARD% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,%GMT_PLUS_07_C_DESC% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Dlt",0x00000000,%GMT_PLUS_07_C_DAYLIGHT% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Std",0x00000000,%GMT_PLUS_07_C_STANDARD% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Index",0x00010001,207 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","TZI",0x00000001,\ 0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tomsk Standard Time","Display",0x00000000,%GMT_PLUS_07_D_DESC% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tomsk Standard Time","Dlt",0x00000000,%GMT_PLUS_07_D_DAYLIGHT% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tomsk Standard Time","Std",0x00000000,%GMT_PLUS_07_D_STANDARD% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tomsk Standard Time","Index",0x00010001,208 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Tomsk Standard Time","TZI",0x00000001,\ +0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Display",0x00000000,%GMT_PLUS_08_A_DESC% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Dlt",0x00000000,%GMT_PLUS_08_A_DAYLIGHT% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Std",0x00000000,%GMT_PLUS_08_A_STANDARD% @@ -1409,15 +1427,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Pacific Stand 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Display",0x00000000,%GMT_PLUS_10_F_DESC% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Dlt",0x00000000,%GMT_PLUS_10_F_DAYLIGHT% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Std",0x00000000,%GMT_PLUS_10_F_STANDARD% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Index",0x00010001,278 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","TZI",0x00000001,\ -0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 - HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Display",0x00000000,%GMT_PLUS_11_A_DESC% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Dlt",0x00000000,%GMT_PLUS_11_A_DAYLIGHT% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Std",0x00000000,%GMT_PLUS_11_A_STANDARD% @@ -1436,6 +1445,16 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russia Time Zone 1 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Display",0x00000000,%GMT_PLUS_11_C_DESC% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Dlt",0x00000000,%GMT_PLUS_11_C_DAYLIGHT% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Std",0x00000000,%GMT_PLUS_11_C_STANDARD% +;; Was previously 278 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Index",0x00010001,283 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","TZI",0x00000001,\ +0x6c,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Fiji Standard Time","Display",0x00000000,%GMT_PLUS_12_A_DESC% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Fiji Standard Time","Dlt",0x00000000,%GMT_PLUS_12_A_DAYLIGHT% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Fiji Standard Time","Std",0x00000000,%GMT_PLUS_12_A_STANDARD% @@ -2276,21 +2295,29 @@ GMT_PLUS_06_A_DESC ="(GMT+06:00) Astana, Dhaka" GMT_PLUS_06_A_DAYLIGHT="Central Asia Daylight Time" GMT_PLUS_06_A_STANDARD="Central Asia Standard Time" -GMT_PLUS_06_B_DESC ="(GMT+06:00) Novosibirsk" -GMT_PLUS_06_B_DAYLIGHT="RTZ 5 Daylight Time" -GMT_PLUS_06_B_STANDARD="RTZ 5 Standard Time" +GMT_PLUS_06_B_DESC ="(GMT+06:00) Omsk" +GMT_PLUS_06_B_DAYLIGHT="Omsk Daylight Time" +GMT_PLUS_06_B_STANDARD="Omsk Standard Time" GMT_PLUS_0630_A_DESC ="(GMT+06:30) Yangon (Rangoon)" GMT_PLUS_0630_A_DAYLIGHT="Myanmar Daylight Time" GMT_PLUS_0630_A_STANDARD="Myanmar Standard Time" -GMT_PLUS_07_A_DESC ="(GMT+07:00) Bangkok, Hanoi, Jakarta" -GMT_PLUS_07_A_DAYLIGHT="SE Asia Daylight Time" -GMT_PLUS_07_A_STANDARD="SE Asia Standard Time" +GMT_PLUS_07_A_DESC ="(GMT+07:00) Novosibirsk" +GMT_PLUS_07_A_DAYLIGHT="Novosibirsk Daylight Time" +GMT_PLUS_07_A_STANDARD="Novosibirsk Standard Time" -GMT_PLUS_07_B_DESC ="(GMT+07:00) Krasnoyarsk" -GMT_PLUS_07_B_DAYLIGHT="RTZ 6 Daylight Time" -GMT_PLUS_07_B_STANDARD="RTZ 6 Standard Time" +GMT_PLUS_07_B_DESC ="(GMT+07:00) Bangkok, Hanoi, Jakarta" +GMT_PLUS_07_B_DAYLIGHT="SE Asia Daylight Time" +GMT_PLUS_07_B_STANDARD="SE Asia Standard Time" + +GMT_PLUS_07_C_DESC ="(GMT+07:00) Krasnoyarsk" +GMT_PLUS_07_C_DAYLIGHT="RTZ 6 Daylight Time" +GMT_PLUS_07_C_STANDARD="RTZ 6 Standard Time" + +GMT_PLUS_07_D_DESC ="(GMT+07:00) Tomsk" +GMT_PLUS_07_D_DAYLIGHT="Tomsk Daylight Time" +GMT_PLUS_07_D_STANDARD="Tomsk Standard Time" GMT_PLUS_08_A_DESC ="(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi" GMT_PLUS_08_A_DAYLIGHT="China Daylight Time" @@ -2356,10 +2383,6 @@ GMT_PLUS_10_E_DESC ="(GMT+10:00) Guam, Port Moresby" GMT_PLUS_10_E_DAYLIGHT="West Pacific Daylight Time" GMT_PLUS_10_E_STANDARD="West Pacific Standard Time" -GMT_PLUS_10_F_DESC ="(GMT+10:00) Magadan" -GMT_PLUS_10_F_DAYLIGHT="Magadan Daylight Time" -GMT_PLUS_10_F_STANDARD="Magadan Standard Time" - GMT_PLUS_11_A_DESC ="(GMT+11:00) Solomon Is., New Caledonia" GMT_PLUS_11_A_DAYLIGHT="Central Pacific Daylight Time" GMT_PLUS_11_A_STANDARD="Central Pacific Standard Time" @@ -2368,6 +2391,10 @@ GMT_PLUS_11_B_DESC ="(GMT+11:00) Chokurdakh" GMT_PLUS_11_B_DAYLIGHT="RTZ 10 Daylight Time" GMT_PLUS_11_B_STANDARD="RTZ 10 Standard Time" +GMT_PLUS_11_C_DESC ="(GMT+11:00) Magadan" +GMT_PLUS_11_C_DAYLIGHT="Magadan Daylight Time" +GMT_PLUS_11_C_STANDARD="Magadan Standard Time" + GMT_PLUS_12_A_DESC ="(GMT+12:00) Fiji, Kamchatka, Marshall Is." GMT_PLUS_12_A_DAYLIGHT="Fiji Daylight Time" GMT_PLUS_12_A_STANDARD="Fiji Standard Time" @@ -3260,21 +3287,29 @@ GMT_PLUS_06_A_DESC ="(GMT+06:00) Astana, Dhaka" GMT_PLUS_06_A_DAYLIGHT="Azja (środkowy czas letni)" GMT_PLUS_06_A_STANDARD="Azja (środkowy czas standardowy)" -GMT_PLUS_06_B_DESC ="(GMT+06:00) Nowosybirsk" -GMT_PLUS_06_B_DAYLIGHT="RTZ 5 (czas letni)" -GMT_PLUS_06_B_STANDARD="RTZ 5 (czas standardowy)" +GMT_PLUS_06_B_DESC ="(GMT+06:00) Omsk" +GMT_PLUS_06_B_DAYLIGHT="Omsk (czas letni)" +GMT_PLUS_06_B_STANDARD="Omsk (czas standardowy)" GMT_PLUS_0630_A_DESC ="(GMT+06:30) Yangon (Rangun)" GMT_PLUS_0630_A_DAYLIGHT="Myanmar (czas letni)" GMT_PLUS_0630_A_STANDARD="Myanmar (czas standardowy)" -GMT_PLUS_07_A_DESC ="(GMT+07:00) Bangkok, Hanoi, Dżakarta" -GMT_PLUS_07_A_DAYLIGHT="Azja Południowo-Wschodnia (czas letni)" -GMT_PLUS_07_A_STANDARD="Azja Południowo-Wschodnia (czas standardowy)" +GMT_PLUS_07_A_DESC ="(GMT+07:00) Nowosybirsk" +GMT_PLUS_07_A_DAYLIGHT="Nowosybirsk (czas letni)" +GMT_PLUS_07_A_STANDARD="Nowosybirsk (czas standardowy)" -GMT_PLUS_07_B_DESC ="(GMT+07:00) Krasnojarsk" -GMT_PLUS_07_B_DAYLIGHT="RTZ 6 (czas letni)" -GMT_PLUS_07_B_STANDARD="RTZ 6 (czas standardowy)" +GMT_PLUS_07_B_DESC ="(GMT+07:00) Bangkok, Hanoi, Dżakarta" +GMT_PLUS_07_B_DAYLIGHT="Azja Południowo-Wschodnia (czas letni)" +GMT_PLUS_07_B_STANDARD="Azja Południowo-Wschodnia (czas standardowy)" + +GMT_PLUS_07_C_DESC ="(GMT+07:00) Krasnojarsk" +GMT_PLUS_07_C_DAYLIGHT="RTZ 6 (czas letni)" +GMT_PLUS_07_C_STANDARD="RTZ 6 (czas standardowy)" + +GMT_PLUS_07_D_DESC ="(GMT+07:00) Tomsk" +GMT_PLUS_07_D_DAYLIGHT="Tomsk (czas letni)" +GMT_PLUS_07_D_STANDARD="Tomsk (czas standardowy)" GMT_PLUS_08_A_DESC ="(GMT+08:00) Pekin, Chongqing, Hongkong, Urumczi" GMT_PLUS_08_A_DAYLIGHT="Chiny (czas letni)" @@ -3340,10 +3375,6 @@ GMT_PLUS_10_E_DESC ="(GMT+10:00) Guam, Port Moresby" GMT_PLUS_10_E_DAYLIGHT="Zachodni Pacyfik (czas letni)" GMT_PLUS_10_E_STANDARD="Zachodni Pacyfik (czas standardowy)" -GMT_PLUS_10_F_DESC ="(GMT+10:00) Magadan" -GMT_PLUS_10_F_DAYLIGHT="Magadan (czas letni)" -GMT_PLUS_10_F_STANDARD="Magadan (czas standardowy)" - GMT_PLUS_11_A_DESC ="(GMT+11:00) Wyspy Salomona, Nowa Kaledonia" GMT_PLUS_11_A_DAYLIGHT="Środkowy Pacyfik (czas letni)" GMT_PLUS_11_A_STANDARD="Środkowy Pacyfik (czas standardowy)" @@ -3352,6 +3383,10 @@ GMT_PLUS_11_B_DESC ="(GMT+11:00) Czokurdach" GMT_PLUS_11_B_DAYLIGHT="RTZ 10 (czas letni)" GMT_PLUS_11_B_STANDARD="RTZ 10 (czas standardowy)" +GMT_PLUS_11_C_DESC ="(GMT+11:00) Magadan" +GMT_PLUS_11_C_DAYLIGHT="Magadan (czas letni)" +GMT_PLUS_11_C_STANDARD="Magadan (czas standardowy)" + GMT_PLUS_12_A_DESC ="(GMT+12:00) Fidżi, Kamczatka, Wyspy Marshalla" GMT_PLUS_12_A_DAYLIGHT="Fidżi (czas letni)" GMT_PLUS_12_A_STANDARD="Fidżi (czas standardowy)" @@ -3836,21 +3871,29 @@ GMT_PLUS_06_A_DESC ="(UTC+06:00) Astana, Dacca" GMT_PLUS_06_A_DAYLIGHT="Ora Asiei Centrale diurnă" GMT_PLUS_06_A_STANDARD="Ora Asiei Centrale standard" -GMT_PLUS_06_B_DESC ="(UTC+06:00) Novosibirsk" -GMT_PLUS_06_B_DAYLIGHT="Ora zonală rusă 5 diurnă" -GMT_PLUS_06_B_STANDARD="Ora zonală rusă 5 standard" +GMT_PLUS_06_B_DESC ="(UTC+06:00) Omsk" +GMT_PLUS_06_B_DAYLIGHT="Oră de Omsk diurnă" +GMT_PLUS_06_B_STANDARD="Oră de Omsk standard" GMT_PLUS_0630_A_DESC ="(UTC+06:30) Yangon (Rangoon)" GMT_PLUS_0630_A_DAYLIGHT="Oră de Myanmar diurnă" GMT_PLUS_0630_A_STANDARD="Oră de Myanmar standard" -GMT_PLUS_07_A_DESC ="(UTC+07:00) Bangkok, Hanoi, Jakarta" -GMT_PLUS_07_A_DAYLIGHT="Ora Asiei de Sud-Est diurnă" -GMT_PLUS_07_A_STANDARD="Ora Asiei de Sud-Est standard" +GMT_PLUS_07_A_DESC ="(UTC+07:00) Novosibirsk" +GMT_PLUS_07_A_DAYLIGHT="Oră de Novosibirsk diurnă" +GMT_PLUS_07_A_STANDARD="Oră de Novosibirsk standard" -GMT_PLUS_07_B_DESC ="(UTC+07:00) Krasnoiarsk" -GMT_PLUS_07_B_DAYLIGHT="Ora zonală rusă 6 diurnă" -GMT_PLUS_07_B_STANDARD="Ora zonală rusă 6 standard" +GMT_PLUS_07_B_DESC ="(UTC+07:00) Bangkok, Hanoi, Jakarta" +GMT_PLUS_07_B_DAYLIGHT="Ora Asiei de Sud-Est diurnă" +GMT_PLUS_07_B_STANDARD="Ora Asiei de Sud-Est standard" + +GMT_PLUS_07_C_DESC ="(UTC+07:00) Krasnoiarsk" +GMT_PLUS_07_C_DAYLIGHT="Ora zonală rusă 6 diurnă" +GMT_PLUS_07_C_STANDARD="Ora zonală rusă 6 standard" + +GMT_PLUS_07_D_DESC ="(UTC+07:00) Tomsk" +GMT_PLUS_07_D_DAYLIGHT="Oră de Tomsk diurnă" +GMT_PLUS_07_D_STANDARD="Oră de Tomsk standard" GMT_PLUS_08_A_DESC ="(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumci" GMT_PLUS_08_A_DAYLIGHT="Oră de China diurnă" @@ -3916,10 +3959,6 @@ GMT_PLUS_10_E_DESC ="(UTC+10:00) Guam, Port Moresby" GMT_PLUS_10_E_DAYLIGHT="Ora Pacificului de Vest diurnă" GMT_PLUS_10_E_STANDARD="Ora Pacificului de Vest standard" -GMT_PLUS_10_F_DESC ="(UTC+10:00) Magadan" -GMT_PLUS_10_F_DAYLIGHT="Oră de Magadan diurnă" -GMT_PLUS_10_F_STANDARD="Oră de Magadan standard" - GMT_PLUS_11_A_DESC ="(UTC+11:00) Insulele Solomon, Noua Caledonie" GMT_PLUS_11_A_DAYLIGHT="Ora Pacificului Central diurnă" GMT_PLUS_11_A_STANDARD="Ora Pacificului Central standard" @@ -3928,6 +3967,10 @@ GMT_PLUS_11_B_DESC ="(UTC+11:00) Ciocurdah" GMT_PLUS_11_B_DAYLIGHT="Ora zonală rusă 10 diurnă" GMT_PLUS_11_B_STANDARD="Ora zonală rusă 10 standard" +GMT_PLUS_11_C_DESC ="(UTC+11:00) Magadan" +GMT_PLUS_11_C_DAYLIGHT="Oră de Magadan diurnă" +GMT_PLUS_11_C_STANDARD="Oră de Magadan standard" + GMT_PLUS_12_A_DESC ="(UTC+12:00) Fiji, Kamceatka, Insulele Marshall" GMT_PLUS_12_A_DAYLIGHT="Oră de Fiji diurnă" GMT_PLUS_12_A_STANDARD="Oră de Fiji standard" @@ -4250,10 +4293,12 @@ GMT_PLUS_0530_A_DESC ="(GMT+05:30) Калькутта, Мумбаи, Нью- GMT_PLUS_0530_B_DESC ="(GMT+05:30) Шри Джаяварденепура" GMT_PLUS_0545_A_DESC ="(GMT+05:45) Катманду" GMT_PLUS_06_A_DESC ="(GMT+06:00) Астана, Дхака" -GMT_PLUS_06_B_DESC ="(GMT+06:00) Новосибирск" +GMT_PLUS_06_B_DESC ="(GMT+06:00) Омск" GMT_PLUS_0630_A_DESC ="(GMT+06:30) Янгун (Рангун)" -GMT_PLUS_07_A_DESC ="(GMT+07:00) Бангкок, Джакарта, Ханой" -GMT_PLUS_07_B_DESC ="(GMT+07:00) Красноярск" +GMT_PLUS_07_A_DESC ="(GMT+07:00) Новосибирск" +GMT_PLUS_07_B_DESC ="(GMT+07:00) Бангкок, Джакарта, Ханой" +GMT_PLUS_07_C_DESC ="(GMT+07:00) Красноярск" +GMT_PLUS_07_D_DESC ="(GMT+07:00) Томск" GMT_PLUS_08_A_DESC ="(GMT+08:00) Гонконг, Пекин, Урумчи, Чунцин" GMT_PLUS_08_B_DESC ="(GMT+08:00) Куала-Лумпур, Сингапур" GMT_PLUS_08_C_DESC ="(GMT+08:00) Тайпей" @@ -4270,9 +4315,9 @@ GMT_PLUS_10_B_DESC ="(GMT+10:00) Брисбейн" GMT_PLUS_10_C_DESC ="(GMT+10:00) Хобарт" GMT_PLUS_10_D_DESC ="(GMT+10:00) Владивосток" GMT_PLUS_10_E_DESC ="(GMT+10:00) Гуам, Порт Моресби" -GMT_PLUS_10_F_DESC ="(GMT+10:00) Магадан" GMT_PLUS_11_A_DESC ="(GMT+11:00) Соломоновы о-ва, Новая Каледония" GMT_PLUS_11_B_DESC ="(GMT+11:00) Чокурдах" +GMT_PLUS_11_C_DESC ="(GMT+11:00) Магадан" GMT_PLUS_12_A_DESC ="(GMT+12:00) Камчатка, Маршалловы о-ва, Фиджи" GMT_PLUS_12_B_DESC ="(GMT+12:00) Анадырь, Петропавловск-Камчатский" GMT_PLUS_12_C_DESC ="(GMT+12:00) Окленд, Веллингтон"

4 years, 2 months

[reactos] 01/01: [NTUSER] Fix Shell Hook HSHELL_WINDOWCREATED (#3294)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58b0558f94abee52ce1c2… commit 58b0558f94abee52ce1c261063d4f4b884e96310 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 13 16:37:52 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 13 16:37:52 2020 +0900 [NTUSER] Fix Shell Hook HSHELL_WINDOWCREATED (#3294) Fix Shell Hook and reduce failures of shell32_apitest ShellHook testcase. Fix the condition of notifying shell hook HSHELL_WINDOWCREATED in ntuser/winpos.c. CORE-17330 --- win32ss/user/ntuser/winpos.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index b5927d183c2..9a74a16e45b 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1904,18 +1904,13 @@ co_WinPosSetWindowPos( } else if (WinPos.flags & SWP_SHOWWINDOW) { - if (Window->spwndOwner == NULL || - !(Window->spwndOwner->style & WS_VISIBLE) || - (Window->spwndOwner->ExStyle & WS_EX_TOOLWINDOW)) + if ((Window->ExStyle & WS_EX_APPWINDOW) || + (!(Window->ExStyle & WS_EX_TOOLWINDOW) && !Window->spwndOwner && + (!Window->spwndParent || UserIsDesktopWindow(Window->spwndParent)))) { - if (UserIsDesktopWindow(Window->spwndParent) && - (!(Window->ExStyle & WS_EX_TOOLWINDOW) || - (Window->ExStyle & WS_EX_APPWINDOW))) - { - co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); - if (!(WinPos.flags & SWP_NOACTIVATE)) - UpdateShellHook(Window); - } + co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); + if (!(WinPos.flags & SWP_NOACTIVATE)) + UpdateShellHook(Window); } Window->style |= WS_VISIBLE; //IntSetStyle( Window, WS_VISIBLE, 0 );

4 years, 2 months

[reactos] 01/01: [FASTFAT] Fix create for DOT and DOT-DOT leaving bad directory entry (#3241)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79794b524cd9b865113dc… commit 79794b524cd9b865113dc9c254d06f82b3b161ae Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Sep 26 17:39:15 2020 -0500 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 12 18:54:06 2020 +0300 [FASTFAT] Fix create for DOT and DOT-DOT leaving bad directory entry (#3241) --- drivers/filesystems/fastfat/create.c | 11 ++++++++--- drivers/filesystems/fastfat/finfo.c | 10 +++++++--- drivers/filesystems/fastfat/string.c | 10 +++++++++- drivers/filesystems/fastfat/vfat.h | 4 ++++ 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index aadc990e37b..0de08a9dd78 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -360,9 +360,7 @@ VfatOpenFile( return STATUS_CANNOT_DELETE; } - if ((vfatFCBIsRoot(Fcb) || - (Fcb->LongNameU.Length == sizeof(WCHAR) && Fcb->LongNameU.Buffer[0] == L'.') || - (Fcb->LongNameU.Length == 2 * sizeof(WCHAR) && Fcb->LongNameU.Buffer[0] == L'.' && Fcb->LongNameU.Buffer[1] == L'.')) && + if ((vfatFCBIsRoot(Fcb) || IsDotOrDotDot(&Fcb->LongNameU)) && BooleanFlagOn(RequestedOptions, FILE_DELETE_ON_CLOSE)) { // we cannot delete a '.', '..' or the root directory @@ -791,6 +789,13 @@ VfatCreateFile( Attributes |= FILE_ATTRIBUTE_ARCHIVE; } vfatSplitPathName(&PathNameU, NULL, &FileNameU); + + if (IsDotOrDotDot(&FileNameU)) + { + vfatReleaseFCB(DeviceExt, ParentFcb); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); + return STATUS_OBJECT_NAME_INVALID; + } Status = VfatAddEntry(DeviceExt, &FileNameU, &pFcb, ParentFcb, RequestedOptions, Attributes, NULL); vfatReleaseFCB(DeviceExt, ParentFcb); diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 755ba6a9917..49738122b1e 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -380,9 +380,7 @@ VfatSetDispositionInformation( return STATUS_CANNOT_DELETE; } - if (vfatFCBIsRoot(FCB) || - (FCB->LongNameU.Length == sizeof(WCHAR) && FCB->LongNameU.Buffer[0] == L'.') || - (FCB->LongNameU.Length == 2 * sizeof(WCHAR) && FCB->LongNameU.Buffer[0] == L'.' && FCB->LongNameU.Buffer[1] == L'.')) + if (vfatFCBIsRoot(FCB) || IsDotOrDotDot(&FCB->LongNameU)) { /* we cannot delete a '.', '..' or the root directory */ return STATUS_ACCESS_DENIED; @@ -804,6 +802,12 @@ VfatSetRenameInformation( vfatSplitPathName(&NewName, &NewPath, &NewFile); DPRINT("New dir: %wZ, New file: %wZ\n", &NewPath, &NewFile); + if (IsDotOrDotDot(&NewFile)) + { + Status = STATUS_OBJECT_NAME_INVALID; + goto Cleanup; + } + if (vfatFCBIsDirectory(FCB) && !IsListEmpty(&FCB->ParentListHead)) { if (IsThereAChildOpened(FCB)) diff --git a/drivers/filesystems/fastfat/string.c b/drivers/filesystems/fastfat/string.c index 6a8f65a48f5..00b3271c921 100644 --- a/drivers/filesystems/fastfat/string.c +++ b/drivers/filesystems/fastfat/string.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/string.c * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * PROGRAMMERS: Jason Filby (jasonfilby(a)yahoo.com) + * Doug Lyons (douglyons at douglyons dot com) * */ @@ -24,3 +25,10 @@ vfatIsLongIllegal( { return wcschr(long_illegals, c) ? TRUE : FALSE; } + +BOOLEAN +IsDotOrDotDot(PCUNICODE_STRING Name) +{ + return ((Name->Length == sizeof(WCHAR) && Name->Buffer[0] == L'.') || + (Name->Length == 2 * sizeof(WCHAR) && Name->Buffer[0] == L'.' && Name->Buffer[1] == L'.')); +} diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 478753447d0..593ceb7c2da 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -1221,6 +1221,10 @@ BOOLEAN vfatIsLongIllegal( WCHAR c); +BOOLEAN +IsDotOrDotDot( + PCUNICODE_STRING Name); + /* volume.c */ NTSTATUS

4 years, 2 months

[reactos] 01/01: [BOOTDATA] Comment out vgaoem.fon (#3291)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea3973f12e4213249d87d… commit ea3973f12e4213249d87dfe130fa21099ab5f3ea Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Mon Oct 12 13:48:49 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 12 14:48:49 2020 +0300 [BOOTDATA] Comment out vgaoem.fon (#3291) This font has been added in 383ea7d and then disabled from builds in 4cd2a93 due to regressions it was causing. Also disable it in registry to not break NTLDR boot again. --- boot/bootdata/hivesys.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 5e201a59a71..30bb1a01944 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -992,7 +992,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","28606",0x00000000,"c_28606 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","ACP",0x00000000,"1252" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","OEMCP",0x00000000,"437" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","MACCP",0x00000000,"10000" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","OEMHAL",0x00000000,"vgaoem.fon" +;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","OEMHAL",0x00000000,"vgaoem.fon" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","932",2,"F040-F9FC" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","936",2,"AAA1-AFFE,F8A1-FEFE,A140-A7A0"

4 years, 2 months

[reactos] 01/01: [SHELL32_APITEST] Add ShellHook testcase (#3289)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0089291751837d977431c… commit 0089291751837d977431c85b6d8d6b1232fbb67b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 12 09:52:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 12 09:52:21 2020 +0900 [SHELL32_APITEST] Add ShellHook testcase (#3289) Add a testcase named ShellHook for shell hook. This testcase will test HSHELL_WINDOWCREATED especially. HSHELL_WINDOWCREATED affects display of task bar panes. CORE-17330 --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + modules/rostests/apitests/shell32/ShellHook.cpp | 464 +++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 467 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 9f8cee6a20d..f719ab6ddab 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -31,6 +31,7 @@ list(APPEND SOURCE ShellExecCmdLine.cpp ShellExecuteEx.cpp ShellExecuteW.cpp + ShellHook.cpp ShellState.cpp SHLimitInputEdit.cpp menu.cpp diff --git a/modules/rostests/apitests/shell32/ShellHook.cpp b/modules/rostests/apitests/shell32/ShellHook.cpp new file mode 100644 index 00000000000..ee4e8d9babf --- /dev/null +++ b/modules/rostests/apitests/shell32/ShellHook.cpp @@ -0,0 +1,464 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for Shell Hook + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include "shelltest.h" +#include "undocshell.h" + +static UINT s_uShellHookMsg = 0; +static HWND s_hwndHookViewer = NULL; +static HWND s_hwndParent = NULL; +static HWND s_hwndTarget = NULL; +static DWORD s_dwFlags = 0; +static WCHAR s_szName[] = L"ReactOS ShellHook testcase"; + +static HWND +DoCreateWindow(HWND hwndParent, DWORD style, DWORD exstyle) +{ + return CreateWindowExW(exstyle, s_szName, s_szName, style, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + hwndParent, NULL, GetModuleHandleW(NULL), NULL); +} + +struct TEST_ENTRY +{ + INT lineno; + DWORD dwFlags; + BOOL bIsChild; + BOOL bHasOwner; + DWORD style; + DWORD exstyle; + DWORD owner_style; + DWORD owner_exstyle; +}; + +#define STYLE_0 WS_POPUP +#define STYLE_1 (WS_POPUP | WS_VISIBLE) + +#define EXSTYLE_0 0 +#define EXSTYLE_1 WS_EX_APPWINDOW +#define EXSTYLE_2 WS_EX_TOOLWINDOW +#define EXSTYLE_3 (WS_EX_APPWINDOW | WS_EX_TOOLWINDOW) + +#define TYPE_0 FALSE, FALSE +#define TYPE_1 FALSE, TRUE +#define TYPE_2 TRUE, TRUE + +static const TEST_ENTRY s_entries[] = +{ + // STYLE_0, EXSTYLE_0 + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_1 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_1 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_0, STYLE_1, EXSTYLE_3 }, + + // STYLE_1, EXSTYLE_0 + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_1 }, + + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_1 }, + + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 3, TYPE_0, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_0, STYLE_1, EXSTYLE_3 }, + + // STYLE_0, EXSTYLE_1 + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_1 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_1 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_1, STYLE_1, EXSTYLE_3 }, + + // STYLE_1, EXSTYLE_1 + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0xB, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0xB, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x1B, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0x1B, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x4B, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0x4B, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_1 }, + + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x5B, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x5B, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_1 }, + + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x2B, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0x2B, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x3B, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0x3B, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x6B, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0x6B, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 0xB, TYPE_0, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x7B, TYPE_1, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x7B, TYPE_2, STYLE_1, EXSTYLE_1, STYLE_1, EXSTYLE_3 }, + + // STYLE_0, EXSTYLE_2 + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_2, STYLE_1, EXSTYLE_3 }, + + // STYLE_1, EXSTYLE_2 + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_1 }, + + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_1 }, + + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 0, TYPE_0, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_1, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_1, EXSTYLE_2, STYLE_1, EXSTYLE_3 }, + + // STYLE_0, EXSTYLE_3 + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 0, TYPE_0, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0, TYPE_1, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0, TYPE_2, STYLE_0, EXSTYLE_3, STYLE_1, EXSTYLE_3 }, + + // STYLE_1, EXSTYLE_3 + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0xF, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_0 }, + { __LINE__, 0xF, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_0 }, + + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x1F, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_0 }, + { __LINE__, 0x1F, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_0 }, + + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x4F, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_1 }, + { __LINE__, 0x4F, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_1 }, + + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x5F, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_1 }, + { __LINE__, 0x5F, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_1 }, + + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x2F, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_2 }, + { __LINE__, 0x2F, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_2 }, + + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x3F, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_2 }, + { __LINE__, 0x3F, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_2 }, + + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x6F, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_3 }, + { __LINE__, 0x6F, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_0, EXSTYLE_3 }, + + { __LINE__, 0xF, TYPE_0, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x7F, TYPE_1, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_3 }, + { __LINE__, 0x7F, TYPE_2, STYLE_1, EXSTYLE_3, STYLE_1, EXSTYLE_3 }, +}; + +static const size_t s_num_entries = sizeof(s_entries) / sizeof(s_entries[0]); + +static void DoTestEntryPart1(const TEST_ENTRY *pEntry) +{ + ok(!pEntry->bIsChild || pEntry->bHasOwner, + "Line %d: bIsChild && !bHasOwner\n", pEntry->lineno); + + s_hwndParent = NULL; + if (pEntry->bIsChild || pEntry->bHasOwner) + { + s_hwndParent = DoCreateWindow(NULL, pEntry->owner_style, pEntry->owner_exstyle); + } + + DWORD style = pEntry->style; + DWORD exstyle = pEntry->exstyle; + if (pEntry->bIsChild) + style |= WS_CHILD; + else + style &= ~WS_CHILD; + + s_dwFlags = 0; + s_hwndTarget = DoCreateWindow(s_hwndParent, style, exstyle); +} + +static void DoTestEntryPart2(const TEST_ENTRY *pEntry) +{ + ok(s_dwFlags == pEntry->dwFlags, "Line %d: s_dwFlags expected 0x%lX but was 0x%lX\n", + pEntry->lineno, pEntry->dwFlags, s_dwFlags); + + PostMessageW(s_hwndTarget, WM_CLOSE, 0, 0); + s_hwndTarget = NULL; + + if (pEntry->bIsChild || pEntry->bHasOwner) + { + PostMessageW(s_hwndParent, WM_CLOSE, 0, 0); + s_hwndParent = NULL; + } +} + +static LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == s_uShellHookMsg && uMsg != 0) + { + DWORD style, exstyle, owner_style, owner_exstyle; + HWND hwndOwner; + DWORD dwFlags; + switch (wParam) + { + case HSHELL_WINDOWCREATED: + if ((HWND)lParam != s_hwndTarget) + break; + style = (LONG)GetWindowLongPtrW(s_hwndTarget, GWL_STYLE); + exstyle = (LONG)GetWindowLongPtrW(s_hwndTarget, GWL_EXSTYLE); + if (style & WS_CHILD) + hwndOwner = GetParent(s_hwndTarget); + else + hwndOwner = GetWindow(s_hwndTarget, GW_OWNER); + owner_style = (LONG)GetWindowLongPtrW(hwndOwner, GWL_STYLE); + owner_exstyle = (LONG)GetWindowLongPtrW(hwndOwner, GWL_EXSTYLE); + dwFlags = (1 << 0); + if (style & WS_VISIBLE) + dwFlags |= (1 << 1); + if (exstyle & WS_EX_TOOLWINDOW) + dwFlags |= (1 << 2); + if (exstyle & WS_EX_APPWINDOW) + dwFlags |= (1 << 3); + if (owner_style & WS_VISIBLE) + dwFlags |= (1 << 4); + if (owner_exstyle & WS_EX_TOOLWINDOW) + dwFlags |= (1 << 5); + if (owner_exstyle & WS_EX_APPWINDOW) + dwFlags |= (1 << 6); + s_dwFlags = dwFlags; + break; + } + } + switch (uMsg) + { + case WM_CREATE: + PostMessageW(hwnd, WM_COMMAND, 1000, 0); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + case WM_COMMAND: + if (hwnd == s_hwndHookViewer) + { + if (1000 <= wParam && wParam < 2000) + { + INT i = (INT)wParam - 1000; + DoTestEntryPart1(&s_entries[i]); + PostMessageW(hwnd, WM_COMMAND, 2000 + i, 0); + } + else if (2000 <= wParam && wParam < 3000) + { + INT i = (INT)wParam - 2000; + DoTestEntryPart2(&s_entries[i]); + ++i; + if (i == s_num_entries) + { + PostQuitMessage(0); + break; + } + PostMessageW(hwnd, WM_COMMAND, 1000 + i, 0); + } + } + break; + default: + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + return 0; +} + +START_TEST(ShellHook) +{ + WNDCLASSW wc; + + ZeroMemory(&wc, sizeof(wc)); + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleW(NULL); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szName; + if (!RegisterClassW(&wc)) + { + skip("RegisterClassW failed\n"); + return; + } + + s_hwndHookViewer = DoCreateWindow(NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0); + if (s_hwndHookViewer == NULL) + { + skip("CreateWindowExW failed\n"); + return; + } + + s_uShellHookMsg = RegisterWindowMessageW(L"SHELLHOOK"); + RegisterShellHookWindow(s_hwndHookViewer); + + MSG msg; + while (GetMessageW(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + DeregisterShellHookWindow(s_hwndHookViewer); + DestroyWindow(s_hwndHookViewer); + s_hwndHookViewer = NULL; +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 4818673e1eb..9763afa4ea7 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -25,6 +25,7 @@ extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecCmdLine(void); extern void func_ShellExecuteEx(void); extern void func_ShellExecuteW(void); +extern void func_ShellHook(void); extern void func_ShellState(void); extern void func_SHLimitInputEdit(void); extern void func_SHParseDisplayName(void); @@ -53,6 +54,7 @@ const struct test winetest_testlist[] = { "ShellExecCmdLine", func_ShellExecCmdLine }, { "ShellExecuteEx", func_ShellExecuteEx }, { "ShellExecuteW", func_ShellExecuteW }, + { "ShellHook", func_ShellHook }, { "ShellState", func_ShellState }, { "SHLimitInputEdit", func_SHLimitInputEdit }, { "SHParseDisplayName", func_SHParseDisplayName },

4 years, 2 months

[reactos] 01/01: [CMD] Fix a typo in filename completion (#3293)

by chirsz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a91a709a8d70dc417a54e… commit a91a709a8d70dc417a54eea5e5b271e04d8fa828 Author: chirsz <chirsz(a)foxmail.com> AuthorDate: Mon Oct 12 03:57:08 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 11 21:57:08 2020 +0200 [CMD] Fix a typo in filename completion (#3293) Fix filename completion that could cause a incorrect result when the path contains "dots". (See also HBelusca@d12169b.) See CORE-8623 and CORE-1901 (bug introduced in r25896 / 54cf74f). For example: - The current directory is `C:\Documents and Settings\Administrator\`, and you input `".` and press TAB. The completion result would be `".Administrator"`, which even does not exist. - You input "some(file).ext", and you remove the final quote (or the quote and "ext") and you attempt to complete the file name. - Import two additional fixes from HBelusca@a826730: Fix the search ordering in the comparisons between szSearch1, szSearch2 and szSearch3. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/shell/cmd/filecomp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/shell/cmd/filecomp.c b/base/shell/cmd/filecomp.c index 9dfa2943fdc..4e486692a66 100644 --- a/base/shell/cmd/filecomp.c +++ b/base/shell/cmd/filecomp.c @@ -394,10 +394,10 @@ VOID FindPrefixAndSuffix(LPTSTR strIN, LPTSTR szPrefix, LPTSTR szSuffix) /* Find the one closest to end */ szSearch1 = _tcsrchr(str, _T('\"')); szSearch2 = _tcsrchr(str, _T('\\')); - szSearch3 = _tcsrchr(str, _T('.')); - if (szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + szSearch3 = _tcsrchr(str, _T('/')); + if ((szSearch2 != NULL) && (szSearch1 < szSearch2)) szSearch = szSearch2; - else if (szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) + else if ((szSearch3 != NULL) && (szSearch1 < szSearch3)) szSearch = szSearch3; else szSearch = szSearch1; @@ -440,9 +440,9 @@ VOID FindPrefixAndSuffix(LPTSTR strIN, LPTSTR szPrefix, LPTSTR szSuffix) szSearch1 = _tcsrchr(str, _T(' ')); szSearch2 = _tcsrchr(str, _T('\\')); szSearch3 = _tcsrchr(str, _T('/')); - if (szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + if ((szSearch2 != NULL) && (szSearch1 < szSearch2)) szSearch = szSearch2; - else if (szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) + else if ((szSearch3 != NULL) && (szSearch1 < szSearch3)) szSearch = szSearch3; else szSearch = szSearch1;

4 years, 2 months

[reactos] 08/08: [RAPPS] Re-add support for icons named after the ini file

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a2c1f7d0bdd93474ff1b… commit 7a2c1f7d0bdd93474ff1b57dd77c7277e6b8bba3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 30 19:24:52 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 11 17:01:06 2020 +0200 [RAPPS] Re-add support for icons named after the ini file --- base/applications/rapps/available.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index d32e5f8d74a..6de168024dd 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -92,18 +92,32 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString } } + ATL::CStringW IconPath = AvlbStrings.szAppsPath; + PathAppendW(IconPath.GetBuffer(MAX_PATH), L"icons"); + // TODO: are we going to support specify an URL for an icon ? ATL::CStringW IconLocation; if (GetString(L"Icon", IconLocation)) { - // TODO: Does the filename contain anything stuff like ":" "<" ">" ? - // these stuff may lead to security issues - ATL::CStringW IconPath = AvlbStrings.szAppsPath; - PathAppendW(IconPath.GetBuffer(MAX_PATH), L"icons"); BOOL bSuccess = PathAppendNoDirEscapeW(IconPath.GetBuffer(), IconLocation.GetString()); IconPath.ReleaseBuffer(); - if (bSuccess) + if (!bSuccess) + { + IconPath.Empty(); + } + } + else + { + // inifile.ico + PathAppendW(IconPath.GetBuffer(), m_szPkgName); + IconPath.ReleaseBuffer(); + IconPath += L".ico"; + } + + if (!IconPath.IsEmpty()) + { + if (PathFileExistsW(IconPath)) { m_szIconLocation = IconPath; }

4 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

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 October 2020