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

gdi32: Don't hold the GDI lock while calling the driver SelectFont function.

This commit is contained in:
Alexandre Julliard 2007-09-27 21:01:00 +02:00
parent e9f1638de6
commit d78a58298a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/gdi32/font.c
View File

@ -588,14 +588,24 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc,
static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc )
{ {
HGDIOBJ ret = 0; HGDIOBJ ret = 0;
DC *dc = DC_GetDCPtr( hdc ); DC *dc = get_dc_ptr( hdc );
if (!dc) return 0; if (!dc) return 0;
if (!GDI_inc_ref_count( handle ))
{
release_dc_ptr( dc );
return 0;
}
if (dc->hFont != handle || dc->gdiFont == NULL) if (dc->hFont != handle || dc->gdiFont == NULL)
{ {
if(GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_VA_ABLE) if(GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_VA_ABLE)
{
FONTOBJ *font = GDI_GetObjPtr( handle, FONT_MAGIC ); /* to grab the GDI lock (FIXME) */
dc->gdiFont = WineEngCreateFontInstance(dc, handle); dc->gdiFont = WineEngCreateFontInstance(dc, handle);
if (font) GDI_ReleaseObj( handle );
}
} }
if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont ); if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont );
@ -603,15 +613,17 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc )
if (ret && dc->gdiFont) dc->gdiFont = 0; if (ret && dc->gdiFont) dc->gdiFont = 0;
if (ret == HGDI_ERROR) if (ret == HGDI_ERROR)
{
GDI_dec_ref_count( handle );
ret = 0; /* SelectObject returns 0 on error */ ret = 0; /* SelectObject returns 0 on error */
}
else else
{ {
ret = dc->hFont; ret = dc->hFont;
dc->hFont = handle; dc->hFont = handle;
GDI_inc_ref_count( handle );
GDI_dec_ref_count( ret ); GDI_dec_ref_count( ret );
} }
DC_ReleaseDCPtr( dc ); release_dc_ptr( dc );
return ret; return ret;
} }