Rémi Bernon : win32u: Remove now unnecessary ImeToAsciiEx driver entry.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 746de318975a8d5287c424433129c180483b1dc9
URL:    https://gitlab.winehq.org/wine/wine/-/commit/746de318975a8d5287c424433129c18...

Author: Rémi Bernon 
Date:   Wed Jan 17 08:20:57 2024 +0100

win32u: Remove now unnecessary ImeToAsciiEx driver entry.

---

dlls/win32u/driver.c      | 12 ------------
 dlls/win32u/imm.c         |  2 --
 include/wine/gdi_driver.h |  1 -
 3 files changed, 15 deletions(-)

diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 2937f0d7248..fcfb7d55d54 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -729,11 +729,6 @@ static UINT nulldrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const BY
     return 0;
 }

-static UINT nulldrv_ImeToAsciiEx( UINT vkey, UINT vsc, const BYTE *state, COMPOSITIONSTRING *compstr, HIMC himc )
-{
-    return STATUS_NOT_IMPLEMENTED;
-}
-
 static void nulldrv_NotifyIMEStatus( HWND hwnd, UINT status )
 {
 }
@@ -1138,11 +1133,6 @@ static UINT loaderdrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const
     return load_driver()->pImeProcessKey( himc, wparam, lparam, state );
 }

-static UINT loaderdrv_ImeToAsciiEx( UINT vkey, UINT vsc, const BYTE *state, COMPOSITIONSTRING *compstr, HIMC himc )
-{
-    return load_driver()->pImeToAsciiEx( vkey, vsc, state, compstr, himc );
-}
-
 static void loaderdrv_NotifyIMEStatus( HWND hwnd, UINT status )
 {
     return load_driver()->pNotifyIMEStatus( hwnd, status );
@@ -1292,7 +1282,6 @@ static const struct user_driver_funcs lazy_load_driver =
     loaderdrv_KbdLayerDescriptor,
     loaderdrv_ReleaseKbdTables,
     loaderdrv_ImeProcessKey,
-    loaderdrv_ImeToAsciiEx,
     loaderdrv_NotifyIMEStatus,
     /* cursor/icon functions */
     nulldrv_DestroyCursorIcon,
@@ -1384,7 +1373,6 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version
     SET_USER_FUNC(KbdLayerDescriptor);
     SET_USER_FUNC(ReleaseKbdTables);
     SET_USER_FUNC(ImeProcessKey);
-    SET_USER_FUNC(ImeToAsciiEx);
     SET_USER_FUNC(NotifyIMEStatus);
     SET_USER_FUNC(DestroyCursorIcon);
     SET_USER_FUNC(SetCursor);
diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c
index 82124f72567..05b8b60090f 100644
--- a/dlls/win32u/imm.c
+++ b/dlls/win32u/imm.c
@@ -590,8 +590,6 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR
         return res;
     }
     case WINE_IME_TO_ASCII_EX:
-        res = user_driver->pImeToAsciiEx( wparam, lparam, params->state, params->compstr, params->himc );
-        if ((NTSTATUS)res != STATUS_NOT_IMPLEMENTED) return res;
         return ime_to_tascii_ex( wparam, lparam, params->state, params->compstr, params->himc );
     case WINE_IME_POST_UPDATE:
         post_ime_update( hwnd, wparam, (WCHAR *)lparam, (WCHAR *)params );
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 26562bfef2b..bd827c31cb1 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -299,7 +299,6 @@ struct user_driver_funcs
     void    (*pReleaseKbdTables)(const KBDTABLES *);
     /* IME functions */
     UINT    (*pImeProcessKey)(HIMC,UINT,UINT,const BYTE*);
-    UINT    (*pImeToAsciiEx)(UINT,UINT,const BYTE*,COMPOSITIONSTRING*,HIMC);
     void    (*pNotifyIMEStatus)(HWND,UINT);
     /* cursor/icon functions */
     void    (*pDestroyCursorIcon)(HCURSOR);