Fix some threadding issues

Author: dmex

plugins/NetworkTools/nettools.h

@@ -58,7 +58,8 @@
 //       + the number of bytes of data specified in the RequestSize parameter.
 // This buffer should also be large enough to also hold 8 more bytes of data (the size of an ICMP error message)
 //       + space for an IO_STATUS_BLOCK structure.
-#define ICMP_BUFFER_SIZE(EchoReplyLength, Buffer) (ULONG)(((EchoReplyLength) + (Buffer)->Length) + 8 + sizeof(IO_STATUS_BLOCK) + MAX_OPT_SIZE)
+#define ICMP_BUFFER_SIZE(EchoReplyLength, Buffer) \
+    (ULONG)(((EchoReplyLength) + (Buffer)->Length) + 8 + sizeof(IO_STATUS_BLOCK) + MAX_OPT_SIZE)
 
 #define BITS_IN_ONE_BYTE 8
 #define NDIS_UNIT_OF_MEASUREMENT 100
@@ -93,6 +94,9 @@ typedef enum _PH_NETWORK_ACTION
 #define NTM_RECEIVEDWHOIS (WM_APP + NETWORK_ACTION_WHOIS)
 #define NTM_RECEIVEDFINISH (WM_APP + NETWORK_ACTION_FINISH)
 
+#define WM_TRACERT_ERROR (WM_APP + NETWORK_ACTION_TRACEROUTE + 1001)
+
+
 typedef struct _NETWORK_OUTPUT_CONTEXT
 {
     HWND WindowHandle;

plugins/NetworkTools/output.c

@@ -191,50 +191,6 @@ INT_PTR CALLBACK NetworkOutputDlgProc(
             }
         }
         break;
-    case NTM_RECEIVEDTRACE:
-        {
-            PPH_STRING inputString;
-            PH_STRING_BUILDER receivedString;
-
-            if (wParam != 0)
-            {
-                inputString = (PPH_STRING)wParam;
-                PPH_STRING windowText = NULL;
-
-                PhInitializeStringBuilder(&receivedString, PAGE_SIZE);
-
-                // Get the current output text.
-                windowText = PhGetWindowText(context->OutputHandle);
-
-                // Append the current output text to the New string.
-                if (!PhIsNullOrEmptyString(windowText))
-                    PhAppendStringBuilder(&receivedString, &windowText->sr);
-
-                PhAppendFormatStringBuilder(&receivedString, L"%s", inputString->Buffer);
-
-                // Remove leading newlines.
-                if (receivedString.String->Length >= 2 * 2 &&
-                    receivedString.String->Buffer[0] == '\r' &&
-                    receivedString.String->Buffer[1] == '\n')
-                {
-                    PhRemoveStringBuilder(&receivedString, 0, 2);
-                }
-
-                SetWindowText(context->OutputHandle, receivedString.String->Buffer);
-                SendMessage(
-                    context->OutputHandle,
-                    EM_SETSEL,
-                    receivedString.String->Length / 2 - 1,
-                    receivedString.String->Length / 2 - 1
-                );
-                SendMessage(context->OutputHandle, WM_VSCROLL, SB_BOTTOM, 0);
-
-                PhDereferenceObject(windowText);
-                PhDeleteStringBuilder(&receivedString);
-                //PhDereferenceObject(&inputString);
-            }
-        }
-        break;
     case NTM_RECEIVEDWHOIS:
         {
             if (lParam != 0)