marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineconsole: Move the curses critical section inside the private data.

oldstable
Eric Pouech 2010-11-28 22:10:49 +01:00 committed by Alexandre Julliard
parent ead4712606
commit ac256c7352
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/wineconsole/curses.c
View File

@ -73,13 +73,12 @@ struct inner_data_curse
unsigned long initial_mouse_mask;
int sync_pipe[2];
HANDLE input_thread;
CRITICAL_SECTION lock;
WINDOW* pad;
chtype* line;
int allow_scroll;
};
static CRITICAL_SECTION WCCURSES_CritSect;
static void *nc_handle = NULL;
#ifdef initscr /* work around Solaris breakage */
@ -953,7 +952,7 @@ static DWORD CALLBACK input_thread( void *arg )
if (!(pfd[0].revents & POLLIN)) continue;
/* we're called from input thread (not main thread), so force unique access */
EnterCriticalSection(&WCCURSES_CritSect);
EnterCriticalSection(&PRIVATE(data)->lock);
if ((inchar = wgetch(stdscr)) != ERR)
{
WINE_TRACE("Got o%o (0x%x)\n", inchar,inchar);
@ -965,7 +964,7 @@ static DWORD CALLBACK input_thread( void *arg )
if (numEvent) WriteConsoleInputW(data->hConIn, ir, numEvent, &n);
}
LeaveCriticalSection(&WCCURSES_CritSect);
LeaveCriticalSection(&PRIVATE(data)->lock);
}
close( PRIVATE(data)->sync_pipe[0] );
return 0;
@ -986,6 +985,7 @@ static void WCCURSES_DeleteBackend(struct inner_data* data)
WaitForSingleObject( PRIVATE(data)->input_thread, INFINITE );
CloseHandle( PRIVATE(data)->input_thread );
}
DeleteCriticalSection(&PRIVATE(data)->lock);
delwin(PRIVATE(data)->pad);
#ifdef HAVE_MOUSEMASK
@ -1018,9 +1018,9 @@ static int WCCURSES_MainLoop(struct inner_data* data)
while (cont && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0)
{
EnterCriticalSection(&WCCURSES_CritSect);
EnterCriticalSection(&PRIVATE(data)->lock);
cont = WINECON_GrabChanges(data);
LeaveCriticalSection(&WCCURSES_CritSect);
LeaveCriticalSection(&PRIVATE(data)->lock);
}
close( PRIVATE(data)->sync_pipe[1] );
@ -1103,6 +1103,7 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data)
PRIVATE(data)->initial_mouse_mask = mm;
}
#endif
InitializeCriticalSection(&PRIVATE(data)->lock);
return init_success;
}