added ability to parse multiple urls from plaintext selection and bumped versions

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

10 files changed, 83 insertions, 32 deletions

diff --git a/COPYING b/COPYING
index 427b0ba..fa23ff9 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
-Copyright (c) 1996-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1996-2005 Klever Group (http://www.klever.net/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
 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/DipstickDlg.cpp b/DipstickDlg.cpp
index ace2aff..f27b219 100644
--- a/DipstickDlg.cpp
+++ b/DipstickDlg.cpp
@@ -102,12 +102,14 @@ WORD hi,lo;
         m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

         m_bmpBack.LoadBitmap(IDB_DIABACK);

         m_bmpBack.GetBitmap(&m_bitmapBack);

 CString tmp;

         VERIFY(tmp.LoadString(IDS_REGEX_HTMLURL));

         VERIFY(m_reHTMLURL.Compile(tmp,CRegEx::regExtended|CRegEx::regIgnoreCase));

+        VERIFY(tmp.LoadString(IDS_REGEX_URL));

+        VERIFY(m_reURL.Compile(tmp,CRegEx::regExtended|CRegEx::regIgnoreCase));

 }

 

 CDipstickDlg::~CDipstickDlg()

 {

 }

 

@@ -132,12 +134,13 @@ BEGIN_MESSAGE_MAP(CDipstickDlg, CDialog)
         //{{AFX_MSG_MAP(CDipstickDlg)

         ON_WM_SYSCOMMAND()

         ON_WM_PAINT()

         ON_WM_QUERYDRAGICON()

         ON_WM_DESTROY()

         ON_BN_CLICKED(IDC_OPTIONS, OnOptions)

+        ON_MESSAGE(WM_DNP_URLSPING, OnURLSPing)

         ON_MESSAGE(WM_DNP_URLPING, OnUrlPing)

         ON_MESSAGE(WM_DNP_ACTIVITYCOUNT, OnActivityCount)

         ON_MESSAGE(WM_DNP_UPDATEHOSTDATA, OnUpdateHostData)

         ON_MESSAGE(WM_DNP_HTML, OnHTMLTransfer)

         ON_NOTIFY(LVN_COLUMNCLICK, IDC_HOSTLIST, OnColumnclickHostlist)

         ON_WM_WINDOWPOSCHANGING()

@@ -1182,12 +1185,13 @@ UINT	cfNIF = RegisterClipboardFormat("Netscape Image Format");
                         xf->html.ReleaseBuffer();

                         if(bTestOnly){

                                 rv = m_reHTMLURL.Match(xf->html);

                                 delete xf;

                         }else{

                                 PostMessage(WM_DNP_HTML,0,(LPARAM)xf);

+                                rv = TRUE;

                         }

                 }while(FALSE);

                 GlobalUnlock(hg);

                 GlobalFree(hg);

                 return rv;

         }

@@ -1207,22 +1211,34 @@ UINT	cfNIF = RegisterClipboardFormat("Netscape Image Format");
                         GlobalUnlock(hg);

                         GlobalFree(hg);

                 }

                 return TRUE;

         }

         if(pDO->IsDataAvailable(CF_TEXT)){

-                if(!bTestOnly){

-                HGLOBAL hg = pDO->GetGlobalData(CF_TEXT);

-                        ASSERT(hg);

-                LPVOID lpv = GlobalLock(hg);

-                        ASSERT(lpv);

-                        PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString((LPCTSTR)lpv));

-                        GlobalUnlock(hg);

-                        GlobalFree(hg);

+        BOOL rv = FALSE;

+        HGLOBAL hg = pDO->GetGlobalData(CF_TEXT);

+                ASSERT(hg);

+        LPVOID lpv = GlobalLock(hg);

+                ASSERT(lpv);

+                if(bTestOnly){

+                        rv = m_reURL.Match((LPCSTR)lpv);

+                }else{

+                        CString sel = (LPCSTR)lpv;

+                        if(m_reURL.Match(sel)) {

+                                rv = TRUE;

+                                CString tmp = m_reURL.GetMatch(CRegEx::matchPostMatch);

+                                if(m_reURL.Match(tmp)) {

+                                         PostMessage(WM_DNP_URLSPING,0,(LPARAM)new CString((LPCSTR)lpv));

+                                }else{

+                                        PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString((LPCTSTR)lpv));

+                                }

+                        }

                 }

-                return TRUE;

+                GlobalUnlock(hg);

+                GlobalFree(hg);

+                return rv;

         }

         return FALSE;

 }

 

 LRESULT CDipstickDlg::OnHTMLTransfer(WPARAM wP, LPARAM lP)

 {

@@ -1254,12 +1270,38 @@ CSelectURLsDlg su;
                         PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString(url));

                 }

         }

         return 0;

 }

 

+LRESULT CDipstickDlg::OnURLSPing(WPARAM wP,LPARAM lP)

+{

+CString *sel = (CString*)lP;

+TRACE1("URLS: %s\n",(LPCTSTR)*sel);

+CSelectURLsDlg su;

+        su.m_bAdjust = m_bSmartAdjust;

+        su.m_bAdjustInnermost = m_bAdjustInnermost;

+        BeginWaitCursor();

+        while(m_reURL.Match(*sel)){

+        CString url = m_reURL.GetMatch(CRegEx::matchMatch);

+                (*sel) = m_reURL.GetMatch(CRegEx::matchPostMatch);

+                if(!su.m_URLs.Find(url))

+                        VERIFY(su.m_URLs.AddTail(url));

+        }

+        EndWaitCursor();

+        delete sel;

+        if(su.DoModal()==IDOK){

+        POSITION p = su.m_URLs.GetHeadPosition();

+                while(p){

+                CString url = su.m_URLs.GetNext(p);

+                        PostMessage(WM_DNP_URLPING,0,(LPARAM)new CString(url));

+                }

+        }

+        return 0;

+}

+

 UINT CPingyHost::PingProc(LPVOID pParam)

 {

 CPingyHost* pThis = (CPingyHost*)pParam;

         ASSERT(pThis->m_Daddy);

         return pThis->DoPing();

 }

@@ -1580,7 +1622,7 @@ UINT CPingyHost::SuicideProc(LPVOID pParam)
 CPingyHost* pThis = (CPingyHost*)pParam;

 CSingleLock sl(&pThis->m_mutex);

         sl.Lock();

         VERIFY(sl.Unlock());

         delete pThis;

         return 0;

-}

+}
\ No newline at end of file
diff --git a/DipstickDlg.h b/DipstickDlg.h
index ce9ed22..47c3e01 100644
--- a/DipstickDlg.h
+++ b/DipstickDlg.h
@@ -40,12 +40,14 @@ class CDipstickDlg : public CDialog
 // Construction

                 struct  _xferHTML{

                 CString html;

                 CCrackURL src;

         };

 public:

+        LRESULT OnURLSPing(WPARAM wP,LPARAM lP);

+        CRegEx m_reURL;

         BOOL ExportLocations(LPCTSTR file);

         CString m_impexPath;

         BOOL ImportLocations(LPCTSTR file);

         BOOL m_bIgnorelative;

         CEvent m_eveStartup;

         UINT volatile m_ActiveThreads;

diff --git a/dipstick.rc b/dipstick.rc
index 55f9fde..8797946 100644
--- a/dipstick.rc
+++ b/dipstick.rc
@@ -79,25 +79,24 @@ 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.0",IDC_STATIC,40,7,89,8,

-                    SS_NOPREFIX

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

-                    IDC_STATIC,40,25,166,8

+    LTEXT           "Dipstick, Version 3.1-trunk",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.0"

+CAPTION "  Dipstick 3.1-trunk"

 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

@@ -260,14 +259,14 @@ END
 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,0,0,0

- PRODUCTVERSION 3,0,0,0

+ FILEVERSION 3,1,0,0

+ PRODUCTVERSION 3,1,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x9L

 #else

  FILEFLAGS 0x8L

 #endif

@@ -278,19 +277,19 @@ 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, 0, 0, 0\0"

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

             VALUE "InternalName", "DIPSTICK\0"

-            VALUE "LegalCopyright", "Copyright © 1996-2004 Klever Group (http://www.klever.net/)\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, 0, 0, 0\0"

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

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

@@ -457,13 +456,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.0"

+    IDS_DRAGPAD_TITLE       " Dipstick 3.1-trunk"

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

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

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

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

     IDS_PS_BIGPACKET        "Packet size is too big"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

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

+    IDC_DNDTARGET           "Dipstick 3.1-trunk, 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"

@@ -534,12 +533,13 @@ 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

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

 

 

diff --git a/help/dipstick.rtf b/help/dipstick.rtf
index c91b3f4..839d331 100644
--- a/help/dipstick.rtf
+++ b/help/dipstick.rtf
@@ -15,25 +15,27 @@ ${\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-2004 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\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\fi0\li0\f1\fs18 \bullet  Ability to parse multiple URLs from plaintext selection

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

diff --git a/help/dipstick.xml b/help/dipstick.xml
index 4754e47..8ed0383 100644
--- a/help/dipstick.xml
+++ b/help/dipstick.xml
@@ -2,17 +2,20 @@
 <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-2004"/>
+  <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">
+   <ni>Ability to parse multiple URLs from plaintext selection</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>
diff --git a/install/install.cpp b/install/install.cpp
index 296f3a3..1d91bc2 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,12 +1,12 @@
 #include "resource.h"

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

 

 #define KINNAME "Dipstick"

 #define KINSHORT KINNAME

-#define VERSION "3.0"

+#define VERSION "3.1-trunk"

 

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

diff --git a/install/install.rc b/install/install.rc
index 016c554..2bdee9c 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -128,14 +128,14 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,0,0,0

- PRODUCTVERSION 3,0,0,0

+ FILEVERSION 3,1,0,0

+ PRODUCTVERSION 3,1,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

@@ -146,19 +146,19 @@ BEGIN
     BLOCK "StringFileInfo"

     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 "FileVersion", "3, 1, 0, 0\0"

             VALUE "InternalName", "INSTALL\0"

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

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

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

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

diff --git a/resource.h b/resource.h
index 2af32cb..2f7b81e 100644
--- a/resource.h
+++ b/resource.h
@@ -16,12 +16,13 @@
 #define IDS_ABEST_NONEFOUND             107

 #define IDS_ABEST_TITLE                 108

 #define IDS_DRAGPAD_TITLE               109

 #define IDS_DRAGPAD_URLS                110

 #define IDS_REGEX_HTMLURL               111

 #define IDS_CSVFILTER                   112

+#define IDS_REGEX_URL                   113

 #define IDR_MAINFRAME                   128

 #define IDD_DRAGPAD                     129

 #define IDR_DNDAVI                      130

 #define IDD_OPTIONS                     132

 #define IDR_MENU                        133

 #define IDD_MANUALHOST                  134

diff --git a/stdafx.h b/stdafx.h
index 06ef43f..ed0fe4e 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -26,11 +26,12 @@
 #include "CrackURL.h"

 

         enum{

         WM_DNP_ACTIVITYCOUNT = WM_USER+16,

         WM_DNP_URLPING,

         WM_DNP_UPDATEHOSTDATA,

-        WM_DNP_HTML

+        WM_DNP_HTML,

+        WM_DNP_URLSPING

 };

 #include <MMSystem.h>

 // CG: The following line was added by the Windows Multimedia component.

 #pragma comment(lib, "winmm.lib")