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

fixed bug #1114876 - "Space Available" shows bad value "258.-2GB"

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3888 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-02-03 18:24:48 +00:00
parent c59980a4eb
commit 1ecd52511c
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/exehead/Ui.c
View file

@ -778,7 +778,7 @@ static BOOL CALLBACK UninstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
#endif #endif
static char * NSISCALL inttosizestr(int kb, char *str) static char * NSISCALL inttosizestr(unsigned kb, char *str)
{ {
char scalestr[32], byte[32]; char scalestr[32], byte[32];
char sh=20; char sh=20;
@ -787,7 +787,7 @@ static char * NSISCALL inttosizestr(int kb, char *str)
else if (kb < 1024*1024) { sh=10; scale=LANG_MEGA; } else if (kb < 1024*1024) { sh=10; scale=LANG_MEGA; }
wsprintf( wsprintf(
str+mystrlen(str), str+mystrlen(str),
"%d.%d%s%s", "%u.%u%s%s",
kb>>sh, kb>>sh,
((kb*10)>>sh)%10, ((kb*10)>>sh)%10,
GetNSISString(scalestr,scale), GetNSISString(scalestr,scale),
@ -892,7 +892,8 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
static char s[NSIS_MAX_STRLEN]; static char s[NSIS_MAX_STRLEN];
char *p; char *p;
int error = 0; int error = 0;
int total, available=-1; int available_set=0;
unsigned total, available;
HMODULE hLib; HMODULE hLib;
GetUIText(IDC_DIR,dir); GetUIText(IDC_DIR,dir);
@ -915,22 +916,28 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
ULARGE_INTEGER available64; ULARGE_INTEGER available64;
ULARGE_INTEGER a, b; ULARGE_INTEGER a, b;
if (GDFSE(s, &available64, &a, &b)) if (GDFSE(s, &available64, &a, &b))
{
available = (int)(available64.QuadPart >> 10); available = (int)(available64.QuadPart >> 10);
available_set++;
}
} }
} }
if (available == -1) if (!available_set)
{ {
// GetDiskFreeSpaceEx is not available // GetDiskFreeSpaceEx is not available
DWORD spc, bps, fc, tc; DWORD spc, bps, fc, tc;
if (GetDiskFreeSpace(s, &spc, &bps, &fc, &tc)) if (GetDiskFreeSpace(s, &spc, &bps, &fc, &tc))
{
available = (int)MulDiv(bps * spc, fc, 1 << 10); available = (int)MulDiv(bps * spc, fc, 1 << 10);
available_set++;
}
} }
total = sumsecsfield(size_kb); total = (unsigned) sumsecsfield(size_kb);
if ((unsigned int)available < (unsigned int)total) if (available < total)
error = NSIS_INSTDIR_NOT_ENOUGH_SPACE; error = NSIS_INSTDIR_NOT_ENOUGH_SPACE;
if (LANG_STR_TAB(LANG_SPACE_REQ)) { if (LANG_STR_TAB(LANG_SPACE_REQ)) {