X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=installer%2Finstaller.c;h=d22efd56f115fa4f40001f2d1c1a3f63391e156b;hp=dc6f36a0db6115c1e4e2cae7dbc5d3fef0db8b49;hb=4372ebe4a0e2197cf8f9e5f7af1decadf7ef44f6;hpb=0276f28a3a85eb904c4a57042c4cafb7d031a0d7 diff --git a/installer/installer.c b/installer/installer.c index dc6f36a..d22efd5 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 + Copyright (c) 2004-2008 Matthias Kramm 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 @@ -26,105 +26,146 @@ #include #include #include "installer.h" - -#include "../config.h" //for swftools version +#ifndef DEINSTALL +#include "archive.h" +#endif +#include "utils.h" static int config_forAllUsers = 0; static int config_createLinks = 0; static int config_createStartmenu = 1; static int config_createDesktop = 1; +static int config_deleteextra = 1; static char path_startmenu[MAX_PATH] = "\0"; static char path_desktop[MAX_PATH] = "\0"; static char path_programfiles[MAX_PATH] = "\0"; -extern char*crndata; -extern int crndata_len; -extern int crn_decompressed_size; - -extern char*license_text; - -static char*install_path = "c:\\swftools\\"; static char pathBuf[MAX_PATH]; static int do_abort = 0; +static char* pdf2swf_dir; static char* pdf2swf_path; +static char registry_path[1024]; + +static char elevated = 0; + +static char*install_path = "c:\\swftools\\"; +#define SOFTWARE_DOMAIN "quiss.org" +#define SOFTWARE_NAME "SWFTools" +#define INSTALLER_NAME "SWFTools Installer" + static HBITMAP logo = 0; static HINSTANCE me; #define USER_SETMESSAGE 0x7f01 -static void tball(HDC hdc, double px, double py, double sx, double sy) +#ifndef DEINSTALL +extern char*crndata; +extern int crndata_len; +extern int crn_decompressed_size; +extern char*license_text; + +#include "background.c" +#endif + +typedef struct _filelist +{ + const char*filename; + struct _filelist*next; + char type; +} filelist_t; + +static filelist_t* registerFile(filelist_t*next, const char*filename, char type) +{ + filelist_t*file = malloc(sizeof(filelist_t)); + file->filename = strdup(filename); + file->type = type; + file->next = next; + return file; +} + +static filelist_t* readFileList(char*filename) +{ + FILE*fi = fopen(filename, "rb"); + if(!fi) { + return 0; + } + fseek(fi, 0, SEEK_END); + int len = ftell(fi); + fseek(fi, 0, SEEK_SET); + char*data = malloc(len+1); + fread(data, len, 1, fi); + fclose(fi); + int t=0; + char*line = data; + filelist_t*list = 0,*lpos=0;; + while(ttype=line[0]; + f->filename=strdup(line+2); + f->next = 0; + if(!list) { + list = lpos = f; + } else { + lpos->next = f; + lpos = f; + } + } else { + // skip line- this usually only happens if somebody tampered + // with the file + } + while(ttype, file->filename); + file = file->next; + } + fclose(fi); +} + +static filelist_t*installedFiles = 0; + +static void addFile(const char*filename) { - int l1 = strlen(base); - int l2 = strlen(add); - int pos = 0; - char*n = 0; - while(l1 && base[l1-1] == '\\') - l1--; - while(pos < l2 && add[pos] == '\\') - pos++; - - n = (char*)malloc(l1 + (l2-pos) + 2); - memcpy(n,base,l1); - n[l1]='\\'; - strcpy(&n[l1+1],&add[pos]); - return n; + installedFiles = registerFile(installedFiles, filename, 'F'); +} +static void addDir(const char*filename) +{ + installedFiles = registerFile(installedFiles, filename, 'D'); } static void handleTemplateFile(const char*filename) { FILE*fi = fopen(filename, "rb"); - fseek(fi, SEEK_END, 0); + fseek(fi, 0, SEEK_END); int len = ftell(fi); - fseek(fi, SEEK_SET, 0); - char*file = malloc(len); + fseek(fi, 0, SEEK_SET); + char*file = malloc(len+1); fread(file, len, 1, fi); fclose(fi); int l = strlen(install_path); @@ -148,6 +189,39 @@ static void handleTemplateFile(const char*filename) free(file); } +static int setRegistryEntry(char*key,char*value) +{ + HKEY hkey1; + HKEY hkey2; + int ret1 = -1, ret2= -1; + ret1 = RegCreateKey(HKEY_CURRENT_USER, key, &hkey1); + if(config_forAllUsers) { + ret2 = RegCreateKey(HKEY_LOCAL_MACHINE, key, &hkey2); + } + + if(ret1 && ret2) { + fprintf(stderr, "registry: CreateKey %s failed\n", key); + return 0; + } + if(ret1) { + installedFiles = registerFile(installedFiles, key, 'k'); + } + if(ret2) { + installedFiles = registerFile(installedFiles, key, 'K'); + } + + if(!ret1) + ret1 = RegSetValue(hkey1, NULL, REG_SZ, value, strlen(value)+1); + if(!ret2) + ret2 = RegSetValue(hkey2, NULL, REG_SZ, value, strlen(value)+1); + if(ret1 && ret2) { + fprintf(stderr, "registry: SetValue %s failed\n", key); + return 0; + } + return 1; +} + + static char* getRegistryEntry(char*path) { int res = 0; @@ -183,72 +257,19 @@ static char* getRegistryEntry(char*path) } } -static int setRegistryEntry(char*key,char*value) +static int has_full_access = 0; +static char hasFullAccess() { - HKEY hkey1; - HKEY hkey2; - int ret1 = -1, ret2= -1; - ret1 = RegCreateKey(HKEY_CURRENT_USER, key, &hkey1); - if(config_forAllUsers) { - ret2 = RegCreateKey(HKEY_LOCAL_MACHINE, key, &hkey2); - } - - if(ret1 && ret2) { - fprintf(stderr, "registry: CreateKey %s failed\n", key); - return 0; - } - if(!ret1) - ret1 = RegSetValue(hkey1, NULL, REG_SZ, value, strlen(value)+1); - if(!ret2) - ret2 = RegSetValue(hkey2, NULL, REG_SZ, value, strlen(value)+1); - if(ret1 && ret2) { - fprintf(stderr, "registry: SetValue %s failed\n", key); - return 0; - } - return 1; -} - -static HWND wnd_background = 0; -LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - if(message == WM_CREATE) { - CREATESTRUCT*cs = ((LPCREATESTRUCT)lParam); - if(cs->lpCreateParams && !strcmp((char*)cs->lpCreateParams, "background")) { - wnd_background = hwnd; - } - } - if(hwnd == wnd_background && message == WM_PAINT) { - HDC hdc; - PAINTSTRUCT ps; - RECT rc; - GetWindowRect(hwnd, &rc); - int width = rc.right - rc.left; - int height = rc.bottom - rc.top; - - hdc = BeginPaint(hwnd, &ps); - SetBkMode(hdc, TRANSPARENT); - - double s = width / 1282.0; - - HPEN pen0 = CreatePen(PS_SOLID, 2, RGB(0, 32, 128)); - HPEN oldPen = (HPEN)SelectObject(hdc, pen0); - tball(hdc, 0.7*width,0.2*height,s,s); - - HPEN pen1 = CreatePen(PS_SOLID, 2, RGB(0, 48, 128)); - (HPEN)SelectObject(hdc, pen1); - tball(hdc, 0.233*width,0.3*height,s*2,s*2); - - HPEN pen2 = CreatePen(PS_SOLID, 2, RGB(0, 64, 128)); - (HPEN)SelectObject(hdc, pen2); - tball(hdc, width, 1.2*height,s*3,-s*3); - - SelectObject(hdc, oldPen); - DeleteObject(pen1); - DeleteObject(pen2); - EndPaint(hwnd, &ps); - return 1; + /* find out whether we can write keys in HKEY_LOCAL_MACHINE */ + HKEY hKey; + int ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, + KEY_CREATE_SUB_KEY, &hKey); + if(!ret) { + RegCloseKey(hKey); + return 1; + } else { + return 0; } - return DefWindowProc(hwnd, message, wParam, lParam); } void processMessages() @@ -265,13 +286,14 @@ void processMessages() int addRegistryEntries(char*install_dir) { int ret; - ret = setRegistryEntry("Software\\quiss.org\\swftools\\InstallPath", install_dir); + ret = setRegistryEntry(registry_path, install_dir); if(!ret) return 0; return 1; } int CreateShortcut(char*path, char*description, char*filename, char*arguments, int iconindex, char*iconpath, char*workdir) { + printf("Creating %s -> %s\n", filename, path); WCHAR wszFilename[MAX_PATH]; IShellLink *ps1 = NULL; IPersistFile *pPf = NULL; @@ -303,6 +325,7 @@ int CreateShortcut(char*path, char*description, char*filename, char*arguments, i } pPf->lpVtbl->Release(pPf); ps1->lpVtbl->Release(ps1); + addFile(filename); return 1; } @@ -314,6 +337,7 @@ static int CreateURL(const char*url, const char*path) fprintf(fi, "[InternetShortcut]\r\n"); fprintf(fi, "URL=http://localhost:8081/\r\n"); fclose(fi); + addFile(path); return 1; } @@ -343,6 +367,7 @@ BOOL CALLBACK PropertySheetFuncCommon(HWND hwnd, UINT message, WPARAM wParam, LP return FALSE; } +#ifndef DEINSTALL BOOL CALLBACK PropertySheetFunc1(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if(message == WM_INITDIALOG) { SetDlgItemText(hwnd, IDC_LICENSE, license_text); @@ -353,7 +378,6 @@ BOOL CALLBACK PropertySheetFunc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM if(message == WM_INITDIALOG) { SetDlgItemText(hwnd, IDC_INSTALL_PATH, install_path); - config_forAllUsers = 0; SendDlgItemMessage(hwnd, IDC_ALLUSERS, BM_SETCHECK, config_forAllUsers, 0); SendDlgItemMessage(hwnd, IDC_CURRENTUSER, BM_SETCHECK, config_forAllUsers^1, 0); } @@ -365,12 +389,9 @@ BOOL CALLBACK PropertySheetFunc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM browse.pszDisplayName = (CHAR*)malloc(MAX_PATH); memset(browse.pszDisplayName, 0, MAX_PATH); browse.lpszTitle = "Select installation directory"; - printf("Start browsing %s\n", browse.pszDisplayName); browse.pidlRoot = SHBrowseForFolder(&browse); - printf("Browsing returns %s / %08x\n", browse.pszDisplayName, browse.pidlRoot); if(browse.pszDisplayName) { if(SHGetPathFromIDList(browse.pidlRoot, browse.pszDisplayName)) { - printf("Path is %s\n", browse.pszDisplayName); install_path = browse.pszDisplayName; int l = strlen(install_path); while(l && install_path[l-1]=='\\') { @@ -404,31 +425,68 @@ BOOL CALLBACK PropertySheetFunc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM return 0; } } + if(message == WM_NOTIFY && (((LPNMHDR)lParam)->code == PSN_SETACTIVE)) { + if(!elevated && !has_full_access) { + OSVERSIONINFO winverinfo; + memset(&winverinfo, 0, sizeof(OSVERSIONINFO)); + winverinfo.dwOSVersionInfoSize = sizeof(winverinfo); + if (GetVersionEx(&winverinfo) && winverinfo.dwMajorVersion >= 5) { + /* we're on Vista, were asked to install for all users, but don't have + priviledges to do so. Ask to spawn the process elevated. */ + char exename[MAX_PATH]; + GetModuleFileName(NULL, exename, sizeof(exename)); + if((int)ShellExecute(0, "runas", exename, "elevated", NULL, SW_SHOWNORMAL)>32) { + /* that worked- the second process will do the work */ + exit(0); + } + } + } + } return PropertySheetFuncCommon(hwnd, message, wParam, lParam, PSWIZB_BACK|PSWIZB_NEXT); } HWND statuswnd; static int progress_pos = 0; -void PropertyArchiveStatus(int type, char*text) + +void PropertyArchiveError(char*text) { - if(text && text[0]=='[') return; - SetDlgItemText(statuswnd, IDC_INFO, strdup(text)); - int t; - /* There are usually 4 messages, and a range of 40 to fill, so - step 9 times */ - for(t=0;t<10;t++) { - SendDlgItemMessage(statuswnd, IDC_PROGRESS, PBM_SETPOS, ++progress_pos, 0); - processMessages(); - Sleep(30); - } - if(type<0) { - while(1) { - int ret = MessageBox(0, text, "Error", MB_RETRYCANCEL|MB_ICONERROR); - if(ret==IDRETRY) continue; - else break; - } + while(1) { + int ret = MessageBox(0, text, "Error", MB_RETRYCANCEL|MB_ICONERROR); + if(ret==IDRETRY) continue; + else break; } } +void PropertyArchive_NewFile(char*filename) +{ + addFile(filename); + processMessages(); +} +void PropertyArchive_NewDirectory(char*filename) +{ + addDir(filename); + processMessages(); +} + +static int lastlen = 0; +void PropertyArchiveStatus(int pos, int len) +{ + if(len!=lastlen) { + SendDlgItemMessage(statuswnd, IDC_PROGRESS, PBM_SETRANGE, 0, (LPARAM)MAKELONG(0,len)); + lastlen = len; + } + SendDlgItemMessage(statuswnd, IDC_PROGRESS, PBM_SETPOS, pos, 0); + processMessages(); + Sleep(30); +} +void PropertyArchiveMessage(char*text) +{ + if(text && text[0]=='[') { + return; + } + SetDlgItemText(statuswnd, IDC_INFO, strdup(text)); + processMessages(); +} + void print_space(char*dest, char*msg, ULONGLONG size) { if(size < 1024) @@ -455,8 +513,20 @@ BOOL CALLBACK PropertySheetFunc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM available.QuadPart=0; total.QuadPart=0; totalfree.QuadPart=0; - GetDiskFreeSpaceEx(install_path, &available, &total, &totalfree); - print_space(buf, "Space available: ", available.QuadPart); + if(GetDiskFreeSpaceEx(install_path, &available, &total, &totalfree)) { + print_space(buf, "Space available: ", available.QuadPart); + } else { + sprintf(buf, "Space available: [Error %d]", GetLastError()); + if((GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND) + && install_path[0] && install_path[1]==':') { + /* installation directory does not yet exist */ + char path[3]={'c',':',0}; + path[0] = install_path[0]; + if(GetDiskFreeSpaceEx(path, &available, &total, &totalfree)) { + print_space(buf, "Space available: ", available.QuadPart); + } + } + } SetDlgItemText(hwnd, IDC_SPACE2, buf); } if(message == WM_NOTIFY && (((LPNMHDR)lParam)->code == PSN_WIZNEXT)) { @@ -464,14 +534,18 @@ BOOL CALLBACK PropertySheetFunc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM SetDlgItemText(hwnd, IDC_SPACE2, ""); PropSheet_SetWizButtons(dialog, 0); SendMessage(dialog, PSM_CANCELTOCLOSE, 0, 0); //makes wine display a warning - SetDlgItemText(hwnd, IDC_TITLE, "Installing files..."); + SetDlgItemText(hwnd, IDC_TITLE, "Installing..."); statuswnd = hwnd; - SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0, (LPARAM)MAKELONG(0,40)); - progress_pos = 0; - SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, progress_pos, 0); - int success = unpack_archive(crndata, crndata_len, install_path, PropertyArchiveStatus); + status_t status; + status.status = PropertyArchiveStatus; + status.message = PropertyArchiveMessage; + status.error = PropertyArchiveError; + status.new_file = PropertyArchive_NewFile; + status.new_directory = PropertyArchive_NewDirectory; + int success = unpack_archive(crndata, crndata_len, install_path, &status); + memset(&status, 0, sizeof(status_t)); if(!success) { - MessageBox(0, "Couldn't extract all installation files", "SWFTools Install", MB_OK|MB_ICONERROR); + MessageBox(0, "Couldn't extract all installation files", INSTALLER_NAME, MB_OK|MB_ICONERROR); do_abort=1; exit(1); } @@ -484,31 +558,40 @@ static HRESULT (WINAPI *f_SHGetSpecialFolderPath)(HWND hwnd, LPTSTR lpszPath, in BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if(message == WM_INITDIALOG) { - pdf2swf_path = concatPaths(install_path, "pdf2swf_gui.exe"); + pdf2swf_dir = install_path; //concatPaths(install_path, "gpdf2swf"); + pdf2swf_path = concatPaths(pdf2swf_dir, "gpdf2swf.exe"); FILE*fi = fopen(pdf2swf_path, "rb"); if(fi) { printf("a GUI program exists, creating desktop/startmenu links\n"); config_createLinks = 1; fclose(fi); + } else { + config_createLinks = 0; + config_createStartmenu = 0; + config_createDesktop = 0; } if(!config_createLinks) { - SendDlgItemMessage(hwnd, IDC_STARTMENU, SW_HIDE, 0, 0); - SendDlgItemMessage(hwnd, IDC_DESKTOP, SW_HIDE, 0, 0); + SendDlgItemMessage(hwnd, IDC_STARTMENU, BN_DISABLE, 0, 0); + SendDlgItemMessage(hwnd, IDC_DESKTOP, BN_DISABLE, 0, 0); } SendDlgItemMessage(hwnd, IDC_STARTMENU, BM_SETCHECK, config_createStartmenu, 0); - SendDlgItemMessage(hwnd, IDC_DESKTOP, BM_SETCHECK, config_createStartmenu, 0); + SendDlgItemMessage(hwnd, IDC_DESKTOP, BM_SETCHECK, config_createDesktop, 0); } if(message == WM_COMMAND) { if((wParam&0xffff) == IDC_STARTMENU) { config_createStartmenu = SendDlgItemMessage(hwnd, IDC_STARTMENU, BM_GETCHECK, 0, 0); - config_createStartmenu^=1; + if(config_createLinks) { + config_createStartmenu^=1; + } SendDlgItemMessage(hwnd, IDC_STARTMENU, BM_SETCHECK, config_createStartmenu, 0); return 0; } if((wParam&0xffff) == IDC_DESKTOP) { config_createDesktop = SendDlgItemMessage(hwnd, IDC_DESKTOP, BM_GETCHECK, 0, 0); - config_createDesktop^=1; + if(config_createLinks) { + config_createDesktop^=1; + } SendDlgItemMessage(hwnd, IDC_DESKTOP, BM_SETCHECK, config_createDesktop, 0); return 0; } @@ -516,7 +599,7 @@ BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM if(message == WM_NOTIFY && (((LPNMHDR)lParam)->code == PSN_WIZFINISH)) { if(!addRegistryEntries(install_path)) { - MessageBox(0, "Couldn't create Registry Entries", "SWFTools Install", MB_OK|MB_ICONERROR); + MessageBox(0, "Couldn't create Registry Entries", INSTALLER_NAME, MB_OK|MB_ICONERROR); return 1; } @@ -535,32 +618,175 @@ BOOL CALLBACK PropertySheetFunc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM if(!path_desktop[0]) { f_SHGetSpecialFolderPath(NULL, path_desktop, CSIDL_DESKTOPDIRECTORY, 0); } + + char*uninstall_path = concatPaths(install_path, "uninstall.exe"); if(config_createLinks) { if(config_createDesktop && path_desktop[0]) { char* linkName = concatPaths(path_desktop, "pdf2swf.lnk"); printf("Creating desktop link %s -> %s\n", linkName, pdf2swf_path); - if(!CreateShortcut(pdf2swf_path, "pdf2swf", linkName, 0, 0, 0, install_path)) { - MessageBox(0, "Couldn't create desktop shortcut", "Install.exe", MB_OK); + if(!CreateShortcut(pdf2swf_path, "pdf2swf", linkName, 0, 0, 0, pdf2swf_dir)) { + MessageBox(0, "Couldn't create desktop shortcut", INSTALLER_NAME, MB_OK); return 1; } } if(config_createStartmenu && path_startmenu[0]) { char* group = concatPaths(path_startmenu, "pdf2swf"); CreateDirectory(group, 0); + addDir(group); char* linkName = concatPaths(group, "pdf2swf.lnk"); - printf("Creating %s -> %s\n", linkName, pdf2swf_path); - if(!CreateShortcut(pdf2swf_path, "pdf2swf", linkName, 0, 0, 0, install_path)) { - MessageBox(0, "Couldn't create start menu entry", "Install.exe", MB_OK); + if(!CreateShortcut(pdf2swf_path, "pdf2swf", concatPaths(group, "pdf2swf.lnk"), 0, 0, 0, pdf2swf_dir) || + !CreateShortcut(uninstall_path, "uninstall", concatPaths(group, "uninstall.lnk"), 0, 0, 0, install_path)) { + MessageBox(0, "Couldn't create start menu entry", INSTALLER_NAME, MB_OK); return 1; } } } else { printf("not creating desktop/startmenu links\n"); } + + char*uninstall_ini = concatPaths(install_path, "uninstall.ini"); + addFile(uninstall_ini); + writeFileList(installedFiles, uninstall_ini); + } + return PropertySheetFuncCommon(hwnd, message, wParam, lParam, PSWIZB_FINISH); +} +#endif + +#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); + /* always try to remove directories- if they are empty, this + will work, and they won't prevent superdirectory deletion later */ + 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) { + SetDlgItemText(hwnd, IDC_INFO, "Ready to uninstall"); + } + if(message == WM_NOTIFY && (((LPNMHDR)lParam)->code == PSN_WIZNEXT)) { + + filelist_t* list = readFileList("uninstall.ini"); + if(!list) { + list = readFileList(concatPaths(install_path, "uninstall.ini")); + if(!list) { + //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; + int num = 0; + while(l) {num++;l=l->next;} + + PropSheet_SetWizButtons(dialog, 0); + SendMessage(dialog, PSM_CANCELTOCLOSE, 0, 0); + SetDlgItemText(hwnd, IDC_TITLE, "Uninstalling files..."); + SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0, (LPARAM)MAKELONG(0,num)); + num = 0; + l = list; + while(l) { + SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, num, 0); + if(l->type=='F') + DeleteFile(l->filename); + else if(l->type=='D') + RemoveDirectory(l->filename); + else if(l->type=='I') + /* skip- we will remove ourselves later */; + 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); +} + +BOOL CALLBACK PropertySheetFunc6(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { + if(message == WM_INITDIALOG) { + SendDlgItemMessage(hwnd, IDC_DELETEEXTRA, BM_SETCHECK, config_deleteextra, 0); + if(extrafiles) { + SetDlgItemText(hwnd, IDC_FILELIST, extrafiles); + } + } + if(message == WM_COMMAND) { + if((wParam&0xffff) == IDC_DELETEEXTRA) { + config_deleteextra = SendDlgItemMessage(hwnd, IDC_DELETEEXTRA, BM_GETCHECK, 0, 0); + config_deleteextra ^=1; + SendDlgItemMessage(hwnd, IDC_DELETEEXTRA, BM_SETCHECK, config_deleteextra, 0); + return 0; + } + } + if(message == WM_NOTIFY && (((LPNMHDR)lParam)->code == PSN_WIZNEXT)) { + if(config_deleteextra) { + int pos = 0; + findfiles(install_path, &pos, 0, 0, 1); + } + } + return PropertySheetFuncCommon(hwnd, message, wParam, lParam, PSWIZB_NEXT); +} + +BOOL CALLBACK PropertySheetFunc7(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { + if(message == WM_INITDIALOG) { + // ... } return PropertySheetFuncCommon(hwnd, message, wParam, lParam, PSWIZB_FINISH); } +#endif #ifndef PSP_HIDEHEADER #define PSP_HIDEHEADER 2048 @@ -576,12 +802,33 @@ void runPropertySheet(HWND parent) PROPSHEETHEADER sheet; wizardpage_t wpage[5] = { +#ifndef DEINSTALL {PropertySheetFunc1, IDD_LICENSE}, {PropertySheetFunc2, IDD_INSTALLDIR}, {PropertySheetFunc3, IDD_PROGRESS}, {PropertySheetFunc4, IDD_FINISH}, +#else + {PropertySheetFunc5, IDD_SURE}, + {PropertySheetFunc6, IDD_EXTRAFILES}, + {PropertySheetFunc7, IDD_DEINSTALLED}, +#endif }; + int num = sizeof(wpage)/sizeof(wpage[0]); + +#ifndef DEINSTALL + if(elevated) { + /* remove license. + TODO: remove installdir querying, too (pass installdir + to second process) */ + int t; + for(t=1;t 320) - xx = r.right - r.left; - if(r.right - r.left > 200) - yy = r.bottom - r.top; - - int ret = 0; runPropertySheet(background); - - return ret; + return 0; } - +#endif