From 394e0eb19b2fcff9dac604dacc0c754bf553bdb6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 26 Nov 2000 22:42:49 +0000 Subject: [PATCH] Moved UTSelectorOffsetToLinear and UTLinearToSelectorOffset to dlls/win32s. --- dlls/win32s/win32s16.c | 22 ++++++++++++++++++++++ memory/selector.c | 21 --------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/win32s/win32s16.c b/dlls/win32s/win32s16.c index d815bccef68..8736c975bae 100644 --- a/dlls/win32s/win32s16.c +++ b/dlls/win32s/win32s16.c @@ -9,6 +9,7 @@ #include #include "windef.h" #include "wine/windef16.h" +#include "selectors.h" #include "debugtools.h" DEFAULT_DEBUG_CHANNEL(dll); @@ -31,3 +32,24 @@ SEGPTR WINAPI StackLinearToSegmented16(WORD w1, WORD w2) FIXME("(%d,%d):stub.\n",w1,w2); return (SEGPTR)NULL; } + + +/*********************************************************************** + * UTSelectorOffsetToLinear16 (WIN32S16.48) + * + * rough guesswork, but seems to work (I had no "reasonable" docu) + */ +LPVOID WINAPI UTSelectorOffsetToLinear16(SEGPTR sptr) +{ + return PTR_SEG_TO_LIN(sptr); +} + +/*********************************************************************** + * UTLinearToSelectorOffset16 (WIN32S16.49) + * + * FIXME: I don't know if that's the right way to do linear -> segmented + */ +SEGPTR WINAPI UTLinearToSelectorOffset16(LPVOID lptr) +{ + return (SEGPTR)lptr; +} diff --git a/memory/selector.c b/memory/selector.c index 9d31b2b8786..7f48f83c859 100644 --- a/memory/selector.c +++ b/memory/selector.c @@ -857,27 +857,6 @@ void WINAPI FreeMappedBuffer( CONTEXT86 *context ) } } - -/*********************************************************************** - * UTSelectorOffsetToLinear (WIN32S16.48) - * - * rough guesswork, but seems to work (I had no "reasonable" docu) - */ -LPVOID WINAPI UTSelectorOffsetToLinear16(SEGPTR sptr) -{ - return PTR_SEG_TO_LIN(sptr); -} - -/*********************************************************************** - * UTLinearToSelectorOffset (WIN32S16.49) - * - * FIXME: I don't know if that's the right way to do linear -> segmented - */ -SEGPTR WINAPI UTLinearToSelectorOffset16(LPVOID lptr) -{ - return (SEGPTR)lptr; -} - #ifdef __i386__ __ASM_GLOBAL_FUNC( __get_cs, "movw %cs,%ax\n\tret" ) __ASM_GLOBAL_FUNC( __get_ds, "movw %ds,%ax\n\tret" )