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

Fixed return value for 'open' command. 

Changed way of allocation open mci drivers (array => list).
This commit is contained in:
Eric Pouech 1999-07-15 14:41:41 +00:00 committed by Alexandre Julliard
parent 3bfbf3cc39
commit 7d6ee3190e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
multimedia/mcistring.c
View File

@ -17,16 +17,11 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <assert.h>
#include "multimedia.h"
#include "digitalv.h"
#include "heap.h"
#include "ldt.h"
#include "user.h"
#include "driver.h"
#include "callback.h"
#include "winuser.h"
#include "debugtools.h"
#include "xmalloc.h"
@ -84,7 +79,7 @@ _MCISTR_printtf(char *buf, UINT16 uDevType, DWORD timef, DWORD val)
case MCI_FORMAT_SAMPLES:
case MCI_VD_FORMAT_TRACK:
/*case MCI_SEQ_FORMAT_SONGPTR: sameas MCI_VD_FORMAT_TRACK */
sprintf(buf, "%ld",val);
sprintf(buf, "%ld", val);
break;
case MCI_FORMAT_HMS:
/* well, the macros have the same content*/
@ -434,6 +429,10 @@ MCISTR_Open(_MCISTR_PROTO_)
res = mciSendCommandA(0, MCI_OPEN, dwFlags, (DWORD)pU);
if (res == 0) {
snprintf(lpstrReturnString, uReturnLength, "%d", pU->openParams.wDeviceID);
}
free(pU->openParams.lpstrElementName);
free(pU->openParams.lpstrDeviceType);
free(pU->openParams.lpstrAlias);
@ -2624,7 +2623,7 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
res = MCIERR_INVALID_DEVICE_NAME;
goto the_end;
}
uDevTyp = MCI_GetDrv(wDevID)->modp.wType;
uDevTyp = MCI_GetDriver(wDevID)->wType;
}
if (lpstrReturnString && uReturnLength > 0)
@ -2644,6 +2643,7 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
res = MCIERR_MISSING_COMMAND_STRING;
}
the_end:
TRACE("=> %d [%s]\n", res, lpstrReturnString);
free(keywords); free(cmd);
return res;
}