diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b3e5e80acd9..5e10c654388 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1013,8 +1013,8 @@ static const unsigned char MF_GRAPHICS_BITS[] = { }; static const unsigned char MF_PATTERN_BRUSH_BITS[] = { - 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x3d, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x2d, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x9e, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x5d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x42, 0x01, 0x03, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, @@ -1027,8 +1027,32 @@ static const unsigned char MF_PATTERN_BRUSH_BITS[] = { 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x2d, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00 + 0x2d, 0x01, 0x00, 0x00, 0x5d, 0x00, 0x00, 0x00, + 0x42, 0x01, 0x05, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, + 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, + 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, + 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, + 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0c, 0x00, + 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0e, 0x00, + 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, + 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, + 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x14, 0x00, + 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, + 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x1a, 0x00, + 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x1c, 0x00, + 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x04, 0x00, + 0x00, 0x00, 0x2d, 0x01, 0x01, 0x00, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00 }; static const unsigned char MF_DCBRUSH_BITS[] = @@ -1435,6 +1459,247 @@ static const unsigned char EMF_GRADIENTFILL_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char mf_palette_brush_bits[] = +{ + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0xb2, 0x03, + 0x00, 0x00, 0x02, 0x00, 0x05, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x05, 0x02, 0x00, 0x00, 0xf7, 0x00, + 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x02, 0x02, 0x00, 0x04, 0x04, 0x04, 0x00, + 0x06, 0x06, 0x06, 0x00, 0x08, 0x08, 0x08, 0x00, + 0x0a, 0x0a, 0x0a, 0x00, 0x0c, 0x0c, 0x0c, 0x00, + 0x0e, 0x0e, 0x0e, 0x00, 0x10, 0x10, 0x10, 0x00, + 0x12, 0x12, 0x12, 0x00, 0x14, 0x14, 0x14, 0x00, + 0x16, 0x16, 0x16, 0x00, 0x18, 0x18, 0x18, 0x00, + 0x1a, 0x1a, 0x1a, 0x00, 0x1c, 0x1c, 0x1c, 0x00, + 0x1e, 0x1e, 0x1e, 0x00, 0x20, 0x20, 0x20, 0x00, + 0x22, 0x22, 0x22, 0x00, 0x24, 0x24, 0x24, 0x00, + 0x26, 0x26, 0x26, 0x00, 0x28, 0x28, 0x28, 0x00, + 0x2a, 0x2a, 0x2a, 0x00, 0x2c, 0x2c, 0x2c, 0x00, + 0x2e, 0x2e, 0x2e, 0x00, 0x30, 0x30, 0x30, 0x00, + 0x32, 0x32, 0x32, 0x00, 0x34, 0x34, 0x34, 0x00, + 0x36, 0x36, 0x36, 0x00, 0x38, 0x38, 0x38, 0x00, + 0x3a, 0x3a, 0x3a, 0x00, 0x3c, 0x3c, 0x3c, 0x00, + 0x3e, 0x3e, 0x3e, 0x00, 0x40, 0x40, 0x40, 0x00, + 0x42, 0x42, 0x42, 0x00, 0x44, 0x44, 0x44, 0x00, + 0x46, 0x46, 0x46, 0x00, 0x48, 0x48, 0x48, 0x00, + 0x4a, 0x4a, 0x4a, 0x00, 0x4c, 0x4c, 0x4c, 0x00, + 0x4e, 0x4e, 0x4e, 0x00, 0x50, 0x50, 0x50, 0x00, + 0x52, 0x52, 0x52, 0x00, 0x54, 0x54, 0x54, 0x00, + 0x56, 0x56, 0x56, 0x00, 0x58, 0x58, 0x58, 0x00, + 0x5a, 0x5a, 0x5a, 0x00, 0x5c, 0x5c, 0x5c, 0x00, + 0x5e, 0x5e, 0x5e, 0x00, 0x60, 0x60, 0x60, 0x00, + 0x62, 0x62, 0x62, 0x00, 0x64, 0x64, 0x64, 0x00, + 0x66, 0x66, 0x66, 0x00, 0x68, 0x68, 0x68, 0x00, + 0x6a, 0x6a, 0x6a, 0x00, 0x6c, 0x6c, 0x6c, 0x00, + 0x6e, 0x6e, 0x6e, 0x00, 0x70, 0x70, 0x70, 0x00, + 0x72, 0x72, 0x72, 0x00, 0x74, 0x74, 0x74, 0x00, + 0x76, 0x76, 0x76, 0x00, 0x78, 0x78, 0x78, 0x00, + 0x7a, 0x7a, 0x7a, 0x00, 0x7c, 0x7c, 0x7c, 0x00, + 0x7e, 0x7e, 0x7e, 0x00, 0x80, 0x80, 0x80, 0x00, + 0x82, 0x82, 0x82, 0x00, 0x84, 0x84, 0x84, 0x00, + 0x86, 0x86, 0x86, 0x00, 0x88, 0x88, 0x88, 0x00, + 0x8a, 0x8a, 0x8a, 0x00, 0x8c, 0x8c, 0x8c, 0x00, + 0x8e, 0x8e, 0x8e, 0x00, 0x90, 0x90, 0x90, 0x00, + 0x92, 0x92, 0x92, 0x00, 0x94, 0x94, 0x94, 0x00, + 0x96, 0x96, 0x96, 0x00, 0x98, 0x98, 0x98, 0x00, + 0x9a, 0x9a, 0x9a, 0x00, 0x9c, 0x9c, 0x9c, 0x00, + 0x9e, 0x9e, 0x9e, 0x00, 0xa0, 0xa0, 0xa0, 0x00, + 0xa2, 0xa2, 0xa2, 0x00, 0xa4, 0xa4, 0xa4, 0x00, + 0xa6, 0xa6, 0xa6, 0x00, 0xa8, 0xa8, 0xa8, 0x00, + 0xaa, 0xaa, 0xaa, 0x00, 0xac, 0xac, 0xac, 0x00, + 0xae, 0xae, 0xae, 0x00, 0xb0, 0xb0, 0xb0, 0x00, + 0xb2, 0xb2, 0xb2, 0x00, 0xb4, 0xb4, 0xb4, 0x00, + 0xb6, 0xb6, 0xb6, 0x00, 0xb8, 0xb8, 0xb8, 0x00, + 0xba, 0xba, 0xba, 0x00, 0xbc, 0xbc, 0xbc, 0x00, + 0xbe, 0xbe, 0xbe, 0x00, 0xc0, 0xc0, 0xc0, 0x00, + 0xc2, 0xc2, 0xc2, 0x00, 0xc4, 0xc4, 0xc4, 0x00, + 0xc6, 0xc6, 0xc6, 0x00, 0xc8, 0xc8, 0xc8, 0x00, + 0xca, 0xca, 0xca, 0x00, 0xcc, 0xcc, 0xcc, 0x00, + 0xce, 0xce, 0xce, 0x00, 0xd0, 0xd0, 0xd0, 0x00, + 0xd2, 0xd2, 0xd2, 0x00, 0xd4, 0xd4, 0xd4, 0x00, + 0xd6, 0xd6, 0xd6, 0x00, 0xd8, 0xd8, 0xd8, 0x00, + 0xda, 0xda, 0xda, 0x00, 0xdc, 0xdc, 0xdc, 0x00, + 0xde, 0xde, 0xde, 0x00, 0xe0, 0xe0, 0xe0, 0x00, + 0xe2, 0xe2, 0xe2, 0x00, 0xe4, 0xe4, 0xe4, 0x00, + 0xe6, 0xe6, 0xe6, 0x00, 0xe8, 0xe8, 0xe8, 0x00, + 0xea, 0xea, 0xea, 0x00, 0xec, 0xec, 0xec, 0x00, + 0xee, 0xee, 0xee, 0x00, 0xf0, 0xf0, 0xf0, 0x00, + 0xf2, 0xf2, 0xf2, 0x00, 0xf4, 0xf4, 0xf4, 0x00, + 0xf6, 0xf6, 0xf6, 0x00, 0xf8, 0xf8, 0xf8, 0x00, + 0xfa, 0xfa, 0xfa, 0x00, 0xfc, 0xfc, 0xfc, 0x00, + 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x02, 0x02, 0x00, 0x04, 0x04, 0x04, 0x00, + 0x06, 0x06, 0x06, 0x00, 0x08, 0x08, 0x08, 0x00, + 0x0a, 0x0a, 0x0a, 0x00, 0x0c, 0x0c, 0x0c, 0x00, + 0x0e, 0x0e, 0x0e, 0x00, 0x10, 0x10, 0x10, 0x00, + 0x12, 0x12, 0x12, 0x00, 0x14, 0x14, 0x14, 0x00, + 0x16, 0x16, 0x16, 0x00, 0x18, 0x18, 0x18, 0x00, + 0x1a, 0x1a, 0x1a, 0x00, 0x1c, 0x1c, 0x1c, 0x00, + 0x1e, 0x1e, 0x1e, 0x00, 0x20, 0x20, 0x20, 0x00, + 0x22, 0x22, 0x22, 0x00, 0x24, 0x24, 0x24, 0x00, + 0x26, 0x26, 0x26, 0x00, 0x28, 0x28, 0x28, 0x00, + 0x2a, 0x2a, 0x2a, 0x00, 0x2c, 0x2c, 0x2c, 0x00, + 0x2e, 0x2e, 0x2e, 0x00, 0x30, 0x30, 0x30, 0x00, + 0x32, 0x32, 0x32, 0x00, 0x34, 0x34, 0x34, 0x00, + 0x36, 0x36, 0x36, 0x00, 0x38, 0x38, 0x38, 0x00, + 0x3a, 0x3a, 0x3a, 0x00, 0x3c, 0x3c, 0x3c, 0x00, + 0x3e, 0x3e, 0x3e, 0x00, 0x40, 0x40, 0x40, 0x00, + 0x42, 0x42, 0x42, 0x00, 0x44, 0x44, 0x44, 0x00, + 0x46, 0x46, 0x46, 0x00, 0x48, 0x48, 0x48, 0x00, + 0x4a, 0x4a, 0x4a, 0x00, 0x4c, 0x4c, 0x4c, 0x00, + 0x4e, 0x4e, 0x4e, 0x00, 0x50, 0x50, 0x50, 0x00, + 0x52, 0x52, 0x52, 0x00, 0x54, 0x54, 0x54, 0x00, + 0x56, 0x56, 0x56, 0x00, 0x58, 0x58, 0x58, 0x00, + 0x5a, 0x5a, 0x5a, 0x00, 0x5c, 0x5c, 0x5c, 0x00, + 0x5e, 0x5e, 0x5e, 0x00, 0x60, 0x60, 0x60, 0x00, + 0x62, 0x62, 0x62, 0x00, 0x64, 0x64, 0x64, 0x00, + 0x66, 0x66, 0x66, 0x00, 0x68, 0x68, 0x68, 0x00, + 0x6a, 0x6a, 0x6a, 0x00, 0x6c, 0x6c, 0x6c, 0x00, + 0x6e, 0x6e, 0x6e, 0x00, 0x70, 0x70, 0x70, 0x00, + 0x72, 0x72, 0x72, 0x00, 0x74, 0x74, 0x74, 0x00, + 0x76, 0x76, 0x76, 0x00, 0x78, 0x78, 0x78, 0x00, + 0x7a, 0x7a, 0x7a, 0x00, 0x7c, 0x7c, 0x7c, 0x00, + 0x7e, 0x7e, 0x7e, 0x00, 0x80, 0x80, 0x80, 0x00, + 0x82, 0x82, 0x82, 0x00, 0x84, 0x84, 0x84, 0x00, + 0x86, 0x86, 0x86, 0x00, 0x88, 0x88, 0x88, 0x00, + 0x8a, 0x8a, 0x8a, 0x00, 0x8c, 0x8c, 0x8c, 0x00, + 0x8e, 0x8e, 0x8e, 0x00, 0x90, 0x90, 0x90, 0x00, + 0x92, 0x92, 0x92, 0x00, 0x94, 0x94, 0x94, 0x00, + 0x96, 0x96, 0x96, 0x00, 0x98, 0x98, 0x98, 0x00, + 0x9a, 0x9a, 0x9a, 0x00, 0x9c, 0x9c, 0x9c, 0x00, + 0x9e, 0x9e, 0x9e, 0x00, 0xa0, 0xa0, 0xa0, 0x00, + 0xa2, 0xa2, 0xa2, 0x00, 0xa4, 0xa4, 0xa4, 0x00, + 0xa6, 0xa6, 0xa6, 0x00, 0xa8, 0xa8, 0xa8, 0x00, + 0xaa, 0xaa, 0xaa, 0x00, 0xac, 0xac, 0xac, 0x00, + 0xae, 0xae, 0xae, 0x00, 0xb0, 0xb0, 0xb0, 0x00, + 0xb2, 0xb2, 0xb2, 0x00, 0xb4, 0xb4, 0xb4, 0x00, + 0xb6, 0xb6, 0xb6, 0x00, 0xb8, 0xb8, 0xb8, 0x00, + 0xba, 0xba, 0xba, 0x00, 0xbc, 0xbc, 0xbc, 0x00, + 0xbe, 0xbe, 0xbe, 0x00, 0xc0, 0xc0, 0xc0, 0x00, + 0xc2, 0xc2, 0xc2, 0x00, 0xc4, 0xc4, 0xc4, 0x00, + 0xc6, 0xc6, 0xc6, 0x00, 0xc8, 0xc8, 0xc8, 0x00, + 0xca, 0xca, 0xca, 0x00, 0xcc, 0xcc, 0xcc, 0x00, + 0xce, 0xce, 0xce, 0x00, 0xd0, 0xd0, 0xd0, 0x00, + 0xd2, 0xd2, 0xd2, 0x00, 0xd4, 0xd4, 0xd4, 0x00, + 0xd6, 0xd6, 0xd6, 0x00, 0xd8, 0xd8, 0xd8, 0x00, + 0xda, 0xda, 0xda, 0x00, 0xdc, 0xdc, 0xdc, 0x00, + 0xde, 0xde, 0xde, 0x00, 0xe0, 0xe0, 0xe0, 0x00, + 0xe2, 0xe2, 0xe2, 0x00, 0xe4, 0xe4, 0xe4, 0x00, + 0xe6, 0xe6, 0xe6, 0x00, 0xe8, 0xe8, 0xe8, 0x00, + 0xea, 0xea, 0xea, 0x00, 0xec, 0xec, 0xec, 0x00, + 0xee, 0xee, 0xee, 0x00, 0xf0, 0xf0, 0xf0, 0x00, + 0xf2, 0xf2, 0xf2, 0x00, 0xf4, 0xf4, 0xf4, 0x00, + 0xf6, 0xf6, 0xf6, 0x00, 0xf8, 0xf8, 0xf8, 0x00, + 0xfa, 0xfa, 0xfa, 0x00, 0xfc, 0xfc, 0xfc, 0x00, + 0xfe, 0xfe, 0xfe, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x34, 0x02, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00, + 0x42, 0x01, 0x05, 0x00, 0x01, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, + 0xfe, 0x00, 0xfd, 0x00, 0xfc, 0x00, 0xfb, 0x00, + 0xfa, 0x00, 0xf9, 0x00, 0xf8, 0x00, 0xf7, 0x00, + 0xf6, 0x00, 0xf5, 0x00, 0xf4, 0x00, 0xf3, 0x00, + 0xf2, 0x00, 0xf1, 0x00, 0xf0, 0x00, 0xef, 0x00, + 0xee, 0x00, 0xed, 0x00, 0xec, 0x00, 0xeb, 0x00, + 0xea, 0x00, 0xe9, 0x00, 0xe8, 0x00, 0xe7, 0x00, + 0xe6, 0x00, 0xe5, 0x00, 0xe4, 0x00, 0xe3, 0x00, + 0xe2, 0x00, 0xe1, 0x00, 0xe0, 0x00, 0xdf, 0x00, + 0xde, 0x00, 0xdd, 0x00, 0xdc, 0x00, 0xdb, 0x00, + 0xda, 0x00, 0xd9, 0x00, 0xd8, 0x00, 0xd7, 0x00, + 0xd6, 0x00, 0xd5, 0x00, 0xd4, 0x00, 0xd3, 0x00, + 0xd2, 0x00, 0xd1, 0x00, 0xd0, 0x00, 0xcf, 0x00, + 0xce, 0x00, 0xcd, 0x00, 0xcc, 0x00, 0xcb, 0x00, + 0xca, 0x00, 0xc9, 0x00, 0xc8, 0x00, 0xc7, 0x00, + 0xc6, 0x00, 0xc5, 0x00, 0xc4, 0x00, 0xc3, 0x00, + 0xc2, 0x00, 0xc1, 0x00, 0xc0, 0x00, 0xbf, 0x00, + 0xbe, 0x00, 0xbd, 0x00, 0xbc, 0x00, 0xbb, 0x00, + 0xba, 0x00, 0xb9, 0x00, 0xb8, 0x00, 0xb7, 0x00, + 0xb6, 0x00, 0xb5, 0x00, 0xb4, 0x00, 0xb3, 0x00, + 0xb2, 0x00, 0xb1, 0x00, 0xb0, 0x00, 0xaf, 0x00, + 0xae, 0x00, 0xad, 0x00, 0xac, 0x00, 0xab, 0x00, + 0xaa, 0x00, 0xa9, 0x00, 0xa8, 0x00, 0xa7, 0x00, + 0xa6, 0x00, 0xa5, 0x00, 0xa4, 0x00, 0xa3, 0x00, + 0xa2, 0x00, 0xa1, 0x00, 0xa0, 0x00, 0x9f, 0x00, + 0x9e, 0x00, 0x9d, 0x00, 0x9c, 0x00, 0x9b, 0x00, + 0x9a, 0x00, 0x99, 0x00, 0x98, 0x00, 0x97, 0x00, + 0x96, 0x00, 0x95, 0x00, 0x94, 0x00, 0x93, 0x00, + 0x92, 0x00, 0x91, 0x00, 0x90, 0x00, 0x8f, 0x00, + 0x8e, 0x00, 0x8d, 0x00, 0x8c, 0x00, 0x8b, 0x00, + 0x8a, 0x00, 0x89, 0x00, 0x88, 0x00, 0x87, 0x00, + 0x86, 0x00, 0x85, 0x00, 0x84, 0x00, 0x83, 0x00, + 0x82, 0x00, 0x81, 0x00, 0x80, 0x00, 0x7f, 0x00, + 0x7e, 0x00, 0x7d, 0x00, 0x7c, 0x00, 0x7b, 0x00, + 0x7a, 0x00, 0x79, 0x00, 0x78, 0x00, 0x77, 0x00, + 0x76, 0x00, 0x75, 0x00, 0x74, 0x00, 0x73, 0x00, + 0x72, 0x00, 0x71, 0x00, 0x70, 0x00, 0x6f, 0x00, + 0x6e, 0x00, 0x6d, 0x00, 0x6c, 0x00, 0x6b, 0x00, + 0x6a, 0x00, 0x69, 0x00, 0x68, 0x00, 0x67, 0x00, + 0x66, 0x00, 0x65, 0x00, 0x64, 0x00, 0x63, 0x00, + 0x62, 0x00, 0x61, 0x00, 0x60, 0x00, 0x5f, 0x00, + 0x5e, 0x00, 0x5d, 0x00, 0x5c, 0x00, 0x5b, 0x00, + 0x5a, 0x00, 0x59, 0x00, 0x58, 0x00, 0x57, 0x00, + 0x56, 0x00, 0x55, 0x00, 0x54, 0x00, 0x53, 0x00, + 0x52, 0x00, 0x51, 0x00, 0x50, 0x00, 0x4f, 0x00, + 0x4e, 0x00, 0x4d, 0x00, 0x4c, 0x00, 0x4b, 0x00, + 0x4a, 0x00, 0x49, 0x00, 0x48, 0x00, 0x47, 0x00, + 0x46, 0x00, 0x45, 0x00, 0x44, 0x00, 0x43, 0x00, + 0x42, 0x00, 0x41, 0x00, 0x40, 0x00, 0x3f, 0x00, + 0x3e, 0x00, 0x3d, 0x00, 0x3c, 0x00, 0x3b, 0x00, + 0x3a, 0x00, 0x39, 0x00, 0x38, 0x00, 0x37, 0x00, + 0x36, 0x00, 0x35, 0x00, 0x34, 0x00, 0x33, 0x00, + 0x32, 0x00, 0x31, 0x00, 0x30, 0x00, 0x2f, 0x00, + 0x2e, 0x00, 0x2d, 0x00, 0x2c, 0x00, 0x2b, 0x00, + 0x2a, 0x00, 0x29, 0x00, 0x28, 0x00, 0x27, 0x00, + 0x26, 0x00, 0x25, 0x00, 0x24, 0x00, 0x23, 0x00, + 0x22, 0x00, 0x21, 0x00, 0x20, 0x00, 0x1f, 0x00, + 0x1e, 0x00, 0x1d, 0x00, 0x1c, 0x00, 0x1b, 0x00, + 0x1a, 0x00, 0x19, 0x00, 0x18, 0x00, 0x17, 0x00, + 0x16, 0x00, 0x15, 0x00, 0x14, 0x00, 0x13, 0x00, + 0x12, 0x00, 0x11, 0x00, 0x10, 0x00, 0x0f, 0x00, + 0x0e, 0x00, 0x0d, 0x00, 0x0c, 0x00, 0x0b, 0x00, + 0x0a, 0x00, 0x09, 0x00, 0x08, 0x00, 0x07, 0x00, + 0x06, 0x00, 0x05, 0x00, 0x04, 0x00, 0x03, 0x00, + 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, + 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, + 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, + 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, + 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, + 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, + 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, + 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, + 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, + 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, + 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, + 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, + 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, + 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, + 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, + 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, + 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, + 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, + 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, + 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, + 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, + 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, + 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, + 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, + 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, + 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, + 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, + 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x04, 0x00, + 0x00, 0x00, 0x2d, 0x01, 0x01, 0x00, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -3533,10 +3798,14 @@ static void test_mf_FloodFill(void) static void test_mf_PatternBrush(void) { + char buffer[sizeof(BITMAPINFOHEADER) + (2 + 32 * 32 / 8) * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)buffer; HDC hdcMetafile; HMETAFILE hMetafile; LOGBRUSH *orig_lb; - HBRUSH hBrush; + HBRUSH hBrush, dib_brush; + DWORD *bits; + unsigned int i; BOOL ret; INT type; @@ -3556,6 +3825,22 @@ static void test_mf_PatternBrush(void) hBrush = SelectObject(hdcMetafile, hBrush); ok(hBrush != 0, "SelectObject error %d.\n", GetLastError()); + memset(info, 0, sizeof(buffer)); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biHeight = 32; + info->bmiHeader.biWidth = 32; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + bits = (DWORD *)info->bmiColors; + for (i = 0; i < 32 * 32 / 8; i++) bits[i] = i; + + dib_brush = CreateDIBPatternBrushPt(info, DIB_RGB_COLORS); + ok(dib_brush != NULL, "CreatePatternBrush failed\n"); + + dib_brush = SelectObject(hdcMetafile, dib_brush); + ok(dib_brush != 0, "SelectObject error %d.\n", GetLastError()); + hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hdcMetafile); @@ -3573,12 +3858,67 @@ static void test_mf_PatternBrush(void) ok( ret, "DeleteMetaFile error %d\n", GetLastError()); ret = DeleteObject(hBrush); ok( ret, "DeleteObject(HBRUSH) error %d\n", GetLastError()); + ret = DeleteObject(dib_brush); + ok(ret, "DeleteObject failed\n"); ret = DeleteObject((HBITMAP)orig_lb->lbHatch); ok( ret, "DeleteObject(HBITMAP) error %d\n", GetLastError()); HeapFree (GetProcessHeap(), 0, orig_lb); } +static void test_mf_palette_brush(void) +{ + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD) + 16 * 16]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + WORD *indices = (WORD *)info->bmiColors; + char pal_buffer[sizeof(LOGPALETTE) + 256 * sizeof(PALETTEENTRY)]; + LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; + HDC hdc = CreateMetaFileA(NULL); + HMETAFILE metafile; + HBRUSH brush; + int i; + HPALETTE palette; + + memset( info, 0, sizeof(*info) ); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = 16; + info->bmiHeader.biHeight = 16; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 8; + info->bmiHeader.biCompression = BI_RGB; + + for (i = 0; i < 256; i++) indices[i] = 255 - i; + for (i = 0; i < 256; i++) ((BYTE *)(indices + 256))[i] = i; + brush = CreateDIBPatternBrushPt(info, DIB_PAL_COLORS); + ok( brush != NULL, "CreateDIBPatternBrushPt failed\n" ); + + pal->palVersion = 0x300; + pal->palNumEntries = 256; + for (i = 0; i < 256; i++) + { + pal->palPalEntry[i].peRed = i * 2; + pal->palPalEntry[i].peGreen = i * 2; + pal->palPalEntry[i].peBlue = i * 2; + pal->palPalEntry[i].peFlags = 0; + } + palette = CreatePalette(pal); + + ok(SelectPalette(hdc, palette, 0) != NULL, "SelectPalette failed\n"); + ok(SelectObject(hdc, brush) != NULL, "SelectObject failed\n"); + + DeleteObject(brush); + DeleteObject(palette); + + metafile = CloseMetaFile(hdc); + if (compare_mf_bits(metafile, mf_palette_brush_bits, sizeof(mf_palette_brush_bits), + "mf_Palette_Pattern_Brush") != 0) + { + dump_mf_bits(metafile, "mf_Palette_Pattern_Brush"); + EnumMetaFile(0, metafile, mf_enum_proc, 0); + } + DeleteObject(metafile); +} + static void test_mf_DCBrush(void) { HDC hdcMetafile; @@ -7158,6 +7498,7 @@ START_TEST(metafile) test_mf_Blank(); test_mf_Graphics(); test_mf_PatternBrush(); + test_mf_palette_brush(); test_mf_DCBrush(); test_CopyMetaFile(); test_SetMetaFileBits();