Changeset 2472 for trunk/src

Timestamp:

Jan 18, 2000, 9:24:02 PM (26 years ago)

Author:

sandervl

Message:

JW: Updated to Wine level 20000109 + corrected compile

Location:

trunk/src/winmm/wavemap

Files:

• initterm.cpp (modified) (4 diffs)
• makefile (modified) (2 diffs)
• msacm32.cpp (modified) (3 diffs)

trunk/src/winmm/wavemap/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.1 2000-01-17 05:22:59 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.2 2000-01-18 20:24:02 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #include <string.h>
 #include <odin.h>
+#include <win32type.h>
+#include <odinlx.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
 
@@ -74 +76 @@
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
+         if(RegisterLxDll(hModule, 0, 0) == FALSE) 
+                return 0UL;
+
          /*******************************************************************/
          /* A DosExitList routine must be used to clean up if runtime calls */
@@ -85 +90 @@
          break;
       case 1 :
+         UnregisterLxDll(hModule);
          break;
       default  :

trunk/src/winmm/wavemap/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-01-17 05:23:00 sandervl Exp $
+# $Id: makefile,v 1.2 2000-01-18 20:24:02 sandervl Exp $
 
 #
@@ -7 +7 @@
 #
 
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
+PDWIN32_INCLUDE = ..\..\..\include
+PDWIN32_LIB = ..\..\..\lib
+PDWIN32_BIN = ..\..\..\bin
 
 

trunk/src/winmm/wavemap/msacm32.cpp

@@ -52 +52 @@
     WAVEMAPDATA*        wom = (WAVEMAPDATA*)dwInstance;
 
-    TRACE("(0x%x %u %ld %ld %ld);\n", hDev, uMsg, dwInstance, dwParam1, dwParam2);
+    TRACE("(0x%x %u %ld %lx %lx);\n", hDev, uMsg, dwInstance, dwParam1, dwParam2);
 
     switch (uMsg) {
@@ -336 +336 @@
 }
 
+static  DWORD   wodBreakLoop(WAVEMAPDATA* wom)
+{
+    return waveOutBreakLoop(wom->hWave);
+}
+
 /**************************************************************************
  *                              WAVEMAP_wodMessage      [sample driver]
@@ -357 +362 @@
     case WODM_PAUSE:            return wodPause         ((WAVEMAPDATA*)dwUser);
     case WODM_GETPOS:           return wodGetPosition   ((WAVEMAPDATA*)dwUser, (LPMMTIME)dwParam1,      dwParam2);
-    case WODM_BREAKLOOP:        return MMSYSERR_NOTSUPPORTED;
+    case WODM_BREAKLOOP:        return wodBreakLoop     ((WAVEMAPDATA*)dwUser);
     case WODM_PREPARE:          return wodPrepare       ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1,     dwParam2);
     case WODM_UNPREPARE:        return wodUnprepare     ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1,     dwParam2);