Bug 586048. Fix typo in crash annotation code. r=bsmedberg,a=bustage

This also cleans up the annotation note that we add.

widget/src/windows/GfxInfo.cpp

@@ -315,8 +315,8 @@ void GfxInfo::AddCrashReportAnnotations()
   GetAdapterDeviceID(&deviceID);
   GetAdapterVendorID(&vendorID);
 
-  deviceIDString.AppendPrintf("%04x", &deviceID);
-  vendorIDString.AppendPrintf("%04x", &vendorID);
+  deviceIDString.AppendPrintf("%04x", deviceID);
+  vendorIDString.AppendPrintf("%04x", vendorID);
 
   CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("AdapterVendorID"),
       vendorIDString);
@@ -325,10 +325,12 @@ void GfxInfo::AddCrashReportAnnotations()
 
   /* 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 */
-  CrashReporter::AppendAppNotesToCrashReport(nsCAutoString(NS_LITERAL_CSTRING("AdapterVendorID: ")) +
-      vendorIDString);
-  CrashReporter::AppendAppNotesToCrashReport(nsCAutoString(NS_LITERAL_CSTRING("AdapterDeviceID: ")) +
-      deviceIDString);
+  nsCAutoString note;
+  /* AppendPrintf only supports 32 character strings, mrghh. */
+  note.AppendPrintf("AdapterVendorID: %04x, ", vendorID);
+  note.AppendPrintf("AdapterDeviceID: %04x\n", deviceID);
+
+  CrashReporter::AppendAppNotesToCrashReport(note);
 
 #endif
 }