| -rw-r--r-- | dipstick.rc | 8 | ||||
| -rw-r--r-- | help/dipstick.rtf | 3 | ||||
| -rw-r--r-- | help/dipstick.xml | 3 | ||||
| -rw-r--r-- | install/install.cpp | 8 |
4 files changed, 15 insertions, 7 deletions
diff --git a/dipstick.rc b/dipstick.rc index 8797946..305eb77 100644 --- a/dipstick.rc +++ b/dipstick.rc @@ -53,76 +53,76 @@ BEGIN "#include ""res\\Dipstick.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
"#include ""afxres.rc"" // Standard components\r\n"
"#endif\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINFRAME ICON DISCARDABLE "res\\Dipstick.ico"
IDI_PINGING ICON DISCARDABLE "res\\pinging.ico"
IDI_PENDING ICON DISCARDABLE "res\\pending.ico"
IDI_COMPLETED ICON DISCARDABLE "res\\complete.ico"
IDI_UNREACHABLE ICON DISCARDABLE "res\\unreach.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
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.1-trunk",IDC_STATIC,40,7,89,8,SS_NOPREFIX
+ LTEXT "Dipstick, Version 3.1",IDC_STATIC,40,7,89,8,SS_NOPREFIX
LTEXT "Copyright © 1996-2005 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.1-trunk"
+CAPTION " Dipstick 3.1"
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
PUSHBUTTON "&Reping",IDC_REPING,361,23,50,14,WS_DISABLED
PUSHBUTTON "Reping &All",IDC_REPINGALL,361,38,50,14,WS_DISABLED
PUSHBUTTON "R&emove",IDC_REMOVE,361,53,50,14,WS_DISABLED
PUSHBUTTON "Remove A&ll",IDC_CLEAR,361,68,50,14,WS_DISABLED
PUSHBUTTON "&Help",ID_HELP,361,99,50,14
PUSHBUTTON "&Options",IDC_OPTIONS,361,114,50,14
PUSHBUTTON "E&xit Dipstick",IDC_EXIT,361,129,50,14
PUSHBUTTON "",IDCANCEL,411,2,6,6,NOT WS_VISIBLE | WS_DISABLED
PUSHBUTTON "Ad&vanced",IDC_ADVANCED,361,83,50,11
END
IDD_DRAGPAD DIALOGEX 0, 0, 53, 33
STYLE DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP
CAPTION " Drag URL here"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "Animate1",IDC_DNDTARGET,"SysAnimate32",WS_TABSTOP,0,0,
53,33
PUSHBUTTON "",IDCANCEL,49,0,6,6,NOT WS_VISIBLE | WS_DISABLED
DEFPUSHBUTTON "",IDOK,47,27,6,6,NOT WS_VISIBLE | WS_DISABLED
END
IDD_OPTIONS DIALOGEX 0, 0, 179, 154
STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP
@@ -430,85 +430,85 @@ BEGIN END
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
IDB_DIABACK BITMAP DISCARDABLE "shared-data/klever-background.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// WAVE
//
IDW_BESTURL WAVE DISCARDABLE "res\\best.wav"
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
IDS_ABOUTBOX "&About Dipstick.."
IDS_PS_FAILEDTOLOCK "Failed to gain access to internal resources. Please, report to Klever."
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.1-trunk"
+ IDS_DRAGPAD_TITLE " Dipstick 3.1"
IDS_DRAGPAD_URLS " %d/%d URL(s)"
IDS_REGEX_HTMLURL "<A[^[:alpha:]][^>]*href[[:space:]]*=[[:space:]]*""?([^[:space:]>""]+)""?[^>]*>"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_KLEVERNET_URL "http://www.klever.net/"
IDS_PS_INTERNALERROR "Internal Error. Please report to Klever."
IDS_PS_NETUNREACHABLE "Destination network unreachable"
IDS_PS_HOSTUNREACHABLE "Destination host unreachable"
IDS_PS_PROTUNREACHABLE "Destination protocol unreachable"
IDS_PS_PORTUNREACHABLE "Destination port unreachable"
IDS_PS_NORESOURCES "No resources"
IDS_PS_HWERROR "Hardware error"
IDS_PS_BIGPACKET "Packet size is too big"
END
STRINGTABLE DISCARDABLE
BEGIN
- IDC_DNDTARGET "Dipstick 3.1-trunk, click the right mouse button to display main window, left mouse button for menu"
+ IDC_DNDTARGET "Dipstick 3.1, 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"
IDC_URL "Universal Resource Locator (URL) associated with this location"
IDC_HOSTCAPTION "Host name as specified or resolved by Dipstick"
IDC_IPCAPTION "Host's IP address as specified or resolved by Dipstick"
IDC_TIMESCAPTION "Minmum, maximum and average round trip time in milliseconds. The less the better."
IDC_TIMES "Minmum, maximum and average round trip time in milliseconds. The less the better."
IDC_LOSSCAPTION "IP packets loss"
IDC_LOSS "IP packets loss"
IDC_STATUSCAPTION "Last error occured during attempt to ping this location"
IDC_STATUS "Last error occured during attempt to ping this location"
IDC_OPENURL "Open URL in your default browser"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_PS_TIMEOUT "Request timed out"
IDS_PS_BADROUTE "Bad route"
IDS_PS_TTLEXPTRANSIT "TTL expired in transit"
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"
IDS_FMT_TIMES "%lu/%lu/%lu"
IDS_FMT_LOSS "%d%%"
diff --git a/help/dipstick.rtf b/help/dipstick.rtf index 839d331..6568499 100644 --- a/help/dipstick.rtf +++ b/help/dipstick.rtf @@ -2,66 +2,67 @@ @{\footnote
THIS FILE WAS AUTOMATICALLY GENERATED FROM XML DOCUMENT.
DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
}
{\fonttbl{\f0\froman Times New Roman;}{\f1\fswiss Arial;}{\f3\froman Symbol;}}{\colortbl;
\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
\pard\plain\keepn
#{\footnote About}
${\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-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.
}
\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.1 - July 26th, 2005
+\par\pard\plain\f1\fs24\qc\cf2\b 3.1 - August 6th, 2005
\par\pard\plain\fi0\li0\f1\fs18 \bullet Ability to parse multiple URLs from plaintext selection
+\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 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
\par\pard\plain\fi0\li0\f1\fs18 \bullet Ability to export/import sets of URLs.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Copy URL menu command in the Main Window and button in the Best URL window.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Multiple URLs dragging or pasting. Works only for MSIE4 browser.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Annoying ToolTips removed.
\par\pard\plain\f1\fs24\qc\cf2\b 2.00 - July 1st, 1997
\par\pard\plain\fi0\li0\f1\fs18 \bullet Drag'n'drop source added to the Best URL window.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Completed/Total URLs counter added to {\b Dipstick} drag pad.
\par\pard\plain\fi0\li0\f1\fs18 \bullet You may now drag'n'drop URLs from main {\b Dipstick} dialog window.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Added ability to paste URLs into {\b Dipstick} instead of dropping.
\par\pard\plain\fi0\li0\f1\fs18 \bullet New install program now lets you install {\b Dipstick} to the location of your choice.
\par\pard\plain\f1\fs24\qc\cf2\b 1.01 - March 13th, 1997
\par\pard\plain\fi0\li0\f1\fs18 \bullet Resizable main {\b Dipstick} dialog window.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Come up with the best URL automatically.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Workaround for redir.dll
\par\pard\plain\fi0\li0\f1\fs18 \bullet No more {\b\cf6 MSIE} 3.0 requirement.
\par\pard\plain\fi0\li0\f1\fs18 \bullet Remembers window positions and size as well as columns widths.
\par\pard\plain\fi0\li0\f1\fs18 \bullet When manually adding locations - you may specify the URL, not host name as it was before (I still wonder how it came to my mind)
\page
\pard\plain\keepn
#{\footnote Using}
${\footnote Using Dipstick}
{ \f1\fs18\b\sb120 Using {\b Dipstick}}
\par\sa120\sb120\qj\pard \f1\fs18\sb120 To use {\b Dipstick}, please follow these steps:\pard
\par \fi0\li0 \bullet Load the page that contains links into your {\b\cf6 MSIE} or {\b\cf6 Netscape} browser.
diff --git a/help/dipstick.xml b/help/dipstick.xml index 8ed0383..21363ab 100644 --- a/help/dipstick.xml +++ b/help/dipstick.xml @@ -1,46 +1,47 @@ <?xml version="1.0"?> <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-2005"/> <credits/> </topic> <topic id="News" title="What's new"> <heading scroll="no">What's New</heading> - <newsfor version="3.1" date="July 26th, 2005"> + <newsfor version="3.1" date="August 6th, 2005"> <ni>Ability to parse multiple URLs from plaintext selection</ni> + <ni>Fixed uninstall procedure so that it works on XP</ni> </newsfor> <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> </newsfor> <newsfor version="2.5" date="December 30th, 1997"> <ni>Ability to export/import sets of URLs.</ni> <ni>Copy URL menu command in the Main Window and button in the Best URL window.</ni> <ni>Multiple URLs dragging or pasting. Works only for MSIE4 browser.</ni> <ni>Annoying ToolTips removed.</ni> </newsfor> <newsfor version="2.00" date="July 1st, 1997"> <ni>Drag'n'drop source added to the Best URL window.</ni> <ni>Completed/Total URLs counter added to <kin>Dipstick</kin> drag pad.</ni> <ni>You may now drag'n'drop URLs from main <kin>Dipstick</kin> dialog window.</ni> <ni>Added ability to paste URLs into <kin>Dipstick</kin> instead of dropping.</ni> <ni>New install program now lets you install <kin>Dipstick</kin> to the location of your choice.</ni> </newsfor> <newsfor version="1.01" date="March 13th, 1997"> <ni>Resizable main <kin>Dipstick</kin> dialog window.</ni> <ni>Come up with the best URL automatically.</ni> <ni>Workaround for redir.dll</ni> <ni>No more <product>MSIE</product> 3.0 requirement.</ni> <ni>Remembers window positions and size as well as columns widths.</ni> <ni>When manually adding locations - you may specify the URL, not host name as it was before (I still wonder how it came to my mind)</ni> </newsfor> </topic> <topic id="Using" title="Using Dipstick"> diff --git a/install/install.cpp b/install/install.cpp index 1d91bc2..fcd32d7 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -1,68 +1,74 @@ #include "resource.h"
#include "../shared-code/install.h"
#define KINNAME "Dipstick"
#define KINSHORT KINNAME
-#define VERSION "3.1-trunk"
+#define VERSION "3.1"
BOOL Install(void)
{
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
STRING sysDir(_MAX_PATH);
GetSystemDirectory(sysDir,_MAX_PATH);
INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");
#endif
MAKE_PATH(path);
STRING shortPath = GET_SHORT_PATH(path);
if(!shortPath){
MessageBox(NULL,"Failed to install " KINNAME " " VERSION " in specified directory",NULL,MB_ICONERROR|MB_OK);
return FALSE;
}
if(!(
INSTALLFILE("dipstick.ex_",path,"dipstick.exe") &&
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("Klever Group",KINNAME,path,"dipstick.exe");
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;
}
INF_FILE_HEADER(inf);
INF_FILE_SECTION(inf,"Uninstall");
fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");
INF_FILE_SECTION(inf,"kFiles");
INF_REMOVE_ROOT(inf,KINSHORT "Files",path);
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,"Klever Group");
INF_MENU_ITEM(inf,1,KINNAME);
fclose(inf);
REG_UNINSTALL_COMMAND(KINSHORT,"Klever " KINNAME " " VERSION,shortPath,KINSHORT ".INF","Uninstall");
+ REG_UNINSTALL_ICON(KINSHORT,path,"dipstick.exe",0);
+ REG_UNINSTALL_COMMENT(KINSHORT,"Klever Dipstick");
+ REG_UNINSTALL_VERSION(KINSHORT,VERSION);
+ REG_UNINSTALL_LOCATION(KINSHORT,path);
+ REG_UNINSTALL_PUBLISHER(KINSHORT,"Klever Group");
+ REG_UNINSTALL_URLS(KINSHORT,"http://www.klever.net/","http://kin.klever.net/dipstick/");
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;
}
|