Remove some Win32s specific code.

dlls/kernel/krnl386.exe.spec

@@ -186,8 +186,8 @@
 183 equate __0000H 0
 184 pascal GlobalDOSAlloc(long) GlobalDOSAlloc16
 185 pascal16 GlobalDOSFree(word) GlobalDOSFree16
-186 pascal GetSelectorBase(word) WIN16_GetSelectorBase
-187 pascal16 SetSelectorBase(word long) WIN16_SetSelectorBase
+186 pascal GetSelectorBase(word) GetSelectorBase
+187 pascal16 SetSelectorBase(word long) SetSelectorBase
 188 pascal GetSelectorLimit(word) GetSelectorLimit16
 189 pascal16 SetSelectorLimit(word long) SetSelectorLimit16
 190 equate __E000H 0

include/selectors.h

@@ -28,11 +28,6 @@ extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char fla
 extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size );
 extern void SELECTOR_FreeBlock( WORD sel );
 
-extern UINT W32S_offset;
-
-#define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0)
-#define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0)
-
 #define FIRST_LDT_ENTRY_TO_ALLOC  17
 
 #define IS_SELECTOR_FREE(sel) (!(wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_ALLOCATED))

memory/selector.c

@@ -315,22 +315,7 @@ void WINAPI LongPtrAdd16( DWORD ptr, DWORD add )
 
 
 /***********************************************************************
- *           GetSelectorBase   (KERNEL.186)
- */
-DWORD WINAPI WIN16_GetSelectorBase( WORD sel )
-{
-    /*
-     * Note: For Win32s processes, the whole linear address space is
-     *       shifted by 0x10000 relative to the OS linear address space.
-     *       See the comment in msdos/vxd.c.
-     */
-
-    DWORD base = GetSelectorBase( sel );
-    return W32S_WINE2APP( base );
-}
-
-/***********************************************************************
- *		GetSelectorBase
+ *             GetSelectorBase   (KERNEL.186)
  */
 DWORD WINAPI GetSelectorBase( WORD sel )
 {
@@ -344,22 +329,7 @@ DWORD WINAPI GetSelectorBase( WORD sel )
 
 
 /***********************************************************************
- *           SetSelectorBase   (KERNEL.187)
- */
-DWORD WINAPI WIN16_SetSelectorBase( WORD sel, DWORD base )
-{
-    /*
-     * Note: For Win32s processes, the whole linear address space is
-     *       shifted by 0x10000 relative to the OS linear address space.
-     *       See the comment in msdos/vxd.c.
-     */
-
-    SetSelectorBase( sel, W32S_APP2WINE( base ) );
-    return sel;
-}
-
-/***********************************************************************
- *		SetSelectorBase
+ *             SetSelectorBase   (KERNEL.187)
  */
 WORD WINAPI SetSelectorBase( WORD sel, DWORD base )
 {

msdos/vxd.c

@@ -45,6 +45,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(vxd);
 
+#define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0)
+#define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0)
 
 #define VXD_BARF(context,name) \
     DPRINTF( "vxd %s: unknown/not implemented parameters:\n" \