From 4e7b8f4a7b7701826b671db6f5277f5dc0abc86a Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Mon, 12 Dec 2005 13:02:35 +0100 Subject: [PATCH] kernel32: Get rid of DOSMEM_AllocSelector. --- dlls/kernel/dosmem.c | 16 ---------------- dlls/kernel/kernel32.spec | 5 ----- dlls/kernel/kernel_private.h | 1 - dlls/winedos/int31.c | 4 +++- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c index 7bb1b248bf2..30ca6cfea15 100644 --- a/dlls/kernel/dosmem.c +++ b/dlls/kernel/dosmem.c @@ -254,19 +254,3 @@ LPVOID DOSMEM_MapRealToLinear(DWORD x) TRACE_(selector)("(0x%08lx) returns %p.\n", x, lin ); return lin; } - -/*********************************************************************** - * DOSMEM_AllocSelector - * - * Allocates a protected mode selector for a realmode segment. - */ -WORD DOSMEM_AllocSelector(WORD realsel) -{ - HMODULE16 hModule = GetModuleHandle16("KERNEL"); - WORD sel; - - sel=GLOBAL_CreateBlock( GMEM_FIXED, DOSMEM_dosmem+realsel*16, DOSMEM_64KB, - hModule, WINE_LDT_FLAGS_DATA ); - TRACE_(selector)("(0x%04x) returns 0x%04x.\n", realsel,sel); - return sel; -} diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 701eecd8fe0..260c6f6b091 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1255,8 +1255,3 @@ # Init code @ cdecl __wine_kernel_init() - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl DOSMEM_AllocSelector(long) diff --git a/dlls/kernel/kernel_private.h b/dlls/kernel/kernel_private.h index 3ed5f67a1a5..98195d4e7ba 100644 --- a/dlls/kernel/kernel_private.h +++ b/dlls/kernel/kernel_private.h @@ -110,7 +110,6 @@ extern WORD DOSMEM_BiosSysSeg; /* dosmem.c */ extern BOOL DOSMEM_Init(void); -extern WORD DOSMEM_AllocSelector(WORD); extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */ extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */ extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 94b6a31bebc..e34b72031bf 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -913,7 +913,9 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) case 0xe000: entryPoint = 190; break; /* __E000H */ case 0xf000: entryPoint = 194; break; /* __F000H */ default: - SET_AX( context, DOSMEM_AllocSelector(BX_reg(context)) ); + FIXME("Real mode segment (%x) to descriptor: no longer supported\n", + BX_reg(context)); + SET_CFLAG( context ); break; } if (entryPoint) -- 2.11.4.GIT