Skip to content

W
wine-winehq
Commit c6e16c3a authored by Ove Kaaven's avatar Ove Kaaven Committed by Alexandre Julliard
Browse files
Options

I think it's time to rethink the HFILE16_TO_HFILE32 strategy,

can't keep working around flaws in it like this (now stdio was getting closed when programs close handles >=5)
parent 32486cde
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
msdos/int21.c
View file @ c6e16c3a
...@@ -1078,7 +1078,7 @@ void WINAPI DOS3Call( CONTEXT *context ) ...@@ -1078,7 +1078,7 @@ void WINAPI DOS3Call( CONTEXT *context )
DX_reg(context) )); DX_reg(context) ));
int res; int res;
TRACE(int21,"BUFFERED INPUT\n"); TRACE(int21,"BUFFERED INPUT (size=%d)\n",buffer[0]);
if (buffer[1]) if (buffer[1])
TRACE(int21,"Handle old chars in buffer!\n"); TRACE(int21,"Handle old chars in buffer!\n");
res=_lread16( 0, buffer+2,buffer[0]); res=_lread16( 0, buffer+2,buffer[0]);
...@@ -1347,8 +1347,13 @@ void WINAPI DOS3Call( CONTEXT *context ) ...@@ -1347,8 +1347,13 @@ void WINAPI DOS3Call( CONTEXT *context )
case 0x3e: /* "CLOSE" - CLOSE FILE */ case 0x3e: /* "CLOSE" - CLOSE FILE */
TRACE(int21,"CLOSE handle %d\n",BX_reg(context)); TRACE(int21,"CLOSE handle %d\n",BX_reg(context));
if (BX_reg(context)<5) { if ((BX_reg(context)<5)||
/* FIXME: need to improve on those handle conversion macros */
(BX_reg(context)==HFILE32_TO_HFILE16(GetStdHandle(STD_INPUT_HANDLE)))||
(BX_reg(context)==HFILE32_TO_HFILE16(GetStdHandle(STD_OUTPUT_HANDLE)))||
(BX_reg(context)==HFILE32_TO_HFILE16(GetStdHandle(STD_ERROR_HANDLE)))) {
/* hack to make sure stdio isn't closed */ /* hack to make sure stdio isn't closed */
FIXME(int21, "stdio handle closed, need proper conversion\n");
DOS_ExtendedError = 0x06; DOS_ExtendedError = 0x06;
bSetDOSExtendedError = TRUE; bSetDOSExtendedError = TRUE;
} else } else
......
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