Index: build.h
===================================================================
RCS file: /cvs/cvsnt/build.h,v
retrieving revision 1.1.2.173.4.367
diff -c -r1.1.2.173.4.367 build.h
*** build.h 1 Feb 2015 22:40:16 -0000 1.1.2.173.4.367
--- build.h 13 Mar 2015 07:19:14 -0000
***************
*** 1 ****
! #define CVSNT_PRODUCT_BUILD 5517
--- 1 ----
! #define CVSNT_PRODUCT_BUILD 5557
Index: cvsnt.sln
===================================================================
RCS file: /cvs/cvsnt/cvsnt.sln,v
retrieving revision 1.19.2.81.4.24
diff -c -r1.19.2.81.4.24 cvsnt.sln
*** cvsnt.sln 19 Sep 2012 07:32:58 -0000 1.19.2.81.4.24
--- cvsnt.sln 13 Mar 2015 00:16:50 -0000
***************
*** 433,492 ****
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cvsntsrv", "cvsntsrv.vcproj", "{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}"
ProjectSection(ProjectDependencies) = postProject
! {AFF96908-CC5E-40D2-94FC-78090D420832} = {AFF96908-CC5E-40D2-94FC-78090D420832}
! {FE571818-1B67-41FB-B49D-850D650CF661} = {FE571818-1B67-41FB-B49D-850D650CF661}
! {15E9DC1B-8890-431C-96A3-095273DCFB05} = {15E9DC1B-8890-431C-96A3-095273DCFB05}
! {B927591E-977E-41E9-A2A1-C701F39E426A} = {B927591E-977E-41E9-A2A1-C701F39E426A}
! {E066EF1F-0DD5-4338-ABC9-C413A556AB0F} = {E066EF1F-0DD5-4338-ABC9-C413A556AB0F}
! {4AD8AB20-D822-44E2-AEC1-E870140D254A} = {4AD8AB20-D822-44E2-AEC1-E870140D254A}
! {2F90C820-CD6E-4BA2-A6A1-339147E508AA} = {2F90C820-CD6E-4BA2-A6A1-339147E508AA}
! {D0305221-49F5-4CD3-AF96-E0C5CD04F440} = {D0305221-49F5-4CD3-AF96-E0C5CD04F440}
! {3C61DD27-F69A-4444-A848-A3D98F22DCA8} = {3C61DD27-F69A-4444-A848-A3D98F22DCA8}
! {A23EC62C-E9C4-4145-B953-90D533CDF47B} = {A23EC62C-E9C4-4145-B953-90D533CDF47B}
{2B05202E-5DD0-4543-99B9-188A23E8139D} = {2B05202E-5DD0-4543-99B9-188A23E8139D}
{5CD43033-B004-4886-8E4D-3A622A7AD677} = {5CD43033-B004-4886-8E4D-3A622A7AD677}
- {E55F4833-F513-4F88-89AB-BCC2E39F81D8} = {E55F4833-F513-4F88-89AB-BCC2E39F81D8}
- {C2CD3641-0F72-4C10-852B-CAA694D28E86} = {C2CD3641-0F72-4C10-852B-CAA694D28E86}
- {3ED9E859-7F8B-4FBE-8589-5B7C4886471D} = {3ED9E859-7F8B-4FBE-8589-5B7C4886471D}
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5} = {86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}
- {5D695560-5DD9-4EF5-9B2E-D609D1A05324} = {5D695560-5DD9-4EF5-9B2E-D609D1A05324}
- {CCE61C64-AC44-40E2-8E75-034C8F60834F} = {CCE61C64-AC44-40E2-8E75-034C8F60834F}
- {00725064-BF63-4724-9FB4-740EABE62CEC} = {00725064-BF63-4724-9FB4-740EABE62CEC}
{61D75468-3718-47EE-BF14-7B1CA51BBAD6} = {61D75468-3718-47EE-BF14-7B1CA51BBAD6}
- {A5EFF26A-60FC-42D4-AB5C-E4159E5672AE} = {A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}
- {44F87A6B-B243-4961-9236-2498E4695331} = {44F87A6B-B243-4961-9236-2498E4695331}
- {A6BB2070-E9A8-442C-BC75-577EEE7382BA} = {A6BB2070-E9A8-442C-BC75-577EEE7382BA}
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08} = {BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}
- {44D20481-5119-4D1B-A194-A7B5AEF9C23C} = {44D20481-5119-4D1B-A194-A7B5AEF9C23C}
- {D8FDB582-57E3-40DE-9F35-9764EB1E4148} = {D8FDB582-57E3-40DE-9F35-9764EB1E4148}
- {E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9} = {E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}
- {68D18485-174E-46BB-A1FC-132DDCCC2EE0} = {68D18485-174E-46BB-A1FC-132DDCCC2EE0}
- {7B67F987-4BBB-4FD4-B537-77BF79ABD04F} = {7B67F987-4BBB-4FD4-B537-77BF79ABD04F}
- {A8630794-5C8B-4B7F-AF1B-DF12FD6C397F} = {A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6} = {5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}
- {543E4395-6BA3-47FE-862D-7D5D27B83D2A} = {543E4395-6BA3-47FE-862D-7D5D27B83D2A}
- {32F96195-E679-4DE4-8B8B-27D2A3CE1014} = {32F96195-E679-4DE4-8B8B-27D2A3CE1014}
- {EDF87796-6F09-4C8A-8202-77ADDB81284B} = {EDF87796-6F09-4C8A-8202-77ADDB81284B}
- {6FED639C-5FE8-4FDF-ABE8-F720947AC9A1} = {6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}
- {9E7B849C-CB9C-499B-B2B2-ECA70C5784D2} = {9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}
- {45866BA8-03B2-40FC-9CA5-1BB7A17B10A1} = {45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}
- {433007AA-2C03-481D-B56B-5FA6840D343D} = {433007AA-2C03-481D-B56B-5FA6840D343D}
- {F41BC1AC-4DA3-4D02-999C-6E4DB0D74420} = {F41BC1AC-4DA3-4D02-999C-6E4DB0D74420}
- {74405EAE-394C-433A-ACD7-27B1B90CF26C} = {74405EAE-394C-433A-ACD7-27B1B90CF26C}
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A} = {C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}
- {3623B3B4-90A1-4FC4-B0C3-98580C2A69DA} = {3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC} = {79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}
{2C1A99CD-4854-4064-9484-F1EB57F366E5} = {2C1A99CD-4854-4064-9484-F1EB57F366E5}
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689} = {6674B4DB-2A9A-4D36-B1B6-38796B6D4689}
- {530EC8E4-2422-45EE-9289-0091A4E8E083} = {530EC8E4-2422-45EE-9289-0091A4E8E083}
- {CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67} = {CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}
- {7E59BCEB-4FD9-42DF-951E-C196F709BAB8} = {7E59BCEB-4FD9-42DF-951E-C196F709BAB8}
- {84E063F1-80EF-432B-93A3-90C3159F16DE} = {84E063F1-80EF-432B-93A3-90C3159F16DE}
- {EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8} = {EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8}
- {C05BD8F3-7197-4B4B-9DFE-EB014490F51C} = {C05BD8F3-7197-4B4B-9DFE-EB014490F51C}
- {B94D88FC-69AB-488E-BC7F-AAA565AA8074} = {B94D88FC-69AB-488E-BC7F-AAA565AA8074}
- {EEEB0DFE-0278-4E6F-948C-9C9CAA8EA8AA} = {EEEB0DFE-0278-4E6F-948C-9C9CAA8EA8AA}
- {6083BAFF-695F-456B-8531-DBDD03C9702C} = {6083BAFF-695F-456B-8531-DBDD03C9702C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntsetuid", "windows-NT\ntsetuid\ntsetuid.vcproj", "{CEA8E982-E089-410B-91F5-4435E6D57CDE}"
--- 433,449 ----
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cvsntsrv", "cvsntsrv.vcproj", "{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}"
ProjectSection(ProjectDependencies) = postProject
! {18BE4128-D152-4D38-9516-69B6450059C5} = {18BE4128-D152-4D38-9516-69B6450059C5}
{2B05202E-5DD0-4543-99B9-188A23E8139D} = {2B05202E-5DD0-4543-99B9-188A23E8139D}
{5CD43033-B004-4886-8E4D-3A622A7AD677} = {5CD43033-B004-4886-8E4D-3A622A7AD677}
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5} = {86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}
{61D75468-3718-47EE-BF14-7B1CA51BBAD6} = {61D75468-3718-47EE-BF14-7B1CA51BBAD6}
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08} = {BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6} = {5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A} = {C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC} = {79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}
{2C1A99CD-4854-4064-9484-F1EB57F366E5} = {2C1A99CD-4854-4064-9484-F1EB57F366E5}
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689} = {6674B4DB-2A9A-4D36-B1B6-38796B6D4689}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntsetuid", "windows-NT\ntsetuid\ntsetuid.vcproj", "{CEA8E982-E089-410B-91F5-4435E6D57CDE}"
***************
*** 510,535 ****
{43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Debug.Build.0 = Debug|Win32
{43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Release.ActiveCfg = Release|Win32
{43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Release.Build.0 = Release|Win32
! {43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Releasex64.ActiveCfg = Release|Win32
! {43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Releasex64.Build.0 = Release|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Debug.ActiveCfg = Debug|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Debug.Build.0 = Debug|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Release.ActiveCfg = Release|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Release.Build.0 = Release|Win32
! {00725064-BF63-4724-9FB4-740EABE62CEC}.Releasex64.ActiveCfg = Release|Win32
! {00725064-BF63-4724-9FB4-740EABE62CEC}.Releasex64.Build.0 = Release|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Debug.ActiveCfg = Debug|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Debug.Build.0 = Debug|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Release.ActiveCfg = Release|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Release.Build.0 = Release|Win32
! {5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Releasex64.ActiveCfg = Release|Win32
! {5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Releasex64.Build.0 = Release|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Debug.ActiveCfg = Debug|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Debug.Build.0 = Debug|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Release.ActiveCfg = Release|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Release.Build.0 = Release|Win32
! {5CD43033-B004-4886-8E4D-3A622A7AD677}.Releasex64.ActiveCfg = Release|Win32
! {5CD43033-B004-4886-8E4D-3A622A7AD677}.Releasex64.Build.0 = Release|Win32
{E55F4833-F513-4F88-89AB-BCC2E39F81D8}.Debug.ActiveCfg = Debug|Win32
{E55F4833-F513-4F88-89AB-BCC2E39F81D8}.Debug.Build.0 = Debug|Win32
{E55F4833-F513-4F88-89AB-BCC2E39F81D8}.Release.ActiveCfg = Release|Win32
--- 467,492 ----
{43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Debug.Build.0 = Debug|Win32
{43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Release.ActiveCfg = Release|Win32
{43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Release.Build.0 = Release|Win32
! {43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Releasex64.ActiveCfg = Releasex64|Win32
! {43B8C2B3-0526-4121-91F8-F218ABC1D0C2}.Releasex64.Build.0 = Releasex64|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Debug.ActiveCfg = Debug|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Debug.Build.0 = Debug|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Release.ActiveCfg = Release|Win32
{00725064-BF63-4724-9FB4-740EABE62CEC}.Release.Build.0 = Release|Win32
! {00725064-BF63-4724-9FB4-740EABE62CEC}.Releasex64.ActiveCfg = Releasex64|Win32
! {00725064-BF63-4724-9FB4-740EABE62CEC}.Releasex64.Build.0 = Releasex64|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Debug.ActiveCfg = Debug|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Debug.Build.0 = Debug|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Release.ActiveCfg = Release|Win32
{5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Release.Build.0 = Release|Win32
! {5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Releasex64.ActiveCfg = Releasex64|Win32
! {5D695560-5DD9-4EF5-9B2E-D609D1A05324}.Releasex64.Build.0 = Releasex64|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Debug.ActiveCfg = Debug|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Debug.Build.0 = Debug|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Release.ActiveCfg = Release|Win32
{5CD43033-B004-4886-8E4D-3A622A7AD677}.Release.Build.0 = Release|Win32
! {5CD43033-B004-4886-8E4D-3A622A7AD677}.Releasex64.ActiveCfg = Releasex64|Win32
! {5CD43033-B004-4886-8E4D-3A622A7AD677}.Releasex64.Build.0 = Releasex64|Win32
{E55F4833-F513-4F88-89AB-BCC2E39F81D8}.Debug.ActiveCfg = Debug|Win32
{E55F4833-F513-4F88-89AB-BCC2E39F81D8}.Debug.Build.0 = Debug|Win32
{E55F4833-F513-4F88-89AB-BCC2E39F81D8}.Release.ActiveCfg = Release|Win32
***************
*** 540,553 ****
{68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Debug.Build.0 = Debug|Win32
{68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Release.ActiveCfg = Release|Win32
{68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Release.Build.0 = Release|Win32
! {68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Releasex64.ActiveCfg = Release|Win32
! {68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Releasex64.Build.0 = Release|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Debug.ActiveCfg = Debug|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Debug.Build.0 = Debug|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Release.ActiveCfg = Release|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Release.Build.0 = Release|Win32
! {AFF96908-CC5E-40D2-94FC-78090D420832}.Releasex64.ActiveCfg = Release|Win32
! {AFF96908-CC5E-40D2-94FC-78090D420832}.Releasex64.Build.0 = Release|Win32
{EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8}.Debug.ActiveCfg = Debug|Win32
{EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8}.Debug.Build.0 = Debug|Win32
{EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8}.Release.ActiveCfg = Release|Win32
--- 497,510 ----
{68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Debug.Build.0 = Debug|Win32
{68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Release.ActiveCfg = Release|Win32
{68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Release.Build.0 = Release|Win32
! {68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Releasex64.ActiveCfg = Releasex64|Win32
! {68D18485-174E-46BB-A1FC-132DDCCC2EE0}.Releasex64.Build.0 = Releasex64|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Debug.ActiveCfg = Debug|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Debug.Build.0 = Debug|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Release.ActiveCfg = Release|Win32
{AFF96908-CC5E-40D2-94FC-78090D420832}.Release.Build.0 = Release|Win32
! {AFF96908-CC5E-40D2-94FC-78090D420832}.Releasex64.ActiveCfg = Releasex64|Win32
! {AFF96908-CC5E-40D2-94FC-78090D420832}.Releasex64.Build.0 = Releasex64|Win32
{EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8}.Debug.ActiveCfg = Debug|Win32
{EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8}.Debug.Build.0 = Debug|Win32
{EC35C4F3-4DC4-4B87-B884-9DAAA8398BD8}.Release.ActiveCfg = Release|Win32
***************
*** 564,571 ****
{C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Debug.Build.0 = Debug|Win32
{C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Release.ActiveCfg = Release|Win32
{C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Release.Build.0 = Release|Win32
! {C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Releasex64.ActiveCfg = Release|Win32
! {C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Releasex64.Build.0 = Release|Win32
{44D20481-5119-4D1B-A194-A7B5AEF9C23C}.Debug.ActiveCfg = Debug|Win32
{44D20481-5119-4D1B-A194-A7B5AEF9C23C}.Debug.Build.0 = Debug|Win32
{44D20481-5119-4D1B-A194-A7B5AEF9C23C}.Release.ActiveCfg = Release|Win32
--- 521,528 ----
{C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Debug.Build.0 = Debug|Win32
{C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Release.ActiveCfg = Release|Win32
{C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Release.Build.0 = Release|Win32
! {C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Releasex64.ActiveCfg = Releasex64|Win32
! {C05BD8F3-7197-4B4B-9DFE-EB014490F51C}.Releasex64.Build.0 = Releasex64|Win32
{44D20481-5119-4D1B-A194-A7B5AEF9C23C}.Debug.ActiveCfg = Debug|Win32
{44D20481-5119-4D1B-A194-A7B5AEF9C23C}.Debug.Build.0 = Debug|Win32
{44D20481-5119-4D1B-A194-A7B5AEF9C23C}.Release.ActiveCfg = Release|Win32
***************
*** 576,625 ****
{6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Debug.Build.0 = Debug|Win32
{6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Release.ActiveCfg = Release|Win32
{6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Release.Build.0 = Release|Win32
! {6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Releasex64.ActiveCfg = Release|Win32
! {6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Releasex64.Build.0 = Release|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Debug.ActiveCfg = Debug|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Debug.Build.0 = Debug|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Release.ActiveCfg = Release|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Release.Build.0 = Release|Win32
! {A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Releasex64.ActiveCfg = Release|Win32
! {A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Releasex64.Build.0 = Release|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Debug.ActiveCfg = Debug|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Debug.Build.0 = Debug|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Release.ActiveCfg = Release|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Release.Build.0 = Release|Win32
! {FE571818-1B67-41FB-B49D-850D650CF661}.Releasex64.ActiveCfg = Release|Win32
! {FE571818-1B67-41FB-B49D-850D650CF661}.Releasex64.Build.0 = Release|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Debug.ActiveCfg = Debug|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Debug.Build.0 = Debug|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Release.ActiveCfg = Release|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Release.Build.0 = Release|Win32
! {7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Releasex64.ActiveCfg = Release|Win32
! {7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Releasex64.Build.0 = Release|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Debug.ActiveCfg = Debug|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Debug.Build.0 = Debug|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Release.ActiveCfg = Release|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Release.Build.0 = Release|Win32
! {433007AA-2C03-481D-B56B-5FA6840D343D}.Releasex64.ActiveCfg = Release|Win32
! {433007AA-2C03-481D-B56B-5FA6840D343D}.Releasex64.Build.0 = Release|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Debug.ActiveCfg = Debug|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Debug.Build.0 = Debug|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Release.ActiveCfg = Release|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Release.Build.0 = Release|Win32
! {2C1A99CD-4854-4064-9484-F1EB57F366E5}.Releasex64.ActiveCfg = Release|Win32
! {2C1A99CD-4854-4064-9484-F1EB57F366E5}.Releasex64.Build.0 = Release|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Debug.ActiveCfg = Debug|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Debug.Build.0 = Debug|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Release.ActiveCfg = Release|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Release.Build.0 = Release|Win32
! {6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Releasex64.ActiveCfg = Release|Win32
! {6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Releasex64.Build.0 = Release|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Debug.ActiveCfg = Debug|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Debug.Build.0 = Debug|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Release.ActiveCfg = Release|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Release.Build.0 = Release|Win32
! {C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Releasex64.ActiveCfg = Release|Win32
! {C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Releasex64.Build.0 = Release|Win32
{E066EF1F-0DD5-4338-ABC9-C413A556AB0F}.Debug.ActiveCfg = Debug|Win32
{E066EF1F-0DD5-4338-ABC9-C413A556AB0F}.Debug.Build.0 = Debug|Win32
{E066EF1F-0DD5-4338-ABC9-C413A556AB0F}.Release.ActiveCfg = Release|Win32
--- 533,582 ----
{6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Debug.Build.0 = Debug|Win32
{6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Release.ActiveCfg = Release|Win32
{6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Release.Build.0 = Release|Win32
! {6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Releasex64.ActiveCfg = Releasex64|Win32
! {6FED639C-5FE8-4FDF-ABE8-F720947AC9A1}.Releasex64.Build.0 = Releasex64|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Debug.ActiveCfg = Debug|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Debug.Build.0 = Debug|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Release.ActiveCfg = Release|Win32
{A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Release.Build.0 = Release|Win32
! {A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Releasex64.ActiveCfg = Releasex64|Win32
! {A8630794-5C8B-4B7F-AF1B-DF12FD6C397F}.Releasex64.Build.0 = Releasex64|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Debug.ActiveCfg = Debug|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Debug.Build.0 = Debug|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Release.ActiveCfg = Release|Win32
{FE571818-1B67-41FB-B49D-850D650CF661}.Release.Build.0 = Release|Win32
! {FE571818-1B67-41FB-B49D-850D650CF661}.Releasex64.ActiveCfg = Releasex64|Win32
! {FE571818-1B67-41FB-B49D-850D650CF661}.Releasex64.Build.0 = Releasex64|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Debug.ActiveCfg = Debug|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Debug.Build.0 = Debug|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Release.ActiveCfg = Release|Win32
{7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Release.Build.0 = Release|Win32
! {7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Releasex64.ActiveCfg = Releasex64|Win32
! {7B67F987-4BBB-4FD4-B537-77BF79ABD04F}.Releasex64.Build.0 = Releasex64|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Debug.ActiveCfg = Debug|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Debug.Build.0 = Debug|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Release.ActiveCfg = Release|Win32
{433007AA-2C03-481D-B56B-5FA6840D343D}.Release.Build.0 = Release|Win32
! {433007AA-2C03-481D-B56B-5FA6840D343D}.Releasex64.ActiveCfg = Releasex64|Win32
! {433007AA-2C03-481D-B56B-5FA6840D343D}.Releasex64.Build.0 = Releasex64|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Debug.ActiveCfg = Debug|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Debug.Build.0 = Debug|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Release.ActiveCfg = Release|Win32
{2C1A99CD-4854-4064-9484-F1EB57F366E5}.Release.Build.0 = Release|Win32
! {2C1A99CD-4854-4064-9484-F1EB57F366E5}.Releasex64.ActiveCfg = Releasex64|Win32
! {2C1A99CD-4854-4064-9484-F1EB57F366E5}.Releasex64.Build.0 = Releasex64|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Debug.ActiveCfg = Debug|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Debug.Build.0 = Debug|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Release.ActiveCfg = Release|Win32
{6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Release.Build.0 = Release|Win32
! {6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Releasex64.ActiveCfg = Releasex64|Win32
! {6674B4DB-2A9A-4D36-B1B6-38796B6D4689}.Releasex64.Build.0 = Releasex64|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Debug.ActiveCfg = Debug|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Debug.Build.0 = Debug|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Release.ActiveCfg = Release|Win32
{C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Release.Build.0 = Release|Win32
! {C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Releasex64.ActiveCfg = Releasex64|Win32
! {C69895B2-28E6-4E13-BC48-D4BAED3DCC5A}.Releasex64.Build.0 = Releasex64|Win32
{E066EF1F-0DD5-4338-ABC9-C413A556AB0F}.Debug.ActiveCfg = Debug|Win32
{E066EF1F-0DD5-4338-ABC9-C413A556AB0F}.Debug.Build.0 = Debug|Win32
{E066EF1F-0DD5-4338-ABC9-C413A556AB0F}.Release.ActiveCfg = Release|Win32
***************
*** 636,649 ****
{CCE61C64-AC44-40E2-8E75-034C8F60834F}.Debug.Build.0 = Debug|Win32
{CCE61C64-AC44-40E2-8E75-034C8F60834F}.Release.ActiveCfg = Release|Win32
{CCE61C64-AC44-40E2-8E75-034C8F60834F}.Release.Build.0 = Release|Win32
! {CCE61C64-AC44-40E2-8E75-034C8F60834F}.Releasex64.ActiveCfg = Release|Win32
! {CCE61C64-AC44-40E2-8E75-034C8F60834F}.Releasex64.Build.0 = Release|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Debug.ActiveCfg = Debug|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Debug.Build.0 = Debug|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Release.ActiveCfg = Release|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Release.Build.0 = Release|Win32
! {3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Releasex64.ActiveCfg = Release|Win32
! {3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Releasex64.Build.0 = Release|Win32
{ADC6AA27-C931-4C72-934B-7C3E81929F07}.Debug.ActiveCfg = Debug|Win32
{ADC6AA27-C931-4C72-934B-7C3E81929F07}.Debug.Build.0 = Debug|Win32
{ADC6AA27-C931-4C72-934B-7C3E81929F07}.Release.ActiveCfg = Release|Win32
--- 593,606 ----
{CCE61C64-AC44-40E2-8E75-034C8F60834F}.Debug.Build.0 = Debug|Win32
{CCE61C64-AC44-40E2-8E75-034C8F60834F}.Release.ActiveCfg = Release|Win32
{CCE61C64-AC44-40E2-8E75-034C8F60834F}.Release.Build.0 = Release|Win32
! {CCE61C64-AC44-40E2-8E75-034C8F60834F}.Releasex64.ActiveCfg = Releasex64|Win32
! {CCE61C64-AC44-40E2-8E75-034C8F60834F}.Releasex64.Build.0 = Releasex64|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Debug.ActiveCfg = Debug|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Debug.Build.0 = Debug|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Release.ActiveCfg = Release|Win32
{3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Release.Build.0 = Release|Win32
! {3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Releasex64.ActiveCfg = Releasex64|Win32
! {3C61DD27-F69A-4444-A848-A3D98F22DCA8}.Releasex64.Build.0 = Releasex64|Win32
{ADC6AA27-C931-4C72-934B-7C3E81929F07}.Debug.ActiveCfg = Debug|Win32
{ADC6AA27-C931-4C72-934B-7C3E81929F07}.Debug.Build.0 = Debug|Win32
{ADC6AA27-C931-4C72-934B-7C3E81929F07}.Release.ActiveCfg = Release|Win32
***************
*** 654,661 ****
{7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Debug.Build.0 = Debug|Win32
{7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Release.ActiveCfg = Release|Win32
{7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Release.Build.0 = Release|Win32
! {7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Releasex64.ActiveCfg = Release|Win32
! {7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Releasex64.Build.0 = Release|Win32
{6083BAFF-695F-456B-8531-DBDD03C9702C}.Debug.ActiveCfg = Debug|Win32
{6083BAFF-695F-456B-8531-DBDD03C9702C}.Debug.Build.0 = Debug|Win32
{6083BAFF-695F-456B-8531-DBDD03C9702C}.Release.ActiveCfg = Release|Win32
--- 611,618 ----
{7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Debug.Build.0 = Debug|Win32
{7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Release.ActiveCfg = Release|Win32
{7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Release.Build.0 = Release|Win32
! {7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Releasex64.ActiveCfg = Releasex64|Win32
! {7E59BCEB-4FD9-42DF-951E-C196F709BAB8}.Releasex64.Build.0 = Releasex64|Win32
{6083BAFF-695F-456B-8531-DBDD03C9702C}.Debug.ActiveCfg = Debug|Win32
{6083BAFF-695F-456B-8531-DBDD03C9702C}.Debug.Build.0 = Debug|Win32
{6083BAFF-695F-456B-8531-DBDD03C9702C}.Release.ActiveCfg = Release|Win32
***************
*** 672,769 ****
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Debug.Build.0 = Debug|Win32
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Release.ActiveCfg = Release|Win32
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Release.Build.0 = Release|Win32
! {86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Releasex64.ActiveCfg = Release|Win32
! {86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Releasex64.Build.0 = Release|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Debug.ActiveCfg = Debug|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Debug.Build.0 = Debug|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Release.ActiveCfg = Release|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Release.Build.0 = Release|Win32
! {2B05202E-5DD0-4543-99B9-188A23E8139D}.Releasex64.ActiveCfg = Release|Win32
! {2B05202E-5DD0-4543-99B9-188A23E8139D}.Releasex64.Build.0 = Release|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Debug.ActiveCfg = Debug|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Debug.Build.0 = Debug|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Release.ActiveCfg = Release|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Release.Build.0 = Release|Win32
! {BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Releasex64.ActiveCfg = Release|Win32
! {BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Releasex64.Build.0 = Release|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Debug.ActiveCfg = Debug|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Debug.Build.0 = Debug|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Release.ActiveCfg = Release|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Release.Build.0 = Release|Win32
! {4AD8AB20-D822-44E2-AEC1-E870140D254A}.Releasex64.ActiveCfg = Release|Win32
! {4AD8AB20-D822-44E2-AEC1-E870140D254A}.Releasex64.Build.0 = Release|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Debug.ActiveCfg = Debug|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Debug.Build.0 = Debug|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Release.ActiveCfg = Release|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Release.Build.0 = Release|Win32
! {D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Releasex64.ActiveCfg = Release|Win32
! {D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Releasex64.Build.0 = Release|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Debug.ActiveCfg = Debug|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Debug.Build.0 = Debug|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Release.ActiveCfg = Release|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Release.Build.0 = Release|Win32
! {E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Releasex64.ActiveCfg = Release|Win32
! {E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Releasex64.Build.0 = Release|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Debug.ActiveCfg = Debug|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Debug.Build.0 = Debug|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Release.ActiveCfg = Release|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Release.Build.0 = Release|Win32
! {B927591E-977E-41E9-A2A1-C701F39E426A}.Releasex64.ActiveCfg = Release|Win32
! {B927591E-977E-41E9-A2A1-C701F39E426A}.Releasex64.Build.0 = Release|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Debug.ActiveCfg = Debug|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Debug.Build.0 = Debug|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Release.ActiveCfg = Release|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Release.Build.0 = Release|Win32
! {EDF87796-6F09-4C8A-8202-77ADDB81284B}.Releasex64.ActiveCfg = Release|Win32
! {EDF87796-6F09-4C8A-8202-77ADDB81284B}.Releasex64.Build.0 = Release|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Debug.ActiveCfg = Debug|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Debug.Build.0 = Debug|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Release.ActiveCfg = Release|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Release.Build.0 = Release|Win32
! {61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Releasex64.ActiveCfg = Release|Win32
! {61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Releasex64.Build.0 = Release|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Debug.ActiveCfg = Debug|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Debug.Build.0 = Debug|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Release.ActiveCfg = Release|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Release.Build.0 = Release|Win32
! {A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Releasex64.ActiveCfg = Release|Win32
! {A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Releasex64.Build.0 = Release|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Debug.ActiveCfg = Debug|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Debug.Build.0 = Debug|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Release.ActiveCfg = Release|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Release.Build.0 = Release|Win32
! {2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Releasex64.ActiveCfg = Release|Win32
! {2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Releasex64.Build.0 = Release|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Debug.ActiveCfg = Debug|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Debug.Build.0 = Debug|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Release.ActiveCfg = Release|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Release.Build.0 = Release|Win32
! {3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Releasex64.ActiveCfg = Release|Win32
! {3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Releasex64.Build.0 = Release|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Debug.ActiveCfg = Debug|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Debug.Build.0 = Debug|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Release.ActiveCfg = Release|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Release.Build.0 = Release|Win32
! {CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Releasex64.ActiveCfg = Release|Win32
! {CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Releasex64.Build.0 = Release|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Debug.ActiveCfg = Debug|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Debug.Build.0 = Debug|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Release.ActiveCfg = Release|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Release.Build.0 = Release|Win32
! {530EC8E4-2422-45EE-9289-0091A4E8E083}.Releasex64.ActiveCfg = Release|Win32
! {530EC8E4-2422-45EE-9289-0091A4E8E083}.Releasex64.Build.0 = Release|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Debug.ActiveCfg = Debug|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Debug.Build.0 = Debug|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Release.ActiveCfg = Release|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Release.Build.0 = Release|Win32
! {32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Releasex64.ActiveCfg = Release|Win32
! {32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Releasex64.Build.0 = Release|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Debug.ActiveCfg = Debug|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Debug.Build.0 = Debug|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Release.ActiveCfg = Release|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Release.Build.0 = Release|Win32
! {5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Releasex64.ActiveCfg = Release|Win32
! {5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Releasex64.Build.0 = Release|Win32
{543E4395-6BA3-47FE-862D-7D5D27B83D2A}.Debug.ActiveCfg = Debug|Win32
{543E4395-6BA3-47FE-862D-7D5D27B83D2A}.Debug.Build.0 = Debug|Win32
{543E4395-6BA3-47FE-862D-7D5D27B83D2A}.Release.ActiveCfg = Release|Win32
--- 629,726 ----
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Debug.Build.0 = Debug|Win32
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Release.ActiveCfg = Release|Win32
{86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Release.Build.0 = Release|Win32
! {86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Releasex64.ActiveCfg = Releasex64|Win32
! {86C5205D-21BC-4CDE-86BE-7AC921D0C6A5}.Releasex64.Build.0 = Releasex64|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Debug.ActiveCfg = Debug|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Debug.Build.0 = Debug|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Release.ActiveCfg = Release|Win32
{2B05202E-5DD0-4543-99B9-188A23E8139D}.Release.Build.0 = Release|Win32
! {2B05202E-5DD0-4543-99B9-188A23E8139D}.Releasex64.ActiveCfg = Releasex64|Win32
! {2B05202E-5DD0-4543-99B9-188A23E8139D}.Releasex64.Build.0 = Releasex64|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Debug.ActiveCfg = Debug|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Debug.Build.0 = Debug|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Release.ActiveCfg = Release|Win32
{BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Release.Build.0 = Release|Win32
! {BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Releasex64.ActiveCfg = Releasex64|Win32
! {BCF71D75-2C0F-4B0F-967E-20D2EE52AB08}.Releasex64.Build.0 = Releasex64|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Debug.ActiveCfg = Debug|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Debug.Build.0 = Debug|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Release.ActiveCfg = Release|Win32
{4AD8AB20-D822-44E2-AEC1-E870140D254A}.Release.Build.0 = Release|Win32
! {4AD8AB20-D822-44E2-AEC1-E870140D254A}.Releasex64.ActiveCfg = Releasex64|Win32
! {4AD8AB20-D822-44E2-AEC1-E870140D254A}.Releasex64.Build.0 = Releasex64|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Debug.ActiveCfg = Debug|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Debug.Build.0 = Debug|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Release.ActiveCfg = Release|Win32
{D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Release.Build.0 = Release|Win32
! {D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Releasex64.ActiveCfg = Releasex64|Win32
! {D8FDB582-57E3-40DE-9F35-9764EB1E4148}.Releasex64.Build.0 = Releasex64|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Debug.ActiveCfg = Debug|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Debug.Build.0 = Debug|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Release.ActiveCfg = Release|Win32
{E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Release.Build.0 = Release|Win32
! {E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Releasex64.ActiveCfg = Releasex64|Win32
! {E634DE84-6C6C-4111-90AF-CC9EE0BE9EC9}.Releasex64.Build.0 = Releasex64|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Debug.ActiveCfg = Debug|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Debug.Build.0 = Debug|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Release.ActiveCfg = Release|Win32
{B927591E-977E-41E9-A2A1-C701F39E426A}.Release.Build.0 = Release|Win32
! {B927591E-977E-41E9-A2A1-C701F39E426A}.Releasex64.ActiveCfg = Releasex64|Win32
! {B927591E-977E-41E9-A2A1-C701F39E426A}.Releasex64.Build.0 = Releasex64|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Debug.ActiveCfg = Debug|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Debug.Build.0 = Debug|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Release.ActiveCfg = Release|Win32
{EDF87796-6F09-4C8A-8202-77ADDB81284B}.Release.Build.0 = Release|Win32
! {EDF87796-6F09-4C8A-8202-77ADDB81284B}.Releasex64.ActiveCfg = Releasex64|Win32
! {EDF87796-6F09-4C8A-8202-77ADDB81284B}.Releasex64.Build.0 = Releasex64|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Debug.ActiveCfg = Debug|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Debug.Build.0 = Debug|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Release.ActiveCfg = Release|Win32
{61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Release.Build.0 = Release|Win32
! {61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Releasex64.ActiveCfg = Releasex64|Win32
! {61D75468-3718-47EE-BF14-7B1CA51BBAD6}.Releasex64.Build.0 = Releasex64|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Debug.ActiveCfg = Debug|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Debug.Build.0 = Debug|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Release.ActiveCfg = Release|Win32
{A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Release.Build.0 = Release|Win32
! {A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Releasex64.ActiveCfg = Releasex64|Win32
! {A5EFF26A-60FC-42D4-AB5C-E4159E5672AE}.Releasex64.Build.0 = Releasex64|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Debug.ActiveCfg = Debug|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Debug.Build.0 = Debug|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Release.ActiveCfg = Release|Win32
{2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Release.Build.0 = Release|Win32
! {2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Releasex64.ActiveCfg = Releasex64|Win32
! {2F90C820-CD6E-4BA2-A6A1-339147E508AA}.Releasex64.Build.0 = Releasex64|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Debug.ActiveCfg = Debug|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Debug.Build.0 = Debug|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Release.ActiveCfg = Release|Win32
{3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Release.Build.0 = Release|Win32
! {3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Releasex64.ActiveCfg = Releasex64|Win32
! {3623B3B4-90A1-4FC4-B0C3-98580C2A69DA}.Releasex64.Build.0 = Releasex64|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Debug.ActiveCfg = Debug|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Debug.Build.0 = Debug|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Release.ActiveCfg = Release|Win32
{CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Release.Build.0 = Release|Win32
! {CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Releasex64.ActiveCfg = Releasex64|Win32
! {CE1BF5E4-822E-49BB-ACD6-3251CE7D0B67}.Releasex64.Build.0 = Releasex64|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Debug.ActiveCfg = Debug|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Debug.Build.0 = Debug|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Release.ActiveCfg = Release|Win32
{530EC8E4-2422-45EE-9289-0091A4E8E083}.Release.Build.0 = Release|Win32
! {530EC8E4-2422-45EE-9289-0091A4E8E083}.Releasex64.ActiveCfg = Releasex64|Win32
! {530EC8E4-2422-45EE-9289-0091A4E8E083}.Releasex64.Build.0 = Releasex64|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Debug.ActiveCfg = Debug|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Debug.Build.0 = Debug|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Release.ActiveCfg = Release|Win32
{32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Release.Build.0 = Release|Win32
! {32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Releasex64.ActiveCfg = Releasex64|Win32
! {32F96195-E679-4DE4-8B8B-27D2A3CE1014}.Releasex64.Build.0 = Releasex64|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Debug.ActiveCfg = Debug|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Debug.Build.0 = Debug|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Release.ActiveCfg = Release|Win32
{5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Release.Build.0 = Release|Win32
! {5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Releasex64.ActiveCfg = Releasex64|Win32
! {5F0B4A94-9332-45D5-881E-F9F4C4CD03F6}.Releasex64.Build.0 = Releasex64|Win32
{543E4395-6BA3-47FE-862D-7D5D27B83D2A}.Debug.ActiveCfg = Debug|Win32
{543E4395-6BA3-47FE-862D-7D5D27B83D2A}.Debug.Build.0 = Debug|Win32
{543E4395-6BA3-47FE-862D-7D5D27B83D2A}.Release.ActiveCfg = Release|Win32
***************
*** 780,799 ****
{45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Debug.Build.0 = Debug|Win32
{45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Release.ActiveCfg = Release|Win32
{45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Release.Build.0 = Release|Win32
! {45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Releasex64.ActiveCfg = Release|Win32
! {45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Releasex64.Build.0 = Release|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Debug.ActiveCfg = Debug|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Debug.Build.0 = Debug|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Release.ActiveCfg = Release|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Release.Build.0 = Release|Win32
! {9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Releasex64.ActiveCfg = Release|Win32
! {9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Releasex64.Build.0 = Release|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Debug.ActiveCfg = Debug|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Debug.Build.0 = Debug|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Release.ActiveCfg = Release|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Release.Build.0 = Release|Win32
! {C2CD3641-0F72-4C10-852B-CAA694D28E86}.Releasex64.ActiveCfg = Release|Win32
! {C2CD3641-0F72-4C10-852B-CAA694D28E86}.Releasex64.Build.0 = Release|Win32
{84E063F1-80EF-432B-93A3-90C3159F16DE}.Debug.ActiveCfg = Debug|Win32
{84E063F1-80EF-432B-93A3-90C3159F16DE}.Debug.Build.0 = Debug|Win32
{84E063F1-80EF-432B-93A3-90C3159F16DE}.Release.ActiveCfg = Release|Win32
--- 737,756 ----
{45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Debug.Build.0 = Debug|Win32
{45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Release.ActiveCfg = Release|Win32
{45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Release.Build.0 = Release|Win32
! {45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Releasex64.ActiveCfg = Releasex64|Win32
! {45866BA8-03B2-40FC-9CA5-1BB7A17B10A1}.Releasex64.Build.0 = Releasex64|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Debug.ActiveCfg = Debug|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Debug.Build.0 = Debug|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Release.ActiveCfg = Release|Win32
{9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Release.Build.0 = Release|Win32
! {9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Releasex64.ActiveCfg = Releasex64|Win32
! {9E7B849C-CB9C-499B-B2B2-ECA70C5784D2}.Releasex64.Build.0 = Releasex64|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Debug.ActiveCfg = Debug|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Debug.Build.0 = Debug|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Release.ActiveCfg = Release|Win32
{C2CD3641-0F72-4C10-852B-CAA694D28E86}.Release.Build.0 = Release|Win32
! {C2CD3641-0F72-4C10-852B-CAA694D28E86}.Releasex64.ActiveCfg = Releasex64|Win32
! {C2CD3641-0F72-4C10-852B-CAA694D28E86}.Releasex64.Build.0 = Releasex64|Win32
{84E063F1-80EF-432B-93A3-90C3159F16DE}.Debug.ActiveCfg = Debug|Win32
{84E063F1-80EF-432B-93A3-90C3159F16DE}.Debug.Build.0 = Debug|Win32
{84E063F1-80EF-432B-93A3-90C3159F16DE}.Release.ActiveCfg = Release|Win32
***************
*** 805,811 ****
{F41BC1AC-4DA3-4D02-999C-6E4DB0D74420}.Release.ActiveCfg = Release|Win32
{F41BC1AC-4DA3-4D02-999C-6E4DB0D74420}.Release.Build.0 = Release|Win32
{F41BC1AC-4DA3-4D02-999C-6E4DB0D74420}.Releasex64.ActiveCfg = Release|Win32
- {F41BC1AC-4DA3-4D02-999C-6E4DB0D74420}.Releasex64.Build.0 = Release|Win32
{D0305221-49F5-4CD3-AF96-E0C5CD04F440}.Debug.ActiveCfg = Debug|Win32
{D0305221-49F5-4CD3-AF96-E0C5CD04F440}.Debug.Build.0 = Debug|Win32
{D0305221-49F5-4CD3-AF96-E0C5CD04F440}.Release.ActiveCfg = Release|Win32
--- 762,767 ----
***************
*** 846,853 ****
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Debug.Build.0 = Debug|Win32
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Release.ActiveCfg = Release|Win32
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Release.Build.0 = Release|Win32
! {79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Releasex64.ActiveCfg = Release|Win32
! {79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Releasex64.Build.0 = Release|Win32
{B94D88FC-69AB-488E-BC7F-AAA565AA8074}.Debug.ActiveCfg = Debug|Win32
{B94D88FC-69AB-488E-BC7F-AAA565AA8074}.Debug.Build.0 = Debug|Win32
{B94D88FC-69AB-488E-BC7F-AAA565AA8074}.Release.ActiveCfg = Release|Win32
--- 802,809 ----
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Debug.Build.0 = Debug|Win32
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Release.ActiveCfg = Release|Win32
{79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Release.Build.0 = Release|Win32
! {79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Releasex64.ActiveCfg = Releasex64|Win32
! {79CEE0BA-CDFC-4CD6-9875-599A91C7B2DC}.Releasex64.Build.0 = Releasex64|Win32
{B94D88FC-69AB-488E-BC7F-AAA565AA8074}.Debug.ActiveCfg = Debug|Win32
{B94D88FC-69AB-488E-BC7F-AAA565AA8074}.Debug.Build.0 = Debug|Win32
{B94D88FC-69AB-488E-BC7F-AAA565AA8074}.Release.ActiveCfg = Release|Win32
***************
*** 858,865 ****
{3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Debug.Build.0 = Debug|Win32
{3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Release.ActiveCfg = Release|Win32
{3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Release.Build.0 = Release|Win32
! {3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Releasex64.ActiveCfg = Release|Win32
! {3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Releasex64.Build.0 = Release|Win32
{C8427D06-C1A9-4B23-83FD-27D93938DE37}.Debug.ActiveCfg = Debug|Win32
{C8427D06-C1A9-4B23-83FD-27D93938DE37}.Debug.Build.0 = Debug|Win32
{C8427D06-C1A9-4B23-83FD-27D93938DE37}.Release.ActiveCfg = Release|Win32
--- 814,821 ----
{3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Debug.Build.0 = Debug|Win32
{3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Release.ActiveCfg = Release|Win32
{3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Release.Build.0 = Release|Win32
! {3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Releasex64.ActiveCfg = Releasex64|Win32
! {3ED9E859-7F8B-4FBE-8589-5B7C4886471D}.Releasex64.Build.0 = Releasex64|Win32
{C8427D06-C1A9-4B23-83FD-27D93938DE37}.Debug.ActiveCfg = Debug|Win32
{C8427D06-C1A9-4B23-83FD-27D93938DE37}.Debug.Build.0 = Debug|Win32
{C8427D06-C1A9-4B23-83FD-27D93938DE37}.Release.ActiveCfg = Release|Win32
***************
*** 870,877 ****
{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Debug.Build.0 = Debug|Win32
{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Release.ActiveCfg = Release|Win32
{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Release.Build.0 = Release|Win32
! {FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Releasex64.ActiveCfg = Release|Win32
! {FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Releasex64.Build.0 = Release|Win32
{CEA8E982-E089-410B-91F5-4435E6D57CDE}.Debug.ActiveCfg = Debug|Win32
{CEA8E982-E089-410B-91F5-4435E6D57CDE}.Debug.Build.0 = Debug|Win32
{CEA8E982-E089-410B-91F5-4435E6D57CDE}.Release.ActiveCfg = Release|Win32
--- 826,833 ----
{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Debug.Build.0 = Debug|Win32
{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Release.ActiveCfg = Release|Win32
{FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Release.Build.0 = Release|Win32
! {FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Releasex64.ActiveCfg = Releasex64|Win32
! {FBC41ECC-0ABC-4742-B224-5FD3B5FFCAFE}.Releasex64.Build.0 = Releasex64|Win32
{CEA8E982-E089-410B-91F5-4435E6D57CDE}.Debug.ActiveCfg = Debug|Win32
{CEA8E982-E089-410B-91F5-4435E6D57CDE}.Debug.Build.0 = Debug|Win32
{CEA8E982-E089-410B-91F5-4435E6D57CDE}.Release.ActiveCfg = Release|Win32
***************
*** 882,889 ****
{18BE4128-D152-4D38-9516-69B6450059C5}.Debug.Build.0 = Debug|Win32
{18BE4128-D152-4D38-9516-69B6450059C5}.Release.ActiveCfg = Release|Win32
{18BE4128-D152-4D38-9516-69B6450059C5}.Release.Build.0 = Release|Win32
! {18BE4128-D152-4D38-9516-69B6450059C5}.Releasex64.ActiveCfg = Release|Win32
! {18BE4128-D152-4D38-9516-69B6450059C5}.Releasex64.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
--- 838,845 ----
{18BE4128-D152-4D38-9516-69B6450059C5}.Debug.Build.0 = Debug|Win32
{18BE4128-D152-4D38-9516-69B6450059C5}.Release.ActiveCfg = Release|Win32
{18BE4128-D152-4D38-9516-69B6450059C5}.Release.Build.0 = Release|Win32
! {18BE4128-D152-4D38-9516-69B6450059C5}.Releasex64.ActiveCfg = Releasex64|Win32
! {18BE4128-D152-4D38-9516-69B6450059C5}.Releasex64.Build.0 = Releasex64|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Index: cvsnt.vcproj
===================================================================
RCS file: /cvs/cvsnt/cvsnt.vcproj,v
retrieving revision 1.78.2.79.4.16
diff -c -r1.78.2.79.4.16 cvsnt.vcproj
*** cvsnt.vcproj 1 Jun 2012 07:25:54 -0000 1.78.2.79.4.16
--- cvsnt.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 179,184 ****
--- 179,272 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 194,199 ****
--- 282,293 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 203,208 ****
--- 297,308 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 212,217 ****
--- 312,323 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 221,226 ****
--- 327,338 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 233,238 ****
--- 345,356 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 242,247 ****
--- 360,371 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 254,259 ****
--- 378,389 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 263,268 ****
--- 393,404 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 272,277 ****
--- 408,419 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 281,286 ****
--- 423,434 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 290,295 ****
--- 438,449 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 299,304 ****
--- 453,464 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 315,320 ****
--- 475,487 ----
Name="VCCLCompilerTool"
ObjectFile=".\WinDebug\2/"/>
+
+
+
***************
*** 324,329 ****
--- 491,502 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 333,338 ****
--- 506,517 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 342,347 ****
--- 521,532 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 351,356 ****
--- 536,547 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 363,368 ****
--- 554,565 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 372,377 ****
--- 569,580 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 381,386 ****
--- 584,595 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 390,395 ****
--- 599,610 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 399,404 ****
--- 614,625 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 408,413 ****
--- 629,640 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 417,422 ****
--- 644,655 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 426,431 ****
--- 659,670 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 435,440 ****
--- 674,685 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 444,449 ****
--- 689,700 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 453,458 ****
--- 704,715 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 462,467 ****
--- 719,730 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 474,479 ****
--- 737,748 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 483,488 ****
--- 752,763 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 492,497 ****
--- 767,778 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 501,506 ****
--- 782,793 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 510,515 ****
--- 797,808 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 519,524 ****
--- 812,823 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 528,533 ****
--- 827,838 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 537,542 ****
--- 842,853 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 546,551 ****
--- 857,868 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 555,560 ****
--- 872,883 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 567,572 ****
--- 890,901 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 576,581 ****
--- 905,916 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 585,590 ****
--- 920,931 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 594,599 ****
--- 935,946 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 603,608 ****
--- 950,961 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 612,617 ****
--- 965,976 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 621,626 ****
--- 980,991 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 630,635 ****
--- 995,1006 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 639,644 ****
--- 1010,1021 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 654,659 ****
--- 1031,1042 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 663,668 ****
--- 1046,1057 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 672,677 ****
--- 1061,1072 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 681,686 ****
--- 1076,1087 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 690,695 ****
--- 1091,1102 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 699,704 ****
--- 1106,1117 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 708,713 ****
--- 1121,1132 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 720,725 ****
--- 1139,1150 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 729,734 ****
--- 1154,1165 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 738,743 ****
--- 1169,1180 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 754,759 ****
--- 1191,1203 ----
Name="VCCLCompilerTool"
ObjectFile=".\WinDebug\1/"/>
+
+
+
***************
*** 763,768 ****
--- 1207,1218 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 772,777 ****
--- 1222,1233 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 784,789 ****
--- 1240,1251 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 799,804 ****
--- 1261,1272 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
+
+
+
Index: cvsntsrv.vcproj
===================================================================
RCS file: /cvs/cvsnt/cvsntsrv.vcproj,v
retrieving revision 1.1.4.2
diff -c -r1.1.4.2 cvsntsrv.vcproj
*** cvsntsrv.vcproj 1 Jun 2012 07:25:54 -0000 1.1.4.2
--- cvsntsrv.vcproj 13 Mar 2015 04:17:16 -0000
***************
*** 179,184 ****
--- 179,270 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 194,199 ****
--- 280,291 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 203,208 ****
--- 295,306 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 212,217 ****
--- 310,321 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 221,226 ****
--- 325,336 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 233,238 ****
--- 343,354 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 242,247 ****
--- 358,369 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 254,259 ****
--- 376,387 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 263,268 ****
--- 391,402 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 272,277 ****
--- 406,417 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 281,286 ****
--- 421,432 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 290,295 ****
--- 436,447 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 299,304 ****
--- 451,462 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 315,320 ****
--- 473,485 ----
Name="VCCLCompilerTool"
ObjectFile=".\WinDebug\2/"/>
+
+
+
***************
*** 324,329 ****
--- 489,500 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 333,338 ****
--- 504,515 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 342,347 ****
--- 519,530 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 351,356 ****
--- 534,545 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 363,368 ****
--- 552,563 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 372,377 ****
--- 567,578 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 381,386 ****
--- 582,593 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 390,395 ****
--- 597,608 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 399,404 ****
--- 612,623 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 408,413 ****
--- 627,638 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 417,422 ****
--- 642,653 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 426,431 ****
--- 657,668 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 435,440 ****
--- 672,683 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 444,449 ****
--- 687,698 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 453,458 ****
--- 702,713 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 462,467 ****
--- 717,728 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 474,479 ****
--- 735,746 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 483,488 ****
--- 750,761 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 492,497 ****
--- 765,776 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 501,506 ****
--- 780,791 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 510,515 ****
--- 795,806 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 519,524 ****
--- 810,821 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 528,533 ****
--- 825,836 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 537,542 ****
--- 840,851 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 546,551 ****
--- 855,866 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 555,560 ****
--- 870,881 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 567,572 ****
--- 888,899 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 576,581 ****
--- 903,914 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 585,590 ****
--- 918,929 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 594,599 ****
--- 933,944 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 603,608 ****
--- 948,959 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 612,617 ****
--- 963,974 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 621,626 ****
--- 978,989 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 630,635 ****
--- 993,1004 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 639,644 ****
--- 1008,1019 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 654,659 ****
--- 1029,1040 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 663,668 ****
--- 1044,1055 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 672,677 ****
--- 1059,1070 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 681,686 ****
--- 1074,1085 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 690,695 ****
--- 1089,1100 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 699,704 ****
--- 1104,1115 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 708,713 ****
--- 1119,1130 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 720,725 ****
--- 1137,1148 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 729,734 ****
--- 1152,1163 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 738,743 ****
--- 1167,1178 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 754,759 ****
--- 1189,1201 ----
Name="VCCLCompilerTool"
ObjectFile=".\WinDebug\1/"/>
+
+
+
***************
*** 763,768 ****
--- 1205,1216 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 772,777 ****
--- 1220,1231 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 784,789 ****
--- 1238,1249 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
***************
*** 799,804 ****
--- 1259,1270 ----
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"/>
+
+
+
+
+
+
Index: WorkspaceViewer/WorkspaceViewer.vcproj
===================================================================
RCS file: /cvs/cvsnt/WorkspaceViewer/WorkspaceViewer.vcproj,v
retrieving revision 1.1.2.7.4.3
diff -c -r1.1.2.7.4.3 WorkspaceViewer.vcproj
*** WorkspaceViewer/WorkspaceViewer.vcproj 29 Sep 2009 14:55:42 -0000 1.1.2.7.4.3
--- WorkspaceViewer/WorkspaceViewer.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 79,85 ****
MinimalRebuild="FALSE"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="TRUE"
! UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
--- 79,85 ----
MinimalRebuild="FALSE"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="TRUE"
! UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
Index: control-panel/ControlService.cpp
===================================================================
RCS file: /cvs/cvsnt/control-panel/ControlService.cpp,v
retrieving revision 1.1.2.6.4.1
diff -c -r1.1.2.6.4.1 ControlService.cpp
*** control-panel/ControlService.cpp 16 May 2008 00:12:10 -0000 1.1.2.6.4.1
--- control-panel/ControlService.cpp 10 Mar 2015 06:33:24 -0000
***************
*** 315,321 ****
if (WSAStartup (MAKEWORD (1, 1), &data))
#else
int wsockver=2;
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\CVS\\Pserver",NULL,KEY_QUERY_VALUE,&hk))
{
dwTmp=sizeof(szTmp);
if(!RegQueryValueEx(hk,"WinSockVer",NULL,&dwType,(BYTE*)szTmp,&dwTmp))
--- 315,321 ----
if (WSAStartup (MAKEWORD (1, 1), &data))
#else
int wsockver=2;
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\CVS\\Pserver",NULL,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hk))
{
dwTmp=sizeof(szTmp);
if(!RegQueryValueEx(hk,"WinSockVer",NULL,&dwType,(BYTE*)szTmp,&dwTmp))
***************
*** 340,346 ****
return;
}
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\CVS\\Pserver",NULL,KEY_QUERY_VALUE,&hk))
{
dwTmp=sizeof(szTmp);
if(!RegQueryValueEx(hk,"ControlPanel",NULL,&dwType,(BYTE*)szTmp,&dwTmp))
--- 340,346 ----
return;
}
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\CVS\\Pserver",NULL,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hk))
{
dwTmp=sizeof(szTmp);
if(!RegQueryValueEx(hk,"ControlPanel",NULL,&dwType,(BYTE*)szTmp,&dwTmp))
Index: cvsagent/win32/cvsagent.vcproj
===================================================================
RCS file: /cvs/cvsnt/cvsagent/win32/cvsagent.vcproj,v
retrieving revision 1.1.2.19.4.5
diff -c -r1.1.2.19.4.5 cvsagent.vcproj
*** cvsagent/win32/cvsagent.vcproj 29 Sep 2009 14:55:42 -0000 1.1.2.19.4.5
--- cvsagent/win32/cvsagent.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 101,107 ****
TreatWChar_tAsBuiltInType="TRUE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
! UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"
--- 101,107 ----
TreatWChar_tAsBuiltInType="TRUE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
! UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"
Index: cvsapi/FileAccess.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/FileAccess.h,v
retrieving revision 1.1.2.10.4.9
diff -c -r1.1.2.10.4.9 FileAccess.h
*** cvsapi/FileAccess.h 5 Jun 2008 22:26:13 -0000 1.1.2.10.4.9
--- cvsapi/FileAccess.h 23 Sep 2014 22:57:30 -0000
***************
*** 45,50 ****
--- 45,51 ----
#endif
#endif
+ #ifdef USE_UC_NAMN
#ifdef _WIN32
#ifndef _UNICODE
#define uc_namn LPCSTR
***************
*** 63,68 ****
--- 64,70 ----
#endif
#else
#define uc_namn const char *
+ #endif
#endif
class CFileAccess
Index: cvsapi/cvs_string.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/cvs_string.cpp,v
retrieving revision 1.1.2.15.4.4
diff -c -r1.1.2.15.4.4 cvs_string.cpp
*** cvsapi/cvs_string.cpp 24 Sep 2012 07:42:03 -0000 1.1.2.15.4.4
--- cvsapi/cvs_string.cpp 2 Mar 2015 22:50:00 -0000
***************
*** 37,42 ****
--- 37,49 ----
#endif
#endif
+
+ #if defined( _NATIVE_WCHAR_T_DEFINED ) && defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ // wish there was something like #pragma comment(compiler, "/Zc:wchar_t-")
+ #error "VS2003.NET x64 builds must define wchar_t as unsigned short by using compiler switch /Zc:wchar_t-"
+ #endif
+
+
#include "cvs_string.h"
// Win32 doesn't support template instantiation, however some
Index: cvsapi/cvs_string.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/cvs_string.h,v
retrieving revision 1.1.2.32.4.10
diff -c -r1.1.2.32.4.10 cvs_string.h
*** cvsapi/cvs_string.h 24 Sep 2012 06:55:00 -0000 1.1.2.32.4.10
--- cvsapi/cvs_string.h 13 Mar 2015 06:54:17 -0000
***************
*** 19,34 ****
#ifndef CVS_STRING__H
#define CVS_STRING__H
! #include
#include
#include
#include
! #include
#ifdef HAVE_WCHAR_H
#include
#endif
/* If this is a nonstandard compiler (gcc-2.95) we define our own wstring */
#ifndef HAVE_WSTRING
namespace std
--- 19,43 ----
#ifndef CVS_STRING__H
#define CVS_STRING__H
! #include
#include
#include
#include
! #include
!
#ifdef HAVE_WCHAR_H
#include
#endif
+ /*
+ #if defined( _NATIVE_WCHAR_T_DEFINED ) && defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ // wish there was something like #pragma comment(compiler, "/Zc:wchar_t-")
+ #error "VS2003.NET x64 builds must define wchar_t as unsigned short by using compiler switch /Zc:wchar_t-"
+ #endif
+ */
+
+
/* If this is a nonstandard compiler (gcc-2.95) we define our own wstring */
#ifndef HAVE_WSTRING
namespace std
***************
*** 136,142 ****
--- 145,156 ----
void quote_vsnprintf(_Typ& str, size_t size_hint, const char *fmt, va_list va)
{
int res;
+ #if defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ // this is VS2003.NET x64 compile which doesn't seem to have a .clear() method to basic_string ?!?
+ str.erase();
+ #else
str.clear();
+ #endif
str.resize(size_hint?size_hint:strlen(fmt)+256);
va_list xva;
***************
*** 175,181 ****
--- 189,199 ----
do
{
va_copy(xva,va);
+ #if defined ( _WIN32 )
+ int res = ::_vsnwprintf((wchar_t*)str.data(), str.size(), fmt, xva);
+ #else
int res = ::vswprintf((wchar_t*)str.data(), str.size(), fmt, xva);
+ #endif
va_end(xva);
if(res<0) /* SuSv2, Win32 */
str.resize(str.size()*2);
***************
*** 231,238 ****
{
const unsigned char *p=(const unsigned char *)src;
wchar_t ch;
! size_t srclen=strlen(src);
! w_str.reserve(srclen*3);
w_str=L"\0";
while(*p)
{
--- 249,257 ----
{
const unsigned char *p=(const unsigned char *)src;
wchar_t ch;
! // strlen(NULL) causes a crash (duh?!?) - so handle it nice
! size_t strlen_src=(src)?strlen(src):0;
! w_str.reserve(strlen_src*3);
w_str=L"\0";
while(*p)
{
Index: cvsapi/cvsapi.vcproj
===================================================================
RCS file: /cvs/cvsnt/cvsapi/cvsapi.vcproj,v
retrieving revision 1.1.2.45.4.18
diff -c -r1.1.2.45.4.18 cvsapi.vcproj
*** cvsapi/cvsapi.vcproj 8 Jun 2010 15:38:27 -0000 1.1.2.45.4.18
--- cvsapi/cvsapi.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 157,162 ****
--- 157,240 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 698,703 ****
--- 776,789 ----
+
+
+
first]=SQL_NTS;
! m_sqlv[i->first].ws=i->second;
ret = SQLBindParameter(hStmt,i->first+1,SQL_PARAM_INPUT,SQL_C_WCHAR,SQL_WVARCHAR,(SQLINTEGER)m_sqlv[i->first].ws.size()+1,0,(SQLPOINTER)m_sqlv[i->first].ws.c_str(),(SQLINTEGER)m_sqlv[i->first].ws.size()+1,&m_sqli[i->first]);
break;
}
--- 263,269 ----
break;
case CSqlVariant::vtWString:
m_sqli[i->first]=SQL_NTS;
! m_sqlv[i->first].ws=(const wchar_t*)i->second;
ret = SQLBindParameter(hStmt,i->first+1,SQL_PARAM_INPUT,SQL_C_WCHAR,SQL_WVARCHAR,(SQLINTEGER)m_sqlv[i->first].ws.size()+1,0,(SQLPOINTER)m_sqlv[i->first].ws.c_str(),(SQLINTEGER)m_sqlv[i->first].ws.size()+1,&m_sqli[i->first]);
break;
}
***************
*** 341,347 ****
}
long id;
! SQLINTEGER len;
m_lasterror=SQLBindCol(hStmt,1,SQL_C_LONG,&id,sizeof(id),&len);
if(!SQL_SUCCEEDED(m_lasterror))
--- 341,347 ----
}
long id;
! SQLLEN len;
m_lasterror=SQLBindCol(hStmt,1,SQL_C_LONG,&id,sizeof(id),&len);
if(!SQL_SUCCEEDED(m_lasterror))
Index: cvsapi/db2/Db2Connection.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/db2/Db2Connection.h,v
retrieving revision 1.1.2.2.4.2
diff -c -r1.1.2.2.4.2 Db2Connection.h
*** cvsapi/db2/Db2Connection.h 3 Jun 2010 03:53:07 -0000 1.1.2.2.4.2
--- cvsapi/db2/Db2Connection.h 12 Sep 2014 04:44:56 -0000
***************
*** 72,78 ****
cvs::string m_lasterrorString;
cvs::wstring m_lastrsError;
std::map m_bindVars;
! std::map m_sqli;
std::map m_sqlv;
CSqlRecordsetPtr _Execute(const char *string);
--- 72,78 ----
cvs::string m_lasterrorString;
cvs::wstring m_lastrsError;
std::map m_bindVars;
! std::map m_sqli;
std::map m_sqlv;
CSqlRecordsetPtr _Execute(const char *string);
Index: cvsapi/db2/Db2Recordset.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/db2/Db2Recordset.h,v
retrieving revision 1.1.2.1
diff -c -r1.1.2.1 Db2Recordset.h
*** cvsapi/db2/Db2Recordset.h 1 Feb 2006 15:23:34 -0000 1.1.2.1
--- cvsapi/db2/Db2Recordset.h 12 Sep 2014 04:44:10 -0000
***************
*** 48,57 ****
HSTMT hStmt;
cvs::wstring name;
SQLSMALLINT type,ctype;
! SQLUINTEGER size;
SQLSMALLINT decimal;
SQLSMALLINT null;
! SQLINTEGER fldlen,datalen;
void *data;
SQLSMALLINT field;
cvs::wstring tmpwstr;
--- 48,57 ----
HSTMT hStmt;
cvs::wstring name;
SQLSMALLINT type,ctype;
! SQLULEN size;
SQLSMALLINT decimal;
SQLSMALLINT null;
! SQLLEN fldlen,datalen;
void *data;
SQLSMALLINT field;
cvs::wstring tmpwstr;
Index: cvsapi/lib/api_system.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/lib/api_system.h,v
retrieving revision 1.1.2.27.4.2
diff -c -r1.1.2.27.4.2 api_system.h
*** cvsapi/lib/api_system.h 4 Nov 2009 13:54:15 -0000 1.1.2.27.4.2
--- cvsapi/lib/api_system.h 23 Sep 2014 22:28:10 -0000
***************
*** 60,65 ****
--- 60,71 ----
#define CVSAPI_EXPORT
#endif
+ #ifdef __cplusplus
+ #define CVSNT_EXPORT extern "C" __declspec(dllexport)
+ #else
+ #define CVSNT_EXPORT __declspec(dllexport)
+ #endif
+
#ifndef PATH_MAX
#define PATH_MAX _MAX_PATH
#endif
***************
*** 172,177 ****
--- 178,187 ----
#ifndef TIME_T_SPRINTF
#define TIME_T_SPRINTF "l"
+ #endif
+
+ #ifndef CVSNT_EXPORT
+ #define CVSNT_EXPORT
#endif
/* Default is to search for libtool (.la) extenstions - this should work on all platforms except win32 */
Index: cvsapi/mssql/MssqlConnection.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/mssql/MssqlConnection.cpp,v
retrieving revision 1.1.2.5.4.17
diff -c -r1.1.2.5.4.17 MssqlConnection.cpp
*** cvsapi/mssql/MssqlConnection.cpp 3 Jun 2010 03:53:07 -0000 1.1.2.5.4.17
--- cvsapi/mssql/MssqlConnection.cpp 11 Mar 2015 07:26:04 -0000
***************
*** 323,329 ****
case CSqlVariant::vtWString:
CServerIo::trace(3,"Bind vtWString (SQL Server)");
m_sqli[i->first]=SQL_NTS;
! m_sqlv[i->first].ws=i->second;
CServerIo::trace(3,"Bind vtWString (SQL Server)");
ret = SQLBindParameter(hStmt,i->first+1,SQL_PARAM_INPUT,SQL_C_WCHAR,SQL_WVARCHAR,(SQLINTEGER)m_sqlv[i->first].ws.size()+1,0,(SQLPOINTER)m_sqlv[i->first].ws.c_str(),(SQLINTEGER)m_sqlv[i->first].ws.size()+1,&m_sqli[i->first]);
break;
--- 323,329 ----
case CSqlVariant::vtWString:
CServerIo::trace(3,"Bind vtWString (SQL Server)");
m_sqli[i->first]=SQL_NTS;
! m_sqlv[i->first].ws=(const wchar_t*)i->second;
CServerIo::trace(3,"Bind vtWString (SQL Server)");
ret = SQLBindParameter(hStmt,i->first+1,SQL_PARAM_INPUT,SQL_C_WCHAR,SQL_WVARCHAR,(SQLINTEGER)m_sqlv[i->first].ws.size()+1,0,(SQLPOINTER)m_sqlv[i->first].ws.c_str(),(SQLINTEGER)m_sqlv[i->first].ws.size()+1,&m_sqli[i->first]);
break;
***************
*** 404,410 ****
}
long id;
! SQLINTEGER len;
m_lasterror=SQLBindCol(hStmt,1,SQL_C_LONG,&id,sizeof(id),&len);
if(!SQL_SUCCEEDED(m_lasterror))
--- 404,410 ----
}
long id;
! SQLLEN len;
m_lasterror=SQLBindCol(hStmt,1,SQL_C_LONG,&id,sizeof(id),&len);
if(!SQL_SUCCEEDED(m_lasterror))
Index: cvsapi/mssql/MssqlConnection.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/mssql/MssqlConnection.h,v
retrieving revision 1.1.2.2.4.5
diff -c -r1.1.2.2.4.5 MssqlConnection.h
*** cvsapi/mssql/MssqlConnection.h 3 Jun 2010 03:53:07 -0000 1.1.2.2.4.5
--- cvsapi/mssql/MssqlConnection.h 12 Sep 2014 03:54:14 -0000
***************
*** 73,79 ****
cvs::string m_lasterrorString;
cvs::wstring m_lastrsError;
std::map m_bindVars;
! std::map m_sqli;
std::map m_sqlv;
CSqlRecordsetPtr _Execute(const char *string);
--- 73,79 ----
cvs::string m_lasterrorString;
cvs::wstring m_lastrsError;
std::map m_bindVars;
! std::map m_sqli;
std::map m_sqlv;
CSqlRecordsetPtr _Execute(const char *string);
Index: cvsapi/mssql/MssqlRecordset.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/mssql/MssqlRecordset.h,v
retrieving revision 1.1.2.1
diff -c -r1.1.2.1 MssqlRecordset.h
*** cvsapi/mssql/MssqlRecordset.h 23 Oct 2005 16:15:04 -0000 1.1.2.1
--- cvsapi/mssql/MssqlRecordset.h 12 Sep 2014 03:47:00 -0000
***************
*** 48,57 ****
HSTMT hStmt;
cvs::wstring name;
SQLSMALLINT type,ctype;
! SQLUINTEGER size;
SQLSMALLINT decimal;
SQLSMALLINT null;
! SQLINTEGER fldlen,datalen;
void *data;
SQLSMALLINT field;
cvs::wstring tmpwstr;
--- 48,57 ----
HSTMT hStmt;
cvs::wstring name;
SQLSMALLINT type,ctype;
! SQLULEN size;
SQLSMALLINT decimal;
SQLSMALLINT null;
! SQLLEN fldlen,datalen;
void *data;
SQLSMALLINT field;
cvs::wstring tmpwstr;
Index: cvsapi/mysql/MySqlConnection.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/mysql/MySqlConnection.cpp,v
retrieving revision 1.1.2.21.4.7
diff -c -r1.1.2.21.4.7 MySqlConnection.cpp
*** cvsapi/mysql/MySqlConnection.cpp 4 Aug 2011 05:56:40 -0000 1.1.2.21.4.7
--- cvsapi/mysql/MySqlConnection.cpp 13 Mar 2015 00:47:29 -0000
***************
*** 33,42 ****
--- 33,67 ----
#include
#else
/* Win32 includes its own copy */
+ #if ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ #pragma comment(lib, "mysql/mysql-3.23/x64/libmySQL64.lib")
+ #else
+ #pragma comment(lib, "mysql/mysql-3.23/libmySQL.lib")
+ #endif
+
#include "mysql-3.23/mysql.h"
#endif
#include
+ //using namespace std;
+ #if (0) /* disable this?? */
+ #ifdef _MSC_VER /* Microsoft section */
+ #ifdef _WIN64
+ template std::string::size_type std::string::npos;
+ template std::wstring::size_type std::wstring::npos;
+ typedef std::basic_string, std::allocator > basicStr;
+ typedef std::basic_string, std::allocator > wbasicStr;
+ //typedef std::basic_string, std::allocator > wbasicStr2 (wbasicStr const &);
+ /*typedef std::basic_string,class std::allocator >
+ ::basic_string,class std::allocator >
+ (class std::basic_string,class std::allocator > const &) unresolvedStr; */
+ class __declspec(dllexport) TmpString : public basicStr { };
+ class __declspec(dllexport) wTmpString : public wbasicStr { };
+ //class __declspec(dllexport) wTmpString2 : public wbasicStr2 (wbasicStr const &) { };
+ # endif /* x64 build */
+ #endif /* Microsoft section */
+ #endif /* disable as causes link errors */
+
#include "../ServerIO.h"
#include "../cvs_string.h"
#include "MySqlRecordset.h"
Index: cvsapi/mysql/MySqlRecordset.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/mysql/MySqlRecordset.cpp,v
retrieving revision 1.1.2.10.4.1
diff -c -r1.1.2.10.4.1 MySqlRecordset.cpp
*** cvsapi/mysql/MySqlRecordset.cpp 28 Feb 2008 06:48:08 -0000 1.1.2.10.4.1
--- cvsapi/mysql/MySqlRecordset.cpp 13 Mar 2015 00:47:29 -0000
***************
*** 32,37 ****
--- 32,42 ----
#include "../lib/api_system.h"
#ifdef _WIN32
+ #if ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ #pragma comment(lib, "mysql/mysql-3.23/x64/libmySQL64.lib")
+ #else
+ #pragma comment(lib, "mysql/mysql-3.23/libmySQL.lib")
+ #endif
#include "mysql-3.23/mysql.h"
#else
#include
Index: cvsapi/mysql/MySqlRecordset.h
===================================================================
RCS file: /cvs/cvsnt/cvsapi/mysql/MySqlRecordset.h,v
retrieving revision 1.1.2.9
diff -c -r1.1.2.9 MySqlRecordset.h
*** cvsapi/mysql/MySqlRecordset.h 9 Jul 2005 23:07:59 -0000 1.1.2.9
--- cvsapi/mysql/MySqlRecordset.h 13 Mar 2015 07:01:19 -0000
***************
*** 51,57 ****
MYSQL_FIELD *field;
void *data;
char num_string[64];
! std::wstring wdata;
unsigned long length;
char is_null;
};
--- 51,57 ----
MYSQL_FIELD *field;
void *data;
char num_string[64];
! cvs::wstring wdata;
unsigned long length;
char is_null;
};
Index: cvsapi/oracle/OracleConnection.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/oracle/OracleConnection.cpp,v
retrieving revision 1.1.2.18
diff -c -r1.1.2.18 OracleConnection.cpp
*** cvsapi/oracle/OracleConnection.cpp 15 Aug 2011 19:03:41 -0000 1.1.2.18
--- cvsapi/oracle/OracleConnection.cpp 12 Sep 2014 03:36:34 -0000
***************
*** 30,35 ****
--- 30,42 ----
#include
#ifdef _WIN32
#include
+
+ #if (DELAYLOAD_VERSION >= 0x0200) && (defined(_WIN64)) && (!defined(_DELAY_IMP_VER))
+ ExternC
+ HRESULT WINAPI
+ __HrLoadAllImportsForDll(LPCSTR szDll);
+ #endif
+
#endif
#if defined(HAVE_ORACLE)
Index: cvsapi/win32/DnsApi.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/win32/DnsApi.cpp,v
retrieving revision 1.1.2.1.4.1
diff -c -r1.1.2.1.4.1 DnsApi.cpp
*** cvsapi/win32/DnsApi.cpp 6 Mar 2007 23:37:45 -0000 1.1.2.1.4.1
--- cvsapi/win32/DnsApi.cpp 12 Sep 2014 03:36:34 -0000
***************
*** 24,29 ****
--- 24,35 ----
#include
#include
+ #if (DELAYLOAD_VERSION >= 0x0200) && (defined(_WIN64)) && (!defined(_DELAY_IMP_VER))
+ ExternC
+ HRESULT WINAPI
+ __HrLoadAllImportsForDll(LPCSTR szDll);
+ #endif
+
#include
#include "../lib/api_system.h"
Index: cvsapi/win32/FileAccess.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/win32/FileAccess.cpp,v
retrieving revision 1.1.2.18.4.9
diff -c -r1.1.2.18.4.9 FileAccess.cpp
*** cvsapi/win32/FileAccess.cpp 8 Jun 2010 15:38:27 -0000 1.1.2.18.4.9
--- cvsapi/win32/FileAccess.cpp 23 Sep 2014 22:58:50 -0000
***************
*** 16,31 ****
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Win32 specific */
#define WIN32_LEAN_AND_MEAN
#define STRICT
#include
#include
#include
- #include
#include
- #include "../lib/api_system.h"
#include "../cvs_string.h"
#include "../FileAccess.h"
#include "../ServerIO.h"
--- 16,33 ----
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Win32 specific */
+ #include
+ #include "../lib/api_system.h"
+
#define WIN32_LEAN_AND_MEAN
#define STRICT
#include
#include
#include
+ #include
#include
#include "../cvs_string.h"
#include "../FileAccess.h"
#include "../ServerIO.h"
***************
*** 81,86 ****
--- 83,89 ----
{ ERROR_NOT_ENOUGH_QUOTA, ENOMEM } /* 1816 */
};
+ #ifdef USE_UC_NAMN
#ifdef _UNICODE
int win32_global_codepage = CP_ACP;
uc_namn::uc_namn(const char *file)
***************
*** 106,111 ****
--- 109,115 ----
if(_fnp) delete[] _fnp;
}
#endif
+ #endif
CFileAccess::CFileAccess()
{
***************
*** 395,401 ****
--- 399,409 ----
void CFileAccess::make_directories (const char *name)
{
+ #ifdef USE_UC_NAMN
uc_namn fn = name;
+ #else
+ Win32Wide fn = name;
+ #endif
_tmake_directories(name,fn);
}
***************
*** 592,598 ****
--- 600,608 ----
void CFileAccess::Win32SetUtf8Mode(bool bUtf8Mode)
{
+ #ifdef USE_UC_NAMN
win32_global_codepage=CP_UTF8;
+ #endif
m_bUtf8Mode = bUtf8Mode;
}
Index: cvsapi/win32/SocketIO.cpp
===================================================================
RCS file: /cvs/cvsnt/cvsapi/win32/SocketIO.cpp,v
retrieving revision 1.1.2.14.4.19
diff -c -r1.1.2.14.4.19 SocketIO.cpp
*** cvsapi/win32/SocketIO.cpp 29 Jun 2012 07:31:06 -0000 1.1.2.14.4.19
--- cvsapi/win32/SocketIO.cpp 10 Mar 2015 06:33:46 -0000
***************
*** 1413,1419 ****
int startres=0;
int wsockver=2;
HKEY hk;
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\CVS\\Pserver"),NULL,KEY_QUERY_VALUE,&hk))
{
DWORD dwTmp,dwType;
char szTmp[1024];
--- 1413,1419 ----
int startres=0;
int wsockver=2;
HKEY hk;
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\CVS\\Pserver"),NULL,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hk))
{
DWORD dwTmp,dwType;
char szTmp[1024];
Index: cvsdelta/cvsdelta.vcproj
===================================================================
RCS file: /cvs/cvsnt/cvsdelta/cvsdelta.vcproj,v
retrieving revision 1.2.2.8
diff -c -r1.2.2.8 cvsdelta.vcproj
*** cvsdelta/cvsdelta.vcproj 30 Jun 2006 12:55:22 -0000 1.2.2.8
--- cvsdelta/cvsdelta.vcproj 13 Mar 2015 00:14:28 -0000
***************
*** 64,71 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
!
!
!
!
!
!
!
!
!
!
!
!
!
!
=0; dwIndex++)
--- 212,218 ----
bufLen=sizeof(buf);
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\CVS\\License"),0,KEY_READ|KEY_WOW64_32KEY,&g_hLicenseKey))
return 0;
for(DWORD dwIndex=0; dwIndex>=0; dwIndex++)
Index: cvstools/RootSplitter.cpp
===================================================================
RCS file: /cvs/cvsnt/cvstools/RootSplitter.cpp,v
retrieving revision 1.1.2.6.4.6
diff -c -r1.1.2.6.4.6 RootSplitter.cpp
*** cvstools/RootSplitter.cpp 31 May 2012 02:47:30 -0000 1.1.2.6.4.6
--- cvstools/RootSplitter.cpp 11 Mar 2015 07:32:28 -0000
***************
*** 46,51 ****
--- 46,63 ----
m_port.reserve(64);
m_directory.reserve(64);
m_module.reserve(64);
+ #if defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ // this is VS2003.NET x64 compile which doesn't seem to have a .clear() method to basic_string ?!?
+ m_root.erase();
+ m_protocol.erase();
+ m_keywords.erase();
+ m_username.erase();
+ m_password.erase();
+ m_server.erase();
+ m_port.erase();
+ m_directory.erase();
+ m_module.erase();
+ #else
m_root.clear();
m_protocol.clear();
m_keywords.clear();
***************
*** 55,60 ****
--- 67,73 ----
m_port.clear();
m_directory.clear();
m_module.clear();
+ #endif
m_root.reserve(100+256);
m_protocol.reserve(100+256);
m_keywords.reserve(100+256);
Index: cvstools/ServerConnection.cpp
===================================================================
RCS file: /cvs/cvsnt/cvstools/ServerConnection.cpp,v
retrieving revision 1.1.2.10.4.9
diff -c -r1.1.2.10.4.9 ServerConnection.cpp
*** cvstools/ServerConnection.cpp 31 May 2012 04:36:22 -0000 1.1.2.10.4.9
--- cvstools/ServerConnection.cpp 11 Mar 2015 07:32:28 -0000
***************
*** 59,64 ****
--- 59,83 ----
password.reserve(64);
module.reserve(64);
srvname.reserve(64);
+ #if defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ // this is VS2003.NET x64 compile which doesn't seem to have a .clear() method to basic_string ?!?
+ server.erase();
+ serverfqdn.erase();
+ ipv4.erase();
+ port.erase();
+ root.erase();
+ directory.erase();
+ tag.erase();
+ anon_user.erase();
+ anon_proto.erase();
+ default_proto.erase();
+ protocol.erase();
+ keywords.erase();
+ username.erase();
+ password.erase();
+ module.erase();
+ srvname.erase();
+ #else
server.clear();
serverfqdn.clear();
ipv4.clear();
***************
*** 75,80 ****
--- 94,100 ----
password.clear();
module.clear();
srvname.clear();
+ #endif
server.reserve(128+256);
serverfqdn.reserve(512+256);
ipv4.reserve(100+256);
Index: cvstools/ServerInfo.cpp
===================================================================
RCS file: /cvs/cvsnt/cvstools/ServerInfo.cpp,v
retrieving revision 1.1.2.7.4.9
diff -c -r1.1.2.7.4.9 ServerInfo.cpp
*** cvstools/ServerInfo.cpp 29 Aug 2012 07:47:37 -0000 1.1.2.7.4.9
--- cvstools/ServerInfo.cpp 11 Mar 2015 07:33:07 -0000
***************
*** 135,141 ****
--- 135,146 ----
} // do_retry_begin_senum
while (do_retry_begin_senum);
mystage=6;
+ #if defined ( _WIN32 ) && ( _M_AMD64 == 100 ) && ( _MSC_VER == 1400 )
+ // this is VS2003.NET x64 compile which doesn't seem to have a .clear() method to basic_string ?!?
+ line.erase();
+ #else
line.clear();
+ #endif
geterr = sockptr->getline(line,2000,3,"Waiting for server response to enum request...\n");
if ((!geterr)&&(line.size()==0))
{
Index: cvstools/cvstools.vcproj
===================================================================
RCS file: /cvs/cvsnt/cvstools/cvstools.vcproj,v
retrieving revision 1.1.2.16.4.6
diff -c -r1.1.2.16.4.6 cvstools.vcproj
*** cvstools/cvstools.vcproj 9 Mar 2010 23:33:49 -0000 1.1.2.16.4.6
--- cvstools/cvstools.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 38,44 ****
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
! PrecompiledHeaderFile=".\Release/cvstools.pch"
AssemblerListingLocation="$(IntDir)/"
ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="$(IntDir)/"
--- 38,44 ----
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
! PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
AssemblerListingLocation="$(IntDir)/"
ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="$(IntDir)/"
***************
*** 156,161 ****
--- 156,239 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 233,238 ****
--- 311,322 ----
+
+
+
Index: cvstools/win32/GlobalSettings.cpp
===================================================================
RCS file: /cvs/cvsnt/cvstools/win32/GlobalSettings.cpp,v
retrieving revision 1.1.2.16.4.8
diff -c -r1.1.2.16.4.8 GlobalSettings.cpp
*** cvstools/win32/GlobalSettings.cpp 3 Oct 2012 06:36:44 -0000 1.1.2.16.4.8
--- cvstools/win32/GlobalSettings.cpp 10 Mar 2015 06:36:25 -0000
***************
*** 168,179 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ,&hKey))
return -1; // Couldn't open or create key
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 168,179 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WOW64_32KEY,&hKey))
return -1; // Couldn't open or create key
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ|KEY_WOW64_32KEY,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 214,229 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WRITE,&hKey) &&
! RegCreateKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 214,229 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey) &&
! RegCreateKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE|KEY_WOW64_32KEY,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE|KEY_WOW64_32KEY,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 261,276 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WRITE,&hKey) &&
! RegCreateKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 261,276 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey) &&
! RegCreateKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE|KEY_WOW64_32KEY,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE|KEY_WOW64_32KEY,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 303,316 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 303,316 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WOW64_32KEY,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ|KEY_WOW64_32KEY,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 345,358 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 345,358 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WOW64_32KEY,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ|KEY_WOW64_32KEY,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 382,388 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WRITE,&hKey))
return -1; // Couldn't open or create key
RegDeleteKeyA(hKey,key);
--- 382,388 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_CURRENT_USER,regkey.c_str(),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey))
return -1; // Couldn't open or create key
RegDeleteKeyA(hKey,key);
***************
*** 434,447 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 434,447 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WOW64_32KEY,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ|KEY_WOW64_32KEY,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 478,493 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WRITE,&hKey) &&
! RegCreateKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 478,493 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey) &&
! RegCreateKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE|KEY_WOW64_32KEY,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE|KEY_WOW64_32KEY,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 528,543 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WRITE,&hKey) &&
! RegCreateKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 528,543 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey) &&
! RegCreateKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,NULL,0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKey,NULL))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_WRITE|KEY_WOW64_32KEY,&hSubKey) &&
! RegCreateKeyExA(hKey,key,0,NULL,0,KEY_WRITE|KEY_WOW64_32KEY,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 583,596 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 583,596 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WOW64_32KEY,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ|KEY_WOW64_32KEY,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 625,638 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
--- 625,638 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WOW64_32KEY,&hKey))
{
return -1; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyExA(hKey,key,0,KEY_READ|KEY_WOW64_32KEY,&hSubKey))
{
RegCloseKey(hKey);
return -1; // Couldn't open or create key
***************
*** 662,668 ****
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WRITE,&hKey))
{
return -1; // Couldn't open or create key
}
--- 662,668 ----
else
cvs::sprintf(regkey,64,"Software\\March Hare Software Ltd\\%s",product);
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,regkey.c_str(),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey))
{
return -1; // Couldn't open or create key
}
Index: diff/libdiff.vcproj
===================================================================
RCS file: /cvs/cvsnt/diff/libdiff.vcproj,v
retrieving revision 1.6.2.11.6.2
diff -c -r1.6.2.11.6.2 libdiff.vcproj
*** diff/libdiff.vcproj 27 May 2008 03:42:12 -0000 1.6.2.11.6.2
--- diff/libdiff.vcproj 13 Mar 2015 00:11:48 -0000
***************
*** 14,21 ****
--- 53,59 ----
Name="VCCustomBuildTool"/>
***************
*** 139,144 ****
--- 139,208 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 195,200 ****
--- 259,270 ----
+
+
+
Index: expat/vcnet/expat.vcproj
===================================================================
RCS file: /cvs/cvsnt/expat/vcnet/expat.vcproj,v
retrieving revision 1.1.2.7
diff -c -r1.1.2.7 expat.vcproj
*** expat/vcnet/expat.vcproj 30 Jun 2006 12:55:22 -0000 1.1.2.7
--- expat/vcnet/expat.vcproj 11 Mar 2015 07:12:58 -0000
***************
*** 61,68 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- 50,56 ----
Name="VCCustomBuildTool"/>
***************
*** 114,119 ****
--- 114,183 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lockservice/lockservice.cpp
===================================================================
RCS file: /cvs/cvsnt/lockservice/lockservice.cpp,v
retrieving revision 1.5.2.25.4.7
diff -c -r1.5.2.25.4.7 lockservice.cpp
*** lockservice/lockservice.cpp 31 May 2012 02:47:31 -0000 1.5.2.25.4.7
--- lockservice/lockservice.cpp 10 Mar 2015 06:31:05 -0000
***************
*** 582,588 ****
}
}
! static BOOL WINAPI MiniDumpDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TCHAR tmp[64];
static int nCountdown;
--- 582,588 ----
}
}
! static INT_PTR WINAPI MiniDumpDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TCHAR tmp[64];
static int nCountdown;
***************
*** 1589,1595 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 1589,1595 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 1657,1663 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 1657,1663 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 1719,1725 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 1719,1725 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 1740,1746 ****
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
--- 1740,1746 ----
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
***************
*** 1802,1808 ****
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueExA(hKeyReg,
strname,
--- 1802,1808 ----
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueExA(hKeyReg,
strname,
***************
*** 2152,2163 ****
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKeyA(HKEY_LOCAL_MACHINE,subkey,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)&dwVal,&dwLen))
return defaultval;
return dwVal;
}
--- 2152,2168 ----
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)&dwVal,&dwLen))
+ {
+ RegCloseKey(hKey);
return defaultval;
+ }
+
+ RegCloseKey(hKey);
return dwVal;
}
***************
*** 2171,2182 ****
static char buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKeyA(HKEY_LOCAL_MACHINE,subkey,&hKey))
return "(no key)";
dwLen=sizeof(buf);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)buf,&dwLen))
return "(no value)";
return buf;
}
--- 2176,2192 ----
static char buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return "(no key)";
dwLen=sizeof(buf);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)buf,&dwLen))
+ {
+ RegCloseKey(hKey);
return "(no value)";
+ }
+
+ RegCloseKey(hKey);
return buf;
}
Index: lockservice/lockservice.vcproj
===================================================================
RCS file: /cvs/cvsnt/lockservice/lockservice.vcproj,v
retrieving revision 1.5.2.23.4.7
diff -c -r1.5.2.23.4.7 lockservice.vcproj
*** lockservice/lockservice.vcproj 4 Aug 2011 05:56:41 -0000 1.5.2.23.4.7
--- lockservice/lockservice.vcproj 11 Mar 2015 06:44:34 -0000
***************
*** 87,94 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- 110,179 ----
Name="VCCustomBuildTool"/>
!
!
!
!
!
!
!
!
!
!
!
!
!
!
Index: plink/plink.vcproj
===================================================================
RCS file: /cvs/cvsnt/plink/plink.vcproj,v
retrieving revision 1.5.2.13.4.4
diff -c -r1.5.2.13.4.4 plink.vcproj
*** plink/plink.vcproj 12 Sep 2012 00:43:11 -0000 1.5.2.13.4.4
--- plink/plink.vcproj 11 Mar 2015 06:56:51 -0000
***************
*** 81,88 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 292,297 ****
--- 362,373 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 313,318 ****
--- 389,400 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 334,339 ****
--- 416,427 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 355,360 ****
--- 443,454 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 376,381 ****
--- 470,481 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 400,405 ****
--- 500,511 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 421,426 ****
--- 527,538 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 442,447 ****
--- 554,565 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 463,468 ****
--- 581,592 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 484,489 ****
--- 608,619 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 505,510 ****
--- 635,646 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 526,531 ****
--- 662,673 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 547,552 ****
--- 689,700 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 568,573 ****
--- 716,727 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 589,594 ****
--- 743,754 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 610,615 ****
--- 770,781 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 631,636 ****
--- 797,808 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 652,657 ****
--- 824,835 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 673,678 ****
--- 851,862 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 694,699 ****
--- 878,889 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 715,720 ****
--- 905,916 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 736,741 ****
--- 932,943 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 757,762 ****
--- 959,970 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 778,783 ****
--- 986,997 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 799,804 ****
--- 1013,1024 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 820,825 ****
--- 1040,1051 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 841,846 ****
--- 1067,1078 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 862,867 ****
--- 1094,1105 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 883,888 ****
--- 1121,1132 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 904,909 ****
--- 1148,1159 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 925,930 ****
--- 1175,1186 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 946,951 ****
--- 1202,1213 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 967,972 ****
--- 1229,1240 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 988,993 ****
--- 1256,1267 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 1009,1014 ****
--- 1283,1294 ----
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+
+
+
***************
*** 1026,1031 ****
--- 1306,1317 ----
+
+
+
Index: plink/putty/winstore.c
===================================================================
RCS file: /cvs/cvsnt/plink/putty/winstore.c,v
retrieving revision 1.1.2.1
diff -c -r1.1.2.1 winstore.c
*** plink/putty/winstore.c 4 Aug 2004 11:49:20 -0000 1.1.2.1
--- plink/putty/winstore.c 13 Mar 2015 05:34:09 -0000
***************
*** 74,87 ****
p = snewn(3 * strlen(sessionname) + 1, char);
mungestr(sessionname, p);
! ret = RegCreateKey(HKEY_CURRENT_USER, puttystr, &subkey1);
if (ret != ERROR_SUCCESS) {
sfree(p);
*errmsg = dupprintf("Unable to create registry key\n"
"HKEY_CURRENT_USER%s", puttystr);
return NULL;
}
! ret = RegCreateKey(subkey1, p, &sesskey);
sfree(p);
RegCloseKey(subkey1);
if (ret != ERROR_SUCCESS) {
--- 74,87 ----
p = snewn(3 * strlen(sessionname) + 1, char);
mungestr(sessionname, p);
! ret = RegCreateKeyEx(HKEY_CURRENT_USER, puttystr,NULL,"",REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE|KEY_QUERY_VALUE|KEY_WOW64_32KEY,NULL, &subkey1,NULL);
if (ret != ERROR_SUCCESS) {
sfree(p);
*errmsg = dupprintf("Unable to create registry key\n"
"HKEY_CURRENT_USER%s", puttystr);
return NULL;
}
! ret = RegCreateKeyEx(subkey1, p,NULL,"",REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE|KEY_QUERY_VALUE|KEY_WOW64_32KEY,NULL, &sesskey,NULL);
sfree(p);
RegCloseKey(subkey1);
if (ret != ERROR_SUCCESS) {
***************
*** 122,131 ****
p = snewn(3 * strlen(sessionname) + 1, char);
mungestr(sessionname, p);
! if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS) {
sesskey = NULL;
} else {
! if (RegOpenKey(subkey1, p, &sesskey) != ERROR_SUCCESS) {
sesskey = NULL;
}
RegCloseKey(subkey1);
--- 122,131 ----
p = snewn(3 * strlen(sessionname) + 1, char);
mungestr(sessionname, p);
! if (RegOpenKeyEx(HKEY_CURRENT_USER, puttystr, 0, KEY_QUERY_VALUE | KEY_WOW64_32KEY , &subkey1) != ERROR_SUCCESS) {
sesskey = NULL;
} else {
! if (RegOpenKeyEx(subkey1, p, 0, KEY_QUERY_VALUE | KEY_WOW64_32KEY , &sesskey) != ERROR_SUCCESS) {
sesskey = NULL;
}
RegCloseKey(subkey1);
***************
*** 222,228 ****
HKEY subkey1;
char *p;
! if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS)
return;
p = snewn(3 * strlen(sessionname) + 1, char);
--- 222,228 ----
HKEY subkey1;
char *p;
! if (RegOpenKeyEx(HKEY_CURRENT_USER, puttystr, 0, KEY_QUERY_VALUE | KEY_WOW64_32KEY, &subkey1) != ERROR_SUCCESS)
return;
p = snewn(3 * strlen(sessionname) + 1, char);
***************
*** 243,249 ****
struct enumsettings *ret;
HKEY key;
! if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &key) != ERROR_SUCCESS)
return NULL;
ret = snew(struct enumsettings);
--- 243,249 ----
struct enumsettings *ret;
HKEY key;
! if (RegOpenKeyEx(HKEY_CURRENT_USER, puttystr, 0, KEY_EXECUTE | KEY_WOW64_32KEY , &key) != ERROR_SUCCESS)
return NULL;
ret = snew(struct enumsettings);
***************
*** 309,315 ****
hostkey_regname(regname, hostname, port, keytype);
! if (RegOpenKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
&rkey) != ERROR_SUCCESS)
return 1; /* key does not exist in registry */
--- 309,315 ----
hostkey_regname(regname, hostname, port, keytype);
! if (RegOpenKeyEx(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys", 0, KEY_READ | KEY_WRITE | KEY_WOW64_32KEY,
&rkey) != ERROR_SUCCESS)
return 1; /* key does not exist in registry */
***************
*** 404,411 ****
hostkey_regname(regname, hostname, port, keytype);
! if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
! &rkey) != ERROR_SUCCESS)
return; /* key does not exist in registry */
RegSetValueEx(rkey, regname, 0, REG_SZ, key, strlen(key) + 1);
RegCloseKey(rkey);
--- 404,411 ----
hostkey_regname(regname, hostname, port, keytype);
! if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",NULL,"",REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE|KEY_QUERY_VALUE|KEY_WOW64_32KEY,NULL,
! &rkey,NULL) != ERROR_SUCCESS)
return; /* key does not exist in registry */
RegSetValueEx(rkey, regname, 0, REG_SZ, key, strlen(key) + 1);
RegCloseKey(rkey);
***************
*** 421,427 ****
size = sizeof(seedpath);
! if (RegOpenKey(HKEY_CURRENT_USER, PUTTY_REG_POS, &rkey) ==
ERROR_SUCCESS) {
int ret = RegQueryValueEx(rkey, "RandSeedFile",
0, &type, seedpath, &size);
--- 421,427 ----
size = sizeof(seedpath);
! if (RegOpenKeyEx(HKEY_CURRENT_USER, PUTTY_REG_POS, 0, KEY_EXECUTE | KEY_WOW64_32KEY, &rkey) ==
ERROR_SUCCESS) {
int ret = RegQueryValueEx(rkey, "RandSeedFile",
0, &type, seedpath, &size);
***************
*** 503,509 ****
i = 0;
while (RegEnumKey(key, i, name, sizeof(name)) == ERROR_SUCCESS) {
! if (RegOpenKey(key, name, &subkey) == ERROR_SUCCESS) {
registry_recursive_remove(subkey);
RegCloseKey(subkey);
}
--- 503,509 ----
i = 0;
while (RegEnumKey(key, i, name, sizeof(name)) == ERROR_SUCCESS) {
! if (RegOpenKeyEx(key, name, 0, KEY_EXECUTE | KEY_WOW64_32KEY, &subkey) == ERROR_SUCCESS) {
registry_recursive_remove(subkey);
RegCloseKey(subkey);
}
***************
*** 531,537 ****
/*
* Open the main PuTTY registry key and remove everything in it.
*/
! if (RegOpenKey(HKEY_CURRENT_USER, PUTTY_REG_POS, &key) ==
ERROR_SUCCESS) {
registry_recursive_remove(key);
RegCloseKey(key);
--- 531,537 ----
/*
* Open the main PuTTY registry key and remove everything in it.
*/
! if (RegOpenKeyEx(HKEY_CURRENT_USER, PUTTY_REG_POS, 0, KEY_EXECUTE | KEY_WOW64_32KEY, &key) ==
ERROR_SUCCESS) {
registry_recursive_remove(key);
RegCloseKey(key);
***************
*** 541,547 ****
* we've done that, see if the parent key has any other
* children.
*/
! if (RegOpenKey(HKEY_CURRENT_USER, PUTTY_REG_PARENT,
&key) == ERROR_SUCCESS) {
RegDeleteKey(key, PUTTY_REG_PARENT_CHILD);
ret = RegEnumKey(key, 0, name, sizeof(name));
--- 541,547 ----
* we've done that, see if the parent key has any other
* children.
*/
! if (RegOpenKeyEx(HKEY_CURRENT_USER, PUTTY_REG_PARENT, 0, KEY_EXECUTE | KEY_WOW64_32KEY,
&key) == ERROR_SUCCESS) {
RegDeleteKey(key, PUTTY_REG_PARENT_CHILD);
ret = RegEnumKey(key, 0, name, sizeof(name));
***************
*** 552,558 ****
* key.
*/
if (ret != ERROR_SUCCESS) {
! if (RegOpenKey(HKEY_CURRENT_USER, PUTTY_REG_GPARENT,
&key) == ERROR_SUCCESS) {
RegDeleteKey(key, PUTTY_REG_GPARENT_CHILD);
RegCloseKey(key);
--- 552,558 ----
* key.
*/
if (ret != ERROR_SUCCESS) {
! if (RegOpenKeyEx(HKEY_CURRENT_USER, PUTTY_REG_GPARENT, 0, KEY_EXECUTE | KEY_WOW64_32KEY,
&key) == ERROR_SUCCESS) {
RegDeleteKey(key, PUTTY_REG_GPARENT_CHILD);
RegCloseKey(key);
Index: postinst/postinst.cpp
===================================================================
RCS file: /cvs/cvsnt/postinst/postinst.cpp,v
retrieving revision 1.8.2.7
diff -c -r1.8.2.7 postinst.cpp
*** postinst/postinst.cpp 20 Oct 2005 15:15:32 -0000 1.8.2.7
--- postinst/postinst.cpp 10 Mar 2015 06:28:03 -0000
***************
*** 33,39 ****
{
MigrateCvsPass();
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\CVS\\PServer",0,KEY_READ|KEY_WRITE,&hServerKey))
{
MigrateRepositories();
MigrateDomainSettings();
--- 33,39 ----
{
MigrateCvsPass();
! if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\CVS\\PServer",0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hServerKey))
{
MigrateRepositories();
MigrateDomainSettings();
***************
*** 68,83 ****
HKEY hKey,hSubKey;
DWORD dwLen;
! if(RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Cvsnt",0,KEY_READ,&hKey) &&
! RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Cvsnt",0,NULL,0,KEY_READ,NULL,&hKey,NULL))
{
return false; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyEx(hKey,key,0,KEY_WRITE,&hSubKey) &&
! RegCreateKeyEx(hKey,key,0,NULL,0,KEY_WRITE,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return false; // Couldn't open or create key
--- 68,83 ----
HKEY hKey,hSubKey;
DWORD dwLen;
! if(RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Cvsnt",0,KEY_READ|KEY_WOW64_32KEY,&hKey) &&
! RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Cvsnt",0,NULL,0,KEY_READ|KEY_WOW64_32KEY,NULL,&hKey,NULL))
{
return false; // Couldn't open or create key
}
if(key)
{
! if(RegOpenKeyEx(hKey,key,0,KEY_WRITE|KEY_WOW64_32KEY,&hSubKey) &&
! RegCreateKeyEx(hKey,key,0,NULL,0,KEY_WRITE|KEY_WOW64_32KEY,NULL,&hSubKey,NULL))
{
RegCloseKey(hKey);
return false; // Couldn't open or create key
Index: postinst/postinst.vcproj
===================================================================
RCS file: /cvs/cvsnt/postinst/postinst.vcproj,v
retrieving revision 1.4.2.12.6.3
diff -c -r1.4.2.12.6.3 postinst.vcproj
*** postinst/postinst.vcproj 29 Sep 2009 14:55:43 -0000 1.4.2.12.6.3
--- postinst/postinst.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 95,102 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 190,195 ****
--- 278,289 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/ext_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/ext_protocol.vcproj,v
retrieving revision 1.4.2.16.6.6
diff -c -r1.4.2.16.6.6 ext_protocol.vcproj
*** protocols/ext_protocol.vcproj 31 May 2012 02:47:31 -0000 1.4.2.16.6.6
--- protocols/ext_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 179,184 ****
--- 179,272 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 190,195 ****
--- 278,289 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/fork_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/fork_protocol.vcproj,v
retrieving revision 1.4.2.17.6.6
diff -c -r1.4.2.17.6.6 fork_protocol.vcproj
*** protocols/fork_protocol.vcproj 31 May 2012 02:47:31 -0000 1.4.2.17.6.6
--- protocols/fork_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 10,17 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 189,194 ****
--- 277,288 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/gserver_protocol_ad.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/gserver_protocol_ad.vcproj,v
retrieving revision 1.2.2.16.6.6
diff -c -r1.2.2.16.6.6 gserver_protocol_ad.vcproj
*** protocols/gserver_protocol_ad.vcproj 4 Aug 2011 05:56:41 -0000 1.2.2.16.6.6
--- protocols/gserver_protocol_ad.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 179,184 ****
--- 179,272 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 190,195 ****
--- 278,289 ----
RelativePath="common.cpp">
+
+
+
Index: protocols/pserver_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/pserver_protocol.vcproj,v
retrieving revision 1.4.2.17.6.6
diff -c -r1.4.2.17.6.6 pserver_protocol.vcproj
*** protocols/pserver_protocol.vcproj 4 Aug 2011 05:56:41 -0000 1.4.2.17.6.6
--- protocols/pserver_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 179,184 ****
--- 179,272 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 190,195 ****
--- 278,289 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/server_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/server_protocol.vcproj,v
retrieving revision 1.2.2.17.6.6
diff -c -r1.2.2.17.6.6 server_protocol.vcproj
*** protocols/server_protocol.vcproj 4 Aug 2011 05:56:41 -0000 1.2.2.17.6.6
--- protocols/server_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 179,184 ****
--- 179,272 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 190,195 ****
--- 278,289 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/sserver.cpp
===================================================================
RCS file: /cvs/cvsnt/protocols/sserver.c,v
retrieving revision 1.16.2.44.4.10
diff -c -r1.16.2.44.4.10 sserver.cpp
*** protocols/sserver.cpp 7 Jun 2012 07:24:59 -0000 1.16.2.44.4.10
--- protocols/sserver.cpp 10 Mar 2015 05:58:36 -0000
***************
*** 788,794 ****
}
#ifdef _WIN32
! static BOOL CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
int nSel;
char value[64];
--- 788,794 ----
}
#ifdef _WIN32
! static INT_PTR CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
int nSel;
char value[64];
Index: protocols/sserver_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/sserver_protocol.vcproj,v
retrieving revision 1.1.2.17.6.7
diff -c -r1.1.2.17.6.7 sserver_protocol.vcproj
*** protocols/sserver_protocol.vcproj 31 May 2012 02:47:31 -0000 1.1.2.17.6.7
--- protocols/sserver_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 181,186 ****
--- 181,275 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 192,197 ****
--- 281,292 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/ssh_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/ssh_protocol.vcproj,v
retrieving revision 1.2.2.16.6.6
diff -c -r1.2.2.16.6.6 ssh_protocol.vcproj
*** protocols/ssh_protocol.vcproj 31 May 2012 02:47:31 -0000 1.2.2.16.6.6
--- protocols/ssh_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 179,184 ****
--- 179,272 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 190,195 ****
--- 278,289 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/sspi.cpp
===================================================================
RCS file: /cvs/cvsnt/protocols/sspi.c,v
retrieving revision 1.25.2.49.6.13
diff -c -r1.25.2.49.6.13 sspi.cpp
*** protocols/sspi.cpp 3 Oct 2012 06:36:44 -0000 1.25.2.49.6.13
--- protocols/sspi.cpp 10 Mar 2015 05:58:36 -0000
***************
*** 1355,1361 ****
return ErrBuf;
};
! static BOOL CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
int nSel;
char value[64];
--- 1355,1361 ----
return ErrBuf;
};
! static INT_PTR CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
int nSel;
char value[64];
Index: protocols/sspi_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/sspi_protocol.vcproj,v
retrieving revision 1.4.2.22.4.7
diff -c -r1.4.2.22.4.7 sspi_protocol.vcproj
*** protocols/sspi_protocol.vcproj 4 Aug 2011 05:56:41 -0000 1.4.2.22.4.7
--- protocols/sspi_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 180,185 ****
--- 180,274 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 191,196 ****
--- 280,291 ----
RelativePath=".\common.cpp">
+
+
+
Index: protocols/sync.cpp
===================================================================
RCS file: /cvs/cvsnt/protocols/sync.cpp,v
retrieving revision 1.8.8.12
diff -c -r1.8.8.12 sync.cpp
*** protocols/sync.cpp 4 Oct 2012 09:20:11 -0000 1.8.8.12
--- protocols/sync.cpp 10 Mar 2015 06:00:32 -0000
***************
*** 530,536 ****
}
#ifdef _WIN32
! static BOOL CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
int nSel;
char value[256];
--- 530,536 ----
}
#ifdef _WIN32
! static INT_PTR CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
int nSel;
char value[256];
Index: protocols/sync_protocol.vcproj
===================================================================
RCS file: /cvs/cvsnt/protocols/sync_protocol.vcproj,v
retrieving revision 1.1.2.4
diff -c -r1.1.2.4 sync_protocol.vcproj
*** protocols/sync_protocol.vcproj 31 May 2012 02:47:31 -0000 1.1.2.4
--- protocols/sync_protocol.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 94,100 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 192,197 ****
--- 281,292 ----
RelativePath=".\common.cpp">
+
+
+
Index: rcs/co.vcproj
===================================================================
RCS file: /cvs/cvsnt/rcs/co.vcproj,v
retrieving revision 1.1.2.12.6.3
diff -c -r1.1.2.12.6.3 co.vcproj
*** rcs/co.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.12.6.3
--- rcs/co.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 182,187 ****
--- 182,274 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rcs/ident.vcproj
===================================================================
RCS file: /cvs/cvsnt/rcs/ident.vcproj,v
retrieving revision 1.1.2.2
diff -c -r1.1.2.2 ident.vcproj
*** rcs/ident.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.2
--- rcs/ident.vcproj 13 Mar 2015 06:34:48 -0000
***************
*** 98,105 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: rcs/rlog.vcproj
===================================================================
RCS file: /cvs/cvsnt/rcs/rlog.vcproj,v
retrieving revision 1.1.2.13.6.3
diff -c -r1.1.2.13.6.3 rlog.vcproj
*** rcs/rlog.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.13.6.3
--- rcs/rlog.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 182,187 ****
--- 182,274 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: simcvs/simcpl.cpp
===================================================================
RCS file: /cvs/cvsnt/simcvs/simcpl.cpp,v
retrieving revision 1.1.2.2.4.3
diff -c -r1.1.2.2.4.3 simcpl.cpp
*** simcvs/simcpl.cpp 31 May 2012 02:47:31 -0000 1.1.2.2.4.3
--- simcvs/simcpl.cpp 10 Mar 2015 06:37:49 -0000
***************
*** 339,345 ****
}
#if !defined(CVS95) && defined (MHCRASH)
! static BOOL WINAPI MiniDumpDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TCHAR tmp[64];
static int nCountdown;
--- 339,345 ----
}
#if !defined(CVS95) && defined (MHCRASH)
! static INT_PTR WINAPI MiniDumpDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TCHAR tmp[64];
static int nCountdown;
***************
*** 408,414 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 408,414 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 476,482 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 476,482 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 538,544 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 538,544 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 559,565 ****
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
--- 559,565 ----
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
***************
*** 621,627 ****
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueExA(hKeyReg,
strname,
--- 621,627 ----
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueExA(hKeyReg,
strname,
***************
*** 1011,1023 ****
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKeyA(HKEY_LOCAL_MACHINE,subkey,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)&dwVal,&dwLen))
return defaultval;
return dwVal;
}
--- 1011,1027 ----
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)&dwVal,&dwLen))
+ {
+ RegCloseKey(hKey);
return defaultval;
+ }
+ RegCloseKey(hKey);
return dwVal;
}
***************
*** 1029,1040 ****
static char buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKeyA(HKEY_LOCAL_MACHINE,subkey,&hKey))
return "(no key)";
dwLen=sizeof(buf);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)buf,&dwLen))
return "(no value)";
return buf;
}
--- 1033,1049 ----
static char buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return "(no key)";
dwLen=sizeof(buf);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)buf,&dwLen))
+ {
+ RegCloseKey(hKey);
return "(no value)";
+ }
+
+ RegCloseKey(hKey);
return buf;
}
***************
*** 1909,1915 ****
static TCHAR szCvs[1024],szPath[1024];
DWORD dwLen,dwType;
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,L"SOFTWARE\\CVS\\Pserver",0,KEY_QUERY_VALUE,&hKey))
return 0;
dwLen=sizeof(szCvs);
--- 1918,1924 ----
static TCHAR szCvs[1024],szPath[1024];
DWORD dwLen,dwType;
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,L"SOFTWARE\\CVS\\Pserver",0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return 0;
dwLen=sizeof(szCvs);
Index: simcvs/simcpl.vcproj
===================================================================
RCS file: /cvs/cvsnt/simcvs/simcpl.vcproj,v
retrieving revision 1.1.2.3.4.5
diff -c -r1.1.2.3.4.5 simcpl.vcproj
*** simcvs/simcpl.vcproj 4 Aug 2011 05:56:41 -0000 1.1.2.3.4.5
--- simcvs/simcpl.vcproj 11 Mar 2015 07:09:32 -0000
***************
*** 67,73 ****
--- 67,73 ----
***************
*** 96,102 ****
Name="VCCustomBuildTool"/>
--- 68,74 ----
***************
*** 97,103 ****
Name="VCCustomBuildTool"/>
=0; dwIndex++)
--- 8536,8542 ----
bufLen=sizeof(buf);
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\CVS\\License"),0,KEY_READ|KEY_WOW64_32KEY,&g_hLicenseKey))
return 0;
for(DWORD dwIndex=0; dwIndex>=0; dwIndex++)
Index: su/su.vcproj
===================================================================
RCS file: /cvs/cvsnt/su/su.vcproj,v
retrieving revision 1.1.2.9.4.3
diff -c -r1.1.2.9.4.3 su.vcproj
*** su/su.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.9.4.3
--- su/su.vcproj 13 Mar 2015 06:34:48 -0000
***************
*** 76,83 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 158,163 ****
--- 224,235 ----
+
+
+
Index: triggers/audit_trigger.cpp
===================================================================
RCS file: /cvs/cvsnt/triggers/audit_trigger.cpp,v
retrieving revision 1.1.2.33.4.65
diff -c -r1.1.2.33.4.65 audit_trigger.cpp
*** triggers/audit_trigger.cpp 7 Jun 2012 07:24:59 -0000 1.1.2.33.4.65
--- triggers/audit_trigger.cpp 10 Mar 2015 05:59:59 -0000
***************
*** 970,976 ****
return nVerTest;
}
! BOOL CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
HCURSOR hCursor;
cvs::string oramessage;
--- 970,976 ----
return nVerTest;
}
! INT_PTR CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
HCURSOR hCursor;
cvs::string oramessage;
Index: triggers/audit_trigger.vcproj
===================================================================
RCS file: /cvs/cvsnt/triggers/audit_trigger.vcproj,v
retrieving revision 1.1.2.9.4.5
diff -c -r1.1.2.9.4.5 audit_trigger.vcproj
*** triggers/audit_trigger.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.9.4.5
--- triggers/audit_trigger.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 119,125 ****
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
! PrecompiledHeaderFile=".\Release/audit_trigger.pch"
AssemblerListingLocation="$(IntDir)/"
ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="$(IntDir)/"
--- 119,125 ----
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
! PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
AssemblerListingLocation="$(IntDir)/"
ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="$(IntDir)/"
***************
*** 150,155 ****
--- 150,243 ----
SetChecksum="TRUE"
ImportLibrary=".\Release/audit_trigger.lib"
TargetMachine="1"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: triggers/script_trigger.cpp
===================================================================
RCS file: /cvs/cvsnt/triggers/script_trigger.cpp,v
retrieving revision 1.1.2.18.4.16
diff -c -r1.1.2.18.4.16 script_trigger.cpp
*** triggers/script_trigger.cpp 7 Jun 2012 07:24:59 -0000 1.1.2.18.4.16
--- triggers/script_trigger.cpp 10 Mar 2015 05:59:32 -0000
***************
*** 899,905 ****
}
#ifdef _WIN32
! BOOL CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
char value[MAX_PATH];
int nSel;
--- 899,905 ----
}
#ifdef _WIN32
! INT_PTR CALLBACK ConfigDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
char value[MAX_PATH];
int nSel;
Index: triggers/script_trigger.vcproj
===================================================================
RCS file: /cvs/cvsnt/triggers/script_trigger.vcproj,v
retrieving revision 1.1.2.7.4.3
diff -c -r1.1.2.7.4.3 script_trigger.vcproj
*** triggers/script_trigger.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.7.4.3
--- triggers/script_trigger.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 183,188 ****
--- 183,278 ----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ufc-crypt/crypt.vcproj
===================================================================
RCS file: /cvs/cvsnt/ufc-crypt/crypt.vcproj,v
retrieving revision 1.4.2.8.6.3
diff -c -r1.4.2.8.6.3 crypt.vcproj
*** ufc-crypt/crypt.vcproj 20 Oct 2009 13:35:06 -0000 1.4.2.8.6.3
--- ufc-crypt/crypt.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 78,85 ****
--- 115,184 ----
Name="VCCustomBuildTool"/>
!
!
!
!
!
!
!
!
!
!
!
!
!
!
Index: uninsthlp/uninsthlp.cpp
===================================================================
RCS file: /cvs/cvsnt/uninsthlp/uninsthlp.cpp,v
retrieving revision 1.2.2.2
diff -c -r1.2.2.2 uninsthlp.cpp
*** uninsthlp/uninsthlp.cpp 20 Oct 2005 15:15:33 -0000 1.2.2.2
--- uninsthlp/uninsthlp.cpp 10 Mar 2015 06:38:06 -0000
***************
*** 49,55 ****
try
{
// Open our registry key
! lRegResult = RegOpenKeyEx(hRootKey, szSubKey, 0, KEY_WRITE | KEY_READ, &hKey);
if(lRegResult != ERROR_SUCCESS)
throw 1;
--- 49,55 ----
try
{
// Open our registry key
! lRegResult = RegOpenKeyEx(hRootKey, szSubKey, 0, KEY_WRITE | KEY_READ | KEY_WOW64_32KEY, &hKey);
if(lRegResult != ERROR_SUCCESS)
throw 1;
Index: uninsthlp/uninsthlp.vcproj
===================================================================
RCS file: /cvs/cvsnt/uninsthlp/uninsthlp.vcproj,v
retrieving revision 1.2.2.12.6.3
diff -c -r1.2.2.12.6.3 uninsthlp.vcproj
*** uninsthlp/uninsthlp.vcproj 29 Sep 2009 14:55:43 -0000 1.2.2.12.6.3
--- uninsthlp/uninsthlp.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 97,104 ****
+ #endif
// Helper routines for password stuff
//struct passwd *win32getpwuid(uid_t uid);
Index: windows-NT/win32.cpp
===================================================================
RCS file: /cvs/cvsnt/windows-NT/win32.c,v
retrieving revision 1.72.2.150.6.61
diff -c -r1.72.2.150.6.61 win32.cpp
*** windows-NT/win32.cpp 15 Apr 2013 07:33:20 -0000 1.72.2.150.6.61
--- windows-NT/win32.cpp 12 Mar 2015 08:51:42 -0000
***************
*** 1598,1604 ****
TCHAR *ptr;
wchar_t w_computer[DNLEN+1];
! ptr=_tcschr(name, '\\');
if (ptr)
{
#ifdef _UNICODE
--- 1598,1604 ----
TCHAR *ptr;
wchar_t w_computer[DNLEN+1];
! ptr=(TCHAR *)_tcschr(name, '\\');
if (ptr)
{
#ifdef _UNICODE
***************
*** 3763,3769 ****
#ifndef CVS95
! static BOOL WINAPI MiniDumpDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
char bufferglobalopt[MAX_PATH]="\0";
int smalldump=1;
--- 3763,3769 ----
#ifndef CVS95
! static INT_PTR WINAPI MiniDumpDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
char bufferglobalopt[MAX_PATH]="\0";
int smalldump=1;
***************
*** 3842,3848 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 3842,3848 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE |KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 3910,3916 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 3910,3916 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE |KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 3972,3978 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 3972,3978 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE |KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 3993,3999 ****
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
--- 3993,3999 ----
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE |KEY_WOW64_32KEY,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
***************
*** 4055,4061 ****
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueExA(hKeyReg,
strname,
--- 4055,4061 ----
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE |KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueExA(hKeyReg,
strname,
***************
*** 4461,4472 ****
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKeyA(HKEY_LOCAL_MACHINE,subkey,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)&dwVal,&dwLen))
return defaultval;
return dwVal;
}
--- 4461,4477 ----
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)&dwVal,&dwLen))
+ {
+ RegCloseKey(hKey);
return defaultval;
+ }
+
+ RegCloseKey(hKey);
return dwVal;
}
***************
*** 4480,4491 ****
static char buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKeyA(HKEY_LOCAL_MACHINE,subkey,&hKey))
return "(no key)";
dwLen=sizeof(buf);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)buf,&dwLen))
return "(no value)";
return buf;
}
--- 4485,4500 ----
static char buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return "(no key)";
dwLen=sizeof(buf);
if(RegQueryValueExA(hKey,key,NULL,&dwType,(LPBYTE)buf,&dwLen))
+ {
+ RegCloseKey(hKey);
return "(no value)";
+ }
+ RegCloseKey(hKey);
return buf;
}
Index: windows-NT/chkmanifest/chkmanifest.vcproj
===================================================================
RCS file: /cvs/cvsnt/windows-NT/chkmanifest/chkmanifest.vcproj,v
retrieving revision 1.2.2.3
diff -c -r1.2.2.3 chkmanifest.vcproj
*** windows-NT/chkmanifest/chkmanifest.vcproj 3 Jul 2006 10:52:09 -0000 1.2.2.3
--- windows-NT/chkmanifest/chkmanifest.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 70,76 ****
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
! UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
--- 70,77 ----
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
! UsePrecompiledHeader="0"
! PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
Index: windows-NT/cvsdiag/cvsdiag.cpp
===================================================================
RCS file: /cvs/cvsnt/windows-NT/cvsdiag/cvsdiag.cpp,v
retrieving revision 1.1.2.8.8.55
diff -c -r1.1.2.8.8.55 cvsdiag.cpp
*** windows-NT/cvsdiag/cvsdiag.cpp 15 Apr 2013 07:33:20 -0000 1.1.2.8.8.55
--- windows-NT/cvsdiag/cvsdiag.cpp 10 Mar 2015 06:32:54 -0000
***************
*** 70,76 ****
bufLen=sizeof(buf);
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\CVS\\License"),0,KEY_READ,&g_hLicenseKey))
return 0;
for(DWORD dwIndex=0; dwIndex>=0; dwIndex++)
--- 70,76 ----
bufLen=sizeof(buf);
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\CVS\\License"),0,KEY_READ|KEY_WOW64_32KEY,&g_hLicenseKey))
return 0;
for(DWORD dwIndex=0; dwIndex>=0; dwIndex++)
***************
*** 584,590 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 584,590 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 652,658 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 652,658 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 714,720 ****
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
--- 714,720 ----
eSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
res=ERROR_SUCCESS;
for (myindexcount=myindexloop=0;res==ERROR_SUCCESS;myindexloop++)
***************
*** 735,741 ****
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
--- 735,741 ----
eSubSubKey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyRegSub)==ERROR_SUCCESS)
{
for (myvalcount=myvalloop=0;res==ERROR_SUCCESS;myvalloop++)
***************
*** 797,803 ****
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueEx(hKeyReg,
strname,
--- 797,803 ----
inkey,
0,
KEY_EXECUTE |
! KEY_QUERY_VALUE|KEY_WOW64_32KEY,
&hKeyReg)==ERROR_SUCCESS) {
if ((res=RegQueryValueEx(hKeyReg,
strname,
***************
*** 1652,1658 ****
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKey(HKEY_LOCAL_MACHINE,subkey,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
--- 1652,1658 ----
DWORD dwVal=defaultval;
DWORD dwType,dwLen;
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return defaultval;
dwLen=sizeof(dwVal);
***************
*** 1672,1678 ****
static TCHAR buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKey(HKEY_LOCAL_MACHINE,subkey,&hKey))
return _T("(no key)");
dwLen=sizeof(buf);
--- 1672,1678 ----
static TCHAR buf[4096];
DWORD dwType,dwLen;
! if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,subkey,0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
return _T("(no key)");
dwLen=sizeof(buf);
Index: windows-NT/cvsdiag/cvsdiag.vcproj
===================================================================
RCS file: /cvs/cvsnt/windows-NT/cvsdiag/cvsdiag.vcproj,v
retrieving revision 1.1.2.9.4.6
diff -c -r1.1.2.9.4.6 cvsdiag.vcproj
*** windows-NT/cvsdiag/cvsdiag.vcproj 15 Apr 2013 07:33:20 -0000 1.1.2.9.4.6
--- windows-NT/cvsdiag/cvsdiag.vcproj 13 Mar 2015 00:02:32 -0000
***************
*** 76,83 ****
--- 142,148 ----
***************
*** 159,165 ****
StringPooling="TRUE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
! TreatWChar_tAsBuiltInType="TRUE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
--- 159,165 ----
StringPooling="TRUE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
! TreatWChar_tAsBuiltInType="FALSE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="3"
***************
*** 173,179 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
***************
*** 152,157 ****
--- 210,221 ----
+
+
+
Index: windows-NT/installer/installer.cpp
===================================================================
RCS file: /cvs/cvsnt/windows-NT/installer/installer.cpp,v
retrieving revision 1.6.8.10
diff -c -r1.6.8.10 installer.cpp
*** windows-NT/installer/installer.cpp 7 Jun 2012 12:27:31 -0000 1.6.8.10
--- windows-NT/installer/installer.cpp 10 Mar 2015 06:52:50 -0000
***************
*** 774,780 ****
TCHAR serial[256];
DWORD dwSerial = sizeof(serial);
HKEY hKey;
! if(!RegOpenKey(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),&hKey))
{
if(RegQueryValueEx(hKey,type,NULL,NULL,(LPBYTE)serial,&dwSerial))
lstrcpy(serial,_T("Unknown"));
--- 774,780 ----
TCHAR serial[256];
DWORD dwSerial = sizeof(serial);
HKEY hKey;
! if(!RegOpenKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,KEY_QUERY_VALUE|KEY_WOW64_32KEY,&hKey))
{
if(RegQueryValueEx(hKey,type,NULL,NULL,(LPBYTE)serial,&dwSerial))
lstrcpy(serial,_T("Unknown"));
***************
*** 953,959 ****
keyopened = true;
DWORD createerrno;
! if((createerrno=RegOpenKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,KEY_READ|KEY_WRITE,&hKey))!=ERROR_SUCCESS)
{
LPVOID createerrstr=NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
--- 953,959 ----
keyopened = true;
DWORD createerrno;
! if((createerrno=RegOpenKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey))!=ERROR_SUCCESS)
{
LPVOID createerrstr=NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
***************
*** 961,967 ****
Log(hInstall,_T("Cannot Open [1]\\Software\\March Hare Software Ltd\\Keys: [2]"),(allusers)?_T("HKLM"):_T("HKCU"),(LPCTSTR)createerrstr);
LocalFree((HLOCAL)createerrstr);
DWORD createerrnum;
! if ((createerrnum=RegCreateKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE,NULL,&hKey,NULL))!=ERROR_SUCCESS)
{
LPVOID createerrtxt=NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
--- 961,967 ----
Log(hInstall,_T("Cannot Open [1]\\Software\\March Hare Software Ltd\\Keys: [2]"),(allusers)?_T("HKLM"):_T("HKCU"),(LPCTSTR)createerrstr);
LocalFree((HLOCAL)createerrstr);
DWORD createerrnum;
! if ((createerrnum=RegCreateKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKey,NULL))!=ERROR_SUCCESS)
{
LPVOID createerrtxt=NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
***************
*** 972,987 ****
}
}
if(!keyopened)
! if(RegOpenKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd"),0,KEY_READ|KEY_WRITE,&hKeyTop)!=ERROR_SUCCESS)
{
! if (RegCreateKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd"),0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE,NULL,&hKeyTop,NULL)==ERROR_SUCCESS)
{
keyopened = true;
Log(hInstall,_T("Created HKLM\\Software\\March Hare Software Ltd OK"));
! if(RegOpenKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,KEY_READ|KEY_WRITE,&hKey)!=ERROR_SUCCESS)
{
DWORD createerrnm;
! if ((createerrnm=RegCreateKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE,NULL,&hKey,NULL))!=ERROR_SUCCESS)
{
LPVOID createerrmsg=NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
--- 972,987 ----
}
}
if(!keyopened)
! if(RegOpenKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd"),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKeyTop)!=ERROR_SUCCESS)
{
! if (RegCreateKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd"),0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKeyTop,NULL)==ERROR_SUCCESS)
{
keyopened = true;
Log(hInstall,_T("Created HKLM\\Software\\March Hare Software Ltd OK"));
! if(RegOpenKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,&hKey)!=ERROR_SUCCESS)
{
DWORD createerrnm;
! if ((createerrnm=RegCreateKeyEx(allusers?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKey,NULL))!=ERROR_SUCCESS)
{
LPVOID createerrmsg=NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
***************
*** 1015,1021 ****
{
if (allusers)
{
! if(RegCreateKey(HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),&hKey)==ERROR_SUCCESS)
{
setresult = RegSetValueEx(hKey,package,NULL,REG_SZ,(BYTE*)serial,(lstrlen(serial)+1)*sizeof(serial[0]));
if (setresult == ERROR_SUCCESS)
--- 1015,1021 ----
{
if (allusers)
{
! if(RegCreateKeyEx(HKEY_CURRENT_USER,_T("Software\\March Hare Software Ltd\\Keys"),0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_WRITE|KEY_WOW64_32KEY,NULL,&hKey,NULL)==ERROR_SUCCESS)
{
setresult = RegSetValueEx(hKey,package,NULL,REG_SZ,(BYTE*)serial,(lstrlen(serial)+1)*sizeof(serial[0]));
if (setresult == ERROR_SUCCESS)
Index: windows-NT/installer/installer.vcproj
===================================================================
RCS file: /cvs/cvsnt/windows-NT/installer/installer.vcproj,v
retrieving revision 1.3.8.1
diff -c -r1.3.8.1 installer.vcproj
*** windows-NT/installer/installer.vcproj 16 Nov 2009 14:09:11 -0000 1.3.8.1
--- windows-NT/installer/installer.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 94,101 ****
--- 65,71 ----
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="TRUE"
! UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
***************
*** 73,79 ****
Name="VCCustomBuildTool"/>
--- 73,120 ----
Name="VCCustomBuildTool"/>
!
!
!
!
!
!
!
!
!
!
!
!
!
!
***************
*** 116,121 ****
--- 157,168 ----
+
+
+
Index: windows-NT/posixdir/setci/setci.vcproj
===================================================================
RCS file: /cvs/cvsnt/windows-NT/posixdir/setci/setci.vcproj,v
retrieving revision 1.1.2.7.4.3
diff -c -r1.1.2.7.4.3 setci.vcproj
*** windows-NT/posixdir/setci/setci.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.7.4.3
--- windows-NT/posixdir/setci/setci.vcproj 11 Mar 2015 07:42:47 -0000
***************
*** 64,70 ****
--- 64,70 ----
***************
*** 75,81 ****
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
! UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
--- 75,82 ----
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="0"
! UsePrecompiledHeader="0"
! PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
***************
*** 83,89 ****
Name="VCCustomBuildTool"/>
--- 78,84 ----
***************
*** 107,113 ****
Name="VCCustomBuildTool"/>
--- 146,152 ----
***************
*** 166,172 ****
TreatWChar_tAsBuiltInType="TRUE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
! UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="0"
--- 166,172 ----
TreatWChar_tAsBuiltInType="TRUE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
! UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="0"
***************
*** 177,183 ****
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
AdditionalDependencies="bufferoverflowU.lib"
! OutputFile="../../../WinRel64/setuid.dll"
LinkIncremental="1"
ModuleDefinitionFile="setuid.def"
GenerateDebugInformation="TRUE"
--- 177,183 ----
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
AdditionalDependencies="bufferoverflowU.lib"
! OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="1"
ModuleDefinitionFile="setuid.def"
GenerateDebugInformation="TRUE"
Index: xdiff/ext_xdiff.vcproj
===================================================================
RCS file: /cvs/cvsnt/xdiff/ext_xdiff.vcproj,v
retrieving revision 1.1.2.7.4.3
diff -c -r1.1.2.7.4.3 ext_xdiff.vcproj
*** xdiff/ext_xdiff.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.7.4.3
--- xdiff/ext_xdiff.vcproj 13 Mar 2015 06:34:48 -0000
***************
*** 12,19 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: xdiff/xml_xdiff.vcproj
===================================================================
RCS file: /cvs/cvsnt/xdiff/xml_xdiff.vcproj,v
retrieving revision 1.1.2.7.4.3
diff -c -r1.1.2.7.4.3 xml_xdiff.vcproj
*** xdiff/xml_xdiff.vcproj 29 Sep 2009 14:55:43 -0000 1.1.2.7.4.3
--- xdiff/xml_xdiff.vcproj 13 Mar 2015 06:06:09 -0000
***************
*** 12,19 ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: zlib/win32/zlib.vcproj
===================================================================
RCS file: /cvs/cvsnt/zlib/win32/zlib.vcproj,v
retrieving revision 1.1.2.9.6.1
diff -c -r1.1.2.9.6.1 zlib.vcproj
*** zlib/win32/zlib.vcproj 6 Mar 2007 03:42:05 -0000 1.1.2.9.6.1
--- zlib/win32/zlib.vcproj 11 Mar 2015 07:45:38 -0000
***************
*** 76,83 ****
--- 113,181 ----
Name="VCCustomBuildTool"/>
!
!
!
!
!
!
!
!
!
!
!
!
!
!