Add TaskDialog message macros

Author: dmex

ProcessHacker/ProcessHacker.def

@@ -377,6 +377,7 @@ EXPORTS
 	PhShellProperties
 	PhShowConfirmMessage
 	PhShowContinueStatus
+	PhShowMessage2
 	PhShowFileDialog
 	PhShowMessage
 	PhShowMessage_V

ProcessHacker/plugin.c

@@ -270,7 +270,6 @@ VOID PhLoadPlugins(
         PPH_STRING baseName;
 
         PhInitializeStringBuilder(&sb, 100);
-        PhAppendStringBuilder2(&sb, L"Unable to load the following plugin(s):\n\n");
 
         for (i = 0; i < LoadErrors->Count; i++)
         {
@@ -283,9 +282,12 @@ VOID PhLoadPlugins(
 
         PhAppendStringBuilder2(&sb, L"\nDo you want to disable the above plugin(s)?");
 
-        if (PhShowMessage(
+        if (PhShowMessage2(
             NULL,
-            MB_ICONERROR | MB_YESNO,
+            TDCBF_YES_BUTTON | TDCBF_NO_BUTTON,
+            TD_ERROR_ICON,
+            L"Unable to load the following plugin(s)",
+            L"%s",
             sb.String->Buffer
             ) == IDYES)
         {

phlib/include/phutil.h

@@ -237,23 +237,20 @@ PhShowMessage_V(
 #define PhShowInformation(hWnd, Format, ...) PhShowMessage(hWnd, MB_OK | MB_ICONINFORMATION, Format, __VA_ARGS__)
 
 PHLIBAPI
-INT
+INT 
 NTAPI
-PhShowInformation2(
+PhShowMessage2(
     _In_ HWND hWnd,
+    _In_ ULONG Buttons,
+    _In_opt_ PWSTR Icon,
     _In_opt_ PWSTR Title,
     _In_ PWSTR Format,
     ...
     );
 
-PHLIBAPI
-INT
-NTAPI
-PhShowError2(
-    _In_ HWND hWnd, 
-    _In_opt_ PWSTR Title, 
-    _In_opt_ PWSTR Message
-    );
+#define PhShowError2(hWnd, Format, ...) PhShowMessage2(hWnd, TDCBF_CLOSE_BUTTON, TD_ERROR_ICON, Format, __VA_ARGS__)
+#define PhShowWarning2(hWnd, Format, ...) PhShowMessage2(hWnd, TDCBF_CLOSE_BUTTON, TD_WARNING_ICON, Format, __VA_ARGS__)
+#define PhShowInformation2(hWnd, Format, ...) PhShowMessage2(hWnd, TDCBF_CLOSE_BUTTON, TD_INFORMATION_ICON, Format, __VA_ARGS__)
 
 PHLIBAPI
 PPH_STRING

phlib/util.c

@@ -406,78 +406,50 @@ INT PhShowMessage_V(
     return result;
 }
 
-INT PhShowInformation2(
+INT PhShowMessage2(
     _In_ HWND hWnd,
+    _In_ ULONG Buttons,
+    _In_opt_ PWSTR Icon,
     _In_opt_ PWSTR Title,
     _In_ PWSTR Format,
     ...
     )
 {
+    INT result;
     va_list argptr;
-    INT button;
     PPH_STRING message;
     TASKDIALOGCONFIG config = { sizeof(config) };
 
     va_start(argptr, Format);
     message = PhFormatString_V(Format, argptr);
     va_end(argptr);
 
+    if (!message)
+        return -1;
+
     config.hwndParent = hWnd;
     config.hInstance = PhLibImageBase;
-    config.dwFlags = TDF_ALLOW_DIALOG_CANCELLATION | (IsWindowVisible(hWnd) ? TDF_POSITION_RELATIVE_TO_WINDOW : 0);
-    config.dwCommonButtons = TDCBF_CLOSE_BUTTON;
+    config.dwFlags = TDF_ALLOW_DIALOG_CANCELLATION | (IsWindowVisible(hWnd) ? TDF_POSITION_RELATIVE_TO_WINDOW : 0) | TDF_SIZE_TO_CONTENT;
+    config.dwCommonButtons = Buttons;
     config.pszWindowTitle = PhApplicationName;
-    config.pszMainIcon = TD_INFORMATION_ICON;
+    config.pszMainIcon = Icon;
     config.pszMainInstruction = Title;
     config.pszContent = message->Buffer;
 
     if (TaskDialogIndirect(
         &config,
-        &button,
+        &result,
         NULL,
         NULL
         ) == S_OK)
     {
         PhDereferenceObject(message);
-        return button;
+        return result;
     }
     else
     {
         PhDereferenceObject(message);
-        return FALSE;
-    }
-}
-
-INT PhShowError2(
-    _In_ HWND hWnd,
-    _In_opt_ PWSTR Title,
-    _In_opt_ PWSTR Message
-    )
-{
-    INT button;
-    TASKDIALOGCONFIG config = { sizeof(config) };
-
-    config.hwndParent = hWnd;
-    config.hInstance = PhLibImageBase;
-    config.dwFlags = TDF_ALLOW_DIALOG_CANCELLATION | (IsWindowVisible(hWnd) ? TDF_POSITION_RELATIVE_TO_WINDOW : 0);
-    config.dwCommonButtons = TDCBF_CLOSE_BUTTON;
-    config.pszWindowTitle = PhApplicationName;
-    config.pszMainIcon = TD_ERROR_ICON;
-    config.pszMainInstruction = Title;
-    config.pszContent = Message;
-
-    if (TaskDialogIndirect(
-        &config,
-        &button,
-        NULL,
-        NULL
-        ) == S_OK)
-    {
-        return button;
-    }
-    else
-    {
-        return FALSE;
+        return -1;
     }
 }