livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for MAINT-7054 Viewer Crashed when I used Japanese IM.

master
Callum Prentice 2017-03-27 10:59:19 -07:00
parent 71ffed27c7
commit 09003cf405
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llwindow/llwindowwin32.cpp
View File

@ -2201,7 +2201,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
if (LLWinImm::isAvailable() && window_imp->mPreeditor)
{
LRESULT result = 0;
if (window_imp->handleImeRequests(w_param, l_param, &result))
if (window_imp->handleImeRequests(w_param, (LONG_PTR)l_param, &result))
{
return result;
}
@ -3800,7 +3800,7 @@ LLWindowCallbacks::DragNDropResult LLWindowWin32::completeDragNDropRequest( cons
// When it handled the message, the value to be returned from
// the Window Procedure is set to *result.
BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
BOOL LLWindowWin32::handleImeRequests(U32 request, LONG_PTR param, LRESULT *result)
{
if ( mPreeditor )
{

2
indra/llwindow/llwindowwin32.h
View File

@ -148,7 +148,7 @@ protected:
U32 fillReconvertString(const LLWString &text, S32 focus, S32 focus_length, RECONVERTSTRING *reconvert_string);
void handleStartCompositionMessage();
void handleCompositionMessage(U32 indexes);
BOOL handleImeRequests(U32 request, U32 param, LRESULT *result);
BOOL handleImeRequests(U32 request, LONG_PTR param, LRESULT *result);
protected:
//