dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

reverted last commit

Browse source 
it forced usage of GetDiskFreeSpace instead of GetDiskFreeSpaceEx for non-existent directories or anything GetDiskFreeSpaceEx deemed invalid

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5602 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-04-18 22:08:29 +00:00
parent 6503959ddb
commit da312003a8
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/exehead/Ui.c
View file

@ -982,6 +982,7 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
if (uMsg == WM_IN_UPDATEMSG || uMsg == WM_NOTIFY_START)
{
static char s[NSIS_MAX_STRLEN];
char *p;
int error = 0;
int available_set = 0;
unsigned total, available = 0xFFFFFFFF;
@ -991,6 +992,9 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
error = NSIS_INSTDIR_INVALID;
mystrcpy(s,dir);
p=skip_root(s);
if (p)
*p=0;
// Test for and use the GetDiskFreeSpaceEx API
{
@ -1016,12 +1020,6 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
{
// GetDiskFreeSpaceEx is not available
DWORD spc, bps, fc, tc;
// GetDiskFreeSpaceEx accepts any path, but GetDiskFreeSpace accepts only the root
char *p=skip_root(s);
if (p)
*p=0;
if (GetDiskFreeSpace(s, &spc, &bps, &fc, &tc))
{
available = (int)MulDiv(bps * spc, fc, 1 << 10);