Backed out changeset b117a76d0a25 (bug 1171638) for making Windows M(JP) basically permafail.

addon-sdk/source/lib/sdk/zip/utils.js

@@ -1,16 +1,22 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
+'use strict';
 
-const { Cc, Ci } = require("chrome");
+const { Cc, Ci, Cu } = require("chrome");
+const { defer } = require("../core/promise");
 
-function getZipReader(aFile) {
-  return new Promise(resolve => {
-    let zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                        createInstance(Ci.nsIZipReader);
+const getZipReader = function getZipReader(aFile) {
+  let { promise, resolve, reject } = defer();
+  let zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].
+                      createInstance(Ci.nsIZipReader);
+  try {
     zipReader.open(aFile);
-    resolve(zipReader);
-  });
+  }
+  catch(e){
+    reject(e);
+  }
+  resolve(zipReader);
+  return promise;
 };
 exports.getZipReader = getZipReader;