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

fix a linux wiimote compile error and apply some little changes to the dx plugin :P 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4631 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
luisr142004 2009-11-30 03:48:59 +00:00
parent 5ef159a971
commit 9e17ee5155
6 changed files with 34 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -622,9 +622,7 @@ void Host_SetWaitCursor(bool enable)
if(enable) if(enable)
{ {
SetCursor(LoadCursor(NULL, IDC_WAIT)); SetCursor(LoadCursor(NULL, IDC_WAIT));
} } else {
else
{
SetCursor(LoadCursor(NULL, IDC_ARROW)); SetCursor(LoadCursor(NULL, IDC_ARROW));
} }
#endif #endif

3
Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.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="9,00" Version="9.00"
Name="Plugin_VideoDX9" Name="Plugin_VideoDX9"
ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}" ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
RootNamespace="Plugin_VideoDX9" RootNamespace="Plugin_VideoDX9"
@ -211,6 +211,7 @@
GenerateManifest="false" GenerateManifest="false"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
SubSystem="2"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib" ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"

18
Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
View File

@ -54,7 +54,7 @@ struct TabDirect3D : public W32Util::Tab
ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_ANTIALIASMODE), g_Config.iMultisampleMode); ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_ANTIALIASMODE), g_Config.iMultisampleMode);
if (adapter.aa_levels.size() == 1) if (adapter.aa_levels.size() == 1)
{ {
EnableWindow(GetDlgItem(hDlg, IDC_ANTIALIASMODE), FALSE); ComboBox_Enable(GetDlgItem(hDlg, IDC_ANTIALIASMODE), FALSE);
} }
for (int i = 0; i < (int)adapter.resolutions.size(); i++) for (int i = 0; i < (int)adapter.resolutions.size(); i++)
@ -71,14 +71,14 @@ struct TabDirect3D : public W32Util::Tab
for (int i = 0; i < 16; i++) tempwstr[i] = g_Config.cInternalRes[i]; for (int i = 0; i < 16; i++) tempwstr[i] = g_Config.cInternalRes[i];
ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED), -1, tempwstr); ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED), -1, tempwstr);
CheckDlgButton(hDlg, IDC_FULLSCREENENABLE, g_Config.bFullscreen ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_FULLSCREENENABLE), g_Config.bFullscreen);
CheckDlgButton(hDlg, IDC_VSYNC, g_Config.bVSync ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_VSYNC), g_Config.bVSync);
CheckDlgButton(hDlg, IDC_RENDER_TO_MAINWINDOW, g_Config.RenderToMainframe ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_RENDER_TO_MAINWINDOW), g_Config.RenderToMainframe);
CheckDlgButton(hDlg, IDC_ASPECT_16_9, g_Config.bKeepAR169 ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_ASPECT_16_9), g_Config.bKeepAR169);
CheckDlgButton(hDlg, IDC_ASPECT_4_3, g_Config.bKeepAR43 ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_ASPECT_4_3), g_Config.bKeepAR43);
CheckDlgButton(hDlg, IDC_WIDESCREEN_HACK, g_Config.bWidescreenHack ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_WIDESCREEN_HACK), g_Config.bWidescreenHack);
CheckDlgButton(hDlg, IDC_SAFE_TEXTURE_CACHE, g_Config.bSafeTextureCache ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_SAFE_TEXTURE_CACHE), g_Config.bSafeTextureCache);
CheckDlgButton(hDlg, IDC_EFB_ACCESS_ENABLE, g_Config.bEFBAccessEnable ? TRUE : FALSE); Button_SetCheck(GetDlgItem(hDlg, IDC_EFB_ACCESS_ENABLE), g_Config.bEFBAccessEnable);
Button_GetCheck(GetDlgItem(hDlg,IDC_RENDER_TO_MAINWINDOW)) ? Button_Enable(GetDlgItem(hDlg,IDC_FULLSCREENENABLE), false) : Button_Enable(GetDlgItem(hDlg,IDC_FULLSCREENENABLE), true); Button_GetCheck(GetDlgItem(hDlg,IDC_RENDER_TO_MAINWINDOW)) ? Button_Enable(GetDlgItem(hDlg,IDC_FULLSCREENENABLE), false) : Button_Enable(GetDlgItem(hDlg,IDC_FULLSCREENENABLE), true);
} }

37
Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
View File

@ -99,25 +99,6 @@ namespace W32Util
sheet.hwndParent = hParent; sheet.hwndParent = hParent;
sheet.pszbmWatermark = watermark; sheet.pszbmWatermark = watermark;
sheet.pszbmHeader = header; sheet.pszbmHeader = header;
if (icon)
sheet.hIcon = icon;
if (wizard)
sheet.dwFlags = PSH_USECALLBACK | PSH_WIZARD97 | (watermark?PSH_WATERMARK:0) | (header?PSH_HEADER:0);
else
sheet.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE;
sheet.dwFlags |= PSH_NOCONTEXTHELP;
if (floating)
sheet.dwFlags |= PSH_MODELESS;
//else
// sheet.dwFlags |= PSH_NOAPPLYNOW;
if (icon)
sheet.dwFlags |= PSH_USEHICON;
sheet.pszCaption = title; sheet.pszCaption = title;
sheet.nPages = (UINT)list.size(); sheet.nPages = (UINT)list.size();
sheet.phpage = pages; sheet.phpage = pages;
@ -131,6 +112,7 @@ namespace W32Util
if (wizard) if (wizard)
{ {
sheet.dwFlags = PSH_USECALLBACK | PSH_WIZARD97 | (watermark?PSH_WATERMARK:0) | (header?PSH_HEADER:0);
//Create the intro/end title font //Create the intro/end title font
LOGFONT TitleLogFont = ncm.lfMessageFont; LOGFONT TitleLogFont = ncm.lfMessageFont;
@ -143,9 +125,22 @@ namespace W32Util
TitleLogFont.lfHeight = 0 - GetDeviceCaps(hdc, LOGPIXELSY) * FontSize / 72; TitleLogFont.lfHeight = 0 - GetDeviceCaps(hdc, LOGPIXELSY) * FontSize / 72;
hTitleFont = CreateFontIndirect(&TitleLogFont); hTitleFont = CreateFontIndirect(&TitleLogFont);
ReleaseDC(NULL, hdc); ReleaseDC(NULL, hdc);
} } else {
else sheet.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE;
hTitleFont = 0; hTitleFont = 0;
}
if (icon) {
sheet.dwFlags |= PSH_USEHICON;
sheet.hIcon = icon;
}
sheet.dwFlags |= PSH_NOCONTEXTHELP;
if (floating)
sheet.dwFlags |= PSH_MODELESS;
//else
// sheet.dwFlags |= PSH_NOAPPLYNOW;
centered=false; centered=false;
PropertySheet(&sheet); PropertySheet(&sheet);

14
Source/Plugins/Plugin_VideoDX9/Src/resource.rc
View File

@ -7,7 +7,7 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include <windows.h> #include "afxres.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
@ -185,7 +185,7 @@ END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN BEGIN
"#include <windows.h\0" "#include ""afxres.h\0"
END END
3 TEXTINCLUDE 3 TEXTINCLUDE
@ -199,13 +199,3 @@ END
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

4
Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
View File

@ -302,7 +302,9 @@ int GetMapKeyState(int _MapKey)
const int Page = 0; const int Page = 0;
if (_MapKey < 256) if (_MapKey < 256)
#ifdef WIN32
return GetAsyncKeyState(_MapKey); // Keyboard return GetAsyncKeyState(_MapKey); // Keyboard
#endif
else if (_MapKey < 0x1100) else if (_MapKey < 0x1100)
return SDL_JoystickGetButton(PadState[Page].joy, _MapKey - 0x1000); // Pad button return SDL_JoystickGetButton(PadState[Page].joy, _MapKey - 0x1000); // Pad button
else // Pad hat else // Pad hat
@ -320,7 +322,7 @@ int GetMapKeyState(int _MapKey)
// Multi System Input Status Check // Multi System Input Status Check
int IsKey(int Key) int IsKey(int Key)
{ {
#ifdef _WIN32 #ifdef WIN32
if (g_Wiimote_kbd.A <= Key && Key <= g_Wiimote_kbd.PITCH_R) if (g_Wiimote_kbd.A <= Key && Key <= g_Wiimote_kbd.PITCH_R)
{ {
return GetMapKeyState(PadMapping[0].Wm.keyForControls[Key - g_Wiimote_kbd.A]); return GetMapKeyState(PadMapping[0].Wm.keyForControls[Key - g_Wiimote_kbd.A]);