commit 8f3cc76ea2df39481cd72a130dddc38ae3a78c09
author Christian Costa <titan.costa@wanadoo.fr> Mon Aug 22 09:27:41 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 22 09:27:41 2005 +0000
tree f131d0bdd807ec91d9b369656a6a2b42fe07b096
parent eafa666bee37b772597100a58757fb0e3b3e738a

Return S_OK when committing/decomitting an already
committed/decommitted allocator.
Add corresponding test case.
Improve traces.

dlls/quartz/memallocator.c

diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c
index 1eb53a8..3bdb273 100644
--- a/dlls/quartz/memallocator.c
+++ b/dlls/quartz/memallocator.c
@@ -116,7 +116,7 @@
 static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REFIID riid, LPVOID * ppv)
 {
     BaseMemAllocator *This = (BaseMemAllocator *)iface;
-    TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv);
+    TRACE("(%p)->(%s, %p)\n", This, qzdebugstr_guid(riid), ppv);
 
     *ppv = NULL;
 
@@ -170,7 +170,7 @@
     BaseMemAllocator *This = (BaseMemAllocator *)iface;
     HRESULT hr;
 
-    TRACE("(%p, %p)\n", pRequest, pActual);
+    TRACE("(%p)->(%p, %p)\n", This, pRequest, pActual);
 
     EnterCriticalSection(&This->csState);
     {
@@ -207,7 +207,7 @@
     BaseMemAllocator *This = (BaseMemAllocator *)iface;
     HRESULT hr = S_OK;
 
-    TRACE("(%p)\n", pProps);
+    TRACE("(%p)->(%p)\n", This, pProps);
 
     EnterCriticalSection(&This->csState);
     {
@@ -232,14 +232,14 @@
     BaseMemAllocator *This = (BaseMemAllocator *)iface;
     HRESULT hr;
 
-    TRACE("()\n");
+    TRACE("(%p)->()\n", This);
 
     EnterCriticalSection(&This->csState);
     {
         if (!This->pProps)
             hr = VFW_E_SIZENOTSET;
         else if (This->bCommitted)
-            hr = VFW_E_ALREADY_COMMITTED;
+            hr = S_OK;
         else if (This->bDecommitQueued)
         {
             This->bDecommitQueued = FALSE;
@@ -272,12 +272,12 @@
     BaseMemAllocator *This = (BaseMemAllocator *)iface;
     HRESULT hr;
 
-    TRACE("()\n");
+    TRACE("(%p)->()\n", This);
 
     EnterCriticalSection(&This->csState);
     {
         if (!This->bCommitted)
-            hr = VFW_E_NOT_COMMITTED;
+            hr = S_OK;
         else
         {
             if (!list_empty(&This->used_list))
@@ -315,7 +315,7 @@
     /* NOTE: The pStartTime and pEndTime parameters are not applied to the sample. 
      * The allocator might use these values to determine which buffer it retrieves */
     
-    TRACE("(%p, %p, %p, %lx)\n", pSample, pStartTime, pEndTime, dwFlags);
+    TRACE("(%p)->(%p, %p, %p, %lx)\n", This, pSample, pStartTime, pEndTime, dwFlags);
 
     *pSample = NULL;
 
@@ -360,7 +360,7 @@
     StdMediaSample2 * pStdSample = (StdMediaSample2 *)pSample;
     HRESULT hr = S_OK;
     
-    TRACE("(%p)\n", pSample);
+    TRACE("(%p)->(%p)\n", This, pSample);
 
     /* FIXME: make sure that sample is currently on the used list */