Nikolay Sivov : qmgr: Remove separate release helpers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 53e25cb4f60bd2d760a9b2fe8b83de3765ad89d7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=53e25cb4f60bd2d760a9b2fe8b...

Author: Nikolay Sivov 
Date:   Fri Jan 18 08:39:15 2013 +0400

qmgr: Remove separate release helpers.

---

dlls/qmgr/file.c |   15 ++++++---------
 dlls/qmgr/job.c  |   15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c
index 5fa5d09..ccba81b 100644
--- a/dlls/qmgr/file.c
+++ b/dlls/qmgr/file.c
@@ -40,14 +40,6 @@ static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundC
     return CONTAINING_RECORD(iface, BackgroundCopyFileImpl, IBackgroundCopyFile_iface);
 }

-static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This)
-{
-    IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface);
-    HeapFree(GetProcessHeap(), 0, This->info.LocalName);
-    HeapFree(GetProcessHeap(), 0, This->info.RemoteName);
-    HeapFree(GetProcessHeap(), 0, This);
-}
-
 static HRESULT WINAPI BITS_IBackgroundCopyFile_QueryInterface(
     IBackgroundCopyFile* iface,
     REFIID riid,
@@ -86,7 +78,12 @@ static ULONG WINAPI BITS_IBackgroundCopyFile_Release(
     TRACE("(%p)->(%d)\n", This, ref);

if (ref == 0)
-        BackgroundCopyFileDestructor(This);
+    {
+        IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface);
+        HeapFree(GetProcessHeap(), 0, This->info.LocalName);
+        HeapFree(GetProcessHeap(), 0, This->info.RemoteName);
+        HeapFree(GetProcessHeap(), 0, This);
+    }

return ref;
 }
diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c
index 26fc43e..4abf220 100644
--- a/dlls/qmgr/job.c
+++ b/dlls/qmgr/job.c
@@ -28,14 +28,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(qmgr);

-static void BackgroundCopyJobDestructor(BackgroundCopyJobImpl *This)
-{
-    This->cs.DebugInfo->Spare[0] = 0;
-    DeleteCriticalSection(&This->cs);
-    HeapFree(GetProcessHeap(), 0, This->displayName);
-    HeapFree(GetProcessHeap(), 0, This);
-}
-
 static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface)
 {
     return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface);
@@ -77,7 +69,12 @@ static ULONG WINAPI BITS_IBackgroundCopyJob_Release(IBackgroundCopyJob2 *iface)
     TRACE("(%p)->(%d)\n", This, ref);

if (ref == 0)
-        BackgroundCopyJobDestructor(This);
+    {
+        This->cs.DebugInfo->Spare[0] = 0;
+        DeleteCriticalSection(&This->cs);
+        HeapFree(GetProcessHeap(), 0, This->displayName);
+        HeapFree(GetProcessHeap(), 0, This);
+    }

return ref;
 }