From 63205aa5a5cb3542ec9c3e3546dabb28e94d285c Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Thu, 30 Aug 2007 05:30:53 +0000
Subject: [PATCH] a bit of windows driver cleanup

---
 src/drivers/win/{ => directx}/ddraw.h         |   0
 .../x86 => src/drivers/win/directx}/ddraw.lib | Bin
 src/drivers/win/{ => directx}/dinput.h        |   0
 .../drivers/win/directx}/dinput.lib           | Bin
 src/drivers/win/{ => directx}/dsound.h        |   0
 .../drivers/win/directx}/dsound.lib           | Bin
 .../drivers/win/directx}/dxguid.lib           | Bin
 src/drivers/win/memview.cpp                   |  12 +-
 src/drivers/win/sound.cpp                     |   6 +-
 src/drivers/win/tracer.cpp                    |   4 +-
 vc8/fceux.vcproj                              | 242 +++++++++++++++++-
 11 files changed, 250 insertions(+), 14 deletions(-)
 rename src/drivers/win/{ => directx}/ddraw.h (100%)
 rename {vc_libs/x86 => src/drivers/win/directx}/ddraw.lib (100%)
 rename src/drivers/win/{ => directx}/dinput.h (100%)
 rename {vc_libs/x86 => src/drivers/win/directx}/dinput.lib (100%)
 rename src/drivers/win/{ => directx}/dsound.h (100%)
 rename {vc_libs/x86 => src/drivers/win/directx}/dsound.lib (100%)
 rename {vc_libs/x86 => src/drivers/win/directx}/dxguid.lib (100%)

diff --git a/src/drivers/win/ddraw.h b/src/drivers/win/directx/ddraw.h
similarity index 100%
rename from src/drivers/win/ddraw.h
rename to src/drivers/win/directx/ddraw.h
diff --git a/vc_libs/x86/ddraw.lib b/src/drivers/win/directx/ddraw.lib
similarity index 100%
rename from vc_libs/x86/ddraw.lib
rename to src/drivers/win/directx/ddraw.lib
diff --git a/src/drivers/win/dinput.h b/src/drivers/win/directx/dinput.h
similarity index 100%
rename from src/drivers/win/dinput.h
rename to src/drivers/win/directx/dinput.h
diff --git a/vc_libs/x86/dinput.lib b/src/drivers/win/directx/dinput.lib
similarity index 100%
rename from vc_libs/x86/dinput.lib
rename to src/drivers/win/directx/dinput.lib
diff --git a/src/drivers/win/dsound.h b/src/drivers/win/directx/dsound.h
similarity index 100%
rename from src/drivers/win/dsound.h
rename to src/drivers/win/directx/dsound.h
diff --git a/vc_libs/x86/dsound.lib b/src/drivers/win/directx/dsound.lib
similarity index 100%
rename from vc_libs/x86/dsound.lib
rename to src/drivers/win/directx/dsound.lib
diff --git a/vc_libs/x86/dxguid.lib b/src/drivers/win/directx/dxguid.lib
similarity index 100%
rename from vc_libs/x86/dxguid.lib
rename to src/drivers/win/directx/dxguid.lib
diff --git a/src/drivers/win/memview.cpp b/src/drivers/win/memview.cpp
index 873b1ed3..814f8934 100644
--- a/src/drivers/win/memview.cpp
+++ b/src/drivers/win/memview.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <algorithm>
+
 #include "common.h"
 #include "..\..\types.h"
 #include "..\..\debug.h"
@@ -697,12 +699,12 @@ void ChangeMemViewFocus(int newEditingMode, int StartOffset,int EndOffset){
 		CursorEndAddy = -1;
 		CursorStartAddy = StartOffset;
 	} else {
-		CursorStartAddy = min(StartOffset,EndOffset);
-		CursorEndAddy = max(StartOffset,EndOffset);
+		CursorStartAddy = std::min(StartOffset,EndOffset);
+		CursorEndAddy = std::max(StartOffset,EndOffset);
 	}
 
 
-	if(min(StartOffset,EndOffset) >= MaxSize)return; //this should never happen
+	if(std::min(StartOffset,EndOffset) >= MaxSize)return; //this should never happen
 
 	if(StartOffset < CurOffset){
 		CurOffset = (StartOffset/16)*16;
@@ -1024,8 +1026,8 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
 					if (i >= MaxSize)i = MaxSize-1;
 					EditingText = AddyWasText;
 					if(i != -1){
-						CursorStartAddy = min(i,CursorDragPoint);
-						CursorEndAddy = max(i,CursorDragPoint);
+						CursorStartAddy = std::min(i,CursorDragPoint);
+						CursorEndAddy = std::max(i,CursorDragPoint);
 						if(CursorEndAddy == CursorStartAddy)CursorEndAddy = -1;
 					}
 
diff --git a/src/drivers/win/sound.cpp b/src/drivers/win/sound.cpp
index 2780feff..2e6a3292 100644
--- a/src/drivers/win/sound.cpp
+++ b/src/drivers/win/sound.cpp
@@ -555,11 +555,9 @@ int32 fps_scale = 256;
 
 void RefreshThrottleFPS()
 {
-	printf("WTF\n");
 	fflush(stdout);
- desiredfps=FCEUI_GetDesiredFPS()>>8;
- desiredfps=(desiredfps*fps_scale)>>8;
- 
+	desiredfps=FCEUI_GetDesiredFPS()>>8;
+	desiredfps=(desiredfps*fps_scale)>>8;
 }
 
 static void IncreaseEmulationSpeed(void)
diff --git a/src/drivers/win/tracer.cpp b/src/drivers/win/tracer.cpp
index 49f0a13a..cd0cc610 100644
--- a/src/drivers/win/tracer.cpp
+++ b/src/drivers/win/tracer.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <algorithm>
+
 #include "common.h"
 #include "debugger.h"
 #include "..\..\x6502.h"
@@ -453,7 +455,7 @@ void UpdateLogText(void){
 	}
 	*/
 
-	for(i = tracesi.nPos;i < min(tracesi.nMax,tracesi.nPos+21);i++){
+	for(i = tracesi.nPos;i < std::min(tracesi.nMax,tracesi.nPos+21);i++){
 		j = i;
 		if(tracelogbufusedsize == tracelogbufsize){
 			j = (tracelogbufpos+i)%tracelogbufsize;
diff --git a/vc8/fceux.vcproj b/vc8/fceux.vcproj
index 30605ad5..d7b45b6c 100644
--- a/vc8/fceux.vcproj
+++ b/vc8/fceux.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="fceux"
 	ProjectGUID="{6893EF44-FEA3-46DF-B236-C4C200F54294}"
 	RootNamespace="fceux"
@@ -43,8 +43,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../src/drivers/win/zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_"
+				AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx"
+				PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib vfw32.lib winmm.lib ws2_32.lib ../vc_libs/x86/ddraw.lib ../vc_libs/x86/dsound.lib ../vc_libs/x86/dinput.lib ../vc_libs/x86/dxguid.lib"
+				AdditionalDependencies="Rpcrt4.lib  comctl32.lib vfw32.lib winmm.lib ws2_32.lib ../src/drivers/win/directx/dsound.lib ../src/drivers/win/directx/dxguid.lib ../src/drivers/win/directx/ddraw.lib ../src/drivers/win/directx/dinput.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -1392,6 +1392,240 @@
 						</FileConfiguration>
 					</File>
 				</Filter>
+				<Filter
+					Name="audiere"
+					>
+					<File
+						RelativePath="..\src\drivers\win\audiere\audiere.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\basic_source.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\basic_source.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\debug.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\debug.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\default_file.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_ds.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_ds.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_ds_buffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_ds_buffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_ds_stream.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_ds_stream.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_mixer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_mixer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_mm.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_mm.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_null.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\device_null.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\dumb_resample.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\dumb_resample.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\file_ansi.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\input.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)2.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)2.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\internal.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\loop_point_source.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\mci_device.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\memory_file.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\memory_file.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\resampler.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\resampler.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\resource.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\sample_buffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\sound.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)2.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)2.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\sound_effect.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\threads.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\threads_win32.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\timer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\timer_win32.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\tone.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\types.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\utility.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\utility.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\drivers\win\audiere\version.cpp"
+						>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter