added revision number to movie format, and fixed avi splitting (for r…

…eal)

src/shared/SubWCRev/SubWCRev.bat

@@ -0,0 +1,29 @@
+@REM this batch file has to be run from the directory the vproj is in. all the paths are relative to that.
+@ECHO OFF
+SETLOCAL enabledelayedexpansion
+..\shared\SubWCRev\SubWCRev.exe .. "..\shared\SubWCRev\svnrev_template.h" "..\shared\svnrev_temp.h"
+IF EXIST "..\shared\svnrev_temp.h" (
+	set text1=
+	for /f "delims=" %%i in (..\shared\svnrev_temp.h) do (
+		set text1=!text1!%%i
+	)
+	set text2=
+	IF EXIST "..\shared\svnrev.h" (
+		for /f "delims=" %%i in (..\shared\svnrev.h) do (
+			set text2=!text2!%%i
+		)
+	)
+	if !text1!==!text2! (
+		echo decided not to modify svnrev.h
+		DEL "..\shared\svnrev_temp.h"
+	) else (
+		IF EXIST "..\shared\svnrev.h" (
+			echo updated svnrev.h
+		) else (
+			echo generated svnrev.h
+		)
+		MOVE /Y "..\shared\svnrev_temp.h" "..\shared\svnrev.h"
+	)
+)
+ENDLOCAL
+exit 0

src/shared/SubWCRev/svnrev.h

@@ -0,0 +1,4 @@
+// this should be overridden by the one generated in the "shared" directory,
+// but this fallback version is here just in case (to prevent compiler errors)
+#define SRCVERSION -1
+#define SRCVERSIONSTRING "-1"

src/shared/SubWCRev/svnrev_template.h

@@ -0,0 +1,2 @@
+#define SRCVERSION $WCREV$
+#define SRCVERSIONSTRING "$WCREV$"

src/shared/ipc.h

@@ -33,6 +33,7 @@ struct TasFlags
 	int allowLoadInstalledDlls, allowLoadUxtheme;
 	int storeVideoMemoryInSavestates;
 	int appLocale;
+	unsigned int movieVersion;
 	LogCategoryFlag includeLogFlags;
 	LogCategoryFlag excludeLogFlags;
 #ifdef _USRDLL
@@ -113,8 +114,4 @@ struct TrustedRangeInfos
 #define SUCCESSFUL_EXITCODE 4242
 #endif
 
-// at a minimum, this should be incremented whenever a change is made
-// that requires the DLL and EXE to be updated together.
-#define SRCDLLVERSION 46
-
 #endif // IPC_H_INCL

src/wintasee/wintasee.cpp

@@ -18,6 +18,7 @@
 #include <vector>
 #include <algorithm>
 
+#include "svnrev.h" // defines SRCVERSION number
 
 #ifdef UNITY_BUILD
 #undef UNITY_BUILD
@@ -1602,8 +1603,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 		SoundDllMainInit();
 		ModuleDllMainInit();
 
-		// in case the TASer tool needs to single out a version of this DLL for some reason
-		cmdprintf("SRCDLLVERSION: %d", SRCDLLVERSION); // must send before the DLLVERSION
+		cmdprintf("SRCDLLVERSION: %d", SRCVERSION); // must send before the DLLVERSION
 		cmdprintf("DLLVERSION: %d.%d, %s", 0, __LINE__, __DATE__);
 
 		// tell it where to put commands
@@ -1694,6 +1694,8 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 			//		SetCPGlobal(LocaleToCodePage(tasflags.appLocale));
 		}
 
+		debugprintf("version = %d, movie version = %d\n", SRCVERSION, tasflags.movieVersion);
+
 		detTimer.Initialize(tasflags.initialTime);
 		nonDetTimer.Initialize(tasflags.initialTime);
 

src/wintasee/wintasee2008.vcproj

@@ -26,6 +26,9 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="ensuring svnrev.h is up to date"
+				CommandLine="..\shared\SubWCRev\SubWCRev.bat"
+				ExcludedFromBuild="true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -43,7 +46,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Oy-"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="..\shared;..\shared\SubWCRev"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINTASDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0500;WINVER=0x0501"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
@@ -109,6 +112,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="ensuring svnrev.h is up to date"
+				CommandLine="..\shared\SubWCRev\SubWCRev.bat"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -131,7 +136,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="false"
 				EnableFiberSafeOptimizations="true"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="..\shared;..\shared\SubWCRev"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINTASDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0500;WINVER=0x0501"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -198,6 +203,9 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="ensuring svnrev.h is up to date"
+				CommandLine="..\shared\SubWCRev\SubWCRev.bat"
+				ExcludedFromBuild="true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -215,7 +223,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Oy-"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="..\shared;..\shared\SubWCRev"
 				PreprocessorDefinitions="UNITY_BUILD;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINTASDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0500;WINVER=0x0501"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
@@ -282,6 +290,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="ensuring svnrev.h is up to date"
+				CommandLine="..\shared\SubWCRev\SubWCRev.bat"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -304,7 +314,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="false"
 				EnableFiberSafeOptimizations="true"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="..\shared;..\shared\SubWCRev"
 				PreprocessorDefinitions="UNITY_BUILD;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINTASDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0500;WINVER=0x0501"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"