reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- fix cRef Leak (init to 1, should be 0) of IDMPerformance

Browse Source 
- SendPMsg implementation
- begin of Performance Processing queues implementation
This commit is contained in:
Raphael Junqueira 2004-05-05 18:59:59 +00:00 committed by Alexandre Julliard
parent ae42aad2ae
commit 7be996e9b7
2 changed files with 109 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/dmime/dmime_private.h
View File

@ -154,6 +154,28 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ {
IDirectMusicPort *port; /* ... at this port */
} DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL;
typedef struct DMUS_PMSGItem DMUS_PMSGItem;
struct DMUS_PMSGItem {
DMUS_PMSGItem* next;
DMUS_PMSGItem* prev;
REFERENCE_TIME rtItemTime;
BOOL bInUse;
DWORD cb;
DMUS_PMSG pMsg;
};
#define DMUS_PMSGToItem(pMSG) ((DMUS_PMSGItem*) (((unsigned char*) pPMSG) - offsetof(DMUS_PMSGItem, pMsg)))
#define DMUS_ItemToPMSG(pItem) (&(pItem->pMsg))
#define DMUS_ItemRemoveFromQueue(This,pItem) \
{\
if (pItem->prev) pItem->prev->next = pItem->next;\
if (pItem->next) pItem->next->prev = pItem->prev;\
if (This->head == pItem) This->head = pItem->next;\
if (This->imm_head == pItem) This->imm_head = pItem->next;\
pItem->bInUse = FALSE;\
}
/*****************************************************************************
* IDirectMusicPerformance8Impl implementation structure
@ -182,6 +204,13 @@ struct IDirectMusicPerformance8Impl {
IDirectMusicAudioPath* pDefaultPath;
HANDLE hNotification;
REFERENCE_TIME rtMinimum;
/** Message Processing */
HANDLE procThread;
REFERENCE_TIME procThreadStartTime;
BOOL procThreadTicStarted;
DMUS_PMSGItem* head;
DMUS_PMSGItem* imm_head;
};
/* IUnknown: */

117
dlls/dmime/performance.c
View File

@ -21,16 +21,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmime);
typedef struct DMUS_PMSGItem DMUS_PMSGItem;
struct DMUS_PMSGItem {
DMUS_PMSGItem* next;
DMUS_PMSGItem* prev;
BOOL bInUse;
DWORD cb;
DMUS_PMSG pMsg;
};
/* IDirectMusicPerformance8 IUnknown part: */
HRESULT WINAPI IDirectMusicPerformance8Impl_QueryInterface (LPDIRECTMUSICPERFORMANCE8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
@ -155,9 +145,53 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_GetBumperLength (LPDIRECTMUSICPERFOR
}
HRESULT WINAPI IDirectMusicPerformance8Impl_SendPMsg (LPDIRECTMUSICPERFORMANCE8 iface, DMUS_PMSG* pPMSG) {
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
FIXME("(%p, %p): stub\n", This, pPMSG);
return S_OK;
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
DMUS_PMSGItem* pItem = NULL;
DMUS_PMSGItem* it = NULL;
DMUS_PMSGItem* prev_it = NULL;
DMUS_PMSGItem** queue = NULL;
FIXME("(%p, %p): stub\n", This, pPMSG);
if (NULL == pPMSG) {
return E_POINTER;
}
pItem = DMUS_PMSGToItem(pPMSG);
if (NULL == pItem) {
return E_POINTER;
}
if (TRUE == pItem->bInUse) {
return DMUS_E_ALREADY_SENT;
}
/* TODO: Valid Flags */
/* TODO: DMUS_PMSGF_MUSICTIME */
pItem->rtItemTime = pPMSG->rtTime;
if (pPMSG->dwFlags & DMUS_PMSGF_TOOL_IMMEDIATE) {
queue = &This->imm_head;
} else {
queue = &This->head;
}
for (it = *queue; NULL != it && it->rtItemTime < pItem->rtItemTime; it = it->next) {
prev_it = it;
}
if (NULL == prev_it) {
pItem->prev = NULL;
pItem->next = (*queue)->next;
/*assert( NULL == pItem->next->prev );*/
if (NULL != pItem->next) pItem->next->prev = pItem;
*queue = pItem;
} else {
pItem->prev = prev_it;
pItem->next = prev_it->next;
prev_it->next = pItem;
if (NULL != pItem->next) pItem->next->prev = pItem;
}
/** now in use, prevent from stupid Frees */
pItem->bInUse = TRUE;
return S_OK;
}
HRESULT WINAPI IDirectMusicPerformance8Impl_MusicToReferenceTime (LPDIRECTMUSICPERFORMANCE8 iface, MUSIC_TIME mtTime, REFERENCE_TIME* prtTime) {
@ -201,7 +235,7 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_AllocPMsg (LPDIRECTMUSICPERFORMANCE8
return E_OUTOFMEMORY;
}
pItem->pMsg.dwSize = cb;
*ppPMSG = &(pItem->pMsg);
*ppPMSG = DMUS_ItemToPMSG(pItem);
return S_OK;
}
@ -214,41 +248,45 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg (LPDIRECTMUSICPERFORMANCE8
if (NULL == pPMSG) {
return E_POINTER;
}
pItem = (DMUS_PMSGItem*) (((unsigned char*) pPMSG) - sizeof(DMUS_PMSG) - sizeof(DMUS_PMSGItem));
pItem = DMUS_PMSGToItem(pPMSG);
if (NULL == pItem) {
return E_POINTER;
}
if (TRUE == pItem->bInUse) {
/** prevent for freeing PMsg in queue (ie to be processed) */
return DMUS_E_CANNOT_FREE;
}
}
/** now we can remove it safely */
DMUS_ItemRemoveFromQueue( This, pItem );
/** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */
HeapFree(GetProcessHeap(), 0, pItem);
return S_OK;
}
HRESULT WINAPI IDirectMusicPerformance8Impl_GetGraph (LPDIRECTMUSICPERFORMANCE8 iface, IDirectMusicGraph** ppGraph) {
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
FIXME("(%p, %p): to check\n", This, ppGraph);
if (NULL != This->pToolGraph) {
*ppGraph = (LPDIRECTMUSICGRAPH) This->pToolGraph;
IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) *ppGraph);
}
return S_OK;
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
FIXME("(%p, %p): to check\n", This, ppGraph);
if (NULL != This->pToolGraph) {
*ppGraph = (LPDIRECTMUSICGRAPH) This->pToolGraph;
IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) *ppGraph);
}
return S_OK;
}
HRESULT WINAPI IDirectMusicPerformance8Impl_SetGraph (LPDIRECTMUSICPERFORMANCE8 iface, IDirectMusicGraph* pGraph) {
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
FIXME("(%p, %p): to check\n", This, pGraph);
if (NULL != This->pToolGraph) {
/* Todo clean buffers and tools before */
IDirectMusicGraph_Release((LPDIRECTMUSICGRAPH) This->pToolGraph);
}
This->pToolGraph = pGraph;
if (NULL != This->pToolGraph) {
IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) This->pToolGraph);
}
return S_OK;
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
FIXME("(%p, %p): to check\n", This, pGraph);
if (NULL != This->pToolGraph) {
/* Todo clean buffers and tools before */
IDirectMusicGraph_Release((LPDIRECTMUSICGRAPH) This->pToolGraph);
}
This->pToolGraph = pGraph;
if (NULL != This->pToolGraph) {
IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) This->pToolGraph);
}
return S_OK;
}
HRESULT WINAPI IDirectMusicPerformance8Impl_SetNotificationHandle (LPDIRECTMUSICPERFORMANCE8 iface, HANDLE hNotification, REFERENCE_TIME rtMinimum) {
@ -261,10 +299,15 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_SetNotificationHandle (LPDIRECTMUSIC
HRESULT WINAPI IDirectMusicPerformance8Impl_GetNotificationPMsg (LPDIRECTMUSICPERFORMANCE8 iface, DMUS_NOTIFICATION_PMSG** ppNotificationPMsg) {
ICOM_THIS(IDirectMusicPerformance8Impl,iface);
FIXME("(%p, %p): stub\n", This, ppNotificationPMsg);
if (NULL == ppNotificationPMsg) {
return E_POINTER;
}
return S_FALSE;
/*return S_OK;*/
}
@ -735,7 +778,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPerformanceImpl (LPCGUID lpcGUID, LPVOID
return E_OUTOFMEMORY;
}
obj->lpVtbl = &DirectMusicPerformance8_Vtbl;
obj->ref = 1;
obj->ref = 0; /* will be inited by QueryInterface */
obj->pDirectMusic = NULL;
obj->pDirectSound = NULL;
obj->pDefaultPath = NULL;