mirror of
https://github.com/reactos/reactos.git
synced 2024-06-28 08:51:29 +00:00
[DMUSIC] Sync with Wine Staging 4.0. CORE-15682
This commit is contained in:
parent
a924dfff45
commit
517ea70ceb
|
@ -301,7 +301,7 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPG
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
/* FIXME: Check return types to ensure we're interpreting data right */
|
/* FIXME: Check return types to ensure we're interpreting data right */
|
||||||
MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff) / sizeof(WCHAR));
|
MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE(buff));
|
||||||
CLSIDFromString(buff, &defaultPortGUID);
|
CLSIDFromString(buff, &defaultPortGUID);
|
||||||
*guid_port = defaultPortGUID;
|
*guid_port = defaultPortGUID;
|
||||||
|
|
||||||
|
@ -373,8 +373,8 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = {
|
||||||
|
|
||||||
static void create_system_ports_list(IDirectMusic8Impl* object)
|
static void create_system_ports_list(IDirectMusic8Impl* object)
|
||||||
{
|
{
|
||||||
|
static const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0};
|
||||||
port_info * port;
|
port_info * port;
|
||||||
const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0};
|
|
||||||
ULONG nb_ports;
|
ULONG nb_ports;
|
||||||
ULONG nb_midi_out;
|
ULONG nb_midi_out;
|
||||||
ULONG nb_midi_in;
|
ULONG nb_midi_in;
|
||||||
|
|
|
@ -408,7 +408,7 @@ const char *debugstr_dmguid (const GUID *id) {
|
||||||
|
|
||||||
if (!id) return "(null)";
|
if (!id) return "(null)";
|
||||||
|
|
||||||
for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) {
|
for (i = 0; i < ARRAY_SIZE(guids); i++) {
|
||||||
if (IsEqualGUID(id, guids[i].guid))
|
if (IsEqualGUID(id, guids[i].guid))
|
||||||
return guids[i].name;
|
return guids[i].name;
|
||||||
}
|
}
|
||||||
|
@ -452,7 +452,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) {
|
||||||
FE(DMUS_OBJ_MEMORY),
|
FE(DMUS_OBJ_MEMORY),
|
||||||
FE(DMUS_OBJ_STREAM)
|
FE(DMUS_OBJ_STREAM)
|
||||||
};
|
};
|
||||||
return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0]));
|
return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Dump whole DMUS_OBJECTDESC struct */
|
/* Dump whole DMUS_OBJECTDESC struct */
|
||||||
|
@ -484,7 +484,7 @@ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask)
|
||||||
FE(DMUS_PORTPARAMS_EFFECTS),
|
FE(DMUS_PORTPARAMS_EFFECTS),
|
||||||
FE(DMUS_PORTPARAMS_SHARE)
|
FE(DMUS_PORTPARAMS_SHARE)
|
||||||
};
|
};
|
||||||
return debugstr_flags(flagmask, flags, sizeof(flags)/sizeof(flags[0]));
|
return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Dump whole DMUS_PORTPARAMS struct */
|
/* Dump whole DMUS_PORTPARAMS struct */
|
||||||
|
|
|
@ -32,7 +32,7 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.9
|
||||||
reactos/dll/directx/wine/devenum # Synced to WineStaging-3.9
|
reactos/dll/directx/wine/devenum # Synced to WineStaging-3.9
|
||||||
reactos/dll/directx/wine/dinput # Synced to WineStaging-4.0
|
reactos/dll/directx/wine/dinput # Synced to WineStaging-4.0
|
||||||
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3
|
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3
|
||||||
reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.17
|
reactos/dll/directx/wine/dmusic # Synced to WineStaging-4.0
|
||||||
reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3
|
reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3
|
||||||
reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.17
|
reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.17
|
||||||
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
|
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
|
||||||
|
|
Loading…
Reference in a new issue