fixed XP uninstall and prepared for 1.2 releaseHEAD1.2master

git-svn-id: http://svn.klever.net/kin/klog/trunk@136 fe716a7a-6dde-0310-88d9-d003556173a8

1 files changed, 8 insertions, 1 deletions

diff --git a/install/install.cpp b/install/install.cpp
index 81d5a7e..82811b9 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,70 +1,77 @@
 #include "resource.h"
 #include "../shared-code/install.h"
 

-#define	KINAME	"KLog 1.1.1-trunk"

+#define VERSION "1.2"

+#define	KINAME	"KLog " VERSION

 #define SKINAME	"KLog"

 
 BOOL Install(void)
 {
 STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path");

 STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");

 LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");

 STRING path = REQUESTPATH("  " KINAME,"\nEnter destination path:",qPath);

 	if(!path)

 		return NULL;

 #ifdef	K_ANNED

 STRING sysDir(_MAX_PATH);

 	GetSystemDirectory(sysDir,_MAX_PATH);

 	INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");

 #endif

 

 	MAKE_PATH(path);

 STRING shortPath = GET_SHORT_PATH(path);

 	if(!shortPath){

 		MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 	}

 

 	if(!(

 		INSTALLFILE(SKINAME ".ex_",path, SKINAME ".exe") &&

 		INSTALLFILE(SKINAME ".hl_",path, SKINAME ".hlp") && 

 		INSTALLFILE(SKINAME ".cn_",path, SKINAME ".cnt")

 	)){

 		MessageBox(NULL,"Failed to install " KINAME "in specified directory",NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 	}

 

 	ADDMENU("Klever Group",SKINAME,path,SKINAME ".exe");

 	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path);

 	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);

 

 FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");

 	if(!inf){

 		MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 

 	}

 

 	INF_FILE_HEADER(inf);

 	INF_FILE_SECTION(inf,"Uninstall");

 	fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");

 

 	INF_FILE_SECTION(inf,"kFiles");

 	INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath);

 	INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe");

 	INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME);

 	INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf");

 

 	INF_FILE_SECTION(inf,"kReg");

 	INF_UNINSTALL_REG(inf,SKINAME);

 

 	INF_FILE_SECTION(inf,"kMenu");

 	INF_MENU_GROUP(inf,1,"Klever Group");

 	INF_MENU_ITEM(inf,1,SKINAME);

 	fclose(inf);

 	REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");

+    REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);

+    REG_UNINSTALL_COMMENT(SKINAME,"Klever " KINAME);

+    REG_UNINSTALL_VERSION(SKINAME,VERSION);

+    REG_UNINSTALL_LOCATION(SKINAME,path);

+    REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");

+    REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/klog/");

 

 	MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu, move it to your Startup group or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);

 

 	return TRUE;

 }