[SHELL32_APITEST] Follow-up to #6796 (25e2f5f)

[reactos.git] / base / applications / regedit / error.c

diff --git a/base/applications/regedit/error.c b/base/applications/regedit/error.c
index aaadf1a..8ddf60a 100644 (file)
--- a/base/applications/regedit/error.c
+++ b/base/applications/regedit/error.c
@@ -1,14 +1,79 @@
-#include <regedit.h>
-void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code)
+/*
+ * Regedit errors, warnings, informations displaying
+ *
+ * Copyright (C) 2010 Adam Kachwalla <geekdundee@gmail.com>
+ * Copyright (C) 2012 Hermès Bélusca - Maïto <hermes.belusca@sfr.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "regedit.h"
+
+int ErrorMessageBox(HWND hWnd, LPCWSTR lpTitle, DWORD dwErrorCode, ...)
 {
-    LPTSTR lpMsgBuf;
-    DWORD status;
-    static const TCHAR fallback[] = TEXT("Error displaying error message.\n");
-    status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                           NULL, code, 0, (LPTSTR)&lpMsgBuf, 0, NULL);
-    if (!status)
-        lpMsgBuf = (LPTSTR)fallback;
-    MessageBox(hWnd, lpMsgBuf, title, MB_OK | MB_ICONERROR);
-    if (lpMsgBuf != fallback)
-        LocalFree(lpMsgBuf);
+    int iRet = 0;
+    LPWSTR lpMsgBuf = NULL;
+    DWORD Status = 0;
+    va_list args;
+
+    va_start(args, dwErrorCode);
+
+    Status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                            NULL,
+                            dwErrorCode,
+                            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                            (LPWSTR)&lpMsgBuf,
+                            0,
+                            &args);
+
+    va_end(args);
+
+    iRet = MessageBoxW(hWnd, (Status && lpMsgBuf ? lpMsgBuf : L"Error displaying error message."), lpTitle, MB_OK | MB_ICONERROR);
+
+    if (lpMsgBuf) LocalFree(lpMsgBuf);
+
+    /* Return the MessageBoxW information */
+    return iRet;
+}
+
+int InfoMessageBox(HWND hWnd, UINT uType, LPCWSTR lpTitle, LPCWSTR lpMessage, ...)
+{
+    int iRet = 0;
+    LPWSTR lpMsgBuf = NULL;
+    va_list args;
+
+    va_start(args, lpMessage);
+
+    if (lpMessage)
+    {
+        SIZE_T strLen = _vscwprintf(lpMessage, args);
+
+        /* Create a buffer on the heap and zero it out (LPTR) */
+        lpMsgBuf = (LPWSTR)LocalAlloc(LPTR, (strLen + 1) * sizeof(WCHAR));
+        if (lpMsgBuf)
+        {
+            _vsnwprintf(lpMsgBuf, strLen, lpMessage, args);
+        }
+    }
+
+    va_end(args);
+
+    iRet = MessageBoxW(hWnd, (lpMessage && lpMsgBuf ? lpMsgBuf : L"Error displaying info message."), lpTitle, uType);
+
+    if (lpMsgBuf) LocalFree(lpMsgBuf);
+
+    /* Return the MessageBoxW information */
+    return iRet;
 }