Changeset 2456 for trunk/src

Timestamp:

Jan 15, 2000, 11:02:50 PM (26 years ago)

Author:

sandervl

Message:

JW: Updated to Wine level 20000109 + corrected compile errors

Location:

trunk/src/winmm

Files:

• mcianim/initterm.cpp (modified) (2 diffs)
• mcianim/makefile (modified) (2 diffs)
• mciavi32/initterm.cpp (modified) (2 diffs)
• mciavi32/makefile (modified) (2 diffs)
• mciseq/initterm.cpp (modified) (2 diffs)
• mciseq/makefile (modified) (2 diffs)
• mciseq/mciseq.cpp (modified) (9 diffs)
• mciwave/initterm.cpp (modified) (2 diffs)
• mciwave/makefile (modified) (2 diffs)
• mciwave/mciwave.cpp (modified) (7 diffs)
• midimap/initterm.cpp (modified) (2 diffs)
• midimap/makefile (modified) (2 diffs)

trunk/src/winmm/mcianim/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.1 2000-01-03 10:29:27 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.2 2000-01-15 22:02:48 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*/
 

trunk/src/winmm/mcianim/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-01-03 10:29:28 sandervl Exp $
+# $Id: makefile,v 1.2 2000-01-15 22:02:48 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/mciavi32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.1 2000-01-03 10:29:02 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.2 2000-01-15 22:02:49 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*/
 

trunk/src/winmm/mciavi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-01-03 10:29:03 sandervl Exp $
+# $Id: makefile,v 1.2 2000-01-15 22:02:49 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/mciseq/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.1 2000-01-03 10:29:03 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.2 2000-01-15 22:02:49 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*/
 

trunk/src/winmm/mciseq/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-01-03 10:29:03 sandervl Exp $
+# $Id: makefile,v 1.2 2000-01-15 22:02:49 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/mciseq/mciseq.cpp

@@ -51 +51 @@
     HMMIO               hFile;                  /* mmio file handle open as Element          */
     LPCSTR              lpstrElementName;       /* Name of file */
+    LPCSTR              lpstrCopyright;
+    LPCSTR              lpstrName;              
     WORD                dwStatus;               /* one from MCI_MODE_xxxx */
     DWORD               dwMciTimeFormat;        /* One of the supported MCI_FORMAT_xxxx */             
@@ -371 +373 @@
     mmt->dwEventPulse = 0;
     
-    while (MIDI_mciReadNextEvent(wmm, mmt) == 0 && 
-           LOWORD(mmt->dwEventData) != 0x2FFF) {        
+    while (MIDI_mciReadNextEvent(wmm, mmt) == 0 && LOWORD(mmt->dwEventData) != 0x2FFF) {
+        char    buf[1024];
+        WORD    len;
+
         mmt->dwIndex += mmt->wEventLength;
+
+        switch (LOWORD(mmt->dwEventData)) {
+        case 0x02FF:
+        case 0x03FF:
+            /* position after meta data header */
+            mmioSeek(wmm->hFile, mmt->dwIndex + HIWORD(mmt->dwEventData), SEEK_SET);
+            len = mmt->wEventLength - HIWORD(mmt->dwEventData);
+                    
+            if (len >= sizeof(buf)) {
+                WARN("Buffer for text is too small (%d bytes, when %u are needed)\n", sizeof(buf) - 1, len);
+                len = sizeof(buf) - 1;
+            }
+            if (mmioRead(wmm->hFile, (HPSTR)buf, len) == len) {
+                buf[len] = 0;   /* end string in case */
+                switch (HIBYTE(LOWORD(mmt->dwEventData))) {
+                case 0x02:
+                    if (wmm->lpstrCopyright) {
+                        WARN("Two copyright notices (%s|%s)\n", wmm->lpstrCopyright, buf);
+                    } else {
+                        wmm->lpstrCopyright = HEAP_strdupA(GetProcessHeap(), 0, buf);
+                    }
+                    break;
+                case 0x03:
+                    if (wmm->lpstrCopyright) {
+                        WARN("Two names (%s|%s)\n", wmm->lpstrName, buf);
+                    } else {
+                        wmm->lpstrName = HEAP_strdupA(GetProcessHeap(), 0, buf);
+                    }
+                    break;
+                }
+            }
+            break;
+        }
     }
     mmt->dwLength = mmt->dwEventPulse;
@@ -681 +718 @@
     
     if (dwFlags & MCI_OPEN_ELEMENT) {
-        LPSTR           lpstrElementName;
-        
-        lpstrElementName = lpParms->lpstrElementName;
-        
-        TRACE("MCI_OPEN_ELEMENT '%s' !\n", lpstrElementName);
-        if (lpstrElementName && strlen(lpstrElementName) > 0) {
-            wmm->hFile = mmioOpenA(lpstrElementName, NULL, 
+        TRACE("MCI_OPEN_ELEMENT '%s' !\n", lpParms->lpstrElementName);
+        if (lpParms->lpstrElementName && strlen(lpParms->lpstrElementName) > 0) {
+            wmm->hFile = mmioOpenA(lpParms->lpstrElementName, NULL, 
                                    MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
             if (wmm->hFile == 0) {
-                WARN("Can't find file '%s' !\n", lpstrElementName);
+                WARN("Can't find file '%s' !\n", lpParms->lpstrElementName);
                 wmm->nUseCount--;
                 return MCIERR_FILE_NOT_FOUND;
@@ -701 +734 @@
     
     /* FIXME: should I get a strdup() of it instead? */
-    wmm->lpstrElementName = lpParms->lpstrElementName;
-    
+    wmm->lpstrElementName = HEAP_strdupA(GetProcessHeap(), 0, lpParms->lpstrElementName);
+    wmm->lpstrCopyright = NULL;
+    wmm->lpstrName = NULL;
+
     wmm->wNotifyDeviceID = dwDeviceID;
     wmm->dwStatus = MCI_MODE_NOT_READY; /* while loading file contents */
@@ -801 +836 @@
         }
         HeapFree(GetProcessHeap(), 0, wmm->tracks);
+        HeapFree(GetProcessHeap(), 0, (LPSTR)wmm->lpstrElementName);
+        HeapFree(GetProcessHeap(), 0, (LPSTR)wmm->lpstrCopyright);
+        HeapFree(GetProcessHeap(), 0, (LPSTR)wmm->lpstrName);
     } else {
         TRACE("Shouldn't happen... nUseCount=%d\n", wmm->nUseCount);
@@ -906 +944 @@
     wmm->wStartedPlaying = FALSE;
     
-    dwRet = midiOutOpen(&wmm->hMidi, 0, 0L, 0L, CALLBACK_NULL);
-    /*  dwRet = midiInOpen(&wmm->hMidi, 0, 0L, 0L, CALLBACK_NULL);*/
+    dwRet = midiOutOpen(&wmm->hMidi, MIDIMAPPER, 0L, 0L, CALLBACK_NULL);
+    /*  dwRet = midiInOpen(&wmm->hMidi, MIDIMAPPER, 0L, 0L, CALLBACK_NULL);*/
 
     while (wmm->dwStatus != MCI_MODE_STOP) {
@@ -987 +1025 @@
                         TRACE("%s => \"%s\"\n", (idx < 8 ) ? info[idx] : "", buf);
                     } else {
-                        WARN("Couldn't read data for %s\n", (idx < 8 ) ? info[idx] : "");
+                        WARN("Couldn't read data for %s\n", (idx < 8) ? info[idx] : "");
                     }
                 }
@@ -1508 +1546 @@
     TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize);
     
-    switch (dwFlags) {
+    switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) {
     case MCI_INFO_PRODUCT:
         str = "Wine's MIDI sequencer";
@@ -1515 +1553 @@
         str = wmm->lpstrElementName;
         break;
-#if 0
-        /* FIXME: the following manifest constants are not defined in <WINE>/include/mmsystem.h */
     case MCI_INFO_COPYRIGHT:
+        str = wmm->lpstrCopyright;
+        break;  
+    case MCI_INFO_NAME:
+        str = wmm->lpstrName;
         break;
-    case MCI_INFO_NAME:
-        break;
-#endif
     default:
         WARN("Don't know this info command (%lu)\n", dwFlags);

trunk/src/winmm/mciwave/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.1 2000-01-03 10:29:03 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.2 2000-01-15 22:02:49 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*/
 

trunk/src/winmm/mciwave/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-01-03 10:29:04 sandervl Exp $
+# $Id: makefile,v 1.2 2000-01-15 22:02:49 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/mciwave/mciwave.cpp

@@ -31 +31 @@
     LPWAVEFORMATEX              lpWaveFormat;
     BOOL                        fInput;         /* FALSE = Output, TRUE = Input */
-    WORD                        dwStatus;       /* one from MCI_MODE_xxxx */
+    volatile WORD               dwStatus;       /* one from MCI_MODE_xxxx */
     DWORD                       dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */
     DWORD                       dwFileOffset;   /* Offset of chunk in mmio file */
@@ -38 +38 @@
     HANDLE                      hEvent;         /* for synchronization */
     DWORD                       dwEventCount;   /* for synchronization */
-} WINE_MCIWAVE, *PWINE_MCIWAVE;
+} WINE_MCIWAVE;
 
 /* ===================================================================
@@ -128 +128 @@
 static  DWORD   WAVE_drvOpen(LPSTR str, LPMCI_OPEN_DRIVER_PARMSA modp)
 {
-    WINE_MCIWAVE*       wmw = PWINE_MCIWAVE(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIWAVE)));
+    WINE_MCIWAVE*       wmw = (WINE_MCIWAVE*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIWAVE));
 
     if (!wmw)
@@ -435 +435 @@
                 dwRet = (wmw->fInput) ? waveInReset(wmw->hWave) : waveOutReset(wmw->hWave);
         }
-        while (((volatile WINE_MCIWAVE*)wmw)->dwStatus != MCI_MODE_STOP)
+        while (wmw->dwStatus != MCI_MODE_STOP)
             Sleep(10);
         break;
@@ -553 +553 @@
     }
     
+        if (wmw->dwStatus == MCI_MODE_PAUSE) {
+            /* FIXME: parameters (start/end) in lpParams may not be used */
+            return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms);
+        }
+    
+    /** This function will be called again by a thread when async is used.
+     * We have to set MCI_MODE_PLAY before we do this so that the app can spin
+     * on MCI_STATUS, so we have to allow it here if we're not going to start this thread.
+     */
+    if ((wmw->dwStatus != MCI_MODE_STOP) && ((wmw->dwStatus != MCI_MODE_PLAY) && (dwFlags & MCI_WAIT))) {
+        return MCIERR_INTERNAL;
+    }
+
+    wmw->dwStatus = MCI_MODE_PLAY;
+    
     if (!(dwFlags & MCI_WAIT)) {
         return MCI_SendCommandAsync(wmw->wNotifyDeviceID, MCI_PLAY, dwFlags, 
                                     (DWORD)lpParms, sizeof(MCI_PLAY_PARMS));
-    }
-
-    if (wmw->dwStatus != MCI_MODE_STOP) {
-        if (wmw->dwStatus == MCI_MODE_PAUSE) {
-            /* FIXME: parameters (start/end) in lpParams may not be used */
-            return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms);
-        }
-        return MCIERR_INTERNAL;
     }
 
@@ -628 +635 @@
 
     TRACE("Playing (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, left);
-    wmw->dwStatus = MCI_MODE_PLAY;
     
     /* FIXME: this doesn't work if wmw->dwPosition != 0 */
@@ -719 +725 @@
     }
     bufsize = 64000;
-    waveHdr.lpData = (CHAR*)HeapAlloc(GetProcessHeap(), 0, bufsize);
+    waveHdr.lpData = (char*)HeapAlloc(GetProcessHeap(), 0, bufsize);
     waveHdr.dwBufferLength = bufsize;
     waveHdr.dwUser = 0L;

trunk/src/winmm/midimap/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.1 2000-01-03 10:29:04 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.2 2000-01-15 22:02:50 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*/
 

trunk/src/winmm/midimap/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-01-03 10:29:05 sandervl Exp $
+# $Id: makefile,v 1.2 2000-01-15 22:02:50 sandervl Exp $
 
 #
@@ -7 +7 @@
 #
 
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
+PDWIN32_INCLUDE = ..\..\..\include
+PDWIN32_LIB = ..\..\..\lib
+PDWIN32_BIN = ..\..\..\bin