prepared for dipstick 3.0 release3.0

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

8 files changed, 24 insertions, 21 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 ad23259..427b0ba 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
-Copyright (c) 1996, 1997, 1998, 2002 Klever Group (http://www.klever.net/)
+Copyright (c) 1996-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 7dab6ae..7dab6ae 100644
--- a/README
+++ b/README.RELEASE
diff --git a/dipstick.rc b/dipstick.rc
index 55b8d98..55f9fde 100644
--- a/dipstick.rc
+++ b/dipstick.rc
@@ -79,25 +79,25 @@ IDI_UNREACHABLE         ICON    DISCARDABLE     "res\\unreach.ico"
 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 213, 61

 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About Dipstick"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,11,17,21,20

-    LTEXT           "Dipstick, Version 3.00",IDC_STATIC,40,7,89,8,

+    LTEXT           "Dipstick, Version 3.0",IDC_STATIC,40,7,89,8,

                     SS_NOPREFIX

-    LTEXT           "Copyright © 1996,1997,1998,2002 Klever Group",

+    LTEXT           "Copyright © 1996-2004 Klever Group",

                     IDC_STATIC,40,25,166,8

     DEFPUSHBUTTON   "OK",IDOK,174,7,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,40,40,91,14

 END

 

 IDD_DIPSTICK_DIALOG DIALOGEX 0, 0, 419, 152

 STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | 

     WS_EX_APPWINDOW

-CAPTION "  Dipstick 3.00"

+CAPTION "  Dipstick 3.0"

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

 BEGIN

     CONTROL         "List1",IDC_HOSTLIST,"SysListView32",LVS_REPORT | 

                     LVS_SORTASCENDING | LVS_AUTOARRANGE | WS_BORDER | 

                     WS_TABSTOP,8,8,349,136,WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Manual Ping",IDC_MANUALPING,361,8,50,14

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

         BEGIN

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

             VALUE "FileDescription", "Dipstick, mirror locator\0"

             VALUE "FileVersion", "3, 0, 0, 0\0"

             VALUE "InternalName", "DIPSTICK\0"

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

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

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

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

             VALUE "ProductName", "Dipstick\0"

             VALUE "ProductVersion", "3, 0, 0, 0\0"

         END

     END

@@ -457,13 +457,13 @@ BEGIN
     IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."

     IDS_CSVEXT              ".csv"

     IDS_HN_BADURL           "Bad URL"

     IDS_ABEST_CLEANUP       "Remove all locations from list?"

     IDS_ABEST_NONEFOUND     "No reachable locations were found."

     IDS_ABEST_TITLE         "  Dipstick - report"

-    IDS_DRAGPAD_TITLE       " Dipstick 3.00"

+    IDS_DRAGPAD_TITLE       " Dipstick 3.0"

     IDS_DRAGPAD_URLS        "  %d/%d URL(s)"

     IDS_REGEX_HTMLURL       "<A[^[:alpha:]][^>]*href[[:space:]]*=[[:space:]]*""?([^[:space:]>""]+)""?[^>]*>"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

@@ -477,13 +477,13 @@ BEGIN
     IDS_PS_HWERROR          "Hardware error"

     IDS_PS_BIGPACKET        "Packet size is too big"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

-    IDC_DNDTARGET           "Dipstick 3.00, click the right mouse button to display main window, left mouse button for menu"

+    IDC_DNDTARGET           "Dipstick 3.0, click the right mouse button to display main window, left mouse button for menu"

     IDC_HOST                "Host name as specified or resolved by Dipstick"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDC_URLCAPTION          "Universal Resource Locator (URL) associated with this location"

@@ -507,13 +507,13 @@ BEGIN
     IDS_PS_TTLEXPREASM      "TTL expired during reassembly"

     IDS_PS_IPARAMP          "IP parameter problem"

     IDS_PS_SOURCEQUENCH     "Source quench received"

     IDS_PS_BIGOPTION        "Option is too big"

     IDS_PS_BADDEST          "Bad destination"

     IDS_PS_UNKNOWNERROR     "Unknown error"

-    IDS_REGISTRYKEY         "Klever Group, Inc."

+    IDS_REGISTRYKEY         "Klever Group"

     IDS_FMT_TIMES           "%lu/%lu/%lu"

     IDS_FMT_LOSS            "%d%%"

     IDS_TIP_UNREACHABLE     "This location seems to be unreachable"

     IDS_PS_FAILEDTORESOLVE  "Unable to resolve host IP"

 END

 

diff --git a/help/dipstick.rtf b/help/dipstick.rtf
index a37a39f..c91b3f4 100644
--- a/help/dipstick.rtf
+++ b/help/dipstick.rtf
@@ -15,26 +15,26 @@ ${\footnote About Dipstick}
 K{\footnote about}

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

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b Dipstick} is our award-winning freeware that allows you to evaluate {\i mirror sites} to figure out which one has currently the least traffic.

 \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) 1996, 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) 1996-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.

 }

 \par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")}

 \par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")}

 \page

 

 \pard\plain\keepn

 #{\footnote News}

 ${\footnote What's new}

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

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

+\par\pard\plain\f1\fs24\qc\cf2\b 3.0 - 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

 \par\pard\plain\f1\fs24\qc\cf2\b 2.52 - June 3rd, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Now works properly with  Winsock 2 for  Windows95. Also may start working with non-Microsoft  TCP/IP stacks.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed bug that caused  GPF when removing all  URLs after testing is over and you picked the  URL of your choice.

 \par\pard\plain\f1\fs24\qc\cf2\b 2.5 - December 30th, 1997

diff --git a/help/dipstick.xml b/help/dipstick.xml
index b6e0748..4754e47 100644
--- a/help/dipstick.xml
+++ b/help/dipstick.xml
@@ -2,18 +2,18 @@
 <winhelp>
  <topic id="About" title="About Dipstick" keywords="about">
   <heading scroll="no">About <kin>Dipstick</kin></heading>
   <p><kin>Dipstick</kin> is our award-winning freeware that allows you to evaluate <term>mirror sites</term> to figure out which one has currently the least traffic.</p>
   <p/>
   <p><b><i>Enjoy!</i></b></p>
-  <license years="1996, 1997, 1998, 2002"/>
+  <license years="1996-2004"/>
   <credits/>
  </topic>
  <topic id="News" title="What's new">
   <heading scroll="no">What's New</heading>
-  <newsfor version="3.00" date="August 19st, 2002">
+  <newsfor version="3.0" 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.52" date="June 3rd, 1998">
    <ni>Now works properly with  Winsock 2 for  Windows95. Also may start working with non-Microsoft  TCP/IP stacks.</ni>
    <ni>Fixed bug that caused  GPF when removing all  URLs after testing is over and you picked the  URL of your choice.</ni>
diff --git a/install/install.cpp b/install/install.cpp
index 995b78f..296f3a3 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,17 +1,17 @@
 #include "resource.h"

 #include "../shared-code/install.h"

 

 #define KINNAME "Dipstick"

 #define KINSHORT KINNAME

-#define VERSION "3.00"

+#define VERSION "3.0"

 

 BOOL Install(void)

 {

-STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.",KINSHORT "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",KINSHORT "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("  " KINNAME " " VERSION,"\nEnter destination path:",qPath);

 	if(!path)

 		return NULL;

 

 #ifdef	K_ANNED

@@ -32,16 +32,16 @@ STRING shortPath = GET_SHORT_PATH(path);
 		INSTALLFILE("dipstick.hl_",path,"dipstick.hlp") && 

 		INSTALLFILE("dipstick.cn_",path,"dipstick.cnt")

 	)){

 		MessageBox(NULL,"Failed to install " KINNAME " " VERSION " in specified directory",NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 	}

-	ADDMENU("Accessories\\Klever Co.",KINNAME,path,"dipstick.exe");

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

 

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

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

+	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",KINSHORT "Path",path);

+	strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);

 

 FILE* inf=CREATE_INF_FILE(path,KINSHORT ".INF");

 	if(!inf){

 		MessageBox(NULL,"Failed to install " KINNAME " " VERSION,NULL,MB_ICONERROR|MB_OK);

 		return FALSE;

 	}

@@ -53,16 +53,16 @@ FILE* inf=CREATE_INF_FILE(path,KINSHORT ".INF");
 	INF_REMOVE_FILE(inf,KINSHORT "Files","dipstick.exe");

 	INF_REMOVE_HELP_FILE(inf,KINSHORT "Files","dipstick");

 	INF_REMOVE_FILE(inf,KINSHORT "Files",KINSHORT ".INF");

 	INF_FILE_SECTION(inf,"kReg");

 	INF_UNINSTALL_REG(inf,KINSHORT);

 	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,KINNAME);

 	fclose(inf);

 

 	REG_UNINSTALL_COMMAND(KINSHORT,"Klever " KINNAME " " VERSION,shortPath,KINSHORT ".INF","Uninstall");

 

-	MessageBox(NULL,KINNAME " " VERSION " 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,KINNAME " " VERSION " 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 8c86414..016c554 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: Dipstick, mirror locator\0"

             VALUE "FileVersion", "3, 0, 0, 0\0"

             VALUE "InternalName", "INSTALL\0"

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

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

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

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

             VALUE "ProductName", "Dipstick\0"

             VALUE "ProductVersion", "3, 0, 0, 0\0"

         END

     END