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

Made mmioSetBuffer callable from 16 and 32 bit code.

This commit is contained in:
Eric Pouech 1998-11-06 16:04:09 +00:00 committed by Alexandre Julliard
parent e674ede085
commit 46b68f091c
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
if1632/mmsystem.spec
View File

@ -156,7 +156,7 @@ type win16
1214 pascal mmioSeek(word long word) mmioSeek16 1214 pascal mmioSeek(word long word) mmioSeek16
1215 pascal mmioGetInfo(word ptr word) mmioGetInfo16 1215 pascal mmioGetInfo(word ptr word) mmioGetInfo16
1216 pascal MMIOSETINFO(word ptr word) mmioSetInfo16 1216 pascal MMIOSETINFO(word ptr word) mmioSetInfo16
1217 pascal MMIOSETBUFFER(word ptr long word) mmioSetBuffer 1217 pascal MMIOSETBUFFER(word ptr long word) mmioSetBuffer16
1218 pascal mmioFlush(word word) mmioFlush16 1218 pascal mmioFlush(word word) mmioFlush16
1219 pascal mmioAdvance(word ptr word) mmioAdvance16 1219 pascal mmioAdvance(word ptr word) mmioAdvance16
1220 pascal mmioStringToFOURCC(str word) mmioStringToFOURCC16 1220 pascal mmioStringToFOURCC(str word) mmioStringToFOURCC16

4
include/mmsystem.h
View File

@ -1624,7 +1624,9 @@ MMRESULT16 WINAPI mmioSetInfo16(HMMIO16,const MMIOINFO16*,UINT16);
MMRESULT32 WINAPI mmioSetInfo32(HMMIO32,const MMIOINFO32*,UINT32); MMRESULT32 WINAPI mmioSetInfo32(HMMIO32,const MMIOINFO32*,UINT32);
#define mmioSetInfo WINELIB_NAME(mmioSetInfo) #define mmioSetInfo WINELIB_NAME(mmioSetInfo)
UINT16 WINAPI mmioSetBuffer(HMMIO16,LPSTR,LONG,UINT16); UINT16 WINAPI mmioSetBuffer16(HMMIO16,LPSTR,LONG,UINT16);
UINT32 WINAPI mmioSetBuffer32(HMMIO32,LPSTR,LONG,UINT32);
#define mmioSetBuffer WINELIB_NAME(mmioSetInfo)
UINT16 WINAPI mmioFlush16(HMMIO16,UINT16); UINT16 WINAPI mmioFlush16(HMMIO16,UINT16);
UINT32 WINAPI mmioFlush32(HMMIO32,UINT32); UINT32 WINAPI mmioFlush32(HMMIO32,UINT32);

29
multimedia/mmio.c
View File

@ -286,14 +286,14 @@ static HMMIO16 MMIO_Open(LPSTR szFileName, MMIOINFO16 * lpmmioinfo,
} }
if (dwOpenFlags & MMIO_ALLOCBUF) { if (dwOpenFlags & MMIO_ALLOCBUF) {
if ((result = mmioSetBuffer(hmmio, NULL, MMIO_DEFAULTBUFFER, 0))) { if ((result = mmioSetBuffer16(hmmio, NULL, MMIO_DEFAULTBUFFER, 0))) {
if (lpmmioinfo) if (lpmmioinfo)
lpmmioinfo->wErrorRet = result; lpmmioinfo->wErrorRet = result;
return 0; return 0;
} }
} else } else
if (lpmminfo->fccIOProc == FOURCC_MEM) { if (lpmminfo->fccIOProc == FOURCC_MEM) {
if ((result = mmioSetBuffer(hmmio, lpmmioinfo->pchBuffer, lpmmioinfo->cchBuffer, 0))) { if ((result = mmioSetBuffer16(hmmio, lpmmioinfo->pchBuffer, lpmmioinfo->cchBuffer, 0))) {
if (lpmmioinfo) if (lpmmioinfo)
lpmmioinfo->wErrorRet = result; lpmmioinfo->wErrorRet = result;
return 0; return 0;
@ -368,7 +368,7 @@ MMRESULT32 WINAPI mmioClose32(HMMIO32 hmmio, UINT32 uFlags)
result = mmioSendMessage(hmmio,MMIOM_CLOSE,(LPARAM)uFlags,(LPARAM)0); result = mmioSendMessage(hmmio,MMIOM_CLOSE,(LPARAM)uFlags,(LPARAM)0);
mmioSetBuffer(hmmio, NULL, 0, 0); mmioSetBuffer16(hmmio, NULL, 0, 0);
GlobalUnlock16(hmmio); GlobalUnlock16(hmmio);
GlobalFree16(hmmio); GlobalFree16(hmmio);
@ -388,7 +388,7 @@ MMRESULT16 WINAPI mmioClose16(HMMIO16 hmmio, UINT16 uFlags)
/************************************************************************** /**************************************************************************
* mmioRead [WINM.124] * mmioRead [WINMM.124]
*/ */
LONG WINAPI mmioRead32(HMMIO32 hmmio, HPSTR pch, LONG cch) LONG WINAPI mmioRead32(HMMIO32 hmmio, HPSTR pch, LONG cch)
{ {
@ -627,10 +627,10 @@ UINT32 WINAPI mmioSetInfo32(HMMIO32 hmmio, const MMIOINFO32 * lpmmioinfo, UINT32
} }
/************************************************************************** /**************************************************************************
* mmioSetBuffer [MMSYSTEM.1217] * mmioSetBuffer [WINMM.129]
*/ */
UINT16 WINAPI mmioSetBuffer(HMMIO16 hmmio, LPSTR pchBuffer, UINT32 WINAPI mmioSetBuffer32(HMMIO32 hmmio, LPSTR pchBuffer,
LONG cchBuffer, UINT16 uFlags) LONG cchBuffer, UINT32 uFlags)
{ {
LPMMIOINFO16 lpmminfo; LPMMIOINFO16 lpmminfo;
@ -649,8 +649,7 @@ UINT16 WINAPI mmioSetBuffer(HMMIO16 hmmio, LPSTR pchBuffer,
} }
if (pchBuffer) { if (pchBuffer) {
lpmminfo->pchBuffer = pchBuffer; lpmminfo->pchBuffer = pchBuffer;
} else } else if (lpmminfo->dwFlags&MMIO_ALLOCBUF) {
if (lpmminfo->dwFlags&MMIO_ALLOCBUF) {
HGLOBAL16 hNewBuf; HGLOBAL16 hNewBuf;
GlobalUnlock16(lpmminfo->dwReserved1); GlobalUnlock16(lpmminfo->dwReserved1);
hNewBuf = GlobalReAlloc16(lpmminfo->dwReserved1, cchBuffer, 0); hNewBuf = GlobalReAlloc16(lpmminfo->dwReserved1, cchBuffer, 0);
@ -662,8 +661,7 @@ UINT16 WINAPI mmioSetBuffer(HMMIO16 hmmio, LPSTR pchBuffer,
} }
lpmminfo->dwReserved1 = hNewBuf; lpmminfo->dwReserved1 = hNewBuf;
lpmminfo->pchBuffer = GlobalLock16(hNewBuf); lpmminfo->pchBuffer = GlobalLock16(hNewBuf);
} else } else if (cchBuffer) {
if (cchBuffer) {
HGLOBAL16 hNewBuf = GlobalAlloc16(GMEM_MOVEABLE, cchBuffer); HGLOBAL16 hNewBuf = GlobalAlloc16(GMEM_MOVEABLE, cchBuffer);
if (!hNewBuf) { if (!hNewBuf) {
GlobalUnlock16(hmmio); GlobalUnlock16(hmmio);
@ -684,6 +682,15 @@ UINT16 WINAPI mmioSetBuffer(HMMIO16 hmmio, LPSTR pchBuffer,
return (UINT16) 0; return (UINT16) 0;
} }
/**************************************************************************
* mmioSetBuffer [MMSYSTEM.1217]
*/
UINT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer,
LONG cchBuffer, UINT16 uFlags)
{
return mmioSetBuffer32(hmmio, pchBuffer, cchBuffer, uFlags);
}
/************************************************************************** /**************************************************************************
* mmioFlush [WINMM.117] * mmioFlush [WINMM.117]
*/ */

4
relay32/winmm.spec
View File

@ -128,8 +128,8 @@ type win32
125 stub mmioRenameA 125 stub mmioRenameA
126 stub mmioRenameW 126 stub mmioRenameW
127 stdcall mmioSeek(long long long) mmioSeek32 127 stdcall mmioSeek(long long long) mmioSeek32
128 stub mmioSendMessage 128 stdcall mmioSendMessage(long long long long) mmioSendMessage
129 stub mmioSetBuffer 129 stdcall mmioSetBuffer(long ptr long long) mmioSetBuffer32
130 stdcall mmioSetInfo(long ptr long) mmioSetInfo32 130 stdcall mmioSetInfo(long ptr long) mmioSetInfo32
131 stdcall mmioStringToFOURCCA(str long) mmioStringToFOURCC32A 131 stdcall mmioStringToFOURCCA(str long) mmioStringToFOURCC32A
132 stdcall mmioStringToFOURCCW(wstr long) mmioStringToFOURCC32W 132 stdcall mmioStringToFOURCCW(wstr long) mmioStringToFOURCC32W