only use a single platform file for win32

Author: firewave

lib/platform.cpp

@@ -87,20 +87,26 @@ bool Platform::set(const std::string& platformstr, std::string& errstr, const st
         // TODO: deprecate
         //std::cout << "Platform 'win32A' is deprecated and will be removed in a future version. Please use 'win32a' instead." << std::endl;
         t = Type::Win32A;
-        platformFile = "win32a";
+        platformFile = "win32";
     }
     else if (platformstr == "win32a") {
+        // TODO: deprecate if we have proper UNICODE support in win32.cfg
         t = Type::Win32A;
-        platformFile = platformstr;
+        platformFile = "win32";
     }
     else if (platformstr == "win32W") {
         // TODO: deprecate
         //std::cout << "Platform 'win32W' is deprecated and will be removed in a future version. Please use 'win32w' instead." << std::endl;
         t = Type::Win32W;
-        platformFile = "win32w";
+        platformFile = "win32";
     }
     else if (platformstr == "win32w") {
+        // TODO: deprecate if we have proper UNICODE support in win32.cfg
         t = Type::Win32W;
+        platformFile = "win32";
+    }
+    else if (platformstr == "win32") {
+        t = Type::Win32A;
         platformFile = platformstr;
     }
     else if (platformstr == "win64") {

platforms/win32a.xml platforms/win32.xmlplatforms/win32a.xml renamed to platforms/win32.xml

@@ -242,6 +242,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(stdmulti1);
         TEST_CASE(stdmulti2);
         TEST_CASE(platformWin64);
+        TEST_CASE(platformWin32);
         TEST_CASE(platformWin32A);
         TEST_CASE(platformWin32a);
         TEST_CASE(platformWin32W);
@@ -1528,6 +1529,15 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(Platform::Type::Win64, settings->platform.type);
     }
 
+    void platformWin32() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=win32", "file.cpp"};
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings->platform.type);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
     void platformWin32A() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=win32A", "file.cpp"};