Module: wine Branch: master Commit: a3368089fb45975df4e819ebb232008fd1228416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3368089fb45975df4e819ebb...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Aug 17 11:38:06 2021 +0200
gdi32: Avoid using MFDRV_MetaParam* helpers.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/mfdrv/graphics.c | 14 +++++++------- dlls/gdi32/mfdrv/init.c | 13 +++++++++---- dlls/gdi32/mfdrv/metafiledrv.h | 13 +------------ dlls/gdi32/mfdrv/objects.c | 24 ++++++++++++------------ 4 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 933ad0c682c..248de986cee 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -340,7 +340,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) mr->rdParm[10] = rgndata->rdh.rcBound.bottom; mr->rdFunction = META_CREATEREGION; mr->rdSize = Param - (WORD *)mr; - ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2 ); + ret = metadc_record( dev->hdc, mr, mr->rdSize * 2 ); HeapFree( GetProcessHeap(), 0, mr ); HeapFree( GetProcessHeap(), 0, rgndata ); if(!ret) @@ -363,7 +363,7 @@ BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) index = MFDRV_CreateRegion( &mf->dev, hrgn ); if(index == -1) return FALSE; - return MFDRV_MetaParam1( &mf->dev, META_PAINTREGION, index ); + return metadc_param1( hdc, META_PAINTREGION, index ); }
@@ -378,7 +378,7 @@ BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) index = MFDRV_CreateRegion( &mf->dev, hrgn ); if(index == -1) return FALSE; - return MFDRV_MetaParam1( &mf->dev, META_INVERTREGION, index ); + return metadc_param1( hdc, META_INVERTREGION, index ); }
@@ -398,7 +398,7 @@ BOOL METADC_FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) iBrush = MFDRV_CreateBrushIndirect( &mf->dev, hbrush ); if(!iBrush) return FALSE; - return MFDRV_MetaParam2( &mf->dev, META_FILLREGION, iRgn, iBrush ); + return metadc_param2( hdc, META_FILLREGION, iRgn, iBrush ); }
/********************************************************************** @@ -424,7 +424,7 @@ BOOL METADC_FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) iBrush = MFDRV_CreateBrushIndirect( &mf->dev, hbrush ); if(!iBrush) return FALSE; - return MFDRV_MetaParam4( &mf->dev, META_FRAMEREGION, iRgn, iBrush, x, y ); + return metadc_param4( hdc, META_FRAMEREGION, iRgn, iBrush, x, y ); }
@@ -442,8 +442,8 @@ BOOL METADC_ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT mode ) if (!hrgn) return NULLREGION; iRgn = MFDRV_CreateRegion( &metadc->dev, hrgn ); if(iRgn == -1) return ERROR; - ret = MFDRV_MetaParam1( &metadc->dev, META_SELECTOBJECT, iRgn ) ? NULLREGION : ERROR; - MFDRV_MetaParam1( &metadc->dev, META_DELETEOBJECT, iRgn ); + ret = metadc_param1( hdc, META_SELECTOBJECT, iRgn ) ? NULLREGION : ERROR; + metadc_param1( hdc, META_DELETEOBJECT, iRgn ); MFDRV_RemoveHandle( &metadc->dev, iRgn ); return ret; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index e841f0c0fc0..345618ead08 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -378,7 +378,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) * in SDK Knowledgebase Q99334. */
- if (!MFDRV_MetaParam0(dc->physDev, META_EOF)) + if (!metadc_param0( hdc, META_EOF )) { free_dc_ptr( dc ); return 0; @@ -581,12 +581,17 @@ struct metadc *get_metadc_ptr( HDC hdc ) return metafile; }
+BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, unsigned int rlen ) +{ + return MFDRV_WriteRecord( &metadc->dev, mr, rlen ); +} + BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) { - struct metadc *dev; + struct metadc *metadc;
- if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_WriteRecord( &dev->dev, mr, rlen ); + if (!(metadc = get_metadc_ptr( hdc ))) return FALSE; + return metadc_write_record( metadc, mr, rlen ); }
BOOL metadc_param1( HDC hdc, short func, short param ) diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b986855540e..2cb8ab9a5f1 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -46,18 +46,6 @@ struct metadc #define HANDLE_LIST_INC 20
-extern BOOL MFDRV_MetaParam0(PHYSDEV dev, short func) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam1(PHYSDEV dev, short func, short param1) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam2(PHYSDEV dev, short func, short param1, short param2) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam4(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam6(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, - short param6) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, - short param6, short param7, short param8) DECLSPEC_HIDDEN; -extern BOOL MFDRV_WriteRecord(PHYSDEV dev, METARECORD *mr, DWORD rlen) DECLSPEC_HIDDEN; extern UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; @@ -76,6 +64,7 @@ extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6, short param7, short param8 ) DECLSPEC_HIDDEN; extern BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) DECLSPEC_HIDDEN; +extern BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, DWORD rlen ) DECLSPEC_HIDDEN;
/* Metafile driver functions */
diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 34b58ebfe52..dbbb72b67bc 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -112,7 +112,7 @@ void METADC_DeleteObject( HDC hdc, HGDIOBJ obj ) mr.rdFunction = META_DELETEOBJECT; mr.rdParm[0] = index;
- MFDRV_WriteRecord( &metadc->dev, &mr, mr.rdSize*2 ); + metadc_write_record( metadc, &mr, mr.rdSize * 2 );
metadc->handles[index] = 0; metadc->cur_handles--; @@ -122,15 +122,14 @@ void METADC_DeleteObject( HDC hdc, HGDIOBJ obj ) /*********************************************************************** * MFDRV_SelectObject */ -static BOOL MFDRV_SelectObject( PHYSDEV dev, INT16 index) +static BOOL metadc_select_object( HDC hdc, INT16 index) { METARECORD mr;
mr.rdSize = sizeof mr / 2; mr.rdFunction = META_SELECTOBJECT; mr.rdParm[0] = index; - - return MFDRV_WriteRecord( dev, &mr, mr.rdSize*2 ); + return metadc_record( hdc, &mr, mr.rdSize*2 ); }
@@ -209,7 +208,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) FIXME("Unknown brush style %x\n", logbrush.lbStyle); return 0; } - r = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); + r = metadc_record( dev->hdc, mr, mr->rdSize * 2 ); HeapFree(GetProcessHeap(), 0, mr); if( !r ) return -1; @@ -235,7 +234,7 @@ static HBRUSH METADC_SelectBrush( HDC hdc, HBRUSH hbrush ) return 0; GDI_hdc_using_object( hbrush, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->brush; metadc->brush = hbrush; return ret; @@ -273,7 +272,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo /* Zero pad the facename buffer, so that we don't write uninitialized data to disk */ memset(font16->lfFaceName + written, 0, LF_FACESIZE - written);
- if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * 2)) return 0; return MFDRV_AddHandle( dev, hFont ); } @@ -299,7 +298,7 @@ static HFONT METADC_SelectFont( HDC hdc, HFONT hfont ) return 0; GDI_hdc_using_object( hfont, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->font; metadc->font = hfont; return ret; @@ -316,7 +315,7 @@ static UINT16 MFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen, LOGPEN16 *logpen) mr->rdSize = (sizeof(METARECORD) + sizeof(*logpen) - 2) / 2; mr->rdFunction = META_CREATEPENINDIRECT; memcpy(&(mr->rdParm), logpen, sizeof(*logpen)); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * 2 )) return 0; return MFDRV_AddHandle( dev, hPen ); } @@ -370,7 +369,8 @@ static HPEN METADC_SelectPen( HDC hdc, HPEN hpen ) GDI_hdc_using_object( hpen, hdc, METADC_DeleteObject ); }
- if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->pen; metadc->pen = hpen; return ret; @@ -390,7 +390,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP mr->rdSize = (sizeof(METARECORD) + sizeofPalette - sizeof(WORD)) / sizeof(WORD); mr->rdFunction = META_CREATEPALETTE; memcpy(&(mr->rdParm), logPalette, sizeofPalette); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * sizeof(WORD)))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * sizeof(WORD) )) { HeapFree(GetProcessHeap(), 0, mr); return FALSE; @@ -403,7 +403,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP else { *(mr->rdParm) = index; - ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * sizeof(WORD)); + ret = metadc_record( dev->hdc, mr, mr->rdSize * sizeof(WORD) ); } HeapFree(GetProcessHeap(), 0, mr); return ret;