Skip to content

W
wine-winehq
Commit 66006129 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

winex11.drv: ImmLockIMCC() returns a void pointer; no need to cast that.

parent 922a3360
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
dlls/winex11.drv/ime.c
View file @ 66006129
...@@ -164,7 +164,7 @@ static HIMCC ImeCreateBlankCompStr(void) ...@@ -164,7 +164,7 @@ static HIMCC ImeCreateBlankCompStr(void)
HIMCC rc; HIMCC rc;
LPCOMPOSITIONSTRING ptr; LPCOMPOSITIONSTRING ptr;
rc = ImmCreateIMCC(sizeof(COMPOSITIONSTRING)); rc = ImmCreateIMCC(sizeof(COMPOSITIONSTRING));
ptr = (LPCOMPOSITIONSTRING)ImmLockIMCC(rc); ptr = ImmLockIMCC(rc);
memset(ptr,0,sizeof(COMPOSITIONSTRING)); memset(ptr,0,sizeof(COMPOSITIONSTRING));
ptr->dwSize = sizeof(COMPOSITIONSTRING); ptr->dwSize = sizeof(COMPOSITIONSTRING);
ImmUnlockIMCC(rc); ImmUnlockIMCC(rc);
...@@ -485,7 +485,7 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, ...@@ -485,7 +485,7 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam,
if (!lpIMC->hMsgBuf) if (!lpIMC->hMsgBuf)
return; return;
lpTransMsg = (LPTRANSMSG)ImmLockIMCC(lpIMC->hMsgBuf); lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf);
if (!lpTransMsg) if (!lpTransMsg)
return; return;
...@@ -520,7 +520,7 @@ static void GenerateIMECHARMessages(HIMC hIMC, LPWSTR String, DWORD length) ...@@ -520,7 +520,7 @@ static void GenerateIMECHARMessages(HIMC hIMC, LPWSTR String, DWORD length)
if (!lpIMC->hMsgBuf) if (!lpIMC->hMsgBuf)
return; return;
lpTransMsg = (LPTRANSMSG)ImmLockIMCC(lpIMC->hMsgBuf); lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf);
if (!lpTransMsg) if (!lpTransMsg)
return; return;
...@@ -649,7 +649,7 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) ...@@ -649,7 +649,7 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
if (lpIMC != NULL) if (lpIMC != NULL)
{ {
LPIMEPRIVATE myPrivate; LPIMEPRIVATE myPrivate;
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
myPrivate->bInComposition = FALSE; myPrivate->bInComposition = FALSE;
myPrivate->bInternalState = FALSE; myPrivate->bInternalState = FALSE;
myPrivate->textfont = NULL; myPrivate->textfont = NULL;
...@@ -707,7 +707,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) ...@@ -707,7 +707,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
LPIMEPRIVATE myPrivate; LPIMEPRIVATE myPrivate;
TRACE("IMC_SETCOMPOSITIONFONT\n"); TRACE("IMC_SETCOMPOSITIONFONT\n");
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
if (myPrivate->textfont) if (myPrivate->textfont)
{ {
DeleteObject(myPrivate->textfont); DeleteObject(myPrivate->textfont);
...@@ -722,7 +722,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) ...@@ -722,7 +722,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
LPIMEPRIVATE myPrivate; LPIMEPRIVATE myPrivate;
TRACE("IMC_SETOPENSTATUS\n"); TRACE("IMC_SETOPENSTATUS\n");
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
if (lpIMC->fOpen != myPrivate->bInternalState && if (lpIMC->fOpen != myPrivate->bInternalState &&
myPrivate->bInComposition) myPrivate->bInComposition)
{ {
...@@ -793,7 +793,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) ...@@ -793,7 +793,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0);
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
myPrivate->bInComposition = FALSE; myPrivate->bInComposition = FALSE;
ImmUnlockIMCC(lpIMC->hPrivate); ImmUnlockIMCC(lpIMC->hPrivate);
...@@ -814,7 +814,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) ...@@ -814,7 +814,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
ImmDestroyIMCC(lpIMC->hCompStr); ImmDestroyIMCC(lpIMC->hCompStr);
lpIMC->hCompStr = ImeCreateBlankCompStr(); lpIMC->hCompStr = ImeCreateBlankCompStr();
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
if (myPrivate->bInComposition) if (myPrivate->bInComposition)
{ {
GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0);
...@@ -902,7 +902,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, ...@@ -902,7 +902,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp,
if (lpIMC == NULL) if (lpIMC == NULL)
return FALSE; return FALSE;
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
if (dwIndex == SCS_SETSTR) if (dwIndex == SCS_SETSTR)
{ {
...@@ -963,7 +963,7 @@ void IME_SetOpenStatus(BOOL fOpen) ...@@ -963,7 +963,7 @@ void IME_SetOpenStatus(BOOL fOpen)
if (lpIMC == NULL) if (lpIMC == NULL)
return; return;
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
if (myPrivate->bInternalState && fOpen == FALSE) if (myPrivate->bInternalState && fOpen == FALSE)
{ {
...@@ -1013,7 +1013,7 @@ INT IME_GetCursorPos(void) ...@@ -1013,7 +1013,7 @@ INT IME_GetCursorPos(void)
lpIMC = LockRealIMC(FROM_X11); lpIMC = LockRealIMC(FROM_X11);
if (lpIMC) if (lpIMC)
{ {
compstr = (LPCOMPOSITIONSTRING)ImmLockIMCC(lpIMC->hCompStr); compstr = ImmLockIMCC(lpIMC->hCompStr);
rc = compstr->dwCursorPos; rc = compstr->dwCursorPos;
ImmUnlockIMCC(lpIMC->hCompStr); ImmUnlockIMCC(lpIMC->hCompStr);
} }
...@@ -1033,7 +1033,7 @@ void IME_SetCursorPos(DWORD pos) ...@@ -1033,7 +1033,7 @@ void IME_SetCursorPos(DWORD pos)
if (!lpIMC) if (!lpIMC)
return; return;
compstr = (LPCOMPOSITIONSTRING)ImmLockIMCC(lpIMC->hCompStr); compstr = ImmLockIMCC(lpIMC->hCompStr);
if (!compstr) if (!compstr)
{ {
UnlockRealIMC(FROM_X11); UnlockRealIMC(FROM_X11);
...@@ -1106,7 +1106,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd) ...@@ -1106,7 +1106,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd)
LPIMEPRIVATE myPrivate; LPIMEPRIVATE myPrivate;
CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset);
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
if (myPrivate->textfont) if (myPrivate->textfont)
oldfont = SelectObject(hdc,myPrivate->textfont); oldfont = SelectObject(hdc,myPrivate->textfont);
...@@ -1376,7 +1376,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, ...@@ -1376,7 +1376,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
lpIMC = LockRealIMC(hIMC); lpIMC = LockRealIMC(hIMC);
if (lpIMC) if (lpIMC)
{ {
myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); myPrivate = ImmLockIMCC(lpIMC->hPrivate);
myPrivate->hwndDefault = hwnd; myPrivate->hwndDefault = hwnd;
ImmUnlockIMCC(lpIMC->hPrivate); ImmUnlockIMCC(lpIMC->hPrivate);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment