ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmp: Added SetClientSite implementation.

This commit is contained in:
Jacek Caban 2014-02-10 11:50:34 +01:00 committed by Alexandre Julliard
parent 852c61c595
commit 54e3e0de48
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/wmp/oleobj.c
View File

@ -28,8 +28,19 @@ struct WindowsMediaPlayer {
IPersistStreamInit IPersistStreamInit_iface;
LONG ref;
IOleClientSite *client_site;
};
static void release_client_site(WindowsMediaPlayer *This)
{
if(!This->client_site)
return;
IOleClientSite_Release(This->client_site);
This->client_site = NULL;
}
static inline WindowsMediaPlayer *impl_from_IOleObject(IOleObject *iface)
{
return CONTAINING_RECORD(iface, WindowsMediaPlayer, IOleObject_iface);
@ -84,8 +95,10 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface)
TRACE("(%p) ref=%d\n", This, ref);
if(!ref)
if(!ref) {
release_client_site(This);
heap_free(This);
}
return ref;
}
@ -93,8 +106,32 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface)
static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite)
{
WindowsMediaPlayer *This = impl_from_IOleObject(iface);
FIXME("(%p)->(%p)\n", This, pClientSite);
return E_NOTIMPL;
IOleControlSite *control_site;
HRESULT hres;
TRACE("(%p)->(%p)\n", This, pClientSite);
release_client_site(This);
if(!pClientSite)
return S_OK;
IOleClientSite_AddRef(pClientSite);
This->client_site = pClientSite;
hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleControlSite, (void**)&control_site);
if(SUCCEEDED(hres)) {
IDispatch *disp;
hres = IOleControlSite_GetExtendedControl(control_site, &disp);
if(SUCCEEDED(hres) && disp) {
FIXME("Use extended control\n");
IDispatch_Release(disp);
}
IOleControlSite_Release(control_site);
}
return S_OK;
}
static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite)
@ -407,7 +444,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer,
TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv);
wmp = heap_alloc(sizeof(*wmp));
wmp = heap_alloc_zero(sizeof(*wmp));
if(!wmp)
return E_OUTOFMEMORY;

5
dlls/wmp/wmp_private.h
View File

@ -29,6 +29,11 @@ static inline void *heap_alloc(size_t len)
return HeapAlloc(GetProcessHeap(), 0, len);
}
static inline void *heap_alloc_zero(size_t len)
{
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
}
static inline BOOL heap_free(void *mem)
{
return HeapFree(GetProcessHeap(), 0, mem);