[PATCH v2 11/11] winemac: Use the default IME implementation for stubs.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winemac.drv/ime.c            | 70 -------------------------------
 dlls/winemac.drv/winemac.drv.spec |  9 ----
 2 files changed, 79 deletions(-)

diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index 5780c942283..94953a1fd66 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -519,23 +519,6 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable)
     UnlockRealIMC(hIMC);
 }

-BOOL WINAPI ImeConfigure(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
-{
-    FIXME("(%p, %p, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-DWORD WINAPI ImeConversionList(HIMC hIMC, LPCWSTR lpSource, LPCANDIDATELIST lpCandList,
-                               DWORD dwBufLen, UINT uFlag)
-
-{
-    FIXME("(%p, %s, %p, %ld, %d): stub\n", hIMC, debugstr_w(lpSource), lpCandList,
-          dwBufLen, uFlag);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 BOOL WINAPI ImeDestroy(UINT uForce)
 {
     TRACE("\n");
@@ -545,12 +528,6 @@ BOOL WINAPI ImeDestroy(UINT uForce)
     return TRUE;
 }

-LRESULT WINAPI ImeEscape(HIMC hIMC, UINT uSubFunc, LPVOID lpData)
-{
-    TRACE("%x %p\n", uSubFunc, lpData);
-    return 0;
-}
-
 BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState)
 {
     LPINPUTCONTEXT lpIMC;
@@ -636,15 +613,6 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
     return TRUE;
 }

-BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag)
-{
-    static int once;
-
-    if (!once++)
-        FIXME("(%p, %x): stub\n", hIMC, fFlag);
-    return TRUE;
-}
-
 UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState,
                          TRANSMSGLIST *lpdwTransKey, UINT fuState, HIMC hIMC)
 {
@@ -869,36 +837,6 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
     return bRet;
 }

-BOOL WINAPI ImeRegisterWord(LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
-{
-    FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister));
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI ImeUnregisterWord(LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
-{
-    FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister));
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-UINT WINAPI ImeGetRegisterWordStyle(UINT nItem, LPSTYLEBUFW lpStyleBuf)
-{
-    FIXME("(%d, %p): stub\n", nItem, lpStyleBuf);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW lpfnEnumProc, LPCWSTR lpszReading,
-                                DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData)
-{
-    FIXME("(%p, %s, %ld, %s, %p): stub\n", lpfnEnumProc, debugstr_w(lpszReading), dwStyle,
-          debugstr_w(lpszRegister), lpData);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, DWORD cursor_pos, BOOL cursor_valid)
 {
     LPINPUTCONTEXT lpIMC;
@@ -986,14 +924,6 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DW
     return IME_SetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, 0, FALSE);
 }

-DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu,
-                                LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize)
-{
-    FIXME("(%p, %lx %lx %p %p %lx): stub\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 static void IME_NotifyComplete(void* hIMC)
 {
     NotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec
index b060d1cc2a6..d5e94b53ce4 100644
--- a/dlls/winemac.drv/winemac.drv.spec
+++ b/dlls/winemac.drv/winemac.drv.spec
@@ -2,19 +2,10 @@
 @ cdecl wine_notify_icon(long ptr)

# IME
-@ stdcall ImeConfigure(long long long ptr)
-@ stdcall ImeConversionList(long wstr ptr long long)
 @ stdcall ImeDestroy(long)
-@ stdcall ImeEnumRegisterWord(ptr wstr long wstr ptr)
-@ stdcall ImeEscape(long long ptr)
-@ stdcall ImeGetImeMenuItems(long long long ptr ptr long)
-@ stdcall ImeGetRegisterWordStyle(long ptr)
 @ stdcall ImeInquire(ptr wstr wstr)
 @ stdcall ImeProcessKey(long long long ptr)
-@ stdcall ImeRegisterWord(wstr long wstr)
 @ stdcall ImeSelect(long long)
-@ stdcall ImeSetActiveContext(long long)
 @ stdcall ImeSetCompositionString(long long ptr long ptr long)
 @ stdcall ImeToAsciiEx(long long ptr ptr long long)
-@ stdcall ImeUnregisterWord(wstr long wstr)
 @ stdcall NotifyIME(long long long long)