renun/ViGEmBus
1
0
Fork 0
mirror of https://github.com/nefarius/ViGEmBus.git synced 2025-08-10 00:52:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved user-data to last parameter of notification

Browse Source
This commit is contained in:
JP Flouret
2020-04-02 10:26:30 -07:00
parent 4ad5aa90e1
commit cbb94a3750
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Tester/Tester.cpp
View File

@@ -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();

8
include/ViGEm/Client.h
View File

@@ -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;

10
src/ViGEmClient.cpp
View File

@@ -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
);
}
};