As the consensus was that Win32s support is no longer
needed, I decided to remove some ugly Win32s stuff.
File msdos/vxd.c and files dlls/win32s/* should now be the
only files which contain Win32s specific code.
Changelog:
Remove some Win32s specific code.
Index: include/selectors.h
===================================================================
RCS file: /home/wine/wine/include/selectors.h,v
retrieving revision 1.9
diff -u -r1.9 selectors.h
--- include/selectors.h 10 Mar 2002 00:02:34 -0000 1.9
+++ include/selectors.h 19 Nov 2002 17:16:40 -0000
@@ -28,11 +28,6 @@
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))
Index: dlls/kernel/krnl386.exe.spec
===================================================================
RCS file: /home/wine/wine/dlls/kernel/krnl386.exe.spec,v
retrieving revision 1.5
diff -u -r1.5 krnl386.exe.spec
--- dlls/kernel/krnl386.exe.spec 12 Sep 2002 17:24:14 -0000 1.5
+++ dlls/kernel/krnl386.exe.spec 19 Nov 2002 17:17:04 -0000
@@ -188,8 +188,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
Index: msdos/vxd.c
===================================================================
RCS file: /home/wine/wine/msdos/vxd.c,v
retrieving revision 1.41
diff -u -r1.41 vxd.c
--- msdos/vxd.c 4 Nov 2002 22:43:24 -0000 1.41
+++ msdos/vxd.c 19 Nov 2002 17:17:42 -0000
@@ -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" \
Index: memory/selector.c
===================================================================
RCS file: /home/wine/wine/memory/selector.c,v
retrieving revision 1.53
diff -u -r1.53 selector.c
--- memory/selector.c 24 Sep 2002 18:29:40 -0000 1.53
+++ memory/selector.c 19 Nov 2002 17:17:55 -0000
@@ -315,22 +315,7 @@
/***********************************************************************
- * 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 @@
/***********************************************************************
- * 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 )
{
--
Jukka Heinonen <http://www.iki.fi/jhei/>
