commit 982a223f362b004b191dff7a49eb5cfc4f9ffa06
author Alexandre Julliard <julliard@winehq.org> Wed Dec 13 20:20:09 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Dec 13 20:20:09 2000 +0000
tree 510d5e2d462693a011868f2a42c9c18ffc33221a
parent f6168db69088c1455525bd2ae8357862ecab649e

Replaced PTR_SEG_TO_LIN macro by exported MapSL function.
Fixed a few ptr/segptr mismatches.
Moved CONV_RECT/POINT macros to wingdi16.h.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index a741b91..bd64dbe 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -16,7 +16,6 @@
 #include "heap.h"
 #include "file.h"
 #include "module.h"
-#include "selectors.h"
 #include "debugtools.h"
 #include "callback.h"
 #include "loadorder.h"
@@ -1748,15 +1747,14 @@
          && (gpOrdinal = NE_GetOrdinal( hModule, "__GP" )) != 0
          && (gpPtr = (SEGPTR)NE_GetEntryPointEx( hModule, gpOrdinal, FALSE )) != 0
          && !IsBadReadPtr16( gpPtr, sizeof(GPHANDLERDEF) )
-         && (gpHandler = PTR_SEG_TO_LIN( gpPtr )) != NULL )
+         && (gpHandler = MapSL( gpPtr )) != NULL )
     {
         while (gpHandler->selector)
         {
             if (    SELECTOROF(address) == gpHandler->selector
                  && OFFSETOF(address)   >= gpHandler->rangeStart
                  && OFFSETOF(address)   <  gpHandler->rangeEnd  )
-                return PTR_SEG_OFF_TO_SEGPTR( gpHandler->selector,
-                                              gpHandler->handler );
+                return MAKESEGPTR( gpHandler->selector, gpHandler->handler );
             gpHandler++;
         }
     }