Menu
▾
▴
[Desmume-cvs] SF.net SVN: desmume:[991] trunk/desmume/src
|
From: <ze...@us...> - 2008-09-23 02:24:30
|
Revision: 991
http://desmume.svn.sourceforge.net/desmume/?rev=991&view=rev
Author: zeromus
Date: 2008-09-23 02:24:26 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
some source code cleanup and reorg of the vs8 vcproj which was driving me insane
Modified Paths:
--------------
trunk/desmume/src/GPU.cpp
trunk/desmume/src/readwrite.cpp
trunk/desmume/src/saves.cpp
trunk/desmume/src/windows/DeSmuME_2005.vcproj
Added Paths:
-----------
trunk/desmume/src/windows/fs-windows.cpp
Removed Paths:
-------------
trunk/desmume/src/config.h
trunk/desmume/src/fs-windows.cpp
trunk/desmume/src/windows/yopyop_private.h
trunk/desmume/src/windows/yopyop_private.rc
Modified: trunk/desmume/src/GPU.cpp
===================================================================
--- trunk/desmume/src/GPU.cpp 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/GPU.cpp 2008-09-23 02:24:26 UTC (rev 991)
@@ -2443,4 +2443,4 @@
{
is->read((char*)GPU_screen,sizeof(GPU_screen));
return !is->fail();
-}
\ No newline at end of file
+}
Deleted: trunk/desmume/src/config.h
===================================================================
--- trunk/desmume/src/config.h 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/config.h 2008-09-23 02:24:26 UTC (rev 991)
@@ -1,28 +0,0 @@
-/* Copyright (C) 2006 thoduv
-
- This file is part of DeSmuME
-
- DeSmuME is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- DeSmuME is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with DeSmuME; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
-
-#include <stdio.h>
-
-#include "debug.h"
-
-#endif /*__CONFIG_H__*/
-
Deleted: trunk/desmume/src/fs-windows.cpp
===================================================================
--- trunk/desmume/src/fs-windows.cpp 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/fs-windows.cpp 2008-09-23 02:24:26 UTC (rev 991)
@@ -1,90 +0,0 @@
-/* Copyright (C) 2006 Guillaume Duhamel
-
- This file is part of DeSmuME
-
- DeSmuME is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- DeSmuME is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with DeSmuME; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "fs.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <windows.h>
-
-const char FS_SEPARATOR = '\\';
-
-void * FsReadFirst(const char * p, FsEntry * entry) {
- WIN32_FIND_DATA FindFileData;
- HANDLE hFind;
- HANDLE * ret;
- char path[1024];
- if (strlen(p)+3 >sizeof(path)) return NULL ;
-
- sprintf(path, "%s\\*", p);
-
- hFind = FindFirstFile(path, &FindFileData);
- if (hFind == INVALID_HANDLE_VALUE)
- return NULL;
-
- strncpy(entry->cFileName, FindFileData.cFileName,256);
- entry->cFileName[255] = 0 ;
- strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
- entry->cAlternateFileName[14] = 0 ;
- entry->flags = 0;
- if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
- entry->flags = FS_IS_DIR;
- entry->fileSize = 0;
- } else {
- entry->fileSize = FindFileData.nFileSizeLow;
- }
-
- ret = (void**)malloc(sizeof(HANDLE));
- *ret = hFind;
- return ret;
-}
-
-int FsReadNext(void * search, FsEntry * entry) {
- WIN32_FIND_DATA FindFileData;
- HANDLE * h = (HANDLE *) search;
- int ret;
-
- ret = FindNextFile(*h, &FindFileData);
-
- strncpy(entry->cFileName, FindFileData.cFileName,256);
- entry->cFileName[255] = 0 ;
- strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
- entry->cAlternateFileName[14] = 0 ;
- entry->flags = 0;
- if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
- entry->flags = FS_IS_DIR;
- entry->fileSize = 0;
- } else {
- entry->fileSize = FindFileData.nFileSizeLow;
- }
-
- return ret;
-}
-
-void FsClose(void * search) {
- FindClose(*((HANDLE *) search));
-}
-
-int FsError(void) {
- if (GetLastError() == ERROR_NO_MORE_FILES)
- return FS_ERR_NO_MORE_FILES;
-
- return FS_ERR_UNKNOWN;
-}
Modified: trunk/desmume/src/readwrite.cpp
===================================================================
--- trunk/desmume/src/readwrite.cpp 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/readwrite.cpp 2008-09-23 02:24:26 UTC (rev 991)
@@ -114,4 +114,4 @@
ret+=fread(d,1,1,fp);
return ret<2?0:2;
#endif
-}
\ No newline at end of file
+}
Modified: trunk/desmume/src/saves.cpp
===================================================================
--- trunk/desmume/src/saves.cpp 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/saves.cpp 2008-09-23 02:24:26 UTC (rev 991)
@@ -573,6 +573,10 @@
std::vector<char> buf(len);
if(comprlen != 0xFFFFFFFF) {
+#ifndef HAVE_LIBZ
+ //without libz, we can't decompress this savestate
+ return false;
+#endif
std::vector<char> cbuf(comprlen);
is->read(&cbuf[0],comprlen);
if(is->fail()) return false;
Modified: trunk/desmume/src/windows/DeSmuME_2005.vcproj
===================================================================
--- trunk/desmume/src/windows/DeSmuME_2005.vcproj 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/windows/DeSmuME_2005.vcproj 2008-09-23 02:24:26 UTC (rev 991)
@@ -545,44 +545,38 @@
</References>
<Files>
<Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ Name="windows"
>
<File
RelativePath=".\AboutBox.cpp"
>
</File>
<File
- RelativePath="..\arm_instructions.cpp"
+ RelativePath=".\AboutBox.h"
>
</File>
<File
- RelativePath="..\armcpu.cpp"
+ RelativePath=".\colorctrl.cpp"
>
</File>
<File
- RelativePath="..\bios.cpp"
+ RelativePath=".\colorctrl.h"
>
</File>
<File
- RelativePath="..\cflash.cpp"
+ RelativePath=".\ConfigKeys.cpp"
>
</File>
<File
- RelativePath=".\colorctrl.cpp"
+ RelativePath=".\ConfigKeys.h"
>
</File>
<File
- RelativePath=".\ConfigKeys.cpp"
- >
- </File>
- <File
RelativePath=".\console.cpp"
>
</File>
<File
- RelativePath="..\cp15.cpp"
+ RelativePath=".\console.h"
>
</File>
<File
@@ -590,11 +584,11 @@
>
</File>
<File
- RelativePath="..\debug.cpp"
+ RelativePath=".\CWindow.h"
>
</File>
<File
- RelativePath="..\Disassembler.cpp"
+ RelativePath=".\DeSmuME.ico"
>
</File>
<File
@@ -602,7 +596,7 @@
>
</File>
<File
- RelativePath="..\FIFO.cpp"
+ RelativePath=".\disView.h"
>
</File>
<File
@@ -610,35 +604,35 @@
>
</File>
<File
- RelativePath="..\fs-windows.cpp"
+ RelativePath=".\FirmConfig.h"
>
</File>
<File
- RelativePath="..\gdbstub\gdbstub.cpp"
+ RelativePath=".\fs-windows.cpp"
>
</File>
<File
- RelativePath="..\gfx3d.cpp"
+ RelativePath=".\ginfo.cpp"
>
</File>
<File
- RelativePath=".\ginfo.cpp"
+ RelativePath=".\ginfo.h"
>
</File>
<File
- RelativePath="..\GPU.cpp"
+ RelativePath=".\IORegView.cpp"
>
</File>
<File
- RelativePath="..\GPU_osd.cpp"
+ RelativePath=".\IORegView.h"
>
</File>
<File
- RelativePath=".\IORegView.cpp"
+ RelativePath=".\lightView.cpp"
>
</File>
<File
- RelativePath=".\lightView.cpp"
+ RelativePath=".\lightView.h"
>
</File>
<File
@@ -674,138 +668,27 @@
>
</File>
<File
- RelativePath="..\matrix.cpp"
+ RelativePath=".\mapView.h"
>
</File>
<File
- RelativePath="..\matrix_sse2-x64.asm"
+ RelativePath=".\matrixView.h"
>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="MASM"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Assembling..."
- CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release (SSE2)|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Assembling..."
- CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="MASM"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Assembling..."
- CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release (SSE2)|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Assembling..."
- CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
</File>
<File
- RelativePath="..\matrix_sse2-x86.asm"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="MASM"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="MASM"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="MASM"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="MASM"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release (SSE2)|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="MASM"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\matrixView.cpp"
- >
- </File>
- <File
- RelativePath="..\mc.cpp"
- >
- </File>
- <File
RelativePath=".\memView.cpp"
>
</File>
<File
- RelativePath="..\MMU.cpp"
+ RelativePath=".\memView.h"
>
</File>
<File
- RelativePath="..\NDSSystem.cpp"
+ RelativePath=".\oamView.cpp"
>
</File>
<File
- RelativePath=".\oamView.cpp"
+ RelativePath=".\oamView.h"
>
</File>
<File
@@ -813,55 +696,27 @@
>
</File>
<File
- RelativePath="..\OGLRender.cpp"
- >
- </File>
- <File
RelativePath=".\palView.cpp"
>
</File>
<File
- RelativePath="..\readwrite.cpp"
+ RelativePath=".\palView.h"
>
</File>
<File
- RelativePath="..\readwrite.h"
+ RelativePath=".\resource.h"
>
</File>
<File
- RelativePath="..\render3D.cpp"
+ RelativePath=".\resources.rc"
>
</File>
<File
- RelativePath="..\ROMReader.cpp"
- >
- <FileConfiguration
- Name="Release (SSE2)|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- CallingConvention="1"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\saves.cpp"
- >
- <FileConfiguration
- Name="Release (SSE2)|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- CallingConvention="1"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\snddx.cpp"
>
</File>
<File
- RelativePath="..\SPU.cpp"
+ RelativePath=".\snddx.h"
>
</File>
<File
@@ -869,7 +724,7 @@
>
</File>
<File
- RelativePath="..\thumb_instructions.cpp"
+ RelativePath=".\throttle.h"
>
</File>
<File
@@ -877,250 +732,369 @@
>
</File>
<File
- RelativePath="..\wifi.cpp"
+ RelativePath=".\tileView.h"
>
</File>
- <Filter
- Name="windows"
- >
- </Filter>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ <File
+ RelativePath="..\ARM9.h"
>
- <File
- RelativePath=".\AboutBox.h"
+ </File>
+ <File
+ RelativePath="..\arm_instructions.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\arm_instructions.h"
+ >
+ </File>
+ <File
+ RelativePath="..\armcpu.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\armcpu.h"
+ >
+ </File>
+ <File
+ RelativePath="..\bios.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\bios.h"
+ >
+ </File>
+ <File
+ RelativePath="..\bits.h"
+ >
+ </File>
+ <File
+ RelativePath="..\cflash.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\cflash.h"
+ >
+ </File>
+ <File
+ RelativePath=".\colorconv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\config.h"
+ >
+ </File>
+ <File
+ RelativePath="..\cp15.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\cp15.h"
+ >
+ </File>
+ <File
+ RelativePath="..\debug.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\debug.h"
+ >
+ </File>
+ <File
+ RelativePath="..\Disassembler.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Disassembler.h"
+ >
+ </File>
+ <File
+ RelativePath="..\dscard.h"
+ >
+ </File>
+ <File
+ RelativePath="..\fat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\FIFO.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\FIFO.h"
+ >
+ </File>
+ <File
+ RelativePath="..\fs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\gdbstub\gdbstub.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\gdbstub.h"
+ >
+ </File>
+ <File
+ RelativePath="..\gdbstub\gdbstub_internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\gfx3d.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\gfx3d.h"
+ >
+ </File>
+ <File
+ RelativePath="..\GPU.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\GPU.h"
+ >
+ </File>
+ <File
+ RelativePath="..\GPU_osd.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\GPU_osd.h"
+ >
+ </File>
+ <File
+ RelativePath="..\matrix.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\matrix.h"
+ >
+ </File>
+ <File
+ RelativePath="..\matrix_sse2-x64.asm"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath="..\ARM9.h"
+ <Tool
+ Name="MASM"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath="..\arm_instructions.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Assembling..."
+ CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release (SSE2)|Win32"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath="..\armcpu.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Assembling..."
+ CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath="..\bios.h"
+ <Tool
+ Name="MASM"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath="..\bits.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Assembling..."
+ CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release (SSE2)|x64"
>
- </File>
- <File
- RelativePath="..\cflash.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Assembling..."
+ CommandLine="ml64 /nologo /c /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\matrix_sse2-x86.asm"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath=".\colorconv.h"
+ <Tool
+ Name="MASM"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath=".\colorctrl.h"
+ <Tool
+ Name="MASM"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath="..\config.h"
+ <Tool
+ Name="MASM"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath=".\ConfigKeys.h"
+ <Tool
+ Name="MASM"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release (SSE2)|x64"
+ ExcludedFromBuild="true"
>
- </File>
- <File
- RelativePath=".\console.h"
+ <Tool
+ Name="MASM"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\matrixView.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mem.h"
+ >
+ </File>
+ <File
+ RelativePath="..\MMU.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\MMU.h"
+ >
+ </File>
+ <File
+ RelativePath="..\NDSSystem.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\NDSSystem.h"
+ >
+ </File>
+ <File
+ RelativePath="..\OGLRender.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\OGLRender.h"
+ >
+ </File>
+ <File
+ RelativePath="..\readwrite.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\readwrite.h"
+ >
+ </File>
+ <File
+ RelativePath="..\registers.h"
+ >
+ </File>
+ <File
+ RelativePath="..\render3D.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\ROMReader.cpp"
+ >
+ <FileConfiguration
+ Name="Release (SSE2)|Win32"
>
- </File>
- <File
- RelativePath="..\cp15.h"
- >
- </File>
- <File
- RelativePath=".\CWindow.h"
- >
- </File>
- <File
- RelativePath="..\debug.h"
- >
- </File>
- <File
- RelativePath="..\Disassembler.h"
- >
- </File>
- <File
- RelativePath=".\disView.h"
- >
- </File>
- <File
- RelativePath="..\dscard.h"
- >
- </File>
- <File
- RelativePath="..\fat.h"
- >
- </File>
- <File
- RelativePath="..\FIFO.h"
- >
- </File>
- <File
- RelativePath=".\FirmConfig.h"
- >
- </File>
- <File
- RelativePath="..\fs.h"
- >
- </File>
- <File
- RelativePath="..\gdbstub.h"
- >
- </File>
- <File
- RelativePath="..\gdbstub\gdbstub_internal.h"
- >
- </File>
- <File
- RelativePath="..\gfx3d.h"
- >
- </File>
- <File
- RelativePath=".\ginfo.h"
- >
- </File>
- <File
- RelativePath="..\GPU.h"
- >
- </File>
- <File
- RelativePath="..\GPU_osd.h"
- >
- </File>
- <File
- RelativePath=".\IORegView.h"
- >
- </File>
- <File
- RelativePath=".\lightView.h"
- >
- </File>
- <File
- RelativePath=".\mapView.h"
- >
- </File>
- <File
- RelativePath="..\matrix.h"
- >
- </File>
- <File
- RelativePath=".\matrixView.h"
- >
- </File>
- <File
- RelativePath="..\mc.h"
- >
- </File>
- <File
- RelativePath="..\mem.h"
- >
- </File>
- <File
- RelativePath=".\memView.h"
- >
- </File>
- <File
- RelativePath="..\MMU.h"
- >
- </File>
- <File
- RelativePath="..\NDSSystem.h"
- >
- </File>
- <File
- RelativePath=".\oamView.h"
- >
- </File>
- <File
- RelativePath="..\OGLRender.h"
- >
- </File>
- <File
- RelativePath=".\palView.h"
- >
- </File>
- <File
- RelativePath="..\registers.h"
- >
- </File>
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\resrc1.h"
- >
- </File>
- <File
- RelativePath="..\ROMReader.h"
- >
- </File>
- <File
- RelativePath="..\saves.h"
- >
- </File>
- <File
- RelativePath=".\snddx.h"
- >
- </File>
- <File
- RelativePath="..\SPU.h"
- >
- </File>
- <File
- RelativePath=".\throttle.h"
- >
- </File>
- <File
- RelativePath="..\thumb_instructions.h"
- >
- </File>
- <File
- RelativePath=".\tileView.h"
- >
- </File>
- <File
- RelativePath="..\types.h"
- >
- </File>
- <File
- RelativePath="..\wifi.h"
- >
- </File>
- <File
- RelativePath=".\yopyop_private.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ <Tool
+ Name="VCCLCompilerTool"
+ CallingConvention="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\ROMReader.h"
>
- <File
- RelativePath=".\DeSmuME.ico"
+ </File>
+ <File
+ RelativePath="..\saves.cpp"
+ >
+ <FileConfiguration
+ Name="Release (SSE2)|Win32"
>
- </File>
- <File
- RelativePath=".\resources.rc"
- >
- </File>
- </Filter>
+ <Tool
+ Name="VCCLCompilerTool"
+ CallingConvention="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\saves.h"
+ >
+ </File>
+ <File
+ RelativePath="..\SPU.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\SPU.h"
+ >
+ </File>
+ <File
+ RelativePath="..\thumb_instructions.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\thumb_instructions.h"
+ >
+ </File>
+ <File
+ RelativePath="..\types.h"
+ >
+ </File>
+ <File
+ RelativePath="..\wifi.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\wifi.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Copied: trunk/desmume/src/windows/fs-windows.cpp (from rev 990, trunk/desmume/src/fs-windows.cpp)
===================================================================
--- trunk/desmume/src/windows/fs-windows.cpp (rev 0)
+++ trunk/desmume/src/windows/fs-windows.cpp 2008-09-23 02:24:26 UTC (rev 991)
@@ -0,0 +1,90 @@
+/* Copyright (C) 2006 Guillaume Duhamel
+
+ This file is part of DeSmuME
+
+ DeSmuME is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ DeSmuME is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with DeSmuME; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "fs.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <windows.h>
+
+const char FS_SEPARATOR = '\\';
+
+void * FsReadFirst(const char * p, FsEntry * entry) {
+ WIN32_FIND_DATA FindFileData;
+ HANDLE hFind;
+ HANDLE * ret;
+ char path[1024];
+ if (strlen(p)+3 >sizeof(path)) return NULL ;
+
+ sprintf(path, "%s\\*", p);
+
+ hFind = FindFirstFile(path, &FindFileData);
+ if (hFind == INVALID_HANDLE_VALUE)
+ return NULL;
+
+ strncpy(entry->cFileName, FindFileData.cFileName,256);
+ entry->cFileName[255] = 0 ;
+ strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
+ entry->cAlternateFileName[14] = 0 ;
+ entry->flags = 0;
+ if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ entry->flags = FS_IS_DIR;
+ entry->fileSize = 0;
+ } else {
+ entry->fileSize = FindFileData.nFileSizeLow;
+ }
+
+ ret = (void**)malloc(sizeof(HANDLE));
+ *ret = hFind;
+ return ret;
+}
+
+int FsReadNext(void * search, FsEntry * entry) {
+ WIN32_FIND_DATA FindFileData;
+ HANDLE * h = (HANDLE *) search;
+ int ret;
+
+ ret = FindNextFile(*h, &FindFileData);
+
+ strncpy(entry->cFileName, FindFileData.cFileName,256);
+ entry->cFileName[255] = 0 ;
+ strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
+ entry->cAlternateFileName[14] = 0 ;
+ entry->flags = 0;
+ if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ entry->flags = FS_IS_DIR;
+ entry->fileSize = 0;
+ } else {
+ entry->fileSize = FindFileData.nFileSizeLow;
+ }
+
+ return ret;
+}
+
+void FsClose(void * search) {
+ FindClose(*((HANDLE *) search));
+}
+
+int FsError(void) {
+ if (GetLastError() == ERROR_NO_MORE_FILES)
+ return FS_ERR_NO_MORE_FILES;
+
+ return FS_ERR_UNKNOWN;
+}
Deleted: trunk/desmume/src/windows/yopyop_private.h
===================================================================
--- trunk/desmume/src/windows/yopyop_private.h 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/windows/yopyop_private.h 2008-09-23 02:24:26 UTC (rev 991)
@@ -1,23 +0,0 @@
-/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
-/* DO NOT EDIT ! */
-
-#ifndef YOPYOP_PRIVATE_H
-#define YOPYOP_PRIVATE_H
-
-/* VERSION DEFINITIONS */
-#define VER_STRING "0.0.7.0"
-#define VER_MAJOR 0
-#define VER_MINOR 0
-#define VER_RELEASE 7
-#define VER_BUILD 0
-#define COMPANY_NAME "yopyop"
-#define FILE_VERSION ""
-#define FILE_DESCRIPTION "NDS(tm) emulator"
-#define INTERNAL_NAME ""
-#define LEGAL_COPYRIGHT ""
-#define LEGAL_TRADEMARKS ""
-#define ORIGINAL_FILENAME ""
-#define PRODUCT_NAME "DeSmuME"
-#define PRODUCT_VERSION ""
-
-#endif /*YOPYOP_PRIVATE_H*/
Deleted: trunk/desmume/src/windows/yopyop_private.rc
===================================================================
--- trunk/desmume/src/windows/yopyop_private.rc 2008-09-22 19:42:28 UTC (rev 990)
+++ trunk/desmume/src/windows/yopyop_private.rc 2008-09-23 02:24:26 UTC (rev 991)
@@ -1,38 +0,0 @@
-/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
-/* DO NOT EDIT! */
-
-#include <windows.h> // include for version info constants
-
-#include "resources.rc"
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME.ico"
-
-//
-// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
-//
-1 VERSIONINFO
-FILEVERSION 0,0,3,4
-PRODUCTVERSION 0,0,3,4
-FILETYPE VFT_APP
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "140904E4"
- {
- VALUE "CompanyName", "yopyop"
- VALUE "FileVersion", ""
- VALUE "FileDescription", "NDS(tm) emulator"
- VALUE "InternalName", ""
- VALUE "LegalCopyright", ""
- VALUE "LegalTrademarks", ""
- VALUE "OriginalFilename", ""
- VALUE "ProductName", "DeSmuME"
- VALUE "ProductVersion", ""
- }
- }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x1409, 1252
- }
-}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|