x64 vcxproj cleanup

HertzDevil · May 16, 2018 · 8ee3700 · 8ee3700
1 parent 844a444
commit 8ee3700
Show file tree

Hide file tree

Showing 18 changed files with 143 additions and 203 deletions.
diff --git a/0CC-FamiTracker.rc b/0CC-FamiTracker.rc
@@ -1962,14 +1962,6 @@ IDI_LEFT                ICON                    "res\\LeftArrow.ico"
 IDI_RIGHT               ICON                    "res\\RightArrow.ico"
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST
-//
-
-ID_MANIFEST             RT_MANIFEST             "res\\0CC-FamiTracker.manifest"
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog Info

diff --git a/0CC-FamiTracker.sln b/0CC-FamiTracker.sln
@@ -14,35 +14,26 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|Win32.Build.0 = Debug|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x64.ActiveCfg = Debug|x64
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x64.Build.0 = Debug|x64
-		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x86.ActiveCfg = Debug|Win32
-		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x86.Build.0 = Debug|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|Win32.ActiveCfg = Release|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|Win32.Build.0 = Release|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|x64.ActiveCfg = Release|x64
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|x64.Build.0 = Release|x64
-		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|x86.ActiveCfg = Release|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|Win32.Build.0 = Debug|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x64.ActiveCfg = Debug|x64
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x64.Build.0 = Debug|x64
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x86.ActiveCfg = Debug|Win32
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x86.Build.0 = Debug|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|Win32.ActiveCfg = Release|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|Win32.Build.0 = Release|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x64.ActiveCfg = Release|x64
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x64.Build.0 = Release|x64
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x86.ActiveCfg = Release|Win32
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/0CC-FamiTracker.vcxproj b/0CC-FamiTracker.vcxproj
@@ -39,6 +39,7 @@
     <RootNamespace>0CC-FamiTracker</RootNamespace>
     <Keyword>MFCProj</Keyword>
     <ProjectName>0CC-FamiTracker</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 64|Win32'" Label="Configuration">
@@ -85,15 +86,15 @@
     <UseOfMfc>Static</UseOfMfc>
     <UseOfAtl>false</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v141</PlatformToolset>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
@@ -145,15 +146,11 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release 64|x64'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release 64|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release 64|x64'" />
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VC_IncludePath);$(WindowsSdk_71A_IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
@@ -166,6 +163,12 @@
     <IncludePath>$(VC_IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include\;</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(DXSDK_DIR)\Include\</IncludePath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -177,14 +180,13 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MinimalRebuild>false</MinimalRebuild>
       <AdditionalIncludeDirectories>$(ProjectDir)libft0cc\include;$(ProjectDir)Source\;$(DXSDK_DIR)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>obj/$(IntDir)/%(RelativeDir)</ObjectFileName>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <ConformanceMode>true</ConformanceMode>
@@ -203,7 +205,6 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86\;</AdditionalLibraryDirectories>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
@@ -221,37 +222,36 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir)libft0cc\include;$(ProjectDir)Source\;$(DXSDK_DIR)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <ObjectFileName>obj/$(IntDir)/%(RelativeDir)</ObjectFileName>
       <DisableSpecificWarnings>4100;4244;4245;4389</DisableSpecificWarnings>
       <ConformanceMode>true</ConformanceMode>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalOptions>/Zc:__cplusplus</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>Dbghelp.lib;winmm.lib;comctl32.lib;dsound.lib;dxguid.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <AdditionalDependencies>Dbghelp.lib;dsound.lib;dxguid.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64\;</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -297,7 +297,6 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
@@ -310,11 +309,10 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)libft0cc\include;$(ProjectDir)Source\;$(DXSDK_DIR)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(ProjectDir)libft0cc\include;$(ProjectDir)Source\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <AssemblerOutput>
@@ -328,26 +326,27 @@
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalOptions>/Zc:__cplusplus</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <StringPooling>true</StringPooling>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>Dbghelp.lib;winmm.lib;comctl32.lib;dsound.lib;dxguid.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Dbghelp.lib;dsound.lib;dxguid.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <Version>
       </Version>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64\;</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
       <GenerateMapFile>false</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
@@ -959,17 +958,6 @@
     <None Include="Source\resampler\resample.inl" />
     <None Include="specs.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="res\0CC-FamiTracker.manifest">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 64|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 64|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Template|x64'">true</ExcludedFromBuild>
-    </Manifest>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="libft0cc\vc\libft0cc.vcxproj">
       <Project>{f2aefcb7-5232-4ec0-9418-40d777613e46}</Project>

diff --git a/0CC-FamiTracker.vcxproj.filters b/0CC-FamiTracker.vcxproj.filters
@@ -1704,11 +1704,6 @@
     <None Include="0CC-FamiTracker.reg" />
     <None Include="README.md" />
   </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="res\0CC-FamiTracker.manifest">
-      <Filter>Source Files</Filter>
-    </Manifest>
-  </ItemGroup>
   <ItemGroup>
     <Text Include="LICENSE.txt" />
   </ItemGroup>

diff --git a/Source/FamiTracker.cpp b/Source/FamiTracker.cpp
@@ -81,9 +81,6 @@ BEGIN_MESSAGE_MAP(CFamiTrackerApp, CWinApp)
 	ON_UPDATE_COMMAND_UI(ID_FILE_MRU_FILE1, OnUpdateRecentFilesClear)		// // //
 END_MESSAGE_MAP()
 
-// Include this for windows xp style in visual studio 2005 or later
-#pragma comment(linker, "\"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
 // CFamiTrackerApp construction
 
 CFamiTrackerApp::CFamiTrackerApp()
@@ -496,7 +493,7 @@ void CFamiTrackerApp::RegisterSingleInstance()
 		if (auto pBuf = (LPWSTR)MapViewOfFile(m_hWndMapFile, FILE_MAP_ALL_ACCESS, 0, 0, SHARED_MEM_SIZE)) {		// // //
 			// Create a string of main window handle
 //			conv::to_wide(conv::from_int((int)GetMainWnd()->m_hWnd)).copy(pBuf, SHARED_MEM_SIZE);
-			_itow_s((int)GetMainWnd()->m_hWnd, pBuf, SHARED_MEM_SIZE, 10);
+			_itow_s((INT_PTR)GetMainWnd()->m_hWnd, pBuf, SHARED_MEM_SIZE, 10);
 			UnmapViewOfFile(pBuf);
 		}
 	}
@@ -544,7 +541,7 @@ bool CFamiTrackerApp::CheckSingleInstance(CFTCommandLineInfo &cmdInfo)
 						data.dwData = value_cast(cmdInfo.m_bPlay ? ipc_command_t::load_play : ipc_command_t::load);
 						data.cbData = (DWORD)((cmdInfo.m_strFileName.GetLength() + 1) * sizeof(WCHAR));
 						data.lpData = pFilePath;
-						DWORD result;
+						DWORD_PTR result;		// // //
 						SendMessageTimeoutW(hWnd, WM_COPYDATA, NULL, (LPARAM)&data, SMTO_NORMAL, 100, &result);
 						cmdInfo.m_strFileName.ReleaseBuffer();
 						UnmapViewOfFile(pwBuf);

diff --git a/Source/FamiTrackerView.cpp b/Source/FamiTrackerView.cpp
@@ -1142,7 +1142,7 @@ void CFamiTrackerView::OnInitialUpdate()
 	pFrameEditor->InvalidateFrameData();
 	RedrawFrameEditor();
 
-	if (Env.GetMainFrame() && Env.GetMainFrame()->IsWindowVisible())		// // //
+	if (pMainFrame->IsWindowVisible())
 		SetFocus();
 
 	// Display comment box

diff --git a/Source/GraphEditor.cpp b/Source/GraphEditor.cpp
@@ -98,8 +98,7 @@ void CGraphEditor::Initialize()
 	// Allow extra initialization
 }
 
-void CGraphEditor::OnTimer(UINT nIDEvent)
-{
+void CGraphEditor::OnTimer(UINT_PTR nIDEvent) {		// // //
 	if (m_pSequence) {
 		int Pos = Env.GetSoundGenerator()->GetSequencePlayPos(m_pSequence);
 		//int Pos = m_pSequence->GetPlayPos();

diff --git a/Source/GraphEditor.h b/Source/GraphEditor.h
@@ -85,7 +85,7 @@ class CGraphEditor : public CWnd
 	afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
 	afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
 	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);		// // //
 	BOOL CreateEx(DWORD dwExStyle, LPCWSTR lpszClassName, LPCWSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, LPVOID lpParam = NULL);
 	afx_msg void OnSetFocus(CWnd* pOldWnd);
 	afx_msg void OnKillFocus(CWnd* pNewWnd);

diff --git a/Source/InstrumentFileTree.cpp b/Source/InstrumentFileTree.cpp
@@ -103,7 +103,7 @@ bool CInstrumentFileTree::ScanDirectory(const CStringW &path, CMenu &Menu, int l
 			SubMenu.CreatePopupMenu();
 			// Recursive scan
 			bool bEnabled = ScanDirectory(path + L"\\" + fileFinder.GetFileName(), SubMenu, level + 1);
-			Menu.AppendMenuW(MFT_STRING | MF_POPUP | (bEnabled ? MFS_ENABLED : MFS_DISABLED), (UINT)SubMenu.m_hMenu, fileFinder.GetFileName());
+			Menu.AppendMenuW(MFT_STRING | MF_POPUP | (bEnabled ? MFS_ENABLED : MFS_DISABLED), (UINT_PTR)SubMenu.m_hMenu, fileFinder.GetFileName());
 			bNoFile = false;
 		}
 	}

diff --git a/Source/MainFrm.cpp b/Source/MainFrm.cpp
@@ -1694,8 +1694,7 @@ void CMainFrame::OnUpdateInstrumentEdit(CCmdUI *pCmdUI)
 	pCmdUI->Enable(m_pInstrumentList->GetItemCount() > 0);
 }
 
-void CMainFrame::OnTimer(UINT nIDEvent)
-{
+void CMainFrame::OnTimer(UINT_PTR nIDEvent) {		// // //
 	CStringW text;
 	switch ((timer_id_t)nIDEvent) {
 		// Welcome message
@@ -2434,13 +2433,13 @@ void CMainFrame::OnUpdateEditDelete(CCmdUI *pCmdUI)
 void CMainFrame::OnHelpEffecttable()
 {
 	// Display effect table in help
-	HtmlHelpW((DWORD)L"effect_list.htm", HH_DISPLAY_TOPIC);
+	HtmlHelpW((DWORD_PTR)L"effect_list.htm", HH_DISPLAY_TOPIC);
 }
 
 void CMainFrame::OnHelpFAQ()
 {
 	// Display FAQ in help
-	HtmlHelpW((DWORD)L"faq.htm", HH_DISPLAY_TOPIC);
+	HtmlHelpW((DWORD_PTR)L"faq.htm", HH_DISPLAY_TOPIC);
 }
 
 CFamiTrackerView *CMainFrame::GetTrackerView() const {		// // //

diff --git a/Source/MainFrm.h b/Source/MainFrm.h
@@ -315,7 +315,7 @@ class CMainFrame : public CFrameWnd
 	afx_msg void OnUpdateEditDelete(CCmdUI *pCmdUI);
 	afx_msg void OnUpdateEditEnablemidi(CCmdUI *pCmdUI);
 	afx_msg void OnUpdateSelectionEnabled(CCmdUI *pCmdUI);
-	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);		// // //
 	afx_msg void OnFileGeneralsettings();
 	afx_msg void OnEnSongNameChange();
 	afx_msg void OnEnSongArtistChange();

diff --git a/Source/PerformanceDlg.cpp b/Source/PerformanceDlg.cpp
@@ -65,8 +65,7 @@ BOOL CPerformanceDlg::OnInitDialog()
 	// EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CPerformanceDlg::OnTimer(UINT nIDEvent)
-{
+void CPerformanceDlg::OnTimer(UINT_PTR nIDEvent) {		// // //
 	CProgressCtrl *pBar = static_cast<CProgressCtrl*>(GetDlgItem(IDC_CPU_BAR));
 	unsigned int Usage = theApp.GetCPUUsage();
 	unsigned int Rate = theApp.GetSoundGenerator()->GetFrameRate();

diff --git a/Source/PerformanceDlg.h b/Source/PerformanceDlg.h
@@ -45,7 +45,7 @@ class CPerformanceDlg : public CDialog
 	DECLARE_MESSAGE_MAP()
 public:
 	virtual BOOL OnInitDialog();
-	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);		// // //
 	afx_msg void OnBnClickedOk();
 	virtual BOOL DestroyWindow();
 };