mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 03:54:46 +00:00
include: Fix ImeToAsciiEx declaration.
This commit is contained in:
parent
2fdfe16c2d
commit
f371309f6d
|
@ -68,7 +68,7 @@ typedef struct _tagImmHkl{
|
|||
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);
|
||||
UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, TRANSMSGLIST *, 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 *);
|
||||
|
@ -97,12 +97,6 @@ typedef struct tagInputContextData
|
|||
|
||||
#define WINE_IMC_VALID_MAGIC 0x56434D49
|
||||
|
||||
typedef struct _tagTRANSMSG {
|
||||
UINT message;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
} TRANSMSG, *LPTRANSMSG;
|
||||
|
||||
struct coinit_spy
|
||||
{
|
||||
IInitializeSpy IInitializeSpy_iface;
|
||||
|
@ -3004,7 +2998,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
|
|||
HIMC imc = ImmGetContext(hwnd);
|
||||
BYTE state[256];
|
||||
UINT scancode;
|
||||
LPVOID list = 0;
|
||||
TRANSMSGLIST *list = NULL;
|
||||
UINT msg_count;
|
||||
UINT uVirtKey;
|
||||
static const DWORD list_count = 10;
|
||||
|
@ -3020,7 +3014,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
|
|||
scancode = lKeyData >> 0x10 & 0xff;
|
||||
|
||||
list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list_count * sizeof(TRANSMSG) + sizeof(DWORD));
|
||||
((DWORD*)list)[0] = list_count;
|
||||
list->uMsgCount = list_count;
|
||||
|
||||
if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST)
|
||||
{
|
||||
|
@ -3040,7 +3034,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
|
|||
if (msg_count && msg_count <= list_count)
|
||||
{
|
||||
UINT i;
|
||||
LPTRANSMSG msgs = (LPTRANSMSG)((LPBYTE)list + sizeof(DWORD));
|
||||
LPTRANSMSG msgs = list->TransMsg;
|
||||
|
||||
for (i = 0; i < msg_count; i++)
|
||||
ImmInternalPostIMEMessage(data, msgs[i].message, msgs[i].wParam, msgs[i].lParam);
|
||||
|
|
|
@ -93,12 +93,6 @@ typedef struct
|
|||
} u;
|
||||
} TEST_INPUT;
|
||||
|
||||
typedef struct _tagTRANSMSG {
|
||||
UINT message;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
} TRANSMSG, *LPTRANSMSG;
|
||||
|
||||
static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t);
|
||||
|
||||
static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam)
|
||||
|
|
|
@ -52,12 +52,6 @@ typedef struct _IMEPRIVATE {
|
|||
UINT repeat;
|
||||
} IMEPRIVATE, *LPIMEPRIVATE;
|
||||
|
||||
typedef struct _tagTRANSMSG {
|
||||
UINT message;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
} TRANSMSG, *LPTRANSMSG;
|
||||
|
||||
static const WCHAR UI_CLASS_NAME[] = {'W','i','n','e',' ','M','a','c',' ','I','M','E',0};
|
||||
|
||||
static HIMC *hSelectedFrom = NULL;
|
||||
|
@ -454,15 +448,15 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, LPARAM lParam
|
|||
UnlockRealIMC(hIMC);
|
||||
}
|
||||
|
||||
static BOOL GenerateMessageToTransKey(LPDWORD lpTransBuf, UINT *uNumTranMsgs,
|
||||
static BOOL GenerateMessageToTransKey(TRANSMSGLIST *lpTransBuf, UINT *uNumTranMsgs,
|
||||
UINT msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
LPTRANSMSG ptr;
|
||||
|
||||
if (*uNumTranMsgs + 1 >= (UINT)*lpTransBuf)
|
||||
if (*uNumTranMsgs + 1 >= lpTransBuf->uMsgCount)
|
||||
return FALSE;
|
||||
|
||||
ptr = (LPTRANSMSG)(lpTransBuf + 1 + *uNumTranMsgs * 3);
|
||||
ptr = lpTransBuf->TransMsg + *uNumTranMsgs;
|
||||
ptr->message = msg;
|
||||
ptr->wParam = wParam;
|
||||
ptr->lParam = lParam;
|
||||
|
@ -652,7 +646,7 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag)
|
|||
}
|
||||
|
||||
UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState,
|
||||
LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC)
|
||||
TRANSMSGLIST *lpdwTransKey, UINT fuState, HIMC hIMC)
|
||||
{
|
||||
struct process_text_input_params params;
|
||||
UINT vkey;
|
||||
|
|
|
@ -56,12 +56,6 @@ typedef struct _IMEPRIVATE {
|
|||
HWND hwndDefault;
|
||||
} IMEPRIVATE, *LPIMEPRIVATE;
|
||||
|
||||
typedef struct _tagTRANSMSG {
|
||||
UINT message;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
} TRANSMSG, *LPTRANSMSG;
|
||||
|
||||
static const WCHAR UI_CLASS_NAME[] = {'W','i','n','e','X','1','1','I','M','E',0};
|
||||
|
||||
static HIMC *hSelectedFrom = NULL;
|
||||
|
@ -618,7 +612,7 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC,BOOL fFlag)
|
|||
}
|
||||
|
||||
UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState,
|
||||
LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC)
|
||||
TRANSMSGLIST *lpdwTransKey, UINT fuState, HIMC hIMC)
|
||||
{
|
||||
/* See the comment at the head of this file */
|
||||
TRACE("We do no processing via this route\n");
|
||||
|
|
|
@ -107,6 +107,19 @@ typedef struct tagCANDIDATEINFO
|
|||
DWORD dwPrivateOffset;
|
||||
} CANDIDATEINFO, *LPCANDIDATEINFO;
|
||||
|
||||
typedef struct tagTRANSMSG
|
||||
{
|
||||
UINT message;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
} TRANSMSG, *LPTRANSMSG;
|
||||
|
||||
typedef struct tagTRANSMSGLIST
|
||||
{
|
||||
UINT uMsgCount;
|
||||
TRANSMSG TransMsg[1];
|
||||
} TRANSMSGLIST, *LPTRANSMSGLIST;
|
||||
|
||||
LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC);
|
||||
BOOL WINAPI ImmUnlockIMC(HIMC);
|
||||
DWORD WINAPI ImmGetIMCLockCount(HIMC);
|
||||
|
@ -162,7 +175,7 @@ LRESULT WINAPI ImeEscape(HIMC, UINT, LPVOID);
|
|||
BOOL WINAPI ImeProcessKey(HIMC, UINT, LPARAM, const LPBYTE);
|
||||
BOOL WINAPI ImeSelect(HIMC, BOOL);
|
||||
BOOL WINAPI ImeSetActiveContext(HIMC, BOOL);
|
||||
UINT WINAPI ImeToAsciiEx(UINT, UINT, const LPBYTE, LPDWORD, UINT, HIMC);
|
||||
UINT WINAPI ImeToAsciiEx(UINT, UINT, const LPBYTE, LPTRANSMSGLIST, UINT, HIMC);
|
||||
BOOL WINAPI NotifyIME(HIMC, DWORD, DWORD, DWORD);
|
||||
BOOL WINAPI ImeRegisterWord(LPCWSTR, DWORD, LPCWSTR);
|
||||
BOOL WINAPI ImeUnregisterWord(LPCWSTR, DWORD, LPCWSTR);
|
||||
|
|
Loading…
Reference in a new issue