Changeset 1630 for trunk/include

Timestamp:

Nov 8, 1999, 2:45:35 PM (26 years ago)

Author:

sandervl

Message:

header changes/additions

Location:

trunk/include/win

Files:

• dinput.h (modified) (12 diffs)
• winerror.h (modified) (8 diffs)

trunk/include/win/dinput.h

@@ -1 @@
-/* $Id: dinput.h,v 1.1 1999-05-24 20:19:11 ktk Exp $ */
-
-#ifndef _WINE_DINPUT_H
-#define _WINE_DINPUT_H
+#ifndef __WINE_DINPUT_H
+#define __WINE_DINPUT_H
 
 #include "windef.h" /* for MAX_PATH */
@@ -460 +458 @@
 typedef struct DIPROPCAL {
         DIPROPHEADER diph;
-        LONG    lMin;
-        LONG    lCenter;
-        LONG    lMax;
+        LONG    lMin;
+        LONG    lCenter;
+        LONG    lMax;
 } DIPROPCAL, *LPDIPROPCAL;
 typedef const DIPROPCAL *LPCDIPROPCAL;
@@ -638 +636 @@
 
 typedef struct DIEFFESCAPE {
-        DWORD                   dwSize;
-        DWORD                   dwCommand;
-        LPVOID                  lpvInBuffer;
-        DWORD                   cbInBuffer;
-        LPVOID                  lpvOutBuffer;
-        DWORD                   cbOutBuffer;
+        DWORD   dwSize;
+        DWORD   dwCommand;
+        LPVOID  lpvInBuffer;
+        DWORD   cbInBuffer;
+        LPVOID  lpvOutBuffer;
+        DWORD   cbOutBuffer;
 } DIEFFESCAPE, *LPDIEFFESCAPE;
+
+typedef struct DIJOYSTATE {
+        LONG    lX;
+        LONG    lY;
+        LONG    lZ;
+        LONG    lRx;
+        LONG    lRy;
+        LONG    lRz;
+        LONG    rglSlider[2];
+        DWORD   rgdwPOV[4];
+        BYTE    rgbButtons[32];
+} DIJOYSTATE, *LPDIJOYSTATE;
+
+typedef struct DIJOYSTATE2 {
+        LONG    lX;
+        LONG    lY;
+        LONG    lZ;
+        LONG    lRx;
+        LONG    lRy;
+        LONG    lRz;
+        LONG    rglSlider[2];
+        DWORD   rgdwPOV[4];
+        BYTE    rgbButtons[128];
+        LONG    lVX;            /* 'v' as in velocity */
+        LONG    lVY;
+        LONG    lVZ;
+        LONG    lVRx;
+        LONG    lVRy;
+        LONG    lVRz;
+        LONG    rglVSlider[2];
+        LONG    lAX;            /* 'a' as in acceleration */
+        LONG    lAY;
+        LONG    lAZ;
+        LONG    lARx;
+        LONG    lARy;
+        LONG    lARz;
+        LONG    rglASlider[2];
+        LONG    lFX;            /* 'f' as in force */
+        LONG    lFY;
+        LONG    lFZ;
+        LONG    lFRx;           /* 'fr' as in rotational force aka torque */
+        LONG    lFRy;
+        LONG    lFRz;
+        LONG    rglFSlider[2];
+} DIJOYSTATE2, *LPDIJOYSTATE2;
+
+#define DIJOFS_X                FIELD_OFFSET(DIJOYSTATE, lX)
+#define DIJOFS_Y                FIELD_OFFSET(DIJOYSTATE, lY)
+#define DIJOFS_Z                FIELD_OFFSET(DIJOYSTATE, lZ)
+#define DIJOFS_RX               FIELD_OFFSET(DIJOYSTATE, lRx)
+#define DIJOFS_RY               FIELD_OFFSET(DIJOYSTATE, lRy)
+#define DIJOFS_RZ               FIELD_OFFSET(DIJOYSTATE, lRz)
+#define DIJOFS_SLIDER(n)        (FIELD_OFFSET(DIJOYSTATE, rglSlider) + \
+                                                        (n) * sizeof(LONG))
+#define DIJOFS_POV(n)           (FIELD_OFFSET(DIJOYSTATE, rgdwPOV) + \
+                                                        (n) * sizeof(DWORD))
+#define DIJOFS_BUTTON(n)        (FIELD_OFFSET(DIJOYSTATE, rgbButtons) + (n))
+#define DIJOFS_BUTTON0          DIJOFS_BUTTON(0)
+#define DIJOFS_BUTTON1          DIJOFS_BUTTON(1)
+#define DIJOFS_BUTTON2          DIJOFS_BUTTON(2)
+#define DIJOFS_BUTTON3          DIJOFS_BUTTON(3)
+#define DIJOFS_BUTTON4          DIJOFS_BUTTON(4)
+#define DIJOFS_BUTTON5          DIJOFS_BUTTON(5)
+#define DIJOFS_BUTTON6          DIJOFS_BUTTON(6)
+#define DIJOFS_BUTTON7          DIJOFS_BUTTON(7)
+#define DIJOFS_BUTTON8          DIJOFS_BUTTON(8)
+#define DIJOFS_BUTTON9          DIJOFS_BUTTON(9)
+#define DIJOFS_BUTTON10         DIJOFS_BUTTON(10)
+#define DIJOFS_BUTTON11         DIJOFS_BUTTON(11)
+#define DIJOFS_BUTTON12         DIJOFS_BUTTON(12)
+#define DIJOFS_BUTTON13         DIJOFS_BUTTON(13)
+#define DIJOFS_BUTTON14         DIJOFS_BUTTON(14)
+#define DIJOFS_BUTTON15         DIJOFS_BUTTON(15)
+#define DIJOFS_BUTTON16         DIJOFS_BUTTON(16)
+#define DIJOFS_BUTTON17         DIJOFS_BUTTON(17)
+#define DIJOFS_BUTTON18         DIJOFS_BUTTON(18)
+#define DIJOFS_BUTTON19         DIJOFS_BUTTON(19)
+#define DIJOFS_BUTTON20         DIJOFS_BUTTON(20)
+#define DIJOFS_BUTTON21         DIJOFS_BUTTON(21)
+#define DIJOFS_BUTTON22         DIJOFS_BUTTON(22)
+#define DIJOFS_BUTTON23         DIJOFS_BUTTON(23)
+#define DIJOFS_BUTTON24         DIJOFS_BUTTON(24)
+#define DIJOFS_BUTTON25         DIJOFS_BUTTON(25)
+#define DIJOFS_BUTTON26         DIJOFS_BUTTON(26)
+#define DIJOFS_BUTTON27         DIJOFS_BUTTON(27)
+#define DIJOFS_BUTTON28         DIJOFS_BUTTON(28)
+#define DIJOFS_BUTTON29         DIJOFS_BUTTON(29)
+#define DIJOFS_BUTTON30         DIJOFS_BUTTON(30)
+#define DIJOFS_BUTTON31         DIJOFS_BUTTON(31)
 
 /*****************************************************************************
@@ -651 +738 @@
 #define ICOM_INTERFACE IDirectInputEffect
 #define IDirectInputEffect_METHODS \
-    ICOM_METHOD3(HRESULT,Initialize,      HINSTANCE,, DWORD,, REFGUID,) \
-    ICOM_METHOD1(HRESULT,GetEffectGuid,   LPGUID,) \
-    ICOM_METHOD2(HRESULT,GetParameters,   LPDIEFFECT,, DWORD,) \
-    ICOM_METHOD2(HRESULT,SetParameters,   LPCDIEFFECT,, DWORD,) \
-    ICOM_METHOD2(HRESULT,Start,           DWORD,, DWORD,) \
+    ICOM_METHOD3(HRESULT,Initialize,      HINSTANCE, hinst, DWORD, dwVersion, REFGUID, rguid) \
+    ICOM_METHOD1(HRESULT,GetEffectGuid,   LPGUID,a) \
+    ICOM_METHOD2(HRESULT,GetParameters,   LPDIEFFECT,a, DWORD,b) \
+    ICOM_METHOD2(HRESULT,SetParameters,   LPCDIEFFECT,a, DWORD,b) \
+    ICOM_METHOD2(HRESULT,Start,           DWORD,a, DWORD,b) \
     ICOM_METHOD (HRESULT,Stop) \
-    ICOM_METHOD1(HRESULT,GetEffectStatus, LPDWORD,) \
+    ICOM_METHOD1(HRESULT,GetEffectStatus, LPDWORD,a) \
     ICOM_METHOD (HRESULT,Download) \
     ICOM_METHOD (HRESULT,Unload) \
-    ICOM_METHOD1(HRESULT,Escape,          LPDIEFFESCAPE,)
+    ICOM_METHOD1(HRESULT,Escape,          LPDIEFFESCAPE,a)
 #define IDirectInputEffect_IMETHODS \
     IUnknown_IMETHODS \
@@ -667 +754 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
     /*** IUnknown methods ***/
 #define IDirectInputEffect_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -683 +769 @@
 #define IDirectInputEffect_Unload(p)              ICOM_CALL (Unload,p)
 #define IDirectInputEffect_Escape(p,a)            ICOM_CALL1(Escape,p,a)
-#endif
 
 
@@ -712 +797 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
     /*** IUnknown methods ***/
 #define IDirectInputDevice_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -733 +817 @@
 #define IDirectInputDevice_RunControlPanel(p,a,b)     ICOM_CALL2(RunControlPanel,p,a,b)
 #define IDirectInputDevice_Initialize(p,a,b,c)        ICOM_CALL3(Initialize,p,a,b,c)
-#endif
 
 
@@ -756 +839 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IDirectInputDevice2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -787 +869 @@
 #define IDirectInputDevice2_Poll(p)                           ICOM_CALL (Poll,p)
 #define IDirectInputDevice2_SendDeviceData(p,a,b,c,d)         ICOM_CALL4(SendDeviceData,p,a,b,c,d)
-#endif
 
 /* "Standard" Mouse report... */
@@ -822 +903 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IDirectInputA_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -833 +913 @@
 #define IDirectInputA_RunControlPanel(p,a,b) ICOM_CALL2(RunControlPanel,p,a,b)
 #define IDirectInputA_Initialize(p,a,b)      ICOM_CALL2(Initialize,p,a,b)
-#endif
-
+
+/* Export functions */ 
+
+HRESULT WINAPI DirectInputCreateA(HINSTANCE,DWORD,LPDIRECTINPUTA *,LPUNKNOWN);
+HRESULT WINAPI DirectInputCreateW(HINSTANCE,DWORD,LPDIRECTINPUTA *,LPUNKNOWN);
+#define DirectInputCreate WINELIB_NAME_AW(DirectInputCreate)
 
 #endif /* __WINE_DINPUT_H */

trunk/include/win/winerror.h

@@ -1 @@
-/* $Id: winerror.h,v 1.2 1999-09-02 10:31:20 phaller Exp $ */
-
 #ifndef __WINE_WINERROR_H
 #define __WINE_WINERROR_H
@@ -243 +241 @@
 #define ERROR_NOACCESS              998
 #define ERROR_SWAPERROR             999
+
 #define ERROR_STACK_OVERFLOW                  1001L
 #define ERROR_INVALID_MESSAGE                 1002L
@@ -326 +325 @@
 #define ERROR_POSSIBLE_DEADLOCK               1131L
 #define ERROR_MAPPED_ALIGNMENT                1132L
-#define ERROR_BAD_USERNAME                    2202L
-#define ERROR_NOT_CONNECTED                   2250L
-#define ERROR_OPEN_FILES                      2401L
-#define ERROR_ACTIVE_CONNECTIONS              2402L
-#define ERROR_DEVICE_IN_USE                   2404L
 #define ERROR_BAD_DEVICE                      1200L
 #define ERROR_CONNECTION_UNAVAIL              1201L
@@ -375 +369 @@
 #define ERROR_ALREADY_REGISTERED              1242L
 #define ERROR_SERVICE_NOT_FOUND               1243L
+#define ERROR_NOT_AUTHENTICATED               1244L
+#define ERROR_NOT_LOGGED_ON                   1245L
+#define ERROR_CONTINUE                        1246L
+#define ERROR_ALREADY_INITIALIZED             1247L
+#define ERROR_NO_MORE_DEVICES                 1248L
+
 #define ERROR_NOT_ALL_ASSIGNED                1300L
 #define ERROR_SOME_NOT_MAPPED                 1301L
@@ -469 +469 @@
 #define ERROR_DISK_CORRUPT                    1393L
 #define ERROR_NO_USER_SESSION_KEY             1394L
+
 #define ERROR_INVALID_WINDOW_HANDLE           1400L
 #define ERROR_INVALID_MENU_HANDLE             1401L
@@ -519 +520 @@
 #define ERROR_INVALID_SCROLLBAR_RANGE         1448L
 #define ERROR_INVALID_SHOWWIN_COMMAND         1449L
+#define ERROR_COMMITMENT_LIMIT                1455L
+
 #define ERROR_EVENTLOG_FILE_CORRUPT           1500L
 #define ERROR_EVENTLOG_CANT_START             1501L
@@ -573 +576 @@
 #define ERROR_TRANSFORM_NOT_SUPPORTED         2004L
 #define ERROR_CLIPPING_NOT_SUPPORTED          2005L
+
+#define ERROR_BAD_USERNAME                    2202L
+#define ERROR_NOT_CONNECTED                   2250L
+#define ERROR_OPEN_FILES                      2401L
+#define ERROR_ACTIVE_CONNECTIONS              2402L
+#define ERROR_DEVICE_IN_USE                   2404L
+
 #define ERROR_UNKNOWN_PRINT_MONITOR           3000L
 #define ERROR_PRINTER_DRIVER_IN_USE           3001L
@@ -622 +632 @@
 #define CLIPBRD_E_BAD_DATA      0x800401D3L
 #define CLIPBRD_E_CANT_CLOSE    0x800401D4L
-
 
 /* Drag and Drop */