Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 15:08:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] ValidateHwndNoErr(): Apply ReactOS-specific handle table array fixup. (#3937)

Browse source 
CORE-17741

This function (which should belong to the user32 helpers) depends on the
internal format of the USER handles table, that is ReactOS-specific. Its
pointer value is stored in the win32k/user32 shared info section, and
thus cannot be converted to user-space and stored back into that section.
Therefore it needs to be retrieved and manually converted when the function
is called.
This commit is contained in:
Hermès Bélusca-Maïto 2021-09-07 22:05:54 +02:00
parent 4cbc61fd02
commit 0233bb72b3
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,7 @@ static PWND FASTCALL ValidateHwndNoErr(HWND hwnd)
PCLIENTINFO ClientInfo = GetWin32ClientInfo();
INT index;
PUSER_HANDLE_TABLE ht;
PUSER_HANDLE_ENTRY he;
WORD generation;
/* See if the window is cached */
@ -76,15 +77,20 @@ static PWND FASTCALL ValidateHwndNoErr(HWND hwnd)
return NULL;
ht = g_SharedInfo.aheList; /* handle table */
ASSERT(ht);
/* ReactOS-Specific! */
ASSERT(g_SharedInfo.ulSharedDelta != 0);
he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - g_SharedInfo.ulSharedDelta);
index = (LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1;
if (index < 0 || index >= ht->nb_handles || ht->handles[index].type != TYPE_WINDOW)
if (index < 0 || index >= ht->nb_handles || he[index].type != TYPE_WINDOW)
return NULL;
generation = HIWORD(hwnd);
if (generation != ht->handles[index].generation && generation && generation != 0xFFFF)
if (generation != he[index].generation && generation && generation != 0xFFFF)
return NULL;
return (PWND)&ht->handles[index];
return (PWND)&he[index];
}
static BOOL APIENTRY Imm32InitInstance(HMODULE hMod)