Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] Sync with Wine Staging 3.17. CORE-15127

Browse source
This commit is contained in:
Amine Khaldi 2018-10-01 12:53:21 +01:00
parent d4bc0feb6e
commit 789fa9c819
3 changed files with 26 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dll/win32/imm32/CMakeLists.txt
View file

@ -13,13 +13,6 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
add_library(imm32 SHARED ${SOURCE} version.rc)
if(MSVC)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#add_target_compile_flags(imm32 "/FIwine/typeof.h")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
endif()
set_module_type(imm32 win32dll)
target_link_libraries(imm32 wine)
add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll)

55
dll/win32/imm32/imm.c
View file

@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm);
#define IMM_INIT_MAGIC 0x19650412
BOOL WINAPI User32InitializeImmEntryTable(DWORD);
#define MAKE_FUNCPTR(f) typeof(f) * p##f
typedef struct _tagImmHkl{
struct list entry;
HKL hkl;
@ -51,24 +50,23 @@ typedef struct _tagImmHkl{
HWND UIWnd;
/* Function Pointers */
MAKE_FUNCPTR(ImeInquire);
MAKE_FUNCPTR(ImeConfigure);
MAKE_FUNCPTR(ImeDestroy);
MAKE_FUNCPTR(ImeEscape);
MAKE_FUNCPTR(ImeSelect);
MAKE_FUNCPTR(ImeSetActiveContext);
MAKE_FUNCPTR(ImeToAsciiEx);
MAKE_FUNCPTR(NotifyIME);
MAKE_FUNCPTR(ImeRegisterWord);
MAKE_FUNCPTR(ImeUnregisterWord);
MAKE_FUNCPTR(ImeEnumRegisterWord);
MAKE_FUNCPTR(ImeSetCompositionString);
MAKE_FUNCPTR(ImeConversionList);
MAKE_FUNCPTR(ImeProcessKey);
MAKE_FUNCPTR(ImeGetRegisterWordStyle);
MAKE_FUNCPTR(ImeGetImeMenuItems);
BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *);
BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *);
BOOL (WINAPI *pImeDestroy)(UINT);
LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *);
BOOL (WINAPI *pImeSelect)(HIMC, BOOL);
BOOL (WINAPI *pImeSetActiveContext)(HIMC, BOOL);
UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, DWORD *, UINT, HIMC);
BOOL (WINAPI *pNotifyIME)(HIMC, DWORD, DWORD, DWORD);
BOOL (WINAPI *pImeRegisterWord)(const WCHAR *, DWORD, const WCHAR *);
BOOL (WINAPI *pImeUnregisterWord)(const WCHAR *, DWORD, const WCHAR *);
UINT (WINAPI *pImeEnumRegisterWord)(REGISTERWORDENUMPROCW, const WCHAR *, DWORD, const WCHAR *, void *);
BOOL (WINAPI *pImeSetCompositionString)(HIMC, DWORD, const void *, DWORD, const void *, DWORD);
DWORD (WINAPI *pImeConversionList)(HIMC, const WCHAR *, CANDIDATELIST *, DWORD, UINT);
BOOL (WINAPI *pImeProcessKey)(HIMC, UINT, LPARAM, const BYTE *);
UINT (WINAPI *pImeGetRegisterWordStyle)(UINT, STYLEBUFW *);
DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, IMEMENUITEMINFOW *, IMEMENUITEMINFOW *, DWORD);
} ImmHkl;
#undef MAKE_FUNCPTR
typedef struct tagInputContextData
{
@ -308,7 +306,7 @@ static HMODULE load_graphics_driver(void)
HKEY hkey;
DWORD size;
WCHAR path[MAX_PATH];
WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40];
WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40];
UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW ));
if (!guid_atom) return 0;
@ -769,7 +767,7 @@ HIMC WINAPI ImmCreateContext(void)
gl->dwSize = sizeof(GUIDELINE);
ImmUnlockIMCC(new_context->IMC.hGuideLine);
for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++)
for (i = 0; i < ARRAY_SIZE(new_context->IMC.cfCandForm); i++)
new_context->IMC.cfCandForm[i].dwIndex = ~0u;
/* Initialize the IME Private */
@ -1013,8 +1011,7 @@ DWORD WINAPI ImmGetCandidateListA(
return 0;
candinfo = ImmLockIMCC(data->IMC.hCandInfo);
if ( dwIndex >= candinfo->dwCount ||
dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) )
if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset))
goto done;
candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]);
@ -1117,8 +1114,7 @@ DWORD WINAPI ImmGetCandidateListW(
return 0;
candinfo = ImmLockIMCC(data->IMC.hCandInfo);
if ( dwIndex >= candinfo->dwCount ||
dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) )
if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset))
goto done;
candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]);
@ -1152,7 +1148,7 @@ BOOL WINAPI ImmGetCandidateWindow(
if (!data || !lpCandidate)
return FALSE;
if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) )
if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm))
return FALSE;
if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex)
@ -1624,8 +1620,7 @@ static BOOL needs_ime_window(HWND hwnd)
{
WCHAR classW[8];
if (GetClassNameW(hwnd, classW, sizeof(classW)/sizeof(classW[0])) &&
!strcmpW(classW, szwIME))
if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME))
return FALSE;
if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE;
@ -1844,7 +1839,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen)
HKEY hkey;
DWORD length;
DWORD rc;
WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8];
WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8];
wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL );
rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey);
@ -2062,7 +2057,7 @@ HKL WINAPI ImmInstallIMEW(
HKL hkl;
DWORD rc;
HKEY hkey;
WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8];
WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8];
TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName),
debugstr_w(lpszLayoutText));
@ -2314,7 +2309,7 @@ BOOL WINAPI ImmSetCandidateWindow(
wine_dbgstr_point(&lpCandidate->ptCurrentPos),
wine_dbgstr_rect(&lpCandidate->rcArea));
if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) )
if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm))
return FALSE;
data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate;

2
media/doc/README.WINE
View file

@ -77,7 +77,7 @@ reactos/dll/win32/iccvid # Synced to WineStaging-3.3
reactos/dll/win32/ieframe # Synced to WineStaging-3.17
reactos/dll/win32/imaadp32.acm # Synced to WineStaging-3.17
reactos/dll/win32/imagehlp # Synced to WineStaging-3.3
reactos/dll/win32/imm32 # Synced to WineStaging-3.9
reactos/dll/win32/imm32 # Synced to WineStaging-3.17
reactos/dll/win32/inetcomm # Synced to WineStaging-3.3
reactos/dll/win32/inetmib1 # Synced to WineStaging-3.3
reactos/dll/win32/initpki # Synced to WineStaging-3.3