Changeset 2812 for trunk/src


Ignore:
Timestamp:
Feb 17, 2000, 3:10:18 PM (26 years ago)
Author:
sandervl
Message:

Added new logging feature + fixed waveout query format bug

Location:
trunk/src/winmm
Files:
2 added
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/winmm/IRTMidi.cpp

    r588 r2812  
    1 /* $Id: IRTMidi.cpp,v 1.5 1999-08-19 18:46:03 phaller Exp $ */
     1/* $Id: IRTMidi.cpp,v 1.6 2000-02-17 14:09:29 sandervl Exp $ */
    22
    33/*******************************************************************************
    … …  
    2727#include <stdio.h>
    2828#include <malloc.h>
     29
     30#define DBG_LOCALLOG    DBG_irtmidi
     31#include "dbglocal.h"
    2932
    3033IRTMidi * IRTMidi::iTheIRTMidiSingleton = NULL;

  • trunk/src/winmm/auxiliary.cpp

    r2308 r2812  
    1 /* $Id: auxiliary.cpp,v 1.2 2000-01-03 10:29:02 sandervl Exp $ */
     1/* $Id: auxiliary.cpp,v 1.3 2000-02-17 14:09:30 sandervl Exp $ */
    22
    33/*
    … …  
    2727#include "winmm.h"
    2828#include "auxiliary.h"
     29
     30#define DBG_LOCALLOG    DBG_auxiliary
     31#include "dbglocal.h"
    2932
    3033ODINDEBUGCHANNEL(WINMM-AUX)

  • trunk/src/winmm/auxos2.cpp

    r2244 r2812  
    1 /* $Id: auxos2.cpp,v 1.7 1999-12-29 10:44:16 sandervl Exp $ */
     1/* $Id: auxos2.cpp,v 1.8 2000-02-17 14:09:30 sandervl Exp $ */
    22
    33/*
    … …  
    2828
    2929#include "auxiliary.h"
     30
     31#define DBG_LOCALLOG    DBG_auxos2
     32#include "dbglocal.h"
    3033
    3134ULONG auxDeviceId = -1;

  • trunk/src/winmm/driver.cpp

    r588 r2812  
    1 /* $Id: driver.cpp,v 1.4 1999-08-19 18:46:04 phaller Exp $ */
     1/* $Id: driver.cpp,v 1.5 2000-02-17 14:09:30 sandervl Exp $ */
    22
    33/*
    … …  
    2525#include "winmm.h"
    2626#include "os2timer.h"
     27
     28#define DBG_LOCALLOG    DBG_driver
     29#include "dbglocal.h"
    2730
    2831ODINDEBUGCHANNEL(WINMM-DRIVER)

  • trunk/src/winmm/dwaveout.cpp

    r2286 r2812  
    1 /* $Id: dwaveout.cpp,v 1.13 1999-12-31 13:55:51 sandervl Exp $ */
     1/* $Id: dwaveout.cpp,v 1.14 2000-02-17 14:09:30 sandervl Exp $ */
    22
    33/*
    … …  
    3030#include "misc.h"
    3131#include "dwaveout.h"
     32
     33#define DBG_LOCALLOG    DBG_dwaveout
     34#include "dbglocal.h"
    3235
    3336#ifndef min
    … …  
    588591                      0);
    589592  if((rc & 0xFFFF) != MCIERR_SUCCESS) {
    590     mciError(rc);
    591     winrc = FALSE;
    592   }
     593        mciError(rc);
     594        winrc = FALSE;
     595  }
     596  else  winrc = TRUE;
     597
    593598  // Close the device
    594599  mciSendCommand(DeviceId,MCI_CLOSE,MCI_WAIT,(PVOID)&GenericParms,0);

  • trunk/src/winmm/initterm.cpp

    r2650 r2812  
    1 /* $Id: initterm.cpp,v 1.8 2000-02-05 02:16:21 sandervl Exp $ */
     1/* $Id: initterm.cpp,v 1.9 2000-02-17 14:09:30 sandervl Exp $ */
    22
    33/*
    … …  
    3939#include "auxiliary.h"
    4040
     41#define DBG_LOCALLOG    DBG_initterm
     42#include "dbglocal.h"
    4143
    4244extern "C" {
    … …  
    9395         _ctordtorInit();
    9496
     97         ParseLogStatus();
     98
    9599         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
    96100

  • trunk/src/winmm/joy.cpp

    r588 r2812  
    1 /* $Id: joy.cpp,v 1.6 1999-08-19 18:46:04 phaller Exp $ */
     1/* $Id: joy.cpp,v 1.7 2000-02-17 14:09:30 sandervl Exp $ */
    22/*
    33 * Odin Joystick apis
    … …  
    2525#include "os2timer.h"
    2626#include "joyos2.h"
     27
     28#define DBG_LOCALLOG    DBG_joy
     29#include "dbglocal.h"
    2730
    2831ODINDEBUGCHANNEL(WINMM-JOY)

  • trunk/src/winmm/joyos2.cpp

    r588 r2812  
    1 /* $Id: joyos2.cpp,v 1.3 1999-08-19 18:46:04 phaller Exp $ */
     1/* $Id: joyos2.cpp,v 1.4 2000-02-17 14:09:30 sandervl Exp $ */
    22/*
    33 * OS/2 Joystick apis
    … …  
    2020#include "joyos2.h"
    2121
     22#define DBG_LOCALLOG    DBG_joyos2
     23#include "dbglocal.h"
    2224
    2325#define GAMEPDDNAME     "GAME$"

  • trunk/src/winmm/makefile

    r2712 r2812  
    1 # $Id: makefile,v 1.15 2000-02-09 23:47:05 bird Exp $
     1# $Id: makefile,v 1.16 2000-02-17 14:09:30 sandervl Exp $
    22
    33#
    … …  
    2525        wavein.obj auxiliary.obj auxos2.obj mixer.obj \
    2626        midi.obj irtmidi.obj midistrm.obj initterm.obj mci.obj joy.obj \
    27         mmio.obj driver.obj playsound.obj joyos2.obj resource.obj
     27        mmio.obj driver.obj playsound.obj joyos2.obj resource.obj dbglocal.obj
    2828
    2929

  • trunk/src/winmm/mci.cpp

    r588 r2812  
    1 /* $Id: mci.cpp,v 1.4 1999-08-19 18:46:04 phaller Exp $ */
     1/* $Id: mci.cpp,v 1.5 2000-02-17 14:09:31 sandervl Exp $ */
    22
    33/*
    … …  
    2626
    2727#include "winmm.h"
     28
     29#define DBG_LOCALLOG    DBG_mci
     30#include "dbglocal.h"
    2831
    2932ODINDEBUGCHANNEL(WINMM-MCI)

  • trunk/src/winmm/midi.cpp

    r1011 r2812  
    1 /* $Id: midi.cpp,v 1.7 1999-09-23 09:35:25 sandervl Exp $ */
     1/* $Id: midi.cpp,v 1.8 2000-02-17 14:09:31 sandervl Exp $ */
    22
    33/*
    … …  
    2727#include <winos2def.h>
    2828#include <wprocess.h>
     29
     30#define DBG_LOCALLOG    DBG_midi
     31#include "dbglocal.h"
    2932
    3033ODINDEBUGCHANNEL(WINMM-MIDI)

  • trunk/src/winmm/midistrm.cpp

    r588 r2812  
    1 /* $Id: midistrm.cpp,v 1.4 1999-08-19 18:46:04 phaller Exp $ */
     1/* $Id: midistrm.cpp,v 1.5 2000-02-17 14:09:31 sandervl Exp $ */
    22
    33/*
    … …  
    2424#include <string.h>
    2525#include <unicode.h>
     26
     27#define DBG_LOCALLOG    DBG_midistrm
     28#include "dbglocal.h"
    2629
    2730

  • trunk/src/winmm/mixer.cpp

    r588 r2812  
    1 /* $Id: mixer.cpp,v 1.4 1999-08-19 18:46:04 phaller Exp $ */
     1/* $Id: mixer.cpp,v 1.5 2000-02-17 14:09:31 sandervl Exp $ */
    22
    33/*
    … …  
    1919#include <odinwrap.h>
    2020#include <misc.h>
     21
     22#define DBG_LOCALLOG    DBG_mixer
     23#include "dbglocal.h"
    2124
    2225

  • trunk/src/winmm/mmio.cpp

    r1998 r2812  
    2323#include "mmsystem.h"
    2424#include "debugtools.h"
     25
     26#define DBG_LOCALLOG    DBG_mmio
     27#include "dbglocal.h"
    2528
    2629ODINDEBUGCHANNEL(WINMM-MMIO)

  • trunk/src/winmm/os2timer.cpp

    r2242 r2812  
    1 /* $Id: os2timer.cpp,v 1.13 1999-12-29 08:33:56 phaller Exp $ */
     1/* $Id: os2timer.cpp,v 1.14 2000-02-17 14:09:32 sandervl Exp $ */
    22
    33/*
    … …  
    2828#include "os2timer.h"
    2929
     30#define DBG_LOCALLOG    DBG_os2timer
     31#include "dbglocal.h"
    3032
    3133

  • trunk/src/winmm/playsound.cpp

    r588 r2812  
    1 /* $Id: playsound.cpp,v 1.4 1999-08-19 18:46:05 phaller Exp $ */
     1/* $Id: playsound.cpp,v 1.5 2000-02-17 14:09:32 sandervl Exp $ */
    22
    33/*
    … …  
    1616 ****************************************************************************/
    1717
     18#define  INCL_BASE
     19#define  INCL_OS2MM
    1820#include <os2wrap.h>       //Odin32 OS/2 api wrappers
    1921#include <odinwrap.h>
    20 #include "win32type.h"
    21 #include "misc.h"
     22#include <win32type.h>
     23#include <winconst.h>
     24#include <misc.h>
     25
     26#define DBG_LOCALLOG    DBG_playsound
     27#include "dbglocal.h"
    2228
    2329ODINDEBUGCHANNEL(WINMM-PLAYSOUND)
    … …  
    4450{
    4551  dprintf(("WINMM:PlaySoundA not implemented\n"));
     52  if((fdwSound & (SND_SYNC_W|SND_ASYNC_W)) == (SND_SYNC_W|SND_ASYNC_W)) {
     53//      SetLastError(ERROR_INVALID_PARAMETER_W);
     54        return FALSE;
     55  }
     56//  if(fdwSound & (SND_MEMORY_W|SND_ALIAS_W|SND_FILENAME_W|SND_RESOURCE_W) == (SND_SYNC_W|SND_ASYNC_W)) {
     57//      SetLastError(ERROR_INVALID_PARAMETER_W);
     58//      return FALSE;
     59//  }
    4660  return(FALSE);
    4761}

  • trunk/src/winmm/time.cpp

    r2242 r2812  
    1 /* $Id: time.cpp,v 1.8 1999-12-29 08:33:56 phaller Exp $ */
     1/* $Id: time.cpp,v 1.9 2000-02-17 14:09:32 sandervl Exp $ */
    22
    33/*
    … …  
    2222#include "time.h"
    2323
     24#define DBG_LOCALLOG    DBG_time
     25#include "dbglocal.h"
     26
    2427ODINDEBUGCHANNEL(WINMM-TIME)
    2528

  • trunk/src/winmm/wavein.cpp

    r588 r2812  
    1 /* $Id: wavein.cpp,v 1.4 1999-08-19 18:46:05 phaller Exp $ */
     1/* $Id: wavein.cpp,v 1.5 2000-02-17 14:09:32 sandervl Exp $ */
    22
    33/*
    … …  
    2525
    2626#include "winmm.h"
     27
     28#define DBG_LOCALLOG    DBG_wavein
     29#include "dbglocal.h"
    2730
    2831

  • trunk/src/winmm/waveout.cpp

    r2286 r2812  
    1 /* $Id: waveout.cpp,v 1.9 1999-12-31 13:55:51 sandervl Exp $ */
     1/* $Id: waveout.cpp,v 1.10 2000-02-17 14:09:33 sandervl Exp $ */
    22//#undef DEBUG
    33/*
    … …  
    2828#include "misc.h"
    2929#include "winmm.h"
     30
     31#define DBG_LOCALLOG    DBG_waveout
     32#include "dbglocal.h"
    3033
    3134ODINDEBUGCHANNEL(WINMM-WAVEOUT)
    … …  
    386389  }
    387390  else
    388     return(MMSYSERR_INVALHANDLE);
     391      return MMSYSERR_NOERROR;
     392//    return(MMSYSERR_INVALHANDLE);
    389393}
    390394
    … …  
    399403  }
    400404  else
    401     return(MMSYSERR_INVALHANDLE);
     405      return MMSYSERR_NOERROR;
     406//    return(MMSYSERR_INVALHANDLE);
    402407}
    403408
Note: See TracChangeset for help on using the changeset viewer.