ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a bit of windows driver cleanup

This commit is contained in:
zeromus 2007-08-30 05:30:53 +00:00
parent 316511edc6
commit 63205aa5a5
11 changed files with 250 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/drivers/win/ddraw.h → src/drivers/win/directx/ddraw.h
View File

0
vc_libs/x86/ddraw.lib → src/drivers/win/directx/ddraw.lib
View File

0
src/drivers/win/dinput.h → src/drivers/win/directx/dinput.h
View File

0
vc_libs/x86/dinput.lib → src/drivers/win/directx/dinput.lib
View File

0
src/drivers/win/dsound.h → src/drivers/win/directx/dsound.h
View File

0
vc_libs/x86/dsound.lib → src/drivers/win/directx/dsound.lib
View File

0
vc_libs/x86/dxguid.lib → src/drivers/win/directx/dxguid.lib
View File

12
src/drivers/win/memview.cpp
View File

@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <algorithm>
#include "common.h" #include "common.h"
#include "..\..\types.h" #include "..\..\types.h"
#include "..\..\debug.h" #include "..\..\debug.h"
@ -697,12 +699,12 @@ void ChangeMemViewFocus(int newEditingMode, int StartOffset,int EndOffset){
CursorEndAddy = -1; CursorEndAddy = -1;
CursorStartAddy = StartOffset; CursorStartAddy = StartOffset;
} else { } else {
CursorStartAddy = min(StartOffset,EndOffset); CursorStartAddy = std::min(StartOffset,EndOffset);
CursorEndAddy = max(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){ if(StartOffset < CurOffset){
CurOffset = (StartOffset/16)*16; 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; if (i >= MaxSize)i = MaxSize-1;
EditingText = AddyWasText; EditingText = AddyWasText;
if(i != -1){ if(i != -1){
CursorStartAddy = min(i,CursorDragPoint); CursorStartAddy = std::min(i,CursorDragPoint);
CursorEndAddy = max(i,CursorDragPoint); CursorEndAddy = std::max(i,CursorDragPoint);
if(CursorEndAddy == CursorStartAddy)CursorEndAddy = -1; if(CursorEndAddy == CursorStartAddy)CursorEndAddy = -1;
} }

2
src/drivers/win/sound.cpp
View File

@ -555,11 +555,9 @@ int32 fps_scale = 256;
void RefreshThrottleFPS() void RefreshThrottleFPS()
{ {
printf("WTF\n");
fflush(stdout); fflush(stdout);
desiredfps=FCEUI_GetDesiredFPS()>>8; desiredfps=FCEUI_GetDesiredFPS()>>8;
desiredfps=(desiredfps*fps_scale)>>8; desiredfps=(desiredfps*fps_scale)>>8;
} }
static void IncreaseEmulationSpeed(void) static void IncreaseEmulationSpeed(void)

4
src/drivers/win/tracer.cpp
View File

@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <algorithm>
#include "common.h" #include "common.h"
#include "debugger.h" #include "debugger.h"
#include "..\..\x6502.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; j = i;
if(tracelogbufusedsize == tracelogbufsize){ if(tracelogbufusedsize == tracelogbufsize){
j = (tracelogbufpos+i)%tracelogbufsize; j = (tracelogbufpos+i)%tracelogbufsize;

242
vc8/fceux.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="fceux" Name="fceux"
ProjectGUID="{6893EF44-FEA3-46DF-B236-C4C200F54294}" ProjectGUID="{6893EF44-FEA3-46DF-B236-C4C200F54294}"
RootNamespace="fceux" RootNamespace="fceux"
@ -43,8 +43,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../src/drivers/win/zlib" 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_" 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" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -67,7 +67,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" 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" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
@ -1392,6 +1392,240 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
</Filter> </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> </Filter>
<Filter <Filter