March 2016 - tor-commits - lists.torproject.org

[tor/master] Code indentation whitespace-only fix
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit eb5a262a15c05bee8e64e66c93f3a6387c0c5cd6 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Mar 24 21:56:13 2016 +1100 Code indentation whitespace-only fix --- src/or/routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index bc5e2e9..ecfcb9b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1861,7 +1861,7 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, !router_supports_extrainfo(d->digest, 1)) continue; if (requireother && me && router_digest_is_me(d->digest)) - continue; + continue; if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, &d->fake_status, -1)) {

1 0

[tor/master] Check if fallbacks support extrainfo descriptors before requesting them
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit b1569e39c87a32b64fe06702c1f18b43eb35f5ad Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Mar 24 22:03:58 2016 +1100 Check if fallbacks support extrainfo descriptors before requesting them When requesting extrainfo descriptors from a trusted directory server, check whether it is an authority or a fallback directory which supports extrainfo descriptors. Fixes bug 18489; bugfix on 90f6071d8d in tor-0.2.4.7-alpha. Reported by "atagar", patch by "teor". --- changes/bug18489 | 6 ++++++ src/or/routerlist.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug18489 b/changes/bug18489 new file mode 100644 index 0000000..d8c171a --- /dev/null +++ b/changes/bug18489 @@ -0,0 +1,6 @@ + o Minor bugfixes (fallback directory mirrors): + - When requesting extrainfo descriptors from a trusted directory + server, check whether it is an authority or a fallback directory + which supports extrainfo descriptors. + Fixes bug 18489; bugfix on 90f6071d8d in tor-0.2.4.7-alpha. + Reported by "atagar", patch by "teor". diff --git a/src/or/routerlist.c b/src/or/routerlist.c index ecfcb9b..7ec84f0 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1857,8 +1857,10 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, if (!d->is_running) continue; if ((type & d->type) == 0) continue; + int is_trusted_extrainfo = router_digest_is_trusted_dir_type( + d->digest, EXTRAINFO_DIRINFO); if ((type & EXTRAINFO_DIRINFO) && - !router_supports_extrainfo(d->digest, 1)) + !router_supports_extrainfo(d->digest, is_trusted_extrainfo)) continue; if (requireother && me && router_digest_is_me(d->digest)) continue;

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18489'
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit ea9472d085b1344eb3abc3f9e644beff184cbce3 Merge: ea82978 b1569e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 24 09:01:28 2016 -0400 Merge remote-tracking branch 'teor/bug18489' changes/bug18489 | 6 ++++++ src/or/routerlist.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor-messenger-build/master] Update xmpp-inband-registration.patch
by sukhbir＠torproject.org 24 Mar '16

24 Mar '16

commit 1fa62272e9832659c9f2565f7966c8c9d632a51d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Mar 24 07:50:44 2016 -0400 Update xmpp-inband-registration.patch --- projects/instantbird/xmpp-inband-registration.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index cdf4b31..c471346 100644 --- a/projects/instantbird/xmpp-inband-registration.patch +++ b/projects/instantbird/xmpp-inband-registration.patch @@ -172,7 +172,7 @@ diff --git a/im/content/jar.mn b/im/content/jar.mn * content/instantbird/viewlog.xul content/instantbird/viewlog.js content/instantbird/viewlog.css -+* content/instantbird/xmppRegister.xul ++ content/instantbird/xmppRegister.xul + content/instantbird/xmppRegister.js #ifdef XP_MACOSX * content/instantbird/hiddenWindow.xul

1 0

[tor/master] specify in the man page that {cc} is a 2-letter ISA3166 code
by arma＠torproject.org 23 Mar '16

23 Mar '16

commit ea829784c0d9c81910ce38a6b115455b93f686dd Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 23 17:49:55 2016 -0400 specify in the man page that {cc} is a 2-letter ISA3166 code --- doc/tor.1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a71b04f..389b9fa 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -787,7 +787,8 @@ The following options are useful only for clients (that is, if [[ExcludeNodes]] **ExcludeNodes** __node__,__node__,__...__:: A list of identity fingerprints, country codes, and address - patterns of nodes to avoid when building a circuit. Country codes must + patterns of nodes to avoid when building a circuit. Country codes are + 2-letter ISA3166 codes, and must be wrapped in braces; fingerprints may be preceded by a dollar sign. (Example: ExcludeNodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +

1 0

[tor-messenger-build/master] Rebase Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 0c4b8aa1fe202d0307c08fe7bc3d63b2bf113a7c Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 12:16:20 2016 -0700 Rebase Bug-9173-Change-the-default-Firefox-profile-director.mozpatch --- ...e-the-default-Firefox-profile-director.mozpatch | 97 +++++++++++----------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index a3ca392..a0e76ea 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -14,7 +14,6 @@ launches Firefox with -profile. 4 files changed, 79 insertions(+), 192 deletions(-) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index 7d09374ba773..417ebee773ba 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -32,6 +32,7 @@ @@ -25,7 +24,7 @@ index 7d09374ba773..417ebee773ba 100644 #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, +@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -35,7 +34,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, +@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDi aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -45,7 +44,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -1222,90 +1217,45 @@ nsresult +@@ -1245,90 +1240,45 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) @@ -86,12 +85,23 @@ index 7d09374ba773..417ebee773ba 100644 + bool didRemove = !removedName.Equals("."); - rv = dirFileMac->InitWithFSRef(&fsRef); -- NS_ENSURE_SUCCESS(rv, rv); + // Remove a directory component. + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; ++ ++ if (didRemove) ++ --levelsToRemove; ++ } ++ ++ if (!localDir) ++ return NS_ERROR_FAILURE; ++ ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); + NS_ENSURE_SUCCESS(rv, rv); - localDir = do_QueryInterface(dirFileMac, &rv); -#elif defined(XP_IOS) @@ -100,7 +110,10 @@ index 7d09374ba773..417ebee773ba 100644 - rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); - } else { - rv = NS_ERROR_FAILURE; -- } ++ if (aLocal) { ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } - NS_ENSURE_SUCCESS(rv, rv); -#elif defined(XP_WIN) - nsString path; @@ -115,11 +128,9 @@ index 7d09374ba773..417ebee773ba 100644 - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } -+ if (didRemove) -+ --levelsToRemove; - } +- } - NS_ENSURE_SUCCESS(rv, rv); - +- - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, @@ -127,18 +138,13 @@ index 7d09374ba773..417ebee773ba 100644 -#elif defined(XP_UNIX) - const char* homeDir = getenv("HOME"); - if (!homeDir || !*homeDir) -+ if (!localDir) - return NS_ERROR_FAILURE; - +- return NS_ERROR_FAILURE; +- -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ - aLocal = false; -#endif -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ NS_ENSURE_SUCCESS(rv, rv); - - if (aLocal) { +- +- if (aLocal) { - // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache. - const char* cacheHome = getenv("XDG_CACHE_HOME"); - if (cacheHome && *cacheHome) { @@ -153,16 +159,14 @@ index 7d09374ba773..417ebee773ba 100644 - } else { - rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, - getter_AddRefs(localDir)); -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } +- } -#else -#error "Don't know how to get product dir on your platform" -#endif NS_IF_ADDREF(*aFile = localDir); return rv; -@@ -1518,48 +1468,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1541,48 +1491,25 @@ nsXREDirProvider::AppendProfilePath(nsIF } nsAutoCString profile; @@ -214,7 +218,7 @@ index 7d09374ba773..417ebee773ba 100644 #elif defined(ANDROID) // The directory used for storing profiles -@@ -1571,12 +1498,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1594,12 +1521,6 @@ nsXREDirProvider::AppendProfilePath(nsIF rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) @@ -227,7 +231,7 @@ index 7d09374ba773..417ebee773ba 100644 if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); -@@ -1585,31 +1506,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, +@@ -1608,31 +1529,17 @@ nsXREDirProvider::AppendProfilePath(nsIF // On the off chance that someone wanted their folder to be hidden don't // let it become ".." @@ -264,7 +268,6 @@ index 7d09374ba773..417ebee773ba 100644 #else #error "Don't know how to get profile path on your platform" diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h -index eb27ed27fc26..1985f668a5b2 100644 --- a/toolkit/xre/nsXREDirProvider.h +++ b/toolkit/xre/nsXREDirProvider.h @@ -56,16 +56,16 @@ public: @@ -299,10 +302,9 @@ index eb27ed27fc26..1985f668a5b2 100644 static nsresult GetSystemExtensionsDirectory(nsIFile** aFile); #endif diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build -index 69208996e4d7..280f23f6fd82 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build -@@ -132,4 +132,8 @@ FINAL_LIBRARY = 'xul' +@@ -134,4 +134,8 @@ FINAL_LIBRARY = 'xul' if CONFIG['OS_ARCH'] == 'Linux' and 'lib64' in CONFIG['libdir']: DEFINES['HAVE_USR_LIB64_DIR'] = True @@ -310,12 +312,11 @@ index 69208996e4d7..280f23f6fd82 100644 + '../build' +] + - GENERATED_INCLUDES += ['..'] + LOCAL_INCLUDES += ['!..'] diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index 540f53fb471b..59785d5f064a 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #include "nsISimpleEnumerator.h" #include "prenv.h" #include "nsCRT.h" @@ -323,7 +324,7 @@ index 540f53fb471b..59785d5f064a 100644 #if defined(MOZ_WIDGET_COCOA) #include <Carbon/Carbon.h> -@@ -280,9 +281,8 @@ nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) +@@ -281,9 +282,8 @@ nsAppFileLocationProvider::CloneMozBinDi //---------------------------------------------------------------------------------------- // GetProductDirectory - Gets the directory which contains the application data folder // @@ -335,7 +336,7 @@ index 540f53fb471b..59785d5f064a 100644 //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, -@@ -296,48 +296,45 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -297,48 +297,45 @@ nsAppFileLocationProvider::GetProductDir bool exists; nsCOMPtr<nsIFile> localDir; @@ -379,7 +380,16 @@ index 540f53fb471b..59785d5f064a 100644 - rv = localDirMac->InitWithFSRef(&fsRef); - if (NS_FAILED(rv)) { - return rv; -- } ++ ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ if (aLocal) { ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ NS_ENSURE_SUCCESS(rv, rv); + } -#elif defined(XP_WIN) - nsCOMPtr<nsIProperties> directoryService = - do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); @@ -404,20 +414,11 @@ index 540f53fb471b..59785d5f064a 100644 - rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); - if (NS_FAILED(rv)) { - return rv; -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (aLocal) { -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); -+ NS_ENSURE_SUCCESS(rv, rv); - } -+ +- } rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { -@@ -357,10 +354,6 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -357,10 +354,6 @@ nsAppFileLocationProvider::GetProductDir //---------------------------------------------------------------------------------------- // GetDefaultUserProfileRoot - Gets the directory which contains each user profile dir @@ -428,7 +429,7 @@ index 540f53fb471b..59785d5f064a 100644 //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, -@@ -378,23 +371,6 @@ nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, +@@ -378,23 +371,6 @@ nsAppFileLocationProvider::GetDefaultUse return rv; } @@ -449,6 +450,6 @@ index 540f53fb471b..59785d5f064a 100644 - } -#endif - - *aLocalFile = localDir; - NS_ADDREF(*aLocalFile); + localDir.forget(aLocalFile); + return rv;

1 0

[tor-messenger-build/master] Bump Tor Browser to 5.5.4
by sukhbir＠torproject.org 23 Mar '16

23 Mar '16

commit 02164868ccc662c4c6e806c305756e6ae1a09b40 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Mar 23 13:33:41 2016 -0400 Bump Tor Browser to 5.5.4 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index be9e1eb..e0fa0f7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.5.2 +version: 5.5.4 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[tor-messenger-build/master] Re-remove the irc quit message
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 6afd5822a453e6d12d866aee1d315775e7e35ecd Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 09:14:39 2016 -0700 Re-remove the irc quit message --- projects/instantbird/preferences.patch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 85bd49e..2631188 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -103,7 +103,15 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // The breakpad report server to link to in about:crashes pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/"); -@@ -307,7 +307,61 @@ +@@ -300,14 +300,68 @@ + // 3 at the end of the tabstrip + pref("browser.tabs.closeButtons", 1); + +-#expand pref("chat.irc.defaultQuitMessage", "Instantbird __APP_VERSION__ -- http://www.instantbird.com"); ++#expand pref("chat.irc.defaultQuitMessage", ""); + + pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); + pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); // Comma separated list of prpl ids that should use libpurple even if there is // a JS implementation. This is used to land JS-prpls pref'ed off in nightlies.

1 0

[tor-messenger-build/master] Rebase preferences.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit d4c075474f7943f61668c2475bbebff0b790e9ea Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:51:41 2016 -0400 Rebase preferences.patch --- projects/instantbird/preferences.patch | 163 ++++++++++----------------------- 1 file changed, 48 insertions(+), 115 deletions(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 9af290b..85bd49e 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -1,56 +1,56 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -59,19 +59,16 @@ pref("extensions.mintrayr.startMinimized - // For Linux, use single click. - pref("extensions.mintrayr.singleClickRestore", true); - #else - // For Windows, use double click. - pref("extensions.mintrayr.singleClickRestore", false); - #endif - #endif - --// Whether message related sounds should be played at all. If this is enabled --// then the more specific prefs are checked as well. +@@ -28,7 +28,7 @@ + // 0 = spellcheck nothing + // 1 = check multi-line controls [default] + // 2 = check multi/single line controls +-pref("layout.spellcheckDefault", 1); ++pref("layout.spellcheckDefault", 0); + + pref("messenger.accounts.convertOldPasswords", true); + pref("messenger.accounts.promptOnDelete", true); +@@ -66,18 +66,18 @@ + + // Whether message related sounds should be played at all. If this is enabled + // then the more specific prefs are checked as well. -pref("messenger.options.playSounds.message", true); ++pref("messenger.options.playSounds.message", false); // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. - pref("messenger.options.playSounds.outgoing", true); - pref("messenger.options.playSounds.incoming", true); - pref("messenger.options.playSounds.alert", true); +-pref("messenger.options.playSounds.outgoing", true); +-pref("messenger.options.playSounds.incoming", true); +-pref("messenger.options.playSounds.alert", true); ++pref("messenger.options.playSounds.outgoing", false); ++pref("messenger.options.playSounds.incoming", false); ++pref("messenger.options.playSounds.alert", false); // Whether contact list related sounds should be played at all. If this is // enabled then the more specific prefs are checked as well. pref("messenger.options.playSounds.blist", false); -@@ -109,41 +106,33 @@ pref("browser.preferences.animateFadeIn" - pref("browser.zoom.full", true); - pref("conversation.zoomLevel", "1.0"); - - pref("accessibility.typeaheadfind", false); - pref("accessibility.typeaheadfind.timeout", 5000); - pref("accessibility.typeaheadfind.linksonly", false); + // Specifies whether sounds should be played on login/logout events. +-pref("messenger.options.playSounds.login", true); +-pref("messenger.options.playSounds.logout", true); ++pref("messenger.options.playSounds.login", false); ++pref("messenger.options.playSounds.logout", false); + + pref("font.default.x-western", "sans-serif"); + pref("font.default.x-unicode", "sans-serif"); +@@ -115,12 +115,12 @@ pref("accessibility.typeaheadfind.flashBar", 1); --// Whether or not app updates are enabled + // Whether or not app updates are enabled -pref("app.update.enabled", true); -- --// This preference turns on app.update.mode and allows automatic download and --// install to take place. We use a separate boolean toggle for this to make --// the UI easier to construct. ++pref("app.update.enabled", false); + + // This preference turns on app.update.mode and allows automatic download and + // install to take place. We use a separate boolean toggle for this to make + // the UI easier to construct. -pref("app.update.auto", true); -- ++pref("app.update.auto", false); + // Defines how the Application Update Service notifies the user about updates: // - // AUM Set to: Minor Releases: Major Releases: - // 0 download no prompt download no prompt - // 1 download no prompt download no prompt if no incompatibilities - // 2 download no prompt prompt - // - // See chart in nsUpdateService.js.in for more details - // - pref("app.update.mode", 1); - - // If set to true, the Update Service will present no UI for any event. - pref("app.update.silent", false); +@@ -138,7 +138,7 @@ // If set to true, the Update Service will apply updates in the background // when it finishes downloading them. @@ -59,17 +59,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example - pref("app.update.url", "https://update.instantbird.org/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARG…"); - - // URL user can browse to manually if for some reason all update installation - // attempts fail. - pref("app.update.url.manual", "http://www.instantbird.com/download.html"); -@@ -194,17 +183,17 @@ pref("browser.search.defaultenginename", - // disable logging for the search service by default - pref("browser.search.log", false); - - // Ordering of Search Engines in the Engine list. - pref("browser.search.order.1", "chrome://instantbird/locale/region.properties"); +@@ -202,7 +202,7 @@ pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -78,17 +68,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // disable logging for the search service update system by default pref("browser.search.update.log", false); - - // Check whether we need to perform engine updates every 6 hours - pref("browser.search.updateinterval", 6); - - /* Extension manager */ -@@ -214,17 +203,17 @@ pref("xpinstall.dialog.progress.chrome", - pref("xpinstall.dialog.progress.type.skin", "Extension:Manager"); - pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager"); - pref("extensions.dss.enabled", false); - pref("extensions.dss.switchPending", false); - pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +222,10 @@ pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -96,18 +76,12 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("extensions.update.enabled", false); pref("extensions.update.interval", 86400); pref("extensions.update.url", "https://addons.instantbird.org/services/update.php?reqVersion=%REQ_VERSION%…"); - pref("extensions.update.autoUpdateDefault", true); +-pref("extensions.update.autoUpdateDefault", true); ++pref("extensions.update.autoUpdateDefault", false); // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); - pref("extensions.getAddons.browseAddons", "https://addons.instantbird.org/%LOCALE%/%APP%"); - pref("extensions.getAddons.maxResults", 5); -@@ -237,35 +226,32 @@ pref("extensions.webservice.discoverURL" - pref("extensions.getMoreExtensionsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/extensions/"); - pref("extensions.getMoreThemesURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/themes/"); - pref("extensions.getMorePluginsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/plugins/"); - pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/messagestyles/"); - pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/emoticons/"); +@@ -245,9 +245,9 @@ pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); // suppress external-load warning for standard browser schemes @@ -120,41 +94,16 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); - // Although we allow these to be exposed internally, there are various places - // (e.g. message pane) where we may divert them out to external applications. - pref("network.protocol-handler.expose.about", true); - pref("network.protocol-handler.expose.http", true); - pref("network.protocol-handler.expose.https", true); - - // expose javascript: so that message themes can use it. - // javascript: links inside messages are filtered out. +@@ -262,7 +262,7 @@ pref("network.protocol-handler.expose.javascript", true); --// 0-Accept, 1-dontAcceptForeign, 2-dontUse + // 0-Accept, 1-dontAcceptForeign, 2-dontUse -pref("network.cookie.cookieBehavior", 0); -- ++pref("network.cookie.cookieBehavior", 1); + // The breakpad report server to link to in about:crashes pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/"); - - // We have an Error Console menu item by default so let's display chrome errors - pref("javascript.options.showInConsole", true); - #ifdef DEBUG - // In debug builds, also display warnings by default - pref("javascript.options.strict", true); -@@ -292,19 +278,89 @@ pref("browser.tabs.tabClipWidth", 140); - - // Where to show tab close buttons: - // 0 on active tab only - // 1 on all tabs until tabClipWidth is reached, then active tab only - // 2 no close buttons at all - // 3 at the end of the tabstrip - pref("browser.tabs.closeButtons", 1); - --#expand pref("chat.irc.defaultQuitMessage", "Instantbird __APP_VERSION__ -- http://www.instantbird.com"); -+#expand pref("chat.irc.defaultQuitMessage", ""); - - pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); - pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); +@@ -307,7 +307,61 @@ // Comma separated list of prpl ids that should use libpurple even if there is // a JS implementation. This is used to land JS-prpls pref'ed off in nightlies. @@ -187,8 +136,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("network.dns.disablePrefetch", true); +// Disable SPDY +pref("network.http.spdy.enabled", false); -+// Do not accept third-party cookies -+pref("network.cookie.cookieBehavior", 1); +// Set the user-agent to Instantbird stable +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Instantbird/1.5"); + @@ -202,8 +149,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("messenger.status.awayWhenIdle", false); +pref("messenger.status.defaultIdleAwayMessage", ""); +pref("messenger.status.reportIdle", false); -+// Do not play sounds on messaging events -+pref("messenger.options.playSounds.message", false); +// Disable text formatting (remove the tags) +pref("messenger.options.filterMode", 0); +// Disable typing notifications @@ -222,15 +167,3 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +// Disable hardware acceleration +pref("gfx.direct2d.disabled", true); +pref("layers.acceleration.disabled", true); -+ -+// Updates -+// Do not auto-update Instantbird -+pref("app.update.enabled", false); -+pref("app.update.auto", false); -+// Do not auto-update extensions -+pref("extensions.update.enabled", false); -+pref("extensions.update.autoUpdateDefault", false); -+// Do not send ping to the server to update -+pref("browser.search.update", false); -+// Set baseURL to Firefox default to prevent console errors -+pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");

1 0

[tor-messenger-build/master] Bump mingw-w64 to 3deeda3a
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit fe08b784f674587d92b5f933a33d5ce4f3057b2c Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 08:47:52 2016 -0700 Bump mingw-w64 to 3deeda3a --- ...fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch | 24 - ...0522-expose-whether-or-not-we-re-in-ta.mozpatch | 512 --------------------- ...2573-Require-tablet-mode-Win10-to-show.mozpatch | 149 ------ projects/instantbird/config | 6 - projects/mingw-w64/config | 2 +- 5 files changed, 1 insertion(+), 692 deletions(-) diff --git a/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch b/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch deleted file mode 100644 index 344e2ed..0000000 --- a/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch +++ /dev/null @@ -1,24 +0,0 @@ -From 464da9c6d7b576a9b92b2c2e26d52a9213e3f89d Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Tue, 29 Sep 2015 16:06:38 +0200 -Subject: [PATCH 1/2] Revert "no bug - fix case of nsIDocShell.h in - WindowsUIUtils.cpp" - -This reverts commit 02335958d9315e5620f030617e4a599209697054. ---- - widget/windows/WindowsUIUtils.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp -index 0c93d945cf30..98325f0eb055 100644 ---- a/widget/windows/WindowsUIUtils.cpp -+++ b/widget/windows/WindowsUIUtils.cpp -@@ -11,7 +11,7 @@ - - #include "nsIObserverService.h" - #include "nsIBaseWindow.h" --#include "nsIDocShell.h" -+#include "nsIDocshell.h" - #include "nsIAppShellService.h" - #include "nsAppShellCID.h" - #include "nsIXULWindow.h" diff --git a/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch b/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch deleted file mode 100644 index bf68c7c..0000000 --- a/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch +++ /dev/null @@ -1,512 +0,0 @@ -From 0fd6ae4f5947b5229b8c14704b893d95787e54a3 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Tue, 29 Sep 2015 16:06:49 +0200 -Subject: [PATCH 2/2] Revert "Bug 1170522 - expose whether or not we're in - tablet mode to xul/js/css, r=jimm,ted" - -This reverts commit 6c7bdf65167060865d9f9a09c0aa3dae0d91680c. ---- - build/win32/mozconfig.vs2013-win64 | 2 +- - build/win64/mozconfig.vs2013 | 2 +- - toolkit/library/moz.build | 6 -- - widget/moz.build | 1 - - widget/nsIWindowsUIUtils.idl | 24 ----- - widget/nsWidgetsCID.h | 4 - - widget/windows/WindowsUIUtils.cpp | 174 ------------------------------------- - widget/windows/WindowsUIUtils.h | 29 ------- - widget/windows/moz.build | 1 - - widget/windows/mozwrlbase.h | 77 ---------------- - widget/windows/nsWidgetFactory.cpp | 6 -- - widget/windows/nsWindow.cpp | 16 ---- - 12 files changed, 2 insertions(+), 340 deletions(-) - delete mode 100644 widget/nsIWindowsUIUtils.idl - delete mode 100644 widget/windows/WindowsUIUtils.cpp - delete mode 100644 widget/windows/WindowsUIUtils.h - delete mode 100644 widget/windows/mozwrlbase.h - -diff --git a/build/win32/mozconfig.vs2013-win64 b/build/win32/mozconfig.vs2013-win64 -index 85821f0720aa..86a846cf670e 100644 ---- a/build/win32/mozconfig.vs2013-win64 -+++ b/build/win32/mozconfig.vs2013-win64 -@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013" - export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT - - ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ## --export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include -+export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include - - ## libs: win8.1 sdk x86 (32-bit) libs, msvc (32-bit) std library, msvc atl libs, directx sdk (32-bit) for d3d9 ## - export LIBPATH=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib -diff --git a/build/win64/mozconfig.vs2013 b/build/win64/mozconfig.vs2013 -index 5fbde2df738b..776c9183e522 100644 ---- a/build/win64/mozconfig.vs2013 -+++ b/build/win64/mozconfig.vs2013 -@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013" - export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC120.CRT - - ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ## --export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include -+export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include - - ## libs: win8.1 sdk x64 (64-bit) libs, msvc (64-bit) std library, msvc atl libs, directx sdk (64-bit) for d3d9 ## - export LIBPATH=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/Lib/winv6.3/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64 -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build -index 62e03f45e154..fcd62bae854e 100644 ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -33,12 +33,6 @@ def Libxul(name): - if CONFIG['MOZ_WEBRTC']: - DELAYLOAD_DLLS += ['msdmo.dll'] - -- if CONFIG['OS_ARCH'] == 'WINNT': -- DELAYLOAD_DLLS += [ -- 'api-ms-win-core-winrt-l1-1-0.dll', -- 'api-ms-win-core-winrt-string-l1-1-0.dll', -- ] -- - if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']: - LOCAL_INCLUDES += [ - '/widget/windows', -diff --git a/widget/moz.build b/widget/moz.build -index 373cf8b23da6..429da474c1ee 100644 ---- a/widget/moz.build -+++ b/widget/moz.build -@@ -26,7 +26,6 @@ if toolkit == 'windows': - 'nsITaskbarProgress.idl', - 'nsITaskbarTabPreview.idl', - 'nsITaskbarWindowPreview.idl', -- 'nsIWindowsUIUtils.idl', - 'nsIWinTaskbar.idl', - ] - elif toolkit == 'cocoa': -diff --git a/widget/nsIWindowsUIUtils.idl b/widget/nsIWindowsUIUtils.idl -deleted file mode 100644 -index 331562a67245..000000000000 ---- a/widget/nsIWindowsUIUtils.idl -+++ /dev/null -@@ -1,24 +0,0 @@ --/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -- * -- * 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/. */ -- --#include "nsISupports.idl" -- -- --[scriptable, uuid(aa8a0ecf-96a1-418c-b80e-f24ae18bbedc)] --interface nsIWindowsUIUtils : nsISupports --{ -- /** -- * Whether the OS is currently in tablet mode. Always false on -- * non-Windows and on versions of Windows before win10 -- */ -- readonly attribute boolean inTabletMode; -- -- /** -- * Update the tablet mode state -- */ -- void updateTabletModeState(); --}; -- -diff --git a/widget/nsWidgetsCID.h b/widget/nsWidgetsCID.h -index a428cdee2866..afafe93f24c0 100644 ---- a/widget/nsWidgetsCID.h -+++ b/widget/nsWidgetsCID.h -@@ -185,7 +185,3 @@ - #define NS_IMEPICKER_CID \ - { 0x8e5c35ef, 0xb65b, 0x47aa, \ - { 0xbb, 0x90, 0x5b, 0x89, 0x6d, 0x88, 0x24, 0x18 } } -- --#define NS_WINDOWS_UIUTILS_CID \ --{ 0xe04a55e8, 0xfee3, 0x4ea2, \ -- { 0xa9, 0x8b, 0x41, 0xd2, 0x62, 0x1a, 0xdc, 0x3c } } -diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp -deleted file mode 100644 -index 98325f0eb055..000000000000 ---- a/widget/windows/WindowsUIUtils.cpp -+++ /dev/null -@@ -1,174 +0,0 @@ --/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* 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/. */ -- --#include <windows.h> --#include "mozwrlbase.h" --#include "nsServiceManagerUtils.h" -- --#include "WindowsUIUtils.h" -- --#include "nsIObserverService.h" --#include "nsIBaseWindow.h" --#include "nsIDocshell.h" --#include "nsIAppShellService.h" --#include "nsAppShellCID.h" --#include "nsIXULWindow.h" --#include "mozilla/Services.h" --#include "mozilla/WindowsVersion.h" --#include "nsString.h" --#include "nsIWidget.h" -- --#include <windows.ui.viewmanagement.h> -- --#pragma comment(lib, "runtimeobject.lib") -- --using namespace mozilla; --using namespace ABI::Windows::UI; --using namespace ABI::Windows::UI::ViewManagement; --using namespace Microsoft::WRL; --using namespace Microsoft::WRL::Wrappers; --using namespace ABI::Windows::Foundation; -- --/* All of this is win10 stuff and we're compiling against win81 headers -- * for now, so we may need to do some legwork: */ --#ifndef UserInteractionMode --namespace ABI { -- namespace Windows { -- namespace UI { -- namespace ViewManagement { -- enum UserInteractionMode { -- UserInteractionMode_Mouse = 0, -- UserInteractionMode_Touch = 1 -- }; -- } -- } -- } --} -- --#endif -- --#ifndef RuntimeClass_Windows_UI_ViewManagement_UIViewSettings --#define RuntimeClass_Windows_UI_ViewManagement_UIViewSettings L"Windows.UI.ViewManagement.UIViewSettings" --#endif -- --#ifndef IUIViewSettings --namespace ABI { -- namespace Windows { -- namespace UI { -- namespace ViewManagement { -- interface IUIViewSettings; -- MIDL_INTERFACE("C63657F6-8850-470D-88F8-455E16EA2C26") -- IUIViewSettings : public IInspectable -- { -- public: -- virtual HRESULT STDMETHODCALLTYPE get_UserInteractionMode(UserInteractionMode *value) = 0; -- }; -- -- extern const __declspec(selectany) IID & IID_IUIViewSettings = __uuidof(IUIViewSettings); -- } -- } -- } --} --#endif -- --#ifndef IUIViewSettingsInterop -- --typedef interface IUIViewSettingsInterop IUIViewSettingsInterop; -- --MIDL_INTERFACE("3694dbf9-8f68-44be-8ff5-195c98ede8a6") --IUIViewSettingsInterop : public IInspectable --{ --public: -- virtual HRESULT STDMETHODCALLTYPE GetForWindow(HWND hwnd, REFIID riid, void **ppv) = 0; --}; --#endif -- --WindowsUIUtils::WindowsUIUtils() : -- mInTabletMode(eTabletModeUnknown) --{ --} -- --WindowsUIUtils::~WindowsUIUtils() --{ --} -- --/* -- * Implement the nsISupports methods... -- */ --NS_IMPL_ISUPPORTS(WindowsUIUtils, -- nsIWindowsUIUtils) -- --NS_IMETHODIMP --WindowsUIUtils::GetInTabletMode(bool* aResult) --{ -- if (mInTabletMode == eTabletModeUnknown) { -- UpdateTabletModeState(); -- } -- *aResult = mInTabletMode == eTabletModeOn; -- return NS_OK; --} -- --NS_IMETHODIMP --WindowsUIUtils::UpdateTabletModeState() --{ -- if (!IsWin10OrLater()) { -- return NS_OK; -- } -- -- nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID)); -- nsCOMPtr<nsIXULWindow> hiddenWindow; -- -- nsresult rv = appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow)); -- if (NS_FAILED(rv)) { -- return rv; -- } -- -- nsCOMPtr<nsIDocShell> docShell; -- rv = hiddenWindow->GetDocShell(getter_AddRefs(docShell)); -- if (NS_FAILED(rv) || !docShell) { -- return rv; -- } -- -- nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(docShell)); -- -- if (!baseWindow) -- return NS_ERROR_FAILURE; -- -- nsCOMPtr<nsIWidget> widget; -- baseWindow->GetMainWidget(getter_AddRefs(widget)); -- -- if (!widget) -- return NS_ERROR_FAILURE; -- -- HWND winPtr = (HWND)widget->GetNativeData(NS_NATIVE_WINDOW); -- ComPtr<IUIViewSettingsInterop> uiViewSettingsInterop; -- -- HRESULT hr = GetActivationFactory( -- HStringReference(RuntimeClass_Windows_UI_ViewManagement_UIViewSettings).Get(), -- &uiViewSettingsInterop); -- if (SUCCEEDED(hr)) { -- ComPtr<IUIViewSettings> uiViewSettings; -- hr = uiViewSettingsInterop->GetForWindow(winPtr, IID_PPV_ARGS(&uiViewSettings)); -- if (SUCCEEDED(hr)) { -- UserInteractionMode mode; -- hr = uiViewSettings->get_UserInteractionMode(&mode); -- if (SUCCEEDED(hr)) { -- TabletModeState oldTabletModeState = mInTabletMode; -- mInTabletMode = (mode == UserInteractionMode_Touch) ? eTabletModeOn : eTabletModeOff; -- if (mInTabletMode != oldTabletModeState) { -- nsCOMPtr<nsIObserverService> observerService = -- mozilla::services::GetObserverService(); -- NS_NAMED_LITERAL_STRING(tabletMode, "tablet-mode"); -- NS_NAMED_LITERAL_STRING(normalMode, "normal-mode"); -- observerService->NotifyObservers(nullptr, "tablet-mode-change", -- ((mInTabletMode == eTabletModeOn) ? tabletMode.get() : normalMode.get())); -- } -- } -- } -- } -- -- return NS_OK; --} -- -diff --git a/widget/windows/WindowsUIUtils.h b/widget/windows/WindowsUIUtils.h -deleted file mode 100644 -index a33c93a94f23..000000000000 ---- a/widget/windows/WindowsUIUtils.h -+++ /dev/null -@@ -1,29 +0,0 @@ --/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* 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/. */ -- --#ifndef mozilla_widget_WindowsUIUtils_h__ --#define mozilla_widget_WindowsUIUtils_h__ -- --#include "nsIWindowsUIUtils.h" -- --enum TabletModeState { -- eTabletModeUnknown = 0, -- eTabletModeOff, -- eTabletModeOn --}; -- --class WindowsUIUtils final : public nsIWindowsUIUtils { --public: -- NS_DECL_ISUPPORTS -- NS_DECL_NSIWINDOWSUIUTILS -- -- WindowsUIUtils(); --protected: -- ~WindowsUIUtils(); -- -- TabletModeState mInTabletMode; --}; -- --#endif // mozilla_widget_WindowsUIUtils_h__ -diff --git a/widget/windows/moz.build b/widget/windows/moz.build -index 755e763553c1..fdb2fb70d28a 100644 ---- a/widget/windows/moz.build -+++ b/widget/windows/moz.build -@@ -63,7 +63,6 @@ SOURCES += [ - 'nsBidiKeyboard.cpp', - 'nsFilePicker.cpp', - 'nsWidgetFactory.cpp', -- 'WindowsUIUtils.cpp', - 'WinMouseScrollHandler.cpp', - ] - -diff --git a/widget/windows/mozwrlbase.h b/widget/windows/mozwrlbase.h -deleted file mode 100644 -index d82be8f0431d..000000000000 ---- a/widget/windows/mozwrlbase.h -+++ /dev/null -@@ -1,77 +0,0 @@ --/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* 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/. */ -- --#pragma once -- --/* -- * Includes <wrl.h> and it's children. Defines imports needed by -- * corewrappers.h in the case where windows.h has already been -- * included w/WINVER < 0x600. Also ups WINVER/_WIN32_WINNT prior -- * to including wrl.h. Mozilla's build currently has WINVER set to -- * 0x502 for XP support. -- */ -- --#if _WIN32_WINNT < 0x600 -- --#include <windows.h> -- --VOID --WINAPI --ReleaseSRWLockExclusive( -- _Inout_ PSRWLOCK SRWLock -- ); -- --VOID --WINAPI --ReleaseSRWLockShared( -- _Inout_ PSRWLOCK SRWLock -- ); -- --BOOL --WINAPI --InitializeCriticalSectionEx( -- _Out_ LPCRITICAL_SECTION lpCriticalSection, -- _In_ DWORD dwSpinCount, -- _In_ DWORD Flags -- ); -- --VOID --WINAPI --InitializeSRWLock( -- _Out_ PSRWLOCK SRWLock -- ); -- --VOID --WINAPI --AcquireSRWLockExclusive( -- _Inout_ PSRWLOCK SRWLock -- ); -- --BOOLEAN --WINAPI --TryAcquireSRWLockExclusive( -- _Inout_ PSRWLOCK SRWLock -- ); -- --BOOLEAN --WINAPI --TryAcquireSRWLockShared( -- _Inout_ PSRWLOCK SRWLock -- ); -- --VOID --WINAPI --AcquireSRWLockShared( -- _Inout_ PSRWLOCK SRWLock -- ); -- --#undef WINVER --#undef _WIN32_WINNT --#define WINVER 0x600 --#define _WIN32_WINNT 0x600 -- --#endif // _WIN32_WINNT < 0x600 -- --#include <wrl.h> -diff --git a/widget/windows/nsWidgetFactory.cpp b/widget/windows/nsWidgetFactory.cpp -index f564d17ee6c6..b7cedbefe2cf 100644 ---- a/widget/windows/nsWidgetFactory.cpp -+++ b/widget/windows/nsWidgetFactory.cpp -@@ -44,8 +44,6 @@ - #include "JumpListBuilder.h" - #include "JumpListItem.h" - --#include "WindowsUIUtils.h" -- - #ifdef NS_PRINTING - #include "nsDeviceContextSpecWin.h" - #include "nsPrintOptionsWin.h" -@@ -114,7 +112,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListItem) - NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListSeparator) - NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListLink) - NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListShortcut) --NS_GENERIC_FACTORY_CONSTRUCTOR(WindowsUIUtils) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) -@@ -153,7 +150,6 @@ NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTITEM_CID); - NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSEPARATOR_CID); - NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTLINK_CID); - NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSHORTCUT_CID); --NS_DEFINE_NAMED_CID(NS_WINDOWS_UIUTILS_CID); - NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID); - #ifdef NS_PRINTING -@@ -186,7 +182,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = { - { &kNS_WIN_JUMPLISTSEPARATOR_CID, false, nullptr, JumpListSeparatorConstructor }, - { &kNS_WIN_JUMPLISTLINK_CID, false, nullptr, JumpListLinkConstructor }, - { &kNS_WIN_JUMPLISTSHORTCUT_CID, false, nullptr, JumpListShortcutConstructor }, -- { &kNS_WINDOWS_UIUTILS_CID, false, nullptr, WindowsUIUtilsConstructor }, - { &kNS_DRAGSERVICE_CID, false, nullptr, nsDragServiceConstructor, Module::MAIN_PROCESS_ONLY }, - { &kNS_BIDIKEYBOARD_CID, false, nullptr, nsBidiKeyboardConstructor }, - #ifdef NS_PRINTING -@@ -219,7 +214,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { - { "@mozilla.org/windows-jumplistseparator;1", &kNS_WIN_JUMPLISTSEPARATOR_CID }, - { "@mozilla.org/windows-jumplistlink;1", &kNS_WIN_JUMPLISTLINK_CID }, - { "@mozilla.org/windows-jumplistshortcut;1", &kNS_WIN_JUMPLISTSHORTCUT_CID }, -- { "@mozilla.org/windows-ui-utils;1", &kNS_WINDOWS_UIUTILS_CID }, - { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID, Module::MAIN_PROCESS_ONLY }, - { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID }, - #ifdef NS_PRINTING -diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp -index 0ab8bee04863..b616fb725cfd 100644 ---- a/widget/windows/nsWindow.cpp -+++ b/widget/windows/nsWindow.cpp -@@ -161,8 +161,6 @@ - #include "nsIWinTaskbar.h" - #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1" - --#include "nsIWindowsUIUtils.h" -- - #include "nsWindowDefs.h" - - #include "nsCrashOnException.h" -@@ -4845,20 +4843,6 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, - } - break; - -- case WM_SETTINGCHANGE: -- { -- if (IsWin10OrLater() && mWindowType == eWindowType_invisible && lParam) { -- auto lParamString = reinterpret_cast<const wchar_t*>(lParam); -- if (!wcscmp(lParamString, L"UserInteractionMode")) { -- nsCOMPtr<nsIWindowsUIUtils> uiUtils(do_GetService("@mozilla.org/windows-ui-utils;1")); -- if (uiUtils) { -- uiUtils->UpdateTabletModeState(); -- } -- } -- } -- } -- break; -- - case WM_NCCALCSIZE: - { - if (mCustomNonClient) { diff --git a/projects/instantbird/0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch b/projects/instantbird/0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch deleted file mode 100644 index 5122351..0000000 --- a/projects/instantbird/0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch +++ /dev/null @@ -1,149 +0,0 @@ -From 8fffddd5b63e14b70213fe93a2dbac2953f10d5a Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Wed, 30 Sep 2015 12:08:26 +0200 -Subject: [PATCH 3/3] Revert "Bug 1192573 - Require tablet-mode (Win10+) to - show the on-screen keyboard. r=masayuki, a=sledru" - -This reverts commit 7af35d3472734b241fa053c1d5e3ff8fe1b0d513. ---- - modules/libpref/init/all.js | 3 --- - widget/windows/WinIMEHandler.cpp | 52 +++++++++++++++------------------------- - 2 files changed, 19 insertions(+), 36 deletions(-) - -diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 6e22123e9084..27b3b2834841 100644 ---- a/modules/libpref/init/all.js -+++ b/modules/libpref/init/all.js -@@ -3237,9 +3237,6 @@ pref("ui.osk.enabled", true); - pref("ui.osk.detect_physical_keyboard", true); - // Path to TabTip.exe on local machine. Cached for performance reasons. - pref("ui.osk.on_screen_keyboard_path", ""); --// Only show the on-screen keyboard when Windows is in Tablet mode. Setting --// this pref to false will allow the OSK to show in regular non-tablet mode. --pref("ui.osk.require_tablet_mode", true); - - # XP_WIN - #endif -diff --git a/widget/windows/WinIMEHandler.cpp b/widget/windows/WinIMEHandler.cpp -index 8d56bb1d3985..28b4f5a704f7 100644 ---- a/widget/windows/WinIMEHandler.cpp -+++ b/widget/windows/WinIMEHandler.cpp -@@ -16,7 +16,6 @@ - #include "nsLookAndFeel.h" - #include "nsWindow.h" - #include "WinUtils.h" --#include "nsIWindowsUIUtils.h" - - #include "shellapi.h" - #include "Shlobj.h" -@@ -27,7 +26,6 @@ - const char* kOskPathPrefName = "ui.osk.on_screen_keyboard_path"; - const char* kOskEnabled = "ui.osk.enabled"; - const char* kOskDetectPhysicalKeyboard = "ui.osk.detect_physical_keyboard"; --const char* kOskRequireTabletMode = "ui.osk.require_tablet_mode"; - - namespace mozilla { - namespace widget { -@@ -527,44 +525,19 @@ IMEHandler::SetInputScopeForIMM32(nsWindow* aWindow, - void - IMEHandler::MaybeShowOnScreenKeyboard() - { -- if (sPluginHasFocus || -- !IsWin10OrLater() || -- !Preferences::GetBool(kOskEnabled, true) || -- sShowingOnScreenKeyboard || -- IMEHandler::IsKeyboardPresentOnSlate()) { -+ if (sPluginHasFocus) { - return; - } -- -- if (Preferences::GetBool(kOskRequireTabletMode, true)) { -- // Tablet Mode is only supported on Windows 10 and higher. -- // When touch-event detection within IME is better supported -- // this check may be removed, and ShowOnScreenKeyboard can -- // run on Windows 8 and higher (adjusting the IsWin10OrLater -- // guard above and within MaybeDismissOnScreenKeyboard). -- nsCOMPtr<nsIWindowsUIUtils> -- uiUtils(do_GetService("@mozilla.org/windows-ui-utils;1")); -- if (uiUtils) { -- bool isInTabletMode = false; -- uiUtils->GetInTabletMode(&isInTabletMode); -- if (!isInTabletMode) { -- return; -- } -- } -- } -- -- IMEHandler::ShowOnScreenKeyboard(); -+ IMEHandler::ShowOnScreenKeyboard(); - } - - // static - void - IMEHandler::MaybeDismissOnScreenKeyboard() - { -- if (sPluginHasFocus || -- !IsWin10OrLater() || -- !sShowingOnScreenKeyboard) { -+ if (sPluginHasFocus) { - return; - } -- - IMEHandler::DismissOnScreenKeyboard(); - } - -@@ -666,12 +639,13 @@ IMEHandler::IsKeyboardPresentOnSlate() - { 0x4D36E96B, 0xE325, 0x11CE, - { 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18 } }; - -+ bool result = false; - // Query for all the keyboard devices. - HDEVINFO device_info = - ::SetupDiGetClassDevs(&KEYBOARD_CLASS_GUID, nullptr, - nullptr, DIGCF_PRESENT); - if (device_info == INVALID_HANDLE_VALUE) { -- return false; -+ return result; - } - - // Enumerate all keyboards and look for ACPI\PNP and HID\VID devices. If -@@ -701,11 +675,11 @@ IMEHandler::IsKeyboardPresentOnSlate() - // return true if the API's report one or more keyboards. Please note - // that this will break for non keyboard devices which expose a - // keyboard PDO. -- return true; -+ result = true; - } - } - } -- return false; -+ return result; - } - - // Based on DisplayVirtualKeyboard() in Chromium's base/win/win_util.cc. -@@ -713,6 +687,13 @@ IMEHandler::IsKeyboardPresentOnSlate() - void - IMEHandler::ShowOnScreenKeyboard() - { -+ if (!IsWin8OrLater() || -+ !Preferences::GetBool(kOskEnabled, true) || -+ sShowingOnScreenKeyboard || -+ IMEHandler::IsKeyboardPresentOnSlate()) { -+ return; -+ } -+ - nsAutoString cachedPath; - nsresult result = Preferences::GetString(kOskPathPrefName, &cachedPath); - if (NS_FAILED(result) || cachedPath.IsEmpty()) { -@@ -793,6 +774,11 @@ IMEHandler::ShowOnScreenKeyboard() - void - IMEHandler::DismissOnScreenKeyboard() - { -+ if (!IsWin8OrLater() || -+ !sShowingOnScreenKeyboard) { -+ return; -+ } -+ - sShowingOnScreenKeyboard = false; - - // Dismiss the virtual keyboard by generating the ESC keystroke diff --git a/projects/instantbird/config b/projects/instantbird/config index fa6ac16..e320000 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -105,12 +105,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: gmploader-sandbox.mozpatch enable: '[% c("var/windows") %]' - - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch - enable: '[% c("var/windows") %]' - - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch - enable: '[% c("var/windows") %]' - - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch - enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index c080a13..5b260e2 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 917249082fd711f6a3e13515d1f6ffd4474d4f9c +git_hash: 3deeda3a1db3dee8a8b6231be5b44f47d79ce1d7 version: '[% c("abbrev") %]' remote_docker: 1 var:

1 0