1642966 - build bustage 2020-06-03 - /builds/worker/checkouts/gecko/comm/mailnews/base/src/nsMessenger.cpp:460:46: error: too few arguments to function call, expected 3, have 2

Status: RESOLVED FIXED

(MailNews Core :: Backend, defect, P1)

Description

[Treeherder Bug Filer]

Filed by: mkmelin+mozilla [at] iki.fi
Parsed log: https://treeherder.mozilla.org/logviewer.html#?job_id=304895436&repo=comm-central
Full log: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/QHxu41bkS0CW5lX9Rqtd5A/runs/0/artifacts/public/logs/live_backing.log

---

From bug 1606797 maybe

Comment 1

[Magnus Melin [:mkmelin]]

From https://hg.mozilla.org/mozilla-central/rev/ecef5e940485 - https://hg.mozilla.org/mozilla-central/diff/ecef5e9404859e6b86dd530a9aba31c0722d5738/uriloader/exthandler/nsIExternalProtocolService.idl

Comment 2

[mac198442]

https://phabricator.services.mozilla.com/D77027 from bug 1676097 needs to be ported to mailnews too fix this

Comment 3

[Jorg K (CEST = GMT+2)]

Two in C++ code: https://searchfox.org/comm-central/search?q=NS_EXTERNALPROTOCOLSERVICE_CONTRACTID&path=mail&case=false&regexp=false

JS: https://searchfox.org/comm-central/search?q=uriloader%2Fexternal-protocol-service&path=&case=false&regexp=false
The new parameter is optional, so with luck, no JS are necessary.

Comment 4

[mac198442]

I see instances of LoadURI with only 2 parameters in the following c++ source files:

mailnews/local/src/nsMailboxService.cpp
mailnews/imap/src/nsImapMailFolder.cpp
mailnews/imap/src/nsImapService.cpp
mailnews/base/src/nsMsgWindow.cpp
mailnews/base/src/nsMsgPrintEngine.cpp
mailnews/base/src/nsMessenger.cpp
mailnews/base/util/nsMsgMailNewsUrl.cpp
mailnews/news/src/nsNntpService.cpp

Comment 5

[Magnus Melin [:mkmelin]]

Yes only two c++ cases needed to be fixed. My local build now succeeded, so I'm going to push a fix.

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/45bd9be84c3d
Port bug 1606797 to Thunderbird (nsIExternalProtocolService::loadURI now takes 3 args). rs=bustage-fix DONTBUILD

Comment 7

[Magnus Melin [:mkmelin]]

Nightlies re-triggered.

Comment 8

[Intermittent Failures Robot]

1 failures in 4949 pushes (0.0 failures/push) were associated with this bug in the last 7 days.

Repository breakdown:

• comm-central: 1

Platform breakdown:

• linux64: 1

For more details, see:
https://treeherder.mozilla.org/intermittent-failures.html#/bugdetails?bug=1642966&startday=2020-06-01&endday=2020-06-07&tree=all

Comment 9

[Rob Lemley [:rjl]]

Attachment: image.png

[Approval Request Comment]
https://hg.mozilla.org/comm-central/rev/45bd9be84c3d

Need to uplift that to 78 beta to fix bustage. Bug 1606797 was uplifted to Firefox 78b8.

Comment 10

[Rob Lemley [:rjl]]

Thunderbird 78.0b3:
https://hg.mozilla.org/releases/comm-beta/rev/0a887f3b2a7a27d5e5ca9b96c425292e646159ba

Comment 11

[Rob Lemley [:rjl]]

Comment on attachment 9157950 [details]
image.png

# HG changeset patch
# User Magnus Melin <[e-mail]>
# Date 1591189662 -10800
#      Wed Jun 03 16:07:42 2020 +0300
# Node ID 0a887f3b2a7a27d5e5ca9b96c425292e646159ba
# Parent  1346aaf4d966114172667f66d60042b371aeab3d
Bug 1642966 - Port bug 1606797 to Thunderbird (nsIExternalProtocolService::loadURI now takes 3 args). rs=bustage-fix a=rjl

diff -r 1346aaf4d966 -r 0a887f3b2a7a mailnews/base/src/nsMessenger.cpp
--- a/mailnews/base/src/nsMessenger.cpp	Wed Jun 17 19:26:59 2020 +0000
+++ b/mailnews/base/src/nsMessenger.cpp	Wed Jun 03 16:07:42 2020 +0300
@@ -452,17 +452,17 @@
 
   nsCOMPtr<nsIURI> uri;
   rv = NS_NewURI(getter_AddRefs(uri), PromiseFlatCString(aURL).get());
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIExternalProtocolService> extProtService =
       do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
-  return extProtService->LoadURI(uri, nullptr);
+  return extProtService->LoadURI(uri, nullptr, nullptr);
 }
 
 NS_IMETHODIMP
 nsMessenger::LoadURL(mozIDOMWindowProxy *aWin, const nsACString &aURL) {
   nsresult rv;
 
   SetDisplayCharset(NS_LITERAL_CSTRING("UTF-8"));
 
diff -r 1346aaf4d966 -r 0a887f3b2a7a mailnews/imap/src/nsImapMailFolder.cpp
--- a/mailnews/imap/src/nsImapMailFolder.cpp	Wed Jun 17 19:26:59 2020 +0000
+++ b/mailnews/imap/src/nsImapMailFolder.cpp	Wed Jun 03 16:07:42 2020 +0300
@@ -3797,17 +3797,17 @@
         return rv;
       uri->GetScheme(scheme);
       if (!scheme.IsEmpty()) {
         // if the URL scheme does not correspond to an exposed protocol, then we
         // need to hand this link click over to the external protocol handler.
         bool isExposed;
         rv = extProtService->IsExposedProtocol(scheme.get(), &isExposed);
         if (NS_SUCCEEDED(rv) && !isExposed)
-          return extProtService->LoadURI(uri, nullptr);
+          return extProtService->LoadURI(uri, nullptr, nullptr);
       }
     }
   } else {
     nsCOMPtr<nsIImapService> imapService =
         do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     rv = imapService->GetFolderAdminUrl(this, window, this, nullptr);
     if (NS_SUCCEEDED(rv)) m_urlRunning = true;