Changeset 1421 for trunk/src


Ignore:
Timestamp:
Oct 24, 1999, 1:01:19 AM (26 years ago)
Author:
sandervl
Message:

Fixed compilation for all files

Location:
trunk/src/dsound
Files:
1 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/dsound/DSOUND.CPP

    r1411 r1421  
    1 /* $Id: DSOUND.CPP,v 1.4 1999-10-23 12:35:14 sandervl Exp $ */
     1/* $Id: DSOUND.CPP,v 1.5 1999-10-23 23:00:49 sandervl Exp $ */
    22
    33/*
    … …  
    1010 */
    1111
    12 /*@Const************************************************************************
    13 *   Defined Constants                                                          *
    14 *******************************************************************************/
    15 #define WIN32SDK_NOPOSTWRAPPER
    16 
    1712/*@Header***********************************************************************
    1813*   Header Files                                                               *
    … …  
    2217#include <string.h>
    2318
     19#define INITGUID
    2420#include <dsound.h>
    25 //#include "os2dsound.h"
     21#include "os2dsound.h"
    2622
    2723#include <misc.h>
    … …  
    3329                                      IUnknown *pUnkOuter)
    3430{
    35   dprintf(("DirectSoundCreate %X %X %X\n", lpGUID, ppDS, pUnkOuter));
    36 #if 0
    3731 OS2IDirectSound *newsound = new OS2IDirectSound(lpGUID);
    3832 HRESULT         rc;
    3933
     34  dprintf(("DirectSoundCreate %X %X %X\n", lpGUID, ppDS, pUnkOuter));
    4035  if(newsound == NULL)  return(DSERR_OUTOFMEMORY);
    4136
    … …  
    4742  else  *ppDS = (LPDIRECTSOUND)newsound;
    4843  return(rc);
    49 #else
    50   return(DSERR_NODRIVER);
    51 #endif
    5244}
    5345//******************************************************************************

  • trunk/src/dsound/OS2DSOUND.CPP

    r97 r1421  
    1 /* $Id: OS2DSOUND.CPP,v 1.3 1999-06-10 17:09:29 phaller Exp $ */
     1/* $Id: OS2DSOUND.CPP,v 1.4 1999-10-23 23:00:49 sandervl Exp $ */
    22
    33/*
    … …  
    1010 */
    1111
    12 /*@Const************************************************************************
    13 *   Defined Constants                                                          *
    14 *******************************************************************************/
    15 #define INITGUID
    16 #define INCL_DIRECTSOUND_GUID
    17 #define WIN32SDK_NOPOSTWRAPPER
    18 
    19 
    2012/*@Header***********************************************************************
    2113*   Header Files                                                               *
    … …  
    2517#include <string.h>
    2618
    27 #include "no.h" /* NO* defines for windows.h */
    28 #include <w_windows.h>
     19#define INITGUID
    2920#include <dsound.h>
    30 #include <Win32SDKPostWrapper.h>
    3121
    3222#include "os2dsound.h"
    3323#include "os2sndbuffer.h"
    3424#include "misc.h"
    35 
    36 
    37 /* KSO Apr 19 1999: INTERFACE set again, since os2sndbuffer changed it.  *
    38  * (INTERFACE is used in the THIS and THIS_ macros)                      */
    39 #undef  INTERFACE
    40 #define INTERFACE   IDirectSound
    41 
    4225
    4326//******************************************************************************
    … …  
    7154//******************************************************************************
    7255//******************************************************************************
    73 HRESULT WIN32API SoundQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj)
     56HRESULT WIN32API SoundQueryInterface(THIS, REFIID riid, LPVOID * ppvObj)
    7457{
    7558  dprintf(("OS2IDirectSound::QueryInterface\n"));
    … …  
    123106//******************************************************************************
    124107//******************************************************************************
    125 #if 0 //KSO Apr 13 1999: some parameter incompabilities between newer and older SDKs.
    126108HRESULT WIN32API SoundCreateSoundBuffer(THIS_
    127                     LPDSBUFFERDESC lpDSBufferDesc, //old, non const
    128                     LPLPDIRECTSOUNDBUFFER lplpDirectSoundBuffer,
    129                     IUnknown FAR *pUnkOuter)
    130 #else
    131 HRESULT WIN32API SoundCreateSoundBuffer(THIS_
    132                     LPCDSBUFFERDESC lpDSBufferDesc, //new, const
     109                    LPDSBUFFERDESC lpDSBufferDesc, //new, const
    133110                    LPDIRECTSOUNDBUFFER *lplpDirectSoundBuffer,
    134111                    LPUNKNOWN pUnkOuter)
    135 #endif
    136112{
    137113 OS2IDirectSound *me = (OS2IDirectSound *)This;
    … …  
    170146//******************************************************************************
    171147//******************************************************************************
    172 HRESULT WIN32API SoundSetCooperativeLevel(THIS_ W32_HWND hwndClient, DWORD level)
     148HRESULT WIN32API SoundSetCooperativeLevel(THIS_ HWND hwndClient, DWORD level)
    173149{
    174150 OS2IDirectSound *me = (OS2IDirectSound *)This;
    … …  
    211187//******************************************************************************
    212188//******************************************************************************
    213 #if 0 //KSO Apr 13 1999: parameter declaration has changed in later SDKs
    214     HRESULT WIN32API SoundInitialize(THIS_ const GUID * )
    215 #else
    216     HRESULT WIN32API SoundInitialize(THIS_ LPGUID)
    217 #endif
     189HRESULT WIN32API SoundInitialize(THIS_ LPGUID)
    218190{
    219191  dprintf(("OS2IDirectSound::Initialize UNSUPPORTED\n"));

  • trunk/src/dsound/OS2DSOUND.H

    r97 r1421  
    1 /* $Id: OS2DSOUND.H,v 1.3 1999-06-10 17:09:29 phaller Exp $ */
     1/* $Id: OS2DSOUND.H,v 1.4 1999-10-23 23:00:49 sandervl Exp $ */
    22
    33/*
    … …  
    1212#define __OS2DSOUND_H__
    1313
    14 /* KSO Apr 19 1999: Set correct interface.           *
    15  * (INTERFACE is used in the THIS and THIS_ macros)  */
    16 #undef  INTERFACE
    17 #define INTERFACE   IDirectSound
     14#undef THIS
     15#define THIS VOID*This
     16
     17#undef THIS_
     18#define THIS_ VOID*This,
    1819
    1920class OS2IDirectSound
    … …  
    4344    static    OS2IDirectSound* dsound;                 // List of OS2IDirectSound
    4445
    45     friend    HRESULT __stdcall SoundQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj);
     46    friend    HRESULT __stdcall SoundQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
    4647    friend    ULONG   __stdcall SoundAddRef(THIS);
    4748    friend    ULONG   __stdcall SoundRelease(THIS);
    48     #if 0 //KSO Apr 13 1999: some parameter incompabilities between newer and older SDKs.
    49        friend HRESULT __stdcall SoundCreateSoundBuffer(THIS_ LPDSBUFFERDESC, LPLPDIRECTSOUNDBUFFER, IUnknown FAR *);
    50     #else
    51        friend HRESULT __stdcall SoundCreateSoundBuffer(THIS_ LPCDSBUFFERDESC, LPDIRECTSOUNDBUFFER*,LPUNKNOWN);
    52     #endif
     49    friend    HRESULT __stdcall SoundCreateSoundBuffer(THIS_ LPDSBUFFERDESC, LPDIRECTSOUNDBUFFER*,LPUNKNOWN);
    5350    friend    HRESULT __stdcall SoundGetCaps(THIS_ LPDSCAPS );
    5451    friend    HRESULT __stdcall SoundDuplicateSoundBuffer(THIS_ LPDIRECTSOUNDBUFFER, LPLPDIRECTSOUNDBUFFER );
    55     friend    HRESULT __stdcall SoundSetCooperativeLevel(THIS_ W32_HWND, DWORD );
     52    friend    HRESULT __stdcall SoundSetCooperativeLevel(THIS_ HWND, DWORD );
    5653    friend    HRESULT __stdcall SoundCompact(THIS );
    5754    friend    HRESULT __stdcall SoundGetSpeakerConfig(THIS_ LPDWORD );
    5855    friend    HRESULT __stdcall SoundSetSpeakerConfig(THIS_ DWORD );
    59     #if 0 //KSO Apr 13 1999: parameter declaration has changed in later SDKs
    60        friend HRESULT __stdcall SoundInitialize(THIS_ const GUID * );
    61     #else
    62        friend HRESULT __stdcall SoundInitialize(THIS_ LPGUID);
    63     #endif
     56    friend    HRESULT __stdcall SoundInitialize(THIS_ LPGUID);
    6457};
    6558//******************************************************************************
    6659//******************************************************************************
    67 HRESULT __stdcall SoundQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj);
     60HRESULT __stdcall SoundQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
    6861ULONG   __stdcall SoundAddRef(THIS);
    6962ULONG   __stdcall SoundRelease(THIS);
    70 #if 0 //KSO Apr 13 1999: some parameter incompabilities between newer and older SDKs.
    71     HRESULT __stdcall SoundCreateSoundBuffer(THIS_ LPDSBUFFERDESC, LPLPDIRECTSOUNDBUFFER, IUnknown FAR *);
    72 #else
    73     HRESULT __stdcall SoundCreateSoundBuffer(THIS_ LPCDSBUFFERDESC, LPDIRECTSOUNDBUFFER*,LPUNKNOWN);
    74 #endif
     63HRESULT __stdcall SoundCreateSoundBuffer(THIS_ LPDSBUFFERDESC, LPDIRECTSOUNDBUFFER*,LPUNKNOWN);
    7564HRESULT __stdcall SoundGetCaps(THIS_ LPDSCAPS );
    7665HRESULT __stdcall SoundDuplicateSoundBuffer(THIS_ LPDIRECTSOUNDBUFFER, LPLPDIRECTSOUNDBUFFER );
    77 HRESULT __stdcall SoundSetCooperativeLevel(THIS_ W32_HWND, DWORD );
     66HRESULT __stdcall SoundSetCooperativeLevel(THIS_ HWND, DWORD );
    7867HRESULT __stdcall SoundCompact(THIS );
    7968HRESULT __stdcall SoundGetSpeakerConfig(THIS_ LPDWORD );
    8069HRESULT __stdcall SoundSetSpeakerConfig(THIS_ DWORD );
    81 #if 0 //KSO Apr 13 1999: parameter declaration has changed in later SDKs
    82    HRESULT __stdcall SoundInitialize(THIS_ const GUID * );
    83 #else
    84    HRESULT __stdcall SoundInitialize(THIS_ LPGUID);
    85 #endif
     70HRESULT __stdcall SoundInitialize(THIS_ LPGUID);
    8671
    8772#endif

  • trunk/src/dsound/OS2SNDBUFFER.CPP

    r97 r1421  
    1 /* $Id: OS2SNDBUFFER.CPP,v 1.3 1999-06-10 17:09:30 phaller Exp $ */
     1/* $Id: OS2SNDBUFFER.CPP,v 1.4 1999-10-23 23:00:49 sandervl Exp $ */
    22
    33/*
    … …  
    1111
    1212
    13 /*@Const************************************************************************
    14 *   Defined Constants                                                          *
    15 *******************************************************************************/
    16 #define INCL_DOSMEMMGR
    17 #define INCL_DIRECTSOUNDBUFFER_GUID
    18 #define WIN32SDK_NOPOSTWRAPPER
    19 
    2013/*@Header***********************************************************************
    2114*   Header Files                                                               *
    2215*******************************************************************************/
    23 #include <os2.h>
     16#include <os2win.h>
    2417#include <stdlib.h>
    2518#include <string.h>
    2619
    27 #include "no.h"     /* NO* defines for windows.h */
    28 #include <w_windows.h>
     20#define INITGUID
    2921#include <dsound.h>
    30 #include <Win32SDKPostWrapper.h>
    3122
    3223#include "os2dsound.h"
    … …  
    3526
    3627
    37 /* KSO Apr 19 1999: Set correct interface.           *
    38  * (INTERFACE is used in the THIS and THIS_ macros)  */
    39 #undef INTERFACE
    40 #define INTERFACE IDirectSoundBuffer
    41 
    42 
    43 
    4428//******************************************************************************
    4529//******************************************************************************
    … …  
    4731        : Referenced(0), lastError(DS_OK)
    4832{
    49  APIRET rc;
    50 
    5133  lpVtbl = &Vtbl;
    5234  Vtbl.AddRef               = SoundBufAddRef;
    … …  
    9072    memcpy(lpfxFormat, bufferdesc.lpwfxFormat, bufferdesc.lpwfxFormat->cbSize + sizeof(WAVEFORMATEX));
    9173
    92     rc = DosAllocMem((PPVOID)&lpBuffer, bufferdesc.dwBufferBytes, PAG_READ|PAG_WRITE|PAG_COMMIT);
    93     if(rc) {
    94         dprintf(("DosAllocMem returned %d", rc));
     74    lpBuffer = (LPSTR)VirtualAlloc(0, bufferdesc.dwBufferBytes, MEM_COMMIT, PAGE_READWRITE);
     75    if(lpBuffer == NULL) {
     76        dprintf(("VirtualAlloc failed"));
    9577        lpBuffer  = NULL;
    9678        lastError = DSERR_OUTOFMEMORY;
    … …  
    10688{
    10789  if(lpBuffer)
    108     DosFreeMem(lpBuffer);
     90    VirtualFree(lpBuffer, 0, MEM_RELEASE);
    10991  if(lpfxFormat)
    11092    free(lpfxFormat);
    … …  
    11395//******************************************************************************
    11496//******************************************************************************
    115 HRESULT WIN32API SoundBufQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj)
     97HRESULT WIN32API SoundBufQueryInterface(THIS, REFIID riid, LPVOID * ppvObj)
    11698{
    11799  dprintf(("OS2IDirectSoundBuffer::QueryInterface\n"));
    … …  
    262244//******************************************************************************
    263245//******************************************************************************
    264 #if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
    265246HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC )
    266 #else
    267 HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPCDSBUFFERDESC )
    268 #endif
    269247{
    270248 OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
    … …  
    278256//******************************************************************************
    279257//******************************************************************************
    280 #if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
    281258HRESULT __stdcall SoundBufLock(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes,
    282259                   LPVOID lplpvAudioPtr1, LPDWORD lpdwAudioBytes1,
    283260                   LPVOID lplpvAudioPtr2, LPDWORD lpdwAudioBytes2,
    284261                   DWORD dwFlags)
    285 #else
    286 HRESULT __stdcall SoundBufLock(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes,
    287                    LPVOID *lplpvAudioPtr1, LPDWORD lpdwAudioBytes1,
    288                    LPVOID *lplpvAudioPtr2, LPDWORD lpdwAudioBytes2,
    289                    DWORD dwFlags)
    290 #endif
    291262{
    292263 OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
    … …  
    352323//******************************************************************************
    353324//******************************************************************************
    354 #if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
    355325HRESULT __stdcall SoundBufSetFormat(THIS_ LPWAVEFORMATEX )
    356 #else
    357 HRESULT __stdcall SoundBufSetFormat(THIS_ LPCWAVEFORMATEX )
    358 #endif
    359326{
    360327 OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;

  • trunk/src/dsound/OS2SNDBUFFER.H

    r97 r1421  
    1 /* $Id: OS2SNDBUFFER.H,v 1.3 1999-06-10 17:09:30 phaller Exp $ */
     1/* $Id: OS2SNDBUFFER.H,v 1.4 1999-10-23 23:00:50 sandervl Exp $ */
    22
    33/*
    … …  
    1212#define __OS2SNDBUFFER_H__
    1313
    14 //KSO Apr 19 1999: Seems to be necessary to define these now.
    15 #undef  INTERFACE
    16 #define INTERFACE   IDirectSoundBuffer
     14#include <mmsystem.h>
     15
     16#undef THIS
     17#define THIS VOID*This
     18
     19#undef THIS_
     20#define THIS_ VOID*This,
    1721
    1822class OS2IDirectSoundBuffer
    … …  
    4852    static    OS2IDirectSoundBuffer* dsound;                 // List of OS2IDirectSound
    4953
    50     friend    HRESULT __stdcall SoundBufQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj);
     54    friend    HRESULT __stdcall SoundBufQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
    5155    friend    ULONG   __stdcall SoundBufAddRef(THIS);
    5256    friend    ULONG   __stdcall SoundBufRelease(THIS);
    … …  
    5862    friend    HRESULT __stdcall SoundBufGetFrequency(THIS_ LPDWORD ) ;
    5963    friend    HRESULT __stdcall SoundBufGetStatus(THIS_ LPDWORD ) ;
    60     #if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
    61        friend HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC ) ;
    62        friend HRESULT __stdcall SoundBufLock(THIS_ DWORD,DWORD,LPVOID,LPDWORD,LPVOID,LPDWORD,DWORD ) ;
    63     #else
    64        friend HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPCDSBUFFERDESC ) ;
    65        friend HRESULT __stdcall SoundBufLock(THIS_ DWORD,DWORD,LPVOID*,LPDWORD,LPVOID*,LPDWORD,DWORD ) ;
    66     #endif
     64    friend    HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC ) ;
     65    friend    HRESULT __stdcall SoundBufLock(THIS_ DWORD,DWORD,LPVOID,LPDWORD,LPVOID,LPDWORD,DWORD ) ;
    6766    friend    HRESULT __stdcall SoundBufPlay(THIS_ DWORD,DWORD,DWORD ) ;
    6867    friend    HRESULT __stdcall SoundBufSetCurrentPosition(THIS_ DWORD ) ;
    69     #if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
    70        friend HRESULT __stdcall SoundBufSetFormat(THIS_ LPWAVEFORMATEX ) ;
    71     #else
    72        friend HRESULT __stdcall SoundBufSetFormat(THIS_ LPCWAVEFORMATEX ) ;
    73     #endif
     68    friend    HRESULT __stdcall SoundBufSetFormat(THIS_ LPWAVEFORMATEX ) ;
    7469    friend    HRESULT __stdcall SoundBufSetVolume(THIS_ LONG ) ;
    7570    friend    HRESULT __stdcall SoundBufSetPan(THIS_ LONG ) ;
    … …  
    8176//******************************************************************************
    8277//******************************************************************************
    83 HRESULT __stdcall SoundBufQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj);
     78HRESULT __stdcall SoundBufQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
    8479ULONG   __stdcall SoundBufAddRef(THIS);
    8580ULONG   __stdcall SoundBufRelease(THIS);
    … …  
    9186HRESULT __stdcall SoundBufGetFrequency(THIS_ LPDWORD ) ;
    9287HRESULT __stdcall SoundBufGetStatus(THIS_ LPDWORD ) ;
    93 #if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
    94     HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC ) ;
    95     HRESULT __stdcall SoundBufLock(THIS_ DWORD,DWORD,LPVOID,LPDWORD,LPVOID,LPDWORD,DWORD ) ;
    96 #else
    97     HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPCDSBUFFERDESC ) ;
    98     HRESULT __stdcall SoundBufLock(THIS_ DWORD,DWORD,LPVOID*,LPDWORD,LPVOID*,LPDWORD,DWORD ) ;
    99 #endif
     88HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC ) ;
     89HRESULT __stdcall SoundBufLock(THIS_ DWORD,DWORD,LPVOID,LPDWORD,LPVOID,LPDWORD,DWORD ) ;
    10090HRESULT __stdcall SoundBufPlay(THIS_ DWORD,DWORD,DWORD ) ;
    10191HRESULT __stdcall SoundBufSetCurrentPosition(THIS_ DWORD ) ;
    102 #if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
    103     HRESULT __stdcall SoundBufSetFormat(THIS_ LPWAVEFORMATEX ) ;
    104 #else
    105     HRESULT __stdcall SoundBufSetFormat(THIS_ LPCWAVEFORMATEX ) ;
    106 #endif
     92HRESULT __stdcall SoundBufSetFormat(THIS_ LPWAVEFORMATEX ) ;
    10793HRESULT __stdcall SoundBufSetVolume(THIS_ LONG ) ;
    10894HRESULT __stdcall SoundBufSetPan(THIS_ LONG ) ;

  • trunk/src/dsound/makefile

    r1411 r1421  
    1 # $Id: makefile,v 1.7 1999-10-23 12:35:14 sandervl Exp $
     1# $Id: makefile,v 1.8 1999-10-23 23:00:50 sandervl Exp $
    22
    33#
    … …  
    2121TARGET = dsound
    2222
    23 #OBJS =  dsound.obj os2dsound.obj initterm.obj misc.obj os2sndbuffer.obj
    24 OBJS =  dsound.obj initterm.obj
     23OBJS =  dsound.obj os2dsound.obj initterm.obj misc.obj os2sndbuffer.obj
     24#OBJS =  dsound.obj initterm.obj
    2525
    2626all: $(TARGET).dll $(TARGET).lib
    … …  
    5454    os2dsound.h
    5555
    56 misc.obj: misc.c \
     56misc.obj: misc.cpp \
    5757          $(PDWIN32_INCLUDE)\misc.h
    5858
    … …  
    6161
    6262clean:
    63         $(RM) *.obj *.lib *.dll *~ *.map *.pch
     63        $(RM) *.obj *.lib *.dll *.map *.pch
    6464        $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    6565        $(RM) $(PDWIN32_LIB)\$(TARGET).lib
Note: See TracChangeset for help on using the changeset viewer.