[WDF] Fix KMDF so it can compile with ReactOS SDK

Not all files are included, but these are necessary to compile cdrom driver. So far it can only be statically linked with drivers, a proper implementation requires wdfldr helper driver
2025-07-31 23:14:12 +00:00 · 2020-10-16 06:30:51 +03:00 · 2020-10-16 06:30:51 +03:00 · 1f377076d7
commit 1f377076d7
parent 8a978a179f
258 changed files with 4047 additions and 2387 deletions
--- a/sdk/lib/drivers/wdf/shared/support/fxcollection.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxcollection.cpp
@ -23,7 +23,7 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 FxCollectionInternal::FxCollectionInternal(
    VOID
--- a/sdk/lib/drivers/wdf/shared/support/fxcollectionapi.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxcollectionapi.cpp
@ -22,10 +22,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxCollectionApi.tmh"
+// #include "FxCollectionApi.tmh"
 }

 //
@ -35,6 +35,7 @@ extern "C" {
 _Must_inspect_result_
 __drv_maxIRQL(DISPATCH_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfCollectionCreate)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -105,6 +106,7 @@ WDFEXPORT(WdfCollectionCreate)(

 __drv_maxIRQL(DISPATCH_LEVEL)
 ULONG
+STDCALL
 WDFEXPORT(WdfCollectionGetCount)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -133,6 +135,7 @@ WDFEXPORT(WdfCollectionGetCount)(
 _Must_inspect_result_
 __drv_maxIRQL(DISPATCH_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfCollectionAdd)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -170,6 +173,7 @@ WDFEXPORT(WdfCollectionAdd)(

 __drv_maxIRQL(DISPATCH_LEVEL)
 VOID
+STDCALL
 WDFEXPORT(WdfCollectionRemoveItem)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -225,6 +229,7 @@ WDFEXPORT(WdfCollectionRemoveItem)(

 __drv_maxIRQL(DISPATCH_LEVEL)
 VOID
+STDCALL
 WDFEXPORT(WdfCollectionRemove)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -283,6 +288,7 @@ WDFEXPORT(WdfCollectionRemove)(

 __drv_maxIRQL(DISPATCH_LEVEL)
 WDFOBJECT
+STDCALL
 WDFEXPORT(WdfCollectionGetItem)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -296,11 +302,8 @@ WDFEXPORT(WdfCollectionGetItem)(

    FxCollection *pCollection;
    FxObject *pObject;
-    WDFOBJECT hObject;
    KIRQL irql;

-    hObject = NULL;
-
    FxObjectHandleGetPtr(GetFxDriverGlobals(DriverGlobals),
                         Collection,
                         FX_TYPE_COLLECTION,
@ -319,6 +322,7 @@ WDFEXPORT(WdfCollectionGetItem)(

 __drv_maxIRQL(DISPATCH_LEVEL)
 WDFOBJECT
+STDCALL
 WDFEXPORT(WdfCollectionGetFirstItem)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -351,6 +355,7 @@ WDFEXPORT(WdfCollectionGetFirstItem)(

 __drv_maxIRQL(DISPATCH_LEVEL)
 WDFOBJECT
+STDCALL
 WDFEXPORT(WdfCollectionGetLastItem)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
--- a/sdk/lib/drivers/wdf/shared/support/fxdeviceinterface.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxdeviceinterface.cpp
@ -22,10 +22,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxDeviceInterface.tmh"
+// #include "FxDeviceInterface.tmh"
 }

 FxDeviceInterface::FxDeviceInterface(
--- a/sdk/lib/drivers/wdf/shared/support/fxdeviceinterfaceapi.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxdeviceinterfaceapi.cpp
@ -23,10 +23,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxDeviceInterfaceAPI.tmh"
+// #include "FxDeviceInterfaceAPI.tmh"
 }

 //
@ -37,6 +37,7 @@ extern "C" {
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfDeviceCreateDeviceInterface)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -164,6 +165,7 @@ Done:

 __drv_maxIRQL(PASSIVE_LEVEL)
 VOID
+STDCALL
 WDFEXPORT(WdfDeviceSetDeviceInterfaceState)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -271,6 +273,7 @@ WDFEXPORT(WdfDeviceSetDeviceInterfaceState)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfDeviceRetrieveDeviceInterfaceString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
--- a/sdk/lib/drivers/wdf/shared/support/fxdevicetext.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxdevicetext.cpp
@ -22,7 +22,7 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 FxDeviceText::FxDeviceText(
    VOID
--- a/sdk/lib/drivers/wdf/shared/support/fxregistryapi.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxregistryapi.cpp
@ -22,10 +22,11 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxRegistryAPI.tmh"
+// #include "FxRegistryAPI.tmh"
+#define RtlSizeTToULong RtlULongPtrToULong
 }

 extern "C" {
@ -50,6 +51,7 @@ extern "C" {
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryOpenKey)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -162,6 +164,7 @@ WDFEXPORT(WdfRegistryOpenKey)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryCreateKey)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -281,6 +284,7 @@ WDFEXPORT(WdfRegistryCreateKey)(

 __drv_maxIRQL(PASSIVE_LEVEL)
 VOID
+STDCALL
 WDFEXPORT(WdfRegistryClose)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -313,6 +317,7 @@ WDFEXPORT(WdfRegistryClose)(

 __drv_maxIRQL(PASSIVE_LEVEL)
 HANDLE
+STDCALL
 WDFEXPORT(WdfRegistryWdmGetHandle)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -335,6 +340,7 @@ WDFEXPORT(WdfRegistryWdmGetHandle)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryRemoveKey)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -374,6 +380,7 @@ WDFEXPORT(WdfRegistryRemoveKey)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryRemoveValue)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -415,6 +422,7 @@ WDFEXPORT(WdfRegistryRemoveValue)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryQueryValue)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -485,6 +493,7 @@ WDFEXPORT(WdfRegistryQueryValue)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryQueryMemory)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -603,6 +612,7 @@ WDFEXPORT(WdfRegistryQueryMemory)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryQueryMultiString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -786,6 +796,7 @@ WDFEXPORT(WdfRegistryQueryMultiString)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryQueryUnicodeString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -908,6 +919,7 @@ WDFEXPORT(WdfRegistryQueryUnicodeString)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryQueryString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -1043,6 +1055,7 @@ WDFEXPORT(WdfRegistryQueryString)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryQueryULong)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -1094,6 +1107,7 @@ WDFEXPORT(WdfRegistryQueryULong)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryAssignValue)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -1147,6 +1161,7 @@ WDFEXPORT(WdfRegistryAssignValue)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryAssignMemory)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -1239,6 +1254,7 @@ WDFEXPORT(WdfRegistryAssignMemory)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryAssignULong)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -1288,6 +1304,7 @@ WDFEXPORT(WdfRegistryAssignULong)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryAssignUnicodeString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -1374,6 +1391,7 @@ WDFEXPORT(WdfRegistryAssignUnicodeString)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryAssignString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -1433,6 +1451,7 @@ WDFEXPORT(WdfRegistryAssignString)(
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfRegistryAssignMultiString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
--- a/sdk/lib/drivers/wdf/shared/support/fxregkey.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxregkey.cpp
@ -1,7 +1,7 @@
 //
 //    Copyright (C) Microsoft.  All rights reserved.
 //
-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
 #if defined(EVENT_TRACING)
--- a/sdk/lib/drivers/wdf/shared/support/fxrequestbuffer.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxrequestbuffer.cpp
@ -22,10 +22,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxRequestBuffer.tmh"
+// #include "FxRequestBuffer.tmh"
 }

 FxRequestBuffer::FxRequestBuffer(
--- a/sdk/lib/drivers/wdf/shared/support/fxresourceapi.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxresourceapi.cpp
@ -22,10 +22,10 @@ Environment:
 Revision History:

 --*/
-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxResourceAPI.tmh"
+// #include "FxResourceAPI.tmh"
 }

 //
--- a/sdk/lib/drivers/wdf/shared/support/fxresourcecollection.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxresourcecollection.cpp
@ -23,7 +23,7 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
 #if defined(EVENT_TRACING)
--- a/sdk/lib/drivers/wdf/shared/support/fxspinlock.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxspinlock.cpp
@ -22,11 +22,11 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
-#include "FxSpinLock.hpp"
+#include "fxsupportpch.hpp"
+#include "fxspinlock.hpp"

 extern "C" {
-#include "FxSpinLock.tmh"
+// #include "FxSpinLock.tmh"
 }

 FxSpinLock::FxSpinLock(
--- a/sdk/lib/drivers/wdf/shared/support/fxspinlockapi.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxspinlockapi.cpp
@ -22,11 +22,11 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
-#include "FxSpinLock.hpp"
+#include "fxsupportpch.hpp"
+#include "fxspinlock.hpp"

 extern "C" {
-#include "FxSpinLockAPI.tmh"
+// #include "FxSpinLockAPI.tmh"
 }

 //
@ -37,6 +37,7 @@ extern "C" {
 _Must_inspect_result_
 __drv_maxIRQL(DISPATCH_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfSpinLockCreate)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -108,6 +109,7 @@ WDFEXPORT(WdfSpinLockCreate)(
 __drv_raisesIRQL(DISPATCH_LEVEL)
 __drv_maxIRQL(DISPATCH_LEVEL)
 VOID
+STDCALL
 WDFEXPORT(WdfSpinLockAcquire)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -145,6 +147,7 @@ WDFEXPORT(WdfSpinLockAcquire)(
 __drv_maxIRQL(DISPATCH_LEVEL)
 __drv_minIRQL(DISPATCH_LEVEL)
 VOID
+STDCALL
 WDFEXPORT(WdfSpinLockRelease)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
--- a/sdk/lib/drivers/wdf/shared/support/fxstring.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxstring.cpp
@ -23,7 +23,7 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 FxString::FxString(
    __in PFX_DRIVER_GLOBALS FxDriverGlobals
--- a/sdk/lib/drivers/wdf/shared/support/fxstringapi.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxstringapi.cpp
@ -22,10 +22,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C"  {
-#include "FxStringAPI.tmh"
+// #include "FxStringAPI.tmh"
 }

 extern "C" {
@ -33,6 +33,7 @@ extern "C" {
 _Must_inspect_result_
 __drv_maxIRQL(PASSIVE_LEVEL)
 NTSTATUS
+STDCALL
 WDFEXPORT(WdfStringCreate)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -116,6 +117,7 @@ WDFEXPORT(WdfStringCreate)(

 __drv_maxIRQL(PASSIVE_LEVEL)
 VOID
+STDCALL
 WDFEXPORT(WdfStringGetUnicodeString)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
--- a/sdk/lib/drivers/wdf/shared/support/fxsupportpch.hpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxsupportpch.hpp
@ -17,9 +17,9 @@ Abstract:
 #define __FX_SUPPORT_PCH_HPP__

 #if FX_CORE_MODE == FX_CORE_USER_MODE
-#include "um\FxSupportPchUM.hpp"
+#include "um/fxsupportpchum.hpp"
 #elif FX_CORE_MODE == FX_CORE_KERNEL_MODE
-#include "km\FxSupportPchKM.hpp"
+#include "km/fxsupportpchkm.hpp"
 #endif

 #endif // __FX_SUPPORT_PCH_HPP__
--- a/sdk/lib/drivers/wdf/shared/support/fxtelemetry.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxtelemetry.cpp
@ -32,13 +32,13 @@ Notes:
 #include "fxldr.h"
 #include <ntstrsafe.h>
 #else
-#include "DriverFrameworks-UserMode-UmEvents.h"
-#include "FxldrUm.h"
+#include "driverframeworks-usermode-umevents.h"
+#include "fxldrum.h"
 #endif

 extern "C" {
 #if defined(EVENT_TRACING)
-#include "FxTelemetry.tmh"
+#include "fxtelemetry.tmh"
 #endif
 }

--- a/sdk/lib/drivers/wdf/shared/support/fxtransactionedlist.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxtransactionedlist.cpp
@ -24,7 +24,7 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 FxTransactionedList::FxTransactionedList()
 {
--- a/sdk/lib/drivers/wdf/shared/support/fxwaitlock.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxwaitlock.cpp
@ -18,12 +18,12 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 #if defined(EVENT_TRACING)
 // Tracing support
 extern "C" {
-#include "FxWaitLock.tmh"
+#include "fxwaitlock.tmh"
 }
 #endif

--- a/sdk/lib/drivers/wdf/shared/support/fxwaitlockapi.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/fxwaitlockapi.cpp
@ -22,7 +22,7 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 // extern the entire file
 extern "C" {
@ -32,6 +32,7 @@ _Must_inspect_result_
 __drv_maxIRQL(DISPATCH_LEVEL)
 NTSTATUS
 WDFAPI
+STDCALL
 WDFEXPORT(WdfWaitLockCreate)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -97,6 +98,7 @@ __drv_when(Timeout != 0 && *Timeout == 0, __drv_maxIRQL(DISPATCH_LEVEL))
 __drv_when(Timeout != 0 && *Timeout != 0, __drv_maxIRQL(PASSIVE_LEVEL))
 NTSTATUS
 WDFAPI
+STDCALL
 WDFEXPORT(WdfWaitLockAcquire)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
@ -151,6 +153,7 @@ Return Value:
 __drv_maxIRQL(DISPATCH_LEVEL)
 VOID
 WDFAPI
+STDCALL
 WDFEXPORT(WdfWaitLockRelease)(
    __in
    PWDF_DRIVER_GLOBALS DriverGlobals,
--- a/sdk/lib/drivers/wdf/shared/support/km/fxdeviceinterfacekm.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/km/fxdeviceinterfacekm.cpp
@ -22,10 +22,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxDeviceInterfaceKM.tmh"
+// #include "FxDeviceInterfaceKM.tmh"
 }

 FxDeviceInterface::FxDeviceInterface(
--- a/sdk/lib/drivers/wdf/shared/support/km/fxregkeykm.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/km/fxregkeykm.cpp
@ -18,10 +18,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxRegKeyKM.tmh"
+// #include "FxRegKeyKM.tmh"
 }

 #define AT_PASSIVE()     ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL)
--- a/sdk/lib/drivers/wdf/shared/support/km/fxrequestbufferkm.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/km/fxrequestbufferkm.cpp
@ -22,10 +22,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C" {
-#include "FxRequestBufferKm.tmh"
+// #include "FxRequestBufferKm.tmh"
 }

 _Must_inspect_result_
--- a/sdk/lib/drivers/wdf/shared/support/km/fxresourcecollectionkm.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/km/fxresourcecollectionkm.cpp
@ -23,7 +23,7 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 #if defined(EVENT_TRACING)
 // Tracing support
--- a/sdk/lib/drivers/wdf/shared/support/km/fxsupportpchkm.hpp
+++ b/sdk/lib/drivers/wdf/shared/support/km/fxsupportpchkm.hpp
@ -29,13 +29,13 @@ extern "C" {

 #include <fxmin.hpp>

-#include "FxCollection.hpp"
-#include "StringUtil.hpp"
-#include "FxString.hpp"
-#include "FxDeviceText.hpp"
-#include "FxWaitLock.hpp"
+#include "fxcollection.hpp"
+#include "stringutil.hpp"
+#include "fxstring.hpp"
+#include "fxdevicetext.hpp"
+#include "fxwaitlock.hpp"

-#include <WdfResource.h>
-#include <FxResource.hpp>
+#include <wdfresource.h>
+#include <fxresource.hpp>

 #endif // __FX_SUPPORT_PCH_KM_HPP__
--- a/sdk/lib/drivers/wdf/shared/support/stringutil.cpp
+++ b/sdk/lib/drivers/wdf/shared/support/stringutil.cpp
@ -22,10 +22,10 @@ Revision History:

 --*/

-#include "FxSupportPch.hpp"
+#include "fxsupportpch.hpp"

 extern "C"  {
-#include "StringUtil.tmh"
+// #include "StringUtil.tmh"
 }

 size_t