Fix compiler errors when winternl.h is included before krabs.hpp. (#127)

* Fix warnings/errors when winternl.h is included before krabs.hpp.

* Declare NtSetSystemInformation() even when winternl.h is included.

* Increment sub-minor version number in .nuspec files.

Co-authored-by: dravenson <dravenson@example.com>
This commit is contained in:
Derek J. Ravenson
2020-04-23 17:20:33 +01:00
committed by GitHub
parent dc92c87460
commit 67a2b6ffcb
4 changed files with 10 additions and 5 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Microsoft.O365.Security.Native.ETW.Debug</id>
<version>4.1.8</version>
<version>4.1.9</version>
<title>Microsoft.O365.Security.Native.ETW Debug - managed wrappers for krabsetw</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
+1 -1
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Microsoft.O365.Security.Native.ETW</id>
<version>4.1.8</version>
<version>4.1.9</version>
<title>Microsoft.O365.Security.Native.ETW - managed wrappers for krabsetw</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
+7 -2
View File
@@ -184,8 +184,9 @@ typedef struct _EVENT_TRACE_GROUPMASK_INFORMATION {
PERFINFO_GROUPMASK EventTraceGroupMasks;
} EVENT_TRACE_GROUPMASK_INFORMATION, * PEVENT_TRACE_GROUPMASK_INFORMATION;
#ifndef _WINTERNL_
typedef enum _SYSTEM_INFORMATION_CLASS {
SystemPerformanceTraceInformation = 0x1f
} SYSTEM_INFORMATION_CLASS;
typedef LONG NTSTATUS;
@@ -197,8 +198,12 @@ extern "C" NTSTATUS NTAPI NtQuerySystemInformation(
_Out_opt_ PULONG ReturnLength
);
#endif // _WINTERNL_
extern "C" NTSTATUS NTAPI NtSetSystemInformation(
_In_ SYSTEM_INFORMATION_CLASS SystemInformationClass,
_In_reads_bytes_opt_(SystemInformationLength) PVOID SystemInformation,
_In_ ULONG SystemInformationLength
);
);
constexpr auto SystemPerformanceTraceInformation{ static_cast<SYSTEM_INFORMATION_CLASS>(0x1f) };
+1 -1
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Microsoft.O365.Security.Krabsetw</id>
<version>4.1.8</version>
<version>4.1.9</version>
<title>Krabs ETW Wrappers</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>