Bug 1358288: Fix incorrect ABI specification for js-ctypes declaration of GetVersionExW; r?gfritzsche draft
authorAaron Klotz <aklotz@mozilla.com>
Thu, 20 Apr 2017 16:08:07 -0600
changeset 566134 9ac0d80b0276ae4683217fd91f55150228b20801
parent 565516 739f5cf430bfc4ac51aba0e9551c5795c904b5cf
child 566496 e721983aa4a832c55fc8b38ff0b999a21fe6fd8d
push id55095
push useraklotz@mozilla.com
push dateThu, 20 Apr 2017 22:08:55 +0000
reviewersgfritzsche
bugs1358288
milestone55.0a1
Bug 1358288: Fix incorrect ABI specification for js-ctypes declaration of GetVersionExW; r?gfritzsche MozReview-Commit-ID: DKTxo8EHNfY
toolkit/components/telemetry/TelemetryEnvironment.jsm
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -418,17 +418,17 @@ function getWindowsVersionInfo() {
       {wSuiteMask: WORD},
       {wProductType: BYTE},
       {wReserved: BYTE}
       ]);
 
   let kernel32 = ctypes.open("kernel32");
   try {
     let GetVersionEx = kernel32.declare("GetVersionExW",
-                                        ctypes.default_abi,
+                                        ctypes.winapi_abi,
                                         BOOL,
                                         OSVERSIONINFOEXW.ptr);
     let winVer = OSVERSIONINFOEXW();
     winVer.dwOSVersionInfoSize = OSVERSIONINFOEXW.size;
 
     if (0 === GetVersionEx(winVer.address())) {
       throw ("Failure in GetVersionEx (returned 0)");
     }