Merge pull request #8304 from Vbif/static-analysis

Fixed some errors from PVS-Studio in Common project
hrydgard · Dec 26, 2015 · 5c18902 · 5c18902
2 parents 7eb662f + dff476c
commit 5c18902
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/Common/CPUDetect.cpp b/Common/CPUDetect.cpp
@@ -280,7 +280,7 @@ std::string CPUInfo::Summarize()
 	if (bSSE4_2) sum += ", SSE4.2";
 	if (HTT) sum += ", HTT";
 	if (bAVX) sum += ", AVX";
-	if (bAVX) sum += ", FMA";
+	if (bFMA) sum += ", FMA";
 	if (bAES) sum += ", AES";
 	if (bLongMode) sum += ", 64-bit support";
 	return sum;

diff --git a/Common/ColorConv.cpp b/Common/ColorConv.cpp
@@ -408,7 +408,7 @@ void ConvertRGBA4444ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels)
 		__m128i b = _mm_and_si128(_mm_srli_epi16(c, 8), mask4);
 		// And lastly 00A0 00A0.  No mask needed, we have a wall.
 		__m128i a = _mm_srli_epi16(c, 12);
-		a = _mm_slli_epi16(g, 8);
+		a = _mm_slli_epi16(a, 8);
 
 		// We swizzle after combining - R0G0 R0G0 and B0A0 B0A0 -> RRGG RRGG and BBAA BBAA.
 		__m128i rg = _mm_or_si128(r, g);

diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp
@@ -121,10 +121,10 @@ void ConsoleListener::Open()
 	{
 		// Open the console window and create the window handle for GetStdHandle()
 		AllocConsole();
-		HWND hConWnd = GetConsoleWindow();
-		ShowWindow(hConWnd, SW_SHOWDEFAULT);
+		hWnd = GetConsoleWindow();
+		ShowWindow(hWnd, SW_SHOWDEFAULT);
 		// disable console close button
-		HMENU hMenu=GetSystemMenu(hConWnd,false);
+		HMENU hMenu=GetSystemMenu(hWnd, false);
 		EnableMenuItem(hMenu,SC_CLOSE,MF_GRAYED|MF_BYCOMMAND);
 		// Save the window handle that AllocConsole() created
 		hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -513,9 +513,6 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool
 	bool DAft = true;
 	std::string SLog = "";
 
-	const HWND hWnd = GetConsoleWindow();
-	const HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-
 	// Get console info
 	CONSOLE_SCREEN_BUFFER_INFO ConInfo;
 	GetConsoleScreenBufferInfo(hConsole, &ConInfo);
@@ -632,8 +629,6 @@ void ConsoleListener::ClearScreen(bool Cursor)
 	CONSOLE_SCREEN_BUFFER_INFO csbi; 
 	DWORD dwConSize; 
 
-	HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); 
-
 	GetConsoleScreenBufferInfo(hConsole, &csbi); 
 	dwConSize = csbi.dwSize.X * csbi.dwSize.Y;
 	// Write space to the entire console

diff --git a/Common/ConsoleListener.h b/Common/ConsoleListener.h
@@ -46,7 +46,7 @@ class ConsoleListener : public LogListener {
 	bool Hidden() const { return bHidden; }
 private:
 #if defined(_WIN32) && !defined(_XBOX)
-	HWND GetHwnd(void);
+	HWND hWnd;
 	HANDLE hConsole;
 
 	static unsigned int WINAPI RunThread(void *lpParam);

diff --git a/Common/FileUtil.h b/Common/FileUtil.h
@@ -187,6 +187,7 @@ class IOFile : NonCopyable {
 
 private:
 	IOFile& operator=(const IOFile&) /*= delete*/;
+	IOFile(const IOFile&) /*= delete*/;
 
 	std::FILE* m_file;
 	bool m_good;

diff --git a/ext/native/base/mutex.h b/ext/native/base/mutex.h
@@ -125,6 +125,7 @@ class recursive_mutex {
 private:
 	mutexType mut_;
 	recursive_mutex(const recursive_mutex &other);
+	recursive_mutex& operator=(const recursive_mutex& other);
 };
 
 class lock_guard {