ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineconsole: Avoid reentering WINECON_GrabChanges.

This commit is contained in:
Alexandre Julliard 2011-09-08 22:27:41 +02:00
parent a763c7dbc8
commit 4a14811527
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/wineconsole/winecon_private.h
View File

@ -61,6 +61,7 @@ struct inner_data {
HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ HWND hWnd; /* handle of 'user' window or NULL for 'curses' */
INT nCmdShow; /* argument of WinMain */ INT nCmdShow; /* argument of WinMain */
BOOL in_set_config; /* to handle re-entrant calls to WINECON_SetConfig */ BOOL in_set_config; /* to handle re-entrant calls to WINECON_SetConfig */
BOOL in_grab_changes;/* to handle re-entrant calls to WINECON_GrabChanges */
BOOL dying; /* to TRUE when we've been notified by server that child has died */ BOOL dying; /* to TRUE when we've been notified by server that child has died */
int (*fnMainLoop)(struct inner_data* data); int (*fnMainLoop)(struct inner_data* data);

4
programs/wineconsole/wineconsole.c
View File

@ -205,6 +205,8 @@ void WINECON_GrabChanges(struct inner_data* data)
int i, num, ev_found; int i, num, ev_found;
HANDLE h; HANDLE h;
if (data->in_grab_changes) return;
SERVER_START_REQ( get_console_renderer_events ) SERVER_START_REQ( get_console_renderer_events )
{ {
wine_server_set_reply( req, evts, sizeof(evts) ); wine_server_set_reply( req, evts, sizeof(evts) );
@ -258,6 +260,7 @@ void WINECON_GrabChanges(struct inner_data* data)
ev_found = i; ev_found = i;
} }
data->in_grab_changes = TRUE;
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
{ {
switch (evts[i].event) switch (evts[i].event)
@ -355,6 +358,7 @@ void WINECON_GrabChanges(struct inner_data* data)
WINE_FIXME("Unknown event type (%d)\n", evts[i].event); WINE_FIXME("Unknown event type (%d)\n", evts[i].event);
} }
} }
data->in_grab_changes = FALSE;
} }
/****************************************************************** /******************************************************************