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

Fixed is_valid_winproc to avoid being optimized out by recent gcc 

versions.
This commit is contained in:
Alexandre Julliard 2004-11-28 15:08:14 +00:00
parent eba27af4f1
commit 675f701dbd
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
windows/winproc.c
View File

@ -138,10 +138,10 @@ static CRITICAL_SECTION winproc_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
static BOOL is_valid_winproc( WINDOWPROC *proc ) static BOOL is_valid_winproc( WINDOWPROC *proc )
{ {
/* check alignment */
if (((BYTE *)proc - (BYTE *)winproc_array) % sizeof(*proc)) return FALSE;
/* check array limits */ /* check array limits */
if (proc < winproc_array || proc >= winproc_array + winproc_used) return FALSE; if (proc < winproc_array || proc >= winproc_array + winproc_used) return FALSE;
/* check alignment */
if (proc != winproc_array + (proc - winproc_array)) return FALSE;
return (proc->type != WIN_PROC_INVALID); return (proc->type != WIN_PROC_INVALID);
} }
@ -514,20 +514,22 @@ static WINDOWPROC *WINPROC_GetPtr( WNDPROC handle )
ptr = (BYTE *)handle; ptr = (BYTE *)handle;
/* First check if it is the jmp address */ /* First check if it is the jmp address */
proc = (WINDOWPROC *)(ptr - (int)&((WINDOWPROC *)0)->jmp); proc = (WINDOWPROC *)(ptr - FIELD_OFFSET(WINDOWPROC,jmp));
if (is_valid_winproc(proc)) return proc; if (is_valid_winproc(proc)) return proc;
/* Now it must be the thunk address */ /* Now it must be the thunk address */
proc = (WINDOWPROC *)(ptr - (int)&((WINDOWPROC *)0)->thunk); proc = (WINDOWPROC *)(ptr - FIELD_OFFSET(WINDOWPROC,thunk));
if (is_valid_winproc(proc)) return proc; if (is_valid_winproc(proc)) return proc;
/* Check for a segmented pointer */ /* Check for a segmented pointer */
ptr = MapSL( (SEGPTR)handle ); if (HIWORD(handle) == get_winproc_selector())
/* It must be the thunk address */ {
proc = (WINDOWPROC *)(ptr - (int)&((WINDOWPROC *)0)->thunk); ptr = (BYTE *)winproc_array + LOWORD(handle);
if (is_valid_winproc(proc)) return proc; /* It must be the thunk address */
proc = (WINDOWPROC *)(ptr - FIELD_OFFSET(WINDOWPROC,thunk));
if (is_valid_winproc(proc)) return proc;
}
return NULL; return NULL;
} }