Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/04: [WIN32K:NTUSER] Handle allocation failure in PopupMenuWndProc. CORE-14222
by Thomas Faber 18 Feb '18

18 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c464f4f2e3c150593d428… commit c464f4f2e3c150593d4282062fc8e193683a871f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 1 11:06:03 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 11:27:27 2018 +0100 [WIN32K:NTUSER] Handle allocation failure in PopupMenuWndProc. CORE-14222 --- win32ss/user/ntuser/menu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 4de96e892a..8432f3a83f 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -4436,6 +4436,10 @@ PopupMenuWndProc( } Wnd->fnid = FNID_MENU; pPopupMenu = DesktopHeapAlloc( Wnd->head.rpdesk, sizeof(POPUPMENU) ); + if (pPopupMenu == NULL) + { + return TRUE; + } pPopupMenu->posSelectedItem = NO_SELECTED_ITEM; pPopupMenu->spwndPopupMenu = Wnd; ((PMENUWND)Wnd)->ppopupmenu = pPopupMenu;

1 0

01/01: [KMTESTS] Change license to LGPL and update to SPDX headers.
by Thomas Faber 18 Feb '18

18 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9ba7a3f9e52653bf03fb… commit a9ba7a3f9e52653bf03fb12c5fa9d3476a40b15a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 18 11:14:13 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 18 11:22:09 2018 +0100 [KMTESTS] Change license to LGPL and update to SPDX headers. Permission for this change was given by all authors (who are now mentioned in the copyright lines). --- modules/rostests/kmtests/example/Example.c | 8 ++++---- modules/rostests/kmtests/example/Example.h | 10 +++++----- modules/rostests/kmtests/example/Example_drv.c | 8 ++++---- modules/rostests/kmtests/example/Example_user.c | 8 ++++---- modules/rostests/kmtests/example/GuardedMemory.c | 8 ++++---- modules/rostests/kmtests/example/KernelType.c | 8 ++++---- modules/rostests/kmtests/include/kmt_platform.h | 9 +++++---- modules/rostests/kmtests/include/kmt_public.h | 10 ++++++---- modules/rostests/kmtests/include/kmt_test.h | 11 +++++++---- modules/rostests/kmtests/include/kmt_test_kernel.h | 8 ++++---- modules/rostests/kmtests/include/kmt_test_user.h | 8 ++++---- modules/rostests/kmtests/kmtest/kmtest.c | 8 ++++---- modules/rostests/kmtests/kmtest/kmtest.h | 9 +++++---- modules/rostests/kmtests/kmtest/kmtest.rc | 7 +++---- modules/rostests/kmtests/kmtest/service.c | 9 +++++---- modules/rostests/kmtests/kmtest/support.c | 9 +++++---- modules/rostests/kmtests/kmtest/testlist.c | 7 +++---- modules/rostests/kmtests/kmtest_drv/kmtest_drv.c | 9 +++++---- modules/rostests/kmtests/kmtest_drv/kmtest_drv.rc | 7 +++---- modules/rostests/kmtests/kmtest_drv/kmtest_standalone.c | 8 ++++---- modules/rostests/kmtests/kmtest_drv/printf_stubs.c | 8 ++++---- modules/rostests/kmtests/kmtest_drv/testlist.c | 7 +++---- 22 files changed, 95 insertions(+), 89 deletions(-) diff --git a/modules/rostests/kmtests/example/Example.c b/modules/rostests/kmtests/example/Example.c index a1ae4c0334..fb0b56f9ec 100644 --- a/modules/rostests/kmtests/example/Example.c +++ b/modules/rostests/kmtests/example/Example.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example kernel-mode test part - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Example kernel-mode test part + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/example/Example.h b/modules/rostests/kmtests/example/Example.h index 41094fe9ee..d98d384438 100644 --- a/modules/rostests/kmtests/example/Example.h +++ b/modules/rostests/kmtests/example/Example.h @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example Test declarations - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Example test declarations + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ - + #ifndef _KMTEST_EXAMPLE_H_ #define _KMTEST_EXAMPLE_H_ diff --git a/modules/rostests/kmtests/example/Example_drv.c b/modules/rostests/kmtests/example/Example_drv.c index 5e735b40d1..347b0257e1 100644 --- a/modules/rostests/kmtests/example/Example_drv.c +++ b/modules/rostests/kmtests/example/Example_drv.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example Test Driver - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Example test driver + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/example/Example_user.c b/modules/rostests/kmtests/example/Example_user.c index 10ec89632a..bd440e0126 100644 --- a/modules/rostests/kmtests/example/Example_user.c +++ b/modules/rostests/kmtests/example/Example_user.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example user-mode test part - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Example user-mode test part + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/example/GuardedMemory.c b/modules/rostests/kmtests/example/GuardedMemory.c index bb82723fd2..d9f3379469 100644 --- a/modules/rostests/kmtests/example/GuardedMemory.c +++ b/modules/rostests/kmtests/example/GuardedMemory.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Guarded Memory example test - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Guarded Memory example test + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/example/KernelType.c b/modules/rostests/kmtests/example/KernelType.c index 03f54cb268..f9f3e6a2c0 100644 --- a/modules/rostests/kmtests/example/KernelType.c +++ b/modules/rostests/kmtests/example/KernelType.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Kernel Type example test - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Kernel Type example test + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/include/kmt_platform.h b/modules/rostests/kmtests/include/kmt_platform.h index 3e29d2c9af..4895bf25a3 100644 --- a/modules/rostests/kmtests/include/kmt_platform.h +++ b/modules/rostests/kmtests/include/kmt_platform.h @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite platform declarations - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite platform declarations + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2017 Ged Murphy <gedmurphy(a)reactos.org> */ #ifndef _KMTEST_PLATFORM_H_ diff --git a/modules/rostests/kmtests/include/kmt_public.h b/modules/rostests/kmtests/include/kmt_public.h index 00442f4d3e..dd3dff2569 100644 --- a/modules/rostests/kmtests/include/kmt_public.h +++ b/modules/rostests/kmtests/include/kmt_public.h @@ -1,8 +1,10 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite public declarations - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite public declarations + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2013 Nikolay Borisov <nib9(a)aber.ac.uk> + * Copyright 2017 Ged Murphy <gedmurphy(a)reactos.org> */ #ifndef _KMTEST_PUBLIC_H_ diff --git a/modules/rostests/kmtests/include/kmt_test.h b/modules/rostests/kmtests/include/kmt_test.h index 1c5ddeefa2..509788a2e2 100644 --- a/modules/rostests/kmtests/include/kmt_test.h +++ b/modules/rostests/kmtests/include/kmt_test.h @@ -1,8 +1,11 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite test framework declarations - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite test framework declarations + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2013 Nikolay Borisov <nib9(a)aber.ac.uk> + * Copyright 2014-2016 Pierre Schweitzer <pierre(a)reactos.org> + * Copyright 2017 Ged Murphy <gedmurphy(a)reactos.org> */ /* Inspired by Wine C unit tests, Copyright (C) 2002 Alexandre Julliard diff --git a/modules/rostests/kmtests/include/kmt_test_kernel.h b/modules/rostests/kmtests/include/kmt_test_kernel.h index 7d7c346991..d5a20076f4 100644 --- a/modules/rostests/kmtests/include/kmt_test_kernel.h +++ b/modules/rostests/kmtests/include/kmt_test_kernel.h @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Kernel-Mode Test Suite test framework declarations - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite test framework kernel declarations + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #ifndef _KMTEST_TEST_KERNEL_H_ diff --git a/modules/rostests/kmtests/include/kmt_test_user.h b/modules/rostests/kmtests/include/kmt_test_user.h index 580dc755e2..768b906336 100644 --- a/modules/rostests/kmtests/include/kmt_test_user.h +++ b/modules/rostests/kmtests/include/kmt_test_user.h @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Kernel-Mode Test Suite test framework declarations - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite test framework user declarations + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #ifndef _KMTEST_TEST_USER_H_ diff --git a/modules/rostests/kmtests/kmtest/kmtest.c b/modules/rostests/kmtests/kmtest/kmtest.c index 08ae2b9240..a8d87807d3 100644 --- a/modules/rostests/kmtests/kmtest/kmtest.c +++ b/modules/rostests/kmtests/kmtest/kmtest.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Loader Application - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite loader application + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #define KMT_DEFINE_TEST_FUNCTIONS diff --git a/modules/rostests/kmtests/kmtest/kmtest.h b/modules/rostests/kmtests/kmtest/kmtest.h index f39c418b5d..a32d41c054 100644 --- a/modules/rostests/kmtests/kmtest/kmtest.h +++ b/modules/rostests/kmtests/kmtest/kmtest.h @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Loader Application - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite loader application declarations + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2017 Ged Murphy <gedmurphy(a)reactos.org> */ #ifndef _KMTESTS_H_ diff --git a/modules/rostests/kmtests/kmtest/kmtest.rc b/modules/rostests/kmtests/kmtest/kmtest.rc index 667509b467..3c3acf7b9c 100644 --- a/modules/rostests/kmtests/kmtest/kmtest.rc +++ b/modules/rostests/kmtests/kmtest/kmtest.rc @@ -1,8 +1,7 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Loader Resource File - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite loader resource file */ #include <windef.h> diff --git a/modules/rostests/kmtests/kmtest/service.c b/modules/rostests/kmtests/kmtest/service.c index 3f617fc302..cc2e91a96e 100644 --- a/modules/rostests/kmtests/kmtest/service.c +++ b/modules/rostests/kmtests/kmtest/service.c @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Loader service control functions - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite loader service control functions + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2017 Ged Murphy <gedmurphy(a)reactos.org> */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/kmtest/support.c b/modules/rostests/kmtests/kmtest/support.c index 1ac2c3ac46..2a2c99ed22 100644 --- a/modules/rostests/kmtests/kmtest/support.c +++ b/modules/rostests/kmtests/kmtest/support.c @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite user-mode support routines + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2013 Nikolay Borisov <nib9(a)aber.ac.uk> */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 01cb31cf53..d58024083b 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -1,8 +1,7 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite user-mode test list - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite user-mode test list */ #include <kmt_test.h> diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c b/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c index 1962f6c46d..6e4e0e8212 100644 --- a/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_drv.c @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite driver + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2013 Nikolay Borisov <nib9(a)aber.ac.uk> */ #include <ntddk.h> diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_drv.rc b/modules/rostests/kmtests/kmtest_drv/kmtest_drv.rc index a080b84000..2b38d3a916 100644 --- a/modules/rostests/kmtests/kmtest_drv/kmtest_drv.rc +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_drv.rc @@ -1,8 +1,7 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver Resource File - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite driver resource file */ #include <windef.h> diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_standalone.c b/modules/rostests/kmtests/kmtest_drv/kmtest_standalone.c index 2ca85126f7..f6fb2a7407 100644 --- a/modules/rostests/kmtests/kmtest_drv/kmtest_standalone.c +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_standalone.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example Test Driver - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite standalone driver routines + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #include <ntddk.h> diff --git a/modules/rostests/kmtests/kmtest_drv/printf_stubs.c b/modules/rostests/kmtests/kmtest_drv/printf_stubs.c index 2e4bfb5afc..389ed46263 100644 --- a/modules/rostests/kmtests/kmtest_drv/printf_stubs.c +++ b/modules/rostests/kmtests/kmtest_drv/printf_stubs.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite stub functions for any-IRQL vsnprintf - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite stub functions for any-IRQL vsnprintf + * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> */ #undef wctomb diff --git a/modules/rostests/kmtests/kmtest_drv/testlist.c b/modules/rostests/kmtests/kmtest_drv/testlist.c index 5f2417f0a7..fea8708b4f 100644 --- a/modules/rostests/kmtests/kmtest_drv/testlist.c +++ b/modules/rostests/kmtests/kmtest_drv/testlist.c @@ -1,8 +1,7 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver test list - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite kernel-mode test list */ #include <kmt_test.h>

1 0

01/01: [NTSTATUS] Add some status messages.
by Hermès Bélusca-Maïto 18 Feb '18

18 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3c60947e7d3e6e7826c0… commit f3c60947e7d3e6e7826c0cfd42348ea956dda86a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 18 02:49:31 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 18 02:49:31 2018 +0100 [NTSTATUS] Add some status messages. --- sdk/include/reactos/mc/ntstatus.mc | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sdk/include/reactos/mc/ntstatus.mc b/sdk/include/reactos/mc/ntstatus.mc index 960c7fb3b0..57b2943603 100644 --- a/sdk/include/reactos/mc/ntstatus.mc +++ b/sdk/include/reactos/mc/ntstatus.mc @@ -556,6 +556,22 @@ Language=English One of the pages to lock was already locked. . +MessageId=0x1a +Severity=Informational +Facility=System +SymbolicName=STATUS_LOG_HARD_ERROR +Language=English +Application popup: %1 : %2 +. + +MessageId=0x1b +Severity=Informational +Facility=System +SymbolicName=STATUS_ALREADY_WIN32 +Language=English +A Win32 process already exists. +. + MessageId=0x1c Severity=Informational Facility=System @@ -564,6 +580,30 @@ Language=English Exception status code used by Win32 x86 emulation subsystem. . +MessageId=0x1d +Severity=Informational +Facility=System +SymbolicName=STATUS_WX86_CONTINUE +Language=English +Exception status code used by Win32 x86 emulation subsystem. +. + +MessageId=0x1e +Severity=Informational +Facility=System +SymbolicName=STATUS_WX86_SINGLE_STEP +Language=English +Exception status code used by Win32 x86 emulation subsystem. +. + +MessageId=0x1f +Severity=Informational +Facility=System +SymbolicName=STATUS_WX86_BREAKPOINT +Language=English +Exception status code used by Win32 x86 emulation subsystem. +. + MessageId=0x20 Severity=Informational Facility=System

1 0

01/01: [BOOTDATA] Add some informative registry values (Win2k3 compat).
by Hermès Bélusca-Maïto 18 Feb '18

18 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ec5eefa64701b74e1c8e… commit 4ec5eefa64701b74e1c8ed2858ecfc2cc7c31734 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 18 01:41:53 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 18 01:41:53 2018 +0100 [BOOTDATA] Add some informative registry values (Win2k3 compat). - In HKLM\SYSTEM\CurrentControlSet\Control\Windows, add "Directory" and "SystemDirectory" values, giving the ReactOS installation directories (purely informative). - Also add the "ErrorMode" value that specifies how the hard-error popups are displayed. This value will be used later. - Fix event log sources ordering. --- boot/bootdata/hivesys.inf | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 59f88fc10d..d2e7d03ca7 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1308,7 +1308,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkst ; Some installers check for SP2 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDReleaseType",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","NoInteractiveServices",0x00010001,0x00000000 + +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","Directory",0x00020002,"%SystemRoot%" +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","ErrorMode",0x00010003,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","NoInteractiveServices",0x00010003,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","SystemDirectory",0x00020002,"%SystemRoot%\system32" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 @@ -1544,12 +1548,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","File",0x00020000,"%SystemRoot%\system32\config\SysEvent.Evt" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","MaxSize",0x00010003,524288 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","Retention",0x00010003,604800 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","TypesSupported",0x00010001,0x00000007 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Application Popup","EventMessageFile",0x00020000,"%SystemRoot%\system32\ntdll.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Application Popup","TypesSupported",0x00010001,0x00000007 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Application Popup","TypesSupported",0x00010003,0x00000007 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","TypesSupported",0x00010003,0x00000007 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","TypesSupported",0x00010001,0x00000007 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","TypesSupported",0x00010003,0x00000007 ; Filesystem recognizer driver HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ErrorControl",0x00010001,0x00000000

1 0

01/01: [BOOTDATA] Add "Application Popup" as a known source of events for the System event log.
by Hermès Bélusca-Maïto 18 Feb '18

18 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e93e0dd46e5fab1de7ab… commit 0e93e0dd46e5fab1de7ab69569b56d56fbfdf193 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 18 01:16:24 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 18 01:16:24 2018 +0100 [BOOTDATA] Add "Application Popup" as a known source of events for the System event log. --- boot/bootdata/hivesys.inf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index bb0b3b8257..59f88fc10d 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1546,6 +1546,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","MaxSize",0x00010003,52 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","Retention",0x00010003,604800 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","TypesSupported",0x00010001,0x00000007 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Application Popup","EventMessageFile",0x00020000,"%SystemRoot%\system32\ntdll.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Application Popup","TypesSupported",0x00010001,0x00000007 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","TypesSupported",0x00010001,0x00000007

1 0

01/01: [CMAKE] Increase KERNEL_VERSION_PATCH_LEVEL to 9 CORE-14345
by Joachim Henze 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f525c2b178631ef029ea… commit 6f525c2b178631ef029ea7e7c7ee9635866418b1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 17 23:48:16 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Feb 17 23:48:16 2018 +0100 [CMAKE] Increase KERNEL_VERSION_PATCH_LEVEL to 9 CORE-14345 To make 1st stage setup properly report "0.4.9" --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index a585154556..70fb1bbe99 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -2,7 +2,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "8") +set(KERNEL_VERSION_PATCH_LEVEL "9") set(COPYRIGHT_YEAR "2018") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds

1 0

01/01: [SC] Fix MSVC build.
by Hermès Bélusca-Maïto 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f59f0380ddcd4a02a322… commit 5f59f0380ddcd4a02a322e4721f8b86db391bfb4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 17 21:03:58 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 17 21:08:28 2018 +0100 [SC] Fix MSVC build. --- base/applications/sc/usage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/sc/usage.c b/base/applications/sc/usage.c index d04907d212..b1b4a04925 100644 --- a/base/applications/sc/usage.c +++ b/base/applications/sc/usage.c @@ -83,7 +83,7 @@ VOID MainUsage(VOID) _T("sc query state= all - Enumerates all services & drivers\n") _T("sc query bufsize= 50 - Enumerates with a 50 byte buffer.\n") _T("sc query ri= 14 - Enumerates with resume index = 14\n") - _T("sc queryex group= "" - Enumerates active services not in a group\n") + _T("sc queryex group= \"\" - Enumerates active services not in a group\n") _T("sc query type= service type= interact - Enumerates all interactive services\n") _T("sc query type= driver group= NDIS - Enumerates all NDIS drivers\n")); }

1 0

01/01: [SHELL32] CFSDropTarget: style fixes
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd209faa66b06f6ed8a1a… commit fd209faa66b06f6ed8a1aeb94ec2f3f20ec0cf55 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 22:01:04 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 22:01:04 2018 +0200 [SHELL32] CFSDropTarget: style fixes --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 72 ++++++++++++------------- dll/win32/shell32/droptargets/CFSDropTarget.h | 16 +++--- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index deca859934..41d4bab1c1 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -52,18 +52,18 @@ static WCHAR* BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls } /**************************************************************************** - * CFSDropTarget::CopyItems + * CFSDropTarget::_CopyItems * * copies items to this folder */ -HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, - LPCITEMIDLIST * apidl, BOOL bCopy) +HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, + LPCITEMIDLIST * apidl, BOOL bCopy) { LPWSTR pszSrcList; HRESULT hr; WCHAR wszTargetPath[MAX_PATH + 1]; - wcscpy(wszTargetPath, sPathTarget); + wcscpy(wszTargetPath, m_sPathTarget); //Double NULL terminate. wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; @@ -75,7 +75,7 @@ HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, return hr; pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); - ERR("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(sPathTarget), bCopy); + ERR("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); CoTaskMemFree(strretFrom.pOleStr); if (!pszSrcList) return E_OUTOFMEMORY; @@ -98,39 +98,39 @@ HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, } CFSDropTarget::CFSDropTarget(): - cfShellIDList(0), - fAcceptFmt(FALSE), - sPathTarget(NULL), + m_cfShellIDList(0), + m_fAcceptFmt(FALSE), + m_sPathTarget(NULL), m_hwndSite(NULL), m_grfKeyState(0) { } -HRESULT WINAPI CFSDropTarget::Initialize(LPWSTR PathTarget) +HRESULT CFSDropTarget::Initialize(LPWSTR PathTarget) { if (!PathTarget) return E_UNEXPECTED; - cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); - if (!cfShellIDList) + m_cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + if (!m_cfShellIDList) return E_FAIL; - sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); - if (!sPathTarget) + m_sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); + if (!m_sPathTarget) return E_OUTOFMEMORY; - wcscpy(sPathTarget, PathTarget); + wcscpy(m_sPathTarget, PathTarget); return S_OK; } CFSDropTarget::~CFSDropTarget() { - SHFree(sPathTarget); + SHFree(m_sPathTarget); } BOOL -CFSDropTarget::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) +CFSDropTarget::_GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) { WCHAR wszLink[40]; @@ -159,7 +159,7 @@ CFSDropTarget::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pw /**************************************************************************** * IDropTarget implementation */ -BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) +BOOL CFSDropTarget::_QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) { /* TODO Windows does different drop effects if dragging across drives. i.e., it will copy instead of move if the directories are on different disks. */ @@ -168,7 +168,7 @@ BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) *pdwEffect = DROPEFFECT_NONE; - if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ + if (m_fAcceptFmt) { /* Does our interpretation of the keystate ... */ *pdwEffect = KeyStateToDropEffect (dwKeyState); if (*pdwEffect == DROPEFFECT_NONE) @@ -268,15 +268,15 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); FORMATETC fmt; FORMATETC fmt2; - fAcceptFmt = FALSE; + m_fAcceptFmt = FALSE; - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + InitFormatEtc (fmt, m_cfShellIDList, TYMED_HGLOBAL); InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) - fAcceptFmt = TRUE; + m_fAcceptFmt = TRUE; else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) - fAcceptFmt = TRUE; + m_fAcceptFmt = TRUE; m_grfKeyState = dwKeyState; m_dwDefaultEffect = DROPEFFECT_MOVE; @@ -288,7 +288,7 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, if (DragQueryFileW((HDROP)medium.hGlobal, 0, wstrFirstFile, _countof(wstrFirstFile))) { /* Check if the drive letter is different */ - if (wstrFirstFile[0] != sPathTarget[0]) + if (wstrFirstFile[0] != m_sPathTarget[0]) { m_dwDefaultEffect = DROPEFFECT_COPY; } @@ -296,7 +296,7 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, ReleaseStgMedium(&medium); } - QueryDrop(dwKeyState, pdwEffect); + _QueryDrop(dwKeyState, pdwEffect); return S_OK; } @@ -310,7 +310,7 @@ HRESULT WINAPI CFSDropTarget::DragOver(DWORD dwKeyState, POINTL pt, m_grfKeyState = dwKeyState; - QueryDrop(dwKeyState, pdwEffect); + _QueryDrop(dwKeyState, pdwEffect); return S_OK; } @@ -319,7 +319,7 @@ HRESULT WINAPI CFSDropTarget::DragLeave() { TRACE("(%p)\n", this); - fAcceptFmt = FALSE; + m_fAcceptFmt = FALSE; return S_OK; } @@ -336,7 +336,7 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, DWORD dwAvailableEffects = *pdwEffect; - QueryDrop(dwKeyState, pdwEffect); + _QueryDrop(dwKeyState, pdwEffect); TRACE("pdwEffect: 0x%x, m_dwDefaultEffect: 0x%x, dwAvailableEffects: 0x%x\n", *pdwEffect, m_dwDefaultEffect, dwAvailableEffects); @@ -401,15 +401,15 @@ CFSDropTarget::GetSite(REFIID riid, void **ppvSite) return m_site->QueryInterface(riid, ppvSite); } -HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) performing drop, effect %u\n", this, *pdwEffect); FORMATETC fmt; FORMATETC fmt2; STGMEDIUM medium; - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + InitFormatEtc (fmt, m_cfShellIDList, TYMED_HGLOBAL); InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); HRESULT hr; @@ -487,7 +487,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, WCHAR wszPath[MAX_PATH]; WCHAR wszTarget[MAX_PATH]; - wcscpy(wszTargetPath, sPathTarget); + wcscpy(wszTargetPath, m_sPathTarget); TRACE("target path = %s", debugstr_w(wszTargetPath)); @@ -518,14 +518,14 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, LPWSTR pwszFileName = PathFindFileNameW(wszPath); LPWSTR pwszExt = PathFindExtensionW(wszPath); - LPWSTR placementPath = PathCombineW(lpStr1, sPathTarget, pwszFileName); + LPWSTR placementPath = PathCombineW(lpStr1, m_sPathTarget, pwszFileName); CComPtr<IPersistFile> ppf; //Check to see if it's already a link. if (!wcsicmp(pwszExt, L".lnk")) { //It's a link so, we create a new one which copies the old. - if(!GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) + if(!_GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) { ERR("Error getting unique file name"); hr = E_FAIL; @@ -546,7 +546,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, { //It's not a link, so build a new link using the creator class and fill it in. //Create a file name for the link - if (!GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) + if (!_GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) { ERR("Error creating unique file name"); hr = E_FAIL; @@ -585,7 +585,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, } else { - hr = this->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl, bCopy); + hr = _CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl, bCopy); } SHFree(pidl); @@ -601,7 +601,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, WCHAR wszTargetPath[MAX_PATH + 1]; LPWSTR pszSrcList; - wcscpy(wszTargetPath, sPathTarget); + wcscpy(wszTargetPath, m_sPathTarget); //Double NULL terminate. wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.h b/dll/win32/shell32/droptargets/CFSDropTarget.h index e0740d2ee7..c808c6f59d 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.h +++ b/dll/win32/shell32/droptargets/CFSDropTarget.h @@ -29,18 +29,18 @@ class CFSDropTarget : public IObjectWithSite { private: - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ - LPWSTR sPathTarget; + UINT m_cfShellIDList; /* clipboardformat for IDropTarget */ + BOOL m_fAcceptFmt; /* flag for pending Drop */ + LPWSTR m_sPathTarget; HWND m_hwndSite; DWORD m_grfKeyState; DWORD m_dwDefaultEffect; CComPtr<IUnknown> m_site; - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); - virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); - BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); + BOOL _QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + HRESULT _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + HRESULT _CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); + BOOL _GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect, DWORD dwAvailableEffects); HRESULT _RepositionItems(IShellFolderView *psfv, IDataObject *pDataObject, POINTL pt); @@ -48,7 +48,7 @@ class CFSDropTarget : public: CFSDropTarget(); ~CFSDropTarget(); - HRESULT WINAPI Initialize(LPWSTR PathTarget); + HRESULT Initialize(LPWSTR PathTarget); // IDropTarget virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);

1 0

01/01: [SHELL32] CDefView: remove a useless print
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b19b1e49d467bf4cbb9b… commit 4b19b1e49d467bf4cbb9b4018ea40f0a7d225b97 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 21:36:31 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 21:40:16 2018 +0200 [SHELL32] CDefView: remove a useless print --- dll/win32/shell32/CDefView.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 280be9606a..336b3fc534 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -3066,8 +3066,6 @@ HRESULT WINAPI CDefView::DragLeave() HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - ERR("GetKeyState(VK_LBUTTON): %d\n", GetKeyState(VK_LBUTTON)); - ImageList_DragLeave(m_hWnd); ImageList_EndDrag();

1 0

04/04: [SHELL32] CFSDropTarget: Use copy depending on the source drive Show the default action as the default menu item in the right click menu.
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f25b42a3142868c232dc… commit 6f25b42a3142868c232dcb718b188be9e2a6fc9d Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 13:59:51 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 20:30:37 2018 +0200 [SHELL32] CFSDropTarget: Use copy depending on the source drive Show the default action as the default menu item in the right click menu. --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 46 ++++++++++++++++++++++--- dll/win32/shell32/droptargets/CFSDropTarget.h | 3 +- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 3337b455a0..deca859934 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -164,7 +164,7 @@ BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) /* TODO Windows does different drop effects if dragging across drives. i.e., it will copy instead of move if the directories are on different disks. */ - DWORD dwEffect = DROPEFFECT_MOVE; + DWORD dwEffect = m_dwDefaultEffect; *pdwEffect = DROPEFFECT_NONE; @@ -182,16 +182,32 @@ BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) return FALSE; } -HRESULT CFSDropTarget::_GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect) +HRESULT CFSDropTarget::_GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect, DWORD dwAvailableEffects) { HMENU hmenu = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(IDM_DRAGFILE)); if (!hmenu) return E_OUTOFMEMORY; + HMENU hpopupmenu = GetSubMenu(hmenu, 0); + + if ((dwAvailableEffects & DROPEFFECT_COPY) == 0) + DeleteMenu(hpopupmenu, IDM_COPYHERE, MF_BYCOMMAND); + else if ((dwAvailableEffects & DROPEFFECT_MOVE) == 0) + DeleteMenu(hpopupmenu, IDM_MOVEHERE, MF_BYCOMMAND); + else if ((dwAvailableEffects & DROPEFFECT_LINK) == 0) + DeleteMenu(hpopupmenu, IDM_LINKHERE, MF_BYCOMMAND); + + if ((*pdwEffect & DROPEFFECT_COPY)) + SetMenuDefaultItem(hpopupmenu, IDM_COPYHERE, FALSE); + else if ((*pdwEffect & DROPEFFECT_MOVE)) + SetMenuDefaultItem(hpopupmenu, IDM_MOVEHERE, FALSE); + else if ((*pdwEffect & DROPEFFECT_LINK)) + SetMenuDefaultItem(hpopupmenu, IDM_LINKHERE, FALSE); + /* FIXME: We need to support shell extensions here */ - UINT uCommand = TrackPopupMenu(GetSubMenu(hmenu, 0), - TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, + UINT uCommand = TrackPopupMenu(hpopupmenu, + TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_NONOTIFY, pt.x, pt.y, 0, m_hwndSite, NULL); if (uCommand == 0) return S_FALSE; @@ -263,6 +279,22 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, fAcceptFmt = TRUE; m_grfKeyState = dwKeyState; + m_dwDefaultEffect = DROPEFFECT_MOVE; + + STGMEDIUM medium; + if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium))) + { + WCHAR wstrFirstFile[MAX_PATH]; + if (DragQueryFileW((HDROP)medium.hGlobal, 0, wstrFirstFile, _countof(wstrFirstFile))) + { + /* Check if the drive letter is different */ + if (wstrFirstFile[0] != sPathTarget[0]) + { + m_dwDefaultEffect = DROPEFFECT_COPY; + } + } + ReleaseStgMedium(&medium); + } QueryDrop(dwKeyState, pdwEffect); return S_OK; @@ -302,11 +334,15 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, IUnknown_GetWindow(m_site, &m_hwndSite); + DWORD dwAvailableEffects = *pdwEffect; + QueryDrop(dwKeyState, pdwEffect); + TRACE("pdwEffect: 0x%x, m_dwDefaultEffect: 0x%x, dwAvailableEffects: 0x%x\n", *pdwEffect, m_dwDefaultEffect, dwAvailableEffects); + if (m_grfKeyState & MK_RBUTTON) { - HRESULT hr = _GetEffectFromMenu(pDataObject, pt, pdwEffect); + HRESULT hr = _GetEffectFromMenu(pDataObject, pt, pdwEffect, dwAvailableEffects); if (FAILED_UNEXPECTEDLY(hr) || hr == S_FALSE) return hr; } diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.h b/dll/win32/shell32/droptargets/CFSDropTarget.h index 091e60ee33..e0740d2ee7 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.h +++ b/dll/win32/shell32/droptargets/CFSDropTarget.h @@ -34,6 +34,7 @@ class CFSDropTarget : LPWSTR sPathTarget; HWND m_hwndSite; DWORD m_grfKeyState; + DWORD m_dwDefaultEffect; CComPtr<IUnknown> m_site; BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); @@ -41,7 +42,7 @@ class CFSDropTarget : virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); - HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect); + HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect, DWORD dwAvailableEffects); HRESULT _RepositionItems(IShellFolderView *psfv, IDataObject *pDataObject, POINTL pt); public:

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

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 February 2018