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

Timestamp:

May 22, 2002, 5:50:26 PM (23 years ago)

Author:

sandervl

Message:

added debug wrappers (.def)

File:

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

trunk/src/winmm/joy.cpp

@@ -1 @@
-/* $Id: joy.cpp,v 1.9 2001-04-04 09:02:16 sandervl Exp $ */
+/* $Id: joy.cpp,v 1.10 2002-05-22 15:50:24 sandervl Exp $ */
 /*
  * Odin Joystick apis
@@ -29 +29 @@
 #include "dbglocal.h"
 
-ODINDEBUGCHANNEL(WINMM-JOY)
-
-
 #define MAXJOYDRIVERS 2
 
@@ -99 +96 @@
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 10:00]
  */
-ODINFUNCTION0(UINT, joyGetNumDevs)
+UINT WINAPI joyGetNumDevs()
 {
   HANDLE            hJoy;
@@ -134 +131 @@
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 09:40]
  */
-ODINFUNCTION3(MMRESULT, joyGetDevCapsW,
-              UINT, wID,
-              LPJOYCAPSW, lpCaps,
-              UINT, wSize)
+MMRESULT WINAPI joyGetDevCapsW(UINT wID, LPJOYCAPSW lpCaps, UINT wSize)
 {
     if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
@@ -176 +170 @@
 
 /**
- * Get Joystick capatibities (Unicode)
+ * Get Joystick capatibities (Ascii)
  * @status      Completely Done
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  */
-ODINFUNCTION3(MMRESULT, joyGetDevCapsA,
-              UINT, wID,
-              LPJOYCAPSA, lpCaps,
-              UINT, wSize)
+MMRESULT WINAPI joyGetDevCapsA(UINT wID, LPJOYCAPSA lpCaps, UINT wSize)
 {
     if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
@@ -227 +218 @@
  *              running with this function.
  */
-ODINFUNCTION2(MMRESULT, joyGetPosEx,
-              UINT, uJoyID,
-              LPJOYINFOEX, pji)
+MMRESULT WINAPI joyGetPosEx(UINT uJoyID, LPJOYINFOEX pji)
 {
   JOYINFO            ji;
@@ -315 +304 @@
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  */
-ODINFUNCTION2(MMRESULT, joyGetPos,
-              UINT, uJoyID,
-              LPJOYINFO, pji)
+MMRESULT WINAPI joyGetPos(UINT uJoyID, LPJOYINFO pji)
 {
   HANDLE   hGame;
@@ -341 +328 @@
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  */
-ODINFUNCTION2(MMRESULT, joyGetThreshold,
-              UINT, wID,
-              LPUINT, lpThreshold)
+MMRESULT WINAPI joyGetThreshold(UINT wID, LPUINT lpThreshold)
 {
     dprintf(("WINMM:joyGetThreshold %d %X\n",wID, lpThreshold));
@@ -358 +343 @@
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  */
-ODINFUNCTION2(MMRESULT, joySetThreshold,
-              UINT, wID,
-              UINT, wThreshold)
+MMRESULT WINAPI joySetThreshold(UINT wID, UINT wThreshold)
 {
    if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
@@ -383 +366 @@
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  */
-ODINFUNCTION4(MMRESULT, joySetCapture,
-              HWND, hWnd,
-              UINT, wID,
-              UINT, wPeriod,
-              BOOL, bChanged)
+MMRESULT WINAPI joySetCapture(HWND hWnd, UINT wID, UINT wPeriod, BOOL bChanged)
 {
    JOYTHREADOPT *newthr;
@@ -422 +401 @@
  * @remark      Must be rewritten.
  */
-ODINFUNCTION1(MMRESULT, joyReleaseCapture,
-              UINT, wID)
+MMRESULT WINAPI joyReleaseCapture(UINT wID)
 {
   // TODO: Semaphores or waiting for thread...
@@ -439 +417 @@
  * @author      Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
  */
-ODINFUNCTION1(MMRESULT, joyConfigChanged,
-              DWORD, dwFlags)
+MMRESULT WINAPI joyConfigChanged(DWORD dwFlags)
 {
   return JOYERR_NOERROR;