Commit ae0a1547 authored by Gerald Pfeifer's avatar Gerald Pfeifer Committed by Alexandre Julliard

setupx.dll16: Simplify VcpClose16 a bit.

parent 7c27f9cb
...@@ -484,7 +484,6 @@ static RETERR16 VCP_CopyFiles(void) ...@@ -484,7 +484,6 @@ static RETERR16 VCP_CopyFiles(void)
RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
{ {
RETERR16 res = OK; RETERR16 res = OK;
WORD cbres = VCPN_PROCEED;
TRACE("(%04x, '%s')\n", fl, lpszBackupDest); TRACE("(%04x, '%s')\n", fl, lpszBackupDest);
...@@ -495,7 +494,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) ...@@ -495,7 +494,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
memset(&vcp_status, 0, sizeof(VCPSTATUS)); memset(&vcp_status, 0, sizeof(VCPSTATUS));
/* yes, vcp_status.cbSize is 0 ! */ /* yes, vcp_status.cbSize is 0 ! */
TRACE("#2\n"); 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"); TRACE("#3\n");
res = VCP_CheckPaths(); res = VCP_CheckPaths();
...@@ -505,7 +504,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) ...@@ -505,7 +504,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
VCP_CopyFiles(); VCP_CopyFiles();
TRACE("#5\n"); 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"); TRACE("#6\n");
VCP_Proc = NULL; VCP_Proc = NULL;
VCP_opened = FALSE; VCP_opened = FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment