Skip to content
Snippets Groups Projects
Commit 09003cf4 authored by Callum Prentice's avatar Callum Prentice
Browse files

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

parent 71ffed27
No related branches found
No related tags found
No related merge requests found
...@@ -2201,7 +2201,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ ...@@ -2201,7 +2201,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
if (LLWinImm::isAvailable() && window_imp->mPreeditor) if (LLWinImm::isAvailable() && window_imp->mPreeditor)
{ {
LRESULT result = 0; 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; return result;
} }
...@@ -3800,7 +3800,7 @@ LLWindowCallbacks::DragNDropResult LLWindowWin32::completeDragNDropRequest( cons ...@@ -3800,7 +3800,7 @@ LLWindowCallbacks::DragNDropResult LLWindowWin32::completeDragNDropRequest( cons
// When it handled the message, the value to be returned from // When it handled the message, the value to be returned from
// the Window Procedure is set to *result. // 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 ) if ( mPreeditor )
{ {
......
...@@ -148,7 +148,7 @@ class LLWindowWin32 : public LLWindow ...@@ -148,7 +148,7 @@ class LLWindowWin32 : public LLWindow
U32 fillReconvertString(const LLWString &text, S32 focus, S32 focus_length, RECONVERTSTRING *reconvert_string); U32 fillReconvertString(const LLWString &text, S32 focus, S32 focus_length, RECONVERTSTRING *reconvert_string);
void handleStartCompositionMessage(); void handleStartCompositionMessage();
void handleCompositionMessage(U32 indexes); void handleCompositionMessage(U32 indexes);
BOOL handleImeRequests(U32 request, U32 param, LRESULT *result); BOOL handleImeRequests(U32 request, LONG_PTR param, LRESULT *result);
protected: protected:
// //
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment