Ros-diffs November 2020

ros-diffs@reactos.org

18 participants
162 discussions

[reactos] 01/01: [REGEDIT] Make "finished find" messagebox owned by Regedit window (#3369)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6aae5f4fdd87efe805f7b… commit 6aae5f4fdd87efe805f7bd44c601044b0cbe47c2 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat Nov 14 20:21:10 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 14 19:21:10 2020 +0100 [REGEDIT] Make "finished find" messagebox owned by Regedit window (#3369) Same behaviour as in MS Regedit. CORE-17367 --- base/applications/regedit/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/find.c b/base/applications/regedit/find.c index 98fe43f00bc..f095712bc6c 100644 --- a/base/applications/regedit/find.c +++ b/base/applications/regedit/find.c @@ -821,7 +821,7 @@ void FindDialog(HWND hWnd) LoadStringW(hInst, IDS_FINISHEDFIND, msg, COUNT_OF(msg)); LoadStringW(hInst, IDS_APP_TITLE, caption, COUNT_OF(caption)); - MessageBoxW(0, msg, caption, MB_ICONINFORMATION); + MessageBoxW(hWnd, msg, caption, MB_ICONINFORMATION); } } }

4 years, 1 month

[reactos] 02/02: [SAMSRV] SamIFree_SAMPR_USER_INFO_BUFFER: Add missing breaks. CORE-17355

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b59bad8d105e0f8a309bb… commit b59bad8d105e0f8a309bb27d41d39901165e0cd7 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 14 15:23:41 2020 +0100 [SAMSRV] SamIFree_SAMPR_USER_INFO_BUFFER: Add missing breaks. CORE-17355 Addendum to fda13e (r58742). --- dll/win32/samsrv/samsrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/samsrv/samsrv.c b/dll/win32/samsrv/samsrv.c index a9664117a19..7efaabe6e7f 100644 --- a/dll/win32/samsrv/samsrv.c +++ b/dll/win32/samsrv/samsrv.c @@ -650,10 +650,12 @@ SamIFree_SAMPR_USER_INFO_BUFFER(PSAMPR_USER_INFO_BUFFER Ptr, case UserScriptInformation: if (Ptr->Script.ScriptPath.Buffer != NULL) MIDL_user_free(Ptr->Script.ScriptPath.Buffer); + break; case UserProfileInformation: if (Ptr->Profile.ProfilePath.Buffer != NULL) MIDL_user_free(Ptr->Profile.ProfilePath.Buffer); + break; case UserAdminCommentInformation: if (Ptr->AdminComment.AdminComment.Buffer != NULL)

4 years, 1 month

[reactos] 01/02: [SAMSRV] SamrQueryInformationUser: Add missing break. CORE-17355

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c4d6b0f9e095cd7119f7… commit 3c4d6b0f9e095cd7119f7d084055dba31b8d7359 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 14 15:22:05 2020 +0100 [SAMSRV] SamrQueryInformationUser: Add missing break. CORE-17355 Addendum to 2f6a92c (r56820). --- dll/win32/samsrv/samrpc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index 6b4aa622950..17ebb5ab1be 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -7457,6 +7457,7 @@ SamrQueryInformationUser(IN SAMPR_HANDLE UserHandle, case UserHomeInformation: Status = SampQueryUserHome(UserObject, Buffer); + break; case UserScriptInformation: Status = SampQueryUserScript(UserObject,

4 years, 1 month

[reactos] 01/01: [HALX86] Implement HalQueryAMLIIllegalIOPortAddresses case in HaliQuerySystemInformation CORE-17359

by Vadim Galyant

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40bb3786b63c69091b70e… commit 40bb3786b63c69091b70ed4d17a0ee29a99061d4 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Thu Nov 5 22:56:05 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 14 15:18:37 2020 +0100 [HALX86] Implement HalQueryAMLIIllegalIOPortAddresses case in HaliQuerySystemInformation CORE-17359 Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> Co-authored-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> --- hal/halx86/generic/sysinfo.c | 53 +++++++++++++++++++++++++++++++++++++++++++- hal/halx86/include/halp.h | 9 ++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/hal/halx86/generic/sysinfo.c b/hal/halx86/generic/sysinfo.c index d3a72c56a2f..ba880f380c3 100644 --- a/hal/halx86/generic/sysinfo.c +++ b/hal/halx86/generic/sysinfo.c @@ -4,6 +4,7 @@ * FILE: hal/halx86/generic/sysinfo.c * PURPOSE: HAL Information Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Vadim Galyant (vgal(a)rambler.ru) */ /* INCLUDES *******************************************************************/ @@ -12,8 +13,43 @@ #define NDEBUG #include <debug.h> +HAL_AMLI_BAD_IO_ADDRESS_LIST HalALMIBadIOAddressList[] = +{ + { 0x0000, 0x10, 1, NULL }, // DMA controller + { 0x0020, 0x02, 0, NULL }, // Programmable Interrupt Controller (8259A) + { 0x0040, 0x04, 1, NULL }, // System Timer 1 + { 0x0048, 0x04, 1, NULL }, // System Timer 2 failsafe + { 0x0070, 0x02, 1, NULL }, // Real-time clock + { 0x0074, 0x03, 1, NULL }, // Extended CMOS + { 0x0081, 0x03, 1, NULL }, // DMA 1 page registers + { 0x0087, 0x01, 1, NULL }, // DMA 1 Ch 0 low page + { 0x0089, 0x01, 1, NULL }, // DMA 2 page registers + { 0x008A, 0x02, 1, NULL }, // DMA 2 page registers + { 0x008F, 0x01, 1, NULL }, // DMA 2 low page refresh + { 0x0090, 0x02, 1, NULL }, // Arbitration control + { 0x0093, 0x02, 1, NULL }, // Reserved system board setup + { 0x0096, 0x02, 1, NULL }, // POS channel select + { 0x00A0, 0x02, 0, NULL }, // Cascaded PIC + { 0x00C0, 0x20, 1, NULL }, // ISA DMA + { 0x04D0, 0x02, 0, NULL }, // PIC edge/level registers + { 0x0CF8, 0x08, 1, &HaliHandlePCIConfigSpaceAccess }, // PCI configuration space + { 0x0000, 0x00, 0, NULL } // Reserved +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +HaliHandlePCIConfigSpaceAccess(_In_ BOOLEAN IsRead, + _In_ ULONG Port, + _In_ ULONG Length, + _Inout_ PULONG Buffer) +{ + DPRINT1("HaliHandlePCIConfigSpaceAccess: IsRead %X, Port 0x%X, Length %u, Buffer %p\n", IsRead, Port, Length, Buffer); + //ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS NTAPI HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, @@ -44,7 +80,22 @@ HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, REPORT_THIS_CASE(HalCmcLogInformation); REPORT_THIS_CASE(HalCpeLogInformation); REPORT_THIS_CASE(HalQueryMcaInterface); - REPORT_THIS_CASE(HalQueryAMLIIllegalIOPortAddresses); + case HalQueryAMLIIllegalIOPortAddresses: + { + ULONG Size = sizeof(HalALMIBadIOAddressList); + NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; + + if (BufferSize >= Size) + { + RtlCopyMemory(Buffer, HalALMIBadIOAddressList, Size); + Status = STATUS_SUCCESS; + } + + *ReturnedLength = Size; + KeFlushWriteBuffer(); + return Status; + } + REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); REPORT_THIS_CASE(HalPartitionIpiInterface); REPORT_THIS_CASE(HalPlatformInformation); diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 080c0ac8462..746230f5d91 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -316,6 +316,15 @@ HalpUnmapVirtualAddress( ); /* sysinfo.c */ +NTSTATUS +NTAPI +HaliHandlePCIConfigSpaceAccess( + _In_ BOOLEAN IsRead, + _In_ ULONG Port, + _In_ ULONG Length, + _Inout_ PULONG Buffer +); + NTSTATUS NTAPI HaliQuerySystemInformation(

4 years, 1 month

[reactos] 02/02: [NTOS:CM] Implement support for KeyValuePartialInformationAlign64. CORE-17358

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=507c44247344fc88a0d86… commit 507c44247344fc88a0d8646bdfc91007a86dd1a4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Oct 30 17:29:29 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 14 15:11:00 2020 +0100 [NTOS:CM] Implement support for KeyValuePartialInformationAlign64. CORE-17358 --- ntoskrnl/config/cmvalche.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/config/cmvalche.c b/ntoskrnl/config/cmvalche.c index 7759b7c646f..07190266e92 100644 --- a/ntoskrnl/config/cmvalche.c +++ b/ntoskrnl/config/cmvalche.c @@ -574,16 +574,23 @@ CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, /* Partial information requested (no name or alignment!) */ case KeyValuePartialInformation: + case KeyValuePartialInformationAlign64: /* Check if this is a small key and compute key size */ IsSmall = CmpIsKeyValueSmall(&KeySize, CellData->u.KeyValue.DataLength); - /* Calculate the total size required */ - Size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + KeySize; - - /* And this is the least we can work with */ - MinimumSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + /* Calculate the total size required and the least we can work with */ + if (KeyValueInformationClass == KeyValuePartialInformationAlign64) + { + Size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data) + KeySize; + MinimumSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data); + } + else + { + Size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + KeySize; + MinimumSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + } /* Tell the caller the size we'll finally need, and set success */ *ResultLength = Size; @@ -598,9 +605,17 @@ CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, } /* Fill out the basic information */ - Info->KeyValuePartialInformation.TitleIndex = 0; - Info->KeyValuePartialInformation.Type = CellData->u.KeyValue.Type; - Info->KeyValuePartialInformation.DataLength = KeySize; + if (KeyValueInformationClass == KeyValuePartialInformationAlign64) + { + Info->KeyValuePartialInformationAlign64.Type = CellData->u.KeyValue.Type; + Info->KeyValuePartialInformationAlign64.DataLength = KeySize; + } + else + { + Info->KeyValuePartialInformation.TitleIndex = 0; + Info->KeyValuePartialInformation.Type = CellData->u.KeyValue.Type; + Info->KeyValuePartialInformation.DataLength = KeySize; + } /* Now check if the key had any data */ if (KeySize > 0) @@ -649,9 +664,18 @@ CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, if (Buffer) { /* Copy the data into the aligned offset */ - RtlCopyMemory(Info->KeyValuePartialInformation.Data, - Buffer, - Size); + if (KeyValueInformationClass == KeyValuePartialInformationAlign64) + { + RtlCopyMemory(Info->KeyValuePartialInformationAlign64.Data, + Buffer, + Size); + } + else + { + RtlCopyMemory(Info->KeyValuePartialInformation.Data, + Buffer, + Size); + } } }

4 years, 1 month

[reactos] 01/02: [NTDLL_APITEST] Add a test for KeyValuePartialInformationAlign64. CORE-17358

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2cf64094cc0980f7d16e… commit b2cf64094cc0980f7d16e4cd089b3e9a9dd34773 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 31 13:08:06 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 14 15:10:59 2020 +0100 [NTDLL_APITEST] Add a test for KeyValuePartialInformationAlign64. CORE-17358 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + modules/rostests/apitests/ntdll/NtQueryValueKey.c | 115 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 118 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index bb2a8cad1f6..1c5be3bad1e 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -30,6 +30,7 @@ list(APPEND SOURCE NtQueryKey.c NtQuerySystemEnvironmentValue.c NtQuerySystemInformation.c + NtQueryValueKey.c NtQueryVolumeInformationFile.c NtReadFile.c NtSaveKey.c diff --git a/modules/rostests/apitests/ntdll/NtQueryValueKey.c b/modules/rostests/apitests/ntdll/NtQueryValueKey.c new file mode 100644 index 00000000000..b2b75948289 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtQueryValueKey.c @@ -0,0 +1,115 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtQueryValueKey + * COPYRIGHT: Copyright 2020 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include "precomp.h" +#include <winreg.h> + +START_TEST(NtQueryValueKey) +{ + NTSTATUS Status; + HANDLE KeyHandle; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SystemRoot"); + PKEY_VALUE_PARTIAL_INFORMATION_ALIGN64 Info; + PKEY_VALUE_PARTIAL_INFORMATION_ALIGN64 InfoUnaligned; + ULONG InfoLength; + ULONG ResultLength; + const WCHAR *StringData; + ULONG StringLength; + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + skip("Test key unavailable\n"); + return; + } + + /* Specify zero-size buffer, get the length */ + ResultLength = 0x55555555; + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformationAlign64, + NULL, + 0, + &ResultLength); + ok_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok(ResultLength > FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data) && ResultLength < 0x10000, + "Invalid result length %lu\n", ResultLength); + if (ResultLength < FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data)) + { + skip("Result length %lu too small\n", ResultLength); + goto Exit; + } + InfoLength = ResultLength; + Info = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + InfoLength + 4); + if (Info == NULL) + { + skip("Could not alloc %lu bytes\n", InfoLength); + goto Exit; + } + + /* Successful call */ + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformationAlign64, + Info, + InfoLength, + &ResultLength); + ok_hex(Status, STATUS_SUCCESS); + ok_int(ResultLength, InfoLength); + + ok_int(Info->Type, REG_SZ); + StringLength = InfoLength - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data); + ok_int(Info->DataLength, StringLength); + + StringData = (PWCHAR)Info->Data; + ok(Info->DataLength >= 5 * sizeof(WCHAR), "DataLength %lu is too small for path\n", Info->DataLength); + if (Info->DataLength >= 5 * sizeof(WCHAR)) + { + trace("SystemRoot: %.*ls\n", (int)(Info->DataLength / sizeof(WCHAR) - 1), StringData); + ok(StringData[0] >= 'A' && StringData[0] <= 'Z', "Data[0] = %x\n", StringData[0]); + ok(StringData[1] == ':', "Data[1] = %x\n", StringData[1]); + ok(StringData[2] == '\\', "Data[2] = %x\n", StringData[2]); + ok(iswalnum(StringData[3]), "Data[3] = %x\n", StringData[3]); + ok(StringData[Info->DataLength / sizeof(WCHAR) - 1] == UNICODE_NULL, + "Data[%lu] = %x\n", Info->DataLength / sizeof(WCHAR) - 1, StringData[Info->DataLength / sizeof(WCHAR) - 1]); + } + + /* If the buffer isn't 64 bit aligned, the data won't be, either */ + InfoUnaligned = (PVOID)((PUCHAR)Info + 4); + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformationAlign64, + InfoUnaligned, + InfoLength, + &ResultLength); + ok_hex(Status, STATUS_SUCCESS); + ok_int(ResultLength, InfoLength); + ok_int(InfoUnaligned->Type, REG_SZ); + StringData = (PWCHAR)InfoUnaligned->Data; + ok(InfoUnaligned->DataLength >= 2 * sizeof(WCHAR), "DataLength %lu is too small for path\n", InfoUnaligned->DataLength); + if (InfoUnaligned->DataLength >= 2 * sizeof(WCHAR)) + { + ok(StringData[1] == ':', "Data[1] = %x\n", StringData[1]); + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, Info); + +Exit: + Status = NtClose(KeyHandle); + ok_hex(Status, STATUS_SUCCESS); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 40a0d686c8b..fa8282ea5f4 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -28,6 +28,7 @@ extern void func_NtQueryInformationThread(void); extern void func_NtQueryKey(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtQuerySystemInformation(void); +extern void func_NtQueryValueKey(void); extern void func_NtQueryVolumeInformationFile(void); extern void func_NtReadFile(void); extern void func_NtSaveKey(void); @@ -102,6 +103,7 @@ const struct test winetest_testlist[] = { "NtQueryKey", func_NtQueryKey }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtQuerySystemInformation", func_NtQuerySystemInformation }, + { "NtQueryValueKey", func_NtQueryValueKey }, { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile }, { "NtReadFile", func_NtReadFile }, { "NtSaveKey", func_NtSaveKey},

4 years, 1 month

[reactos] 02/02: [COMPBATT] Add a missing OBJ_KERNEL_HANDLE

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33714797f47537983142e… commit 33714797f47537983142e1d4760f7f492f822e30 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 14 12:03:27 2020 +0100 [COMPBATT] Add a missing OBJ_KERNEL_HANDLE CORE-10207 --- drivers/bus/acpi/compbatt/compmisc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/bus/acpi/compbatt/compmisc.c b/drivers/bus/acpi/compbatt/compmisc.c index 337c521835c..e84a2512706 100644 --- a/drivers/bus/acpi/compbatt/compmisc.c +++ b/drivers/bus/acpi/compbatt/compmisc.c @@ -84,7 +84,11 @@ CompBattGetDeviceObjectPointer(IN PUNICODE_STRING DeviceName, PAGED_CODE(); /* Open a file object handle to the device */ - InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, + DeviceName, + OBJ_KERNEL_HANDLE, + NULL, + NULL); Status = ZwCreateFile(&DeviceHandle, DesiredAccess, &ObjectAttributes,

4 years, 1 month

[reactos] 01/02: [NTOS:KDBG] Add some missing OBJ_KERNEL_HANDLE

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b910409a4ab00fb77a874… commit b910409a4ab00fb77a8745ea414db35d3ea58a9a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Sep 9 03:46:56 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 14 12:00:24 2020 +0100 [NTOS:KDBG] Add some missing OBJ_KERNEL_HANDLE CORE-10207 --- ntoskrnl/kdbg/kdb_cli.c | 6 +++++- ntoskrnl/kdbg/kdb_symbols.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 53d874c3e2f..7314086c2f6 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3798,7 +3798,11 @@ KdbpCliInit(VOID) /* Initialize the object attributes */ RtlInitUnicodeString(&FileName, L"\\SystemRoot\\System32\\drivers\\etc\\KDBinit"); - InitializeObjectAttributes(&ObjectAttributes, &FileName, 0, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); /* Open the file */ Status = ZwOpenFile(&hFile, FILE_READ_DATA | SYNCHRONIZE, diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 3baafaf7b78..a3db0abe7fc 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -385,7 +385,7 @@ KdbpSymLoadModuleSymbols( /* Open the file */ InitializeObjectAttributes(&ObjectAttributes, FileName, - 0, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL);

4 years, 1 month

[reactos] 01/01: [PARTMGR] Disable driver startup

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4fc9467815ab43e774d29… commit 4fc9467815ab43e774d297bffd4a77b21c514cc9 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Nov 13 04:13:32 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Nov 13 04:13:32 2020 +0300 [PARTMGR] Disable driver startup --- drivers/storage/partmgr/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/partmgr/CMakeLists.txt b/drivers/storage/partmgr/CMakeLists.txt index 275fc305fb4..92a90931e06 100644 --- a/drivers/storage/partmgr/CMakeLists.txt +++ b/drivers/storage/partmgr/CMakeLists.txt @@ -15,5 +15,5 @@ add_library(partmgr MODULE add_pch(partmgr partmgr.h "${PCH_SKIP_SOURCE}") set_module_type(partmgr kernelmodedriver) add_importlibs(partmgr ntoskrnl hal) -add_registry_inf(partmgr_reg.inf) +# add_registry_inf(partmgr_reg.inf) add_cd_file(TARGET partmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)

4 years, 1 month

[reactos] 01/01: [PSDK] Add more 32 and 64-bit definitions to ntddscsi.h

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=901c457b633881ffc5984… commit 901c457b633881ffc5984f4901742c3bec0ac17a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Nov 13 03:15:31 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Nov 13 03:15:31 2020 +0300 [PSDK] Add more 32 and 64-bit definitions to ntddscsi.h --- sdk/include/psdk/ntddscsi.h | 66 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/ntddscsi.h b/sdk/include/psdk/ntddscsi.h index 14a9cef230c..0d9001b34fb 100644 --- a/sdk/include/psdk/ntddscsi.h +++ b/sdk/include/psdk/ntddscsi.h @@ -20,9 +20,9 @@ DEFINE_GUID(WmiScsiAddressGuid,0x53f5630fL,0xb6bf,0x11d0,0x94,0xf2,0x00,0xa0,0xc extern "C" { #endif -#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER +#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER -#define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort" +#define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort" #define DD_SCSI_DEVICE_NAME_U L"\\Device\\ScsiPort" #define IOCTL_SCSI_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE,0x0401,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -126,6 +126,68 @@ extern "C" { UCHAR Cdb[ANYSIZE_ARRAY]; } SCSI_PASS_THROUGH_EX, *PSCSI_PASS_THROUGH_EX; +typedef struct _SCSI_PASS_THROUGH_DIRECT_EX +{ + ULONG Version; + ULONG Length; + ULONG CdbLength; + ULONG StorAddressLength; + UCHAR ScsiStatus; + UCHAR SenseInfoLength; + UCHAR DataDirection; + UCHAR Reserved; + ULONG TimeOutValue; + ULONG StorAddressOffset; + ULONG SenseInfoOffset; + ULONG DataOutTransferLength; + ULONG DataInTransferLength; + PVOID DataOutBuffer; + PVOID DataInBuffer; + UCHAR Cdb[ANYSIZE_ARRAY]; +} SCSI_PASS_THROUGH_DIRECT_EX, *PSCSI_PASS_THROUGH_DIRECT_EX; + +#if defined(_WIN64) +typedef struct _SCSI_PASS_THROUGH32_EX +{ + ULONG Version; + ULONG Length; + ULONG CdbLength; + ULONG StorAddressLength; + UCHAR ScsiStatus; + UCHAR SenseInfoLength; + UCHAR DataDirection; + UCHAR Reserved; + ULONG TimeOutValue; + ULONG StorAddressOffset; + ULONG SenseInfoOffset; + ULONG DataOutTransferLength; + ULONG DataInTransferLength; + ULONG32 DataOutBufferOffset; + ULONG32 DataInBufferOffset; + UCHAR Cdb[ANYSIZE_ARRAY]; +} SCSI_PASS_THROUGH32_EX, *PSCSI_PASS_THROUGH32_EX; + +typedef struct _SCSI_PASS_THROUGH_DIRECT32_EX +{ + ULONG Version; + ULONG Length; + ULONG CdbLength; + ULONG StorAddressLength; + UCHAR ScsiStatus; + UCHAR SenseInfoLength; + UCHAR DataDirection; + UCHAR Reserved; + ULONG TimeOutValue; + ULONG StorAddressOffset; + ULONG SenseInfoOffset; + ULONG DataOutTransferLength; + ULONG DataInTransferLength; + VOID * POINTER_32 DataOutBuffer; + VOID * POINTER_32 DataInBuffer; + UCHAR Cdb[ANYSIZE_ARRAY]; +} SCSI_PASS_THROUGH_DIRECT32_EX, *PSCSI_PASS_THROUGH_DIRECT32_EX; +#endif + typedef struct _ATA_PASS_THROUGH_EX { USHORT Length; USHORT AtaFlags;

4 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2020