Update local sync

ztextplus · Oct 15, 2019 · 9c60e7a · 9c60e7a
1 parent aa7e761
commit 9c60e7a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/ProcessHacker/thrdlist.c b/ProcessHacker/thrdlist.c
@@ -989,9 +989,6 @@ BOOLEAN NTAPI PhpThreadTreeNewCallback(
                 if (GetKeyState(VK_CONTROL) < 0)
                     TreeNew_SelectRange(context->TreeNewHandle, 0, -1);
                 break;
-            case 'K':
-                SetFocus(GetDlgItem(context->ParentWindowHandle, IDC_SEARCH));
-                break;
             case VK_DELETE:
                 SendMessage(context->ParentWindowHandle, WM_COMMAND, ID_THREAD_TERMINATE, 0);
                 break;

diff --git a/plugins/DotNetTools/counters.c b/plugins/DotNetTools/counters.c
@@ -533,7 +533,7 @@ BOOLEAN OpenDotNetPublicControlBlock_V4(
     if (!NT_SUCCESS(RtlAddSIDToBoundaryDescriptor(&boundaryDescriptorHandle, everyoneSIDHandle)))
         goto CleanupExit;
 
-    if (WINDOWS_HAS_IMMERSIVE && IsImmersive)
+    if (IsImmersive && WindowsVersion >= WINDOWS_8)
     {
         if (NT_SUCCESS(PhOpenProcessToken(ProcessHandle, TOKEN_QUERY, &tokenHandle)))
         {

diff --git a/plugins/NetworkTools/main.c b/plugins/NetworkTools/main.c
@@ -915,7 +915,7 @@ LOGICAL DllMain(
                 { ScalableIntegerPairSettingType, SETTING_NAME_TRACERT_WINDOW_SIZE, L"@96|850,490" },
                 { StringSettingType, SETTING_NAME_TRACERT_TREE_LIST_COLUMNS, L"" },
                 { IntegerPairSettingType, SETTING_NAME_TRACERT_TREE_LIST_SORT, L"0,1" },
-                { IntegerSettingType, SETTING_NAME_TRACERT_MAX_HOPS, L"30" },
+                { IntegerSettingType, SETTING_NAME_TRACERT_MAX_HOPS, L"14" },
                 { IntegerPairSettingType, SETTING_NAME_WHOIS_WINDOW_POSITION, L"0,0" },
                 { ScalableIntegerPairSettingType, SETTING_NAME_WHOIS_WINDOW_SIZE, L"@96|600,365" },
                 { StringSettingType, SETTING_NAME_DB_LOCATION, L"%APPDATA%\\Process Hacker\\GeoLite2-Country.mmdb" },

diff --git a/plugins/NetworkTools/nettools.h b/plugins/NetworkTools/nettools.h
@@ -3,7 +3,7 @@
  *   Main header
  *
  * Copyright (C) 2010-2013 wj32
- * Copyright (C) 2012-2017 dmex
+ * Copyright (C) 2012-2019 dmex
  *
  * This file is part of Process Hacker.
  *

diff --git a/plugins/NetworkTools/tracert.h b/plugins/NetworkTools/tracert.h
@@ -2,7 +2,7 @@
  * Process Hacker Network Tools -
  *   Tracert header
  *
- * Copyright (C) 2015-2017 dmex
+ * Copyright (C) 2015-2019 dmex
  *
  * This file is part of Process Hacker.
  *
@@ -49,8 +49,10 @@ typedef struct _TRACERT_ROOT_NODE
 
     ULONG UniqueId;
     ULONG TTL;
+
     ULONG PingStatus[DEFAULT_MAXIMUM_PINGS];
     ULONG PingList[DEFAULT_MAXIMUM_PINGS];
+
     PPH_STRING PingString[DEFAULT_MAXIMUM_PINGS];
     PPH_STRING PingMessage[DEFAULT_MAXIMUM_PINGS];
 

diff --git a/plugins/OnlineChecks/main.c b/plugins/OnlineChecks/main.c
@@ -3,7 +3,7 @@
  *   Main Program
  *
  * Copyright (C) 2010-2013 wj32
- * Copyright (C) 2012-2018 dmex
+ * Copyright (C) 2012-2019 dmex
  *
  * This file is part of Process Hacker.
  *
@@ -207,8 +207,6 @@ VOID NTAPI MenuItemCallback(
                         );
                     ProcessHacker_Destroy(PhMainWndHandle);
                 }
-
-                DestroyIcon(config.hMainIcon);
             }
         }
         break;

diff --git a/plugins/OnlineChecks/virustotal.c b/plugins/OnlineChecks/virustotal.c
@@ -254,7 +254,7 @@ VOID VirusTotalBuildJsonArray(
         &fileHandle,
         Entry->FileName->Buffer,
         FILE_GENERIC_READ,
-        0,
+        FILE_ATTRIBUTE_NORMAL,
         FILE_SHARE_READ,
         FILE_OPEN,
         FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT // FILE_OPEN_FOR_BACKUP_INTENT
@@ -270,7 +270,7 @@ VOID VirusTotalBuildJsonArray(
             PVOID entry;
 
             Entry->FileHash = hashString;
-            Entry->FileHashAnsi = PhConvertUtf16ToMultiByte(Entry->FileHash->Buffer);
+            Entry->FileHashAnsi = PhConvertUtf16ToMultiByte(hashString->Buffer);
 
             entry = PhCreateJsonObject();
             PhAddJsonObject(entry, "autostart_location", "");