system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Terminating DOS program in real mode now calls ExitThread which is

Browse source 
exactly what terminating in protected mode does.
This commit is contained in:
Jukka Heinonen 2002-05-05 20:22:39 +00:00 committed by Alexandre Julliard
parent 8a1ac6edf4
commit 887ed6228a
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/winedos/dosexe.h
View file

@ -53,7 +53,7 @@ extern void WINAPI MZ_AllocDPMITask( void );
extern void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg );
extern INT WINAPI DOSVM_Enter( CONTEXT86 *context );
extern void WINAPI DOSVM_Wait( INT read_pipe, HANDLE hObject );
extern DWORD WINAPI DOSVM_Loop( LPVOID lpExtra );
extern DWORD WINAPI DOSVM_Loop( HANDLE hThread );
extern void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data );
extern void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val );
extern void WINAPI DOSVM_SetTimer( UINT ticks );

17
dlls/winedos/dosvm.c
View file

@ -370,19 +370,30 @@ chk_console_input:
} while (TRUE);
}
DWORD WINAPI DOSVM_Loop( LPVOID lpExtra )
DWORD WINAPI DOSVM_Loop( HANDLE hThread )
{
HANDLE obj = GetStdHandle(STD_INPUT_HANDLE);
HANDLE objs[2];
MSG msg;
DWORD waitret;
objs[0] = GetStdHandle(STD_INPUT_HANDLE);
objs[1] = hThread;
for(;;) {
TRACE_(int)("waiting for action\n");
waitret = MsgWaitForMultipleObjects(1, &obj, FALSE, INFINITE, QS_ALLINPUT);
waitret = MsgWaitForMultipleObjects(2, objs, FALSE, INFINITE, QS_ALLINPUT);
if (waitret == WAIT_OBJECT_0) {
DOSVM_ProcessConsole();
}
else if (waitret == WAIT_OBJECT_0 + 1) {
DWORD rv;
if(!GetExitCodeThread(hThread, &rv)) {
ERR("Failed to get thread exit code!\n");
rv = 0;
}
return rv;
}
else if (waitret == WAIT_OBJECT_0 + 2) {
while (PeekMessageA(&msg,0,0,0,PM_REMOVE)) {
if (msg.hwnd) {
/* it's a window message */

17
dlls/winedos/module.c
View file

@ -94,7 +94,6 @@ static DWORD dosvm_tid, loop_tid;
static void MZ_Launch(void);
static BOOL MZ_InitTask(void);
static void MZ_KillTask(void);
static void MZ_CreatePSP( LPVOID lpPSP, WORD env, WORD par )
{
@ -474,6 +473,7 @@ static void MZ_Launch(void)
TDB *pTask = TASK_GetCurrent();
BYTE *psp_start = PTR_REAL_TO_LIN( DOSVM_psp, 0 );
LPSTR cmdline = GetCommandLineA();
DWORD rv;
MZ_FillPSP(psp_start, cmdline, cmdline ? strlen(cmdline) : 0);
pTask->flags |= TDBF_WINOLDAP;
@ -481,20 +481,15 @@ static void MZ_Launch(void)
_LeaveWin16Lock();
ResumeThread(dosvm_thread);
DOSVM_Loop(NULL);
ExitThread(0);
}
rv = DOSVM_Loop(dosvm_thread);
static void MZ_KillTask(void)
{
TRACE("killing DOS task\n");
VGA_Clean();
PostThreadMessageA(loop_tid, WM_QUIT, 0, 0);
WaitForSingleObject(loop_thread, INFINITE); /* ? */
CloseHandle(dosvm_thread);
dosvm_thread = 0; dosvm_tid = 0;
CloseHandle(loop_thread);
loop_thread = 0; loop_tid = 0;
VGA_Clean();
ExitThread(rv);
}
/***********************************************************************
@ -531,7 +526,7 @@ void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
context->Esp = OFFSETOF(psp->saveStack);
return;
} else
MZ_KillTask();
TRACE("killing DOS task\n");
}
ExitThread( retval );
}