More rearrangements of classes in Visual Studio project file.

Some fixes for suggestions from VS.

src/common/JPGLibrary.cxx

@@ -111,7 +111,7 @@ void JPGLibrary::readMetaData(const string& filename, VariantList& metaData)
   std::ifstream in(filename, std::ifstream::binary);
 
   // parse image EXIF metadata
-  TinyEXIF::EXIFInfo imageEXIF(in);
+  const TinyEXIF::EXIFInfo imageEXIF(in);
   if(imageEXIF.Fields)
   {
     // For now we only read the image description

src/common/ZipHandler.cxx

@@ -273,7 +273,6 @@ void ZipHandler::ZipFile::close()
 void ZipHandler::ZipFile::readEcd()
 {
   uInt64 buflen = 1024;
-  ByteBuffer buffer;
 
   // We may need multiple tries
   while(buflen < 65536)
@@ -285,7 +284,7 @@ void ZipHandler::ZipFile::readEcd()
       buflen = myLength;
 
     // Allocate buffer
-    buffer = make_unique<uInt8[]>(buflen + 1);
+    ByteBuffer buffer = make_unique<uInt8[]>(buflen + 1);
     if(buffer == nullptr)
       throw runtime_error(errorMessage(ZipError::OUT_OF_MEMORY));
 

src/os/windows/SerialPortWINDOWS.cxx

@@ -62,7 +62,7 @@ bool SerialPortWINDOWS::openPort(const string& device)
       dcb.StopBits = ONESTOPBIT;
       SetCommState(myHandle, &dcb);
 
-      COMMTIMEOUTS commtimeouts;
+      COMMTIMEOUTS commtimeouts{0};
       commtimeouts.ReadIntervalTimeout = MAXDWORD;
       commtimeouts.ReadTotalTimeoutMultiplier = 0;
       commtimeouts.ReadTotalTimeoutConstant = 1;
@@ -82,7 +82,7 @@ bool SerialPortWINDOWS::readByte(uInt8& data)
   if(myHandle != INVALID_HANDLE_VALUE)
   {
     DWORD read;
-    ReadFile(myHandle, &data, 1, &read, NULL);
+    std::ignore = ReadFile(myHandle, &data, 1, &read, NULL);
     return read == 1;
   }
   return false;
@@ -94,7 +94,7 @@ bool SerialPortWINDOWS::writeByte(uInt8 data)
   if(myHandle != INVALID_HANDLE_VALUE)
   {
     DWORD written;
-    WriteFile(myHandle, &data, 1, &written, NULL);
+    std::ignore = WriteFile(myHandle, &data, 1, &written, NULL);
     return written == 1;
   }
   return false;
@@ -106,7 +106,7 @@ bool SerialPortWINDOWS::isCTS()
   if(myHandle != INVALID_HANDLE_VALUE)
   {
     DWORD modemStat;
-    GetCommModemStatus(myHandle, &modemStat);
+    std::ignore = GetCommModemStatus(myHandle, &modemStat);
     return modemStat & MS_CTS_ON;
   }
   return false;
@@ -147,10 +147,7 @@ StringList SerialPortWINDOWS::portNames()
   RegCloseKey(hKey);
 
   std::sort(ports.begin(), ports.end(),
-    [](const std::string& a, const std::string& b)
+    [](const std::string& a, const std::string& b) { return a < b; }
-  {
-    return a < b;
-  }
   );
 
   return ports;

src/os/windows/Stella.vcxproj

@@ -1836,6 +1836,7 @@
     <ClInclude Include="..\..\common\sdl_blitter\BlitterFactory.hxx" />
     <ClInclude Include="..\..\common\sdl_blitter\QisBlitter.hxx" />
     <ClInclude Include="..\..\common\SDL_lib.hxx" />
+    <ClInclude Include="..\..\common\smartmod.hxx" />
     <ClInclude Include="..\..\common\StaggeredLogger.hxx" />
     <ClInclude Include="..\..\common\StateManager.hxx" />
     <ClInclude Include="..\..\common\StellaKeys.hxx" />

src/os/windows/Stella.vcxproj.filters

@@ -121,6 +121,18 @@
     <Filter Include="Source Files\debugger\gui">
       <UniqueIdentifier>{f379898f-6732-4ffd-ab68-28b275790ca8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\sdl_blitter">
+      <UniqueIdentifier>{ee0eac0c-bfb9-4009-bfe2-1da3c7392a3b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\tv_filters">
+      <UniqueIdentifier>{5825497d-8a3a-4d66-8f1a-b8f381d22204}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\sdl_blitter">
+      <UniqueIdentifier>{ea74c030-5085-43da-9800-64525764ad3b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\tv_filters">
+      <UniqueIdentifier>{30c7f8db-f036-4f42-8edf-88d7773a05b0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\common\FBBackendSDL2.cxx">
@@ -543,9 +555,6 @@
     <ClCompile Include="..\..\common\MouseControl.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\common\tv_filters\NTSCFilter.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\emucore\CartCTY.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
@@ -636,9 +645,6 @@
     <ClCompile Include="..\..\emucore\CartCDF.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\common\tv_filters\AtariNTSC.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\emucore\CartDetector.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
@@ -768,15 +774,6 @@
     <ClCompile Include="..\..\emucore\CartFC.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\common\sdl_blitter\BilinearBlitter.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\sdl_blitter\QisBlitter.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\sdl_blitter\BlitterFactory.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\common\PhosphorHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1182,6 +1179,21 @@
     <ClCompile Include="..\..\debugger\gui\CpuWidget.cxx">
       <Filter>Source Files\debugger\gui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\common\tv_filters\AtariNTSC.cxx">
+      <Filter>Source Files\tv_filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\common\tv_filters\NTSCFilter.cxx">
+      <Filter>Source Files\tv_filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\common\sdl_blitter\BilinearBlitter.cxx">
+      <Filter>Source Files\sdl_blitter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\common\sdl_blitter\BlitterFactory.cxx">
+      <Filter>Source Files\sdl_blitter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\common\sdl_blitter\QisBlitter.cxx">
+      <Filter>Source Files\sdl_blitter</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\common\bspf.hxx">
@@ -1631,9 +1643,6 @@
     <ClInclude Include="..\..\common\MouseControl.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\tv_filters\NTSCFilter.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\emucore\CartCTY.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
@@ -1769,9 +1778,6 @@
     <ClInclude Include="..\..\emucore\tia\DelayQueueIteratorImpl.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\tv_filters\AtariNTSC.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\emucore\CartDetector.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
@@ -1937,18 +1943,6 @@
     <ClInclude Include="..\..\emucore\CartFC.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\sdl_blitter\BilinearBlitter.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\sdl_blitter\Blitter.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\sdl_blitter\QisBlitter.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\sdl_blitter\BlitterFactory.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\PhosphorHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -2420,6 +2414,27 @@
     <ClInclude Include="..\..\debugger\gui\RomListSettings.hxx">
       <Filter>Header Files\debugger\gui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\tv_filters\AtariNTSC.hxx">
+      <Filter>Header Files\tv_filters</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\common\tv_filters\NTSCFilter.hxx">
+      <Filter>Header Files\tv_filters</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\common\sdl_blitter\BilinearBlitter.hxx">
+      <Filter>Header Files\sdl_blitter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\common\sdl_blitter\Blitter.hxx">
+      <Filter>Header Files\sdl_blitter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\common\sdl_blitter\BlitterFactory.hxx">
+      <Filter>Header Files\sdl_blitter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\common\sdl_blitter\QisBlitter.hxx">
+      <Filter>Header Files\sdl_blitter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\common\smartmod.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="stella.ico">