quick fix to also build on arm64

CMakeLists.txt

@@ -65,29 +65,20 @@ string(TIMESTAMP CFB_CURRENT_YEAR "%Y")
 # Build
 #
 add_subdirectory(${CFB_ROOT_DIR}/Common)
+add_subdirectory(${CFB_ROOT_DIR}/Driver)
+add_subdirectory(${CFB_ROOT_DIR}/Broker)
+
+if(CFB_BUILD_GUI)
+ add_subdirectory(${CFB_ROOT_DIR}/GUI)
+endif(CFB_BUILD_GUI)
+
+if(CFB_BUILD_TOOLS)
+ add_subdirectory(${CFB_ROOT_DIR}/Driver/Client)
+endif(CFB_BUILD_TOOLS)
 
 if(CFB_BUILD_TESTS)
  include(CTest)
  add_subdirectory(${CFB_ROOT_DIR}/Common/Tests)
+ add_subdirectory(${CFB_ROOT_DIR}/Broker/Tests)
+ add_subdirectory(${CFB_ROOT_DIR}/GUI/Tests)
 endif(CFB_BUILD_TESTS)
-
-if(CFB_BUILD_BROKER)
- add_subdirectory(${CFB_ROOT_DIR}/Driver)
- add_subdirectory(${CFB_ROOT_DIR}/Broker)
-
- if(CFB_BUILD_TESTS)
- add_subdirectory(${CFB_ROOT_DIR}/Broker/Tests)
- endif(CFB_BUILD_TESTS)
-
- if(CFB_BUILD_TOOLS)
- add_subdirectory(${CFB_ROOT_DIR}/Driver/Client)
- endif(CFB_BUILD_TOOLS)
-endif(CFB_BUILD_BROKER)
-
-if(CFB_BUILD_GUI)
- add_subdirectory(${CFB_ROOT_DIR}/GUI)
-
- if(CFB_BUILD_TESTS)
- add_subdirectory(${CFB_ROOT_DIR}/GUI/Tests)
- endif(CFB_BUILD_TESTS)
-endif(CFB_BUILD_GUI)

Driver/Source/Driver.rc.in

@@ -1,7 +1,7 @@
 #include <Winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION @BROKER_VERSION_MAJOR@,@BROKER_VERSION_MINOR@,@BROKER_VERSION_PATCH@,0
+FILEVERSION @DRIVER_VERSION_MAJOR@,@DRIVER_VERSION_MINOR@,@DRIVER_VERSION_PATCH@,0
 PRODUCTVERSION @CFB_VERSION_MAJOR@,@CFB_VERSION_MINOR@,@CFB_VERSION_PATCH@,0
 FILEOS VOS_NT_WINDOWS32
 FILETYPE VFT_DRV

Driver/Source/DriverUtils.cpp

@@ -54,8 +54,10 @@ ToString(KIRQL const Level)
  return "APC_LEVEL";
  case DISPATCH_LEVEL:
  return "DISPATCH_LEVEL";
+#ifdef CMCI_LEVEL
  case CMCI_LEVEL:
  return "CMCI_LEVEL";
+#endif // CMCI_LEVEL
  case CLOCK_LEVEL:
  return "CLOCK_LEVEL";
  case POWER_LEVEL:

cmake/FindWdk.cmake

@@ -80,12 +80,16 @@ set(WDK_COMPILE_FLAGS
 set(WDK_COMPILE_DEFINITIONS "WINNT=1")
 set(WDK_COMPILE_DEFINITIONS_DEBUG "MSC_NOOPT;DEPRECATE_DDK_FUNCTIONS=1;DBG=1")
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+if(CMAKE_GENERATOR_PLATFORM STREQUAL "win32")
  list(APPEND WDK_COMPILE_DEFINITIONS "_X86_=1;i386=1;STD_CALL")
  set(WDK_PLATFORM "x86")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
  list(APPEND WDK_COMPILE_DEFINITIONS "_WIN64;_AMD64_;AMD64")
  set(WDK_PLATFORM "x64")
+elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "arm64")
+ list(APPEND WDK_COMPILE_DEFINITIONS "_WIN64;_ARM64_;ARM64")
+ set(WDK_COMPILE_FLAGS ${WDK_COMPILE_FLAGS} /GS-) # TODO: fixes missing symbol __security_pop_cookie, fix
+ set(WDK_PLATFORM "arm64")
 else()
  message(FATAL_ERROR "Unsupported architecture")
 endif()
@@ -133,11 +137,15 @@ function(wdk_add_driver _target)
  "${WDK_ROOT}/Include/${WDK_VERSION}/km/crt"
  )
 
- target_link_libraries(${_target} WDK::NTOSKRNL WDK::HAL WDK::BUFFEROVERFLOWK WDK::WMILIB)
+ target_link_libraries(${_target}
+ WDK::NTOSKRNL
+ WDK::HAL
+ WDK::WMILIB
 
- if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- target_link_libraries(${_target} WDK::MEMCMP)
- endif()
+ $<$<STREQUAL:${CMAKE_GENERATOR_PLATFORM},arm64>:WDK::BUFFEROVERFLOWFASTFAILK>
+ $<$<STREQUAL:${CMAKE_GENERATOR_PLATFORM},x64>:WDK::BUFFEROVERFLOWK>
+ $<$<STREQUAL:${CMAKE_GENERATOR_PLATFORM},win32>:WDK::BUFFEROVERFLOWK WDK::MEMCMP>
+ )
 
  if(DEFINED WDK_KMDF)
  target_include_directories(${_target} SYSTEM PRIVATE "${WDK_ROOT}/Include/wdf/kmdf/${WDK_KMDF}")