From 1e0243aa3dd8b9823e78bc8fe666cb5d29841963 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Tue, 12 May 2015 09:11:59 -0400
Subject: [PATCH] Fix some 64bit-unsafe windows code

---
 indra/llwindow/llwindowwin32.cpp | 14 +++++++-------
 indra/llwindow/llwindowwin32.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index f2db11f26..a6cfa3625 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -3820,11 +3820,11 @@ 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(WPARAM w_param, LPARAM l_param, LRESULT *result)
 {
 	if ( mPreeditor )
 	{
-		switch (request)
+		switch (w_param)
 		{
 			case IMR_CANDIDATEWINDOW:		// http://msdn2.microsoft.com/en-us/library/ms776080.aspx
 			{
@@ -3832,7 +3832,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 				LLRect preedit_bounds;
 				mPreeditor->getPreeditLocation(-1, &caret_coord, &preedit_bounds, NULL);
 				
-				CANDIDATEFORM *const form = (CANDIDATEFORM *)param;
+				CANDIDATEFORM *const form = (CANDIDATEFORM *)l_param;
 				DWORD const dwIndex = form->dwIndex;
 				fillCandidateForm(caret_coord, preedit_bounds, form);
 				form->dwIndex = dwIndex;
@@ -3842,7 +3842,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 			}
 			case IMR_QUERYCHARPOSITION:
 			{
-				IMECHARPOSITION *const char_position = (IMECHARPOSITION *)param;
+				IMECHARPOSITION *const char_position = (IMECHARPOSITION *)l_param;
 
 				// char_position->dwCharPos counts in number of
 				// WCHARs, i.e., UTF-16 encoding units, so we can't simply pass the
@@ -3867,7 +3867,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 			}
 			case IMR_COMPOSITIONFONT:
 			{
-				fillCompositionLogfont((LOGFONT *)param);
+				fillCompositionLogfont((LOGFONT *)l_param);
 
 				*result = 1;
 				return TRUE;
@@ -3882,7 +3882,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 				S32 context_offset;
 				const LLWString context = find_context(wtext, select, select_length, &context_offset);
 
-				RECONVERTSTRING * const reconvert_string = (RECONVERTSTRING *)param;
+				RECONVERTSTRING * const reconvert_string = (RECONVERTSTRING *)l_param;
 				const U32 size = fillReconvertString(context, select - context_offset, select_length, reconvert_string);
 				if (reconvert_string)
 				{
@@ -3932,7 +3932,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 					context.erase(preedit, preedit_length);
 				}
 				
-				RECONVERTSTRING *reconvert_string = (RECONVERTSTRING *)param;
+				RECONVERTSTRING *reconvert_string = (RECONVERTSTRING *)l_param;
 				*result = fillReconvertString(context, preedit, 0, reconvert_string);
 				return TRUE;
 			}
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 07dc67c20..9ef2b206e 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -152,7 +152,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(WPARAM request, LPARAM param, LRESULT *result);
 
 protected:
 	//