Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32] Don't delay-load-link to imm32.dll (#4328)

Browse source 
Reduce binary size.
- Don't directly call the IMM32 functions. Use IMM_FN instead.
- Modify CMakeLists.txt to unlink imm32.dll.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-01-31 09:30:47 +09:00 committed by GitHub
parent d735373e46
commit fbab1914a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
win32ss/user/user32/CMakeLists.txt
View file

@ -87,7 +87,7 @@ if(MSVC AND (ARCH STREQUAL "i386"))
target_sources(user32 PRIVATE $<TARGET_OBJECTS:ftol2_sse>) target_sources(user32 PRIVATE $<TARGET_OBJECTS:ftol2_sse>)
endif() endif()
add_delay_importlibs(user32 imm32 usp10) add_delay_importlibs(user32 usp10)
add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll)
add_pch(user32 include/user32.h SOURCE) add_pch(user32 include/user32.h SOURCE)
add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all)

5
win32ss/user/user32/controls/edit.c
View file

@ -45,6 +45,11 @@
#include <user32.h> #include <user32.h>
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <usp10.h> #include <usp10.h>
#ifdef __REACTOS__
#define ImmGetContext IMM_FN(ImmGetContext)
#define ImmGetCompositionStringW IMM_FN(ImmGetCompositionStringW)
#define ImmReleaseContext IMM_FN(ImmReleaseContext)
#endif
WINE_DEFAULT_DEBUG_CHANNEL(edit); WINE_DEFAULT_DEBUG_CHANNEL(edit);
WINE_DECLARE_DEBUG_CHANNEL(combo); WINE_DECLARE_DEBUG_CHANNEL(combo);

28
win32ss/user/user32/windows/defwnd.c
View file

@ -951,16 +951,16 @@ RealDefWindowProcA(HWND hWnd,
LONG size, i; LONG size, i;
unsigned char lead = 0; unsigned char lead = 0;
char *buf = NULL; char *buf = NULL;
HIMC himc = ImmGetContext( hWnd ); HIMC himc = IMM_FN(ImmGetContext)( hWnd );
if (himc) if (himc)
{ {
if ((size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, NULL, 0 ))) if ((size = IMM_FN(ImmGetCompositionStringA)( himc, GCS_RESULTSTR, NULL, 0 )))
{ {
if (!(buf = HeapAlloc( GetProcessHeap(), 0, size ))) size = 0; if (!(buf = HeapAlloc( GetProcessHeap(), 0, size ))) size = 0;
else size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, buf, size ); else size = IMM_FN(ImmGetCompositionStringA)( himc, GCS_RESULTSTR, buf, size );
} }
ImmReleaseContext( hWnd, himc ); IMM_FN(ImmReleaseContext)( hWnd, himc );
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
{ {
@ -990,7 +990,7 @@ RealDefWindowProcA(HWND hWnd,
{ {
HWND hwndIME; HWND hwndIME;
hwndIME = ImmGetDefaultIMEWnd(hWnd); hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd);
if (hwndIME) if (hwndIME)
Result = SendMessageA(hwndIME, Msg, wParam, lParam); Result = SendMessageA(hwndIME, Msg, wParam, lParam);
break; break;
@ -1000,9 +1000,9 @@ RealDefWindowProcA(HWND hWnd,
{ {
HWND hwndIME; HWND hwndIME;
hwndIME = ImmGetDefaultIMEWnd(hWnd); hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd);
if (hwndIME) if (hwndIME)
Result = ImmIsUIMessageA(hwndIME, Msg, wParam, lParam); Result = SendMessageA(hwndIME, Msg, wParam, lParam);
break; break;
} }
@ -1150,16 +1150,16 @@ RealDefWindowProcW(HWND hWnd,
{ {
LONG size, i; LONG size, i;
WCHAR *buf = NULL; WCHAR *buf = NULL;
HIMC himc = ImmGetContext( hWnd ); HIMC himc = IMM_FN(ImmGetContext)( hWnd );
if (himc) if (himc)
{ {
if ((size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, NULL, 0 ))) if ((size = IMM_FN(ImmGetCompositionStringW)( himc, GCS_RESULTSTR, NULL, 0 )))
{ {
if (!(buf = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) size = 0; if (!(buf = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) size = 0;
else size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, buf, size * sizeof(WCHAR) ); else size = IMM_FN(ImmGetCompositionStringW)( himc, GCS_RESULTSTR, buf, size * sizeof(WCHAR) );
} }
ImmReleaseContext( hWnd, himc ); IMM_FN(ImmReleaseContext)( hWnd, himc );
for (i = 0; i < size / sizeof(WCHAR); i++) for (i = 0; i < size / sizeof(WCHAR); i++)
SendMessageW( hWnd, WM_IME_CHAR, buf[i], 1 ); SendMessageW( hWnd, WM_IME_CHAR, buf[i], 1 );
@ -1175,7 +1175,7 @@ RealDefWindowProcW(HWND hWnd,
{ {
HWND hwndIME; HWND hwndIME;
hwndIME = ImmGetDefaultIMEWnd(hWnd); hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd);
if (hwndIME) if (hwndIME)
Result = SendMessageW(hwndIME, Msg, wParam, lParam); Result = SendMessageW(hwndIME, Msg, wParam, lParam);
break; break;
@ -1185,9 +1185,9 @@ RealDefWindowProcW(HWND hWnd,
{ {
HWND hwndIME; HWND hwndIME;
hwndIME = ImmGetDefaultIMEWnd(hWnd); hwndIME = IMM_FN(ImmGetDefaultIMEWnd)(hWnd);
if (hwndIME) if (hwndIME)
Result = ImmIsUIMessageW(hwndIME, Msg, wParam, lParam); Result = SendMessageW(hwndIME, Msg, wParam, lParam);
break; break;
} }