setupx.dll16: Simplify VcpClose16 a bit.

Gerald Pfeifer gerald at pfeifer.com
Sat Sep 18 17:17:21 CDT 2010


This is along the lines of two other changes I have made based on guidance 
from Alexandre.  cbres is not used here, and error detection takes place 
via checking VCP_CheckPaths (see the end of the second hunk of the patch).

Gerald
---
 dlls/setupx.dll16/virtcopy.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c
index 1e50bc4..8816754 100644
--- a/dlls/setupx.dll16/virtcopy.c
+++ b/dlls/setupx.dll16/virtcopy.c
@@ -489,7 +489,6 @@ static RETERR16 VCP_CopyFiles(void)
 RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
 {
     RETERR16 res = OK;
-    WORD cbres = VCPN_PROCEED;
 
     TRACE("(%04x, '%s')\n", fl, lpszBackupDest);
 
@@ -500,7 +499,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
     memset(&vcp_status, 0, sizeof(VCPSTATUS));
     /* yes, vcp_status.cbSize is 0 ! */
     TRACE("#2\n");
-    cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSESTART, 0, 0, VCP_MsgRef);
+    VCP_Callback(&vcp_status, VCPM_VSTATCLOSESTART, 0, 0, VCP_MsgRef);
     TRACE("#3\n");
 
     res = VCP_CheckPaths();
@@ -510,7 +509,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
     VCP_CopyFiles();
 
     TRACE("#5\n");
-    cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef);
+    VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef);
     TRACE("#6\n");
     VCP_Proc = NULL;
     VCP_opened = FALSE;
-- 
1.7.2.2



More information about the wine-patches mailing list