[SDK][WDF][USBDEX][NTOSKRNL_VISTA] Fully enable KMDF (reactos#8396)

[SDK][WDFLDR] Add kmdf loader driver
[SDK][WDF] Add kmdf drver init static library
[SDK][WDF] Modify kmdf driver for working with wdfldr driver
[SDK][CDROM] Cdrom driver dynamically linking with kmdf
[SDK][WDF] Add kmdfdriver module type
[SDK][WDF][USBDEX][NTOSKRNL_VISTA] Fully enable KMDF
[KMDF][WDFLDR][WDF01000] Fix Windows 10 Compatibility WDFLDR and WDF01000
[WDF01000] NO_KERNEL_LIST_ENTRY_CHECKS for wdf01000 3rd party code

This PR is an accumulation of three peoples work, with the goal of the trying to get WDF to work like it should.
This has been tested in combination with some extra NT6+ ntoskrnl against multiple drivers.

---------

Co-authored-by: Max Korostil <[email protected]>
Co-authored-by: Victor Perevertkin <[email protected]>
Co-authored-by: Adam Słaboń <[email protected]>
Co-authored-by: Hermès BÉLUSCA - MAÏTO <[email protected]>

Author: 5 people

boot/bootdata/hivesys.inf

@@ -1454,6 +1454,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x000000
 HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \
  "System Reserved", \
  "EMS", \
+ "WdfLoadGroup", \
  "Boot Bus Extender", \
  "System Bus Extender", \
  "SCSI Miniport", \

boot/bootdata/txtsetup.sif

@@ -135,6 +135,8 @@ wmilib.sys   = 1,,,,,,,4,,,,1,4
 ksecdd.sys   = 1,,,,,,,4,,,,1,4
 mountmgr.sys = 1,,,,,,x,4,,,,1,4
 partmgr.sys  = 1,,,,,,x,4,,,,1,4
+wdfldr.sys   = 1,,,,,,,4,,,,1,4
+wdf01000.sys = 1,,,,,,x,4,,,,1,4
 
 [SourceDisksFiles.x86]
 acpi.sys     = 1,,,,,,,4,1,,,1,4

drivers/storage/class/cdrom/CMakeLists.txt

@@ -18,7 +18,7 @@ list(APPEND SOURCE
     cdrom.h)
 
 add_library(cdrom MODULE ${SOURCE} cdrom.rc)
-set_module_type(cdrom kernelmodedriver)
+set_module_type(cdrom kmdfdriver)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
     target_compile_options(cdrom PRIVATE -Wno-format -Wno-unused-variable -Wno-pointer-sign)
@@ -29,10 +29,11 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
     target_compile_options(cdrom PRIVATE -Wno-enum-conversion -Wno-tautological-constant-compare)
 endif()
 
-target_compile_definitions(cdrom PRIVATE DEBUG_USE_KDPRINT)
+target_compile_definitions(cdrom PRIVATE DEBUG_USE_KDPRINT 
+    WDF_DEVICE_NO_WDMSEC_H _WIN32_WINNT=0x603 NTDDI_VERSION=0x06030000)
 
-target_link_libraries(cdrom wdf01000 ntoskrnl_vista libcntpr ${PSEH_LIB})
-add_importlibs(cdrom ntoskrnl hal)
+target_link_libraries(cdrom ntoskrnl_vista libcntpr ${PSEH_LIB})
+add_importlibs(cdrom wdfldr ntoskrnl hal)
 # add_pch(cdrom cdrom.h SOURCE)
 add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all)
 add_registry_inf(cdrom_reg.inf)

ntoskrnl/CMakeLists.txt

@@ -46,7 +46,7 @@ set_module_type(ntoskrnl kernel)
 
 source_group(TREE ${REACTOS_SOURCE_DIR}/ntoskrnl PREFIX "Source Files" FILES ${NTOSKRNL_SOURCE})
 
-target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
+target_link_libraries(ntoskrnl ntoskrnl_vista cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
 
 if(STACK_PROTECTOR)
     target_sources(ntoskrnl PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)

ntoskrnl/ntkrnlmp/CMakeLists.txt

@@ -37,7 +37,7 @@ if(STACK_PROTECTOR)
     target_sources(ntkrnlmp PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
 endif()
 
-target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
+target_link_libraries(ntkrnlmp ntoskrnl_vista cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
 add_importlibs(ntkrnlmp hal kdcom bootvid)
 add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${NTKRNLMP_PCH_SKIP_SOURCE}")
 add_dependencies(ntkrnlmp psdk asm)

ntoskrnl/ntoskrnl.spec

@@ -930,6 +930,16 @@
 @ stdcall PfxRemovePrefix(ptr ptr)
 @ stdcall PoCallDriver(ptr ptr)
 @ stdcall PoCancelDeviceNotify(ptr)
+@ stdcall -version=0x602+ PoFxActivateComponent(ptr long long)
+@ stdcall -version=0x602+ PoFxCompleteDevicePowerNotRequired(ptr)
+@ stdcall -version=0x602+ PoFxCompleteIdleCondition(ptr long)
+@ stdcall -version=0x602+ PoFxCompleteIdleState(ptr long)
+@ stdcall -version=0x602+ PoFxIdleComponent(ptr ptr long)
+@ stdcall -version=0x602+ PoFxRegisterDevice(ptr ptr ptr)
+@ stdcall -version=0x602+ PoFxReportDevicePoweredOn(ptr)
+@ stdcall -version=0x602+ PoFxSetDeviceIdleTimeout(ptr int64)
+@ stdcall -version=0x602+ PoFxStartDevicePowerManagement(ptr)
+@ stdcall -version=0x602+ PoFxUnregisterDevice(ptr)
 @ stdcall PoQueueShutdownWorkItem(ptr)
 @ stdcall PoRegisterDeviceForIdleDetection(ptr long long long)
 @ stdcall PoRegisterDeviceNotify(ptr long long long ptr ptr)

sdk/cmake/CMakeMacros.cmake

@@ -563,9 +563,9 @@ function(add_importlibs _module)
 endfunction()
 
 # Some helper lists
-list(APPEND VALID_MODULE_TYPES kernel kerneldll kernelmodedriver wdmdriver nativecui nativedll win32cui win32gui win32dll win32ocx cpl module)
-list(APPEND KERNEL_MODULE_TYPES kernel kerneldll kernelmodedriver wdmdriver)
-list(APPEND NATIVE_MODULE_TYPES kernel kerneldll kernelmodedriver wdmdriver nativecui nativedll)
+list(APPEND VALID_MODULE_TYPES kernel kerneldll kernelmodedriver kmdfdriver wdmdriver nativecui nativedll win32cui win32gui win32dll win32ocx cpl module)
+list(APPEND KERNEL_MODULE_TYPES kernel kerneldll kernelmodedriver kmdfdriver wdmdriver)
+list(APPEND NATIVE_MODULE_TYPES kernel kerneldll kernelmodedriver kmdfdriver wdmdriver nativecui nativedll)
 
 # Signs a driver if it is kernelmodedriver or wdmdriver if the cert exists
 function(sign_driver_if_needed TARGET)
@@ -656,6 +656,8 @@ function(set_module_type MODULE TYPE)
         set_entrypoint(${MODULE} DllMainCRTStartup 12)
     elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
         set_entrypoint(${MODULE} DriverEntry 8)
+    elseif(${TYPE} STREQUAL kmdfdriver)
+        set_entrypoint(${MODULE} FxDriverEntry 8)
     elseif(${TYPE} STREQUAL nativedll)
         set_entrypoint(${MODULE} DllMain 12)
     elseif(TYPE STREQUAL kernel)
@@ -688,7 +690,9 @@ function(set_module_type MODULE TYPE)
     # Now do some stuff which is specific to each type
     if(TYPE IN_LIST KERNEL_MODULE_TYPES)
         add_dependencies(${MODULE} bugcodes xdk)
-        if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
+        if((${TYPE} STREQUAL kernelmodedriver) OR
+           (${TYPE} STREQUAL kmdfdriver) OR
+           (${TYPE} STREQUAL wdmdriver))
             set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")
             sign_driver_if_needed(${MODULE})
         endif()
@@ -702,6 +706,12 @@ function(set_module_type MODULE TYPE)
             DEFINE_SYMBOL "")
     endif()
 
+    if(TYPE STREQUAL kmdfdriver)
+        target_include_directories(${MODULE} PUBLIC ${REACTOS_SOURCE_DIR}/sdk/include/wdf/kmdf/1.17)
+        add_importlibs(${MODULE} wdfldr)
+        target_link_libraries(${MODULE} wdfdriverentry)
+    endif()
+
     if(${TYPE} STREQUAL win32ocx)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")
     endif()

sdk/cmake/gcc.cmake

@@ -385,6 +385,11 @@ function(set_module_type_toolchain MODULE TYPE)
         -Wl,--major-image-version,5 -Wl,--minor-image-version,01 -Wl,--major-os-version,5 -Wl,--minor-os-version,01)
 
     if(TYPE IN_LIST KERNEL_MODULE_TYPES)
+        # "kmdfdriver" is treated the same way as "wdmdriver" in toolchain-specific set_module_type
+        if(${TYPE} STREQUAL "kmdfdriver")
+            set(TYPE "wdmdriver")
+        endif()
+
         target_link_options(${MODULE} PRIVATE -Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000)
 
         if(${TYPE} STREQUAL "wdmdriver")

sdk/include/ddk/usbdlib.h

@@ -240,6 +240,75 @@ USBD_ValidateConfigurationDescriptor(
   _Out_ PUCHAR *Offset,
   _In_opt_ ULONG Tag);
 
+/* UsbdEx lib */
+
+_Must_inspect_result_
+_IRQL_requires_(PASSIVE_LEVEL)
+NTSTATUS
+USBD_QueryUsbCapability(
+    _In_ USBD_HANDLE USBDHandle,
+    _In_ const GUID* CapabilityType,
+    _In_ ULONG       OutputBufferLength,
+    _When_(OutputBufferLength == 0, _Pre_null_)
+    _When_(OutputBufferLength != 0 && ResultLength == NULL, _Out_writes_bytes_(OutputBufferLength))
+    _When_(OutputBufferLength != 0 && ResultLength != NULL, _Out_writes_bytes_to_opt_(OutputBufferLength, *ResultLength))
+        PUCHAR                        OutputBuffer,
+    _Out_opt_ 
+    _When_(ResultLength != NULL, _Deref_out_range_(<=,OutputBufferLength))
+        PULONG                        ResultLength
+);
+
+_IRQL_requires_max_(DISPATCH_LEVEL)
+VOID
+USBD_AssignUrbToIoStackLocation(
+    _In_ USBD_HANDLE USBDHandle,
+    _In_ PIO_STACK_LOCATION IoStackLocation,
+    _In_ PURB Urb
+);
+
+_Must_inspect_result_
+_IRQL_requires_(PASSIVE_LEVEL)
+NTSTATUS
+USBD_CreateHandle(
+    _In_      PDEVICE_OBJECT DeviceObject,
+    _In_      PDEVICE_OBJECT TargetDeviceObject,
+    _In_      ULONG          USBDClientContractVersion,
+    _In_      ULONG          PoolTag,
+    _Out_     USBD_HANDLE   *USBDHandle
+);
+
+VOID
+USBD_CloseHandle(
+    _In_ USBD_HANDLE USBDHandle
+);
+
+_IRQL_requires_max_(DISPATCH_LEVEL)
+_Must_inspect_result_
+NTSTATUS
+USBD_UrbAllocate(
+    _In_ USBD_HANDLE USBDHandle,
+    _Outptr_result_bytebuffer_(sizeof(URB)) PURB *Urb
+);
+
+_IRQL_requires_max_(DISPATCH_LEVEL)
+_Must_inspect_result_
+NTSTATUS
+USBD_IsochUrbAllocate(
+    _In_ USBD_HANDLE USBDHandle,
+    _In_ ULONG NumberOfIsochPacket,
+    _Outptr_result_bytebuffer_(sizeof(struct _URB_ISOCH_TRANSFER) 
+                               + (NumberOfIsochPackets * sizeof(USBD_ISO_PACKET_DESCRIPTOR))
+                               - sizeof(USBD_ISO_PACKET_DESCRIPTOR)) 
+    PURB *Urb
+);
+
+_IRQL_requires_max_(DISPATCH_LEVEL)
+VOID
+USBD_UrbFree(
+    _In_ USBD_HANDLE USBDHandle,
+    _In_ PURB Urb
+);
+
 #endif
 
 #endif /* ! _USBD_ */

sdk/include/wdf/kmdf/1.17/wdf.h

@@ -65,7 +65,7 @@ WDF_EXTERN_C_START
 //
 #define WdfFunctions WdfFunctions_01017
 
-typedef VOID (*WDFFUNC) (VOID);
+typedef VOID (NTAPI *WDFFUNC) (VOID);
 extern const WDFFUNC *WdfFunctions;
 extern WDFFUNC WdfDriverMiniportUnloadOverride;