mise en conformité de la reponse au Ping avec les autres implementations

7 files changed, 93 insertions, 52 deletions

diff --git a/Ivy/InstIvyDev/InstIvyDev.vdproj b/Ivy/InstIvyDev/InstIvyDev.vdproj
index 2b5f728..712f9e7 100644
--- a/Ivy/InstIvyDev/InstIvyDev.vdproj
+++ b/Ivy/InstIvyDev/InstIvyDev.vdproj
@@ -15,8 +15,8 @@
     {

         "Entry"

         {

-        "MsmKey" = "8:_1298CF5A881747EFB48A4D77E2F769D6"

-        "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"

+        "MsmKey" = "8:_1AE1D84826D24DC7B33AF5BEFFCCFF51"

+        "OwnerKey" = "8:_D7957F7601464B0DA7AAC18E7F515ABA"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

@@ -45,40 +45,40 @@
         }

         "Entry"

         {

+        "MsmKey" = "8:_B0DB2D5F65614F36A703117E53733095"

+        "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"

+        "MsmSig" = "8:_UNDEFINED"

+        }

+        "Entry"

+        {

         "MsmKey" = "8:_B656C8E7B4C5444BB7CAA2BB82B22DEB"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_E6EB9EFA5AEA4E82938E4187FA8888A9"

-        "OwnerKey" = "8:_EB7D6BBAF6774BF8B850873EB41F08FE"

+        "MsmKey" = "8:_C7EE9D7467C54948923A98DD9F6962F4"

+        "OwnerKey" = "8:_B0DB2D5F65614F36A703117E53733095"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_EB7D6BBAF6774BF8B850873EB41F08FE"

+        "MsmKey" = "8:_D7957F7601464B0DA7AAC18E7F515ABA"

         "OwnerKey" = "8:_32C90C9C8FC242AE9C65DA1C92DA2700"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_EB7D6BBAF6774BF8B850873EB41F08FE"

+        "MsmKey" = "8:_D7957F7601464B0DA7AAC18E7F515ABA"

         "OwnerKey" = "8:_587183B52DD64752997FFA522BC57D0A"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_EB7D6BBAF6774BF8B850873EB41F08FE"

+        "MsmKey" = "8:_D7957F7601464B0DA7AAC18E7F515ABA"

         "OwnerKey" = "8:_3B5C053C16CE42B2810E6471B5EBFDBD"

         "MsmSig" = "8:_UNDEFINED"

         }

-        "Entry"

-        {

-        "MsmKey" = "8:_F906AF0444D847F0BB8D59DBD2CF9001"

-        "OwnerKey" = "8:_1298CF5A881747EFB48A4D77E2F769D6"

-        "MsmSig" = "8:_UNDEFINED"

-        }

     }

     "Configurations"

     {

@@ -87,7 +87,7 @@
         "DisplayName" = "8:Debug"

         "IsDebugOnly" = "11:TRUE"

         "IsReleaseOnly" = "11:FALSE"

-        "OutputFilename" = "8:Debug\\InstIvyDev.msi"

+        "OutputFilename" = "8:Debug\\InstallIvyDevelx86.msi"

         "PackageFilesAs" = "3:2"

         "PackageFileSize" = "3:-2147483648"

         "CabType" = "3:1"

@@ -285,20 +285,20 @@
         {

         "Name" = "8:Microsoft Visual Studio"

         "ProductName" = "8:InstallIvyDev"

-        "ProductCode" = "8:{7169891B-EAF2-442A-AC27-5EDE989C7D68}"

-        "PackageCode" = "8:{46E38AD7-1C14-4399-AC3E-D2A0BC223635}"

+        "ProductCode" = "8:{E3C1699B-99F2-418B-BB42-0DFD5F135216}"

+        "PackageCode" = "8:{E452EC03-E344-4538-89BC-599EB0604486}"

         "UpgradeCode" = "8:{B61AA283-78E2-443D-A093-4D5D6C0B779A}"

         "RestartWWWService" = "11:FALSE"

         "RemovePreviousVersions" = "11:TRUE"

         "DetectNewerInstalledVersion" = "11:TRUE"

         "InstallAllUsers" = "11:TRUE"

-        "ProductVersion" = "8:1.4.2"

-        "Manufacturer" = "8:DTI/R&D"

+        "ProductVersion" = "8:1.4.3"

+        "Manufacturer" = "8:DTI R&D"

         "ARPHELPTELEPHONE" = "8:"

         "ARPHELPLINK" = "8:http://www.tls.cena.fr/products/ivy"

         "Title" = "8:InstallIvyDev"

         "Subject" = "8:Ivy"

-        "ARPCONTACT" = "8:DTI/R&D"

+        "ARPCONTACT" = "8:DTI R&D"

         "Keywords" = "8:Ivy"

         "ARPCOMMENTS" = "8:Ivy Sources and Lib "

         "ARPURLINFOABOUT" = "8:"

@@ -801,11 +801,11 @@
         }

         "MergeModule"

         {

-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1298CF5A881747EFB48A4D77E2F769D6"

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1AE1D84826D24DC7B33AF5BEFFCCFF51"

             {

             "UseDynamicProperties" = "11:TRUE"

             "IsDependency" = "11:TRUE"

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

+            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"

                 "Properties"

                 {

                 }

@@ -815,11 +815,11 @@
             "Feature" = "8:"

             "IsolateTo" = "8:"

             }

-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E6EB9EFA5AEA4E82938E4187FA8888A9"

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B0DB2D5F65614F36A703117E53733095"

             {

             "UseDynamicProperties" = "11:TRUE"

             "IsDependency" = "11:TRUE"

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

+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_MFC_x86.msm"

                 "Properties"

                 {

                 }

@@ -829,11 +829,11 @@
             "Feature" = "8:"

             "IsolateTo" = "8:"

             }

-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EB7D6BBAF6774BF8B850873EB41F08FE"

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C7EE9D7467C54948923A98DD9F6962F4"

             {

             "UseDynamicProperties" = "11:TRUE"

             "IsDependency" = "11:TRUE"

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

+            "SourcePath" = "8:microsoft_vc90_mfc_x86.msm"

                 "Properties"

                 {

                 }

@@ -843,11 +843,11 @@
             "Feature" = "8:"

             "IsolateTo" = "8:"

             }

-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F906AF0444D847F0BB8D59DBD2CF9001"

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D7957F7601464B0DA7AAC18E7F515ABA"

             {

             "UseDynamicProperties" = "11:TRUE"

             "IsDependency" = "11:TRUE"

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

+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"

                 "Properties"

                 {

                 }

diff --git a/Ivy/Ivy.vcproj b/Ivy/Ivy.vcproj
index f547577..e2bcb2b 100644
--- a/Ivy/Ivy.vcproj
+++ b/Ivy/Ivy.vcproj
@@ -380,7 +380,7 @@
 	<References>

 		<ProjectReference

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

-			RelativePathToProject="..\..\..\..\Users\fcolin\Documents\Projects Visual Studio\pcre\pcre.vcproj"

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

 		/>

 	</References>

 	<Files>

diff --git a/Ivy/IvyApplication.cxx b/Ivy/IvyApplication.cxx
index ab0cd9e..7b3cd2f 100644
--- a/Ivy/IvyApplication.cxx
+++ b/Ivy/IvyApplication.cxx
@@ -283,7 +283,7 @@ void IvyApplication::OnReceive(char * line)
 #ifdef IVY_DEBUG

 			TRACE("Ping Message\n");

 #endif //IVY_DEBUG

-			this->SendMsg( Pong, 0, "beurk" );

+			this->SendMsg( Pong, id, arg ); //reply with same id and arg

 			break;

 

 		case Pong:

diff --git a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
index 969c7a9..a36b2cc 100644
--- a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
+++ b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
@@ -15,44 +15,44 @@
     {

         "Entry"

         {

-        "MsmKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"

-        "OwnerKey" = "8:_UNDEFINED"

+        "MsmKey" = "8:_3242670360DB45C0B11B781FBA2B6EA5"

+        "OwnerKey" = "8:_F33F0737CB7D442EBA793478C3AD99C3"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_522624C883B2416AAD0D345280C2CB97"

+        "MsmKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_5A688E16C8FB4F969BAAF36ACF9DE131"

+        "MsmKey" = "8:_522624C883B2416AAD0D345280C2CB97"

         "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_7D62B99A451B4AB2AAFCD611E80C741A"

-        "OwnerKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"

+        "MsmKey" = "8:_5A688E16C8FB4F969BAAF36ACF9DE131"

+        "OwnerKey" = "8:_UNDEFINED"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_7D62B99A451B4AB2AAFCD611E80C741A"

+        "MsmKey" = "8:_8E374943E56221993853F7D9051D7B42"

         "OwnerKey" = "8:_522624C883B2416AAD0D345280C2CB97"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_8E374943E56221993853F7D9051D7B42"

-        "OwnerKey" = "8:_522624C883B2416AAD0D345280C2CB97"

+        "MsmKey" = "8:_F33F0737CB7D442EBA793478C3AD99C3"

+        "OwnerKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"

         "MsmSig" = "8:_UNDEFINED"

         }

         "Entry"

         {

-        "MsmKey" = "8:_92E7CD908F864B6A98B01ABC23963E91"

-        "OwnerKey" = "8:_7D62B99A451B4AB2AAFCD611E80C741A"

+        "MsmKey" = "8:_F33F0737CB7D442EBA793478C3AD99C3"

+        "OwnerKey" = "8:_522624C883B2416AAD0D345280C2CB97"

         "MsmSig" = "8:_UNDEFINED"

         }

     }

@@ -148,7 +148,7 @@
             "SharedLegacy" = "11:FALSE"

             "PackageAs" = "3:1"

             "Register" = "3:1"

-            "Exclude" = "11:FALSE"

+            "Exclude" = "11:TRUE"

             "IsDependency" = "11:TRUE"

             "IsolateTo" = "8:"

             }

@@ -209,7 +209,7 @@
         "Name" = "8:Microsoft Visual Studio"

         "ProductName" = "8:IvyCursor"

         "ProductCode" = "8:{687B5941-010C-4495-94A6-52E0D3331FD7}"

-        "PackageCode" = "8:{18D7DCB8-6F9C-4955-BF45-79F58CDFD0D8}"

+        "PackageCode" = "8:{9F678DD6-2BF7-46EF-92C8-61C718D1BC0A}"

         "UpgradeCode" = "8:{B9048C4D-4B78-4498-8634-FA5726303A10}"

         "RestartWWWService" = "11:FALSE"

         "RemovePreviousVersions" = "11:TRUE"

@@ -752,11 +752,11 @@
         }

         "MergeModule"

         {

-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7D62B99A451B4AB2AAFCD611E80C741A"

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3242670360DB45C0B11B781FBA2B6EA5"

             {

             "UseDynamicProperties" = "11:TRUE"

             "IsDependency" = "11:TRUE"

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

+            "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm"

                 "Properties"

                 {

                 }

@@ -766,11 +766,11 @@
             "Feature" = "8:"

             "IsolateTo" = "8:"

             }

-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_92E7CD908F864B6A98B01ABC23963E91"

+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F33F0737CB7D442EBA793478C3AD99C3"

             {

             "UseDynamicProperties" = "11:TRUE"

             "IsDependency" = "11:TRUE"

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

+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"

                 "Properties"

                 {

                 }

diff --git a/IvyCursor/IvyCursor.cpp b/IvyCursor/IvyCursor.cpp
index 2a018cf..5b1a3d4 100644
--- a/IvyCursor/IvyCursor.cpp
+++ b/IvyCursor/IvyCursor.cpp
@@ -129,6 +129,47 @@ void ivyPointerEvent(IvyApplication *app, void *user_data, int argc, const char
     

    

 }

+UINT TabletToMouseButton( int button , bool down )

+{

+	UINT mouse_bttton;

+	if ( down )

+	{

+		switch ( button )

+		{

+		case 1:

+			mouse_bttton = MOUSEEVENTF_LEFTDOWN;

+			break;

+		case 2:

+			mouse_bttton = MOUSEEVENTF_MIDDLEDOWN;

+			break;

+		case 3:

+			mouse_bttton = MOUSEEVENTF_RIGHTDOWN;

+			break;

+		default:

+			mouse_bttton = MOUSEEVENTF_LEFTDOWN;

+			break;

+		}

+	}

+	else

+	{

+		switch ( button )

+		{

+		case 1:

+			mouse_bttton = MOUSEEVENTF_LEFTUP;

+			break;

+		case 2:

+			mouse_bttton = MOUSEEVENTF_MIDDLEUP;

+			break;

+		case 3:

+			mouse_bttton = MOUSEEVENTF_RIGHTUP;

+			break;

+		default:

+			mouse_bttton = MOUSEEVENTF_LEFTUP;

+			break;

+		}

+	}

+	return button;

+}

 void ivyButtonEvent(IvyApplication *app, void *user_data, int argc, const char **argv)

 {

 	static int bt_down = 0;

@@ -149,6 +190,7 @@ void ivyButtonEvent(IvyApplication *app, void *user_data, int argc, const char *
 	double hires_y = atof(*argv++);

 	const char *proximity = *argv++; // (In|Out|unchanged)

 	

+	

 	// hack for tablet PC

 	if ( serial_number ==0 )

 	{

@@ -159,7 +201,7 @@ void ivyButtonEvent(IvyApplication *app, void *user_data, int argc, const char *
 	{

 		if ( *status == 'u' && bt_down )

 		{

-			SendInput ( MOUSEEVENTF_LEFTUP, hires_x, hires_y , wheel );

+			SendInput ( TabletToMouseButton( button,false ), hires_x, hires_y , wheel );

 			bt_down = 0;

 		}

 		

@@ -168,12 +210,12 @@ void ivyButtonEvent(IvyApplication *app, void *user_data, int argc, const char *
 	{

 	if ( (*status) == 'd' )

 	{

-	SendInput ( MOUSEEVENTF_WHEEL | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_LEFTDOWN , hires_x, hires_y , wheel );

+	SendInput ( MOUSEEVENTF_WHEEL | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | TabletToMouseButton( button,true ) , hires_x, hires_y , wheel );

 	bt_down = 1;

 	}

 	else

 	{

-	SendInput ( MOUSEEVENTF_WHEEL | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_LEFTUP , hires_x, hires_y , wheel );

+	SendInput ( MOUSEEVENTF_WHEEL | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | TabletToMouseButton( button,false ) , hires_x, hires_y , wheel );

 	bt_down = 0;

 	}

 	}

diff --git a/IvyProbe/IvyProbe.sln b/IvyProbe/IvyProbe.sln
index d0c3281..134b344 100644
--- a/IvyProbe/IvyProbe.sln
+++ b/IvyProbe/IvyProbe.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

 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}

diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj
index 2698f40..6296903 100644
--- a/IvyProbe/IvyProbe.vcproj
+++ b/IvyProbe/IvyProbe.vcproj
@@ -367,7 +367,6 @@
 	<References>

 		<ProjectReference

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

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

 		/>

 	</References>

 	<Files>