Ros-diffs June 2019

ros-diffs@reactos.org

28 participants
288 discussions

[reactos] 01/01: [STORPORT] Fix resource list size calculation

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=631db820587eff59b0ff1… commit 631db820587eff59b0ff1dee2471806d69a254ec Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 2 14:23:59 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 2 14:24:35 2019 +0200 [STORPORT] Fix resource list size calculation --- drivers/storage/port/storport/misc.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index 1c9c73ae661..200682708e1 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -102,7 +102,6 @@ GetResourceListSize( PCM_RESOURCE_LIST ResourceList) { PCM_FULL_RESOURCE_DESCRIPTOR Descriptor; - INT i; ULONG Size; DPRINT1("GetResourceListSize(%p)\n", ResourceList); @@ -117,20 +116,12 @@ GetResourceListSize( DPRINT1("ResourceList->Count: %lu\n", ResourceList->Count); Descriptor = &ResourceList->List[0]; - for (i = 0; i < ResourceList->Count; i++) - { - /* Process resources in CM_FULL_RESOURCE_DESCRIPTOR block number ix. */ - - DPRINT1("PartialResourceList->Count: %lu\n", Descriptor->PartialResourceList.Count); - /* Add the size of the current full descriptor */ - Size += sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + - (Descriptor->PartialResourceList.Count - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + DPRINT1("PartialResourceList->Count: %lu\n", Descriptor->PartialResourceList.Count); - /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ - Descriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(Descriptor->PartialResourceList.PartialDescriptors + - Descriptor->PartialResourceList.Count); - } + /* Add the size of the partial descriptors */ + if (Descriptor->PartialResourceList.Count > 1) + Size += (Descriptor->PartialResourceList.Count - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); DPRINT1("Size: 0x%lx (%u)\n", Size, Size); return Size;

5 years, 6 months

[reactos] 01/01: [WIN32SS][USER32] Fix Task Switcher more (#1602)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7fc10c17c7172aee040c… commit f7fc10c17c7172aee040c1cb2f631d6824917d80 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jun 2 19:17:50 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 2 19:17:50 2019 +0900 [WIN32SS][USER32] Fix Task Switcher more (#1602) This PR will fix task switcher (Alt+Tab) as Win2k3. It became more reliable. CORE-15653 c.f. Raymond Chen's article: http://blogs.msdn.com/b/oldnewthing/archive/2007/10/08/5351207.aspx --- win32ss/user/user32/controls/appswitch.c | 74 +++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c index ee9c10677cc..ac9c5d0ee24 100644 --- a/win32ss/user/user32/controls/appswitch.c +++ b/win32ss/user/user32/controls/appswitch.c @@ -209,15 +209,52 @@ BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam) return TRUE; } -static BOOL CALLBACK -EnumWindowsProc(HWND hwnd, LPARAM lParam) +static HWND GetNiceRootOwner(HWND hwnd) { HWND hwndOwner; - WCHAR szClass[64]; + DWORD ExStyle, OwnerExStyle; + + for (;;) + { + // A window with WS_EX_APPWINDOW is treated as if it has no owner + ExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); + if (ExStyle & WS_EX_APPWINDOW) + break; + + // Is the owner visible? + // An window with WS_EX_TOOLWINDOW is treated as if it weren't visible + hwndOwner = GetWindow(hwnd, GW_OWNER); + OwnerExStyle = GetWindowLong(hwndOwner, GWL_EXSTYLE); + if (!IsWindowVisible(hwndOwner) || (OwnerExStyle & WS_EX_TOOLWINDOW)) + break; + + hwnd = hwndOwner; + } + + return hwnd; +} + +// c.f. http://blogs.msdn.com/b/oldnewthing/archive/2007/10/08/5351207.aspx +BOOL IsAltTabWindow(HWND hwnd) +{ DWORD ExStyle; + RECT rc; + HWND hwndTry, hwndWalk; + WCHAR szClass[64]; + // must be visible if (!IsWindowVisible(hwnd)) - return TRUE; + return FALSE; + + // must not be WS_EX_TOOLWINDOW + ExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); + if (ExStyle & WS_EX_TOOLWINDOW) + return FALSE; + + // must be not empty rect + GetWindowRect(hwnd, &rc); + if (IsRectEmpty(&rc)) + return FALSE; // check special windows if (!GetClassNameW(hwnd, szClass, _countof(szClass)) || @@ -227,17 +264,34 @@ EnumWindowsProc(HWND hwnd, LPARAM lParam) return TRUE; } - ExStyle = GetWindowLongPtrW(hwnd, GWL_EXSTYLE); - if (ExStyle & WS_EX_TOOLWINDOW) - return TRUE; + // get 'nice' root owner + hwndWalk = GetNiceRootOwner(hwnd); + + // walk back from hwndWalk toward hwnd + for (;;) + { + hwndTry = GetLastActivePopup(hwndWalk); + if (hwndTry == hwndWalk) + break; + + ExStyle = GetWindowLong(hwndTry, GWL_EXSTYLE); + if (IsWindowVisible(hwndTry) && !(ExStyle & WS_EX_TOOLWINDOW)) + break; + + hwndWalk = hwndTry; + } + + return hwnd == hwndTry; // Reached? +} - hwndOwner = GetWindow(hwnd, GW_OWNER); - if (!IsWindowVisible(hwndOwner) || (ExStyle & WS_EX_APPWINDOW)) +static BOOL CALLBACK +EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + if (IsAltTabWindow(hwnd)) { if (!EnumerateCallback(hwnd, lParam)) return FALSE; } - return TRUE; }

5 years, 6 months

[reactos] 01/01: [NTOSKRNL] In case IopMountVolume call is a success, return its VPB This fixes an extra (erroneous) reference being set on the VPB.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c3c0d123bf2306b80826… commit 9c3c0d123bf2306b808262fba1d3a224be9fac96 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jun 2 10:48:35 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 2 10:48:35 2019 +0200 [NTOSKRNL] In case IopMountVolume call is a success, return its VPB This fixes an extra (erroneous) reference being set on the VPB. Based on a patch by Vadim Galyant CORE-16080 --- ntoskrnl/io/iomgr/volume.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ntoskrnl/io/iomgr/volume.c b/ntoskrnl/io/iomgr/volume.c index 6c2e3191e9a..1d1e31e5c0d 100644 --- a/ntoskrnl/io/iomgr/volume.c +++ b/ntoskrnl/io/iomgr/volume.c @@ -123,6 +123,14 @@ IopCheckVpbMounted(IN POPEN_PACKET OpenPacket, *Status = STATUS_WRONG_VOLUME; return NULL; } + /* + * In case IopMountVolume returns a valid VPB + * Then, the volume is mounted, return it + */ + else if (Vpb != NULL) + { + return Vpb; + } /* Re-acquire the lock */ IoAcquireVpbSpinLock(&OldIrql);

5 years, 6 months

[reactos] 01/01: [NTOSKRNL] On process primary token change, dereference device map

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8a4d31da489660d48975… commit f8a4d31da489660d48975a685da49fb1f4748685 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jun 2 09:50:05 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 2 10:00:17 2019 +0200 [NTOSKRNL] On process primary token change, dereference device map --- ntoskrnl/ps/security.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ntoskrnl/ps/security.c b/ntoskrnl/ps/security.c index e245dde563f..619ff56d247 100644 --- a/ntoskrnl/ps/security.c +++ b/ntoskrnl/ps/security.c @@ -325,6 +325,14 @@ PspSetPrimaryToken(IN PEPROCESS Process, STANDARD_RIGHTS_ALL | PROCESS_SET_QUOTA); } + + /* + * In case LUID device maps are enable, we may not be using + * system device map for this process, but a logon LUID based + * device map. Because we change primary token, this usage is + * no longer valid, so dereference the process device map + */ + if (ObIsLUIDDeviceMapsEnabled()) ObDereferenceDeviceMap(Process); } /* Dereference the token */

5 years, 6 months

[reactos] 01/01: [SDK][INCLUDE] Update msgdump.h

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8c51ecdd78cda96c6b8c… commit f8c51ecdd78cda96c6b8c486054a671c5c9dddd2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jun 2 10:09:34 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Jun 2 10:09:34 2019 +0900 [SDK][INCLUDE] Update msgdump.h --- sdk/include/reactos/msgdump.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 514914a30c9..c81763b02e6 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 5 /* Version 5 */ +#define _INC_MSGDUMP 6 /* Version 6 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -65,7 +65,7 @@ MD_OnUnknown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (0xC000 <= uMsg && uMsg <= 0xFFFF && GlobalGetAtomName(uMsg, szName, ARRAYSIZE(szName))) { - // RegisterWindowMessage'd message + /* RegisterWindowMessage'd message */ MSGDUMP_TPRINTF(TEXT("%s'%s'(%u)(hwnd:%p, wParam:%p, lParam:%p)\n"), MSGDUMP_PREFIX, szName, uMsg, (void *)hwnd, (void *)wParam, (void *)lParam); @@ -3323,7 +3323,9 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult DEFINE_RESULT(WM_NCXBUTTONDOWN); DEFINE_RESULT(WM_NCXBUTTONUP); DEFINE_RESULT(WM_NCXBUTTONDBLCLK); +#ifdef WM_INPUT_DEVICE_CHANGE DEFINE_RESULT(WM_INPUT_DEVICE_CHANGE); +#endif DEFINE_RESULT(WM_INPUT); DEFINE_RESULT(WM_KEYDOWN); DEFINE_RESULT(WM_KEYUP); @@ -3473,7 +3475,9 @@ MD_msgresult(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT lResult DEFINE_RESULT(WM_PRINTCLIENT); DEFINE_RESULT(WM_APPCOMMAND); DEFINE_RESULT(WM_THEMECHANGED); +#ifdef WM_CLIPBOARDUPDATE DEFINE_RESULT(WM_CLIPBOARDUPDATE); +#endif #if _WIN32_WINNT >= 0x0600 DEFINE_RESULT(WM_DWMCOMPOSITIONCHANGED); DEFINE_RESULT(WM_DWMNCRENDERINGCHANGED);

5 years, 6 months

[reactos] 01/01: [NDK/TESTS] The world isn't only amd64 or i386 (#1596)

by woachk

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e048b8ae9de11b2054b5… commit 8e048b8ae9de11b2054b5400ed48261c43c6e431 Author: woachk <24752637+woachk(a)users.noreply.github.com> AuthorDate: Sun Jun 2 00:39:57 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 2 00:39:57 2019 +0200 [NDK/TESTS] The world isn't only amd64 or i386 (#1596) --- sdk/include/ndk/tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ndk/tests/CMakeLists.txt b/sdk/include/ndk/tests/CMakeLists.txt index a72c95f0371..bd9028a677e 100644 --- a/sdk/include/ndk/tests/CMakeLists.txt +++ b/sdk/include/ndk/tests/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(ndk_tests win8_x64.c win81_x64.c win10_x64.c) -else() +elseif(ARCH STREQUAL "i386") add_library(ndk_tests win2003_x86.c winvista_x86.c

5 years, 6 months

[reactos] 01/01: Update toolchain-msvc.cmake (#1593)

by woachk

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcab77871ebd3d540682f… commit fcab77871ebd3d540682fd402166e17fae58fc99 Author: woachk <24752637+woachk(a)users.noreply.github.com> AuthorDate: Sun Jun 2 00:38:56 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 2 00:38:56 2019 +0200 Update toolchain-msvc.cmake (#1593) Adding armasm64 as the assembler. This on its own isn't too useful right now. --- toolchain-msvc.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 87d31a48930..d1699c38d4a 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -45,6 +45,8 @@ if(ARCH STREQUAL "amd64") set(CMAKE_ASM_COMPILER ml64) elseif(ARCH STREQUAL "arm") set(CMAKE_ASM_COMPILER armasm) +elseif(ARCH STREQUAL "arm64") + set(CMAKE_ASM_COMPILER armasm64) else() set(CMAKE_ASM_COMPILER ml) endif()

5 years, 6 months

[reactos] 01/01: [CONFIGURE] Add support for VS16.1 (#1594)

by woachk

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fcf20a41215b6e4db654… commit 9fcf20a41215b6e4db654abfd13bc3ae9a823222 Author: woachk <24752637+woachk(a)users.noreply.github.com> AuthorDate: Sun Jun 2 00:38:30 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 2 00:38:30 2019 +0200 [CONFIGURE] Add support for VS16.1 (#1594) --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index 00b45f363e6..4113375bfde 100755 --- a/configure.cmd +++ b/configure.cmd @@ -74,6 +74,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.16." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.20." > NUL && set VS_VERSION=16 + cl 2>&1 | find "19.21." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

5 years, 6 months

[reactos] 01/01: [MSHTML] Fake Success in HTMLDocument_put_bgColor()

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc3eed68ca1f4c5aa66ce… commit bc3eed68ca1f4c5aa66ceaca4fc8ae405714699e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Jun 1 22:53:16 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Jun 1 22:53:16 2019 +0200 [MSHTML] Fake Success in HTMLDocument_put_bgColor() This avoids at startup of Instant Messenger "QIP 2005 8095" a message-box with "OLE Error 8004001". The issue is a subtask of CORE-11537 Many Thanks to the patches author Andreas Maier <staubim(a)quantentunnel.de> JIRA-nick: andy-123 Note you still need to install Gecko 2.40 and Samba 1.3 from rapps for QIP. --- dll/win32/mshtml/htmldoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/mshtml/htmldoc.c b/dll/win32/mshtml/htmldoc.c index b7eea81a469..5142e194c6d 100644 --- a/dll/win32/mshtml/htmldoc.c +++ b/dll/win32/mshtml/htmldoc.c @@ -658,7 +658,11 @@ static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); +#ifdef __REACTOS__ + return S_OK; +#else return E_NOTIMPL; +#endif } static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p)

5 years, 6 months

[reactos] 02/02: [NTOSKRNL] Implement ObSetDirectoryDeviceMap

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de17b3603726bd3fdf668… commit de17b3603726bd3fdf668b344f47dbf15425ca0f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jun 1 21:22:30 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 1 21:22:30 2019 +0200 [NTOSKRNL] Implement ObSetDirectoryDeviceMap --- ntoskrnl/ob/devicemap.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index 5dfe1994dd8..5d583e9388b 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -149,8 +149,97 @@ NTAPI ObSetDirectoryDeviceMap(OUT PDEVICE_MAP * DeviceMap, IN HANDLE DirectoryHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + POBJECT_DIRECTORY DirectoryObject = NULL; + PDEVICE_MAP LocalMap = NULL, NewDeviceMap = NULL; + NTSTATUS Status; + POBJECT_HEADER ObjectHeader; + POBJECT_HEADER_NAME_INFO HeaderNameInfo; + + Status = ObReferenceObjectByHandle(DirectoryHandle, + DIRECTORY_TRAVERSE, + ObpDirectoryObjectType, + KernelMode, + (PVOID*)&DirectoryObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Allocate and initialize a new device map */ + LocalMap = ExAllocatePoolWithTag(PagedPool, + sizeof(*LocalMap), + 'mDbO'); + if (LocalMap == NULL) + { + ObDereferenceObject(DirectoryObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the device map */ + RtlZeroMemory(LocalMap, sizeof(*LocalMap)); + LocalMap->ReferenceCount = 1; + LocalMap->DosDevicesDirectory = DirectoryObject; + + /* Acquire the device map lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* Attach the device map to the directory object */ + if (DirectoryObject->DeviceMap == NULL) + { + DirectoryObject->DeviceMap = LocalMap; + } + else + { + NewDeviceMap = LocalMap; + + /* There's already a device map, + so reuse it */ + LocalMap = DirectoryObject->DeviceMap; + ++LocalMap->ReferenceCount; + } + + /* If current object isn't system one, save system one in current + * device map */ + if (DirectoryObject != ObSystemDeviceMap->DosDevicesDirectory) + { + /* We also need to make the object permanant */ + LocalMap->GlobalDosDevicesDirectory = ObSystemDeviceMap->DosDevicesDirectory; + } + + /* Release the device map lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + if (DeviceMap != NULL) + { + *DeviceMap = LocalMap; + } + + /* Caller expects us to make the object permanant, so do it! */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(DirectoryObject); + HeaderNameInfo = ObpReferenceNameInfo(ObjectHeader); + + ObpEnterObjectTypeMutex(ObjectHeader->Type); + if (HeaderNameInfo != NULL && HeaderNameInfo->Directory != NULL) + { + ObjectHeader->Flags |= OB_FLAG_PERMANENT; + } + ObpLeaveObjectTypeMutex(ObjectHeader->Type); + + if (HeaderNameInfo != NULL) + { + ObpDereferenceNameInfo(HeaderNameInfo); + } + + /* Release useless device map if required */ + if (NewDeviceMap != NULL) + { + ObfDereferenceObject(DirectoryObject); + ExFreePoolWithTag(NewDeviceMap, 'mDbO'); + } + + return Status; }

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2019