Merge branch 'feature-tb60' into develop

Author: Ximi1970

Changelog

@@ -1,3 +1,9 @@
+-- 0.6.5 - 15 Jan 2019
+
+- Make foreground restore for Windows optional, just like Linux.
+  (Settings->Windows->Activate restored windows)
+- Fix add-on for win64
+
 -- 0.6.4 - 13 Jan 2019
 
 - Added left click action for libindicator icon (Thank you for the tip @PlagueCZ)

README.md

@@ -5,8 +5,9 @@ New releases have been tested with:
 
 Working:
 
-Windows 10 x64, Thunderbird win32 52.9.1 and 60.0  
-openSuSE Leap 15.0, KDE, Thunderbird 52.9.1 and 60.0  
+Windows 10 x64, Thunderbird win32 52.9.1 and 60.4.0  
+Windows 10 x64, Thunderbird win64 52.9.1 and 60.4.0  
+openSuSE Leap 15.0, KDE, Thunderbird 52.9.1 and 60.3.0  
 
 Linux Mint 18.3 Sylvia  
 Linux Mint 19 Tara and Thunderbird 60.2.1  
@@ -19,7 +20,6 @@ Thank you for testing !!!
 
 Not working:  
 
-Windows 10 x64, Thunderbird win64 60.* (icon visibible but no menu, no show/hide on click)  
 (K)ubuntu 16.04, Thunderbird (very small icon with GTK)  
 
 

src/chrome/content/options.js

@@ -34,7 +34,7 @@ var firetrayUIOptions = {
     this.initAppIconType();
     if (firetray.Handler.support['winnt']) {
       this.hideUnsupportedOptions([
-        'ui_show_activates', 'ui_remember_desktop', 'ui_use_appindicator_icon', 'app_icon_default',
+        'ui_remember_desktop', 'ui_use_appindicator_icon', 'app_icon_default',
         'ui_show_icon_on_hide', 'ui_scroll_hides', 'ui_radiogroup_scroll',
         'ui_scroll_hides', 'ui_middle_click', 'newmail_icon_names'
       ]);

src/defaults/preferences/prefs.js

@@ -9,7 +9,7 @@ pref("extensions.firetray.hides_on_minimize", true);
 pref("extensions.firetray.hides_single_window", true);
 pref("extensions.firetray.hides_last_only", false);
 pref("extensions.firetray.start_hidden", false);
-pref("extensions.firetray.show_activates", false);
+pref("extensions.firetray.show_activates", true);
 pref("extensions.firetray.remember_desktop", false);
 
 pref("extensions.firetray.app_icon_type", 0);
@@ -39,7 +39,7 @@ pref("extensions.firetray.folder_count_recursive", true);
 // Ci.nsMsgFolderFlags.Archive|Drafts|Junk|Queue|SentMail|Trash|Virtual
 pref("extensions.firetray.excluded_folders_flags", 1077956384);
 // exposed in 1 tree, hence 2 branches: serverTypes, excludedAccounts
-pref("extensions.firetray.mail_accounts", '{ "serverTypes": {"pop3":{"order":1,"excluded":false}, "imap":{"order":1,"excluded":false}, "movemail":{"order":2,"excluded":true}, "none":{"order":3,"excluded":false}, "rss":{"order":4,"excluded":true}, "nntp":{"order":5,"excluded":true}, "exquilla":{"order":6,"excluded":true}}, "excludedAccounts": [] }'); // JSON
+pref("extensions.firetray.mail_accounts", '{ "serverTypes": {"pop3":{"order":1,"excluded":false}, "imap":{"order":1,"excluded":false}, "movemail":{"order":2,"excluded":true}, "none":{"order":3,"excluded":false}, "rss":{"order":4,"excluded":true}, "nntp":{"order":5,"excluded":true}, "exquilla":{"order":6,"excluded":false}}, "excludedAccounts": [] }'); // JSON
 pref("extensions.firetray.only_favorite_folders", false);
 
 pref("extensions.firetray.with_appindicator", true);

src/install.rdf

@@ -7,7 +7,7 @@
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
     <em:type>2</em:type>
     <em:name>FireTray</em:name>
-    <em:version>0.6.4</em:version> <!-- change FIRETRAY_VERSION accordingly ! -->
+    <em:version>0.6.5</em:version> <!-- change FIRETRAY_VERSION accordingly ! -->
     <em:creator>Hua Luo, Francesco Solero, Foudil BRÉTEL</em:creator>
     <em:contributor>Hua Luo, Francesco Solero (Firetray original authors)</em:contributor>
     <em:homepageURL>https://github.com/Ximi1970/FireTray</em:homepageURL>

src/modules/commons.js

@@ -25,7 +25,7 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://firetray/logging.jsm");
 
-const FIRETRAY_VERSION     = "0.6.4"; // needed for sync call of onVersionChange() :(
+const FIRETRAY_VERSION     = "0.6.5"; // needed for sync call of onVersionChange() :(
 const FIRETRAY_OS_SUPPORT  = ['freebsd', 'linux', 'winnt']; // install.rdf sync :(
 const FIRETRAY_ID          = "{9533f794-00b4-4354-aa15-c2bbda6989f8}";
 const FIRETRAY_PREF_BRANCH = "extensions.firetray.";

src/modules/ctypes/winnt/user32.jsm

@@ -75,6 +75,10 @@ function user32_defines(lib) {
   lib.lazy_bind("SetWindowLongW", win32.LONG_PTR , win32.HWND, ctypes.int, win32.LONG_PTR);
   // SetWindowLongPtrW aliases SetWindowLongW with the correct signature thank
   // win32.LONG_PTR
+  //
+  // x86_64 needs GetWindowLongPtrW instead of SetWindowLongW
+  lib.lazy_bind("GetWindowLongPtrW", win32.LONG_PTR, win32.HWND, ctypes.int);
+  lib.lazy_bind("SetWindowLongPtrW", win32.LONG_PTR, win32.HWND, ctypes.int, win32.LONG_PTR);
   this.GWLP_WNDPROC   = -4;
   this.GWLP_HINSTANCE = -6;
   this.GWLP_ID        = -12;
@@ -99,6 +103,9 @@ function user32_defines(lib) {
   lib.lazy_bind("CallWindowProcW", win32.LRESULT, this.WNDPROC, win32.HWND, win32.UINT, win32.WPARAM, win32.LPARAM);
   lib.lazy_bind("DefWindowProcW", win32.LRESULT, win32.HWND, win32.UINT, win32.WPARAM, win32.LPARAM);
 
+  lib.lazy_bind("CallWindowProc", win32.LRESULT, this.WNDPROC, win32.HWND, win32.UINT, win32.WPARAM, win32.LPARAM);
+  lib.lazy_bind("DefWindowProc", win32.LRESULT, win32.HWND, win32.UINT, win32.WPARAM, win32.LPARAM);
+
   this.WNDCLASSEXW = ctypes.StructType("WNDCLASSEXW", [
     { "cbSize": win32.UINT },
     { "style": win32.UINT },

src/modules/winnt/FiretrayPopupMenu.jsm

@@ -144,12 +144,27 @@ firetray.PopupMenu = {
       return;
     }
 
-    switch (itemId) {
-    case IDM_PREF: firetray.Handler.openPrefWindow(); break;
-    case IDM_QUIT: firetray.Handler.quitApplication(); break;
-    case IDM_NEW_MSG: firetray.Handler.openMailMessage(); break;
-    case IDM_NEW_WND: firetray.Handler.openBrowserWindow(); break;
-    case IDM_RESET: firetray.Handler.setIconImageDefault(); break;
+    switch (win32.LOWORD(itemId)) {
+    case IDM_PREF:
+      log.debug("IDM_PREF");
+      firetray.Handler.openPrefWindow();
+      break;
+    case IDM_QUIT:
+      log.debug("IDM_QUIT");
+      firetray.Handler.quitApplication();
+      break;
+    case IDM_NEW_MSG:
+      log.debug("IDM_NEW_MSG");
+      firetray.Handler.openMailMessage();
+      break;
+    case IDM_NEW_WND:
+      log.debug("IDM_NEW_WND");
+      firetray.Handler.openBrowserWindow();
+      break;
+    case IDM_RESET:
+      log.debug("IDM_RESET");
+      firetray.Handler.setIconImageDefault();
+      break;
     default:
       log.error("no action for itemId ("+itemId+")");
     }

src/modules/winnt/FiretrayStatusIcon.jsm

@@ -221,8 +221,14 @@ firetray.StatusIcon = {
     log.debug("CreateWindow="+!hwnd_hidden.isNull()+" winLastError="+ctypes.winLastError);
 
     this.callbacks.proxyWndProc = user32.WNDPROC(firetray.StatusIcon.proxyWndProc);
-    let procPrev = user32.SetWindowLongW(hwnd_hidden, user32.GWLP_WNDPROC,
-      ctypes.cast(this.callbacks.proxyWndProc, win32.LONG_PTR));
+    let procPrev;
+    if (firetray.Handler.app.ABI == "x86_64-msvc") {
+      procPrev = user32.SetWindowLongPtrW(hwnd_hidden, user32.GWLP_WNDPROC,
+                      ctypes.cast(this.callbacks.proxyWndProc, win32.LONG_PTR));
+    } else {
+      procPrev = user32.SetWindowLongW(hwnd_hidden, user32.GWLP_WNDPROC,
+                      ctypes.cast(this.callbacks.proxyWndProc, win32.LONG_PTR));
+    }
     log.debug("procPrev="+procPrev+" winLastError="+ctypes.winLastError);
 
     firetray.Win32.acceptAllMessages(hwnd_hidden);
@@ -241,7 +247,7 @@ firetray.StatusIcon = {
   },
 
   proxyWndProc: function(hWnd, uMsg, wParam, lParam) {
-    // log.debug("ProxyWindowProc CALLED: hWnd="+hWnd+", uMsg="+uMsg+", wParam="+wParam+", lParam="+lParam);
+    log.debug("ProxyWindowProc CALLED: hWnd="+hWnd+", uMsg="+uMsg+", wParam="+wParam+", lParam="+lParam);
 
     // FIXME: WM_TASKBARCREATED is needed in case of explorer crash
     // http://twigstechtips.blogspot.fr/2011/02/c-detect-when-windows-explorer-has.html

src/modules/winnt/FiretrayWindow.jsm

@@ -43,7 +43,12 @@ firetray.Window.shutdown = function() {
 
 firetray.Window.getVisibility = function(wid) {
   let hwnd = firetray.Win32.hexStrToHwnd(wid);
-  let style = user32.GetWindowLongW(hwnd, user32.GWL_STYLE);
+  let style;
+  if (firetray.Handler.app.ABI == "x86_64-msvc") {
+    style = user32.GetWindowLongPtrW(hwnd, user32.GWL_STYLE);
+  } else {
+    style = user32.GetWindowLongW(hwnd, user32.GWL_STYLE);
+  }
   return ((style & user32.WS_VISIBLE) != 0); // user32.IsWindowVisible(hwnd);
 };
 
@@ -57,7 +62,8 @@ firetray.Window.setVisibility = function(wid, visible) {
 		visible = true;
 	}
   let ret = user32.ShowWindow(hwnd, visible ? user32.SW_SHOW : user32.SW_HIDE);
-  if (visible) user32.SetForegroundWindow(hwnd);
+  if (firetray.Utils.prefService.getBoolPref('show_activates'))
+    if (visible) user32.SetForegroundWindow(hwnd);
   log.debug("  ShowWindow="+ret+" winLastError="+ctypes.winLastError);
   return visible;
 };
@@ -138,21 +144,21 @@ firetray.Window.wndProcStartup = function(hWnd, uMsg, wParam, lParam) {
   return user32.CallWindowProcW(user32.WNDPROC(procPrev), hWnd, uMsg, wParam, lParam);
 };
 
-// https://social.msdn.microsoft.com/Forums/en-US/4eb3bad0-caf3-45ca-bfe8-7bc257af986a/getwindowlongsetwindowlong-on-gwlwndproc-crashes-in-compact-2013?forum=winembmngdapp
-var procNat = null;
-firetray.Window.NativeWndProc = function(hWnd, uMsg, wParam, lParam) {
-  return user32.CallWindowProcW(user32.WNDPROC(procNat), hWnd, uMsg, wParam, lParam);
-}
-
 // procInfo = {wid, hwnd, jsProc, mapNew, mapBak}
+var procDummy = null;
 firetray.Window.attachWndProc = function(procInfo) {
   try {
     let wndProc = ctypes.cast(user32.WNDPROC(procInfo.jsProc), win32.LONG_PTR);
     log.debug("proc="+wndProc);
     procInfo.mapNew.insert(procInfo.wid, wndProc);
 //    let procPrev = user32.SetWindowLongW(procInfo.hwnd, user32.GWLP_WNDPROC, wndProc);
-    this.procNat = wndProc;
-    let procPrev = user32.SetWindowLongW(procInfo.hwnd, user32.GWLP_WNDPROC, this.procNat);
+    this.procDummy = wndProc;
+    let procPrev;
+    if (firetray.Handler.app.ABI == "x86_64-msvc") {
+      procPrev = user32.SetWindowLongPtrW(procInfo.hwnd, user32.GWLP_WNDPROC, wndProc);
+    } else {
+      procPrev = user32.SetWindowLongW(procInfo.hwnd, user32.GWLP_WNDPROC, wndProc);
+    }
     log.debug("procPrev="+procPrev+" winLastError="+ctypes.winLastError);
     /* we can't store WNDPROC callbacks (JS ctypes objects) with SetPropW(), as
      we need long-living refs. */
@@ -179,7 +185,12 @@ firetray.Window.detachWndProc = function(procInfo) {
   let procNew = procInfo.mapNew.get(wid);
   let hwnd = firetray.Win32.hexStrToHwnd(wid);
   log.debug("hwnd="+hwnd);
-  let procPrev = user32.SetWindowLongW(hwnd, user32.GWLP_WNDPROC, procBak);
+  let procPrev;
+  if (firetray.Handler.app.ABI == "x86_64-msvc") {
+    procPrev = user32.SetWindowLongPtrW(hwnd, user32.GWLP_WNDPROC, procBak);
+  } else {
+    procPrev = user32.SetWindowLongW(hwnd, user32.GWLP_WNDPROC, procBak);
+  }
   firetray.js.assert(firetray.js.strEquals(procPrev, procNew),
                      "Wrong WndProc replaced.");
   procInfo.mapNew.remove(wid);