1192248 - Fix wchar_t/char16_t mismatch WinIMEHandler.cpp.

Status: RESOLVED FIXED

(Core :: Widget: Win32, defect)

Description

[Jacek Caban]

Attachment: fix

Recent changes broke compilation on compilers where wchar_t != char16_t like GCC and VS2015.

The attached patch also fixes compilation on case sensitive OSes, unused variable warning and unrelated non-virtual destructor warning.

Comment 1

[Masayuki Nakano [:masayuki] (he/him)(JST, +0900)]

Comment on attachment 8644959 [details] [diff] [review]
fix

>-class InkCollectorEvent : public _IInkCollectorEvents
>+class InkCollectorEvent final : public _IInkCollectorEvents

I don't understand why this is necessary. Please remove this change if this is not necessary for this bug.

>@@ -740,36 +740,36 @@ IMEHandler::ShowOnScreenKeyboard()
>       } else {
>         PWSTR path = nullptr;
>         HRESULT hres =
>           WinUtils::SHGetKnownFolderPath(FOLDERID_ProgramFilesCommon, 0,
>                                          nullptr, &path);
>         if (FAILED(hres) || !path) {
>           return;
>         }
>-        commonProgramFilesPath = nsDependentString(path).get();
>+        commonProgramFilesPath = static_cast<const wchar_t*>(nsDependentString(path).get());

I *guess* this line is over 80 chars. If so, please do:

        commonProgramFilesPath =
          static_cast<const wchar_t*>(nsDependentString(path).get());

Comment 2

[Xidorn Quan [:xidorn] UTC+10]

url:        https://hg.mozilla.org/integration/mozilla-inbound/rev/b41dbdb8e871cf8528571a16272b05fc6449bc82
changeset:  b41dbdb8e871cf8528571a16272b05fc6449bc82
user:       Jacek Caban <[e-mail]>
date:       Mon Aug 10 09:24:57 2015 +1000
description:
Bug 1192248 - Fix wchar_t/char16_t mismatch WinIMEHandler.cpp. r=masayuki

Comment 3

[Ryan VanderMeulen [:RyanVM]]

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

Comment 4

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/02d10fc80c18

Comment 5

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/02d10fc80c18