diff options
Diffstat (limited to 'src/apps')
24 files changed, 577 insertions, 365 deletions
diff --git a/src/apps/SubResync/SubResync.rc b/src/apps/SubResync/SubResync.rc index 5adeba7ba..8b05237ae 100644 --- a/src/apps/SubResync/SubResync.rc +++ b/src/apps/SubResync/SubResync.rc @@ -13,13 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -40,16 +38,17 @@ IDR_MAINFRAME ICON "res\\SubResync.ico" //
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_ABOUTBOX, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 198
- VERTGUIDE, 14
- VERTGUIDE, 190
+ RIGHTMARGIN, 208
+ VERTGUIDE, 11
+ VERTGUIDE, 193
TOPMARGIN, 7
- BOTTOMMARGIN, 122
+ BOTTOMMARGIN, 133
+ HORZGUIDE, 125
END
IDD_ASKCHARDLG, DIALOG
@@ -104,26 +103,24 @@ IDB_BITMAP2 BITMAP "res\\bitmap2.bmp" // Dialog
//
-IDD_ABOUTBOX DIALOGEX 0, 0, 205, 129
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_ABOUTBOX DIALOGEX 0, 0, 215, 140
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About..."
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- DEFPUSHBUTTON "OK",IDOK,137,98,50,14,WS_GROUP
- GROUPBOX "",IDC_STATIC,7,7,191,115,BS_CENTER
- LTEXT "Subresync Version 2.24\nCopyright 2001-2002 Gabest",
- IDC_STATIC,14,17,179,19
- PUSHBUTTON "Homepage",IDC_HOMEPAGEBTN,17,98,50,14,BS_FLAT
- PUSHBUTTON "Bug Report",IDC_BUGREPORTBTN,77,98,50,14,BS_FLAT
- LTEXT "Credits:\n- SAMI format support by Sanger && Wilowisp of SPKOR\n- Handling of some basic html style modifier tags in SAMI done by [maven]\n- Advanced Text Renderer is using the 'Rasterizer' class of Avery Lee's subtitler plugin",
- IDC_STATIC,14,40,176,51
+ DEFPUSHBUTTON "OK",IDOK,137,111,50,14,WS_GROUP
+ GROUPBOX "",IDC_STATIC,7,7,201,126,BS_CENTER
+ LTEXT "Subresync Version 2.24.0.1\nCopyright © 2001-2002 Gabest",IDC_STATIC,11,17,182,28
+ PUSHBUTTON "Homepage",IDC_HOMEPAGEBTN,17,111,50,14,BS_FLAT
+ PUSHBUTTON "Bug Report",IDC_BUGREPORTBTN,77,111,50,14,BS_FLAT
+ LTEXT "Credits:\n- SAMI format support by Sanger && Wilowisp of SPKOR\n- Handling of some basic html style modifier tags in SAMI done by [maven]\n- Advanced Text Renderer is using the 'Rasterizer' class of Avery Lee's subtitler plugin",IDC_STATIC,11,51,182,51
END
IDD_ASKCHARDLG DIALOGEX 0, 0, 122, 99
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Enter matching letter(s)"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
EDITTEXT 1008,7,7,108,28,ES_CENTER | ES_AUTOHSCROLL
DEFPUSHBUTTON "&OK",IDOK,7,40,108,14
@@ -134,68 +131,51 @@ END IDD_OPENTMPLT DIALOGEX 0, 0, 292, 40
STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Character Set:",IDC_STATIC4,5,3,47,8
- COMBOBOX 1007,54,1,74,76,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP
+ COMBOBOX 1007,54,1,74,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Fps:",IDC_STATIC,143,3,14,8
- COMBOBOX IDC_COMBO2,161,1,37,69,CBS_DROPDOWN | WS_VSCROLL |
- WS_TABSTOP
- CONTROL "Append",IDC_CHECK1,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,5,22,48,10
+ COMBOBOX IDC_COMBO2,161,1,37,69,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Append",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,22,48,10
EDITTEXT IDC_EDIT1,54,20,21,13,ES_CENTER | ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT2,78,20,21,13,ES_CENTER | ES_AUTOHSCROLL |
- ES_NUMBER
- EDITTEXT IDC_EDIT3,102,20,21,13,ES_CENTER | ES_AUTOHSCROLL |
- ES_NUMBER
- EDITTEXT IDC_EDIT4,126,20,21,13,ES_CENTER | ES_AUTOHSCROLL |
- ES_NUMBER
+ EDITTEXT IDC_EDIT2,78,20,21,13,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_EDIT3,102,20,21,13,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_EDIT4,126,20,21,13,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
LTEXT "(hh:mm:ss.ms)",IDC_TIMEFORMATLABEL,152,23,49,8
LTEXT "at:",IDC_AT,44,23,8,8
END
IDD_SAVEASTMPLT DIALOGEX 0, 0, 278, 68
STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "Unicode output",IDC_CHECK1,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,18,15,63,10
- CONTROL "Clear image->letter(s) database",IDC_CHECK2,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,99,15,110,10
- CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,120,40,123,13
+ CONTROL "Unicode output",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,15,63,10
+ CONTROL "Clear image->letter(s) database",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,15,110,10
+ CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,120,40,123,13
LTEXT "Space detecting sensitivity:",IDC_STATIC1,99,29,87,8
LTEXT "More",IDC_STATIC2,99,42,17,8
LTEXT "Less",IDC_STATIC3,247,42,16,8
GROUPBOX "MBCS<->Unicode",IDC_STATIC,9,2,77,58
GROUPBOX "OCR Settings",IDC_STATIC,93,2,178,58
- CONTROL "Use ocrdll.dll",IDC_OCRDLL,"Button",BS_AUTOCHECKBOX |
- NOT WS_VISIBLE | WS_TABSTOP,212,15,52,10
+ CONTROL "Use ocrdll.dll",IDC_OCRDLL,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,212,15,52,10
END
IDD_SUBRESYNC_DIALOG DIALOGEX 0, 0, 342, 197
-STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE |
- WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW
CAPTION "Subresync"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "&Open...",IDC_OPENBTN,7,7,52,14
PUSHBUTTON "Save &As...",IDC_SAVEBTN,7,28,52,14
PUSHBUTTON "&Reset timing",IDC_RESET,7,49,52,14
PUSHBUTTON "&Edit...",IDC_EDITSUB,7,70,52,14,WS_DISABLED
- COMBOBOX IDC_COMBO1,7,71,52,30,CBS_DROPDOWNLIST | NOT WS_VISIBLE |
- WS_VSCROLL | WS_TABSTOP
- CONTROL "Render",IDC_CHECK1,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,13,92,42,10
- CONTROL "Unlink",IDC_CHECK2,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,13,107,43,10
+ COMBOBOX IDC_COMBO1,7,71,52,30,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Render",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,92,42,10
+ CONTROL "Unlink",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,107,43,10
PUSHBUTTON "E&xit",IDOK,7,176,52,14
- CONTROL "List1",IDC_LIST1,"SysListView32",LVS_REPORT |
- LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_EDITLABELS |
- LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,68,7,266,183,
- WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE
+ CONTROL "List1",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_EDITLABELS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,68,7,266,183,WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE
END
@@ -226,8 +206,8 @@ END //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,24,0
- PRODUCTVERSION 2,0,24,0
+ FILEVERSION 2,0,24,1
+ PRODUCTVERSION 2,0,24,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -245,12 +225,12 @@ BEGIN VALUE "Comments", "Visit http://gabest.org/ for updates"
VALUE "CompanyName", "Gabest"
VALUE "FileDescription", "SubResync"
- VALUE "FileVersion", "2, 0, 24, 0"
+ VALUE "FileVersion", "2, 0, 24, 1"
VALUE "InternalName", "SubResync"
- VALUE "LegalCopyright", "Copyright (C) 2001-2002 Gabest"
+ VALUE "LegalCopyright", "Copyright © 2001-2002 Gabest"
VALUE "OriginalFilename", "Subresync.exe"
VALUE "ProductName", "Subresync"
- VALUE "ProductVersion", "2, 0, 24, 0"
+ VALUE "ProductVersion", "2, 0, 24, 1"
END
END
BLOCK "VarFileInfo"
@@ -265,7 +245,7 @@ END // String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_ABOUTBOX "&About SubResync..."
IDS_RG_SPACESENS "SpaceSensitivity"
@@ -274,7 +254,7 @@ BEGIN IDS_ADD "&Add"
END
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/apps/SubResync/SubResync.vcxproj b/src/apps/SubResync/SubResync.vcxproj new file mode 100644 index 000000000..6907a7383 --- /dev/null +++ b/src/apps/SubResync/SubResync.vcxproj @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{0B232385-29E3-4F64-92F6-1029204A08F3}</ProjectGuid>
+ <RootNamespace>SubResync</RootNamespace>
+ <Keyword>MFCProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\common.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\common.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\common.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\common.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin10\$(Configuration)_$(Platform)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin10\$(Configuration)_$(Platform)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin10\$(Configuration)_$(Platform)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin10\$(Configuration)_$(Platform)\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../Subtitles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;_USEMFC2010ICON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../Subtitles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;_USEMFC2010ICON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link />
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../Subtitles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;_USEMFC2010ICON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../../Subtitles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_WIN64;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;_USEMFC2010ICON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link />
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp" />
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="SubResync.cpp" />
+ <ClCompile Include="SubResyncDlg.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Resource.h" />
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="SubResync.h" />
+ <ClInclude Include="SubResyncDlg.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\bitmap1.bmp" />
+ <None Include="res\bitmap2.bmp" />
+ <None Include="res\SubResync.ico" />
+ <None Include="res\SubResync.rc2" />
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="res\SubResync.manifest" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="SubResync.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Subtitles\Subtitles.vcxproj">
+ <Project>{5e56335f-0fb1-4eea-b240-d8dc5e0608e4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file diff --git a/src/apps/SubResync/SubResync.vcxproj.filters b/src/apps/SubResync/SubResync.vcxproj.filters new file mode 100644 index 000000000..f0283c11d --- /dev/null +++ b/src/apps/SubResync/SubResync.vcxproj.filters @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{5f09cc81-1892-41c2-8362-f344b504439e}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{3d5bd954-3440-4ee8-983e-abc1d3daace5}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{eeaed7ea-53cd-4cf6-aec6-9f7980be07d2}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="SubResync.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="SubResyncDlg.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="stdafx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="SubResync.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="SubResyncDlg.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\bitmap1.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="res\bitmap2.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="res\SubResync.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="res\SubResync.rc2">
+ <Filter>Resource Files</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="res\SubResync.manifest">
+ <Filter>Resource Files</Filter>
+ </Manifest>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="SubResync.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/src/apps/SubResync/SubResync_2010.sln b/src/apps/SubResync/SubResync_2010.sln new file mode 100644 index 000000000..64bd438ff --- /dev/null +++ b/src/apps/SubResync/SubResync_2010.sln @@ -0,0 +1,35 @@ +Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubResync", "SubResync.vcxproj", "{0B232385-29E3-4F64-92F6-1029204A08F3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Subtitles", "..\..\Subtitles\Subtitles.vcxproj", "{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Debug|Win32.Build.0 = Debug|Win32
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Debug|x64.ActiveCfg = Debug|x64
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Debug|x64.Build.0 = Debug|x64
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Release|Win32.ActiveCfg = Release|Win32
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Release|Win32.Build.0 = Release|Win32
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Release|x64.ActiveCfg = Release|x64
+ {0B232385-29E3-4F64-92F6-1029204A08F3}.Release|x64.Build.0 = Release|x64
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|Win32.Build.0 = Debug|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|x64.ActiveCfg = Debug|x64
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|x64.Build.0 = Debug|x64
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|Win32.ActiveCfg = Release|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|Win32.Build.0 = Release|Win32
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|x64.ActiveCfg = Release|x64
+ {5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/src/apps/SubResync/res/SubResync.manifest b/src/apps/SubResync/res/SubResync.manifest index 6c1cd6393..972de4d7c 100644 --- a/src/apps/SubResync/res/SubResync.manifest +++ b/src/apps/SubResync/res/SubResync.manifest @@ -1,33 +1,47 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
- version="2.0.24.0"
- processorArchitecture="*"
- name="SubResync"
- type="win32"
- />
- <description>SubResync</description>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
- </dependency>
- <!-- Identify the application security requirements -->
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel
- level="asInvoker"
- uiAccess="false"
- />
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>
+ <assemblyIdentity
+ name="SubResync"
+ processorArchitecture="*"
+ version="2.0.24.1"
+ type="win32"
+ />
+ <description>SubResync</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>
+ <!-- Identify the application security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
+ <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <asmv3:windowsSettings
+ xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+</assembly>
\ No newline at end of file diff --git a/src/apps/SubResync/stdafx.h b/src/apps/SubResync/stdafx.h index 3c93a0e95..0b7f0178a 100644 --- a/src/apps/SubResync/stdafx.h +++ b/src/apps/SubResync/stdafx.h @@ -1,10 +1,8 @@ /*
* $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
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of subresync.
*
@@ -25,25 +23,5 @@ #pragma once
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0600
-#endif
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-// turns off MFC's hiding of some common and often safely ignored warning messages
-#define _AFX_ALL_WARNINGS
-
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdisp.h> // MFC Automation classes
-#include <afxdlgs.h>
-#include <atlbase.h>
-
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
+#include "../../../include/stdafx_common.h"
+#include "../../../include/stdafx_common_afx2.h"
diff --git a/src/apps/VSConv/VSConv.vcxproj b/src/apps/VSConv/VSConv.vcxproj index 90008231e..7ba57138b 100644 --- a/src/apps/VSConv/VSConv.vcxproj +++ b/src/apps/VSConv/VSConv.vcxproj @@ -92,6 +92,9 @@ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
diff --git a/src/apps/VSConv/VSConv.vcxproj.filters b/src/apps/VSConv/VSConv.vcxproj.filters index ec2a5acd0..08924547b 100644 --- a/src/apps/VSConv/VSConv.vcxproj.filters +++ b/src/apps/VSConv/VSConv.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="VSConvDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
diff --git a/src/apps/VSConv/res/VSConv.manifest b/src/apps/VSConv/res/VSConv.manifest index 82a80dd79..e7ae4339d 100644 --- a/src/apps/VSConv/res/VSConv.manifest +++ b/src/apps/VSConv/res/VSConv.manifest @@ -1,33 +1,47 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
- version="1.0.0.7"
- processorArchitecture="*"
- name="VSConv"
- type="win32"
- />
- <description>vsconv</description>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
- </dependency>
- <!-- Identify the application security requirements -->
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel
- level="asInvoker"
- uiAccess="false"
- />
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>
+ <assemblyIdentity
+ name="VSConv"
+ processorArchitecture="*"
+ version="1.0.0.7"
+ type="win32"
+ />
+ <description>VSConv</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>
+ <!-- Identify the application security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
+ <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <asmv3:windowsSettings
+ xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+</assembly>
\ No newline at end of file diff --git a/src/apps/VSConv/stdafx.h b/src/apps/VSConv/stdafx.h index a55358e5a..7f793249d 100644 --- a/src/apps/VSConv/stdafx.h +++ b/src/apps/VSConv/stdafx.h @@ -23,26 +23,6 @@ #pragma once
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0600
-#endif
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-// turns off MFC's hiding of some common and often safely ignored warning messages
-#define _AFX_ALL_WARNINGS
-
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdisp.h> // MFC Automation classes
-
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include <dshow.h>
-#include <streams.h>
+#include "../../../include/stdafx_common.h"
+#include "../../../include/stdafx_common_afx2.h"
+#include "../../../include/stdafx_common_dshow.h"
diff --git a/src/apps/VSRip/VSRip.vcxproj b/src/apps/VSRip/VSRip.vcxproj index c3f7207f8..9e1b62dc8 100644 --- a/src/apps/VSRip/VSRip.vcxproj +++ b/src/apps/VSRip/VSRip.vcxproj @@ -145,6 +145,9 @@ </Manifest>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp" />
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="VSRip.cpp" />
<ClCompile Include="VSRipDlg.cpp" />
diff --git a/src/apps/VSRip/VSRip.vcxproj.filters b/src/apps/VSRip/VSRip.vcxproj.filters index 7e602f0ec..42439d6d6 100644 --- a/src/apps/VSRip/VSRip.vcxproj.filters +++ b/src/apps/VSRip/VSRip.vcxproj.filters @@ -36,6 +36,15 @@ <ClCompile Include="VSRipPGCDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
diff --git a/src/apps/VSRip/res/VSRip.manifest b/src/apps/VSRip/res/VSRip.manifest index d1b82ca28..8831ec7dc 100644 --- a/src/apps/VSRip/res/VSRip.manifest +++ b/src/apps/VSRip/res/VSRip.manifest @@ -1,33 +1,47 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
- version="1.0.0.7"
- processorArchitecture="*"
- name="VSRip"
- type="win32"
- />
- <description>VSRip</description>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
- </dependency>
- <!-- Identify the application security requirements -->
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel
- level="asInvoker"
- uiAccess="false"
- />
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>
+ <assemblyIdentity
+ name="VSRip"
+ processorArchitecture="*"
+ version="1.0.0.7"
+ type="win32"
+ />
+ <description>VSRip</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>
+ <!-- Identify the application security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
+ <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <asmv3:windowsSettings
+ xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+</assembly>
\ No newline at end of file diff --git a/src/apps/VSRip/stdafx.h b/src/apps/VSRip/stdafx.h index 14875f780..95e556f5b 100644 --- a/src/apps/VSRip/stdafx.h +++ b/src/apps/VSRip/stdafx.h @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of vsrip.
*
@@ -23,25 +23,6 @@ #pragma once
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0600
-#endif
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-// turns off MFC's hiding of some common and often safely ignored warning messages
-#define _AFX_ALL_WARNINGS
-
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdisp.h> // MFC Automation classes
-
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include <streams.h>
+#include "../../../include/stdafx_common.h"
+#include "../../../include/stdafx_common_afx2.h"
+#include "../../../include/stdafx_common_dshow.h"
diff --git a/src/apps/asf2mkv/asf2mkv.rc b/src/apps/asf2mkv/asf2mkv.rc index 8b147c046..695a8841b 100644 --- a/src/apps/asf2mkv/asf2mkv.rc +++ b/src/apps/asf2mkv/asf2mkv.rc @@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
LTEXT "asf2mkv Version 1.0.0.2",IDC_STATIC,40,10,119,8,SS_NOPREFIX
- LTEXT "Copyright (C) 2003-2010",IDC_STATIC,40,25,119,8
+ LTEXT "Copyright (C) 2003-2011",IDC_STATIC,40,25,119,8
DEFPUSHBUTTON "OK",IDOK,178,7,50,16,WS_GROUP
END
diff --git a/src/apps/asf2mkv/asf2mkv.vcxproj b/src/apps/asf2mkv/asf2mkv.vcxproj index d58af3345..a77b82b0a 100644 --- a/src/apps/asf2mkv/asf2mkv.vcxproj +++ b/src/apps/asf2mkv/asf2mkv.vcxproj @@ -86,6 +86,9 @@ </Manifest>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp" />
<ClCompile Include="asf2mkv.cpp" />
<ClCompile Include="asf2mkvDlg.cpp" />
<ClCompile Include="stdafx.cpp">
diff --git a/src/apps/asf2mkv/asf2mkv.vcxproj.filters b/src/apps/asf2mkv/asf2mkv.vcxproj.filters index 3b9141f4f..2649e0be5 100644 --- a/src/apps/asf2mkv/asf2mkv.vcxproj.filters +++ b/src/apps/asf2mkv/asf2mkv.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="asf2mkv.h">
diff --git a/src/apps/asf2mkv/res/asf2mkv.manifest b/src/apps/asf2mkv/res/asf2mkv.manifest index 10008e96c..4ba2ceaf5 100644 --- a/src/apps/asf2mkv/res/asf2mkv.manifest +++ b/src/apps/asf2mkv/res/asf2mkv.manifest @@ -1,33 +1,47 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
- version="1.0.0.2"
- processorArchitecture="X86"
- name="asf2mkv"
- type="win32"
- />
- <description>asf2mkv</description>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
- </dependency>
- <!-- Identify the application security requirements -->
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel
- level="asInvoker"
- uiAccess="false"
- />
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>
+ <assemblyIdentity
+ name="asf2mkv"
+ processorArchitecture="*"
+ version="1.0.0.2"
+ type="win32"
+ />
+ <description>asf2mkv</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>
+ <!-- Identify the application security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
+ <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <asmv3:windowsSettings
+ xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+</assembly>
\ No newline at end of file diff --git a/src/apps/asf2mkv/stdafx.h b/src/apps/asf2mkv/stdafx.h index 27dd75cff..30537870b 100644 --- a/src/apps/asf2mkv/stdafx.h +++ b/src/apps/asf2mkv/stdafx.h @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of asf2mkv.
*
@@ -23,34 +23,9 @@ #pragma once
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-// 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 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
-
-// turns off MFC's hiding of some common and often safely ignored warning messages
-#define _AFX_ALL_WARNINGS
-
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#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
-
-#include <afxtempl.h>
-#include <afxdisp.h>
-#include <Shlwapi.h>
-#include <atlpath.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../include/stdafx_common.h"
+#include "../../../include/stdafx_common_afx2.h"
+#include "../../../include/stdafx_common_dshow.h"
#include "../../CmdUI/CmdUI.h"
#include "../../thirdparty/ui/ResizableLib/ResizableDialog.h"
diff --git a/src/apps/mpcinfo/mpcinfo.cpp b/src/apps/mpcinfo/mpcinfo.cpp index da2056db4..0be1f6af0 100644 --- a/src/apps/mpcinfo/mpcinfo.cpp +++ b/src/apps/mpcinfo/mpcinfo.cpp @@ -23,10 +23,6 @@ #include "stdafx.h"
#include "mpcinfo.h"
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
//
// Note!
//
@@ -83,9 +79,6 @@ BOOL CmpcinfoApp::InitInstance() return TRUE;
}
-#include <dshow.h>
-#include <streams.h>
-#include <atlbase.h>
static bool GetFilterGraph(IFilterGraph** ppFG)
{
@@ -142,6 +135,7 @@ static bool GetFilterGraph(IFilterGraph** ppFG) return(!!*ppFG);
}
+
extern "C" int WINAPI file(HWND,HWND,char *data,char*,BOOL,BOOL)
{
CComPtr<IFilterGraph> pFG;
@@ -184,6 +178,7 @@ extern "C" int WINAPI file(HWND,HWND,char *data,char*,BOOL,BOOL) return 3;
}
+
extern "C" int WINAPI size(HWND,HWND,char *data,char*,BOOL,BOOL)
{
if(file(0,0,data,0,0,0) != 3) {
@@ -210,6 +205,7 @@ extern "C" int WINAPI size(HWND,HWND,char *data,char*,BOOL,BOOL) return 3;
}
+
extern "C" int WINAPI pos(HWND,HWND,char *data,char*,BOOL,BOOL)
{
CComPtr<IFilterGraph> pFG;
@@ -237,6 +233,7 @@ extern "C" int WINAPI pos(HWND,HWND,char *data,char*,BOOL,BOOL) return 3;
}
+
extern "C" int WINAPI info(HWND,HWND,char *data,char*,BOOL,BOOL)
{
CStringA ret;
@@ -261,6 +258,7 @@ extern "C" int WINAPI info(HWND,HWND,char *data,char*,BOOL,BOOL) return 3;
}
+
extern "C" int WINAPI stopped(HWND,HWND,char *data,char*,BOOL,BOOL)
{
size_t len = strlen(data) +1;
@@ -278,6 +276,7 @@ extern "C" int WINAPI stopped(HWND,HWND,char *data,char*,BOOL,BOOL) return 3;
}
+
extern "C" int WINAPI paused(HWND,HWND,char *data,char*,BOOL,BOOL)
{
size_t len = strlen(data) +1;
@@ -295,6 +294,7 @@ extern "C" int WINAPI paused(HWND,HWND,char *data,char*,BOOL,BOOL) return 3;
}
+
extern "C" int WINAPI running(HWND,HWND,char *data,char*,BOOL,BOOL)
{
size_t len = strlen(data) +1;
diff --git a/src/apps/mpcinfo/mpcinfo.rc b/src/apps/mpcinfo/mpcinfo.rc index 3854f7c65..bc0494187 100644 --- a/src/apps/mpcinfo/mpcinfo.rc +++ b/src/apps/mpcinfo/mpcinfo.rc @@ -13,61 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Hungarian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
-#ifdef _WIN32
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
- "#define _AFX_NO_OLE_RESOURCES\r\n"
- "#define _AFX_NO_TRACKER_RESOURCES\r\n"
- "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
- "\r\n"
- "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
- "LANGUAGE 9, 1\r\n"
- "#pragma code_page(1252)\r\n"
- "#include ""res\\mpcinfo.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
- "#include ""afxres.rc"" // Standard components\r\n"
- "#endif\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // Hungarian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -96,7 +46,7 @@ BEGIN VALUE "FileDescription", "plugin dll for mirc"
VALUE "FileVersion", "1.0.0.0"
VALUE "InternalName", "mpcinfo.dll"
- VALUE "LegalCopyright", "Copyright (C) 2003-2005 Gabest. All rights reserved."
+ VALUE "LegalCopyright", "Copyright © 2003-2005 Gabest. All rights reserved."
VALUE "OriginalFilename", "mpcinfo.dll"
VALUE "ProductName", "mpcinfo"
VALUE "ProductVersion", "1.0.0.0"
@@ -108,7 +58,7 @@ BEGIN END
END
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/apps/mpcinfo/mpcinfo.vcxproj b/src/apps/mpcinfo/mpcinfo.vcxproj index 95e1cbb2d..174ec4ef8 100644 --- a/src/apps/mpcinfo/mpcinfo.vcxproj +++ b/src/apps/mpcinfo/mpcinfo.vcxproj @@ -93,6 +93,9 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp" />
<ClCompile Include="mpcinfo.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
diff --git a/src/apps/mpcinfo/mpcinfo.vcxproj.filters b/src/apps/mpcinfo/mpcinfo.vcxproj.filters index 34c3cd638..cb0ff8a9c 100644 --- a/src/apps/mpcinfo/mpcinfo.vcxproj.filters +++ b/src/apps/mpcinfo/mpcinfo.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="mpcinfo.def">
diff --git a/src/apps/mpcinfo/stdafx.h b/src/apps/mpcinfo/stdafx.h index 4b5caf984..494ec7e6b 100644 --- a/src/apps/mpcinfo/stdafx.h +++ b/src/apps/mpcinfo/stdafx.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mpcinfo.
*
@@ -22,21 +23,6 @@ #pragma once
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-// 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 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
-
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
+#include "../../../include/stdafx_common.h"
+#include "../../../include/stdafx_common_afx2.h"
+#include "../../../include/stdafx_common_dshow.h"
|