Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 01/01: [WIN32SS] Fix crash if releasing a PDEVOBJ before switching to graphic mode
by Hervé Poussineau 25 Apr '22

25 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb504d7b0c85f69a9f215… commit cb504d7b0c85f69a9f2152427eca4b9b18fbeefe Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 24 17:27:55 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Apr 25 22:18:41 2022 +0200 [WIN32SS] Fix crash if releasing a PDEVOBJ before switching to graphic mode - do not try to remove ppdev from gppdevList if gppdevList is NULL - do not check (and maybe change) gpmdev, as it should be done only in MDEVOBJ_vDestroy --- win32ss/gdi/eng/pdevobj.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index e1f9da54c69..77dce0b0bfa 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -139,7 +139,7 @@ PDEVOBJ_vRelease( { gppdevList = ppdev->ppdevNext; } - else + else if (gppdevList) { PPDEVOBJ ppdevCurrent = gppdevList; BOOL found = FALSE; @@ -154,10 +154,6 @@ PDEVOBJ_vRelease( ppdevCurrent->ppdevNext = ppdev->ppdevNext; } - /* Is this the primary one ? */ - if (ppdev == gpmdev->ppdevGlobal) - gpmdev->ppdevGlobal = NULL; - /* Unload display driver */ EngUnloadImage(ppdev->pldev);

1 0

[reactos] 01/01: [NTUSER] Add locking at IntSendFocusMessage (#4468)
by Katayama Hirofumi MZ 25 Apr '22

25 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b0e73d66edc9e6ebff70… commit 0b0e73d66edc9e6ebff7057d44d1789846016687 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 25 11:36:00 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 25 11:36:00 2022 +0900 [NTUSER] Add locking at IntSendFocusMessage (#4468) Fix access violation on IntFocusSetInputContext. - Add locking on pWndPrev. CORE-18163 --- win32ss/user/ntuser/focus.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 7ecb9c88f73..f40a2bf686b 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -617,6 +617,7 @@ IntSendFocusMessages( PTHREADINFO pti, PWND pWnd) PWND pWndPrev; PUSER_MESSAGE_QUEUE ThreadQueue = pti->MessageQueue; // Queue can change... HWND hwndPrev; + USER_REFERENCE_ENTRY Ref; ThreadQueue->QF_flags &= ~QF_FOCUSNULLSINCEACTIVE; if (!pWnd && ThreadQueue->spwndActive) @@ -625,6 +626,8 @@ IntSendFocusMessages( PTHREADINFO pti, PWND pWnd) } pWndPrev = ThreadQueue->spwndFocus; + if (pWndPrev) + UserRefObjectCo(pWndPrev, &Ref); /* check if the specified window can be set in the input data of a given queue */ if (!pWnd || ThreadQueue == pWnd->head.pti->MessageQueue) @@ -667,6 +670,9 @@ IntSendFocusMessages( PTHREADINFO pti, PWND pWnd) } } } + + if (pWndPrev) + UserDerefObjectCo(pWndPrev); } BOOL FASTCALL

1 0

[reactos] 01/01: [UMPNPMGR] PNP_CreateDevInst: Create a device node for the device to be installed
by Eric Kohl 24 Apr '22

24 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74efe979a89d4150b23f5… commit 74efe979a89d4150b23f58a5499d1726ad63967b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 24 12:56:42 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 24 12:56:42 2022 +0200 [UMPNPMGR] PNP_CreateDevInst: Create a device node for the device to be installed --- base/services/umpnpmgr/rpcserver.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 50cf19b261c..f3dcd0817cc 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3056,8 +3056,10 @@ PNP_CreateDevInst( PNP_RPC_STRING_LEN ulLength, DWORD ulFlags) { + PLUGPLAY_CONTROL_DEVICE_CONTROL_DATA ControlData; HKEY hKey = NULL; DWORD dwSize, dwPhantom; + NTSTATUS Status; CONFIGRET ret = CR_SUCCESS; DPRINT("PNP_CreateDevInst(%p %S %S %lu 0x%08lx)\n", @@ -3115,7 +3117,18 @@ PNP_CreateDevInst( RegOpenKeyEx(hEnumKey, pszDeviceID, 0, KEY_READ | KEY_WRITE, &hKey); } - /* If the device instance is a phantom, turn it into an non-phantom */ + /* Create a device node for the device */ + RtlInitUnicodeString(&ControlData.DeviceInstance, pszDeviceID); + Status = NtPlugPlayControl(PlugPlayControlInitializeDevice, + &ControlData, + sizeof(ControlData)); + if (!NT_SUCCESS(Status)) + { + ret = CR_FAILURE; + goto done; + } + + /* If the device is a phantom device, turn it into a normal device */ if (hKey != NULL) { dwPhantom = 0;

1 0

[reactos] 01/01: [NTOS:PNP] Add a stub for NtPlugPlayControl:PlugPlayControlInitializeDevice
by Eric Kohl 24 Apr '22

24 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=969f950bf34c478973878… commit 969f950bf34c4789738785581d8c06fe8870b862 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 24 10:02:17 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 24 10:02:17 2022 +0200 [NTOS:PNP] Add a stub for NtPlugPlayControl:PlugPlayControlInitializeDevice --- ntoskrnl/io/pnpmgr/plugplay.c | 48 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 4d64c1e54da..c1f108da332 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -186,6 +186,48 @@ IopCaptureUnicodeString(PUNICODE_STRING DstName, PUNICODE_STRING SrcName) return Status; } + +static +NTSTATUS +IopInitializeDevice( + _In_ PPLUGPLAY_CONTROL_DEVICE_CONTROL_DATA ControlData) +{ + UNICODE_STRING DeviceInstance; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("IopInitializeDevice(%p)\n", ControlData); + + Status = IopCaptureUnicodeString(&DeviceInstance, &ControlData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("Device: %wZ\n", &DeviceInstance); + + /* Leave, if the device already exists */ + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + if (DeviceInstance.Buffer != NULL) + { + DPRINT("Device %wZ already exists!\n", &DeviceInstance); + Status = STATUS_SUCCESS; + goto done; + } + + ObDereferenceObject(DeviceObject); + + DPRINT("Device %wZ does not exist!\n", &DeviceInstance); + + /* FIXME: Create a device node for the device instan*/ + +done: + ExFreePool(DeviceInstance.Buffer); + + return Status; +} + + /* * Remove the current PnP event from the tail of the event queue * and signal IopPnpNotifyEvent if there is yet another event in the queue. @@ -1308,7 +1350,11 @@ NtPlugPlayControl(IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, // case PlugPlayControlRegisterNewDevice: // case PlugPlayControlDeregisterDevice: -// case PlugPlayControlInitializeDevice: + + case PlugPlayControlInitializeDevice: + if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_DEVICE_CONTROL_DATA)) + return STATUS_INVALID_PARAMETER; + return IopInitializeDevice((PPLUGPLAY_CONTROL_DEVICE_CONTROL_DATA)Buffer); case PlugPlayControlStartDevice: case PlugPlayControlResetDevice:

1 0

[reactos] 01/01: [MSVCRT] Enable _wfindfirst64 and _wfindnext64 in msvcrt.spec (#4464)
by Julen Urizar Compains 23 Apr '22

23 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=072dcafc1cd49dda5b65c… commit 072dcafc1cd49dda5b65c67a50f9cf0af373c8eb Author: Julen Urizar Compains <julenuri(a)hotmail.com> AuthorDate: Sat Apr 23 19:19:09 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 23 19:19:09 2022 +0200 [MSVCRT] Enable _wfindfirst64 and _wfindnext64 in msvcrt.spec (#4464) CORE-17666 --- dll/win32/msvcrt/msvcrt.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index adff7f8bf98..a300b5cb60e 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -1197,10 +1197,10 @@ @ cdecl _wexecvpe(wstr ptr ptr) @ cdecl _wfdopen(long wstr) @ cdecl _wfindfirst(wstr ptr) -# stub _wfindfirst64 +@ cdecl _wfindfirst64(wstr ptr) @ cdecl _wfindfirsti64(wstr ptr) @ cdecl _wfindnext(long ptr) -# stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) @ cdecl _wfindnexti64(long ptr) @ cdecl _wfopen(wstr wstr) @ cdecl -version=0x600+ _wfopen_s(ptr wstr wstr)

1 0

[reactos] 01/01: [CSRSRV] Acquire the necessary SE_INC_BASE_PRIORITY_PRIVILEGE at shutdown (#4461)
by Hermès Bélusca-Maïto 23 Apr '22

23 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff293a18779dc509c09fd… commit ff293a18779dc509c09fdea862a6abf33d7d281d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 20 03:31:08 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 23 19:15:22 2022 +0200 [CSRSRV] Acquire the necessary SE_INC_BASE_PRIORITY_PRIVILEGE at shutdown (#4461) When increasing the base priority at shutdown, acquire the necessary SE_INC_BASE_PRIORITY_PRIVILEGE in CsrSetToShutdownPriority(), called by CsrShutdownProcesses(), which is necessary due to the increase of process base priority (i.e. increase of scheduling) being done. Dedicated to George Bișoc :) The Shutdown privilege is however unnecessary (or unwanted) since this has been already dealt with by the shutdown caller. Also, it will be needed only by the caller of NtShutdownSystem() -- that we don't call at all here. --- subsystems/win32/csrsrv/procsup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c index 8d00dc202a3..929a0bc39a6 100644 --- a/subsystems/win32/csrsrv/procsup.c +++ b/subsystems/win32/csrsrv/procsup.c @@ -64,8 +64,8 @@ CsrSetToNormalPriority(VOID) * @name CsrSetToShutdownPriority * * The CsrSetToShutdownPriority routine sets the current NT Process' - * priority to the boosted priority for CSR Processes doing shutdown. - * Additonally, it acquires the Shutdown Privilege required for shutdown. + * priority to the boosted priority for CSR Processes doing shutdown, + * acquiring also the required Increase Base Priority privilege. * * @param None. * @@ -82,8 +82,8 @@ CsrSetToShutdownPriority(VOID) KPRIORITY BasePriority = PROCESS_PRIORITY_NORMAL_FOREGROUND + 6; BOOLEAN Old; - /* Get the shutdown privilege */ - if (NT_SUCCESS(RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, + /* Get the Increase Base Priority privilege */ + if (NT_SUCCESS(RtlAdjustPrivilege(SE_INC_BASE_PRIORITY_PRIVILEGE, TRUE, FALSE, &Old)))

1 0

[reactos] 02/02: [GITHUB] Fix MSVC 2015 (v14.0) build, until a clear consensus is reached for PR #3872 (#4454) CORE-18146
by Hermès Bélusca-Maïto 23 Apr '22

23 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d08c6429d04e1c158030… commit 0d08c6429d04e1c158030e1ff84ff56a56887bbb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 17 02:26:13 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 23 19:14:06 2022 +0200 [GITHUB] Fix MSVC 2015 (v14.0) build, until a clear consensus is reached for PR #3872 (#4454) CORE-18146 Use the matrix.os + include/exclude technique, as suggested by Serge Gautherie :) --- .github/workflows/build.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d8acbae356..b45b9b1d87b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,14 +78,19 @@ jobs: build-msvc: strategy: matrix: - toolset: ['14.2', '14.1'] # VS 2019, 2017 + os: [windows-latest, windows-2019] + toolset: ['14.2', '14.1', '14.0'] # VS 2019, 2017, and 2015 (see below) arch: [i386, amd64] config: [Debug, Release] - include: - - arch: i386 # Not compiling on amd64 prompt - toolset: '14.0' # VS 2015 + exclude: # VS 2019, 2017 only with windows-latest; VS 2015 only with windows-2019 + - os: windows-2019 + toolset: '14.2' + - os: windows-2019 + toolset: '14.1' + - os: windows-latest + toolset: '14.0' fail-fast: false - runs-on: windows-latest + runs-on: ${{matrix.os}} steps: - name: Install ninja run: choco install -y ninja @@ -115,7 +120,7 @@ jobs: - name: Configure run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 - name: Build - run: cmake --build build -- -k0 + run: cmake --build build -- -k0 - name: Generate ISOs run: cmake --build build --target bootcd --target livecd - name: Upload ISOs

1 0

[reactos] 01/02: [GITHUB] Use the correct worker to get MSBuild VS2019 working. (#4454) CORE-18146
by Hermès Bélusca-Maïto 23 Apr '22

23 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1170a5a493a5f82506a19… commit 1170a5a493a5f82506a19e707c806db18c48fd6c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 17 02:21:19 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 23 19:14:05 2022 +0200 [GITHUB] Use the correct worker to get MSBuild VS2019 working. (#4454) CORE-18146 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a3819525cf..3d8acbae356 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -256,7 +256,7 @@ jobs: build-msbuild-i386: name: MSBuild (i386) - runs-on: windows-latest + runs-on: windows-2019 steps: - name: Install Flex and Bison run: |

1 0

[reactos] 01/01: [UMPNPMGR] PNP_CreateDevInst: Convert a phantom device to a normal device
by Eric Kohl 23 Apr '22

23 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7a222b52db416283eeca… commit a7a222b52db416283eeca2aa0e3d0a923d2881e9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 23 16:59:47 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 23 16:59:47 2022 +0200 [UMPNPMGR] PNP_CreateDevInst: Convert a phantom device to a normal device --- base/services/umpnpmgr/rpcserver.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 26b9ab88ab3..50cf19b261c 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3057,6 +3057,7 @@ PNP_CreateDevInst( DWORD ulFlags) { HKEY hKey = NULL; + DWORD dwSize, dwPhantom; CONFIGRET ret = CR_SUCCESS; DPRINT("PNP_CreateDevInst(%p %S %S %lu 0x%08lx)\n", @@ -3104,8 +3105,26 @@ PNP_CreateDevInst( goto done; } - /* Create the device instance */ - ret = CreateDeviceInstance(pszDeviceID, FALSE); + /* If it does not already exist ... */ + if (hKey == NULL) + { + /* Create the device instance */ + ret = CreateDeviceInstance(pszDeviceID, FALSE); + + /* Open the device instance key */ + RegOpenKeyEx(hEnumKey, pszDeviceID, 0, KEY_READ | KEY_WRITE, &hKey); + } + + /* If the device instance is a phantom, turn it into an non-phantom */ + if (hKey != NULL) + { + dwPhantom = 0; + dwSize = sizeof(DWORD); + RegQueryValueEx(hKey, L"Phantom", NULL, NULL, (PBYTE)&dwPhantom, &dwSize); + + if (dwPhantom != 0) + RegDeleteValue(hKey, L"Phantom"); + } } done:

1 0

[reactos] 01/01: [UMPNPMGR] PNP_CreateDevInst: Do not create a normal device if it is already present
by Eric Kohl 23 Apr '22

23 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33a0c66f30d823b1adf21… commit 33a0c66f30d823b1adf21bb95c526e489847b38f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 23 15:35:45 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 23 15:35:45 2022 +0200 [UMPNPMGR] PNP_CreateDevInst: Do not create a normal device if it is already present --- base/services/umpnpmgr/rpcserver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 74a289205d0..26b9ab88ab3 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3097,6 +3097,13 @@ PNP_CreateDevInst( } else { + /* Fail, if the device exists and is present */ + if ((hKey != NULL) && (IsPresentDeviceInstanceID(pszDeviceID))) + { + ret = CR_ALREADY_SUCH_DEVINST; + goto done; + } + /* Create the device instance */ ret = CreateDeviceInstance(pszDeviceID, FALSE); }

1 0

← Newer
1
2
3
4
5
6
7
...
16
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 April 2022