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

The adwInfo[0] field was no longer used on mmioOpen (may contain file 

handle).
This commit is contained in:
Eric Pouech 1999-11-14 23:59:01 +00:00 committed by Alexandre Julliard
parent 76cc171f4b
commit 9aa8960f7e
1 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
dlls/winmm/mmio.c
View File

@ -250,9 +250,7 @@ static LRESULT mmioMemIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lP
/************************************************************************** /**************************************************************************
* MMIO_Open [internal] * MMIO_Open [internal]
*/ */
static HMMIO16 MMIO_Open(LPSTR szFileName, FOURCC fccIOProc, LPMMIOPROC16 pIOProc, static HMMIO16 MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, int use16)
HPSTR pchBuffer, LONG cchBuffer,
DWORD dwOpenFlags, LPUINT lpRet, int use16)
{ {
LPMMIOINFO16 lpmminfo; LPMMIOINFO16 lpmminfo;
HMMIO16 hmmio; HMMIO16 hmmio;
@ -275,43 +273,45 @@ static HMMIO16 MMIO_Open(LPSTR szFileName, FOURCC fccIOProc, LPMMIOPROC16 pIOPro
memset(lpmminfo, 0, sizeof(MMIOINFO16)); memset(lpmminfo, 0, sizeof(MMIOINFO16));
/* assume DOS file if not otherwise specified */ /* assume DOS file if not otherwise specified */
if (fccIOProc == 0 && pIOProc == NULL) { if (refmminfo->fccIOProc == 0 && refmminfo->pIOProc == NULL) {
lpmminfo->fccIOProc = FOURCC_DOS; lpmminfo->fccIOProc = FOURCC_DOS;
lpmminfo->pIOProc = (LPMMIOPROC16) mmioDosIOProc; lpmminfo->pIOProc = (LPMMIOPROC16) mmioDosIOProc;
} }
/* if just the four character code is present, look up IO proc */ /* if just the four character code is present, look up IO proc */
else if (pIOProc == NULL) { else if (refmminfo->pIOProc == NULL) {
lpmminfo->fccIOProc = fccIOProc; lpmminfo->fccIOProc = refmminfo->fccIOProc;
lpmminfo->pIOProc = mmioInstallIOProc16(fccIOProc, NULL, MMIO_FINDPROC); lpmminfo->pIOProc = mmioInstallIOProc16(refmminfo->fccIOProc, NULL, MMIO_FINDPROC);
} }
/* if IO proc specified, use it and specified four character code */ /* if IO proc specified, use it and specified four character code */
else { else {
lpmminfo->fccIOProc = fccIOProc; lpmminfo->fccIOProc = refmminfo->fccIOProc;
lpmminfo->pIOProc = pIOProc; lpmminfo->pIOProc = (LPMMIOPROC16)refmminfo->pIOProc;
} }
if (dwOpenFlags & MMIO_ALLOCBUF) { if (dwOpenFlags & MMIO_ALLOCBUF) {
if ((*lpRet = mmioSetBuffer16(hmmio, NULL, MMIO_DEFAULTBUFFER, 0))) { if ((refmminfo->wErrorRet = mmioSetBuffer16(hmmio, NULL, MMIO_DEFAULTBUFFER, 0))) {
return 0; return 0;
} }
} else if (lpmminfo->fccIOProc == FOURCC_MEM) { } else if (lpmminfo->fccIOProc == FOURCC_MEM) {
if ((*lpRet = mmioSetBuffer16(hmmio, pchBuffer, cchBuffer, 0))) { if ((refmminfo->wErrorRet = mmioSetBuffer16(hmmio, refmminfo->pchBuffer, refmminfo->cchBuffer, 0))) {
return 0; return 0;
} }
} }
/* see mmioDosIOProc for that one */
lpmminfo->adwInfo[0] = refmminfo->adwInfo[0];
lpmminfo->dwFlags = dwOpenFlags; lpmminfo->dwFlags = dwOpenFlags;
lpmminfo->hmmio = hmmio; lpmminfo->hmmio = hmmio;
/* call IO proc to actually open file */ /* call IO proc to actually open file */
*lpRet = (UINT16) mmioSendMessage(hmmio, MMIOM_OPEN, (LPARAM) szFileName, (LPARAM) use16); refmminfo->wErrorRet = (UINT16) mmioSendMessage(hmmio, MMIOM_OPEN, (LPARAM) szFileName, (LPARAM) use16);
GlobalUnlock16(hmmio); GlobalUnlock16(hmmio);
if (*lpRet != 0) { if (refmminfo->wErrorRet != 0) {
GlobalFree16(hmmio); GlobalFree16(hmmio);
return 0; return 0;
} }
@ -322,22 +322,12 @@ static HMMIO16 MMIO_Open(LPSTR szFileName, FOURCC fccIOProc, LPMMIOPROC16 pIOPro
/************************************************************************** /**************************************************************************
* mmioOpenW [WINMM.123] * mmioOpenW [WINMM.123]
*/ */
HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO * lpmmioinfo, HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo,
DWORD dwOpenFlags) DWORD dwOpenFlags)
{ {
LPSTR szFn = HEAP_strdupWtoA(GetProcessHeap(),0,szFileName); LPSTR szFn = HEAP_strdupWtoA(GetProcessHeap(),0,szFileName);
HMMIO ret; HMMIO ret = mmioOpenA(szFn, lpmmioinfo, dwOpenFlags);
if (lpmmioinfo) {
ret = MMIO_Open(szFn, lpmmioinfo->fccIOProc,
(LPMMIOPROC16)lpmmioinfo->pIOProc,
lpmmioinfo->pchBuffer, lpmmioinfo->cchBuffer,
dwOpenFlags, &lpmmioinfo->wErrorRet, FALSE);
} else {
UINT res;
ret = MMIO_Open(szFn, 0, NULL, NULL, 0,
dwOpenFlags, &res, FALSE);
}
HeapFree(GetProcessHeap(),0,szFn); HeapFree(GetProcessHeap(),0,szFn);
return ret; return ret;
} }
@ -349,15 +339,18 @@ HMMIO WINAPI mmioOpenA(LPSTR szFileName, MMIOINFO* lpmmioinfo,
DWORD dwOpenFlags) DWORD dwOpenFlags)
{ {
HMMIO ret; HMMIO ret;
UINT res;
if (lpmmioinfo) { if (lpmmioinfo) {
ret = MMIO_Open(szFileName, lpmmioinfo->fccIOProc, ret = MMIO_Open(szFileName, lpmmioinfo, dwOpenFlags, FALSE);
(LPMMIOPROC16)lpmmioinfo->pIOProc,
lpmmioinfo->pchBuffer, lpmmioinfo->cchBuffer,
dwOpenFlags, &lpmmioinfo->wErrorRet, FALSE);
} else { } else {
ret = MMIO_Open(szFileName, 0, NULL, NULL, 0, dwOpenFlags, &res, FALSE); MMIOINFO mmioinfo;
mmioinfo.fccIOProc = 0;
mmioinfo.pIOProc = NULL;
mmioinfo.pchBuffer = NULL;
mmioinfo.cchBuffer = 0;
ret = MMIO_Open(szFileName, &mmioinfo, dwOpenFlags, FALSE);
} }
return ret; return ret;
} }
@ -369,15 +362,18 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo,
DWORD dwOpenFlags) DWORD dwOpenFlags)
{ {
HMMIO ret; HMMIO ret;
UINT res; MMIOINFO mmio;
if (lpmmioinfo) { if (lpmmioinfo) {
ret = MMIO_Open(szFileName, lpmmioinfo->fccIOProc, lpmmioinfo->pIOProc, mmio.fccIOProc = lpmmioinfo->fccIOProc;
PTR_SEG_TO_LIN(lpmmioinfo->pchBuffer), lpmmioinfo->cchBuffer, mmio.pIOProc = (LPMMIOPROC)lpmmioinfo->pIOProc;
dwOpenFlags, &res, FALSE); mmio.pchBuffer = PTR_SEG_TO_LIN(lpmmioinfo->pchBuffer);
lpmmioinfo->wErrorRet = res; mmio.cchBuffer = lpmmioinfo->cchBuffer;
mmio.adwInfo[0] = lpmmioinfo->adwInfo[0];
ret = MMIO_Open(szFileName, &mmio, dwOpenFlags, FALSE);
lpmmioinfo->wErrorRet = mmio.wErrorRet;
} else { } else {
ret = MMIO_Open(szFileName, 0, NULL, NULL, 0, dwOpenFlags, &res, TRUE); return mmioOpenA(szFileName, NULL, dwOpenFlags);
} }
return ret; return ret;
} }