From 8beeaff896ed0a0d92ccc61a3a6f08c2cc8f4146 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Thu, 17 Sep 2009 05:57:38 +0000 Subject: [PATCH] WIIMENU:move call to filemon to verify that std::string(null) is not called fixes issue 1421. D3D: fullscreen use 640x480 if ini setting is invalid Externals/Memcard Manager: fix build since change to lib files for wx git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4290 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Memcard Manager/Memcard Manager.vcproj | 255 +----------------- .../Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 3 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 3 + 3 files changed, 12 insertions(+), 249 deletions(-) diff --git a/Externals/Memcard Manager/Memcard Manager.vcproj b/Externals/Memcard Manager/Memcard Manager.vcproj index c66a9eb806..155ab28f44 100644 --- a/Externals/Memcard Manager/Memcard Manager.vcproj +++ b/Externals/Memcard Manager/Memcard Manager.vcproj @@ -91,12 +91,12 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -621,157 +533,6 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index bb7627b56c..2eca576e59 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -200,6 +200,7 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 { INFO_LOG(WII_IPC_DVD, "DVDLowRead: %s (0x%x) - (DVDAddr: 0x%x, Size: 0x%x)", pFilename, m_pFileSystem->GetFileSize(pFilename), DVDAddress, Size); + FileMon::CheckFile(std::string(pFilename), (int)m_pFileSystem->GetFileSize(pFilename)); } else { @@ -217,8 +218,6 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 { PanicAlert("Cant read from DVD_Plugin - DVD-Interface: Fatal Error"); } - - FileMon::CheckFile(std::string(pFilename), (int)m_pFileSystem->GetFileSize(pFilename)); } break; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 148391c5fd..3cc0f3502f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -111,6 +111,9 @@ bool Renderer::Init() (D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions[fullScreenRes].yres == h_temp)) break; } + if (fullScreenRes == D3D::GetAdapter(g_ActiveConfig.iAdapter).resolutions.size()) + fullScreenRes = 0; + D3D::Create(g_ActiveConfig.iAdapter, EmuWindow::GetWnd(), g_ActiveConfig.bFullscreen, fullScreenRes, backbuffer_ms_mode, false);