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

better uninstaller recursion test using the new state_exe_path

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5106 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-19 21:38:30 +00:00
parent 0ef9426b45
commit c3e4937efe
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/exehead/Main.c
View file

@ -200,6 +200,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,LPSTR lpszCmdParam,
char s[] = "Au_.exe"; char s[] = "Au_.exe";
mystrcat(state_temp_dir,"~nsu.tmp"); mystrcat(state_temp_dir,"~nsu.tmp");
// check if already running from uninstaller temp dir
// this prevents recursive uninstaller calls
if (!lstrcmpi(state_temp_dir,state_exe_directory))
goto end;
CreateDirectory(state_temp_dir,NULL); CreateDirectory(state_temp_dir,NULL);
SetCurrentDirectory(state_temp_dir); SetCurrentDirectory(state_temp_dir);
@ -212,7 +218,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,LPSTR lpszCmdParam,
for (x = 0; x < 26; x ++) for (x = 0; x < 26; x ++)
{ {
static char buf2[NSIS_MAX_STRLEN]; static char buf2[NSIS_MAX_STRLEN];
static char ibuf[NSIS_MAX_STRLEN];
GetNSISString(buf2,g_header->str_uninstchild); // $TEMP\$1 GetNSISString(buf2,g_header->str_uninstchild); // $TEMP\$1
@ -220,13 +225,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,LPSTR lpszCmdParam,
if (m_Err) // not done yet if (m_Err) // not done yet
{ {
// get current name
int l=GetModuleFileName(NULL,ibuf,sizeof(ibuf));
// check if it is ?u_.exe - if so, fuck it
if (!lstrcmpi(ibuf+l-(sizeof(s)-2),s+1)) break;
// copy file // copy file
if (CopyFile(ibuf,buf2,TRUE)) if (CopyFile(state_exe_path,buf2,TRUE))
{ {
HANDLE hProc; HANDLE hProc;
#ifdef NSIS_SUPPORT_MOVEONREBOOT #ifdef NSIS_SUPPORT_MOVEONREBOOT