ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some Win32s specific code.

This commit is contained in:
Jukka Heinonen 2002-11-20 19:40:12 +00:00 committed by Alexandre Julliard
parent 1a6afad1a4
commit 56dff0d4df
4 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/kernel/krnl386.exe.spec
View File

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

5
include/selectors.h
View File

@ -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 WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size );
extern void SELECTOR_FreeBlock( WORD sel ); 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 FIRST_LDT_ENTRY_TO_ALLOC 17
#define IS_SELECTOR_FREE(sel) (!(wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_ALLOCATED)) #define IS_SELECTOR_FREE(sel) (!(wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_ALLOCATED))

30
memory/selector.c
View File

@ -317,21 +317,6 @@ void WINAPI LongPtrAdd16( DWORD ptr, DWORD add )
/*********************************************************************** /***********************************************************************
* GetSelectorBase (KERNEL.186) * 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
*/
DWORD WINAPI GetSelectorBase( WORD sel ) DWORD WINAPI GetSelectorBase( WORD sel )
{ {
void *base = wine_ldt_copy.base[sel >> __AHSHIFT]; void *base = wine_ldt_copy.base[sel >> __AHSHIFT];
@ -346,21 +331,6 @@ DWORD WINAPI GetSelectorBase( WORD sel )
/*********************************************************************** /***********************************************************************
* SetSelectorBase (KERNEL.187) * 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
*/
WORD WINAPI SetSelectorBase( WORD sel, DWORD base ) WORD WINAPI SetSelectorBase( WORD sel, DWORD base )
{ {
LDT_ENTRY entry; LDT_ENTRY entry;

2
msdos/vxd.c
View File

@ -45,6 +45,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(vxd); 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) \ #define VXD_BARF(context,name) \
DPRINTF( "vxd %s: unknown/not implemented parameters:\n" \ DPRINTF( "vxd %s: unknown/not implemented parameters:\n" \