commit 1ae26ebafcaf361867f1365ab764e9680dc3d914
author Vincent Béron <vberon@mecano.gme.usherb.ca> Sun Jun 02 21:18:48 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jun 02 21:18:48 2002 +0000
tree 2cc0fb2dc0fa34ac9144b2618bbf0f69824ace8b
parent c075f35e1adfb7924004bf0270e64e6a705ff399

- Made sure const LP were actually const in dinput.h.
- Uniformized the {A,W} declarations of some structures.

include/dinput.h

diff --git a/include/dinput.h b/include/dinput.h
index 9eb90e1..cf86603 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -214,7 +214,8 @@
     WORD	wExponent;
     WORD	wReserved;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA,*LPCDIDEVICEOBJECTINSTANCEA;
+} DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA;
+typedef const DIDEVICEOBJECTINSTANCEA *LPCDIDEVICEOBJECTINSTANCEA;
 
 typedef struct {
     DWORD	dwSize;
@@ -234,9 +235,12 @@
     WORD	wExponent;
     WORD	wReserved;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW,*LPCDIDEVICEOBJECTINSTANCEW;
-DECL_WINELIB_TYPE_AW(LPDIDEVICEOBJECTINSTANCE)
+} DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW;
+typedef const DIDEVICEOBJECTINSTANCEW *LPCDIDEVICEOBJECTINSTANCEW;
+
 DECL_WINELIB_TYPE_AW(DIDEVICEOBJECTINSTANCE)
+DECL_WINELIB_TYPE_AW(LPDIDEVICEOBJECTINSTANCE)
+DECL_WINELIB_TYPE_AW(LPCDIDEVICEOBJECTINSTANCE)
 
 
 typedef struct {
@@ -251,7 +255,8 @@
     WORD	wUsagePage;
     WORD	wUsage;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEINSTANCEA, *LPDIDEVICEINSTANCEA, *LPCDIDEVICEINSTANCEA;
+} DIDEVICEINSTANCEA, *LPDIDEVICEINSTANCEA;
+typedef const DIDEVICEINSTANCEA *LPCDIDEVICEINSTANCEA;
 
 typedef struct {
     DWORD	dwSize;
@@ -265,7 +270,9 @@
     WORD	wUsagePage;
     WORD	wUsage;
 #endif /* DIRECTINPUT_VERSION >= 0x0500 */
-} DIDEVICEINSTANCEW, *LPDIDEVICEINSTANCEW, *LPCDIDEVICEINSTANCEW;
+} DIDEVICEINSTANCEW, *LPDIDEVICEINSTANCEW;
+typedef const DIDEVICEINSTANCEW *LPCDIDEVICEINSTANCEW;
+
 DECL_WINELIB_TYPE_AW(DIDEVICEINSTANCE)
 DECL_WINELIB_TYPE_AW(LPDIDEVICEINSTANCE)
 DECL_WINELIB_TYPE_AW(LPCDIDEVICEINSTANCE)
@@ -449,7 +456,8 @@
     DWORD	dwData;
     DWORD	dwTimeStamp;
     DWORD	dwSequence;
-} DIDEVICEOBJECTDATA,*LPDIDEVICEOBJECTDATA,*LPCDIDEVICEOBJECTDATA;
+} DIDEVICEOBJECTDATA,*LPDIDEVICEOBJECTDATA;
+typedef const DIDEVICEOBJECTDATA *LPCDIDEVICEOBJECTDATA;
 
 typedef struct _DIOBJECTDATAFORMAT {
     const GUID *pguid;
@@ -511,7 +519,8 @@
 	DIPROPHEADER diph;
 	GUID    guidClass;
 	WCHAR   wszPath[MAX_PATH];
-} DIPROPGUIDANDPATH, *LPDIPROPGUIDANDPATH,*LPCDIPROPGUIDANDPATH;
+} DIPROPGUIDANDPATH, *LPDIPROPGUIDANDPATH;
+typedef const DIPROPGUIDANDPATH *LPCDIPROPGUIDANDPATH;
 
 /* special property GUIDs */
 #ifdef __cplusplus
@@ -657,6 +666,7 @@
 	DWORD			dwDynamicParams;
 	CHAR			tszName[MAX_PATH];
 } DIEFFECTINFOA, *LPDIEFFECTINFOA;
+typedef const DIEFFECTINFOA *LPCDIEFFECTINFOA;
 
 typedef struct DIEFFECTINFOW {
 	DWORD			dwSize;
@@ -666,18 +676,11 @@
 	DWORD			dwDynamicParams;
 	WCHAR			tszName[MAX_PATH];
 } DIEFFECTINFOW, *LPDIEFFECTINFOW;
-
-#ifdef UNICODE
-typedef DIEFFECTINFOW DIEFFECTINFO;
-typedef LPDIEFFECTINFOW LPDIEFFECTINFO;
-#else
-typedef DIEFFECTINFOA DIEFFECTINFO;
-typedef LPDIEFFECTINFOA LPDIEFFECTINFO;
-#endif
-
-typedef const DIEFFECTINFOA *LPCDIEFFECTINFOA;
 typedef const DIEFFECTINFOW *LPCDIEFFECTINFOW;
-typedef const DIEFFECTINFO  *LPCDIEFFECTINFO;
+
+DECL_WINELIB_TYPE_AW(DIEFFECTINFO)
+DECL_WINELIB_TYPE_AW(LPDIEFFECTINFO)
+DECL_WINELIB_TYPE_AW(LPCDIEFFECTINFO)
 
 typedef BOOL (CALLBACK *LPDIENUMEFFECTSCALLBACKA)(LPCDIEFFECTINFOA, LPVOID);
 typedef BOOL (CALLBACK *LPDIENUMEFFECTSCALLBACKW)(LPCDIEFFECTINFOW, LPVOID);