ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Release 940706 

Sun, 3 Jul 1994 20:15:56 +0100 (BST)  David Metcalfe <david@prism.demon.co.uk>

	* [controls/edit.c]
	Bug fixes and tidying up.  Preliminary tab stop support
	(doesn't work yet).

	* [windows/dialog.c]
	Reversed order of buttons in CheckRadioButtons so that all
	buttons are now displayed.

Tue Jul  5 18:30:24 1994  Alexandre Julliard  (julliard@lamisun.epfl.ch)

	* [include/options.h] [misc/main.c] [windows/win.c]
	Removed nosaveunders option, replaced by handling
	the CS_SAVEBITS flag.

	* [windows/class.c]
	Modified the fix for negative size in class extra bytes to
	avoid modifying the caller's data.

	* [windows/dc.c]
	Bug fix: system font must be a proportional font.
	Fixed a bug that caused the default pen to not be selected
	correctly in a DC.

	* [windows/graphics.c]
	Bug fix in GRAPH_DrawArc(). Thanks to Adriano Azevedo for
	noticing it.

	* [windows/painting.c]
	Removed incorrect selecting of default objects in BeginPaint()
	(no longer needed because of the fix in dc.c).

Jul 4, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)

	* [misc/mmsystem.c]
	* [misc/audio.c]
	Add more code to interface '/dev/dsp'.

	* New file [misc/mcicda.c]
	Create an MCI_DEVTYPE_CD_AUDIO driver connected to '/dev/sbpcd'.

	* New file [misc/mmaux.c]
	Stubs to make a future driver connected to '/dev/mixer'.

	* [windows/win.c]
	Temporary patch to CreateWindowEx() for reseting negative
	coordinates to 0,0 ; because 'soundrec.exe' give negative values
	and I need it to work on MMSYSTEM ... :-)

	* [miscemu/int2f.c]
	add a stub 'do_int2f_16' (function 0x16) for DMPI server.

Mon Jun 20 10:08:40 BST 1994  William Smith (wos@dcs.warwick.ac.uk)

	* include/comm.h
	New file -- some definitions that were in comm.c now need to
	be shared with misc/dos_fs.c

	* misc/comm.c
	Some definitions moved into include/comm.h

	* misc/dos_fs.c (DOS_GetEquipment):
	Fixed error in equipment -- bitwise or of two values should
	be used instead of logical or.  Also added code to correctly
	report the number of serial and parallel devices.
This commit is contained in:
Alexandre Julliard 1994-07-07 16:23:58 +00:00
parent 988ca977ab
commit 6b81b398f5
24 changed files with 3307 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ChangeLog
View File

@ -1,3 +1,71 @@
----------------------------------------------------------------------
Sun, 3 Jul 1994 20:15:56 +0100 (BST) David Metcalfe <david@prism.demon.co.uk>
* [controls/edit.c]
Bug fixes and tidying up. Preliminary tab stop support
(doesn't work yet).
* [windows/dialog.c]
Reversed order of buttons in CheckRadioButtons so that all
buttons are now displayed.
Tue Jul 5 18:30:24 1994 Alexandre Julliard (julliard@lamisun.epfl.ch)
* [include/options.h] [misc/main.c] [windows/win.c]
Removed nosaveunders option, replaced by handling
the CS_SAVEBITS flag.
* [windows/class.c]
Modified the fix for negative size in class extra bytes to
avoid modifying the caller's data.
* [windows/dc.c]
Bug fix: system font must be a proportional font.
Fixed a bug that caused the default pen to not be selected
correctly in a DC.
* [windows/graphics.c]
Bug fix in GRAPH_DrawArc(). Thanks to Adriano Azevedo for
noticing it.
* [windows/painting.c]
Removed incorrect selecting of default objects in BeginPaint()
(no longer needed because of the fix in dc.c).
Jul 4, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [misc/mmsystem.c]
* [misc/audio.c]
Add more code to interface '/dev/dsp'.
* New file [misc/mcicda.c]
Create an MCI_DEVTYPE_CD_AUDIO driver connected to '/dev/sbpcd'.
* New file [misc/mmaux.c]
Stubs to make a future driver connected to '/dev/mixer'.
* [windows/win.c]
Temporary patch to CreateWindowEx() for reseting negative
coordinates to 0,0 ; because 'soundrec.exe' give negative values
and I need it to work on MMSYSTEM ... :-)
* [miscemu/int2f.c]
add a stub 'do_int2f_16' (function 0x16) for DMPI server.
Mon Jun 20 10:08:40 BST 1994 William Smith (wos@dcs.warwick.ac.uk)
* include/comm.h
New file -- some definitions that were in comm.c now need to
be shared with misc/dos_fs.c
* misc/comm.c
Some definitions moved into include/comm.h
* misc/dos_fs.c (DOS_GetEquipment):
Fixed error in equipment -- bitwise or of two values should
be used instead of logical or. Also added code to correctly
report the number of serial and parallel devices.
---------------------------------------------------------------------- ----------------------------------------------------------------------
Mon Jun 20 14:26:41 1994 Bob Amstadt (bob@pooh) Mon Jun 20 14:26:41 1994 Bob Amstadt (bob@pooh)

277
controls/edit.c
View File

@ -67,6 +67,8 @@ typedef struct
int DeletedLength; /* length of deleted text */ int DeletedLength; /* length of deleted text */
int DeletedCurrLine; /* starting line from which text was deleted */ int DeletedCurrLine; /* starting line from which text was deleted */
int DeletedCurrCol; /* starting col from which text was deleted */ int DeletedCurrCol; /* starting col from which text was deleted */
int NumTabStops; /* number of tab stops in buffer hTabStops */
HANDLE hTabStops; /* handle of tab stops buffer */
} EDITSTATE; } EDITSTATE;
@ -79,6 +81,9 @@ typedef struct
#define CurrChar (EDIT_TextLine(hwnd, es->CurrLine) + es->CurrCol) #define CurrChar (EDIT_TextLine(hwnd, es->CurrLine) + es->CurrCol)
#define SelMarked(es) (es->SelBegLine != 0 || es->SelBegCol != 0 || \ #define SelMarked(es) (es->SelBegLine != 0 || es->SelBegCol != 0 || \
es->SelEndLine != 0 || es->SelEndCol != 0) es->SelEndLine != 0 || es->SelEndCol != 0)
#define ROUNDUP(numer, denom) ((numer % denom) \
? (((numer + denom) / denom) * denom) \
: numer)
/* macros to access window styles */ /* macros to access window styles */
#define IsAutoVScroll() (wndPtr->dwStyle & ES_AUTOVSCROLL) #define IsAutoVScroll() (wndPtr->dwStyle & ES_AUTOVSCROLL)
@ -104,14 +109,16 @@ void EDIT_ModTextPointers(HWND hwnd, int lineno, int var);
void EDIT_PaintMsg(HWND hwnd); void EDIT_PaintMsg(HWND hwnd);
HANDLE EDIT_GetTextLine(HWND hwnd, int selection); HANDLE EDIT_GetTextLine(HWND hwnd, int selection);
char *EDIT_TextLine(HWND hwnd, int sel); char *EDIT_TextLine(HWND hwnd, int sel);
int EDIT_LineLength(EDITSTATE *es, char *str, int len); int EDIT_StrLength(EDITSTATE *es, char *str, int len, int pcol);
int EDIT_LineLength(HWND hwnd, int num);
void EDIT_WriteTextLine(HWND hwnd, RECT *rc, int y); void EDIT_WriteTextLine(HWND hwnd, RECT *rc, int y);
void EDIT_WriteText(HWND hwnd, char *lp, int off, int len, int row, void EDIT_WriteText(HWND hwnd, char *lp, int off, int len, int row,
int col, RECT *rc, BOOL blank, BOOL reverse); int col, RECT *rc, BOOL blank, BOOL reverse);
HANDLE EDIT_GetStr(EDITSTATE *es, char *lp, int off, int len, int *diff); HANDLE EDIT_GetStr(EDITSTATE *es, char *lp, int off, int len, int *diff);
void EDIT_CharMsg(HWND hwnd, WORD wParam); void EDIT_CharMsg(HWND hwnd, WORD wParam);
void EDIT_KeyTyped(HWND hwnd, short ch); void EDIT_KeyTyped(HWND hwnd, short ch);
int EDIT_CharWidth(EDITSTATE *es, short ch); int EDIT_CharWidth(EDITSTATE *es, short ch, int pcol);
int EDIT_GetNextTabStop(EDITSTATE *es, int pcol);
void EDIT_Forward(HWND hwnd); void EDIT_Forward(HWND hwnd);
void EDIT_Downward(HWND hwnd); void EDIT_Downward(HWND hwnd);
void EDIT_Upward(HWND hwnd); void EDIT_Upward(HWND hwnd);
@ -162,6 +169,7 @@ unsigned int EDIT_TextAlloc(EDITSTATE *es, int bytes);
void *EDIT_TextAddr(EDITSTATE *es, unsigned int handle); void *EDIT_TextAddr(EDITSTATE *es, unsigned int handle);
unsigned int EDIT_TextReAlloc(EDITSTATE *es, unsigned int handle, int bytes); unsigned int EDIT_TextReAlloc(EDITSTATE *es, unsigned int handle, int bytes);
void EDIT_SetHandleMsg(HWND hwnd, WORD wParam); void EDIT_SetHandleMsg(HWND hwnd, WORD wParam);
LONG EDIT_SetTabStopsMsg(HWND hwnd, WORD wParam, LONG lParam);
void swap(int *a, int *b); void swap(int *a, int *b);
@ -295,7 +303,7 @@ LONG EditWndProc(HWND hwnd, WORD uMsg, WORD wParam, LONG lParam)
break; break;
case EM_SETTABSTOPS: case EM_SETTABSTOPS:
printf("edit: cannot process EM_SETTABSTOPS message\n"); lResult = EDIT_SetTabStopsMsg(hwnd, wParam, lParam);
break; break;
case EM_SETWORDBREAKPROC: case EM_SETWORDBREAKPROC:
@ -451,7 +459,7 @@ long EDIT_NCCreateMsg(HWND hwnd, LONG lParam)
/* --- text buffer */ /* --- text buffer */
es->localheap = &HEAP_LocalFindHeap(createStruct->hInstance)->free_list; es->localheap = &HEAP_LocalFindHeap(createStruct->hInstance)->free_list;
es->MaxTextLen = MAXTEXTLEN + 1; es->MaxTextLen = MAXTEXTLEN + 1;
if (!(es->hText)) if (!(createStruct->lpszName))
{ {
es->textlen = EditBufLen(wndPtr) + 1; es->textlen = EditBufLen(wndPtr) + 1;
es->hText = EDIT_TextAlloc(es, EditBufLen(wndPtr) + 2); es->hText = EDIT_TextAlloc(es, EditBufLen(wndPtr) + 2);
@ -464,15 +472,18 @@ long EDIT_NCCreateMsg(HWND hwnd, LONG lParam)
if (strlen(createStruct->lpszName) < EditBufLen(wndPtr)) if (strlen(createStruct->lpszName) < EditBufLen(wndPtr))
{ {
es->hText = EDIT_TextAlloc(es, EditBufLen(wndPtr) + 2); es->hText = EDIT_TextAlloc(es, EditBufLen(wndPtr) + 2);
es->textlen = EditBufLen(wndPtr) + 1; text = EDIT_TextAddr(es, es->hText);
strcpy(text, createStruct->lpszName);
*(text + es->textlen) = '\0'; *(text + es->textlen) = '\0';
es->textlen = EditBufLen(wndPtr) + 1;
} }
else else
{ {
es->hText = EDIT_TextAlloc(es, strlen(createStruct->lpszName) + 2); es->hText = EDIT_TextAlloc(es, strlen(createStruct->lpszName) + 2);
text = EDIT_TextAddr(es, es->hText);
strcpy(text, createStruct->lpszName);
es->textlen = strlen(createStruct->lpszName) + 1; es->textlen = strlen(createStruct->lpszName) + 1;
} }
text = EDIT_TextAddr(es, es->hText);
*(text + es->textlen + 1) = '\0'; *(text + es->textlen + 1) = '\0';
EDIT_BuildTextPointers(hwnd); EDIT_BuildTextPointers(hwnd);
} }
@ -524,6 +535,8 @@ long EDIT_CreateMsg(HWND hwnd, LONG lParam)
es->hFont = 0; es->hFont = 0;
es->hDeletedText = 0; es->hDeletedText = 0;
es->DeletedLength = 0; es->DeletedLength = 0;
es->NumTabStops = 0;
es->hTabStops = EDIT_HEAP_ALLOC(sizeof(int));
/* allocate space for a line full of blanks to speed up */ /* allocate space for a line full of blanks to speed up */
/* line filling */ /* line filling */
@ -608,14 +621,15 @@ void EDIT_BuildTextPointers(HWND hwnd)
/* advance through current line */ /* advance through current line */
while (*cp && *cp != '\n') while (*cp && *cp != '\n')
{ {
len += charWidths[*cp]; /* width of line in pixels */ len += EDIT_CharWidth(es, *cp, len); /* width of line in pixels */
cp++; cp++;
} }
es->textwidth = max(es->textwidth, len); es->textwidth = max(es->textwidth, len);
if (*cp) if (*cp)
cp++; /* skip '\n' */ cp++; /* skip '\n' */
} }
off = (unsigned int)(cp - text); /* offset of beginning of line */
off = (unsigned int)(cp - text);
*(textPtrs + es->wlines) = off; *(textPtrs + es->wlines) = off;
} }
@ -722,26 +736,45 @@ char *EDIT_TextLine(HWND hwnd, int sel)
/********************************************************************* /*********************************************************************
* EDIT_LineLength * EDIT_StrLength
* *
* Return length of line _str_ of length _len_ characters in pixels. * Return length of string _str_ of length _len_ characters in pixels.
* The current column offset in pixels _pcol_ is required to calculate
* the width of a tab.
*/ */
int EDIT_LineLength(EDITSTATE *es, char *str, int len) int EDIT_StrLength(EDITSTATE *es, char *str, int len, int pcol)
{ {
int i, plen = 0; int i, plen = 0;
short *charWidths = (short *)EDIT_HEAP_ADDR(es->hCharWidths);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
plen += charWidths[*(str + i)]; plen += EDIT_CharWidth(es, *(str + i), pcol + plen);
#ifdef DEBUG_EDIT #ifdef DEBUG_EDIT
printf("EDIT_LineLength: returning %d\n", plen); printf("EDIT_StrLength: returning %d\n", plen);
#endif #endif
return plen; return plen;
} }
/*********************************************************************
* EDIT_LineLength
*
* Return length of line _num_ in characters.
*/
int EDIT_LineLength(HWND hwnd, int num)
{
WND *wndPtr = WIN_FindWndPtr(hwnd);
EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra)));
char *cp = EDIT_TextLine(hwnd, num);
char *cp1;
cp1 = strchr(cp, '\n');
return cp1 ? (int)(cp1 - cp) : strlen(cp);
}
/********************************************************************* /*********************************************************************
* EDIT_WriteTextLine * EDIT_WriteTextLine
* *
@ -812,7 +845,7 @@ void EDIT_WriteTextLine(HWND hwnd, RECT *rect, int y)
if ((hLine = EDIT_GetTextLine(hwnd, y)) == 0) if ((hLine = EDIT_GetTextLine(hwnd, y)) == 0)
return; return;
lp = (unsigned char *)EDIT_HEAP_ADDR(hLine); lp = (unsigned char *)EDIT_HEAP_ADDR(hLine);
lnlen = EDIT_LineLength(es, lp, strlen(lp)); lnlen = EDIT_StrLength(es, lp, strlen(lp), 0);
lnlen1 = lnlen; lnlen1 = lnlen;
/* build the line to display */ /* build the line to display */
@ -852,7 +885,7 @@ void EDIT_WriteTextLine(HWND hwnd, RECT *rect, int y)
TRUE, TRUE); TRUE, TRUE);
else if (y == sbl) else if (y == sbl)
{ {
col = EDIT_LineLength(es, lp, sbc); col = EDIT_StrLength(es, lp, sbc, 0);
if (col > (es->wleft + rc.left)) if (col > (es->wleft + rc.left))
{ {
len = min(col - off, rc.right - off); len = min(col - off, rc.right - off);
@ -862,7 +895,7 @@ void EDIT_WriteTextLine(HWND hwnd, RECT *rect, int y)
} }
if (y == sel) if (y == sel)
{ {
col = EDIT_LineLength(es, lp, sec); col = EDIT_StrLength(es, lp, sec, 0);
if (col < (es->wleft + rc.right)) if (col < (es->wleft + rc.right))
{ {
len = min(col - off, rc.right - off); len = min(col - off, rc.right - off);
@ -890,7 +923,7 @@ void EDIT_WriteTextLine(HWND hwnd, RECT *rect, int y)
} }
else if (y == sel) else if (y == sel)
{ {
col = EDIT_LineLength(es, lp, sec); col = EDIT_StrLength(es, lp, sec, 0);
if (col < (es->wleft + rc.right)) if (col < (es->wleft + rc.right))
{ {
len = min(col - off, rc.right - off); len = min(col - off, rc.right - off);
@ -930,14 +963,15 @@ void EDIT_WriteText(HWND hwnd, char *lp, int off, int len, int row,
{ {
HDC hdc; HDC hdc;
HANDLE hStr; HANDLE hStr;
char *str, *blanks; char *str, *cp, *cp1;
int diff, num_spaces; int diff, num_spaces, tabwidth, scol;
HRGN hrgnClip; HRGN hrgnClip;
COLORREF oldTextColor, oldBkgdColor; COLORREF oldTextColor, oldBkgdColor;
HFONT oldfont; HFONT oldfont;
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_FindWndPtr(hwnd);
EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra))); EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra)));
short *charWidths = (short *)EDIT_HEAP_ADDR(es->hCharWidths); short *charWidths = (short *)EDIT_HEAP_ADDR(es->hCharWidths);
char *blanks = (char *)EDIT_HEAP_ADDR(es->hBlankLine);
#ifdef DEBUG_EDIT #ifdef DEBUG_EDIT
printf("EDIT_WriteText lp=%s, off=%d, len=%d, row=%d, col=%d, reverse=%d\n", lp, off, len, row, col, reverse); printf("EDIT_WriteText lp=%s, off=%d, len=%d, row=%d, col=%d, reverse=%d\n", lp, off, len, row, col, reverse);
@ -963,7 +997,31 @@ void EDIT_WriteText(HWND hwnd, char *lp, int off, int len, int row,
SetTextColor(hdc, oldBkgdColor); SetTextColor(hdc, oldBkgdColor);
} }
TextOut(hdc, col - diff, row * es->txtht, str, strlen(str)); if (!(cp = strchr(str, VK_TAB)))
TextOut(hdc, col - diff, row * es->txtht, str, strlen(str));
else
{
TextOut(hdc, col - diff, row * es->txtht, str, (int)(cp - str));
scol = EDIT_StrLength(es, str, (int)(cp - str), 0);
tabwidth = EDIT_CharWidth(es, VK_TAB, scol);
num_spaces = tabwidth / charWidths[32] + 1;
TextOut(hdc, scol, row * es->txtht, blanks, num_spaces);
cp++;
scol += tabwidth;
while (cp1 = strchr(cp, VK_TAB))
{
TextOut(hdc, scol, row * es->txtht, cp, (int)(cp1 - cp));
scol = EDIT_StrLength(es, cp, (int)(cp1 - cp), scol);
tabwidth = EDIT_CharWidth(es, VK_TAB, scol);
num_spaces = tabwidth / charWidths[32] + 1;
TextOut(hdc, scol, row * es->txtht, blanks, num_spaces);
cp = ++cp1;
scol += tabwidth;
}
TextOut(hdc, scol, row * es->txtht, cp, strlen(cp));
}
if (reverse) if (reverse)
{ {
@ -976,7 +1034,6 @@ void EDIT_WriteText(HWND hwnd, char *lp, int off, int len, int row,
{ {
if ((rc->right - col) > len) if ((rc->right - col) > len)
{ {
blanks = EDIT_HEAP_ADDR(es->hBlankLine);
num_spaces = (rc->right - col - len) / charWidths[32]; num_spaces = (rc->right - col - len) / charWidths[32];
TextOut(hdc, col + len, row * es->txtht, blanks, num_spaces); TextOut(hdc, col + len, row * es->txtht, blanks, num_spaces);
} }
@ -1003,9 +1060,8 @@ HANDLE EDIT_GetStr(EDITSTATE *es, char *lp, int off, int len, int *diff)
{ {
HANDLE hStr; HANDLE hStr;
char *str; char *str;
int ch = 0, i = 0, j, tmp; int ch = 0, i = 0, j, s_i;
int ch1; int ch1;
short *charWidths = (short *)EDIT_HEAP_ADDR(es->hCharWidths);
#ifdef DEBUG_EDIT #ifdef DEBUG_EDIT
printf("EDIT_GetStr %s %d %d\n", lp, off, len); printf("EDIT_GetStr %s %d %d\n", lp, off, len);
@ -1013,19 +1069,23 @@ HANDLE EDIT_GetStr(EDITSTATE *es, char *lp, int off, int len, int *diff)
while (i < off) while (i < off)
{ {
i += charWidths[*(lp + ch)]; s_i = i;
i += EDIT_CharWidth(es, *(lp + ch), i);
ch++; ch++;
} }
/* if stepped past _off_, go back a character */ /* if stepped past _off_, go back a character */
if (i - off) if (i - off)
i -= charWidths[*(lp + --ch)]; {
i = s_i;
ch--;
}
*diff = off - i; *diff = off - i;
ch1 = ch; ch1 = ch;
while (i < len + off) while (i < len + off)
{ {
i += charWidths[*(lp + ch)]; i += EDIT_CharWidth(es, *(lp + ch), i);
ch++; ch++;
} }
@ -1102,7 +1162,7 @@ void EDIT_KeyTyped(HWND hwnd, short ch)
return; return;
} }
if (*currchar == '\0') if (*currchar == '\0' && IsMultiLine())
{ {
/* insert a newline at end of text */ /* insert a newline at end of text */
*currchar = '\n'; *currchar = '\n';
@ -1145,13 +1205,13 @@ void EDIT_KeyTyped(HWND hwnd, short ch)
if (IsMultiLine() && es->wlines > 1) if (IsMultiLine() && es->wlines > 1)
{ {
es->textwidth = max(es->textwidth, es->textwidth = max(es->textwidth,
EDIT_LineLength(es, EDIT_TextLine(hwnd, es->CurrLine), EDIT_StrLength(es, EDIT_TextLine(hwnd, es->CurrLine),
(int)(EDIT_TextLine(hwnd, es->CurrLine + 1) - (int)(EDIT_TextLine(hwnd, es->CurrLine + 1) -
EDIT_TextLine(hwnd, es->CurrLine)))); EDIT_TextLine(hwnd, es->CurrLine)), 0));
} }
else else
es->textwidth = max(es->textwidth, es->textwidth = max(es->textwidth,
EDIT_LineLength(es, text, strlen(text))); EDIT_StrLength(es, text, strlen(text), 0));
EDIT_WriteTextLine(hwnd, NULL, es->wtop + es->WndRow); EDIT_WriteTextLine(hwnd, NULL, es->wtop + es->WndRow);
if (ch == '\n') if (ch == '\n')
@ -1177,14 +1237,15 @@ void EDIT_KeyTyped(HWND hwnd, short ch)
} }
/* test end of window */ /* test end of window */
if (es->WndCol >= ClientWidth(wndPtr) - EDIT_CharWidth(es, ch)) if (es->WndCol >= ClientWidth(wndPtr) -
EDIT_CharWidth(es, ch, es->WndCol + es->wleft))
{ {
/* TODO:- Word wrap to be handled here */ /* TODO:- Word wrap to be handled here */
/* if (!(currchar == text + es->MaxTextLen - 2)) */ /* if (!(currchar == text + es->MaxTextLen - 2)) */
EDIT_KeyHScroll(hwnd, SB_LINEDOWN); EDIT_KeyHScroll(hwnd, SB_LINEDOWN);
} }
es->WndCol += EDIT_CharWidth(es, ch); es->WndCol += EDIT_CharWidth(es, ch, es->WndCol + es->wleft);
es->CurrCol++; es->CurrCol++;
SetCaretPos(es->WndCol, es->WndRow * es->txtht); SetCaretPos(es->WndCol, es->WndRow * es->txtht);
ShowCaret(hwnd); ShowCaret(hwnd);
@ -1196,13 +1257,46 @@ void EDIT_KeyTyped(HWND hwnd, short ch)
* EDIT_CharWidth * EDIT_CharWidth
* *
* Return the width of the given character in pixels. * Return the width of the given character in pixels.
* The current column offset in pixels _pcol_ is required to calculate
* the width of a tab.
*/ */
int EDIT_CharWidth(EDITSTATE *es, short ch) int EDIT_CharWidth(EDITSTATE *es, short ch, int pcol)
{ {
short *charWidths = (short *)EDIT_HEAP_ADDR(es->hCharWidths); short *charWidths = (short *)EDIT_HEAP_ADDR(es->hCharWidths);
return (charWidths[ch]); if (ch != VK_TAB)
return (charWidths[ch]);
else
return (EDIT_GetNextTabStop(es, pcol) - pcol);
}
/*********************************************************************
* EDIT_GetNextTabStop
*
* Return the next tab stop beyond _pcol_.
*/
int EDIT_GetNextTabStop(EDITSTATE *es, int pcol)
{
int i;
int baseUnitWidth = LOWORD(GetDialogBaseUnits());
unsigned short *tabstops = EDIT_HEAP_ADDR(es->hTabStops);
if (es->NumTabStops == 0)
return ROUNDUP(pcol, 8);
else if (es->NumTabStops == 1)
return ROUNDUP(pcol, *tabstops * baseUnitWidth / 4);
else
{
for (i = 0; i < es->NumTabStops; i++)
{
if (*(tabstops + i) * baseUnitWidth / 4 >= pcol)
return (*(tabstops + i) * baseUnitWidth / 4);
}
return pcol;
}
} }
@ -1217,9 +1311,8 @@ void EDIT_Forward(HWND hwnd)
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_FindWndPtr(hwnd);
EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra))); EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra)));
char *text = EDIT_TextAddr(es, es->hText); char *text = EDIT_TextAddr(es, es->hText);
char *cc = CurrChar + 1;
if (*cc == '\0') if (*CurrChar == '\0')
return; return;
if (*CurrChar == '\n') if (*CurrChar == '\n')
@ -1229,7 +1322,7 @@ void EDIT_Forward(HWND hwnd)
} }
else else
{ {
es->WndCol += EDIT_CharWidth(es, *CurrChar); es->WndCol += EDIT_CharWidth(es, *CurrChar, es->WndCol + es->wleft);
es->CurrCol++; es->CurrCol++;
if (es->WndCol >= ClientWidth(wndPtr)) if (es->WndCol >= ClientWidth(wndPtr))
EDIT_KeyHScroll(hwnd, SB_LINEDOWN); EDIT_KeyHScroll(hwnd, SB_LINEDOWN);
@ -1309,7 +1402,7 @@ void EDIT_Backward(HWND hwnd)
if (es->CurrCol) if (es->CurrCol)
{ {
--es->CurrCol; --es->CurrCol;
es->WndCol -= EDIT_CharWidth(es, *CurrChar); es->WndCol -= EDIT_CharWidth(es, *CurrChar, es->WndCol + es->wleft);
if (es->WndCol < 0) if (es->WndCol < 0)
EDIT_KeyHScroll(hwnd, SB_LINEUP); EDIT_KeyHScroll(hwnd, SB_LINEUP);
} }
@ -1336,7 +1429,7 @@ void EDIT_End(HWND hwnd)
while (*CurrChar && *CurrChar != '\n') while (*CurrChar && *CurrChar != '\n')
{ {
es->WndCol += EDIT_CharWidth(es, *CurrChar); es->WndCol += EDIT_CharWidth(es, *CurrChar, es->WndCol + es->wleft);
es->CurrCol++; es->CurrCol++;
} }
@ -1382,15 +1475,13 @@ void EDIT_StickEnd(HWND hwnd)
{ {
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_FindWndPtr(hwnd);
EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra))); EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra)));
int len = EDIT_LineLength(hwnd, es->CurrLine);
char *cp = EDIT_TextLine(hwnd, es->CurrLine);
char currpel; char currpel;
char *cp = EDIT_TextLine(hwnd, es->CurrLine);
char *cp1 = strchr(cp, '\n');
int len = cp1 ? (int)(cp1 - cp) : 0;
es->CurrCol = min(len, es->CurrCol); es->CurrCol = min(len, es->CurrCol);
es->WndCol = min(EDIT_LineLength(es, cp, len) - es->wleft, es->WndCol); es->WndCol = min(EDIT_StrLength(es, cp, len, 0) - es->wleft, es->WndCol);
currpel = EDIT_LineLength(es, cp, es->CurrCol); currpel = EDIT_StrLength(es, cp, es->CurrCol, 0);
if (es->wleft > currpel) if (es->wleft > currpel)
{ {
@ -1848,7 +1939,6 @@ void EDIT_VScrollLine(HWND hwnd, WORD opt)
if (es->wtop + ClientHeight(wndPtr, es) >= es->wlines) if (es->wtop + ClientHeight(wndPtr, es) >= es->wlines)
return; return;
es->wtop++; es->wtop++;
printf("Scroll line down: wtop=%d\n", es->wtop);
} }
else else
{ {
@ -1856,7 +1946,6 @@ void EDIT_VScrollLine(HWND hwnd, WORD opt)
if (es->wtop == 0) if (es->wtop == 0)
return; return;
--es->wtop; --es->wtop;
printf("Scroll line up: wtop=%d\n", es->wtop);
} }
if (IsWindowVisible(hwnd)) if (IsWindowVisible(hwnd))
@ -1974,7 +2063,7 @@ void EDIT_SizeMsg(HWND hwnd, WORD wParam, LONG lParam)
void EDIT_LButtonDownMsg(HWND hwnd, WORD wParam, LONG lParam) void EDIT_LButtonDownMsg(HWND hwnd, WORD wParam, LONG lParam)
{ {
char *cp, *cp1; char *cp;
int len; int len;
BOOL end = FALSE; BOOL end = FALSE;
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_FindWndPtr(hwnd);
@ -1995,12 +2084,10 @@ void EDIT_LButtonDownMsg(HWND hwnd, WORD wParam, LONG lParam)
es->CurrLine = es->wtop + es->WndRow; es->CurrLine = es->wtop + es->WndRow;
cp = EDIT_TextLine(hwnd, es->CurrLine); cp = EDIT_TextLine(hwnd, es->CurrLine);
cp1 = strchr(cp, '\n'); len = EDIT_LineLength(hwnd, es->CurrLine);
len = cp1 ? (int)(cp1 - cp) : 0;
es->WndCol = LOWORD(lParam); es->WndCol = LOWORD(lParam);
if (es->WndCol > EDIT_LineLength(es, cp, len) - es->wleft || end) if (es->WndCol > EDIT_StrLength(es, cp, len, 0) - es->wleft || end)
es->WndCol = EDIT_LineLength(es, cp, len) - es->wleft; es->WndCol = EDIT_StrLength(es, cp, len, 0) - es->wleft;
es->CurrCol = EDIT_PixelToChar(hwnd, es->CurrLine, &(es->WndCol)); es->CurrCol = EDIT_PixelToChar(hwnd, es->CurrLine, &(es->WndCol));
ButtonDown = TRUE; ButtonDown = TRUE;
@ -2040,11 +2127,10 @@ void EDIT_MouseMoveMsg(HWND hwnd, WORD wParam, LONG lParam)
int EDIT_PixelToChar(HWND hwnd, int row, int *pixel) int EDIT_PixelToChar(HWND hwnd, int row, int *pixel)
{ {
int ch = 0, i = 0; int ch = 0, i = 0, s_i;
char *text; char *text;
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_FindWndPtr(hwnd);
EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra))); EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra)));
short *charWidths = (short *)EDIT_HEAP_ADDR(es->hCharWidths);
#ifdef DEBUG_EDIT #ifdef DEBUG_EDIT
printf("EDIT_PixelToChar: row=%d, pixel=%d\n", row, *pixel); printf("EDIT_PixelToChar: row=%d, pixel=%d\n", row, *pixel);
@ -2053,13 +2139,17 @@ int EDIT_PixelToChar(HWND hwnd, int row, int *pixel)
text = EDIT_TextLine(hwnd, row); text = EDIT_TextLine(hwnd, row);
while (i < *pixel) while (i < *pixel)
{ {
i += charWidths[*(text + ch)]; s_i = i;
i += EDIT_CharWidth(es, *(text + ch), i);
ch++; ch++;
} }
/* if stepped past _pixel_, go back a character */ /* if stepped past _pixel_, go back a character */
if (i - *pixel) if (i - *pixel)
i -= charWidths[*(text + ch)]; {
i = s_i;
--ch;
}
*pixel = i; *pixel = i;
return ch; return ch;
} }
@ -2154,8 +2244,8 @@ void EDIT_SetSelMsg(HWND hwnd, LONG lParam)
es->wtop = es->SelEndLine; es->wtop = es->SelEndLine;
es->WndRow = 0; es->WndRow = 0;
} }
es->WndCol = EDIT_LineLength(es, EDIT_TextLine(hwnd, es->SelEndLine), es->WndCol = EDIT_StrLength(es, EDIT_TextLine(hwnd, es->SelEndLine),
es->SelEndCol) - es->wleft; es->SelEndCol, 0) - es->wleft;
} }
InvalidateRect(hwnd, NULL, TRUE); InvalidateRect(hwnd, NULL, TRUE);
UpdateWindow(hwnd); UpdateWindow(hwnd);
@ -2202,8 +2292,10 @@ void EDIT_GetLineCol(HWND hwnd, int off, int *line, int *col)
} }
*line = lineno - 1; *line = lineno - 1;
*col = off - (int)(cp1 - text); *col = off - (int)(cp1 - text);
#if 0
if (*(text + *col) == '\0') if (*(text + *col) == '\0')
(*col)--; (*col)--;
#endif
} }
@ -2238,8 +2330,8 @@ void EDIT_DeleteSel(HWND hwnd)
es->wtop = es->SelBegLine; es->wtop = es->SelBegLine;
es->WndRow = 0; es->WndRow = 0;
} }
es->WndCol = EDIT_LineLength(es, bbl - es->SelBegCol, es->WndCol = EDIT_StrLength(es, bbl - es->SelBegCol,
es->SelBegCol) - es->wleft; es->SelBegCol, 0) - es->wleft;
EDIT_BuildTextPointers(hwnd); EDIT_BuildTextPointers(hwnd);
es->PaintBkgd = TRUE; es->PaintBkgd = TRUE;
@ -2329,7 +2421,7 @@ void EDIT_SetAnchor(HWND hwnd, int row, int col)
void EDIT_ExtendSel(HWND hwnd, int x, int y) void EDIT_ExtendSel(HWND hwnd, int x, int y)
{ {
int bbl, bel, bbc, bec; int bbl, bel, bbc, bec;
char *cp, *cp1; char *cp;
int len; int len;
BOOL end = FALSE; BOOL end = FALSE;
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_FindWndPtr(hwnd);
@ -2342,8 +2434,7 @@ void EDIT_ExtendSel(HWND hwnd, int x, int y)
bbl = es->SelEndLine; bbl = es->SelEndLine;
bbc = es->SelEndCol; bbc = es->SelEndCol;
cp = EDIT_TextLine(hwnd, es->wtop + y / es->txtht); cp = EDIT_TextLine(hwnd, es->wtop + y / es->txtht);
cp1 = strchr(cp, '\n'); len = EDIT_LineLength(hwnd, es->wtop + y / es->txtht);
len = cp1 ? (int)(cp1 - cp) : 0;
es->WndRow = y / es->txtht; es->WndRow = y / es->txtht;
if (es->WndRow > es->wlines - es->wtop - 1) if (es->WndRow > es->wlines - es->wtop - 1)
@ -2358,8 +2449,8 @@ void EDIT_ExtendSel(HWND hwnd, int x, int y)
es->SelEndLine = es->CurrLine; es->SelEndLine = es->CurrLine;
es->WndCol = x; es->WndCol = x;
if (es->WndCol > EDIT_LineLength(es, cp, len) - es->wleft || end) if (es->WndCol > EDIT_StrLength(es, cp, len, 0) - es->wleft || end)
es->WndCol = EDIT_LineLength(es, cp, len) - es->wleft; es->WndCol = EDIT_StrLength(es, cp, len, 0) - es->wleft;
es->CurrCol = EDIT_PixelToChar(hwnd, es->CurrLine, &(es->WndCol)); es->CurrCol = EDIT_PixelToChar(hwnd, es->CurrLine, &(es->WndCol));
es->SelEndCol = es->CurrCol - 1; es->SelEndCol = es->CurrCol - 1;
@ -2404,7 +2495,7 @@ void EDIT_WriteSel(HWND hwnd, int y, int start, int end)
{ {
RECT rc; RECT rc;
int scol, ecol; int scol, ecol;
char *cp, *cp1; char *cp;
HDC hdc; HDC hdc;
HBRUSH hbrush, holdbrush; HBRUSH hbrush, holdbrush;
int olddm; int olddm;
@ -2425,15 +2516,12 @@ void EDIT_WriteSel(HWND hwnd, int y, int start, int end)
/* get length of line if end == -1 */ /* get length of line if end == -1 */
if (end == -1) if (end == -1)
{ end = EDIT_LineLength(hwnd, y);
cp1 = strchr(cp, '\n');
end = cp1 ? (int)(cp1 - cp) : 0;
}
scol = EDIT_LineLength(es, cp, start); scol = EDIT_StrLength(es, cp, start, 0);
if (scol > rc.right) return; if (scol > rc.right) return;
if (scol < rc.left) scol = rc.left; if (scol < rc.left) scol = rc.left;
ecol = EDIT_LineLength(es, cp, end); ecol = EDIT_StrLength(es, cp, end, 0);
if (ecol < rc.left) return; if (ecol < rc.left) return;
if (ecol > rc.right) ecol = rc.right; if (ecol > rc.right) ecol = rc.right;
@ -2551,8 +2639,8 @@ void EDIT_InsertText(HWND hwnd, char *str, int len)
EDIT_GetLineCol(hwnd, (int)((CurrChar + len) - text), &(es->CurrLine), EDIT_GetLineCol(hwnd, (int)((CurrChar + len) - text), &(es->CurrLine),
&(es->CurrCol)); &(es->CurrCol));
es->WndRow = es->CurrLine - es->wtop; es->WndRow = es->CurrLine - es->wtop;
es->WndCol = EDIT_LineLength(es, EDIT_TextLine(hwnd, es->CurrLine), es->WndCol = EDIT_StrLength(es, EDIT_TextLine(hwnd, es->CurrLine),
es->CurrCol) - es->wleft; es->CurrCol, 0) - es->wleft;
} }
@ -2669,8 +2757,8 @@ void EDIT_SetFont(HWND hwnd, WORD wParam, LONG lParam)
ReleaseDC(hwnd, hdc); ReleaseDC(hwnd, hdc);
es->WndRow = (es->CurrLine - es->wtop) / es->txtht; es->WndRow = (es->CurrLine - es->wtop) / es->txtht;
es->WndCol = EDIT_LineLength(es, EDIT_TextLine(hwnd, es->CurrLine), es->WndCol = EDIT_StrLength(es, EDIT_TextLine(hwnd, es->CurrLine),
es->CurrCol) - es->wleft; es->CurrCol, 0) - es->wleft;
InvalidateRect(hwnd, NULL, TRUE); InvalidateRect(hwnd, NULL, TRUE);
es->PaintBkgd = TRUE; es->PaintBkgd = TRUE;
@ -2741,8 +2829,8 @@ LONG EDIT_UndoMsg(HWND hwnd)
EDIT_GetLineCol(hwnd, (int)((CurrChar + es->DeletedLength) - text), EDIT_GetLineCol(hwnd, (int)((CurrChar + es->DeletedLength) - text),
&(es->CurrLine), &(es->CurrCol)); &(es->CurrLine), &(es->CurrCol));
es->WndRow = es->CurrLine - es->wtop; es->WndRow = es->CurrLine - es->wtop;
es->WndCol = EDIT_LineLength(es, EDIT_TextLine(hwnd, es->CurrLine), es->WndCol = EDIT_StrLength(es, EDIT_TextLine(hwnd, es->CurrLine),
es->CurrCol) - es->wleft; es->CurrCol, 0) - es->wleft;
es->SelEndLine = es->CurrLine; es->SelEndLine = es->CurrLine;
es->SelEndCol = es->CurrCol; es->SelEndCol = es->CurrCol;
@ -2825,6 +2913,35 @@ void EDIT_SetHandleMsg(HWND hwnd, WORD wParam)
} }
/*********************************************************************
* EM_SETTABSTOPS message function
*/
LONG EDIT_SetTabStopsMsg(HWND hwnd, WORD wParam, LONG lParam)
{
unsigned short *tabstops;
WND *wndPtr = WIN_FindWndPtr(hwnd);
EDITSTATE *es = (EDITSTATE *)EDIT_HEAP_ADDR((HANDLE)(*(wndPtr->wExtra)));
es->NumTabStops = wParam;
if (wParam == 0)
es->hTabStops = EDIT_HEAP_REALLOC(es->hTabStops, 1);
else if (wParam == 1)
{
es->hTabStops = EDIT_HEAP_REALLOC(es->hTabStops, 1);
tabstops = (unsigned short *)EDIT_HEAP_ADDR(es->hTabStops);
*tabstops = (unsigned short)lParam;
}
else
{
es->hTabStops = EDIT_HEAP_REALLOC(es->hTabStops, wParam);
tabstops = (unsigned short *)EDIT_HEAP_ADDR(es->hTabStops);
memcpy(tabstops, (unsigned short *)lParam, wParam);
}
return 0L;
}
/********************************************************************* /*********************************************************************
* Utility functions * Utility functions
*/ */

2
controls/listbox.c
View File

@ -1151,7 +1151,7 @@ int ListBoxDirectory(HWND hwnd, UINT attrib, LPSTR filespec)
{ {
if (DOS_ValidDrive(x)) if (DOS_ValidDrive(x))
{ {
sprintf(temp, "[-%c-]", 'A'+x); sprintf(temp, "[-%c-]", 'a'+x);
if ( (wRet = ListBoxAddString(hwnd, temp)) == LB_ERR) if ( (wRet = ListBoxAddString(hwnd, temp)) == LB_ERR)
break; break;
} }

21
include/comm.h Normal file
View File

@ -0,0 +1,21 @@
/*
* Communications header
*
* 93 Erik Bos (erik@trashcan.hacktic.nl)
*/
#ifndef COMM_H
#define COMM_H
#define MAX_PORTS 16
struct DosDeviceStruct {
char *devicename; /* /dev/cua1 */
int fd;
int suspended;
int unget;
int unget_byte;
};
#endif /* COMM_H */

183
include/mmsystem.h
View File

@ -8,6 +8,11 @@
typedef LPSTR HPSTR; /* a huge version of LPSTR */ typedef LPSTR HPSTR; /* a huge version of LPSTR */
typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */ typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */
#define MAXWAVEDRIVERS 10
#define MAXMIDIDRIVERS 10
#define MAXAUXDRIVERS 10
#define MAXMCIDRIVERS 32
#define MAXPNAMELEN 32 /* max product name length (including NULL) */ #define MAXPNAMELEN 32 /* max product name length (including NULL) */
#define MAXERRORLENGTH 128 /* max error text length (including NULL) */ #define MAXERRORLENGTH 128 /* max error text length (including NULL) */
@ -166,7 +171,7 @@ typedef WAVECALLBACK FAR *LPWAVECALLBACK;
#define WAVE_FORMAT_QUERY 0x0001 #define WAVE_FORMAT_QUERY 0x0001
#define WAVE_ALLOWSYNC 0x0002 #define WAVE_ALLOWSYNC 0x0002
typedef struct { typedef struct wavehdr_tag {
LPSTR lpData; /* pointer to locked data buffer */ LPSTR lpData; /* pointer to locked data buffer */
DWORD dwBufferLength; /* length of data buffer */ DWORD dwBufferLength; /* length of data buffer */
DWORD dwBytesRecorded; /* used for input only */ DWORD dwBytesRecorded; /* used for input only */
@ -764,8 +769,10 @@ YIELDPROC WINAPI mciGetYieldProc (UINT uDeviceID, DWORD FAR* lpdwYieldData);
#define MCIERR_CUSTOM_DRIVER_BASE (MCIERR_BASE + 256) #define MCIERR_CUSTOM_DRIVER_BASE (MCIERR_BASE + 256)
#define MCI_OPEN 0x0803 #define MCI_OPEN_DRIVER 0x0801
#define MCI_CLOSE 0x0804 #define MCI_CLOSE_DRIVER 0x0802
#define MCI_OPEN 0x0803
#define MCI_CLOSE 0x0804
#define MCI_ESCAPE 0x0805 #define MCI_ESCAPE 0x0805
#define MCI_PLAY 0x0806 #define MCI_PLAY 0x0806
#define MCI_SEEK 0x0807 #define MCI_SEEK 0x0807
@ -1389,6 +1396,126 @@ typedef MCI_OVLY_LOAD_PARMS FAR * LPMCI_OVLY_LOAD_PARMS;
* Linux MMSYSTEM Internals & Sample Audio Drivers * Linux MMSYSTEM Internals & Sample Audio Drivers
*/ */
#define DRVM_INIT 100
#define WODM_INIT DRVM_INIT
#define WIDM_INIT DRVM_INIT
#define MODM_INIT DRVM_INIT
#define MIDM_INIT DRVM_INIT
#define AUXM_INIT DRVM_INIT
#define WODM_GETNUMDEVS 3
#define WODM_GETDEVCAPS 4
#define WODM_OPEN 5
#define WODM_CLOSE 6
#define WODM_PREPARE 7
#define WODM_UNPREPARE 8
#define WODM_WRITE 9
#define WODM_PAUSE 10
#define WODM_RESTART 11
#define WODM_RESET 12
#define WODM_GETPOS 13
#define WODM_GETPITCH 14
#define WODM_SETPITCH 15
#define WODM_GETVOLUME 16
#define WODM_SETVOLUME 17
#define WODM_GETPLAYBACKRATE 18
#define WODM_SETPLAYBACKRATE 19
#define WODM_BREAKLOOP 20
#define WIDM_GETNUMDEVS 50
#define WIDM_GETDEVCAPS 51
#define WIDM_OPEN 52
#define WIDM_CLOSE 53
#define WIDM_PREPARE 54
#define WIDM_UNPREPARE 55
#define WIDM_ADDBUFFER 56
#define WIDM_START 57
#define WIDM_STOP 58
#define WIDM_RESET 59
#define WIDM_GETPOS 60
#define MODM_GETNUMDEVS 1
#define MODM_GETDEVCAPS 2
#define MODM_OPEN 3
#define MODM_CLOSE 4
#define MODM_PREPARE 5
#define MODM_UNPREPARE 6
#define MODM_DATA 7
#define MODM_LONGDATA 8
#define MODM_RESET 9
#define MODM_GETVOLUME 10
#define MODM_SETVOLUME 11
#define MODM_CACHEPATCHES 12
#define MODM_CACHEDRUMPATCHES 13
#define MIDM_GETNUMDEVS 53
#define MIDM_GETDEVCAPS 54
#define MIDM_OPEN 55
#define MIDM_CLOSE 56
#define MIDM_PREPARE 57
#define MIDM_UNPREPARE 58
#define MIDM_ADDBUFFER 59
#define MIDM_START 60
#define MIDM_STOP 61
#define MIDM_RESET 62
#define AUXDM_GETNUMDEVS 3
#define AUXDM_GETDEVCAPS 4
#define AUXDM_GETVOLUME 5
#define AUXDM_SETVOLUME 6
#define MCI_MAX_DEVICE_TYPE_LENGTH 80
#define MCI_FALSE (MCI_STRING_OFFSET + 19)
#define MCI_TRUE (MCI_STRING_OFFSET + 20)
#define MCI_FORMAT_RETURN_BASE MCI_FORMAT_MILLISECONDS_S
#define MCI_FORMAT_MILLISECONDS_S (MCI_STRING_OFFSET + 21)
#define MCI_FORMAT_HMS_S (MCI_STRING_OFFSET + 22)
#define MCI_FORMAT_MSF_S (MCI_STRING_OFFSET + 23)
#define MCI_FORMAT_FRAMES_S (MCI_STRING_OFFSET + 24)
#define MCI_FORMAT_SMPTE_24_S (MCI_STRING_OFFSET + 25)
#define MCI_FORMAT_SMPTE_25_S (MCI_STRING_OFFSET + 26)
#define MCI_FORMAT_SMPTE_30_S (MCI_STRING_OFFSET + 27)
#define MCI_FORMAT_SMPTE_30DROP_S (MCI_STRING_OFFSET + 28)
#define MCI_FORMAT_BYTES_S (MCI_STRING_OFFSET + 29)
#define MCI_FORMAT_SAMPLES_S (MCI_STRING_OFFSET + 30)
#define MCI_FORMAT_TMSF_S (MCI_STRING_OFFSET + 31)
#define MCI_VD_FORMAT_TRACK_S (MCI_VD_OFFSET + 5)
#define WAVE_FORMAT_PCM_S (MCI_WAVE_OFFSET + 0)
#define WAVE_MAPPER_S (MCI_WAVE_OFFSET + 1)
#define MCI_SEQ_MAPPER_S (MCI_SEQ_OFFSET + 5)
#define MCI_SEQ_FILE_S (MCI_SEQ_OFFSET + 6)
#define MCI_SEQ_MIDI_S (MCI_SEQ_OFFSET + 7)
#define MCI_SEQ_SMPTE_S (MCI_SEQ_OFFSET + 8)
#define MCI_SEQ_FORMAT_SONGPTR_S (MCI_SEQ_OFFSET + 9)
#define MCI_SEQ_NONE_S (MCI_SEQ_OFFSET + 10)
#define MIDIMAPPER_S (MCI_SEQ_OFFSET + 11)
#define MCI_RESOURCE_RETURNED 0x00010000 /* resource ID */
#define MCI_COLONIZED3_RETURN 0x00020000 /* colonized ID, 3 bytes data */
#define MCI_COLONIZED4_RETURN 0x00040000 /* colonized ID, 4 bytes data */
#define MCI_INTEGER_RETURNED 0x00080000 /* integer conversion needed */
#define MCI_RESOURCE_DRIVER 0x00100000 /* driver owns returned resource */
#define MCI_NO_COMMAND_TABLE 0xFFFF
#define MCI_COMMAND_HEAD 0
#define MCI_STRING 1
#define MCI_INTEGER 2
#define MCI_END_COMMAND 3
#define MCI_RETURN 4
#define MCI_FLAG 5
#define MCI_END_COMMAND_LIST 6
#define MCI_RECT 7
#define MCI_CONSTANT 8
#define MCI_END_CONSTANT 9
#define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes))
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwInstance; DWORD dwInstance;
@ -1397,6 +1524,56 @@ typedef struct {
} PORTALLOC; } PORTALLOC;
typedef PORTALLOC FAR *LPPORTALLOC; typedef PORTALLOC FAR *LPPORTALLOC;
typedef struct {
HWAVE hWave;
LPWAVEFORMAT lpFormat;
DWORD dwCallBack;
DWORD dwInstance;
} WAVEOPENDESC;
typedef WAVEOPENDESC FAR *LPWAVEOPENDESC;
typedef struct {
HMIDI hMidi;
DWORD dwCallback;
DWORD dwInstance;
} MIDIOPENDESC;
typedef MIDIOPENDESC FAR *LPMIDIOPENDESC;
typedef struct {
UINT wDelay;
UINT wResolution;
LPTIMECALLBACK lpFunction;
DWORD dwUser;
UINT wFlags;
} TIMEREVENT;
typedef TIMEREVENT FAR *LPTIMEREVENT;
typedef struct {
UINT wDeviceID; /* device ID */
LPSTR lpstrParams; /* parameter string for entry in SYSTEM.INI */
UINT wCustomCommandTable; /* custom command table (0xFFFF if none) */
/* filled in by the driver */
UINT wType; /* driver type */
/* filled in by the driver */
} MCI_OPEN_DRIVER_PARMS;
typedef MCI_OPEN_DRIVER_PARMS FAR * LPMCI_OPEN_DRIVER_PARMS;
DWORD WINAPI mciGetDriverData(UINT uDeviceID);
BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData);
UINT WINAPI mciDriverYield(UINT uDeviceID);
BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
UINT uStatus);
UINT WINAPI mciLoadCommandResource(HINSTANCE hInstance,
LPCSTR lpResName, UINT uType);
BOOL WINAPI mciFreeCommandResource(UINT uTable);
#define DCB_NULL 0x0000
#define DCB_WINDOW 0x0001 /* dwCallback is a HWND */
#define DCB_TASK 0x0002 /* dwCallback is a HTASK */
#define DCB_FUNCTION 0x0003 /* dwCallback is a FARPROC */
#define DCB_TYPEMASK 0x0007
#define DCB_NOSWITCH 0x0008 /* don't switch stacks for callback */
BOOL DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev, BOOL DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev,
WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
DWORD auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser,

1
include/options.h
View File

@ -15,7 +15,6 @@ struct options
int usePrivateMap; int usePrivateMap;
int synchronous; int synchronous;
int nobackingstore; int nobackingstore;
int nosaveunders;
short cmdShow; short cmdShow;
int relay_debug; int relay_debug;
int debug; int debug;

4
include/windows.h
View File

@ -2790,8 +2790,8 @@ Fb(void,ValidateRgn,HWND,a,HRGN,b)
Fc(BOOL,LineTo,HDC,a,short,b,short,c) Fc(BOOL,LineTo,HDC,a,short,b,short,c)
Fc(WORD,GetInternalWindowPos,HWND,a,LPRECT,b,LPPOINT,c) Fc(WORD,GetInternalWindowPos,HWND,a,LPRECT,b,LPPOINT,c)
Fc(LONG,_llseek,INT,a,LONG,b,INT,c) Fc(LONG,_llseek,INT,a,LONG,b,INT,c)
Fc(INT,_lread,INT,a,LPSTR,b,INT,c) Fc(INT,_lread,INT,a,LPSTR,b,WORD,c)
Fc(INT,_lwrite,INT,a,LPSTR,b,INT,c) Fc(INT,_lwrite,INT,a,LPSTR,b,WORD,c)
Fc(int,FillRect,HDC,a,LPRECT,b,HBRUSH,c) Fc(int,FillRect,HDC,a,LPRECT,b,HBRUSH,c)
Fc(DWORD,MoveTo,HDC,a,short,b,short,c) Fc(DWORD,MoveTo,HDC,a,short,b,short,c)
Fc(BOOL,CheckMenuItem,HMENU,a,WORD,b,WORD,c) Fc(BOOL,CheckMenuItem,HMENU,a,WORD,b,WORD,c)

5
loader/main.c
View File

@ -264,7 +264,10 @@ int _WinMain(int argc, char **argv)
strncpy(filename, Argv[0], p - Argv[0]); strncpy(filename, Argv[0], p - Argv[0]);
filename[p - Argv[0]] = '\0'; filename[p - Argv[0]] = '\0';
strcat(WindowsPath, ";"); strcat(WindowsPath, ";");
strcat(WindowsPath, filename); if (strchr(filename, '/'))
strcat(WindowsPath, GetDosFileName(filename));
else
strcat(WindowsPath, filename);
} }
if ((hInstMain = LoadImage(Argv[0], EXE, 1)) < 32) { if ((hInstMain = LoadImage(Argv[0], EXE, 1)) < 32) {

2
misc/Imakefile
View File

@ -16,7 +16,9 @@ SRCS = \
keyboard.c \ keyboard.c \
lstr.c \ lstr.c \
main.c \ main.c \
mcicda.c \
message.c \ message.c \
mmaux.c \
mmsystem.c \ mmsystem.c \
network.c \ network.c \
profile.c \ profile.c \

1442
misc/audio.c
View File

File diff suppressed because it is too large Load Diff

11
misc/comm.c
View File

@ -18,21 +18,12 @@
#include "wine.h" #include "wine.h"
#include "windows.h" #include "windows.h"
#include "comm.h"
/* #define DEBUG_COMM /* */ /* #define DEBUG_COMM /* */
#define MAX_PORTS 16
int commerror = 0, eventmask = 0; int commerror = 0, eventmask = 0;
struct DosDeviceStruct {
char *devicename; /* /dev/cua1 */
int fd;
int suspended;
int unget;
int unget_byte;
};
struct DosDeviceStruct COM[MAX_PORTS]; struct DosDeviceStruct COM[MAX_PORTS];
struct DosDeviceStruct LPT[MAX_PORTS]; struct DosDeviceStruct LPT[MAX_PORTS];

33
misc/dos_fs.c
View File

@ -27,6 +27,7 @@
#include "msdos.h" #include "msdos.h"
#include "prototypes.h" #include "prototypes.h"
#include "autoconf.h" #include "autoconf.h"
#include "comm.h"
/* #define DEBUG /* */ /* #define DEBUG /* */
@ -170,6 +171,11 @@ WORD DOS_GetEquipment(void)
{ {
WORD equipment; WORD equipment;
int diskdrives = 0; int diskdrives = 0;
int parallelports = 0;
int serialports = 0;
int x;
extern struct DosDeviceStruct COM[MAX_PORTS];
extern struct DosDeviceStruct LPT[MAX_PORTS];
/* borrowed from Ralph Brown's interrupt lists /* borrowed from Ralph Brown's interrupt lists
@ -190,6 +196,12 @@ WORD DOS_GetEquipment(void)
bit 1: =1 if math co-processor bit 1: =1 if math co-processor
bit 0: =1 if diskette available for boot bit 0: =1 if diskette available for boot
*/ */
/* Currently the only of these bits correctly set are:
bits 15-14 } Added by William Owen Smith,
bits 11-9 } wos@dcs.warwick.ac.uk
bits 7-6
bit 2 (always set)
*/
if (DosDrives[0].rootdir != NULL) if (DosDrives[0].rootdir != NULL)
diskdrives++; diskdrives++;
@ -197,8 +209,27 @@ WORD DOS_GetEquipment(void)
diskdrives++; diskdrives++;
if (diskdrives) if (diskdrives)
diskdrives--; diskdrives--;
for (x=0; x!=MAX_PORTS; x++) {
if (COM[x].devicename)
serialports++;
if (LPT[x].devicename)
parallelports++;
}
if (serialports > 7) /* 3 bits -- maximum value = 7 */
serialports=7;
if (parallelports > 3) /* 2 bits -- maximum value = 3 */
parallelports=3;
equipment = (diskdrives << 6) || 0x02; equipment = (diskdrives << 6) | (serialports << 9) |
(parallelports << 14) | 0x02;
#ifdef DEBUG
fprintf(stderr, "DOS_GetEquipment : diskdrives = %d serialports = %d "
"parallelports = %d\n"
"DOS_GetEquipment : equipment = %d\n",
diskdrives, serialports, parallelports, equipment);
#endif
return (equipment); return (equipment);
} }

4
misc/file.c
View File

@ -61,7 +61,7 @@ INT _lopen (LPSTR lpPathName, INT iReadWrite)
/*************************************************************************** /***************************************************************************
_lread _lread
***************************************************************************/ ***************************************************************************/
INT _lread (INT hFile, LPSTR lpBuffer, INT wBytes) INT _lread (INT hFile, LPSTR lpBuffer, WORD wBytes)
{ {
int result; int result;
@ -81,7 +81,7 @@ INT _lread (INT hFile, LPSTR lpBuffer, INT wBytes)
/**************************************************************************** /****************************************************************************
_lwrite _lwrite
****************************************************************************/ ****************************************************************************/
INT _lwrite (INT hFile, LPSTR lpBuffer, INT wBytes) INT _lwrite (INT hFile, LPSTR lpBuffer, WORD wBytes)
{ {
int result; int result;

14
misc/main.c
View File

@ -53,7 +53,6 @@ struct options Options =
FALSE, /* usePrivateMap */ FALSE, /* usePrivateMap */
FALSE, /* synchronous */ FALSE, /* synchronous */
FALSE, /* no backing store */ FALSE, /* no backing store */
FALSE, /* no save unders */
SW_SHOWNORMAL, /* cmdShow */ SW_SHOWNORMAL, /* cmdShow */
FALSE FALSE
}; };
@ -69,7 +68,6 @@ static XrmOptionDescRec optionsTable[] =
{ "-privatemap", ".privatemap", XrmoptionNoArg, (caddr_t)"on" }, { "-privatemap", ".privatemap", XrmoptionNoArg, (caddr_t)"on" },
{ "-synchronous", ".synchronous", XrmoptionNoArg, (caddr_t)"on" }, { "-synchronous", ".synchronous", XrmoptionNoArg, (caddr_t)"on" },
{ "-nobackingstore",".nobackingstore", XrmoptionNoArg, (caddr_t)"on" }, { "-nobackingstore",".nobackingstore", XrmoptionNoArg, (caddr_t)"on" },
{ "-nosaveunders", ".nosaveunders", XrmoptionNoArg, (caddr_t)"on" },
{ "-spy", ".spy", XrmoptionSepArg, (caddr_t)NULL }, { "-spy", ".spy", XrmoptionSepArg, (caddr_t)NULL },
{ "-debug", ".debug", XrmoptionNoArg, (caddr_t)"on" }, { "-debug", ".debug", XrmoptionNoArg, (caddr_t)"on" },
{ "-relaydbg", ".relaydbg", XrmoptionNoArg, (caddr_t)"on" } { "-relaydbg", ".relaydbg", XrmoptionNoArg, (caddr_t)"on" }
@ -90,7 +88,6 @@ static XrmOptionDescRec optionsTable[] =
" -privatemap Use a private color map\n" \ " -privatemap Use a private color map\n" \
" -synchronous Turn on synchronous display mode\n" \ " -synchronous Turn on synchronous display mode\n" \
" -nobackingstore Turn off backing store\n" \ " -nobackingstore Turn off backing store\n" \
" -nosaveunders Turn off saveunders\n" \
" -spy file Turn on message spying to the specified file\n" \ " -spy file Turn on message spying to the specified file\n" \
" -relaydbg Display call relay information\n" " -relaydbg Display call relay information\n"
@ -245,8 +242,6 @@ static void MAIN_ParseOptions( int *argc, char *argv[] )
Options.usePrivateMap = TRUE; Options.usePrivateMap = TRUE;
if (MAIN_GetResource( db, ".synchronous", &value )) if (MAIN_GetResource( db, ".synchronous", &value ))
Options.synchronous = TRUE; Options.synchronous = TRUE;
if (MAIN_GetResource( db, ".nosaveunders", &value ))
Options.nosaveunders = TRUE;
if (MAIN_GetResource( db, ".nobackingstore", &value )) if (MAIN_GetResource( db, ".nobackingstore", &value ))
Options.nobackingstore = TRUE; Options.nobackingstore = TRUE;
if (MAIN_GetResource( db, ".relaydbg", &value )) if (MAIN_GetResource( db, ".relaydbg", &value ))
@ -297,16 +292,11 @@ static void MAIN_CreateDesktop( int argc, char *argv[] )
else else
win_attr.backing_store = Always; win_attr.backing_store = Always;
if (Options.nosaveunders)
win_attr.save_under = FALSE;
else
win_attr.save_under = TRUE;
rootWindow = XCreateWindow( display, DefaultRootWindow(display), rootWindow = XCreateWindow( display, DefaultRootWindow(display),
desktopX, desktopY, width, height, 0, desktopX, desktopY, width, height, 0,
CopyFromParent, InputOutput, CopyFromParent, CopyFromParent, InputOutput, CopyFromParent,
CWEventMask | CWCursor | CWSaveUnder | CWEventMask | CWCursor |
CWBackingStore, &win_attr ); CWBackingStore, &win_attr );
/* Set window manager properties */ /* Set window manager properties */

859
misc/mcicda.c Normal file
View File

@ -0,0 +1,859 @@
/*
* Sample MCI CDAUDIO Wine Driver for Linux
*
* Copyright 1994 Martin Ayotte
*/
static char Copyright[] = "Copyright Martin Ayotte, 1994";
/*
#define DEBUG_CDAUDIO
*/
#include "stdio.h"
#include "win.h"
#include "user.h"
#include "driver.h"
#include "mmsystem.h"
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/soundcard.h>
#include <linux/cdrom.h>
#define SOUND_DEV "/dev/dsp"
#define CDAUDIO_DEV "/dev/sbpcd"
#ifdef SOUND_VERSION
#define IOCTL(a,b,c) ioctl(a,b,&c)
#else
#define IOCTL(a,b,c) (c = ioctl(a,b,c) )
#endif
#define MAX_CDAUDIODRV 2
#define MAX_CDAUDIO_TRACKS 256
#define CDFRAMES_PERSEC 75
#define CDFRAMES_PERMIN 4500
#define SECONDS_PERMIN 60
typedef struct {
int nUseCount; /* Incremented for each shared open */
BOOL fShareable; /* TRUE if first open was shareable */
WORD wNotifyDeviceID; /* MCI device ID with a pending notification */
HANDLE hCallback; /* Callback handle for pending notification */
MCI_OPEN_PARMS openParms;
DWORD dwTimeFormat;
int unixdev;
struct cdrom_subchnl sc;
int mode;
UINT nCurTrack;
DWORD dwCurFrame;
UINT nTracks;
DWORD dwTotalLen;
LPDWORD lpdwTrackLen;
LPDWORD lpdwTrackPos;
DWORD dwFirstOffset;
} LINUX_CDAUDIO;
static LINUX_CDAUDIO CDADev[MAX_CDAUDIODRV];
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_mciOpen [internal]
*/
DWORD CDAUDIO_mciOpen(DWORD dwFlags, LPMCI_OPEN_PARMS lpParms)
{
UINT wDevID;
int cdrom;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciOpen(%08X, %08X);\n", dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
wDevID = lpParms->wDeviceID;
if (CDADev[wDevID].nUseCount > 0) {
/* The driver already open on this channel */
/* If the driver was% op, ened shareable before and this open specifies */
/* shareable then increment the use count */
if (CDADev[wDevID].fShareable && (dwFlags & MCI_OPEN_SHAREABLE))
++CDADev[wDevID].nUseCount;
else
return MCIERR_MUST_USE_SHAREABLE;
}
else {
CDADev[wDevID].nUseCount = 1;
CDADev[wDevID].fShareable = dwFlags & MCI_OPEN_SHAREABLE;
}
if (dwFlags & MCI_OPEN_ELEMENT) {
printf("CDAUDIO_mciOpen // MCI_OPEN_ELEMENT !\n");
/* return MCIERR_NO_ELEMENT_ALLOWED; */
}
memcpy(&CDADev[wDevID].openParms, lpParms, sizeof(MCI_OPEN_PARMS));
CDADev[wDevID].wNotifyDeviceID = lpParms->wDeviceID;
CDADev[wDevID].unixdev = open (CDAUDIO_DEV, O_RDONLY, 0);
if (CDADev[wDevID].unixdev == -1) {
printf("CDAUDIO_mciOpen // can't open '%s' !\n", CDAUDIO_DEV);
return MCIERR_HARDWARE;
}
CDADev[wDevID].mode = 0;
CDADev[wDevID].dwTimeFormat = MCI_FORMAT_TMSF;
CDADev[wDevID].nCurTrack = 0;
CDADev[wDevID].nTracks = 0;
CDADev[wDevID].dwTotalLen = 0;
CDADev[wDevID].dwFirstOffset = 0;
CDADev[wDevID].lpdwTrackLen = NULL;
CDADev[wDevID].lpdwTrackPos = NULL;
if (!CDAUDIO_GetTracksInfo(wDevID)) {
printf("CDAUDIO_mciOpen // error reading TracksInfo !\n");
/* return MCIERR_INTERNAL; */
}
if (dwFlags & MCI_NOTIFY) {
printf("CDAUDIO_mciOpen // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
}
/**************************************************************************
* CDAUDIO_mciClose [internal]
*/
DWORD CDAUDIO_mciClose(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciClose(%u, %08X, %08X);\n", wDevID, dwParam, lpParms);
#endif
if (CDADev[wDevID].lpdwTrackLen != NULL) free(CDADev[wDevID].lpdwTrackLen);
if (CDADev[wDevID].lpdwTrackPos != NULL) free(CDADev[wDevID].lpdwTrackPos);
close(CDADev[wDevID].unixdev);
}
/**************************************************************************
* CDAUDIO_mciGetDevCaps [internal]
*/
DWORD CDAUDIO_mciGetDevCaps(UINT wDevID, DWORD dwFlags,
LPMCI_GETDEVCAPS_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciGetDevCaps(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
if (dwFlags & MCI_GETDEVCAPS_ITEM) {
printf("CDAUDIO_mciGetDevCaps // MCI_GETDEVCAPS_ITEM dwItem=%08X);\n",
lpParms->dwItem);
switch(lpParms->dwItem) {
case MCI_GETDEVCAPS_CAN_RECORD:
lpParms->dwReturn = FALSE;
break;
case MCI_GETDEVCAPS_HAS_AUDIO:
lpParms->dwReturn = TRUE;
break;
case MCI_GETDEVCAPS_HAS_VIDEO:
lpParms->dwReturn = FALSE;
break;
case MCI_GETDEVCAPS_DEVICE_TYPE:
lpParms->dwReturn = MCI_DEVTYPE_CD_AUDIO;
break;
case MCI_GETDEVCAPS_USES_FILES:
lpParms->dwReturn = FALSE;
break;
case MCI_GETDEVCAPS_COMPOUND_DEVICE:
lpParms->dwReturn = FALSE;
break;
case MCI_GETDEVCAPS_CAN_EJECT:
lpParms->dwReturn = TRUE;
break;
case MCI_GETDEVCAPS_CAN_PLAY:
lpParms->dwReturn = TRUE;
break;
case MCI_GETDEVCAPS_CAN_SAVE:
lpParms->dwReturn = FALSE;
break;
default:
return MCIERR_UNRECOGNIZED_COMMAND;
}
}
printf("CDAUDIO_mciGetDevCaps // lpParms->dwReturn=%08X);\n", lpParms->dwReturn);
return 0;
}
/**************************************************************************
* CDAUDIO_mciInfo [internal]
*/
DWORD CDAUDIO_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciInfo(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
lpParms->lpstrReturn = NULL;
switch(dwFlags) {
case MCI_INFO_PRODUCT:
lpParms->lpstrReturn = "Linux CDROM 0.5";
break;
default:
return MCIERR_UNRECOGNIZED_COMMAND;
}
if (lpParms->lpstrReturn != NULL)
lpParms->dwRetSize = strlen(lpParms->lpstrReturn);
else
lpParms->dwRetSize = 0;
return 0;
}
/**************************************************************************
* CDAUDIO_mciStatus [internal]
*/
DWORD CDAUDIO_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStatus(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
if (CDADev[wDevID].unixdev == 0) return MMSYSERR_NOTENABLED;
if (dwFlags & MCI_NOTIFY) {
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStatus // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
#endif
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
if (dwFlags & MCI_STATUS_ITEM) {
switch(lpParms->dwItem) {
case MCI_STATUS_CURRENT_TRACK:
if (!CDAUDIO_GetCDStatus(wDevID)) return MCIERR_INTERNAL;
lpParms->dwReturn = CDADev[wDevID].nCurTrack;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStatus // CURRENT_TRACK=%u!\n", lpParms->dwReturn);
#endif
return 0;
case MCI_STATUS_LENGTH:
if (CDADev[wDevID].nTracks == 0) {
if (!CDAUDIO_GetTracksInfo(wDevID)) {
printf("CDAUDIO_mciStatus // error reading TracksInfo !\n");
return MCIERR_INTERNAL;
}
}
if (dwFlags & MCI_TRACK) {
printf("CDAUDIO_mciStatus // MCI_TRACK #%u LENGTH=??? !\n",
lpParms->dwTrack);
if (lpParms->dwTrack > CDADev[wDevID].nTracks)
return MCIERR_OUTOFRANGE;
lpParms->dwReturn = CDADev[wDevID].lpdwTrackLen[lpParms->dwTrack];
}
else
lpParms->dwReturn = CDADev[wDevID].dwTotalLen;
lpParms->dwReturn = CDAUDIO_CalcTime(wDevID,
CDADev[wDevID].dwTimeFormat, lpParms->dwReturn);
printf("CDAUDIO_mciStatus // LENGTH=%u !\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_MODE:
if (!CDAUDIO_GetCDStatus(wDevID)) return MCIERR_INTERNAL;
lpParms->dwReturn = CDADev[wDevID].mode;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStatus // MCI_STATUS_MODE=%08X !\n",
lpParms->dwReturn);
#endif
return 0;
case MCI_STATUS_MEDIA_PRESENT:
lpParms->dwReturn = (CDADev[wDevID].nTracks > 0) ? TRUE : FALSE;
if (lpParms->dwReturn == FALSE)
printf("CDAUDIO_mciStatus // MEDIA_NOT_PRESENT !\n");
else
printf("CDAUDIO_mciStatus // MCI_STATUS_MEDIA_PRESENT !\n");
return 0;
case MCI_STATUS_NUMBER_OF_TRACKS:
lpParms->dwReturn = CDAUDIO_GetNumberOfTracks(wDevID);
printf("CDAUDIO_mciStatus // MCI_STATUS_NUMBER_OF_TRACKS = %u !\n",
lpParms->dwReturn);
if (lpParms->dwReturn == (WORD)-1) return MCIERR_INTERNAL;
return 0;
case MCI_STATUS_POSITION:
if (!CDAUDIO_GetCDStatus(wDevID)) return MCIERR_INTERNAL;
lpParms->dwReturn = CDADev[wDevID].dwCurFrame;
if (dwFlags & MCI_STATUS_START) {
lpParms->dwReturn = CDADev[wDevID].dwFirstOffset;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStatus // get MCI_STATUS_START !\n");
#endif
}
if (dwFlags & MCI_TRACK) {
if (lpParms->dwTrack > CDADev[wDevID].nTracks)
return MCIERR_OUTOFRANGE;
lpParms->dwReturn = CDADev[wDevID].lpdwTrackPos[lpParms->dwTrack - 1];
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStatus // get MCI_TRACK #%u !\n", lpParms->dwTrack);
#endif
}
lpParms->dwReturn = CDAUDIO_CalcTime(wDevID,
CDADev[wDevID].dwTimeFormat, lpParms->dwReturn);
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStatus // MCI_STATUS_POSITION=%08X !\n",
lpParms->dwReturn);
#endif
return 0;
case MCI_STATUS_READY:
printf("CDAUDIO_mciStatus // MCI_STATUS_READY !\n");
lpParms->dwReturn = TRUE;
return 0;
case MCI_STATUS_TIME_FORMAT:
printf("CDAUDIO_mciStatus // MCI_STATUS_TIME_FORMAT !\n");
lpParms->dwReturn = MCI_FORMAT_MILLISECONDS;
return 0;
default:
printf("CDAUDIO_mciStatus // unknowm command %04X !\n", lpParms->dwItem);
return MCIERR_UNRECOGNIZED_COMMAND;
}
}
printf("CDAUDIO_mciStatus // not MCI_STATUS_ITEM !\n");
return 0;
}
/**************************************************************************
* CDAUDIO_CalcTime [internal]
*/
DWORD CDAUDIO_CalcTime(UINT wDevID, DWORD dwFormatType, DWORD dwFrame)
{
DWORD dwTime = 0;
UINT wTrack;
UINT wMinutes;
UINT wSeconds;
UINT wFrames;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcTime(%u, %08X, %lu);\n", wDevID, dwFormatType, dwFrame);
#endif
TryAGAIN:
switch (dwFormatType) {
case MCI_FORMAT_MILLISECONDS:
dwTime = dwFrame / CDFRAMES_PERSEC * 1000;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcTime // MILLISECONDS %u\n", dwTime);
#endif
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);
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcTime // MSF %02u:%02u:%02u -> dwTime=%u\n",
wMinutes, wSeconds, wFrames, dwTime);
#endif
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);
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcTime // %02u-%02u:%02u:%02u\n",
wTrack, wMinutes, wSeconds, wFrames);
#endif
break;
default:
/* unknown format ! force TMSF ! ... */
dwFormatType = MCI_FORMAT_TMSF;
goto TryAGAIN;
}
return dwTime;
}
/**************************************************************************
* CDAUDIO_CalcFrame [internal]
*/
DWORD CDAUDIO_CalcFrame(UINT wDevID, DWORD dwFormatType, DWORD dwTime)
{
DWORD dwFrame = 0;
UINT wTrack;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcFrame(%u, %08X, %lu);\n", wDevID, dwFormatType, dwTime);
#endif
TryAGAIN:
switch (dwFormatType) {
case MCI_FORMAT_MILLISECONDS:
dwFrame = dwTime * CDFRAMES_PERSEC / 1000;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcFrame // MILLISECONDS %u\n", dwFrame);
#endif
break;
case MCI_FORMAT_MSF:
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcFrame // MSF %02u:%02u:%02u\n",
MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime),
MCI_MSF_FRAME(dwTime));
#endif
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);
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_CalcFrame // TMSF %02u-%02u:%02u:%02u\n",
MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime),
MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime));
printf("CDAUDIO_CalcFrame // TMSF trackpos[%u]=%u\n",
wTrack, CDADev[wDevID].lpdwTrackPos[wTrack - 1]);
#endif
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;
}
return dwFrame;
}
/**************************************************************************
* CDAUDIO_GetNumberOfTracks [internal]
*/
UINT CDAUDIO_GetNumberOfTracks(UINT wDevID)
{
struct cdrom_tochdr hdr;
if (CDADev[wDevID].nTracks == 0) {
if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCHDR, &hdr)) {
printf("GetNumberOfTracks(%u) // Error occured !\n", wDevID);
return (WORD)-1;
}
CDADev[wDevID].nTracks = hdr.cdth_trk1;
}
return CDADev[wDevID].nTracks;
}
/**************************************************************************
* CDAUDIO_GetNumberOfTracks [internal]
*/
BOOL CDAUDIO_GetTracksInfo(UINT wDevID)
{
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;
}
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) {
printf("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)) {
printf("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) {
CDADev[wDevID].dwFirstOffset = last_start = start;
printf("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;
printf("CDAUDIO_GetTracksInfo // track #%u start=%u len=%u\n",
i, start, length);
}
}
CDADev[wDevID].dwTotalLen = total_length;
printf("CDAUDIO_GetTracksInfo // total_len=%u\n", total_length);
return TRUE;
}
/**************************************************************************
* CDAUDIO_GetNumberOfTracks [internal]
*/
BOOL CDAUDIO_GetCDStatus(UINT wDevID)
{
int oldmode = CDADev[wDevID].mode;
CDADev[wDevID].sc.cdsc_format = CDROM_MSF;
if (ioctl(CDADev[wDevID].unixdev, CDROMSUBCHNL, &CDADev[wDevID].sc)) {
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_GetCDStatus // opened or no_media !\n");
#endif
CDADev[wDevID].mode = MCI_MODE_OPEN;
return TRUE;
}
switch (CDADev[wDevID].sc.cdsc_audiostatus) {
case CDROM_AUDIO_INVALID:
printf("CDAUDIO_GetCDStatus // device doesn't support status !\n");
return FALSE;
case CDROM_AUDIO_NO_STATUS:
CDADev[wDevID].mode = MCI_MODE_STOP;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_GetCDStatus // MCI_MODE_STOP !\n");
#endif
break;
case CDROM_AUDIO_PLAY:
CDADev[wDevID].mode = MCI_MODE_PLAY;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_GetCDStatus // MCI_MODE_PLAY !\n");
#endif
break;
case CDROM_AUDIO_PAUSED:
CDADev[wDevID].mode = MCI_MODE_PAUSE;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_GetCDStatus // MCI_MODE_PAUSE !\n");
#endif
break;
default:
printf("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;
#ifdef DEBUG_CDAUDIO
printf("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);
#endif
if (oldmode != CDADev[wDevID].mode && oldmode == MCI_MODE_OPEN) {
if (!CDAUDIO_GetTracksInfo(wDevID)) {
printf("CDAUDIO_GetCDStatus // error updating TracksInfo !\n");
return MCIERR_INTERNAL;
}
}
return TRUE;
}
/**************************************************************************
* CDAUDIO_mciPlay [internal]
*/
DWORD CDAUDIO_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
{
int start, end;
struct cdrom_msf msf;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciPlay(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
if (CDADev[wDevID].unixdev == 0) return MMSYSERR_NOTENABLED;
start = 0; end = CDADev[wDevID].dwTotalLen;
CDADev[wDevID].nCurTrack = 1;
if (dwFlags & MCI_FROM) {
start = CDAUDIO_CalcFrame(wDevID,
CDADev[wDevID].dwTimeFormat, lpParms->dwFrom);
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciPlay // MCI_FROM=%08X -> %u \n",
lpParms->dwFrom, start);
#endif
}
if (dwFlags & MCI_TO) {
end = CDAUDIO_CalcFrame(wDevID,
CDADev[wDevID].dwTimeFormat, lpParms->dwTo);
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciPlay // MCI_TO=%08X -> %u \n",
lpParms->dwTo, end);
#endif
}
start += CDADev[wDevID].dwFirstOffset;
end += CDADev[wDevID].dwFirstOffset;
msf.cdmsf_min0 = start / CDFRAMES_PERMIN;
msf.cdmsf_sec0 = (start % CDFRAMES_PERMIN) / CDFRAMES_PERSEC;
msf.cdmsf_frame0 = start % CDFRAMES_PERSEC;
msf.cdmsf_min1 = end / CDFRAMES_PERMIN;
msf.cdmsf_sec1 = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC;
msf.cdmsf_frame1 = end % CDFRAMES_PERSEC;
if (ioctl(CDADev[wDevID].unixdev, CDROMSTART)) {
printf("CDAUDIO_mciPlay // motor doesn't start !\n");
return MCIERR_HARDWARE;
}
if (ioctl(CDADev[wDevID].unixdev, CDROMPLAYMSF, &msf)) {
printf("CDAUDIO_mciPlay // device doesn't play !\n");
return MCIERR_HARDWARE;
}
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciPlay // msf = %d:%d:%d %d:%d:%d\n",
msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0,
msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1);
#endif
CDADev[wDevID].mode = MCI_MODE_PLAY;
if (dwFlags & MCI_NOTIFY) {
printf("CDAUDIO_mciPlay // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
}
/**************************************************************************
* CDAUDIO_mciStop [internal]
*/
DWORD CDAUDIO_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciStop(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
if (ioctl(CDADev[wDevID].unixdev, CDROMSTOP)) return MCIERR_HARDWARE;
CDADev[wDevID].mode = MCI_MODE_STOP;
if (dwFlags & MCI_NOTIFY) {
printf("CDAUDIO_mciStop // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
}
/**************************************************************************
* CDAUDIO_mciPause [internal]
*/
DWORD CDAUDIO_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciPause(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
if (ioctl(CDADev[wDevID].unixdev, CDROMPAUSE)) return MCIERR_HARDWARE;
CDADev[wDevID].mode = MCI_MODE_PAUSE;
if (dwFlags & MCI_NOTIFY) {
printf("CDAUDIO_mciPause // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
}
/**************************************************************************
* CDAUDIO_mciResume [internal]
*/
DWORD CDAUDIO_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciResume(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
if (ioctl(CDADev[wDevID].unixdev, CDROMRESUME)) return MCIERR_HARDWARE;
CDADev[wDevID].mode = MCI_MODE_STOP;
if (dwFlags & MCI_NOTIFY) {
printf("CDAUDIO_mciResume // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
}
/**************************************************************************
* CDAUDIO_mciSeek [internal]
*/
DWORD CDAUDIO_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
{
DWORD dwRet;
MCI_PLAY_PARMS PlayParms;
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciSeek(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
if (ioctl(CDADev[wDevID].unixdev, CDROMRESUME)) return MCIERR_HARDWARE;
CDADev[wDevID].mode = MCI_MODE_SEEK;
switch(dwFlags) {
case MCI_SEEK_TO_START:
PlayParms.dwFrom = 0;
break;
case MCI_SEEK_TO_END:
PlayParms.dwFrom = CDADev[wDevID].dwTotalLen;
break;
case MCI_TO:
PlayParms.dwFrom = lpParms->dwTo;
break;
}
dwRet = CDAUDIO_mciPlay(wDevID, MCI_WAIT | MCI_FROM, &PlayParms);
if (dwRet != 0) return dwRet;
dwRet = CDAUDIO_mciStop(wDevID, MCI_WAIT, (LPMCI_GENERIC_PARMS)&PlayParms);
if (dwFlags & MCI_NOTIFY) {
printf("CDAUDIO_mciSeek // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return dwRet;
}
/**************************************************************************
* CDAUDIO_mciSet [internal]
*/
DWORD CDAUDIO_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
{
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciSet(%u, %08X, %08X);\n", wDevID, dwFlags, lpParms);
#endif
if (lpParms == NULL) return MCIERR_INTERNAL;
/*
printf("CDAUDIO_mciSet // dwTimeFormat=%08X\n", lpParms->dwTimeFormat);
printf("CDAUDIO_mciSet // dwAudio=%08X\n", lpParms->dwAudio);
*/
if (dwFlags & MCI_SET_TIME_FORMAT) {
switch (lpParms->dwTimeFormat) {
case MCI_FORMAT_MILLISECONDS:
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciSet // MCI_FORMAT_MILLISECONDS !\n");
#endif
break;
case MCI_FORMAT_MSF:
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciSet // MCI_FORMAT_MSF !\n");
#endif
break;
case MCI_FORMAT_TMSF:
#ifdef DEBUG_CDAUDIO
printf("CDAUDIO_mciSet // MCI_FORMAT_TMSF !\n");
#endif
break;
default:
printf("CDAUDIO_mciSet // bad time format !\n");
return MCIERR_BAD_TIME_FORMAT;
}
CDADev[wDevID].dwTimeFormat = lpParms->dwTimeFormat;
}
if (dwFlags & MCI_SET_DOOR_OPEN) {
printf("CDAUDIO_mciSet // MCI_SET_DOOR_OPEN !\n");
if (ioctl(CDADev[wDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE;
CDADev[wDevID].nTracks = 0;
}
if (dwFlags & MCI_SET_DOOR_CLOSED) {
printf("CDAUDIO_mciSet // MCI_SET_DOOR_CLOSED !\n");
if (ioctl(CDADev[wDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE;
CDADev[wDevID].nTracks = 0;
}
if (dwFlags & MCI_SET_VIDEO) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_NOTIFY) {
printf("CDAUDIO_mciSet // MCI_NOTIFY_SUCCESSFUL %08X !\n", lpParms->dwCallback);
mciDriverNotify((HWND)LOWORD(lpParms->dwCallback),
CDADev[wDevID].wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
return 0;
}
/**************************************************************************
* CDAUDIO_DriverProc [sample driver]
*/
LRESULT CDAUDIO_DriverProc(DWORD dwDevID, HDRVR hDriv, WORD wMsg,
DWORD dwParam1, DWORD dwParam2)
{
switch(wMsg) {
case DRV_LOAD:
return (LRESULT)1L;
case DRV_FREE:
return (LRESULT)1L;
case DRV_OPEN:
case MCI_OPEN_DRIVER:
case MCI_OPEN:
return CDAUDIO_mciOpen(dwParam1, (LPMCI_OPEN_PARMS)dwParam2);
case DRV_CLOSE:
case MCI_CLOSE_DRIVER:
case MCI_CLOSE:
return CDAUDIO_mciClose(dwDevID, dwParam1,
(LPMCI_GENERIC_PARMS)dwParam2);
case DRV_ENABLE:
return (LRESULT)1L;
case DRV_DISABLE:
return (LRESULT)1L;
case DRV_QUERYCONFIGURE:
return (LRESULT)1L;
case DRV_CONFIGURE:
MessageBox((HWND)NULL, "Sample MultiMedia Linux Driver !",
"MMLinux Driver", MB_OK);
return (LRESULT)1L;
case DRV_INSTALL:
return (LRESULT)DRVCNF_RESTART;
case DRV_REMOVE:
return (LRESULT)DRVCNF_RESTART;
case MCI_GETDEVCAPS:
return CDAUDIO_mciGetDevCaps(dwDevID, dwParam1,
(LPMCI_GETDEVCAPS_PARMS)dwParam2);
case MCI_INFO:
return CDAUDIO_mciInfo(dwDevID, dwParam1,
(LPMCI_INFO_PARMS)dwParam2);
case MCI_STATUS:
return CDAUDIO_mciStatus(dwDevID, dwParam1,
(LPMCI_STATUS_PARMS)dwParam2);
case MCI_SET:
return CDAUDIO_mciSet(dwDevID, dwParam1,
(LPMCI_SET_PARMS)dwParam2);
case MCI_PLAY:
return CDAUDIO_mciPlay(dwDevID, dwParam1,
(LPMCI_PLAY_PARMS)dwParam2);
case MCI_STOP:
return CDAUDIO_mciStop(dwDevID, dwParam1,
(LPMCI_GENERIC_PARMS)dwParam2);
case MCI_PAUSE:
return CDAUDIO_mciPause(dwDevID, dwParam1,
(LPMCI_GENERIC_PARMS)dwParam2);
case MCI_RESUME:
return CDAUDIO_mciResume(dwDevID, dwParam1,
(LPMCI_GENERIC_PARMS)dwParam2);
case MCI_SEEK:
return CDAUDIO_mciSeek(dwDevID, dwParam1,
(LPMCI_SEEK_PARMS)dwParam2);
case MCI_SET_DOOR_OPEN:
printf("CDAUDIO_DriverProc // MCI_SET_DOOR_OPEN !\n");
if (ioctl(CDADev[dwDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE;
CDADev[dwDevID].nTracks = 0;
return 0;
case MCI_SET_DOOR_CLOSED:
printf("CDAUDIO_DriverProc // MCI_SET_DOOR_CLOSED !\n");
if (ioctl(CDADev[dwDevID].unixdev, CDROMEJECT, 1)) return MCIERR_HARDWARE;
CDADev[dwDevID].nTracks = 0;
return 0;
default:
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
}
}
/*-----------------------------------------------------------------------*/

116
misc/mmaux.c Normal file
View File

@ -0,0 +1,116 @@
/*
* Sample AUXILARY Wine Driver for Linux
*
* Copyright 1994 Martin Ayotte
*/
static char Copyright[] = "Copyright Martin Ayotte, 1994";
#include "stdio.h"
#include "win.h"
#include "user.h"
#include "driver.h"
#include "mmsystem.h"
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/soundcard.h>
#define SOUND_DEV "/dev/dsp"
#define MIXER_DEV "/dev/mixer"
#ifdef SOUND_VERSION
#define IOCTL(a,b,c) ioctl(a,b,&c)
#else
#define IOCTL(a,b,c) (c = ioctl(a,b,c) )
#endif
/*-----------------------------------------------------------------------*/
/**************************************************************************
* AUX_GetDevCaps [internal]
*/
DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPS lpCaps, DWORD dwSize)
{
int mixer;
int volume;
printf("AUX_GetDevCaps(%u, %08X, %u);\n", wDevID, lpCaps, dwSize);
if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
printf("AUX_GetDevCaps // mixer device not available !\n");
return MMSYSERR_NOTENABLED;
}
if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) {
printf("AUX_GetDevCaps // unable read mixer !\n");
return MMSYSERR_NOTENABLED;
}
close(mixer);
return MMSYSERR_NOERROR;
}
/**************************************************************************
* AUX_GetVolume [internal]
*/
DWORD AUX_GetVolume(WORD wDevID, DWORD dwParam)
{
int mixer;
int volume;
printf("AUX_GetVolume(%u, %08X);\n", wDevID, dwParam);
if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
printf("Linux 'AUX_GetVolume' // mixer device not available !\n");
return MMSYSERR_NOTENABLED;
}
if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) {
printf("Linux 'AUX_GetVolume' // unable read mixer !\n");
return MMSYSERR_NOTENABLED;
}
close(mixer);
return MMSYSERR_NOERROR;
}
/**************************************************************************
* AUX_SetVolume [internal]
*/
DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam)
{
int mixer;
int volume = 50;
printf("AUX_SetVolume(%u, %08X);\n", wDevID, dwParam);
if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
printf("Linux 'AUX_SetVolume' // mixer device not available !\n");
return MMSYSERR_NOTENABLED;
}
if (ioctl(mixer, SOUND_MIXER_WRITE_LINE, &volume) == -1) {
printf("Linux 'AUX_SetVolume' // unable set mixer !\n");
return MMSYSERR_NOTENABLED;
}
close(mixer);
return MMSYSERR_NOERROR;
}
/**************************************************************************
* auxMessage [sample driver]
*/
DWORD auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
printf("auxMessage(%u, %04X, %08X, %08X, %08X);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch(wMsg) {
case AUXDM_GETDEVCAPS:
return AUX_GetDevCaps(wDevID, (LPAUXCAPS)dwParam1, dwParam2);
case AUXDM_GETNUMDEVS:
return 0L;
case AUXDM_GETVOLUME:
return AUX_GetVolume(wDevID, dwParam1);
case AUXDM_SETVOLUME:
return AUX_SetVolume(wDevID, dwParam1);
}
return MMSYSERR_NOTSUPPORTED;
}

502
misc/mmsystem.c
View File

@ -7,7 +7,10 @@
static char Copyright[] = "Copyright Martin Ayotte, 1993"; static char Copyright[] = "Copyright Martin Ayotte, 1993";
#include "stdio.h" #include "stdio.h"
#include <fcntl.h>
#include <sys/ioctl.h>
#include "win.h" #include "win.h"
#include "user.h"
#include "driver.h" #include "driver.h"
#include "mmsystem.h" #include "mmsystem.h"
@ -31,6 +34,8 @@ typedef TIMERENTRY *LPTIMERENTRY;
static LPTIMERENTRY lpTimerList = NULL; static LPTIMERENTRY lpTimerList = NULL;
static MCI_OPEN_DRIVER_PARMS mciDrv[MAXMCIDRIVERS];
UINT WINAPI midiGetErrorText(UINT uError, LPSTR lpText, UINT uSize); UINT WINAPI midiGetErrorText(UINT uError, LPSTR lpText, UINT uSize);
UINT WINAPI waveGetErrorText(UINT uError, LPSTR lpText, UINT uSize); UINT WINAPI waveGetErrorText(UINT uError, LPSTR lpText, UINT uSize);
@ -50,9 +55,67 @@ int MMSYSTEM_WEP(HANDLE hInstance, WORD wDataSeg,
*/ */
BOOL WINAPI sndPlaySound(LPCSTR lpszSoundName, UINT uFlags) BOOL WINAPI sndPlaySound(LPCSTR lpszSoundName, UINT uFlags)
{ {
printf("EMPTY STUB !!! sndPlaySound // SoundName='%s' uFlags=%04X !\n", int hFile;
lpszSoundName, uFlags); int count;
return 0; WAVEHDR WaveHdr;
PCMWAVEFORMAT WaveFormat;
WAVEOPENDESC WaveDesc;
DWORD dwRet;
char str[128];
LPSTR ptr;
printf("sndPlaySound // SoundName='%s' uFlags=%04X !\n",
lpszSoundName, uFlags);
if (lpszSoundName == NULL) {
printf("sndPlaySound // Stop !\n");
return FALSE;
}
hFile = open(lpszSoundName, O_RDONLY);
if (hFile == 0) {
printf("sndPlaySound // searching in SystemSound List !\n");
GetProfileString("Sounds", (LPSTR)lpszSoundName, "", str, sizeof(str));
if (strlen(str) == 0) return FALSE;
if ((ptr = strchr(str, ',')) != NULL) *ptr = '\0';
hFile = open(str, O_RDONLY);
if (hFile == 0) {
printf("sndPlaySound // can't find SystemSound='%s' !\n", str);
return FALSE;
}
}
WaveDesc.hWave = 0;
WaveDesc.lpFormat = (LPWAVEFORMAT)&WaveFormat;
WaveFormat.wf.wFormatTag = WAVE_FORMAT_PCM;
WaveFormat.wBitsPerSample = 8;
WaveFormat.wf.nChannels = 1;
WaveFormat.wf.nSamplesPerSec = 11025;
WaveFormat.wf.nAvgBytesPerSec = 11025;
WaveFormat.wf.nBlockAlign = 1;
dwRet = wodMessage(0, WODM_OPEN, 0, (DWORD)&WaveDesc, CALLBACK_NULL);
if (dwRet != MMSYSERR_NOERROR) {
printf("sndPlaySound // can't open WaveOut device !\n");
return FALSE;
}
WaveHdr.lpData = (LPSTR) malloc(64000);
WaveHdr.dwBufferLength = 64000;
WaveHdr.dwUser = 0L;
WaveHdr.dwFlags = 0L;
WaveHdr.dwLoops = 0L;
dwRet = wodMessage(0, WODM_PREPARE, 0, (DWORD)&WaveHdr, sizeof(WAVEHDR));
if (dwRet != MMSYSERR_NOERROR) {
printf("sndPlaySound // can't prepare WaveOut device !\n");
return FALSE;
}
while(TRUE) {
count = read(hFile, WaveHdr.lpData, WaveHdr.dwBufferLength);
if (count == 0) break;
WaveHdr.dwBytesRecorded = count;
wodMessage(0, WODM_WRITE, 0, (DWORD)&WaveHdr, sizeof(WAVEHDR));
}
wodMessage(0, WODM_UNPREPARE, 0, (DWORD)&WaveHdr, sizeof(WAVEHDR));
wodMessage(0, WODM_CLOSE, 0, 0L, 0L);
free(WaveHdr.lpData);
close(hFile);
return TRUE;
} }
/************************************************************************** /**************************************************************************
@ -87,7 +150,23 @@ void WINAPI OutputDebugStr(LPCSTR str)
BOOL DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev, BOOL DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev,
WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2)
{ {
printf("EMPTY STUB !!! DriverCallback() !\n"); printf("DriverCallback(%08X, %04X, %04X, %04X, %08X, %08X, %08X); !\n",
dwCallBack, uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2);
switch(uFlags & DCB_TYPEMASK) {
case DCB_NULL:
printf("DriverCallback() // CALLBACK_NULL !\n");
break;
case DCB_WINDOW:
printf("DriverCallback() // CALLBACK_WINDOW !\n");
break;
case DCB_TASK:
printf("DriverCallback() // CALLBACK_TASK !\n");
break;
case DCB_FUNCTION:
printf("DriverCallback() // CALLBACK_FUNCTION !\n");
break;
}
return TRUE;
} }
/************************************************************************** /**************************************************************************
@ -170,8 +249,11 @@ WORD JoySetCalibration(WORD wID)
*/ */
UINT WINAPI auxGetNumDevs() UINT WINAPI auxGetNumDevs()
{ {
UINT count = 0;
printf("auxGetNumDevs !\n"); printf("auxGetNumDevs !\n");
return 0; count += auxMessage(0, AUXDM_GETNUMDEVS, 0L, 0L, 0L);
printf("auxGetNumDevs return %u \n", count);
return count;
} }
/************************************************************************** /**************************************************************************
@ -474,25 +556,32 @@ msg# 543 : tmsf
/************************************************************************** /**************************************************************************
* mciWaveOpen [internal] * mciDriverNotify [MMSYSTEM.711]
*/ */
DWORD mciWaveOpen(UINT wDevID, DWORD dwParam, LPMCI_WAVE_OPEN_PARMS lpParms) BOOL WINAPI mciDriverNotify(HWND hWndCallBack, UINT wDevID, UINT wStatus)
{ {
if (lpParms == NULL) return MCIERR_INTERNAL; printf("mciDriverNotify(%04X, %u, %04X)\n", hWndCallBack, wDevID, wStatus);
printf("mciWaveOpen(%04X, %08X, %08X)\n", wDevID, dwParam, lpParms); PostMessage(hWndCallBack, MM_MCINOTIFY, wStatus,
return MCIERR_INTERNAL; MAKELONG(mciDrv[wDevID].wDeviceID, 0));
return TRUE;
} }
/************************************************************************** /**************************************************************************
* mciOpen [internal] * mciOpen [internal]
*/ */
DWORD mciOpen(UINT wDevID, DWORD dwParam, LPMCI_OPEN_PARMS lpParms) DWORD mciOpen(DWORD dwParam, LPMCI_OPEN_PARMS lpParms)
{ {
char str[128]; char str[128];
DWORD dwDevTyp = 0; DWORD dwDevTyp = 0;
UINT wDevID = 1;
printf("mciOpen(%08X, %08X)\n", dwParam, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL; if (lpParms == NULL) return MCIERR_INTERNAL;
printf("mciOpen(%04X, %08X, %08X)\n", wDevID, dwParam, lpParms); while(mciDrv[wDevID].wType != 0) {
if (++wDevID >= MAXMCIDRIVERS) {
printf("MCI_OPEN // MAXMCIDRIVERS reached !\n");
return MCIERR_INTERNAL;
}
}
if (dwParam & MCI_OPEN_TYPE) { if (dwParam & MCI_OPEN_TYPE) {
if (lpParms->lpstrDeviceType == NULL) return MCIERR_INTERNAL; if (lpParms->lpstrDeviceType == NULL) return MCIERR_INTERNAL;
if (dwParam & MCI_OPEN_TYPE_ID) { if (dwParam & MCI_OPEN_TYPE_ID) {
@ -519,13 +608,17 @@ DWORD mciOpen(UINT wDevID, DWORD dwParam, LPMCI_OPEN_PARMS lpParms)
dwDevTyp = MCI_DEVTYPE_ANIMATION; dwDevTyp = MCI_DEVTYPE_ANIMATION;
} }
} }
mciDrv[wDevID].wType = dwDevTyp;
mciDrv[wDevID].wDeviceID = 1;
lpParms->wDeviceID = wDevID;
printf("MCI_OPEN // wDeviceID=%04X !\n", lpParms->wDeviceID);
switch(dwDevTyp) { switch(dwDevTyp) {
case MCI_DEVTYPE_CD_AUDIO: case MCI_DEVTYPE_CD_AUDIO:
printf("MCI_OPEN // No SEQUENCER yet !\n"); return CDAUDIO_DriverProc(0, 0, MCI_OPEN_DRIVER,
return MCIERR_DEVICE_NOT_INSTALLED; dwParam, (DWORD)lpParms);
case MCI_DEVTYPE_WAVEFORM_AUDIO: case MCI_DEVTYPE_WAVEFORM_AUDIO:
printf("MCI_OPEN // No WAVEAUDIO yet !\n"); return WAVE_DriverProc(0, 0, MCI_OPEN_DRIVER,
return MCIERR_DEVICE_NOT_INSTALLED; dwParam, (DWORD)lpParms);
case MCI_DEVTYPE_SEQUENCER: case MCI_DEVTYPE_SEQUENCER:
printf("MCI_OPEN // No SEQUENCER yet !\n"); printf("MCI_OPEN // No SEQUENCER yet !\n");
return MCIERR_DEVICE_NOT_INSTALLED; return MCIERR_DEVICE_NOT_INSTALLED;
@ -539,18 +632,35 @@ DWORD mciOpen(UINT wDevID, DWORD dwParam, LPMCI_OPEN_PARMS lpParms)
printf("MCI_OPEN // Invalid Device Name '%08X' !\n", lpParms->lpstrDeviceType); printf("MCI_OPEN // Invalid Device Name '%08X' !\n", lpParms->lpstrDeviceType);
return MCIERR_INVALID_DEVICE_NAME; return MCIERR_INVALID_DEVICE_NAME;
} }
lpParms->wDeviceID = ++mciActiveDev;
printf("MCI_OPEN // wDeviceID=%04X !\n", lpParms->wDeviceID);
return 0;
}
if (dwParam & MCI_OPEN_ELEMENT) {
printf("MCI_OPEN // Element !\n");
printf("MCI_OPEN // Elem=%s' !\n", lpParms->lpstrElementName);
} }
return MCIERR_INTERNAL; return MCIERR_INTERNAL;
} }
/**************************************************************************
* mciClose [internal]
*/
DWORD mciClose(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms)
{
DWORD dwRet = MCIERR_INTERNAL;
printf("mciClose(%u, %08X, %08X)\n", wDevID, dwParam, lpParms);
switch(mciDrv[wDevID].wType) {
case MCI_DEVTYPE_CD_AUDIO:
dwRet = CDAUDIO_DriverProc(mciDrv[wDevID].wDeviceID, 0,
MCI_CLOSE, dwParam, (DWORD)lpParms);
break;
case MCI_DEVTYPE_WAVEFORM_AUDIO:
dwRet = WAVE_DriverProc(mciDrv[wDevID].wDeviceID, 0,
MCI_CLOSE, dwParam, (DWORD)lpParms);
break;
default:
printf("mciClose() // unknown type=%04X !\n", mciDrv[wDevID].wType);
}
mciDrv[wDevID].wType = 0;
return dwRet;
}
/************************************************************************** /**************************************************************************
* mciSound [internal] * mciSound [internal]
*/ */
@ -563,106 +673,36 @@ DWORD mciSound(UINT wDevID, DWORD dwParam, LPMCI_SOUND_PARMS lpParms)
} }
/**************************************************************************
* mciGetDevCaps [internal]
*/
DWORD mciGetDevCaps(UINT wDevID, DWORD dwParam, LPMCI_GETDEVCAPS_PARMS lpParms)
{
if (lpParms == NULL) return MCIERR_INTERNAL;
lpParms->dwReturn = 0;
return 0;
}
/**************************************************************************
* mciInfo [internal]
*/
DWORD mciInfo(UINT wDevID, DWORD dwParam, LPMCI_INFO_PARMS lpParms)
{
if (lpParms == NULL) return MCIERR_INTERNAL;
lpParms->lpstrReturn = NULL;
lpParms->dwRetSize = 0;
return 0;
}
/**************************************************************************
* mciStatus [internal]
*/
DWORD mciStatus(UINT wDevID, DWORD dwParam, LPMCI_STATUS_PARMS lpParms)
{
if (lpParms == NULL) return MCIERR_INTERNAL;
return 0;
}
/**************************************************************************
* mciPlay [internal]
*/
DWORD mciPlay(UINT wDevID, DWORD dwParam, LPMCI_PLAY_PARMS lpParms)
{
if (lpParms == NULL) return MCIERR_INTERNAL;
return 0;
}
/**************************************************************************
* mciRecord [internal]
*/
DWORD mciRecord(UINT wDevID, DWORD dwParam, LPMCI_RECORD_PARMS lpParms)
{
if (lpParms == NULL) return MCIERR_INTERNAL;
return 0;
}
/**************************************************************************
* mciClose [internal]
*/
DWORD mciClose(UINT wDevID)
{
return 0;
}
/************************************************************************** /**************************************************************************
* mciSendCommand [MMSYSTEM.701] * mciSendCommand [MMSYSTEM.701]
*/ */
DWORD mciSendCommand(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2) DWORD mciSendCommand(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2)
{ {
HDRVR hDrv = 0;
#ifdef DEBUG_MCI
printf("mciSendCommand(%04X, %04X, %08X, %08X)\n", printf("mciSendCommand(%04X, %04X, %08X, %08X)\n",
wDevID, wMsg, dwParam1, dwParam2); wDevID, wMsg, dwParam1, dwParam2);
#endif
switch(wMsg) { switch(wMsg) {
case MCI_OPEN: case MCI_OPEN:
printf("mciSendCommand // MCI_OPEN !\n"); return mciOpen(dwParam1, (LPMCI_OPEN_PARMS)dwParam2);
if (dwParam1 & MCI_WAVE_OPEN_BUFFER)
return mciWaveOpen(wDevID, dwParam1,
(LPMCI_WAVE_OPEN_PARMS)dwParam2);
else
return mciOpen(wDevID, dwParam1, (LPMCI_OPEN_PARMS)dwParam2);
case MCI_PLAY:
printf("mciSendCommand // MCI_PLAY !\n");
return mciPlay(wDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2);
case MCI_RECORD:
printf("mciSendCommand // MCI_RECORD !\n");
return mciRecord(wDevID, dwParam1, (LPMCI_RECORD_PARMS)dwParam2);
case MCI_CLOSE: case MCI_CLOSE:
printf("mciSendCommand // MCI_CLOSE !\n"); return mciClose(wDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
return mciClose(wDevID); default:
case MCI_SOUND: switch(mciDrv[wDevID].wType) {
printf("mciSendCommand // MCI_SOUND !\n"); case MCI_DEVTYPE_CD_AUDIO:
return mciSound(wDevID, dwParam1, (LPMCI_SOUND_PARMS)dwParam2); return CDAUDIO_DriverProc(mciDrv[wDevID].wDeviceID, hDrv,
case MCI_STATUS: wMsg, dwParam1, dwParam2);
printf("mciSendCommand // MCI_STATUS !\n"); case MCI_DEVTYPE_WAVEFORM_AUDIO:
return mciStatus(wDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2); return WAVE_DriverProc(mciDrv[wDevID].wDeviceID, hDrv,
case MCI_INFO: wMsg, dwParam1, dwParam2);
printf("mciSendCommand // MCI_INFO !\n"); default:
return mciInfo(wDevID, dwParam1, (LPMCI_INFO_PARMS)dwParam2); printf("mciSendCommand() // unknown type=%04X !\n",
case MCI_GETDEVCAPS: mciDrv[wDevID].wType);
printf("mciSendCommand // MCI_GETDEVCAPS !\n"); }
return mciGetDevCaps(wDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
} }
return MCIERR_DEVICE_NOT_INSTALLED; return MMSYSERR_INVALPARAM;
} }
/************************************************************************** /**************************************************************************
@ -670,7 +710,13 @@ DWORD mciSendCommand(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2)
*/ */
UINT mciGetDeviceID (LPCSTR lpstrName) UINT mciGetDeviceID (LPCSTR lpstrName)
{ {
char str[128];
printf("mciGetDeviceID(%s)\n", lpstrName); printf("mciGetDeviceID(%s)\n", lpstrName);
if (lpstrName != NULL) {
strcpy(str, lpstrName);
AnsiUpper(str);
if (strcmp(str, "ALL") == 0) return MCI_ALL_DEVICE_ID;
}
return 0; return 0;
} }
@ -1046,8 +1092,11 @@ DWORD WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage,
*/ */
UINT WINAPI waveOutGetNumDevs() UINT WINAPI waveOutGetNumDevs()
{ {
UINT count = 0;
printf("waveOutGetNumDevs\n"); printf("waveOutGetNumDevs\n");
return 1; count += wodMessage(0, WODM_GETNUMDEVS, 0L, 0L, 0L);
printf("waveOutGetNumDevs return %u \n", count);
return count;
} }
/************************************************************************** /**************************************************************************
@ -1056,7 +1105,7 @@ UINT WINAPI waveOutGetNumDevs()
UINT WINAPI waveOutGetDevCaps(UINT uDeviceID, WAVEOUTCAPS FAR* lpCaps, UINT uSize) UINT WINAPI waveOutGetDevCaps(UINT uDeviceID, WAVEOUTCAPS FAR* lpCaps, UINT uSize)
{ {
printf("waveOutGetDevCaps\n"); printf("waveOutGetDevCaps\n");
return MMSYSERR_INVALHANDLE; return wodMessage(uDeviceID, WODM_GETDEVCAPS, 0L, (DWORD)lpCaps, uSize);
} }
/************************************************************************** /**************************************************************************
@ -1144,20 +1193,42 @@ UINT WINAPI waveGetErrorText(UINT uError, LPSTR lpText, UINT uSize)
UINT WINAPI waveOutOpen(HWAVEOUT FAR* lphWaveOut, UINT uDeviceID, UINT WINAPI waveOutOpen(HWAVEOUT FAR* lphWaveOut, UINT uDeviceID,
const LPWAVEFORMAT lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags) const LPWAVEFORMAT lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
{ {
HWAVE hWaveOut;
LPWAVEOPENDESC lpDesc;
DWORD dwRet;
BOOL bMapperFlg = FALSE;
printf("waveOutOpen(%08X, %d, %08X, %08X, %08X, %08X);\n", printf("waveOutOpen(%08X, %d, %08X, %08X, %08X, %08X);\n",
lphWaveOut, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); lphWaveOut, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags);
if (dwFlags & WAVE_FORMAT_QUERY) { if (dwFlags & WAVE_FORMAT_QUERY) {
printf("waveOutOpen // WAVE_FORMAT_QUERY !\n"); printf("waveOutOpen // WAVE_FORMAT_QUERY requested !\n");
if (uDeviceID == (UINT)WAVE_MAPPER) { }
printf("waveOutOpen // No WAVE_MAPPER supported yet !\n"); if (uDeviceID == (UINT)WAVE_MAPPER) {
return MMSYSERR_BADDEVICEID; printf("waveOutOpen // WAVE_MAPPER mode requested !\n");
} bMapperFlg = TRUE;
uDeviceID = 0;
} }
if (lpFormat == NULL) return WAVERR_BADFORMAT; if (lpFormat == NULL) return WAVERR_BADFORMAT;
if (lphWaveOut != NULL) *lphWaveOut = 0; hWaveOut = GlobalAlloc(GMEM_MOVEABLE, sizeof(WAVEOPENDESC));
if (lphWaveOut != NULL) *lphWaveOut = ++mciActiveDev; if (lphWaveOut != NULL) *lphWaveOut = hWaveOut;
return 0; lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveOut);
/* return MMSYSERR_BADDEVICEID;*/ if (lpDesc == NULL) return MMSYSERR_NOMEM;
lpDesc->hWave = hWaveOut;
lpDesc->lpFormat = lpFormat;
lpDesc->dwCallBack = dwCallback;
lpDesc->dwInstance = dwInstance;
while(uDeviceID < MAXWAVEDRIVERS) {
dwRet = wodMessage(uDeviceID, WODM_OPEN,
lpDesc->dwInstance, (DWORD)lpDesc, 0L);
if (dwRet == MMSYSERR_NOERROR) break;
if (!bMapperFlg) break;
uDeviceID++;
printf("waveOutOpen // WAVE_MAPPER mode ! try next driver...\n");
}
if (dwFlags & WAVE_FORMAT_QUERY) {
printf("waveOutOpen // End of WAVE_FORMAT_QUERY !\n");
waveOutClose(hWaveOut);
}
return dwRet;
} }
/************************************************************************** /**************************************************************************
@ -1165,8 +1236,11 @@ UINT WINAPI waveOutOpen(HWAVEOUT FAR* lphWaveOut, UINT uDeviceID,
*/ */
UINT WINAPI waveOutClose(HWAVEOUT hWaveOut) UINT WINAPI waveOutClose(HWAVEOUT hWaveOut)
{ {
printf("waveOutClose\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveOutClose(%04X)\n", hWaveOut);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveOut);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return wodMessage(0, WODM_CLOSE, lpDesc->dwInstance, 0L, 0L);
} }
/************************************************************************** /**************************************************************************
@ -1175,8 +1249,13 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut)
UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut, UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut,
WAVEHDR FAR* lpWaveOutHdr, UINT uSize) WAVEHDR FAR* lpWaveOutHdr, UINT uSize)
{ {
printf("waveOutPrepareHeader\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveOutPrepareHeader(%04X, %08X, %u);\n",
hWaveOut, lpWaveOutHdr, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveOut);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return wodMessage(0, WODM_PREPARE, lpDesc->dwInstance,
(DWORD)lpWaveOutHdr, uSize);
} }
/************************************************************************** /**************************************************************************
@ -1185,8 +1264,13 @@ UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut,
UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut, UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut,
WAVEHDR FAR* lpWaveOutHdr, UINT uSize) WAVEHDR FAR* lpWaveOutHdr, UINT uSize)
{ {
printf("waveOutUnprepareHeader\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveOutUnprepareHeader(%04X, %08X, %u);\n",
hWaveOut, lpWaveOutHdr, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveOut);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return wodMessage(0, WODM_PREPARE, lpDesc->dwInstance,
(DWORD)lpWaveOutHdr, uSize);
} }
/************************************************************************** /**************************************************************************
@ -1194,8 +1278,12 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut,
*/ */
UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR FAR* lpWaveOutHdr, UINT uSize) UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR FAR* lpWaveOutHdr, UINT uSize)
{ {
printf("waveOutWrite\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveOutWrite(%04X, %08X, %u);\n", hWaveOut, lpWaveOutHdr, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveOut);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return wodMessage(0, WODM_WRITE, lpDesc->dwInstance,
(DWORD)lpWaveOutHdr, uSize);
} }
/************************************************************************** /**************************************************************************
@ -1203,7 +1291,7 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR FAR* lpWaveOutHdr, UINT uSi
*/ */
UINT WINAPI waveOutPause(HWAVEOUT hWaveOut) UINT WINAPI waveOutPause(HWAVEOUT hWaveOut)
{ {
printf("waveOutPause\n"); printf("waveOutPause(%04X)\n", hWaveOut);
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
} }
@ -1212,7 +1300,7 @@ UINT WINAPI waveOutPause(HWAVEOUT hWaveOut)
*/ */
UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut)
{ {
printf("waveOutRestart\n"); printf("waveOutRestart(%04X)\n", hWaveOut);
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
} }
@ -1221,17 +1309,21 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut)
*/ */
UINT WINAPI waveOutReset(HWAVEOUT hWaveOut) UINT WINAPI waveOutReset(HWAVEOUT hWaveOut)
{ {
printf("waveOutReset\n"); printf("waveOutReset(%04X)\n", hWaveOut);
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
} }
/************************************************************************** /**************************************************************************
* waveOutGetPosition [MMSYSTEM.412] * waveOutGetPosition [MMSYSTEM.412]
*/ */
UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, MMTIME FAR* lpInfo, UINT uSize) UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, MMTIME FAR* lpTime, UINT uSize)
{ {
printf("waveOutGetPosition\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveOutGetPosition(%04X, %08X, %u);\n", hWaveOut, lpTime, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveOut);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return wodMessage(0, WODM_GETPOS, lpDesc->dwInstance,
(DWORD)lpTime, (DWORD)uSize);
} }
/************************************************************************** /**************************************************************************
@ -1293,7 +1385,7 @@ UINT WINAPI waveOutSetPlaybackRate(HWAVEOUT hWaveOut, DWORD dwRate)
*/ */
UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut) UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut)
{ {
printf("waveOutBreakLoop\n"); printf("waveOutBreakLoop(%04X)\n", hWaveOut);
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
} }
@ -1319,8 +1411,11 @@ DWORD WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage,
*/ */
UINT WINAPI waveInGetNumDevs() UINT WINAPI waveInGetNumDevs()
{ {
UINT count = 0;
printf("waveInGetNumDevs\n"); printf("waveInGetNumDevs\n");
return 0; count += widMessage(0, WIDM_GETNUMDEVS, 0L, 0L, 0L);
printf("waveInGetNumDevs return %u \n", count);
return count;
} }
@ -1330,7 +1425,7 @@ UINT WINAPI waveInGetNumDevs()
UINT WINAPI waveInGetDevCaps(UINT uDeviceID, WAVEINCAPS FAR* lpCaps, UINT uSize) UINT WINAPI waveInGetDevCaps(UINT uDeviceID, WAVEINCAPS FAR* lpCaps, UINT uSize)
{ {
printf("waveInGetDevCaps\n"); printf("waveInGetDevCaps\n");
return MMSYSERR_INVALHANDLE; return widMessage(uDeviceID, WIDM_GETDEVCAPS, 0L, (DWORD)lpCaps, uSize);
} }
@ -1350,18 +1445,42 @@ UINT WINAPI waveInGetErrorText(UINT uError, LPSTR lpText, UINT uSize)
UINT WINAPI waveInOpen(HWAVEIN FAR* lphWaveIn, UINT uDeviceID, UINT WINAPI waveInOpen(HWAVEIN FAR* lphWaveIn, UINT uDeviceID,
const LPWAVEFORMAT lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags) const LPWAVEFORMAT lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
{ {
HWAVE hWaveIn;
LPWAVEOPENDESC lpDesc;
DWORD dwRet;
BOOL bMapperFlg = FALSE;
printf("waveInOpen(%08X, %d, %08X, %08X, %08X, %08X);\n", printf("waveInOpen(%08X, %d, %08X, %08X, %08X, %08X);\n",
lphWaveIn, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); lphWaveIn, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags);
if (dwFlags & WAVE_FORMAT_QUERY) { if (dwFlags & WAVE_FORMAT_QUERY) {
printf("waveInOpen // WAVE_FORMAT_QUERY !\n"); printf("waveInOpen // WAVE_FORMAT_QUERY requested !\n");
if (uDeviceID == (UINT)WAVE_MAPPER) { }
printf("waveInOpen // No WAVE_MAPPER supported yet !\n"); if (uDeviceID == (UINT)WAVE_MAPPER) {
return MMSYSERR_BADDEVICEID; printf("waveInOpen // WAVE_MAPPER mode requested !\n");
} bMapperFlg = TRUE;
uDeviceID = 0;
} }
if (lphWaveIn != NULL) *lphWaveIn = 0;
if (lpFormat == NULL) return WAVERR_BADFORMAT; if (lpFormat == NULL) return WAVERR_BADFORMAT;
return MMSYSERR_BADDEVICEID; hWaveIn = GlobalAlloc(GMEM_MOVEABLE, sizeof(WAVEOPENDESC));
if (lphWaveIn != NULL) *lphWaveIn = hWaveIn;
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_NOMEM;
lpDesc->hWave = hWaveIn;
lpDesc->lpFormat = lpFormat;
lpDesc->dwCallBack = dwCallback;
lpDesc->dwInstance = dwInstance;
while(uDeviceID < MAXWAVEDRIVERS) {
dwRet = widMessage(uDeviceID, WIDM_OPEN,
lpDesc->dwInstance, (DWORD)lpDesc, 0L);
if (dwRet == MMSYSERR_NOERROR) break;
if (!bMapperFlg) break;
uDeviceID++;
printf("waveInOpen // WAVE_MAPPER mode ! try next driver...\n");
}
if (dwFlags & WAVE_FORMAT_QUERY) {
printf("waveInOpen // End of WAVE_FORMAT_QUERY !\n");
waveInClose(hWaveIn);
}
return dwRet;
} }
@ -1370,8 +1489,11 @@ UINT WINAPI waveInOpen(HWAVEIN FAR* lphWaveIn, UINT uDeviceID,
*/ */
UINT WINAPI waveInClose(HWAVEIN hWaveIn) UINT WINAPI waveInClose(HWAVEIN hWaveIn)
{ {
printf("waveInClose\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveInClose(%04X)\n", hWaveIn);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return widMessage(0, WIDM_CLOSE, lpDesc->dwInstance, 0L, 0L);
} }
@ -1381,8 +1503,18 @@ UINT WINAPI waveInClose(HWAVEIN hWaveIn)
UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn, UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn,
WAVEHDR FAR* lpWaveInHdr, UINT uSize) WAVEHDR FAR* lpWaveInHdr, UINT uSize)
{ {
printf("waveInPrepareHeader\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveInPrepareHeader(%04X, %08X, %u);\n",
hWaveIn, lpWaveInHdr, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
if (lpWaveInHdr == NULL) return MMSYSERR_INVALHANDLE;
lpWaveInHdr->lpNext = NULL;
lpWaveInHdr->dwBytesRecorded = 0;
printf("waveInPrepareHeader // lpData=%08X size=%u \n",
lpWaveInHdr->lpData, lpWaveInHdr->dwBufferLength);
return widMessage(0, WIDM_PREPARE, lpDesc->dwInstance,
(DWORD)lpWaveInHdr, uSize);
} }
@ -1392,20 +1524,36 @@ UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn,
UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn, UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn,
WAVEHDR FAR* lpWaveInHdr, UINT uSize) WAVEHDR FAR* lpWaveInHdr, UINT uSize)
{ {
printf("waveInUnprepareHeader\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveInUnprepareHeader(%04X, %08X, %u);\n",
hWaveIn, lpWaveInHdr, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
USER_HEAP_FREE(HIWORD((DWORD)lpWaveInHdr->lpData));
lpWaveInHdr->lpData = NULL;
lpWaveInHdr->lpNext = NULL;
return widMessage(0, WIDM_PREPARE, lpDesc->dwInstance,
(DWORD)lpWaveInHdr, uSize);
} }
/************************************************************************** /**************************************************************************
* waveInAddBuffer [MMSYSTEM.508] * waveInAddBuffer [MMSYSTEM.508]
*/ */
UINT WINAPI waveInAddBuffer(HWAVEIN hWaveIn, UINT WINAPI waveInAddBuffer(HWAVEIN hWaveIn,
WAVEHDR FAR* lpWaveInHdr, UINT uSize) WAVEHDR FAR* lpWaveInHdr, UINT uSize)
{ {
printf("waveInAddBuffer\n"); LPWAVEOPENDESC lpDesc;
return 0; printf("waveInAddBuffer(%04X, %08X, %u);\n", hWaveIn, lpWaveInHdr, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
if (lpWaveInHdr == NULL) return MMSYSERR_INVALHANDLE;
lpWaveInHdr->lpNext = NULL;
lpWaveInHdr->dwBytesRecorded = 0;
printf("waveInAddBuffer // lpData=%08X size=%u \n",
lpWaveInHdr->lpData, lpWaveInHdr->dwBufferLength);
return widMessage(0, WIDM_ADDBUFFER, lpDesc->dwInstance,
(DWORD)lpWaveInHdr, uSize);
} }
@ -1414,8 +1562,11 @@ UINT WINAPI waveInAddBuffer(HWAVEIN hWaveIn,
*/ */
UINT WINAPI waveInStart(HWAVEIN hWaveIn) UINT WINAPI waveInStart(HWAVEIN hWaveIn)
{ {
printf("waveInStart\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveInStart(%04X)\n", hWaveIn);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return widMessage(0, WIDM_START, lpDesc->dwInstance, 0L, 0L);
} }
@ -1424,8 +1575,11 @@ UINT WINAPI waveInStart(HWAVEIN hWaveIn)
*/ */
UINT WINAPI waveInStop(HWAVEIN hWaveIn) UINT WINAPI waveInStop(HWAVEIN hWaveIn)
{ {
printf("waveInStop\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveInStop(%04X)\n", hWaveIn);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return widMessage(0, WIDM_STOP, lpDesc->dwInstance, 0L, 0L);
} }
@ -1434,18 +1588,25 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn)
*/ */
UINT WINAPI waveInReset(HWAVEIN hWaveIn) UINT WINAPI waveInReset(HWAVEIN hWaveIn)
{ {
printf("waveInReset\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveInReset(%04X)\n", hWaveIn);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return widMessage(0, WIDM_RESET, lpDesc->dwInstance, 0L, 0L);
} }
/************************************************************************** /**************************************************************************
* waveInGetPosition [MMSYSTEM.512] * waveInGetPosition [MMSYSTEM.512]
*/ */
UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, MMTIME FAR* lpInfo, UINT uSize) UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, MMTIME FAR* lpTime, UINT uSize)
{ {
printf("waveInGetPosition\n"); LPWAVEOPENDESC lpDesc;
return MMSYSERR_INVALHANDLE; printf("waveInGetPosition(%04X, %08X, %u);\n", hWaveIn, lpTime, uSize);
lpDesc = (LPWAVEOPENDESC) GlobalLock(hWaveIn);
if (lpDesc == NULL) return MMSYSERR_INVALHANDLE;
return widMessage(0, WIDM_GETPOS, lpDesc->dwInstance,
(DWORD)lpTime, (DWORD)uSize);
} }
@ -1455,6 +1616,7 @@ UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, MMTIME FAR* lpInfo, UINT uSize)
UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT FAR* lpuDeviceID) UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT FAR* lpuDeviceID)
{ {
printf("waveInGetID\n"); printf("waveInGetID\n");
if (lpuDeviceID == NULL) return MMSYSERR_INVALPARAM;
return 0; return 0;
} }
@ -1540,7 +1702,7 @@ WORD timeSetEvent(WORD wDelay, WORD wResol,
printf("timeSetEvent(%u, %u, %08X, %08X, %04X);\n", printf("timeSetEvent(%u, %u, %08X, %08X, %04X);\n",
wDelay, wResol, lpFunc, dwUser, wFlags); wDelay, wResol, lpFunc, dwUser, wFlags);
if (!mmTimeStarted) StartMMTime(); if (!mmTimeStarted) StartMMTime();
lpNewTimer = malloc(sizeof(TIMERENTRY)); lpNewTimer = (LPTIMERENTRY) malloc(sizeof(TIMERENTRY));
if (lpNewTimer == NULL) return 0; if (lpNewTimer == NULL) return 0;
while (lpTimer != NULL) { while (lpTimer != NULL) {
wNewID = max(wNewID, lpTimer->wTimerID); wNewID = max(wNewID, lpTimer->wTimerID);
@ -1628,8 +1790,10 @@ DWORD timeGetTime()
*/ */
HMMIO WINAPI mmioOpen(LPSTR szFileName, MMIOINFO FAR* lpmmioinfo, DWORD dwOpenFlags) HMMIO WINAPI mmioOpen(LPSTR szFileName, MMIOINFO FAR* lpmmioinfo, DWORD dwOpenFlags)
{ {
int hFile;
printf("mmioOpen('%s', %08X, %08X);\n", szFileName, lpmmioinfo, dwOpenFlags); printf("mmioOpen('%s', %08X, %08X);\n", szFileName, lpmmioinfo, dwOpenFlags);
return 0; hFile = _lopen(szFileName, dwOpenFlags);
return (HMMIO)hFile;
} }
@ -1640,6 +1804,7 @@ HMMIO WINAPI mmioOpen(LPSTR szFileName, MMIOINFO FAR* lpmmioinfo, DWORD dwOpenFl
UINT WINAPI mmioClose(HMMIO hmmio, UINT uFlags) UINT WINAPI mmioClose(HMMIO hmmio, UINT uFlags)
{ {
printf("mmioClose(%04X, %04X);\n", hmmio, uFlags); printf("mmioClose(%04X, %04X);\n", hmmio, uFlags);
_lclose(hmmio);
return 0; return 0;
} }
@ -1651,6 +1816,7 @@ UINT WINAPI mmioClose(HMMIO hmmio, UINT uFlags)
LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch)
{ {
printf("mmioRead\n"); printf("mmioRead\n");
_lread(hmmio, pch, cch);
return 0; return 0;
} }
@ -1815,8 +1981,10 @@ LRESULT DrvClose(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2)
*/ */
LRESULT WINAPI DrvSendMessage(HDRVR hDriver, WORD msg, LPARAM lParam1, LPARAM lParam2) LRESULT WINAPI DrvSendMessage(HDRVR hDriver, WORD msg, LPARAM lParam1, LPARAM lParam2)
{ {
DWORD dwDevID = 0;
printf("DrvSendMessage(%04X, %04X, %08X, %08X);\n", printf("DrvSendMessage(%04X, %04X, %08X, %08X);\n",
hDriver, msg, lParam1, lParam2); hDriver, msg, lParam1, lParam2);
return CDAUDIO_DriverProc(dwDevID, hDriver, msg, lParam1, lParam2);
} }
/************************************************************************** /**************************************************************************

43
miscemu/int2f.c
View File

@ -3,6 +3,9 @@
#include "msdos.h" #include "msdos.h"
#include "wine.h" #include "wine.h"
int do_int2f_16(struct sigcontext_struct *context);
int do_int2f(struct sigcontext_struct *context) int do_int2f(struct sigcontext_struct *context)
{ {
switch((context->sc_eax >> 8) & 0xff) switch((context->sc_eax >> 8) & 0xff)
@ -12,17 +15,41 @@ int do_int2f(struct sigcontext_struct *context)
return 1; return 1;
case 0x16: case 0x16:
switch(context->sc_eax & 0xff) return do_int2f_16(context);
{
case 0x00: /* windows enhanced mode install check */
/* don't return anything as we're running in standard mode */
return 1;
default:
}
default: default:
IntBarf(0x2f, context); IntBarf(0x2f, context);
}; };
return 1; return 1;
} }
int do_int2f_16(struct sigcontext_struct *context)
{
switch(context->sc_eax & 0xff) {
case 0x00:
/* return 'major/minor' for MSWin 3.1 */
printf("do_int2f_16 // return 'major/minor' for MSWin 3.1 !\n");
context->sc_eax = 0x0310;
return 1;
case 0x86:
/* operating in protected mode under DPMI */
printf("do_int2f_16 // operating in protected mode under DPMI !\n");
context->sc_eax = 0x0000;
return 1;
case 0x87:
printf("do_int2f_16 // return DPMI flags !\n");
context->sc_eax = 0x0000; /* DPMI Installed */
context->sc_ebx = 0x0001; /* 32bits available */
context->sc_ecx = 0x04; /* processor 486 */
context->sc_edx = 0x0100; /* DPMI major/minor */
context->sc_esi = 0; /* # of para. of DOS */
/* extended private data */
return 1;
default:
IntBarf(0x2f, context);
}
return 1;
}

23
windows/class.c
View File

@ -91,7 +91,8 @@ ATOM RegisterClass( LPWNDCLASS class )
{ {
CLASS * newClass, * prevClassPtr; CLASS * newClass, * prevClassPtr;
HCLASS handle, prevClass; HCLASS handle, prevClass;
int classExtra;
#ifdef DEBUG_CLASS #ifdef DEBUG_CLASS
printf( "RegisterClass: wndproc=%08x hinst=%d name='%s' background %x\n", printf( "RegisterClass: wndproc=%08x hinst=%d name='%s' background %x\n",
class->lpfnWndProc, class->hInstance, class->lpszClassName, class->lpfnWndProc, class->hInstance, class->lpszClassName,
@ -110,20 +111,18 @@ ATOM RegisterClass( LPWNDCLASS class )
if (!(prevClassPtr->wc.style & CS_GLOBALCLASS)) return 0; if (!(prevClassPtr->wc.style & CS_GLOBALCLASS)) return 0;
} }
/* bug for bug compatible */
if (class->cbClsExtra < 0) class->cbClsExtra = 0;
if (class->cbWndExtra < 0) class->cbWndExtra = 0;
/* Create class */ /* Create class */
handle = USER_HEAP_ALLOC( GMEM_MOVEABLE, sizeof(CLASS)+class->cbClsExtra ); classExtra = (class->cbClsExtra < 0) ? 0 : class->cbClsExtra;
handle = USER_HEAP_ALLOC( GMEM_MOVEABLE, sizeof(CLASS) + classExtra );
if (!handle) return 0; if (!handle) return 0;
newClass = (CLASS *) USER_HEAP_ADDR( handle ); newClass = (CLASS *) USER_HEAP_ADDR( handle );
newClass->hNext = firstClass; newClass->hNext = firstClass;
newClass->wMagic = CLASS_MAGIC; newClass->wMagic = CLASS_MAGIC;
newClass->cWindows = 0; newClass->cWindows = 0;
newClass->wc = *class; newClass->wc = *class;
newClass->wc.cbWndExtra = (class->cbWndExtra < 0) ? 0 : class->cbWndExtra;
newClass->wc.cbClsExtra = classExtra;
if (newClass->wc.style & CS_GLOBALCLASS) if (newClass->wc.style & CS_GLOBALCLASS)
newClass->atomName = GlobalAddAtom( class->lpszClassName ); newClass->atomName = GlobalAddAtom( class->lpszClassName );
@ -147,7 +146,7 @@ ATOM RegisterClass( LPWNDCLASS class )
} }
} }
if (class->cbClsExtra) memset( newClass->wExtra, 0, class->cbClsExtra ); if (classExtra) memset( newClass->wExtra, 0, classExtra );
firstClass = handle; firstClass = handle;
return newClass->atomName; return newClass->atomName;
} }

4
windows/dc.c
View File

@ -105,7 +105,6 @@ static void DC_InitDC( HDC hdc )
SelectObject( hdc, dc->w.hFont ); SelectObject( hdc, dc->w.hFont );
XSetGraphicsExposures( XT_display, dc->u.x.gc, False ); XSetGraphicsExposures( XT_display, dc->u.x.gc, False );
CLIPPING_SetDeviceClipping( dc ); CLIPPING_SetDeviceClipping( dc );
FONT_SelectObject(dc, STOCK_SYSTEM_FIXED_FONT, NULL);
} }
@ -204,7 +203,7 @@ int DC_SetupGCForText( DC * dc )
if (!dc->u.x.font.fstruct) if (!dc->u.x.font.fstruct)
{ {
FONT_SelectObject(dc, STOCK_SYSTEM_FIXED_FONT, NULL); FONT_SelectObject(dc, STOCK_SYSTEM_FONT, NULL);
} }
val.function = DC_XROPfunction[dc->w.ROPmode-1]; val.function = DC_XROPfunction[dc->w.ROPmode-1];
val.foreground = dc->w.textPixel; val.foreground = dc->w.textPixel;
@ -235,6 +234,7 @@ HDC GetDCState( HDC hdc )
#endif #endif
memcpy( &newdc->w, &dc->w, sizeof(dc->w) ); memcpy( &newdc->w, &dc->w, sizeof(dc->w) );
memcpy( &newdc->u.x.pen, &dc->u.x.pen, sizeof(dc->u.x.pen) );
newdc->saveLevel = 0; newdc->saveLevel = 0;
newdc->w.flags |= DC_SAVED; newdc->w.flags |= DC_SAVED;

4
windows/dialog.c
View File

@ -595,13 +595,13 @@ WORD IsDlgButtonChecked( HWND hwnd, WORD id )
*/ */
void CheckRadioButton( HWND hwndDlg, WORD firstID, WORD lastID, WORD checkID ) void CheckRadioButton( HWND hwndDlg, WORD firstID, WORD lastID, WORD checkID )
{ {
HWND button = GetDlgItem( hwndDlg, firstID ); HWND button = GetDlgItem( hwndDlg, lastID );
while (button != 0) while (button != 0)
{ {
WND * wndPtr = WIN_FindWndPtr( button ); WND * wndPtr = WIN_FindWndPtr( button );
if (!wndPtr) break; if (!wndPtr) break;
SendMessage( button, BM_SETCHECK, (wndPtr->wIDmenu == checkID), 0 ); SendMessage( button, BM_SETCHECK, (wndPtr->wIDmenu == checkID), 0 );
if (wndPtr->wIDmenu == lastID) break; if (wndPtr->wIDmenu == firstID) break;
button = wndPtr->hwndNext; button = wndPtr->hwndNext;
} }
} }

2
windows/graphics.c
View File

@ -153,6 +153,8 @@ BOOL GRAPH_DrawArc( HDC hdc, int left, int top, int right, int bottom,
(double)(xend-xcenter)*(bottom-top) ); (double)(xend-xcenter)*(bottom-top) );
diff_angle = end_angle - start_angle; diff_angle = end_angle - start_angle;
if (diff_angle < 0.0) diff_angle += 2*PI; if (diff_angle < 0.0) diff_angle += 2*PI;
if (left > right) swap_int( &left, &right );
if (top > bottom) swap_int( &top, &bottom );
XDrawArc( display, dc->u.x.drawable, dc->u.x.gc, XDrawArc( display, dc->u.x.drawable, dc->u.x.gc,
dc->w.DCOrgX + left, dc->w.DCOrgY + top, dc->w.DCOrgX + left, dc->w.DCOrgY + top,

7
windows/painting.c
View File

@ -45,13 +45,6 @@ HDC BeginPaint( HWND hwnd, LPPAINTSTRUCT lps )
if (!(wndPtr->flags & WIN_ERASE_UPDATERGN)) lps->fErase = TRUE; if (!(wndPtr->flags & WIN_ERASE_UPDATERGN)) lps->fErase = TRUE;
else lps->fErase = !SendMessage( hwnd, WM_ERASEBKGND, lps->hdc, 0 ); else lps->fErase = !SendMessage( hwnd, WM_ERASEBKGND, lps->hdc, 0 );
/*
* a BeginPaint should return with these objects set by default
*/
SelectObject(lps->hdc, STOCK_BLACK_PEN);
SelectObject(lps->hdc, STOCK_WHITE_BRUSH);
SelectObject(lps->hdc, STOCK_SYSTEM_FONT);
return lps->hdc; return lps->hdc;
} }

18
windows/win.c
View File

@ -253,7 +253,10 @@ HWND CreateWindowEx( DWORD exStyle, LPSTR className, LPSTR windowName,
exStyle, className, windowName, style, x, y, width, height, exStyle, className, windowName, style, x, y, width, height,
parent, menu, instance, data); parent, menu, instance, data);
#endif #endif
/* 'soundrec.exe' has negative position !
Why ? For now, here a patch : */
if (x < 0) x = 0;
if (y < 0) y = 0;
if (x == CW_USEDEFAULT) x = y = 0; if (x == CW_USEDEFAULT) x = y = 0;
if (width == CW_USEDEFAULT) if (width == CW_USEDEFAULT)
{ {
@ -366,24 +369,15 @@ HWND CreateWindowEx( DWORD exStyle, LPSTR className, LPSTR windowName,
else else
win_attr.backing_store = Always; win_attr.backing_store = Always;
if (Options.nosaveunders) win_attr.save_under = ((classPtr->wc.style & CS_SAVEBITS) != 0);
win_attr.save_under = FALSE;
else
win_attr.save_under = TRUE;
/* set the background of all windows to be white, just like
* MS-Windows does (hopefully!)
*/
win_attr.background_pixel = WhitePixelOfScreen(screen);
wndPtr->window = XCreateWindow( display, parentPtr->window, wndPtr->window = XCreateWindow( display, parentPtr->window,
x + parentPtr->rectClient.left - parentPtr->rectWindow.left, x + parentPtr->rectClient.left - parentPtr->rectWindow.left,
y + parentPtr->rectClient.top - parentPtr->rectWindow.top, y + parentPtr->rectClient.top - parentPtr->rectWindow.top,
width, height, 0, width, height, 0,
CopyFromParent, InputOutput, CopyFromParent, CopyFromParent, InputOutput, CopyFromParent,
CWEventMask | CWOverrideRedirect | CWColormap | CWEventMask | CWOverrideRedirect | CWColormap |
CWSaveUnder | CWBackingStore | CWBackPixel, &win_attr ); CWSaveUnder | CWBackingStore, &win_attr );
XStoreName( display, wndPtr->window, windowName ); XStoreName( display, wndPtr->window, windowName );