Changeset 154367 in webkit

Timestamp:

Aug 20, 2013 3:25:29 PM (11 years ago)

Author:

Brent Fulgham

Message:

<​https://webkit.org/b/120090> Report better error messages from WinLauncher/DRT

Reviewed by Tim Horton.

• win/DLLLauncher/DLLLauncherMain.cpp:

(getLastErrorString): New method to convert GetLastError to text.
(wWinMain): Use new error formatter to provide useful diagnostic text to user.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• win/DLLLauncher/DLLLauncherMain.cpp (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-20  Brent Fulgham  <bfulgham@apple.com>
+
+        <https://webkit.org/b/120090> Report better error messages from WinLauncher/DRT
+
+        Reviewed by Tim Horton.
+
+        * win/DLLLauncher/DLLLauncherMain.cpp:
+        (getLastErrorString): New method to convert GetLastError to text.
+        (wWinMain): Use new error formatter to provide useful diagnostic text to user.
+
 2013-08-19  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -149 +149 @@
 }
 
+static wstring getLastErrorString(HRESULT hr)
+{
+    static const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS;
+    static const size_t bufSize = 4096;
+
+    wchar_t errorMessage[bufSize];
+    DWORD len = ::FormatMessageW(kFlags, 0, hr, 0, errorMessage, bufSize, 0);
+    if (len >= bufSize)
+        len = bufSize - 1;
+
+    errorMessage[len + 1] = 0;
+
+    return errorMessage;
+}
+
 #if USE_CONSOLE_ENTRY_POINT
 int main(int argc, const char* argv[])
@@ -160 +175 @@
     wchar_t exePath[MAX_PATH];
     if (!::GetModuleFileNameW(0, exePath, _countof(exePath)))
-        return fatalError(L"Unknown Program", L"Failed to determine name of executable.");
+        return fatalError(L"Unknown Program", L"Failed to determine name of executable: " + getLastErrorString(::GetLastError()));
 
     ::PathRemoveExtensionW(exePath);
@@ -172 +187 @@
     wstring dllName = programName + L".dll";
     if (!::PathRemoveFileSpecW(exePath))
-        return fatalError(programName, L"::PathRemoveFileSpecW failed.");
+        return fatalError(programName, L"::PathRemoveFileSpecW failed: " + getLastErrorString(::GetLastError()));
     if (!::PathAppendW(exePath, dllName.c_str()))
-        return fatalError(programName, L"::PathAppendW failed.");
+        return fatalError(programName, L"::PathAppendW failed: " + getLastErrorString(::GetLastError()));
     HMODULE module = ::LoadLibraryW(exePath);
     if (!module)
-        return fatalError(programName, L"::LoadLibraryW failed.");
+        return fatalError(programName, L"::LoadLibraryW failed: \npath=" + wstring(exePath) + L"\n" + getLastErrorString(::GetLastError()));
 
 #if USE_CONSOLE_ENTRY_POINT
@@ -197 +212 @@
     EntryPoint entryPoint = reinterpret_cast<EntryPoint>(::GetProcAddress(module, entryPointName));
     if (!entryPoint)
-        return fatalError(programName, L"Failed to find dllLauncherEntryPoint function.");
+        return fatalError(programName, L"Failed to find dllLauncherEntryPoint function: " + getLastErrorString(::GetLastError()));
 
 #if USE_CONSOLE_ENTRY_POINT