MMDRV_GetDescription32 fix + a few cosmetic improvements to dlls/winmm/lolvldrv.c
-- Jeff Smith
_________________________________________________________________
Help STOP SPAM with the new MSN 8 and get 2 months FREE* http://join.msn.com/?page=features/junkmail
Index: dlls/winmm/lolvldrv.c =================================================================== RCS file: /home/wine/wine/dlls/winmm/lolvldrv.c,v retrieving revision 1.39 diff -u -r1.39 lolvldrv.c --- dlls/winmm/lolvldrv.c 11 Nov 2002 19:53:01 -0000 1.39 +++ dlls/winmm/lolvldrv.c 11 Dec 2002 20:40:06 -0000 @@ -121,7 +121,7 @@ goto theEnd; if (!(pGetFileVersionInfoA = GetProcAddress( hmodule, "GetFileVersionInfoA" ))) goto theEnd; - if (!(pVerQueryValueA = GetProcAddress( hmodule, "pVerQueryValueA" ))) + if (!(pVerQueryValueA = GetProcAddress( hmodule, "VerQueryValueA" ))) goto theEnd; if (!(dw = pGetFileVersionInfoSizeA(ofs.szPathName, &h))) E(("Can't get FVIS\n")); @@ -166,7 +166,7 @@ } /************************************************************************** - * WINE_Message [internal] + * MMDRV_Message [internal] */ DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32) @@ -178,7 +178,7 @@ WINMM_MapType map; 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, mld->dwDriverInstance, dwParam1, dwParam2, bFrom32?'Y':'N'); @@ -212,7 +212,7 @@ assert(part->u.fnMessage32); 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); ret = part->u.fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); TRACE("=> %lu\n", ret); @@ -228,7 +228,7 @@ break; case WINMM_MAP_OK: 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); ret = part->u.fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); @@ -257,7 +257,7 @@ break; case WINMM_MAP_OK: 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); ret = pFnCallMMDrvFunc16((FARPROC16)part->u.fnMessage16, mld->uDeviceID, wMsg, mld->dwDriverInstance, @@ -272,7 +272,7 @@ break; } } 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); ret = pFnCallMMDrvFunc16((FARPROC16)part->u.fnMessage16, mld->uDeviceID, wMsg, mld->dwDriverInstance,