tools/installer/LocalCopyMethod.cpp
changeset 1722 2c16f160f5dd
parent 1651 077571ea8942
child 2289 44045ead61cd
     1.1 --- a/tools/installer/LocalCopyMethod.cpp	Sun Nov 25 02:45:12 2007 +0000
     1.2 +++ b/tools/installer/LocalCopyMethod.cpp	Sun Nov 25 04:46:18 2007 +0000
     1.3 @@ -15,9 +15,8 @@
     1.4  {
     1.5  	ICopyProgress *progress = (ICopyProgress *)lpData;
     1.6  
     1.7 -	float percent = (float)(TotalBytesTransferred.QuadPart) / (float)(TotalFileSize.QuadPart);
     1.8 -
     1.9 -	progress->UpdateProgress(percent);
    1.10 +	progress->UpdateProgress((size_t)TotalBytesTransferred.QuadPart,
    1.11 +		(size_t)TotalFileSize.QuadPart);
    1.12  
    1.13  	return PROGRESS_CONTINUE;
    1.14  }
    1.15 @@ -55,7 +54,7 @@
    1.16  		m_CurrentPath,
    1.17  		name);
    1.18  
    1.19 -	if (CreateDirectory(name, NULL))
    1.20 +	if (CreateDirectory(path, NULL))
    1.21  	{
    1.22  		return true;
    1.23  	}
    1.24 @@ -111,6 +110,11 @@
    1.25  
    1.26  	m_bCancelStatus = FALSE;
    1.27  
    1.28 +	if (m_pProgress != NULL)
    1.29 +	{
    1.30 +		m_pProgress->StartingNewFile(filename);
    1.31 +	}
    1.32 +
    1.33  	if (CopyFileEx(path,
    1.34  		new_path,
    1.35  		m_pProgress ? CopyProgressRoutine : NULL,
    1.36 @@ -126,6 +130,11 @@
    1.37  		return false;
    1.38  	}
    1.39  
    1.40 +	if (m_pProgress != NULL)
    1.41 +	{
    1.42 +		m_pProgress->FileDone(UTIL_GetFileSize(path));
    1.43 +	}
    1.44 +
    1.45  	return true;
    1.46  }
    1.47