setupx.dll16: Fix error handling in VCP_VirtnodeCreate. (RETRY)

[Gerald Pfeifer]

On Tue, 18 May 2010, Alexandre Julliard wrote:
> If you are going to return an error you have to handle the error
> properly and free the data structures etc.  It's not clear that this
> is the right thing to do though.

Per our recent conversation in some similar case in setupx.dll16, let
me retract that patch and instead offer the one below.

Gerald


ChangeLog:
setupx.dll16: Simplify VCP_VirtnodeCreate a bit.

diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c
index 98c2f31..299041f 100644
--- a/dlls/setupx.dll16/virtcopy.c
+++ b/dlls/setupx.dll16/virtcopy.c
@@ -211,7 +211,6 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC
 {
     HANDLE heap;
     LPVIRTNODE lpvn;
-    RETERR16 cbres;
 
     while (vn_last < vn_num)
     {
@@ -248,9 +247,9 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC
 
     lpvn->vhstrDstFinalName = 0xffff; /* FIXME: what is this ? */
 
-    cbres = VCP_Callback(lpvn, VCPM_NODECREATE, 0, 0, VCP_MsgRef);
+    VCP_Callback(lpvn, VCPM_NODECREATE, 0, 0, VCP_MsgRef);
     lpvn->fl |= VFNL_CREATED;
-    cbres = VCP_Callback(lpvn, VCPM_NODEACCEPT, 0, 0, VCP_MsgRef);
+    VCP_Callback(lpvn, VCPM_NODEACCEPT, 0, 0, VCP_MsgRef);
 
     return OK;
 }
-- 
1.7.2.2