Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems.
by Hermès Bélusca-Maïto 18 Sep '19

18 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e18e7b100c236835ffa6c… commit e18e7b100c236835ffa6ca06114a5c8551becec5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 18 02:42:56 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 02:42:56 2019 +0200 [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 25 ++++++++++++++++++------- boot/freeldr/freeldr/disk/scsiport.c | 25 ++++++++++++++++++------- boot/freeldr/freeldr/lib/fs/btrfs.c | 19 ++++++++++++++----- boot/freeldr/freeldr/lib/fs/ext2.c | 21 ++++++++++++++------- boot/freeldr/freeldr/lib/fs/fat.c | 21 +++++++++++++++------ boot/freeldr/freeldr/lib/fs/iso.c | 21 +++++++++++++++------ boot/freeldr/freeldr/lib/fs/ntfs.c | 21 ++++++++++++++------- 7 files changed, 108 insertions(+), 45 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index ef13c24bbe4..d67494d508d 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -206,18 +206,29 @@ static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - ULONGLONG SectorNumber; + LARGE_INTEGER NewPosition = *Position; - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->LowPart & (Context->SectorSize - 1)) + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (Context->SectorNumber * Context->SectorSize); + break; + default: + ASSERT(FALSE); + return EINVAL; + } + + if (NewPosition.QuadPart & (Context->SectorSize - 1)) return EINVAL; - SectorNumber = Position->QuadPart / Context->SectorSize; - if (SectorNumber >= Context->SectorCount) + /* Convert in number of sectors */ + NewPosition.QuadPart /= Context->SectorSize; + if (NewPosition.QuadPart >= Context->SectorCount) return EINVAL; - Context->SectorNumber = SectorNumber; + Context->SectorNumber = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 92b032ea574..6cb204d4c31 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -373,18 +373,29 @@ static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - ULONGLONG SectorNumber; + LARGE_INTEGER NewPosition = *Position; - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->QuadPart & (Context->SectorSize - 1)) + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (Context->SectorNumber * Context->SectorSize); + break; + default: + ASSERT(FALSE); + return EINVAL; + } + + if (NewPosition.QuadPart & (Context->SectorSize - 1)) return EINVAL; - SectorNumber = Position->QuadPart / Context->SectorSize; - if (SectorNumber >= Context->SectorCount) + /* Convert in number of sectors */ + NewPosition.QuadPart /= Context->SectorSize; + if (NewPosition.QuadPart >= Context->SectorCount) return EINVAL; - Context->SectorNumber = SectorNumber; + Context->SectorNumber = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 6ba632e0a40..2b88d6f6b39 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -1201,15 +1201,24 @@ ARC_STATUS BtrFsRead(ULONG FileId, VOID *Buffer, ULONG Size, ULONG *BytesRead) ARC_STATUS BtrFsSeek(ULONG FileId, LARGE_INTEGER *Position, SEEKMODE SeekMode) { pbtrfs_file_info phandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("BtrFsSeek %lu NewFilePointer = %llu\n", FileId, Position->QuadPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += phandle->position; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->QuadPart >= phandle->inode.size) + if (NewPosition.QuadPart >= phandle->inode.size) return EINVAL; - phandle->position = Position->QuadPart; + phandle->position = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index d5a4d92b456..9d183488d68 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -1263,17 +1263,24 @@ ARC_STATUS Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS Ext2Seek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("Ext2Seek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) - return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.QuadPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 7dad4f2f516..f16f03a57e1 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -1485,17 +1485,26 @@ ARC_STATUS FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS FatSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("FatSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (ULONGLONG)FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) + if (NewPosition.HighPart != 0) return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.LowPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.LowPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index 6e8d0df2a02..6c08d32a0e9 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -462,17 +462,26 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS IsoSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("IsoSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (ULONGLONG)FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) + if (NewPosition.HighPart != 0) return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.LowPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.LowPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index e6f7b2531b9..bc2e6bfee86 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -846,17 +846,24 @@ ARC_STATUS NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS NtfsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("NtfsSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += FileHandle->Offset; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) - return EINVAL; - if (Position->LowPart >= (ULONG)NtfsGetAttributeSize(&FileHandle->DataContext->Record)) + if (NewPosition.QuadPart >= NtfsGetAttributeSize(&FileHandle->DataContext->Record)) return EINVAL; - FileHandle->Offset = Position->LowPart; + FileHandle->Offset = NewPosition.QuadPart; return ESUCCESS; }

1 0

[reactos] 01/01: [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems.
by Hermès Bélusca-Maïto 18 Sep '19

18 Sep '19

1 0

[reactos] 01/01: [DLLEXPORT_TEST] Fix duplicated export on non-x86 architectures
by Timo Kreuzer 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eaf24cc380a66bf8c1cb2… commit eaf24cc380a66bf8c1cb2439da225b351e0b482d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 28 16:34:33 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 8 16:59:57 2019 +0200 [DLLEXPORT_TEST] Fix duplicated export on non-x86 architectures --- modules/rostests/tests/dllexport/dllexport_test_dll1.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/tests/dllexport/dllexport_test_dll1.spec b/modules/rostests/tests/dllexport/dllexport_test_dll1.spec index 2a8d06cd340..dfe635f1aeb 100644 --- a/modules/rostests/tests/dllexport/dllexport_test_dll1.spec +++ b/modules/rostests/tests/dllexport/dllexport_test_dll1.spec @@ -12,8 +12,8 @@ @ stdcall StdcallFunc1(ptr) # Decorated export of a stdcall function - @ stdcall _StdcallFunc1@4(ptr) - @ stdcall -arch=i386 _DecoratedStdcallFunc1@4(ptr) + @ stdcall -arch=i386 _StdcallFunc1@4(ptr) # Reuse function name on x86 only! + @ stdcall _DecoratedStdcallFunc1@4(ptr) # Redirected stdcall function @ stdcall StdcallFunc2(ptr) StdcallFunc1

1 0

[reactos] 03/03: [IPHLPAPI] Simplify spec file
by Timo Kreuzer 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=175abab7adab9db5a6e36… commit 175abab7adab9db5a6e36a34b9d6f89ffbc51d6a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 25 11:44:43 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 8 16:23:46 2019 +0200 [IPHLPAPI] Simplify spec file Also move the exports where they are on Windows. This was already handled correctly by MSVC and still doesn't fix the order on GCC builds, but that is a different story and shall be addressed at a different time. --- dll/win32/iphlpapi/iphlpapi.spec | 53 ++++++++++++---------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi.spec b/dll/win32/iphlpapi/iphlpapi.spec index d9a20667939..6d186f35152 100644 --- a/dll/win32/iphlpapi/iphlpapi.spec +++ b/dll/win32/iphlpapi/iphlpapi.spec @@ -116,6 +116,22 @@ @ stdcall NotifyRouteChange( ptr ptr ) @ stub NotifyRouteChangeEx @ stub NotifySecurityHealthChange +@ stdcall _PfAddFiltersToInterface@24() +@ stdcall _PfAddGlobalFilterToInterface@8() +@ stdcall _PfBindInterfaceToIPAddress@12() +@ stdcall _PfBindInterfaceToIndex@16() +@ stdcall _PfCreateInterface@24() +@ stdcall _PfDeleteInterface@4() +@ stdcall _PfDeleteLog@0() +@ stdcall _PfGetInterfaceStatistics@16() +@ stdcall _PfMakeLog@4() +@ stdcall _PfRebindFilters@8() +@ stdcall _PfRemoveFilterHandles@12() +@ stdcall _PfRemoveFiltersFromInterface@20() +@ stdcall _PfRemoveGlobalFilterFromInterface@8() +@ stdcall _PfSetLogBuffer@28() +@ stdcall _PfTestPacket@20() +@ stdcall _PfUnBindInterface@4() @ stdcall RestoreMediaSense(ptr ptr) @ stdcall SendARP(long long ptr ptr) @ stub SetAdapterIpAddress @@ -136,43 +152,6 @@ @ stdcall SetTcpEntry( ptr ) @ stub SetTcpEntryToStack @ stdcall UnenableRouter( ptr ptr ) - -# These are actually stubs, but we need to forward them to preserve the decoration. -@ stdcall -arch=i386 _PfAddFiltersToInterface@24() _PfAddFiltersToInterface@24 -@ stdcall -arch=i386 _PfAddGlobalFilterToInterface@8() _PfAddGlobalFilterToInterface@8 -@ stdcall -arch=i386 _PfBindInterfaceToIPAddress@12() _PfBindInterfaceToIPAddress@12 -@ stdcall -arch=i386 _PfBindInterfaceToIndex@16() _PfBindInterfaceToIndex@16 -@ stdcall -arch=i386 _PfCreateInterface@24() _PfCreateInterface@24 -@ stdcall -arch=i386 _PfDeleteInterface@4() _PfDeleteInterface@4 -@ stdcall -arch=i386 _PfDeleteLog@0() _PfDeleteLog@0 -@ stdcall -arch=i386 _PfGetInterfaceStatistics@16() _PfGetInterfaceStatistics@16 -@ stdcall -arch=i386 _PfMakeLog@4() _PfMakeLog@4 -@ stdcall -arch=i386 _PfRebindFilters@8() _PfRebindFilters@8 -@ stdcall -arch=i386 _PfRemoveFilterHandles@12() _PfRemoveFilterHandles@12 -@ stdcall -arch=i386 _PfRemoveFiltersFromInterface@20() _PfRemoveFiltersFromInterface@20 -@ stdcall -arch=i386 _PfRemoveGlobalFilterFromInterface@8() _PfRemoveGlobalFilterFromInterface@8 -@ stdcall -arch=i386 _PfSetLogBuffer@28() _PfSetLogBuffer@28 -@ stdcall -arch=i386 _PfTestPacket@20() _PfTestPacket@20 -@ stdcall -arch=i386 _PfUnBindInterface@4() _PfUnBindInterface@4 - -# x64 does not use decoration in these names -@ stdcall -arch=x86_64 _PfAddFiltersToInterface@24() -@ stdcall -arch=x86_64 _PfAddGlobalFilterToInterface@8() -@ stdcall -arch=x86_64 _PfBindInterfaceToIPAddress@12() -@ stdcall -arch=x86_64 _PfBindInterfaceToIndex@16() -@ stdcall -arch=x86_64 _PfCreateInterface@24() -@ stdcall -arch=x86_64 _PfDeleteInterface@4() -@ stdcall -arch=x86_64 _PfDeleteLog@0() -@ stdcall -arch=x86_64 _PfGetInterfaceStatistics@16() -@ stdcall -arch=x86_64 _PfMakeLog@4() -@ stdcall -arch=x86_64 _PfRebindFilters@8() -@ stdcall -arch=x86_64 _PfRemoveFilterHandles@12() -@ stdcall -arch=x86_64 _PfRemoveFiltersFromInterface@20() -@ stdcall -arch=x86_64 _PfRemoveGlobalFilterFromInterface@8() -@ stdcall -arch=x86_64 _PfSetLogBuffer@28() -@ stdcall -arch=x86_64 _PfTestPacket@20() -@ stdcall -arch=x86_64 _PfUnBindInterface@4() - @ stub do_echo_rep @ stub do_echo_req @ stub register_icmp

1 0

[reactos] 02/03: [IPHLPAPI] Improve function stubs
by Timo Kreuzer 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76eed61813a573126c926… commit 76eed61813a573126c926ddc64abe595b74c2525 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 29 17:59:26 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 8 16:23:46 2019 +0200 [IPHLPAPI] Improve function stubs --- dll/win32/iphlpapi/iphlpapi_fakestubs.c | 196 +++++++++++++++++++++----------- 1 file changed, 128 insertions(+), 68 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_fakestubs.c b/dll/win32/iphlpapi/iphlpapi_fakestubs.c index 8304b33ffc8..04871374e24 100644 --- a/dll/win32/iphlpapi/iphlpapi_fakestubs.c +++ b/dll/win32/iphlpapi/iphlpapi_fakestubs.c @@ -1,120 +1,180 @@ -#include <stubs.h> -// These are here so we can forward the decorated export functions. -// Without forwarding, we'll lose the decoration +// These are here so we can get the decorated export functions. +// With autogenerated stubs we'll lose the decoration // See: // https://jira.reactos.org/browse/CORE-8462 // https://jira.reactos.org/browse/CORE-15665 -int __stdcall PfAddFiltersToInterface(long a0, long a1, long a2, long a3, long a4, long a5) +#include <config.h> +#include "iphlpapi_private.h" +#include <fltdefs.h> + +WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); + +DWORD +WINAPI +PfAddFiltersToInterface( + INTERFACE_HANDLE ih, + DWORD cInFilters, + PPF_FILTER_DESCRIPTOR pfiltIn, + DWORD cOutFilters, + PPF_FILTER_DESCRIPTOR pfiltOut, + PFILTER_HANDLE pfHandle) { - DbgPrint("WARNING: calling stub PfAddFiltersToInterface(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4, (long)a5); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfAddGlobalFilterToInterface(long a0, long a1) +DWORD +PFEXPORT +WINAPI +PfAddGlobalFilterToInterface( + INTERFACE_HANDLE pInterface, + GLOBAL_FILTER gfFilter) { - DbgPrint("WARNING: calling stub PfAddGlobalFilterToInterface(0x%lx,0x%lx)\n", (long)a0, (long)a1); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfBindInterfaceToIPAddress(long a0, long a1, long a2) +PFAPIENTRY +PfBindInterfaceToIPAddress( + INTERFACE_HANDLE pInterface, + PFADDRESSTYPE pfatType, + PBYTE IPAddress) { - DbgPrint("WARNING: calling stub PfBindInterfaceToIPAddress(0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfBindInterfaceToIndex(long a0, long a1, long a2, long a3) +PFAPIENTRY +PfBindInterfaceToIndex( + INTERFACE_HANDLE pInterface, + DWORD dwIndex, + PFADDRESSTYPE pfatLinkType, + PBYTE LinkIPAddress) { - DbgPrint("WARNING: calling stub PfBindInterfaceToIndex(0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfCreateInterface(long a0, long a1, long a2, long a3, long a4, long a5) +PFAPIENTRY +PfCreateInterface( + DWORD dwName, + PFFORWARD_ACTION inAction, + PFFORWARD_ACTION outAction, + BOOL bUseLog, + BOOL bMustBeUnique, + INTERFACE_HANDLE* ppInterface) { - DbgPrint("WARNING: calling stub PfCreateInterface(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4, (long)a5); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfDeleteInterface(long a0) +PFAPIENTRY +PfDeleteInterface( + INTERFACE_HANDLE pInterface) { - DbgPrint("WARNING: calling stub PfDeleteInterface(0x%lx)\n", (long)a0); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfDeleteLog() +PFAPIENTRY +PfDeleteLog( + VOID) { - DbgPrint("WARNING: calling stub PfDeleteLog()\n"); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfGetInterfaceStatistics(long a0, long a1, long a2, long a3) +PFAPIENTRY +PfGetInterfaceStatistics( + INTERFACE_HANDLE pInterface, + PPF_INTERFACE_STATS ppfStats, + PDWORD pdwBufferSize, + BOOL fResetCounters) { - DbgPrint("WARNING: calling stub PfGetInterfaceStatistics(0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfMakeLog(long a0) +PFAPIENTRY +PfMakeLog( + HANDLE hEvent) { - DbgPrint("WARNING: calling stub PfMakeLog(0x%lx)\n", (long)a0); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfRebindFilters(long a0, long a1) +PFAPIENTRY +PfRebindFilters( + INTERFACE_HANDLE pInterface, + PPF_LATEBIND_INFO pLateBindInfo) { - DbgPrint("WARNING: calling stub PfRebindFilters(0x%lx,0x%lx)\n", (long)a0, (long)a1); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfRemoveFilterHandles(long a0, long a1, long a2) +PFAPIENTRY +PfRemoveFilterHandles( + INTERFACE_HANDLE pInterface, + DWORD cFilters, + PFILTER_HANDLE pvHandles) { - DbgPrint("WARNING: calling stub PfRemoveFilterHandles(0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfRemoveFiltersFromInterface(long a0, long a1, long a2, long a3, long a4) +PFAPIENTRY +PfRemoveFiltersFromInterface( + INTERFACE_HANDLE ih, + DWORD cInFilters, + PPF_FILTER_DESCRIPTOR pfiltIn, + DWORD cOutFilters, + PPF_FILTER_DESCRIPTOR pfiltOut) { - DbgPrint("WARNING: calling stub PfRemoveFiltersFromInterface(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfRemoveGlobalFilterFromInterface(long a0, long a1) +PFAPIENTRY +PfRemoveGlobalFilterFromInterface( + INTERFACE_HANDLE pInterface, + GLOBAL_FILTER gfFilter) { - DbgPrint("WARNING: calling stub PfRemoveGlobalFilterFromInterface(0x%lx,0x%lx)\n", (long)a0, (long)a1); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfSetLogBuffer(long a0, long a1, long a2, long a3, long a4, long a5, long a6) +PFAPIENTRY +PfSetLogBuffer( + PBYTE pbBuffer, + DWORD dwSize, + DWORD dwThreshold, + DWORD dwEntries, + PDWORD pdwLoggedEntries, + PDWORD pdwLostEntries, + PDWORD pdwSizeUsed) { - DbgPrint("WARNING: calling stub PfSetLogBuffer(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4, (long)a5, (long)a6); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfTestPacket(long a0, long a1, long a2, long a3, long a4) +PFAPIENTRY +PfTestPacket( + INTERFACE_HANDLE pInInterface OPTIONAL, + INTERFACE_HANDLE pOutInterface OPTIONAL, + DWORD cBytes, + PBYTE pbPacket, + PPFFORWARD_ACTION ppAction) { - DbgPrint("WARNING: calling stub PfTestPacket(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -int __stdcall PfUnBindInterface(long a0) +PFAPIENTRY +PfUnBindInterface( + INTERFACE_HANDLE pInterface) { - DbgPrint("WARNING: calling stub PfUnBindInterface(0x%lx)\n", (long)a0); - __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); - return 0; + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } -

1 0

[reactos] 01/03: [PSDK] Add fltdefs.h
by Timo Kreuzer 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2adbfdf6cdb3fb1d02f61… commit 2adbfdf6cdb3fb1d02f61f6a12ded2320c663a0b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 29 17:57:01 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 8 16:23:46 2019 +0200 [PSDK] Add fltdefs.h --- sdk/include/psdk/fltdefs.h | 261 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+) diff --git a/sdk/include/psdk/fltdefs.h b/sdk/include/psdk/fltdefs.h new file mode 100644 index 00000000000..673db5205a0 --- /dev/null +++ b/sdk/include/psdk/fltdefs.h @@ -0,0 +1,261 @@ +/* + * fltdefs.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Timo Kreuzer. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#ifndef _FLTDEFS_H +#define _FLTDEFS_H + +#pragma once + +#ifdef __cplusplus +#define EXTERNCDECL EXTERN_C +#else +#define EXTERNCDECL +#endif + +#ifdef _M_CEE_PURE +#define PFEXPORT +#else +#define PFEXPORT /* __declspec(dllexport) Native headers have this, but this breaks exports with GCC! */ +#endif + +#define PFAPIENTRY EXTERNCDECL DWORD PFEXPORT WINAPI + +#define ERROR_BASE 23000 +#define PFERROR_NO_PF_INTERFACE (ERROR_BASE + 0) +#define PFERROR_NO_FILTERS_GIVEN (ERROR_BASE + 1) +#define PFERROR_BUFFER_TOO_SMALL (ERROR_BASE + 2) +#define ERROR_IPV6_NOT_IMPLEMENTED (ERROR_BASE + 3) + +#define FD_FLAGS_NOSYN 0x1 +#define FD_FLAGS_ALLFLAGS FD_FLAGS_NOSYN + +#define FILTER_PROTO(ProtoId) MAKELONG(MAKEWORD((ProtoId), 0x00), 0x00000) +#define FILTER_PROTO_ANY FILTER_PROTO(0x00) +#define FILTER_PROTO_ICMP FILTER_PROTO(0x01) +#define FILTER_PROTO_TCP FILTER_PROTO(0x06) +#define FILTER_PROTO_UDP FILTER_PROTO(0x11) + +#define FILTER_TCPUDP_PORT_ANY ((WORD)0x0000) +#define FILTER_ICMP_TYPE_ANY ((BYTE)0xff) +#define FILTER_ICMP_CODE_ANY ((BYTE)0xff) + +#define LB_SRC_ADDR_USE_SRCADDR_FLAG 0x00000001 +#define LB_SRC_ADDR_USE_DSTADDR_FLAG 0x00000002 +#define LB_DST_ADDR_USE_SRCADDR_FLAG 0x00000004 +#define LB_DST_ADDR_USE_DSTADDR_FLAG 0x00000008 +#define LB_SRC_MASK_LATE_FLAG 0x00000010 +#define LB_DST_MASK_LATE_FLAG 0x00000020 + +typedef PVOID FILTER_HANDLE, * PFILTER_HANDLE; +typedef PVOID INTERFACE_HANDLE, * PINTERFACE_HANDLE; + +typedef enum _GlobalFilter +{ + GF_FRAGMENTS = 2, + GF_STRONGHOST = 8, + GF_FRAGCACHE = 9 +} GLOBAL_FILTER, *PGLOBAL_FILTER; + +typedef enum _PfAddresType +{ + PF_IPV4, + PF_IPV6 +} PFADDRESSTYPE, *PPFADDRESSTYPE; + +typedef enum _PfForwardAction +{ + PF_ACTION_FORWARD = 0, + PF_ACTION_DROP +} PFFORWARD_ACTION, *PPFFORWARD_ACTION; + +typedef enum _PfFrameType +{ + PFFT_FILTER = 1, + PFFT_FRAG = 2, + PFFT_SPOOF = 3 +} PFFRAMETYPE, *PPFFRAMETYPE; + +typedef struct _pfLogFrame +{ + LARGE_INTEGER Timestamp; + PFFRAMETYPE pfeTypeOfFrame; + DWORD dwTotalSizeUsed; + DWORD dwFilterRule; + WORD wSizeOfAdditionalData; + WORD wSizeOfIpHeader; + DWORD dwInterfaceName; + DWORD dwIPIndex; + BYTE bPacketData[1]; +} PFLOGFRAME, *PPFLOGFRAME; + +typedef struct _PF_FILTER_DESCRIPTOR +{ + DWORD dwFilterFlags; + DWORD dwRule; + PFADDRESSTYPE pfatType; + PBYTE SrcAddr; + PBYTE SrcMask; + PBYTE DstAddr; + PBYTE DstMask; + DWORD dwProtocol; + DWORD fLateBound; + WORD wSrcPort; + WORD wDstPort; + WORD wSrcPortHighRange; + WORD wDstPortHighRange; +} PF_FILTER_DESCRIPTOR, *PPF_FILTER_DESCRIPTOR; + +#define FILTERSIZE (sizeof(PF_FILTER_DESCRIPTOR) - (DWORD)FIELD_OFFSET(PF_FILTER_DESCRIPTOR, SrcAddr)) + +typedef struct _PF_FILTER_STATS +{ + DWORD dwNumPacketsFiltered; + PF_FILTER_DESCRIPTOR info; +} PF_FILTER_STATS, *PPF_FILTER_STATS; + +typedef struct _PF_INTERFACE_STATS +{ + PVOID pvDriverContext; + DWORD dwFlags; + DWORD dwInDrops; + DWORD dwOutDrops; + PFFORWARD_ACTION eaInAction; + PFFORWARD_ACTION eaOutAction; + DWORD dwNumInFilters; + DWORD dwNumOutFilters; + DWORD dwFrag; + DWORD dwSpoof; + DWORD dwReserved1; + DWORD dwReserved2; + LARGE_INTEGER liSYN; + LARGE_INTEGER liTotalLogged; + DWORD dwLostLogEntries; + PF_FILTER_STATS FilterInfo[1]; +} PF_INTERFACE_STATS, *PPF_INTERFACE_STATS; + +typedef struct _PF_LATEBIND_INFO +{ + PBYTE SrcAddr; + PBYTE DstAddr; + PBYTE Mask; +} PF_LATEBIND_INFO, *PPF_LATEBIND_INFO; + +PFAPIENTRY +PfAddFiltersToInterface( + INTERFACE_HANDLE ih, + DWORD cInFilters, + PPF_FILTER_DESCRIPTOR pfiltIn, + DWORD cOutFilters, + PPF_FILTER_DESCRIPTOR pfiltOut, + PFILTER_HANDLE pfHandle); + +PFAPIENTRY +PfAddGlobalFilterToInterface( + INTERFACE_HANDLE pInterface, + GLOBAL_FILTER gfFilter); + +PFAPIENTRY +PfBindInterfaceToIPAddress( + INTERFACE_HANDLE pInterface, + PFADDRESSTYPE pfatType, + PBYTE IPAddress); + +PFAPIENTRY +PfBindInterfaceToIndex( + INTERFACE_HANDLE pInterface, + DWORD dwIndex, + PFADDRESSTYPE pfatLinkType, + PBYTE LinkIPAddress); + +PFAPIENTRY +PfCreateInterface( + DWORD dwName, + PFFORWARD_ACTION inAction, + PFFORWARD_ACTION outAction, + BOOL bUseLog, + BOOL bMustBeUnique, + INTERFACE_HANDLE* ppInterface); + +PFAPIENTRY +PfDeleteInterface( + INTERFACE_HANDLE pInterface); + +PFAPIENTRY +PfDeleteLog( + VOID); + +PFAPIENTRY +PfGetInterfaceStatistics( + INTERFACE_HANDLE pInterface, + PPF_INTERFACE_STATS ppfStats, + PDWORD pdwBufferSize, + BOOL fResetCounters); + +PFAPIENTRY +PfMakeLog( + HANDLE hEvent); + +PFAPIENTRY +PfRebindFilters( + INTERFACE_HANDLE pInterface, + PPF_LATEBIND_INFO pLateBindInfo); + +PFAPIENTRY +PfRemoveFilterHandles( + INTERFACE_HANDLE pInterface, + DWORD cFilters, + PFILTER_HANDLE pvHandles); + +PFAPIENTRY +PfRemoveFiltersFromInterface( + INTERFACE_HANDLE ih, + DWORD cInFilters, + PPF_FILTER_DESCRIPTOR pfiltIn, + DWORD cOutFilters, + PPF_FILTER_DESCRIPTOR pfiltOut); + +PFAPIENTRY +PfRemoveGlobalFilterFromInterface( + INTERFACE_HANDLE pInterface, + GLOBAL_FILTER gfFilter); + +PFAPIENTRY +PfSetLogBuffer( + PBYTE pbBuffer, + DWORD dwSize, + DWORD dwThreshold, + DWORD dwEntries, + PDWORD pdwLoggedEntries, + PDWORD pdwLostEntries, + PDWORD pdwSizeUsed); + +PFAPIENTRY +PfTestPacket( + INTERFACE_HANDLE pInInterface OPTIONAL, + INTERFACE_HANDLE pOutInterface OPTIONAL, + DWORD cBytes, + PBYTE pbPacket, + PPFFORWARD_ACTION ppAction); + +PFAPIENTRY +PfUnBindInterface( + INTERFACE_HANDLE pInterface); + +#endif // _FLTDEFS_H

1 0

[reactos] 01/01: [SETUP] Add support for archtitcure specific inf sections and use it for x64 computer type
by Timo Kreuzer 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85616bc8b2dad302417d3… commit 85616bc8b2dad302417d32ee3cac8933ed47cd6d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 27 09:56:37 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 8 10:42:16 2019 +0200 [SETUP] Add support for archtitcure specific inf sections and use it for x64 computer type --- base/setup/lib/settings.c | 54 ++++++++++++++++++++++++++++++++++------------ boot/bootdata/txtsetup.sif | 14 ++++++++++-- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index 2d1c4e1c349..cafe247c05c 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -433,16 +433,18 @@ DefaultProcessEntry( } -PGENERIC_LIST -CreateComputerTypeList( - IN HINF InfFile) +BOOLEAN +AddComputerTypeEntries( + _In_ HINF InfFile, + PGENERIC_LIST List, + _In_ PWSTR SectionName) { - PGENERIC_LIST List; INFCONTEXT Context; PCWSTR KeyName; PCWSTR KeyValue; WCHAR ComputerIdentifier[128]; WCHAR ComputerKey[32]; + ULONG Count1, Count2; /* Get the computer identification */ if (!GetComputerIdentifier(ComputerIdentifier, 128)) @@ -453,10 +455,10 @@ CreateComputerTypeList( DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); /* Search for matching device identifier */ - if (!SpInfFindFirstLine(InfFile, L"Map.Computer", NULL, &Context)) + if (!SpInfFindFirstLine(InfFile, SectionName, NULL, &Context)) { /* FIXME: error message */ - return NULL; + return FALSE; } do @@ -467,7 +469,7 @@ CreateComputerTypeList( { /* FIXME: Handle error! */ DPRINT("INF_GetDataField() failed\n"); - return NULL; + return FALSE; } DPRINT("KeyValue: %S\n", KeyValue); @@ -481,7 +483,7 @@ CreateComputerTypeList( { /* FIXME: Handle error! */ DPRINT("INF_GetDataField() failed\n"); - return NULL; + return FALSE; } DPRINT("Computer key: %S\n", KeyName); @@ -489,16 +491,40 @@ CreateComputerTypeList( INF_FreeData(KeyName); } while (SpInfFindNextLine(&Context, &Context)); + Count1 = AddEntriesFromInfSection(List, + InfFile, + L"Computer", + &Context, + DefaultProcessEntry, + ComputerKey); + Count2 = AddEntriesFromInfSection(List, + InfFile, + L"Computer.NT" INF_ARCH, + &Context, + DefaultProcessEntry, + ComputerKey); + if ((Count1 == -1) && (Count2 == -1)) + { + return FALSE; + } + + return TRUE; +} + +PGENERIC_LIST +CreateComputerTypeList( + IN HINF InfFile) +{ + PGENERIC_LIST List; + BOOLEAN Success; + List = CreateGenericList(); if (List == NULL) return NULL; - if (AddEntriesFromInfSection(List, - InfFile, - L"Computer", - &Context, - DefaultProcessEntry, - ComputerKey) == -1) + Success = AddComputerTypeEntries(InfFile, List, L"Map.Computer"); + Success |= AddComputerTypeEntries(InfFile, List, L"Map.Computer.NT" INF_ARCH); + if (!Success) { DestroyGenericList(List, TRUE); return NULL; diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 8b662ef7177..82247b5a154 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -220,14 +220,17 @@ UnicodeCasetable = l_intl.nls DefaultLayout = 00000409 DefaultLanguage = 00000409 -[Computer] +[Computer.NTx86] pci_up = "Standard PC Uniprocessor" ;pci_mp = "Standard PC Multiprocessor" acpi_up = "ACPI PC Uniprocessor" ;acpi_mp = "ACPI PC Multiprocessor" xbox = "Original Xbox" -[Map.Computer] +[Computer.NTamd64] +x64_up = "Standard x64 Uniprocessor" + +[Map.Computer.NTx86] ;<id> = <pnp id string> pci_up = "PC UP" ;pci_mp = "PC MP" @@ -235,6 +238,9 @@ acpi_up = "ACPI UP" ;acpi_mp = "ACPI MP" xbox = "Xbox" +[Map.Computer.NTamd64] +x64_up = "ACPI UP" + [Files.pci_up] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 hal.dll = 1,,,,,,,2,,,,1,2 @@ -255,6 +261,10 @@ halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 ntoskrnl.exe = 1,,,,,,,2,,,,1,2 halxbox.dll = 1,,,,,,,2,,,hal.dll,1,2 +[Files.x64_up] +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +hal.dll = 1,,,,,,,2,,,,1,2 + [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<height>,<width>,<bpp> vga = "VGA Display (640x480x4)",,Vga,640,480,4

1 0

[reactos] 01/01: [UNIATA] Fix uniata on x64
by Timo Kreuzer 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a71a6531ef157fb39d291… commit a71a6531ef157fb39d29171cff6fc59a47e2c4be Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 8 12:29:07 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 8 10:39:01 2019 +0200 [UNIATA] Fix uniata on x64 --- drivers/storage/ide/uniata/bsmaster.h | 4 ++++ drivers/storage/ide/uniata/id_sata.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/storage/ide/uniata/bsmaster.h b/drivers/storage/ide/uniata/bsmaster.h index ed42cc7ba97..4b748b4981b 100644 --- a/drivers/storage/ide/uniata/bsmaster.h +++ b/drivers/storage/ide/uniata/bsmaster.h @@ -1003,7 +1003,11 @@ struct _HW_LU_EXTENSION; typedef struct _IORES { union { +#ifdef __REACTOS__ + ULONG_PTR Addr; /* Base address*/ +#else ULONG Addr; /* Base address*/ +#endif PVOID pAddr; /* Base address in pointer form */ }; ULONG MemIo:1; /* Memory mapping (1) vs IO ports (0) */ diff --git a/drivers/storage/ide/uniata/id_sata.cpp b/drivers/storage/ide/uniata/id_sata.cpp index 2c67131983c..edd7289e3ed 100644 --- a/drivers/storage/ide/uniata/id_sata.cpp +++ b/drivers/storage/ide/uniata/id_sata.cpp @@ -650,7 +650,11 @@ UniataAhciInit( ULONG c, i; PHW_CHANNEL chan; ULONG offs; +#ifdef __REACTOS__ + ULONG_PTR BaseMemAddress; +#else ULONG BaseMemAddress; +#endif ULONG PI; ULONG CAP; ULONG CAP2;

1 0

[reactos] 02/02: [KMTESTS:EX] Try to avoid some spurious test failures.
by Thomas Faber 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acfea670fedbac5eef312… commit acfea670fedbac5eef312c1cbff4726af8c482a6 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 8 08:01:23 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 8 08:06:51 2019 +0200 [KMTESTS:EX] Try to avoid some spurious test failures. E.g. https://reactos.org/testman/detail.php?id=43906459&prev=43889679 This test depends on the timeout to be long enough for another thread to actually have started waiting, which may take longer than 10ms under load. --- modules/rostests/kmtests/ntos_ex/ExFastMutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/ntos_ex/ExFastMutex.c b/modules/rostests/kmtests/ntos_ex/ExFastMutex.c index ffd3034ba8b..04de7a9a16f 100644 --- a/modules/rostests/kmtests/ntos_ex/ExFastMutex.c +++ b/modules/rostests/kmtests/ntos_ex/ExFastMutex.c @@ -253,7 +253,7 @@ TestFastMutexConcurrent( THREAD_DATA ThreadDataUnsafe; THREAD_DATA ThreadDataTry; LARGE_INTEGER Timeout; - Timeout.QuadPart = -10 * 1000 * 10; /* 10 ms */ + Timeout.QuadPart = -50 * MILLISECOND; InitThreadData(&ThreadData, Mutex, ExAcquireFastMutex, NULL, ExReleaseFastMutex); InitThreadData(&ThreadData2, Mutex, ExAcquireFastMutex, NULL, ExReleaseFastMutex);

1 0

[reactos] 01/02: [ACPICA] Update to version 20190816. CORE-16368
by Thomas Faber 08 Sep '19

08 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d4f13f625bdd4abfc31f… commit 5d4f13f625bdd4abfc31fe282a7696eab24e3ba2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 7 13:56:10 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 8 07:46:53 2019 +0200 [ACPICA] Update to version 20190816. CORE-16368 --- drivers/bus/acpi/acpica/events/evgpe.c | 9 ++++++++ drivers/bus/acpi/acpica/events/evxfgpe.c | 27 +++++++++++++++++++++++ drivers/bus/acpi/acpica/executer/exconfig.c | 4 +++- drivers/bus/acpi/acpica/executer/exdump.c | 6 ++--- drivers/bus/acpi/acpica/include/acconfig.h | 4 ++-- drivers/bus/acpi/acpica/include/aclocal.h | 4 ++-- drivers/bus/acpi/acpica/include/acobject.h | 2 +- drivers/bus/acpi/acpica/include/acpiosxf.h | 1 + drivers/bus/acpi/acpica/include/acpixf.h | 14 +++++++++++- drivers/bus/acpi/acpica/include/acstruct.h | 2 +- drivers/bus/acpi/acpica/include/actypes.h | 20 +++++++++-------- drivers/bus/acpi/acpica/include/acutils.h | 9 +++++--- drivers/bus/acpi/acpica/include/platform/acmsvc.h | 1 - drivers/bus/acpi/acpica/namespace/nsaccess.c | 2 +- drivers/bus/acpi/acpica/namespace/nsalloc.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdump.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair2.c | 2 +- drivers/bus/acpi/acpica/tables/tbdata.c | 1 + drivers/bus/acpi/acpica/utilities/utdebug.c | 4 ++-- drivers/bus/acpi/acpica/utilities/uterror.c | 6 ++--- drivers/bus/acpi/acpica/utilities/utosi.c | 3 ++- drivers/bus/acpi/acpica/utilities/utownerid.c | 12 +++++----- 22 files changed, 97 insertions(+), 40 deletions(-) diff --git a/drivers/bus/acpi/acpica/events/evgpe.c b/drivers/bus/acpi/acpica/events/evgpe.c index 4f282e21937..5908e593ce4 100644 --- a/drivers/bus/acpi/acpica/events/evgpe.c +++ b/drivers/bus/acpi/acpica/events/evgpe.c @@ -740,6 +740,15 @@ AcpiEvDetectGpe ( Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); + if (!GpeEventInfo) + { + GpeEventInfo = AcpiEvGetGpeEventInfo (GpeDevice, GpeNumber); + if (!GpeEventInfo) + { + goto ErrorExit; + } + } + /* Get the info block for the entire GPE register */ GpeRegisterInfo = GpeEventInfo->RegisterInfo; diff --git a/drivers/bus/acpi/acpica/events/evxfgpe.c b/drivers/bus/acpi/acpica/events/evxfgpe.c index f56aa1d9bb4..f2946bc46c5 100644 --- a/drivers/bus/acpi/acpica/events/evxfgpe.c +++ b/drivers/bus/acpi/acpica/events/evxfgpe.c @@ -767,6 +767,33 @@ UnlockAndExit: ACPI_EXPORT_SYMBOL (AcpiGetGpeStatus) +/******************************************************************************* + * + * FUNCTION: AcpiDispatchGpe + * + * PARAMETERS: GpeDevice - Parent GPE Device. NULL for GPE0/GPE1 + * GpeNumber - GPE level within the GPE block + * + * RETURN: INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED + * + * DESCRIPTION: Detect and dispatch a General Purpose Event to either a function + * (e.g. EC) or method (e.g. _Lxx/_Exx) handler. + * + ******************************************************************************/ + +UINT32 +AcpiDispatchGpe( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber) +{ + ACPI_FUNCTION_TRACE(acpi_dispatch_gpe); + + return (AcpiEvDetectGpe (GpeDevice, NULL, GpeNumber)); +} + +ACPI_EXPORT_SYMBOL (AcpiDispatchGpe) + + /******************************************************************************* * * FUNCTION: AcpiFinishGpe diff --git a/drivers/bus/acpi/acpica/executer/exconfig.c b/drivers/bus/acpi/acpica/executer/exconfig.c index 7e2b0dbfb9d..4555b53136a 100644 --- a/drivers/bus/acpi/acpica/executer/exconfig.c +++ b/drivers/bus/acpi/acpica/executer/exconfig.c @@ -235,7 +235,9 @@ AcpiExLoadTableOp ( /* Complete the initialization/resolution of new objects */ - AcpiNsInitializeObjects (); + AcpiExExitInterpreter(); + AcpiNsInitializeObjects(); + AcpiExEnterInterpreter(); /* Parameter Data (optional) */ diff --git a/drivers/bus/acpi/acpica/executer/exdump.c b/drivers/bus/acpi/acpica/executer/exdump.c index cfe1e30409d..607707afb39 100644 --- a/drivers/bus/acpi/acpica/executer/exdump.c +++ b/drivers/bus/acpi/acpica/executer/exdump.c @@ -147,7 +147,7 @@ static ACPI_EXDUMP_INFO AcpiExDumpMethod[9] = {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.ParamCount), "Parameter Count"}, {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.SyncLevel), "Sync Level"}, {ACPI_EXD_POINTER, ACPI_EXD_OFFSET (Method.Mutex), "Mutex"}, - {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.OwnerId), "Owner Id"}, + {ACPI_EXD_UINT16, ACPI_EXD_OFFSET (Method.OwnerId), "Owner Id"}, {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.ThreadCount), "Thread Count"}, {ACPI_EXD_UINT32, ACPI_EXD_OFFSET (Method.AmlLength), "Aml Length"}, {ACPI_EXD_POINTER, ACPI_EXD_OFFSET (Method.AmlStart), "Aml Start"} @@ -314,8 +314,8 @@ static ACPI_EXDUMP_INFO AcpiExDumpFieldCommon[7] = static ACPI_EXDUMP_INFO AcpiExDumpNode[7] = { {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE (AcpiExDumpNode), NULL}, - {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET (Flags), "Flags"}, - {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET (OwnerId), "Owner Id"}, + {ACPI_EXD_UINT16, ACPI_EXD_NSOFFSET (Flags), "Flags"}, + {ACPI_EXD_UINT16, ACPI_EXD_NSOFFSET (OwnerId), "Owner Id"}, {ACPI_EXD_LIST, ACPI_EXD_NSOFFSET (Object), "Object List"}, {ACPI_EXD_NODE, ACPI_EXD_NSOFFSET (Parent), "Parent"}, {ACPI_EXD_NODE, ACPI_EXD_NSOFFSET (Child), "Child"}, diff --git a/drivers/bus/acpi/acpica/include/acconfig.h b/drivers/bus/acpi/acpica/include/acconfig.h index 4a95e203add..530983ebee4 100644 --- a/drivers/bus/acpi/acpica/include/acconfig.h +++ b/drivers/bus/acpi/acpica/include/acconfig.h @@ -131,9 +131,9 @@ #define ACPI_DEFAULT_PAGE_SIZE 4096 /* Must be power of 2 */ -/* OwnerId tracking. 8 entries allows for 255 OwnerIds */ +/* OwnerId tracking. 128 entries allows for 4095 OwnerIds */ -#define ACPI_NUM_OWNERID_MASKS 8 +#define ACPI_NUM_OWNERID_MASKS 128 /* Size of the root table array is increased by this increment */ diff --git a/drivers/bus/acpi/acpica/include/aclocal.h b/drivers/bus/acpi/acpica/include/aclocal.h index 0d683460f9d..e45d97cdcd6 100644 --- a/drivers/bus/acpi/acpica/include/aclocal.h +++ b/drivers/bus/acpi/acpica/include/aclocal.h @@ -187,12 +187,12 @@ typedef struct acpi_namespace_node union acpi_operand_object *Object; /* Interpreter object */ UINT8 DescriptorType; /* Differentiate object descriptor types */ UINT8 Type; /* ACPI Type associated with this name */ - UINT8 Flags; /* Miscellaneous flags */ - ACPI_OWNER_ID OwnerId; /* Node creator */ + UINT16 Flags; /* Miscellaneous flags */ ACPI_NAME_UNION Name; /* ACPI Name, always 4 chars per ACPI spec */ struct acpi_namespace_node *Parent; /* Parent node */ struct acpi_namespace_node *Child; /* First child */ struct acpi_namespace_node *Peer; /* First peer */ + ACPI_OWNER_ID OwnerId; /* Node creator */ /* * The following fields are used by the ASL compiler and disassembler only diff --git a/drivers/bus/acpi/acpica/include/acobject.h b/drivers/bus/acpi/acpica/include/acobject.h index 150f6fb236e..45f09839b6d 100644 --- a/drivers/bus/acpi/acpica/include/acobject.h +++ b/drivers/bus/acpi/acpica/include/acobject.h @@ -225,8 +225,8 @@ typedef struct acpi_object_method } Dispatch; UINT32 AmlLength; - UINT8 ThreadCount; ACPI_OWNER_ID OwnerId; + UINT8 ThreadCount; } ACPI_OBJECT_METHOD; diff --git a/drivers/bus/acpi/acpica/include/acpiosxf.h b/drivers/bus/acpi/acpica/include/acpiosxf.h index a874f65f316..9209c5af078 100644 --- a/drivers/bus/acpi/acpica/include/acpiosxf.h +++ b/drivers/bus/acpi/acpica/include/acpiosxf.h @@ -469,6 +469,7 @@ AcpiOsEnterSleep ( * Debug print routines */ #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsPrintf +ACPI_PRINTF_LIKE (1) void ACPI_INTERNAL_VAR_XFACE AcpiOsPrintf ( const char *Format, diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index 9322858f8fe..d84c008daf9 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20190703 +#define ACPI_CA_VERSION 0x20190816 #include "acconfig.h" #include "actypes.h" @@ -338,6 +338,9 @@ ACPI_GLOBAL (BOOLEAN, AcpiGbl_SystemAwakeAndRunning); #define ACPI_HW_DEPENDENT_RETURN_OK(Prototype) \ ACPI_EXTERNAL_RETURN_OK(Prototype) +#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \ + ACPI_EXTERNAL_RETURN_UINT32(prototype) + #define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \ ACPI_EXTERNAL_RETURN_VOID(Prototype) @@ -348,6 +351,9 @@ ACPI_GLOBAL (BOOLEAN, AcpiGbl_SystemAwakeAndRunning); #define ACPI_HW_DEPENDENT_RETURN_OK(Prototype) \ static ACPI_INLINE Prototype {return(AE_OK);} +#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \ + static ACPI_INLINE prototype {return(0);} + #define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \ static ACPI_INLINE Prototype {return;} @@ -968,6 +974,12 @@ AcpiGetGpeStatus ( UINT32 GpeNumber, ACPI_EVENT_STATUS *EventStatus)) +ACPI_HW_DEPENDENT_RETURN_UINT32 ( +UINT32 +AcpiDispatchGpe ( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber)) + ACPI_HW_DEPENDENT_RETURN_STATUS ( ACPI_STATUS AcpiDisableAllGpes ( diff --git a/drivers/bus/acpi/acpica/include/acstruct.h b/drivers/bus/acpi/acpica/include/acstruct.h index 04123f307f1..ae168d75780 100644 --- a/drivers/bus/acpi/acpica/include/acstruct.h +++ b/drivers/bus/acpi/acpica/include/acstruct.h @@ -219,9 +219,9 @@ typedef struct acpi_evaluate_info UINT32 ReturnFlags; /* Used for return value analysis */ UINT32 ReturnBtype; /* Bitmapped type of the returned object */ UINT16 ParamCount; /* Count of the input argument list */ + UINT16 NodeFlags; /* Same as Node->Flags */ UINT8 PassNumber; /* Parser pass number */ UINT8 ReturnObjectType; /* Object type of the returned object */ - UINT8 NodeFlags; /* Same as Node->Flags */ UINT8 Flags; /* General flags */ } ACPI_EVALUATE_INFO; diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index 48a192a5b8e..e73dee3b673 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -483,8 +483,8 @@ typedef void * ACPI_HANDLE; /* Actually a ptr to a N /* Owner IDs are used to track namespace nodes for selective deletion */ -typedef UINT8 ACPI_OWNER_ID; -#define ACPI_OWNER_ID_MAX 0xFF +typedef UINT16 ACPI_OWNER_ID; +#define ACPI_OWNER_ID_MAX 0xFFF /* 4095 possible owner IDs */ #define ACPI_INTEGER_BIT_SIZE 64 @@ -549,7 +549,7 @@ typedef UINT64 ACPI_INTEGER; /* Pointer/Integer type conversions */ -#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (ACPI_SIZE) (i)) +#define ACPI_TO_POINTER(i) ACPI_CAST_PTR (void, (ACPI_SIZE) (i)) #define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0) #define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0) #define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i) @@ -1405,12 +1405,14 @@ typedef enum #define ACPI_OSI_WIN_VISTA_SP2 0x0A #define ACPI_OSI_WIN_7 0x0B #define ACPI_OSI_WIN_8 0x0C -#define ACPI_OSI_WIN_10 0x0D -#define ACPI_OSI_WIN_10_RS1 0x0E -#define ACPI_OSI_WIN_10_RS2 0x0F -#define ACPI_OSI_WIN_10_RS3 0x10 -#define ACPI_OSI_WIN_10_RS4 0x11 -#define ACPI_OSI_WIN_10_RS5 0x12 +#define ACPI_OSI_WIN_8_1 0x0D +#define ACPI_OSI_WIN_10 0x0E +#define ACPI_OSI_WIN_10_RS1 0x0F +#define ACPI_OSI_WIN_10_RS2 0x10 +#define ACPI_OSI_WIN_10_RS3 0x11 +#define ACPI_OSI_WIN_10_RS4 0x12 +#define ACPI_OSI_WIN_10_RS5 0x13 +#define ACPI_OSI_WIN_10_19H1 0x14 /* Definitions of getopt */ diff --git a/drivers/bus/acpi/acpica/include/acutils.h b/drivers/bus/acpi/acpica/include/acutils.h index 5d407343dff..7e4922f810f 100644 --- a/drivers/bus/acpi/acpica/include/acutils.h +++ b/drivers/bus/acpi/acpica/include/acutils.h @@ -1086,30 +1086,33 @@ AcpiUtDeleteAddressLists ( /* * utxferror - various error/warning output functions */ +ACPI_PRINTF_LIKE(5) void ACPI_INTERNAL_VAR_XFACE AcpiUtPredefinedWarning ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...); +ACPI_PRINTF_LIKE(5) void ACPI_INTERNAL_VAR_XFACE AcpiUtPredefinedInfo ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...); +ACPI_PRINTF_LIKE(5) void ACPI_INTERNAL_VAR_XFACE AcpiUtPredefinedBiosError ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...); diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvc.h b/drivers/bus/acpi/acpica/include/platform/acmsvc.h index fe8ca747178..6a39e9caa43 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvc.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvc.h @@ -242,7 +242,6 @@ #pragma warning(disable:4459) - /* Debug support. */ #ifdef _DEBUG diff --git a/drivers/bus/acpi/acpica/namespace/nsaccess.c b/drivers/bus/acpi/acpica/namespace/nsaccess.c index c0c829012d3..5321edaca8f 100644 --- a/drivers/bus/acpi/acpica/namespace/nsaccess.c +++ b/drivers/bus/acpi/acpica/namespace/nsaccess.c @@ -659,7 +659,7 @@ AcpiNsLookup ( if (Flags & ACPI_NS_PREFIX_MUST_EXIST) { AcpiOsPrintf (ACPI_MSG_BIOS_ERROR - "Object does not exist: %4.4s\n", &SimpleName); + "Object does not exist: %4.4s\n", (char *) &SimpleName); } #endif /* Name not found in ACPI namespace */ diff --git a/drivers/bus/acpi/acpica/namespace/nsalloc.c b/drivers/bus/acpi/acpica/namespace/nsalloc.c index fb5cc71d007..b77725b915c 100644 --- a/drivers/bus/acpi/acpica/namespace/nsalloc.c +++ b/drivers/bus/acpi/acpica/namespace/nsalloc.c @@ -315,7 +315,7 @@ AcpiNsInstallNode ( Node->Type = (UINT8) Type; ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, - "%4.4s (%s) [Node %p Owner %X] added to %4.4s (%s) [Node %p]\n", + "%4.4s (%s) [Node %p Owner %3.3X] added to %4.4s (%s) [Node %p]\n", AcpiUtGetNodeName (Node), AcpiUtGetTypeName (Node->Type), Node, OwnerId, AcpiUtGetNodeName (ParentNode), AcpiUtGetTypeName (ParentNode->Type), ParentNode)); diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c b/drivers/bus/acpi/acpica/namespace/nsdump.c index cf03a110f36..67ff9369587 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdump.c +++ b/drivers/bus/acpi/acpica/namespace/nsdump.c @@ -272,7 +272,7 @@ AcpiNsDumpOneObject ( /* Now we can print out the pertinent information */ - AcpiOsPrintf (" %-12s %p %2.2X ", + AcpiOsPrintf (" %-12s %p %3.3X ", AcpiUtGetTypeName (Type), ThisNode, ThisNode->OwnerId); DbgLevel = AcpiDbgLevel; diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair2.c b/drivers/bus/acpi/acpica/namespace/nsrepair2.c index 6668ad1130f..88b8dc9636d 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair2.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair2.c @@ -181,7 +181,7 @@ static const ACPI_REPAIR_INFO AcpiNsRepairableNames[] = #define ACPI_FDE_FIELD_COUNT 5 #define ACPI_FDE_BYTE_BUFFER_SIZE 5 -#define ACPI_FDE_DWORD_BUFFER_SIZE (ACPI_FDE_FIELD_COUNT * sizeof (UINT32)) +#define ACPI_FDE_DWORD_BUFFER_SIZE (ACPI_FDE_FIELD_COUNT * (UINT32) sizeof (UINT32)) /****************************************************************************** diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c b/drivers/bus/acpi/acpica/tables/tbdata.c index 977eee87318..e6ac5bb1130 100644 --- a/drivers/bus/acpi/acpica/tables/tbdata.c +++ b/drivers/bus/acpi/acpica/tables/tbdata.c @@ -865,6 +865,7 @@ AcpiTbDeleteNamespaceByOwner ( { return_ACPI_STATUS (Status); } + AcpiNsDeleteNamespaceByOwner (OwnerId); AcpiUtReleaseWriteLock (&AcpiGbl_NamespaceRwLock); return_ACPI_STATUS (Status); diff --git a/drivers/bus/acpi/acpica/utilities/utdebug.c b/drivers/bus/acpi/acpica/utilities/utdebug.c index 9ceed9754a9..583589555cd 100644 --- a/drivers/bus/acpi/acpica/utilities/utdebug.c +++ b/drivers/bus/acpi/acpica/utilities/utdebug.c @@ -214,7 +214,7 @@ AcpiDebugPrint ( * Display the module name, current line number, thread ID (if requested), * current procedure nesting level, and the current procedure name */ - AcpiOsPrintf ("%9s-%04ld ", ModuleName, LineNumber); + AcpiOsPrintf ("%9s-%04d ", ModuleName, LineNumber); #ifdef ACPI_APPLICATION /* @@ -235,7 +235,7 @@ AcpiDebugPrint ( FillCount = 0; } - AcpiOsPrintf ("[%02ld] %*s", + AcpiOsPrintf ("[%02d] %*s", AcpiGbl_NestingLevel, AcpiGbl_NestingLevel + 1, " "); AcpiOsPrintf ("%s%*s: ", AcpiUtTrimFunctionName (FunctionName), FillCount, " "); diff --git a/drivers/bus/acpi/acpica/utilities/uterror.c b/drivers/bus/acpi/acpica/utilities/uterror.c index 76778943a5a..52edc68994a 100644 --- a/drivers/bus/acpi/acpica/utilities/uterror.c +++ b/drivers/bus/acpi/acpica/utilities/uterror.c @@ -80,7 +80,7 @@ AcpiUtPredefinedWarning ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...) { @@ -129,7 +129,7 @@ AcpiUtPredefinedInfo ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...) { @@ -178,7 +178,7 @@ AcpiUtPredefinedBiosError ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...) { diff --git a/drivers/bus/acpi/acpica/utilities/utosi.c b/drivers/bus/acpi/acpica/utilities/utosi.c index 8c0da51cff4..d145055aeea 100644 --- a/drivers/bus/acpi/acpica/utilities/utosi.c +++ b/drivers/bus/acpi/acpica/utilities/utosi.c @@ -104,13 +104,14 @@ static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] = {"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2}, /* Windows Vista SP2 - Added 09/2010 */ {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */ {"Windows 2012", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8 and Server 2012 - Added 08/2012 */ - {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */ + {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8_1}, /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */ {"Windows 2015", NULL, 0, ACPI_OSI_WIN_10}, /* Windows 10 - Added 03/2015 */ {"Windows 2016", NULL, 0, ACPI_OSI_WIN_10_RS1}, /* Windows 10 version 1607 - Added 12/2017 */ {"Windows 2017", NULL, 0, ACPI_OSI_WIN_10_RS2}, /* Windows 10 version 1703 - Added 12/2017 */ {"Windows 2017.2", NULL, 0, ACPI_OSI_WIN_10_RS3}, /* Windows 10 version 1709 - Added 02/2018 */ {"Windows 2018", NULL, 0, ACPI_OSI_WIN_10_RS4}, /* Windows 10 version 1803 - Added 11/2018 */ {"Windows 2018.2", NULL, 0, ACPI_OSI_WIN_10_RS5}, /* Windows 10 version 1809 - Added 11/2018 */ + {"Windows 2019", NULL, 0, ACPI_OSI_WIN_10_19H1}, /* Windows 10 version 1903 - Added 08/2019 */ /* Feature Group Strings */ diff --git a/drivers/bus/acpi/acpica/utilities/utownerid.c b/drivers/bus/acpi/acpica/utilities/utownerid.c index ea98b81d590..8e723fabdc7 100644 --- a/drivers/bus/acpi/acpica/utilities/utownerid.c +++ b/drivers/bus/acpi/acpica/utilities/utownerid.c @@ -82,7 +82,7 @@ AcpiUtAllocateOwnerId ( if (*OwnerId) { ACPI_ERROR ((AE_INFO, - "Owner ID [0x%2.2X] already exists", *OwnerId)); + "Owner ID [0x%3.3X] already exists", *OwnerId)); return_ACPI_STATUS (AE_ALREADY_EXISTS); } @@ -138,13 +138,13 @@ AcpiUtAllocateOwnerId ( /* * Construct encoded ID from the index and bit position * - * Note: Last [j].k (bit 255) is never used and is marked + * Note: Last [j].k (bit 4095) is never used and is marked * permanently allocated (prevents +1 overflow) */ *OwnerId = (ACPI_OWNER_ID) ((k + 1) + ACPI_MUL_32 (j)); ACPI_DEBUG_PRINT ((ACPI_DB_VALUES, - "Allocated OwnerId: %2.2X\n", (unsigned int) *OwnerId)); + "Allocated OwnerId: 0x%3.3X\n", (unsigned int) *OwnerId)); goto Exit; } } @@ -164,7 +164,7 @@ AcpiUtAllocateOwnerId ( */ Status = AE_OWNER_ID_LIMIT; ACPI_ERROR ((AE_INFO, - "Could not allocate new OwnerId (255 max), AE_OWNER_ID_LIMIT")); + "Could not allocate new OwnerId (4095 max), AE_OWNER_ID_LIMIT")); Exit: (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); @@ -207,7 +207,7 @@ AcpiUtReleaseOwnerId ( if (OwnerId == 0) { - ACPI_ERROR ((AE_INFO, "Invalid OwnerId: 0x%2.2X", OwnerId)); + ACPI_ERROR ((AE_INFO, "Invalid OwnerId: 0x%3.3X", OwnerId)); return_VOID; } @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId ( else { ACPI_ERROR ((AE_INFO, - "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1)); + "Attempted release of non-allocated OwnerId: 0x%3.3X", OwnerId + 1)); } (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs