From c58f6c9742d4894bd1dc9350016a198131c7c19a Mon Sep 17 00:00:00 2001 From: momo5502 Date: Mon, 25 Apr 2022 19:47:22 +0200 Subject: [PATCH] Fix formatting --- src/driver/ept.cpp | 12 ++--- src/driver/finally.hpp | 2 +- src/driver/irp.cpp | 5 ++- src/driver/nt_ext.hpp | 84 +++++++++++++++++------------------ src/driver/process.cpp | 2 +- src/driver/sleep_callback.cpp | 2 +- src/driver/type_traits.hpp | 25 +++++++---- src/runner/driver_device.cpp | 2 +- src/runner/main.cpp | 4 +- 9 files changed, 74 insertions(+), 64 deletions(-) diff --git a/src/driver/ept.cpp b/src/driver/ept.cpp index 7a154f3..f02562c 100644 --- a/src/driver/ept.cpp +++ b/src/driver/ept.cpp @@ -49,13 +49,13 @@ namespace vmx if (mtrr_data[i].enabled != FALSE) { mtrr_data[i].physical_address_min = mtrr_base.page_frame_number * - MTRR_PAGE_SIZE; + MTRR_PAGE_SIZE; unsigned long bit{}; _BitScanForward64(&bit, mtrr_mask.page_frame_number * MTRR_PAGE_SIZE); mtrr_data[i].physical_address_max = mtrr_data[i]. - physical_address_min + - (1ULL << bit) - 1; + physical_address_min + + (1ULL << bit) - 1; } } } @@ -198,7 +198,7 @@ namespace vmx this->epml4[0].write_access = 1; this->epml4[0].execute_access = 1; this->epml4[0].page_frame_number = memory::get_physical_address(&this->epdpt) / - PAGE_SIZE; + PAGE_SIZE; // -------------------------- @@ -232,7 +232,7 @@ namespace vmx { this->epde[i][j].page_frame_number = (i * 512) + j; this->epde[i][j].memory_type = mtrr_adjust_effective_memory_type( - mtrr_data, this->epde[i][j].page_frame_number * 2_mb, MEMORY_TYPE_WRITE_BACK); + mtrr_data, this->epde[i][j].page_frame_number * 2_mb, MEMORY_TYPE_WRITE_BACK); } } } @@ -366,7 +366,7 @@ namespace vmx if (translation_hint) { physical_address = translation_hint->physical_base_address + ADDRMASK_EPT_PML1_OFFSET( - reinterpret_cast(destination)); + reinterpret_cast(destination)); } else { diff --git a/src/driver/finally.hpp b/src/driver/finally.hpp index 3684c53..458aba8 100644 --- a/src/driver/finally.hpp +++ b/src/driver/finally.hpp @@ -50,6 +50,6 @@ namespace utils finally(F&& f) noexcept { return final_action::type>::type>( - std::forward(f)); + std::forward(f)); } } diff --git a/src/driver/irp.cpp b/src/driver/irp.cpp index 55929a6..ca10c44 100644 --- a/src/driver/irp.cpp +++ b/src/driver/irp.cpp @@ -90,7 +90,8 @@ namespace }); memcpy(buffer.get(), request.source_data, request.source_data_size); - translation_hints = generate_translation_hints(request.process_id, request.target_address, request.source_data_size); + translation_hints = generate_translation_hints(request.process_id, request.target_address, + request.source_data_size); if (!translation_hints) { @@ -153,7 +154,7 @@ namespace } _Function_class_(DRIVER_DISPATCH) NTSTATUS io_ctl_handler( - PDEVICE_OBJECT /*device_object*/, const PIRP irp) + PDEVICE_OBJECT /*device_object*/, const PIRP irp) { PAGED_CODE() diff --git a/src/driver/nt_ext.hpp b/src/driver/nt_ext.hpp index 7fbd7ab..f0c9511 100644 --- a/src/driver/nt_ext.hpp +++ b/src/driver/nt_ext.hpp @@ -13,9 +13,9 @@ _IRQL_requires_min_(PASSIVE_LEVEL) _IRQL_requires_same_ VOID KeGenericCallDpc( - _In_ PKDEFERRED_ROUTINE Routine, - _In_opt_ PVOID Context - ); + _In_ PKDEFERRED_ROUTINE Routine, + _In_opt_ PVOID Context +); // ---------------------------------------- @@ -24,8 +24,8 @@ _IRQL_requires_(DISPATCH_LEVEL) _IRQL_requires_same_ VOID KeSignalCallDpcDone( - _In_ PVOID SystemArgument1 - ); + _In_ PVOID SystemArgument1 +); // ---------------------------------------- @@ -34,8 +34,8 @@ _IRQL_requires_(DISPATCH_LEVEL) _IRQL_requires_same_ LOGICAL KeSignalCallDpcSynchronize( - _In_ PVOID SystemArgument2 - ); + _In_ PVOID SystemArgument2 +); // ---------------------------------------- @@ -45,13 +45,13 @@ _IRQL_requires_max_(DISPATCH_LEVEL) NTKERNELAPI _When_(return != NULL, _Post_writable_byte_size_ (NumberOfBytes)) PVOID MmAllocateContiguousNodeMemory( - _In_ SIZE_T NumberOfBytes, - _In_ PHYSICAL_ADDRESS LowestAcceptableAddress, - _In_ PHYSICAL_ADDRESS HighestAcceptableAddress, - _In_opt_ PHYSICAL_ADDRESS BoundaryAddressMultiple, - _In_ ULONG Protect, - _In_ NODE_REQUIREMENT PreferredNode - ); + _In_ SIZE_T NumberOfBytes, + _In_ PHYSICAL_ADDRESS LowestAcceptableAddress, + _In_ PHYSICAL_ADDRESS HighestAcceptableAddress, + _In_opt_ PHYSICAL_ADDRESS BoundaryAddressMultiple, + _In_ ULONG Protect, + _In_ NODE_REQUIREMENT PreferredNode +); #endif // ---------------------------------------- @@ -60,8 +60,8 @@ NTSYSAPI VOID NTAPI RtlCaptureContext( - _Out_ PCONTEXT ContextRecord - ); + _Out_ PCONTEXT ContextRecord +); // ---------------------------------------- @@ -79,34 +79,34 @@ typedef struct _KAPC_STATE NTKERNELAPI VOID KeStackAttachProcess( - __inout PEPROCESS PROCESS, - __out PRKAPC_STATE ApcState - ); + __inout PEPROCESS PROCESS, + __out PRKAPC_STATE ApcState +); // ---------------------------------------- NTKERNELAPI VOID KeUnstackDetachProcess( - __in PRKAPC_STATE ApcState - ); + __in PRKAPC_STATE ApcState +); // ---------------------------------------- NTKERNELAPI NTSTATUS PsLookupProcessByProcessId( - IN HANDLE ProcessId, - OUT PEPROCESS* Process - ); + IN HANDLE ProcessId, + OUT PEPROCESS* Process +); // ---------------------------------------- NTKERNELAPI PVOID PsGetProcessSectionBaseAddress( - __in PEPROCESS Process - ); + __in PEPROCESS Process +); // ---------------------------------------- @@ -114,16 +114,16 @@ NTKERNELAPI PPEB NTAPI PsGetProcessPeb( - IN PEPROCESS Process - ); + IN PEPROCESS Process +); // ---------------------------------------- NTKERNELAPI PCSTR PsGetProcessImageFileName( - __in PEPROCESS Process - ); + __in PEPROCESS Process +); // ---------------------------------------- @@ -131,18 +131,18 @@ __kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtCreateFile( - _Out_ PHANDLE FileHandle, - _In_ ACCESS_MASK DesiredAccess, - _In_ POBJECT_ATTRIBUTES ObjectAttributes, - _Out_ PIO_STATUS_BLOCK IoStatusBlock, - _In_opt_ PLARGE_INTEGER AllocationSize, - _In_ ULONG FileAttributes, - _In_ ULONG ShareAccess, - _In_ ULONG CreateDisposition, - _In_ ULONG CreateOptions, - _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, - _In_ ULONG EaLength - ); + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER AllocationSize, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, + _In_ ULONG EaLength +); #ifdef __cplusplus } diff --git a/src/driver/process.cpp b/src/driver/process.cpp index b718726..d8f9624 100644 --- a/src/driver/process.cpp +++ b/src/driver/process.cpp @@ -48,7 +48,7 @@ namespace process this->own_ = obj.own_; this->handle_ = obj.handle_; - if(this->own_ && this->handle_) + if (this->own_ && this->handle_) { ObReferenceObject(this->handle_); } diff --git a/src/driver/sleep_callback.cpp b/src/driver/sleep_callback.cpp index dda6ab6..e0c93cd 100644 --- a/src/driver/sleep_callback.cpp +++ b/src/driver/sleep_callback.cpp @@ -9,7 +9,7 @@ sleep_callback::sleep_callback(callback_function&& callback) PCALLBACK_OBJECT callback_object{}; UNICODE_STRING callback_name = RTL_CONSTANT_STRING(L"\\Callback\\PowerState"); OBJECT_ATTRIBUTES object_attributes = RTL_CONSTANT_OBJECT_ATTRIBUTES( - &callback_name, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE); + &callback_name, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE); const auto _ = utils::finally([&callback_object]() { diff --git a/src/driver/type_traits.hpp b/src/driver/type_traits.hpp index ea7cc21..395155b 100644 --- a/src/driver/type_traits.hpp +++ b/src/driver/type_traits.hpp @@ -38,7 +38,7 @@ namespace std // TEMPLATE FUNCTION forward template constexpr _Ty&& forward( - typename remove_reference<_Ty>::type& _Arg) + typename remove_reference<_Ty>::type& _Arg) { // forward an lvalue as either an lvalue or an rvalue return (static_cast<_Ty&&>(_Arg)); @@ -46,7 +46,7 @@ namespace std template constexpr _Ty&& forward( - typename remove_reference<_Ty>::type&& _Arg) + typename remove_reference<_Ty>::type&& _Arg) { // forward an rvalue as an rvalue return (static_cast<_Ty&&>(_Arg)); @@ -134,12 +134,21 @@ namespace std }; - template - struct remove_extent { typedef T type; }; + template + struct remove_extent + { + typedef T type; + }; - template - struct remove_extent { typedef T type; }; + template + struct remove_extent + { + typedef T type; + }; - template - struct remove_extent { typedef T type; }; + template + struct remove_extent + { + typedef T type; + }; } diff --git a/src/runner/driver_device.cpp b/src/runner/driver_device.cpp index d9dffda..6c5377d 100644 --- a/src/runner/driver_device.cpp +++ b/src/runner/driver_device.cpp @@ -34,7 +34,7 @@ bool driver_device::send(const DWORD ioctl_code, const data& input, data& output static_cast(output.size()), &size_returned, nullptr - ) != FALSE; + ) != FALSE; if (success && size_returned < output.size()) { diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 5fa5a74..f6cdaab 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -52,7 +52,7 @@ std::vector load_resource(const int id) auto* const handle = LoadResource(nullptr, res); if (!handle) return {}; - const auto* data_ptr =static_cast(LockResource(handle)); + const auto* data_ptr = static_cast(LockResource(handle)); const auto data_size = SizeofResource(nullptr, res); std::vector data{}; @@ -78,7 +78,7 @@ void unsafe_main(const int /*argc*/, char* /*argv*/[]) { const auto driver_file = extract_driver(); - driver driver{ driver_file, "MomoLul"}; + driver driver{driver_file, "MomoLul"}; const driver_device driver_device{R"(\\.\HelloDev)"}; std::string pid_str{};