XP uninstall fixed and 2.6 release ready

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@134 fe716a7a-6dde-0310-88d9-d003556173a8
author: Michael Krelin <hacker@klever.net> 2005-08-06 13:52:52 (UTC)
committer: Michael Krelin <hacker@klever.net> 2005-08-06 13:52:52 (UTC)
commit: 79e1fbc641b946452a37f2dbf845b0d86ccc3c53 (patch) (unidiff)
tree: 7bf6da3a4ac8dfbb1122e33273566d5c7d3f20d4
parent: 81636a2fb6f93863cdca3fdad8ff3df753b17d5e (diff)
download: pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.zip
pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.gz
pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.bz2
7 files changed, 61 insertions, 35 deletions
diff --git a/COPYING b/COPYING
index e7ef42e..b830fe7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 1997-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1997-2005 Klever Group (http://www.klever.net/)
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/KTAGS b/KTAGS
index 36d22e5..b27cd12 100644
--- a/KTAGS
+++ b/KTAGS
@@ -2,7 +2,7 @@ about-date	pumpkin.rc	/LTEXT\s\+"Copyright /;"	kind:d
        about-version   pumpkin.rc      /LTEXT\s\+"PumpKIN, Version /;"kind:v
        help-license-date       ./help/pumpkin.xml      /<license\s/;"kind:d
        help-news       ./help/pumpkin.xml/<newsfor\s/
-        install-version         ./install/install.cpp   /^#define\s\+KINAME\s\+"/;"kind:v
+        install-version         ./install/install.cpp   /^#define\s\+VERSION\s\+"/;"kind:v
        install-vsinfo-date     install/install.rc      /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d
        install-vsinfo-numeric-version  install/install.rc      /^\s\+FILEVERSION\s\+/;"kind:v
        install-vsinfo-string-version   install/install.rc      /^\s\+VALUE\s\+"FileVersion",/;"kind:v
diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 2ccd23a..d283fcd 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -5,10 +5,15 @@
  <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>
  <p/>
  <p><b><i>Enjoy!</i></b></p>
-  <license years="1997-2004"/>
+  <license years="1997-2005"/>
  <credist/>
 </topic>
 <topic id="News" title="What's New">
+  <newsfor version="2.6" date="August 6th, 2005">
+   <ni>more robust solution to the backslash/slash dilemma</ni>
+   <ni>A bit more elaborate error reporting</ni>
+   <ni>Fixed uninstall procedure so that it works on XP</ni>
+  </newfor>
  <newsfor version="2.5" date="July 11th, 2004">
   <ni>Change of <a href="#About">license</a> and opening the source.</ni>
   <ni>Minor cosmetic changes</ni>
diff --git a/install/install.cpp b/install/install.cpp
index 6fa4ae4..d11de03 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,7 +1,8 @@
 #include "resource.h"
 #include "../shared-code/install.h"
-        #defineKINAME "PumpKIN 2.5.1-trunk"
+#define VERSION "2.6"
+        #defineKINAME "PumpKIN " VERSION
 #define SKINAME "PumpKIN"
 BOOL Install(void)
@@ -60,6 +61,12 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
        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 PumpKIN");
+    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/pumpkin/");
        MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);
diff --git a/install/install.rc b/install/install.rc
index 30907ad..cc621ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -131,8 +131,8 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
+ FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,5,1,0
+ PRODUCTVERSION 2,6,0,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -149,13 +149,13 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
            VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
-            VALUE "FileVersion", "2, 5, 1, 0\0"
+            VALUE "FileVersion", "2, 6, 0, 0\0"
            VALUE "InternalName", "INSTALL\0"
-            VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net/)\0"
+            VALUE "LegalCopyright", "Copyright � 1997-2005 Klever Group (http://www.klever.net/)\0"
            VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
            VALUE "OriginalFilename", "INSTALL.EXE\0"
            VALUE "ProductName", "PumpKIN\0"
-            VALUE "ProductVersion", "2, 5, 1, 0\0"
+            VALUE "ProductVersion", "2, 6, 0, 0\0"
        END
    END
    BLOCK "VarFileInfo"
diff --git a/pumpkin.mak b/pumpkin.mak
index 9a40fa2..bd466fe 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -39,9 +39,9 @@ NULL=nul
 ################################################################################
 # Begin Project
 # PROP Target_Last_Scanned "Install - Win32 Canned"
+CPP=cl.exe
 RSC=rc.exe
 MTL=mktyplib.exe
-CPP=cl.exe
 !IF  "$(CFG)" == "PumpKIN - Win32 Release"
@@ -77,7 +77,7 @@ CLEAN :
        -@erase "$(INTDIR)\pumpkin.hlp"
        -@erase "$(INTDIR)\PumpKIN.obj"
        -@erase "$(INTDIR)\pumpkin.pch"
-        -@erase "$(INTDIR)\PumpKIN.res"
+        -@erase "$(INTDIR)\pumpkin.res"
        -@erase "$(INTDIR)\PumpKINDlg.obj"
        -@erase "$(INTDIR)\RequestDlg.obj"
        -@erase "$(INTDIR)\Resolver.obj"
@@ -102,7 +102,7 @@ CPP_SBRS=.\.
 MTL_PROJ=/nologo /D "NDEBUG" /win32 
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
 # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" /d "_AFXDLL" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" /d "_AFXDLL" 
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -121,7 +121,7 @@ LINK32_OBJS= \
        "$(INTDIR)\PropsServer.obj" \
        "$(INTDIR)\PropsSounds.obj" \
        "$(INTDIR)\PumpKIN.obj" \
-        "$(INTDIR)\PumpKIN.res" \
+        "$(INTDIR)\pumpkin.res" \
        "$(INTDIR)\PumpKINDlg.obj" \
        "$(INTDIR)\RequestDlg.obj" \
        "$(INTDIR)\Resolver.obj" \
@@ -185,7 +185,7 @@ CLEAN :
        -@erase "$(INTDIR)\pumpkin.hlp"
        -@erase "$(INTDIR)\PumpKIN.obj"
        -@erase "$(INTDIR)\pumpkin.pch"
-        -@erase "$(INTDIR)\PumpKIN.res"
+        -@erase "$(INTDIR)\pumpkin.res"
        -@erase "$(INTDIR)\PumpKIN.sbr"
        -@erase "$(INTDIR)\PumpKINDlg.obj"
        -@erase "$(INTDIR)\PumpKINDlg.sbr"
@@ -222,7 +222,7 @@ CPP_SBRS=.\Debug/
 MTL_PROJ=/nologo /D "_DEBUG" /win32 
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "_DEBUG" /d "_AFXDLL" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "_DEBUG" /d "_AFXDLL" 
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -258,7 +258,7 @@ LINK32_OBJS= \
        "$(INTDIR)\PropsServer.obj" \
        "$(INTDIR)\PropsSounds.obj" \
        "$(INTDIR)\PumpKIN.obj" \
-        "$(INTDIR)\PumpKIN.res" \
+        "$(INTDIR)\pumpkin.res" \
        "$(INTDIR)\PumpKINDlg.obj" \
        "$(INTDIR)\RequestDlg.obj" \
        "$(INTDIR)\Resolver.obj" \
@@ -316,7 +316,7 @@ CLEAN :
        -@erase "$(INTDIR)\pumpkin.hlp"
        -@erase "$(INTDIR)\PumpKIN.obj"
        -@erase "$(INTDIR)\pumpkin.pch"
-        -@erase "$(INTDIR)\PumpKIN.res"
+        -@erase "$(INTDIR)\pumpkin.res"
        -@erase "$(INTDIR)\PumpKINDlg.obj"
        -@erase "$(INTDIR)\RequestDlg.obj"
        -@erase "$(INTDIR)\Resolver.obj"
@@ -340,7 +340,7 @@ CPP_SBRS=.\.
 MTL_PROJ=/nologo /D "NDEBUG" /win32 
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
 # ADD RSC /l 0x409 /d "NDEBUG"
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" 
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -359,7 +359,7 @@ LINK32_OBJS= \
        "$(INTDIR)\PropsServer.obj" \
        "$(INTDIR)\PropsSounds.obj" \
        "$(INTDIR)\PumpKIN.obj" \
-        "$(INTDIR)\PumpKIN.res" \
+        "$(INTDIR)\pumpkin.res" \
        "$(INTDIR)\PumpKINDlg.obj" \
        "$(INTDIR)\RequestDlg.obj" \
        "$(INTDIR)\Resolver.obj" \
@@ -461,22 +461,24 @@ LINK32_OBJS= \
 OUTDIR=.\Install\Pure
 INTDIR=.\Install\Pure
-ALL : "$(OUTDIR)\Install.exe"
+ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"
 CLEAN : 
        -@erase "$(INTDIR)\install.obj"
        -@erase "$(INTDIR)\Install.res"
+        -@erase "$(INTDIR)\install.sbr"
+        -@erase "$(OUTDIR)\Install.bsc"
        -@erase "$(OUTDIR)\Install.exe"
 "$(OUTDIR)" :
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /c
 CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
- "_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c 
+ "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c 
 CPP_OBJS=.\Install\Pure/
-CPP_SBRS=.\.
+CPP_SBRS=.\Install\Pure/
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /win32
 MTL_PROJ=/nologo /D "NDEBUG" /win32 
@@ -488,7 +490,13 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc" 
 BSC32_SBRS= \
-        
+        "$(INTDIR)\install.sbr"
+"$(OUTDIR)\Install.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib /nologo /subsystem:windows /machine:I386
@@ -829,21 +837,21 @@ DEP_RSC_PUMPKIN=\
 !IF  "$(CFG)" == "PumpKIN - Win32 Release"
-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
   $(RSC) $(RSC_PROJ) $(SOURCE)
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"
-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
   $(RSC) $(RSC_PROJ) $(SOURCE)
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"
-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
   $(RSC) $(RSC_PROJ) $(SOURCE)
@@ -1397,9 +1405,15 @@ DEP_CPP_INSTAL=\
 !ELSEIF  "$(CFG)" == "Install - Win32 Pure"
+BuildCmds= \
+        $(CPP) $(CPP_PROJ) $(SOURCE) \
+        
 "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
+   $(BuildCmds)
+"$(INTDIR)\install.sbr" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
+   $(BuildCmds)
 !ELSEIF  "$(CFG)" == "Install - Win32 Static"
diff --git a/pumpkin.rc b/pumpkin.rc
index 1bf0fd3..7dafe04 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -82,9 +82,9 @@ CAPTION "About PumpKIN"
 FONT 8, "MS Sans Serif"
 BEGIN
    ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20
-    LTEXT           "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,
+    LTEXT           "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
                    SS_NOPREFIX
-    LTEXT           "Copyright � 1997-2004 Klever Group",IDC_STATIC,40,30,
+    LTEXT           "Copyright � 1997-2005 Klever Group",IDC_STATIC,40,30,
                    170,8
    DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP
    PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
@@ -287,8 +287,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
+ FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,5,1,0
+ PRODUCTVERSION 2,6,0,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -305,13 +305,13 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
            VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
-            VALUE "FileVersion", "2, 5, 1, 0\0"
+            VALUE "FileVersion", "2, 6, 0, 0\0"
            VALUE "InternalName", "PUMPKIN\0"
-            VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net)\0"
+            VALUE "LegalCopyright", "Copyright � 1997-2005 Klever Group (http://www.klever.net)\0"
            VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
            VALUE "OriginalFilename", "PUMPKIN.EXE\0"
            VALUE "ProductName", "PumpKIN\0"
-            VALUE "ProductVersion", "2, 5, 1, 0\0"
+            VALUE "ProductVersion", "2, 6, 0, 0\0"
        END
    END
    BLOCK "VarFileInfo"
author	Michael Krelin <hacker@klever.net>	2005-08-06 13:52:52 (UTC)
committer	Michael Krelin <hacker@klever.net>	2005-08-06 13:52:52 (UTC)
commit	79e1fbc641b946452a37f2dbf845b0d86ccc3c53 (patch) (unidiff)
tree	7bf6da3a4ac8dfbb1122e33273566d5c7d3f20d4
parent	81636a2fb6f93863cdca3fdad8ff3df753b17d5e (diff)
download	pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.zip pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.gz pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.bz2

diff --git a/COPYING b/COPYING index e7ef42e..b830fe7 100644 --- a/COPYING +++ b/COPYING
@@ -1,4 +1,4 @@
1	Copyright (c) 1997-2004 Klever Group (http://www.klever.net/)	1	Copyright (c) 1997-2005 Klever Group (http://www.klever.net/)
2		2
3	Permission is hereby granted, free of charge, to any person obtaining a copy of	3	Permission is hereby granted, free of charge, to any person obtaining a copy of
4	this software and associated documentation files (the "Software"), to deal in	4	this software and associated documentation files (the "Software"), to deal in


diff --git a/KTAGS b/KTAGS index 36d22e5..b27cd12 100644 --- a/KTAGS +++ b/KTAGS
@@ -2,7 +2,7 @@ about-date pumpkin.rc /LTEXT\s\+"Copyright /;" kind:d
2	about-version pumpkin.rc /LTEXT\s\+"PumpKIN, Version /;"kind:v	2	about-version pumpkin.rc /LTEXT\s\+"PumpKIN, Version /;"kind:v
3	help-license-date ./help/pumpkin.xml /<license\s/;"kind:d	3	help-license-date ./help/pumpkin.xml /<license\s/;"kind:d
4	help-news ./help/pumpkin.xml/<newsfor\s/	4	help-news ./help/pumpkin.xml/<newsfor\s/
5	install-version ./install/install.cpp /^#define\s\+KINAME\s\+"/;"kind:v	5	install-version ./install/install.cpp /^#define\s\+VERSION\s\+"/;"kind:v
6	install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d	6	install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d
7	install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v	7	install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v
8	install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v	8	install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v


diff --git a/help/pumpkin.xml b/help/pumpkin.xml index 2ccd23a..d283fcd 100644 --- a/help/pumpkin.xml +++ b/help/pumpkin.xml
@@ -5,10 +5,15 @@
5	<p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>	5	<p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>
6	<p/>	6	<p/>
7	<p><b><i>Enjoy!</i></b></p>	7	<p><b><i>Enjoy!</i></b></p>
8	<license years="1997-2004"/>	8	<license years="1997-2005"/>
9	<credist/>	9	<credist/>
10	</topic>	10	</topic>
11	<topic id="News" title="What's New">	11	<topic id="News" title="What's New">
		12	<newsfor version="2.6" date="August 6th, 2005">
		13	<ni>more robust solution to the backslash/slash dilemma</ni>
		14	<ni>A bit more elaborate error reporting</ni>
		15	<ni>Fixed uninstall procedure so that it works on XP</ni>
		16	</newfor>
12	<newsfor version="2.5" date="July 11th, 2004">	17	<newsfor version="2.5" date="July 11th, 2004">
13	<ni>Change of <a href="#About">license</a> and opening the source.</ni>	18	<ni>Change of <a href="#About">license</a> and opening the source.</ni>
14	<ni>Minor cosmetic changes</ni>	19	<ni>Minor cosmetic changes</ni>


diff --git a/install/install.cpp b/install/install.cpp index 6fa4ae4..d11de03 100644 --- a/install/install.cpp +++ b/install/install.cpp
@@ -1,7 +1,8 @@
1	#include "resource.h"	1	#include "resource.h"
2	#include "../shared-code/install.h"	2	#include "../shared-code/install.h"
3		3
4	#defineKINAME "PumpKIN 2.5.1-trunk"	4	#define VERSION "2.6"
		5	#defineKINAME "PumpKIN " VERSION
5	#define SKINAME "PumpKIN"	6	#define SKINAME "PumpKIN"
6		7
7	BOOL Install(void)	8	BOOL Install(void)
@@ -60,6 +61,12 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
60	fclose(inf);	61	fclose(inf);
61		62
62	REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");	63	REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");
		64	REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);
		65	REG_UNINSTALL_COMMENT(SKINAME,"Klever PumpKIN");
		66	REG_UNINSTALL_VERSION(SKINAME,VERSION);
		67	REG_UNINSTALL_LOCATION(SKINAME,path);
		68	REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");
		69	REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/pumpkin/");
63		70
64	MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION\|MB_OK);	71	MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION\|MB_OK);
65		72


diff --git a/install/install.rc b/install/install.rc index 30907ad..cc621ad 100644 --- a/install/install.rc +++ b/install/install.rc
@@ -131,8 +131,8 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico
131	//	131	//
132		132
133	VS_VERSION_INFO VERSIONINFO	133	VS_VERSION_INFO VERSIONINFO
134	FILEVERSION 2,5,1,0	134	FILEVERSION 2,6,0,0
135	PRODUCTVERSION 2,5,1,0	135	PRODUCTVERSION 2,6,0,0
136	FILEFLAGSMASK 0x3fL	136	FILEFLAGSMASK 0x3fL
137	#ifdef _DEBUG	137	#ifdef _DEBUG
138	FILEFLAGS 0x1L	138	FILEFLAGS 0x1L
@@ -149,13 +149,13 @@ BEGIN
149	BEGIN	149	BEGIN
150	VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"	150	VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
151	VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"	151	VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
152	VALUE "FileVersion", "2, 5, 1, 0\0"	152	VALUE "FileVersion", "2, 6, 0, 0\0"
153	VALUE "InternalName", "INSTALL\0"	153	VALUE "InternalName", "INSTALL\0"
154	VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net/)\0"	154	VALUE "LegalCopyright", "Copyright � 1997-2005 Klever Group (http://www.klever.net/)\0"
155	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"	155	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
156	VALUE "OriginalFilename", "INSTALL.EXE\0"	156	VALUE "OriginalFilename", "INSTALL.EXE\0"
157	VALUE "ProductName", "PumpKIN\0"	157	VALUE "ProductName", "PumpKIN\0"
158	VALUE "ProductVersion", "2, 5, 1, 0\0"	158	VALUE "ProductVersion", "2, 6, 0, 0\0"
159	END	159	END
160	END	160	END
161	BLOCK "VarFileInfo"	161	BLOCK "VarFileInfo"


diff --git a/pumpkin.mak b/pumpkin.mak index 9a40fa2..bd466fe 100644 --- a/pumpkin.mak +++ b/pumpkin.mak
@@ -39,9 +39,9 @@ NULL=nul
39	################################################################################	39	################################################################################
40	# Begin Project	40	# Begin Project
41	# PROP Target_Last_Scanned "Install - Win32 Canned"	41	# PROP Target_Last_Scanned "Install - Win32 Canned"
		42	CPP=cl.exe
42	RSC=rc.exe	43	RSC=rc.exe
43	MTL=mktyplib.exe	44	MTL=mktyplib.exe
44	CPP=cl.exe
45		45
46	!IF "$(CFG)" == "PumpKIN - Win32 Release"	46	!IF "$(CFG)" == "PumpKIN - Win32 Release"
47		47
@@ -77,7 +77,7 @@ CLEAN :
77	-@erase "$(INTDIR)\pumpkin.hlp"	77	-@erase "$(INTDIR)\pumpkin.hlp"
78	-@erase "$(INTDIR)\PumpKIN.obj"	78	-@erase "$(INTDIR)\PumpKIN.obj"
79	-@erase "$(INTDIR)\pumpkin.pch"	79	-@erase "$(INTDIR)\pumpkin.pch"
80	-@erase "$(INTDIR)\PumpKIN.res"	80	-@erase "$(INTDIR)\pumpkin.res"
81	-@erase "$(INTDIR)\PumpKINDlg.obj"	81	-@erase "$(INTDIR)\PumpKINDlg.obj"
82	-@erase "$(INTDIR)\RequestDlg.obj"	82	-@erase "$(INTDIR)\RequestDlg.obj"
83	-@erase "$(INTDIR)\Resolver.obj"	83	-@erase "$(INTDIR)\Resolver.obj"
@@ -102,7 +102,7 @@ CPP_SBRS=.\.
102	MTL_PROJ=/nologo /D "NDEBUG" /win32	102	MTL_PROJ=/nologo /D "NDEBUG" /win32
103	# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"	103	# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
104	# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"	104	# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
105	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" /d "_AFXDLL"	105	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" /d "_AFXDLL"
106	BSC32=bscmake.exe	106	BSC32=bscmake.exe
107	# ADD BASE BSC32 /nologo	107	# ADD BASE BSC32 /nologo
108	# ADD BSC32 /nologo	108	# ADD BSC32 /nologo
@@ -121,7 +121,7 @@ LINK32_OBJS= \
121	"$(INTDIR)\PropsServer.obj" \	121	"$(INTDIR)\PropsServer.obj" \
122	"$(INTDIR)\PropsSounds.obj" \	122	"$(INTDIR)\PropsSounds.obj" \
123	"$(INTDIR)\PumpKIN.obj" \	123	"$(INTDIR)\PumpKIN.obj" \
124	"$(INTDIR)\PumpKIN.res" \	124	"$(INTDIR)\pumpkin.res" \
125	"$(INTDIR)\PumpKINDlg.obj" \	125	"$(INTDIR)\PumpKINDlg.obj" \
126	"$(INTDIR)\RequestDlg.obj" \	126	"$(INTDIR)\RequestDlg.obj" \
127	"$(INTDIR)\Resolver.obj" \	127	"$(INTDIR)\Resolver.obj" \
@@ -185,7 +185,7 @@ CLEAN :
185	-@erase "$(INTDIR)\pumpkin.hlp"	185	-@erase "$(INTDIR)\pumpkin.hlp"
186	-@erase "$(INTDIR)\PumpKIN.obj"	186	-@erase "$(INTDIR)\PumpKIN.obj"
187	-@erase "$(INTDIR)\pumpkin.pch"	187	-@erase "$(INTDIR)\pumpkin.pch"
188	-@erase "$(INTDIR)\PumpKIN.res"	188	-@erase "$(INTDIR)\pumpkin.res"
189	-@erase "$(INTDIR)\PumpKIN.sbr"	189	-@erase "$(INTDIR)\PumpKIN.sbr"
190	-@erase "$(INTDIR)\PumpKINDlg.obj"	190	-@erase "$(INTDIR)\PumpKINDlg.obj"
191	-@erase "$(INTDIR)\PumpKINDlg.sbr"	191	-@erase "$(INTDIR)\PumpKINDlg.sbr"
@@ -222,7 +222,7 @@ CPP_SBRS=.\Debug/
222	MTL_PROJ=/nologo /D "_DEBUG" /win32	222	MTL_PROJ=/nologo /D "_DEBUG" /win32
223	# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"	223	# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
224	# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"	224	# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
225	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "_DEBUG" /d "_AFXDLL"	225	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "_DEBUG" /d "_AFXDLL"
226	BSC32=bscmake.exe	226	BSC32=bscmake.exe
227	# ADD BASE BSC32 /nologo	227	# ADD BASE BSC32 /nologo
228	# ADD BSC32 /nologo	228	# ADD BSC32 /nologo
@@ -258,7 +258,7 @@ LINK32_OBJS= \
258	"$(INTDIR)\PropsServer.obj" \	258	"$(INTDIR)\PropsServer.obj" \
259	"$(INTDIR)\PropsSounds.obj" \	259	"$(INTDIR)\PropsSounds.obj" \
260	"$(INTDIR)\PumpKIN.obj" \	260	"$(INTDIR)\PumpKIN.obj" \
261	"$(INTDIR)\PumpKIN.res" \	261	"$(INTDIR)\pumpkin.res" \
262	"$(INTDIR)\PumpKINDlg.obj" \	262	"$(INTDIR)\PumpKINDlg.obj" \
263	"$(INTDIR)\RequestDlg.obj" \	263	"$(INTDIR)\RequestDlg.obj" \
264	"$(INTDIR)\Resolver.obj" \	264	"$(INTDIR)\Resolver.obj" \
@@ -316,7 +316,7 @@ CLEAN :
316	-@erase "$(INTDIR)\pumpkin.hlp"	316	-@erase "$(INTDIR)\pumpkin.hlp"
317	-@erase "$(INTDIR)\PumpKIN.obj"	317	-@erase "$(INTDIR)\PumpKIN.obj"
318	-@erase "$(INTDIR)\pumpkin.pch"	318	-@erase "$(INTDIR)\pumpkin.pch"
319	-@erase "$(INTDIR)\PumpKIN.res"	319	-@erase "$(INTDIR)\pumpkin.res"
320	-@erase "$(INTDIR)\PumpKINDlg.obj"	320	-@erase "$(INTDIR)\PumpKINDlg.obj"
321	-@erase "$(INTDIR)\RequestDlg.obj"	321	-@erase "$(INTDIR)\RequestDlg.obj"
322	-@erase "$(INTDIR)\Resolver.obj"	322	-@erase "$(INTDIR)\Resolver.obj"
@@ -340,7 +340,7 @@ CPP_SBRS=.\.
340	MTL_PROJ=/nologo /D "NDEBUG" /win32	340	MTL_PROJ=/nologo /D "NDEBUG" /win32
341	# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"	341	# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
342	# ADD RSC /l 0x409 /d "NDEBUG"	342	# ADD RSC /l 0x409 /d "NDEBUG"
343	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG"	343	RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG"
344	BSC32=bscmake.exe	344	BSC32=bscmake.exe
345	# ADD BASE BSC32 /nologo	345	# ADD BASE BSC32 /nologo
346	# ADD BSC32 /nologo	346	# ADD BSC32 /nologo
@@ -359,7 +359,7 @@ LINK32_OBJS= \
359	"$(INTDIR)\PropsServer.obj" \	359	"$(INTDIR)\PropsServer.obj" \
360	"$(INTDIR)\PropsSounds.obj" \	360	"$(INTDIR)\PropsSounds.obj" \
361	"$(INTDIR)\PumpKIN.obj" \	361	"$(INTDIR)\PumpKIN.obj" \
362	"$(INTDIR)\PumpKIN.res" \	362	"$(INTDIR)\pumpkin.res" \
363	"$(INTDIR)\PumpKINDlg.obj" \	363	"$(INTDIR)\PumpKINDlg.obj" \
364	"$(INTDIR)\RequestDlg.obj" \	364	"$(INTDIR)\RequestDlg.obj" \
365	"$(INTDIR)\Resolver.obj" \	365	"$(INTDIR)\Resolver.obj" \
@@ -461,22 +461,24 @@ LINK32_OBJS= \
461	OUTDIR=.\Install\Pure	461	OUTDIR=.\Install\Pure
462	INTDIR=.\Install\Pure	462	INTDIR=.\Install\Pure
463		463
464	ALL : "$(OUTDIR)\Install.exe"	464	ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"
465		465
466	CLEAN :	466	CLEAN :
467	-@erase "$(INTDIR)\install.obj"	467	-@erase "$(INTDIR)\install.obj"
468	-@erase "$(INTDIR)\Install.res"	468	-@erase "$(INTDIR)\Install.res"
		469	-@erase "$(INTDIR)\install.sbr"
		470	-@erase "$(OUTDIR)\Install.bsc"
469	-@erase "$(OUTDIR)\Install.exe"	471	-@erase "$(OUTDIR)\Install.exe"
470		472
471	"$(OUTDIR)" :	473	"$(OUTDIR)" :
472	if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"	474	if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
473		475
474	# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c	476	# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c
475	# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c	477	# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /c
476	CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\	478	CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
477	"_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c	479	"_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c
478	CPP_OBJS=.\Install\Pure/	480	CPP_OBJS=.\Install\Pure/
479	CPP_SBRS=.\.	481	CPP_SBRS=.\Install\Pure/
480	# ADD BASE MTL /nologo /D "NDEBUG" /win32	482	# ADD BASE MTL /nologo /D "NDEBUG" /win32
481	# ADD MTL /nologo /D "NDEBUG" /win32	483	# ADD MTL /nologo /D "NDEBUG" /win32
482	MTL_PROJ=/nologo /D "NDEBUG" /win32	484	MTL_PROJ=/nologo /D "NDEBUG" /win32
@@ -488,7 +490,13 @@ BSC32=bscmake.exe
488	# ADD BSC32 /nologo	490	# ADD BSC32 /nologo
489	BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc"	491	BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc"
490	BSC32_SBRS= \	492	BSC32_SBRS= \
491		493	"$(INTDIR)\install.sbr"
		494
		495	"$(OUTDIR)\Install.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
		496	$(BSC32) @<<
		497	$(BSC32_FLAGS) $(BSC32_SBRS)
		498	<<
		499
492	LINK32=link.exe	500	LINK32=link.exe
493	# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386	501	# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
494	# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib /nologo /subsystem:windows /machine:I386	502	# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib /nologo /subsystem:windows /machine:I386
@@ -829,21 +837,21 @@ DEP_RSC_PUMPKIN=\
829	!IF "$(CFG)" == "PumpKIN - Win32 Release"	837	!IF "$(CFG)" == "PumpKIN - Win32 Release"
830		838
831		839
832	"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"	840	"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
833	$(RSC) $(RSC_PROJ) $(SOURCE)	841	$(RSC) $(RSC_PROJ) $(SOURCE)
834		842
835		843
836	!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"	844	!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
837		845
838		846
839	"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"	847	"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
840	$(RSC) $(RSC_PROJ) $(SOURCE)	848	$(RSC) $(RSC_PROJ) $(SOURCE)
841		849
842		850
843	!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"	851	!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
844		852
845		853
846	"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"	854	"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
847	$(RSC) $(RSC_PROJ) $(SOURCE)	855	$(RSC) $(RSC_PROJ) $(SOURCE)
848		856
849		857
@@ -1397,9 +1405,15 @@ DEP_CPP_INSTAL=\
1397	!ELSEIF "$(CFG)" == "Install - Win32 Pure"	1405	!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1398		1406
1399		1407
		1408	BuildCmds= \
		1409	$(CPP) $(CPP_PROJ) $(SOURCE) \
		1410
		1411
1400	"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"	1412	"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1401	$(CPP) $(CPP_PROJ) $(SOURCE)	1413	$(BuildCmds)
1402		1414
		1415	"$(INTDIR)\install.sbr" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
		1416	$(BuildCmds)
1403		1417
1404	!ELSEIF "$(CFG)" == "Install - Win32 Static"	1418	!ELSEIF "$(CFG)" == "Install - Win32 Static"
1405		1419


diff --git a/pumpkin.rc b/pumpkin.rc index 1bf0fd3..7dafe04 100644 --- a/pumpkin.rc +++ b/pumpkin.rc
@@ -82,9 +82,9 @@ CAPTION "About PumpKIN"
82	FONT 8, "MS Sans Serif"	82	FONT 8, "MS Sans Serif"
83	BEGIN	83	BEGIN
84	ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20	84	ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
85	LTEXT "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,	85	LTEXT "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
86	SS_NOPREFIX	86	SS_NOPREFIX
87	LTEXT "Copyright � 1997-2004 Klever Group",IDC_STATIC,40,30,	87	LTEXT "Copyright � 1997-2005 Klever Group",IDC_STATIC,40,30,
88	170,8	88	170,8
89	DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP	89	DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP
90	PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14	90	PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
@@ -287,8 +287,8 @@ END
287	//	287	//
288		288
289	VS_VERSION_INFO VERSIONINFO	289	VS_VERSION_INFO VERSIONINFO
290	FILEVERSION 2,5,1,0	290	FILEVERSION 2,6,0,0
291	PRODUCTVERSION 2,5,1,0	291	PRODUCTVERSION 2,6,0,0
292	FILEFLAGSMASK 0x3fL	292	FILEFLAGSMASK 0x3fL
293	#ifdef _DEBUG	293	#ifdef _DEBUG
294	FILEFLAGS 0x1L	294	FILEFLAGS 0x1L
@@ -305,13 +305,13 @@ BEGIN
305	BEGIN	305	BEGIN
306	VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"	306	VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
307	VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"	307	VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
308	VALUE "FileVersion", "2, 5, 1, 0\0"	308	VALUE "FileVersion", "2, 6, 0, 0\0"
309	VALUE "InternalName", "PUMPKIN\0"	309	VALUE "InternalName", "PUMPKIN\0"
310	VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net)\0"	310	VALUE "LegalCopyright", "Copyright � 1997-2005 Klever Group (http://www.klever.net)\0"
311	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"	311	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
312	VALUE "OriginalFilename", "PUMPKIN.EXE\0"	312	VALUE "OriginalFilename", "PUMPKIN.EXE\0"
313	VALUE "ProductName", "PumpKIN\0"	313	VALUE "ProductName", "PumpKIN\0"
314	VALUE "ProductVersion", "2, 5, 1, 0\0"	314	VALUE "ProductVersion", "2, 6, 0, 0\0"
315	END	315	END
316	END	316	END
317	BLOCK "VarFileInfo"	317	BLOCK "VarFileInfo"