Ros-diffs

ros-diffs@reactos.org

19 participants
81103 discussions

[reactos] 01/01: [TASKMGR] Fix the license. Turns out it's LGPL-2.1-or-later from the texts.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c706222f3f1b2a63e8cc9… commit c706222f3f1b2a63e8cc969ee756c8be92527853 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 15 19:45:15 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 19:45:23 2023 +0200 [TASKMGR] Fix the license. Turns out it's LGPL-2.1-or-later from the texts. Caught by Stanislav. Sorry for the oversight! --- base/applications/taskmgr/about.c | 2 +- base/applications/taskmgr/about.h | 2 +- base/applications/taskmgr/affinity.c | 2 +- base/applications/taskmgr/affinity.h | 2 +- base/applications/taskmgr/applpage.c | 2 +- base/applications/taskmgr/applpage.h | 2 +- base/applications/taskmgr/column.c | 2 +- base/applications/taskmgr/column.h | 2 +- base/applications/taskmgr/debug.c | 2 +- base/applications/taskmgr/debug.h | 2 +- base/applications/taskmgr/endproc.c | 2 +- base/applications/taskmgr/endproc.h | 2 +- base/applications/taskmgr/graph.c | 2 +- base/applications/taskmgr/graph.h | 2 +- base/applications/taskmgr/graphctl.c | 2 +- base/applications/taskmgr/graphctl.h | 2 +- base/applications/taskmgr/optnmenu.c | 2 +- base/applications/taskmgr/optnmenu.h | 2 +- base/applications/taskmgr/perfdata.c | 2 +- base/applications/taskmgr/perfdata.h | 2 +- base/applications/taskmgr/perfpage.c | 2 +- base/applications/taskmgr/perfpage.h | 2 +- base/applications/taskmgr/precomp.h | 2 +- base/applications/taskmgr/priority.c | 2 +- base/applications/taskmgr/priority.h | 2 +- base/applications/taskmgr/proclist.c | 2 +- base/applications/taskmgr/proclist.h | 2 +- base/applications/taskmgr/procpage.c | 2 +- base/applications/taskmgr/procpage.h | 2 +- base/applications/taskmgr/resource.h | 2 +- base/applications/taskmgr/run.c | 2 +- base/applications/taskmgr/run.h | 2 +- base/applications/taskmgr/shutdown.c | 2 +- base/applications/taskmgr/shutdown.h | 2 +- base/applications/taskmgr/taskmgr.c | 2 +- base/applications/taskmgr/taskmgr.h | 2 +- base/applications/taskmgr/taskmgr.rc | 2 +- base/applications/taskmgr/trayicon.c | 2 +- base/applications/taskmgr/trayicon.h | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/base/applications/taskmgr/about.c b/base/applications/taskmgr/about.c index e3ebc1c0b7c..e0decc1ddaa 100644 --- a/base/applications/taskmgr/about.c +++ b/base/applications/taskmgr/about.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: About Box. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/about.h b/base/applications/taskmgr/about.h index cfe31132e2c..5af62ca8a80 100644 --- a/base/applications/taskmgr/about.h +++ b/base/applications/taskmgr/about.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: About Box. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/affinity.c b/base/applications/taskmgr/affinity.c index 5bb596a63a0..6470caa9526 100644 --- a/base/applications/taskmgr/affinity.c +++ b/base/applications/taskmgr/affinity.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processor Affinity. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/affinity.h b/base/applications/taskmgr/affinity.h index 6aafd95cb8f..1d7e05e3dd2 100644 --- a/base/applications/taskmgr/affinity.h +++ b/base/applications/taskmgr/affinity.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processor Affinity. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index 488ae8fd6af..7db38c09c90 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Applications Page. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/applpage.h b/base/applications/taskmgr/applpage.h index 2f59e175c68..e6bf69c21a1 100644 --- a/base/applications/taskmgr/applpage.h +++ b/base/applications/taskmgr/applpage.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Applications Page. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/column.c b/base/applications/taskmgr/column.c index bc98b06705d..089e4044854 100644 --- a/base/applications/taskmgr/column.c +++ b/base/applications/taskmgr/column.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processes List Columns. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/column.h b/base/applications/taskmgr/column.h index cf68106c6e0..615067104ad 100644 --- a/base/applications/taskmgr/column.h +++ b/base/applications/taskmgr/column.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processes List Columns. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/debug.c b/base/applications/taskmgr/debug.c index 8e5701fceab..7e3e11f283e 100644 --- a/base/applications/taskmgr/debug.c +++ b/base/applications/taskmgr/debug.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Process Debugging. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/debug.h b/base/applications/taskmgr/debug.h index cecb974df67..5ab2473bbce 100644 --- a/base/applications/taskmgr/debug.h +++ b/base/applications/taskmgr/debug.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Process Debugging. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/endproc.c b/base/applications/taskmgr/endproc.c index 822790033d2..9f4a2ee647e 100644 --- a/base/applications/taskmgr/endproc.c +++ b/base/applications/taskmgr/endproc.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Process Termination. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/endproc.h b/base/applications/taskmgr/endproc.h index 04744d7c1f1..1cf2704acab 100644 --- a/base/applications/taskmgr/endproc.h +++ b/base/applications/taskmgr/endproc.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Process Termination. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/graph.c b/base/applications/taskmgr/graph.c index 0b30e1ffbbc..aea347c47b6 100644 --- a/base/applications/taskmgr/graph.c +++ b/base/applications/taskmgr/graph.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Performance Graph Meters. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/graph.h b/base/applications/taskmgr/graph.h index d79524b43b1..27682b41c05 100644 --- a/base/applications/taskmgr/graph.h +++ b/base/applications/taskmgr/graph.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Performance Graph Meters. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index ef6bbf6b632..3f34ddf016e 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Graph Plotting controls. * COPYRIGHT: Copyright 2002 Robert Dickenson <robd(a)reactos.org> * Copyright 2021 Wu Haotian <rigoligo03(a)gmail.com> diff --git a/base/applications/taskmgr/graphctl.h b/base/applications/taskmgr/graphctl.h index 959ffab4122..7fb84d291db 100644 --- a/base/applications/taskmgr/graphctl.h +++ b/base/applications/taskmgr/graphctl.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Graph Plotting controls. * COPYRIGHT: Copyright 2002 Robert Dickenson <robd(a)reactos.org> * Copyright 2021 Wu Haotian <rigoligo03(a)gmail.com> diff --git a/base/applications/taskmgr/optnmenu.c b/base/applications/taskmgr/optnmenu.c index f6be7e209f6..93cd96c3f85 100644 --- a/base/applications/taskmgr/optnmenu.c +++ b/base/applications/taskmgr/optnmenu.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Menu item handlers for the options menu. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/optnmenu.h b/base/applications/taskmgr/optnmenu.h index 6f259c396bd..46bfc60ba0b 100644 --- a/base/applications/taskmgr/optnmenu.h +++ b/base/applications/taskmgr/optnmenu.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Menu item handlers for the options menu. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index c4e80d5832a..0126285c98b 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Performance Counters. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> diff --git a/base/applications/taskmgr/perfdata.h b/base/applications/taskmgr/perfdata.h index 5bfc3bb31fb..3da4a0fef2b 100644 --- a/base/applications/taskmgr/perfdata.h +++ b/base/applications/taskmgr/perfdata.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Performance Counters. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index 62668e059c0..9e601041bd4 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Performance Page. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/perfpage.h b/base/applications/taskmgr/perfpage.h index 6eed9c34e61..e581bd39c3e 100644 --- a/base/applications/taskmgr/perfpage.h +++ b/base/applications/taskmgr/perfpage.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Performance Page. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index 682b35d07e7..5a4f77a55d9 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Precompiled Header. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/priority.c b/base/applications/taskmgr/priority.c index 714bc76da72..028c297f8e0 100644 --- a/base/applications/taskmgr/priority.c +++ b/base/applications/taskmgr/priority.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Process Priority. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/priority.h b/base/applications/taskmgr/priority.h index d7088b17211..891db0fd0b5 100644 --- a/base/applications/taskmgr/priority.h +++ b/base/applications/taskmgr/priority.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Process Priority. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/proclist.c b/base/applications/taskmgr/proclist.c index 7396be368ec..02e7df0b314 100644 --- a/base/applications/taskmgr/proclist.c +++ b/base/applications/taskmgr/proclist.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processes List. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/proclist.h b/base/applications/taskmgr/proclist.h index 8822d1010f2..96f07472bd9 100644 --- a/base/applications/taskmgr/proclist.h +++ b/base/applications/taskmgr/proclist.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processes List. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index 40d941add28..1740e0a2753 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processes Page. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2009 Maxime Vernier <maxime.vernier(a)gmail.com> diff --git a/base/applications/taskmgr/procpage.h b/base/applications/taskmgr/procpage.h index fdee980ae79..d9705b1ec16 100644 --- a/base/applications/taskmgr/procpage.h +++ b/base/applications/taskmgr/procpage.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Processes Page. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2009 Maxime Vernier <maxime.vernier(a)gmail.com> diff --git a/base/applications/taskmgr/resource.h b/base/applications/taskmgr/resource.h index 7f5ef276afe..bda48393a30 100644 --- a/base/applications/taskmgr/resource.h +++ b/base/applications/taskmgr/resource.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Resources header. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/run.c b/base/applications/taskmgr/run.c index 09ed71e74d2..3e210f04415 100644 --- a/base/applications/taskmgr/run.c +++ b/base/applications/taskmgr/run.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Run Task. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/run.h b/base/applications/taskmgr/run.h index ef1ffe53cb0..d3ea0a1e0ba 100644 --- a/base/applications/taskmgr/run.h +++ b/base/applications/taskmgr/run.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Run Task. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/shutdown.c b/base/applications/taskmgr/shutdown.c index 9a64b0a3ed6..41604e35409 100644 --- a/base/applications/taskmgr/shutdown.c +++ b/base/applications/taskmgr/shutdown.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: System Shutdown. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2011 Mário Kacmár /Mario Kacmar/ aka Kario <kario(a)szm.sk> diff --git a/base/applications/taskmgr/shutdown.h b/base/applications/taskmgr/shutdown.h index 7c13c445e3a..272471768a4 100644 --- a/base/applications/taskmgr/shutdown.h +++ b/base/applications/taskmgr/shutdown.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: System Shutdown. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2011 Mário Kacmár /Mario Kacmar/ aka Kario <kario(a)szm.sk> diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 844e85acefc..51e6d4a8fcf 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Application Entry-point. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index 7a719a77a20..28136f8271c 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Main Header. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/taskmgr.rc b/base/applications/taskmgr/taskmgr.rc index 521f83fbe78..a60e8f33e27 100644 --- a/base/applications/taskmgr/taskmgr.rc +++ b/base/applications/taskmgr/taskmgr.rc @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Resources file. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index 9a7c1efcee1..88578800557 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Tray Icon. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> diff --git a/base/applications/taskmgr/trayicon.h b/base/applications/taskmgr/trayicon.h index 6d6c1dbc21c..5eae5cf0156 100644 --- a/base/applications/taskmgr/trayicon.h +++ b/base/applications/taskmgr/trayicon.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Task Manager - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Tray Icon. * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2005 Klemens Friedl <frik85(a)reactos.at>

1 year, 7 months

[reactos] 02/02: [TASKMGR] Re-include StringSafe usage in trayicon.c (see e.g. 99fb812be)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4735ccc9b83eae23cf67… commit f4735ccc9b83eae23cf6771fa1e7737a39436369 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 5 20:33:13 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 13:28:16 2023 +0200 [TASKMGR] Re-include StringSafe usage in trayicon.c (see e.g. 99fb812be) --- base/applications/taskmgr/trayicon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index 5da5d7d778a..9a7c1efcee1 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -111,7 +111,7 @@ TrayIcon_Update( BOOL bRetVal; if (!*szMsg) - LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szMsg, ARRAYSIZE(szMsg)); + LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szMsg, _countof(szMsg)); ZeroMemory(&nid, sizeof(nid)); @@ -125,7 +125,7 @@ TrayIcon_Update( nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - wsprintfW(nid.szTip, szMsg, CpuUsage); + StringCchPrintfW(nid.szTip, _countof(nid.szTip), szMsg, CpuUsage); bRetVal = Shell_NotifyIconW(dwMessage, &nid);

1 year, 7 months

[reactos] 01/02: [TASKMGR] Move strsafe.h into precompiled header.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=434798e312cf5141dffc0… commit 434798e312cf5141dffc032afdca71475a5b72d7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 5 20:34:16 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 13:26:32 2023 +0200 [TASKMGR] Move strsafe.h into precompiled header. --- base/applications/taskmgr/precomp.h | 2 ++ base/applications/taskmgr/procpage.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index 4fbcf760c3d..682b35d07e7 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -33,6 +33,8 @@ #include <shellapi.h> #include <tlhelp32.h> +#include <strsafe.h> + #include "column.h" #include "taskmgr.h" #include "perfdata.h" diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index 7119e675239..40d941add28 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -11,8 +11,6 @@ #include "proclist.h" -#include <strsafe.h> - #include <ndk/psfuncs.h> #define CMP(x1, x2)\

1 year, 7 months

[reactos] 01/01: [MSPAINT] mouse.cpp: Use override keywords

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d9b7f77adbc9c79ec256… commit 6d9b7f77adbc9c79ec256f65e725068424c3ea03 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 16:01:10 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 16:01:10 2023 +0900 [MSPAINT] mouse.cpp: Use override keywords CORE-18867 --- base/applications/mspaint/mouse.cpp | 80 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 23bfa69043c..bd7d23c139c 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -108,7 +108,7 @@ struct FreeSelTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { selectionModel.Landing(); if (bLeftButton) @@ -122,7 +122,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -134,7 +134,7 @@ struct FreeSelTool : ToolBase } } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -155,7 +155,7 @@ struct FreeSelTool : ToolBase } } - void OnFinishDraw() + void OnFinishDraw() override { if (m_bLeftButton) canvasWindow.Invalidate(FALSE); @@ -164,7 +164,7 @@ struct FreeSelTool : ToolBase ToolBase::OnFinishDraw(); } - void OnCancelDraw() + void OnCancelDraw() override { if (m_bLeftButton) imageModel.Undo(TRUE); @@ -182,7 +182,7 @@ struct RectSelTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { selectionModel.Landing(); if (bLeftButton) @@ -194,7 +194,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -206,7 +206,7 @@ struct RectSelTool : ToolBase } } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -218,7 +218,7 @@ struct RectSelTool : ToolBase } } - void OnFinishDraw() + void OnFinishDraw() override { if (m_bLeftButton) canvasWindow.Invalidate(FALSE); @@ -227,7 +227,7 @@ struct RectSelTool : ToolBase ToolBase::OnFinishDraw(); } - void OnCancelDraw() + void OnCancelDraw() override { if (m_bLeftButton) imageModel.Undo(TRUE); @@ -244,23 +244,23 @@ struct GenericDrawTool : ToolBase virtual void draw(BOOL bLeftButton, LONG x, LONG y) = 0; - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { imageModel.PushImageForUndo(); draw(bLeftButton, x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { draw(bLeftButton, x, y); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { draw(bLeftButton, x, y); } - void OnCancelDraw() + void OnCancelDraw() override { OnButtonUp(FALSE, 0, 0); imageModel.Undo(TRUE); @@ -275,7 +275,7 @@ struct RubberTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) Erase(m_hdc, last.x, last.y, x, y, m_bg, toolsModel.GetRubberRadius()); @@ -291,7 +291,7 @@ struct FillTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { imageModel.PushImageForUndo(); Fill(m_hdc, x, y, bLeftButton ? m_fg : m_bg); @@ -320,12 +320,12 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { fetchColor(bLeftButton, x, y); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); @@ -339,7 +339,7 @@ struct ZoomTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { imageModel.PushImageForUndo(); if (bLeftButton) @@ -362,7 +362,7 @@ struct PenTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; Line(m_hdc, last.x, last.y, x, y, rgb, 1); @@ -377,7 +377,7 @@ struct BrushTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; Brush(m_hdc, last.x, last.y, x, y, rgb, toolsModel.GetBrushStyle()); @@ -391,7 +391,7 @@ struct AirBrushTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); @@ -414,7 +414,7 @@ struct TextTool : ToolBase RectSel(m_hdc, start.x, start.y, pt.x, pt.y); } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { if (!textEditWindow.IsWindow()) textEditWindow.Create(canvasWindow); @@ -423,12 +423,12 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { UpdatePoint(x, y); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { imageModel.Undo(TRUE); @@ -494,7 +494,7 @@ struct TextTool : ToolBase textEditWindow.SetFocus(); } - void OnFinishDraw() + void OnFinishDraw() override { toolsModel.OnButtonDown(TRUE, -1, -1, TRUE); toolsModel.OnButtonUp(TRUE, -1, -1); @@ -509,7 +509,7 @@ struct LineTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) @@ -547,7 +547,7 @@ struct BezierTool : ToolBase m_bLeftButton = bLeftButton; } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -559,7 +559,7 @@ struct BezierTool : ToolBase } } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); pointStack[pointSP].x = x; @@ -567,7 +567,7 @@ struct BezierTool : ToolBase draw(bLeftButton); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); draw(bLeftButton); @@ -576,14 +576,14 @@ struct BezierTool : ToolBase pointSP = 0; } - void OnCancelDraw() + void OnCancelDraw() override { OnButtonUp(FALSE, 0, 0); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } - void OnFinishDraw() + void OnFinishDraw() override { if (pointSP) { @@ -602,7 +602,7 @@ struct RectTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) @@ -635,7 +635,7 @@ struct ShapeTool : ToolBase m_bLeftButton = bLeftButton; } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -652,7 +652,7 @@ struct ShapeTool : ToolBase } } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); pointStack[pointSP].x = x; @@ -662,7 +662,7 @@ struct ShapeTool : ToolBase draw(bLeftButton, x, y, FALSE); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -686,13 +686,13 @@ struct ShapeTool : ToolBase pointSP--; } - void OnCancelDraw() + void OnCancelDraw() override { imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } - void OnFinishDraw() + void OnFinishDraw() override { if (pointSP) { @@ -711,7 +711,7 @@ struct EllipseTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) @@ -730,7 +730,7 @@ struct RRectTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0)

1 year, 7 months

[reactos] 01/01: [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78c8df8393c7164f9dc1b… commit 78c8df8393c7164f9dc1b83ad9a81c8c7ed334f6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 16:44:54 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 16:44:54 2023 +0900 [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush CORE-18867 --- base/applications/mspaint/drawing.cpp | 51 ++++++++++++++++------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 05599d2d2cc..40ff30bcb32 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -116,46 +116,41 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG a, b; - HPEN oldPen; - HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); + LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); - for(a = 0; a <= b; a++) - Rectangle(hdc, - (x1 * (b - a) + x2 * a) / b - radius, - (y1 * (b - a) + y2 * a) / b - radius, - (x1 * (b - a) + x2 * a) / b + radius, - (y1 * (b - a) + y2 * a) / b + radius); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); + HBRUSH hbr = ::CreateSolidBrush(color); + ::FillRect(hdc, &rc, hbr); + ::DeleteObject(hbr); } void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG a, b, x, y; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; - for(a = 0; a <= b; a++) - for(y = (y1 * (b - a) + y2 * a) / b - radius + 1; - y < (y1 * (b - a) + y2 * a) / b + radius + 1; y++) - for(x = (x1 * (b - a) + x2 * a) / b - radius + 1; - x < (x1 * (b - a) + x2 * a) / b + radius + 1; x++) - if (GetPixel(hdc, x, y) == fg) - SetPixel(hdc, x, y, bg); + for (LONG y = rc.top; y < rc.bottom; ++y) + { + for (LONG x = rc.left; x < rc.right; ++x) + { + if (::GetPixel(hdc, x, y) == fg) + ::SetPixelV(hdc, x, y, bg); + } + } } void Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r) { - LONG a, b; - - for(b = -r; b <= r; b++) - for(a = -r; a <= r; a++) - if ((a * a + b * b <= r * r) && (rand() % 4 == 0)) - SetPixel(hdc, x + a, y + b, color); + for (LONG dy = -r; dy <= r; dy++) + { + for (LONG dx = -r; dx <= r; dx++) + { + if ((dx * dx + dy * dy <= r * r) && (rand() % 4 == 0)) + ::SetPixelV(hdc, x + dx, y + dy, color); + } + } } void

1 year, 7 months

[reactos] 01/01: [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 2

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03344980688a47267debd… commit 03344980688a47267debdf875b458e50bac70786 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 17:03:22 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 17:03:22 2023 +0900 [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 2 CORE-18867 --- base/applications/mspaint/drawing.cpp | 36 +++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 40ff30bcb32..de9c925f396 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -116,26 +116,42 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; - RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; - + LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + RECT rc; HBRUSH hbr = ::CreateSolidBrush(color); - ::FillRect(hdc, &rc, hbr); + + for (LONG a = 0; a <= b; a++) + { + ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, + (y1 * (b - a) + y2 * a) / b - radius, + (x1 * (b - a) + x2 * a) / b + radius, + (y1 * (b - a) + y2 * a) / b + radius); + + ::FillRect(hdc, &rc, hbr); + } + ::DeleteObject(hbr); } void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; - RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; + LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + RECT rc; - for (LONG y = rc.top; y < rc.bottom; ++y) + for (LONG a = 0; a <= b; a++) { - for (LONG x = rc.left; x < rc.right; ++x) + ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, + (y1 * (b - a) + y2 * a) / b - radius, + (x1 * (b - a) + x2 * a) / b + radius, + (y1 * (b - a) + y2 * a) / b + radius); + for (LONG y = rc.top; y < rc.bottom; ++y) { - if (::GetPixel(hdc, x, y) == fg) - ::SetPixelV(hdc, x, y, bg); + for (LONG x = rc.left; x < rc.right; ++x) + { + if (::GetPixel(hdc, x, y) == fg) + ::SetPixelV(hdc, x, y, bg); + } } } }

1 year, 7 months

[reactos] 01/01: [MSPAINT] Trivial improvements

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=318b2e786dbd8c1409264… commit 318b2e786dbd8c14092640a68179c37853568150 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 17:42:21 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 17:42:21 2023 +0900 [MSPAINT] Trivial improvements - Use SetPixelV instead of SetPixel. - BI_RGB is zero. - Use CS_HREDRAW and CS_VREDRAW. CORE-18867 --- base/applications/mspaint/dib.cpp | 1 - base/applications/mspaint/drawing.cpp | 2 +- base/applications/mspaint/fullscreen.cpp | 6 ------ base/applications/mspaint/fullscreen.h | 5 ++--- base/applications/mspaint/miniature.h | 3 ++- base/applications/mspaint/mouse.cpp | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 51d09d86d6b..3d74403cdda 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -33,7 +33,6 @@ CreateDIBWithProperties(int width, int height) bmi.bmiHeader.biHeight = height; bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biBitCount = 24; - bmi.bmiHeader.biCompression = BI_RGB; return CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); } diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 600e7addd7a..7bb0d57da60 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -189,7 +189,7 @@ Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) case 2: MoveToEx(hdc, x1, y1, NULL); LineTo(hdc, x2, y2); - SetPixel(hdc, x2, y2, color); + ::SetPixelV(hdc, x2, y2, color); break; case 3: for(a = 0; a <= b; a++) diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index 610062c0dbc..63dd070da6d 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -50,12 +50,6 @@ LRESULT CFullscreenWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } -LRESULT CFullscreenWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - Invalidate(TRUE); - return 0; -} - LRESULT CFullscreenWindow::OnGetText(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { // return caption of the main window, instead diff --git a/base/applications/mspaint/fullscreen.h b/base/applications/mspaint/fullscreen.h index 4466b116266..5afe843700e 100644 --- a/base/applications/mspaint/fullscreen.h +++ b/base/applications/mspaint/fullscreen.h @@ -11,7 +11,8 @@ class CFullscreenWindow : public CWindowImpl<CFullscreenWindow> { public: - DECLARE_WND_CLASS_EX(_T("FullscreenWindow"), CS_DBLCLKS, COLOR_BACKGROUND) + DECLARE_WND_CLASS_EX(_T("FullscreenWindow"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + COLOR_BACKGROUND) BEGIN_MSG_MAP(CFullscreenWindow) MESSAGE_HANDLER(WM_CREATE, OnCreate) @@ -19,7 +20,6 @@ public: MESSAGE_HANDLER(WM_KEYDOWN, OnCloseOrKeyDownOrLButtonDown) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnCloseOrKeyDownOrLButtonDown) MESSAGE_HANDLER(WM_PAINT, OnPaint) - MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_GETTEXT, OnGetText) END_MSG_MAP() @@ -29,6 +29,5 @@ private: LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCloseOrKeyDownOrLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnGetText(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index b68d03a086f..63f0fd6997a 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -12,7 +12,8 @@ class CMiniatureWindow : public CWindowImpl<CMiniatureWindow> { public: - DECLARE_WND_CLASS_EX(_T("MiniatureWindow"), CS_DBLCLKS, COLOR_BTNFACE) + DECLARE_WND_CLASS_EX(_T("MiniatureWindow"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + COLOR_BTNFACE) BEGIN_MSG_MAP(CMiniatureWindow) MESSAGE_HANDLER(WM_CLOSE, OnClose) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index bd7d23c139c..61395e8aa7f 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -366,7 +366,7 @@ struct PenTool : GenericDrawTool { COLORREF rgb = bLeftButton ? m_fg : m_bg; Line(m_hdc, last.x, last.y, x, y, rgb, 1); - SetPixel(m_hdc, x, y, rgb); + ::SetPixelV(m_hdc, x, y, rgb); } };

1 year, 7 months

[reactos] 01/01: [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 3

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b4422b41b93bc6b96562… commit 3b4422b41b93bc6b96562b2ea4d2af826a04d49b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 17:14:41 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 17:14:41 2023 +0900 [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 3 CORE-18867 --- base/applications/mspaint/drawing.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index de9c925f396..600e7addd7a 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -117,16 +117,13 @@ void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - RECT rc; HBRUSH hbr = ::CreateSolidBrush(color); for (LONG a = 0; a <= b; a++) { - ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, - (y1 * (b - a) + y2 * a) / b - radius, - (x1 * (b - a) + x2 * a) / b + radius, - (y1 * (b - a) + y2 * a) / b + radius); - + LONG cx = (x1 * (b - a) + x2 * a) / b; + LONG cy = (y1 * (b - a) + y2 * a) / b; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; ::FillRect(hdc, &rc, hbr); } @@ -137,14 +134,12 @@ void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - RECT rc; for (LONG a = 0; a <= b; a++) { - ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, - (y1 * (b - a) + y2 * a) / b - radius, - (x1 * (b - a) + x2 * a) / b + radius, - (y1 * (b - a) + y2 * a) / b + radius); + LONG cx = (x1 * (b - a) + x2 * a) / b; + LONG cy = (y1 * (b - a) + y2 * a) / b; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; for (LONG y = rc.top; y < rc.bottom; ++y) { for (LONG x = rc.left; x < rc.right; ++x)

1 year, 7 months

[reactos] 01/01: [NTOS:IO] Fix some bugs in the IoQueryDeviceDescription helpers (#5320)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84b4a80bebd1feaad2c27… commit 84b4a80bebd1feaad2c276883cf25aa033c65baa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 27 22:55:40 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 14 11:20:56 2023 +0200 [NTOS:IO] Fix some bugs in the IoQueryDeviceDescription helpers (#5320) - Add missing ExAllocatePool NULL checks. - Fix order of KeBugCheckEx parameters for PNP_DETECTED_FATAL_ERROR. - The Controller and Peripheral numbers are zero-based, so if the caller wants to inspect controller (or peripheral) zero, let it be so! The original code was treating controller number zero for enumerating controllers of a given class within the different buses, which is wrong. See the diff'ed trace below. Tested with Windows' videoprt.sys VideoPortGetDeviceData(). ```diff IoQueryDeviceDescription() BusType: 0xB093C224 (0) BusNumber: 0xB093C228 (0) ControllerType: 0xF9D01030 (19) ControllerNumber: 0xF9D01038 (0) PeripheralType: 0x00000000 (4294967295) PeripheralNumber: 0x00000000 (4294967295) CalloutRoutine: 0xF9CF74E4 Context: 0xF9D5A340 --> Query: 0xF9D5A22C IopQueryBusDescription(Query: 0xF9D5A22C) RootKey: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM' RootKeyHandle: 0x00000598 KeyIsRoot: TRUE Bus: 0xF9D5A290 (4294967295) Seen: 'CentralProcessor' Seen: 'FloatingPointProcessor' Seen: 'MultifunctionAdapter' SubRootRegName: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter' IopQueryBusDescription(Query: 0xF9D5A22C) RootKey: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter' RootKeyHandle: 0x00000590 KeyIsRoot: FALSE Bus: 0xF9D5A290 (4294967295) Seen: '0' SubRootRegName: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0' Getting bus value: 'Identifier' Getting bus value: 'Configuration Data' Getting bus value: 'Component Information' --> Getting device on Bus #0 : '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0' IopQueryDeviceDescription(Query: 0xF9D5A22C) RootKey: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0' RootKeyHandle: 0x00000590 Bus: 0 - Enumerating controllers in '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0\DisplayController'... + Getting controller #0 + Retrieving controller '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0\DisplayController\0' ``` --- ntoskrnl/io/iomgr/iorsrce.c | 73 +++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/io/iomgr/iorsrce.c b/ntoskrnl/io/iomgr/iorsrce.c index 01f2b104a84..af20b2960d6 100644 --- a/ntoskrnl/io/iomgr/iorsrce.c +++ b/ntoskrnl/io/iomgr/iorsrce.c @@ -170,18 +170,16 @@ IopQueryDeviceDescription( Bus); /* Temporary string */ - TempString.MaximumLength = sizeof(TempBuffer); - TempString.Length = 0; - TempString.Buffer = TempBuffer; + RtlInitEmptyUnicodeString(&TempString, TempBuffer, sizeof(TempBuffer)); /* Append controller name to string */ RtlAppendUnicodeToString(&ControllerRootRegName, L"\\"); RtlAppendUnicodeToString(&ControllerRootRegName, ArcTypes[*Query->ControllerType]); /* Set the controller number if specified */ - if (Query->ControllerNumber && *(Query->ControllerNumber)) + if (Query->ControllerNumber) { - ControllerNumber = *Query->ControllerNumber; + ControllerNumber = *(Query->ControllerNumber); MaximumControllerNumber = ControllerNumber + 1; IORSRCTRACE(" Getting controller #%lu\n", ControllerNumber); } @@ -208,6 +206,11 @@ IopQueryDeviceDescription( /* Allocate it */ ControllerFullInformation = ExAllocatePoolWithTag(PagedPool, LenFullInformation, TAG_IO_RESOURCE); + if (!ControllerFullInformation) + { + ZwClose(ControllerKeyHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Get the information */ Status = ZwQueryKey(ControllerKeyHandle, @@ -222,7 +225,7 @@ IopQueryDeviceDescription( /* No controller was found, bail out */ if (!NT_SUCCESS(Status)) { - if (ControllerFullInformation != NULL) + if (ControllerFullInformation) ExFreePoolWithTag(ControllerFullInformation, TAG_IO_RESOURCE); return Status; } @@ -286,11 +289,17 @@ IopQueryDeviceDescription( (Status != STATUS_BUFFER_TOO_SMALL) && (Status != STATUS_BUFFER_OVERFLOW)) { + ControllerInformation[ControllerLoop] = NULL; continue; } /* Allocate it */ ControllerInformation[ControllerLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); + if (!ControllerInformation[ControllerLoop]) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } /* Get the information */ Status = ZwQueryValueKey(ControllerKeyHandle, @@ -339,9 +348,9 @@ IopQueryDeviceDescription( goto EndLoop; /* Set the peripheral number if specified */ - if (Query->PeripheralNumber && *Query->PeripheralNumber) + if (Query->PeripheralNumber) { - PeripheralNumber = *Query->PeripheralNumber; + PeripheralNumber = *(Query->PeripheralNumber); MaximumPeripheralNumber = PeripheralNumber + 1; IORSRCTRACE(" Getting peripheral #%lu\n", PeripheralNumber); } @@ -368,6 +377,12 @@ IopQueryDeviceDescription( /* Allocate it */ PeripheralFullInformation = ExAllocatePoolWithTag(PagedPool, LenFullInformation, TAG_IO_RESOURCE); + if (!PeripheralFullInformation) + { + ZwClose(PeripheralKeyHandle); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto EndLoop; + } /* Get the information */ Status = ZwQueryKey(PeripheralKeyHandle, @@ -450,6 +465,11 @@ IopQueryDeviceDescription( /* Allocate it */ PeripheralInformation[PeripheralLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); + if (!PeripheralInformation[PeripheralLoop]) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } /* Get the information */ Status = ZwQueryValueKey(PeripheralKeyHandle, @@ -591,9 +611,8 @@ IopQueryBusDescription( /* Allocate it */ FullInformation = ExAllocatePoolWithTag(PagedPool, LenFullInformation, TAG_IO_RESOURCE); - if (!FullInformation) - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; /* Get the information */ Status = ZwQueryKey(RootKeyHandle, @@ -608,6 +627,11 @@ IopQueryBusDescription( /* Allocate it */ BasicInformation = ExAllocatePoolWithTag(PagedPool, LenBasicInformation, TAG_IO_RESOURCE); + if (!BasicInformation) + { + ExFreePoolWithTag(FullInformation, TAG_IO_RESOURCE); + return STATUS_INSUFFICIENT_RESOURCES; + } } /* Deallocate the old buffer */ @@ -691,6 +715,11 @@ IopQueryBusDescription( /* Allocate it */ BusInformation[SubBusLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); + if (!BusInformation[SubBusLoop]) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } /* Get the information */ Status = ZwQueryValueKey(SubRootKeyHandle, @@ -774,7 +803,8 @@ IopQueryBusDescription( Status = IopQueryBusDescription(Query, SubRootRegName, SubRootKeyHandle, Bus, !KeyIsRoot); /* Everything enumerated */ - if (Status == STATUS_NO_MORE_ENTRIES) Status = STATUS_SUCCESS; + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; ZwClose(SubRootKeyHandle); SubRootKeyHandle = NULL; @@ -860,11 +890,10 @@ IopStoreSystemPartitionInformation( return; } - /* Prepare the string that will receive where symbolic link points to */ - LinkTarget.Length = 0; - /* We will zero the end of the string after having received it */ - LinkTarget.MaximumLength = sizeof(LinkTargetBuffer) - sizeof(UNICODE_NULL); - LinkTarget.Buffer = LinkTargetBuffer; + /* Prepare the string that will receive where symbolic link points to. + * We will zero the end of the string after having received it */ + RtlInitEmptyUnicodeString(&LinkTarget, LinkTargetBuffer, + sizeof(LinkTargetBuffer) - sizeof(UNICODE_NULL)); /* Query target */ Status = ZwQuerySymbolicLinkObject(LinkHandle, &LinkTarget, NULL); @@ -1124,10 +1153,10 @@ IoAssignResources( { /* New drivers should not call this API */ KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, - 0, - 0, + 0x2, (ULONG_PTR)DeviceObject, - (ULONG_PTR)DriverObject); + (ULONG_PTR)DriverObject, + 0); } } @@ -1217,10 +1246,16 @@ IoQueryDeviceDescription( CalloutRoutine, Context, &Query); + if (!BusType) + return STATUS_NOT_IMPLEMENTED; + /* Set up the string */ RootRegKey.Length = 0; RootRegKey.MaximumLength = 2048; RootRegKey.Buffer = ExAllocatePoolWithTag(PagedPool, RootRegKey.MaximumLength, TAG_IO_RESOURCE); + if (!RootRegKey.Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + RtlAppendUnicodeToString(&RootRegKey, L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); /* Open a handle to the Root Registry Key */

1 year, 7 months

[reactos] 01/01: [FLOPPY] "zero" parameters in IoQueryDeviceDescription() call are NULL pointers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f41000714c0c68541a8f… commit 4f41000714c0c68541a8f3b6510976644d9f702c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 7 22:47:32 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 14 11:24:47 2023 +0200 [FLOPPY] "zero" parameters in IoQueryDeviceDescription() call are NULL pointers. --- drivers/storage/floppy/fdc/fdo.c | 2 -- drivers/storage/floppy/floppy/floppy.c | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/storage/floppy/fdc/fdo.c b/drivers/storage/floppy/fdc/fdo.c index f00c58c08d9..a42893dd2c5 100644 --- a/drivers/storage/floppy/fdc/fdo.c +++ b/drivers/storage/floppy/fdc/fdo.c @@ -31,8 +31,6 @@ ForwardIrpAndForget( } - - static NTSTATUS FdcFdoStartDevice( diff --git a/drivers/storage/floppy/floppy/floppy.c b/drivers/storage/floppy/floppy/floppy.c index b67c6096872..c1b96046f21 100644 --- a/drivers/storage/floppy/floppy/floppy.c +++ b/drivers/storage/floppy/floppy/floppy.c @@ -929,7 +929,14 @@ AddControllers(PDRIVER_OBJECT DriverObject) PAGED_CODE(); /* Find our controllers on all ISA buses */ - IoQueryDeviceDescription(&InterfaceType, 0, &ControllerType, 0, &PeripheralType, 0, ConfigCallback, 0); + IoQueryDeviceDescription(&InterfaceType, + NULL, + &ControllerType, + NULL, + &PeripheralType, + NULL, + ConfigCallback, + NULL); /* * w2k breaks the return val from ConfigCallback, so we have to hack around it, rather than just

1 year, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs