Fixed a few compiler warnings.

cosinekitty · cosinekitty · commit 148855dabc11 · 2021-05-03T20:38:49.000-04:00
diff --git a/src/uistdio.cpp b/src/uistdio.cpp
@@ -433,8 +433,7 @@ bool ChessUI_stdio::ReadMove (
                 printf ( "!!! Ignoring invalid time limit\n" );
             }
         }
-        else if ( sscanf ( s, "edit %[a-zA-Z1-8.]", temp ) == 1
-                  && strlen(temp)==3 )
+        else if (sscanf(s, "edit %[a-zA-Z1-8.]", temp)==1 && strlen(temp)==3 )
         {
             int x = temp[1] - 'a';
             int y = temp[2] - '1';
diff --git a/src/uiwin32.cpp b/src/uiwin32.cpp
@@ -1211,7 +1211,7 @@ void ChessUI_win32_gui::blunderAlert_FormatContinuation(
     int maxTextLength)
 {
     int d = 0;      // must init before first usage of SafeAppendToken macro
-    memset(text, '\0', 1 + maxTextLength);
+    memset(text, '\0', 1 + (size_t)maxTextLength);
     int length = 0;
 
     if (!parms || moveIndex < 0 || moveIndex >= parms->numLegalMoves)
diff --git a/src/wbrdbuf.cpp b/src/wbrdbuf.cpp
@@ -49,7 +49,12 @@ BoardDisplayBuffer::BoardDisplayBuffer():
     tempHDC(nullptr),
     inPromotionPrompt(false),
     prom_x(-1),
-    prom_y(-1)
+    prom_y(-1),
+    moverIsWhite(false),
+    vx1(0),
+    vx2(0),
+    vy1(0),
+    vy2(0)
 {
     for ( int x=0; x < 8; x++ )
     {
@@ -428,13 +433,9 @@ void BoardDisplayBuffer::draw (
     loadBitmaps (global_hInstance);
 
     for ( int y=miny; y <= maxy; y++ )
-    {
         for ( int x=minx; x <= maxx; x++ )
-        {
-            // Put the bitmap in the presentation space given.
-            drawSquare ( hdc, board[x][y], x, y );
-        }
-    }
+            if (x >= 0 && x < 8 && y >= 0 && y < 8)
+                drawSquare ( hdc, board[x][y], x, y );
 
     HBRUSH oldbrush = (HBRUSH) SelectObject ( hdc, GetStockObject(NULL_BRUSH) );
     HPEN oldpen = (HPEN) SelectObject ( hdc, GetStockObject(BLACK_PEN) );
diff --git a/src/wingui.cpp b/src/wingui.cpp
@@ -1233,6 +1233,9 @@ void ReadChenardSetting (const char *key, const char *defaultValue, char *opt, s
 {
     bool readValue = false;     // if remains false, it means we failed to read data and will use defaultValue
 
+    if (opt == nullptr)
+        return;
+
     HKEY softwareKeyHandle;
     LSTATUS status = RegOpenKeyEx (
         HKEY_CURRENT_USER,
@@ -1274,11 +1277,8 @@ void ReadChenardSetting (const char *key, const char *defaultValue, char *opt, s
         RegCloseKey (softwareKeyHandle);
     }
 
-
     if (!readValue)
-    {
-        strcpy_s (opt, optSize, defaultValue);
-    }
+        strcpy_s(opt, optSize, defaultValue);
 }
 
 
@@ -1632,11 +1632,11 @@ void SetDirectoryFromFilePath (const char *filepath)
     if (backslash)
     {
         int length = (int) (backslash - filepath);
-        char *path = new char [length + 1];
+        char *path = new char [(size_t)length + 1];
         memcpy (path, filepath, length);
         path[length] = '\0';
 
-        _chdir (path);
+        (void)_chdir(path);
 
         delete[] path;
     }

Original file line number	Diff line number	Diff line change
`@@ -433,8 +433,7 @@ bool ChessUI_stdio::ReadMove (`
`433`	`433`	`printf ( "!!! Ignoring invalid time limit\n" );`
`434`	`434`	`}`
`435`	`435`	`}`
`436`		`- else if ( sscanf ( s, "edit %[a-zA-Z1-8.]", temp ) == 1`
`437`		`- && strlen(temp)==3 )`
	`436`	`+ else if (sscanf(s, "edit %[a-zA-Z1-8.]", temp)==1 && strlen(temp)==3 )`
`438`	`437`	`{`
`439`	`438`	`int x = temp[1] - 'a';`
`440`	`439`	`int y = temp[2] - '1';`
Original file line number	Diff line number	Diff line change
`@@ -1211,7 +1211,7 @@ void ChessUI_win32_gui::blunderAlert_FormatContinuation(`
`1211`	`1211`	`int maxTextLength)`
`1212`	`1212`	`{`
`1213`	`1213`	`int d = 0; // must init before first usage of SafeAppendToken macro`
`1214`		`- memset(text, '\0', 1 + maxTextLength);`
	`1214`	`+ memset(text, '\0', 1 + (size_t)maxTextLength);`
`1215`	`1215`	`int length = 0;`
`1216`	`1216`
`1217`	`1217`	`if (!parms \|\| moveIndex < 0 \|\| moveIndex >= parms->numLegalMoves)`
Original file line number	Diff line number	Diff line change
`@@ -1233,6 +1233,9 @@ void ReadChenardSetting (const char key, const char defaultValue, char *opt, s`
`1233`	`1233`	`{`
`1234`	`1234`	`bool readValue = false; // if remains false, it means we failed to read data and will use defaultValue`
`1235`	`1235`
	`1236`	`+ if (opt == nullptr)`
	`1237`	`+ return;`
	`1238`	`+`
`1236`	`1239`	`HKEY softwareKeyHandle;`
`1237`	`1240`	`LSTATUS status = RegOpenKeyEx (`
`1238`	`1241`	`HKEY_CURRENT_USER,`
`@@ -1274,11 +1277,8 @@ void ReadChenardSetting (const char key, const char defaultValue, char *opt, s`
`1274`	`1277`	`RegCloseKey (softwareKeyHandle);`
`1275`	`1278`	`}`
`1276`	`1279`
`1277`		`-`
`1278`	`1280`	`if (!readValue)`
`1279`		`- {`
`1280`		`- strcpy_s (opt, optSize, defaultValue);`
`1281`		`- }`
	`1281`	`+ strcpy_s(opt, optSize, defaultValue);`
`1282`	`1282`	`}`
`1283`	`1283`
`1284`	`1284`
`@@ -1632,11 +1632,11 @@ void SetDirectoryFromFilePath (const char *filepath)`
`1632`	`1632`	`if (backslash)`
`1633`	`1633`	`{`
`1634`	`1634`	`int length = (int) (backslash - filepath);`
`1635`		`- char *path = new char [length + 1];`
	`1635`	`+ char *path = new char [(size_t)length + 1];`
`1636`	`1636`	`memcpy (path, filepath, length);`
`1637`	`1637`	`path[length] = '\0';`
`1638`	`1638`
`1639`		`- _chdir (path);`
	`1639`	`+ (void)_chdir(path);`
`1640`	`1640`
`1641`	`1641`	`delete[] path;`
`1642`	`1642`	`}`