Skip to content

Commit fdde826

Browse files
author
-
committed
WinMTR (Redux) v1.0
------------------- + added IPv6 support - removed Windows 2000 support (kind of... can be added again with ease I guess) + hop information / properties can still be viewed if state is "stopped" or "stopping" * added start delay of about 30ms before starting to ping next hop (should improve performance) ! fixed trace/hop list freeze (one of them being the use of _beginthread and not _beginthreadex and waiting for it's handles...) * theme support (now uses OS's default theme instead of Win98 ! other minor or critical fixes (such as leaks)
1 parent 22de9c4 commit fdde826

12 files changed

Lines changed: 573 additions & 604 deletions

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,10 @@ this should improve performance and reduces network load* <br>
1818
- `[ ]` + host history: pressing del key or right mouse will remove selected entry <br>
1919
- `[ ]` * new icon <br>
2020

21-
~~~~
21+
### About me / why I decided to create this fork
22+
There isn't that much to say actually, I've been using IPv6 for a few years now thanks to [**SixXS**](http://sixxs.net/) and it always annoyed me that WinMTR couldn't handle IPv6... finally my ISP got some sort of IPv6 beta test. And that's what I wanted to compare, native vs SixXS with long-term trace routes such as those WinMTR provides.
23+
Since there wasn't any WinMTR build with IPv6, I decided to do it myself ;) The result can be seen here :P
24+
25+
**If you're looking for an alternative** *(not meant for long-term traces)* there's [**vTrace**](vtrace.pl).
26+
It's some really interesting piece of Software ;) *(with more then just trace routes)*
27+
~~~~

‎src/WinMTR.rc‎

Lines changed: 56 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,25 @@ IDR_MAINFRAME ICON "WinMTR.ico"
7070
// Dialog
7171
//
7272

73-
IDD_WINMTR_DIALOG DIALOGEX 0, 0, 390, 193
73+
IDD_WINMTR_DIALOG DIALOGEX 0, 0, 420, 220
7474
STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
7575
EXSTYLE WS_EX_APPWINDOW
7676
FONT 8, "MS Sans Serif", 0, 0, 0x1
7777
BEGIN
78-
DEFPUSHBUTTON "&Start",ID_RESTART,203,12,50,14,BS_FLAT
79-
PUSHBUTTON "&Options",ID_OPTIONS,270,12,51,14,BS_FLAT
80-
PUSHBUTTON "E&xit",IDCANCEL,328,12,49,14,BS_FLAT
81-
PUSHBUTTON "&Copy Text to clipboard",ID_CTTC,14,39,89,14,BS_FLAT
82-
PUSHBUTTON "Co&py HTML to clipboard",ID_CHTC,113,39,89,14,BS_FLAT
83-
PUSHBUTTON "Export &TEXT",ID_EXPT,270,39,51,14,BS_FLAT
84-
PUSHBUTTON "Export &HTML",ID_EXPH,328,39,49,14,BS_FLAT
85-
CONTROL "List1",IDC_LIST_MTR,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,60,376,126
86-
LTEXT "Host:",IDC_STATIC,13,12,20,13,SS_CENTERIMAGE
87-
GROUPBOX "",IDC_STATIC,7,3,251,29,BS_FLAT
88-
GROUPBOX "",IDC_STATICS,263,3,120,29,BS_FLAT
89-
GROUPBOX "",IDC_STATICJ,7,31,376,26,BS_FLAT
90-
COMBOBOX IDC_COMBO_HOST,35,12,164,73,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
78+
DEFPUSHBUTTON "&Start",ID_RESTART,235,10,50,14,BS_FLAT
79+
PUSHBUTTON "&Options",ID_OPTIONS,333,10,41,14,BS_FLAT
80+
PUSHBUTTON "E&xit",IDCANCEL,379,10,30,14,BS_FLAT
81+
PUSHBUTTON "&Copy Text to clipboard",ID_CTTC,12,37,89,14,BS_FLAT
82+
PUSHBUTTON "Co&py HTML to clipboard",ID_CHTC,111,37,89,14,BS_FLAT
83+
PUSHBUTTON "Export &TEXT",ID_EXPT,301,37,51,14,BS_FLAT
84+
PUSHBUTTON "Export &HTML",ID_EXPH,359,37,49,14,BS_FLAT
85+
CONTROL "List1",IDC_LIST_MTR,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,58,409,157
86+
LTEXT "Host:",IDC_STATIC,11,10,20,13,SS_LEFT | SS_CENTERIMAGE
87+
GROUPBOX "",IDC_STATIC,5,0,287,30,BS_FLAT
88+
GROUPBOX "",IDC_STATICS,295,0,120,30,BS_FLAT
89+
GROUPBOX "",IDC_STATICJ,5,29,409,26,BS_FLAT
90+
COMBOBOX IDC_COMBO_HOST,33,10,198,73,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
91+
AUTO3STATE "IPv6",IDC_CHECK_IPV6,301,14,31,8
9192
END
9293

9394
IDD_DIALOG_OPTIONS DIALOGEX 0, 0, 251, 164
@@ -106,52 +107,53 @@ BEGIN
106107
CONTROL "Resolve names",IDC_CHECK_DNS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,119,63,8
107108
GROUPBOX "",IDC_STATIC,7,7,237,82,BS_FLAT
108109
CTEXT "Get Fully Managed Dedicated and Cloud hosting in Europe and USA at killer prices.",IDC_STATIC,31,35,201,17
109-
CTEXT "WinMTR v0.92 is offered under GPL V2 by Appnor MSP",IDC_STATIC,42,14,194,17
110+
CTEXT "WinMTR (Redux) v1.00 is offered under GPLv2",IDC_STATIC,42,14,194,17
110111
PUSHBUTTON "&License and Credits",ID_LICENSE,81,67,94,14,BS_FLAT
111112
LTEXT "Max. hosts in LRU list:",IDC_STATIC,15,119,74,10,NOT WS_GROUP
112113
EDITTEXT IDC_EDIT_MAX_LRU,90,116,34,13,ES_AUTOHSCROLL
113-
CONTROL "www.appnor.com",IDC_MFCLINK1,"MfcLink",WS_TABSTOP,102,51,60,11
114+
LTEXT "www.appnor.com",IDC_STATIC,102,51,60,11,NOT WS_GROUP
114115
END
115116

116117
IDD_DIALOG_LICENSE DIALOGEX 0, 0, 175, 70
117118
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
118119
CAPTION "License & Credits"
119120
FONT 8, "MS Sans Serif", 0, 0, 0x0
120121
BEGIN
121-
DEFPUSHBUTTON "OK",IDOK,59,43,50,14
122-
LTEXT "Read more on",IDC_STATIC,36,27,46,8
123-
CONTROL "www.winmtr.net",IDC_MFCLINK1,"MfcLink",WS_TABSTOP,83,26,60,14
124-
LTEXT "WinMTR is licensed under GPL V2.",IDC_STATIC,33,14,113,8
122+
DEFPUSHBUTTON "OK",IDOK,62,36,50,14
123+
LTEXT "Read more on",IDC_STATIC,36,21,46,8
124+
LTEXT "www.winmtr.net",IDC_STATIC,85,21,60,8
125+
CTEXT "WinMTR (Redux) is licensed under GPLv2.",IDC_STATIC,2,9,171,8,SS_CENTER
126+
CTEXT "https://github.com/White-Tiger/WinMTR",IDC_STATIC,7,57,161,8,SS_CENTER
125127
END
126128

127-
IDD_DIALOG_PROPERTIES DIALOG 0, 0, 201, 159
129+
IDD_DIALOG_PROPERTIES DIALOG 0, 0, 282, 160
128130
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
129131
CAPTION "Host properties"
130132
FONT 8, "MS Sans Serif"
131133
BEGIN
132-
DEFPUSHBUTTON "OK",IDOK,71,138,50,14,BS_FLAT
134+
DEFPUSHBUTTON "OK",IDOK,116,140,50,14,BS_FLAT
133135
LTEXT "Name:",IDC_STATIC,15,18,24,8
134-
EDITTEXT IDC_EDIT_PHOST,48,16,136,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
136+
EDITTEXT IDC_EDIT_PHOST,48,16,219,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
135137
LTEXT "IP Address:",IDC_STATIC,14,32,40,9
136-
EDITTEXT IDC_EDIT_PIP,58,31,126,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
137-
GROUPBOX "Packets",IDC_STATIC,7,74,89,60,BS_FLAT
138-
GROUPBOX "Ping time",IDC_STATIC,108,74,86,60,BS_FLAT
139-
GROUPBOX "Host",IDC_STATIC,7,7,187,62,BS_FLAT
140-
LTEXT "Loss (%):",IDC_STATIC,13,117,31,9
141-
LTEXT "Received:",IDC_STATIC,13,101,36,9
142-
LTEXT "Sent:",IDC_STATIC,13,85,21,9
143-
LTEXT "Last:",IDC_STATIC,114,84,18,9
144-
LTEXT "Best:",IDC_STATIC,114,96,20,8
145-
LTEXT "Average:",IDC_STATIC,114,107,32,8
146-
LTEXT "Worst:",IDC_STATIC,114,118,23,8
147-
EDITTEXT IDC_EDIT_PSENT,53,82,35,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER
148-
EDITTEXT IDC_EDIT_PRECV,53,99,35,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER
149-
EDITTEXT IDC_EDIT_PLOSS,53,116,35,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER
150-
EDITTEXT IDC_EDIT_PLAST,150,81,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
151-
EDITTEXT IDC_EDIT_PBEST,150,94,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
152-
EDITTEXT IDC_EDIT_PAVRG,150,106,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
153-
EDITTEXT IDC_EDIT_PWORST,150,118,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
154-
EDITTEXT IDC_EDIT_PCOMMENT,14,50,170,12,ES_AUTOHSCROLL | ES_READONLY
138+
EDITTEXT IDC_EDIT_PIP,58,31,209,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
139+
GROUPBOX "Packets",IDC_STATIC,46,74,89,60,BS_FLAT
140+
GROUPBOX "Ping time",IDC_STATIC,147,74,86,60,BS_FLAT
141+
GROUPBOX "Host",IDC_STATIC,7,7,267,62,BS_FLAT
142+
LTEXT "Loss (%):",IDC_STATIC,52,117,31,9
143+
LTEXT "Received:",IDC_STATIC,52,101,36,9
144+
LTEXT "Sent:",IDC_STATIC,52,85,21,9
145+
LTEXT "Last:",IDC_STATIC,153,84,18,9
146+
LTEXT "Best:",IDC_STATIC,153,96,20,8
147+
LTEXT "Average:",IDC_STATIC,153,107,32,8
148+
LTEXT "Worst:",IDC_STATIC,153,118,23,8
149+
EDITTEXT IDC_EDIT_PSENT,92,82,35,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER
150+
EDITTEXT IDC_EDIT_PRECV,92,99,35,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER
151+
EDITTEXT IDC_EDIT_PLOSS,92,116,35,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER
152+
EDITTEXT IDC_EDIT_PLAST,189,81,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
153+
EDITTEXT IDC_EDIT_PBEST,189,94,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
154+
EDITTEXT IDC_EDIT_PAVRG,189,106,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
155+
EDITTEXT IDC_EDIT_PWORST,189,118,34,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY
156+
EDITTEXT IDC_EDIT_PCOMMENT,14,50,253,12,ES_AUTOHSCROLL | ES_READONLY
155157
END
156158

157159
IDD_DIALOG_HELP DIALOGEX 0, 0, 256, 122
@@ -160,8 +162,8 @@ CAPTION "WinMTR"
160162
FONT 8, "MS Shell Dlg", 400, 0, 0x1
161163
BEGIN
162164
DEFPUSHBUTTON "OK",IDOK,144,101,50,14
163-
CONTROL "www.appnor.com",IDC_MFCLINK1,"MfcLink",WS_TABSTOP,187,8,60,11
164-
LTEXT "WinMTR v0.92 is offered under GPL V2 by Appnor MSP",IDC_STATIC,7,9,176,10
165+
LTEXT "www.appnor.com",IDC_STATIC,187,9,60,11
166+
LTEXT "WinMTR (Redux) v1.00 is offered under GPLv2",IDC_STATIC,7,9,176,10
165167
LTEXT "Usage: WinMTR [options] target_host_name",IDC_STATIC,7,29,144,8
166168
LTEXT "Options:",IDC_STATIC,7,39,28,8
167169
LTEXT " --interval, -i VALUE. Set ping interval.",IDC_STATIC,26,47,131,8
@@ -178,8 +180,8 @@ END
178180
//
179181

180182
VS_VERSION_INFO VERSIONINFO
181-
FILEVERSION 0,9,0,2
182-
PRODUCTVERSION 0,9,0,2
183+
FILEVERSION 1,0,0,0
184+
PRODUCTVERSION 1,0,0,0
183185
FILEFLAGSMASK 0x3fL
184186
#ifdef _DEBUG
185187
FILEFLAGS 0x1L
@@ -194,13 +196,13 @@ BEGIN
194196
BEGIN
195197
BLOCK "040904b0"
196198
BEGIN
197-
VALUE "FileDescription", "WinMTR by Appnor MSP - www.winmtr.net"
198-
VALUE "FileVersion", "0.9.0.2"
199+
VALUE "FileDescription", "WinMTR Redux (original by Appnor MSP - www.winmtr.net)"
200+
VALUE "FileVersion", "1.0.0.0"
199201
VALUE "InternalName", "WinMTR"
200202
VALUE "LegalCopyright", "WinMTR 0.9 (c) 2010-2011 Appnor MSP - Fully Managed Hosting & Cloud Provider www.appnor.com"
201-
VALUE "OriginalFilename", "WinMTR.EXE"
203+
VALUE "OriginalFilename", "WinMTR.exe"
202204
VALUE "ProductName", "WinMTR Application"
203-
VALUE "ProductVersion", "0.9.0.2"
205+
VALUE "ProductVersion", "1.0.0.0"
204206
END
205207
END
206208
BLOCK "VarFileInfo"
@@ -268,67 +270,6 @@ END
268270
#endif // APSTUDIO_INVOKED
269271

270272

271-
/////////////////////////////////////////////////////////////////////////////
272-
//
273-
// Dialog Info
274-
//
275-
276-
IDD_DIALOG_HELP DLGINIT
277-
BEGIN
278-
IDC_MFCLINK1, 0x37c, 238, 0
279-
0x4d3c, 0x4346, 0x694c, 0x6b6e, 0x555f, 0x6c72, 0x683e, 0x7474, 0x3a70,
280-
0x2f2f, 0x7777, 0x2e77, 0x7061, 0x6e70, 0x726f, 0x632e, 0x6d6f, 0x3f2f,
281-
0x7475, 0x5f6d, 0x6f73, 0x7275, 0x6563, 0x773d, 0x6e69, 0x746d, 0x2672,
282-
0x7475, 0x5f6d, 0x656d, 0x6964, 0x6d75, 0x643d, 0x7365, 0x746b, 0x706f,
283-
0x7526, 0x6d74, 0x635f, 0x6d61, 0x6170, 0x6769, 0x3d6e, 0x6f73, 0x7466,
284-
0x6177, 0x6572, 0x2f3c, 0x464d, 0x4c43, 0x6e69, 0x5f6b, 0x7255, 0x3e6c,
285-
0x4d3c, 0x4346, 0x694c, 0x6b6e, 0x555f, 0x6c72, 0x7250, 0x6665, 0x7869,
286-
0x3c3e, 0x4d2f, 0x4346, 0x694c, 0x6b6e, 0x555f, 0x6c72, 0x7250, 0x6665,
287-
0x7869, 0x3c3e, 0x464d, 0x4c43, 0x6e69, 0x5f6b, 0x6f54, 0x6c6f, 0x6974,
288-
0x3e70, 0x2f3c, 0x464d, 0x4c43, 0x6e69, 0x5f6b, 0x6f54, 0x6c6f, 0x6974,
289-
0x3e70, 0x4d3c, 0x4346, 0x694c, 0x6b6e, 0x465f, 0x6c75, 0x546c, 0x7865,
290-
0x5474, 0x6f6f, 0x746c, 0x7069, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d,
291-
0x4c43, 0x6e69, 0x5f6b, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f,
292-
0x6974, 0x3e70,
293-
0
294-
END
295-
296-
IDD_DIALOG_OPTIONS DLGINIT
297-
BEGIN
298-
IDC_MFCLINK1, 0x37c, 238, 0
299-
0x4d3c, 0x4346, 0x694c, 0x6b6e, 0x555f, 0x6c72, 0x683e, 0x7474, 0x3a70,
300-
0x2f2f, 0x7777, 0x2e77, 0x7061, 0x6e70, 0x726f, 0x632e, 0x6d6f, 0x3f2f,
301-
0x7475, 0x5f6d, 0x6f73, 0x7275, 0x6563, 0x773d, 0x6e69, 0x746d, 0x2672,
302-
0x7475, 0x5f6d, 0x656d, 0x6964, 0x6d75, 0x643d, 0x7365, 0x746b, 0x706f,
303-
0x7526, 0x6d74, 0x635f, 0x6d61, 0x6170, 0x6769, 0x3d6e, 0x6f73, 0x7466,
304-
0x6177, 0x6572, 0x2f3c, 0x464d, 0x4c43, 0x6e69, 0x5f6b, 0x7255, 0x3e6c,
305-
0x4d3c, 0x4346, 0x694c, 0x6b6e, 0x555f, 0x6c72, 0x7250, 0x6665, 0x7869,
306-
0x3c3e, 0x4d2f, 0x4346, 0x694c, 0x6b6e, 0x555f, 0x6c72, 0x7250, 0x6665,
307-
0x7869, 0x3c3e, 0x464d, 0x4c43, 0x6e69, 0x5f6b, 0x6f54, 0x6c6f, 0x6974,
308-
0x3e70, 0x2f3c, 0x464d, 0x4c43, 0x6e69, 0x5f6b, 0x6f54, 0x6c6f, 0x6974,
309-
0x3e70, 0x4d3c, 0x4346, 0x694c, 0x6b6e, 0x465f, 0x6c75, 0x546c, 0x7865,
310-
0x5474, 0x6f6f, 0x746c, 0x7069, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d,
311-
0x4c43, 0x6e69, 0x5f6b, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f,
312-
0x6974, 0x3e70,
313-
0
314-
END
315-
316-
IDD_DIALOG_LICENSE DLGINIT
317-
BEGIN
318-
IDC_MFCLINK1, 0x37c, 157, 0
319-
0x4d3c, 0x4346, 0x694c, 0x6b6e, 0x555f, 0x6c72, 0x3c3e, 0x4d2f, 0x4346,
320-
0x694c, 0x6b6e, 0x555f, 0x6c72, 0x3c3e, 0x464d, 0x4c43, 0x6e69, 0x5f6b,
321-
0x7255, 0x506c, 0x6572, 0x6966, 0x3e78, 0x2f3c, 0x464d, 0x4c43, 0x6e69,
322-
0x5f6b, 0x7255, 0x506c, 0x6572, 0x6966, 0x3e78, 0x4d3c, 0x4346, 0x694c,
323-
0x6b6e, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x694c,
324-
0x6b6e, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4c43, 0x6e69,
325-
0x5f6b, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, 0x6974, 0x3e70,
326-
0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x694c, 0x6b6e, 0x465f, 0x6c75,
327-
0x546c, 0x7865, 0x5474, 0x6f6f, 0x746c, 0x7069, "\076"
328-
0
329-
END
330-
331-
332273
/////////////////////////////////////////////////////////////////////////////
333274
//
334275
// String Table
@@ -337,7 +278,7 @@ END
337278
STRINGTABLE
338279
BEGIN
339280
IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."
340-
IDS_STRING_SB_NAME "WinMTR v0.92 GPL V2 by Appnor MSP - Fully Managed Hosting & Cloud Provider"
281+
IDS_STRING_SB_NAME "WinMTR v1.00 GPLv2 (original by Appnor MSP - Fully Managed Hosting & Cloud Provider)"
341282
IDS_STRING_SB_PING "0000000"
342283
IDS_STRING_CLEAR_HISTORY "Clear History"
343284
END
@@ -346,25 +287,8 @@ END
346287
/////////////////////////////////////////////////////////////////////////////
347288

348289

349-
350-
#ifndef APSTUDIO_INVOKED
351-
/////////////////////////////////////////////////////////////////////////////
352290
//
353-
// Generated from the TEXTINCLUDE 3 resource.
291+
// Manifest resources
354292
//
355-
#define _AFX_NO_SPLITTER_RESOURCES
356-
#define _AFX_NO_OLE_RESOURCES
357-
#define _AFX_NO_TRACKER_RESOURCES
358-
#define _AFX_NO_PROPERTY_RESOURCES
359-
360-
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
361-
#ifdef _WIN32
362-
LANGUAGE 9, 1
363-
#pragma code_page(1252)
364-
#endif //_WIN32
365-
#include "afxres.rc" // Standard components
366-
#endif
367-
368-
/////////////////////////////////////////////////////////////////////////////
369-
#endif // not APSTUDIO_INVOKED
370-
293+
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
294+
1 RT_MANIFEST ".\\manifest.xml"

0 commit comments

Comments
 (0)