Changeset 9232 for trunk/src

Timestamp:

Sep 14, 2002, 10:31:25 AM (23 years ago)

Author:

sandervl

Message:

YD: Load MMPM2 (MDM.DLL) on demand

Location:

trunk/src/dsound

Files:

• dart.cpp (modified) (14 diffs)
• initdsound.cpp (added)
• initdsound.h (added)
• initterm.cpp (modified) (3 diffs)
• makefile (modified) (2 diffs)

trunk/src/dsound/dart.cpp

@@ -1 @@
-/* $Id: dart.cpp,v 1.5 2001-04-20 13:22:37 phaller Exp $ */
+/* $Id: dart.cpp,v 1.6 2002-09-14 08:31:24 sandervl Exp $ */
 /*
  *  Dart Interface..
@@ -21 +21 @@
 #include "dart.h"
 #include "dsmixer.h"
+
+#include "initdsound.h"
 
 #include <misc.h>
@@ -60 +62 @@
      if( fIsPlaying == FALSE /*&& lLastBuff == 0*/ )
      {
-       mciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
+       dsmciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
        return TRUE;
      }
@@ -119 +121 @@
    AmpOpenParms.pszDeviceType = (PSZ)MAKEULONG(MCI_DEVTYPE_AUDIO_AMPMIX, (USHORT)device);
 
-   rc = mciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
+   rc = dsmciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_OPEN %d", rc));
@@ -137 +139 @@
    MixSetupParms.pmixEvent        = OS2_Dart_Update;
 
-   rc = mciSendCommand(usDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
+   rc = dsmciSendCommand(usDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
                       (PVOID)&MixSetupParms, 0);
    if (rc != MCIERR_SUCCESS) {
@@ -157 +159 @@
    BufferParms.pBufList       = pMixBuffers;
 
-   rc = mciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
+   rc = dsmciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
                                 (PVOID)&BufferParms, 0);
    if ( ULONG_LOWD(rc) != MCIERR_SUCCESS ) {
       dprintf(("DSOUND-DART: MCI_BUFFER (Alloc) %d", rc));
-      mciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+      dsmciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
       return DSERR_OUTOFMEMORY;
    }
@@ -199 +201 @@
    BufferParms = (MCI_BUFFER_PARMS*)vpBuffParms;
 
-   rc = mciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY, BufferParms, 0);
+   rc = dsmciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY, BufferParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_BUFFER (Close) %d", rc));
    }
-   rc = mciSendCommand(usDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+   rc = dsmciSendCommand(usDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_CLOSE (Close) %d", rc));
@@ -257 +259 @@
 
    /* Dealloc to avoid the 5511 error */
-   rc = mciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY,
+   rc = dsmciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY,
                        BufferParms, 0);
    if (rc != MCIERR_SUCCESS) {
@@ -264 +266 @@
    }
 
-   rc = mciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+   rc = dsmciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_CLOSE (SetFormat) %d", rc));
@@ -275 +277 @@
    AmpOpenParms.pszDeviceType = (PSZ)MAKEULONG(MCI_DEVTYPE_AUDIO_AMPMIX, (USHORT)device);
 
-   rc = mciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
+   rc = dsmciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_OPEN %d", rc));
@@ -292 +294 @@
    MixSetup->pmixEvent        = OS2_Dart_Update;
 
-   rc = mciSendCommand(*pusDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
+   rc = dsmciSendCommand(*pusDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
                        (PVOID)MixSetup, 0);
    if (rc != MCIERR_SUCCESS) {
@@ -307 +309 @@
    pMixBuffers->pBuffer        = NULL;
 
-   rc = mciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
+   rc = dsmciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
                        (PVOID)BufferParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_BUFFER_ALLOCATE_MEMORY (SetFormat) %d", rc));
-      mciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+      dsmciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
       memset(pMixBuffers, 0, sizeof(MCI_MIX_BUFFER) * ulNumDartBuffs);
       return DSERR_OUTOFMEMORY;
@@ -360 +362 @@
    // buffer causing Dart to start again..
 
-   //rc = mciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
+   //rc = dsmciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
    //if (rc != MCIERR_SUCCESS) {
    //   { FILE *dbf; dbf=fopen("log.log", "a"); fprintf( dbf, "Error in MCI_STOP...\n"); fclose(dbf); }
@@ -384 +386 @@
   if (playing == TRUE) 
   {
-    rc = mciSendCommand(usDeviceID, MCI_RESUME, MCI_WAIT, NULL, 0);
+    rc = dsmciSendCommand(usDeviceID, MCI_RESUME, MCI_WAIT, NULL, 0);
     if (rc != MCIERR_SUCCESS) 
     {

trunk/src/dsound/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.17 2001-09-05 12:53:02 bird Exp $
+/* $Id: initterm.cpp,v 1.18 2002-09-14 08:31:25 sandervl Exp $
  *
  * DLL entry point
@@ -27 +27 @@
 #define  INCL_DOSPROCESS
 #include <os2wrap.h>    //Odin32 OS/2 api wrappers
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <odin.h>
 #include <win32type.h>
-#include <winconst.h>
 #include <odinlx.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
 #include <initdll.h>
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD _Resource_PEResTab;
-}
+char dsoundPath[CCHMAXPATH] = "";
 
-char dsoundPath[CCHMAXPATH] = "";
-static HMODULE dllHandle = 0;
-
-//******************************************************************************
-//******************************************************************************
-BOOL WINAPI OdinLibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
-{
-   switch (fdwReason)
-   {
-   case DLL_PROCESS_ATTACH:
-        return TRUE;
-
-   case DLL_THREAD_ATTACH:
-   case DLL_THREAD_DETACH:
-        return TRUE;
-
-   case DLL_PROCESS_DETACH:
-        ctordtorTerm();
-        return TRUE;
-   }
-   return FALSE;
-}
 /****************************************************************************/
 /* _DLL_InitTerm is the function that gets called by the operating system   */
@@ -89 +60 @@
 
          ctordtorInit();
-
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
-
-         dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab);
-         if(dllHandle == 0)
-                return 0UL;
-
-         break;
+         return inittermDSound(hModule, ulFlag);
       }
 
       case 1 :
-         if(dllHandle) {
-                UnregisterLxDll(dllHandle);
-         }
+         inittermDSound(hModule, ulFlag);
+         ctordtorTerm();
          break;
       default  :

trunk/src/dsound/makefile

@@ -1 @@
-# $Id: makefile,v 1.23 2001-04-27 17:39:49 sandervl Exp $
+# $Id: makefile,v 1.24 2002-09-14 08:31:25 sandervl Exp $
 
 #
@@ -21 +21 @@
 $(OBJDIR)\os2dsound.obj \
 $(OBJDIR)\initterm.obj \
+$(OBJDIR)\initdsound.obj \
 $(OBJDIR)\os2sndbuffer.obj \
 $(OBJDIR)\os2primbuff.obj \