8 files changed, 30 insertions, 17 deletions

diff --git a/COPYING b/COPYING
index 9abe63f..b71fe11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
-Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1998-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
diff --git a/KTAGS b/KTAGS
index dfc79bb..25b6254 100644
--- a/KTAGS
+++ b/KTAGS
@@ -1,7 +1,7 @@
         help-license-date       ./help/kinsole.xml      /<license\s/;"kind:d
         help-news       ./help/kinsole.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
         kinsole-version         kinsole.cpp     /^#define\s\+DAMN_KIN_VERSION\s\+"/;"kind:v
diff --git a/help/kinsole.rtf b/help/kinsole.rtf
index f0b6c8a..f3eeb2d 100644
--- a/help/kinsole.rtf
+++ b/help/kinsole.rtf
@@ -16,9 +16,9 @@ ${\footnote About KINSole}
 \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b KINSole} is our {\i Win32} implementation of client side of the {\i telnet} protocol described in details in the {\uldb {\b RFC854}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc854.txt")} and related RFCs (namely {\uldb {\b RFC855}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc855.txt")}, {\uldb {\b RFC857}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc857.txt")}, {\uldb {\b RFC1091}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1091.txt")}, {\uldb {\b RFC1073}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1073.txt")}, {\uldb {\b RFC1572}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1572.txt")} and others). It uses {\i Win32} console and, therefore, can be run both windowed and in fullscreen mode.

 \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) 1998-2004 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2005 {\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.

 }

@@ -29,8 +29,10 @@ ${\footnote About KINSole}
 \pard\plain\keepn

 #{\footnote News}

 ${\footnote What's new}

 { \f1\fs18\b\sb120 What's New}

+\par\pard\plain\f1\fs24\qc\cf2\b 1.1.1 - August 6th, 2005

+\par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed uninstall procedure so that it works on XP

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

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  No changes in code. License change.

 \par\pard\plain\f1\fs24\qc\cf2\b 1.00 Beta 2 - March 7th, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Better copying from {\b KINSole} window.

diff --git a/help/kinsole.xml b/help/kinsole.xml
index c08aa01..c7f7dd8 100644
--- a/help/kinsole.xml
+++ b/help/kinsole.xml
@@ -4,13 +4,16 @@
   <heading scroll="no">About KINSole</heading>

   <p><kin>KINSole</kin> is our <term>Win32</term> implementation of client side of the <term>telnet</term> protocol described in details in the <rfc num="854"/> and related RFCs (namely <rfc num="855"/>, <rfc num="857"/>, <rfc num="1091"/>, <rfc num="1073"/>, <rfc num="1572"/> and others). It uses <term>Win32</term> console and, therefore, can be run both windowed and in fullscreen mode.</p>

   <p/>

   <p><b><i>Enjoy!</i></b></p>

-  <license years="1998-2004"/>

+  <license years="1998-2005"/>

   <credits/>

  </topic>

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

   <heading scroll="no">What's New</heading>

+  <newsfor version="1.1.1" date="August 6th, 2005">

+   <ni>Fixed uninstall procedure so that it works on XP</ni>

+  </newsfor>

   <newsfor version="1.1" date="July 11th, 2004">

    <ni>No changes in code. License change.</ni>

   </newsfor>

   <newsfor version="1.00 Beta 2" date="March 7th, 1998">

diff --git a/install/install.cpp b/install/install.cpp
index aa474d5..bbc2b3b 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,8 +1,9 @@
 #include "resource.h"
 #include "../shared-code/install.h"

 

-        #define         KINAME"KINSole 1.1"

+#define VERSION "1.1.1"

+        #define         KINAME"KINSole " VERSION

         #define         SKINAME"KINSole"
 
 BOOL Install(void)
 {

@@ -57,8 +58,15 @@ FILE* inf=CREATE_INF_FILE(path, SKINAME ".INF");
         INF_MENU_ITEM(inf,1,"KINSole Help");

         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/kinsole/");

+

 

         MessageBox(NULL,KINAME " installed successfully, you may now run it from command line, read documentation in 'Programs/Klever Group' menu or simply 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 04ae8f4..4b81d3e 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -130,10 +130,10 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,0,0

- PRODUCTVERSION 1,1,0,0

+ FILEVERSION 1,1,1,0

+ PRODUCTVERSION 1,1,1,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

@@ -148,15 +148,15 @@ BEGIN
         BLOCK "040904b0"

         BEGIN

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

             VALUE "FileDescription", "INSTALL: KINSole, telnet client\0"

-            VALUE "FileVersion", "1, 1, 0, 0\0"

+            VALUE "FileVersion", "1, 1, 1, 0\0"

             VALUE "InternalName", "INSTALL\0"

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

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

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

             VALUE "OriginalFilename", "INSTALL.EXE\0"

             VALUE "ProductName", "KINSole\0"

-            VALUE "ProductVersion", "1, 1, 0, 0\0"

+            VALUE "ProductVersion", "1, 1, 1, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

diff --git a/kinsole.cpp b/kinsole.cpp
index 01286f3..7fa3f8b 100644
--- a/kinsole.cpp
+++ b/kinsole.cpp
@@ -15,9 +15,9 @@
 #include "resource.h"

 #include "windowsx.h"

 

         #define         DAMN_KIN_NAME   "KINSole"

-        #define         DAMN_KIN_VERSION"1.1"

+        #define         DAMN_KIN_VERSION"1.1.1"

 

 #ifdef _DEBUG

 #define new DEBUG_NEW

 #undef THIS_FILE

@@ -549,9 +549,9 @@ main(int argc,char*argv[])
 {

         if(argc<2){

 usagebye:

                 printf(

-                        DAMN_KIN_NAME " " DAMN_KIN_VERSION ", Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)\n\n"

+                        DAMN_KIN_NAME " " DAMN_KIN_VERSION ", Copyright (c) 1998-2005 Klever Group (http://www.klever.net/)\n\n"

                         "Usage:\t" DAMN_KIN_NAME " [<options> ]<host-name/ip-address>[ <port>]\n\n"

                         "Options are:\n"

                         "-r## or -##\tSet number of rows in console screenbuffer\n"

                         "-c##\t\tSet number of columns in console screenbuffer\n"

diff --git a/kinsole.rc b/kinsole.rc
index 6e45d44..531055e 100644
--- a/kinsole.rc
+++ b/kinsole.rc
@@ -62,10 +62,10 @@ END
 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,0,0

- PRODUCTVERSION 1,1,0,0

+ FILEVERSION 1,1,1,0

+ PRODUCTVERSION 1,1,1,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x29L

 #else

@@ -80,15 +80,15 @@ BEGIN
         BLOCK "040904b0"

         BEGIN

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

             VALUE "FileDescription", "KINSole, telnet client\0"

-            VALUE "FileVersion", "1, 1, 0, 0\0"

+            VALUE "FileVersion", "1, 1, 1, 0\0"

             VALUE "InternalName", "KINSOLE\0"

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

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

             VALUE "LegalTrademarks", "Klever Group (http://www.klevernet/)\0"

             VALUE "OriginalFilename", "KINSOLE.EXE\0"

             VALUE "ProductName", "KINSole\0"

-            VALUE "ProductVersion", "1, 1, 0, 0\0"

+            VALUE "ProductVersion", "1, 1, 1, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN