Ignore:
Timestamp:
May 22, 2002, 5:50:26 PM (23 years ago)
Author:
sandervl
Message:

added debug wrappers (.def)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/winmm/midi.cpp

    r5272 r8470  
    1 /* $Id: midi.cpp,v 1.9 2001-02-27 21:13:59 sandervl Exp $ */
     1/* $Id: midi.cpp,v 1.10 2002-05-22 15:50:24 sandervl Exp $ */
    22
    33/*
    … …  
    3131#include "dbglocal.h"
    3232
    33 ODINDEBUGCHANNEL(WINMM-MIDI)
    34 
    35 //SvL: 23/09/99: WinPostMsg no longer works, as win32 window handles are no longer PM handles
    36 BOOL WIN32API PostMessageA(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
    37 
    3833/*
    3934   Work to do:
    … …  
    119114
    120115/******************************************************************************/
    121 ODINFUNCTION3(MMRESULT, midiConnect,
    122               HMIDI, hMidiIn,
    123               HMIDIOUT, hMidiOut,
    124               LPVOID, pReserved)
     116MMRESULT WINAPI midiConnect(HMIDI hMidiIn, HMIDIOUT hMidiOut, LPVOID pReserved)
    125117{
    126118  // TODO: Implement using instance connections
    … …  
    142134
    143135/******************************************************************************/
    144 ODINFUNCTION3(MMRESULT, midiDisconnect,
    145               HMIDI, hMidiIn,
    146               HMIDIOUT, hMidiOut,
    147               LPVOID, pReserved)
     136MMRESULT WINAPI midiDisconnect(HMIDI hMidiIn, HMIDIOUT hMidiOut, LPVOID pReserved)
    148137{
    149138  // TODO: Implement using instance connections
    … …  
    165154
    166155/******************************************************************************/
    167 ODINFUNCTION3(MMRESULT, midiInAddBuffer,
    168               HMIDIIN, hMidiIn,
    169               LPMIDIHDR, lpMidiInHdr,
    170               UINT, cbMidiInHdr)
     156MMRESULT WINAPI midiInAddBuffer(HMIDIIN hMidiIn, LPMIDIHDR lpMidiInHdr, UINT cbMidiInHdr)
    171157{
    172158  dprintf(("WINMM:midiInAddBuffer -- not Implemented\n" ));
    … …  
    183169
    184170/******************************************************************************/
    185 ODINFUNCTION1(MMRESULT, midiInClose,
    186               HMIDIIN, hMidiIn)
     171MMRESULT WINAPI midiInClose(HMIDIIN hMidiIn)
    187172{
    188173  dprintf(("WINMM:midiInClose -- partially Implemented\n" ));
    … …  
    200185
    201186/******************************************************************************/
    202 ODINFUNCTION3(MMRESULT, midiInGetDevCapsA,
    203               UINT, uDeviceId,
    204               LPMIDIINCAPSA, midiInCaps,
    205               UINT,  sMidiInCaps)
     187MMRESULT WINAPI midiInGetDevCapsA(UINT uDeviceId, LPMIDIINCAPSA midiInCaps,
     188                                  UINT sMidiInCaps)
    206189{
    207190  dprintf(("WINMM:midiInGetDevCapsA(%u)\n", uDeviceId ));
    … …  
    229212
    230213/******************************************************************************/
    231 ODINFUNCTION3(MMRESULT, midiInGetDevCapsW,
    232               UINT, uDeviceId,
    233               LPMIDIINCAPSW, midiInCaps,
    234               UINT,  sMidiInCaps )
     214MMRESULT WINAPI midiInGetDevCapsW(UINT uDeviceId, LPMIDIINCAPSW midiInCaps,
     215                                  UINT sMidiInCaps )
    235216{
    236217  dprintf(("WINMM:midiInGetDevCapsA(%u)\n", uDeviceId ));
    … …  
    259240
    260241/******************************************************************************/
    261 ODINFUNCTION3(MMRESULT, midiInGetErrorTextA,
    262               MMRESULT, wError,
    263               LPSTR, lpText,
    264               UINT, cchText)
     242MMRESULT WINAPI midiInGetErrorTextA(MMRESULT wError, LPSTR lpText, UINT cchText)
    265243{
    266244  dprintf(("WINMM:midiInGetErrorTextA(%d)\n", wError ));
    … …  
    278256
    279257/******************************************************************************/
    280 ODINFUNCTION3(MMRESULT, midiInGetErrorTextW,
    281               MMRESULT, wError,
    282               LPWSTR, lpText,
    283               UINT, cchText)
     258MMRESULT WINAPI midiInGetErrorTextW(MMRESULT wError, LPWSTR lpText,
     259                                    UINT cchText)
    284260{
    285261  dprintf(("WINMM:midiInGetErrorTextW(%d)\n", wError ));
    … …  
    297273
    298274/******************************************************************************/
    299 ODINFUNCTION2(MMRESULT, midiInGetID,
    300               HMIDIIN, hMidiIn,
    301               LPUINT, puDeviceID)
     275MMRESULT WINAPI midiInGetID(HMIDIIN hMidiIn, LPUINT puDeviceID)
    302276{
    303277  dprintf(("WINMM:midiInGetID\n" ));
    … …  
    316290
    317291/******************************************************************************/
    318 ODINFUNCTION4(UINT, midiInMessage,
    319               HMIDIIN, hmi,
    320               UINT, msg,
    321               DWORD, dw1,
    322               DWORD, dw2)
     292UINT WINAPI midiInMessage(HMIDIIN hmi, UINT msg, DWORD dw1, DWORD dw2)
    323293{
    324294  dprintf(("WINMM:midiInMessage -- not Implemented\n" ));
    … …  
    327297
    328298/******************************************************************************/
    329 ODINFUNCTION0(UINT, midiInGetNumDevs)
     299UINT WINAPI midiInGetNumDevs()
    330300{
    331301  UINT i = IRTMIDI->numInInstances();
    … …  
    334304
    335305/******************************************************************************/
    336 ODINFUNCTION5(MMRESULT, midiInOpen,
    337               LPHMIDIIN, lphMidiIn,
    338               UINT, uDeviceId,
    339               DWORD, dwCallback,
    340               DWORD, dwCallbackInstance,
    341               DWORD, dwflags)
     306MMRESULT WINAPI midiInOpen(LPHMIDIIN lphMidiIn, UINT uDeviceId, DWORD dwCallback,
     307                           DWORD dwCallbackInstance, DWORD dwflags)
    342308{
    343309  dprintf(("WINMM:midiInOpen(%d) --  partial Implementation\n", uDeviceId ));
    … …  
    360326
    361327/******************************************************************************/
    362 ODINFUNCTION3(MMRESULT, midiInPrepareHeader,
    363               HMIDIIN, hMidiIn,
    364               LPMIDIHDR, lpMidiInHdr,
    365               UINT, cbMidiInHdr)
     328MMRESULT WINAPI midiInPrepareHeader(HMIDIIN hMidiIn, LPMIDIHDR lpMidiInHdr,
     329                                    UINT cbMidiInHdr)
    366330{
    367331  dprintf(("WINMM:midiInPrepareHeader -- not Implemented\n" ));
    … …  
    379343
    380344/******************************************************************************/
    381 ODINFUNCTION1(MMRESULT, midiInReset,
    382               HMIDIIN, hMidiIn)
     345MMRESULT WINAPI midiInReset(HMIDIIN hMidiIn)
    383346{
    384347  dprintf(("WINMM:midiInReset -- not Implemented\n" ));
    … …  
    395358
    396359/******************************************************************************/
    397 ODINFUNCTION1(MMRESULT, midiInStart,
    398               HMIDIIN, hMidiIn)
     360MMRESULT WINAPI midiInStart(HMIDIIN hMidiIn)
    399361{
    400362  dprintf(("WINMM:midiInStart\n" ));
    … …  
    411373
    412374/******************************************************************************/
    413 ODINFUNCTION1(MMRESULT, midiInStop,
    414               HMIDIIN, hMidiIn)
     375MMRESULT WINAPI midiInStop(HMIDIIN hMidiIn)
    415376{
    416377  dprintf(("WINMM:midiInStop\n" ));
    … …  
    427388
    428389/******************************************************************************/
    429 ODINFUNCTION3(MMRESULT, midiInUnprepareHeader,
    430               HMIDIIN, hMidiIn,
    431               LPMIDIHDR, lpMidiInHdr,
    432               UINT, cbMidiInHdr)
     390MMRESULT WINAPI midiInUnprepareHeader(HMIDIIN hMidiIn,
     391                                      LPMIDIHDR lpMidiInHdr,
     392                                      UINT cbMidiInHdr)
    433393{
    434394  dprintf(("WINMM:midiInUnPrepareHeader -- not Implemented\n" ));
    … …  
    445405
    446406/******************************************************************************/
    447 ODINFUNCTION4(MMRESULT, midiOutCacheDrumPatches,
    448               HMIDIOUT, hMidiOut,
    449               UINT, wPatch,
    450               WORD *, lpKeyArray,
    451               UINT, wFlags)
     407MMRESULT WINAPI midiOutCacheDrumPatches(HMIDIOUT hMidiOut,
     408                                        UINT wPatch,
     409                                        WORD *lpKeyArray,
     410                                        UINT wFlags)
    452411{
    453412  // Valid only for an Internal synth.  So we won't do it for now.
    … …  
    465424
    466425/******************************************************************************/
    467 ODINFUNCTION4(MMRESULT, midiOutCachePatches,
    468               HMIDIOUT, hMidiOut,
    469               UINT, wBank,
    470               WORD *, lpPatchArray,
    471               UINT, wFlags)
     426MMRESULT WINAPI midiOutCachePatches(HMIDIOUT hMidiOut,
     427                                    UINT wBank,
     428                                    WORD *lpPatchArray,
     429                                    UINT wFlags)
    472430{
    473431  // Valid only for an Internal synth.  So we won't do it for now.
    … …  
    485443
    486444/******************************************************************************/
    487 ODINFUNCTION1(MMRESULT, midiOutClose,
    488               HMIDIOUT, hMidiOut)
     445MMRESULT WINAPI midiOutClose(HMIDIOUT hMidiOut)
    489446{
    490447  dprintf(("WINMM:midiOutClose - partially implemented\n" ));
    … …  
    503460
    504461/******************************************************************************/
    505 ODINFUNCTION3(MMRESULT, midiOutGetDevCapsA,
    506               UINT, uDeviceId,
    507               LPMIDIOUTCAPSA, midiOutCaps,
    508               UINT,  sMidiOutCaps )
     462MMRESULT WINAPI midiOutGetDevCapsA(UINT uDeviceId, LPMIDIOUTCAPSA midiOutCaps,
     463                                   UINT sMidiOutCaps )
    509464{
    510465  // TODO: Actually fill in the important fields
    … …  
    554509
    555510/******************************************************************************/
    556 ODINFUNCTION3(MMRESULT, midiOutGetDevCapsW,
    557               UINT, uDeviceId,
    558               LPMIDIOUTCAPSW, midiOutCaps,
    559               UINT,  sMidiOutCaps )
     511MMRESULT WINAPI midiOutGetDevCapsW(UINT uDeviceId, LPMIDIOUTCAPSW midiOutCaps,
     512                                   UINT sMidiOutCaps )
    560513{
    561514  // TODO: Actually fill in the important fields
    … …  
    607560
    608561/******************************************************************************/
    609 ODINFUNCTION3(MMRESULT, midiOutGetErrorTextA,
    610               MMRESULT, wError,
    611               LPSTR, lpText,
    612               UINT, cchText)
     562MMRESULT WINAPI midiOutGetErrorTextA(MMRESULT wError, LPSTR lpText, UINT cchText)
    613563{
    614564  dprintf(("WINMM:midiOutGetErrorTextA(%d)\n", wError ));
    … …  
    626576
    627577/******************************************************************************/
    628 ODINFUNCTION3(MMRESULT, midiOutGetErrorTextW,
    629               MMRESULT, wError,
    630               LPWSTR, lpText,
    631               UINT, cchText)
     578MMRESULT WINAPI midiOutGetErrorTextW(MMRESULT wError, LPWSTR lpText, UINT cchText)
    632579{
    633580  dprintf(("WINMM:midiOutGetErrorTextW(%d) - need to translate\n", wError ));
    … …  
    645592
    646593/******************************************************************************/
    647 ODINFUNCTION2(MMRESULT, midiOutGetID,
    648               HMIDIOUT, hMidiOut,
    649               LPUINT, puDeviceID)
     594MMRESULT WINAPI midiOutGetID(HMIDIOUT hMidiOut,LPUINT puDeviceID)
    650595{
    651596  dprintf(("WINMM:midiOutGetID\n" ));
    … …  
    663608
    664609/******************************************************************************/
    665 ODINFUNCTION0(UINT, midiOutGetNumDevs)
     610UINT WINAPI midiOutGetNumDevs()
    666611{
    667612  UINT i = IRTMIDI->numOutInstances();
    … …  
    670615
    671616/******************************************************************************/
    672 ODINFUNCTION2(MMRESULT, midiOutGetVolume,
    673               HMIDIOUT, hMidiOut,
    674               LPDWORD, lpdwVolume)
     617MMRESULT WINAPI midiOutGetVolume(HMIDIOUT hMidiOut, LPDWORD lpdwVolume)
    675618{
    676619  MMRESULT rc;
    … …  
    687630
    688631/******************************************************************************/
    689 ODINFUNCTION3(MMRESULT, midiOutLongMsg,
    690               HMIDIOUT, hMidiOut,
    691               LPMIDIHDR, lpMidiOutHdr,
    692               UINT, cbMidiOutHdr)
     632MMRESULT WINAPI midiOutLongMsg(HMIDIOUT hMidiOut, LPMIDIHDR lpMidiOutHdr,
     633                               UINT cbMidiOutHdr)
    693634{
    694635  // TODO: Implement this
    … …  
    708649
    709650/******************************************************************************/
    710 ODINFUNCTION4(UINT, midiOutMessage,
    711               HMIDIOUT, hMidiOut,
    712               UINT, msg,
    713               DWORD, dw1,
    714               DWORD, dw2)
     651UINT WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT msg, DWORD dw1, DWORD dw2)
    715652{
    716653  // TODO: Need to find out wha drivers actually return.
    … …  
    720657
    721658/******************************************************************************/
    722 ODINFUNCTION5(MMRESULT, midiOutOpen,
    723               LPHMIDIOUT, lphMidiOut,
    724               UINT, uDeviceId,
    725               DWORD, dwCallback,
    726               DWORD, dwCallbackInstance,
    727               DWORD, dwflags)
     659MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceId,
     660                            DWORD dwCallback, DWORD dwCallbackInstance,
     661                            DWORD dwflags)
    728662{
    729663  // TODO: - Handle thread callback, if any program really needs it
    … …  
    761695
    762696/******************************************************************************/
    763 ODINFUNCTION3(MMRESULT, midiOutPrepareHeader,
    764               HMIDIOUT, hMidiOut,
    765               LPMIDIHDR, lpMidiOutHdr,
    766               UINT, cbMidiOutHdr)
     697MMRESULT WINAPI midiOutPrepareHeader(HMIDIOUT hMidiOut, LPMIDIHDR lpMidiOutHdr,
     698                                     UINT cbMidiOutHdr)
    767699{
    768700  // TODO: Either implement or treat as a NOOP as we may not need to "prepare"
    … …  
    781713
    782714/******************************************************************************/
    783 ODINFUNCTION1(MMRESULT, midiOutReset,
    784               HMIDIOUT, hMidiOut)
     715MMRESULT WINAPI midiOutReset(HMIDIOUT hMidiOut)
    785716{
    786717  // TODO: - return pending output buffers to callback
    … …  
    800731
    801732/******************************************************************************/
    802 ODINFUNCTION2(MMRESULT, midiOutSetVolume,
    803               HMIDIOUT, hMidiOut,
    804               DWORD, dwVolume)
     733MMRESULT WINAPI midiOutSetVolume(HMIDIOUT hMidiOut, DWORD dwVolume)
    805734{
    806735  dprintf(("WINMM:midiOutSetVolume\n" ));
    … …  
    818747
    819748/******************************************************************************/
    820 ODINFUNCTION2(MMRESULT, midiOutShortMsg,
    821               HMIDIOUT, hMidiOut,
    822               DWORD, dwMsg)
     749MMRESULT WINAPI midiOutShortMsg(HMIDIOUT hMidiOut, DWORD dwMsg)
    823750{
    824751  dprintf(("WINMM:midiOutShortMsg(%X)\n", dwMsg ));
    … …  
    836763
    837764/******************************************************************************/
    838 ODINFUNCTION3(MMRESULT, midiOutUnprepareHeader,
    839               HMIDIOUT, hMidiOut,
    840               LPMIDIHDR, lpMidiOutHdr,
    841               UINT, cbMidiOutHdr)
     765MMRESULT WINAPI midiOutUnprepareHeader(HMIDIOUT hMidiOut, LPMIDIHDR lpMidiOutHdr,
     766                                       UINT cbMidiOutHdr)
    842767{
    843768  // TODO: - return MIDIERR_STILLPLAYING if buffer is playing
Note: See TracChangeset for help on using the changeset viewer.