Closed Bug 945230 Opened 6 years ago Closed 6 years ago

Fix char16_t/wchar_t mismatch in gfx/thebes/.

Categories

(Core :: Graphics: Text, defect)

x86_64
Windows 7
defect
Not set

Tracking

()

RESOLVED FIXED
mozilla29

People

(Reporter: jacek, Assigned: jacek)

References

Details

(Whiteboard: [qa-])

Attachments

(1 file)

Attached patch patch.diffSplinter Review
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
Attachment #8341060 - Flags: review?(jdaggett)
Comment on attachment 8341060 [details] [diff] [review]
patch.diff

I think Bas would be a better person to review this.
Attachment #8341060 - Flags: review?(jdaggett) → review?(bas)
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
Attachment #8341060 - Flags: review?(bas) → review+
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
https://hg.mozilla.org/mozilla-central/rev/6447ab85a415
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla29
Whiteboard: [qa-]
You need to log in before you can comment on or make changes to this bug.