ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Allow XIM server to be started after Wine.

This commit is contained in:
Kusanagi Kouichi 2008-04-29 20:03:51 +09:00 committed by Alexandre Julliard
parent efa040119b
commit bf05ded740
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/winex11.drv/ime.c
View File

@ -75,7 +75,6 @@ static const WCHAR UI_CLASS_NAME[] = {'W','i','n','e','X','1','1','I','M','E',0}
static HIMC *hSelectedFrom = NULL; static HIMC *hSelectedFrom = NULL;
static INT hSelectedCount = 0; static INT hSelectedCount = 0;
static BOOL hXIMPresent = FALSE;
/* MSIME messages */ /* MSIME messages */
static UINT WM_MSIME_SERVICE; static UINT WM_MSIME_SERVICE;
@ -521,11 +520,6 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass,
LPCWSTR lpszOption) LPCWSTR lpszOption)
{ {
TRACE("\n"); TRACE("\n");
if (!hXIMPresent)
{
ERR("No XIM in the back end\n");
return FALSE;
}
lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE); lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE);
lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET;
lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE;
@ -592,12 +586,6 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
return FALSE; return FALSE;
} }
if (!hXIMPresent)
{
ERR("No XIM in the back end\n");
return FALSE;
}
if (!hIMC) if (!hIMC)
return TRUE; return TRUE;
@ -981,11 +969,6 @@ void IME_SetOpenStatus(BOOL fOpen)
ImmSetOpenStatus(RealIMC(FROM_X11), fOpen); ImmSetOpenStatus(RealIMC(FROM_X11), fOpen);
} }
void IME_XIMPresent(BOOL present)
{
hXIMPresent = present;
}
LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam) LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam)
{ {
LPINPUTCONTEXT lpIMC; LPINPUTCONTEXT lpIMC;

1
dlls/winex11.drv/x11drv.h
View File

@ -277,7 +277,6 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap);
extern void IME_RegisterClasses(HINSTANCE hImeInst); extern void IME_RegisterClasses(HINSTANCE hImeInst);
extern void IME_UnregisterClasses(HINSTANCE hImeInst); extern void IME_UnregisterClasses(HINSTANCE hImeInst);
extern void IME_SetOpenStatus(BOOL fOpen); extern void IME_SetOpenStatus(BOOL fOpen);
extern void IME_XIMPresent(BOOL present);
extern LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam); extern LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam);
extern INT IME_GetCursorPos(); extern INT IME_GetCursorPos();
extern void IME_SetCursorPos(DWORD pos); extern void IME_SetCursorPos(DWORD pos);

1
dlls/winex11.drv/xim.c
View File

@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data)
thread_data->xim = xim; thread_data->xim = xim;
XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, NULL); XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, NULL);
wine_tsx11_unlock(); wine_tsx11_unlock();
IME_XIMPresent(TRUE);
IME_UpdateAssociation(NULL); IME_UpdateAssociation(NULL);
} }