Maintenance SVN /SourceSafe

17 files changed, 1130 insertions, 892 deletions

diff --git a/Bus.sln b/Bus.sln
index 6f65d87..76e6fec 100644
--- a/Bus.sln
+++ b/Bus.sln
@@ -1,11 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

 # Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "Ivy\Ivy.vcproj", "{9BD87B7A-517E-4900-B3EA-A358885CD876}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "Ivy\Ivy.vcproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyProbe", "IvyProbe\IvyProbe.vcproj", "{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}"

-	ProjectSection(ProjectDependencies) = postProject

-		{9BD87B7A-517E-4900-B3EA-A358885CD876} = {9BD87B7A-517E-4900-B3EA-A358885CD876}

-	EndProjectSection

 EndProject

 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyProbe", "IvyProbe\InstIvy\InstIvy.vdproj", "{72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}"

 EndProject

@@ -59,14 +56,14 @@ Global
 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Debug|Win32.Build.0 = Debug|Win32

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Debug|x64.ActiveCfg = Debug|x64

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Debug|x64.Build.0 = Debug|x64

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Release|Win32.ActiveCfg = Release|x64

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Release|Win32.Build.0 = Release|x64

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Release|x64.ActiveCfg = Release|x64

-		{9BD87B7A-517E-4900-B3EA-A358885CD876}.Release|x64.Build.0 = Release|x64

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|Win32.ActiveCfg = Debug|Win32

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|Win32.Build.0 = Debug|Win32

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|x64.ActiveCfg = Debug|x64

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug|x64.Build.0 = Debug|x64

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.ActiveCfg = Release|x64

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|Win32.Build.0 = Release|x64

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|x64.ActiveCfg = Release|x64

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release|x64.Build.0 = Release|x64

 		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|Win32.ActiveCfg = Debug|Win32

 		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|Win32.Build.0 = Debug|Win32

 		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/Horloge/Horloge.vcproj b/Horloge/Horloge.vcproj
index 3a5bcb1..9c9c9cd 100644
--- a/Horloge/Horloge.vcproj
+++ b/Horloge/Horloge.vcproj
@@ -54,7 +54,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="&quot;..\Ivy&quot;"

+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -82,6 +82,7 @@
 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				SubSystem="2"

+				Profile="true"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -171,6 +172,7 @@
 				GenerateDebugInformation="true"

 				SubSystem="2"

 				TargetMachine="17"

+				Profile="true"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -373,7 +375,7 @@
 	</Configurations>

 	<References>

 		<ProjectReference

-			ReferencedProjectIdentifier="{84E0039A-6721-4B18-9792-E9AE4274AC0E}"

+			ReferencedProjectIdentifier="{9818D652-CC05-463E-880D-AFCA2C7BFABE}"

 			RelativePathToProject="..\Ivy\Ivy.vcproj"

 		/>

 		<ProjectReference

diff --git a/Ivy/InstIvyDev/InstIvyDev.sln b/Ivy/InstIvyDev/InstIvyDev.sln
index 79e9200..da686f1 100644
--- a/Ivy/InstIvyDev/InstIvyDev.sln
+++ b/Ivy/InstIvyDev/InstIvyDev.sln
@@ -1,21 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 7.00

-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstIvyDev", "InstIvyDev.vdproj", "{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}"

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyDev", "InstIvyDev.vdproj", "{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}"

 EndProject

 Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		ConfigName.0 = Debug

-		ConfigName.1 = Release

+	GlobalSection(SourceCodeControl) = preSolution

+		SccNumberOfProjects = 1

+		SccProjectUniqueName0 = InstIvyDev.vdproj

+		SccProjectName0 = \u0022$/Bus/Ivy/InstIvyDev\u0022,\u0020FUFAAAAA

+		SccLocalPath0 = .

+		SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

 	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Default = Debug|Default

+		Release|Default = Release|Default

 	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Debug.ActiveCfg = Debug

-		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Debug.Build.0 = Debug

-		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Release.ActiveCfg = Release

-		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Release.Build.0 = Release

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Debug|Default.ActiveCfg = Debug

+		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Debug|Default.Build.0 = Debug

+		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Release|Default.ActiveCfg = Release

+		{07B35ABB-D1C2-4546-8ABA-945C1E8A88FE}.Release|Default.Build.0 = Release

 	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/Ivy/Ivy.vcproj b/Ivy/Ivy.vcproj
index f9e983a..6426b62 100644
--- a/Ivy/Ivy.vcproj
+++ b/Ivy/Ivy.vcproj
@@ -385,7 +385,7 @@
 	<References>

 		<ProjectReference

 			ReferencedProjectIdentifier="{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}"

-			RelativePathToProject="..\..\pcre\pcre.vcproj"

+			RelativePathToProject="..\..\..\pcre\pcre.vcproj"

 		/>

 	</References>

 	<Files>

diff --git a/Ivy/IvyBinding.cxx b/Ivy/IvyBinding.cxx
index f3000fd..9013cad 100644
--- a/Ivy/IvyBinding.cxx
+++ b/Ivy/IvyBinding.cxx
@@ -1,189 +1,189 @@
-/*

- *	Ivy, C++ interface

- *

- *	Copyright (C) 1997-2000

- *	Centre d'Études de la Navigation Aérienne

- *

- *	Bind syntax for extracting message comtent 

- *  using regexp or other 

- *

- *	Authors: François-Régis Colin <fcolin@cena.fr>

- *

- *	$Id: ivybind.c,v 1.9.2.7 2006/06/01 12:07:17 bustico Exp $

- * 

- *	Please refer to file version.h for the

- *	copyright notice regarding this software

- */

-/* Module de gestion de la syntaxe des messages Ivy */

-#include "IvyStdAfx.h"

-

-#include "IvyBinding.h"

-

-static int err_offset;

-

-#ifdef USE_PCRE

-	static const char *err_buf;

-#else  /* we don't USE_PCRE */

-	static char err_buf[4096];

-#endif /* USE_PCRE */

-

-/* classes de messages emis par l'application utilise pour le filtrage */

-static int	messages_classes_count = 0;

-static const char **messages_classes = 0;

-/* regexp d'extraction du mot clef des regexp client pour le filtrage des regexp , ca va c'est clair ??? */

-static IvyBinding token_extract;

-

-IvyBinding::IvyBinding()

-{

-#ifdef USE_PCRE

-	regexp = NULL;

-	inspect = NULL;

-#else  /* we don't USE_PCRE */

-	free( regexp );

-#endif /* USE_PCRE */

-	nb_match = 0;

-}

-IvyBinding::~IvyBinding()

-{

-#ifdef USE_PCRE

-	if (inspect!=NULL)

-		pcre_free(inspect);

-	if (regexp!=NULL)

-		pcre_free(regexp);

-#else  /* we don't USE_PCRE */

-	free( regexp );

-#endif /* USE_PCRE */

-}

-bool IvyBinding::Compile( const char * expression,  int *erroffset, const char **errmessage )

-{

-	bool compile = false;

-#ifdef USE_PCRE

-	regexp = pcre_compile(expression, PCRE_CASELESS, &err_buf, &err_offset, NULL);

-	if ( regexp != NULL )

-		{

-			this->inspect = pcre_study(regexp,0,&err_buf);

-			if (err_buf!=NULL)

-				{

-					printf("Error studying %s, message: %s\n",expression,err_buf);

-				}

-			compile = true;

-		}

-		else

-		{

-		*erroffset = err_offset;

-		*errmessage = err_buf;

-		printf("Error compiling '%s', %s\n", expression, err_buf);

-		}

-#else  /* we don't USE_PCRE */

-	regex_t regexp;

-	int reg;

-	reg = regcomp(&regexp, expression, REGCOMP_OPT|REG_EXTENDED);

-	if ( reg == 0 )

-		{

-			this->next = NULL;

-		}

-		else

-		{

-		regerror (reg, &regexp, err_buf, sizeof(err_buf) );

-		*erroffset = err_offset;

-		*errmessage = err_buf;

-		printf("Error compiling '%s', %s\n", expression, err_buf);

-		}

-#endif /* USE_PCRE */

-	return compile;

-}

-

-

-int IvyBinding::Exec( const char * message )

-{

-#ifdef USE_PCRE

-	

-	nb_match = pcre_exec(

-					regexp,

-					inspect,

-					message,

-					strlen(message),

-					0, /* debut */

-					0, /* no other regexp option */

-					ovector,

-					OVECSIZE);

-	if (nb_match<1) return 0; /* no match */

-#else  /* we don't USE_PCRE */

-	memset( match, -1, sizeof(match )); /* work around bug !!!*/

-	nb_match = regexec (&regexp, message, MAX_MSG_FIELDS, match, 0) 

-	if (nb_match == REG_NOMATCH)

-		return 0;

-	for ( index = 1; index < MAX_MSG_FIELDS; index++ )

-	{

-		if ( match[i].rm_so != -1 )

-			nb_match++;

-	}

-#endif /* USE_PCRE */

-	return nb_match;

-}

-

-void IvyBinding::Match( const char *message, int argnum, int *arglen, const char **arg)

-{

-#ifdef USE_PCRE

-	

-		*arglen = ovector[2*argnum+1]- ovector[2*argnum];

-		*arg =   message + ovector[2*argnum];

-#else  /* we don't USE_PCRE */

-	

-	regmatch_t* p;

-

-	p = &match[argnum+1];

-	if ( p->rm_so != -1 ) {

-			*arglen = p->rm_eo - p->rm_so;

-			*arg = message + p->rm_so;

-	} else { // ARG VIDE

-			*arglen = 0;

-			*arg = NULL;

-	}

-#endif /* USE_PCRE */

-

-}

-

-//filter Expression Bind 

-void IvyBinding::SetFilter( int argc, const char **argv)

-{

-	const char *errbuf;

-	int erroffset;

-

-	messages_classes_count = argc;

-	messages_classes = argv;

-	/* compile the token extraction regexp */

-

-	if ( !token_extract.Compile("^\\^([a-zA-Z_0-9-]+).*", & erroffset, & errbuf) )

-	{

-		printf("Error compiling Token Extract regexp: %s\n", errbuf);

-	}

-}

-	

-int IvyBinding::Filter(const char *expression)

-{

-	int i;

-	int err;

-	int regexp_ok = 1; /* accepte tout par default */

-	int tokenlen;

-	const char *token;

-	

-	if ( *expression =='^' && messages_classes_count !=0 )

-	{

-		regexp_ok = 0;

-		

-		/* extract token */

-		err = token_extract.Exec( expression );

-		if ( err < 1 ) return 1;

-		token_extract.Match( expression , 1, &tokenlen, &token );

-		for ( i = 0 ; i < messages_classes_count; i++ )

-		{

-		  if (strncmp( messages_classes[i], token, tokenlen ) == 0) {

-		    return 1; }

-		  //		  else {

-		  //printf ("DBG> %s eliminé [%s]\n", token, expression);

-		  //}

-		}

- 	}

-	return regexp_ok;

-}

+/*
+ *	Ivy, C++ interface
+ *
+ *	Copyright (C) 1997-2000
+ *	Centre d'Études de la Navigation Aérienne
+ *
+ *	Bind syntax for extracting message comtent 
+ *  using regexp or other 
+ *
+ *	Authors: François-Régis Colin <fcolin@cena.fr>
+ *
+ *	$Id: ivybind.c,v 1.9.2.7 2006/06/01 12:07:17 bustico Exp $
+ * 
+ *	Please refer to file version.h for the
+ *	copyright notice regarding this software
+ */
+/* Module de gestion de la syntaxe des messages Ivy */
+#include "IvyStdAfx.h"
+
+#include "IvyBinding.h"
+
+static int err_offset;
+
+#ifdef USE_PCRE
+	static const char *err_buf;
+#else  /* we don't USE_PCRE */
+	static char err_buf[4096];
+#endif /* USE_PCRE */
+
+/* classes de messages emis par l'application utilise pour le filtrage */
+static int	messages_classes_count = 0;
+static const char **messages_classes = 0;
+/* regexp d'extraction du mot clef des regexp client pour le filtrage des regexp , ca va c'est clair ??? */
+static IvyBinding token_extract;
+
+IvyBinding::IvyBinding()
+{
+#ifdef USE_PCRE
+	regexp = NULL;
+	inspect = NULL;
+#else  /* we don't USE_PCRE */
+	free( regexp );
+#endif /* USE_PCRE */
+	nb_match = 0;
+}
+IvyBinding::~IvyBinding()
+{
+#ifdef USE_PCRE
+	if (inspect!=NULL)
+		pcre_free(inspect);
+	if (regexp!=NULL)
+		pcre_free(regexp);
+#else  /* we don't USE_PCRE */
+	free( regexp );
+#endif /* USE_PCRE */
+}
+bool IvyBinding::Compile( const char * expression,  int *erroffset, const char **errmessage )
+{
+	bool compile = false;
+#ifdef USE_PCRE
+	regexp = pcre_compile(expression, PCRE_CASELESS, &err_buf, &err_offset, NULL);
+	if ( regexp != NULL )
+		{
+			this->inspect = pcre_study(regexp,0,&err_buf);
+			if (err_buf!=NULL)
+				{
+					printf("Error studying %s, message: %s\n",expression,err_buf);
+				}
+			compile = true;
+		}
+		else
+		{
+		*erroffset = err_offset;
+		*errmessage = err_buf;
+		printf("Error compiling '%s', %s\n", expression, err_buf);
+		}
+#else  /* we don't USE_PCRE */
+	regex_t regexp;
+	int reg;
+	reg = regcomp(&regexp, expression, REGCOMP_OPT|REG_EXTENDED);
+	if ( reg == 0 )
+		{
+			this->next = NULL;
+		}
+		else
+		{
+		regerror (reg, &regexp, err_buf, sizeof(err_buf) );
+		*erroffset = err_offset;
+		*errmessage = err_buf;
+		printf("Error compiling '%s', %s\n", expression, err_buf);
+		}
+#endif /* USE_PCRE */
+	return compile;
+}
+
+
+int IvyBinding::Exec( const char * message )
+{
+#ifdef USE_PCRE
+	
+	nb_match = pcre_exec(
+					regexp,
+					inspect,
+					message,
+					strlen(message),
+					0, /* debut */
+					0, /* no other regexp option */
+					ovector,
+					OVECSIZE);
+	if (nb_match<1) return 0; /* no match */
+#else  /* we don't USE_PCRE */
+	memset( match, -1, sizeof(match )); /* work around bug !!!*/
+	nb_match = regexec (&regexp, message, MAX_MSG_FIELDS, match, 0) 
+	if (nb_match == REG_NOMATCH)
+		return 0;
+	for ( index = 1; index < MAX_MSG_FIELDS; index++ )
+	{
+		if ( match[i].rm_so != -1 )
+			nb_match++;
+	}
+#endif /* USE_PCRE */
+	return nb_match;
+}
+
+void IvyBinding::Match( const char *message, int argnum, int *arglen, const char **arg)
+{
+#ifdef USE_PCRE
+	
+		*arglen = ovector[2*argnum+1]- ovector[2*argnum];
+		*arg =   message + ovector[2*argnum];
+#else  /* we don't USE_PCRE */
+	
+	regmatch_t* p;
+
+	p = &match[argnum+1];
+	if ( p->rm_so != -1 ) {
+			*arglen = p->rm_eo - p->rm_so;
+			*arg = message + p->rm_so;
+	} else { // ARG VIDE
+			*arglen = 0;
+			*arg = NULL;
+	}
+#endif /* USE_PCRE */
+
+}
+
+//filter Expression Bind 
+void IvyBinding::SetFilter( int argc, const char **argv)
+{
+	const char *errbuf;
+	int erroffset;
+
+	messages_classes_count = argc;
+	messages_classes = argv;
+	/* compile the token extraction regexp */
+
+	if ( !token_extract.Compile("^\\^([a-zA-Z_0-9-]+).*", & erroffset, & errbuf) )
+	{
+		printf("Error compiling Token Extract regexp: %s\n", errbuf);
+	}
+}
+	
+int IvyBinding::Filter(const char *expression)
+{
+	int i;
+	int err;
+	int regexp_ok = 1; /* accepte tout par default */
+	int tokenlen;
+	const char *token;
+	
+	if ( *expression =='^' && messages_classes_count !=0 )
+	{
+		regexp_ok = 0;
+		
+		/* extract token */
+		err = token_extract.Exec( expression );
+		if ( err < 1 ) return 1;
+		token_extract.Match( expression , 1, &tokenlen, &token );
+		for ( i = 0 ; i < messages_classes_count; i++ )
+		{
+		  if (strncmp( messages_classes[i], token, tokenlen ) == 0) {
+		    return 1; }
+		  //		  else {
+		  //printf ("DBG> %s eliminé [%s]\n", token, expression);
+		  //}
+		}
+ 	}
+	return regexp_ok;
+}
diff --git a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
index 69a3248..1046fce 100644
--- a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
+++ b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
@@ -1,7 +1,7 @@
 "DeployProject"

 {

-"VSVersion" = "3:701"

-"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}"

+"VSVersion" = "3:800"

+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"

 "IsWebType" = "8:FALSE"

 "ProjectName" = "8:Install"

 "LanguageId" = "3:1036"

@@ -25,24 +25,6 @@
         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

         }

-        "Entry"

-        {

-        "MsmKey" = "8:_8E374943E56221993853F7D9051D7B42"

-        "OwnerKey" = "8:_4E16B1233013473896B5B14884B766C6"

-        "MsmSig" = "8:_UNDEFINED"

-        }

-        "Entry"

-        {

-        "MsmKey" = "8:_CD5F4F48D63B4317962CABF981642C29"

-        "OwnerKey" = "8:_4E16B1233013473896B5B14884B766C6"

-        "MsmSig" = "8:_UNDEFINED"

-        }

-        "Entry"

-        {

-        "MsmKey" = "8:_CE3A08225274427BA9D9B77094DAD99A"

-        "OwnerKey" = "8:_4E16B1233013473896B5B14884B766C6"

-        "MsmSig" = "8:_UNDEFINED"

-        }

     }

     "Configurations"

     {

@@ -61,6 +43,17 @@
         "PrivateKeyFile" = "8:"

         "TimeStampServer" = "8:"

         "InstallerBootstrapper" = "3:2"

+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"

+            {

+            "Enabled" = "11:TRUE"

+            "PromptEnabled" = "11:TRUE"

+            "PrerequisitesLocation" = "2:1"

+            "Url" = "8:"

+            "ComponentsUrl" = "8:"

+                "Items"

+                {

+                }

+            }

         }

         "Release"

         {

@@ -77,6 +70,17 @@
         "PrivateKeyFile" = "8:"

         "TimeStampServer" = "8:"

         "InstallerBootstrapper" = "3:1"

+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"

+            {

+            "Enabled" = "11:FALSE"

+            "PromptEnabled" = "11:TRUE"

+            "PrerequisitesLocation" = "2:1"

+            "Url" = "8:"

+            "ComponentsUrl" = "8:"

+                "Items"

+                {

+                }

+            }

         }

     }

     "Deployable"

@@ -96,38 +100,15 @@
             {

             }

         }

-        "Feature"

-        {

-        }

         "File"

         {

-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_8E374943E56221993853F7D9051D7B42"

-            {

-            "SourcePath" = "8:WSOCK32.dll"

-            "TargetName" = "8:WSOCK32.dll"

-            "Tag" = "8:"

-            "Folder" = "8:_4032CB2519934BECBD77C58A883B04AC"

-            "Condition" = "8:"

-            "Transitive" = "11:FALSE"

-            "Vital" = "11:TRUE"

-            "ReadOnly" = "11:FALSE"

-            "Hidden" = "11:FALSE"

-            "System" = "11:FALSE"

-            "Permanent" = "11:FALSE"

-            "SharedLegacy" = "11:FALSE"

-            "PackageAs" = "3:1"

-            "Register" = "3:1"

-            "Exclude" = "11:TRUE"

-            "IsDependency" = "11:TRUE"

-            "IsolateTo" = "8:"

-            }

         }

         "FileType"

         {

         }

         "Folder"

         {

-            "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_4032CB2519934BECBD77C58A883B04AC"

+            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_4032CB2519934BECBD77C58A883B04AC"

             {

             "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"

             "Name" = "8:#1925"

@@ -139,7 +120,7 @@
                 {

                 }

             }

-            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_664713DFF3804FDBAB8E117608A0FABC"

+            "{1525181F-901A-416C-8A58-119130FE478E}:_664713DFF3804FDBAB8E117608A0FABC"

             {

             "Name" = "8:#1919"

             "AlwaysCreate" = "11:FALSE"

@@ -150,7 +131,7 @@
                 {

                 }

             }

-            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_A192F2DB771043B083A2C45490FA442F"

+            "{1525181F-901A-416C-8A58-119130FE478E}:_A192F2DB771043B083A2C45490FA442F"

             {

             "Name" = "8:#1916"

             "AlwaysCreate" = "11:FALSE"

@@ -182,13 +163,14 @@
         "RestartWWWService" = "11:FALSE"

         "RemovePreviousVersions" = "11:FALSE"

         "DetectNewerInstalledVersion" = "11:TRUE"

+        "InstallAllUsers" = "11:FALSE"

         "ProductVersion" = "8:1.0.0"

-        "Manufacturer" = "8:CENA"

+        "Manufacturer" = "8:CENA PII"

         "ARPHELPTELEPHONE" = "8:"

         "ARPHELPLINK" = "8:"

         "Title" = "8:IvyCursor"

         "Subject" = "8:"

-        "ARPCONTACT" = "8:CENA"

+        "ARPCONTACT" = "8:CENA PII"

         "Keywords" = "8:"

         "ARPCOMMENTS" = "8:"

         "ARPURLINFOABOUT" = "8:"

@@ -196,6 +178,10 @@
         "ARPIconIndex" = "3:0"

         "SearchPath" = "8:"

         "UseSystemSearchPath" = "11:TRUE"

+        "TargetPlatform" = "3:0"

+        "PreBuildEvent" = "8:"

+        "PostBuildEvent" = "8:"

+        "RunPostBuildEvent" = "3:0"

         }

         "Registry"

         {

@@ -203,7 +189,7 @@
             {

                 "Keys"

                 {

-                    "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_F6740CA6BCA84BB49508BADA0BBCBBBF"

+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_F6740CA6BCA84BB49508BADA0BBCBBBF"

                     {

                     "Name" = "8:Software"

                     "Condition" = "8:"

@@ -212,7 +198,7 @@
                     "Transitive" = "11:FALSE"

                         "Keys"

                         {

-                            "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_C20FFB7B3DF34F7280C6464E7AB3F96F"

+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_C20FFB7B3DF34F7280C6464E7AB3F96F"

                             {

                             "Name" = "8:[Manufacturer]"

                             "Condition" = "8:"

@@ -237,7 +223,7 @@
             {

                 "Keys"

                 {

-                    "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_79D7593CDD5549DC9DD26DC610419BB0"

+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_79D7593CDD5549DC9DD26DC610419BB0"

                     {

                     "Name" = "8:Software"

                     "Condition" = "8:"

@@ -246,7 +232,7 @@
                     "Transitive" = "11:FALSE"

                         "Keys"

                         {

-                            "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_F5467127899F4382B8608654B9BD162D"

+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_F5467127899F4382B8608654B9BD162D"

                             {

                             "Name" = "8:[Manufacturer]"

                             "Condition" = "8:"

@@ -291,7 +277,7 @@
         }

         "Shortcut"

         {

-            "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_1DD319DEBF174F32B022569E0FDC8231"

+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_1DD319DEBF174F32B022569E0FDC8231"

             {

             "Name" = "8:IvyCursor"

             "Arguments" = "8:"

@@ -305,7 +291,7 @@
             "Icon" = "8:"

             "Feature" = "8:"

             }

-            "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_FFDAE000C8814769B666A79E1A1874E9"

+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FFDAE000C8814769B666A79E1A1874E9"

             {

             "Name" = "8:IvyCursor"

             "Arguments" = "8:"

@@ -322,17 +308,17 @@
         }

         "UserInterface"

         {

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_0636F50D084F44628ABC60E0B92F6482"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_0636F50D084F44628ABC60E0B92F6482"

             {

             "Name" = "8:#1901"

             "Sequence" = "3:2"

             "Attributes" = "3:2"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_9DF06B29188C410D86056403380FE6D0"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9DF06B29188C410D86056403380FE6D0"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Progression"

+                    "DisplayName" = "8:Progress"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"

@@ -366,17 +352,17 @@
                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_18CABE436CC84533888CCE0E7AFABFC7"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_18CABE436CC84533888CCE0E7AFABFC7"

             {

             "Name" = "8:#1902"

             "Sequence" = "3:2"

             "Attributes" = "3:3"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_4BBF6ECCF3FF4CCE9DF57D69257EACFE"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4BBF6ECCF3FF4CCE9DF57D69257EACFE"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Terminé"

+                    "DisplayName" = "8:Finished"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"

@@ -397,17 +383,17 @@
                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_2A026925638547F882E2143EB6CBFB47"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_2A026925638547F882E2143EB6CBFB47"

             {

             "Name" = "8:#1900"

             "Sequence" = "3:1"

             "Attributes" = "3:1"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_BA40ECBCA4F74472B6B4A2B850EF0B58"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BA40ECBCA4F74472B6B4A2B850EF0B58"

                     {

                     "Sequence" = "3:200"

-                    "DisplayName" = "8:Dossier d'installation"

+                    "DisplayName" = "8:Installation Folder"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"

@@ -424,12 +410,25 @@
                             "Setting" = "3:1"

                             "UsePlugInResources" = "11:TRUE"

                             }

+                            "InstallAllUsersVisible"

+                            {

+                            "Name" = "8:InstallAllUsersVisible"

+                            "DisplayName" = "8:#1059"

+                            "Description" = "8:#1159"

+                            "Type" = "3:5"

+                            "ContextData" = "8:1;True=1;False=0"

+                            "Attributes" = "3:0"

+                            "Setting" = "3:0"

+                            "Value" = "3:1"

+                            "DefaultValue" = "3:1"

+                            "UsePlugInResources" = "11:TRUE"

+                            }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_CA4454662068449AB70A51A0D6B62F45"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_CA4454662068449AB70A51A0D6B62F45"

                     {

                     "Sequence" = "3:300"

-                    "DisplayName" = "8:Confirmer l'installation"

+                    "DisplayName" = "8:Confirm Installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"

@@ -448,10 +447,10 @@
                             }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_D88802A5F2B14E358204211F16EB4FAE"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D88802A5F2B14E358204211F16EB4FAE"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Bienvenue"

+                    "DisplayName" = "8:Welcome"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"

@@ -498,17 +497,17 @@
                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_6987FD35A7A4427285F47DF69B3F46AC"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_6987FD35A7A4427285F47DF69B3F46AC"

             {

             "Name" = "8:#1902"

             "Sequence" = "3:1"

             "Attributes" = "3:3"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_0B3BD974222A492098588B27DB307CDA"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0B3BD974222A492098588B27DB307CDA"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Terminé"

+                    "DisplayName" = "8:Finished"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"

@@ -542,29 +541,29 @@
                     }

                 }

             }

-            "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_BD34D23EE7874F2E8422867476425191"

+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_BD34D23EE7874F2E8422867476425191"

             {

             "UseDynamicProperties" = "11:FALSE"

             "IsDependency" = "11:FALSE"

             "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"

             }

-            "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_CF0CE67F9DDB4AF5A48F2F086BAB4C42"

+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_CF0CE67F9DDB4AF5A48F2F086BAB4C42"

             {

             "UseDynamicProperties" = "11:FALSE"

             "IsDependency" = "11:FALSE"

             "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_D9A2328703204827A30713BEAC6CF403"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_D9A2328703204827A30713BEAC6CF403"

             {

             "Name" = "8:#1901"

             "Sequence" = "3:1"

             "Attributes" = "3:2"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_F15ADAF16F724C85916FA31593F72F8D"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F15ADAF16F724C85916FA31593F72F8D"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Progression"

+                    "DisplayName" = "8:Progress"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"

@@ -598,17 +597,17 @@
                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_F12D846FFE1A4DC9B3126FA263DFD826"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_F12D846FFE1A4DC9B3126FA263DFD826"

             {

             "Name" = "8:#1900"

             "Sequence" = "3:2"

             "Attributes" = "3:1"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_30F0F9F2A1834E0BA3D83DBD6F9BFAE9"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_30F0F9F2A1834E0BA3D83DBD6F9BFAE9"

                     {

                     "Sequence" = "3:200"

-                    "DisplayName" = "8:Dossier d'installation"

+                    "DisplayName" = "8:Installation Folder"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"

@@ -627,10 +626,10 @@
                             }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_53970AAC5A024A3681F861F4BE2D650B"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_53970AAC5A024A3681F861F4BE2D650B"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Bienvenue"

+                    "DisplayName" = "8:Welcome"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"

@@ -675,10 +674,10 @@
                             }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A92D8986A08B4691BE0869927B5BCF43"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A92D8986A08B4691BE0869927B5BCF43"

                     {

                     "Sequence" = "3:300"

-                    "DisplayName" = "8:Confirmer l'installation"

+                    "DisplayName" = "8:Confirm Installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"

@@ -702,40 +701,12 @@
         }

         "MergeModule"

         {

-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_CD5F4F48D63B4317962CABF981642C29"

-            {

-            "UseDynamicProperties" = "11:TRUE"

-            "IsDependency" = "11:TRUE"

-            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"

-                "Properties"

-                {

-                }

-            "LanguageId" = "3:0"

-            "Exclude" = "11:FALSE"

-            "Folder" = "8:"

-            "Feature" = "8:"

-            "IsolateTo" = "8:"

-            }

-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_CE3A08225274427BA9D9B77094DAD99A"

-            {

-            "UseDynamicProperties" = "11:TRUE"

-            "IsDependency" = "11:TRUE"

-            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"

-                "Properties"

-                {

-                }

-            "LanguageId" = "3:0"

-            "Exclude" = "11:FALSE"

-            "Folder" = "8:"

-            "Feature" = "8:"

-            "IsolateTo" = "8:"

-            }

         }

         "ProjectOutput"

         {

-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4E16B1233013473896B5B14884B766C6"

+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4E16B1233013473896B5B14884B766C6"

             {

-            "SourcePath" = "8:..\\..\\Ivy\\Release\\Ivy.dll"

+            "SourcePath" = "8:..\\Release\\Ivy.dll"

             "TargetName" = "8:"

             "Tag" = "8:"

             "Folder" = "8:_4032CB2519934BECBD77C58A883B04AC"

@@ -761,7 +732,7 @@
                 {

                 }

             }

-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5A688E16C8FB4F969BAAF36ACF9DE131"

+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5A688E16C8FB4F969BAAF36ACF9DE131"

             {

             "SourcePath" = "8:..\\Release\\IvyCursor.exe"

             "TargetName" = "8:"

diff --git a/IvyCursor/IvyCursor.cpp b/IvyCursor/IvyCursor.cpp
index 8b5e48e..558d074 100644
--- a/IvyCursor/IvyCursor.cpp
+++ b/IvyCursor/IvyCursor.cpp
@@ -2,10 +2,11 @@
 //

 

 #include "stdafx.h"

+#include "Ivy.h"

 #include <winuser.h>

 #include <crtdbg.h>

 #include <shellapi.h>

-#include "Ivy.h"

+

 #include "IvyCursor.h"

 #define MAX_LOADSTRING 100

 

@@ -18,7 +19,7 @@ HMENU hMenu;									// handle menu icontray
 HMENU hmenuTrackPopup;

 

 // Ivy 

-Ivy* ivy;

+Ivy* bus;

 

 // Pré-déclarations des fonctions incluses dans ce module de code :

 ATOM				MyRegisterClass(HINSTANCE hInstance);

@@ -102,10 +103,10 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 		return FALSE;

 	}

 	// Initoiailize ivy

-	ivy = new Ivy("IvyCursor", "IvyCursor Ready", 0, FALSE );

-	ivy->BindMsg(BUS_CALLBACK(ivyCursorMouve,0),"Cigale SetCursorPosition x=([0-9.]+) y=([0-9.]+)");

-	ivy->BindMsg(BUS_CALLBACK(ivyCursorClick,0),"Cigale CursorSelectEvent x=([0-9.]+) y=([0-9.]+)");

-	ivy->start( 0 );

+	bus = new Ivy("IvyCursor", "IvyCursor Ready", 0, FALSE );

+	bus->BindMsg(BUS_CALLBACK(ivyCursorMouve,0),"^Cigale SetCursorPosition x=([0-9.]+) y=([0-9.]+)");

+	bus->BindMsg(BUS_CALLBACK(ivyCursorClick,0),"^Cigale CursorSelectEvent x=([0-9.]+) y=([0-9.]+)");

+	bus->start( 0 );

 

 	// Boucle de messages principale :

 	while (GetMessage(&msg, NULL, 0, 0)) 

@@ -235,7 +236,7 @@ void Quitting( HWND hWnd )
 	RemoveTrayIcon(hWnd);

 	DestroyMenu(hMenu);

 	DestroyWindow(hWnd);

-	ivy->stop();

+	bus->stop();

 }

 //

 //  FONCTION : WndProc(HWND, unsigned, WORD, LONG)

diff --git a/IvyCursor/IvyCursor.sln b/IvyCursor/IvyCursor.sln
index e8e53cb..8f2829e 100644
--- a/IvyCursor/IvyCursor.sln
+++ b/IvyCursor/IvyCursor.sln
@@ -1,55 +1,72 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyCursor", "IvyCursor.vcproj", "{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}"

 	ProjectSection(ProjectDependencies) = postProject

 		{84E0039A-6721-4B18-9792-E9AE4274AC0E} = {84E0039A-6721-4B18-9792-E9AE4274AC0E}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "..\Ivy\Ivy.vcproj", "{84E0039A-6721-4B18-9792-E9AE4274AC0E}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install", "InstIvyCursor\InstIvyCursor.vdproj", "{465D12EC-FE99-47FE-AF2A-17BB43672F22}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\..\..\pcre\pcre.vcproj", "{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}"

 EndProject

 Global

 	GlobalSection(SourceCodeControl) = preSolution

-		SccNumberOfProjects = 4

-		SccProjectUniqueName0 = ..\\Ivy\\Ivy.vcproj

-		SccProjectName0 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA

-		SccLocalPath0 = ..\\Ivy

-		CanCheckoutShared = false

-		SccLocalPath1 = .

-		CanCheckoutShared = false

-		SolutionUniqueID = {414FACD5-03EC-415D-B4B1-E8EA51BC621B}

+		SccNumberOfProjects = 5

+		SccLocalPath0 = .

+		SccProjectUniqueName1 = ..\\Ivy\\Ivy.vcproj

+		SccProjectName1 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA

+		SccLocalPath1 = ..\\Ivy

 		SccProjectUniqueName2 = InstIvyCursor\\InstIvyCursor.vdproj

 		SccLocalPath2 = .

-		CanCheckoutShared = false

 		SccProjectFilePathRelativizedFromConnection2 = InstIvyCursor\\

 		SccProjectUniqueName3 = IvyCursor.vcproj

 		SccLocalPath3 = .

-		CanCheckoutShared = false

-	EndGlobalSection

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

+		SccProjectUniqueName4 = ..\\..\\..\\pcre\\pcre.vcproj

+		SccProjectName4 = \u0022$/pcre\u0022,\u0020KSHAAAAA

+		SccLocalPath4 = ..\\..\\..\\pcre

 	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug.ActiveCfg = Debug|Win32

-		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug.Build.0 = Debug|Win32

-		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release.ActiveCfg = Release|Win32

-		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release.Build.0 = Release|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug.ActiveCfg = Debug|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug.Build.0 = Debug|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release.ActiveCfg = Release|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release.Build.0 = Release|Win32

-		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug.ActiveCfg = Debug

-		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug.Build.0 = Debug

-		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release.ActiveCfg = Release

-		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release.Build.0 = Release

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|Win32.Build.0 = Debug|Win32

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|x64.ActiveCfg = Debug|Win32

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Debug|x64.Build.0 = Debug|Win32

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|Win32.ActiveCfg = Release|Win32

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|Win32.Build.0 = Release|Win32

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|x64.ActiveCfg = Release|Win32

+		{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}.Release|x64.Build.0 = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.Build.0 = Debug|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.ActiveCfg = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.Build.0 = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.ActiveCfg = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.Build.0 = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.ActiveCfg = Release|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.Build.0 = Release|x64

+		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug|Win32.ActiveCfg = Debug

+		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug|x64.ActiveCfg = Debug

+		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Debug|x64.Build.0 = Debug

+		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release|Win32.ActiveCfg = Release

+		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release|Win32.Build.0 = Release

+		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release|x64.ActiveCfg = Release

+		{465D12EC-FE99-47FE-AF2A-17BB43672F22}.Release|x64.Build.0 = Release

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.Build.0 = Debug|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.ActiveCfg = Debug|x64

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.Build.0 = Debug|x64

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.ActiveCfg = Release|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.Build.0 = Release|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.ActiveCfg = Release|x64

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/IvyCursor/IvyCursor.vcproj b/IvyCursor/IvyCursor.vcproj
index 673c7df..be89ff9 100644
--- a/IvyCursor/IvyCursor.vcproj
+++ b/IvyCursor/IvyCursor.vcproj
@@ -1,175 +1,257 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="IvyCursor"

 	ProjectGUID="{5353F53D-8047-42AB-A3E1-73E6EAAFBBE6}"

+	RootNamespace="IvyCursor"

 	SccProjectName="SAK"

 	SccAuxPath="SAK"

 	SccLocalPath="SAK"

 	SccProvider="SAK"

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="1"

-			CharacterSet="2">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\Ivy"

+				AdditionalIncludeDirectories="..\ivy"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_IE=0x500;_WIN32_WINNT=0x0500"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="3"

+				RuntimeLibrary="1"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/IvyCursor.exe"

 				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)/IvyCursor.pdb"

 				SubSystem="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="1"

-			CharacterSet="2">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\Ivy"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WIN32_IE=0x500;_WIN32_WINNT=0x0500"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="3"

+				RuntimeLibrary="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)/IvyCursor.exe"

 				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

 		<ProjectReference

 			ReferencedProjectIdentifier="{84E0039A-6721-4B18-9792-E9AE4274AC0E}"

-			Name="Ivy"/>

+			RelativePathToProject="..\Ivy\Ivy.vcproj"

+		/>

 	</References>

 	<Files>

 		<Filter

 			Name="Source Files"

 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

 			<File

-				RelativePath=".\IvyCursor.cpp">

+				RelativePath=".\IvyCursor.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\stdafx.cpp">

+				RelativePath=".\stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

 			<File

-				RelativePath=".\IvyCursor.h">

+				RelativePath=".\IvyCursor.h"

+				>

 			</File>

 			<File

-				RelativePath=".\Resource.h">

+				RelativePath=".\Resource.h"

+				>

 			</File>

 			<File

-				RelativePath=".\stdafx.h">

+				RelativePath=".\stdafx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

 			<File

-				RelativePath=".\IvyCursor.ico">

+				RelativePath=".\IvyCursor.ico"

+				>

 			</File>

 			<File

-				RelativePath=".\IvyCursor.rc">

+				RelativePath=".\IvyCursor.rc"

+				>

 			</File>

 			<File

-				RelativePath=".\small.ico">

+				RelativePath=".\small.ico"

+				>

 			</File>

 		</Filter>

 		<File

-			RelativePath=".\ReadMe.txt">

+			RelativePath=".\ReadMe.txt"

+			>

 		</File>

 	</Files>

 	<Globals>

diff --git a/IvyFileMon/InstIvyFileMon/InstIvyFileMon.vdproj b/IvyFileMon/InstIvyFileMon/InstIvyFileMon.vdproj
index 5d95e1f..04a1352 100644
--- a/IvyFileMon/InstIvyFileMon/InstIvyFileMon.vdproj
+++ b/IvyFileMon/InstIvyFileMon/InstIvyFileMon.vdproj
@@ -1,52 +1,34 @@
 "DeployProject"

 {

-"VSVersion" = "3:701"

-"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}"

+"VSVersion" = "3:800"

+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"

 "IsWebType" = "8:FALSE"

 "ProjectName" = "8:Install"

 "LanguageId" = "3:1036"

 "CodePage" = "3:1252"

 "UILanguageId" = "3:1036"

-"SccProjectName" = "8:\"$/Bus/IvyFileMon\", VTEAAAAA"

-"SccLocalPath" = "8:..\\.."

+"SccProjectName" = "8:\"$/Bus/IvyFileMon/InstIvyFileMon\", DEIAAAAA"

+"SccLocalPath" = "8:."

 "SccAuxPath" = "8:"

 "SccProvider" = "8:MSSCCI:Microsoft Visual SourceSafe"

     "Hierarchy"

     {

         "Entry"

         {

-        "MsmKey" = "8:_0DD44A8F6530438CB2E0A50F1F80A210"

-        "OwnerKey" = "8:_DB155C88AA6C4534BEF14067EEC6FB65"

-        "MsmSig" = "8:_UNDEFINED"

-        }

-        "Entry"

-        {

-        "MsmKey" = "8:_0E19E1F4B469891E119B302278BD7676"

-        "OwnerKey" = "8:_DB155C88AA6C4534BEF14067EEC6FB65"

-        "MsmSig" = "8:_UNDEFINED"

-        }

-        "Entry"

-        {

-        "MsmKey" = "8:_1787477A582B41BDA52AEC8762B60240"

-        "OwnerKey" = "8:_378194BEC0C642BBBEB8EBC7B0B33A4F"

-        "MsmSig" = "8:_UNDEFINED"

-        }

-        "Entry"

-        {

         "MsmKey" = "8:_378194BEC0C642BBBEB8EBC7B0B33A4F"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_7E184C689278442B851207163DF58EC0"

+        "MsmKey" = "8:_4EBC668F00B3FCC2036FBBE5AD65D7FF"

         "OwnerKey" = "8:_378194BEC0C642BBBEB8EBC7B0B33A4F"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_7E184C689278442B851207163DF58EC0"

-        "OwnerKey" = "8:_DB155C88AA6C4534BEF14067EEC6FB65"

+        "MsmKey" = "8:_BF8D451D1F7016BCF90442045BCCAE33"

+        "OwnerKey" = "8:_378194BEC0C642BBBEB8EBC7B0B33A4F"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

@@ -73,13 +55,24 @@
         "PrivateKeyFile" = "8:"

         "TimeStampServer" = "8:"

         "InstallerBootstrapper" = "3:1"

+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"

+            {

+            "Enabled" = "11:FALSE"

+            "PromptEnabled" = "11:TRUE"

+            "PrerequisitesLocation" = "2:1"

+            "Url" = "8:"

+            "ComponentsUrl" = "8:"

+                "Items"

+                {

+                }

+            }

         }

         "Release"

         {

         "DisplayName" = "8:Release"

         "IsDebugOnly" = "11:FALSE"

         "IsReleaseOnly" = "11:TRUE"

-        "OutputFilename" = "8:Release\\InstIvyFileMon.msi"

+        "OutputFilename" = "8:..\\..\\..\\..\\Install\\IvyFileMon.msi"

         "PackageFilesAs" = "3:2"

         "PackageFileSize" = "3:-2147483648"

         "CabType" = "3:1"

@@ -89,6 +82,17 @@
         "PrivateKeyFile" = "8:"

         "TimeStampServer" = "8:"

         "InstallerBootstrapper" = "3:1"

+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"

+            {

+            "Enabled" = "11:FALSE"

+            "PromptEnabled" = "11:TRUE"

+            "PrerequisitesLocation" = "2:1"

+            "Url" = "8:"

+            "ComponentsUrl" = "8:"

+                "Items"

+                {

+                }

+            }

         }

     }

     "Deployable"

@@ -108,15 +112,32 @@
             {

             }

         }

-        "Feature"

-        {

-        }

         "File"

         {

-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_0E19E1F4B469891E119B302278BD7676"

+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EBC668F00B3FCC2036FBBE5AD65D7FF"

+            {

+            "SourcePath" = "8:MFC71.DLL"

+            "TargetName" = "8:MFC71.DLL"

+            "Tag" = "8:"

+            "Folder" = "8:_DDAA30AF8058479E808821672EB9DC2B"

+            "Condition" = "8:"

+            "Transitive" = "11:FALSE"

+            "Vital" = "11:TRUE"

+            "ReadOnly" = "11:FALSE"

+            "Hidden" = "11:FALSE"

+            "System" = "11:FALSE"

+            "Permanent" = "11:FALSE"

+            "SharedLegacy" = "11:FALSE"

+            "PackageAs" = "3:1"

+            "Register" = "3:1"

+            "Exclude" = "11:FALSE"

+            "IsDependency" = "11:TRUE"

+            "IsolateTo" = "8:"

+            }

+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF8D451D1F7016BCF90442045BCCAE33"

             {

-            "SourcePath" = "8:WSOCK32.dll"

-            "TargetName" = "8:WSOCK32.dll"

+            "SourcePath" = "8:MSVCR71.dll"

+            "TargetName" = "8:MSVCR71.dll"

             "Tag" = "8:"

             "Folder" = "8:_DDAA30AF8058479E808821672EB9DC2B"

             "Condition" = "8:"

@@ -129,7 +150,7 @@
             "SharedLegacy" = "11:FALSE"

             "PackageAs" = "3:1"

             "Register" = "3:1"

-            "Exclude" = "11:TRUE"

+            "Exclude" = "11:FALSE"

             "IsDependency" = "11:TRUE"

             "IsolateTo" = "8:"

             }

@@ -139,7 +160,7 @@
         }

         "Folder"

         {

-            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_31436C2B3945454BA152271137CCAA39"

+            "{1525181F-901A-416C-8A58-119130FE478E}:_31436C2B3945454BA152271137CCAA39"

             {

             "Name" = "8:#1916"

             "AlwaysCreate" = "11:FALSE"

@@ -150,7 +171,7 @@
                 {

                 }

             }

-            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_DC93F1DBB219414A9D02F4F54143F682"

+            "{1525181F-901A-416C-8A58-119130FE478E}:_DC93F1DBB219414A9D02F4F54143F682"

             {

             "Name" = "8:#1919"

             "AlwaysCreate" = "11:FALSE"

@@ -161,7 +182,7 @@
                 {

                 }

             }

-            "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_DDAA30AF8058479E808821672EB9DC2B"

+            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_DDAA30AF8058479E808821672EB9DC2B"

             {

             "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"

             "Name" = "8:#1925"

@@ -194,6 +215,7 @@
         "RestartWWWService" = "11:FALSE"

         "RemovePreviousVersions" = "11:TRUE"

         "DetectNewerInstalledVersion" = "11:TRUE"

+        "InstallAllUsers" = "11:FALSE"

         "ProductVersion" = "8:1.0.0"

         "Manufacturer" = "8:CENA PII"

         "ARPHELPTELEPHONE" = "8:"

@@ -208,6 +230,10 @@
         "ARPIconIndex" = "3:0"

         "SearchPath" = "8:"

         "UseSystemSearchPath" = "11:TRUE"

+        "TargetPlatform" = "3:0"

+        "PreBuildEvent" = "8:"

+        "PostBuildEvent" = "8:"

+        "RunPostBuildEvent" = "3:0"

         }

         "Registry"

         {

@@ -215,7 +241,7 @@
             {

                 "Keys"

                 {

-                    "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_90B278BF81154475985C1A4181CF94D4"

+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_90B278BF81154475985C1A4181CF94D4"

                     {

                     "Name" = "8:Software"

                     "Condition" = "8:"

@@ -224,7 +250,7 @@
                     "Transitive" = "11:FALSE"

                         "Keys"

                         {

-                            "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_F9F082172E184264885DD15D618580FC"

+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_F9F082172E184264885DD15D618580FC"

                             {

                             "Name" = "8:[Manufacturer]"

                             "Condition" = "8:"

@@ -249,7 +275,7 @@
             {

                 "Keys"

                 {

-                    "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_55DCD8AB55384E17A422F91638D7BAD6"

+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_55DCD8AB55384E17A422F91638D7BAD6"

                     {

                     "Name" = "8:Software"

                     "Condition" = "8:"

@@ -258,7 +284,7 @@
                     "Transitive" = "11:FALSE"

                         "Keys"

                         {

-                            "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_298A7C0021DA49E58AEA25CA12D1EB8E"

+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_298A7C0021DA49E58AEA25CA12D1EB8E"

                             {

                             "Name" = "8:[Manufacturer]"

                             "Condition" = "8:"

@@ -306,23 +332,23 @@
         }

         "UserInterface"

         {

-            "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_746273026A43484A92DF764E5FE0F8D5"

+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_746273026A43484A92DF764E5FE0F8D5"

             {

             "UseDynamicProperties" = "11:FALSE"

             "IsDependency" = "11:FALSE"

             "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_7E930155F5254413952D4A13E6984096"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_7E930155F5254413952D4A13E6984096"

             {

             "Name" = "8:#1901"

             "Sequence" = "3:2"

             "Attributes" = "3:2"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_9201B3D3FED9428884C552E8907BD940"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9201B3D3FED9428884C552E8907BD940"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Progression"

+                    "DisplayName" = "8:Progress"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"

@@ -356,17 +382,17 @@
                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_89117C1BBE544863B1B3C820791387B3"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_89117C1BBE544863B1B3C820791387B3"

             {

             "Name" = "8:#1902"

             "Sequence" = "3:1"

             "Attributes" = "3:3"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_89B7CC371BC44ECAA1ADC833B75A98BE"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_89B7CC371BC44ECAA1ADC833B75A98BE"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Terminé"

+                    "DisplayName" = "8:Finished"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"

@@ -400,17 +426,17 @@
                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_A340822367004EA3B2E848CB3A4A7AC0"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A340822367004EA3B2E848CB3A4A7AC0"

             {

             "Name" = "8:#1900"

             "Sequence" = "3:1"

             "Attributes" = "3:1"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_5467627873D44B388595ABEDF07BE051"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5467627873D44B388595ABEDF07BE051"

                     {

                     "Sequence" = "3:300"

-                    "DisplayName" = "8:Confirmer l'installation"

+                    "DisplayName" = "8:Confirm Installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"

@@ -429,10 +455,10 @@
                             }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A19F72F966EC4837BD7FA41F66501195"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A19F72F966EC4837BD7FA41F66501195"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Bienvenue"

+                    "DisplayName" = "8:Welcome"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"

@@ -477,10 +503,10 @@
                             }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A5FFBF0129BC461FBFEE8A03128FF939"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A5FFBF0129BC461FBFEE8A03128FF939"

                     {

                     "Sequence" = "3:200"

-                    "DisplayName" = "8:Dossier d'installation"

+                    "DisplayName" = "8:Installation Folder"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"

@@ -497,21 +523,34 @@
                             "Setting" = "3:1"

                             "UsePlugInResources" = "11:TRUE"

                             }

+                            "InstallAllUsersVisible"

+                            {

+                            "Name" = "8:InstallAllUsersVisible"

+                            "DisplayName" = "8:#1059"

+                            "Description" = "8:#1159"

+                            "Type" = "3:5"

+                            "ContextData" = "8:1;True=1;False=0"

+                            "Attributes" = "3:0"

+                            "Setting" = "3:0"

+                            "Value" = "3:1"

+                            "DefaultValue" = "3:1"

+                            "UsePlugInResources" = "11:TRUE"

+                            }

                         }

                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_AE2014636E5E4F25B59645C85CE9CD4B"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_AE2014636E5E4F25B59645C85CE9CD4B"

             {

             "Name" = "8:#1902"

             "Sequence" = "3:2"

             "Attributes" = "3:3"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_EF4845026C4E48A18C9D2D3C97217128"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_EF4845026C4E48A18C9D2D3C97217128"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Terminé"

+                    "DisplayName" = "8:Finished"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"

@@ -532,17 +571,17 @@
                     }

                 }

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_CF64177EA7D844FD8AA819106C1D5F47"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_CF64177EA7D844FD8AA819106C1D5F47"

             {

             "Name" = "8:#1901"

             "Sequence" = "3:1"

             "Attributes" = "3:2"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A404463CA0524BA1B155B28BB93CE3D1"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A404463CA0524BA1B155B28BB93CE3D1"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Progression"

+                    "DisplayName" = "8:Progress"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"

@@ -576,23 +615,23 @@
                     }

                 }

             }

-            "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_DD40DA431C6A4691AD9C0CD2B694F4D3"

+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_DD40DA431C6A4691AD9C0CD2B694F4D3"

             {

             "UseDynamicProperties" = "11:FALSE"

             "IsDependency" = "11:FALSE"

             "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"

             }

-            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_F0487C7ECB9243B89FFDC800DD19A924"

+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_F0487C7ECB9243B89FFDC800DD19A924"

             {

             "Name" = "8:#1900"

             "Sequence" = "3:2"

             "Attributes" = "3:1"

                 "Dialogs"

                 {

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_746AC3F4F55049E082938A764D4F913E"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_746AC3F4F55049E082938A764D4F913E"

                     {

                     "Sequence" = "3:200"

-                    "DisplayName" = "8:Dossier d'installation"

+                    "DisplayName" = "8:Installation Folder"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"

@@ -611,10 +650,10 @@
                             }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_D2355D14BD594C9EA6DCAB182C8C94CF"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D2355D14BD594C9EA6DCAB182C8C94CF"

                     {

                     "Sequence" = "3:100"

-                    "DisplayName" = "8:Bienvenue"

+                    "DisplayName" = "8:Welcome"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"

@@ -659,10 +698,10 @@
                             }

                         }

                     }

-                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_F29124EDF2D24CAF9003CA4D78974AA8"

+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F29124EDF2D24CAF9003CA4D78974AA8"

                     {

                     "Sequence" = "3:300"

-                    "DisplayName" = "8:Confirmer l'installation"

+                    "DisplayName" = "8:Confirm Installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"

@@ -686,52 +725,10 @@
         }

         "MergeModule"

         {

-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_0DD44A8F6530438CB2E0A50F1F80A210"

-            {

-            "UseDynamicProperties" = "11:TRUE"

-            "IsDependency" = "11:TRUE"

-            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"

-                "Properties"

-                {

-                }

-            "LanguageId" = "3:0"

-            "Exclude" = "11:FALSE"

-            "Folder" = "8:"

-            "Feature" = "8:"

-            "IsolateTo" = "8:"

-            }

-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_1787477A582B41BDA52AEC8762B60240"

-            {

-            "UseDynamicProperties" = "11:TRUE"

-            "IsDependency" = "11:TRUE"

-            "SourcePath" = "8:vc_user_mfc71_rtl_x86_---.msm"

-                "Properties"

-                {

-                }

-            "LanguageId" = "3:0"

-            "Exclude" = "11:FALSE"

-            "Folder" = "8:"

-            "Feature" = "8:"

-            "IsolateTo" = "8:"

-            }

-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_7E184C689278442B851207163DF58EC0"

-            {

-            "UseDynamicProperties" = "11:TRUE"

-            "IsDependency" = "11:TRUE"

-            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"

-                "Properties"

-                {

-                }

-            "LanguageId" = "3:0"

-            "Exclude" = "11:FALSE"

-            "Folder" = "8:"

-            "Feature" = "8:"

-            "IsolateTo" = "8:"

-            }

         }

         "ProjectOutput"

         {

-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_378194BEC0C642BBBEB8EBC7B0B33A4F"

+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_378194BEC0C642BBBEB8EBC7B0B33A4F"

             {

             "SourcePath" = "8:..\\Release\\IvyFileMon.exe"

             "TargetName" = "8:"

@@ -759,9 +756,9 @@
                 {

                 }

             }

-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB155C88AA6C4534BEF14067EEC6FB65"

+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DB155C88AA6C4534BEF14067EEC6FB65"

             {

-            "SourcePath" = "8:..\\..\\Ivy\\Release\\Ivy.dll"

+            "SourcePath" = "8:..\\Release\\Ivy.dll"

             "TargetName" = "8:"

             "Tag" = "8:"

             "Folder" = "8:_DDAA30AF8058479E808821672EB9DC2B"

diff --git a/IvyFileMon/IvyFileMon.sln b/IvyFileMon/IvyFileMon.sln
index d23441b..154a489 100644
--- a/IvyFileMon/IvyFileMon.sln
+++ b/IvyFileMon/IvyFileMon.sln
@@ -1,53 +1,66 @@
-Microsoft Visual Studio Solution File, Format Version 7.00

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyFileMon", "IvyFileMon.vcproj", "{B50B2407-50BF-4DF3-832E-41EDA9914A4D}"

+	ProjectSection(ProjectDependencies) = postProject

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E} = {84E0039A-6721-4B18-9792-E9AE4274AC0E}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "..\Ivy\Ivy.vcproj", "{84E0039A-6721-4B18-9792-E9AE4274AC0E}"

 EndProject

-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstIvyFileMon", "..\..\..\Install\InstIvyFileMon\InstIvyFileMon.vdproj", "{EFBC2510-93C6-4911-973D-02F63CAAF396}"

+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install", "InstIvyFileMon\InstIvyFileMon.vdproj", "{E4A237ED-A1C0-4808-B356-07C55C873CAE}"

 EndProject

 Global

 	GlobalSection(SourceCodeControl) = preSolution

 		SccNumberOfProjects = 4

-		SccProjectUniqueName0 = ..\\Ivy\\Ivy.vcproj

-		SccProjectName0 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA

-		SccLocalPath0 = ..\\Ivy

+		SccProjectName0 = \u0022$/Bus/IvyFileMon\u0022,\u0020VTEAAAAA

+		SccLocalPath0 = .

+		SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

 		CanCheckoutShared = false

-		SccProjectName1 = \u0022$/Bus/IvyFileMon\u0022,\u0020VTEAAAAA

-		SccLocalPath1 = ..\\..\\..

-		SccProvider1 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

+		SccProjectUniqueName1 = ..\\Ivy\\Ivy.vcproj

+		SccProjectName1 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA

+		SccLocalPath1 = ..\\Ivy

 		CanCheckoutShared = false

-		SccProjectFilePathRelativizedFromConnection1 = C++\\Bus\\IvyFileMon\\

-		SolutionUniqueID = {5F419E2D-5A13-4FB3-9817-74A8EB0DE519}

 		SccProjectUniqueName2 = IvyFileMon.vcproj

-		SccLocalPath2 = ..\\..\\..

+		SccLocalPath2 = .

 		CanCheckoutShared = false

-		SccProjectFilePathRelativizedFromConnection2 = C++\\Bus\\IvyFileMon\\

-		SccProjectUniqueName3 = ..\\..\\..\\Install\\InstIvyFileMon\\InstIvyFileMon.vdproj

-		SccLocalPath3 = ..\\..\\..

+		SccProjectUniqueName3 = InstIvyFileMon\\InstIvyFileMon.vdproj

+		SccProjectName3 = \u0022$/Bus/IvyFileMon/InstIvyFileMon\u0022,\u0020DEIAAAAA

+		SccLocalPath3 = InstIvyFileMon

 		CanCheckoutShared = false

-		SccProjectFilePathRelativizedFromConnection3 = Install\\InstIvyFileMon\\

 	EndGlobalSection

-	GlobalSection(SolutionConfiguration) = preSolution

-		ConfigName.0 = Debug

-		ConfigName.1 = Release

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.0 = {84E0039A-6721-4B18-9792-E9AE4274AC0E}

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Debug|Win32.Build.0 = Debug|Win32

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Debug|x64.ActiveCfg = Debug|Win32

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Debug|x64.Build.0 = Debug|Win32

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Release|Win32.ActiveCfg = Release|Win32

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Release|Win32.Build.0 = Release|Win32

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Release|x64.ActiveCfg = Release|Win32

+		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Release|x64.Build.0 = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.Build.0 = Debug|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.ActiveCfg = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.Build.0 = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.ActiveCfg = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.Build.0 = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.ActiveCfg = Release|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.Build.0 = Release|x64

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Debug|Win32.ActiveCfg = Debug

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Debug|Win32.Build.0 = Debug

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Debug|x64.ActiveCfg = Debug

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Debug|x64.Build.0 = Debug

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Release|Win32.ActiveCfg = Release

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Release|Win32.Build.0 = Release

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Release|x64.ActiveCfg = Release

+		{E4A237ED-A1C0-4808-B356-07C55C873CAE}.Release|x64.Build.0 = Release

 	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Debug.ActiveCfg = Debug|Win32

-		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Debug.Build.0 = Debug|Win32

-		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Release.ActiveCfg = Release|Win32

-		{B50B2407-50BF-4DF3-832E-41EDA9914A4D}.Release.Build.0 = Release|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug.ActiveCfg = Debug|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug.Build.0 = Debug|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release.ActiveCfg = Release|Win32

-		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release.Build.0 = Release|Win32

-		{EFBC2510-93C6-4911-973D-02F63CAAF396}.Debug.ActiveCfg = Debug

-		{EFBC2510-93C6-4911-973D-02F63CAAF396}.Release.ActiveCfg = Release

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/IvyFileMon/IvyFileMon.vcproj b/IvyFileMon/IvyFileMon.vcproj
index 9ccc796..dadeb81 100644
--- a/IvyFileMon/IvyFileMon.vcproj
+++ b/IvyFileMon/IvyFileMon.vcproj
@@ -1,205 +1,326 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

+<?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.00"

+	Version="8,00"

 	Name="IvyFileMon"

 	ProjectGUID="{B50B2407-50BF-4DF3-832E-41EDA9914A4D}"

+	RootNamespace="IvyFileMon"

 	SccProjectName="&quot;$/Bus/IvyFileMon&quot;, VTEAAAAA"

-	SccAuxPath=""

-	SccLocalPath="..\..\.."

+	SccLocalPath="."

 	SccProvider="MSSCCI:Microsoft Visual SourceSafe"

-	Keyword="MFCProj">

+	Keyword="MFCProj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="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"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\Ivy"

 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				TreatWChar_tAsBuiltInType="TRUE"

-				UsePrecompiledHeader="3"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir)"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				SubSystem="2"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="FALSE"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(IntDir)"/>

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="false"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				AdditionalIncludeDirectories="..\Ivy"

 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"

-				StringPooling="TRUE"

-				MinimalRebuild="FALSE"

+				StringPooling="true"

+				MinimalRebuild="false"

 				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				TreatWChar_tAsBuiltInType="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories="$(IntDir)"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="FALSE"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(IntDir)"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

+	<References>

+	</References>

 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath="DelayedDirectoryChangeHandler.cpp">

+				RelativePath="DelayedDirectoryChangeHandler.cpp"

+				>

 			</File>

 			<File

-				RelativePath="DirectoryChanges.cpp">

+				RelativePath="DirectoryChanges.cpp"

+				>

 			</File>

 			<File

-				RelativePath="HistoryEdit.cpp">

+				RelativePath="HistoryEdit.cpp"

+				>

 			</File>

 			<File

-				RelativePath="IvyFileMon.cpp">

+				RelativePath="IvyFileMon.cpp"

+				>

 			</File>

 			<File

-				RelativePath="IvyFileMonDlg.cpp">

+				RelativePath="IvyFileMonDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="ParseCmdLine.cpp">

+				RelativePath="ParseCmdLine.cpp"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.cpp">

+				RelativePath="stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc">

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

 			<File

-				RelativePath="DelayedDirectoryChangeHandler.h">

+				RelativePath="DelayedDirectoryChangeHandler.h"

+				>

 			</File>

 			<File

-				RelativePath="DirectoryChanges.h">

+				RelativePath="DirectoryChanges.h"

+				>

 			</File>

 			<File

-				RelativePath="HistoryEdit.h">

+				RelativePath="HistoryEdit.h"

+				>

 			</File>

 			<File

-				RelativePath="IvyFileMon.h">

+				RelativePath="IvyFileMon.h"

+				>

 			</File>

 			<File

-				RelativePath="IvyFileMonDlg.h">

+				RelativePath="IvyFileMonDlg.h"

+				>

 			</File>

 			<File

-				RelativePath="ParseCmdLine.h">

+				RelativePath="ParseCmdLine.h"

+				>

 			</File>

 			<File

-				RelativePath="Resource.h">

+				RelativePath="Resource.h"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.h">

+				RelativePath="stdafx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest">

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"

+			>

 			<File

-				RelativePath="res\IvyFileMon.ico">

+				RelativePath="res\IvyFileMon.ico"

+				>

 			</File>

 			<File

-				RelativePath="res\IvyFileMon.manifest">

+				RelativePath="res\IvyFileMon.manifest"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="IvyFileMon.rc">

+				RelativePath="IvyFileMon.rc"

+				>

 			</File>

 			<File

-				RelativePath="res\IvyFileMon.rc2">

+				RelativePath="res\IvyFileMon.rc2"

+				>

 			</File>

 		</Filter>

 		<File

-			RelativePath="ReadMe.txt">

+			RelativePath="ReadMe.txt"

+			>

 		</File>

 	</Files>

 	<Globals>

diff --git a/IvyProbe/IvyProbe.sln b/IvyProbe/IvyProbe.sln
index 22e0629..d0c3281 100644
--- a/IvyProbe/IvyProbe.sln
+++ b/IvyProbe/IvyProbe.sln
@@ -1,42 +1,77 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyProbe", "IvyProbe.vcproj", "{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}"

 	ProjectSection(ProjectDependencies) = postProject

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B} = {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E} = {84E0039A-6721-4B18-9792-E9AE4274AC0E}

 	EndProjectSection

 EndProject

-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install", "InstIvy\InstIvy.vdproj", "{61A08759-9E99-481F-811D-204553D27E75}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyProbe", "InstIvy\InstIvy.vdproj", "{61A08759-9E99-481F-811D-204553D27E75}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "..\Ivy\Ivy.vcproj", "{84E0039A-6721-4B18-9792-E9AE4274AC0E}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\..\..\pcre\pcre.vcproj", "{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}"

 EndProject

 Global

 	GlobalSection(SourceCodeControl) = preSolution

-		SccNumberOfProjects = 3

-		SccProjectUniqueName0 = IvyProbe.vcproj

+		SccNumberOfProjects = 5

 		SccLocalPath0 = .

 		CanCheckoutShared = false

-		SccProjectUniqueName1 = InstIvy\\InstIvy.vdproj

-		SccProjectName1 = \u0022$/InstIvyProbe\u0022,\u0020IPFAAAAA

-		SccLocalPath1 = InstIvy

+		SccProjectUniqueName1 = IvyProbe.vcproj

+		SccLocalPath1 = .

 		CanCheckoutShared = false

-		SccLocalPath2 = .

+		SccProjectUniqueName2 = InstIvy\\InstIvy.vdproj

+		SccProjectName2 = \u0022$/Bus/IvyProbe/InstIvyProbe\u0022,\u0020QTFAAAAA

+		SccLocalPath2 = InstIvy

+		CanCheckoutShared = false

+		SccProjectUniqueName3 = ..\\Ivy\\Ivy.vcproj

+		SccProjectName3 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA

+		SccLocalPath3 = ..\\Ivy

+		CanCheckoutShared = false

+		SccProjectUniqueName4 = ..\\..\\..\\pcre\\pcre.vcproj

+		SccProjectName4 = \u0022$/pcre\u0022,\u0020KSHAAAAA

+		SccLocalPath4 = ..\\..\\..\\pcre

 		CanCheckoutShared = false

-		SolutionUniqueID = {CFBC3463-2A25-4A65-99D7-92F0A19DACAB}

-	EndGlobalSection

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

 	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug.ActiveCfg = Debug|Win32

-		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug.Build.0 = Debug|Win32

-		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release.ActiveCfg = Release|Win32

-		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release.Build.0 = Release|Win32

-		{61A08759-9E99-481F-811D-204553D27E75}.Debug.ActiveCfg = Debug

-		{61A08759-9E99-481F-811D-204553D27E75}.Debug.Build.0 = Debug

-		{61A08759-9E99-481F-811D-204553D27E75}.Release.ActiveCfg = Release

-		{61A08759-9E99-481F-811D-204553D27E75}.Release.Build.0 = Release

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|Win32.ActiveCfg = Debug|x64

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|Win32.Build.0 = Debug|x64

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|x64.ActiveCfg = Debug|x64

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug|x64.Build.0 = Debug|x64

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|Win32.ActiveCfg = Release|Win32

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|Win32.Build.0 = Release|Win32

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|x64.ActiveCfg = Release|x64

+		{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release|x64.Build.0 = Release|x64

+		{61A08759-9E99-481F-811D-204553D27E75}.Debug|Win32.ActiveCfg = Debug

+		{61A08759-9E99-481F-811D-204553D27E75}.Debug|x64.ActiveCfg = Debug

+		{61A08759-9E99-481F-811D-204553D27E75}.Release|Win32.ActiveCfg = Release

+		{61A08759-9E99-481F-811D-204553D27E75}.Release|Win32.Build.0 = Release

+		{61A08759-9E99-481F-811D-204553D27E75}.Release|x64.ActiveCfg = Release

+		{61A08759-9E99-481F-811D-204553D27E75}.Release|x64.Build.0 = Release

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.ActiveCfg = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|Win32.Build.0 = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.ActiveCfg = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Debug|x64.Build.0 = Debug|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.ActiveCfg = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|Win32.Build.0 = Release|Win32

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.ActiveCfg = Release|x64

+		{84E0039A-6721-4B18-9792-E9AE4274AC0E}.Release|x64.Build.0 = Release|x64

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|Win32.Build.0 = Debug|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.ActiveCfg = Debug|x64

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Debug|x64.Build.0 = Debug|x64

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.ActiveCfg = Release|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|Win32.Build.0 = Release|Win32

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.ActiveCfg = Release|x64

+		{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/IvyProbe/res/IvyProbe.manifest b/IvyProbe/res/IvyProbe.manifest
index 752fcd2..ab50a31 100644
--- a/IvyProbe/res/IvyProbe.manifest
+++ b/IvyProbe/res/IvyProbe.manifest
@@ -6,7 +6,7 @@
     processorArchitecture="x86" 

     version="5.1.0.0"

     type="win32"

-    name="IvyProbe

+    name="IvyProbe
     <description>IvyProbe Application</description>

     <dependency>

     <dependentAssembly>

diff --git a/comIvy/InstComIvy/InstComIvy.vdproj b/comIvy/InstComIvy/InstComIvy.vdproj
index c60e66b..4358607 100644
--- a/comIvy/InstComIvy/InstComIvy.vdproj
+++ b/comIvy/InstComIvy/InstComIvy.vdproj
@@ -1,13 +1,13 @@
 "DeployProject"

 {

-"VSVersion" = "3:700"

-"ProjectType" = "8:{5443560c-dbb4-11d2-8724-00a0c9a8b90c}"

+"VSVersion" = "3:701"

+"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}"

 "IsWebType" = "8:FALSE"

-"ProjectName" = "8:InstComIvy"

+"ProjectName" = "8:Install"

 "LanguageId" = "3:1036"

 "CodePage" = "3:1252"

 "UILanguageId" = "3:1036"

-"SccProjectName" = "8:\"$/Bus/Install/InstComIvy\", BREAAAAA"

+"SccProjectName" = "8:\"$/Bus/comIvy/InstComIvy\", GUFAAAAA"

 "SccLocalPath" = "8:."

 "SccAuxPath" = "8:"

 "SccProvider" = "8:MSSCCI:Microsoft Visual SourceSafe"

@@ -15,27 +15,21 @@
     {

         "Entry"

         {

-        "MsmKey" = "8:_0AD2E46EB65340B1AB9CC25A71562F9C"

-        "OwnerKey" = "8:_UNDEFINED"

-        "MsmSig" = "8:C:\\USERS\\FCOLIN\\PROGRAM FILES\\DEBUG\\COMIVY.DLL"

-        }

-        "Entry"

-        {

-        "MsmKey" = "8:_12835B5401EE632F407FC85D9BC4D0EC"

-        "OwnerKey" = "8:_0AD2E46EB65340B1AB9CC25A71562F9C"

-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"

+        "MsmKey" = "8:_00FEB1EC35BD4FA3BD5B480C865A3EDD"

+        "OwnerKey" = "8:_1B9A5E9380B449948AD0D41798E918C1"

+        "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_934A60A38A51557A21D7C7D911E7CEB1"

-        "OwnerKey" = "8:_0AD2E46EB65340B1AB9CC25A71562F9C"

-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\IVY.DLL"

+        "MsmKey" = "8:_1B9A5E9380B449948AD0D41798E918C1"

+        "OwnerKey" = "8:_UNDEFINED"

+        "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_FE202B4CAE9589180F3BC6586E6389B6"

-        "OwnerKey" = "8:_0AD2E46EB65340B1AB9CC25A71562F9C"

-        "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"

+        "MsmKey" = "8:_629B99F3B22643E89CEFF6406E69F1EC"

+        "OwnerKey" = "8:_1B9A5E9380B449948AD0D41798E918C1"

+        "MsmSig" = "8:_UNDEFINED"

         }

     }

     "Configurations"

@@ -61,7 +55,7 @@
         "DisplayName" = "8:Release"

         "IsDebugOnly" = "11:FALSE"

         "IsReleaseOnly" = "11:TRUE"

-        "OutputFilename" = "8:Release\\InstComIvy.msi"

+        "OutputFilename" = "8:..\\..\\..\\..\\Install\\ComIvy.msi"

         "PackageFilesAs" = "3:2"

         "PackageFileSize" = "3:-2147483648"

         "CabType" = "3:1"

@@ -70,7 +64,7 @@
         "CertificateFile" = "8:"

         "PrivateKeyFile" = "8:"

         "TimeStampServer" = "8:"

-        "InstallerBootstrapper" = "3:2"

+        "InstallerBootstrapper" = "3:1"

         }

     }

     "Deployable"

@@ -84,81 +78,24 @@
         "Title" = "8:"

         "Description" = "8:"

         }

+        "ExternalPersistence"

+        {

+            "LaunchCondition"

+            {

+            }

+        }

         "Feature"

         {

         }

         "File"

         {

-            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_12835B5401EE632F407FC85D9BC4D0EC"

-            {

-            "Signature" = "8:20000000a04c53fed195c10125e51635ed6ac201a04c53fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"

-            "SourcePath" = "8:MSVCR70D.dll"

-            "TargetName" = "8:MSVCR70D.dll"

-            "Tag" = "8:"

-            "Folder" = "8:_4A020A91D793427C9F8AC28A4383C66D"

-            "Condition" = "8:"

-            "Transitive" = "11:FALSE"

-            "Vital" = "11:TRUE"

-            "ReadOnly" = "11:FALSE"

-            "Hidden" = "11:FALSE"

-            "System" = "11:FALSE"

-            "Permanent" = "11:FALSE"

-            "SharedLegacy" = "11:FALSE"

-            "PackageAs" = "3:1"

-            "Register" = "3:1"

-            "Exclude" = "11:FALSE"

-            "IsDependency" = "11:TRUE"

-            "IsolateTo" = "8:"

-            }

-            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_934A60A38A51557A21D7C7D911E7CEB1"

-            {

-            "Signature" = "8:2000000067a22599ad60c201cb821435ed6ac2018f5ce7609122c2010000000000d0020000000000000000004900760079002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"

-            "SourcePath" = "8:Ivy.dll"

-            "TargetName" = "8:Ivy.dll"

-            "Tag" = "8:"

-            "Folder" = "8:_4A020A91D793427C9F8AC28A4383C66D"

-            "Condition" = "8:"

-            "Transitive" = "11:FALSE"

-            "Vital" = "11:TRUE"

-            "ReadOnly" = "11:FALSE"

-            "Hidden" = "11:FALSE"

-            "System" = "11:FALSE"

-            "Permanent" = "11:FALSE"

-            "SharedLegacy" = "11:FALSE"

-            "PackageAs" = "3:1"

-            "Register" = "3:1"

-            "Exclude" = "11:FALSE"

-            "IsDependency" = "11:TRUE"

-            "IsolateTo" = "8:"

-            }

-            "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_FE202B4CAE9589180F3BC6586E6389B6"

-            {

-            "Signature" = "8:2000000090c39d10d295c101cb821435ed6ac20190c39d10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"

-            "SourcePath" = "8:MSVCP70D.dll"

-            "TargetName" = "8:MSVCP70D.dll"

-            "Tag" = "8:"

-            "Folder" = "8:_4A020A91D793427C9F8AC28A4383C66D"

-            "Condition" = "8:"

-            "Transitive" = "11:FALSE"

-            "Vital" = "11:TRUE"

-            "ReadOnly" = "11:FALSE"

-            "Hidden" = "11:FALSE"

-            "System" = "11:FALSE"

-            "Permanent" = "11:FALSE"

-            "SharedLegacy" = "11:FALSE"

-            "PackageAs" = "3:1"

-            "Register" = "3:1"

-            "Exclude" = "11:FALSE"

-            "IsDependency" = "11:TRUE"

-            "IsolateTo" = "8:"

-            }

         }

         "FileType"

         {

         }

         "Folder"

         {

-            "{777C097F-0ED8-11D3-8D6C-00A0C9CFCEE6}:_2B2C6B0DF8CC40A8A8E2DFA350230B5A"

+            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_2B2C6B0DF8CC40A8A8E2DFA350230B5A"

             {

             "Name" = "8:#1914"

             "AlwaysCreate" = "11:FALSE"

@@ -169,7 +106,7 @@
                 {

                 }

             }

-            "{EE62640D-12F2-11D3-8D6C-00A0C9CFCEE6}:_4A020A91D793427C9F8AC28A4383C66D"

+            "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_4A020A91D793427C9F8AC28A4383C66D"

             {

             "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"

             "Name" = "8:#1925"

@@ -181,7 +118,7 @@
                 {

                 }

             }

-            "{777C097F-0ED8-11D3-8D6C-00A0C9CFCEE6}:_7D7E3CB3F86A42B3B3329BBD1CE04868"

+            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_7D7E3CB3F86A42B3B3329BBD1CE04868"

             {

             "Name" = "8:#1919"

             "AlwaysCreate" = "11:FALSE"

@@ -192,7 +129,7 @@
                 {

                 }

             }

-            "{777C097F-0ED8-11D3-8D6C-00A0C9CFCEE6}:_AC61AE0B941E4CD38DF1BACE585642DF"

+            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_AC61AE0B941E4CD38DF1BACE585642DF"

             {

             "Name" = "8:#1916"

             "AlwaysCreate" = "11:FALSE"

@@ -210,11 +147,34 @@
         "Locator"

         {

         }

-        "Shortcut"

+        "MsiBootstrapper"

         {

+        "LangId" = "3:1036"

         }

-        "Sequences"

+        "Product"

         {

+        "Name" = "8:Microsoft Visual Studio"

+        "ProductName" = "8:ComIvy"

+        "ProductCode" = "8:{98F05275-9FE2-4613-81CD-EEF6C529F63E}"

+        "PackageCode" = "8:{5D1463E7-A235-4607-9A46-1E178ABD0419}"

+        "UpgradeCode" = "8:{1CC5F500-0E3C-401C-B711-3779A4175563}"

+        "RestartWWWService" = "11:FALSE"

+        "RemovePreviousVersions" = "11:TRUE"

+        "DetectNewerInstalledVersion" = "11:TRUE"

+        "ProductVersion" = "8:1.0.0"

+        "Manufacturer" = "8:CENA PII"

+        "ARPHELPTELEPHONE" = "8:"

+        "ARPHELPLINK" = "8:"

+        "Title" = "8:ComIvy"

+        "Subject" = "8:"

+        "ARPCONTACT" = "8:CENA PII"

+        "Keywords" = "8:ivy"

+        "ARPCOMMENTS" = "8:"

+        "ARPURLINFOABOUT" = "8:"

+        "ARPPRODUCTICON" = "8:"

+        "ARPIconIndex" = "3:0"

+        "SearchPath" = "8:"

+        "UseSystemSearchPath" = "11:TRUE"

         }

         "Registry"

         {

@@ -222,7 +182,7 @@
             {

                 "Keys"

                 {

-                    "{7DF0CD0A-FF27-11D2-8D6B-00A0C9CFCEE6}:_2FDB08C375C6438FAE11F0738723CB2E"

+                    "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_2FDB08C375C6438FAE11F0738723CB2E"

                     {

                     "Name" = "8:Software"

                     "Condition" = "8:"

@@ -231,7 +191,7 @@
                     "Transitive" = "11:FALSE"

                         "Keys"

                         {

-                            "{7DF0CD0A-FF27-11D2-8D6B-00A0C9CFCEE6}:_13AAE11CAFAC4AB5A4C243704796602D"

+                            "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_13AAE11CAFAC4AB5A4C243704796602D"

                             {

                             "Name" = "8:[Manufacturer]"

                             "Condition" = "8:"

@@ -256,7 +216,7 @@
             {

                 "Keys"

                 {

-                    "{7DF0CD0A-FF27-11D2-8D6B-00A0C9CFCEE6}:_75218A37922A4FDC92FDE12416943003"

+                    "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_75218A37922A4FDC92FDE12416943003"

                     {

                     "Name" = "8:Software"

                     "Condition" = "8:"

@@ -265,7 +225,7 @@
                     "Transitive" = "11:FALSE"

                         "Keys"

                         {

-                            "{7DF0CD0A-FF27-11D2-8D6B-00A0C9CFCEE6}:_AA4D0D6AAF5B43018DC02B4B152AB69C"

+                            "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_AA4D0D6AAF5B43018DC02B4B152AB69C"

                             {

                             "Name" = "8:[Manufacturer]"

                             "Condition" = "8:"

@@ -305,87 +265,28 @@
                 }

             }

         }

-        "ProjectOutput"

-        {

-            "{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_0AD2E46EB65340B1AB9CC25A71562F9C"

-            {

-            "SourcePath" = "8:..\\..\\Program Files\\Debug\\comIvy.dll"

-            "TargetName" = "8:"

-            "Tag" = "8:"

-            "Folder" = "8:_4A020A91D793427C9F8AC28A4383C66D"

-            "Condition" = "8:"

-            "Transitive" = "11:FALSE"

-            "Vital" = "11:TRUE"

-            "ReadOnly" = "11:FALSE"

-            "Hidden" = "11:FALSE"

-            "System" = "11:FALSE"

-            "Permanent" = "11:FALSE"

-            "SharedLegacy" = "11:FALSE"

-            "PackageAs" = "3:1"

-            "Register" = "3:1"

-            "Exclude" = "11:FALSE"

-            "IsDependency" = "11:FALSE"

-            "IsolateTo" = "8:"

-            "ProjectOutputGroupRegister" = "3:1"

-            "OutputConfiguration" = "8:"

-            "OutputGroupCanonicalName" = "8:Built"

-            "OutputProjectCanonicalName" = "8:..\\..\\C++\\Bus\\comIvy\\comIvy.vcproj"

-            "OutputProjectGuid" = "8:{2AF2B2E6-446C-4B06-B175-E221F6ABA5BA}"

-            "ShowKeyOutput" = "11:TRUE"

-                "ExcludeFilters"

-                {

-                }

-            }

-        }

-        "Product"

-        {

-        "Name" = "8:Microsoft Visual Studio"

-        "ProductName" = "8:ComIvy"

-        "ProductCode" = "8:{98F05275-9FE2-4613-81CD-EEF6C529F63E}"

-        "PackageCode" = "8:{A213362A-059D-4BA0-BC7A-5C2E268D2D53}"

-        "UpgradeCode" = "8:{1CC5F500-0E3C-401C-B711-3779A4175563}"

-        "RestartWWWService" = "11:FALSE"

-        "RemovePreviousVersions" = "11:TRUE"

-        "DetectNewerInstalledVersion" = "11:TRUE"

-        "ProductVersion" = "8:1.0.0"

-        "Manufacturer" = "8:CENA"

-        "ARPHELPTELEPHONE" = "8:"

-        "ARPHELPLINK" = "8:"

-        "Title" = "8:ComIvy"

-        "Subject" = "8:"

-        "ARPCONTACT" = "8:CENA"

-        "Keywords" = "8:ivy"

-        "ARPCOMMENTS" = "8:"

-        "ARPURLINFOABOUT" = "8:"

-        "ARPPRODUCTICON" = "8:"

-        "ARPIconIndex" = "3:0"

-        "SearchPath" = "8:"

-        "UseSystemSearchPath" = "11:TRUE"

-        }

-        "MsiBootstrapper"

+        "Sequences"

         {

-        "LangId" = "3:1036"

         }

-        "MergeModule"

+        "Shortcut"

         {

         }

         "UserInterface"

         {

-            "{7DFFC192-4ABE-11D3-8D78-00A0C9CFCEE6}:_0AF82025022F4FE2A8F1E3A673758673"

+            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_0AF82025022F4FE2A8F1E3A673758673"

             {

             "Name" = "8:#1901"

             "Sequence" = "3:2"

             "Attributes" = "3:2"

                 "Dialogs"

                 {

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_FD4410F630FA43FC8AA03D3D7594B41D"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_FD4410F630FA43FC8AA03D3D7594B41D"

                     {

                     "Sequence" = "3:100"

                     "DisplayName" = "8:Progression"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.EE9A1AFA_41DD_4514_B727_DF0ACA1D7389"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -416,35 +317,32 @@
                     }

                 }

             }

-            "{E4ECAB26-4AB7-11D3-8D78-00A0C9CFCEE6}:_129E7AE713AC4C17BEECD56D1E198B66"

+            "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_129E7AE713AC4C17BEECD56D1E198B66"

             {

             "UseDynamicProperties" = "11:FALSE"

             "IsDependency" = "11:FALSE"

             "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"

-            "ModuleSignature" = "8:VsdDialogs.CE4B864F_F1C1_4B85_98D4_2A2BF5FFB12B"

             }

-            "{E4ECAB26-4AB7-11D3-8D78-00A0C9CFCEE6}:_24107971CF6D42708AA7AA90DFE10276"

+            "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_24107971CF6D42708AA7AA90DFE10276"

             {

             "UseDynamicProperties" = "11:FALSE"

             "IsDependency" = "11:FALSE"

             "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"

-            "ModuleSignature" = "8:VsdUserInterface.524F4245_5254_5341_4C45_534153783400"

             }

-            "{7DFFC192-4ABE-11D3-8D78-00A0C9CFCEE6}:_6E6D9BBB04FE46EE874BDB0FF61E27CC"

+            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_6E6D9BBB04FE46EE874BDB0FF61E27CC"

             {

             "Name" = "8:#1900"

             "Sequence" = "3:1"

             "Attributes" = "3:1"

                 "Dialogs"

                 {

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_7C1DEC913F4B46DD96E3FAB2F4F579C3"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_7C1DEC913F4B46DD96E3FAB2F4F579C3"

                     {

                     "Sequence" = "3:300"

                     "DisplayName" = "8:Confirmer l'installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.6DBC9783_3677_4D68_8BF5_D749558A0AC1"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -460,14 +358,13 @@
                             }

                         }

                     }

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_9CD75890130542FAA362099A62112D09"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_9CD75890130542FAA362099A62112D09"

                     {

                     "Sequence" = "3:100"

                     "DisplayName" = "8:Bienvenue"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.68F69290_BB7C_474E_A153_6679845F3DDF"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -509,14 +406,13 @@
                             }

                         }

                     }

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_D9102667BB724BC69AF9472B42650AD2"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_D9102667BB724BC69AF9472B42650AD2"

                     {

                     "Sequence" = "3:200"

                     "DisplayName" = "8:Dossier d'installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.C113BC36_2532_4D45_8099_4818B1133B2F"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -534,21 +430,20 @@
                     }

                 }

             }

-            "{7DFFC192-4ABE-11D3-8D78-00A0C9CFCEE6}:_71470E202AE748CD99FFF0D17C56201C"

+            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_71470E202AE748CD99FFF0D17C56201C"

             {

             "Name" = "8:#1900"

             "Sequence" = "3:2"

             "Attributes" = "3:1"

                 "Dialogs"

                 {

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_590850FBC5504ACA95B9E94E1D44BF4F"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_590850FBC5504ACA95B9E94E1D44BF4F"

                     {

                     "Sequence" = "3:100"

                     "DisplayName" = "8:Bienvenue"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.E35A0E2C_F131_4B57_B946_59A1A2A8F45F"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -590,14 +485,13 @@
                             }

                         }

                     }

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_A61E972000094EEFBC09395782DA8464"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A61E972000094EEFBC09395782DA8464"

                     {

                     "Sequence" = "3:200"

                     "DisplayName" = "8:Dossier d'installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.2DED2424_5429_4616_A1AD_4D62837C2ADA"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -613,14 +507,13 @@
                             }

                         }

                     }

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_BE6B88D7DEE9408BB26C265CFD829904"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_BE6B88D7DEE9408BB26C265CFD829904"

                     {

                     "Sequence" = "3:300"

                     "DisplayName" = "8:Confirmer l'installation"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.FA58E60A_A1E8_4876_95FC_2AC3B5AAA5F8"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -638,21 +531,20 @@
                     }

                 }

             }

-            "{7DFFC192-4ABE-11D3-8D78-00A0C9CFCEE6}:_C054A861FB4045FCB7E4ECF2F8A08FCF"

+            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_C054A861FB4045FCB7E4ECF2F8A08FCF"

             {

             "Name" = "8:#1901"

             "Sequence" = "3:1"

             "Attributes" = "3:2"

                 "Dialogs"

                 {

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_3502006AE0EA4610A262A78C3B5A5E3F"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_3502006AE0EA4610A262A78C3B5A5E3F"

                     {

                     "Sequence" = "3:100"

                     "DisplayName" = "8:Progression"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.4FB12620_0D15_42D0_8677_2766FFA6923F"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -683,21 +575,20 @@
                     }

                 }

             }

-            "{7DFFC192-4ABE-11D3-8D78-00A0C9CFCEE6}:_C0CEC7F0A6664EC89F166F25CB58AC86"

+            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_C0CEC7F0A6664EC89F166F25CB58AC86"

             {

             "Name" = "8:#1902"

             "Sequence" = "3:2"

             "Attributes" = "3:3"

                 "Dialogs"

                 {

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_9901D05D1778445B8CD9C771104EE79F"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_9901D05D1778445B8CD9C771104EE79F"

                     {

                     "Sequence" = "3:100"

                     "DisplayName" = "8:Terminé"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.83D22742_1B79_46f6_9A99_DF0F2BD4C077"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -715,21 +606,20 @@
                     }

                 }

             }

-            "{7DFFC192-4ABE-11D3-8D78-00A0C9CFCEE6}:_F502D320A6784BF3B2C2652D56FC874E"

+            "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_F502D320A6784BF3B2C2652D56FC874E"

             {

             "Name" = "8:#1902"

             "Sequence" = "3:1"

             "Attributes" = "3:3"

                 "Dialogs"

                 {

-                    "{E4ECAB24-4AB7-11D3-8D78-00A0C9CFCEE6}:_D583508A58C243DE96769081E91585F7"

+                    "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_D583508A58C243DE96769081E91585F7"

                     {

                     "Sequence" = "3:100"

                     "DisplayName" = "8:Terminé"

                     "UseDynamicProperties" = "11:TRUE"

                     "IsDependency" = "11:FALSE"

                     "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"

-                    "ModuleSignature" = "8:VsdDialogs.1DB77F5A_BA5C_4470_89B6_0B0EC07E3A10"

                         "Properties"

                         {

                             "BannerBitmap"

@@ -743,10 +633,88 @@
                             "Setting" = "3:1"

                             "UsePlugInResources" = "11:TRUE"

                             }

+                            "UpdateText"

+                            {

+                            "Name" = "8:UpdateText"

+                            "DisplayName" = "8:#1058"

+                            "Description" = "8:#1158"

+                            "Type" = "3:15"

+                            "ContextData" = "8:"

+                            "Attributes" = "3:0"

+                            "Setting" = "3:1"

+                            "Value" = "8:#1258"

+                            "DefaultValue" = "8:#1258"

+                            "UsePlugInResources" = "11:TRUE"

+                            }

                         }

                     }

                 }

             }

         }

+        "MergeModule"

+        {

+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_00FEB1EC35BD4FA3BD5B480C865A3EDD"

+            {

+            "UseDynamicProperties" = "11:TRUE"

+            "IsDependency" = "11:TRUE"

+            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"

+                "Properties"

+                {

+                }

+            "LanguageId" = "3:0"

+            "Exclude" = "11:FALSE"

+            "Folder" = "8:"

+            "Feature" = "8:"

+            "IsolateTo" = "8:"

+            }

+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_629B99F3B22643E89CEFF6406E69F1EC"

+            {

+            "UseDynamicProperties" = "11:TRUE"

+            "IsDependency" = "11:TRUE"

+            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"

+                "Properties"

+                {

+                }

+            "LanguageId" = "3:0"

+            "Exclude" = "11:FALSE"

+            "Folder" = "8:"

+            "Feature" = "8:"

+            "IsolateTo" = "8:"

+            }

+        }

+        "ProjectOutput"

+        {

+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_1B9A5E9380B449948AD0D41798E918C1"

+            {

+            "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Release\\comIvy.dll"

+            "TargetName" = "8:"

+            "Tag" = "8:"

+            "Folder" = "8:_4A020A91D793427C9F8AC28A4383C66D"

+            "Condition" = "8:"

+            "Transitive" = "11:FALSE"

+            "Vital" = "11:TRUE"

+            "ReadOnly" = "11:FALSE"

+            "Hidden" = "11:FALSE"

+            "System" = "11:FALSE"

+            "Permanent" = "11:FALSE"

+            "SharedLegacy" = "11:FALSE"

+            "PackageAs" = "3:1"

+            "Register" = "3:1"

+            "Exclude" = "11:FALSE"

+            "IsDependency" = "11:FALSE"

+            "IsolateTo" = "8:"

+            "ProjectOutputGroupRegister" = "3:1"

+            "OutputConfiguration" = "8:"

+            "OutputGroupCanonicalName" = "8:Built"

+            "OutputProjectGuid" = "8:{561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}"

+            "ShowKeyOutput" = "11:TRUE"

+                "ExcludeFilters"

+                {

+                }

+            }

+        }

+        "VJSharpPlugin"

+        {

+        }

     }

 }

diff --git a/comIvy/comIvy.sln b/comIvy/comIvy.sln
index 3862005..c7ca002 100644
--- a/comIvy/comIvy.sln
+++ b/comIvy/comIvy.sln
@@ -1,39 +1,51 @@
-Microsoft Visual Studio Solution File, Format Version 7.00

+Microsoft Visual Studio Solution File, Format Version 8.00

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comIvy", "comIvy.vcproj", "{561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}"

+	ProjectSection(ProjectDependencies) = postProject

+		{9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comIvyPS", "comIvyPS.vcproj", "{2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}"

+	ProjectSection(ProjectDependencies) = postProject

+		{561E32B8-AF2E-4BA4-8D1D-159CC71E2C90} = {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "..\Ivy\Ivy.vcproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install", "Install\Install.vdproj", "{37BC8B64-48B5-4A9E-945C-225AA6BB591C}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

 EndProject

 Global

 	GlobalSection(SourceCodeControl) = preSolution

-		SccNumberOfProjects = 4

-		SccProjectUniqueName0 = ..\\Ivy\\Ivy.vcproj

-		SccProjectName0 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA

-		SccLocalPath0 = ..\\Ivy

+		SccNumberOfProjects = 5

+		SccProjectName0 = \u0022$/Bus\u0022,\u0020ZOBAAAAA

+		SccLocalPath0 = ..

+		SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

 		CanCheckoutShared = false

-		SccProjectUniqueName1 = comIvy.vcproj

-		SccLocalPath1 = ..

+		SccProjectFilePathRelativizedFromConnection0 = comIvy\\

+		SolutionUniqueID = {0D33DAE6-8F43-4549-9070-01A6DB7794D4}

+		SccProjectUniqueName1 = ..\\Ivy\\Ivy.vcproj

+		SccProjectName1 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA

+		SccLocalPath1 = ..\\Ivy

 		CanCheckoutShared = false

-		SccProjectFilePathRelativizedFromConnection1 = comIvy\\

-		SccProjectName2 = \u0022$/Bus\u0022,\u0020ZOBAAAAA

+		SccProjectUniqueName2 = comIvy.vcproj

 		SccLocalPath2 = ..

-		SccProvider2 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe

 		CanCheckoutShared = false

 		SccProjectFilePathRelativizedFromConnection2 = comIvy\\

-		SolutionUniqueID = {0D33DAE6-8F43-4549-9070-01A6DB7794D4}

 		SccProjectUniqueName3 = comIvyPS.vcproj

 		SccLocalPath3 = ..

 		CanCheckoutShared = false

 		SccProjectFilePathRelativizedFromConnection3 = comIvy\\

+		SccProjectUniqueName4 = Install\\Install.vdproj

+		SccLocalPath4 = ..

+		CanCheckoutShared = false

+		SccProjectFilePathRelativizedFromConnection4 = comIvy\\Install\\

 	EndGlobalSection

 	GlobalSection(SolutionConfiguration) = preSolution

-		ConfigName.0 = Debug

-		ConfigName.1 = Release

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-		{561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.0 = {9818D652-CC05-463E-880D-AFCA2C7BFABE}

-		{2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}.0 = {561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}

+		Debug = Debug

+		Release = Release

 	EndGlobalSection

 	GlobalSection(ProjectConfiguration) = postSolution

 		{561E32B8-AF2E-4BA4-8D1D-159CC71E2C90}.Debug.ActiveCfg = Debug|Win32

@@ -46,6 +58,9 @@ Global
 		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Debug.Build.0 = Debug|Win32

 		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release.ActiveCfg = Release|Win32

 		{9818D652-CC05-463E-880D-AFCA2C7BFABE}.Release.Build.0 = Release|Win32

+		{37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Debug.ActiveCfg = Debug

+		{37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release.ActiveCfg = Release

+		{37BC8B64-48B5-4A9E-945C-225AA6BB591C}.Release.Build.0 = Release

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/comIvy/comIvyPS.vcproj b/comIvy/comIvyPS.vcproj
index e0695a6..ed45cc0 100644
--- a/comIvy/comIvyPS.vcproj
+++ b/comIvy/comIvyPS.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

+<?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.00"

+	Version="7.10"

 	Name="comIvyPS"

 	ProjectGUID="{2518DFBB-6692-4F0C-8020-1DEEC95A5EC1}"

 	SccProjectName="&quot;$/Bus&quot;, ZOBAAAAA"

@@ -21,7 +21,7 @@
 			ConfigurationType="2">

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;REGISTER_PROXY_DLL;_DEBUG"

+				PreprocessorDefinitions="WIN32;REGISTER_PROXY_DLL;_DEBUG"

 				RuntimeLibrary="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

@@ -50,7 +50,13 @@ Exit 1
 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

 				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

@@ -60,7 +66,7 @@ Exit 1
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="3"

-				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0400;REGISTER_PROXY_DLL;NDEBUG"

+				PreprocessorDefinitions="WIN32;REGISTER_PROXY_DLL;NDEBUG"

 				RuntimeLibrary="2"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

@@ -91,9 +97,17 @@ Exit 1
 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

 				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

 		</Configuration>

 	</Configurations>

+	<References>

+	</References>

 	<Files>

 		<Filter

 			Name="Source Files"