Minor code cleanup.

Add missing variable initialization.
rdoeffinger · Sep 8, 2021 · 6053b3e · 6053b3e
1 parent f3f6463
commit 6053b3e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 17 deletions.
diff --git a/impl11/ddraw/BackbufferSurface.cpp b/impl11/ddraw/BackbufferSurface.cpp
@@ -19,6 +19,7 @@ BackbufferSurface::BackbufferSurface(DeviceResources* deviceResources)
 	this->_buffer = new char[this->_bufferSize];
 	memset(this->_buffer, 0, this->_bufferSize);
 	this->_lockCount = 0;
+	this->sawSrcCopy = false;
 }
 
 BackbufferSurface::~BackbufferSurface()

diff --git a/impl11/ddraw/Direct3DDevice.cpp b/impl11/ddraw/Direct3DDevice.cpp
@@ -555,7 +555,6 @@ HRESULT Direct3DDevice::Execute(
 	DumpExecuteBuffer(executeBuffer);
 #endif
 
-	auto& device = this->_deviceResources->_d3dDevice;
 	auto& context = this->_deviceResources->_d3dDeviceContext;
 
 	HRESULT hr = S_OK;

diff --git a/impl11/ddraw/Direct3DMaterial.h b/impl11/ddraw/Direct3DMaterial.h
@@ -3,6 +3,7 @@
 class Direct3DMaterial : public IDirect3DMaterial
 {
 public:
+	constexpr Direct3DMaterial() : material(), _refCount(1) {}
 	virtual ~Direct3DMaterial() {}
 	/*** IUnknown methods ***/
 

diff --git a/impl11/ddraw/Direct3DTexture.cpp b/impl11/ddraw/Direct3DTexture.cpp
@@ -382,6 +382,8 @@ HRESULT Direct3DTexture::Load(
 				case DXGI_ERROR_INVALID_CALL:
 					s << "invalid call ";
 					break;
+				default:
+					s << reason;
 				}
 				s << reason << " " << _com_error(reason).ErrorMessage();
 				MessageBox(nullptr, s.str().c_str(), __FUNCTION__, MB_ICONERROR);

diff --git a/impl11/ddraw/Direct3DViewport.cpp b/impl11/ddraw/Direct3DViewport.cpp
@@ -6,7 +6,8 @@
 #include "Direct3DMaterial.h"
 #include "Direct3DViewport.h"
 
-Direct3DViewport::Direct3DViewport(DeviceResources* deviceResources)
+Direct3DViewport::Direct3DViewport(DeviceResources* deviceResources) :
+   clearColor{}
 {
 	this->_refCount = 1;
 	this->_deviceResources = deviceResources;

diff --git a/impl11/ddraw/DirectDrawPalette.cpp b/impl11/ddraw/DirectDrawPalette.cpp
@@ -1,15 +1,6 @@
 #include "common.h"
 #include "DirectDrawPalette.h"
 
-DirectDrawPalette::DirectDrawPalette()
-{
-	this->_refCount = 1;
-}
-
-DirectDrawPalette::~DirectDrawPalette()
-{
-}
-
 HRESULT DirectDrawPalette::QueryInterface(
 	REFIID riid,
 	LPVOID* obp

diff --git a/impl11/ddraw/DirectDrawPalette.h b/impl11/ddraw/DirectDrawPalette.h
@@ -3,9 +3,9 @@
 class DirectDrawPalette : public IDirectDrawPalette
 {
 public:
-	DirectDrawPalette();
+	DirectDrawPalette() : _refCount(1), palette() {}
 
-	virtual ~DirectDrawPalette();
+	virtual ~DirectDrawPalette() = default;
 
 	/*** IUnknown methods ***/
 

diff --git a/impl11/ddraw/config.cpp b/impl11/ddraw/config.cpp
@@ -110,7 +110,7 @@ Config::Config()
 				continue;
 			}
 
-			int pos = line.find("=");
+			int pos = line.find('=');
 
 			std::string name = line.substr(0, pos);
 			name.erase(remove_if(name.begin(), name.end(), isspace_wrapper), name.end());

diff --git a/impl11/ddraw/ddraw.cpp b/impl11/ddraw/ddraw.cpp
@@ -5,8 +5,6 @@
 #include "DeviceResources.h"
 #include "DirectDraw.h"
 
-#include "joystick.h"
-
 #pragma comment(lib, "dxguid")
 #pragma comment(lib, "dxgi")
 #pragma comment(lib, "d3d11")

diff --git a/impl11/tests/main.cpp b/impl11/tests/main.cpp
@@ -473,7 +473,7 @@ void main()
 	DDCOLORKEY colorkey;
 	DDBLTFX ddBltFx;
 
-#define CALL(fct) std::cout << #fct << std::endl; if(FAILED(hr = (fct))) { std::cout << (void*)hr << ": " << _com_error(hr).ErrorMessage() << std::endl; return; }
+#define CALL(fct) do { std::cout << #fct << std::endl; if(FAILED(hr = (fct))) { std::cout << (void*)hr << ": " << _com_error(hr).ErrorMessage() << std::endl; return; } } while (false)
 
 	ComPtr<IDirectDraw> ddraw;
 	CALL(DirectDrawCreate(nullptr, &ddraw, nullptr));