Skip to content

W
wine-winehq
Commit f88d00a2 authored by Jeff Smith's avatar Jeff Smith Committed by Alexandre Julliard
Browse files
Options

MMDRV_GetDescription32 fix + a few cosmetic improvements.

parent b42b9ddb
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 9 deletions
dlls/winmm/lolvldrv.c
View file @ f88d00a2
...@@ -121,7 +121,7 @@ static BOOL MMDRV_GetDescription32(const char* fname, char* buf, int buflen) ...@@ -121,7 +121,7 @@ static BOOL MMDRV_GetDescription32(const char* fname, char* buf, int buflen)
goto theEnd; goto theEnd;
if (!(pGetFileVersionInfoA = GetProcAddress( hmodule, "GetFileVersionInfoA" ))) if (!(pGetFileVersionInfoA = GetProcAddress( hmodule, "GetFileVersionInfoA" )))
goto theEnd; goto theEnd;
if (!(pVerQueryValueA = GetProcAddress( hmodule, "pVerQueryValueA" ))) if (!(pVerQueryValueA = GetProcAddress( hmodule, "VerQueryValueA" )))
goto theEnd; goto theEnd;
if (!(dw = pGetFileVersionInfoSizeA(ofs.szPathName, &h))) E(("Can't get FVIS\n")); if (!(dw = pGetFileVersionInfoSizeA(ofs.szPathName, &h))) E(("Can't get FVIS\n"));
...@@ -166,7 +166,7 @@ UINT MMDRV_GetNum(UINT type) ...@@ -166,7 +166,7 @@ UINT MMDRV_GetNum(UINT type)
} }
/************************************************************************** /**************************************************************************
* WINE_Message [internal] * MMDRV_Message [internal]
*/ */
DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
DWORD dwParam2, BOOL bFrom32) DWORD dwParam2, BOOL bFrom32)
...@@ -178,7 +178,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, ...@@ -178,7 +178,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
WINMM_MapType map; WINMM_MapType map;
int devID; int devID;
TRACE("(%s %u %u 0x%08lx 0x%08lx 0x%08lx %c)!\n", TRACE("(%s %u %u 0x%08lx 0x%08lx 0x%08lx %c)\n",
llTypes[mld->type].typestr, mld->uDeviceID, wMsg, llTypes[mld->type].typestr, mld->uDeviceID, wMsg,
mld->dwDriverInstance, dwParam1, dwParam2, bFrom32?'Y':'N'); mld->dwDriverInstance, dwParam1, dwParam2, bFrom32?'Y':'N');
...@@ -212,7 +212,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, ...@@ -212,7 +212,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
assert(part->u.fnMessage32); assert(part->u.fnMessage32);
if (bFrom32) { if (bFrom32) {
TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx\n", TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n",
mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2);
ret = part->u.fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); ret = part->u.fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2);
TRACE("=> %lu\n", ret); TRACE("=> %lu\n", ret);
...@@ -228,7 +228,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, ...@@ -228,7 +228,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
break; break;
case WINMM_MAP_OK: case WINMM_MAP_OK:
case WINMM_MAP_OKMEM: case WINMM_MAP_OKMEM:
TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx\n", TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n",
mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2);
ret = part->u.fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, ret = part->u.fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance,
dwParam1, dwParam2); dwParam1, dwParam2);
...@@ -257,7 +257,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, ...@@ -257,7 +257,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
break; break;
case WINMM_MAP_OK: case WINMM_MAP_OK:
case WINMM_MAP_OKMEM: case WINMM_MAP_OKMEM:
TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx\n", TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n",
mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2);
ret = pFnCallMMDrvFunc16((FARPROC16)part->u.fnMessage16, ret = pFnCallMMDrvFunc16((FARPROC16)part->u.fnMessage16,
mld->uDeviceID, wMsg, mld->dwDriverInstance, mld->uDeviceID, wMsg, mld->dwDriverInstance,
...@@ -272,7 +272,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, ...@@ -272,7 +272,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
break; break;
} }
} else { } else {
TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx\n", TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n",
mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2);
ret = pFnCallMMDrvFunc16((FARPROC16)part->u.fnMessage16, ret = pFnCallMMDrvFunc16((FARPROC16)part->u.fnMessage16,
mld->uDeviceID, wMsg, mld->dwDriverInstance, mld->uDeviceID, wMsg, mld->dwDriverInstance,
......
dlls/winmm/wineoss/midi.c
View file @ f88d00a2
...@@ -102,7 +102,7 @@ static int midiOpenSeq(void); ...@@ -102,7 +102,7 @@ static int midiOpenSeq(void);
static int midiCloseSeq(void); static int midiCloseSeq(void);
/************************************************************************** /**************************************************************************
* unixToWindowsDeviceType [internal] * MIDI_unixToWindowsDeviceType [internal]
* *
* return the Windows equivalent to a Unix Device Type * return the Windows equivalent to a Unix Device Type
* *
...@@ -432,6 +432,9 @@ SEQ_DEFINEBUF(1024); ...@@ -432,6 +432,9 @@ SEQ_DEFINEBUF(1024);
*/ */
/************************************************************************** /**************************************************************************
* seqbuf_dump [internal] * seqbuf_dump [internal]
*
* Used by SEQ_DUMPBUF to flush the buffer.
*
*/ */
void seqbuf_dump(void) void seqbuf_dump(void)
{ {
...@@ -448,6 +451,9 @@ void seqbuf_dump(void) ...@@ -448,6 +451,9 @@ void seqbuf_dump(void)
} }
} }
/**************************************************************************
* midRecieveChar [internal]
*/
static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
{ {
DWORD toSend = 0; DWORD toSend = 0;
...@@ -1496,7 +1502,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -1496,7 +1502,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
return MMSYSERR_NOTENABLED; return MMSYSERR_NOTENABLED;
} }
/* MS doc says taht dwFlags must be set to zero, but (kinda funny) MS mciseq drivers /* MS doc says that dwFlags must be set to zero, but (kinda funny) MS mciseq drivers
* asks to prepare MIDIHDR which dwFlags != 0. * asks to prepare MIDIHDR which dwFlags != 0.
* So at least check for the inqueue flag * So at least check for the inqueue flag
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment