winex11.drv: Allow XIM server to be started after Wine.
Kusanagi Kouichi
slash at ma.neweb.ne.jp
Tue Apr 29 06:03:51 CDT 2008
It is needless to check XIM server is present at initialization.
That check forces XIM server to start before Wine.
---
dlls/winex11.drv/ime.c | 17 -----------------
dlls/winex11.drv/x11drv.h | 1 -
dlls/winex11.drv/xim.c | 1 -
3 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index 5d36612..ffd8e80 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -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 INT hSelectedCount = 0;
-static BOOL hXIMPresent = FALSE;
/* MSIME messages */
static UINT WM_MSIME_SERVICE;
@@ -521,11 +520,6 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass,
LPCWSTR lpszOption)
{
TRACE("\n");
- if (!hXIMPresent)
- {
- ERR("No XIM in the back end\n");
- return FALSE;
- }
lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE);
lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET;
lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE;
@@ -592,12 +586,6 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
return FALSE;
}
- if (!hXIMPresent)
- {
- ERR("No XIM in the back end\n");
- return FALSE;
- }
-
if (!hIMC)
return TRUE;
@@ -981,11 +969,6 @@ void IME_SetOpenStatus(BOOL fOpen)
ImmSetOpenStatus(RealIMC(FROM_X11), fOpen);
}
-void IME_XIMPresent(BOOL present)
-{
- hXIMPresent = present;
-}
-
LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam)
{
LPINPUTCONTEXT lpIMC;
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index f46eaaa..337af74 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -277,7 +277,6 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap);
extern void IME_RegisterClasses(HINSTANCE hImeInst);
extern void IME_UnregisterClasses(HINSTANCE hImeInst);
extern void IME_SetOpenStatus(BOOL fOpen);
-extern void IME_XIMPresent(BOOL present);
extern LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam);
extern INT IME_GetCursorPos();
extern void IME_SetCursorPos(DWORD pos);
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index c44a869..a4fbdb2 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data)
thread_data->xim = xim;
XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, NULL);
wine_tsx11_unlock();
- IME_XIMPresent(TRUE);
IME_UpdateAssociation(NULL);
}
--
1.5.5.1
More information about the wine-patches
mailing list