Index: /trunk/MFCtooling/replay/replay.cpp
===================================================================
--- /trunk/MFCtooling/replay/replay.cpp	(revision 159)
+++ /trunk/MFCtooling/replay/replay.cpp	(revision 160)
@@ -10,8 +10,22 @@
 int _tmain(int argc, _TCHAR* argv[])
 {
-	if (argc<3) 
+	if (argc<4) 
 	{
-		std::wcout << "Usage: " << argv[0] << "<replayfile> <applicationundertest> [<resultfile>]" << std::endl;
+		std::wcout << "Usage: " << argv[0] << "<replayfile> <applicationundertest> [<resultfile>] [<useDefaultDelay>] [<waitAfterFinish>]" << std::endl;
 		return 0;
+	}
+	TCHAR * replayfile = argv[1];
+	TCHAR * appUnderTest = argv[2];
+	TCHAR * resultfile = NULL;
+	bool useDefaultDelay = true;
+	int wait = 1;
+	if( argc>=4 ) {
+		TCHAR * resultfile = argv[3];
+	}
+	if( argc>=5 ) {
+		useDefaultDelay = (bool) _tstoi(argv[4]);
+	} 
+	if( argc>=6 ) {
+		wait = _tstoi(argv[5]);
 	}
 
@@ -29,22 +43,24 @@
 
 	if( !FAILED(hr) ) {
-		TestResults results(argv[1]);
+		TestResults results(replayfile);
 		std::wcout << L"replaying sessions in " << argv[1] << std::endl;
-		LogParser * parser = new LogParser(argv[2], 5000, &results, true);
+		LogParser * parser = new LogParser(appUnderTest, 5000, &results, useDefaultDelay);
 		pXMLReader->putContentHandler(parser);
-		hr = pXMLReader->parseURL(argv[1]);
+		hr = pXMLReader->parseURL(replayfile);
 		pXMLReader->Release();
 		std::wcout << L"================================================" << std::endl;
 		std::wcout << L"replay completed" << std::endl;
-		if( argc>=4 ) {
-			results.write(argv[3]);
-			std::wcout << L"results written to " << argv[3] << std::endl;
+		if( resultfile!=NULL ) {
+			results.write(resultfile);
+			std::wcout << L"results written to " << resultfile << std::endl;
 		}
 	}
 
 	CoUninitialize();
-
-	std::wcout << L"press enter to exit ...";
-	getchar();
+	
+	if( wait!=0 ) {
+		std::wcout << L"press enter to exit ...";
+		getchar();
+	}
 
 	return 0;
Index: /trunk/MFCtooling/userlog/helpers.h
===================================================================
--- /trunk/MFCtooling/userlog/helpers.h	(revision 159)
+++ /trunk/MFCtooling/userlog/helpers.h	(revision 160)