From cbb94a3750de1edb0ce81e91a12abc4e85a298d1 Mon Sep 17 00:00:00 2001
From: JP Flouret <jpflouret@gmail.com>
Date: Thu, 2 Apr 2020 10:26:30 -0700
Subject: [PATCH] Moved user-data to last parameter of notification

---
 app/Tester/Tester.cpp  |  4 ++--
 include/ViGEm/Client.h |  8 ++++----
 src/ViGEmClient.cpp    | 10 ++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/Tester/Tester.cpp b/app/Tester/Tester.cpp
index f3c8ece..5dcf350 100644
--- a/app/Tester/Tester.cpp
+++ b/app/Tester/Tester.cpp
@@ -16,10 +16,10 @@ static std::mutex m;
 VOID CALLBACK notification(
     PVIGEM_CLIENT Client,
     PVIGEM_TARGET Target,
-    LPVOID UserData,
     UCHAR LargeMotor,
     UCHAR SmallMotor,
-    UCHAR LedNumber
+    UCHAR LedNumber,
+    LPVOID UserData
 )
 {
     m.lock();
diff --git a/include/ViGEm/Client.h b/include/ViGEm/Client.h
index 3acc105..3d36283 100644
--- a/include/ViGEm/Client.h
+++ b/include/ViGEm/Client.h
@@ -111,10 +111,10 @@ extern "C" {
         EVT_VIGEM_X360_NOTIFICATION(
             PVIGEM_CLIENT Client,
             PVIGEM_TARGET Target,
-            LPVOID UserData,
             UCHAR LargeMotor,
             UCHAR SmallMotor,
-            UCHAR LedNumber
+            UCHAR LedNumber,
+            LPVOID UserData
         );
 
     typedef EVT_VIGEM_X360_NOTIFICATION *PFN_VIGEM_X360_NOTIFICATION;
@@ -125,10 +125,10 @@ extern "C" {
         EVT_VIGEM_DS4_NOTIFICATION(
             PVIGEM_CLIENT Client,
             PVIGEM_TARGET Target,
-            LPVOID UserData,
             UCHAR LargeMotor,
             UCHAR SmallMotor,
-            DS4_LIGHTBAR_COLOR LightbarColor
+            DS4_LIGHTBAR_COLOR LightbarColor,
+            LPVOID UserData
         );
 
     typedef EVT_VIGEM_DS4_NOTIFICATION *PFN_VIGEM_DS4_NOTIFICATION;
diff --git a/src/ViGEmClient.cpp b/src/ViGEmClient.cpp
index 7e5e2f7..18e8bd8 100644
--- a/src/ViGEmClient.cpp
+++ b/src/ViGEmClient.cpp
@@ -106,10 +106,11 @@ public:
 	void ProcessNotificationRequest(PVIGEM_CLIENT client, PVIGEM_TARGET target) override
 	{
 		if(target->Notification != nullptr)
-			PFN_VIGEM_X360_NOTIFICATION(target->Notification)(client, target, target->NotificationUserData,
+			PFN_VIGEM_X360_NOTIFICATION(target->Notification)(client, target,
 				((PXUSB_REQUEST_NOTIFICATION)lpPayloadBuffer)->LargeMotor, 
 				((PXUSB_REQUEST_NOTIFICATION)lpPayloadBuffer)->SmallMotor,
-				((PXUSB_REQUEST_NOTIFICATION)lpPayloadBuffer)->LedNumber
+				((PXUSB_REQUEST_NOTIFICATION)lpPayloadBuffer)->LedNumber,
+				target->NotificationUserData
 			);
 	}
 };
@@ -126,10 +127,11 @@ public:
 	void ProcessNotificationRequest(PVIGEM_CLIENT client, PVIGEM_TARGET target) override
 	{
 		if (target->Notification != nullptr)
-			PFN_VIGEM_DS4_NOTIFICATION(target->Notification)(client, target, target->NotificationUserData,
+			PFN_VIGEM_DS4_NOTIFICATION(target->Notification)(client, target,
 				((PDS4_REQUEST_NOTIFICATION)lpPayloadBuffer)->Report.LargeMotor,
 				((PDS4_REQUEST_NOTIFICATION)lpPayloadBuffer)->Report.SmallMotor,
-				((PDS4_REQUEST_NOTIFICATION)lpPayloadBuffer)->Report.LightbarColor
+				((PDS4_REQUEST_NOTIFICATION)lpPayloadBuffer)->Report.LightbarColor,
+				target->NotificationUserData
 			);
 	}
 };