Commit 3967b091 authored by Ulrich Weigand's avatar Ulrich Weigand Committed by Alexandre Julliard

Make CallTo16 return stub segment owned by KERNEL.

parent a2d5bb39
...@@ -40,8 +40,9 @@ BOOL RELAY_Init(void) ...@@ -40,8 +40,9 @@ BOOL RELAY_Init(void)
extern DWORD CALL32_CBClientEx_RetAddr; extern DWORD CALL32_CBClientEx_RetAddr;
codesel = GLOBAL_CreateBlock( GMEM_FIXED, (void *)Call16_Ret_Start, codesel = GLOBAL_CreateBlock( GMEM_FIXED, (void *)Call16_Ret_Start,
(int)Call16_Ret_End - (int)Call16_Ret_Start, (int)Call16_Ret_End - (int)Call16_Ret_Start,
0, TRUE, TRUE, FALSE, NULL ); GetModuleHandle16( "KERNEL" ),
TRUE, TRUE, FALSE, NULL );
if (!codesel) return FALSE; if (!codesel) return FALSE;
/* Patch the return addresses for CallTo16 routines */ /* Patch the return addresses for CallTo16 routines */
......
...@@ -101,9 +101,6 @@ BOOL MAIN_MainInit(void) ...@@ -101,9 +101,6 @@ BOOL MAIN_MainInit(void)
/* Read DOS config.sys */ /* Read DOS config.sys */
if (!DOSCONF_ReadConfig()) return FALSE; if (!DOSCONF_ReadConfig()) return FALSE;
/* Initialize relay code */
if (!RELAY_Init()) return FALSE;
return TRUE; return TRUE;
} }
...@@ -155,6 +152,10 @@ BOOL WINAPI MAIN_KernelInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReser ...@@ -155,6 +152,10 @@ BOOL WINAPI MAIN_KernelInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReser
NE_SetEntryPoint( hModule, 194, DOSMEM_BiosSysSeg ); /* KERNEL.194: __F000H */ NE_SetEntryPoint( hModule, 194, DOSMEM_BiosSysSeg ); /* KERNEL.194: __F000H */
#undef SET_ENTRY_POINT #undef SET_ENTRY_POINT
} }
/* Initialize relay code */
if (!RELAY_Init()) return FALSE;
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment