system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 22:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

imm32: Avoid using GCC's typeof extension.

Browse source 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2018-09-19 22:44:34 -06:00 committed by Alexandre Julliard
parent ac7ae92af1
commit 1d65be607d
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dlls/imm32/imm.c
View file

@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm);
#define IMM_INIT_MAGIC 0x19650412 #define IMM_INIT_MAGIC 0x19650412
BOOL WINAPI User32InitializeImmEntryTable(DWORD); BOOL WINAPI User32InitializeImmEntryTable(DWORD);
#define MAKE_FUNCPTR(f) typeof(f) * p##f
typedef struct _tagImmHkl{ typedef struct _tagImmHkl{
struct list entry; struct list entry;
HKL hkl; HKL hkl;
@ -51,24 +50,23 @@ typedef struct _tagImmHkl{
HWND UIWnd; HWND UIWnd;
/* Function Pointers */ /* Function Pointers */
MAKE_FUNCPTR(ImeInquire); BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *);
MAKE_FUNCPTR(ImeConfigure); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *);
MAKE_FUNCPTR(ImeDestroy); BOOL (WINAPI *pImeDestroy)(UINT);
MAKE_FUNCPTR(ImeEscape); LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *);
MAKE_FUNCPTR(ImeSelect); BOOL (WINAPI *pImeSelect)(HIMC, BOOL);
MAKE_FUNCPTR(ImeSetActiveContext); BOOL (WINAPI *pImeSetActiveContext)(HIMC, BOOL);
MAKE_FUNCPTR(ImeToAsciiEx); UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, DWORD *, UINT, HIMC);
MAKE_FUNCPTR(NotifyIME); BOOL (WINAPI *pNotifyIME)(HIMC, DWORD, DWORD, DWORD);
MAKE_FUNCPTR(ImeRegisterWord); BOOL (WINAPI *pImeRegisterWord)(const WCHAR *, DWORD, const WCHAR *);
MAKE_FUNCPTR(ImeUnregisterWord); BOOL (WINAPI *pImeUnregisterWord)(const WCHAR *, DWORD, const WCHAR *);
MAKE_FUNCPTR(ImeEnumRegisterWord); UINT (WINAPI *pImeEnumRegisterWord)(REGISTERWORDENUMPROCW, const WCHAR *, DWORD, const WCHAR *, void *);
MAKE_FUNCPTR(ImeSetCompositionString); BOOL (WINAPI *pImeSetCompositionString)(HIMC, DWORD, const void *, DWORD, const void *, DWORD);
MAKE_FUNCPTR(ImeConversionList); DWORD (WINAPI *pImeConversionList)(HIMC, const WCHAR *, CANDIDATELIST *, DWORD, UINT);
MAKE_FUNCPTR(ImeProcessKey); BOOL (WINAPI *pImeProcessKey)(HIMC, UINT, LPARAM, const BYTE *);
MAKE_FUNCPTR(ImeGetRegisterWordStyle); UINT (WINAPI *pImeGetRegisterWordStyle)(UINT, STYLEBUFW *);
MAKE_FUNCPTR(ImeGetImeMenuItems); DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, IMEMENUITEMINFOW *, IMEMENUITEMINFOW *, DWORD);
} ImmHkl; } ImmHkl;
#undef MAKE_FUNCPTR
typedef struct tagInputContextData typedef struct tagInputContextData
{ {