Author: rharabien
Date: Mon Feb 13 17:04:52 2012
New Revision: 55579

URL: http://svn.reactos.org/svn/reactos?rev=55579&view=rev
Log:
- Fix MSVC build (patch by Thomas Fabber reverted by me in previous commit)

Modified:
    trunk/reactos/dll/win32/comctl32/imagelist.c
    trunk/reactos/dll/win32/comctl32/monthcal.c

Modified: trunk/reactos/dll/win32/comctl32/imagelist.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imagelist.c?rev=55579&r1=55578&r2=55579&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Mon Feb 13 
17:04:52 2012
@@ -3094,7 +3094,7 @@
 
     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",

Modified: trunk/reactos/dll/win32/comctl32/monthcal.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthcal.c?rev=55579&r1=55578&r2=55579&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] Mon Feb 13 
17:04:52 2012
@@ -160,8 +160,8 @@
 /* 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


Reply via email to