From d6f931eb800d16d0bf116765cbaeef83d232cfad Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sun, 11 Jul 2004 04:29:12 +0000 Subject: prepared for kinsole 1.1 release git-svn-id: http://svn.klever.net/kin/kinsole/trunk@7 fe716a7a-6dde-0310-88d9-d003556173a8 --- 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 + Leonid Ivanov diff --git a/COPYING b/COPYING index 997e508..9abe63f 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 1998, 2002 Klever Group (http://www.klever.net/) +Copyright (c) 1998-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 diff --git a/README b/README.RELEASE index 9bbcbe8..9bbcbe8 100644 --- a/README +++ b/README.RELEASE diff --git a/help/kinsole.cnt b/help/kinsole.cnt index 9a8af90..a30e9b7 100644 --- a/help/kinsole.cnt +++ b/help/kinsole.cnt @@ -5,5 +5,5 @@ 2 Using KINSole=Using 2 Command Line Options=CmdOptions 2 Keyboard Shortcuts=HotKeys -2 Beta Notes=BetaNotes -2 Beta News=News +2 Notes=Notes +2 What's New=News diff --git a/help/kinsole.rtf b/help/kinsole.rtf index 2cfd296..f0b6c8a 100644 --- a/help/kinsole.rtf +++ b/help/kinsole.rtf @@ -17,7 +17,7 @@ ${\footnote About KINSole} \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, 2002 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")} +\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\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. @@ -28,9 +28,9 @@ ${\footnote About KINSole} \pard\plain\keepn #{\footnote News} -${\footnote Beta News} -{ \f1\fs18\b\sb120 Beta News} -\par\pard\plain\f1\fs24\qc\cf2\b 1.00 Beta 3 - August 19st, 2002 +${\footnote What's new} +{ \f1\fs18\b\sb120 What's New} +\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. @@ -86,11 +86,11 @@ ${\footnote Hot Keys} \page \pard\plain\keepn -#{\footnote BetaNotes} -${\footnote Beta Notes} -{ \f1\fs18\b\sb120 Beta Notes} -\par\sa120\sb120\qj\pard \f1\fs18\sb120 A few things you may want to know about this Beta Release:\pard -\par \fi0\li0 \bullet Only two terminal emulation modules are included in this beta release - one for dumb terminal and one for vt100/102. If you try to select ANSI terminal type vt100 emulation will be selected, which is actually close enough to ANSI so you shouldn't suffer too much. Why would one want to use ANSI terminal emulation, anyway? +#{\footnote Notes} +${\footnote Notes} +{ \f1\fs18\b\sb120 Notes} +\par\sa120\sb120\qj\pard \f1\fs18\sb120 A few things you may want to know about this release:\pard +\par \fi0\li0 \bullet Only two terminal emulation modules are included in this release - one for dumb terminal and one for vt100/102. If you try to select ANSI terminal type vt100 emulation will be selected, which is actually close enough to ANSI so you shouldn't suffer too much. Why would one want to use ANSI terminal emulation, anyway? \par \fi0\li0 \bullet Telnet {\b LINEMODE} option ({\uldb {\b RFC1184}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1184.txt")}) is still to come. \par \fi0\li0 \bullet Pasting of text using console toolbar button may cause {\b KINSole} to lock up. Use {\b Shift-INS} instead.\pard \page diff --git a/help/kinsole.xml b/help/kinsole.xml index 7d15eed..c08aa01 100644 --- a/help/kinsole.xml +++ b/help/kinsole.xml @@ -5,12 +5,12 @@

KINSole is our Win32 implementation of client side of the telnet protocol described in details in the and related RFCs (namely , , , , and others). It uses Win32 console and, therefore, can be run both windowed and in fullscreen mode.

Enjoy!

- + - - Beta News - + + What's New + No changes in code. License change. @@ -60,11 +60,11 @@
  • Alt-T - Send TIMING-MARK request. As soon as response comes KINSole will flash window thrice or beep if window handle is not available for some reason.
    •  - - Beta Notes -

    A few things you may want to know about this Beta Release:

    + + Notes +

    A few things you may want to know about this release:

      -
    • Only two terminal emulation modules are included in this beta release - one for dumb terminal and one for vt100/102. If you try to select ANSI terminal type vt100 emulation will be selected, which is actually close enough to ANSI so you shouldn't suffer too much. Why would one want to use ANSI terminal emulation, anyway?
      • +
    • Only two terminal emulation modules are included in this release - one for dumb terminal and one for vt100/102. If you try to select ANSI terminal type vt100 emulation will be selected, which is actually close enough to ANSI so you shouldn't suffer too much. Why would one want to use ANSI terminal emulation, anyway?
    • Telnet LINEMODE option () is still to come.
    • Pasting of text using console toolbar button may cause KINSole to lock up. Use Shift-INS instead.
    diff --git a/install/install.cpp b/install/install.cpp index e6f4e5a..aa474d5 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -1,13 +1,13 @@ #include "resource.h" #include "../shared-code/install.h" -#define KINAME "KINSole 1.00 Beta 3" +#define KINAME "KINSole 1.1" #define SKINAME "KINSole" BOOL Install(void) { -STRING tPath = 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 tPath = 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)tPath)?(LPCSTR)tPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); STRING path = REQUESTPATH(" " KINAME,"Note: KINSole program file will be installed into your windows directory so that you can rely on it's presence in your search path\nEnter destination path:",qPath); if(!path) @@ -29,9 +29,9 @@ STRING shortPath = GET_SHORT_PATH(path); MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); return FALSE; } - ADDMENU("Accessories\\Klever Co.","KINSole Help",path,SKINAME ".hlp"); - 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); + ADDMENU("Klever Group","KINSole Help",path,SKINAME ".hlp"); + 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); @@ -53,13 +53,13 @@ FILE* inf=CREATE_INF_FILE(path, SKINAME ".INF"); 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,"KINSole Help"); fclose(inf); REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall"); - MessageBox(NULL,KINAME " installed successfully, you may now run it from command line, read documentation in Programs/Accessories/Klever Co. menu or simply 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 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 d7780b6..04ae8f4 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 1,0,0,3 - PRODUCTVERSION 1,0,0,3 + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,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: KINSole, telnet client\0" - VALUE "FileVersion", "1, 0, 0, 3\0" + VALUE "FileVersion", "1, 1, 0, 0\0" VALUE "InternalName", "INSTALL\0" - VALUE "LegalCopyright", "Copyright © 1998, 2002 Klever Group (http://www.klever.net/)\0" + VALUE "LegalCopyright", "Copyright © 1998-2004 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, 0, 0, 3\0" + VALUE "ProductVersion", "1, 1, 0, 0\0" END END BLOCK "VarFileInfo" diff --git a/kinsole.cpp b/kinsole.cpp index 463db1c..01286f3 100644 --- a/kinsole.cpp +++ b/kinsole.cpp @@ -16,7 +16,7 @@ #include "windowsx.h" #define DAMN_KIN_NAME "KINSole" -#define DAMN_KIN_VERSION "v1.00 Beta 3" +#define DAMN_KIN_VERSION "1.1" #ifdef _DEBUG #define new DEBUG_NEW @@ -550,7 +550,7 @@ main(int argc,char*argv[]) if(argc<2){ usagebye: printf( - DAMN_KIN_NAME " " DAMN_KIN_VERSION ", Copyright (c) 1998, 2002 Klever Group (http://www.klever.net/)\n\n" + DAMN_KIN_NAME " " DAMN_KIN_VERSION ", Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)\n\n" "Usage:\t" DAMN_KIN_NAME " [ ][ ]\n\n" "Options are:\n" "-r## or -##\tSet number of rows in console screenbuffer\n" @@ -562,7 +562,7 @@ usagebye: "-v=\tPass user environment variable to remote server\n" "-t\tChange preferred terminal type\n" "\tnote: there are only two different terminal emulations in this\n" - "\tbeta release - one for dumb terminal and one for vt terminal\n" + "\trelease - one for dumb terminal and one for vt terminal\n" ); CleanEnvars(); return 1; diff --git a/kinsole.mak b/kinsole.mak index b25a32d..9b7eeac 100644 --- a/kinsole.mak +++ b/kinsole.mak @@ -65,7 +65,7 @@ CLEAN : -@erase "$(INTDIR)\kinsole.hl_" -@erase "$(INTDIR)\kinsole.hlp" -@erase "$(INTDIR)\KINSole.obj" - -@erase "$(INTDIR)\KINSole.res" + -@erase "$(INTDIR)\kinsole.res" -@erase "$(OUTDIR)\kinsole.ex_" -@erase "$(OUTDIR)\kinsole.exe" -@erase "$(OUTDIR)\kinsole.map" @@ -103,7 +103,7 @@ CPP_SBRS=.\. RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" -RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KINSole.res" /d "NDEBUG" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)/kinsole.res" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -120,7 +120,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ /out:"$(OUTDIR)/kinsole.exe" LINK32_OBJS= \ "$(INTDIR)\KINSole.obj" \ - "$(INTDIR)\KINSole.res" + "$(INTDIR)\kinsole.res" "$(OUTDIR)\kinsole.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -166,7 +166,7 @@ CLEAN : -@erase "$(INTDIR)\kinsole.hl_" -@erase "$(INTDIR)\kinsole.hlp" -@erase "$(INTDIR)\KINSole.obj" - -@erase "$(INTDIR)\KINSole.res" + -@erase "$(INTDIR)\kinsole.res" -@erase "$(INTDIR)\vc40.idb" -@erase "$(INTDIR)\vc40.pdb" -@erase "$(OUTDIR)\kinsole.ex_" @@ -207,7 +207,7 @@ CPP_SBRS=.\. RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KINSole.res" /d "_DEBUG" /d "_AFXDLL" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)/kinsole.res" /d "_DEBUG" /d "_AFXDLL" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -221,7 +221,7 @@ LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)/kinsole.pdb" /debug /machine:I386 /out:"$(OUTDIR)/kinsole.exe" LINK32_OBJS= \ "$(INTDIR)\KINSole.obj" \ - "$(INTDIR)\KINSole.res" + "$(INTDIR)\kinsole.res" "$(OUTDIR)\kinsole.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -423,6 +423,9 @@ LINK32_OBJS= \ # Begin Source File SOURCE=.\KINSole.cpp + +!IF "$(CFG)" == "KINSole - Win32 Release" + DEP_CPP_KINSO=\ ".\NAWS.cpp"\ ".\NEW-ENVIRON.cpp"\ @@ -437,19 +440,52 @@ DEP_CPP_KINSO=\ "$(INTDIR)\KINSole.obj" : $(SOURCE) $(DEP_CPP_KINSO) "$(INTDIR)" +!ELSEIF "$(CFG)" == "KINSole - Win32 Debug" + +DEP_CPP_KINSO=\ + ".\NAWS.cpp"\ + ".\NEW-ENVIRON.cpp"\ + ".\options.cpp"\ + ".\status.cpp"\ + ".\terminal.cpp"\ + ".\TIMING-MARK.cpp"\ + ".\TTY.cpp"\ + ".\VT100.cpp"\ + + +"$(INTDIR)\KINSole.obj" : $(SOURCE) $(DEP_CPP_KINSO) "$(INTDIR)" + + +!ENDIF + # End Source File ################################################################################ # Begin Source File SOURCE=.\kinsole.rc + +!IF "$(CFG)" == "KINSole - Win32 Release" + DEP_RSC_KINSOL=\ ".\res\kinsole.ico"\ -"$(INTDIR)\KINSole.res" : $(SOURCE) $(DEP_RSC_KINSOL) "$(INTDIR)" +"$(INTDIR)\kinsole.res" : $(SOURCE) $(DEP_RSC_KINSOL) "$(INTDIR)" $(RSC) $(RSC_PROJ) $(SOURCE) +!ELSEIF "$(CFG)" == "KINSole - Win32 Debug" + +DEP_RSC_KINSOL=\ + ".\res\kinsole.ico"\ + + +"$(INTDIR)\kinsole.res" : $(SOURCE) $(DEP_RSC_KINSOL) "$(INTDIR)" + $(RSC) $(RSC_PROJ) $(SOURCE) + + +!ENDIF + # End Source File ################################################################################ # Begin Source File diff --git a/kinsole.rc b/kinsole.rc index b789f37..6e45d44 100644 --- a/kinsole.rc +++ b/kinsole.rc @@ -63,8 +63,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,3 - PRODUCTVERSION 1,0,0,3 + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x29L @@ -81,13 +81,13 @@ BEGIN BEGIN VALUE "CompanyName", "Klever Group (http://www.klever.net)\0" VALUE "FileDescription", "KINSole, telnet client\0" - VALUE "FileVersion", "1, 0, 0, 3\0" + VALUE "FileVersion", "1, 1, 0, 0\0" VALUE "InternalName", "KINSOLE\0" - VALUE "LegalCopyright", "Copyright © 1998, 2002 Klever Group (http://www.klever.net/)\0" + VALUE "LegalCopyright", "Copyright © 1998-2004 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, 0, 0, 3\0" + VALUE "ProductVersion", "1, 1, 0, 0\0" END END BLOCK "VarFileInfo" -- cgit v0.9.0.2