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

No longer checking for correct iData in code.

This commit is contained in:
Eric Pouech 1999-09-22 16:47:47 +00:00 committed by Alexandre Julliard
parent 526b3c920d
commit dc8d856c7a
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
multimedia/time.c
View File

@ -124,7 +124,7 @@ static LPWINE_MM_IDATA MULTIMEDIA_MMTimeStart(void)
{ {
LPWINE_MM_IDATA iData = MULTIMEDIA_GetIData(); LPWINE_MM_IDATA iData = MULTIMEDIA_GetIData();
if (!iData || IsBadWritePtr(iData, sizeof(WINE_MM_IDATA))) { if (IsBadWritePtr(iData, sizeof(WINE_MM_IDATA))) {
ERR("iData is not correctly set, please report. Expect failure.\n"); ERR("iData is not correctly set, please report. Expect failure.\n");
return 0; return 0;
} }
@ -149,18 +149,13 @@ static LPWINE_MM_IDATA MULTIMEDIA_MMTimeStart(void)
*/ */
MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize) MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize)
{ {
LPWINE_MM_IDATA iData;
TRACE("(%p, %u);\n", lpTime, wSize); TRACE("(%p, %u);\n", lpTime, wSize);
if (wSize >= sizeof(*lpTime)) { if (wSize >= sizeof(*lpTime)) {
iData = MULTIMEDIA_MMTimeStart();
if (!iData)
return MMSYSERR_NOMEM;
lpTime->wType = TIME_MS; lpTime->wType = TIME_MS;
lpTime->u.ms = iData->mmSysTimeMS; lpTime->u.ms = MULTIMEDIA_MMTimeStart()->mmSysTimeMS;
TRACE("=> %lu\n", iData->mmSysTimeMS); TRACE("=> %lu\n", lpTime->u.ms);
} }
return 0; return 0;
@ -171,18 +166,13 @@ MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize)
*/ */
MMRESULT16 WINAPI timeGetSystemTime16(LPMMTIME16 lpTime, UINT16 wSize) MMRESULT16 WINAPI timeGetSystemTime16(LPMMTIME16 lpTime, UINT16 wSize)
{ {
LPWINE_MM_IDATA iData;
TRACE("(%p, %u);\n", lpTime, wSize); TRACE("(%p, %u);\n", lpTime, wSize);
if (wSize >= sizeof(*lpTime)) { if (wSize >= sizeof(*lpTime)) {
iData = MULTIMEDIA_MMTimeStart();
if (!iData)
return MMSYSERR_NOMEM;
lpTime->wType = TIME_MS; lpTime->wType = TIME_MS;
lpTime->u.ms = iData->mmSysTimeMS; lpTime->u.ms = MULTIMEDIA_MMTimeStart()->mmSysTimeMS;
TRACE("=> %lu\n", iData->mmSysTimeMS); TRACE("=> %lu\n", lpTime->u.ms);
} }
return 0; return 0;
@ -210,9 +200,6 @@ static WORD timeSetEventInternal(UINT wDelay, UINT wResol,
iData = MULTIMEDIA_MMTimeStart(); iData = MULTIMEDIA_MMTimeStart();
if (!iData)
return 0;
lpNewTimer->uCurTime = wDelay; lpNewTimer->uCurTime = wDelay;
lpNewTimer->wDelay = wDelay; lpNewTimer->wDelay = wDelay;
lpNewTimer->wResol = wResol; lpNewTimer->wResol = wResol;
@ -381,5 +368,13 @@ MMRESULT16 WINAPI timeEndPeriod16(UINT16 wPeriod)
*/ */
DWORD WINAPI timeGetTime(void) DWORD WINAPI timeGetTime(void)
{ {
/* FIXME: releasing the win16 lock here is a temporary hack (I hope)
* that lets mciavi.drv run correctly
*/
if ( _ConfirmWin16Lock() ) {
SYSLEVEL_ReleaseWin16Lock();
SYSLEVEL_RestoreWin16Lock();
}
return MULTIMEDIA_MMTimeStart()->mmSysTimeMS; return MULTIMEDIA_MMTimeStart()->mmSysTimeMS;
} }