[PATCH 0/9] MR2365: imm32: More control flow reordering in preparation for ImmLoadIME implementation.

[Rémi Bernon]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 1/9] imm32: Reorder control flow in ImmGetProperty

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 6a5ee4f2217..de455c71b9d 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1856,29 +1856,29 @@ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC)
 /***********************************************************************
  *		ImmGetProperty (IMM32.@)
  */
-DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex)
+DWORD WINAPI ImmGetProperty( HKL hkl, DWORD index )
 {
-    DWORD rc = 0;
-    struct ime *kbd;
+    struct ime *ime;
+    DWORD ret;
+
+    TRACE( "hkl %p, index %lu.\n", hkl, index );
 
-    TRACE("(%p, %ld)\n", hKL, fdwIndex);
-    kbd = IMM_GetImmHkl(hKL);
+    ime = IMM_GetImmHkl( hkl );
+    if (!ime || !ime->hIME) return 0;
 
-    if (kbd && kbd->hIME)
+    switch (index)
     {
-        switch (fdwIndex)
-        {
-            case IGP_PROPERTY: rc = kbd->imeInfo.fdwProperty; break;
-            case IGP_CONVERSION: rc = kbd->imeInfo.fdwConversionCaps; break;
-            case IGP_SENTENCE: rc = kbd->imeInfo.fdwSentenceCaps; break;
-            case IGP_SETCOMPSTR: rc = kbd->imeInfo.fdwSCSCaps; break;
-            case IGP_SELECT: rc = kbd->imeInfo.fdwSelectCaps; break;
-            case IGP_GETIMEVERSION: rc = IMEVER_0400; break;
-            case IGP_UI: rc = 0; break;
-            default: rc = 0;
-        }
+    case IGP_PROPERTY: ret = ime->imeInfo.fdwProperty; break;
+    case IGP_CONVERSION: ret = ime->imeInfo.fdwConversionCaps; break;
+    case IGP_SENTENCE: ret = ime->imeInfo.fdwSentenceCaps; break;
+    case IGP_SETCOMPSTR: ret = ime->imeInfo.fdwSCSCaps; break;
+    case IGP_SELECT: ret = ime->imeInfo.fdwSelectCaps; break;
+    case IGP_GETIMEVERSION: ret = IMEVER_0400; break;
+    case IGP_UI: ret = 0; break;
+    default: ret = 0; break;
     }
-    return rc;
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 2/9] imm32: Reorder control flow in ImmGetRegisterWordStyleA.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index de455c71b9d..2c9c04fc684 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1884,29 +1884,26 @@ DWORD WINAPI ImmGetProperty( HKL hkl, DWORD index )
 /***********************************************************************
  *		ImmGetRegisterWordStyleA (IMM32.@)
  */
-UINT WINAPI ImmGetRegisterWordStyleA(
-  HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf)
+UINT WINAPI ImmGetRegisterWordStyleA( HKL hkl, UINT count, STYLEBUFA *styleA )
 {
-    struct ime *immHkl = IMM_GetImmHkl( hKL );
-    TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf);
-    if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle)
-    {
-        if (!is_kbd_ime_unicode(immHkl))
-            return immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)lpStyleBuf);
-        else
-        {
-            STYLEBUFW sbw;
-            UINT rc;
+    struct ime *ime = IMM_GetImmHkl( hkl );
+    UINT ret;
 
-            rc = immHkl->pImeGetRegisterWordStyle(nItem,&sbw);
-            WideCharToMultiByte(CP_ACP, 0, sbw.szDescription, -1,
-                lpStyleBuf->szDescription, 32, NULL, NULL);
-            lpStyleBuf->dwStyle = sbw.dwStyle;
-            return rc;
-        }
-    }
+    TRACE( "hkl %p, count %u, styleA %p.\n", hkl, count, styleA );
+
+    if (!ime->hIME || !ime->pImeGetRegisterWordStyle) return 0;
+
+    if (!is_kbd_ime_unicode( ime ))
+        ret = ime->pImeGetRegisterWordStyle( count, (STYLEBUFW *)styleA );
     else
-        return 0;
+    {
+        STYLEBUFW styleW;
+        ret = ime->pImeGetRegisterWordStyle( count, &styleW );
+        WideCharToMultiByte( CP_ACP, 0, styleW.szDescription, -1, styleA->szDescription, 32, NULL, NULL );
+        styleA->dwStyle = styleW.dwStyle;
+    }
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 3/9] imm32: Reorder control flow in ImmGetRegisterWordStyleW.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 2c9c04fc684..ea5dd127a9e 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1909,29 +1909,26 @@ UINT WINAPI ImmGetRegisterWordStyleA( HKL hkl, UINT count, STYLEBUFA *styleA )
 /***********************************************************************
  *		ImmGetRegisterWordStyleW (IMM32.@)
  */
-UINT WINAPI ImmGetRegisterWordStyleW(
-  HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf)
+UINT WINAPI ImmGetRegisterWordStyleW( HKL hkl, UINT count, STYLEBUFW *styleW )
 {
-    struct ime *immHkl = IMM_GetImmHkl( hKL );
-    TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf);
-    if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle)
-    {
-        if (is_kbd_ime_unicode(immHkl))
-            return immHkl->pImeGetRegisterWordStyle(nItem,lpStyleBuf);
-        else
-        {
-            STYLEBUFA sba;
-            UINT rc;
+    struct ime *ime = IMM_GetImmHkl( hkl );
+    UINT ret;
 
-            rc = immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)&sba);
-            MultiByteToWideChar(CP_ACP, 0, sba.szDescription, -1,
-                lpStyleBuf->szDescription, 32);
-            lpStyleBuf->dwStyle = sba.dwStyle;
-            return rc;
-        }
-    }
+    TRACE( "hkl %p, count %u, styleW %p.\n", hkl, count, styleW );
+
+    if (!ime->hIME || !ime->pImeGetRegisterWordStyle) return 0;
+
+    if (is_kbd_ime_unicode( ime ))
+        ret = ime->pImeGetRegisterWordStyle( count, styleW );
     else
-        return 0;
+    {
+        STYLEBUFA styleA;
+        ret = ime->pImeGetRegisterWordStyle( count, (STYLEBUFW *)&styleA );
+        MultiByteToWideChar( CP_ACP, 0, styleA.szDescription, -1, styleW->szDescription, 32 );
+        styleW->dwStyle = styleA.dwStyle;
+    }
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 4/9] imm32: Reorder control flow in ImmRegisterWordA.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index ea5dd127a9e..c05a4845f5d 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2138,31 +2138,26 @@ BOOL WINAPI ImmNotifyIME(
 /***********************************************************************
  *		ImmRegisterWordA (IMM32.@)
  */
-BOOL WINAPI ImmRegisterWordA(
-  HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister)
+BOOL WINAPI ImmRegisterWordA( HKL hkl, const char *readingA, DWORD style, const char *stringA )
 {
-    struct ime *immHkl = IMM_GetImmHkl( hKL );
-    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_a(lpszReading), dwStyle,
-                    debugstr_a(lpszRegister));
-    if (immHkl->hIME && immHkl->pImeRegisterWord)
-    {
-        if (!is_kbd_ime_unicode(immHkl))
-            return immHkl->pImeRegisterWord((LPCWSTR)lpszReading,dwStyle,
-                                            (LPCWSTR)lpszRegister);
-        else
-        {
-            LPWSTR lpszwReading = strdupAtoW(lpszReading);
-            LPWSTR lpszwRegister = strdupAtoW(lpszRegister);
-            BOOL rc;
+    struct ime *ime = IMM_GetImmHkl( hkl );
+    BOOL ret;
 
-            rc = immHkl->pImeRegisterWord(lpszwReading,dwStyle,lpszwRegister);
-            HeapFree(GetProcessHeap(),0,lpszwReading);
-            HeapFree(GetProcessHeap(),0,lpszwRegister);
-            return rc;
-        }
-    }
+    TRACE( "hkl %p, readingA %s, style %lu, stringA %s.\n", hkl, debugstr_a(readingA), style, debugstr_a(stringA) );
+
+    if (!ime->hIME || !ime->pImeRegisterWord) return FALSE;
+
+    if (!is_kbd_ime_unicode( ime ))
+        ret = ime->pImeRegisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA );
     else
-        return FALSE;
+    {
+        WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA );
+        ret = ime->pImeRegisterWord( readingW, style, stringW );
+        HeapFree( GetProcessHeap(), 0, readingW );
+        HeapFree( GetProcessHeap(), 0, stringW );
+    }
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 5/9] imm32: Reorder control flow in ImmRegisterWordW.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index c05a4845f5d..a881ef76224 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2163,31 +2163,26 @@ BOOL WINAPI ImmRegisterWordA( HKL hkl, const char *readingA, DWORD style, const
 /***********************************************************************
  *		ImmRegisterWordW (IMM32.@)
  */
-BOOL WINAPI ImmRegisterWordW(
-  HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
+BOOL WINAPI ImmRegisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, const WCHAR *stringW )
 {
-    struct ime *immHkl = IMM_GetImmHkl( hKL );
-    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_w(lpszReading), dwStyle,
-                    debugstr_w(lpszRegister));
-    if (immHkl->hIME && immHkl->pImeRegisterWord)
-    {
-        if (is_kbd_ime_unicode(immHkl))
-            return immHkl->pImeRegisterWord(lpszReading,dwStyle,lpszRegister);
-        else
-        {
-            LPSTR lpszaReading = strdupWtoA(lpszReading);
-            LPSTR lpszaRegister = strdupWtoA(lpszRegister);
-            BOOL rc;
+    struct ime *ime = IMM_GetImmHkl( hkl );
+    BOOL ret;
 
-            rc = immHkl->pImeRegisterWord((LPCWSTR)lpszaReading,dwStyle,
-                                          (LPCWSTR)lpszaRegister);
-            HeapFree(GetProcessHeap(),0,lpszaReading);
-            HeapFree(GetProcessHeap(),0,lpszaRegister);
-            return rc;
-        }
-    }
+    TRACE( "hkl %p, readingW %s, style %lu, stringW %s.\n", hkl, debugstr_w(readingW), style, debugstr_w(stringW) );
+
+    if (!ime->hIME || !ime->pImeRegisterWord) return FALSE;
+
+    if (is_kbd_ime_unicode( ime ))
+        ret = ime->pImeRegisterWord( readingW, style, stringW );
     else
-        return FALSE;
+    {
+        char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW );
+        ret = ime->pImeRegisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA );
+        HeapFree( GetProcessHeap(), 0, readingA );
+        HeapFree( GetProcessHeap(), 0, stringA );
+    }
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 6/9] imm32: Reorder control flow in ImmUnregisterWordA.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index a881ef76224..f0dfd755229 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2618,31 +2618,26 @@ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID)
 /***********************************************************************
  *		ImmUnregisterWordA (IMM32.@)
  */
-BOOL WINAPI ImmUnregisterWordA(
-  HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister)
+BOOL WINAPI ImmUnregisterWordA( HKL hkl, const char *readingA, DWORD style, const char *stringA )
 {
-    struct ime *immHkl = IMM_GetImmHkl( hKL );
-    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_a(lpszReading), dwStyle,
-            debugstr_a(lpszUnregister));
-    if (immHkl->hIME && immHkl->pImeUnregisterWord)
-    {
-        if (!is_kbd_ime_unicode(immHkl))
-            return immHkl->pImeUnregisterWord((LPCWSTR)lpszReading,dwStyle,
-                                              (LPCWSTR)lpszUnregister);
-        else
-        {
-            LPWSTR lpszwReading = strdupAtoW(lpszReading);
-            LPWSTR lpszwUnregister = strdupAtoW(lpszUnregister);
-            BOOL rc;
+    struct ime *ime = IMM_GetImmHkl( hkl );
+    BOOL ret;
 
-            rc = immHkl->pImeUnregisterWord(lpszwReading,dwStyle,lpszwUnregister);
-            HeapFree(GetProcessHeap(),0,lpszwReading);
-            HeapFree(GetProcessHeap(),0,lpszwUnregister);
-            return rc;
-        }
-    }
+    TRACE( "hkl %p, readingA %s, style %lu, stringA %s.\n", hkl, debugstr_a(readingA), style, debugstr_a(stringA) );
+
+    if (!ime->hIME || !ime->pImeUnregisterWord) return FALSE;
+
+    if (!is_kbd_ime_unicode( ime ))
+        ret = ime->pImeUnregisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA );
     else
-        return FALSE;
+    {
+        WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA );
+        ret = ime->pImeUnregisterWord( readingW, style, stringW );
+        HeapFree( GetProcessHeap(), 0, readingW );
+        HeapFree( GetProcessHeap(), 0, stringW );
+    }
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 7/9] imm32: Reorder control flow in ImmUnregisterWordW.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index f0dfd755229..2fb0e06ac77 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2643,31 +2643,26 @@ BOOL WINAPI ImmUnregisterWordA( HKL hkl, const char *readingA, DWORD style, cons
 /***********************************************************************
  *		ImmUnregisterWordW (IMM32.@)
  */
-BOOL WINAPI ImmUnregisterWordW(
-  HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
+BOOL WINAPI ImmUnregisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, const WCHAR *stringW )
 {
-    struct ime *immHkl = IMM_GetImmHkl( hKL );
-    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_w(lpszReading), dwStyle,
-            debugstr_w(lpszUnregister));
-    if (immHkl->hIME && immHkl->pImeUnregisterWord)
+    struct ime *ime = IMM_GetImmHkl( hkl );
+    BOOL ret;
+
+    TRACE( "hkl %p, readingW %s, style %lu, stringW %s.\n", hkl, debugstr_w(readingW), style, debugstr_w(stringW) );
+
+    if (!ime->hIME || !ime->pImeUnregisterWord) return FALSE;
+
+    if (is_kbd_ime_unicode( ime ))
+        ret = ime->pImeUnregisterWord( readingW, style, stringW );
+    else
     {
-        if (is_kbd_ime_unicode(immHkl))
-            return immHkl->pImeUnregisterWord(lpszReading,dwStyle,lpszUnregister);
-        else
-        {
-            LPSTR lpszaReading = strdupWtoA(lpszReading);
-            LPSTR lpszaUnregister = strdupWtoA(lpszUnregister);
-            BOOL rc;
-
-            rc = immHkl->pImeUnregisterWord((LPCWSTR)lpszaReading,dwStyle,
-                                            (LPCWSTR)lpszaUnregister);
-            HeapFree(GetProcessHeap(),0,lpszaReading);
-            HeapFree(GetProcessHeap(),0,lpszaUnregister);
-            return rc;
-        }
+        char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW );
+        ret = ime->pImeUnregisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA );
+        HeapFree( GetProcessHeap(), 0, readingA );
+        HeapFree( GetProcessHeap(), 0, stringA );
     }
-    else
-        return FALSE;
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 8/9] imm32: Reorder control flow in ImmGetImeMenuItemsA.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 90 +++++++++++++++++++++---------------------------
 1 file changed, 40 insertions(+), 50 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 2fb0e06ac77..c7fdb096fe2 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2668,72 +2668,62 @@ BOOL WINAPI ImmUnregisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, con
 /***********************************************************************
  *		ImmGetImeMenuItemsA (IMM32.@)
  */
-DWORD WINAPI ImmGetImeMenuItemsA( HIMC hIMC, DWORD dwFlags, DWORD dwType,
-   LPIMEMENUITEMINFOA lpImeParentMenu, LPIMEMENUITEMINFOA lpImeMenu,
-    DWORD dwSize)
+DWORD WINAPI ImmGetImeMenuItemsA( HIMC himc, DWORD flags, DWORD type, IMEMENUITEMINFOA *parentA,
+                                  IMEMENUITEMINFOA *menuA, DWORD size )
 {
-    InputContextData *data = get_imc_data(hIMC);
-    TRACE("(%p, %li, %li, %p, %p, %li):\n", hIMC, dwFlags, dwType,
-        lpImeParentMenu, lpImeMenu, dwSize);
+    InputContextData *data = get_imc_data( himc );
+    DWORD ret;
+
+    TRACE( "himc %p, flags %#lx, type %lu, parentA %p, menuA %p, size %lu.\n",
+           himc, flags, type, parentA, menuA, size );
 
     if (!data)
     {
-        SetLastError(ERROR_INVALID_HANDLE);
+        SetLastError( ERROR_INVALID_HANDLE );
         return 0;
     }
 
-    if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems)
+    if (!data->immKbd->hIME || !data->immKbd->pImeGetImeMenuItems) return 0;
+
+    if (!is_himc_ime_unicode( data ) || (!parentA && !menuA))
+        ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, (IMEMENUITEMINFOW *)parentA,
+                                                 (IMEMENUITEMINFOW *)menuA, size );
+    else
     {
-        if (!is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu))
-            return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType,
-                                (IMEMENUITEMINFOW*)lpImeParentMenu,
-                                (IMEMENUITEMINFOW*)lpImeMenu, dwSize);
+        IMEMENUITEMINFOW tmpW, *menuW, *parentW = parentA ? &tmpW : NULL;
+
+        if (!menuA) menuW = NULL;
         else
         {
-            IMEMENUITEMINFOW lpImeParentMenuW;
-            IMEMENUITEMINFOW *lpImeMenuW, *parent = NULL;
-            DWORD rc;
-
-            if (lpImeParentMenu)
-                parent = &lpImeParentMenuW;
-            if (lpImeMenu)
-            {
-                int count = dwSize / sizeof(LPIMEMENUITEMINFOA);
-                dwSize = count * sizeof(IMEMENUITEMINFOW);
-                lpImeMenuW = HeapAlloc(GetProcessHeap(), 0, dwSize);
-            }
-            else
-                lpImeMenuW = NULL;
+            int count = size / sizeof(LPIMEMENUITEMINFOA);
+            size = count * sizeof(IMEMENUITEMINFOW);
+            menuW = HeapAlloc( GetProcessHeap(), 0, size );
+        }
 
-            rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType,
-                                parent, lpImeMenuW, dwSize);
+        ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, parentW, menuW, size );
 
-            if (lpImeParentMenu)
-            {
-                memcpy(lpImeParentMenu,&lpImeParentMenuW,sizeof(IMEMENUITEMINFOA));
-                lpImeParentMenu->hbmpItem = lpImeParentMenuW.hbmpItem;
-                WideCharToMultiByte(CP_ACP, 0, lpImeParentMenuW.szString,
-                    -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE,
-                    NULL, NULL);
-            }
-            if (lpImeMenu && rc)
+        if (parentA)
+        {
+            memcpy( parentA, parentW, sizeof(IMEMENUITEMINFOA) );
+            parentA->hbmpItem = parentW->hbmpItem;
+            WideCharToMultiByte( CP_ACP, 0, parentW->szString, -1, parentA->szString,
+                                 IMEMENUITEM_STRING_SIZE, NULL, NULL );
+        }
+        if (menuA && ret)
+        {
+            unsigned int i;
+            for (i = 0; i < ret; i++)
             {
-                unsigned int i;
-                for (i = 0; i < rc; i++)
-                {
-                    memcpy(&lpImeMenu[i],&lpImeMenuW[1],sizeof(IMEMENUITEMINFOA));
-                    lpImeMenu[i].hbmpItem = lpImeMenuW[i].hbmpItem;
-                    WideCharToMultiByte(CP_ACP, 0, lpImeMenuW[i].szString,
-                        -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE,
-                        NULL, NULL);
-                }
+                memcpy( &menuA[i], &menuW[1], sizeof(IMEMENUITEMINFOA) );
+                menuA[i].hbmpItem = menuW[i].hbmpItem;
+                WideCharToMultiByte( CP_ACP, 0, menuW[i].szString, -1, menuA[i].szString,
+                                     IMEMENUITEM_STRING_SIZE, NULL, NULL );
             }
-            HeapFree(GetProcessHeap(),0,lpImeMenuW);
-            return rc;
         }
+        HeapFree( GetProcessHeap(), 0, menuW );
     }
-    else
-        return 0;
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2365

[PATCH 9/9] imm32: Reorder control flow in ImmGetImeMenuItemsW.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/imm.c | 86 +++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 48 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index c7fdb096fe2..634c4ff472c 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2729,70 +2729,60 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC himc, DWORD flags, DWORD type, IMEMENUITE
 /***********************************************************************
 *		ImmGetImeMenuItemsW (IMM32.@)
 */
-DWORD WINAPI ImmGetImeMenuItemsW( HIMC hIMC, DWORD dwFlags, DWORD dwType,
-   LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu,
-   DWORD dwSize)
+DWORD WINAPI ImmGetImeMenuItemsW( HIMC himc, DWORD flags, DWORD type, IMEMENUITEMINFOW *parentW,
+                                  IMEMENUITEMINFOW *menuW, DWORD size )
 {
-    InputContextData *data = get_imc_data(hIMC);
-    TRACE("(%p, %li, %li, %p, %p, %li):\n", hIMC, dwFlags, dwType,
-        lpImeParentMenu, lpImeMenu, dwSize);
+    InputContextData *data = get_imc_data( himc );
+    DWORD ret;
+
+    TRACE( "himc %p, flags %#lx, type %lu, parentW %p, menuW %p, size %lu.\n",
+           himc, flags, type, parentW, menuW, size );
 
     if (!data)
     {
-        SetLastError(ERROR_INVALID_HANDLE);
+        SetLastError( ERROR_INVALID_HANDLE );
         return 0;
     }
 
-    if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems)
+    if (!data->immKbd->hIME || !data->immKbd->pImeGetImeMenuItems) return 0;
+
+    if (is_himc_ime_unicode( data ) || (!parentW && !menuW))
+        ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, parentW, menuW, size );
+    else
     {
-        if (is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu))
-            return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType,
-                                lpImeParentMenu, lpImeMenu, dwSize);
+        IMEMENUITEMINFOA tmpA, *menuA, *parentA = parentW ? &tmpA : NULL;
+
+        if (!menuW) menuA = NULL;
         else
         {
-            IMEMENUITEMINFOA lpImeParentMenuA;
-            IMEMENUITEMINFOA *lpImeMenuA, *parent = NULL;
-            DWORD rc;
-
-            if (lpImeParentMenu)
-                parent = &lpImeParentMenuA;
-            if (lpImeMenu)
-            {
-                int count = dwSize / sizeof(LPIMEMENUITEMINFOW);
-                dwSize = count * sizeof(IMEMENUITEMINFOA);
-                lpImeMenuA = HeapAlloc(GetProcessHeap(), 0, dwSize);
-            }
-            else
-                lpImeMenuA = NULL;
+            int count = size / sizeof(LPIMEMENUITEMINFOW);
+            size = count * sizeof(IMEMENUITEMINFOA);
+            menuA = HeapAlloc( GetProcessHeap(), 0, size );
+        }
 
-            rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType,
-                                (IMEMENUITEMINFOW*)parent,
-                                (IMEMENUITEMINFOW*)lpImeMenuA, dwSize);
+        ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, (IMEMENUITEMINFOW *)parentA,
+                                                 (IMEMENUITEMINFOW *)menuA, size );
 
-            if (lpImeParentMenu)
-            {
-                memcpy(lpImeParentMenu,&lpImeParentMenuA,sizeof(IMEMENUITEMINFOA));
-                lpImeParentMenu->hbmpItem = lpImeParentMenuA.hbmpItem;
-                MultiByteToWideChar(CP_ACP, 0, lpImeParentMenuA.szString,
-                    -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE);
-            }
-            if (lpImeMenu && rc)
+        if (parentW)
+        {
+            memcpy( parentW, parentA, sizeof(IMEMENUITEMINFOA) );
+            parentW->hbmpItem = parentA->hbmpItem;
+            MultiByteToWideChar( CP_ACP, 0, parentA->szString, -1, parentW->szString, IMEMENUITEM_STRING_SIZE );
+        }
+        if (menuW && ret)
+        {
+            unsigned int i;
+            for (i = 0; i < ret; i++)
             {
-                unsigned int i;
-                for (i = 0; i < rc; i++)
-                {
-                    memcpy(&lpImeMenu[i],&lpImeMenuA[1],sizeof(IMEMENUITEMINFOA));
-                    lpImeMenu[i].hbmpItem = lpImeMenuA[i].hbmpItem;
-                    MultiByteToWideChar(CP_ACP, 0, lpImeMenuA[i].szString,
-                        -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE);
-                }
+                memcpy( &menuW[i], &menuA[1], sizeof(IMEMENUITEMINFOA) );
+                menuW[i].hbmpItem = menuA[i].hbmpItem;
+                MultiByteToWideChar( CP_ACP, 0, menuA[i].szString, -1, menuW[i].szString, IMEMENUITEM_STRING_SIZE );
             }
-            HeapFree(GetProcessHeap(),0,lpImeMenuA);
-            return rc;
         }
+        HeapFree( GetProcessHeap(), 0, menuA );
     }
-    else
-        return 0;
+
+    return ret;
 }
 
 /***********************************************************************
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2365