[ros-diffs] [reactos] 20/26: [WDF] Synchronize function attributes between declaration & definition

[Jérôme Gardou]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e55eeb2d9c14cff0b8659…

commit e55eeb2d9c14cff0b8659db2a4463f43d8343363
Author:     Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Fri Jun 18 09:58:04 2021 +0200
Commit:     Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Mon Jun 28 10:20:57 2021 +0200

    [WDF] Synchronize function attributes between declaration & definition
    
    Addendum to 1f377076d783
---
 sdk/lib/drivers/wdf/kmdf/src/core/fxchildlist.cpp                    | 1 -
 sdk/lib/drivers/wdf/shared/core/fxdevice.cpp                         | 2 ++
 sdk/lib/drivers/wdf/shared/core/km/fxdriverkm.cpp                    | 1 +
 sdk/lib/drivers/wdf/shared/irphandlers/general/fxpkggeneral.cpp      | 2 ++
 sdk/lib/drivers/wdf/shared/irphandlers/pnp/fdopower.cpp              | 3 +++
 sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgfdo.cpp              | 2 ++
 sdk/lib/drivers/wdf/shared/targets/general/fxiotarget.cpp            | 1 +
 sdk/lib/drivers/wdf/shared/targets/general/km/fxiotargetremotekm.cpp | 1 +
 8 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sdk/lib/drivers/wdf/kmdf/src/core/fxchildlist.cpp
b/sdk/lib/drivers/wdf/kmdf/src/core/fxchildlist.cpp
index e749b7c9a3f..8bbfcf803c2 100644
--- a/sdk/lib/drivers/wdf/kmdf/src/core/fxchildlist.cpp
+++ b/sdk/lib/drivers/wdf/kmdf/src/core/fxchildlist.cpp
@@ -412,7 +412,6 @@ exit:
     return ntStatus;
 }
 
-_Must_inspect_result_
 VOID
 FxChildList::Initialize(
     __in PWDF_CHILD_LIST_CONFIG Config
diff --git a/sdk/lib/drivers/wdf/shared/core/fxdevice.cpp
b/sdk/lib/drivers/wdf/shared/core/fxdevice.cpp
index 6fb8723283f..4157f4c244b 100644
--- a/sdk/lib/drivers/wdf/shared/core/fxdevice.cpp
+++ b/sdk/lib/drivers/wdf/shared/core/fxdevice.cpp
@@ -1332,6 +1332,7 @@ FxDevice::_AcquireOptinRemoveLock(
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxDevice::DispatchWithLock(
     __in MdDeviceObject DeviceObject,
     __in MdIrp Irp
@@ -1546,6 +1547,7 @@ DispatchWorker(
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxDevice::Dispatch(
     __in MdDeviceObject DeviceObject,
     __in MdIrp       Irp
diff --git a/sdk/lib/drivers/wdf/shared/core/km/fxdriverkm.cpp
b/sdk/lib/drivers/wdf/shared/core/km/fxdriverkm.cpp
index 9c80b0b1e7f..75deb8d3945 100644
--- a/sdk/lib/drivers/wdf/shared/core/km/fxdriverkm.cpp
+++ b/sdk/lib/drivers/wdf/shared/core/km/fxdriverkm.cpp
@@ -34,6 +34,7 @@ extern "C" {
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxDriver::AddDevice(
     __in MdDriverObject DriverObject,
     __in MdDeviceObject PhysicalDeviceObject
diff --git a/sdk/lib/drivers/wdf/shared/irphandlers/general/fxpkggeneral.cpp
b/sdk/lib/drivers/wdf/shared/irphandlers/general/fxpkggeneral.cpp
index 80e144aabfa..9c8cb352e21 100644
--- a/sdk/lib/drivers/wdf/shared/irphandlers/general/fxpkggeneral.cpp
+++ b/sdk/lib/drivers/wdf/shared/irphandlers/general/fxpkggeneral.cpp
@@ -1444,6 +1444,7 @@ Return Value:
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxPkgGeneral::_CreateCompletionRoutine(
     __in MdDeviceObject DeviceObject,
     __in MdIrp           OriginalIrp,
@@ -1500,6 +1501,7 @@ Return Value:
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxPkgGeneral::_CreateCompletionRoutine2(
     __in MdDeviceObject DeviceObject,
     __in MdIrp           OriginalIrp,
diff --git a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fdopower.cpp
b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fdopower.cpp
index 09b20e0e0ac..05bd8893095 100644
--- a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fdopower.cpp
+++ b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fdopower.cpp
@@ -154,6 +154,7 @@ Returns:
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxPkgFdo::_SystemPowerS0Completion(
     __in MdDeviceObject DeviceObject,
     __in MdIrp OriginalIrp,
@@ -205,6 +206,7 @@ FxPkgFdo::_SystemPowerS0Completion(
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxPkgFdo::_SystemPowerSxCompletion(
     __in MdDeviceObject DeviceObject,
     __in MdIrp OriginalIrp,
@@ -365,6 +367,7 @@ FxPkgFdo::RaiseDevicePower(
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxPkgFdo::RaiseDevicePowerCompletion(
     __in MdDeviceObject DeviceObject,
     __in MdIrp OriginalIrp,
diff --git a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgfdo.cpp
b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgfdo.cpp
index ec29a1a4dc9..fa8e598b43b 100644
--- a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgfdo.cpp
+++ b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgfdo.cpp
@@ -1434,6 +1434,7 @@ Return Value:
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxPkgFdo::_PnpFilteredStartDeviceCompletionRoutine(
     __in    MdDeviceObject DeviceObject,
     __inout MdIrp Irp,
@@ -1457,6 +1458,7 @@ FxPkgFdo::_PnpFilteredStartDeviceCompletionRoutine(
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxPkgFdo::_PnpStartDeviceCompletionRoutine(
     __in    MdDeviceObject DeviceObject,
     __inout MdIrp Irp,
diff --git a/sdk/lib/drivers/wdf/shared/targets/general/fxiotarget.cpp
b/sdk/lib/drivers/wdf/shared/targets/general/fxiotarget.cpp
index 12066b6891f..c374947142b 100644
--- a/sdk/lib/drivers/wdf/shared/targets/general/fxiotarget.cpp
+++ b/sdk/lib/drivers/wdf/shared/targets/general/fxiotarget.cpp
@@ -2402,6 +2402,7 @@ Return Value:
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxIoTarget::_RequestCompletionRoutine(
     MdDeviceObject DeviceObject,
     MdIrp Irp,
diff --git a/sdk/lib/drivers/wdf/shared/targets/general/km/fxiotargetremotekm.cpp
b/sdk/lib/drivers/wdf/shared/targets/general/km/fxiotargetremotekm.cpp
index 63f743c380a..90100bb5050 100644
--- a/sdk/lib/drivers/wdf/shared/targets/general/km/fxiotargetremotekm.cpp
+++ b/sdk/lib/drivers/wdf/shared/targets/general/km/fxiotargetremotekm.cpp
@@ -29,6 +29,7 @@ extern "C" {
 
 _Must_inspect_result_
 NTSTATUS
+STDCALL
 FxIoTargetRemote::_PlugPlayNotification(
     __in PVOID NotificationStructure,
     __inout_opt PVOID Context