prepared for pumpkin 2.5 release2.5

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

8 files changed, 25 insertions, 22 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..a9fb0c7
--- a/dev/null
+++ b/AUTHORS
@@ -0,0 +1,3 @@
+Klever dissected:
+        Michael 'hacker' Krelin <hacker@klever.net>
+        Leonid Ivanov <kamel@klever.net>
diff --git a/COPYING b/COPYING
index 98e8827..e7ef42e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
-Copyright (c) 1997, 1998, 2002 Klever Group (http://www.klever.net/)
+Copyright (c) 1997-2004 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
diff --git a/README b/README.RELEASE
index fbdfd9c..fbdfd9c 100644
--- a/README
+++ b/README.RELEASE
diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf
index b78a159..f629b67 100644
--- a/help/pumpkin.rtf
+++ b/help/pumpkin.rtf
@@ -11,29 +11,29 @@ DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
   

 \pard\plain\keepn

 #{\footnote About}

 ${\footnote About PumpKIN}

 K{\footnote about}

 { \f1\fs18\b\sb120 About {\b PumpKIN}}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b PumpKIN} is a program designed to send and receive files over the net while having {\uldb {\b T42}}{\v %!ExecFile("http://www.klever.net/kin/t42.html")} or {\uldb {\b\cf6 Wintalk}}{\v %!ExecFile("http://www.elf.com/elf/wintalk.html")} session running using {\i TFTP} ({\uldb {\b RFC1350}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1350.txt")}) protocol. It includes full-functional {\i TFTP} server/client so it may be useful for maintaining {\uldb CISCO}{\v %!ExecFile("http://www.cisco.com/")} routers and other network equipment.

+\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b PumpKIN} is a program designed to send and receive files over the net while having {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} session running using {\i TFTP} ({\uldb {\b RFC1350}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1350.txt")}) protocol. It includes full-functional {\i TFTP} server/client so it may be useful for maintaining {\uldb CISCO}{\v %!ExecFile("http://www.cisco.com/")} routers and other network equipment.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}

 {

-\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997, 1998, 2002 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2004 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

 \par\qj\sb120\sa120Permission 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:

 \par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

 \par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 }

 \page

 

 \pard\plain

 #{\footnote News}

 ${\footnote What's New}

-\par\pard\plain\f1\fs24\qc\cf2\b 2.5 - August 19st, 2002

+\par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Change of {\uldb license}{\v About} and opening the source.

-\par\pard\plain\fi0\li0\f1\fs18 \bullet  Minor cosmetic changes, mostly in build process

+\par\pard\plain\fi0\li0\f1\fs18 \bullet  Minor cosmetic changes

 \par\pard\plain\f1\fs24\qc\cf2\b 2.0 - June 13th, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Sounds customization. Now you can customize {\b PumpKIN} bells and whistles or turn them off completely.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Previous version of {\b PumpKIN} had a bug causing it to misbehave when you're requesting file from remote {\i tftp} server using {\b IP Address} (as opposed to {\b hostname}).

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Typo causing {\b PumpKIN} to log outgoing request in reverse (i.e. {\i Requesting 'hostname' from 'filename'}) fixed.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Something else that you may not notice and I can not remember.

 \par\pard\plain\f1\fs24\qc\cf2\b 1.5 - February 12th, 1998

@@ -43,13 +43,13 @@ ${\footnote What's New}
 \page

 

 \pard\plain\keepn

 #{\footnote Using}

 ${\footnote Using PumpKIN}

 { \f1\fs18\b\sb120 Using {\b PumpKIN}}

-\par\sa120\sb120\qj\pard \f1\fs18\sb120 This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a {\uldb {\b T42}}{\v %!ExecFile("http://www.klever.net/kin/t42.html")} or {\uldb {\b\cf6 Wintalk}}{\v %!ExecFile("http://elf.com/elf/wintalk.html")} conversation. It uses open sessions to determine IP address of your party. Also you may use it as a {\i TFTP} client/server by itself. To get/put files from/to {\i TFTP} server you need to enter host name/IP address manually in the {\uldb Request Dialog}{\v Request}.

+\par\sa120\sb120\qj\pard \f1\fs18\sb120 This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} conversation. It uses open sessions to determine IP address of your party. Also you may use it as a {\i TFTP} client/server by itself. To get/put files from/to {\i TFTP} server you need to enter host name/IP address manually in the {\uldb Request Dialog}{\v Request}.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click {\b Abort xfer} button.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 You may want to hide {\b PumpKIN} window and leave it as a tray icon only. Just click the \{bmct pumpkin.bmp\} icon in the tray or simply close the window.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Use {\uldb Options}{\v Options} button to set {\b PumpKIN} options.

 \page

 

 \pard\plain\keepn

diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index bac9950..2ccd23a 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -1,20 +1,20 @@
 <?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://www.klever.net/kin/t42.html">T42</kin> or <product href="http://www.elf.com/elf/wintalk.html">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><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, 1998, 2002"/>

+  <license years="1997-2004"/>

   <credist/>

  </topic>

  <topic id="News" title="What's New">

-  <newsfor version="2.5" date="August 19st, 2002">

+  <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, mostly in build process</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>

@@ -24,13 +24,13 @@
    <ni>Support for <b>block size</b>, <b>trasnfer size</b> and <b>transfer timeout</b> options as described in <rfc num="1782"/>, <rfc num="1783"/> and <rfc num="1784"/>. I'm not sure if there are any other <term>TFTP</term> implementations supporting this, but at least it makes sense if you use <kin>PumpKIN</kin> on both ends.</ni>

    <ni>New Install program</ni>

   </newsfor>

  </topic>

  <topic id="Using" title="Using PumpKIN">

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

-  <p>This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a <kin href="http://www.klever.net/kin/t42.html">T42</kin> or <product href="http://elf.com/elf/wintalk.html">Wintalk</product> conversation. It uses open sessions to determine IP address of your party. Also you may use it as a <term>TFTP</term> client/server by itself. To get/put files from/to <term>TFTP</term> server you need to enter host name/IP address manually in the <a href="#Request">Request Dialog</a>.</p>

+  <p>This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> conversation. It uses open sessions to determine IP address of your party. Also you may use it as a <term>TFTP</term> client/server by itself. To get/put files from/to <term>TFTP</term> server you need to enter host name/IP address manually in the <a href="#Request">Request Dialog</a>.</p>

   <p>To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click <b>Abort xfer</b> button.</p>

   <p>You may want to hide <kin>PumpKIN</kin> window and leave it as a tray icon only. Just click the <image source="pumpkin.bmp"/> icon in the tray or simply close the window.</p>

   <p>Use <a href="#Options">Options</a> button to set <kin>PumpKIN</kin> options.</p>

  </topic>

  <topic id="ConfirmRRQ" title="Confirm Read Request Dialog">

   <heading scroll="no">Confirm Read Request Dialog</heading>

diff --git a/install/install.cpp b/install/install.cpp
index 4e518d5..62f1e20 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -3,14 +3,14 @@
 

         #defineKINAME "PumpKIN 2.5"

 #define SKINAME "PumpKIN"
 
 BOOL Install(void)
 {
-STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.",SKINAME "Path");

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

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

 

         #ifdefK_ANNED

@@ -31,16 +31,16 @@ STRING shortPath = GET_SHORT_PATH(path);
                 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("Accessories\\Klever Co.",SKINAME,path, SKINAME ".exe");

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

 

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

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

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

         }

@@ -52,16 +52,16 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
         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,"Accessories\\Klever Co.");

+        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");

 

-        MessageBox(NULL,KINAME " installed successfully, you may now run it from Programs/Accessories/Klever Co. menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);

+        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 b4eeb01..b1a3037 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -148,13 +148,13 @@ 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, 0, 0\0"

             VALUE "InternalName", "INSTALL\0"

-            VALUE "LegalCopyright", "Copyright © 1997, 1998, 2002 Klever Group (http://www.klever.net/)\0"

+            VALUE "LegalCopyright", "Copyright © 1997-2004 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, 0, 0\0"

         END

     END

diff --git a/pumpkin.rc b/pumpkin.rc
index 05b6cde..67e5b24 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -80,13 +80,13 @@ 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",IDC_STATIC,40,15,119,8,SS_NOPREFIX

-    LTEXT           "Copyright © 1997,1998,2002 Klever Group",IDC_STATIC,40,30,170,

+    LTEXT           "Copyright © 1997-2004 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

@@ -303,13 +303,13 @@ BEGIN
         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"

             VALUE "FileVersion", "2, 5, 0, 0\0"

             VALUE "InternalName", "PUMPKIN\0"

-            VALUE "LegalCopyright", "Copyright © 1997, 1998, 2002 Klever Group (http://www.klever.net)\0"

+            VALUE "LegalCopyright", "Copyright © 1997-2004 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, 0, 0\0"

         END

     END

@@ -514,13 +514,13 @@ BEGIN
     IDS_WTALKHEADING        "Talk with "

     IDS_TITLE_BROWSEFILE    "Browse"

     IDS_LOG_RESOLVEFAILED   "Failed to resolve host address for '%s'"

     IDS_LOG_FAILEDLOCALFILE "Failed to open local file '%s'"

     IDS_LOG_FAILEDTOOPEN    "Failed to open '%s'"

     IDS_OTALXHEADING        "Open Talks: talking to "

-    IDS_REGISTRYKEY         "Klever Group, Inc."

+    IDS_REGISTRYKEY         "Klever Group"

     IDS_KLEVERNET_URL       "http://www.klever.net/"

     IDS_LOGTIMEFORMAT       "%H:%M:%S %B %d"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN