Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DMUSIC] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71760
This commit is contained in:
Amine Khaldi 2016-07-02 15:40:22 +00:00
parent b0105c5dc3
commit 8c8e0a9437
4 changed files with 99 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/dll/directx/wine/dmusic/buffer.c
View file

@ -132,9 +132,26 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER
static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb)
{
IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface);
DWORD new_write_pos = This->write_pos + sizeof(DMUS_EVENTHEADER) + cb;
DMUS_EVENTHEADER header;
FIXME("(%p, 0x%s, %d, %d, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb);
if (new_write_pos > This->size)
return DMUS_E_BUFFER_FULL;
if (!This->write_pos)
This->start_time = rt;
header.cbEvent = cb;
header.dwChannelGroup = dwChannelGroup;
header.rtDelta = rt - This->start_time;
header.dwFlags = 0;
memcpy(This->data + This->write_pos, &header, sizeof(header));
memcpy(This->data + This->write_pos + sizeof(header), lpb, cb);
This->write_pos = new_write_pos;
return S_OK;
}

2
reactos/dll/directx/wine/dmusic/dmusic_private.h
View file

@ -37,6 +37,7 @@
#include <objbase.h>
#include <dmusici.h>
#include <dmusics.h>
#include <dmksctrl.h>
#include <wine/debug.h>
#include <wine/list.h>
@ -171,6 +172,7 @@ struct SynthPortImpl {
IDirectMusicPort IDirectMusicPort_iface;
IDirectMusicPortDownload IDirectMusicPortDownload_iface;
IDirectMusicThru IDirectMusicThru_iface;
IKsControl IKsControl_iface;
LONG ref;
/* IDirectMusicPort fields */

79
reactos/dll/directx/wine/dmusic/port.c
View file

@ -43,6 +43,11 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus
return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface);
}
static inline SynthPortImpl *impl_from_SynthPortImpl_IKsControl(IKsControl *iface)
{
return CONTAINING_RECORD(iface, SynthPortImpl, IKsControl_iface);
}
/* IDirectMusicDownloadedInstrument IUnknown part follows: */
static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface)
{
@ -141,6 +146,10 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI
*ret_iface = &This->IDirectMusicThru_iface;
IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
return S_OK;
} else if (IsEqualGUID(riid, &IID_IKsControl)) {
*ret_iface = &This->IKsControl_iface;
IKsControl_AddRef((IKsControl*)*ret_iface);
return S_OK;
}
WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
@ -671,6 +680,75 @@ static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = {
SynthPortImpl_IDirectMusicThru_ThruChannel
};
static HRESULT WINAPI SynthPortImpl_IKsControl_QueryInterface(IKsControl* iface, REFIID riid, LPVOID *ppobj)
{
SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface);
return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ppobj);
}
static ULONG WINAPI SynthPortImpl_IKsControl_AddRef(IKsControl* iface)
{
SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface);
return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface);
}
static ULONG WINAPI SynthPortImpl_IKsControl_Release(IKsControl* iface)
{
SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface);
return IDirectMusicPort_Release(&This->IDirectMusicPort_iface);
}
static HRESULT WINAPI SynthPortImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData,
ULONG DataLength, ULONG* BytesReturned)
{
TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags);
if (Property->Flags != KSPROPERTY_TYPE_GET)
{
FIXME("Property flags %u not yet supported\n", Property->Flags);
return S_FALSE;
}
if (DataLength < sizeof(DWORD))
return E_NOT_SUFFICIENT_BUFFER;
FIXME("Unknown property %s\n", debugstr_guid(&Property->Set));
*(DWORD*)PropertyData = FALSE;
*BytesReturned = sizeof(DWORD);
return S_OK;
}
static HRESULT WINAPI SynthPortImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData,
ULONG DataLength, ULONG* BytesReturned)
{
FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned);
return E_NOTIMPL;
}
static HRESULT WINAPI SynthPortImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData,
ULONG DataLength, ULONG* BytesReturned)
{
FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned);
return E_NOTIMPL;
}
static const IKsControlVtbl SynthPortImpl_IKsControl_Vtbl = {
SynthPortImpl_IKsControl_QueryInterface,
SynthPortImpl_IKsControl_AddRef,
SynthPortImpl_IKsControl_Release,
SynthPortImpl_IKsControl_KsProperty,
SynthPortImpl_IKsControl_KsMethod,
SynthPortImpl_IKsControl_KsEvent
};
HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)
{
SynthPortImpl *obj;
@ -688,6 +766,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou
obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl;
obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl;
obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl;
obj->IKsControl_iface.lpVtbl = &SynthPortImpl_IKsControl_Vtbl;
obj->ref = 0; /* Will be inited by QueryInterface */
obj->fActive = FALSE;
obj->params = *port_params;

2
reactos/media/doc/README.WINE
View file

@ -32,7 +32,7 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29