944894 - Fix char16_t/wchar_t mismatch in widget/windows/.

Status: RESOLVED FIXED

(Core :: Widget: Win32, defect)

Description

[Jacek Caban]

Attachment: patch.diff

This is followup of bug 928351 for widget/windows/.

- Use wchar_t for strings used in Windows API.
- Use AppendPrintf instead of sprintf_s to avoid conflictx in GfxInfo::GetCleartypeParameters
- Replace a few BeginReading() with get() where possible. get() returns the new char16ptr_t type that hides char16_t/wchar_t differences.
- Not really related, but also needed for mingw: remove a few MOZ_ALWAYS_INLINE. Those functions are implemented in KeyboardLayout.cpp, so they can't be inlined in other files and that causes errors on GCC.
- Use char16ptr_t type in a few cases, which are used both as wchar_t and char16_t.

Comment 1

[Jim Mathies [:jimm]]

Comment on attachment 8340635 [details] [diff] [review]
patch.diff

Review of attachment 8340635 [details] [diff] [review]:
-----------------------------------------------------------------

Is PRUnichar going away at some point? There are still some uses in widget/windows/winrt/*. 

http://mxr.mozilla.org/mozilla-central/search?find=%2Fwidget%2Fwindows%2Fwinrt%2F&string=PRUnichar

::: widget/windows/nsDeviceContextSpecWin.cpp
@@ +333,5 @@
>  }
>  
>  //----------------------------------------------------------------------------------
>  static nsresult
> +CheckForPrintToFile(nsIPrintSettings* aPS, const PRUnichar* aPrinterName, const PRUnichar* aUPrinterName)

Did you intend to keep these?

::: widget/windows/nsPrintSettingsWin.cpp
@@ +56,5 @@
>  }
>  NS_IMETHODIMP nsPrintSettingsWin::GetDeviceName(PRUnichar **aDeviceName)
>  {
>    NS_ENSURE_ARG_POINTER(aDeviceName);
> +  *aDeviceName = mDeviceName?reinterpret_cast<PRUnichar*>(wcsdup(mDeviceName)):nullptr;

here as well?

Comment 2

[Jacek Caban]

Thanks for the review.

(In reply to Jim Mathies [:jimm] from comment #1)
> Comment on attachment 8340635 [details] [diff] [review]
> patch.diff
> 
> Review of attachment 8340635 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Is PRUnichar going away at some point? There are still some uses in
> widget/windows/winrt/*.

There a massive PRUnichar->char16_t change is planned. I guess it will happen for the whole tree at once.

> http://mxr.mozilla.org/mozilla-central/
> search?find=%2Fwidget%2Fwindows%2Fwinrt%2F&string=PRUnichar
> 
> ::: widget/windows/nsDeviceContextSpecWin.cpp
> @@ +333,5 @@
> >  }
> >  
> >  //----------------------------------------------------------------------------------
> >  static nsresult
> > +CheckForPrintToFile(nsIPrintSettings* aPS, const PRUnichar* aPrinterName, const PRUnichar* aUPrinterName)
> 
> Did you intend to keep these?

Yes, mostly because this function is currently called only with PRUnichar* arguments.

> 
> ::: widget/windows/nsPrintSettingsWin.cpp
> @@ +56,5 @@
> >  }
> >  NS_IMETHODIMP nsPrintSettingsWin::GetDeviceName(PRUnichar **aDeviceName)
> >  {
> >    NS_ENSURE_ARG_POINTER(aDeviceName);
> > +  *aDeviceName = mDeviceName?reinterpret_cast<PRUnichar*>(wcsdup(mDeviceName)):nullptr;
> 
> here as well?

Yes, this is a part of an interface.


https://hg.mozilla.org/integration/mozilla-inbound/rev/eba1adf9482a

Comment 3

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/eba1adf9482a