XP uninstall fixed and 2.6 release ready

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

7 files changed, 61 insertions, 35 deletions

diff --git a/COPYING b/COPYING
index e7ef42e..b830fe7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,13 @@
-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
 the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
 of the Software, and to permit persons to whom the Software is furnished to do
 so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
diff --git a/KTAGS b/KTAGS
index 36d22e5..b27cd12 100644
--- a/KTAGS
+++ b/KTAGS
@@ -1,12 +1,12 @@
 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
 license-date	COPYING	:1;"	kind:d
 vsinfo-date	pumpkin.rc	/VALUE\s\+"LegalCopyright",/;"	kind:d
 vsinfo-numeric-version	pumpkin.rc	/^\s\+FILEVERSION\s\+/;"	kind:v
 vsinfo-string-version	pumpkin.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
@@ -1,23 +1,28 @@
 <?xml version="1.0"?>

 <winhelp>

  <topic id="About" title="About PumpKIN" keywords="about">

   <heading scroll="no">About <kin>PumpKIN</kin></heading>

   <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>

   </newsfor>

   <newsfor version="2.0" date="June 13th, 1998">

    <ni>Sounds customization. Now you can customize <kin>PumpKIN</kin> bells and whistles or turn them off completely.</ni>

    <ni>Previous version of <kin>PumpKIN</kin> had a bug causing it to misbehave when you're requesting file from remote <term>tftp</term> server using <b>IP Address</b> (as opposed to <b>hostname</b>).</ni>

    <ni>Typo causing <kin>PumpKIN</kin> to log outgoing request in reverse (i.e. <i>Requesting 'hostname' from 'filename'</i>) fixed.</ni>

    <ni>Something else that you may not notice and I can not remember.</ni>

   </newsfor>

   <newsfor version="1.5" date="February 12th, 1998">

    <ni>Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.</ni>

diff --git a/install/install.cpp b/install/install.cpp
index 6fa4ae4..d11de03 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,16 +1,17 @@
 #include "resource.h"
 #include "../shared-code/install.h"

 

-#define	KINAME "PumpKIN 2.5.1-trunk"

+#define VERSION "2.6"

+#define	KINAME "PumpKIN " VERSION

 #define SKINAME "PumpKIN"
 
 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

@@ -51,17 +52,23 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
 	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 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);

 

 	return TRUE;

 }
diff --git a/install/install.rc b/install/install.rc
index 30907ad..cc621ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -122,49 +122,49 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico"

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 2,5,1,0

- PRODUCTVERSION 2,5,1,0

+ FILEVERSION 2,6,0,0

+ PRODUCTVERSION 2,6,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x40004L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         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"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

diff --git a/pumpkin.mak b/pumpkin.mak
index 9a40fa2..bd466fe 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -30,27 +30,27 @@ CFG=Install - Win32 Debug
 !MESSAGE 

 !ERROR An invalid configuration is specified.

 !ENDIF 

 

 !IF "$(OS)" == "Windows_NT"

 NULL=

 !ELSE 

 NULL=nul

 !ENDIF 

 ################################################################################

 # 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"

 

 # PROP BASE Use_MFC 6

 # PROP BASE Use_Debug_Libraries 0

 # PROP BASE Output_Dir "Release"

 # PROP BASE Intermediate_Dir "Release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 6

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

@@ -68,69 +68,69 @@ ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\
 CLEAN : 

 	-@erase "$(INTDIR)\ConfirmRRQDlg.obj"

 	-@erase "$(INTDIR)\ConfirmWRQDlg.obj"

 	-@erase "$(INTDIR)\PropsNetwork.obj"

 	-@erase "$(INTDIR)\PropsServer.obj"

 	-@erase "$(INTDIR)\PropsSounds.obj"

 	-@erase "$(INTDIR)\pumpkin.cn_"

 	-@erase "$(INTDIR)\pumpkin.cnt"

 	-@erase "$(INTDIR)\pumpkin.hl_"

 	-@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"

 	-@erase "$(INTDIR)\Retrier.obj"

 	-@erase "$(INTDIR)\StdAfx.obj"

 	-@erase "$(INTDIR)\Trayer.obj"

 	-@erase "$(OUTDIR)\pumpkin.ex_"

 	-@erase "$(OUTDIR)\pumpkin.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" /Yu"stdafx.h" /c

 # ADD CPP /nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c

 CPP_PROJ=/nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\

  "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/"\

  /c 

 CPP_OBJS=.\Release/

 CPP_SBRS=.\.

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /win32

 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

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 

 BSC32_SBRS= \

 	

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

 # ADD LINK32 /nologo /subsystem:windows /machine:I386

 LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\

  /pdb:"$(OUTDIR)/pumpkin.pdb" /machine:I386 /out:"$(OUTDIR)/pumpkin.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\ConfirmRRQDlg.obj" \

 	"$(INTDIR)\ConfirmWRQDlg.obj" \

 	"$(INTDIR)\PropsNetwork.obj" \

 	"$(INTDIR)\PropsServer.obj" \

 	"$(INTDIR)\PropsSounds.obj" \

 	"$(INTDIR)\PumpKIN.obj" \

-	"$(INTDIR)\PumpKIN.res" \

+	"$(INTDIR)\pumpkin.res" \

 	"$(INTDIR)\PumpKINDlg.obj" \

 	"$(INTDIR)\RequestDlg.obj" \

 	"$(INTDIR)\Resolver.obj" \

 	"$(INTDIR)\Retrier.obj" \

 	"$(INTDIR)\StdAfx.obj" \

 	"$(INTDIR)\Trayer.obj"

 

 "$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

@@ -176,25 +176,25 @@ CLEAN :
 	-@erase "$(INTDIR)\PropsNetwork.obj"

 	-@erase "$(INTDIR)\PropsNetwork.sbr"

 	-@erase "$(INTDIR)\PropsServer.obj"

 	-@erase "$(INTDIR)\PropsServer.sbr"

 	-@erase "$(INTDIR)\PropsSounds.obj"

 	-@erase "$(INTDIR)\PropsSounds.sbr"

 	-@erase "$(INTDIR)\pumpkin.cn_"

 	-@erase "$(INTDIR)\pumpkin.cnt"

 	-@erase "$(INTDIR)\pumpkin.hl_"

 	-@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"

 	-@erase "$(INTDIR)\RequestDlg.obj"

 	-@erase "$(INTDIR)\RequestDlg.sbr"

 	-@erase "$(INTDIR)\Resolver.obj"

 	-@erase "$(INTDIR)\Resolver.sbr"

 	-@erase "$(INTDIR)\Retrier.obj"

 	-@erase "$(INTDIR)\Retrier.sbr"

 	-@erase "$(INTDIR)\StdAfx.obj"

 	-@erase "$(INTDIR)\StdAfx.sbr"

 	-@erase "$(INTDIR)\Trayer.obj"

@@ -213,25 +213,25 @@ CLEAN :
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c

 # ADD CPP /nologo /Zp1 /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /c

 CPP_PROJ=/nologo /Zp1 /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D\

  "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/pumpkin.pch"\

  /Yu"stdafx.h" /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 CPP_OBJS=.\Debug/

 CPP_SBRS=.\Debug/

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

 # ADD MTL /nologo /D "_DEBUG" /win32

 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

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 

 BSC32_SBRS= \

 	"$(INTDIR)\ConfirmRRQDlg.sbr" \

 	"$(INTDIR)\ConfirmWRQDlg.sbr" \

 	"$(INTDIR)\PropsNetwork.sbr" \

 	"$(INTDIR)\PropsServer.sbr" \

 	"$(INTDIR)\PropsSounds.sbr" \

 	"$(INTDIR)\PumpKIN.sbr" \

 	"$(INTDIR)\PumpKINDlg.sbr" \

@@ -249,25 +249,25 @@ BSC32_SBRS= \
 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386

 # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386

 LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\

  /pdb:"$(OUTDIR)/pumpkin.pdb" /debug /machine:I386 /out:"$(OUTDIR)/pumpkin.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\ConfirmRRQDlg.obj" \

 	"$(INTDIR)\ConfirmWRQDlg.obj" \

 	"$(INTDIR)\PropsNetwork.obj" \

 	"$(INTDIR)\PropsServer.obj" \

 	"$(INTDIR)\PropsSounds.obj" \

 	"$(INTDIR)\PumpKIN.obj" \

-	"$(INTDIR)\PumpKIN.res" \

+	"$(INTDIR)\pumpkin.res" \

 	"$(INTDIR)\PumpKINDlg.obj" \

 	"$(INTDIR)\RequestDlg.obj" \

 	"$(INTDIR)\Resolver.obj" \

 	"$(INTDIR)\Retrier.obj" \

 	"$(INTDIR)\StdAfx.obj" \

 	"$(INTDIR)\Trayer.obj"

 

 "$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

@@ -307,68 +307,68 @@ ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\
 CLEAN : 

 	-@erase "$(INTDIR)\ConfirmRRQDlg.obj"

 	-@erase "$(INTDIR)\ConfirmWRQDlg.obj"

 	-@erase "$(INTDIR)\PropsNetwork.obj"

 	-@erase "$(INTDIR)\PropsServer.obj"

 	-@erase "$(INTDIR)\PropsSounds.obj"

 	-@erase "$(INTDIR)\pumpkin.cn_"

 	-@erase "$(INTDIR)\pumpkin.cnt"

 	-@erase "$(INTDIR)\pumpkin.hl_"

 	-@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"

 	-@erase "$(INTDIR)\Retrier.obj"

 	-@erase "$(INTDIR)\StdAfx.obj"

 	-@erase "$(INTDIR)\Trayer.obj"

 	-@erase "$(OUTDIR)\pumpkin.ex_"

 	-@erase "$(OUTDIR)\pumpkin.exe"

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

 # ADD BASE CPP /nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c

 # ADD CPP /nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /c

 CPP_PROJ=/nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\

  "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c 

 CPP_OBJS=.\Releast/

 CPP_SBRS=.\.

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /win32

 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

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 

 BSC32_SBRS= \

 	

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

 # ADD LINK32 /nologo /subsystem:windows /machine:I386

 LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\

  /pdb:"$(OUTDIR)/pumpkin.pdb" /machine:I386 /out:"$(OUTDIR)/pumpkin.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\ConfirmRRQDlg.obj" \

 	"$(INTDIR)\ConfirmWRQDlg.obj" \

 	"$(INTDIR)\PropsNetwork.obj" \

 	"$(INTDIR)\PropsServer.obj" \

 	"$(INTDIR)\PropsSounds.obj" \

 	"$(INTDIR)\PumpKIN.obj" \

-	"$(INTDIR)\PumpKIN.res" \

+	"$(INTDIR)\pumpkin.res" \

 	"$(INTDIR)\PumpKINDlg.obj" \

 	"$(INTDIR)\RequestDlg.obj" \

 	"$(INTDIR)\Resolver.obj" \

 	"$(INTDIR)\Retrier.obj" \

 	"$(INTDIR)\StdAfx.obj" \

 	"$(INTDIR)\Trayer.obj"

 

 "$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

@@ -452,52 +452,60 @@ LINK32_OBJS= \
 # PROP BASE Use_Debug_Libraries 0

 # PROP BASE Output_Dir "Install\Pure"

 # PROP BASE Intermediate_Dir "Install\Pure"

 # PROP BASE Target_Dir "Install"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Install\Pure"

 # PROP Intermediate_Dir "Install\Pure"

 # PROP Target_Dir "Install"

 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 

 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

 # ADD RSC /l 0x409 /d "NDEBUG"

 RSC_PROJ=/l 0x409 /fo"$(INTDIR)/Install.res" /d "NDEBUG" 

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # 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

 LINK32_FLAGS=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 /incremental:no\

  /pdb:"$(OUTDIR)/Install.pdb" /machine:I386 /out:"$(OUTDIR)/Install.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\install.obj" \

 	"$(INTDIR)\Install.res"

 

 "$(OUTDIR)\Install.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

@@ -820,39 +828,39 @@ DEP_RSC_PUMPKIN=\
 	".\res\pumpkin.rc2"\

 	".\res\ring.wav"\

 	".\res\rrq.ico"\

 	".\res\wrq.ico"\

 	".\shared-data\browse-icon.ico"\

 	".\shared-data\klever-background.bmp"\

 	".\shared-data\play-icon.ico"\

 	

 

 !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)

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\help\pumpkin.hpj

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

@@ -1388,27 +1396,33 @@ DEP_CPP_INSTAL=\
 	

 

 !IF  "$(CFG)" == "Install - Win32 Debug"

 

 

 "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

 

 

 !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"

 

 

 "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

 

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Canned"

 

 

 "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

diff --git a/pumpkin.rc b/pumpkin.rc
index 1bf0fd3..7dafe04 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -73,27 +73,27 @@ IDI_PLAY                ICON    DISCARDABLE     "shared-data/play-icon.ico"
 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 74

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 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

 END

 

 IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191

 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 

     WS_SYSMENU

 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW

 CAPTION "  PumpKIN"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

@@ -278,49 +278,49 @@ BEGIN
     PUSHBUTTON      "browse",IDC_ABORTED_BROWSE,175,37,13,13,BS_ICON

     PUSHBUTTON      "play",IDC_ABORTED_PLAY,190,37,13,13,BS_ICON

 END

 

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 2,5,1,0

- PRODUCTVERSION 2,5,1,0

+ FILEVERSION 2,6,0,0

+ PRODUCTVERSION 2,6,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         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"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 

 /////////////////////////////////////////////////////////////////////////////