Windows Port: Minor fixes to allow builds on older Visual Studio versions.

Author: rogerman

desmume/src/frontend/windows/aviout.cpp

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2006-2024 DeSmuME team
+	Copyright (C) 2006-2025 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -517,51 +517,13 @@ HRESULT AVIFileStream::WriteAllFrames()
 
 NDSCaptureObject::NDSCaptureObject()
 {
-	// Create the format structs.
-	memset(&_bmpFormat, 0, sizeof(BITMAPINFOHEADER));
-	_bmpFormat.biSize = 0x28;
-	_bmpFormat.biPlanes = 1;
-	_bmpFormat.biBitCount = 24;
-
-	memset(&_wavFormat, 0, sizeof(WAVEFORMATEX));
-
-	_pendingVideoBuffer = NULL;
-	_pendingAudioBuffer = NULL;
-	_pendingAudioWriteSize = NULL;
-	_pendingBufferCount = 0;
-	_currentBufferIndex = 0;
-
-	// Create the colorspace conversion threads.
-	_numThreads = CommonSettings.num_cores;
-
-	if (_numThreads > MAX_CONVERT_THREADS)
-	{
-		_numThreads = MAX_CONVERT_THREADS;
-	}
-	else if (_numThreads < 2)
-	{
-		_numThreads = 0;
-	}
-
-	for (size_t i = 0; i < _numThreads; i++)
-	{
-		memset(&_convertParam[i], 0, sizeof(VideoConvertParam));
-		_convertParam[i].captureObj = this;
-
-		_convertThread[i] = new Task();
-		_convertThread[i]->start(false);
-	}
-	
-	// Generate the AVI file streams.
-	_fs = new AVIFileStream;
-
-	_fileWriteThread = new Task();
-	_fileWriteThread->start(false);
+	__InstanceInit();
 }
 
 NDSCaptureObject::NDSCaptureObject(size_t frameWidth, size_t frameHeight, const WAVEFORMATEX *wfex)
-	: NDSCaptureObject()
 {
+	__InstanceInit();
+
 	_bmpFormat.biWidth = frameWidth;
 	_bmpFormat.biHeight = frameHeight * 2;
 	_bmpFormat.biSizeImage = _bmpFormat.biWidth * _bmpFormat.biHeight * 3;
@@ -623,6 +585,50 @@ NDSCaptureObject::NDSCaptureObject(size_t frameWidth, size_t frameHeight, const
 	}
 }
 
+void NDSCaptureObject::__InstanceInit()
+{
+	// Create the format structs.
+	memset(&_bmpFormat, 0, sizeof(BITMAPINFOHEADER));
+	_bmpFormat.biSize = 0x28;
+	_bmpFormat.biPlanes = 1;
+	_bmpFormat.biBitCount = 24;
+
+	memset(&_wavFormat, 0, sizeof(WAVEFORMATEX));
+
+	_pendingVideoBuffer = NULL;
+	_pendingAudioBuffer = NULL;
+	_pendingAudioWriteSize = NULL;
+	_pendingBufferCount = 0;
+	_currentBufferIndex = 0;
+
+	// Create the colorspace conversion threads.
+	_numThreads = CommonSettings.num_cores;
+
+	if (_numThreads > MAX_CONVERT_THREADS)
+	{
+		_numThreads = MAX_CONVERT_THREADS;
+	}
+	else if (_numThreads < 2)
+	{
+		_numThreads = 0;
+	}
+
+	for (size_t i = 0; i < _numThreads; i++)
+	{
+		memset(&_convertParam[i], 0, sizeof(VideoConvertParam));
+		_convertParam[i].captureObj = this;
+
+		_convertThread[i] = new Task();
+		_convertThread[i]->start(false);
+	}
+	
+	// Generate the AVI file streams.
+	_fs = new AVIFileStream;
+
+	_fileWriteThread = new Task();
+	_fileWriteThread->start(false);
+}
+
 NDSCaptureObject::~NDSCaptureObject()
 {
 	this->_fileWriteThread->finish();

desmume/src/frontend/windows/aviout.h

@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2009-2018 DeSmuME team
+	Copyright (C) 2009-2025 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -131,6 +131,9 @@ class AVIFileStream
 
 class NDSCaptureObject
 {
+private:
+	void __InstanceInit();
+
 protected:
 	AVIFileStream *_fs;
 

desmume/src/frontend/windows/ddraw.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2018 DeSmuME team
+Copyright (C) 2018-2025 DeSmuME team
 
 This file is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,6 +31,9 @@ const char *DDerrors[] = {
 DDRAW::DDRAW() :
 	handle(NULL), clip(NULL)
 {
+	systemMemory = false;
+	vSync = false;
+
 	surface.primary = NULL;
 	surface.back = NULL;
 	memset(&surfDesc, 0, sizeof(surfDesc));

desmume/src/frontend/windows/ddraw.h

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2018 DeSmuME team
+Copyright (C) 2018-2025 DeSmuME team
 
 This file is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@ struct DDRAW
 	DDSURFACEDESC2			surfDescBack;
 	LPDIRECTDRAWCLIPPER		clip;
 
-	bool systemMemory = false;
-	bool vSync = false;
+	bool systemMemory;
+	bool vSync;
 };
 
 #endif

desmume/src/frontend/windows/display.cpp

@@ -25,7 +25,6 @@ along with the this software.  If not, see <http://www.gnu.org/licenses/>.
 #include "windriver.h"
 #include "winutil.h"
 
-#include <cmath>
 
 DDRAW ddraw;
 GLDISPLAY gldisplay;
@@ -816,7 +815,10 @@ void UpdateWndRects(HWND hwnd, RECT* newClientRect)
 	POINT ptClient;
 	RECT rc;
 
-	GapRect = {0,0,0,0};
+	GapRect.left = 0;
+	GapRect.top = 0;
+	GapRect.right = 0;
+	GapRect.bottom = 0;
 
 	bool maximized = IsZoomed(hwnd) != FALSE;
 
@@ -847,8 +849,8 @@ void UpdateWndRects(HWND hwnd, RECT* newClientRect)
 		wndHeight = (rc.right - rc.left);
 
 		ratio = ((float)wndHeight / (float)512);
-		oneScreenHeight = (int)std::round(((float)GPU_FRAMEBUFFER_NATIVE_WIDTH * ratio));
-		int oneScreenWidth = (int)std::round(((float)GPU_FRAMEBUFFER_NATIVE_HEIGHT * ratio));
+		oneScreenHeight    = (int)( ((float)GPU_FRAMEBUFFER_NATIVE_WIDTH  * ratio) + 0.5f );
+		int oneScreenWidth = (int)( ((float)GPU_FRAMEBUFFER_NATIVE_HEIGHT * ratio) + 0.5f );
 		int vResizedScrOffset = 0;
 
 		// Main screen

desmume/src/frontend/windows/main.cpp

@@ -3096,14 +3096,14 @@ LRESULT OpenFile()
 
 	ofn.lpstrFilter = 
 		L"All Usable Files (*.nds, *.ds.gba, *.srl, *.zip, *.7z, *.rar, *.gz)\0*.nds;*.ds.gba;*.srl;*.zip;*.7z;*.rar;*.gz\0"
-		"NDS ROM file (*.nds,*.srl)\0*.nds;*.srl\0"
-		"NDS/GBA ROM File (*.ds.gba)\0*.ds.gba\0"
-		"Zipped NDS ROM file (*.zip)\0*.zip\0"
-		"7Zipped NDS ROM file (*.7z)\0*.7z\0"
-		"RARed NDS ROM file (*.rar)\0*.rar\0"
-		"GZipped NDS ROM file (*.gz)\0*.gz\0"
-		"Any file (*.*)\0*.*\0"
-		"\0"
+		L"NDS ROM file (*.nds,*.srl)\0*.nds;*.srl\0"
+		L"NDS/GBA ROM File (*.ds.gba)\0*.ds.gba\0"
+		L"Zipped NDS ROM file (*.zip)\0*.zip\0"
+		L"7Zipped NDS ROM file (*.7z)\0*.7z\0"
+		L"RARed NDS ROM file (*.rar)\0*.rar\0"
+		L"GZipped NDS ROM file (*.gz)\0*.gz\0"
+		L"Any file (*.*)\0*.*\0"
+		L"\0"
 		; //gzip doesnt actually work right now
 
 	ofn.nFilterIndex = 1;