diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-16 16:56:08 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-16 16:56:08 +0400 |
commit | cd491aff9404bf6f2ab4bca36f2d72ffe53bb128 (patch) | |
tree | 92009b444a05110b9d14be8803a1148d99f0e5d8 /src | |
parent | 60af42a80edbf24004c1662591721b9db454c248 (diff) |
mpcinfo: applied astyle formatting, added VS2008 project and solution file
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2253 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
-rw-r--r-- | src/apps/mpcinfo/mpcinfo.cpp | 268 | ||||
-rw-r--r-- | src/apps/mpcinfo/mpcinfo.def | 27 | ||||
-rw-r--r-- | src/apps/mpcinfo/mpcinfo.h | 6 | ||||
-rw-r--r-- | src/apps/mpcinfo/mpcinfo.rc | 1 | ||||
-rw-r--r-- | src/apps/mpcinfo/mpcinfo.sln | 28 | ||||
-rw-r--r-- | src/apps/mpcinfo/mpcinfo.vcproj | 248 | ||||
-rw-r--r-- | src/apps/mpcinfo/res/mpcinfo.rc2 | 13 | ||||
-rw-r--r-- | src/apps/mpcinfo/stdafx.cpp | 5 | ||||
-rw-r--r-- | src/apps/mpcinfo/stdafx.h | 29 |
9 files changed, 419 insertions, 206 deletions
diff --git a/src/apps/mpcinfo/mpcinfo.cpp b/src/apps/mpcinfo/mpcinfo.cpp index ab59dd67f..4c24ca24f 100644 --- a/src/apps/mpcinfo/mpcinfo.cpp +++ b/src/apps/mpcinfo/mpcinfo.cpp @@ -64,8 +64,8 @@ END_MESSAGE_MAP() CmpcinfoApp::CmpcinfoApp()
{
- // TODO: add construction code here,
- // Place all significant initialization in InitInstance
+ // TODO: add construction code here,
+ // Place all significant initialization in InitInstance
}
@@ -78,9 +78,9 @@ CmpcinfoApp theApp; BOOL CmpcinfoApp::InitInstance()
{
- CWinApp::InitInstance();
+ CWinApp::InitInstance();
- return TRUE;
+ return TRUE;
}
#include <dshow.h>
@@ -89,198 +89,198 @@ BOOL CmpcinfoApp::InitInstance() static bool GetFilterGraph(IFilterGraph** ppFG)
{
- if(!ppFG) return(false);
+ if(!ppFG) return(false);
- CComPtr<IRunningObjectTable> pROT;
- if(FAILED(GetRunningObjectTable(0, &pROT)))
- return 1;
+ CComPtr<IRunningObjectTable> pROT;
+ if(FAILED(GetRunningObjectTable(0, &pROT)))
+ return 1;
- CComPtr<IEnumMoniker> pEM;
- if(FAILED(pROT->EnumRunning(&pEM)))
- return 1;
+ CComPtr<IEnumMoniker> pEM;
+ if(FAILED(pROT->EnumRunning(&pEM)))
+ return 1;
- CComPtr<IBindCtx> pBindCtx;
- CreateBindCtx(0, &pBindCtx);
+ CComPtr<IBindCtx> pBindCtx;
+ CreateBindCtx(0, &pBindCtx);
- for(CComPtr<IMoniker> pMoniker; S_OK == pEM->Next(1, &pMoniker, NULL); pMoniker = NULL)
- {
- LPOLESTR pDispName = NULL;
- if(FAILED(pMoniker->GetDisplayName(pBindCtx, NULL, &pDispName)))
- continue;
+ for(CComPtr<IMoniker> pMoniker; S_OK == pEM->Next(1, &pMoniker, NULL); pMoniker = NULL)
+ {
+ LPOLESTR pDispName = NULL;
+ if(FAILED(pMoniker->GetDisplayName(pBindCtx, NULL, &pDispName)))
+ continue;
- CStringW strw(pDispName);
+ CStringW strw(pDispName);
- CComPtr<IMalloc> pMalloc;
- if(FAILED(CoGetMalloc(1, &pMalloc)))
- continue;
- pMalloc->Free(pDispName);
+ CComPtr<IMalloc> pMalloc;
+ if(FAILED(CoGetMalloc(1, &pMalloc)))
+ continue;
+ pMalloc->Free(pDispName);
- if(strw.Find(L"(MPC)") < 0)
- continue;
+ if(strw.Find(L"(MPC)") < 0)
+ continue;
- CComPtr<IUnknown> pUnk;
- if(S_OK != pROT->GetObject(pMoniker, &pUnk))
- continue;
+ CComPtr<IUnknown> pUnk;
+ if(S_OK != pROT->GetObject(pMoniker, &pUnk))
+ continue;
- CComQIPtr<IFilterGraph> pFG = pUnk;
- if(!pFG)
- continue;
+ CComQIPtr<IFilterGraph> pFG = pUnk;
+ if(!pFG)
+ continue;
- *ppFG = pFG.Detach();
+ *ppFG = pFG.Detach();
- break;
- }
+ break;
+ }
- return(!!*ppFG);
+ return(!!*ppFG);
}
extern "C" int WINAPI file(HWND,HWND,char *data,char*,BOOL,BOOL)
{
- CComPtr<IFilterGraph> pFG;
- if(!GetFilterGraph(&pFG))
- return 1;
+ CComPtr<IFilterGraph> pFG;
+ if(!GetFilterGraph(&pFG))
+ return 1;
- CString fn;
+ CString fn;
- CComPtr<IEnumFilters> pEF;
- if(FAILED(pFG->EnumFilters(&pEF)))
- return 1;
+ CComPtr<IEnumFilters> pEF;
+ if(FAILED(pFG->EnumFilters(&pEF)))
+ return 1;
- ULONG cFetched = 0;
- for(CComPtr<IBaseFilter> pBF; S_OK == pEF->Next(1, &pBF, &cFetched); pBF = NULL)
- {
- if(CComQIPtr<IFileSourceFilter> pFSF = pBF)
- {
- LPOLESTR pFileName = NULL;
- AM_MEDIA_TYPE mt;
- if(FAILED(pFSF->GetCurFile(&pFileName, &mt)))
- continue;
+ ULONG cFetched = 0;
+ for(CComPtr<IBaseFilter> pBF; S_OK == pEF->Next(1, &pBF, &cFetched); pBF = NULL)
+ {
+ if(CComQIPtr<IFileSourceFilter> pFSF = pBF)
+ {
+ LPOLESTR pFileName = NULL;
+ AM_MEDIA_TYPE mt;
+ if(FAILED(pFSF->GetCurFile(&pFileName, &mt)))
+ continue;
- fn = CStringW(pFileName);
+ fn = CStringW(pFileName);
- CoTaskMemFree(pFileName);
- FreeMediaType(mt);
+ CoTaskMemFree(pFileName);
+ FreeMediaType(mt);
- break;
- }
- }
+ break;
+ }
+ }
- if(fn.IsEmpty())
- return 1;
+ if(fn.IsEmpty())
+ return 1;
- sprintf(data, _T("%s"), fn);
+ sprintf(data, _T("%s"), fn);
- return 3;
+ return 3;
}
extern "C" int WINAPI size(HWND,HWND,char *data,char*,BOOL,BOOL)
{
- if(file(0,0,data,0,0,0) != 3)
- return 1;
+ if(file(0,0,data,0,0,0) != 3)
+ return 1;
- CString fn = CStringA(data);
- data[0] = 0;
+ CString fn = CStringA(data);
+ data[0] = 0;
- HANDLE hFile = CreateFile(fn, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, (HANDLE)NULL);
- if(hFile == INVALID_HANDLE_VALUE)
- return 1;
+ HANDLE hFile = CreateFile(fn, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, (HANDLE)NULL);
+ if(hFile == INVALID_HANDLE_VALUE)
+ return 1;
- LARGE_INTEGER size;
- size.QuadPart = 0;
- size.LowPart = GetFileSize(hFile, (DWORD*)&size.HighPart);
+ LARGE_INTEGER size;
+ size.QuadPart = 0;
+ size.LowPart = GetFileSize(hFile, (DWORD*)&size.HighPart);
- sprintf(data, _T("%I64d"), size.QuadPart);
+ sprintf(data, _T("%I64d"), size.QuadPart);
- CloseHandle(hFile);
+ CloseHandle(hFile);
- return 3;
+ return 3;
}
extern "C" int WINAPI pos(HWND,HWND,char *data,char*,BOOL,BOOL)
{
- CComPtr<IFilterGraph> pFG;
- if(!GetFilterGraph(&pFG))
- return 1;
-
- CComQIPtr<IMediaSeeking> pMS = pFG;
- REFERENCE_TIME pos, dur;
- if(FAILED(pMS->GetCurrentPosition(&pos)) || FAILED(pMS->GetDuration(&dur)))
- return 1;
-
- if(dur > 10000000i64*60*60)
- {
- sprintf(data, _T("%02d:%02d:%02d/%02d:%02d:%02d"),
- (int)(pos/10000000/60/60), (int)(pos/10000000/60)%60, (int)(pos/10000000)%60,
- (int)(dur/10000000/60/60), (int)(dur/10000000/60)%60, (int)(dur/10000000)%60);
- }
- else
- {
- sprintf(data, _T("%02d:%02d/%02d:%02d"),
- (int)(pos/10000000/60)%60, (int)(pos/10000000)%60,
- (int)(dur/10000000/60)%60, (int)(dur/10000000)%60);
- }
-
- return 3;
+ CComPtr<IFilterGraph> pFG;
+ if(!GetFilterGraph(&pFG))
+ return 1;
+
+ CComQIPtr<IMediaSeeking> pMS = pFG;
+ REFERENCE_TIME pos, dur;
+ if(FAILED(pMS->GetCurrentPosition(&pos)) || FAILED(pMS->GetDuration(&dur)))
+ return 1;
+
+ if(dur > 10000000i64*60*60)
+ {
+ sprintf(data, _T("%02d:%02d:%02d/%02d:%02d:%02d"),
+ (int)(pos/10000000/60/60), (int)(pos/10000000/60)%60, (int)(pos/10000000)%60,
+ (int)(dur/10000000/60/60), (int)(dur/10000000/60)%60, (int)(dur/10000000)%60);
+ }
+ else
+ {
+ sprintf(data, _T("%02d:%02d/%02d:%02d"),
+ (int)(pos/10000000/60)%60, (int)(pos/10000000)%60,
+ (int)(dur/10000000/60)%60, (int)(dur/10000000)%60);
+ }
+
+ return 3;
}
extern "C" int WINAPI info(HWND,HWND,char *data,char*,BOOL,BOOL)
{
- CStringA ret;
- if(file(0,0,data,0,0,0)!=3) return 1;
- ret += data;
- ret += ", ";
- if(size(0,0,data,0,0,0)!=3) return 1;
- ret += data;
- ret += ", ";
- if(pos(0,0,data,0,0,0)!=3) return 1;
- ret += data;
-
- strcpy(data, ret);
-
- return 3;
+ CStringA ret;
+ if(file(0,0,data,0,0,0)!=3) return 1;
+ ret += data;
+ ret += ", ";
+ if(size(0,0,data,0,0,0)!=3) return 1;
+ ret += data;
+ ret += ", ";
+ if(pos(0,0,data,0,0,0)!=3) return 1;
+ ret += data;
+
+ strcpy(data, ret);
+
+ return 3;
}
extern "C" int WINAPI stopped(HWND,HWND,char *data,char*,BOOL,BOOL)
{
- sprintf(data, _T("2"));
+ sprintf(data, _T("2"));
- CComPtr<IFilterGraph> pFG;
- CComQIPtr<IMediaControl> pMC;
- OAFilterState fs;
- if(!GetFilterGraph(&pFG) || !(pMC = pFG) || FAILED(pMC->GetState(0, &fs)))
- return 3;
+ CComPtr<IFilterGraph> pFG;
+ CComQIPtr<IMediaControl> pMC;
+ OAFilterState fs;
+ if(!GetFilterGraph(&pFG) || !(pMC = pFG) || FAILED(pMC->GetState(0, &fs)))
+ return 3;
- sprintf(data, _T("%d"), fs == State_Stopped ? 1 : 0);
+ sprintf(data, _T("%d"), fs == State_Stopped ? 1 : 0);
- return 3;
+ return 3;
}
extern "C" int WINAPI paused(HWND,HWND,char *data,char*,BOOL,BOOL)
{
- sprintf(data, _T("2"));
+ sprintf(data, _T("2"));
- CComPtr<IFilterGraph> pFG;
- CComQIPtr<IMediaControl> pMC;
- OAFilterState fs;
- if(!GetFilterGraph(&pFG) || !(pMC = pFG) || FAILED(pMC->GetState(0, &fs)))
- return 3;
+ CComPtr<IFilterGraph> pFG;
+ CComQIPtr<IMediaControl> pMC;
+ OAFilterState fs;
+ if(!GetFilterGraph(&pFG) || !(pMC = pFG) || FAILED(pMC->GetState(0, &fs)))
+ return 3;
- sprintf(data, _T("%d"), fs == State_Paused ? 1 : 0);
+ sprintf(data, _T("%d"), fs == State_Paused ? 1 : 0);
- return 3;
+ return 3;
}
extern "C" int WINAPI running(HWND,HWND,char *data,char*,BOOL,BOOL)
{
- sprintf(data, _T("2"));
+ sprintf(data, _T("2"));
- CComPtr<IFilterGraph> pFG;
- CComQIPtr<IMediaControl> pMC;
- OAFilterState fs;
- if(!GetFilterGraph(&pFG) || !(pMC = pFG) || FAILED(pMC->GetState(0, &fs)))
- return 3;
+ CComPtr<IFilterGraph> pFG;
+ CComQIPtr<IMediaControl> pMC;
+ OAFilterState fs;
+ if(!GetFilterGraph(&pFG) || !(pMC = pFG) || FAILED(pMC->GetState(0, &fs)))
+ return 3;
- sprintf(data, _T("%d"), fs == State_Running ? 1 : 0);
+ sprintf(data, _T("%d"), fs == State_Running ? 1 : 0);
- return 3;
+ return 3;
}
diff --git a/src/apps/mpcinfo/mpcinfo.def b/src/apps/mpcinfo/mpcinfo.def index e6de7c10f..ea1950f23 100644 --- a/src/apps/mpcinfo/mpcinfo.def +++ b/src/apps/mpcinfo/mpcinfo.def @@ -1,31 +1,4 @@ -/*
- * $Id$
- *
- * (C) 2003-2005 Gabest
- *
- * This file is part of mpcinfo.
- *
- * Mpcinfo is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mpcinfo is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-; mpcinfo.def : Declares the module parameters for the DLL.
-
-LIBRARY "mpcinfo"
-
EXPORTS
- ; Explicit exports can go here
file
size
pos
diff --git a/src/apps/mpcinfo/mpcinfo.h b/src/apps/mpcinfo/mpcinfo.h index e79fc99d5..29bc96c29 100644 --- a/src/apps/mpcinfo/mpcinfo.h +++ b/src/apps/mpcinfo/mpcinfo.h @@ -36,11 +36,11 @@ class CmpcinfoApp : public CWinApp
{
public:
- CmpcinfoApp();
+ CmpcinfoApp();
// Overrides
public:
- virtual BOOL InitInstance();
+ virtual BOOL InitInstance();
- DECLARE_MESSAGE_MAP()
+ DECLARE_MESSAGE_MAP()
};
diff --git a/src/apps/mpcinfo/mpcinfo.rc b/src/apps/mpcinfo/mpcinfo.rc index 7dd7e5740..3854f7c65 100644 --- a/src/apps/mpcinfo/mpcinfo.rc +++ b/src/apps/mpcinfo/mpcinfo.rc @@ -126,7 +126,6 @@ END #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE 9, 1
#pragma code_page(1252)
-#include "res\mpcinfo.rc2" // non-Microsoft Visual C++ edited resources
#include "afxres.rc" // Standard components
#endif
diff --git a/src/apps/mpcinfo/mpcinfo.sln b/src/apps/mpcinfo/mpcinfo.sln new file mode 100644 index 000000000..07070d179 --- /dev/null +++ b/src/apps/mpcinfo/mpcinfo.sln @@ -0,0 +1,28 @@ +Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpcinfo", "mpcinfo.vcproj", "{AF754B6B-75F8-4A8A-9A98-2E34DB02D4A8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "..\..\filters\BaseClasses\BaseClasses.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {AF754B6B-75F8-4A8A-9A98-2E34DB02D4A8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AF754B6B-75F8-4A8A-9A98-2E34DB02D4A8}.Debug|Win32.Build.0 = Debug|Win32
+ {AF754B6B-75F8-4A8A-9A98-2E34DB02D4A8}.Release|Win32.ActiveCfg = Release|Win32
+ {AF754B6B-75F8-4A8A-9A98-2E34DB02D4A8}.Release|Win32.Build.0 = Release|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.Build.0 = Debug|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.ActiveCfg = Release|Win32
+ {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/src/apps/mpcinfo/mpcinfo.vcproj b/src/apps/mpcinfo/mpcinfo.vcproj new file mode 100644 index 000000000..6ed621965 --- /dev/null +++ b/src/apps/mpcinfo/mpcinfo.vcproj @@ -0,0 +1,248 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="mpcinfo"
+ ProjectGUID="{AF754B6B-75F8-4A8A-9A98-2E34DB02D4A8}"
+ RootNamespace="mpcinfo"
+ Keyword="MFCDLLProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)_$(PlatformName)\"
+ ConfigurationType="2"
+ InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"
+ UseOfMFC="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="false"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\filters\BaseClasses"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="BaseClasses.lib Delayimp.lib Winmm.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="bin/lib/$(ConfigurationName)_$(PlatformName)"
+ IgnoreDefaultLibraryNames="LIBCMTD.lib"
+ ModuleDefinitionFile=".\mpcinfo.def"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(OutDir)\mpcinfo.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)_$(PlatformName)\"
+ ConfigurationType="2"
+ InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"
+ UseOfMFC="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="false"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ AdditionalIncludeDirectories="..\..\filters\BaseClasses"
+ PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_CRT_SECURE_NO_WARNINGS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="2"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="BaseClasses.lib Delayimp.lib Winmm.lib"
+ AdditionalLibraryDirectories="bin/lib/$(ConfigurationName)_$(PlatformName)"
+ IgnoreDefaultLibraryNames=""
+ ModuleDefinitionFile=".\mpcinfo.def"
+ DelayLoadDLLs="oleacc.dll"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="2"
+ ImportLibrary="$(OutDir)\mpcinfo.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ >
+ <File
+ RelativePath="mpcinfo.cpp"
+ >
+ </File>
+ <File
+ RelativePath="mpcinfo.def"
+ >
+ </File>
+ <File
+ RelativePath="stdafx.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc"
+ >
+ <File
+ RelativePath="mpcinfo.h"
+ >
+ </File>
+ <File
+ RelativePath="Resource.h"
+ >
+ </File>
+ <File
+ RelativePath="stdafx.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="mpcinfo.rc"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/src/apps/mpcinfo/res/mpcinfo.rc2 b/src/apps/mpcinfo/res/mpcinfo.rc2 deleted file mode 100644 index 7dc6c48dc..000000000 --- a/src/apps/mpcinfo/res/mpcinfo.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -//
-// mpcinfo.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Add manually edited resources here...
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/src/apps/mpcinfo/stdafx.cpp b/src/apps/mpcinfo/stdafx.cpp index 75853f336..2f1db76f2 100644 --- a/src/apps/mpcinfo/stdafx.cpp +++ b/src/apps/mpcinfo/stdafx.cpp @@ -1,8 +1,5 @@ /*
* $Id$
- * stdafx.cpp : source file that includes just the standard includes
- * mpcinfo.pch will be the pre-compiled header
- * stdafx.obj will contain the pre-compiled type information
*
* (C) 2003-2005 Gabest
*
@@ -24,5 +21,3 @@ */
#include "stdafx.h"
-
-
diff --git a/src/apps/mpcinfo/stdafx.h b/src/apps/mpcinfo/stdafx.h index 5274bb1c4..9e5f785f9 100644 --- a/src/apps/mpcinfo/stdafx.h +++ b/src/apps/mpcinfo/stdafx.h @@ -1,8 +1,5 @@ /*
* $Id$
- * stdafx.h : include file for standard system include files,
- * or project specific include files that are used frequently, but
- * are changed infrequently
*
* (C) 2003-2005 Gabest
*
@@ -32,30 +29,18 @@ // Modify the following defines if you have to target a platform prior to the ones specified below.
// Refer to MSDN for the latest info on corresponding values for different platforms.
#ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400 // Change this to the appropriate value to target IE 5.0 or later.
+#define WINVER 0x0600 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
#endif
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
+#include <afxwin.h> // MFC core and standard components
+#include <afxext.h> // MFC extensions
#ifndef _AFX_NO_OLE_SUPPORT
-#include <afxole.h> // MFC OLE classes
-#include <afxodlgs.h> // MFC OLE dialog classes
-#include <afxdisp.h> // MFC Automation classes
+#include <afxole.h> // MFC OLE classes
+#include <afxodlgs.h> // MFC OLE dialog classes
+#include <afxdisp.h> // MFC Automation classes
#endif // _AFX_NO_OLE_SUPPORT
#ifndef _AFX_NO_DB_SUPPORT
@@ -66,8 +51,6 @@ #include <afxdao.h> // MFC DAO database classes
#endif // _AFX_NO_DAO_SUPPORT
-#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
#ifndef _AFX_NO_AFXCMN_SUPPORT
#include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT
-
|