From: Piotr Caban piotr@codeweavers.com
--- dlls/gdi32/emfdc.c | 6 +++--- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 45587503330..bf35450cfb3 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -451,7 +451,7 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) * FIXME: It may be that the DIB functions themselves accept this value. */ emr->emr.iType = EMR_CREATEMONOBRUSH; - usage = DIB_PAL_MONO; + usage = DIB_PAL_INDICES; emr->cbBmi = sizeof( BITMAPINFOHEADER ); } else @@ -1617,7 +1617,7 @@ BOOL EMFDC_MaskBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT h emr->cbBitsSrc = src_info.bmiHeader.biSizeImage; emr->xMask = x_mask; emr->yMask = y_mask; - emr->iUsageMask = DIB_PAL_MONO; + emr->iUsageMask = DIB_PAL_INDICES; emr->offBmiMask = mask_info_size ? emr->offBitsSrc + emr->cbBitsSrc : 0; emr->cbBmiMask = mask_info_size; emr->offBitsMask = emr->offBmiMask + emr->cbBmiMask; @@ -1720,7 +1720,7 @@ BOOL EMFDC_PlgBlt( DC_ATTR *dc_attr, const POINT *points, HDC hdc_src, INT x_src emr->cbBitsSrc = src_info.bmiHeader.biSizeImage; emr->xMask = x_mask; emr->yMask = y_mask; - emr->iUsageMask = DIB_PAL_MONO; + emr->iUsageMask = DIB_PAL_INDICES; emr->offBmiMask = mask_info_size ? emr->offBitsSrc + emr->cbBitsSrc : 0; emr->cbBmiMask = mask_info_size; emr->offBitsMask = emr->offBmiMask + emr->cbBmiMask; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 178f7b0e132..da9c68df4af 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1858,7 +1858,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
/* Need to check if the bitmap is monochrome, and if the two colors are really black and white */ - if (pCreateMonoBrush->iUsage == DIB_PAL_MONO) + if (pCreateMonoBrush->iUsage == DIB_PAL_INDICES) { BITMAP bm;
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79f1975d96f..da4c951eb00 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -53,7 +53,7 @@ static inline DWORD gdi_handle_type( HGDIOBJ obj ) #define MFVERSION 0x300
/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ -#define DIB_PAL_MONO 2 +#define DIB_PAL_INDICES 2
/* Format of comment record added by GetWinMetaFileBits */ #include <pshpack2.h>