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

Don't depend on wine user32 internals

Browse source 
svn path=/trunk/; revision=7892
This commit is contained in:
Gé van Geldorp 2004-01-27 21:54:03 +00:00
parent c778f1be56
commit 18a0b41cb6
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/lib/ole32/ole2.c
View file

@ -1419,15 +1419,13 @@ HRESULT WINAPI OleSetMenuDescriptor(
*/ */
BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* lpwCmd) BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* lpwCmd)
{ {
#if 0 /* Not implemented for ReactOS */ LPACCEL lpAccelTbl;
/* YES, Accel16! */
LPACCEL16 lpAccelTbl;
int i; int i;
if(!lpMsg) return FALSE; if(!lpMsg) return FALSE;
if (!hAccel || !(lpAccelTbl = (LPACCEL16)LockResource16(HACCEL_16(hAccel)))) if (!hAccel)
{ {
WARN_(accel)("invalid accel handle=%p\n", hAccel); WARN_(accel)("NULL accel handle\n");
return FALSE; return FALSE;
} }
if((lpMsg->message != WM_KEYDOWN && if((lpMsg->message != WM_KEYDOWN &&
@ -1435,6 +1433,16 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
lpMsg->message != WM_SYSKEYDOWN && lpMsg->message != WM_SYSKEYDOWN &&
lpMsg->message != WM_SYSKEYUP && lpMsg->message != WM_SYSKEYUP &&
lpMsg->message != WM_CHAR)) return FALSE; lpMsg->message != WM_CHAR)) return FALSE;
lpAccelTbl = HeapAlloc(GetProcessHeap(), 0, cAccelEntries * sizeof(ACCEL));
if (NULL == lpAccelTbl)
{
return FALSE;
}
if (CopyAcceleratorTableW(hAccel, lpAccelTbl, cAccelEntries) != cAccelEntries)
{
WARN_(accel)("CopyAcceleratorTableW failed\n");
return FALSE;
}
TRACE_(accel)("hAccel=%p, cAccelEntries=%d," TRACE_(accel)("hAccel=%p, cAccelEntries=%d,"
"msg->hwnd=%p, msg->message=%04x, wParam=%08x, lParam=%08lx\n", "msg->hwnd=%p, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
@ -1481,14 +1489,13 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
} }
WARN_(accel)("couldn't translate accelerator key\n"); WARN_(accel)("couldn't translate accelerator key\n");
HeapFree(GetProcessHeap(), 0, lpAccelTbl);
return FALSE; return FALSE;
found: found:
if(lpwCmd) *lpwCmd = lpAccelTbl[i].cmd; if(lpwCmd) *lpwCmd = lpAccelTbl[i].cmd;
HeapFree(GetProcessHeap(), 0, lpAccelTbl);
return TRUE; return TRUE;
#else
return FALSE;
#endif
} }
/*********************************************************************** /***********************************************************************