[PATCH v2 3/6] dmime: Cleanup IDirectMusicPerformance_AllocPMsg.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dmime/performance.c | 27 ++++++++++++---------------
 dlls/dmime/tests/dmime.c |  2 +-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 7ce8ccb0d84..7cf446d9816 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -81,7 +81,6 @@ struct DMUS_PMSGItem {
 };

#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;\
@@ -515,23 +514,21 @@ static HRESULT WINAPI performance_GetTime(IDirectMusicPerformance8 *iface, REFER
     return hr;
 }

-static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULONG cb, DMUS_PMSG **ppPMSG)
+static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULONG size, DMUS_PMSG **msg)
 {
-  struct performance *This = impl_from_IDirectMusicPerformance8(iface);
-  DMUS_PMSGItem* pItem = NULL;
+    struct performance *This = impl_from_IDirectMusicPerformance8(iface);
+    DMUS_PMSGItem *message;

-  FIXME("(%p, %ld, %p): stub\n", This, cb, ppPMSG);
+    TRACE("(%p, %ld, %p)\n", This, size, msg);

-  if (sizeof(DMUS_PMSG) > cb) {
-    return E_INVALIDARG;
-  }
-  if (NULL == ppPMSG) {
-    return E_POINTER;
-  }
-  if (!(pItem = calloc(1, cb - sizeof(DMUS_PMSG) + sizeof(DMUS_PMSGItem)))) return E_OUTOFMEMORY;
-  pItem->pMsg.dwSize = cb;
-  *ppPMSG = DMUS_ItemToPMSG(pItem);
-  return S_OK;
+    if (!msg) return E_POINTER;
+    if (size < sizeof(DMUS_PMSG)) return E_INVALIDARG;
+
+    if (!(message = calloc(1, size - sizeof(DMUS_PMSG) + sizeof(DMUS_PMSGItem)))) return E_OUTOFMEMORY;
+    message->pMsg.dwSize = size;
+    *msg = &message->pMsg;
+
+    return S_OK;
 }

static HRESULT WINAPI performance_FreePMsg(IDirectMusicPerformance8 *iface, DMUS_PMSG *pPMSG)
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index 8999d5564db..5a1d5c9733e 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -1747,7 +1747,7 @@ static void test_performance_pmsg(void)

hr = IDirectMusicPerformance_AllocPMsg(performance, 0, NULL);
-    todo_wine ok(hr == E_POINTER, "got %#lx\n", hr);
+    ok(hr == E_POINTER, "got %#lx\n", hr);
     hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(DMUS_PMSG) - 1, &msg);
     ok(hr == E_INVALIDARG, "got %#lx\n", hr);