[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-cvs
Subject:    =?UTF-8?Q?R=C3=A9mi_Bernon_=3A_dinput=3A_Rename_wReserved_to_wReportId_in?= =?UTF-8?Q?_DIDEVICEOBJEC
From:       Alexandre Julliard <julliard () winehq ! org>
Date:       2021-05-31 20:58:36
Message-ID: E1lnozc-0001qF-Fd () winehq ! org
[Download RAW message or body]

Module: wine
Branch: master
Commit: 2d629228ddd71d8c308da755c91b667a895dc4f8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2d629228ddd71d8c308da755c91b667a895dc4f8

Author: Rémi Bernon <rbernon@codeweavers.com>
Date:   Mon May 31 10:23:59 2021 +0200

dinput: Rename wReserved to wReportId in DIDEVICEOBJECTINSTANCE.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

---

 dlls/dinput/ansi.c | 2 +-
 include/dinput.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c
index 431b812aeb2..390b2f56581 100644
--- a/dlls/dinput/ansi.c
+++ b/dlls/dinput/ansi.c
@@ -92,7 +92,7 @@ static void dideviceobjectinstance_wtoa( const DIDEVICEOBJECTINSTANCEW *in, DIDE
     out->wUsage = in->wUsage;
     out->dwDimension = in->dwDimension;
     out->wExponent = in->wExponent;
-    out->wReserved = in->wReserved;
+    out->wReportId = in->wReportId;
 }
 
 static void dideviceinstance_wtoa( const DIDEVICEINSTANCEW *in, DIDEVICEINSTANCEA *out )
diff --git a/include/dinput.h b/include/dinput.h
index 2d183bbc944..a073054b388 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -358,7 +358,7 @@ typedef struct DIDEVICEOBJECTINSTANCEA {
     WORD	wUsage;
     DWORD	dwDimension;
     WORD	wExponent;
-    WORD	wReserved;
+    WORD	wReportId;
 } DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA;
 typedef const DIDEVICEOBJECTINSTANCEA *LPCDIDEVICEOBJECTINSTANCEA;
 
@@ -377,7 +377,7 @@ typedef struct DIDEVICEOBJECTINSTANCEW {
     WORD	wUsage;
     DWORD	dwDimension;
     WORD	wExponent;
-    WORD	wReserved;
+    WORD	wReportId;
 } DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW;
 typedef const DIDEVICEOBJECTINSTANCEW *LPCDIDEVICEOBJECTINSTANCEW;
 


[prev in list] [next in list] [prev in thread] [next in thread]