X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=installer%2Finstaller.c;h=439fc2f8c3b000bf1c9c1662a33cd521abc088ab;hb=d0de0a246df2608d786e17b4b3438ecbfb5fcbf0;hp=78f4fc32d423fba55f654755ee074ebbe4b2376d;hpb=4c9fd87fcd005cde5de999f554da23947cd95c23;p=swftools.git

diff --git a/installer/installer.c b/installer/installer.c
index 78f4fc3..439fc2f 100644
--- a/installer/installer.c
+++ b/installer/installer.c
@@ -1,8 +1,8 @@
 /* installer.c
 
-   Part of the swftools installer (Main program).
+   Part of the rfx installer (Main program).
    
-   Copyright (c) 2004 Matthias Kramm <kramm@quiss.org> 
+   Copyright (c) 2004-2008 Matthias Kramm <kramm@quiss.org> 
  
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,8 +31,6 @@
 #endif
 #include "utils.h"
 
-#include "../config.h" //for swftools version
-
 static int config_forAllUsers = 0;
 static int config_createLinks = 0;
 static int config_createStartmenu = 1;
@@ -95,7 +93,7 @@ static filelist_t* readFileList(char*filename)
     fseek(fi, 0, SEEK_END);
     int len = ftell(fi);
     fseek(fi, 0, SEEK_SET);
-    char*data = malloc(len);
+    char*data = malloc(len+1);
     fread(data, len, 1, fi);
     fclose(fi);
     int t=0;
@@ -164,7 +162,7 @@ static void handleTemplateFile(const char*filename)
     fseek(fi, 0, SEEK_END);
     int len = ftell(fi);
     fseek(fi, 0, SEEK_SET);
-    char*file = malloc(len);
+    char*file = malloc(len+1);
     fread(file, len, 1, fi);
     fclose(fi);
     int l = strlen(install_path);
@@ -612,6 +610,55 @@ BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 
 #ifdef DEINSTALL
 
+void findfiles(char*path, int*pos, char*data, int len, char del)
+{
+    WIN32_FIND_DATA findFileData;
+    HANDLE hFind = FindFirstFile(concatPaths(path, "*"), &findFileData);
+    if(hFind == INVALID_HANDLE_VALUE)
+	return;
+    do {
+	if(findFileData.cFileName[0] == '.' &&
+	   (findFileData.cFileName[0] == '.' || findFileData.cFileName == '\0'))
+	    continue;
+	char*f = concatPaths(path, findFileData.cFileName);
+	if(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+	    findfiles(f, pos, data, len, del);
+	    if(del) {
+		RemoveDirectory(f);
+	    }
+	} else {
+	    int l = strlen(f);
+
+	    /* don't list the uninstaller as file- it's going to be removed *after*
+	       everything else is done */
+	    char*uninstaller="uninstall.exe";
+	    int ll = strlen(uninstaller);
+	    if(l>=ll) {
+		if(!strcasecmp(&f[l-ll],uninstaller)) {
+		    continue;
+		}
+	    }
+
+	    if(data) {
+		if(*pos+l <= len) {
+		    memcpy(&data[*pos], f, l);(*pos)+=l;
+		    data[(*pos)++] = '\r';
+		    data[(*pos)++] = '\n';
+		    data[(*pos)] = 0;
+		}
+	    } else {
+		(*pos) += l+2;
+	    }
+	    if(del) {
+		DeleteFile(f);
+	    }
+	}
+    } while(FindNextFile(hFind, &findFileData));
+    FindClose(hFind);
+}
+
+static char*extrafiles = 0;
+
 BOOL CALLBACK PropertySheetFunc5(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
     HWND dialog = GetParent(hwnd);
     if(message == WM_INITDIALOG) {
@@ -623,8 +670,10 @@ BOOL CALLBACK PropertySheetFunc5(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 	if(!list) {
 	    list = readFileList(concatPaths(install_path, "uninstall.ini"));
 	    if(!list) {
-		MessageBox(0, "Couldn't determine installed files list- did you run uninstall twice?", INSTALLER_NAME, MB_OK);
-		exit(-1);
+		//Don't abort. If there's still something there, it'll be catched by the "extra files"
+		//functionality later
+		//MessageBox(0, "Couldn't determine installed files list- did you run uninstall twice?", INSTALLER_NAME, MB_OK);
+		//exit(-1);
 	    }
 	}
 	filelist_t* l = list;
@@ -648,58 +697,26 @@ BOOL CALLBACK PropertySheetFunc5(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 	    num++;l = l->next;
 	}
 
+	int len = 0;
+	findfiles(install_path, &len, 0, 0, 0);
+	if(len) {
+	    extrafiles = malloc(len);
+	    int pos = 0;
+	    findfiles(install_path, &pos, extrafiles, len, 0);
+	} else {
+	    PropSheet_RemovePage(dialog, 1, 0);
+	}
 	return 0;
     }
     return PropertySheetFuncCommon(hwnd, message, wParam, lParam, PSWIZB_BACK|PSWIZB_NEXT);
 }
 
-void findfiles(char*path, int*pos, char*data, int len, char del)
-{
-    WIN32_FIND_DATA findFileData;
-    HANDLE hFind = FindFirstFile(concatPaths(path, "*"), &findFileData);
-    if(hFind == INVALID_HANDLE_VALUE)
-	return;
-    do {
-	if(findFileData.cFileName[0] == '.' &&
-	   (findFileData.cFileName[0] == '.' || findFileData.cFileName == '\0'))
-	    continue;
-	char*f = concatPaths(path, findFileData.cFileName);
-	if(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-	    findfiles(f, pos, data, len, del);
-	    if(del) {
-		RemoveDirectory(f);
-	    }
-	} else {
-	    int l = strlen(f);
-	    if(data) {
-		if(*pos+l <= len) {
-		    memcpy(&data[*pos], f, l);(*pos)+=l;
-		    data[(*pos)++] = '\r';
-		    data[(*pos)++] = '\n';
-		}
-	    } else {
-		(*pos) += l+2;
-	    }
-	    if(del) {
-		DeleteFile(f);
-	    }
-	}
-    } while(FindNextFile(hFind, &findFileData));
-    FindClose(hFind);
-}
-
 BOOL CALLBACK PropertySheetFunc6(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
     if(message == WM_INITDIALOG) {
 	SendDlgItemMessage(hwnd, IDC_DELETEEXTRA, BM_SETCHECK, config_deleteextra, 0);
-
-	int len = 0;
-
-	findfiles(install_path, &len, 0, 0, 0);
-	char*data = malloc(len);
-	int pos = 0;
-	findfiles(install_path, &pos, data, len, 0);
-
-	SetDlgItemText(hwnd, IDC_FILELIST, data);
+	if(extrafiles) {
+	    SetDlgItemText(hwnd, IDC_FILELIST, extrafiles);
+	}
     }
     if(message == WM_COMMAND) {
 	if((wParam&0xffff) == IDC_DELETEEXTRA) {
@@ -790,6 +807,7 @@ static void remove_self()
     fprintf(fp, "del \"%s\"\n", exename);
     fprintf(fp, "if exist \"%s\" goto Repeat\n", exename);
     fprintf(fp, "del \"%s\"\n", batname);
+    fprintf(fp, "rmdir \"%s\"\n", install_path);
     fclose(fp);
 
     STARTUPINFO si;