diff --git a/VBA.sln b/VBA.sln index 065989e7..5f0234c6 100644 --- a/VBA.sln +++ b/VBA.sln @@ -19,40 +19,73 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Optimized|Win32 = Optimized|Win32 + Optimized|x64 = Optimized|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32 {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.ActiveCfg = Debug|x64 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.Build.0 = Debug|x64 {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Optimized|Win32.ActiveCfg = Optimized|Win32 {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Optimized|Win32.Build.0 = Optimized|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Optimized|x64.ActiveCfg = Optimized|x64 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Optimized|x64.Build.0 = Optimized|x64 {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32 {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.ActiveCfg = Release|x64 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.Build.0 = Release|x64 {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|Win32.ActiveCfg = Debug|Win32 {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|Win32.Build.0 = Debug|Win32 + {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|x64.ActiveCfg = Debug|x64 + {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|x64.Build.0 = Debug|x64 {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Optimized|Win32.ActiveCfg = Release|Win32 {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Optimized|Win32.Build.0 = Release|Win32 + {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Optimized|x64.ActiveCfg = Release|x64 + {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Optimized|x64.Build.0 = Release|x64 {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|Win32.ActiveCfg = Release|Win32 {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|Win32.Build.0 = Release|Win32 + {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|x64.ActiveCfg = Release|x64 + {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|x64.Build.0 = Release|x64 {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Debug|Win32.ActiveCfg = Debug|Win32 {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Debug|Win32.Build.0 = Debug|Win32 + {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Debug|x64.ActiveCfg = Debug|x64 + {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Debug|x64.Build.0 = Debug|x64 {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Optimized|Win32.ActiveCfg = Release|Win32 {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Optimized|Win32.Build.0 = Release|Win32 + {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Optimized|x64.ActiveCfg = Release|x64 + {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Optimized|x64.Build.0 = Release|x64 {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Release|Win32.ActiveCfg = Release|Win32 {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Release|Win32.Build.0 = Release|Win32 + {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Release|x64.ActiveCfg = Release|x64 + {96E945F7-0377-48DA-A5F8-1C192DE9F25F}.Release|x64.Build.0 = Release|x64 {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Debug|Win32.ActiveCfg = Debug|Win32 {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Debug|Win32.Build.0 = Debug|Win32 + {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Debug|x64.ActiveCfg = Debug|x64 + {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Debug|x64.Build.0 = Debug|x64 {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Optimized|Win32.ActiveCfg = Release|Win32 {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Optimized|Win32.Build.0 = Release|Win32 + {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Optimized|x64.ActiveCfg = Release|x64 + {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Optimized|x64.Build.0 = Release|x64 {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Release|Win32.ActiveCfg = Release|Win32 {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Release|Win32.Build.0 = Release|Win32 + {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Release|x64.ActiveCfg = Release|x64 + {DB5C12E9-BCD3-4517-8708-475C0D1D88CE}.Release|x64.Build.0 = Release|x64 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.ActiveCfg = Debug|x64 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.Build.0 = Debug|x64 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Optimized|Win32.ActiveCfg = Release|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Optimized|Win32.Build.0 = Release|Win32 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Optimized|x64.ActiveCfg = Release|x64 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Optimized|x64.Build.0 = Release|x64 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32 {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.ActiveCfg = Release|x64 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VBA.vcproj b/VBA.vcproj index 74b611f0..1385d82a 100644 --- a/VBA.vcproj +++ b/VBA.vcproj @@ -11,6 +11,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,6 +787,14 @@ WholeProgramOptimization="true" /> + + + + + + @@ -435,6 +829,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + @@ -445,6 +849,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + + + + + + + @@ -512,6 +944,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + @@ -522,6 +964,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + + + + @@ -546,6 +1008,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + @@ -556,6 +1028,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + + + + @@ -580,6 +1072,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + @@ -590,6 +1092,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + + + + @@ -614,6 +1136,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + @@ -624,6 +1156,16 @@ Outputs=""$(ProjectDir)$(IntDir)\$(InputName).obj"" /> + + + + + + + + + + + + + + + @@ -1141,6 +1715,14 @@ CompileAs="1" /> + + + @@ -1149,6 +1731,14 @@ CompileAs="1" /> + + + checkDevices(); diff --git a/src/win32/Joypad.h b/src/win32/Joypad.h index 4fc41adb..bfc16016 100644 --- a/src/win32/Joypad.h +++ b/src/win32/Joypad.h @@ -106,7 +106,7 @@ class JoypadConfig : public CDialog // Implementation protected: - UINT timerId; + UINT_PTR timerId; int which; // Generated message map functions @@ -115,7 +115,7 @@ class JoypadConfig : public CDialog afx_msg void OnOk(); afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnDestroy(); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); virtual BOOL OnInitDialog(); //}}AFX_MSG @@ -162,7 +162,7 @@ class MotionConfig : public CDialog afx_msg void OnDestroy(); virtual BOOL OnInitDialog(); afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); //}}AFX_MSG DECLARE_MESSAGE_MAP() private: diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp index e64f5f43..3b3c8133 100644 --- a/src/win32/MainWndOptions.cpp +++ b/src/win32/MainWndOptions.cpp @@ -1049,7 +1049,7 @@ void MainWnd::OnOptionsSoundOn() { if(soundOffFlag) { soundOffFlag = false; - // soundInit(); + soundInit(); } soundEnable(0x30f); }