Changeset 1421 for trunk/src/dsound/OS2SNDBUFFER.CPP

Timestamp:

Oct 24, 1999, 1:01:19 AM (26 years ago)

Author:

sandervl

Message:

Fixed compilation for all files

File:

• trunk/src/dsound/OS2SNDBUFFER.CPP (modified) (10 diffs)

trunk/src/dsound/OS2SNDBUFFER.CPP

@@ -1 @@
-/* $Id: OS2SNDBUFFER.CPP,v 1.3 1999-06-10 17:09:30 phaller Exp $ */
+/* $Id: OS2SNDBUFFER.CPP,v 1.4 1999-10-23 23:00:49 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
 
 
-/*@Const************************************************************************
-*   Defined Constants                                                          *
-*******************************************************************************/
-#define INCL_DOSMEMMGR
-#define INCL_DIRECTSOUNDBUFFER_GUID
-#define WIN32SDK_NOPOSTWRAPPER
-
 /*@Header***********************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
+#include <os2win.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "no.h"     /* NO* defines for windows.h */
-#include <w_windows.h>
+#define INITGUID
 #include <dsound.h>
-#include <Win32SDKPostWrapper.h>
 
 #include "os2dsound.h"
@@ -35 +26 @@
 
 
-/* KSO Apr 19 1999: Set correct interface.           *
- * (INTERFACE is used in the THIS and THIS_ macros)  */
-#undef INTERFACE
-#define INTERFACE IDirectSoundBuffer
-
-
-
 //******************************************************************************
 //******************************************************************************
@@ -47 +31 @@
         : Referenced(0), lastError(DS_OK)
 {
- APIRET rc;
-
   lpVtbl = &Vtbl;
   Vtbl.AddRef               = SoundBufAddRef;
@@ -90 +72 @@
     memcpy(lpfxFormat, bufferdesc.lpwfxFormat, bufferdesc.lpwfxFormat->cbSize + sizeof(WAVEFORMATEX));
 
-    rc = DosAllocMem((PPVOID)&lpBuffer, bufferdesc.dwBufferBytes, PAG_READ|PAG_WRITE|PAG_COMMIT);
-    if(rc) {
-        dprintf(("DosAllocMem returned %d", rc));
+    lpBuffer = (LPSTR)VirtualAlloc(0, bufferdesc.dwBufferBytes, MEM_COMMIT, PAGE_READWRITE);
+    if(lpBuffer == NULL) {
+        dprintf(("VirtualAlloc failed"));
         lpBuffer  = NULL;
         lastError = DSERR_OUTOFMEMORY;
@@ -106 +88 @@
 {
   if(lpBuffer)
-    DosFreeMem(lpBuffer);
+    VirtualFree(lpBuffer, 0, MEM_RELEASE);
   if(lpfxFormat)
     free(lpfxFormat);
@@ -113 +95 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT WIN32API SoundBufQueryInterface(THIS, REFIID riid, LPVOID FAR * ppvObj)
+HRESULT WIN32API SoundBufQueryInterface(THIS, REFIID riid, LPVOID * ppvObj)
 {
   dprintf(("OS2IDirectSoundBuffer::QueryInterface\n"));
@@ -262 +244 @@
 //******************************************************************************
 //******************************************************************************
-#if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
 HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC )
-#else
-HRESULT __stdcall SoundBufInitialize(THIS_ LPDIRECTSOUND, LPCDSBUFFERDESC )
-#endif
 {
  OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
@@ -278 +256 @@
 //******************************************************************************
 //******************************************************************************
-#if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
 HRESULT __stdcall SoundBufLock(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes,
                    LPVOID lplpvAudioPtr1, LPDWORD lpdwAudioBytes1,
                    LPVOID lplpvAudioPtr2, LPDWORD lpdwAudioBytes2,
                    DWORD dwFlags)
-#else
-HRESULT __stdcall SoundBufLock(THIS_ DWORD dwWriteCursor, DWORD dwWriteBytes,
-                   LPVOID *lplpvAudioPtr1, LPDWORD lpdwAudioBytes1,
-                   LPVOID *lplpvAudioPtr2, LPDWORD lpdwAudioBytes2,
-                   DWORD dwFlags)
-#endif
 {
  OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
@@ -352 +323 @@
 //******************************************************************************
 //******************************************************************************
-#if 0 //KSO Apr 19 1999: some parameter incompabilities between newer and older SDKs.
 HRESULT __stdcall SoundBufSetFormat(THIS_ LPWAVEFORMATEX )
-#else
-HRESULT __stdcall SoundBufSetFormat(THIS_ LPCWAVEFORMATEX )
-#endif
 {
  OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;