Bug 949821 - Use L... for wchar_t* strings.
authorJacek Caban <jacek@codeweavers.com>
Tue, 17 Dec 2013 12:02:27 +0100
changeset 171021 5eaf6fe48be2cd3486659ed20b4da1f8e3697d7e
parent 171020 bfeb49413f4ed78d52b958d30eb9b125ae5cf35b
child 171022 32ad0b1d8a3f55e8b428c954d1f0a99ce5ab2d4c
push id5166
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:47:54 +0000
treeherdermozilla-aurora@977eb2548b2d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs949821
milestone29.0a1
Bug 949821 - Use L... for wchar_t* strings.
widget/windows/nsDataObj.cpp
widget/windows/nsTextStore.cpp
--- a/widget/windows/nsDataObj.cpp
+++ b/widget/windows/nsDataObj.cpp
@@ -1063,23 +1063,23 @@ nsDataObj :: GetFileDescriptorInternetSh
   LPFILEGROUPDESCRIPTORW fileGroupDescW = reinterpret_cast<LPFILEGROUPDESCRIPTORW>(::GlobalLock(fileGroupDescHandle));
   if (!fileGroupDescW) {
     ::GlobalFree(fileGroupDescHandle);
     return E_OUTOFMEMORY;
   }
 
   // get a valid filename in the following order: 1) from the page title, 
   // 2) localized string for an untitled page, 3) just use "Untitled.URL"
-  if (!CreateFilenameFromTextW(title, MOZ_UTF16(".URL"), 
+  if (!CreateFilenameFromTextW(title, L".URL",
                                fileGroupDescW->fgd[0].cFileName, NS_MAX_FILEDESCRIPTOR)) {
     nsXPIDLString untitled;
     if (!GetLocalizedString(MOZ_UTF16("noPageTitle"), untitled) ||
-        !CreateFilenameFromTextW(untitled, MOZ_UTF16(".URL"), 
+        !CreateFilenameFromTextW(untitled, L".URL",
                                  fileGroupDescW->fgd[0].cFileName, NS_MAX_FILEDESCRIPTOR)) {
-      wcscpy(fileGroupDescW->fgd[0].cFileName, MOZ_UTF16("Untitled.URL"));
+      wcscpy(fileGroupDescW->fgd[0].cFileName, L"Untitled.URL");
     }
   }
 
   // one file in the file block
   fileGroupDescW->cItems = 1;
   fileGroupDescW->fgd[0].dwFlags = FD_LINKUI;
 
   ::GlobalUnlock( fileGroupDescHandle );
--- a/widget/windows/nsTextStore.cpp
+++ b/widget/windows/nsTextStore.cpp
@@ -3342,17 +3342,17 @@ nsTextStore::Initialize(void)
         MarkContextAsKeyboardDisabled(sTsfDisabledContext);
         MarkContextAsEmpty(sTsfDisabledContext);
       }
     }
   }
 
   if (sTsfThreadMgr && !sFlushTIPInputMessage) {
     sFlushTIPInputMessage = ::RegisterWindowMessageW(
-        MOZ_UTF16("Flush TIP Input Message"));
+        L"Flush TIP Input Message");
   }
 
   if (!sTsfThreadMgr) {
     NS_IF_RELEASE(sMessagePump);
     NS_IF_RELEASE(sKeystrokeMgr);
   }
 
   PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,