Alexandre Julliard : kernel32: Use FIELD_OFFSET instead of pointer cast.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3eea9a61936484ffef3babe50c812ca41a52b906
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3eea9a61936484ffef3babe50c...

Author: Alexandre Julliard 
Date:   Wed Oct 10 12:38:58 2007 +0200

kernel32: Use FIELD_OFFSET instead of pointer cast.

---

dlls/kernel32/ne_segment.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c
index b4f6e7c..7758d6d 100644
--- a/dlls/kernel32/ne_segment.c
+++ b/dlls/kernel32/ne_segment.c
@@ -694,7 +694,7 @@ static BOOL NE_InitDLL( NE_MODULE *pModule )
     context.SegGs = wine_get_gs();
     context.SegCs = SEL(pSegTable[SELECTOROF(pModule->ne_csip)-1].hSeg);
     context.Eip   = OFFSETOF(pModule->ne_csip);
-    context.Ebp   = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp;
+    context.Ebp   = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp);

pModule->ne_csip = 0;  /* Don't initialize it twice */
     TRACE_(dll)("Calling LibMain for %.*s, cs:ip=%04x:%04x ds=%04x di=%04x cx=%04x\n",
@@ -799,7 +799,7 @@ static void NE_CallDllEntryPoint( NE_MODULE *pModule, DWORD dwReason )
         context.SegGs = wine_get_gs();
         context.SegCs = HIWORD(entryPoint);
         context.Eip   = LOWORD(entryPoint);
-        context.Ebp   = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp;
+        context.Ebp   = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp);

args[7] = HIWORD(dwReason);
         args[6] = LOWORD(dwReason);