mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 14:37:45 +00:00
[WINMM]
- Sync MCI_SysInfo with Wine. CORE-8528 #resolve svn path=/trunk/; revision=67232
This commit is contained in:
parent
2dc91ac6c0
commit
a80d5b8e9d
|
@ -37,11 +37,6 @@
|
||||||
* - command table handling isn't thread safe
|
* - command table handling isn't thread safe
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* to be cross checked:
|
|
||||||
* - heapalloc for *sizeof(WCHAR) when needed
|
|
||||||
* - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "winemm.h"
|
#include "winemm.h"
|
||||||
|
|
||||||
#include <mmsystem.h>
|
#include <mmsystem.h>
|
||||||
|
@ -1726,19 +1721,25 @@ static DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr)
|
||||||
static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParms)
|
static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParms)
|
||||||
{
|
{
|
||||||
DWORD ret = MCIERR_INVALID_DEVICE_ID, cnt = 0;
|
DWORD ret = MCIERR_INVALID_DEVICE_ID, cnt = 0;
|
||||||
WCHAR buf[2048], *s = buf, *p;
|
WCHAR buf[2048], *s, *p;
|
||||||
LPWINE_MCIDRIVER wmd;
|
LPWINE_MCIDRIVER wmd;
|
||||||
HKEY hKey;
|
HKEY hKey;
|
||||||
|
|
||||||
if (lpParms == NULL || lpParms->lpstrReturn == NULL)
|
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
|
||||||
return MCIERR_NULL_PARAMETER_BLOCK;
|
if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW;
|
||||||
|
|
||||||
TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n",
|
TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n",
|
||||||
uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType);
|
uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType);
|
||||||
|
if ((WORD)MCI_ALL_DEVICE_ID == LOWORD(uDevID))
|
||||||
|
uDevID = MCI_ALL_DEVICE_ID; /* Be compatible with Win9x */
|
||||||
|
|
||||||
switch (dwFlags & ~MCI_SYSINFO_OPEN) {
|
switch (dwFlags & ~(MCI_SYSINFO_OPEN|MCI_NOTIFY|MCI_WAIT)) {
|
||||||
case MCI_SYSINFO_QUANTITY:
|
case MCI_SYSINFO_QUANTITY:
|
||||||
if (lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) {
|
if (lpParms->dwRetSize < sizeof(DWORD))
|
||||||
|
return MCIERR_PARAM_OVERFLOW;
|
||||||
|
/* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */
|
||||||
|
if (uDevID == MCI_ALL_DEVICE_ID) {
|
||||||
|
/* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */
|
||||||
if (dwFlags & MCI_SYSINFO_OPEN) {
|
if (dwFlags & MCI_SYSINFO_OPEN) {
|
||||||
TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers\n");
|
TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers\n");
|
||||||
EnterCriticalSection(&WINMM_cs);
|
EnterCriticalSection(&WINMM_cs);
|
||||||
|
@ -1758,21 +1759,32 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (dwFlags & MCI_SYSINFO_OPEN) {
|
if (dwFlags & MCI_SYSINFO_OPEN) {
|
||||||
TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %u\n", lpParms->wDeviceType);
|
TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %d\n", lpParms->wDeviceType);
|
||||||
EnterCriticalSection(&WINMM_cs);
|
EnterCriticalSection(&WINMM_cs);
|
||||||
for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) {
|
for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) {
|
||||||
if (wmd->wType == lpParms->wDeviceType) cnt++;
|
if (wmd->wType == lpParms->wDeviceType) cnt++;
|
||||||
}
|
}
|
||||||
LeaveCriticalSection(&WINMM_cs);
|
LeaveCriticalSection(&WINMM_cs);
|
||||||
} else {
|
} else {
|
||||||
TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %u\n", lpParms->wDeviceType);
|
TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType);
|
||||||
FIXME("Don't know how to get # of MCI devices of a given type\n");
|
FIXME("Don't know how to get # of MCI devices of a given type\n");
|
||||||
cnt = 1;
|
/* name = LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType))
|
||||||
|
* then lookup registry and/or system.ini for name, ignoring digits suffix */
|
||||||
|
switch (LOWORD(lpParms->wDeviceType)) {
|
||||||
|
case MCI_DEVTYPE_CD_AUDIO:
|
||||||
|
case MCI_DEVTYPE_WAVEFORM_AUDIO:
|
||||||
|
case MCI_DEVTYPE_SEQUENCER:
|
||||||
|
cnt = 1;
|
||||||
|
break;
|
||||||
|
default: /* "digitalvideo" gets 0 because it's not in the registry */
|
||||||
|
cnt = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*(DWORD*)lpParms->lpstrReturn = cnt;
|
*(DWORD*)lpParms->lpstrReturn = cnt;
|
||||||
TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn);
|
TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn);
|
||||||
ret = MCI_INTEGER_RETURNED;
|
ret = MCI_INTEGER_RETURNED;
|
||||||
|
/* return ret; Only Win9x sends a notification in this case. */
|
||||||
break;
|
break;
|
||||||
case MCI_SYSINFO_INSTALLNAME:
|
case MCI_SYSINFO_INSTALLNAME:
|
||||||
TRACE("MCI_SYSINFO_INSTALLNAME\n");
|
TRACE("MCI_SYSINFO_INSTALLNAME\n");
|
||||||
|
@ -1780,18 +1792,33 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm
|
||||||
ret = MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize,
|
ret = MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize,
|
||||||
wmd->lpstrDeviceType);
|
wmd->lpstrDeviceType);
|
||||||
} else {
|
} else {
|
||||||
*lpParms->lpstrReturn = 0;
|
ret = (uDevID == MCI_ALL_DEVICE_ID)
|
||||||
ret = MCIERR_INVALID_DEVICE_ID;
|
? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME;
|
||||||
}
|
}
|
||||||
TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn));
|
TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn));
|
||||||
break;
|
break;
|
||||||
case MCI_SYSINFO_NAME:
|
case MCI_SYSINFO_NAME:
|
||||||
TRACE("MCI_SYSINFO_NAME\n");
|
s = NULL;
|
||||||
if (dwFlags & MCI_SYSINFO_OPEN) {
|
if (dwFlags & MCI_SYSINFO_OPEN) {
|
||||||
FIXME("Don't handle MCI_SYSINFO_NAME|MCI_SYSINFO_OPEN (yet)\n");
|
/* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */
|
||||||
ret = MCIERR_UNRECOGNIZED_COMMAND;
|
TRACE("MCI_SYSINFO_NAME: nth alias of type %d\n",
|
||||||
} else {
|
uDevID == MCI_ALL_DEVICE_ID ? MCI_ALL_DEVICE_ID : lpParms->wDeviceType);
|
||||||
s = NULL;
|
EnterCriticalSection(&WINMM_cs);
|
||||||
|
for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) {
|
||||||
|
/* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */
|
||||||
|
if (uDevID == MCI_ALL_DEVICE_ID ||
|
||||||
|
lpParms->wDeviceType == wmd->wType) {
|
||||||
|
cnt++;
|
||||||
|
if (cnt == lpParms->dwNumber) {
|
||||||
|
s = wmd->lpstrAlias;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
LeaveCriticalSection(&WINMM_cs);
|
||||||
|
ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE;
|
||||||
|
} else if (MCI_ALL_DEVICE_ID == uDevID) {
|
||||||
|
TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber);
|
||||||
if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0,
|
if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0,
|
||||||
KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) {
|
KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) {
|
||||||
if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt,
|
if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt,
|
||||||
|
@ -1815,14 +1842,27 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE;
|
ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE;
|
||||||
|
} else {
|
||||||
|
FIXME("MCI_SYSINFO_NAME: nth device of type %d\n", lpParms->wDeviceType);
|
||||||
|
/* Cheating: what is asked for is the nth device from the registry. */
|
||||||
|
if (1 != lpParms->dwNumber || /* Handle only one of each kind. */
|
||||||
|
lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST)
|
||||||
|
ret = MCIERR_OUTOFRANGE;
|
||||||
|
else {
|
||||||
|
LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType),
|
||||||
|
lpParms->lpstrReturn, lpParms->dwRetSize);
|
||||||
|
ret = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn));
|
TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
TRACE("Unsupported flag value=%08x\n", dwFlags);
|
TRACE("Unsupported flag value=%08x\n", dwFlags);
|
||||||
ret = MCIERR_UNRECOGNIZED_COMMAND;
|
ret = MCIERR_UNRECOGNIZED_KEYWORD;
|
||||||
}
|
}
|
||||||
|
if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0)
|
||||||
|
mciDriverNotify((HWND)lpParms->dwCallback, uDevID, MCI_NOTIFY_SUCCESSFUL);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue