Changeset 8857 for trunk/src

Timestamp:

Jul 12, 2002, 10:59:24 AM (23 years ago)

Author:

sandervl

Message:

Changed init order; do not check for MMPM2 presence if wave audio was already disabled

File:

• trunk/src/winmm/initwinmm.cpp (modified) (4 diffs)

trunk/src/winmm/initwinmm.cpp

@@ -1 @@
-/* $Id: initwinmm.cpp,v 1.9 2002-06-04 17:36:55 sandervl Exp $
+/* $Id: initwinmm.cpp,v 1.10 2002-07-12 08:59:24 sandervl Exp $
  *
  * WINMM DLL entry point
@@ -67 +67 @@
 static HMODULE MMPMLibraryHandle = 0;
 
-BOOL fMMPMAvailable = FALSE;
+BOOL fMMPMAvailable = TRUE;
 
 DWORD (APIENTRY *pfnmciSendCommand)(WORD   wDeviceID,
@@ -82 +82 @@
 void WIN32API DisableWaveAudio()
 {
-    fMMPMAvailable = FALSE;
+    fMMPMAvailable       = FALSE;
     pfnmciGetErrorString = NULL;
-    pfnmciSendCommand = NULL;
+    pfnmciSendCommand    = NULL;
 }
 //******************************************************************************
@@ -115 +115 @@
         WaveOut::setDefaultVolume(dwVolume);
 
-        // try to load the MDM library, not MMPM directly!!!
-        if (DosLoadModule(szError, sizeof(szError),
-                          "MDM.DLL", &MMPMLibraryHandle) != NO_ERROR)
-        {
-            // this system has no MMPM :-(
-            fMMPMAvailable = FALSE;
-        } 
-        else
-        {
-            /* detect if MMPM is available */
-            if (DosQueryProcAddr(MMPMLibraryHandle,
-                                 1, /* ORD_MCISENDCOMMAND */
-                                 NULL,
-                                (PFN*)&pfnmciSendCommand) != NO_ERROR)
+        if(fMMPMAvailable == TRUE) 
+        {//if audio access wasn't disabled already, check if mmpm2 is installed
+            // try to load the MDM library, not MMPM directly!!!
+            if (DosLoadModule(szError, sizeof(szError),
+                              "MDM.DLL", &MMPMLibraryHandle) != NO_ERROR)
             {
+                // this system has no MMPM :-(
                 fMMPMAvailable = FALSE;
             } 
             else
             {
-                fMMPMAvailable = TRUE;
+                /* detect if MMPM is available */
+                if (DosQueryProcAddr(MMPMLibraryHandle,
+                                     1, /* ORD_MCISENDCOMMAND */
+                                     NULL,
+                                    (PFN*)&pfnmciSendCommand) != NO_ERROR)
+                {
+                    fMMPMAvailable = FALSE;
+                } 
+                else
+                {
+                    fMMPMAvailable = TRUE;
+                }
+
+                /* see if we can get the address for the mciGetErrorString function */
+                if (fMMPMAvailable == TRUE)
+                {
+                    if (DosQueryProcAddr(MMPMLibraryHandle,
+                                         3, /* ORD_MCIGETERRORSTRING */
+                                         NULL,
+                                         (PFN*)&pfnmciGetErrorString) != NO_ERROR)
+                        pfnmciGetErrorString = NULL;
+                }
+                dprintf(("MMPM/2 is available; hmod %x", MMPMLibraryHandle));
+                dprintf(("mciSendCommand    %x", pfnmciSendCommand));
+                dprintf(("mciGetErrorString %x", pfnmciGetErrorString));
             }
-
-            /* see if we can get the address for the mciGetErrorString function */
-            if (fMMPMAvailable == TRUE)
-            {
-                if (DosQueryProcAddr(MMPMLibraryHandle,
-                                     3, /* ORD_MCIGETERRORSTRING */
-                                     NULL,
-                                     (PFN*)&pfnmciGetErrorString) != NO_ERROR)
-                    pfnmciGetErrorString = NULL;
-            }
-            dprintf(("MMPM/2 is available; hmod %x", MMPMLibraryHandle));
-            dprintf(("mciSendCommand    %x", pfnmciSendCommand));
-            dprintf(("mciGetErrorString %x", pfnmciGetErrorString));
-        }
+        }
+
         if(fMMPMAvailable && RegOpenKeyA(HKEY_LOCAL_MACHINE, CUSTOM_BUILD_OPTIONS_KEY, &hKey) == 0) 
         {