Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MingW bustage (bug 287179).

Browse Source
This commit is contained in:
emaijala%kolumbus.fi 2006-01-08 09:40:59 +00:00
parent 4c1018afe3
commit 87ce583d9e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/src/windows/nsKeyboardLayout.cpp
View File

@ -381,7 +381,7 @@ void KeyboardLayout::LoadLayout ()
else
{
rv = ::ToAsciiEx (virtualKey, 0, kbdState, &ascii, 0, mKeyboardLayout);
::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, rv, &deadChar, 1);
::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, rv, (WCHAR*)&deadChar, 1);
}
mVirtualKeys [vki].SetDeadChar (shiftState, deadChar);
@ -391,7 +391,7 @@ void KeyboardLayout::LoadLayout ()
shiftStatesWithBaseChars |= 1 << shiftState;
if (!nsToolkit::mIsNT)
rv = ::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, rv, uniChars, NS_ARRAY_LENGTH (uniChars));
rv = ::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, rv, (WCHAR*)uniChars, NS_ARRAY_LENGTH (uniChars));
mVirtualKeys [vki].SetNormalChars (shiftState, uniChars, rv);
}
@ -654,7 +654,7 @@ PRUint32 KeyboardLayout::GetDeadKeyCombinations (PRUint8 aDeadKey, const PBYTE a
rv = ::ToAsciiEx (virtualKey, 0, kbdState, &ascii, 0, mKeyboardLayout);
if (rv == 1)
::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, 1, compositeChars, NS_ARRAY_LENGTH (compositeChars));
::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, 1, (WCHAR*)compositeChars, NS_ARRAY_LENGTH (compositeChars));
}
switch (rv)
@ -682,7 +682,7 @@ PRUint32 KeyboardLayout::GetDeadKeyCombinations (PRUint8 aDeadKey, const PBYTE a
rv = ::ToAsciiEx (virtualKey, 0, kbdState, &ascii, 0, mKeyboardLayout);
if (rv == 1)
::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, 1, baseChars, NS_ARRAY_LENGTH (baseChars));
::MultiByteToWideChar (mCodePage, 0, (LPCSTR)&ascii, 1, (WCHAR*)baseChars, NS_ARRAY_LENGTH (baseChars));
}
if (entries < aMaxEntries)
@ -752,4 +752,4 @@ PRBool LangIDToCP (WORD aLangID, UINT* aCodePage)
return PR_FALSE;
}
}
#endif
#endif