Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 03:05:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing bug #52513 - Disk space error during install. Affects windows platforms only. r=sgehani

Browse Source
This commit is contained in:
ssu%netscape.com 2000-09-14 07:35:08 +00:00
parent d46d2d3c38
commit 75889d85d9
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xpinstall/wizard/windows/setup/extra.c
View File

@ -2654,11 +2654,28 @@ ULONGLONG GetDiskSpaceRequired(DWORD dwType)
return(ullTotalSize);
}
int LocateExistingPath(char *szPath, char *szExistingPath, DWORD dwExistingPathSize)
{
char szBuf[MAX_BUF];
lstrcpy(szExistingPath, szPath);
AppendBackSlash(szExistingPath, dwExistingPathSize);
while((FileExists(szExistingPath) == FALSE))
{
RemoveBackSlash(szExistingPath);
ParsePath(szExistingPath, szBuf, sizeof(szBuf), PP_PATH_ONLY);
lstrcpy(szExistingPath, szBuf);
AppendBackSlash(szExistingPath, dwExistingPathSize);
}
return(WIZ_OK);
}
/* returns the value in bytes */
ULONGLONG GetDiskSpaceAvailable(LPSTR szPath)
{
char szTempPath[MAX_BUF];
char szBuf[MAX_BUF];
char szExistingPath[MAX_BUF];
char szBuf2[MAX_BUF];
ULARGE_INTEGER uliFreeBytesAvailableToCaller;
ULARGE_INTEGER uliTotalNumberOfBytesToCaller;
@ -2681,9 +2698,9 @@ ULONGLONG GetDiskSpaceAvailable(LPSTR szPath)
}
else if(NS_GetDiskFreeSpaceEx != NULL)
{
lstrcpy(szTempPath, szPath);
AppendBackSlash(szTempPath, MAX_BUF);
if(NS_GetDiskFreeSpaceEx(szTempPath,
LocateExistingPath(szPath, szExistingPath, sizeof(szExistingPath));
AppendBackSlash(szExistingPath, sizeof(szExistingPath));
if(NS_GetDiskFreeSpaceEx(szExistingPath,
&uliFreeBytesAvailableToCaller,
&uliTotalNumberOfBytesToCaller,
&uliTotalNumberOfFreeBytes) == FALSE)
@ -2693,7 +2710,7 @@ ULONGLONG GetDiskSpaceAvailable(LPSTR szPath)
if(NS_LoadString(hSetupRscInst, IDS_ERROR_DETERMINING_DISK_SPACE, szEDeterminingDiskSpace, MAX_BUF) == WIZ_OK)
{
lstrcpy(szBuf2, "\n ");
lstrcat(szBuf2, szTempPath);
lstrcat(szBuf2, szPath);
wsprintf(szBuf, szEDeterminingDiskSpace, szBuf2);
PrintError(szBuf, ERROR_CODE_SHOW);
}

1
xpinstall/wizard/windows/setup/extra.h
View File

@ -178,6 +178,7 @@ char *GetSaveInstallerPath(char *szBuf, DWORD dwBufSize);
void SaveInstallerFiles(void);
void ResetComponentAttributes(char *szFileIni);
BOOL IsInList(DWORD dwCurrentItem, DWORD dwItems, DWORD *dwItemsSelected);
int LocateExistingPath(char *szPath, char *szExistingPath, DWORD dwExistingPathSize);
BOOL bSDInit;