ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Use a proper structure for thunks instead of an array of WORDs.

This commit is contained in:
Alexandre Julliard 2008-07-03 18:15:03 +02:00
parent d8202087c7
commit f3bf2a7045
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/kernel32/task.c
View File

@ -49,6 +49,14 @@ WINE_DECLARE_DEBUG_CHANNEL(toolhelp);
#include "pshpack1.h" #include "pshpack1.h"
struct thunk
{
BYTE movw;
HANDLE16 instance;
BYTE ljmp;
FARPROC16 func;
};
/* Segment containing MakeProcInstance() thunks */ /* Segment containing MakeProcInstance() thunks */
typedef struct typedef struct
{ {
@ -56,7 +64,7 @@ typedef struct
WORD magic; /* Thunks signature */ WORD magic; /* Thunks signature */
WORD unused; WORD unused;
WORD free; /* Head of the free list */ WORD free; /* Head of the free list */
WORD thunks[4]; /* Each thunk is 4 words long */ struct thunk thunks[1];
} THUNKS; } THUNKS;
#include "poppack.h" #include "poppack.h"
@ -163,20 +171,15 @@ static void TASK_UnlinkTask( HTASK16 hTask )
static void TASK_CreateThunks( HGLOBAL16 handle, WORD offset, WORD count ) static void TASK_CreateThunks( HGLOBAL16 handle, WORD offset, WORD count )
{ {
int i; int i;
WORD free;
THUNKS *pThunk; THUNKS *pThunk;
pThunk = (THUNKS *)((BYTE *)GlobalLock16( handle ) + offset); pThunk = (THUNKS *)((BYTE *)GlobalLock16( handle ) + offset);
pThunk->next = 0; pThunk->next = 0;
pThunk->magic = THUNK_MAGIC; pThunk->magic = THUNK_MAGIC;
pThunk->free = (int)&pThunk->thunks - (int)pThunk; pThunk->free = FIELD_OFFSET( THUNKS, thunks );
free = pThunk->free;
for (i = 0; i < count-1; i++) for (i = 0; i < count-1; i++)
{ *(WORD *)&pThunk->thunks[i] = FIELD_OFFSET( THUNKS, thunks[i+1] );
free += 8; /* Offset of next thunk */ *(WORD *)&pThunk->thunks[i] = 0; /* Last thunk */
pThunk->thunks[4*i] = free;
}
pThunk->thunks[4*i] = 0; /* Last thunk */
} }
@ -845,7 +848,8 @@ HTASK16 WINAPI KERNEL_490( HTASK16 someTask )
*/ */
FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance ) FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
{ {
BYTE *thunk,*lfunc; struct thunk *thunk;
BYTE *lfunc;
SEGPTR thunkaddr; SEGPTR thunkaddr;
WORD hInstanceSelector; WORD hInstanceSelector;
@ -891,11 +895,10 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
WARN("This was the (in)famous \"thunk useless\" warning. We thought we have to overwrite with nop;nop;, but this isn't true.\n"); WARN("This was the (in)famous \"thunk useless\" warning. We thought we have to overwrite with nop;nop;, but this isn't true.\n");
} }
*thunk++ = 0xb8; /* movw instance, %ax */ thunk->movw = 0xb8; /* movw instance, %ax */
*thunk++ = (BYTE)(hInstanceSelector & 0xff); thunk->instance = hInstanceSelector;
*thunk++ = (BYTE)(hInstanceSelector >> 8); thunk->ljmp = 0xea; /* ljmp func */
*thunk++ = 0xea; /* ljmp func */ thunk->func = func;
*(DWORD *)thunk = (DWORD)func;
return (FARPROC16)thunkaddr; return (FARPROC16)thunkaddr;
/* CX reg indicates if thunkaddr != NULL, implement if needed */ /* CX reg indicates if thunkaddr != NULL, implement if needed */
} }