[PATCH v3 2/5] win32u: Stub NtUserBuildHimcList syscall.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/imm.c       | 11 +++++++++++
 dlls/win32u/syscall.c   |  1 +
 dlls/win32u/win32u.spec |  2 +-
 dlls/wow64win/syscall.h |  1 +
 dlls/wow64win/user.c    | 19 +++++++++++++++++++
 include/ntuser.h        |  1 +
 6 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c
index 1ccc09c97b2..dc10eedd903 100644
--- a/dlls/win32u/imm.c
+++ b/dlls/win32u/imm.c
@@ -25,6 +25,8 @@
 #endif

#include <pthread.h>
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "win32u_private.h"
 #include "ntuser_private.h"
 #include "immdev.h"
@@ -393,6 +395,15 @@ void cleanup_imm_thread(void)
     NtUserDestroyInputContext( UlongToHandle( thread_info->client_info.default_imc ));
 }

+/*****************************************************************************
+ *           NtUserBuildHimcList (win32u.@)
+ */
+NTSTATUS WINAPI NtUserBuildHimcList( UINT thread_id, UINT count, HIMC *buffer, UINT *size )
+{
+    FIXME( "thread_id %#x, count %u, buffer %p, size %p stub!\n", thread_id, count, buffer, size );
+    return STATUS_NOT_IMPLEMENTED;
+}
+
 BOOL WINAPI DECLSPEC_HIDDEN ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM key_data, DWORD unknown )
 {
     struct imm_process_key_params params =
diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c
index 9020aa01126..f93ba9b804b 100644
--- a/dlls/win32u/syscall.c
+++ b/dlls/win32u/syscall.c
@@ -106,6 +106,7 @@ static void * const syscalls[] =
     NtUserAssociateInputContext,
     NtUserAttachThreadInput,
     NtUserBeginPaint,
+    NtUserBuildHimcList,
     NtUserBuildHwndList,
     NtUserCallHwnd,
     NtUserCallHwndParam,
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index 6e1a0a51175..544f375d637 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -762,7 +762,7 @@
 @ stub NtUserBitBltSysBmp
 @ stub NtUserBlockInput
 @ stub NtUserBroadcastThemeChangeEvent
-@ stub NtUserBuildHimcList
+@ stdcall -syscall NtUserBuildHimcList(long long ptr ptr)
 @ stdcall -syscall NtUserBuildHwndList(long long long long long long ptr ptr)
 @ stub NtUserBuildNameList
 @ stub NtUserBuildPropList
diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h
index 4977013c595..7e2b7af7846 100644
--- a/dlls/wow64win/syscall.h
+++ b/dlls/wow64win/syscall.h
@@ -92,6 +92,7 @@
     SYSCALL_ENTRY( NtUserAssociateInputContext ) \
     SYSCALL_ENTRY( NtUserAttachThreadInput ) \
     SYSCALL_ENTRY( NtUserBeginPaint ) \
+    SYSCALL_ENTRY( NtUserBuildHimcList ) \
     SYSCALL_ENTRY( NtUserBuildHwndList ) \
     SYSCALL_ENTRY( NtUserCallHwnd ) \
     SYSCALL_ENTRY( NtUserCallHwndParam ) \
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 2ce82907a88..e1ce2dd8321 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -1182,6 +1182,25 @@ NTSTATUS WINAPI wow64_NtUserBeginPaint( UINT *args )
     return HandleToUlong( ret );
 }

+NTSTATUS WINAPI wow64_NtUserBuildHimcList( UINT *args )
+{
+    ULONG thread_id = get_ulong( &args );
+    ULONG count = get_ulong( &args );
+    UINT32 *buffer32 = get_ptr( &args );
+    UINT *size = get_ptr( &args );
+
+    HIMC *buffer;
+    ULONG i;
+    NTSTATUS status;
+
+    if (!(buffer = Wow64AllocateTemp( count * sizeof(*buffer) ))) return STATUS_NO_MEMORY;
+
+    if ((status = NtUserBuildHimcList( thread_id, count, buffer, size ))) return status;
+
+    for (i = 0; i < *size; i++) buffer32[i] = HandleToUlong( buffer[i] );
+    return status;
+}
+
 NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args )
 {
     HDESK desktop = get_handle( &args );
diff --git a/include/ntuser.h b/include/ntuser.h
index 35ead9750c6..629f6353fa3 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -648,6 +648,7 @@ BOOL    WINAPI NtUserAddClipboardFormatListener( HWND hwnd );
 UINT    WINAPI NtUserAssociateInputContext( HWND hwnd, HIMC ctx, ULONG flags );
 BOOL    WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach );
 HDC     WINAPI NtUserBeginPaint( HWND hwnd, PAINTSTRUCT *ps );
+NTSTATUS WINAPI NtUserBuildHimcList( UINT thread_id, UINT count, HIMC *buffer, UINT *size );
 NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4,
                                      ULONG thread_id, ULONG count, HWND *buffer, ULONG *size );
 ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code );