* ndrtypes.h (NDR_VERSION_1_1): Drop UL qualifier from or'ed minor version value. (NDR_VERSION_2_0): Ditto. (NDR_VERSION_5_0): Ditto. (NDR_VERSION_5_2): Ditto. (NDR_VERSION_5_3): Ditto. (NDR_VERSION_5_4): Ditto. * d2d1.h (DXGI_FORMAT_FORCE_UINT): Drop UL qualifier. * gdiplus/gdipluscolor.h: Ditto for all ARGB symbolic color values. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5280 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index 6ca58ec..021d92d 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,16 @@ +2012-07-30 Corinna Vinschen <vinschen@redhat.com> + + * ndrtypes.h (NDR_VERSION_1_1): Drop UL qualifier from or'ed + minor version value. + (NDR_VERSION_2_0): Ditto. + (NDR_VERSION_5_0): Ditto. + (NDR_VERSION_5_2): Ditto. + (NDR_VERSION_5_3): Ditto. + (NDR_VERSION_5_4): Ditto. + * d2d1.h (DXGI_FORMAT_FORCE_UINT): Drop UL qualifier. + * gdiplus/gdipluscolor.h: Ditto for all ARGB symbolic color + values. + 2012-07-27 Corinna Vinschen <vinschen@redhat.com> * Throughout, use __MSABI_LONG macro rather than 'L' qualifier
diff --git a/mingw-w64-headers/include/d2d1.h b/mingw-w64-headers/include/d2d1.h index 1749915..8078fcf 100644 --- a/mingw-w64-headers/include/d2d1.h +++ b/mingw-w64-headers/include/d2d1.h
@@ -160,7 +160,7 @@ DXGI_FORMAT_BC7_TYPELESS = 97, DXGI_FORMAT_BC7_UNORM = 98, DXGI_FORMAT_BC7_UNORM_SRGB = 99, - DXGI_FORMAT_FORCE_UINT = 0xffffffffUL + DXGI_FORMAT_FORCE_UINT = 0xffffffff } DXGI_FORMAT, *LPDXGI_FORMAT; #endif /*__MINGW_HAS_DXSDK*/
diff --git a/mingw-w64-headers/include/gdiplus/gdipluscolor.h b/mingw-w64-headers/include/gdiplus/gdipluscolor.h index 9f39e59..cb01c05 100644 --- a/mingw-w64-headers/include/gdiplus/gdipluscolor.h +++ b/mingw-w64-headers/include/gdiplus/gdipluscolor.h
@@ -56,149 +56,149 @@ | (((DWORD) g) << 8) | ((DWORD) b)); } - static const ARGB AlphaMask = 0xFF000000UL; + static const ARGB AlphaMask = 0xFF000000; - static const ARGB AliceBlue = 0xFFF0F8FFUL; - static const ARGB AntiqueWhite = 0xFFFAEBD7UL; - static const ARGB Aqua = 0xFF00FFFFUL; - static const ARGB Aquamarine = 0xFF7FFFD4UL; - static const ARGB Azure = 0xFFF0FFFFUL; - static const ARGB Beige = 0xFFF5F5DCUL; - static const ARGB Bisque = 0xFFFFE4C4UL; - static const ARGB Black = 0xFF000000UL; - static const ARGB BlanchedAlmond = 0xFFFFEBCDUL; - static const ARGB Blue = 0xFF0000FFUL; - static const ARGB BlueViolet = 0xFF8A2BE2UL; - static const ARGB Brown = 0xFFA52A2AUL; - static const ARGB BurlyWood = 0xFFDEB887UL; - static const ARGB CadetBlue = 0xFF5F9EA0UL; - static const ARGB Chartreuse = 0xFF7FFF00UL; - static const ARGB Chocolate = 0xFFD2691EUL; - static const ARGB Coral = 0xFFFF7F50UL; - static const ARGB CornflowerBlue = 0xFF6495EDUL; - static const ARGB Cornsilk = 0xFFFFF8DCUL; - static const ARGB Crimson = 0xFFDC143CUL; - static const ARGB Cyan = 0xFF00FFFFUL; - static const ARGB DarkBlue = 0xFF00008BUL; - static const ARGB DarkCyan = 0xFF008B8BUL; - static const ARGB DarkGoldenrod = 0xFFB8860BUL; - static const ARGB DarkGray = 0xFFA9A9A9UL; - static const ARGB DarkGreen = 0xFF006400UL; - static const ARGB DarkKhaki = 0xFFBDB76BUL; - static const ARGB DarkMagenta = 0xFF8B008BUL; - static const ARGB DarkOliveGreen = 0xFF556B2FUL; - static const ARGB DarkOrange = 0xFFFF8C00UL; - static const ARGB DarkOrchid = 0xFF9932CCUL; - static const ARGB DarkRed = 0xFF8B0000UL; - static const ARGB DarkSalmon = 0xFFE9967AUL; - static const ARGB DarkSeaGreen = 0xFF8FBC8FUL; - static const ARGB DarkSlateBlue = 0xFF483D8BUL; - static const ARGB DarkSlateGray = 0xFF2F4F4FUL; - static const ARGB DarkTurquoise = 0xFF00CED1UL; - static const ARGB DarkViolet = 0xFF9400D3UL; - static const ARGB DeepPink = 0xFFFF1493UL; - static const ARGB DeepSkyBlue = 0xFF00BFFFUL; - static const ARGB DimGray = 0xFF696969UL; - static const ARGB DodgerBlue = 0xFF1E90FFUL; - static const ARGB Firebrick = 0xFFB22222UL; - static const ARGB FloralWhite = 0xFFFFFAF0UL; - static const ARGB ForestGreen = 0xFF228B22UL; - static const ARGB Fuchsia = 0xFFFF00FFUL; - static const ARGB Gainsboro = 0xFFDCDCDCUL; - static const ARGB GhostWhite = 0xFFF8F8FFUL; - static const ARGB Gold = 0xFFFFD700UL; - static const ARGB Goldenrod = 0xFFDAA520UL; - static const ARGB Gray = 0xFF808080UL; - static const ARGB Green = 0xFF008000UL; - static const ARGB GreenYellow = 0xFFADFF2FUL; - static const ARGB Honeydew = 0xFFF0FFF0UL; - static const ARGB HotPink = 0xFFFF69B4UL; - static const ARGB IndianRed = 0xFFCD5C5CUL; - static const ARGB Indigo = 0xFF4B0082UL; - static const ARGB Ivory = 0xFFFFFFF0UL; - static const ARGB Khaki = 0xFFF0E68CUL; - static const ARGB Lavender = 0xFFE6E6FAUL; - static const ARGB LavenderBlush = 0xFFFFF0F5UL; - static const ARGB LawnGreen = 0xFF7CFC00UL; - static const ARGB LemonChiffon = 0xFFFFFACDUL; - static const ARGB LightBlue = 0xFFADD8E6UL; - static const ARGB LightCoral = 0xFFF08080UL; - static const ARGB LightCyan = 0xFFE0FFFFUL; - static const ARGB LightGoldenrodYellow = 0xFFFAFAD2UL; - static const ARGB LightGray = 0xFFD3D3D3UL; - static const ARGB LightGreen = 0xFF90EE90UL; - static const ARGB LightPink = 0xFFFFB6C1UL; - static const ARGB LightSalmon = 0xFFFFA07AUL; - static const ARGB LightSeaGreen = 0xFF20B2AAUL; - static const ARGB LightSkyBlue = 0xFF87CEFAUL; - static const ARGB LightSlateGray = 0xFF778899UL; - static const ARGB LightSteelBlue = 0xFFB0C4DEUL; - static const ARGB LightYellow = 0xFFFFFFE0UL; - static const ARGB Lime = 0xFF00FF00UL; - static const ARGB LimeGreen = 0xFF32CD32UL; - static const ARGB Linen = 0xFFFAF0E6UL; - static const ARGB Magenta = 0xFFFF00FFUL; - static const ARGB Maroon = 0xFF800000UL; - static const ARGB MediumAquamarine = 0xFF66CDAAUL; - static const ARGB MediumBlue = 0xFF0000CDUL; - static const ARGB MediumOrchid = 0xFFBA55D3UL; - static const ARGB MediumPurple = 0xFF9370DBUL; - static const ARGB MediumSeaGreen = 0xFF3CB371UL; - static const ARGB MediumSlateBlue = 0xFF7B68EEUL; - static const ARGB MediumSpringGreen = 0xFF00FA9AUL; - static const ARGB MediumTurquoise = 0xFF48D1CCUL; - static const ARGB MediumVioletRed = 0xFFC71585UL; - static const ARGB MidnightBlue = 0xFF191970UL; - static const ARGB MintCream = 0xFFF5FFFAUL; - static const ARGB MistyRose = 0xFFFFE4E1UL; - static const ARGB Moccasin = 0xFFFFE4B5UL; - static const ARGB NavajoWhite = 0xFFFFDEADUL; - static const ARGB Navy = 0xFF000080UL; - static const ARGB OldLace = 0xFFFDF5E6UL; - static const ARGB Olive = 0xFF808000UL; - static const ARGB OliveDrab = 0xFF6B8E23UL; - static const ARGB Orange = 0xFFFFA500UL; - static const ARGB OrangeRed = 0xFFFF4500UL; - static const ARGB Orchid = 0xFFDA70D6UL; - static const ARGB PaleGoldenrod = 0xFFEEE8AAUL; - static const ARGB PaleGreen = 0xFF98FB98UL; - static const ARGB PaleTurquoise = 0xFFAFEEEEUL; - static const ARGB PaleVioletRed = 0xFFDB7093UL; - static const ARGB PapayaWhip = 0xFFFFEFD5UL; - static const ARGB PeachPuff = 0xFFFFDAB9UL; - static const ARGB Peru = 0xFFCD853FUL; - static const ARGB Pink = 0xFFFFC0CBUL; - static const ARGB Plum = 0xFFDDA0DDUL; - static const ARGB PowderBlue = 0xFFB0E0E6UL; - static const ARGB Purple = 0xFF800080UL; - static const ARGB Red = 0xFFFF0000UL; - static const ARGB RosyBrown = 0xFFBC8F8FUL; - static const ARGB RoyalBlue = 0xFF4169E1UL; - static const ARGB SaddleBrown = 0xFF8B4513UL; - static const ARGB Salmon = 0xFFFA8072UL; - static const ARGB SandyBrown = 0xFFF4A460UL; - static const ARGB SeaGreen = 0xFF2E8B57UL; - static const ARGB SeaShell = 0xFFFFF5EEUL; - static const ARGB Sienna = 0xFFA0522DUL; - static const ARGB Silver = 0xFFC0C0C0UL; - static const ARGB SkyBlue = 0xFF87CEEBUL; - static const ARGB SlateBlue = 0xFF6A5ACDUL; - static const ARGB SlateGray = 0xFF708090UL; - static const ARGB Snow = 0xFFFFFAFAUL; - static const ARGB SpringGreen = 0xFF00FF7FUL; - static const ARGB SteelBlue = 0xFF4682B4UL; - static const ARGB Tan = 0xFFD2B48CUL; - static const ARGB Teal = 0xFF008080UL; - static const ARGB Thistle = 0xFFD8BFD8UL; - static const ARGB Tomato = 0xFFFF6347UL; - static const ARGB Transparent = 0x00FFFFFFUL; - static const ARGB Turquoise = 0xFF40E0D0UL; - static const ARGB Violet = 0xFFEE82EEUL; - static const ARGB Wheat = 0xFFF5DEB3UL; - static const ARGB White = 0xFFFFFFFFUL; - static const ARGB WhiteSmoke = 0xFFF5F5F5UL; - static const ARGB Yellow = 0xFFFFFF00UL; - static const ARGB YellowGreen = 0xFF9ACD32UL; + static const ARGB AliceBlue = 0xFFF0F8FF; + static const ARGB AntiqueWhite = 0xFFFAEBD7; + static const ARGB Aqua = 0xFF00FFFF; + static const ARGB Aquamarine = 0xFF7FFFD4; + static const ARGB Azure = 0xFFF0FFFF; + static const ARGB Beige = 0xFFF5F5DC; + static const ARGB Bisque = 0xFFFFE4C4; + static const ARGB Black = 0xFF000000; + static const ARGB BlanchedAlmond = 0xFFFFEBCD; + static const ARGB Blue = 0xFF0000FF; + static const ARGB BlueViolet = 0xFF8A2BE2; + static const ARGB Brown = 0xFFA52A2A; + static const ARGB BurlyWood = 0xFFDEB887; + static const ARGB CadetBlue = 0xFF5F9EA0; + static const ARGB Chartreuse = 0xFF7FFF00; + static const ARGB Chocolate = 0xFFD2691E; + static const ARGB Coral = 0xFFFF7F50; + static const ARGB CornflowerBlue = 0xFF6495ED; + static const ARGB Cornsilk = 0xFFFFF8DC; + static const ARGB Crimson = 0xFFDC143C; + static const ARGB Cyan = 0xFF00FFFF; + static const ARGB DarkBlue = 0xFF00008B; + static const ARGB DarkCyan = 0xFF008B8B; + static const ARGB DarkGoldenrod = 0xFFB8860B; + static const ARGB DarkGray = 0xFFA9A9A9; + static const ARGB DarkGreen = 0xFF006400; + static const ARGB DarkKhaki = 0xFFBDB76B; + static const ARGB DarkMagenta = 0xFF8B008B; + static const ARGB DarkOliveGreen = 0xFF556B2F; + static const ARGB DarkOrange = 0xFFFF8C00; + static const ARGB DarkOrchid = 0xFF9932CC; + static const ARGB DarkRed = 0xFF8B0000; + static const ARGB DarkSalmon = 0xFFE9967A; + static const ARGB DarkSeaGreen = 0xFF8FBC8F; + static const ARGB DarkSlateBlue = 0xFF483D8B; + static const ARGB DarkSlateGray = 0xFF2F4F4F; + static const ARGB DarkTurquoise = 0xFF00CED1; + static const ARGB DarkViolet = 0xFF9400D3; + static const ARGB DeepPink = 0xFFFF1493; + static const ARGB DeepSkyBlue = 0xFF00BFFF; + static const ARGB DimGray = 0xFF696969; + static const ARGB DodgerBlue = 0xFF1E90FF; + static const ARGB Firebrick = 0xFFB22222; + static const ARGB FloralWhite = 0xFFFFFAF0; + static const ARGB ForestGreen = 0xFF228B22; + static const ARGB Fuchsia = 0xFFFF00FF; + static const ARGB Gainsboro = 0xFFDCDCDC; + static const ARGB GhostWhite = 0xFFF8F8FF; + static const ARGB Gold = 0xFFFFD700; + static const ARGB Goldenrod = 0xFFDAA520; + static const ARGB Gray = 0xFF808080; + static const ARGB Green = 0xFF008000; + static const ARGB GreenYellow = 0xFFADFF2F; + static const ARGB Honeydew = 0xFFF0FFF0; + static const ARGB HotPink = 0xFFFF69B4; + static const ARGB IndianRed = 0xFFCD5C5C; + static const ARGB Indigo = 0xFF4B0082; + static const ARGB Ivory = 0xFFFFFFF0; + static const ARGB Khaki = 0xFFF0E68C; + static const ARGB Lavender = 0xFFE6E6FA; + static const ARGB LavenderBlush = 0xFFFFF0F5; + static const ARGB LawnGreen = 0xFF7CFC00; + static const ARGB LemonChiffon = 0xFFFFFACD; + static const ARGB LightBlue = 0xFFADD8E6; + static const ARGB LightCoral = 0xFFF08080; + static const ARGB LightCyan = 0xFFE0FFFF; + static const ARGB LightGoldenrodYellow = 0xFFFAFAD2; + static const ARGB LightGray = 0xFFD3D3D3; + static const ARGB LightGreen = 0xFF90EE90; + static const ARGB LightPink = 0xFFFFB6C1; + static const ARGB LightSalmon = 0xFFFFA07A; + static const ARGB LightSeaGreen = 0xFF20B2AA; + static const ARGB LightSkyBlue = 0xFF87CEFA; + static const ARGB LightSlateGray = 0xFF778899; + static const ARGB LightSteelBlue = 0xFFB0C4DE; + static const ARGB LightYellow = 0xFFFFFFE0; + static const ARGB Lime = 0xFF00FF00; + static const ARGB LimeGreen = 0xFF32CD32; + static const ARGB Linen = 0xFFFAF0E6; + static const ARGB Magenta = 0xFFFF00FF; + static const ARGB Maroon = 0xFF800000; + static const ARGB MediumAquamarine = 0xFF66CDAA; + static const ARGB MediumBlue = 0xFF0000CD; + static const ARGB MediumOrchid = 0xFFBA55D3; + static const ARGB MediumPurple = 0xFF9370DB; + static const ARGB MediumSeaGreen = 0xFF3CB371; + static const ARGB MediumSlateBlue = 0xFF7B68EE; + static const ARGB MediumSpringGreen = 0xFF00FA9A; + static const ARGB MediumTurquoise = 0xFF48D1CC; + static const ARGB MediumVioletRed = 0xFFC71585; + static const ARGB MidnightBlue = 0xFF191970; + static const ARGB MintCream = 0xFFF5FFFA; + static const ARGB MistyRose = 0xFFFFE4E1; + static const ARGB Moccasin = 0xFFFFE4B5; + static const ARGB NavajoWhite = 0xFFFFDEAD; + static const ARGB Navy = 0xFF000080; + static const ARGB OldLace = 0xFFFDF5E6; + static const ARGB Olive = 0xFF808000; + static const ARGB OliveDrab = 0xFF6B8E23; + static const ARGB Orange = 0xFFFFA500; + static const ARGB OrangeRed = 0xFFFF4500; + static const ARGB Orchid = 0xFFDA70D6; + static const ARGB PaleGoldenrod = 0xFFEEE8AA; + static const ARGB PaleGreen = 0xFF98FB98; + static const ARGB PaleTurquoise = 0xFFAFEEEE; + static const ARGB PaleVioletRed = 0xFFDB7093; + static const ARGB PapayaWhip = 0xFFFFEFD5; + static const ARGB PeachPuff = 0xFFFFDAB9; + static const ARGB Peru = 0xFFCD853F; + static const ARGB Pink = 0xFFFFC0CB; + static const ARGB Plum = 0xFFDDA0DD; + static const ARGB PowderBlue = 0xFFB0E0E6; + static const ARGB Purple = 0xFF800080; + static const ARGB Red = 0xFFFF0000; + static const ARGB RosyBrown = 0xFFBC8F8F; + static const ARGB RoyalBlue = 0xFF4169E1; + static const ARGB SaddleBrown = 0xFF8B4513; + static const ARGB Salmon = 0xFFFA8072; + static const ARGB SandyBrown = 0xFFF4A460; + static const ARGB SeaGreen = 0xFF2E8B57; + static const ARGB SeaShell = 0xFFFFF5EE; + static const ARGB Sienna = 0xFFA0522D; + static const ARGB Silver = 0xFFC0C0C0; + static const ARGB SkyBlue = 0xFF87CEEB; + static const ARGB SlateBlue = 0xFF6A5ACD; + static const ARGB SlateGray = 0xFF708090; + static const ARGB Snow = 0xFFFFFAFA; + static const ARGB SpringGreen = 0xFF00FF7F; + static const ARGB SteelBlue = 0xFF4682B4; + static const ARGB Tan = 0xFFD2B48C; + static const ARGB Teal = 0xFF008080; + static const ARGB Thistle = 0xFFD8BFD8; + static const ARGB Tomato = 0xFFFF6347; + static const ARGB Transparent = 0x00FFFFFF; + static const ARGB Turquoise = 0xFF40E0D0; + static const ARGB Violet = 0xFFEE82EE; + static const ARGB Wheat = 0xFFF5DEB3; + static const ARGB White = 0xFFFFFFFF; + static const ARGB WhiteSmoke = 0xFFF5F5F5; + static const ARGB Yellow = 0xFFFFFF00; + static const ARGB YellowGreen = 0xFF9ACD32; Color(): Value(0xFF000000) {} Color(ARGB argb): Value(argb) {}
diff --git a/mingw-w64-headers/include/ndrtypes.h b/mingw-w64-headers/include/ndrtypes.h index 8d54d1a..e71eb79 100644 --- a/mingw-w64-headers/include/ndrtypes.h +++ b/mingw-w64-headers/include/ndrtypes.h
@@ -26,12 +26,12 @@ #define NDR_MINOR_VERSION 4UL #define NDR_VERSION ((NDR_MAJOR_VERSION << 16) | NDR_MINOR_VERSION) -#define NDR_VERSION_1_1 ((1UL << 16) | 1UL) -#define NDR_VERSION_2_0 ((2UL << 16) | 0UL) -#define NDR_VERSION_5_0 ((5UL << 16) | 0UL) -#define NDR_VERSION_5_2 ((5UL << 16) | 2UL) -#define NDR_VERSION_5_3 ((5UL << 16) | 3UL) -#define NDR_VERSION_5_4 ((5UL << 16) | 4UL) +#define NDR_VERSION_1_1 ((1UL << 16) | 1) +#define NDR_VERSION_2_0 ((2UL << 16) | 0) +#define NDR_VERSION_5_0 ((5UL << 16) | 0) +#define NDR_VERSION_5_2 ((5UL << 16) | 2) +#define NDR_VERSION_5_3 ((5UL << 16) | 3) +#define NDR_VERSION_5_4 ((5UL << 16) | 4) #define LOAD_TLB_AS_64BIT 0 #define LOAD_TLB_AS_32BIT 0