Changeset 3099 for trunk/src/dsound/DSOUND.CPP

Timestamp:

Mar 13, 2000, 1:47:54 PM (25 years ago)

Author:

sandervl

Message:

replaced dsound by new version

File:

• trunk/src/dsound/DSOUND.CPP (modified) (4 diffs)

trunk/src/dsound/DSOUND.CPP

@@ -1 @@
-/* $Id: DSOUND.CPP,v 1.6 1999-11-14 22:12:14 hugh Exp $ */
+/* $Id: DSOUND.CPP,v 1.7 2000-03-13 12:47:44 sandervl Exp $ */
 
 /*
  * DirectSound exported APIs
  *
- * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 1998 Sander van Leeuwen
+ * Copyright 2000 Michal Necasek
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -15 +16 @@
 #include <os2win.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
 #define INITGUID
+#define ICOM_CINTERFACE 1
+#define CINTERFACE
 #include <dsound.h>
+
 #include "os2dsound.h"
 
 #include <misc.h>
+
+OS2IDirectSound *DS = NULL;
 
 //******************************************************************************
@@ -29 +36 @@
                                       IUnknown *pUnkOuter)
 {
- OS2IDirectSound *newsound = new OS2IDirectSound(lpGUID);
- HRESULT         rc;
-
-  dprintf(("DirectSoundCreate %X %X %X\n", lpGUID, ppDS, pUnkOuter));
-  if(newsound == NULL)
-    return(DSERR_OUTOFMEMORY);
-
-  rc = newsound->GetLastError();
-  if(rc != DS_OK) {
-    *ppDS = NULL;
-    delete newsound;
-  }
-  else
-    *ppDS = (LPDIRECTSOUND)newsound;
-  return(rc);
-}
+   OS2IDirectSound *newsound;
+   HRESULT         rc;
+
+   dprintf(("DSOUND:DirectSoundCreate %X %X %X\n", lpGUID, ppDS, pUnkOuter));
+
+   if (OS2IDirectSound::fDSExists) {
+      *ppDS = (LPDIRECTSOUND)DS;
+      DS->Vtbl.AddRef(DS);
+      return DS_OK;
+   }
+
+   newsound = new OS2IDirectSound(lpGUID);
+
+   if (newsound == NULL)
+      return DSERR_OUTOFMEMORY;
+
+   rc = newsound->GetLastError();
+   if(rc != DS_OK) {
+     *ppDS = NULL;
+     delete newsound;
+   }
+   else {
+     *ppDS = (LPDIRECTSOUND)newsound;
+     newsound->Vtbl.AddRef(newsound);
+     DS = newsound;
+   }
+   return rc;
+}
+
+//******************************************************************************
+//******************************************************************************
+HRESULT WIN32API OS2DirectSoundCaptureCreate(const GUID *lpGUID,
+                                             LPDIRECTSOUNDCAPTURE * ppDS,
+                                             IUnknown *pUnkOuter)
+{
+   return DSERR_OUTOFMEMORY;
+}
+
+//******************************************************************************
+//******************************************************************************
+HRESULT WIN32API OS2DirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA lpCallback,
+                                                 LPVOID lpContext)
+{
+   dprintf(("DSOUND:DirectSoundCaptureEnumerateA\n"));
+
+   lpCallback(NULL, "DART DirectSoundCapture for OS/2",
+              "DirectSoundCapture/2 v0.1", lpContext);
+   return DS_OK;
+}
+
+//******************************************************************************
+//******************************************************************************
+HRESULT WIN32API OS2DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW lpCallback,
+                                                 LPVOID lpContext)
+{
+   dprintf(("DSOUND:DirectSoundCaptureEnumerateW\n"));
+
+   lpCallback(NULL, (LPWSTR)L"DART DirectSoundCapture for OS/2",
+              (LPWSTR)L"DirectSoundCapture/2 v0.1", lpContext);
+   return DS_OK;
+}
+
 //******************************************************************************
 //******************************************************************************
@@ -50 +103 @@
                                           LPVOID lpContext)
 {
-  dprintf(("DirectSoundEnumerateA\n"));
-
-  lpCallback(NULL, "DART DirectSound for OS/2", "DirectSound/2 v0.1",
-         lpContext);
-  return(DS_OK);
-}
-//******************************************************************************
-//******************************************************************************
+   dprintf(("DSOUND:DirectSoundEnumerateA\n"));
+
+   lpCallback(NULL, "DART DirectSound for OS/2", "DirectSound/2 v0.5",
+              lpContext);
+   return DS_OK;
+}
+
+//******************************************************************************
+//******************************************************************************
+HRESULT WIN32API OS2DirectSoundEnumerateW(LPDSENUMCALLBACKW lpCallback,
+                                          LPVOID lpContext)
+{
+   dprintf(("DSOUND:DirectSoundEnumerateW\n"));
+
+   lpCallback(NULL, (LPWSTR)L"DART DirectSound for OS/2", (LPWSTR)L"DirectSound/2 v0.5",
+              lpContext);
+   return DS_OK;
+}
+
+//******************************************************************************
+//******************************************************************************
+
+
+/*******************************************************************************
+ * DirectSound ClassFactory
+ *
+ */
+
+typedef struct
+{
+    /* IUnknown fields */
+    ICOM_VTABLE(IClassFactory) *lpvtbl;
+    DWORD                       ref;
+} IClassFactoryImpl;
+
+static HRESULT WINAPI
+DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
+{
+  ICOM_THIS(IClassFactoryImpl,iface);
+  char buf[80];
+
+  if (HIWORD(riid))
+    WINE_StringFromCLSID(riid,buf);
+  else
+    sprintf(buf,"<guid-0x%04x>",LOWORD(riid));
+  dprintf(("DSOUND:DSCF_QueryInterface(%p)->(%s,%p),stub!\n",This,buf,ppobj));
+  return E_NOINTERFACE;
+}
+
+static ULONG WINAPI
+DSCF_AddRef(LPCLASSFACTORY iface)
+{
+  ICOM_THIS(IClassFactoryImpl,iface);
+  return ++(This->ref);
+}
+
+static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface)
+{
+  ICOM_THIS(IClassFactoryImpl,iface);
+  /* static class, won't be  freed */
+  return --(This->ref);
+}
+
+static HRESULT WINAPI DSCF_CreateInstance( LPCLASSFACTORY iface,
+                                           LPUNKNOWN pOuter,
+                                           REFIID riid,
+                                           LPVOID *ppobj)
+{
+  ICOM_THIS(IClassFactoryImpl,iface);
+  LPGUID lpGUID;
+  lpGUID = (LPGUID) riid;
+
+  dprintf(("DSOUND:DSCF_CreateInstance\n"));
+  if( lpGUID && (*lpGUID == IID_IDirectSound )) {
+    return OS2DirectSoundCreate(lpGUID,(LPDIRECTSOUND*)ppobj,pOuter);
+  }
+  return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
+{
+  ICOM_THIS(IClassFactoryImpl,iface);
+  dprintf(("DSOUND:DSCF_LockServer(%p)->(%d),stub!\n",This,dolock));
+  return S_OK;
+}
+
+static ICOM_VTABLE(IClassFactory) DSCF_Vtbl =
+{
+  DSCF_QueryInterface,
+  DSCF_AddRef,
+  DSCF_Release,
+  DSCF_CreateInstance,
+  DSCF_LockServer
+};
+
+static IClassFactoryImpl DSOUND_CF = {&DSCF_Vtbl, 1 };
+
+
+HRESULT WINAPI DllGetClassObject( REFCLSID rclsid,
+                                  REFIID riid,
+                                  LPVOID *ppv)
+{
+  char buf[80],xbuf[80];
+
+  if (HIWORD(rclsid))
+    WINE_StringFromCLSID(rclsid,xbuf);
+  else
+    sprintf(xbuf,"<guid-0x%04x>",LOWORD(rclsid));
+  if (HIWORD(riid))
+    WINE_StringFromCLSID(riid,buf);
+  else
+    sprintf(buf,"<guid-0x%04x>",LOWORD(riid));
+  WINE_StringFromCLSID(riid,xbuf);
+
+  dprintf(("DSOUND:(%p,%p,%p)\n", xbuf, buf, ppv));
+  if (!memcmp(riid,&IID_IClassFactory,sizeof(IID_IClassFactory)))
+  {
+    *ppv = (LPVOID)&DSOUND_CF;
+    DSOUND_CF.lpvtbl->AddRef((IClassFactory*)&DSOUND_CF);
+    return S_OK;
+  }
+  dprintf(("DSOUND: (%p,%p,%p): no interface found.\n", xbuf, buf, ppv));
+  return E_NOINTERFACE;
+}
+
+
+/*******************************************************************************
+ * DllCanUnloadNow   Determines whether the DLL is in use.
+ *
+ * RETURNS
+ *    Success: S_OK
+ *    Failure: S_FALSE
+ */
+HRESULT WINAPI DllCanUnloadNow(void)
+{
+  dprintf(("DSOUND:DllCanUnloadNow(void) stub\n"));
+  return S_FALSE;
+}//******************************************************************************
+