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

converted RMDir back from SHFileOperation to the good old manual method

Browse source 
- RMDir can now be used with both /r and /REBOOTOK
- RMDir /r no longer leaves lots of files behind if one file removal failed
- The plug-ins directory is now always deleted, if not immediately, then after reboot
- RMDir /r prints a detailed log of its actions


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3597 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-08-06 17:03:07 +00:00
parent 7270abe8d3
commit 010dc75a71
8 changed files with 141 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/exehead/Main.c
View file

@ -278,6 +278,6 @@ void NSISCALL CleanUp()
#endif
#ifdef NSIS_CONFIG_PLUGIN_SUPPORT
// Clean up after plug-ins
doRMDir(state_plugins_dir, 1);
myDelete(state_plugins_dir, DEL_DIR | DEL_RECURSE | DEL_REBOOT);
#endif // NSIS_CONFIG_PLUGIN_SUPPORT
}

47
Source/exehead/exec.c
View file

@ -487,46 +487,9 @@ static int NSISCALL ExecuteEntry(entry *entry_)
#ifdef NSIS_SUPPORT_DELETE
case EW_DELETEFILE:
{
HANDLE h;
WIN32_FIND_DATA fd;
char *buf1=GetStringFromParm(0x10);
mystrcpy(buf0,buf1);
char *buf0=GetStringFromParm(0x00);
log_printf2("Delete: \"%s\"",buf0);
trimslashtoend(buf0);
h=FindFirstFile(buf1,&fd);
if (h != INVALID_HANDLE_VALUE)
{
do
{
if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
wsprintf(buf1,"%s\\%s",buf0,fd.cFileName);
if (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
SetFileAttributes(buf1,fd.dwFileAttributes^FILE_ATTRIBUTE_READONLY);
if (DeleteFile(buf1))
{
log_printf2("Delete: DeleteFile(\"%s\")",buf1);
update_status_text_buf1(LANG_DELETEFILE);
}
else
{
#ifdef NSIS_SUPPORT_MOVEONREBOOT
if (parm1)
{
log_printf2("Delete: DeleteFile on Reboot(\"%s\")",buf1);
update_status_text_buf1(LANG_DELETEONREBOOT);
MoveFileOnReboot(buf1,NULL);
}
else
#endif
{
exec_error++;
}
}
}
} while (FindNextFile(h,&fd));
FindClose(h);
}
myDelete(buf0,parm1);
}
break;
#endif//NSIS_SUPPORT_DELETE
@ -558,9 +521,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
char *buf1=GetStringFromParm(-0x10);
log_printf2("RMDir: \"%s\"",buf1);
doRMDir(buf1,parm1);
if (file_exists(buf1) && parm1!=2) exec_error++;
else update_status_text_buf1(LANG_REMOVEDIR);
myDelete(buf1,parm1);
}
break;
#endif//NSIS_SUPPORT_RMDIR
@ -1178,7 +1139,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
{
char *buf3=GetStringFromParm(0x33);
res = RegDeleteValue(hKey,buf3);
log_printf4("DeleteRegValue: %d\\%s\\%s",rootkey,buf2,buf3);
log_printf4("DeleteRegValue: %d\\%s\\%s",parm1,buf2,buf3);
RegCloseKey(hKey);
}
}

5
Source/exehead/fileform.h
View file

@ -432,6 +432,11 @@ typedef struct {
int flags;
} ctlcolors;
// constants for myDelete (util.c)
#define DEL_DIR 1
#define DEL_RECURSE 2
#define DEL_REBOOT 4
// $0..$9, $INSTDIR, etc are encoded as ASCII bytes starting from this value.
// Added by ramon 3 jun 2003
#define NS_SKIP_CODE 252

126
Source/exehead/util.c
View file

@ -94,36 +94,110 @@ void * NSISCALL my_GlobalAlloc(DWORD dwBytes) {
return (void *)GlobalAlloc(GPTR, dwBytes);
}
#ifdef NSIS_SUPPORT_RMDIR
void NSISCALL doRMDir(char *buf, int flags) // 1 - recurse, 2 - rebootok
void NSISCALL myDelete(char *buf, int flags)
{
if (is_valid_instpath(buf))
{
if (flags&1) {
SHFILEOPSTRUCT op;
static char lbuf[NSIS_MAX_STRLEN];
op.hwnd=g_hwnd;
op.wFunc=FO_DELETE;
buf[mystrlen(buf)+1]=0;
op.pFrom=buf;
op.pTo=0;
HANDLE h;
WIN32_FIND_DATA fd;
char *fn;
op.fFlags=FOF_NOERRORUI|FOF_SILENT|FOF_NOCONFIRMATION;
SHFileOperation(&op);
}
#ifdef NSIS_SUPPORT_MOVEONREBOOT
else if (!RemoveDirectory(buf) && flags&2) {
log_printf2("Remove folder on reboot: %s",buf);
MoveFileOnReboot(buf,0);
}
#else
else RemoveDirectory(buf);
#endif
}
log_printf2("RMDir: RemoveDirectory(\"%s\")",buf);
}
#ifdef NSIS_SUPPORT_RMDIR
if (!(flags & DEL_DIR) || (is_valid_instpath(buf) && (flags & DEL_RECURSE)))
#endif//NSIS_SUPPORT_RMDIR
{
mystrcpy(lbuf,buf);
#ifdef NSIS_SUPPORT_RMDIR
if (flags & DEL_DIR)
lstrcat(lbuf,"\\*.*");
else
#endif//NSIS_SUPPORT_RMDIR
trimslashtoend(buf);
lstrcat(buf,"\\");
fn=buf+mystrlen(buf);
h = FindFirstFile(lbuf,&fd);
if (h != INVALID_HANDLE_VALUE)
{
do
{
#ifdef NSIS_SUPPORT_RMDIR
if (fd.cFileName[0] != '.' ||
(fd.cFileName[1] != '.' && fd.cFileName[1]))
#endif//NSIS_SUPPORT_RMDIR
{
mystrcpy(fn,fd.cFileName);
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{
#ifdef NSIS_SUPPORT_RMDIR
if ((flags & DEL_DIR | DEL_RECURSE) == (DEL_DIR | DEL_RECURSE))
{
myDelete(buf,flags);
}
#endif//NSIS_SUPPORT_RMDIR
}
else
{
log_printf2("Delete: DeleteFile(\"%s\")",buf);
SetFileAttributes(buf,fd.dwFileAttributes&(~FILE_ATTRIBUTE_READONLY));
if (!DeleteFile(buf))
{
#ifdef NSIS_SUPPORT_MOVEONREBOOT
if (flags & DEL_REBOOT)
{
log_printf2("Delete: DeleteFile on Reboot(\"%s\")",buf);
update_status_text(LANG_DELETEONREBOOT,buf);
MoveFileOnReboot(buf,NULL);
}
else
#endif//NSIS_SUPPORT_MOVEONREBOOT
{
log_printf2("Delete: DeleteFile failed(\"%s\")",buf);
g_exec_flags.exec_error++;
}
}
else
update_status_text(LANG_DELETEFILE,buf);
}
}
} while (FindNextFile(h,&fd));
FindClose(h);
}
#ifdef NSIS_SUPPORT_RMDIR
if (flags & DEL_DIR)
fn[-1]=0;
#endif//NSIS_SUPPORT_RMDIR
}
#ifdef NSIS_SUPPORT_RMDIR
if (flags & DEL_DIR)
{
addtrailingslash(buf);
log_printf2("RMDir: RemoveDirectory(\"%s\")",buf);
if (!RemoveDirectory(buf))
{
#ifdef NSIS_SUPPORT_MOVEONREBOOT
if (flags & DEL_REBOOT)
{
log_printf2("RMDir: RemoveDirectory on Reboot(\"%s\")",buf);
update_status_text(LANG_DELETEONREBOOT,buf);
MoveFileOnReboot(buf,NULL);
}
else
#endif//NSIS_SUPPORT_MOVEONREBOOT
{
log_printf2("RMDir: RemoveDirectory failed(\"%s\")",buf);
g_exec_flags.exec_error++;
}
}
else
update_status_text(LANG_REMOVEDIR,buf);
}
#endif//NSIS_SUPPORT_RMDIR
}
char *NSISCALL addtrailingslash(char *str)
{

2
Source/exehead/util.h
View file

@ -54,7 +54,7 @@ HANDLE NSISCALL myCreateProcess(char *cmd, char *dir);
int NSISCALL my_MessageBox(const char *text, UINT type);
void * NSISCALL my_GlobalAlloc(DWORD dwBytes);
void NSISCALL doRMDir(char *buf, int recurse);
void NSISCALL myDelete(char *buf, int flags);
HANDLE NSISCALL myOpenFile(const char *fn, DWORD da, DWORD cd);
int NSISCALL validpathspec(char *ubuf);