Release 950620
Mon Jun 19 20:29:50 1995 Alexandre Julliard (julliard@sunsite.unc.edu)
* [debugger/*.c]
Modified debugger to use segmented pointers everywhere.
* [if1632/shell.spec] [if1632/sound.spec] [if1632/user.spec]
Declared all functions that return only 16-bit as 'pascal16'.
* [include/ldt.h] [memory/ldt.c]
Export LDT_EntryToBytes (new) and LDT_BytesToEntry for DPMI.
Maintain a copy of the selector flags, removing the need to make a
system call to retrieve an LDT entry.
* [loader/module.c]
Fixed bug with module file handle cache.
* [loader/ne_resource.c]
Fixed file name bug in NE_AccessResource().
* [loader/resource.c]
Fixed bug in LoadIcon() that caused wrong colors to be used for
the icon mask.
* [loader/signal.c]
Moved instruction emulation to miscemu/instr.c.
* [misc/dos_fs.c] [miscemu/int21.c]
Lots of small fixes, thanks to Morten Welinder.
* [miscemu/dpmi.c]
More complete DPMI emulation.
* [miscemu/instr.c]
Added support for prefixes in instructions to emulate.
* [miscemu/int2f.c]
Use register macros instead of destroying the high part of 32-bit
registers.
* [objects/dc.c]
Fixed bug in GetDCState() that failed to clear the new DC.
* [rc/sysres.rc]
Removed dialogs 11 and 12 that were never used.
* [tools/build.c]
'pascal16' generated functions did not save %dx.
Removed use of %fs to access the stack.
%ds is no longer initialized before calling a 16-bit routine.
* [windows/defwnd.c]
Accept a NULL pointer as window title.
* [windows/mdi.c]
MDICascade: skip iconic windows.
Implemented CalcChildScroll().
* [windows/utility.c]
Fixed MulDiv() for illegal values.
* [windows/win.c]
Fixed X error in CreateWindowEx() when WM_NCCALCSIZE returned
a zero width or height.
Sun Jun 18 22:22:30 MET DST 1995 Fons Botman (botman@inter.nl.net)
* [controls/edit.c]
Fixed "uninitalized" message which -Wall couldnt see to be ok
in EDIT_WriteText.
* [include/debug.h]
Added define for extra checks in API definitions during debugging.
* [loader/ne_image.c]
Added newline in NE_FixupPrologs to avoid long lines.
* [misc/dos_fs.c]
Added extra safety check in DOS_ValidDrive.
* [misc/exec.c]
Fixed definition of ExitWindows.
Sun Jun 18 21:16:08 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/edit.c]
Some fixes, mostly for memory management, but also for text selection
and tab postitions. General cleanup. Notepad.exe now works.
* [controls/combo.c]
Fix: the hwnd field of the DRAWITEMSTRUCT should always be that of
the combo box, not the ComboLBox that belongs to it.
* [controls/listbox.c]
Handle itemID field correctly throughout.
* [memory/local.c]
Implemented flag LMEM_ZEROINIT.
LocalReAlloc() could trash the heap. Fixed.
* [objects/font.c]
FONT_MatchFont(): don't get confused by negative widths.
Fixed a segfault in EnumFonts().
* [objects/text.c]
DrawText(): DT_CALCRECT implies DT_NOCLIP.
* [objects/dcvalues.c]
MAKELONG was used with bad parameters in DC_GET_X_Y.
* [windows/dialog.c]
Don't show the dialog if WS_VISIBLE isn't set in the template.
* [windows/utility.c]
UTILITY_convertArgs(): Never pass an expression containing ++ into a
macro...
* [windows/win.c]
SetParent() should unlink the window before changing the parent.
* [windows/message.c]
Don't call timer functions via CallWindowProc(), since it checks
whether hwnd==0 and does not call the function in that case.
* [miscemu/instr.c]
Ignore interrupt 0x3D, for VBRUN300.DLL.
* [misc/commdlg.c]
Don't rely on the itemData field of the DRAWITEMSTRUCT to contain a
pointer to the item text.
* [if1632/relay.c]
Disable OLE and DDEML DLLs by default, since they contain nothing but
stubs anyway. SHELL, COMMDLG and WIN87EM are left enabled, although
some programs may work better without them.
* [multimedia/*.c] [include/multimedia.h] [include/driver.h]
Begun cleaning things up a little. Replaced printfs with dprintf_
macros, made functions static where possible, and some other minor
changes.
Sun Jun 11 23:19:10 1995 Martin von Loewis <martin@informatik.hu-berlin.de>
* [debugger/dbg.y][debugger/dbg.l]
Removed special handling for FILE_IDENTIFER, because it caused
problems with x/<format> statements.
* [debugger/info.c]
Use SC_ESP instead of SC_EIP for stack dump.
* [misc/compobj.c][if1632/compobj.spec]
CoBuildVersion, CoInitialize, CoUninitialize: new functions
* [misc/ole2.c][if1632/ole2.spec][misc/Imakefile][include/ole2.h]
New files ole2.c, ole2.h
OleBuildVersion, OleInitialize, OleUninitialize: new functions
* [if1632/ole2disp.spec]
Added missing ordinals above 109
* [misc/ole2nls.c][if1632/ole2nls.spec][include/winnls.h]
New file winnls.h
GetLocaleInfoA: new function
* [if1632/shell.spec]
Added FindEnvironmentString as stub
* [misc/olecli.c][if1632/olecli.spec]
OleIsDcMeta: New function
* [objects/font][misc/gdi.spec]
GetKerningPairs: new function
* [misc/shell.c]
ShellExecute: Implemented support for starting programs
* [if1632/user.spec]
Inserted missing relay to GetClipCursor
Sun Jun 11 20:34:47 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/edit.c]
Fix a problem with the local heap.
* [include/wintypes.h]
Fixed wrong declarations of CATCHBUF and LPCATCHBUF.
* [include/mdi.h] [windows/mdi.c]
This code still assumed segmented address==linear address. Fixed.
* [include/msdos.h] [misc/dos_fs.c]
The filemask field of the dosdirent structure could be overrun. Fixed.
If you had a file called foobar and a file called foo, trying to
FindFile(foo) could accidentally find file foobar instead. Fixed.
* [misc/file.c]
OpenFile(): Always return the full pathname in ofs->szPathName. This
also fixes GetModuleFilename().
Prevent _lclose() from closing stderr or stdout.
* [misc/profile.c]
Search for .ini files in the path of the current module as well.
(Needed by Lotus Organizer.)
* [loader/task.c] [loader/ne_image.c] [loader/module.c]
[memory/local.c]
Local heaps are now initialized by InitTask() for executables. DLLs
have to call LocalInit() themselves, LocalInit() has to put the
heap at the end of the segment when called with start==0. We no longer
allocate the DGROUP with 64k on startup, but grow the local heap
in LOCAL_GetBlock() when necessary.
* [loader/module.c]
LoadLibrary() should call LoadModule() in all cases, even if the
DLL is already loaded, to ensure that the reference count is correct.
* [loader/ne_image.c]
Some changes to function prolog fixup. Does anyone know exactly how
this is supposed to work? I am only guessing here.
In NE_InitializeDLLs(), initialize the DLLs a module refers to before
the module itself.
* [loader/task.c]
Initialize instance data at the beginning of the DGROUP in InitTask().
* [memory/local.c]
Some fixes for moveable blocks.
* [memory/selector.c]
All the IsBad*Pointer() functions returned exactly the wrong boolean
value in all cases!
* [objects/bitblt.c]
Fixed another null pointer dereference in debugging output.
* [objects/font.c]
Some more recovery possibilities for FONT_MatchFont() if a specified
font does not exist.
* [windows/win.c]
The dialog code may call CreateWindowEx with an integer in windowName.
This happens for static icon controls that expect a resource ID as
the window name. CreateWindowEx() used to crash. Fixed.
* [windows/class.c] [windows/win.c]
Window classes are owned by modules, not instances. Changed
RegisterClass(), UnregisterClass(), GetClassInfo() and CreateWindowEx()
accordingly.
Sat Jun 10 16:10:53 1995 Olaf Flebbe <o.flebbe@science-computing.uni-tuebingen.de>
* [miscemu/int21.c]
clock.exe was displaying incorrect year.
Fri Jun 9 20:36:56 1995 Victor Schneider <tailor@crl.com>
* [include/cursor.h] [windows/cursor.c]
Implemented CreateCursorIconIndirect().
diff --git a/multimedia/mcicda.c b/multimedia/mcicda.c
index 6e00345..f1e125c 100644
--- a/multimedia/mcicda.c
+++ b/multimedia/mcicda.c
@@ -2,9 +2,8 @@
* Sample MCI CDAUDIO Wine Driver for Linux
*
* Copyright 1994 Martin Ayotte
- *
-static char Copyright[] = "Copyright Martin Ayotte, 1994";
-*/
+ */
+
#ifndef WINELIB
#define BUILTIN_MMSYSTEM
#endif
@@ -22,7 +21,6 @@
#include "driver.h"
#include "mmsystem.h"
#include "stddebug.h"
-/* #define DEBUG_CDAUDIO */
#include "debug.h"
#ifdef linux
@@ -69,19 +67,114 @@
static LINUX_CDAUDIO CDADev[MAX_CDAUDIODRV];
#endif
-UINT CDAUDIO_GetNumberOfTracks(UINT wDevID);
-BOOL CDAUDIO_GetTracksInfo(UINT wDevID);
-BOOL CDAUDIO_GetCDStatus(UINT wDevID);
-DWORD CDAUDIO_CalcTime(UINT wDevID, DWORD dwFormatType, DWORD dwFrame);
-
/*-----------------------------------------------------------------------*/
/**************************************************************************
+* CDAUDIO_GetNumberOfTracks [internal]
+*/
+static UINT CDAUDIO_GetNumberOfTracks(UINT wDevID)
+{
+#ifdef linux
+ struct cdrom_tochdr hdr;
+ if (CDADev[wDevID].nTracks == 0) {
+ if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCHDR, &hdr)) {
+ dprintf_cdaudio(stddeb,
+ "GetNumberOfTracks(%u) // Error occured !\n",
+ wDevID);
+ return (WORD)-1;
+ }
+ CDADev[wDevID].nTracks = hdr.cdth_trk1;
+ }
+ return CDADev[wDevID].nTracks;
+#else
+ return (WORD)-1;
+#endif
+}
+
+
+/**************************************************************************
+* CDAUDIO_GetTracksInfo [internal]
+*/
+static BOOL CDAUDIO_GetTracksInfo(UINT wDevID)
+{
+#ifdef linux
+ int i, length;
+ int start, last_start = 0;
+ int total_length = 0;
+ struct cdrom_tocentry entry;
+ if (CDADev[wDevID].nTracks == 0) {
+ if (CDAUDIO_GetNumberOfTracks(wDevID) == (WORD)-1) return FALSE;
+ }
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetTracksInfo // nTracks=%u\n",
+ CDADev[wDevID].nTracks);
+ if (CDADev[wDevID].lpdwTrackLen != NULL)
+ free(CDADev[wDevID].lpdwTrackLen);
+ CDADev[wDevID].lpdwTrackLen = (LPDWORD)malloc(
+ (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
+ if (CDADev[wDevID].lpdwTrackPos != NULL)
+ free(CDADev[wDevID].lpdwTrackPos);
+ CDADev[wDevID].lpdwTrackPos = (LPDWORD)malloc(
+ (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
+ if (CDADev[wDevID].lpdwTrackLen == NULL ||
+ CDADev[wDevID].lpdwTrackPos == NULL) {
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_GetTracksInfo // error allocating track table !\n");
+ return FALSE;
+ }
+ memset(CDADev[wDevID].lpdwTrackLen, 0,
+ (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
+ memset(CDADev[wDevID].lpdwTrackPos, 0,
+ (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
+ for (i = 0; i <= CDADev[wDevID].nTracks; i++) {
+ if (i == CDADev[wDevID].nTracks)
+ entry.cdte_track = CDROM_LEADOUT;
+ else
+ entry.cdte_track = i + 1;
+ entry.cdte_format = CDROM_MSF;
+ if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCENTRY, &entry)) {
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_GetTracksInfo // error read entry\n");
+ return FALSE;
+ }
+ start = CDFRAMES_PERSEC * (SECONDS_PERMIN *
+ entry.cdte_addr.msf.minute + entry.cdte_addr.msf.second) +
+ entry.cdte_addr.msf.frame;
+ if (i == 0) {
+ last_start = start;
+ CDADev[wDevID].dwFirstOffset = start;
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_GetTracksInfo // dwFirstOffset=%u\n",
+ start);
+ }
+ else {
+ length = start - last_start;
+ last_start = start;
+ start = last_start - length;
+ total_length += length;
+ CDADev[wDevID].lpdwTrackLen[i - 1] = length;
+ CDADev[wDevID].lpdwTrackPos[i - 1] = start;
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_GetTracksInfo // track #%u start=%u len=%u\n",
+ i, start, length);
+ }
+ }
+ CDADev[wDevID].dwTotalLen = total_length;
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetTracksInfo // total_len=%u\n",
+ total_length);
+ fflush(stdout);
+ return TRUE;
+#else
+ return FALSE;
+#endif
+}
+
+
+/**************************************************************************
* CDAUDIO_mciOpen [internal]
*/
-DWORD CDAUDIO_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS lpParms)
+static DWORD CDAUDIO_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciOpen(%04X, %08lX, %p);\n",
@@ -109,7 +202,7 @@
CDADev[wDevID].wNotifyDeviceID = lpParms->wDeviceID;
CDADev[wDevID].unixdev = open (CDAUDIO_DEV, O_RDONLY, 0);
if (CDADev[wDevID].unixdev == -1) {
- fprintf(stderr,"CDAUDIO_mciOpen // can't open '%s' !\n", CDAUDIO_DEV);
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciOpen // can't open '%s' !\n", CDAUDIO_DEV);
return MCIERR_HARDWARE;
}
CDADev[wDevID].mode = 0;
@@ -121,7 +214,7 @@
CDADev[wDevID].lpdwTrackLen = NULL;
CDADev[wDevID].lpdwTrackPos = NULL;
if (!CDAUDIO_GetTracksInfo(wDevID)) {
- fprintf(stderr,"CDAUDIO_mciOpen // error reading TracksInfo !\n");
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciOpen // error reading TracksInfo !\n");
/* return MCIERR_INTERNAL; */
}
if (dwFlags & MCI_NOTIFY) {
@@ -140,7 +233,7 @@
/**************************************************************************
* CDAUDIO_mciClose [internal]
*/
-DWORD CDAUDIO_mciClose(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms)
+static DWORD CDAUDIO_mciClose(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciClose(%u, %08lX, %p);\n",
@@ -155,7 +248,7 @@
/**************************************************************************
* CDAUDIO_mciGetDevCaps [internal]
*/
-DWORD CDAUDIO_mciGetDevCaps(UINT wDevID, DWORD dwFlags,
+static DWORD CDAUDIO_mciGetDevCaps(UINT wDevID, DWORD dwFlags,
LPMCI_GETDEVCAPS_PARMS lpParms)
{
#ifdef linux
@@ -210,7 +303,7 @@
/**************************************************************************
* CDAUDIO_mciInfo [internal]
*/
-DWORD CDAUDIO_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMS lpParms)
+static DWORD CDAUDIO_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciInfo(%u, %08lX, %p);\n",
@@ -234,10 +327,173 @@
#endif
}
+
+/**************************************************************************
+* CDAUDIO_CalcFrame [internal]
+*/
+static DWORD CDAUDIO_CalcFrame(UINT wDevID, DWORD dwFormatType, DWORD dwTime)
+{
+ DWORD dwFrame = 0;
+#ifdef linux
+ UINT wTrack;
+
+ dprintf_cdaudio(stddeb,"CDAUDIO_CalcFrame(%u, %08lX, %lu);\n",
+ wDevID, dwFormatType, dwTime);
+
+ switch (dwFormatType) {
+ case MCI_FORMAT_MILLISECONDS:
+ dwFrame = dwTime * CDFRAMES_PERSEC / 1000;
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_CalcFrame // MILLISECONDS %lu\n",
+ dwFrame);
+ break;
+ case MCI_FORMAT_MSF:
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_CalcFrame // MSF %02u:%02u:%02u\n",
+ MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime),
+ MCI_MSF_FRAME(dwTime));
+ dwFrame += CDFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime);
+ dwFrame += CDFRAMES_PERSEC * MCI_MSF_SECOND(dwTime);
+ dwFrame += MCI_MSF_FRAME(dwTime);
+ break;
+ default:
+ /* unknown format ! force TMSF ! ... */
+ dwFormatType = MCI_FORMAT_TMSF;
+ case MCI_FORMAT_TMSF:
+ wTrack = MCI_TMSF_TRACK(dwTime);
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_CalcFrame // TMSF %02u-%02u:%02u:%02u\n",
+ MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime),
+ MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime));
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_CalcFrame // TMSF trackpos[%u]=%lu\n",
+ wTrack, CDADev[wDevID].lpdwTrackPos[wTrack - 1]);
+ dwFrame = CDADev[wDevID].lpdwTrackPos[wTrack - 1];
+ dwFrame += CDFRAMES_PERMIN * MCI_TMSF_MINUTE(dwTime);
+ dwFrame += CDFRAMES_PERSEC * MCI_TMSF_SECOND(dwTime);
+ dwFrame += MCI_TMSF_FRAME(dwTime);
+ break;
+ }
+#endif
+ return dwFrame;
+}
+
+
+/**************************************************************************
+* CDAUDIO_GetCDStatus [internal]
+*/
+static BOOL CDAUDIO_GetCDStatus(UINT wDevID)
+{
+#ifdef linux
+ int oldmode = CDADev[wDevID].mode;
+ CDADev[wDevID].sc.cdsc_format = CDROM_MSF;
+ if (ioctl(CDADev[wDevID].unixdev, CDROMSUBCHNL, &CDADev[wDevID].sc)) {
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // opened or no_media !\n");
+ CDADev[wDevID].mode = MCI_MODE_NOT_READY;
+ return TRUE;
+ }
+ switch (CDADev[wDevID].sc.cdsc_audiostatus) {
+ case CDROM_AUDIO_INVALID:
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // device doesn't support status !\n");
+ return FALSE;
+ case CDROM_AUDIO_NO_STATUS:
+ CDADev[wDevID].mode = MCI_MODE_STOP;
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // MCI_MODE_STOP !\n");
+ break;
+ case CDROM_AUDIO_PLAY:
+ CDADev[wDevID].mode = MCI_MODE_PLAY;
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // MCI_MODE_PLAY !\n");
+ break;
+ case CDROM_AUDIO_PAUSED:
+ CDADev[wDevID].mode = MCI_MODE_PAUSE;
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // MCI_MODE_PAUSE !\n");
+ break;
+ default:
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // status=%02X !\n",
+ CDADev[wDevID].sc.cdsc_audiostatus);
+ }
+ CDADev[wDevID].nCurTrack = CDADev[wDevID].sc.cdsc_trk;
+ CDADev[wDevID].dwCurFrame =
+ CDFRAMES_PERMIN * CDADev[wDevID].sc.cdsc_absaddr.msf.minute +
+ CDFRAMES_PERSEC * CDADev[wDevID].sc.cdsc_absaddr.msf.second +
+ CDADev[wDevID].sc.cdsc_absaddr.msf.frame;
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // %02u-%02u:%02u:%02u \n",
+ CDADev[wDevID].sc.cdsc_trk,
+ CDADev[wDevID].sc.cdsc_absaddr.msf.minute,
+ CDADev[wDevID].sc.cdsc_absaddr.msf.second,
+ CDADev[wDevID].sc.cdsc_absaddr.msf.frame);
+ if (oldmode != CDADev[wDevID].mode && oldmode == MCI_MODE_OPEN) {
+ if (!CDAUDIO_GetTracksInfo(wDevID)) {
+ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // error updating TracksInfo !\n");
+ return MCIERR_INTERNAL;
+ }
+ }
+ return TRUE;
+#else
+ return FALSE;
+#endif
+}
+
+
+/**************************************************************************
+* CDAUDIO_CalcTime [internal]
+*/
+static DWORD CDAUDIO_CalcTime(UINT wDevID, DWORD dwFormatType, DWORD dwFrame)
+{
+ DWORD dwTime = 0;
+#ifdef linux
+ UINT wTrack;
+ UINT wMinutes;
+ UINT wSeconds;
+ UINT wFrames;
+ dprintf_cdaudio(stddeb,"CDAUDIO_CalcTime(%u, %08lX, %lu);\n",
+ wDevID, dwFormatType, dwFrame);
+
+ switch (dwFormatType) {
+ case MCI_FORMAT_MILLISECONDS:
+ dwTime = dwFrame / CDFRAMES_PERSEC * 1000;
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_CalcTime // MILLISECONDS %lu\n",
+ dwTime);
+ break;
+ case MCI_FORMAT_MSF:
+ wMinutes = dwFrame / CDFRAMES_PERMIN;
+ wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC;
+ wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes -
+ CDFRAMES_PERSEC * wSeconds;
+ dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames);
+ dprintf_cdaudio(stddeb,"CDAUDIO_CalcTime // MSF %02u:%02u:%02u -> dwTime=%lu\n",
+ wMinutes, wSeconds, wFrames, dwTime);
+ break;
+ default:
+ /* unknown format ! force TMSF ! ... */
+ dwFormatType = MCI_FORMAT_TMSF;
+ case MCI_FORMAT_TMSF:
+ for (wTrack = 0; wTrack < CDADev[wDevID].nTracks; wTrack++) {
+/* dwTime += CDADev[wDevID].lpdwTrackLen[wTrack - 1];
+ printf("Adding trk#%u curpos=%u \n", dwTime);
+ if (dwTime >= dwFrame) break; */
+ if (CDADev[wDevID].lpdwTrackPos[wTrack - 1] >= dwFrame) break;
+ }
+ wMinutes = dwFrame / CDFRAMES_PERMIN;
+ wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC;
+ wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes -
+ CDFRAMES_PERSEC * wSeconds;
+ dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames);
+ dprintf_cdaudio(stddeb,
+ "CDAUDIO_CalcTime // %02u-%02u:%02u:%02u\n",
+ wTrack, wMinutes, wSeconds, wFrames);
+ break;
+ }
+#endif
+ return dwTime;
+}
+
+
/**************************************************************************
* CDAUDIO_mciStatus [internal]
*/
-DWORD CDAUDIO_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms)
+static DWORD CDAUDIO_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciStatus(%u, %08lX, %p);\n",
@@ -261,7 +517,7 @@
case MCI_STATUS_LENGTH:
if (CDADev[wDevID].nTracks == 0) {
if (!CDAUDIO_GetTracksInfo(wDevID)) {
- fprintf(stderr,"CDAUDIO_mciStatus // error reading TracksInfo !\n");
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciStatus // error reading TracksInfo !\n");
return MCIERR_INTERNAL;
}
}
@@ -287,7 +543,7 @@
case MCI_STATUS_MEDIA_PRESENT:
lpParms->dwReturn = (CDADev[wDevID].nTracks > 0) ? TRUE : FALSE;
if (lpParms->dwReturn == FALSE)
- fprintf(stderr,"CDAUDIO_mciStatus // MEDIA_NOT_PRESENT !\n");
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciStatus // MEDIA_NOT_PRESENT !\n");
else
dprintf_cdaudio(stddeb,"CDAUDIO_mciStatus // MCI_STATUS_MEDIA_PRESENT !\n");
return 0;
@@ -324,11 +580,11 @@
lpParms->dwReturn = MCI_FORMAT_MILLISECONDS;
return 0;
default:
- fprintf(stderr,"CDAUDIO_mciStatus // unknown command %08lX !\n", lpParms->dwItem);
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciStatus // unknown command %08lX !\n", lpParms->dwItem);
return MCIERR_UNRECOGNIZED_COMMAND;
}
}
- fprintf(stderr,"CDAUDIO_mciStatus // not MCI_STATUS_ITEM !\n");
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciStatus // not MCI_STATUS_ITEM !\n");
return 0;
#else
return MMSYSERR_NOTENABLED;
@@ -337,270 +593,9 @@
/**************************************************************************
-* CDAUDIO_CalcTime [internal]
-*/
-DWORD CDAUDIO_CalcTime(UINT wDevID, DWORD dwFormatType, DWORD dwFrame)
-{
- DWORD dwTime = 0;
-#ifdef linux
- UINT wTrack;
- UINT wMinutes;
- UINT wSeconds;
- UINT wFrames;
- dprintf_cdaudio(stddeb,"CDAUDIO_CalcTime(%u, %08lX, %lu);\n",
- wDevID, dwFormatType, dwFrame);
-TryAGAIN:
- switch (dwFormatType) {
- case MCI_FORMAT_MILLISECONDS:
- dwTime = dwFrame / CDFRAMES_PERSEC * 1000;
- dprintf_cdaudio(stddeb,
- "CDAUDIO_CalcTime // MILLISECONDS %lu\n",
- dwTime);
- break;
- case MCI_FORMAT_MSF:
- wMinutes = dwFrame / CDFRAMES_PERMIN;
- wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC;
- wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes -
- CDFRAMES_PERSEC * wSeconds;
- dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames);
- dprintf_cdaudio(stddeb,"CDAUDIO_CalcTime // MSF %02u:%02u:%02u -> dwTime=%lu\n",
- wMinutes, wSeconds, wFrames, dwTime);
- break;
- case MCI_FORMAT_TMSF:
- for (wTrack = 0; wTrack < CDADev[wDevID].nTracks; wTrack++) {
-/* dwTime += CDADev[wDevID].lpdwTrackLen[wTrack - 1];
- printf("Adding trk#%u curpos=%u \n", dwTime);
- if (dwTime >= dwFrame) break; */
- if (CDADev[wDevID].lpdwTrackPos[wTrack - 1] >= dwFrame) break;
- }
- wMinutes = dwFrame / CDFRAMES_PERMIN;
- wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC;
- wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes -
- CDFRAMES_PERSEC * wSeconds;
- dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames);
- dprintf_cdaudio(stddeb,
- "CDAUDIO_CalcTime // %02u-%02u:%02u:%02u\n",
- wTrack, wMinutes, wSeconds, wFrames);
- break;
- default:
- /* unknown format ! force TMSF ! ... */
- dwFormatType = MCI_FORMAT_TMSF;
- goto TryAGAIN;
- }
-#endif
- return dwTime;
-}
-
-
-/**************************************************************************
-* CDAUDIO_CalcFrame [internal]
-*/
-DWORD CDAUDIO_CalcFrame(UINT wDevID, DWORD dwFormatType, DWORD dwTime)
-{
- DWORD dwFrame = 0;
-#ifdef linux
- UINT wTrack;
- dprintf_cdaudio(stddeb,"CDAUDIO_CalcFrame(%u, %08lX, %lu);\n",
- wDevID, dwFormatType, dwTime);
-TryAGAIN:
- switch (dwFormatType) {
- case MCI_FORMAT_MILLISECONDS:
- dwFrame = dwTime * CDFRAMES_PERSEC / 1000;
- dprintf_cdaudio(stddeb,
- "CDAUDIO_CalcFrame // MILLISECONDS %lu\n",
- dwFrame);
- break;
- case MCI_FORMAT_MSF:
- dprintf_cdaudio(stddeb,
- "CDAUDIO_CalcFrame // MSF %02u:%02u:%02u\n",
- MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime),
- MCI_MSF_FRAME(dwTime));
- dwFrame += CDFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime);
- dwFrame += CDFRAMES_PERSEC * MCI_MSF_SECOND(dwTime);
- dwFrame += MCI_MSF_FRAME(dwTime);
- break;
- case MCI_FORMAT_TMSF:
- wTrack = MCI_TMSF_TRACK(dwTime);
- dprintf_cdaudio(stddeb,
- "CDAUDIO_CalcFrame // TMSF %02u-%02u:%02u:%02u\n",
- MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime),
- MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime));
- dprintf_cdaudio(stddeb,
- "CDAUDIO_CalcFrame // TMSF trackpos[%u]=%lu\n",
- wTrack, CDADev[wDevID].lpdwTrackPos[wTrack - 1]);
- dwFrame = CDADev[wDevID].lpdwTrackPos[wTrack - 1];
- dwFrame += CDFRAMES_PERMIN * MCI_TMSF_MINUTE(dwTime);
- dwFrame += CDFRAMES_PERSEC * MCI_TMSF_SECOND(dwTime);
- dwFrame += MCI_TMSF_FRAME(dwTime);
- break;
- default:
- /* unknown format ! force TMSF ! ... */
- dwFormatType = MCI_FORMAT_TMSF;
- goto TryAGAIN;
- }
-#endif
- return dwFrame;
-}
-
-
-/**************************************************************************
-* CDAUDIO_GetNumberOfTracks [internal]
-*/
-UINT CDAUDIO_GetNumberOfTracks(UINT wDevID)
-{
-#ifdef linux
- struct cdrom_tochdr hdr;
- if (CDADev[wDevID].nTracks == 0) {
- if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCHDR, &hdr)) {
- fprintf(stderr,
- "GetNumberOfTracks(%u) // Error occured !\n",
- wDevID);
- return (WORD)-1;
- }
- CDADev[wDevID].nTracks = hdr.cdth_trk1;
- }
- return CDADev[wDevID].nTracks;
-#else
- return (WORD)-1;
-#endif
-}
-
-/**************************************************************************
-* CDAUDIO_GetTracksInfo [internal]
-*/
-BOOL CDAUDIO_GetTracksInfo(UINT wDevID)
-{
-#ifdef linux
- int i, length;
- int start, last_start;
- int total_length = 0;
- struct cdrom_tocentry entry;
- if (CDADev[wDevID].nTracks == 0) {
- if (CDAUDIO_GetNumberOfTracks(wDevID) == (WORD)-1) return FALSE;
- }
- dprintf_cdaudio(stddeb,"CDAUDIO_GetTracksInfo // nTracks=%u\n",
- CDADev[wDevID].nTracks);
- if (CDADev[wDevID].lpdwTrackLen != NULL)
- free(CDADev[wDevID].lpdwTrackLen);
- CDADev[wDevID].lpdwTrackLen = (LPDWORD)malloc(
- (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
- if (CDADev[wDevID].lpdwTrackPos != NULL)
- free(CDADev[wDevID].lpdwTrackPos);
- CDADev[wDevID].lpdwTrackPos = (LPDWORD)malloc(
- (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
- if (CDADev[wDevID].lpdwTrackLen == NULL ||
- CDADev[wDevID].lpdwTrackPos == NULL) {
- fprintf(stderr,
- "CDAUDIO_GetTracksInfo // error allocating track table !\n");
- return FALSE;
- }
- memset(CDADev[wDevID].lpdwTrackLen, 0,
- (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
- memset(CDADev[wDevID].lpdwTrackPos, 0,
- (CDADev[wDevID].nTracks + 1) * sizeof(DWORD));
- for (i = 0; i <= CDADev[wDevID].nTracks; i++) {
- if (i == CDADev[wDevID].nTracks)
- entry.cdte_track = CDROM_LEADOUT;
- else
- entry.cdte_track = i + 1;
- entry.cdte_format = CDROM_MSF;
- if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCENTRY, &entry)) {
- fprintf(stderr,
- "CDAUDIO_GetTracksInfo // error read entry\n");
- return FALSE;
- }
- start = CDFRAMES_PERSEC * (SECONDS_PERMIN *
- entry.cdte_addr.msf.minute + entry.cdte_addr.msf.second) +
- entry.cdte_addr.msf.frame;
- if (i == 0) {
- last_start = start;
- CDADev[wDevID].dwFirstOffset = start;
- dprintf_cdaudio(stddeb,
- "CDAUDIO_GetTracksInfo // dwFirstOffset=%u\n",
- start);
- }
- else {
- length = start - last_start;
- last_start = start;
- start = last_start - length;
- total_length += length;
- CDADev[wDevID].lpdwTrackLen[i - 1] = length;
- CDADev[wDevID].lpdwTrackPos[i - 1] = start;
- dprintf_cdaudio(stddeb,
- "CDAUDIO_GetTracksInfo // track #%u start=%u len=%u\n",
- i, start, length);
- }
- }
- CDADev[wDevID].dwTotalLen = total_length;
- dprintf_cdaudio(stddeb,"CDAUDIO_GetTracksInfo // total_len=%u\n",
- total_length);
- fflush(stdout);
- return TRUE;
-#else
- return FALSE;
-#endif
-}
-
-
-/**************************************************************************
-* CDAUDIO_GetCDStatus [internal]
-*/
-BOOL CDAUDIO_GetCDStatus(UINT wDevID)
-{
-#ifdef linux
- int oldmode = CDADev[wDevID].mode;
- CDADev[wDevID].sc.cdsc_format = CDROM_MSF;
- if (ioctl(CDADev[wDevID].unixdev, CDROMSUBCHNL, &CDADev[wDevID].sc)) {
- fprintf(stderr,"CDAUDIO_GetCDStatus // opened or no_media !\n");
- CDADev[wDevID].mode = MCI_MODE_NOT_READY;
- return TRUE;
- }
- switch (CDADev[wDevID].sc.cdsc_audiostatus) {
- case CDROM_AUDIO_INVALID:
- fprintf(stderr,"CDAUDIO_GetCDStatus // device doesn't support status !\n");
- return FALSE;
- case CDROM_AUDIO_NO_STATUS:
- CDADev[wDevID].mode = MCI_MODE_STOP;
- dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // MCI_MODE_STOP !\n");
- break;
- case CDROM_AUDIO_PLAY:
- CDADev[wDevID].mode = MCI_MODE_PLAY;
- dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // MCI_MODE_PLAY !\n");
- break;
- case CDROM_AUDIO_PAUSED:
- CDADev[wDevID].mode = MCI_MODE_PAUSE;
- dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // MCI_MODE_PAUSE !\n");
- break;
- default:
- dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // status=%02X !\n",
- CDADev[wDevID].sc.cdsc_audiostatus);
- }
- CDADev[wDevID].nCurTrack = CDADev[wDevID].sc.cdsc_trk;
- CDADev[wDevID].dwCurFrame =
- CDFRAMES_PERMIN * CDADev[wDevID].sc.cdsc_absaddr.msf.minute +
- CDFRAMES_PERSEC * CDADev[wDevID].sc.cdsc_absaddr.msf.second +
- CDADev[wDevID].sc.cdsc_absaddr.msf.frame;
- dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // %02u-%02u:%02u:%02u \n",
- CDADev[wDevID].sc.cdsc_trk,
- CDADev[wDevID].sc.cdsc_absaddr.msf.minute,
- CDADev[wDevID].sc.cdsc_absaddr.msf.second,
- CDADev[wDevID].sc.cdsc_absaddr.msf.frame);
- if (oldmode != CDADev[wDevID].mode && oldmode == MCI_MODE_OPEN) {
- if (!CDAUDIO_GetTracksInfo(wDevID)) {
- fprintf(stderr,"CDAUDIO_GetCDStatus // error updating TracksInfo !\n");
- return MCIERR_INTERNAL;
- }
- }
- return TRUE;
-#else
- return FALSE;
-#endif
-}
-
-/**************************************************************************
* CDAUDIO_mciPlay [internal]
*/
-DWORD CDAUDIO_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
+static DWORD CDAUDIO_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
{
#ifdef linux
int start, end;
@@ -633,11 +628,11 @@
msf.cdmsf_sec1 = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC;
msf.cdmsf_frame1 = end % CDFRAMES_PERSEC;
if (ioctl(CDADev[wDevID].unixdev, CDROMSTART)) {
- fprintf(stderr,"CDAUDIO_mciPlay // motor doesn't start !\n");
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciPlay // motor doesn't start !\n");
return MCIERR_HARDWARE;
}
if (ioctl(CDADev[wDevID].unixdev, CDROMPLAYMSF, &msf)) {
- fprintf(stderr,"CDAUDIO_mciPlay // device doesn't play !\n");
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciPlay // device doesn't play !\n");
return MCIERR_HARDWARE;
}
dprintf_cdaudio(stddeb,"CDAUDIO_mciPlay // msf = %d:%d:%d %d:%d:%d\n",
@@ -662,7 +657,7 @@
/**************************************************************************
* CDAUDIO_mciStop [internal]
*/
-DWORD CDAUDIO_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD CDAUDIO_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciStop(%u, %08lX, %p);\n",
@@ -686,7 +681,7 @@
/**************************************************************************
* CDAUDIO_mciPause [internal]
*/
-DWORD CDAUDIO_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD CDAUDIO_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciPause(%u, %08lX, %p);\n",
@@ -710,7 +705,7 @@
/**************************************************************************
* CDAUDIO_mciResume [internal]
*/
-DWORD CDAUDIO_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD CDAUDIO_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciResume(%u, %08lX, %p);\n",
@@ -734,7 +729,7 @@
/**************************************************************************
* CDAUDIO_mciSeek [internal]
*/
-DWORD CDAUDIO_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
+static DWORD CDAUDIO_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
{
#ifdef linux
DWORD dwRet;
@@ -775,7 +770,7 @@
/**************************************************************************
* CDAUDIO_mciSet [internal]
*/
-DWORD CDAUDIO_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
+static DWORD CDAUDIO_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
{
#ifdef linux
dprintf_cdaudio(stddeb,"CDAUDIO_mciSet(%u, %08lX, %p);\n",
@@ -798,7 +793,7 @@
dprintf_cdaudio(stddeb,"CDAUDIO_mciSet // MCI_FORMAT_TMSF !\n");
break;
default:
- fprintf(stderr,"CDAUDIO_mciSet // bad time format !\n");
+ dprintf_cdaudio(stddeb,"CDAUDIO_mciSet // bad time format !\n");
return MCIERR_BAD_TIME_FORMAT;
}
CDADev[wDevID].dwTimeFormat = lpParms->dwTimeFormat;
@@ -835,15 +830,15 @@
/**************************************************************************
* CDAUDIO_DriverProc [sample driver]
*/
-LRESULT CDAUDIO_DriverProc(DWORD dwDevID, HDRVR hDriv, WORD wMsg,
+LONG CDAUDIO_DriverProc(DWORD dwDevID, HDRVR hDriv, WORD wMsg,
DWORD dwParam1, DWORD dwParam2)
{
#ifdef linux
switch(wMsg) {
case DRV_LOAD:
- return (LRESULT)1L;
+ return 1;
case DRV_FREE:
- return (LRESULT)1L;
+ return 1;
case DRV_OPEN:
case MCI_OPEN_DRIVER:
case MCI_OPEN:
@@ -854,19 +849,19 @@
return CDAUDIO_mciClose(dwDevID, dwParam1,
(LPMCI_GENERIC_PARMS)dwParam2);
case DRV_ENABLE:
- return (LRESULT)1L;
+ return 1;
case DRV_DISABLE:
- return (LRESULT)1L;
+ return 1;
case DRV_QUERYCONFIGURE:
- return (LRESULT)1L;
+ return 1;
case DRV_CONFIGURE:
MessageBox((HWND)NULL, "Sample MultiMedia Linux Driver !",
"MMLinux Driver", MB_OK);
- return (LRESULT)1L;
+ return 1;
case DRV_INSTALL:
- return (LRESULT)DRVCNF_RESTART;
+ return DRVCNF_RESTART;
case DRV_REMOVE:
- return (LRESULT)DRVCNF_RESTART;
+ return DRVCNF_RESTART;
case MCI_GETDEVCAPS:
return CDAUDIO_mciGetDevCaps(dwDevID, dwParam1,
(LPMCI_GETDEVCAPS_PARMS)PTR_SEG_TO_LIN(dwParam2));
