[PATCH 0/5] MR2407: imm32: Fix ImmGetIMEFileName(A|W) and ImmGetDescription(A|W).

[Rémi Bernon]

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

[PATCH 1/5] imm32: Rename szImeRegFmt to layouts_formatW.

[Rémi Bernon]

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

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

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 14b357d9533..94bc0dea024 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -123,7 +123,7 @@ static CRITICAL_SECTION_DEBUG ime_cs_debug =
 static CRITICAL_SECTION ime_cs = { &ime_cs_debug, -1, 0, 0, 0, 0 };
 static struct list ime_list = LIST_INIT( ime_list );
 
-static const WCHAR szImeRegFmt[] = L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08lx";
+static const WCHAR layouts_formatW[] = L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08lx";
 
 static BOOL ime_is_unicode( const struct ime *ime )
 {
@@ -1842,9 +1842,9 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen)
     HKEY hkey;
     DWORD length;
     DWORD rc;
-    WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8];
+    WCHAR regKey[ARRAY_SIZE(layouts_formatW)+8];
 
-    wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL );
+    wsprintfW( regKey, layouts_formatW, (ULONG_PTR)hKL );
     rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey);
     if (rc != ERROR_SUCCESS)
     {
@@ -2056,7 +2056,7 @@ HKL WINAPI ImmInstallIMEW(
     HKL hkl;
     DWORD rc;
     HKEY hkey;
-    WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8];
+    WCHAR regKey[ARRAY_SIZE(layouts_formatW)+8];
 
     TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName),
                           debugstr_w(lpszLayoutText));
@@ -2069,7 +2069,7 @@ HKL WINAPI ImmInstallIMEW(
         DWORD disposition = 0;
 
         hkl = (HKL)MAKELPARAM( lcid, 0xe000 | count );
-        wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hkl);
+        wsprintfW( regKey, layouts_formatW, (ULONG_PTR)hkl);
 
         rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regKey, 0, NULL, 0, KEY_WRITE, NULL, &hkey, &disposition);
         if (rc == ERROR_SUCCESS && disposition == REG_CREATED_NEW_KEY)
-- 
GitLab


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

[PATCH 2/5] imm32: Transform "Ime File" value in ImmInstallIMEW.

[Rémi Bernon]

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

---
 dlls/imm32/imm.c         | 61 +++++++++++++++++++---------------------
 dlls/imm32/tests/imm32.c |  3 --
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 94bc0dea024..a915bb25132 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2048,34 +2048,30 @@ HKL WINAPI ImmInstallIMEA(
 /***********************************************************************
  *		ImmInstallIMEW (IMM32.@)
  */
-HKL WINAPI ImmInstallIMEW(
-  LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText)
+HKL WINAPI ImmInstallIMEW( const WCHAR *filename, const WCHAR *description )
 {
-    INT lcid = GetUserDefaultLCID();
-    INT count;
-    HKL hkl;
-    DWORD rc;
+    WCHAR path[ARRAY_SIZE(layouts_formatW)+8], buffer[MAX_PATH];
+    LCID lcid = GetUserDefaultLCID();
+    WORD count = 0x20;
+    const WCHAR *tmp;
+    DWORD length;
     HKEY hkey;
-    WCHAR regKey[ARRAY_SIZE(layouts_formatW)+8];
-
-    TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName),
-                          debugstr_w(lpszLayoutText));
+    HKL hkl;
 
-    /* Start with 2.  e001 will be blank and so default to the wine internal IME */
-    count = 2;
+    TRACE( "filename %s, description %s\n", debugstr_w(filename), debugstr_w(description) );
 
     while (count < 0xfff)
     {
         DWORD disposition = 0;
 
         hkl = (HKL)MAKELPARAM( lcid, 0xe000 | count );
-        wsprintfW( regKey, layouts_formatW, (ULONG_PTR)hkl);
-
-        rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regKey, 0, NULL, 0, KEY_WRITE, NULL, &hkey, &disposition);
-        if (rc == ERROR_SUCCESS && disposition == REG_CREATED_NEW_KEY)
-            break;
-        else if (rc == ERROR_SUCCESS)
-            RegCloseKey(hkey);
+        swprintf( path, ARRAY_SIZE(path), layouts_formatW, (ULONG_PTR)hkl);
+        if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, path, 0, NULL, 0,
+                              KEY_WRITE, NULL, &hkey, &disposition ))
+        {
+            if (disposition == REG_CREATED_NEW_KEY) break;
+            RegCloseKey( hkey );
+        }
 
         count++;
     }
@@ -2086,21 +2082,22 @@ HKL WINAPI ImmInstallIMEW(
         return 0;
     }
 
-    if (rc == ERROR_SUCCESS)
-    {
-        rc = RegSetValueExW(hkey, L"Ime File", 0, REG_SZ, (const BYTE*)lpszIMEFileName,
-                            (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR));
-        if (rc == ERROR_SUCCESS)
-            rc = RegSetValueExW(hkey, L"Layout Text", 0, REG_SZ, (const BYTE*)lpszLayoutText,
-                                (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR));
-        RegCloseKey(hkey);
-        return hkl;
-    }
-    else
+    if ((tmp = wcsrchr( filename, '\\' ))) tmp++;
+    else tmp = filename;
+
+    length = LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_UPPERCASE, tmp, -1, buffer, ARRAY_SIZE(buffer) );
+
+    if (RegSetValueExW( hkey, L"Ime File", 0, REG_SZ, (const BYTE *)buffer, length * sizeof(WCHAR) ) ||
+        RegSetValueExW( hkey, L"Layout Text", 0, REG_SZ, (const BYTE *)description,
+                        (wcslen(description) + 1) * sizeof(WCHAR) ))
     {
-        WARN("Unable to set IME registry values\n");
-        return 0;
+        WARN( "Unable to write registry to install IME\n");
+        hkl = 0;
     }
+    RegCloseKey( hkey );
+
+    if (!hkl) RegDeleteKeyW( HKEY_LOCAL_MACHINE, path );
+    return hkl;
 }
 
 /***********************************************************************
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index f3dfef389f5..83c3ff25719 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -2693,7 +2693,6 @@ static HKL ime_install(void)
     memset( buffer, 0xcd, sizeof(buffer) );
     ret = RegQueryValueExW( hkey, L"Ime File", NULL, NULL, (BYTE *)buffer, &len );
     ok( !ret, "RegQueryValueExW returned %#lx, error %lu\n", ret, GetLastError() );
-    todo_wine
     ok( !wcsicmp( buffer, wcsrchr( ime_path, '\\' ) + 1 ), "got Ime File %s\n", debugstr_w(buffer) );
 
     len = sizeof(buffer);
@@ -2996,13 +2995,11 @@ static void test_ImmGetIMEFileName(void)
     ret = ImmGetIMEFileNameW( hkl, bufferW, 13 );
     todo_wine
     ok( ret == 12, "ImmGetIMEFileNameW returned %lu\n", ret );
-    todo_wine
     ok( !wcscmp( bufferW, expectW ), "got bufferW %s\n", debugstr_w(bufferW) );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetIMEFileNameA( hkl, bufferA, 13 );
     todo_wine
     ok( ret == 12, "ImmGetIMEFileNameA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, expectA ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     ime_cleanup( hkl );
-- 
GitLab


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

[PATCH 3/5] imm32: Rewrite ImmGetIMEFileName(A|W).

[Rémi Bernon]

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

---
 dlls/imm32/imm.c         | 87 +++++++++++++---------------------------
 dlls/imm32/tests/imm32.c | 13 ------
 2 files changed, 27 insertions(+), 73 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index a915bb25132..6acdd8a7344 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1802,82 +1802,49 @@ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBu
 }
 
 /***********************************************************************
- *		ImmGetIMEFileNameA (IMM32.@)
+ *      ImmGetIMEFileNameA (IMM32.@)
  */
-UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen)
+UINT WINAPI ImmGetIMEFileNameA( HKL hkl, char *bufferA, UINT lengthA )
 {
-    LPWSTR bufW = NULL;
-    UINT wBufLen = uBufLen;
-    UINT rc;
+    WCHAR *bufferW;
+    DWORD lengthW;
 
-    if (uBufLen && lpszFileName)
-        bufW = HeapAlloc(GetProcessHeap(),0,uBufLen * sizeof(WCHAR));
-    else /* We need this to get the number of byte required */
-    {
-        bufW = HeapAlloc(GetProcessHeap(),0,MAX_PATH * sizeof(WCHAR));
-        wBufLen = MAX_PATH;
-    }
-
-    rc = ImmGetIMEFileNameW(hKL,bufW,wBufLen);
+    TRACE( "hkl %p, bufferA %p, lengthA %d\n", hkl, bufferA, lengthA );
 
-    if (rc > 0)
-    {
-        if (uBufLen && lpszFileName)
-            rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, lpszFileName,
-                                 uBufLen, NULL, NULL);
-        else /* get the length */
-            rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, NULL, 0, NULL,
-                                     NULL);
-    }
+    if (!(lengthW = ImmGetIMEFileNameW( hkl, NULL, 0 ))) return 0;
+    if (!(bufferW = malloc( (lengthW + 1) * sizeof(WCHAR) ))) return 0;
+    lengthW = ImmGetIMEFileNameW( hkl, bufferW, lengthW + 1 );
+    lengthA = WideCharToMultiByte( CP_ACP, 0, bufferW, lengthW, bufferA,
+                                   bufferA ? lengthA : 0, NULL, NULL );
+    if (bufferA) bufferA[lengthA] = 0;
+    free( bufferW );
 
-    HeapFree(GetProcessHeap(),0,bufW);
-    return rc;
+    return lengthA;
 }
 
 /***********************************************************************
  *		ImmGetIMEFileNameW (IMM32.@)
  */
-UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen)
+UINT WINAPI ImmGetIMEFileNameW( HKL hkl, WCHAR *buffer, UINT length )
 {
-    HKEY hkey;
-    DWORD length;
-    DWORD rc;
-    WCHAR regKey[ARRAY_SIZE(layouts_formatW)+8];
-
-    wsprintfW( regKey, layouts_formatW, (ULONG_PTR)hKL );
-    rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey);
-    if (rc != ERROR_SUCCESS)
-    {
-        SetLastError(rc);
-        return 0;
-    }
+    WCHAR path[MAX_PATH];
+    HKEY hkey = 0;
+    DWORD size;
 
-    length = 0;
-    rc = RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, NULL, &length);
+    TRACE( "hkl %p, buffer %p, length %u\n", hkl, buffer, length );
 
-    if (rc != ERROR_SUCCESS)
-    {
-        RegCloseKey(hkey);
-        SetLastError(rc);
-        return 0;
-    }
-    if (length > uBufLen * sizeof(WCHAR) || !lpszFileName)
-    {
-        RegCloseKey(hkey);
-        if (lpszFileName)
-        {
-            SetLastError(ERROR_INSUFFICIENT_BUFFER);
-            return 0;
-        }
-        else
-            return length / sizeof(WCHAR);
-    }
+    swprintf( path, ARRAY_SIZE(path), layouts_formatW, (ULONG)(ULONG_PTR)hkl );
+    if (RegOpenKeyW( HKEY_LOCAL_MACHINE, path, &hkey )) return 0;
 
-    RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, lpszFileName, &length);
+    size = ARRAY_SIZE(path) * sizeof(WCHAR);
+    if (RegGetValueW( hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, path, &size )) *path = 0;
+    RegCloseKey( hkey );
 
-    RegCloseKey(hkey);
+    size = wcslen( path );
+    if (!buffer) return size;
 
-    return length / sizeof(WCHAR);
+    lstrcpynW( buffer, path, length );
+    return wcslen( buffer );
 }
 
 /***********************************************************************
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 83c3ff25719..f75b777d65b 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -2945,60 +2945,47 @@ static void test_ImmGetIMEFileName(void)
     ret = ImmGetIMEFileNameA( hkl, bufferA, 100 );
     ok( !ret, "ImmGetIMEFileNameA returned %lu\n", ret );
     ret = GetLastError();
-    todo_wine
     ok( ret == 0xdeadbeef, "got error %lu\n", ret );
 
     if (!(hkl = ime_install())) goto cleanup;
 
     memset( bufferW, 0xcd, sizeof(bufferW) );
     ret = ImmGetIMEFileNameW( hkl, bufferW, 2 );
-    todo_wine
     ok( ret == 1, "ImmGetIMEFileNameW returned %lu\n", ret );
-    todo_wine
     ok( !wcscmp( bufferW, L"W" ), "got bufferW %s\n", debugstr_w(bufferW) );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetIMEFileNameA( hkl, bufferA, 2 );
     ok( ret == 0, "ImmGetIMEFileNameA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     swprintf( expectW, ARRAY_SIZE(expectW), L"WINE%04X.I", ime_count - 1 );
     memset( bufferW, 0xcd, sizeof(bufferW) );
     ret = ImmGetIMEFileNameW( hkl, bufferW, 11 );
-    todo_wine
     ok( ret == 10, "ImmGetIMEFileNameW returned %lu\n", ret );
-    todo_wine
     ok( !wcscmp( bufferW, expectW ), "got bufferW %s\n", debugstr_w(bufferW) );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetIMEFileNameA( hkl, bufferA, 11 );
     ok( ret == 0, "ImmGetIMEFileNameA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     swprintf( expectW, ARRAY_SIZE(expectW), L"WINE%04X.IM", ime_count - 1 );
     memset( bufferW, 0xcd, sizeof(bufferW) );
     ret = ImmGetIMEFileNameW( hkl, bufferW, 12 );
-    todo_wine
     ok( ret == 11, "ImmGetIMEFileNameW returned %lu\n", ret );
-    todo_wine
     ok( !wcscmp( bufferW, expectW ), "got bufferW %s\n", debugstr_w(bufferW) );
     snprintf( expectA, ARRAY_SIZE(expectA), "WINE%04X.IME", ime_count - 1 );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetIMEFileNameA( hkl, bufferA, 12 );
-    todo_wine
     ok( ret == 12, "ImmGetIMEFileNameA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, expectA ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     swprintf( expectW, ARRAY_SIZE(expectW), L"WINE%04X.IME", ime_count - 1 );
     memset( bufferW, 0xcd, sizeof(bufferW) );
     ret = ImmGetIMEFileNameW( hkl, bufferW, 13 );
-    todo_wine
     ok( ret == 12, "ImmGetIMEFileNameW returned %lu\n", ret );
     ok( !wcscmp( bufferW, expectW ), "got bufferW %s\n", debugstr_w(bufferW) );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetIMEFileNameA( hkl, bufferA, 13 );
-    todo_wine
     ok( ret == 12, "ImmGetIMEFileNameA returned %lu\n", ret );
     ok( !strcmp( bufferA, expectA ), "got bufferA %s\n", debugstr_a(bufferA) );
 
-- 
GitLab


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

[PATCH 4/5] imm32: Rewrite ImmGetDescription(A|W).

[Rémi Bernon]

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

---
 dlls/imm32/imm.c         | 65 +++++++++++++++++++---------------------
 dlls/imm32/tests/imm32.c | 15 ----------
 2 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 6acdd8a7344..6fe6b5e3f0e 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1728,52 +1728,49 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
 }
 
 /***********************************************************************
- *		ImmGetDescriptionA (IMM32.@)
+ *      ImmGetDescriptionA (IMM32.@)
  */
-UINT WINAPI ImmGetDescriptionA(
-  HKL hKL, LPSTR lpszDescription, UINT uBufLen)
+UINT WINAPI ImmGetDescriptionA( HKL hkl, LPSTR bufferA, UINT lengthA )
 {
-  WCHAR *buf;
-  DWORD len;
-
-  TRACE("%p %p %d\n", hKL, lpszDescription, uBufLen);
-
-  /* find out how many characters in the unicode buffer */
-  len = ImmGetDescriptionW( hKL, NULL, 0 );
-  if (!len)
-    return 0;
-
-  /* allocate a buffer of that size */
-  buf = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR) );
-  if( !buf )
-  return 0;
-
-  /* fetch the unicode buffer */
-  len = ImmGetDescriptionW( hKL, buf, len + 1 );
-
-  /* convert it back to ANSI */
-  len = WideCharToMultiByte( CP_ACP, 0, buf, len + 1,
-                             lpszDescription, uBufLen, NULL, NULL );
+    WCHAR *bufferW;
+    DWORD lengthW;
 
-  HeapFree( GetProcessHeap(), 0, buf );
+    TRACE( "hkl %p, bufferA %p, lengthA %d\n", hkl, bufferA, lengthA );
 
-  if (len == 0)
-    return 0;
+    if (!(lengthW = ImmGetDescriptionW( hkl, NULL, 0 ))) return 0;
+    if (!(bufferW = malloc( (lengthW + 1) * sizeof(WCHAR) ))) return 0;
+    lengthW = ImmGetDescriptionW( hkl, bufferW, lengthW + 1 );
+    lengthA = WideCharToMultiByte( CP_ACP, 0, bufferW, lengthW, bufferA,
+                                   bufferA ? lengthA : 0, NULL, NULL );
+    if (bufferA) bufferA[lengthA] = 0;
+    free( bufferW );
 
-  return len - 1;
+    return lengthA;
 }
 
 /***********************************************************************
  *		ImmGetDescriptionW (IMM32.@)
  */
-UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen)
+UINT WINAPI ImmGetDescriptionW( HKL hkl, WCHAR *buffer, UINT length )
 {
-  FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen);
+    WCHAR path[MAX_PATH];
+    HKEY hkey = 0;
+    DWORD size;
+
+    TRACE( "hkl %p, buffer %p, length %u\n", hkl, buffer, length );
+
+    swprintf( path, ARRAY_SIZE(path), layouts_formatW, (ULONG)(ULONG_PTR)hkl );
+    if (RegOpenKeyW( HKEY_LOCAL_MACHINE, path, &hkey )) return 0;
 
-  if (!hKL) return 0;
-  if (!uBufLen) return lstrlenW(L"Wine XIM" );
-  lstrcpynW( lpszDescription, L"Wine XIM", uBufLen );
-  return lstrlenW( lpszDescription );
+    size = ARRAY_SIZE(path) * sizeof(WCHAR);
+    if (RegGetValueW( hkey, NULL, L"Layout Text", RRF_RT_REG_SZ, NULL, path, &size )) *path = 0;
+    RegCloseKey( hkey );
+
+    size = wcslen( path );
+    if (!buffer) return size;
+
+    lstrcpynW( buffer, path, length );
+    return wcslen( buffer );
 }
 
 /***********************************************************************
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index f75b777d65b..7c376287993 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -2851,10 +2851,8 @@ static void test_ImmGetDescription(void)
     ret = ImmGetDescriptionA( NULL, NULL, 100 );
     ok( !ret, "ImmGetDescriptionA returned %lu\n", ret );
     ret = ImmGetDescriptionW( hkl, bufferW, 100 );
-    todo_wine
     ok( !ret, "ImmGetDescriptionW returned %lu\n", ret );
     ret = ImmGetDescriptionA( hkl, bufferA, 100 );
-    todo_wine
     ok( !ret, "ImmGetDescriptionA returned %lu\n", ret );
     ret = GetLastError();
     ok( ret == 0xdeadbeef, "got error %lu\n", ret );
@@ -2868,46 +2866,33 @@ static void test_ImmGetDescription(void)
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetDescriptionA( hkl, bufferA, 2 );
     ok( ret == 0, "ImmGetDescriptionA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     memset( bufferW, 0xcd, sizeof(bufferW) );
     ret = ImmGetDescriptionW( hkl, bufferW, 11 );
-    todo_wine
     ok( ret == 10, "ImmGetDescriptionW returned %lu\n", ret );
-    todo_wine
     ok( !wcscmp( bufferW, L"WineTest I" ), "got bufferW %s\n", debugstr_w(bufferW) );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetDescriptionA( hkl, bufferA, 11 );
-    todo_wine
     ok( ret == 0, "ImmGetDescriptionA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     memset( bufferW, 0xcd, sizeof(bufferW) );
     ret = ImmGetDescriptionW( hkl, bufferW, 12 );
-    todo_wine
     ok( ret == 11, "ImmGetDescriptionW returned %lu\n", ret );
-    todo_wine
     ok( !wcscmp( bufferW, L"WineTest IM" ), "got bufferW %s\n", debugstr_w(bufferW) );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetDescriptionA( hkl, bufferA, 12 );
-    todo_wine
     ok( ret == 12, "ImmGetDescriptionA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, "WineTest IME" ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     memset( bufferW, 0xcd, sizeof(bufferW) );
     ret = ImmGetDescriptionW( hkl, bufferW, 13 );
-    todo_wine
     ok( ret == 12, "ImmGetDescriptionW returned %lu\n", ret );
-    todo_wine
     ok( !wcscmp( bufferW, L"WineTest IME" ), "got bufferW %s\n", debugstr_w(bufferW) );
     memset( bufferA, 0xcd, sizeof(bufferA) );
     ret = ImmGetDescriptionA( hkl, bufferA, 13 );
-    todo_wine
     ok( ret == 12, "ImmGetDescriptionA returned %lu\n", ret );
-    todo_wine
     ok( !strcmp( bufferA, "WineTest IME" ), "got bufferA %s\n", debugstr_a(bufferA) );
 
     ime_cleanup( hkl );
-- 
GitLab


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

[PATCH 5/5] imm32: Use CRT allocation functions.

[Rémi Bernon]

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

---
 dlls/imm32/imm.c | 114 +++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 58 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 6fe6b5e3f0e..2dd1d7c6858 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -139,8 +139,7 @@ static inline WCHAR *strdupAtoW( const char *str )
     if (str)
     {
         DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 );
-        if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )))
-            MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len );
+        if ((ret = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len );
     }
     return ret;
 }
@@ -151,8 +150,7 @@ static inline CHAR *strdupWtoA( const WCHAR *str )
     if (str)
     {
         DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL );
-        if ((ret = HeapAlloc( GetProcessHeap(), 0, len )))
-            WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL );
+        if ((ret = malloc( len ))) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL );
     }
     return ret;
 }
@@ -300,7 +298,7 @@ static ULONG WINAPI InitializeSpy_Release(IInitializeSpy *iface)
     LONG ref = InterlockedDecrement(&spy->ref);
     if (!ref)
     {
-        HeapFree(GetProcessHeap(), 0, spy);
+        free( spy );
         NtUserGetThreadInfo()->client_imm = 0;
     }
     return ref;
@@ -379,7 +377,7 @@ static void imm_coinit_thread(void)
 
     if (!(spy = get_thread_coinit_spy()))
     {
-        if (!(spy = HeapAlloc(GetProcessHeap(), 0, sizeof(*spy)))) return;
+        if (!(spy = malloc( sizeof(*spy) ))) return;
         spy->IInitializeSpy_iface.lpVtbl = &InitializeSpyVtbl;
         spy->ref = 1;
         spy->cookie.QuadPart = 0;
@@ -596,7 +594,7 @@ static BOOL free_input_context_data( HIMC hIMC )
     ImmDestroyIMCC( data->IMC.hMsgBuf );
 
     ime_release( data->ime );
-    HeapFree( GetProcessHeap(), 0, data );
+    free( data );
 
     return TRUE;
 }
@@ -822,8 +820,8 @@ BOOL WINAPI ImmConfigureIMEA( HKL hkl, HWND hwnd, DWORD mode, void *data )
         wordW.lpWord = strdupAtoW( wordA->lpWord );
         wordW.lpReading = strdupAtoW( wordA->lpReading );
         ret = ime->pImeConfigure( hkl, hwnd, mode, &wordW );
-        HeapFree( GetProcessHeap(), 0, wordW.lpReading );
-        HeapFree( GetProcessHeap(), 0, wordW.lpWord );
+        free( wordW.lpReading );
+        free( wordW.lpWord );
     }
 
     ime_release( ime );
@@ -852,8 +850,8 @@ BOOL WINAPI ImmConfigureIMEW( HKL hkl, HWND hwnd, DWORD mode, void *data )
         wordA.lpWord = strdupWtoA( wordW->lpWord );
         wordA.lpReading = strdupWtoA( wordW->lpReading );
         ret = ime->pImeConfigure( hkl, hwnd, mode, &wordA );
-        HeapFree( GetProcessHeap(), 0, wordA.lpReading );
-        HeapFree( GetProcessHeap(), 0, wordA.lpWord );
+        free( wordA.lpReading );
+        free( wordA.lpWord );
     }
 
     ime_release( ime );
@@ -867,14 +865,14 @@ static InputContextData *create_input_context(HIMC default_imc)
     LPCANDIDATEINFO ci;
     int i;
 
-    new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData));
+    new_context = calloc( 1, sizeof(InputContextData) );
 
     /* Load the IME */
     new_context->threadDefault = !!default_imc;
     if (!(new_context->ime = ime_acquire( GetKeyboardLayout( 0 ) )))
     {
         TRACE("IME dll could not be loaded\n");
-        HeapFree(GetProcessHeap(),0,new_context);
+        free( new_context );
         return 0;
     }
 
@@ -981,8 +979,8 @@ UINT WINAPI ImmEnumRegisterWordA( HKL hkl, REGISTERWORDENUMPROCA procA, const ch
     {
         WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA );
         ret = ime->pImeEnumRegisterWord( procA, readingW, style, stringW, user );
-        HeapFree( GetProcessHeap(), 0, readingW );
-        HeapFree( GetProcessHeap(), 0, stringW );
+        free( readingW );
+        free( stringW );
     }
 
     ime_release( ime );
@@ -1009,8 +1007,8 @@ UINT WINAPI ImmEnumRegisterWordW( HKL hkl, REGISTERWORDENUMPROCW procW, const WC
     {
         char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW );
         ret = ime->pImeEnumRegisterWord( procW, readingA, style, stringA, user );
-        HeapFree( GetProcessHeap(), 0, readingA );
-        HeapFree( GetProcessHeap(), 0, stringA );
+        free( readingA );
+        free( stringA );
     }
 
     ime_release( ime );
@@ -1647,15 +1645,15 @@ DWORD WINAPI ImmGetConversionListA( HKL hkl, HIMC himc, const char *srcA, CANDID
         CANDIDATELIST *listW;
         WCHAR *srcW = strdupAtoW( srcA );
         DWORD lengthW = ime->pImeConversionList( himc, srcW, NULL, 0, flags );
-
-        if (!(listW = HeapAlloc( GetProcessHeap(), 0, lengthW ))) ret = 0;
+        
+        if (!(listW = malloc( lengthW ))) ret = 0;
         else
         {
             ime->pImeConversionList( himc, srcW, listW, lengthW, flags );
             ret = convert_candidatelist_WtoA( listW, listA, lengthA );
-            HeapFree( GetProcessHeap(), 0, listW );
+            free( listW );
         }
-        HeapFree( GetProcessHeap(), 0, srcW );
+        free( srcW );
     }
 
     ime_release( ime );
@@ -1684,14 +1682,14 @@ DWORD WINAPI ImmGetConversionListW( HKL hkl, HIMC himc, const WCHAR *srcW, CANDI
         char *srcA = strdupWtoA( srcW );
         DWORD lengthA = ime->pImeConversionList( himc, srcA, NULL, 0, flags );
 
-        if (!(listA = HeapAlloc( GetProcessHeap(), 0, lengthA ))) ret = 0;
+        if (!(listA = malloc( lengthA ))) ret = 0;
         else
         {
             ime->pImeConversionList( himc, srcA, listA, lengthA, flags );
             ret = convert_candidatelist_AtoW( listA, listW, lengthW );
-            HeapFree( GetProcessHeap(), 0, listA );
+            free( listA );
         }
-        HeapFree( GetProcessHeap(), 0, srcA );
+        free( srcA );
     }
 
     ime_release( ime );
@@ -1989,23 +1987,17 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd)
 /***********************************************************************
  *		ImmInstallIMEA (IMM32.@)
  */
-HKL WINAPI ImmInstallIMEA(
-  LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText)
+HKL WINAPI ImmInstallIMEA( const char *filenameA, const char *descriptionA )
 {
-    LPWSTR lpszwIMEFileName;
-    LPWSTR lpszwLayoutText;
+    WCHAR *filenameW = strdupAtoW( filenameA ), *descriptionW = strdupAtoW( descriptionA );
     HKL hkl;
 
-    TRACE ("(%s, %s)\n", debugstr_a(lpszIMEFileName),
-                         debugstr_a(lpszLayoutText));
-
-    lpszwIMEFileName = strdupAtoW(lpszIMEFileName);
-    lpszwLayoutText = strdupAtoW(lpszLayoutText);
+    TRACE( "filenameA %s, descriptionA %s\n", debugstr_a(filenameA), debugstr_a(descriptionA) );
 
-    hkl = ImmInstallIMEW(lpszwIMEFileName, lpszwLayoutText);
+    hkl = ImmInstallIMEW( filenameW, descriptionW );
+    free( descriptionW );
+    free( filenameW );
 
-    HeapFree(GetProcessHeap(),0,lpszwIMEFileName);
-    HeapFree(GetProcessHeap(),0,lpszwLayoutText);
     return hkl;
 }
 
@@ -2024,6 +2016,12 @@ HKL WINAPI ImmInstallIMEW( const WCHAR *filename, const WCHAR *description )
 
     TRACE( "filename %s, description %s\n", debugstr_w(filename), debugstr_w(description) );
 
+    if (!filename || !description)
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return 0;
+    }
+
     while (count < 0xfff)
     {
         DWORD disposition = 0;
@@ -2166,8 +2164,8 @@ BOOL WINAPI ImmRegisterWordA( HKL hkl, const char *readingA, DWORD style, const
     {
         WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA );
         ret = ime->pImeRegisterWord( readingW, style, stringW );
-        HeapFree( GetProcessHeap(), 0, readingW );
-        HeapFree( GetProcessHeap(), 0, stringW );
+        free( readingW );
+        free( stringW );
     }
 
     ime_release( ime );
@@ -2192,8 +2190,8 @@ BOOL WINAPI ImmRegisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, const
     {
         char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW );
         ret = ime->pImeRegisterWord( readingA, style, stringA );
-        HeapFree( GetProcessHeap(), 0, readingA );
-        HeapFree( GetProcessHeap(), 0, stringA );
+        free( readingA );
+        free( stringA );
     }
 
     ime_release( ime );
@@ -2362,22 +2360,22 @@ BOOL WINAPI ImmSetCompositionStringA(
     comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0);
     if (comp_len)
     {
-        CompBuffer = HeapAlloc(GetProcessHeap(),0,comp_len * sizeof(WCHAR));
+        CompBuffer = malloc( comp_len * sizeof(WCHAR) );
         MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, CompBuffer, comp_len);
     }
 
     read_len = MultiByteToWideChar(CP_ACP, 0, lpRead, dwReadLen, NULL, 0);
     if (read_len)
     {
-        ReadBuffer = HeapAlloc(GetProcessHeap(),0,read_len * sizeof(WCHAR));
+        ReadBuffer = malloc( read_len * sizeof(WCHAR) );
         MultiByteToWideChar(CP_ACP, 0, lpRead, dwReadLen, ReadBuffer, read_len);
     }
 
     rc =  ImmSetCompositionStringW(hIMC, dwIndex, CompBuffer, comp_len,
                                    ReadBuffer, read_len);
 
-    HeapFree(GetProcessHeap(), 0, CompBuffer);
-    HeapFree(GetProcessHeap(), 0, ReadBuffer);
+    free( CompBuffer );
+    free( ReadBuffer );
 
     return rc;
 }
@@ -2420,7 +2418,7 @@ BOOL WINAPI ImmSetCompositionStringW(
                                    NULL);
     if (comp_len)
     {
-        CompBuffer = HeapAlloc(GetProcessHeap(),0,comp_len);
+        CompBuffer = malloc( comp_len );
         WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, CompBuffer, comp_len,
                             NULL, NULL);
     }
@@ -2429,7 +2427,7 @@ BOOL WINAPI ImmSetCompositionStringW(
                                    NULL);
     if (read_len)
     {
-        ReadBuffer = HeapAlloc(GetProcessHeap(),0,read_len);
+        ReadBuffer = malloc( read_len );
         WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, ReadBuffer, read_len,
                             NULL, NULL);
     }
@@ -2437,8 +2435,8 @@ BOOL WINAPI ImmSetCompositionStringW(
     rc =  ImmSetCompositionStringA(hIMC, dwIndex, CompBuffer, comp_len,
                                    ReadBuffer, read_len);
 
-    HeapFree(GetProcessHeap(), 0, CompBuffer);
-    HeapFree(GetProcessHeap(), 0, ReadBuffer);
+    free( CompBuffer );
+    free( ReadBuffer );
 
     return rc;
 }
@@ -2643,8 +2641,8 @@ BOOL WINAPI ImmUnregisterWordA( HKL hkl, const char *readingA, DWORD style, cons
     {
         WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA );
         ret = ime->pImeUnregisterWord( readingW, style, stringW );
-        HeapFree( GetProcessHeap(), 0, readingW );
-        HeapFree( GetProcessHeap(), 0, stringW );
+        free( readingW );
+        free( stringW );
     }
 
     ime_release( ime );
@@ -2669,8 +2667,8 @@ BOOL WINAPI ImmUnregisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, con
     {
         char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW );
         ret = ime->pImeUnregisterWord( readingA, style, stringA );
-        HeapFree( GetProcessHeap(), 0, readingA );
-        HeapFree( GetProcessHeap(), 0, stringA );
+        free( readingA );
+        free( stringA );
     }
 
     ime_release( ime );
@@ -2706,7 +2704,7 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC himc, DWORD flags, DWORD type, IMEMENUITE
         {
             int count = size / sizeof(LPIMEMENUITEMINFOA);
             size = count * sizeof(IMEMENUITEMINFOW);
-            menuW = HeapAlloc( GetProcessHeap(), 0, size );
+            menuW = malloc( size );
         }
 
         ret = data->ime->pImeGetImeMenuItems( himc, flags, type, parentW, menuW, size );
@@ -2729,7 +2727,7 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC himc, DWORD flags, DWORD type, IMEMENUITE
                                      IMEMENUITEM_STRING_SIZE, NULL, NULL );
             }
         }
-        HeapFree( GetProcessHeap(), 0, menuW );
+        free( menuW );
     }
 
     return ret;
@@ -2764,7 +2762,7 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC himc, DWORD flags, DWORD type, IMEMENUITE
         {
             int count = size / sizeof(LPIMEMENUITEMINFOW);
             size = count * sizeof(IMEMENUITEMINFOA);
-            menuA = HeapAlloc( GetProcessHeap(), 0, size );
+            menuA = malloc( size );
         }
 
         ret = data->ime->pImeGetImeMenuItems( himc, flags, type, parentA, menuA, size );
@@ -2785,7 +2783,7 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC himc, DWORD flags, DWORD type, IMEMENUITE
                 MultiByteToWideChar( CP_ACP, 0, menuA[i].szString, -1, menuW[i].szString, IMEMENUITEM_STRING_SIZE );
             }
         }
-        HeapFree( GetProcessHeap(), 0, menuA );
+        free( menuA );
     }
 
     return ret;
@@ -2947,7 +2945,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
     GetKeyboardState(state);
     scancode = lKeyData >> 0x10 & 0xff;
 
-    list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list_count * sizeof(TRANSMSG) + sizeof(DWORD));
+    list = calloc( list_count, sizeof(TRANSMSG) + sizeof(DWORD) );
     list->uMsgCount = list_count;
 
     if (data->ime->info.fdwProperty & IME_PROP_KBD_CHAR_FIRST)
@@ -2976,7 +2974,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
     else if (msg_count > list_count)
         ImmGenerateMessage(imc);
 
-    HeapFree(GetProcessHeap(),0,list);
+    free( list );
 
     data->lastVK = VK_PROCESSKEY;
 
-- 
GitLab

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