comparison dw.h @ 2083:f1acc157b2dd

Win: Correctly show "IE" as HTML renderer if built with Edge support... but a supported version of Edge cannot be detected. Also bump the size of the fields in the DWEnv struct to be 65 characters in line with the size of Linux utsname fields so gcc fortify won't complain about possible truncation during strncpy().
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 31 May 2020 15:15:34 +0000
parents 24875681eec5
children cdb94c6fd611
comparison
equal deleted inserted replaced
2082:3144912829e2 2083:f1acc157b2dd
1329 1329
1330 #if defined(__OS2__) || (defined(__WIN32__) && !defined(GDK_WINDOWING_WIN32)) || (defined(WINNT) && !defined(GDK_WINDOWING_WIN32)) || defined(__EMX__) 1330 #if defined(__OS2__) || (defined(__WIN32__) && !defined(GDK_WINDOWING_WIN32)) || (defined(WINNT) && !defined(GDK_WINDOWING_WIN32)) || defined(__EMX__)
1331 typedef unsigned long DWTID; 1331 typedef unsigned long DWTID;
1332 #endif 1332 #endif
1333 1333
1334 /* Use at least the linux utsname limit to avoid gcc fortify warnings */
1335 #define _DW_ENV_STRING_SIZE 65
1336
1334 typedef struct _dwenv { 1337 typedef struct _dwenv {
1335 /* Operating System Name and DW Build Date/Time */ 1338 /* Operating System Name and DW Build Date/Time */
1336 char osName[30], buildDate[30], buildTime[30]; 1339 char osName[_DW_ENV_STRING_SIZE], buildDate[_DW_ENV_STRING_SIZE], buildTime[_DW_ENV_STRING_SIZE];
1337 /* Versions and builds */ 1340 /* Versions and builds */
1338 short MajorVersion, MinorVersion, MajorBuild, MinorBuild; 1341 short MajorVersion, MinorVersion, MajorBuild, MinorBuild;
1339 /* Dynamic Window version */ 1342 /* Dynamic Window version */
1340 short DWMajorVersion, DWMinorVersion, DWSubVersion; 1343 short DWMajorVersion, DWMinorVersion, DWSubVersion;
1341 /* Which HTML engine is compiled in */ 1344 /* Which HTML engine is compiled in */
1342 char htmlEngine[30]; 1345 char htmlEngine[_DW_ENV_STRING_SIZE];
1343 } DWEnv; 1346 } DWEnv;
1344 1347
1345 1348
1346 typedef struct _dwexpose { 1349 typedef struct _dwexpose {
1347 int x, y; 1350 int x, y;