fixed the installer for XP and prepared for 3.1 release3.1

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

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
@@ -1,567 +1,567 @@
 //Microsoft Developer Studio generated resource script.

 //

 #include "resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include "afxres.h"

 

 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

 

 /////////////////////////////////////////////////////////////////////////////

 // English (U.S.) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

 #ifdef _WIN32

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 #pragma code_page(1252)

 #endif //_WIN32

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

 // TEXTINCLUDE

 //

 

 1 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "resource.h\0"

 END

 

 2 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

 3 TEXTINCLUDE DISCARDABLE 

 BEGIN

     "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

     "#define _AFX_NO_OLE_RESOURCES\r\n"

     "#define _AFX_NO_TRACKER_RESOURCES\r\n"

     "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

     "\r\n"

     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

     "#ifdef _WIN32\r\n"

     "LANGUAGE 9, 1\r\n"

     "#pragma code_page(1252)\r\n"

     "#endif\r\n"

     "#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

 CAPTION "Dipstick Options"

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

 BEGIN

     LTEXT           "Number of pings per &host",IDC_STATIC,50,9,122,10

     EDITTEXT        IDC_NPINGS,7,7,35,14,ES_AUTOHSCROLL

     CONTROL         "Spin1",IDC_SPINPINGS,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

                     UDS_ARROWKEYS | UDS_NOTHOUSANDS,31,7,11,14

     LTEXT           "&Maximum number of threads",IDC_STATIC,50,23,122,10

     EDITTEXT        IDC_MAXPINGS,7,21,35,14,ES_AUTOHSCROLL

     CONTROL         "Spin1",IDC_SPINMAXPINGS,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

                     UDS_ARROWKEYS | UDS_NOTHOUSANDS,31,21,11,14

     LTEXT           "Ping &timeout",IDC_STATIC,50,37,122,10

     EDITTEXT        IDC_TIMEOUT,7,35,35,14,ES_AUTOHSCROLL

     CONTROL         "Spin1",IDC_SPINTIMEOUT,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

                     UDS_ARROWKEYS | UDS_NOTHOUSANDS,31,35,11,14

     LTEXT           "&Interval between pings",IDC_STATIC,50,51,122,10

     EDITTEXT        IDC_INTERVAL,7,49,35,14,ES_AUTOHSCROLL

     CONTROL         "Spin1",IDC_SPINTERVAL,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

                     UDS_ARROWKEYS | UDS_NOTHOUSANDS,31,49,11,14

     LTEXT           "Ping &size",IDC_STATIC,50,65,122,10

     EDITTEXT        IDC_PACKETSIZE,7,63,35,14,ES_AUTOHSCROLL

     CONTROL         "Spin1",IDC_SPINSIZE,"msctls_updown32",UDS_WRAP | 

                     UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

                     UDS_ARROWKEYS | UDS_NOTHOUSANDS,31,63,11,14

     CONTROL         "Test i&nnermost URL",IDC_MSWORKAROUND,"Button",

                     BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,80,165,8

     DEFPUSHBUTTON   "OK",IDOK,31,133,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,97,133,50,14

     CONTROL         "Come up with the &best URL",IDC_AUTOBEST,"Button",

                     BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,16,90,156,8

     CONTROL         "When selecting URLs, enable smart adjust",

                     IDC_SMARTADJUST,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | 

                     WS_TABSTOP,7,100,165,8

     CONTROL         "When smart-adjusting, use innermost URL",IDC_ADJUSTINN,

                     "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,16,110,

                     156,8

     CONTROL         "Ignore relative URLs when dragging selection.",

                     IDC_IGNORELA,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | 

                     WS_TABSTOP,7,120,165,8

 END

 

 IDD_MANUALHOST DIALOGEX 0, 0, 187, 54

 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE

 CAPTION " Manually Test Host"

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

 BEGIN

     LTEXT           "Enter &URL, host name or ip address:",IDC_STATIC,7,7,

                     129,8

     EDITTEXT        IDC_HOST,7,16,173,14,ES_LOWERCASE | ES_AUTOHSCROLL

     DEFPUSHBUTTON   "OK",IDOK,35,33,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,101,33,50,14

 END

 

 IDD_PROPS DIALOGEX 0, 0, 209, 99

 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE

 CAPTION " Properties"

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

 BEGIN

     DEFPUSHBUTTON   "OK",IDOK,152,78,50,14

     LTEXT           "URL:",IDC_URLCAPTION,7,7,18,8,SS_NOTIFY

     LTEXT           "..",IDC_URL,60,7,142,8,SS_NOPREFIX | SS_NOTIFY

     LTEXT           "Host name:",IDC_HOSTCAPTION,7,17,37,8,SS_NOTIFY

     LTEXT           "..",IDC_HOST,60,17,142,8,SS_NOPREFIX | SS_NOTIFY

     LTEXT           "IP:",IDC_IPCAPTION,7,27,10,8,SS_NOTIFY

     LTEXT           "..",IDC_IP,60,27,142,8,SS_NOTIFY

     LTEXT           "Ping times (min/avg/max):",IDC_TIMESCAPTION,7,37,53,17,

                     SS_NOTIFY

     LTEXT           "../../..",IDC_TIMES,60,45,66,8,SS_NOTIFY

     LTEXT           "Packet loss:",IDC_LOSSCAPTION,7,56,40,8,SS_NOTIFY

     LTEXT           "..",IDC_LOSS,60,56,66,8,SS_NOPREFIX | SS_NOTIFY

     LTEXT           "Status:",IDC_STATUSCAPTION,7,66,23,8,SS_NOTIFY

     LTEXT           "..",IDC_STATUS,60,66,142,8,SS_NOPREFIX | SS_NOTIFY

     PUSHBUTTON      "&Open URL",IDC_OPENURL,7,78,50,14

     ICON            IDR_MAINFRAME,IDC_STATE,166,42,18,20,SS_NOTIFY | 

                     SS_CENTERIMAGE | SS_REALSIZEIMAGE

     PUSHBUTTON      "&Copy URL",IDC_COPYURL,60,78,50,14

 END

 

 IDD_AUTOBEST DIALOGEX 0, 0, 287, 82

 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_POPUP | 

     WS_CAPTION

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE

 CAPTION "  Dipstick - report"

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

 BEGIN

     DEFPUSHBUTTON   "Open this URL",IDOK,110,47,68,14

     PUSHBUTTON      "&Next Location",IDC_NEXT,188,47,68,14

     PUSHBUTTON      "&Previous Location",IDC_PREV,32,47,68,14

     CTEXT           "..",IDC_URL,7,7,273,14,SS_NOPREFIX,WS_EX_DLGMODALFRAME | 

                     WS_EX_CLIENTEDGE

     LTEXT           "Average Response Time, milliseconds:",IDC_STATIC,7,25,

                     136,8

     LTEXT           "..",IDC_RTT,143,25,68,8

     LTEXT           "Packet Loss:",IDC_STATIC,7,36,136,8

     LTEXT           "..",IDC_PKTLOSS,143,36,68,8

     PUSHBUTTON      "Cancel",IDCANCEL,118,63,50,12

     CONTROL         "Animate1",IDC_DROPSOURCE,"SysAnimate32",ACS_CENTER | 

                     ACS_AUTOPLAY,257,23,23,22,WS_EX_DLGMODALFRAME | 

                     WS_EX_STATICEDGE

     PUSHBUTTON      "&Copy URL",IDC_COPYURL,211,23,39,22,BS_CENTER | 

                     BS_VCENTER | BS_MULTILINE

 END

 

 IDD_URLS DIALOGEX 0, 0, 176, 192

 STYLE DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_MAXIMIZEBOX | WS_POPUP | 

     WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_CLIENTEDGE

 CAPTION "  Select URLs of interest"

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

 BEGIN

     LISTBOX         IDC_URLS,7,7,162,146,LBS_SORT | LBS_NOINTEGRALHEIGHT | 

                     LBS_EXTENDEDSEL | NOT WS_BORDER | WS_VSCROLL | 

                     WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE

     DEFPUSHBUTTON   "OK",IDOK,7,155,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,7,171,50,14

     CONTROL         "&Smart adjust selection",IDC_DOADJUST,"Button",

                     BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,63,157,106,10

     CONTROL         "Adjust by &innermost URL",IDC_ADJUSTINN,"Button",

                     BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,63,

                     175,106,10

 END

 

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION 3,1,0,0

  PRODUCTVERSION 3,1,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x9L

 #else

  FILEFLAGS 0x8L

 #endif

  FILEOS 0x4L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

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

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

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

             VALUE "InternalName", "DIPSTICK\0"

             VALUE "LegalCopyright", "Copyright © 1996-2005 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, 1, 0, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

 //

 

 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO DISCARDABLE 

 BEGIN

     IDD_ABOUTBOX, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 206

         VERTGUIDE, 40

         TOPMARGIN, 7

         BOTTOMMARGIN, 54

     END

 

     IDD_DIPSTICK_DIALOG, DIALOG

     BEGIN

         VERTGUIDE, 8

         VERTGUIDE, 411

         HORZGUIDE, 8

         HORZGUIDE, 144

     END

 

     IDD_OPTIONS, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 172

         VERTGUIDE, 16

         VERTGUIDE, 50

         TOPMARGIN, 7

         BOTTOMMARGIN, 147

     END

 

     IDD_MANUALHOST, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 180

         TOPMARGIN, 7

         BOTTOMMARGIN, 47

     END

 

     IDD_PROPS, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 202

         VERTGUIDE, 60

         TOPMARGIN, 7

         BOTTOMMARGIN, 92

     END

 

     IDD_AUTOBEST, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 280

         VERTGUIDE, 143

         VERTGUIDE, 211

         TOPMARGIN, 7

         BOTTOMMARGIN, 75

         HORZGUIDE, 25

         HORZGUIDE, 44

     END

 

     IDD_URLS, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 169

         TOPMARGIN, 7

         BOTTOMMARGIN, 185

     END

 END

 #endif    // APSTUDIO_INVOKED

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // AVI

 //

 

 IDR_DNDAVI              AVI     DISCARDABLE     "res\\kdnd.avi"

 IDR_DRAGAVI             AVI     DISCARDABLE     "res\\kdragurl.avi"

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Menu

 //

 

 IDR_MENU MENU DISCARDABLE 

 BEGIN

     POPUP "Drag pad"

     BEGIN

         MENUITEM "&Manual Ping",                ID_DRAGPAD_MANUALPING

         MENUITEM "&Paste URL(s)",               ID_DRAGPAD_PASTEURL

         MENUITEM "Reping &All",                 ID_DRAGPAD_REPINGALL

         MENUITEM "Remove A&ll",                 ID_DRAGPAD_REMOVEALL

         MENUITEM SEPARATOR

         MENUITEM "&Options",                    ID_DRAGPAD_OPTIONS

         MENUITEM "&Show main window",           ID_DRAGPAD_SHOWMAINWINDOW

         POPUP "Ad&vanced"

         BEGIN

             MENUITEM "&Export List",                ID_DRAGPAD_ADVANCED_EXPORTLIST

 

             MENUITEM "&Import List",                ID_DRAGPAD_ADVANCED_IMPORTLIST

 

         END

         MENUITEM SEPARATOR

         MENUITEM "&Help",                       ID_DRAGPAD_HELP

         MENUITEM "A&bout Dipstick",             ID_DRAGPAD_ABOUT

         MENUITEM "E&xit Dipstick",              ID_DRAGPAD_EXIT

     END

     POPUP "Host List"

     BEGIN

         MENUITEM "&Reping",                     ID_HOSTLIST_REPING

         MENUITEM "R&emove",                     ID_HOSTLIST_REMOVE

         MENUITEM "Open URL",                    ID_HOSTLIST_OPENURL

         MENUITEM "&Copy URL",                   ID_HOSTLIST_COPYURL

         MENUITEM SEPARATOR

         MENUITEM "Reping &All",                 ID_HOSTLIST_REPINGALL

         MENUITEM "Remove A&ll",                 ID_HOSTLIST_REMOVEALL

         MENUITEM SEPARATOR

         MENUITEM "&Paste URL(s)",               ID_HOSTLIST_PASTEURL

         MENUITEM "&Properties",                 ID_HOSTLIST_PROPERTIES

     END

     POPUP "Advanced"

     BEGIN

         MENUITEM "&Export List",                ID_ADVANCED_EXPORTLIST

         MENUITEM "&Import List",                ID_ADVANCED_IMPORTLIST

     END

 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%%"

     IDS_TIP_UNREACHABLE     "This location seems to be unreachable"

     IDS_PS_FAILEDTORESOLVE  "Unable to resolve host IP"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_PS_UNABLETOICMP     "Unable to initialize ICMP services"

     IDS_TIP_PENDING         "This location is waiting for it's turn to get pinged"

     IDS_TIP_COMPLETE        "Pinging of this location has been completed"

     IDS_TIP_PROPSOK         "Click OK if you're done with looking and want to dismiss this window"

     IDS_TIP_INTERVAL        "Interval between ping requests in seconds"

     IDS_TIP_OPTIONSOK       "Click OK to make changes permanent"

     IDS_TIP_OPTIONSCANCEL   "Click CANCEL to leave dialog without making any changes"

     IDS_TIP_PINGING         "This location is being pinged at the moment.."

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDC_MSWORKAROUND        "In case of REDIRed URL - test the innermost one"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_CSVFILTER           "Comma Separated Values (*.csv)|*.csv|All Files (*.*)|*.*||"

     IDS_REGEX_URL           "([a-zA-Z]+://)?[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]*)+(/[^ \t\r\n\\f]*)?"

 END

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

 #define _AFX_NO_SPLITTER_RESOURCES

 #define _AFX_NO_OLE_RESOURCES

 #define _AFX_NO_TRACKER_RESOURCES

 #define _AFX_NO_PROPERTY_RESOURCES

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

 #ifdef _WIN32

 LANGUAGE 9, 1

 #pragma code_page(1252)

 #endif

 #include "res\Dipstick.rc2"  // non-Microsoft Visual C++ edited resources

 #include "afxres.rc"         // Standard components

 #endif

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED

 

diff --git a/help/dipstick.rtf b/help/dipstick.rtf
index 839d331..6568499 100644
--- a/help/dipstick.rtf
+++ b/help/dipstick.rtf
@@ -1,141 +1,142 @@
 {\rtf1\ansi

 @{\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.

 \par \fi0\li0 \bullet   Drag'n'drop desired links to {\b Dipstick} window.

 \par \fi0\li0 \bullet   {#{\footnote UsingManual}}(Optional) you can also manually add as many links as you want by selecting {\b Manual Ping} option. You can enter {\i url}, {\i hostname} or {\i IP address} there.

 \par \fi0\li0 \bullet   You will see rain going thought {\b Dipstick} window. After the rain stops, {\b Dipstick} will show you results either by suggesting the best URL or by sorting results in a table (which can be viewed by clicking on {\b Dipstick} window).

 \par \fi0\li0 \bullet   After you are done, you can reping all selected URLs by clicking {\uldb {\b Reping All}}{\v MainWindowRA} button in {\b Dipstick} window.\pard

 \par\sa120\sb120\qj\f1\fs16 Small note for newbies (all others, please do not get mad): To drag'n'drop the URL, you need to move your mouse to the link on the web page, press and hold the select (usually - left) mouse button, and drag the mouse (with the selected URL to {\b Dipstick} window and then release mouse button.

 \page

 

 \pard\plain\keepn

 #{\footnote MainWindow}

 ${\footnote Main Window}

 { \f1\fs18\b\sb120 Main Window}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 The main window consists of -\pard

 \par \fi0\li0 \bullet   {\b Brilliant ListView with the following columns:}

 \par \fi0\li0 \bullet   Host Name - host name as it was specified in the URL or resolved from IP address.

 \par \fi0\li0 \bullet   Host IP address - host IP address as it was specified in the URL or resolved from host name.

 \par \fi0\li0 \bullet   Min RTT - Minimum Round Trip Time. {\b Dipstick} sends a few echo requests to remote host and calculates minimum, maximum, and average Round Trip Times. The less the better.

 \par \fi0\li0 \bullet   Avg RTT - Average Round Trip Time. About the same meaning as in Min RTT, but this is the average one. The less the better. By default locations are sorted by Avg RTT.

 \par \fi0\li0 \bullet   Max RTT - Maximum Round Trip Time. About the same meaning as in Min RTT and Avg RTT, but this is maximum one. The less the better.

 \par \fi0\li0 \bullet   Pktloss - Percentage of the requests lost somewhere in the net. The less the better.

 \par \fi0\li0 \bullet   {\b Buttons:}

 \par \fi0\li0 \bullet   {#{\footnote MainWindowMP}}Manual Ping - lets you add location manually (usually you just drag'n'drop locations into {\b Dipstick} window.

 \par \fi0\li0 \bullet   Reping - Test selected location again.

 \par \fi0\li0 \bullet   {#{\footnote MainWindowRA}}Reping All - Test again all locations in the list.

 \par \fi0\li0 \bullet   Remove - Remove selected location from the list.

 \par \fi0\li0 \bullet   Remove All - Remove all locations from the list.

 \par \fi0\li0 \bullet   Help - I think you have a clue on what this button does.

 \par \fi0\li0 \bullet   Options - Set {\b Dipstick} options

 \par \fi0\li0 \bullet   Exit Dipstick - Close {\b Dipstick} program\pard

 \page

 

 \pard\plain\keepn

 #{\footnote Options}

 ${\footnote Dipstick Options}

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

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Options are:\pard

 \par \fi0\li0 \bullet   {#{\footnote OptionsPPH}}{\b Number of pings per host} - number of echo requests to send for each location.

 \par \fi0\li0 \bullet   {\b Maximum number of threads} - number of locations to process at the same time. adjust this if you have unusually fast or slow connection and/or computer.

 \par \fi0\li0 \bullet   {\b Ping Timeout} - number of seconds to wait between sending echo requests.

 \par \fi0\li0 \bullet   {\b Interval between pings} - number of seconds to wait between sending echo requests.

 \par \fi0\li0 \bullet   {\b Ping size} - number of bytes to send in each echo request.

 \par \fi0\li0 \bullet   {#{\footnote OptionsIM}}{\b Test innermost URL} - in case of nesting {\b redir}ed URLs test the innermost one. Some strange companies refer to their mirrors using {\b redir.dll} so that the URLs for files located on different machines look like they're all here. Like {\b http://www.punchcards.com/redir.dll?target=http://www.punchcards.mirrordudes.com/file.exe&puchcards=advanced}

 \par \fi0\li0 \bullet   {#{\footnote OptionsBU}}{\b Come up with the best URL} - pop up with a suggestion about the best URL (after all locations have been pinged and have nothing left to do other than to start dowloading).\pard

 \page

 

 \pard\plain\keepn

 #{\footnote Properties}

 ${\footnote URL properties}

 { \f1\fs18\b\sb120 URL Properties}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 URL Properties are:\pard

 \par \fi0\li0 \bullet   {\b URL} - the URL itself if present.

 \par \fi0\li0 \bullet   {\b Host name} - host name as specified in URL (or the innermost URL in case of {\b redir}ed URLs in the {\uldb appropriate option}{\v OptionsIM} is turned on or resolved by {\b Dipstick}.

 \par \fi0\li0 \bullet   {\b Ping times} - minimum, average, and mmaximum round trip times if available.

 \par \fi0\li0 \bullet   {\b Packet loss} - percentage of packets lost in transmission.

 \par \fi0\li0 \bullet   {\b Status} - description of last error occured (if any).\pard

 \page

 

 \pard\plain\keepn

 #{\footnote SelectURLs}

 ${\footnote Select URLs Dialog}

 { \f1\fs18\b\sb120 Select URLs dialog}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 If you're dragging or cut'n'pasting selection from {\b\cf6 MSIE4} browser, you're supposed to chose which URLs to test.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 There are two options you may want to change when selecting URLs from list:\pard

 \par \fi0\li0 \bullet   {\b Smart adjust selection} - let {\b Dipstick} adjust current selection when you're clicking URL based on the URL you click.

 \par \fi0\li0 \bullet   {\b Adjusst by innermost URL} - use the innermost URL when adjusting selection.\pard

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 The default values for these options are also available from the {\uldb {\b Options}}{\v Options} dialog box.

 \page

 

 \pard\plain\keepn

 #{\footnote Autobest}

 ${\footnote Dipstick Report}

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

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 When {\b Dipstick} has finished testing and there's nothing left but to start your download, you're presented with a suggestion about the best URL. From this dialog you may chose to browse to the location you like using {\b Previous Location} and {\b Next Location} buttons, {\b Open this URL}, {\b Copy URL} to clipboard or drag it to wherever you want.

 \page

 }
\ No newline at end of file
diff --git a/help/dipstick.xml b/help/dipstick.xml
index 8ed0383..21363ab 100644
--- a/help/dipstick.xml
+++ b/help/dipstick.xml
@@ -1,118 +1,119 @@
 <?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">
   <heading scroll="no">Using <kin>Dipstick</kin></heading>
   <p>To use <kin>Dipstick</kin>, please follow these steps:</p>
   <ul>
    <li>Load the page that contains links into your <product>MSIE</product> or <product>Netscape</product> browser.</li>
    <li>Drag'n'drop desired links to <kin>Dipstick</kin> window.</li>
    <li><a name="UsingManual"/>(Optional) you can also manually add as many links as you want by selecting <b>Manual Ping</b> option. You can enter <term>url</term>, <term>hostname</term> or <term>IP address</term> there.</li>
    <li>You will see rain going thought <kin>Dipstick</kin> window. After the rain stops, <kin>Dipstick</kin> will show you results either by suggesting the best URL or by sorting results in a table (which can be viewed by clicking on <kin>Dipstick</kin> window).</li>
    <li>After you are done, you can reping all selected URLs by clicking <a href="#MainWindowRA"><b>Reping All</b></a> button in <kin>Dipstick</kin> window.</li>
   </ul>
   <note>Small note for newbies (all others, please do not get mad): To drag'n'drop the URL, you need to move your mouse to the link on the web page, press and hold the select (usually - left) mouse button, and drag the mouse (with the selected URL to <kin>Dipstick</kin> window and then release mouse button.</note>
  </topic>
  <topic id="MainWindow" title="Main Window">
   <heading scroll="no">Main Window</heading>
   <p>The main window consists of -</p>
   <ul>
    <li><b>Brilliant ListView with the following columns:</b></li>
     <li>Host Name - host name as it was specified in the URL or resolved from IP address.</li>
     <li>Host IP address - host IP address as it was specified in the URL or resolved from host name.</li>
     <li>Min RTT - Minimum Round Trip Time. <kin>Dipstick</kin> sends a few echo requests to remote host and calculates minimum, maximum, and average Round Trip Times. The less the better.</li>
     <li>Avg RTT - Average Round Trip Time. About the same meaning as in Min RTT, but this is the average one. The less the better. By default locations are sorted by Avg RTT.</li>
     <li>Max RTT - Maximum Round Trip Time. About the same meaning as in Min RTT and Avg RTT, but this is maximum one. The less the better.</li>
     <li>Pktloss - Percentage of the requests lost somewhere in the net. The less the better.</li>
    <li><b>Buttons:</b></li>
     <li><a name="MainWindowMP"/>Manual Ping - lets you add location manually (usually you just drag'n'drop locations into <kin>Dipstick</kin> window.</li>
     <li>Reping - Test selected location again.</li>
     <li><a name="MainWindowRA"/>Reping All - Test again all locations in the list.</li>
     <li>Remove - Remove selected location from the list.</li>
     <li>Remove All - Remove all locations from the list.</li>
     <li>Help - I think you have a clue on what this button does.</li>
     <li>Options - Set <kin>Dipstick</kin> options</li>
     <li>Exit Dipstick - Close <kin>Dipstick</kin> program</li>
   </ul>
  </topic>
  <topic id="Options" title="Dipstick Options">
   <heading scroll="no"><kin>Dipstick</kin> Opions</heading>
   <p>Options are:</p>
   <ul>
    <li><a name="OptionsPPH"/><b>Number of pings per host</b> - number of echo requests to send for each location.</li>
    <li><b>Maximum number of threads</b> - number of locations to process at the same time. adjust this if you have unusually fast or slow connection and/or computer.</li>
    <li><b>Ping Timeout</b> - number of seconds to wait between sending echo requests.</li>
    <li><b>Interval between pings</b> - number of seconds to wait between sending echo requests.</li>
    <li><b>Ping size</b> - number of bytes to send in each echo request.</li>
    <li><a name="OptionsIM"/><b>Test innermost URL</b> - in case of nesting <b>redir</b>ed URLs test the innermost one. Some strange companies refer to their mirrors using <b>redir.dll</b> so that the URLs for files located on different machines look like they're all here. Like <b>http://www.punchcards.com/redir.dll?target=http://www.punchcards.mirrordudes.com/file.exe&amp;puchcards=advanced</b></li>
    <li><a name="OptionsBU"/><b>Come up with the best URL</b> - pop up with a suggestion about the best URL (after all locations have been pinged and have nothing left to do other than to start dowloading).</li>
   </ul>
  </topic>
  <topic id="Properties" title="URL properties">
   <heading scroll="no">URL Properties</heading>
   <p>URL Properties are:</p>
   <ul>
    <li><b>URL</b> - the URL itself if present.</li>
    <li><b>Host name</b> - host name as specified in URL (or the innermost URL in case of <b>redir</b>ed URLs in the <a href="#OptionsIM">appropriate option</a> is turned on or resolved by <kin>Dipstick</kin>.</li>
    <li><b>Ping times</b> - minimum, average, and mmaximum round trip times if available.</li>
    <li><b>Packet loss</b> - percentage of packets lost in transmission.</li>
    <li><b>Status</b> - description of last error occured (if any).</li>
   </ul>
  </topic>
  <topic id="SelectURLs" title="Select URLs Dialog">
   <heading scroll="no">Select URLs dialog</heading>
   <p>If you're dragging or cut'n'pasting selection from <product>MSIE4</product> browser, you're supposed to chose which URLs to test.</p>
   <p>There are two options you may want to change when selecting URLs from list:</p>
   <ul>
    <li><b>Smart adjust selection</b> - let <kin>Dipstick</kin> adjust current selection when you're clicking URL based on the URL you click.</li>
    <li><b>Adjusst by innermost URL</b> - use the innermost URL when adjusting selection.</li>
   </ul>
   <p>The default values for these options are also available from the <a href="#Options"><b>Options</b></a> dialog box.</p>
  </topic>
  <topic id="Autobest" title="Dipstick Report">
   <heading scroll="no"><kin>Dipstick</kin> report</heading>
   <p>When <kin>Dipstick</kin> has finished testing and there's nothing left but to start your download, you're presented with a suggestion about the best URL. From this dialog you may chose to browse to the location you like using <b>Previous Location</b> and <b>Next Location</b> buttons, <b>Open this URL</b>, <b>Copy URL</b> to clipboard or drag it to wherever you want.</p>
  </topic>
 </winhelp>
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;

 

         #ifdefK_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;

 }