945230 - Fix char16_t/wchar_t mismatch in gfx/thebes/.

Status: RESOLVED FIXED

(Core :: Graphics: Text, defect)

Description

[Jacek Caban]

Attachment: patch.diff

This is a followup of bug 928351.

- Use wchar_t for strings used in Windows API.
- Use char16ptr_t for strings used both for internal APIs and Windows APIs

Comment 1

[John Daggett (:jtd)]

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

I think Bas would be a better person to review this.

Comment 2

[Bas Schouten (:bas.schouten)]

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

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

::: gfx/thebes/gfxUniscribeShaper.cpp
@@ +66,5 @@
>      HRESULT Shape() {
>          HRESULT rv;
>          HDC shapeDC = nullptr;
>  
> +        char16ptr_t str = mAlternativeString ? mAlternativeString : mItemString;

Should we keep the const qualifier around here?

@@ +416,5 @@
>          return &mItems[i];
>      }
>  
>  private:
> +    char16ptr_t      mString;

idem

::: gfx/thebes/gfxWindowsPlatform.cpp
@@ +1117,5 @@
>      return mUseClearTypeAlways;
>  }
>  
>  void 
> +gfxWindowsPlatform::GetDLLVersion(char16ptr_t aDLLPath, nsAString& aVersion)

idem

Comment 3

[Jacek Caban]

Thanks for the review. char16ptr_t is a typedef (or a wrapper) of |const char16_t*|, so additional const is not needed here.

https://hg.mozilla.org/integration/mozilla-inbound/rev/6447ab85a415

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/6447ab85a415