From edd917756280b4d7bad942ee10d9b8b28b409df2 Mon Sep 17 00:00:00 2001 From: Rafal Harabien Date: Mon, 13 Feb 2012 17:04:52 +0000 Subject: [PATCH] - Fix MSVC build (patch by Thomas Fabber reverted by me in previous commit) svn path=/trunk/; revision=55579 --- reactos/dll/win32/comctl32/imagelist.c | 2 +- reactos/dll/win32/comctl32/monthcal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/comctl32/imagelist.c b/reactos/dll/win32/comctl32/imagelist.c index ccc594f09f6..28e2968774e 100644 --- a/reactos/dll/win32/comctl32/imagelist.c +++ b/reactos/dll/win32/comctl32/imagelist.c @@ -3094,7 +3094,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n", diff --git a/reactos/dll/win32/comctl32/monthcal.c b/reactos/dll/win32/comctl32/monthcal.c index 83adf600c98..e148a62aa80 100644 --- a/reactos/dll/win32/comctl32/monthcal.c +++ b/reactos/dll/win32/comctl32/monthcal.c @@ -160,8 +160,8 @@ static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; /* valid date limits */ -static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; -static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; +static const SYSTEMTIME max_allowed_date = { /* wYear */ 9999, /* wMonth */ 12, /* wDayOfWeek */ 0, /* wDay */ 31 }; +static const SYSTEMTIME min_allowed_date = { /* wYear */ 1752, /* wMonth */ 9, /* wDayOfWeek */ 0, /* wDay */ 14 }; /* Prev/Next buttons */ enum nav_direction