From 091a454c50113879db5ef56a019811aee681c041 Mon Sep 17 00:00:00 2001 From: death2droid Date: Mon, 19 Oct 2009 12:13:35 +0000 Subject: [PATCH] D3D: Change it so the windows mode resolution displays all usable resolutions like full screen does. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4435 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Plugin_VideoDX9/Src/DlgSettings.cpp | 19 ++----------------- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 -- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp index 0028feb611..61b8690a9b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp @@ -28,16 +28,6 @@ #include "TextureCache.h" // TODO: remove if/when ini files use unicode #define ComboBox_GetTextA(hwndCtl, lpch, cchMax) GetWindowTextA((hwndCtl), (lpch), (cchMax)) -#define NUMWNDRES 6 -int g_Res[NUMWNDRES][2] = -{ - {640,480}, - {800,600}, - {1024,768}, - {1280,960}, - {1280,1024}, - {1600,1200}, -}; struct TabDirect3D : public W32Util::Tab { @@ -72,17 +62,12 @@ struct TabDirect3D : public W32Util::Tab const D3D::Resolution &r = adapter.resolutions[i]; MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, r.name, -1, tempwstr, 2000); ComboBox_AddString(GetDlgItem(hDlg,IDC_RESOLUTION), tempwstr); + ComboBox_AddString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED),tempwstr); } for (int i = 0; i <16; i++) tempwstr[i] = g_Config.cFSResolution[i]; ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTION), -1, tempwstr); - for (int i = 0; i < NUMWNDRES; i++) - { - char temp[256]; - sprintf(temp,"%ix%i",g_Res[i][0],g_Res[i][1]); - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, temp, -1, tempwstr, 2000); - ComboBox_AddString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED),tempwstr); - } + for (int i = 0; i < 16; i++) tempwstr[i] = g_Config.cInternalRes[i]; ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED), -1, tempwstr); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 8af97dd2ab..b68522f936 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -61,8 +61,6 @@ static bool s_AVIDumping; static u32 s_blendMode; -#define NUMWNDRES 6 -extern int g_Res[NUMWNDRES][2]; char st[32768]; // State translation lookup tables