Ros-diffs December 2020

ros-diffs@reactos.org

17 participants
131 discussions

[reactos] 01/04: [DISK_NEW] Various small fixes

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb682bbfab56566a5cff6… commit eb682bbfab56566a5cff6f95265544b17c4f2562 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 19:19:25 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 22:14:50 2020 +0300 [DISK_NEW] Various small fixes - Silence a (possibly wrong) assert in DiskShutdownFlush - Fix build with GCC and MSVC amd64 CORE-17129 --- drivers/storage/class/disk_new/disk.c | 8 ++++++-- drivers/storage/class/disk_new/pnp.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/storage/class/disk_new/disk.c b/drivers/storage/class/disk_new/disk.c index 29259da6dba..3aee7640418 100644 --- a/drivers/storage/class/disk_new/disk.c +++ b/drivers/storage/class/disk_new/disk.c @@ -1258,7 +1258,11 @@ Return Value: InsertTailList(&diskData->FlushContext.CurrList, listEntry); } +#ifndef __REACTOS__ + // ReactOS hits this assert, because CurrIrp can already be freed at this point + // and it's possible that NextIrp has the same pointer value NT_ASSERT(diskData->FlushContext.CurrIrp != diskData->FlushContext.NextIrp); +#endif diskData->FlushContext.CurrIrp = diskData->FlushContext.NextIrp; diskData->FlushContext.NextIrp = NULL; @@ -1678,7 +1682,7 @@ Return Value: irpSp->MajorFunction = IRP_MJ_SCSI; irpSp->Parameters.Scsi.Srb = srb; - IoSetCompletionRoutine(FlushContext->CurrIrp, DiskFlushComplete, (PVOID)SyncCacheStatus, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(FlushContext->CurrIrp, DiskFlushComplete, (PVOID)(ULONG_PTR)SyncCacheStatus, TRUE, TRUE, TRUE); TracePrint((TRACE_LEVEL_VERBOSE, TRACE_FLAG_SCSI, "DiskFlushDispatch: sending srb flush on irp %p\n", FlushContext->CurrIrp)); @@ -1728,7 +1732,7 @@ Return Value: #ifdef _MSC_VER #pragma warning(suppress:4311) // pointer truncation from 'PVOID' to 'NTSTATUS' #endif - NTSTATUS SyncCacheStatus = (NTSTATUS) Context; + NTSTATUS SyncCacheStatus = (NTSTATUS)(ULONG_PTR)Context; TracePrint((TRACE_LEVEL_VERBOSE, TRACE_FLAG_GENERAL, "DiskFlushComplete: %p %p\n", Fdo, Irp)); diff --git a/drivers/storage/class/disk_new/pnp.c b/drivers/storage/class/disk_new/pnp.c index 2023a00abb2..f124d96be85 100644 --- a/drivers/storage/class/disk_new/pnp.c +++ b/drivers/storage/class/disk_new/pnp.c @@ -132,7 +132,9 @@ Return Value: queryTable[0].EntryContext = &(rootPartitionMountable); queryTable[0].DefaultType = (REG_DWORD << RTL_QUERY_REGISTRY_TYPECHECK_SHIFT) | REG_NONE; +#ifdef _MSC_VER #pragma prefast(suppress:6309, "We don't have QueryRoutine so Context doesn't make any sense") +#endif status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, diskKey, queryTable,

4 years

[reactos] 01/01: [NTDLL_APITEST] Add test showing that RtlImageDirectoryEntryToData works on 32-bit and 64-bit images

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1523dd28ece6d40a322d… commit e1523dd28ece6d40a322d467b8457393a8e1c979 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Nov 30 10:35:10 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 5 17:03:24 2020 +0100 [NTDLL_APITEST] Add test showing that RtlImageDirectoryEntryToData works on 32-bit and 64-bit images --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/RtlImageDirectoryEntryToData.c | 171 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 174 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 1c5be3bad1e..0ed66a9fed6 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -63,6 +63,7 @@ list(APPEND SOURCE RtlGetNtProductType.c RtlGetUnloadEventTrace.c RtlHandle.c + RtlImageDirectoryEntryToData.c RtlImageRvaToVa.c RtlIsNameLegalDOS8Dot3.c RtlMemoryStream.c diff --git a/modules/rostests/apitests/ntdll/RtlImageDirectoryEntryToData.c b/modules/rostests/apitests/ntdll/RtlImageDirectoryEntryToData.c new file mode 100644 index 00000000000..1f8e785b4b1 --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlImageDirectoryEntryToData.c @@ -0,0 +1,171 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test showing that RtlImageDirectoryEntryToData accepts 32 and 64 bit images + * COPYRIGHT: Copyright 2020 Mark Jansen <mark.jansen(a)reactos.org> + */ + + +#include "precomp.h" + +/* +tcc main.c -shared -nostdlib -DIS_DLL -rdynamic -o pe32.dll + +int __attribute__((__stdcall__)) _dllstart(int a, int b, int c) +{ + return 1; +} +*/ + +static unsigned char dll_32[1536] = { + 0x4D, 0x5A, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x1F, 0xBA, 0x0E, 0x00, 0xB4, 0x09, 0xCD, + 0x21, 0xB8, 0x01, 0x4C, 0xCD, 0x21, 0x54, 0x68, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6F, 0x67, 0x72, 0x61, 0x6D, 0x20, 0x63, 0x61, 0x6E, 0x6E, 0x6F, + 0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x69, 0x6E, 0x20, 0x44, 0x4F, 0x53, 0x20, 0x6D, 0x6F, 0x64, 0x65, 0x2E, 0x0D, 0x0D, 0x0A, + 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x45, 0x00, 0x00, 0x4C, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x0E, 0x23, 0x0B, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, + 0xB0, 0x7D, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x2E, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, + 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0xC0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x89, 0xE5, 0x81, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x90, 0xB8, 0x01, 0x00, 0x00, 0x00, 0xE9, + 0x00, 0x00, 0x00, 0x00, 0xC9, 0xC2, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x8C, 0x20, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x28, 0x20, 0x00, 0x00, + 0x50, 0x20, 0x00, 0x00, 0x78, 0x20, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, + 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x40, 0x21, 0x00, 0x00, 0x18, 0x10, 0x00, 0x00, + 0x95, 0x20, 0x00, 0x00, 0xA3, 0x20, 0x00, 0x00, 0xB4, 0x20, 0x00, 0x00, 0xC7, 0x20, 0x00, 0x00, 0xD8, 0x20, 0x00, 0x00, 0xEB, 0x20, 0x00, 0x00, + 0xFF, 0x20, 0x00, 0x00, 0x15, 0x21, 0x00, 0x00, 0x1C, 0x21, 0x00, 0x00, 0x21, 0x21, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, + 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00, 0x09, 0x00, 0x70, 0x65, 0x33, 0x32, 0x2E, 0x64, 0x6C, 0x6C, 0x00, 0x5F, 0x5F, 0x64, + 0x6C, 0x6C, 0x73, 0x74, 0x61, 0x72, 0x74, 0x40, 0x31, 0x32, 0x00, 0x5F, 0x5F, 0x66, 0x69, 0x6E, 0x69, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, + 0x65, 0x6E, 0x64, 0x00, 0x5F, 0x5F, 0x66, 0x69, 0x6E, 0x69, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x73, 0x74, 0x61, 0x72, 0x74, 0x00, 0x5F, + 0x5F, 0x69, 0x6E, 0x69, 0x74, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x65, 0x6E, 0x64, 0x00, 0x5F, 0x5F, 0x69, 0x6E, 0x69, 0x74, 0x5F, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x5F, 0x73, 0x74, 0x61, 0x72, 0x74, 0x00, 0x5F, 0x5F, 0x70, 0x72, 0x65, 0x69, 0x6E, 0x69, 0x74, 0x5F, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x5F, 0x65, 0x6E, 0x64, 0x00, 0x5F, 0x5F, 0x70, 0x72, 0x65, 0x69, 0x6E, 0x69, 0x74, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x00, 0x5F, 0x65, 0x64, 0x61, 0x74, 0x61, 0x00, 0x5F, 0x65, 0x6E, 0x64, 0x00, 0x5F, 0x65, 0x74, 0x65, 0x78, 0x74, 0x00, +}; + + +/* +tcc64 main.c -shared -nostdlib -DWIN64 -DIS_DLL -rdynamic -o pe64.dll + +int _dllstart() +{ + return 1; +} +*/ + +static unsigned char dll_64[2048] = { + 0x4D, 0x5A, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x1F, 0xBA, 0x0E, 0x00, 0xB4, 0x09, 0xCD, + 0x21, 0xB8, 0x01, 0x4C, 0xCD, 0x21, 0x54, 0x68, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6F, 0x67, 0x72, 0x61, 0x6D, 0x20, 0x63, 0x61, 0x6E, 0x6E, 0x6F, + 0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x69, 0x6E, 0x20, 0x44, 0x4F, 0x53, 0x20, 0x6D, 0x6F, 0x64, 0x65, 0x2E, 0x0D, 0x0D, 0x0A, + 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x45, 0x00, 0x00, 0x64, 0x86, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x2E, 0x22, 0x0B, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x3B, 0x33, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x20, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, + 0x2E, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0xC0, 0x2E, 0x70, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, + 0x0C, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x55, 0x48, 0x89, 0xE5, 0x48, 0x81, 0xEC, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x01, 0x00, 0x00, 0x00, + 0xE9, 0x00, 0x00, 0x00, 0x00, 0xC9, 0xC3, 0x00, 0x01, 0x04, 0x02, 0x05, 0x04, 0x03, 0x01, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x8C, 0x20, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x28, 0x20, 0x00, 0x00, + 0x50, 0x20, 0x00, 0x00, 0x78, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x40, 0x21, 0x00, 0x00, 0x20, 0x10, 0x00, 0x00, + 0x95, 0x20, 0x00, 0x00, 0xA6, 0x20, 0x00, 0x00, 0xB9, 0x20, 0x00, 0x00, 0xCA, 0x20, 0x00, 0x00, 0xDD, 0x20, 0x00, 0x00, 0xF1, 0x20, 0x00, 0x00, + 0x07, 0x21, 0x00, 0x00, 0x11, 0x21, 0x00, 0x00, 0x18, 0x21, 0x00, 0x00, 0x1D, 0x21, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, + 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00, 0x09, 0x00, 0x70, 0x65, 0x36, 0x34, 0x2E, 0x64, 0x6C, 0x6C, 0x00, 0x5F, 0x5F, 0x66, + 0x69, 0x6E, 0x69, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x65, 0x6E, 0x64, 0x00, 0x5F, 0x5F, 0x66, 0x69, 0x6E, 0x69, 0x5F, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x5F, 0x73, 0x74, 0x61, 0x72, 0x74, 0x00, 0x5F, 0x5F, 0x69, 0x6E, 0x69, 0x74, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x65, 0x6E, + 0x64, 0x00, 0x5F, 0x5F, 0x69, 0x6E, 0x69, 0x74, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x73, 0x74, 0x61, 0x72, 0x74, 0x00, 0x5F, 0x5F, 0x70, + 0x72, 0x65, 0x69, 0x6E, 0x69, 0x74, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x65, 0x6E, 0x64, 0x00, 0x5F, 0x5F, 0x70, 0x72, 0x65, 0x69, 0x6E, + 0x69, 0x74, 0x5F, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5F, 0x73, 0x74, 0x61, 0x72, 0x74, 0x00, 0x5F, 0x64, 0x6C, 0x6C, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x00, 0x5F, 0x65, 0x64, 0x61, 0x74, 0x61, 0x00, 0x5F, 0x65, 0x6E, 0x64, 0x00, 0x5F, 0x65, 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0B, 0x10, 0x00, 0x00, 0x17, 0x10, 0x00, 0x00, 0x18, 0x10, 0x00, 0x00, +}; + + +START_TEST(RtlImageDirectoryEntryToData) +{ + PVOID Ptr; + const BOOLEAN MappedAsImage = FALSE; + ULONG Size = 0x123; + + Ptr = RtlImageDirectoryEntryToData(dll_32, MappedAsImage, IMAGE_DIRECTORY_ENTRY_EXPORT, &Size); + ok_ptr(Ptr, dll_32 + 0x400); + ok_int(Size, 0x128); + + Size = 0x123; + Ptr = RtlImageDirectoryEntryToData(dll_64, MappedAsImage, IMAGE_DIRECTORY_ENTRY_EXPORT, &Size); + ok_ptr(Ptr, dll_64 + 0x400); + ok_int(Size, 0x124); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index fa8282ea5f4..a1de8c81629 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -62,6 +62,7 @@ extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlGetNtProductType(void); extern void func_RtlGetUnloadEventTrace(void); extern void func_RtlHandle(void); +extern void func_RtlImageDirectoryEntryToData(void); extern void func_RtlImageRvaToVa(void); extern void func_RtlIsNameLegalDOS8Dot3(void); extern void func_RtlMemoryStream(void); @@ -137,6 +138,7 @@ const struct test winetest_testlist[] = { "RtlGetNtProductType", func_RtlGetNtProductType }, { "RtlGetUnloadEventTrace", func_RtlGetUnloadEventTrace }, { "RtlHandle", func_RtlHandle }, + { "RtlImageDirectoryEntryToData", func_RtlImageDirectoryEntryToData }, { "RtlImageRvaToVa", func_RtlImageRvaToVa }, { "RtlIsNameLegalDOS8Dot3", func_RtlIsNameLegalDOS8Dot3 }, { "RtlMemoryStream", func_RtlMemoryStream },

4 years

[reactos] 01/01: [STORAHCI] Do not put the driver onto cd

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99f16dc8a7fb3f27b404a… commit 99f16dc8a7fb3f27b404ad3a61ef34e95f995dcd Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 18:06:42 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 18:06:42 2020 +0300 [STORAHCI] Do not put the driver onto cd Meanwhile, fix add_registry_inf usage (it is really a driver inf) --- boot/bootdata/txtsetup.sif | 1 - drivers/storage/port/storahci/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 2ddb0512ed3..2668740ff53 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -92,7 +92,6 @@ nmidebug.sys = 1,,,,,,x,4,,,,1,4 sacdrv.sys = 1,,,,,,x,4,,,,1,4 uniata.sys = 1,,,,,,x,4,,,,1,4 buslogic.sys = 1,,,,,,x,4,,,,1,4 -storahci.sys = 1,,,,,,x,4,,,,1,4 blue.sys = 1,,,,,,x,4,,,,1,4 vgafonts.cab = 1,,,,,,,1,,,,1,1 bootvid.dll = 1,,,,,,,2,,,,1,2 diff --git a/drivers/storage/port/storahci/CMakeLists.txt b/drivers/storage/port/storahci/CMakeLists.txt index 343f096d1d4..3dab8cbcdd6 100644 --- a/drivers/storage/port/storahci/CMakeLists.txt +++ b/drivers/storage/port/storahci/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(storahci MODULE ${SOURCE} storahci.rc) set_module_type(storahci kernelmodedriver) add_importlibs(storahci storport ntoskrnl hal) -add_cd_file(TARGET storahci DESTINATION reactos/system32/drivers NO_CAB FOR all) -add_registry_inf(storahci.inf) +#add_cd_file(TARGET storahci DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_driver_inf(storahci storahci.inf)

4 years

[reactos] 01/01: [CMAKE] Use C_STANDARD property instead of command line option

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16e5ce8fb1a2522c796cb… commit 16e5ce8fb1a2522c796cb05b4039274dd5649543 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 13:14:28 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 15:35:06 2020 +0300 [CMAKE] Use C_STANDARD property instead of command line option Addendum to 64211aa6964a8ca1627f2ce7244b8270003e6770 and 19779b3f96dd2905a09c827a871f32a9bfb431c6 --- drivers/filesystems/cdfs/CMakeLists.txt | 7 +------ drivers/filesystems/ext2/CMakeLists.txt | 5 ++--- drivers/filesystems/nfs/CMakeLists.txt | 5 +---- sdk/cmake/gcc.cmake | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 3e35991bfa0..552224c2058 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -36,11 +36,6 @@ add_library(cdfs MODULE ${SOURCE} cdfs.rc) set_module_type(cdfs kernelmodedriver) target_link_libraries(cdfs ${PSEH_LIB} memcmp) add_importlibs(cdfs ntoskrnl hal) +set_property(TARGET cdfs PROPERTY C_STANDARD 90) add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(cdfs_reg.inf) - -if (CLANG AND GCC) - # Make __inline work as expected - target_compile_options(cdfs PRIVATE -std=gnu89) -endif() - diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index dbd8cc84925..dadf04c06b7 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -113,9 +113,6 @@ if(CLANG) -Wno-unused-value -Wno-parentheses-equality -Wno-incompatible-pointer-types-discards-qualifiers "-Wno-#pragma-messages;-Wno-cast-calling-convention") - if (GCC) - target_compile_options(ext2fs PRIVATE -std=gnu89) - endif() endif() target_link_libraries(ext2fs memcmp ${PSEH_LIB}) @@ -123,6 +120,8 @@ add_definitions(-D__KERNEL__ -D_CRT_NO_POSIX_ERROR_CODES) set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) +set_property(TARGET ext2fs PROPERTY C_STANDARD 90) + if(NOT USE_CLANG_CL) # The fallback we have above prevents cl and clang-cl from using the same PCH add_pch(ext2fs inc/ext2fs.h SOURCE) diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 3d05ff676c6..91ad25761d0 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -18,11 +18,8 @@ if(GCC OR CLANG) target_compile_options(nfs41_driver PRIVATE "-Wno-switch") if(CLANG) target_compile_options(nfs41_driver PRIVATE "-Wno-unused-value") - if(GCC) - # When CLang mimicks GCC, it uses C17 as default, which breaks __inline - target_compile_options(nfs41_driver PRIVATE "-std=gnu89") - endif() endif() endif() +set_property(TARGET nfs41_driver PROPERTY C_STANDARD 90) add_cd_file(TARGET nfs41_driver DESTINATION reactos/system32/drivers FOR all) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index acde67d9203..938bc0e2454 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -53,7 +53,7 @@ if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options("$<$<COMPILE_LANGUAGE:C>:-Wold-style-declaration>") endif() else() - add_compile_options("$<$<COMPILE_LANGUAGE:C>:-std=gnu99;-Wno-microsoft>") + add_compile_options("$<$<COMPILE_LANGUAGE:C>:-Wno-microsoft>") add_compile_options(-Wno-pragma-pack) add_compile_options(-fno-associative-math) add_compile_options(-fcommon)

4 years

[reactos] 01/01: [NTOSKRNL:FSRTL] Fix memory corruption when pruning tunnel cache

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0db79d4aa9d625a91ddb6… commit 0db79d4aa9d625a91ddb6f9b3ff9f830cd796672 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 4 16:02:26 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Dec 4 16:08:14 2020 +0100 [NTOSKRNL:FSRTL] Fix memory corruption when pruning tunnel cache --- ntoskrnl/fsrtl/tunnel.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/fsrtl/tunnel.c b/ntoskrnl/fsrtl/tunnel.c index 7f40f466192..a14acc5e02a 100644 --- a/ntoskrnl/fsrtl/tunnel.c +++ b/ntoskrnl/fsrtl/tunnel.c @@ -42,7 +42,7 @@ FsRtlFreeTunnelNode( { if (PoolList) { - /* divert the linked list entry, it's not required anymore, but we need it */ + /* divert the linked list entry, it's not required anymore, but we need it */ InsertHeadList(PoolList, &CurEntry->TimerQueueEntry); return; } @@ -124,7 +124,8 @@ FsRtlPruneTunnelCache( /* If we have too many entries */ while (Cache->NumEntries > TunnelMaxEntries) { - CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + ASSERT(!IsListEmpty(&Cache->TimerQueue)); + CurEntry = CONTAINING_RECORD(Cache->TimerQueue.Flink, TUNNEL_NODE_ENTRY, TimerQueueEntry); FsRtlRemoveNodeFromTunnel(Cache, CurEntry, PoolList, &Rebalance); } } @@ -477,7 +478,7 @@ FsRtlAddToTunnelCache(IN PTUNNEL Cache, RtlInsertAsRightChild(RtlParent(CurEntry), NodeEntry); } } - + /* remove entry */ RemoveEntryList(&((PTUNNEL_NODE_ENTRY)CurEntry)->TimerQueueEntry);

4 years

[reactos] 01/01: [BTRFS] Fix wrong condition check

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ec3e1a7f6e810b10862f… commit 3ec3e1a7f6e810b10862ffc329795217a04f4aec Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 4 15:44:11 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Dec 4 15:49:39 2020 +0100 [BTRFS] Fix wrong condition check --- drivers/filesystems/btrfs/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/btrfs/security.c b/drivers/filesystems/btrfs/security.c index 7f429e27274..f6769d05606 100644 --- a/drivers/filesystems/btrfs/security.c +++ b/drivers/filesystems/btrfs/security.c @@ -180,7 +180,7 @@ void add_group_mapping(WCHAR* sidstring, ULONG sidstringlength, uint32_t gid) { while (sidstringlength > 0) { val = 0; i = 0; - while (sidstring[i] != '-' && i < sidstringlength) { + while (i < sidstringlength && sidstring[i] != '-') { if (sidstring[i] >= '0' && sidstring[i] <= '9') { val *= 10; val += sidstring[i] - '0';

4 years

[reactos] 01/01: [CMAKE] Our C code base is C99, so mark it as such.

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19779b3f96dd2905a09c8… commit 19779b3f96dd2905a09c827a871f32a9bfb431c6 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 20:42:22 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 20:42:41 2020 +0100 [CMAKE] Our C code base is C99, so mark it as such. This fixes 64211aa6964a8ca1627f2ce7244b8270003e6770, which mistakenly declared C11 as default. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e60e3fae3e..b91387178d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) set(CMAKE_POSITION_INDEPENDENT_CODE OFF) -set(CMAKE_C_STANDARD 11) +set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 11) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)

4 years

[reactos] 01/01: [DDK] Use FORCEINLINE instead of __inline, as in other DDK headers

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06a6eda0a16fbf45886d1… commit 06a6eda0a16fbf45886d1d02aa87201a237b9463 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 18:55:29 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 18:56:02 2020 +0100 [DDK] Use FORCEINLINE instead of __inline, as in other DDK headers --- sdk/include/ddk/classpnp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ddk/classpnp.h b/sdk/include/ddk/classpnp.h index e8fda74498f..65cd35fe81f 100644 --- a/sdk/include/ddk/classpnp.h +++ b/sdk/include/ddk/classpnp.h @@ -1432,7 +1432,7 @@ ClassSendNotification( #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ -__inline +FORCEINLINE UCHAR GET_FDO_EXTENSON_SENSE_DATA_LENGTH ( _In_ PFUNCTIONAL_DEVICE_EXTENSION FdoExtension)

4 years

[reactos] 03/03: [UMPNPMGR] Remove invalid prototype of inline function

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b483be4af27c43f76da3c… commit b483be4af27c43f76da3c087a2e2ce9746e34012 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 18:45:41 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 18:51:42 2020 +0100 [UMPNPMGR] Remove invalid prototype of inline function This fixes eede1b9b7a258a9094cafef5615b9ed8c3877081. --- base/services/umpnpmgr/precomp.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/base/services/umpnpmgr/precomp.h b/base/services/umpnpmgr/precomp.h index d24a760884a..82035203441 100644 --- a/base/services/umpnpmgr/precomp.h +++ b/base/services/umpnpmgr/precomp.h @@ -53,10 +53,6 @@ extern HANDLE hDeviceInstallListNotEmpty; BOOL SetupIsActive(VOID); -FORCEINLINE -BOOL -IsUISuppressionAllowed(VOID); - DWORD WINAPI DeviceInstallThread(

4 years

[reactos] 02/03: [CMAKE] Declare that we want to use C11/C++11

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64211aa6964a8ca1627f2… commit 64211aa6964a8ca1627f2ce7244b8270003e6770 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 18:48:36 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 18:51:42 2020 +0100 [CMAKE] Declare that we want to use C11/C++11 That way, we won't use whatever standard is the default on whatever compiler we are using. This should also prevent using more recent features without warning. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3dff10c6c1..3e60e3fae3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) set(CMAKE_POSITION_INDEPENDENT_CODE OFF) +set(CMAKE_C_STANDARD 11) +set(CMAKE_CXX_STANDARD 11) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) if(NOT ARCH)

4 years

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 December 2020