Jacek Caban : gdi32: Remove no longer needed metafile helpers.
Alexandre Julliard
julliard at winehq.org
Tue Aug 17 16:26:52 CDT 2021
Module: wine
Branch: master
Commit: 728f96bf8ac8fc44fa234a65c5e0b0122c8840b9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=728f96bf8ac8fc44fa234a65c5e0b0122c8840b9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Aug 17 11:38:50 2021 +0200
gdi32: Remove no longer needed metafile helpers.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdi32/mfdrv/init.c | 236 ++++++++++++++----------------------------------
1 file changed, 67 insertions(+), 169 deletions(-)
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index 345618ead08..356319f36eb 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -427,165 +427,34 @@ HMETAFILE WINAPI CloseMetaFile(HDC hdc)
}
-/******************************************************************
- * MFDRV_WriteRecord
- *
- * Warning: this function can change the pointer to the metafile header.
- */
-BOOL MFDRV_WriteRecord( PHYSDEV dev, METARECORD *mr, DWORD rlen)
+struct metadc *get_metadc_ptr( HDC hdc )
+{
+ struct metadc *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC );
+ if (!metafile) SetLastError( ERROR_INVALID_HANDLE );
+ return metafile;
+}
+
+BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, unsigned int rlen )
{
DWORD len, size;
METAHEADER *mh;
- struct metadc *physDev = (struct metadc *)dev;
- len = physDev->mh->mtSize * 2 + rlen;
- /* reallocate memory if needed */
- size = HeapSize( GetProcessHeap(), 0, physDev->mh );
+ len = metadc->mh->mtSize * sizeof(WORD) + rlen;
+ size = HeapSize( GetProcessHeap(), 0, metadc->mh );
if (len > size)
{
- /*expand size*/
- size += size / 2 + rlen;
- mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size);
+ size += size / sizeof(WORD) + rlen;
+ mh = HeapReAlloc( GetProcessHeap(), 0, metadc->mh, size );
if (!mh) return FALSE;
- physDev->mh = mh;
- TRACE("Reallocated metafile: new size is %d\n",size);
+ metadc->mh = mh;
}
- memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen);
+ memcpy( (WORD *)metadc->mh + metadc->mh->mtSize, mr, rlen );
- physDev->mh->mtSize += rlen / 2;
- physDev->mh->mtMaxRecord = max(physDev->mh->mtMaxRecord, rlen / 2);
+ metadc->mh->mtSize += rlen / sizeof(WORD);
+ metadc->mh->mtMaxRecord = max( metadc->mh->mtMaxRecord, rlen / sizeof(WORD) );
return TRUE;
}
-
-/******************************************************************
- * MFDRV_MetaParam0
- */
-
-BOOL MFDRV_MetaParam0(PHYSDEV dev, short func)
-{
- char buffer[8];
- METARECORD *mr = (METARECORD *)&buffer;
-
- mr->rdSize = 3;
- mr->rdFunction = func;
- return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
-}
-
-
-/******************************************************************
- * MFDRV_MetaParam1
- */
-BOOL MFDRV_MetaParam1(PHYSDEV dev, short func, short param1)
-{
- char buffer[8];
- METARECORD *mr = (METARECORD *)&buffer;
- WORD *params = mr->rdParm;
-
- mr->rdSize = 4;
- mr->rdFunction = func;
- params[0] = param1;
- return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
-}
-
-
-/******************************************************************
- * MFDRV_MetaParam2
- */
-BOOL MFDRV_MetaParam2(PHYSDEV dev, short func, short param1, short param2)
-{
- char buffer[10];
- METARECORD *mr = (METARECORD *)&buffer;
- WORD *params = mr->rdParm;
-
- mr->rdSize = 5;
- mr->rdFunction = func;
- params[0] = param2;
- params[1] = param1;
- return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
-}
-
-
-/******************************************************************
- * MFDRV_MetaParam4
- */
-
-BOOL MFDRV_MetaParam4(PHYSDEV dev, short func, short param1, short param2,
- short param3, short param4)
-{
- char buffer[14];
- METARECORD *mr = (METARECORD *)&buffer;
- WORD *params = mr->rdParm;
-
- mr->rdSize = 7;
- mr->rdFunction = func;
- params[0] = param4;
- params[1] = param3;
- params[2] = param2;
- params[3] = param1;
- return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
-}
-
-
-/******************************************************************
- * MFDRV_MetaParam6
- */
-
-BOOL MFDRV_MetaParam6(PHYSDEV dev, short func, short param1, short param2,
- short param3, short param4, short param5, short param6)
-{
- char buffer[18];
- METARECORD *mr = (METARECORD *)&buffer;
- WORD *params = mr->rdParm;
-
- mr->rdSize = 9;
- mr->rdFunction = func;
- params[0] = param6;
- params[1] = param5;
- params[2] = param4;
- params[3] = param3;
- params[4] = param2;
- params[5] = param1;
- return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
-}
-
-
-/******************************************************************
- * MFDRV_MetaParam8
- */
-BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2,
- short param3, short param4, short param5,
- short param6, short param7, short param8)
-{
- char buffer[22];
- METARECORD *mr = (METARECORD *)&buffer;
- WORD *params = mr->rdParm;
-
- mr->rdSize = 11;
- mr->rdFunction = func;
- params[0] = param8;
- params[1] = param7;
- params[2] = param6;
- params[3] = param5;
- params[4] = param4;
- params[5] = param3;
- params[6] = param2;
- params[7] = param1;
- return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
-}
-
-struct metadc *get_metadc_ptr( HDC hdc )
-{
- struct metadc *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC );
- if (!metafile) SetLastError( ERROR_INVALID_HANDLE );
- 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 *metadc;
@@ -594,37 +463,50 @@ BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen )
return metadc_write_record( metadc, mr, rlen );
}
-BOOL metadc_param1( HDC hdc, short func, short param )
+BOOL metadc_param0( HDC hdc, short func )
{
- struct metadc *dev;
+ METARECORD mr;
- if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
- return MFDRV_MetaParam1( &dev->dev, func, param );
+ mr.rdSize = FIELD_OFFSET(METARECORD, rdParm[0]) / sizeof(WORD);
+ mr.rdFunction = func;
+ return metadc_record( hdc, &mr, mr.rdSize * sizeof(WORD) );
}
-BOOL metadc_param0( HDC hdc, short func )
+BOOL metadc_param1( HDC hdc, short func, short param )
{
- struct metadc *dev;
+ METARECORD mr;
- if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
- return MFDRV_MetaParam0( &dev->dev, func );
+ mr.rdSize = sizeof(mr) / sizeof(WORD);
+ mr.rdFunction = func;
+ mr.rdParm[0] = param;
+ return metadc_record( hdc, &mr, mr.rdSize * sizeof(WORD) );
}
BOOL metadc_param2( HDC hdc, short func, short param1, short param2 )
{
- struct metadc *dev;
+ char buffer[FIELD_OFFSET(METARECORD, rdParm[2])];
+ METARECORD *mr = (METARECORD *)&buffer;
- if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
- return MFDRV_MetaParam2( &dev->dev, func, param1, param2 );
+ mr->rdSize = sizeof(buffer) / sizeof(WORD);
+ mr->rdFunction = func;
+ mr->rdParm[0] = param2;
+ mr->rdParm[1] = param1;
+ return metadc_record( hdc, mr, sizeof(buffer) );
}
BOOL metadc_param4( HDC hdc, short func, short param1, short param2,
short param3, short param4 )
{
- struct metadc *dev;
+ char buffer[FIELD_OFFSET(METARECORD, rdParm[4])];
+ METARECORD *mr = (METARECORD *)&buffer;
- if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
- return MFDRV_MetaParam4( &dev->dev, func, param1, param2, param3, param4 );
+ mr->rdSize = sizeof(buffer) / sizeof(WORD);
+ mr->rdFunction = func;
+ mr->rdParm[0] = param4;
+ mr->rdParm[1] = param3;
+ mr->rdParm[2] = param2;
+ mr->rdParm[3] = param1;
+ return metadc_record( hdc, mr, sizeof(buffer) );
}
BOOL metadc_param5( HDC hdc, short func, short param1, short param2,
@@ -647,20 +529,36 @@ BOOL metadc_param6( HDC hdc, short func, short param1, short param2,
short param3, short param4, short param5,
short param6 )
{
- struct metadc *dev;
+ char buffer[FIELD_OFFSET(METARECORD, rdParm[6])];
+ METARECORD *mr = (METARECORD *)&buffer;
- if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
- return MFDRV_MetaParam6( &dev->dev, func, param1, param2, param3,
- param4, param5, param6 );
+ mr->rdSize = sizeof(buffer) / sizeof(WORD);
+ mr->rdFunction = func;
+ mr->rdParm[0] = param6;
+ mr->rdParm[1] = param5;
+ mr->rdParm[2] = param4;
+ mr->rdParm[3] = param3;
+ mr->rdParm[4] = param2;
+ mr->rdParm[5] = param1;
+ return metadc_record( hdc, mr, sizeof(buffer) );
}
BOOL metadc_param8( HDC hdc, short func, short param1, short param2,
short param3, short param4, short param5,
short param6, short param7, short param8)
{
- struct metadc *dev;
+ char buffer[FIELD_OFFSET(METARECORD, rdParm[8])];
+ METARECORD *mr = (METARECORD *)&buffer;
- if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
- return MFDRV_MetaParam8( &dev->dev, func, param1, param2, param3,
- param4, param5, param6, param7, param8 );
+ mr->rdSize = sizeof(buffer) / sizeof(WORD);
+ mr->rdFunction = func;
+ mr->rdParm[0] = param8;
+ mr->rdParm[1] = param7;
+ mr->rdParm[2] = param6;
+ mr->rdParm[3] = param5;
+ mr->rdParm[4] = param4;
+ mr->rdParm[5] = param3;
+ mr->rdParm[6] = param2;
+ mr->rdParm[7] = param1;
+ return metadc_record( hdc, mr, sizeof(buffer) );
}
More information about the wine-cvs
mailing list