Updater: Fix nightly link, Fix changelog text;

Author: dmex

plugins/CommonUtil/json.c

@@ -61,7 +61,7 @@ PSTR UtilGetJsonValueAsString(
     return json_object_get_string(json_get_object(Object, Key));
 }
 
-int64_t UtilGetJsonValueAsUlong(
+INT64 UtilGetJsonValueAsUlong(
     _In_ PVOID Object,
     _In_ PSTR Key
     )
@@ -130,6 +130,14 @@ PSTR UtilGetJsonArrayString(
     return _strdup( json_object_to_json_string(Object) ); // leak
 }
 
+INT64 UtilGetJsonArrayUlong(
+    _In_ PVOID Object,
+    _In_ INT Index
+    )
+{
+    return json_object_get_int64(json_object_array_get_idx(Object, Index));
+}
+
 INT UtilGetArrayLength(
     _In_ PVOID Object
     )

plugins/CommonUtil/main.c

@@ -43,6 +43,7 @@ COMMONUTIL_INTERFACE PluginInterface =
     UtilCreateJsonArray,
     UtilAddJsonArray,
     UtilGetJsonArrayString,
+    UtilGetJsonArrayUlong,
     UtilGetArrayLength,
     UtilGetObjectArrayIndex,
     UtilGetObjectArrayList

plugins/CommonUtil/main.h

@@ -145,6 +145,11 @@ PSTR UtilGetJsonArrayString(
     _In_ PVOID Object
     );
 
+INT64 UtilGetJsonArrayUlong(
+    _In_ PVOID Object,
+    _In_ INT Index
+    );
+
 INT UtilGetArrayLength(
     _In_ PVOID Object
     );

plugins/Updater/CHANGELOG.txt

@@ -1,5 +1,5 @@
 2.0
- * Major rewrite of updater
+ * Added support for Process Hacker nightly builds
  * Improved UI with native TaskDialog
 
 1.8

plugins/Updater/Updater.rc

@@ -97,7 +97,7 @@ BEGIN
     CONTROL         "Check for updates automatically",IDC_AUTOCHECKBOX,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,142,10
     DEFPUSHBUTTON   "Close",IDCANCEL,158,33,50,14
-    CONTROL         "Check for nightly builds",IDC_NIGHTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,142,10
+    CONTROL         "Check for nightly builds",IDC_NIGHTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,19,142,10
 END
 
 

plugins/Updater/page3.c

@@ -56,7 +56,14 @@ HRESULT CALLBACK ShowAvailableCallbackProc(
                 }
                 else
                 {
-                    PhShellExecute(hwndDlg, L"https://wj32.org/processhacker/downloads.php", NULL);
+                    if (PhGetIntegerSetting(SETTING_NAME_NIGHTLY_BUILD))
+                    {
+                        PhShellExecute(hwndDlg, L"https://wj32.org/processhacker/nightly.php", NULL);
+                    }
+                    else
+                    {
+                        PhShellExecute(hwndDlg, L"https://wj32.org/processhacker/downloads.php", NULL);
+                    }
                 }
             }
         }

plugins/UserNotes/main.c

@@ -630,9 +630,9 @@ VOID NTAPI MenuHookCallback(
 
                 LockDb();
 
-                // Update the process affinity in our database (if the database values are different).
                 if (object = FindDbObjectForProcess(processItem, INTENT_PROCESS_AFFINITY))
                 {
+                    // Update the process affinity in our database (if the database values are different).
                     if (object->AffinityMask != (ULONG)newAffinityMask)
                     {
                         object->AffinityMask = (ULONG)newAffinityMask;

plugins/include/commonutil.h

@@ -96,6 +96,11 @@ typedef PSTR (NTAPI *PUTIL_GET_JSON_ARRAY_STRING)(
     _In_ PVOID Object
     );
 
+typedef INT64 (NTAPI *PUTIL_GET_JSON_OBJECT_ARRAY_ULONG)(
+    _In_ PVOID Object,
+    _In_ INT Index
+    );
+
 typedef INT (NTAPI *PUTIL_GET_JSON_ARRAY_LENGTH)(
     _In_ PVOID Object
     );
@@ -134,6 +139,7 @@ typedef struct _COMMONUTIL_INTERFACE
     PUTIL_CREATE_JSON_ARRAY CreateJsonArray;
     PUTIL_ADD_JSON_OBJECT_VALUE JsonArrayAddObject;
     PUTIL_GET_JSON_ARRAY_STRING GetJsonArrayString;
+    PUTIL_GET_JSON_OBJECT_ARRAY_ULONG GetJsonArrayUlong;
     PUTIL_GET_JSON_ARRAY_LENGTH JsonGetArrayLength;
     PUTIL_GET_JSON_OBJECT_ARRAY_INDEX JsonGetObjectArrayIndex;
     PUTIL_GET_JSON_OBJECT_ARRAY_LIST JsonGetObjectArrayList;
@@ -367,6 +373,31 @@ GetJsonArrayString(
     return NULL;
 }
 
+FORCEINLINE
+INT64
+GetJsonArrayUlong(
+    _In_ PVOID Object,
+    _In_ INT Index
+    )
+{
+    PPH_PLUGIN toolStatusPlugin;
+
+    if (toolStatusPlugin = PhFindPlugin(COMMONUTIL_PLUGIN_NAME))
+    {
+        P_COMMONUTIL_INTERFACE Interface;
+
+        if (Interface = PhGetPluginInformation(toolStatusPlugin)->Interface)
+        {
+            if (Interface->Version <= COMMONUTIL_INTERFACE_VERSION)
+            {
+                return Interface->GetJsonArrayUlong(Object, Index);
+            }
+        }
+    }
+
+    return 0;
+}
+
 FORCEINLINE
 INT 
 JsonGetArrayLength(
@@ -440,7 +471,6 @@ JsonGetObjectArrayList(
     return NULL;
 }
 
-
 FORCEINLINE
 PVOID 
 CreateJsonObject(