mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:54:13 +00:00
Avoid deadlock in VGA_DoSetMode.
This commit is contained in:
parent
470a3f93eb
commit
4a0a2ee00e
1 changed files with 13 additions and 13 deletions
|
@ -232,6 +232,18 @@ typedef struct {
|
|||
int ret;
|
||||
} ModeSet;
|
||||
|
||||
static void WINAPI VGA_DoExit(ULONG_PTR arg)
|
||||
{
|
||||
VGA_DeinstallTimer();
|
||||
IDirectDrawSurface_SetPalette(lpddsurf,NULL);
|
||||
IDirectDrawSurface_Release(lpddsurf);
|
||||
lpddsurf=NULL;
|
||||
IDirectDrawPalette_Release(lpddpal);
|
||||
lpddpal=NULL;
|
||||
IDirectDraw_Release(lpddraw);
|
||||
lpddraw=NULL;
|
||||
}
|
||||
|
||||
static void WINAPI VGA_DoSetMode(ULONG_PTR arg)
|
||||
{
|
||||
LRESULT res;
|
||||
|
@ -239,7 +251,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg)
|
|||
ModeSet *par = (ModeSet *)arg;
|
||||
par->ret=1;
|
||||
|
||||
if (lpddraw) VGA_Exit();
|
||||
if (lpddraw) VGA_DoExit(NULL);
|
||||
if (!lpddraw) {
|
||||
if (!pDirectDrawCreate)
|
||||
{
|
||||
|
@ -334,18 +346,6 @@ int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void WINAPI VGA_DoExit(ULONG_PTR arg)
|
||||
{
|
||||
VGA_DeinstallTimer();
|
||||
IDirectDrawSurface_SetPalette(lpddsurf,NULL);
|
||||
IDirectDrawSurface_Release(lpddsurf);
|
||||
lpddsurf=NULL;
|
||||
IDirectDrawPalette_Release(lpddpal);
|
||||
lpddpal=NULL;
|
||||
IDirectDraw_Release(lpddraw);
|
||||
lpddraw=NULL;
|
||||
}
|
||||
|
||||
void VGA_Exit(void)
|
||||
{
|
||||
if (lpddraw) MZ_RunInThread(VGA_DoExit, 0);
|
||||
|
|
Loading…
Reference in a new issue