summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfcolin2011-01-06 15:01:51 +0000
committerfcolin2011-01-06 15:01:51 +0000
commit090233152ffa7daad3c5c8268b8983298808d9c3 (patch)
treecc95c57757a4f633826e649d3b985d6830835c4e
parente00eb376f45ead6e5c5eccd79810d16ce72999b0 (diff)
downloadivy-cplusplus-090233152ffa7daad3c5c8268b8983298808d9c3.zip
ivy-cplusplus-090233152ffa7daad3c5c8268b8983298808d9c3.tar.gz
ivy-cplusplus-090233152ffa7daad3c5c8268b8983298808d9c3.tar.bz2
ivy-cplusplus-090233152ffa7daad3c5c8268b8983298808d9c3.tar.xz
modification bouton acceleration
-rw-r--r--Bus.sln83
-rw-r--r--IvyCursor/InstIvyCursor/InstIvyCursor.vdproj30
-rw-r--r--IvyProbe/IvyProbe.rc2
3 files changed, 53 insertions, 62 deletions
diff --git a/Bus.sln b/Bus.sln
index cd52cd3..50983ae 100644
--- a/Bus.sln
+++ b/Bus.sln
@@ -1,17 +1,17 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{63C59D2C-F649-432C-8A44-969E66BC2C56}"
ProjectSection(SolutionItems) = preProject
UpdateIvyWeb.bat = UpdateIvyWeb.bat
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "Ivy\Ivy.vcproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ivy", "Ivy\Ivy.vcxproj", "{9818D652-CC05-463E-880D-AFCA2C7BFABE}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyProbe", "IvyProbe\IvyProbe.vcproj", "{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyProbe", "IvyProbe\IvyProbe.vcxproj", "{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyProbe", "IvyProbe\InstIvy\InstIvy.vdproj", "{72D0A567-E63F-4B6B-9F4D-9C9CC2B5E6E5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\..\pcre\pcre.vcproj", "{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\..\pcre\pcre.vcxproj", "{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyDev", "Ivy\InstIvyDev\InstIvyDev.vdproj", "{D1E11E12-38DB-4190-AD37-830CF9AD335F}"
EndProject
@@ -20,21 +20,11 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InstallIvyLib", "Ivy\IvyLib
{9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyThroughput", "IvyThroughput\IvyThroughput.vcproj", "{4E7CA151-4751-4FC3-B76E-4A915329A301}"
- ProjectSection(ProjectDependencies) = postProject
- {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B} = {D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}
- {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyThroughput", "IvyThroughput\IvyThroughput.vcxproj", "{4E7CA151-4751-4FC3-B76E-4A915329A301}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyPerf", "IvyPerf\IvyPerf.vcproj", "{26747FB6-EC25-400B-995E-8F6F1AC49734}"
- ProjectSection(ProjectDependencies) = postProject
- {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyPerf", "IvyPerf\IvyPerf.vcxproj", "{26747FB6-EC25-400B-995E-8F6F1AC49734}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyTestReady", "IvyTestReady\IvyTestReady.vcproj", "{DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}"
- ProjectSection(ProjectDependencies) = postProject
- {9818D652-CC05-463E-880D-AFCA2C7BFABE} = {9818D652-CC05-463E-880D-AFCA2C7BFABE}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyTestReady", "IvyTestReady\IvyTestReady.vcxproj", "{DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}"
EndProject
Global
GlobalSection(SourceCodeControl) = preSolution
@@ -43,42 +33,42 @@ Global
SccLocalPath0 = .
SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
CanCheckoutShared = false
- SccProjectUniqueName1 = Ivy\\Ivy.vcproj
- SccProjectName1 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA
- SccLocalPath1 = Ivy
+ SccProjectUniqueName1 = IvyProbe\\InstIvy\\InstIvy.vdproj
+ SccProjectName1 = \u0022$/Bus/IvyProbe/InstIvyProbe\u0022,\u0020QTFAAAAA
+ SccLocalPath1 = IvyProbe\\InstIvy
CanCheckoutShared = false
- SccProjectUniqueName2 = IvyProbe\\IvyProbe.vcproj
- SccProjectName2 = \u0022$/Bus/IvyProbe\u0022,\u0020ZPBAAAAA
- SccLocalPath2 = IvyProbe
+ SccProjectUniqueName2 = Ivy\\InstIvyDev\\InstIvyDev.vdproj
+ SccProjectName2 = \u0022$/Bus/Ivy/InstIvyDev\u0022,\u0020FUFAAAAA
+ SccLocalPath2 = Ivy\\InstIvyDev
CanCheckoutShared = false
- SccProjectUniqueName3 = IvyProbe\\InstIvy\\InstIvy.vdproj
- SccProjectName3 = \u0022$/Bus/IvyProbe/InstIvyProbe\u0022,\u0020QTFAAAAA
- SccLocalPath3 = IvyProbe\\InstIvy
+ SccProjectUniqueName3 = Ivy\\IvyLib\\IvyLib.vdproj
+ SccLocalPath3 = .
CanCheckoutShared = false
- SccProjectUniqueName4 = ..\\..\\pcre\\pcre.vcproj
- SccProjectName4 = \u0022$/pcre\u0022,\u0020KSHAAAAA
- SccLocalPath4 = ..\\..\\pcre
+ SccProjectFilePathRelativizedFromConnection3 = Ivy\\IvyLib\\
+ SccProjectUniqueName4 = Ivy\\Ivy.vcxproj
+ SccProjectName4 = \u0022$/Bus/Ivy\u0022,\u0020QPEAAAAA
+ SccLocalPath4 = Ivy
CanCheckoutShared = false
- SccProjectUniqueName5 = Ivy\\InstIvyDev\\InstIvyDev.vdproj
- SccProjectName5 = \u0022$/Bus/Ivy/InstIvyDev\u0022,\u0020FUFAAAAA
- SccLocalPath5 = Ivy\\InstIvyDev
+ SccProjectUniqueName5 = IvyProbe\\IvyProbe.vcxproj
+ SccProjectName5 = \u0022$/Bus/IvyProbe\u0022,\u0020ZPBAAAAA
+ SccLocalPath5 = IvyProbe
CanCheckoutShared = false
- SccProjectUniqueName6 = Ivy\\IvyLib\\IvyLib.vdproj
- SccLocalPath6 = .
+ SccProjectUniqueName6 = ..\\..\\pcre\\pcre.vcxproj
+ SccProjectName6 = \u0022$/pcre\u0022,\u0020KSHAAAAA
+ SccLocalPath6 = ..\\..\\pcre
CanCheckoutShared = false
- SccProjectFilePathRelativizedFromConnection6 = Ivy\\IvyLib\\
- SccProjectUniqueName7 = IvyPerf\\IvyPerf.vcproj
- SccLocalPath7 = .
+ SccProjectUniqueName7 = IvyThroughput\\IvyThroughput.vcxproj
+ SccProjectName7 = \u0022$/Bus/IvyThroughput\u0022,\u0020XTIAAAAA
+ SccLocalPath7 = IvyThroughput
CanCheckoutShared = false
- SccProjectFilePathRelativizedFromConnection7 = IvyPerf\\
- SccProjectUniqueName8 = IvyThroughput\\IvyThroughput.vcproj
- SccLocalPath8 = .
+ SccProjectUniqueName8 = IvyPerf\\IvyPerf.vcxproj
+ SccProjectName8 = \u0022$/Bus/IvyPerf\u0022,\u0020QTIAAAAA
+ SccLocalPath8 = IvyPerf
CanCheckoutShared = false
- SccProjectFilePathRelativizedFromConnection8 = IvyThroughput\\
- SccProjectUniqueName9 = IvyTestReady\\IvyTestReady.vcproj
- SccLocalPath9 = .
+ SccProjectUniqueName9 = IvyTestReady\\IvyTestReady.vcxproj
+ SccProjectName9 = \u0022$/Bus/IvyTestReady\u0022,\u0020DNJAAAAA
+ SccLocalPath9 = IvyTestReady
CanCheckoutShared = false
- SccProjectFilePathRelativizedFromConnection9 = IvyTestReady\\
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -144,7 +134,8 @@ Global
{26747FB6-EC25-400B-995E-8F6F1AC49734}.Release|x64.Build.0 = Release|x64
{DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Debug|Win32.ActiveCfg = Debug|Win32
{DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Debug|Win32.Build.0 = Debug|Win32
- {DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Debug|x64.ActiveCfg = Debug|Win32
+ {DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Debug|x64.ActiveCfg = Debug|x64
+ {DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Debug|x64.Build.0 = Debug|x64
{DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Release|Win32.ActiveCfg = Release|Win32
{DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Release|Win32.Build.0 = Release|Win32
{DFB4EAD3-EB3F-412A-8F5B-4A6ABE660C71}.Release|x64.ActiveCfg = Release|Win32
diff --git a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
index a36b2cc..265afbd 100644
--- a/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
+++ b/IvyCursor/InstIvyCursor/InstIvyCursor.vdproj
@@ -15,12 +15,6 @@
{
"Entry"
{
- "MsmKey" = "8:_3242670360DB45C0B11B781FBA2B6EA5"
- "OwnerKey" = "8:_F33F0737CB7D442EBA793478C3AD99C3"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -45,16 +39,22 @@
}
"Entry"
{
- "MsmKey" = "8:_F33F0737CB7D442EBA793478C3AD99C3"
+ "MsmKey" = "8:_9D552D32AE6D45C29DAEA8DBCE3C6DBB"
"OwnerKey" = "8:_3B23F7E390FC40EA8E3083AFEBCFC095"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F33F0737CB7D442EBA793478C3AD99C3"
+ "MsmKey" = "8:_9D552D32AE6D45C29DAEA8DBCE3C6DBB"
"OwnerKey" = "8:_522624C883B2416AAD0D345280C2CB97"
"MsmSig" = "8:_UNDEFINED"
}
+ "Entry"
+ {
+ "MsmKey" = "8:_CCD5B66C07D2494D8FAF877AB946921D"
+ "OwnerKey" = "8:_9D552D32AE6D45C29DAEA8DBCE3C6DBB"
+ "MsmSig" = "8:_UNDEFINED"
+ }
}
"Configurations"
{
@@ -208,14 +208,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:IvyCursor"
- "ProductCode" = "8:{687B5941-010C-4495-94A6-52E0D3331FD7}"
- "PackageCode" = "8:{9F678DD6-2BF7-46EF-92C8-61C718D1BC0A}"
+ "ProductCode" = "8:{5F695C69-1664-45F2-A38F-9FE741901293}"
+ "PackageCode" = "8:{2A95FC01-23DE-48BA-9D0A-BECCA895521B}"
"UpgradeCode" = "8:{B9048C4D-4B78-4498-8634-FA5726303A10}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:2.4.0"
+ "ProductVersion" = "8:2.4.1"
"Manufacturer" = "8:DTI R&D"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
@@ -752,11 +752,11 @@
}
"MergeModule"
{
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3242670360DB45C0B11B781FBA2B6EA5"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_9D552D32AE6D45C29DAEA8DBCE3C6DBB"
{
"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"
{
}
@@ -766,11 +766,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F33F0737CB7D442EBA793478C3AD99C3"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CCD5B66C07D2494D8FAF877AB946921D"
{
"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"
{
}
diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc
index 52746ec..101013a 100644
--- a/IvyProbe/IvyProbe.rc
+++ b/IvyProbe/IvyProbe.rc
@@ -98,7 +98,7 @@ BEGIN
DEFPUSHBUTTON "Send",IDC_SEND,246,116,27,14
PUSHBUTTON "Bind",IDC_BIND,246,132,27,14
COMBOBOX IDC_REGEXP,27,133,214,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_TEXT,99,29,171,82,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL
+ EDITTEXT IDC_TEXT,99,29,171,82,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | WS_VSCROLL
LISTBOX IDC_CLIENT_LIST,4,29,92,84,LBS_SORT | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END