mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-06 07:17:30 +09:00
Remove base conditional code for crash reporter and injector.
This commit is contained in:
wolfbeast
Roy Tam
parent
87fa26d31e
commit
434f3590e3
131 changed files with 39 additions and 4139 deletions
|
|
@ -21,12 +21,6 @@
|
|||
#include "nsPrintfCString.h"
|
||||
#include "jsapi.h"
|
||||
|
||||
#if defined(MOZ_CRASHREPORTER)
|
||||
#include "nsExceptionHandler.h"
|
||||
#include "nsICrashReporter.h"
|
||||
#define NS_CRASHREPORTER_CONTRACTID "@mozilla.org/toolkit/crash-reporter;1"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::gfx;
|
||||
using namespace mozilla::widget;
|
||||
|
|
@ -724,102 +718,10 @@ GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
#if defined(MOZ_CRASHREPORTER)
|
||||
/* Cisco's VPN software can cause corruption of the floating point state.
|
||||
* Make a note of this in our crash reports so that some weird crashes
|
||||
* make more sense */
|
||||
static void
|
||||
CheckForCiscoVPN() {
|
||||
LONG result;
|
||||
HKEY key;
|
||||
/* This will give false positives, but hopefully no false negatives */
|
||||
result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Cisco Systems\\VPN Client", 0, KEY_QUERY_VALUE, &key);
|
||||
if (result == ERROR_SUCCESS) {
|
||||
RegCloseKey(key);
|
||||
CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("Cisco VPN\n"));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
GfxInfo::AddCrashReportAnnotations()
|
||||
{
|
||||
#if defined(MOZ_CRASHREPORTER)
|
||||
CheckForCiscoVPN();
|
||||
|
||||
if (mHasDriverVersionMismatch) {
|
||||
CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("DriverVersionMismatch\n"));
|
||||
}
|
||||
|
||||
nsString deviceID, vendorID, driverVersion, subsysID;
|
||||
nsCString narrowDeviceID, narrowVendorID, narrowDriverVersion, narrowSubsysID;
|
||||
|
||||
GetAdapterDeviceID(deviceID);
|
||||
CopyUTF16toUTF8(deviceID, narrowDeviceID);
|
||||
GetAdapterVendorID(vendorID);
|
||||
CopyUTF16toUTF8(vendorID, narrowVendorID);
|
||||
GetAdapterDriverVersion(driverVersion);
|
||||
CopyUTF16toUTF8(driverVersion, narrowDriverVersion);
|
||||
GetAdapterSubsysID(subsysID);
|
||||
CopyUTF16toUTF8(subsysID, narrowSubsysID);
|
||||
|
||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AdapterVendorID"),
|
||||
narrowVendorID);
|
||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AdapterDeviceID"),
|
||||
narrowDeviceID);
|
||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AdapterDriverVersion"),
|
||||
narrowDriverVersion);
|
||||
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AdapterSubsysID"),
|
||||
narrowSubsysID);
|
||||
|
||||
/* Add an App Note for now so that we get the data immediately. These
|
||||
* can go away after we store the above in the socorro db */
|
||||
nsAutoCString note;
|
||||
/* AppendPrintf only supports 32 character strings, mrghh. */
|
||||
note.AppendLiteral("AdapterVendorID: ");
|
||||
note.Append(narrowVendorID);
|
||||
note.AppendLiteral(", AdapterDeviceID: ");
|
||||
note.Append(narrowDeviceID);
|
||||
note.AppendLiteral(", AdapterSubsysID: ");
|
||||
note.Append(narrowSubsysID);
|
||||
note.AppendLiteral(", AdapterDriverVersion: ");
|
||||
note.Append(NS_LossyConvertUTF16toASCII(driverVersion));
|
||||
|
||||
if (vendorID == GfxDriverInfo::GetDeviceVendor(VendorAll)) {
|
||||
/* if we didn't find a valid vendorID lets append the mDeviceID string to try to find out why */
|
||||
note.AppendLiteral(", ");
|
||||
LossyAppendUTF16toASCII(mDeviceID, note);
|
||||
note.AppendLiteral(", ");
|
||||
LossyAppendUTF16toASCII(mDeviceKeyDebug, note);
|
||||
LossyAppendUTF16toASCII(mDeviceKeyDebug, note);
|
||||
}
|
||||
note.Append("\n");
|
||||
|
||||
if (mHasDualGPU) {
|
||||
nsString deviceID2, vendorID2, subsysID2;
|
||||
nsAutoString adapterDriverVersionString2;
|
||||
nsCString narrowDeviceID2, narrowVendorID2, narrowSubsysID2;
|
||||
|
||||
note.AppendLiteral("Has dual GPUs. GPU #2: ");
|
||||
GetAdapterDeviceID2(deviceID2);
|
||||
CopyUTF16toUTF8(deviceID2, narrowDeviceID2);
|
||||
GetAdapterVendorID2(vendorID2);
|
||||
CopyUTF16toUTF8(vendorID2, narrowVendorID2);
|
||||
GetAdapterDriverVersion2(adapterDriverVersionString2);
|
||||
GetAdapterSubsysID(subsysID2);
|
||||
CopyUTF16toUTF8(subsysID2, narrowSubsysID2);
|
||||
note.AppendLiteral("AdapterVendorID2: ");
|
||||
note.Append(narrowVendorID2);
|
||||
note.AppendLiteral(", AdapterDeviceID2: ");
|
||||
note.Append(narrowDeviceID2);
|
||||
note.AppendLiteral(", AdapterSubsysID2: ");
|
||||
note.Append(narrowSubsysID2);
|
||||
note.AppendLiteral(", AdapterDriverVersion2: ");
|
||||
note.Append(NS_LossyConvertUTF16toASCII(adapterDriverVersionString2));
|
||||
}
|
||||
CrashReporter::AppendAppNotesToCrashReport(note);
|
||||
|
||||
#endif
|
||||
/*** STUB ***/
|
||||
}
|
||||
|
||||
static OperatingSystem
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@
|
|||
#include "mozilla/WindowsVersion.h"
|
||||
|
||||
#include "nsAlgorithm.h"
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
#include "nsExceptionHandler.h"
|
||||
#endif
|
||||
#include "nsGkAtoms.h"
|
||||
#include "nsIDOMKeyEvent.h"
|
||||
#include "nsIIdleServiceInternal.h"
|
||||
|
|
@ -2792,42 +2789,6 @@ NativeKey::NeedsToHandleWithoutFollowingCharMessages() const
|
|||
return mIsPrintableKey;
|
||||
}
|
||||
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
|
||||
static nsCString
|
||||
GetResultOfInSendMessageEx()
|
||||
{
|
||||
DWORD ret = ::InSendMessageEx(nullptr);
|
||||
if (!ret) {
|
||||
return NS_LITERAL_CSTRING("ISMEX_NOSEND");
|
||||
}
|
||||
nsAutoCString result;
|
||||
if (ret & ISMEX_CALLBACK) {
|
||||
result = "ISMEX_CALLBACK";
|
||||
}
|
||||
if (ret & ISMEX_NOTIFY) {
|
||||
if (!result.IsEmpty()) {
|
||||
result += " | ";
|
||||
}
|
||||
result += "ISMEX_NOTIFY";
|
||||
}
|
||||
if (ret & ISMEX_REPLIED) {
|
||||
if (!result.IsEmpty()) {
|
||||
result += " | ";
|
||||
}
|
||||
result += "ISMEX_REPLIED";
|
||||
}
|
||||
if (ret & ISMEX_SEND) {
|
||||
if (!result.IsEmpty()) {
|
||||
result += " | ";
|
||||
}
|
||||
result += "ISMEX_SEND";
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif // #ifdef MOZ_CRASHREPORTER
|
||||
|
||||
bool
|
||||
NativeKey::MayBeSameCharMessage(const MSG& aCharMsg1,
|
||||
const MSG& aCharMsg2) const
|
||||
|
|
@ -3071,33 +3032,6 @@ NativeKey::GetFollowingCharMessage(MSG& aCharMsg)
|
|||
}
|
||||
|
||||
if (doCrash) {
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
nsPrintfCString info("\nPeekMessage() failed to remove char message! "
|
||||
"\nActive keyboard layout=0x%08X (%s), "
|
||||
"\nHandling message: %s, InSendMessageEx()=%s, "
|
||||
"\nFound message: %s, "
|
||||
"\nWM_NULL has been removed: %d, "
|
||||
"\nNext key message in all windows: %s, "
|
||||
"time=%d, ",
|
||||
KeyboardLayout::GetActiveLayout(),
|
||||
KeyboardLayout::GetActiveLayoutName().get(),
|
||||
ToString(mMsg).get(),
|
||||
GetResultOfInSendMessageEx().get(),
|
||||
ToString(kFoundCharMsg).get(), i,
|
||||
ToString(nextKeyMsgInAllWindows).get(),
|
||||
nextKeyMsgInAllWindows.time);
|
||||
CrashReporter::AppendAppNotesToCrashReport(info);
|
||||
MSG nextMsg;
|
||||
if (WinUtils::PeekMessage(&nextMsg, 0, 0, 0,
|
||||
PM_NOREMOVE | PM_NOYIELD)) {
|
||||
nsPrintfCString info("\nNext message in all windows: %s, time=%d",
|
||||
ToString(nextMsg).get(), nextMsg.time);
|
||||
CrashReporter::AppendAppNotesToCrashReport(info);
|
||||
} else {
|
||||
CrashReporter::AppendAppNotesToCrashReport(
|
||||
NS_LITERAL_CSTRING("\nThere is no message in any window"));
|
||||
}
|
||||
#endif // #ifdef MOZ_CRASHREPORTER
|
||||
MOZ_CRASH("We lost the following char message");
|
||||
}
|
||||
|
||||
|
|
@ -3216,63 +3150,12 @@ NativeKey::GetFollowingCharMessage(MSG& aCharMsg)
|
|||
"nextKeyMsg=%s, kFoundCharMsg=%s",
|
||||
this, ToString(removedMsg).get(), ToString(nextKeyMsg).get(),
|
||||
ToString(kFoundCharMsg).get()));
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
nsPrintfCString info("\nPeekMessage() removed unexpcted char message! "
|
||||
"\nActive keyboard layout=0x%08X (%s), "
|
||||
"\nHandling message: %s, InSendMessageEx()=%s, "
|
||||
"\nFound message: %s, "
|
||||
"\nRemoved message: %s, ",
|
||||
KeyboardLayout::GetActiveLayout(),
|
||||
KeyboardLayout::GetActiveLayoutName().get(),
|
||||
ToString(mMsg).get(),
|
||||
GetResultOfInSendMessageEx().get(),
|
||||
ToString(kFoundCharMsg).get(),
|
||||
ToString(removedMsg).get());
|
||||
CrashReporter::AppendAppNotesToCrashReport(info);
|
||||
// What's the next key message?
|
||||
MSG nextKeyMsgAfter;
|
||||
if (WinUtils::PeekMessage(&nextKeyMsgAfter, mMsg.hwnd,
|
||||
WM_KEYFIRST, WM_KEYLAST,
|
||||
PM_NOREMOVE | PM_NOYIELD)) {
|
||||
nsPrintfCString info("\nNext key message after unexpected char message "
|
||||
"removed: %s, ",
|
||||
ToString(nextKeyMsgAfter).get());
|
||||
CrashReporter::AppendAppNotesToCrashReport(info);
|
||||
} else {
|
||||
CrashReporter::AppendAppNotesToCrashReport(
|
||||
NS_LITERAL_CSTRING("\nThere is no key message after unexpected char "
|
||||
"message removed, "));
|
||||
}
|
||||
// Another window has a key message?
|
||||
if (WinUtils::PeekMessage(&nextKeyMsgInAllWindows, 0,
|
||||
WM_KEYFIRST, WM_KEYLAST,
|
||||
PM_NOREMOVE | PM_NOYIELD)) {
|
||||
nsPrintfCString info("\nNext key message in all windows: %s.",
|
||||
ToString(nextKeyMsgInAllWindows).get());
|
||||
CrashReporter::AppendAppNotesToCrashReport(info);
|
||||
} else {
|
||||
CrashReporter::AppendAppNotesToCrashReport(
|
||||
NS_LITERAL_CSTRING("\nThere is no key message in any windows."));
|
||||
}
|
||||
#endif // #ifdef MOZ_CRASHREPORTER
|
||||
MOZ_CRASH("PeekMessage() removed unexpected message");
|
||||
}
|
||||
MOZ_LOG(sNativeKeyLogger, LogLevel::Error,
|
||||
("%p NativeKey::GetFollowingCharMessage(), FAILED, removed messages "
|
||||
"are all WM_NULL, nextKeyMsg=%s",
|
||||
this, ToString(nextKeyMsg).get()));
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
nsPrintfCString info("\nWe lost following char message! "
|
||||
"\nActive keyboard layout=0x%08X (%s), "
|
||||
"\nHandling message: %s, InSendMessageEx()=%s, \n"
|
||||
"Found message: %s, removed a lot of WM_NULL",
|
||||
KeyboardLayout::GetActiveLayout(),
|
||||
KeyboardLayout::GetActiveLayoutName().get(),
|
||||
ToString(mMsg).get(),
|
||||
GetResultOfInSendMessageEx().get(),
|
||||
ToString(kFoundCharMsg).get());
|
||||
CrashReporter::AppendAppNotesToCrashReport(info);
|
||||
#endif // #ifdef MOZ_CRASHREPORTER
|
||||
MOZ_CRASH("We lost the following char message");
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,11 +79,6 @@ SOURCES += [
|
|||
'WinMouseScrollHandler.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_CRASHREPORTER']:
|
||||
UNIFIED_SOURCES += [
|
||||
'LSPAnnotator.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['NS_PRINTING']:
|
||||
UNIFIED_SOURCES += [
|
||||
'nsDeviceContextSpecWin.cpp',
|
||||
|
|
|
|||
|
|
@ -213,10 +213,6 @@ nsAppShell::~nsAppShell()
|
|||
nsresult
|
||||
nsAppShell::Init()
|
||||
{
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
LSPAnnotate();
|
||||
#endif
|
||||
|
||||
mLastNativeEventScheduled = TimeStamp::NowLoRes();
|
||||
|
||||
mozilla::ipc::windows::InitUIThread();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue