Michael Stefaniuc : qmgr: Parameter cleanup for a helper function.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 022e3f5333e690945be70cc306e3baa22aa417bc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=022e3f5333e690945be70cc306...

Author: Michael Stefaniuc 
Date:   Tue Dec  4 00:59:02 2012 +0100

qmgr: Parameter cleanup for a helper function.

---

dlls/qmgr/enum_jobs.c |    8 +++-----
 dlls/qmgr/qmgr.c      |    2 +-
 dlls/qmgr/qmgr.h      |    4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c
index 85aca47..1805a6a 100644
--- a/dlls/qmgr/enum_jobs.c
+++ b/dlls/qmgr/enum_jobs.c
@@ -163,15 +163,13 @@ static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl =
     BITS_IEnumBackgroundCopyJobs_GetCount
 };

-HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj,
-                                          IBackgroundCopyManager* copyManager)
+HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCopyJobs **enumjob)
 {
-    BackgroundCopyManagerImpl *qmgr = (BackgroundCopyManagerImpl *) copyManager;
     EnumBackgroundCopyJobsImpl *This;
     BackgroundCopyJobImpl *job;
     ULONG i;

-    TRACE("%p, %p)\n", ppObj, copyManager);
+    TRACE("%p, %p)\n", qmgr, enumjob);

This = HeapAlloc(GetProcessHeap(), 0, sizeof *This);
     if (!This)
@@ -208,6 +206,6 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj,
     }
     LeaveCriticalSection(&qmgr->cs);

-    *ppObj = &This->lpVtbl;
+    *enumjob = (IEnumBackgroundCopyJobs *)&This->lpVtbl;
     return S_OK;
 }
diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c
index 55a01e6..7b11b66 100644
--- a/dlls/qmgr/qmgr.c
+++ b/dlls/qmgr/qmgr.c
@@ -85,7 +85,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManage
         DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum)
 {
     TRACE("\n");
-    return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface);
+    return enum_copy_job_create(&globalMgr, ppEnum);
 }

static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface,
diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h
index 1057880..d591d20 100644
--- a/dlls/qmgr/qmgr.h
+++ b/dlls/qmgr/qmgr.h
@@ -100,8 +100,8 @@ extern BackgroundCopyManagerImpl globalMgr DECLSPEC_HIDDEN;
 HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type,
                                      GUID *pJobId, LPVOID *ppObj) DECLSPEC_HIDDEN;
-HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj,
-                                          IBackgroundCopyManager* copyManager) DECLSPEC_HIDDEN;
+HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr,
+        IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN;
 HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner,
                                       LPCWSTR remoteName, LPCWSTR localName,
                                       LPVOID *ppObj) DECLSPEC_HIDDEN;