Changeset 588 for trunk/src/winmm/joy.cpp

Timestamp:

Aug 19, 1999, 8:46:54 PM (26 years ago)

Author:

phaller

Message:

Add: added ODINWRAP support for WINMM

File:

• trunk/src/winmm/joy.cpp (modified) (17 diffs)

trunk/src/winmm/joy.cpp

@@ -1 @@
-/* $Id: joy.cpp,v 1.5 1999-06-30 11:29:40 sandervl Exp $ */
+/* $Id: joy.cpp,v 1.6 1999-08-19 18:46:04 phaller Exp $ */
 /*
  * Odin Joystick apis
@@ -9 +9 @@
  *
  */
+
+/****************************************************************************
+ * Includes                                                                 *
+ ****************************************************************************/
+
 #include <os2win.h>
 #include <mmsystem.h>
+#include <odinwrap.h>
 #include <misc.h>
 #include <string.h>
@@ -20 +26 @@
 #include "joyos2.h"
 
+ODINDEBUGCHANNEL(WINMM-JOY)
+
+
 #define MAXJOYDRIVERS 2
 
@@ -83 +92 @@
 
 /*****************************************************************************
- * Name      : UINT WIN32API joyGetNumDevs
- * Purpose   : Get number of installed joysticks
+ODINFUNCTION0(*, :
+ODINFUNCTION0(INT, joyGetNumDevs* Purpose   : Get number of installed joysticks
  * Status    : Done
  *
  * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 10:00]
  *****************************************************************************/
-UINT WIN32API joyGetNumDevs()
+ODINFUNCTION0(UINT, joyGetNumDevs)
 {
   HANDLE            hJoy;
@@ -120 +129 @@
 
 /*****************************************************************************
- * Name      : UINT WIN32API joyGetDevCapsW
- * Purpose   : Get Joystick capatibities (Unicode)
+ODINFUNCTION1(*, :,
+ODINFUNCTION1(UINT,, *,
+              Purpose, :Get Joystick capatibities (Unicode)
  * Status    : Done
  *
  * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:40]
  *****************************************************************************/
-MMRESULT WIN32API joyGetDevCapsW(UINT wID, LPJOYCAPSW lpCaps,UINT wSize)
-{
-    dprintf(("WINMM:joyGetDevCapsW = %d %X %d\n",wID, lpCaps, wSize));
-
+ODINFUNCTION3(MMRESULT, joyGetDevCapsW,
+              UINT, wID,
+              LPJOYCAPSW, lpCaps,
+              UINT, wSize)
+{
     if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
 
@@ -167 +178 @@
 
 /*****************************************************************************
- * Name      : UINT WIN32API joyGetDevCapsW
- * Purpose   : Get Joystick capatibities (Unicode)
+ODINFUNCTION1(*, :,
+ODINFUNCTION1(UINT,, *,
+              Purpose, :Get Joystick capatibities (Unicode)
  * Status    : Done
  *
  * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  *****************************************************************************/
-MMRESULT WIN32API joyGetDevCapsA(UINT wID, LPJOYCAPSA lpCaps,UINT wSize)
-{
-    dprintf(("WINMM:joyGetDevCapsA = %d %X %d\n",wID, lpCaps, wSize));
-
+ODINFUNCTION3(MMRESULT, joyGetDevCapsA,
+              UINT, wID,
+              LPJOYCAPSA, lpCaps,
+              UINT, wSize)
+{
     if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
 
@@ -213 +226 @@
 
 /*****************************************************************************
- * Name      : MMRESULT WIN32API joyGetPosEx
- * Purpose   : Get the extended actual joystick position
+ODINFUNCTION1(*, :,
+ODINFUNCTION1(MMRESULT,, *,
+              Purpose, :Get the extended actual joystick position
  * Status    : Done (but not all functions are functionally but Quake2
  *             running with this function)
@@ -220 +234 @@
  * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 23:42]
  *****************************************************************************/
-MMRESULT WIN32API joyGetPosEx(UINT uJoyID, LPJOYINFOEX pji)
+ODINFUNCTION2(MMRESULT, joyGetPosEx,
+              UINT, uJoyID,
+              LPJOYINFOEX, pji)
 {
   JOYINFO            ji;
@@ -227 +243 @@
   DWORD              rc;
 
-  dprintf(("WINMM:joyGetPosEx %d %X",uJoyID, pji));
-
   if (uJoyID >= MAXJOYDRIVERS) return JOYERR_PARMS;
 
@@ -237 +251 @@
   rc=JoyOpen(&hGamePort);
 
-  if (rc) return (MMSYSERR_NODRIVER);  
+  if (rc) return (MMSYSERR_NODRIVER);
 
   JoyGetPos(hGamePort,uJoyID,&ji);
@@ -304 +318 @@
 
 /*****************************************************************************
- * Name      : MMRESULT WIN32API joyGetPos
- * Purpose   : Get the actual joystick position
- * Status    : Done
- *
- * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
- *****************************************************************************/
-MMRESULT WIN32API joyGetPos(UINT uJoyID, LPJOYINFO pji)
+ODINFUNCTION2(*, :,
+ODINFUNCTION6(MMRESULT,, joyGetPos,
+              *,, Purpose:,
+              Get, the,
+              actual, joystick,
+              position *, Status,
+              :, Done,
+              * *, Author: Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
+ *****************************************************************************/
+ODINFUNCTION2(MMRESULT, joyGetPos,
+              UINT, uJoyID,
+              LPJOYINFO, pji)
 {
   HANDLE   hGame;
   MMRESULT rc;
-  dprintf(("WINMM:joyGetPos %d %X\n",uJoyID, pji));
-
   if (uJoyID >= MAXJOYDRIVERS) return JOYERR_PARMS;
 
@@ -331 +348 @@
 }
 /*****************************************************************************
- * Name      : MMRESULT WIN32API joyGetThreshold
- * Status    : Done
- *
- * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
- *****************************************************************************/
-MMRESULT WINAPI joyGetThreshold(UINT wID, LPUINT lpThreshold)
+ODINFUNCTION2(*, :,
+ODINFUNCTION2(MMRESULT,, joyGetThreshold,
+              *,, Status:,
+              Done *, *Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
+ *****************************************************************************/
+ODINFUNCTION2(MMRESULT, joyGetThreshold,
+              UINT, wID,
+              LPUINT, lpThreshold)
 {
     dprintf(("WINMM:joyGetThreshold %d %X\n",wID, lpThreshold));
@@ -348 +367 @@
 
 /*****************************************************************************
- * Name      : MMRESULT WIN32API joySetThreshold
- * Status    : Done
- *
- * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
- *****************************************************************************/
-MMRESULT WINAPI joySetThreshold(UINT wID, UINT wThreshold)
-{
-   dprintf(("WINMM:joySetThreshold %d %d\n",wID, wThreshold));
-
+ODINFUNCTION2(*, :,
+ODINFUNCTION2(MMRESULT,, joySetThreshold,
+              *,, Status:,
+              Done *, *Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
+ *****************************************************************************/
+ODINFUNCTION2(MMRESULT, joySetThreshold,
+              UINT, wID,
+              UINT, wThreshold)
+{
    if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
 
@@ -374 +393 @@
 
 /*****************************************************************************
- * Name      : MMRESULT WIN32API joySetCapture
- * Purpose   : Start joystick moves capturing
- * Status    : Done
+ODINFUNCTION4(*, :,
+ODINFUNCTION4(MMRESULT,, joySetCapture,
+              *,, Purpose,
+              :,, Start,
+              joystick,, movescapturing,
+              *, Status: Done
  *
  * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  *****************************************************************************/
-MMRESULT WINAPI joySetCapture(HWND hWnd,UINT wID,UINT wPeriod,BOOL bChanged)
+ODINFUNCTION4(MMRESULT, joySetCapture,
+              HWND, hWnd,
+              UINT, wID,
+              UINT, wPeriod,
+              BOOL, bChanged)
 {
    JOYTHREADOPT *newthr;
    INT          iThreadId;
    DWORD        rc;
-
-   dprintf(("WINMM:joySetCapture %x %d %d %d\n", hWnd, wID, wPeriod, bChanged));
 
    if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
@@ -412 +436 @@
 
 /*****************************************************************************
- * Name      : MMRESULT WIN32API joyReleaseCapture
- * Purpose   : Stop capturing joystick moves
+ODINFUNCTION1(*, :,
+ODINFUNCTION1(MMRESULT,, *,
+              Purpose, :Stop capturing joystick moves
  * Status    : Done (but must be rewriting)
  *
  * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  *****************************************************************************/
-MMRESULT WINAPI joyReleaseCapture(UINT wID)
+ODINFUNCTION1(MMRESULT, joyReleaseCapture,
+              UINT, wID)
 {
   // TODO: Semaphores or waiting for thread...
-  dprintf(("WINMM:joyReleaseCapture %d\n",wID));
-
   if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
 
@@ -433 +457 @@
 
 /*****************************************************************************
- * Name      : MMRESULT WIN32API joyConfigChanged
- * Status    : Stub but done ;-)
- *
- * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
- *****************************************************************************/
-MMRESULT WIN32API joyConfigChanged( DWORD dwFlags )
-{
-  dprintf(("WINMM:joyConfigChanged %X\n",dwFlags));
-
+ODINFUNCTION1(*, :,
+ODINFUNCTION4(MMRESULT,, *,
+              Status, :,
+              Stub, but,
+              done, ;-,
+              * *, Author)
+: Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
+ *****************************************************************************/
+ODINFUNCTION1(MMRESULT, joyConfigChanged,
+              DWORD, dwFlags)
+{
   return JOYERR_NOERROR;
 }
@@ -500 +526 @@
   _endthread();
 }
+