Skip to content

Commit 6125dc9

Browse files
committed
fixed macro name conflict
1 parent ba003a0 commit 6125dc9

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/vmaware.hpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9745,7 +9745,7 @@ struct VM {
97459745

97469746
using POBJECT_DIRECTORY_INFORMATION = OBJECT_DIRECTORY_INFORMATION*;
97479747
constexpr auto DIRECTORY_QUERY = 0x0001;
9748-
constexpr NTSTATUS STATUS_NO_MORE_ENTRIES = static_cast<NTSTATUS>(0x8000001A);
9748+
constexpr NTSTATUS NO_MORE_ENTRIES = 0x8000001A;
97499749

97509750
HANDLE dir = nullptr;
97519751
OBJECT_ATTRIBUTES object_attributes{};
@@ -9802,7 +9802,7 @@ struct VM {
98029802
);
98039803

98049804
// Stop if we have iterated through all objects
9805-
if (status == STATUS_NO_MORE_ENTRIES) {
9805+
if (status == NO_MORE_ENTRIES) {
98069806
break;
98079807
}
98089808

@@ -10650,10 +10650,10 @@ struct VM {
1065010650
// need to do a lambda wrapper to isolate SEH from the parent function's stack unwinding
1065110651
// target aes is required for clang/gcc while in MSVC not, and this target can only be applied to functions, meaning we need a struct
1065210652
struct aes_executor {
10653-
#if (CLANG || GCC)
10654-
__attribute__((__target__("aes")))
10655-
#endif
10656-
static bool check_aes_integrity(const unsigned char* pt, const unsigned char* k, unsigned char* o, bool support) {
10653+
#if (CLANG || GCC)
10654+
__attribute__((__target__("aes")))
10655+
#endif
10656+
static bool check_aes_integrity(const unsigned char* pt, const unsigned char* k, unsigned char* o, bool support) {
1065710657
__try {
1065810658
__m128i block = _mm_loadu_si128(reinterpret_cast<const __m128i*>(pt));
1065910659
__m128i key_vec = _mm_loadu_si128(reinterpret_cast<const __m128i*>(k));
@@ -10670,7 +10670,8 @@ struct VM {
1067010670
}
1067110671
__except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION
1067210672
? EXCEPTION_EXECUTE_HANDLER
10673-
: EXCEPTION_CONTINUE_SEARCH) {
10673+
: EXCEPTION_CONTINUE_SEARCH
10674+
) {
1067410675
if (support) {
1067510676
debug("CPU_HEURISTIC: Hypervisor reports AES, but it is not handled correctly");
1067610677
return true;

0 commit comments

Comments
 (0)