Bug 1453456 - Followup for Windows-specific bustage about char16ptr_t where every other platform has a nice pointer-to-character type instead. r=bustage in a CLOSED TREE
authorJeff Walden <jwalden@mit.edu>
Wed, 27 Feb 2019 12:49:20 -0800
changeset 519552 6ad7a291385a560da0a7b7019f03f9afde786112
parent 519551 f4f9757e41e19aed16bead8cbd9ae533637cc3cc
child 519553 1dd26ddfc3734772ec7531d34792ee2c80402fe8
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1453456
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1453456 - Followup for Windows-specific bustage about char16ptr_t where every other platform has a nice pointer-to-character type instead. r=bustage in a CLOSED TREE
widget/windows/nsDataObj.cpp
--- a/widget/windows/nsDataObj.cpp
+++ b/widget/windows/nsDataObj.cpp
@@ -1153,17 +1153,17 @@ nsDataObj ::GetFileContentsInternetShort
                                                          mIOThread, true);
 
     rv = mozilla::widget::FaviconHelper::GetOutputIconPath(aUri, icoFile, true);
     NS_ENSURE_SUCCESS(rv, E_FAIL);
     nsString path;
     rv = icoFile->GetPath(path);
     NS_ENSURE_SUCCESS(rv, E_FAIL);
 
-    if (IsAsciiNullTerminated(path.get())) {
+    if (IsAsciiNullTerminated(static_cast<const char16_t*>(path.get()))) {
       LossyCopyUTF16toASCII(path, asciiPath);
       shortcutFormatStr =
           "[InternetShortcut]\r\nURL=%s\r\n"
           "IDList=\r\nHotKey=0\r\nIconFile=%s\r\n"
           "IconIndex=0\r\n";
     } else {
       int len =
           WideCharToMultiByte(CP_UTF7, 0, char16ptr_t(path.BeginReading()),