Jacek Caban : win32u: Use syscall interface for NtUserDisableThreadIme.
Alexandre Julliard
julliard at winehq.org
Mon Jul 25 16:18:23 CDT 2022
Module: wine
Branch: master
Commit: 43c851c796b06ed54fe093b859134063d457ba27
URL: https://gitlab.winehq.org/wine/wine/-/commit/43c851c796b06ed54fe093b859134063d457ba27
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun Jul 10 22:25:16 2022 +0200
win32u: Use syscall interface for NtUserDisableThreadIme.
---
dlls/win32u/gdiobj.c | 1 -
dlls/win32u/syscall.c | 1 +
dlls/win32u/win32u.spec | 2 +-
dlls/win32u/win32u_private.h | 1 -
dlls/win32u/wrappers.c | 6 ------
dlls/wow64win/syscall.h | 1 +
dlls/wow64win/user.c | 7 +++++++
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c
index f7df8f88cb6..d4c9a1a3861 100644
--- a/dlls/win32u/gdiobj.c
+++ b/dlls/win32u/gdiobj.c
@@ -1140,7 +1140,6 @@ static struct unix_funcs unix_funcs =
NtUserDeferWindowPosAndBand,
NtUserDestroyMenu,
NtUserDestroyWindow,
- NtUserDisableThreadIme,
NtUserDrawCaptionTemp,
NtUserDrawMenuBarTemp,
NtUserEnableMenuItem,
diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c
index 92077671eb6..d04e4dc2cf3 100644
--- a/dlls/win32u/syscall.c
+++ b/dlls/win32u/syscall.c
@@ -132,6 +132,7 @@ static void * const syscalls[] =
NtUserDestroyAcceleratorTable,
NtUserDestroyCursor,
NtUserDestroyInputContext,
+ NtUserDisableThreadIme,
NtUserDispatchMessage,
NtUserDragDetect,
NtUserDrawIconEx,
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index c0ad2866b48..555aaecdfb5 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -837,7 +837,7 @@
@ stdcall NtUserDestroyWindow(long)
@ stub NtUserDisableImmersiveOwner
@ stub NtUserDisableProcessWindowFiltering
-@ stdcall NtUserDisableThreadIme(long)
+@ stdcall -syscall NtUserDisableThreadIme(long)
@ stub NtUserDiscardPointerFrameMessages
@ stdcall -syscall NtUserDispatchMessage(ptr)
@ stub NtUserDisplayConfigGetDeviceInfo
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 722bee43944..c7aac2edd75 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -196,7 +196,6 @@ struct unix_funcs
UINT flags, UINT unk1, UINT unk2 );
BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle );
BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd );
- BOOL (WINAPI *pNtUserDisableThreadIme)( DWORD thread_id );
BOOL (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font,
HICON icon, const WCHAR *str, UINT flags );
DWORD (WINAPI *pNtUserDrawMenuBarTemp)( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font );
diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c
index 9694c203fcb..f4847d06480 100644
--- a/dlls/win32u/wrappers.c
+++ b/dlls/win32u/wrappers.c
@@ -758,12 +758,6 @@ BOOL WINAPI NtUserDestroyWindow( HWND hwnd )
return unix_funcs->pNtUserDestroyWindow( hwnd );
}
-BOOL WINAPI NtUserDisableThreadIme( DWORD thread_id )
-{
- if (!unix_funcs) return FALSE;
- return unix_funcs->pNtUserDisableThreadIme( thread_id );
-}
-
BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font,
HICON icon, const WCHAR *str, UINT flags )
{
diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h
index 7bdf8dd32cd..95ceeb9e16d 100644
--- a/dlls/wow64win/syscall.h
+++ b/dlls/wow64win/syscall.h
@@ -119,6 +119,7 @@
SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \
SYSCALL_ENTRY( NtUserDestroyCursor ) \
SYSCALL_ENTRY( NtUserDestroyInputContext ) \
+ SYSCALL_ENTRY( NtUserDisableThreadIme ) \
SYSCALL_ENTRY( NtUserDispatchMessage ) \
SYSCALL_ENTRY( NtUserDragDetect ) \
SYSCALL_ENTRY( NtUserDrawIconEx ) \
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 8c971154448..a3e880c46ed 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -458,6 +458,13 @@ NTSTATUS WINAPI wow64_NtUserDestroyInputContext( UINT *args )
return NtUserDestroyInputContext( handle );
}
+NTSTATUS WINAPI wow64_NtUserDisableThreadIme( UINT *args )
+{
+ DWORD thread_id = get_ulong( &args );
+
+ return NtUserDisableThreadIme( thread_id );
+}
+
NTSTATUS WINAPI wow64_NtUserDispatchMessage( UINT *args )
{
const MSG32 *msg32 = get_ptr( &args );
More information about the wine-cvs
mailing list