From c5049e7a5d1179edd76ef01ceb1a37b85c22c59e Mon Sep 17 00:00:00 2001
From: DJRobX <DJRobX@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Wed, 31 Oct 2007 02:33:28 +0000
Subject: [PATCH] Project cleanups, add _CRT_SECURE_NO_WARNINGS to reduce
 absurdly high warning count.

Fix DirectDraw initializer to check for 1024x768 and 1280x1024, they were grayed out.  Default resolutions set to 60hz and DirectDraw now obeys fsFrequency setting.
---
 VBA.suo                  | Bin 53248 -> 53248 bytes
 VBA.vcproj               |   8 ++++----
 libpng/libpng.vcproj     |   4 ++--
 res/VBA.rc               |   4 ++--
 src/hq4x_16.asm          |   6 ++----
 src/win32/Direct3D.cpp   |   7 +++++++
 src/win32/DirectDraw.cpp |  16 +++++++++++++++-
 src/win32/VBA.cpp        |  19 ++++++++++++-------
 zlib/zlib.vcproj         |   4 ++--
 9 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/VBA.suo b/VBA.suo
index b5cff28b3707ef7bd1218c38253709ea586deaea..6b6d8a4c5abbdbcf0a9673a8e7d8e25fb40c0e0f 100644
GIT binary patch
delta 8230
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
XVZ>{kVv5|1(!BD=IHs8|=TUzLZmu$3

delta 9615
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

diff --git a/VBA.vcproj b/VBA.vcproj
index e790f475..0b1a8470 100644
--- a/VBA.vcproj
+++ b/VBA.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)zlib&quot;;&quot;$(SolutionDir)libpng&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;MMX"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;MMX;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="false"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -165,7 +165,7 @@
 				OmitFramePointers="false"
 				EnableFiberSafeOptimizations="false"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)zlib&quot;;&quot;$(SolutionDir)libpng&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;FINAL_VERSION;MMX"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;FINAL_VERSION;MMX;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
 				GeneratePreprocessedFile="0"
 				KeepComments="false"
@@ -307,13 +307,13 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)zlib&quot;;&quot;$(SolutionDir)libpng&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;FINAL_VERSION;MMX"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;FINAL_VERSION;MMX;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
 				GeneratePreprocessedFile="0"
 				KeepComments="false"
 				StringPooling="true"
 				MinimalRebuild="false"
-				ExceptionHandling="0"
+				ExceptionHandling="1"
 				BasicRuntimeChecks="0"
 				SmallerTypeCheck="false"
 				RuntimeLibrary="0"
diff --git a/libpng/libpng.vcproj b/libpng/libpng.vcproj
index 4042293f..5fa03fd4 100644
--- a/libpng/libpng.vcproj
+++ b/libpng/libpng.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)zlib&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -106,7 +106,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)zlib&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/res/VBA.rc b/res/VBA.rc
index 783fb0ff..15e19512 100644
--- a/res/VBA.rc
+++ b/res/VBA.rc
@@ -1592,8 +1592,8 @@ BEGIN
                 MENUITEM "320x240x16",                  ID_OPTIONS_VIDEO_FULLSCREEN320X240
                 MENUITEM "640x480x16",                  ID_OPTIONS_VIDEO_FULLSCREEN640X480
                 MENUITEM "800x600x16",                  ID_OPTIONS_VIDEO_FULLSCREEN800X600
-                MENUITEM "1024x768x32",                 ID_OPTIONS_VIDEO_FULLSCREEN1024X768
-                MENUITEM "1280x1024x32",                ID_OPTIONS_VIDEO_FULLSCREEN1280X1024
+                MENUITEM "1024x768x16",                 ID_OPTIONS_VIDEO_FULLSCREEN1024X768
+                MENUITEM "1280x1024x16",                ID_OPTIONS_VIDEO_FULLSCREEN1280X1024
                 MENUITEM SEPARATOR
                 MENUITEM "&Max Scale...",               ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE
                 MENUITEM "Stretch to &fit",             ID_OPTIONS_VIDEO_FULLSCREENSTRETCHTOFIT
diff --git a/src/hq4x_16.asm b/src/hq4x_16.asm
index 1daf450e..33e93183 100644
--- a/src/hq4x_16.asm
+++ b/src/hq4x_16.asm
@@ -3896,11 +3896,9 @@ _hq4x_16:
     add		edi,ebx
     add     edi,ebx
     mov     ebx, [ebp+Xres] ; added, bug - need to add to destination offset
-    shl     ebx, 1
+    shl     ebx, 3
     sub     edi, ebx
-    sub     edi, ebx
-    sub     edi, ebx    
-    sub     edi, ebx    
+    shr     ebx, 2
     dec     dword[linesleft]
     jz      .fin
     add		ebx, [ebp+offset];
diff --git a/src/win32/Direct3D.cpp b/src/win32/Direct3D.cpp
index 5d53eee8..9878b605 100644
--- a/src/win32/Direct3D.cpp
+++ b/src/win32/Direct3D.cpp
@@ -378,6 +378,8 @@ bool Direct3DDisplay::initialize()
 	theApp.mode320Available = false;
 	theApp.mode640Available = false;
 	theApp.mode800Available = false;
+	theApp.mode1024Available = false;
+	theApp.mode1280Available = false;
 
 	nModes = pD3D->GetAdapterModeCount(theApp.fsAdapter, D3DFMT_R5G6B5);
 	for (i = 0; i<nModes; i++)
@@ -390,6 +392,11 @@ bool Direct3DDisplay::initialize()
 				theApp.mode640Available = true;
 			if ( (dm.Width == 800) && (dm.Height == 600) )
 				theApp.mode800Available = true;
+			if ( (dm.Width == 1024) && (dm.Height == 768) )
+				theApp.mode1024Available = true;
+			if ( (dm.Width == 1280) && (dm.Height == 1024) )
+				theApp.mode1280Available = true;
+
 		}
 	}
 
diff --git a/src/win32/DirectDraw.cpp b/src/win32/DirectDraw.cpp
index df652491..801e8330 100644
--- a/src/win32/DirectDraw.cpp
+++ b/src/win32/DirectDraw.cpp
@@ -105,6 +105,18 @@ static HRESULT WINAPI checkModesAvailable(LPDDSURFACEDESC2 surf, LPVOID lpContex
      surf->ddpfPixelFormat.dwRGBBitCount == 16) {
     theApp.mode800Available = TRUE;
   }
+   if(surf->dwWidth == 1024 &&
+     surf->dwHeight == 768 &&
+     surf->ddpfPixelFormat.dwRGBBitCount == 16) {
+    theApp.mode1024Available = TRUE;
+  }
+    if(surf->dwWidth == 1280 &&
+     surf->dwHeight == 1024 &&
+     surf->ddpfPixelFormat.dwRGBBitCount == 16) {
+    theApp.mode1280Available = TRUE;
+  }
+
+
   return DDENUMRET_OK;
 }
 
@@ -346,6 +358,8 @@ bool DirectDrawDisplay::initialize()
   theApp.mode320Available = false;
   theApp.mode640Available = false;
   theApp.mode800Available = false;
+  theApp.mode1024Available = false;
+  theApp.mode1280Available = false;
   // check for available fullscreen modes
   pDirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, NULL,
                                 checkModesAvailable);
@@ -371,7 +385,7 @@ bool DirectDrawDisplay::initialize()
     hret = pDirectDraw->SetDisplayMode(theApp.fsWidth,
                                        theApp.fsHeight,
                                        theApp.fsColorDepth,
-                                       60,
+                                       theApp.fsFrequency,
                                        0);
     if(hret != DD_OK) {
       winlog("Error SetDisplayMode %08x\n", hret);
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index 9ab16c22..45705cb3 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -1286,7 +1286,7 @@ void VBA::loadSettings()
   fsWidth = regQueryDwordValue("fsWidth", 0);
   fsHeight = regQueryDwordValue("fsHeight", 0);
   fsColorDepth = regQueryDwordValue("fsColorDepth", 0);
-  fsFrequency = regQueryDwordValue("fsFrequency", 0);
+  fsFrequency = regQueryDwordValue("fsFrequency", 60);
   fsAdapter = regQueryDwordValue("fsAdapter", 0);
 
   if(videoOption == VIDEO_OTHER)
@@ -1421,27 +1421,32 @@ void VBA::loadSettings()
     fsWidth = 320;
     fsHeight = 240;
     fsColorDepth = 16;
+	fsFrequency = 60;
     break;
   case VIDEO_640x480:
     fsWidth = 640;
     fsHeight = 480;
     fsColorDepth = 16;
-    break;
+	fsFrequency = 60;
+	break;
   case VIDEO_800x600:
     fsWidth = 800;
     fsHeight = 600;
     fsColorDepth = 16;
-    break;
+	fsFrequency = 60;
+	break;
   case VIDEO_1024x768:
     fsWidth = 1024;
     fsHeight = 768;
-    fsColorDepth = 32;
-    break;
+    fsColorDepth = 16;
+	fsFrequency = 60;
+	break;
   case VIDEO_1280x1024:
     fsWidth = 1280;
     fsHeight = 1024;
-    fsColorDepth = 32;
-    break;
+    fsColorDepth = 16;
+	fsFrequency = 60;
+	break;
   }
 
   winGbBorderOn = regQueryDwordValue("borderOn", 0);
diff --git a/zlib/zlib.vcproj b/zlib/zlib.vcproj
index 3a4d3e04..c3b7df8f 100644
--- a/zlib/zlib.vcproj
+++ b/zlib/zlib.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -103,7 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"