all subagents moved to VS2005
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 28 Dec 2008 22:14:48 +0000 (22:14 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 28 Dec 2008 22:14:48 +0000 (22:14 +0000)
31 files changed:
.gitattributes
include/nms_common.h
netxms.sln
src/agent/core/hddinfo.cpp
src/agent/subagents/ecs/ecs.dsw [deleted file]
src/agent/subagents/ecs/ecs.vcproj [copied from src/libnxlp/libnxlp.vcproj with 78% similarity]
src/agent/subagents/logwatch/logwatch.dsw [deleted file]
src/agent/subagents/logwatch/logwatch.vcproj [copied from src/libnxlp/libnxlp.vcproj with 79% similarity]
src/agent/subagents/odbcquery/odbcquery.dsw [deleted file]
src/agent/subagents/odbcquery/odbcquery.vcproj [copied from src/libnxlp/libnxlp.vcproj with 79% similarity]
src/agent/subagents/ping/ping.dsw [deleted file]
src/agent/subagents/ping/ping.vcproj [copied from src/libnxlp/libnxlp.vcproj with 78% similarity]
src/agent/subagents/portCheck/portcheck.dsw [deleted file]
src/agent/subagents/portCheck/portcheck.vcproj [copied from src/libnxlp/libnxlp.vcproj with 75% similarity]
src/agent/subagents/sms/sms.dsw [deleted file]
src/agent/subagents/sms/sms.vcproj [copied from src/libnxlp/libnxlp.vcproj with 79% similarity]
src/agent/subagents/ups/ups.dsw [deleted file]
src/agent/subagents/ups/ups.vcproj [copied from src/libnxlp/libnxlp.vcproj with 76% similarity]
src/agent/subagents/win9x/win9x.dsw [deleted file]
src/agent/subagents/winnt/procinfo.cpp
src/agent/subagents/winnt/winnt.dsw [deleted file]
src/agent/subagents/winnt/winnt.vcproj [copied from src/libnxlp/libnxlp.vcproj with 77% similarity]
src/agent/subagents/winperf/tools.cpp
src/agent/subagents/winperf/winperf.dsw [deleted file]
src/agent/subagents/winperf/winperf.h
src/agent/subagents/winperf/winperf.vcproj [copied from src/libnxlp/libnxlp.vcproj with 78% similarity]
src/agent/subagents/wmi/wmi.dsw [deleted file]
src/agent/subagents/wmi/wmi.h
src/agent/subagents/wmi/wmi.vcproj [copied from src/libnxlp/libnxlp.vcproj with 78% similarity]
src/libnxlp/libnxlp.vcproj
tools/mc.rule

index ff7c992..b5bf8f2 100644 (file)
@@ -50,33 +50,32 @@ src/agent/core/nxagentd.dsp eol=crlf
 src/agent/core/nxagentd.dsw eol=crlf
 src/agent/core/nxagentd.vcproj -text
 src/agent/subagents/ecs/ecs.dsp eol=crlf
-src/agent/subagents/ecs/ecs.dsw eol=crlf
+src/agent/subagents/ecs/ecs.vcproj -text
 src/agent/subagents/logscan/logscan.dsp eol=crlf
 src/agent/subagents/logscan/logscan.dsw eol=crlf
 src/agent/subagents/logwatch/logwatch.dsp eol=crlf
-src/agent/subagents/logwatch/logwatch.dsw eol=crlf
+src/agent/subagents/logwatch/logwatch.vcproj -text
 src/agent/subagents/odbcquery/odbcquery.dsp eol=crlf
-src/agent/subagents/odbcquery/odbcquery.dsw eol=crlf
+src/agent/subagents/odbcquery/odbcquery.vcproj -text
 src/agent/subagents/ping/ping.dsp eol=crlf
-src/agent/subagents/ping/ping.dsw eol=crlf
+src/agent/subagents/ping/ping.vcproj -text
 src/agent/subagents/portCheck/portcheck.dsp eol=crlf
-src/agent/subagents/portCheck/portcheck.dsw eol=crlf
+src/agent/subagents/portCheck/portcheck.vcproj -text
 src/agent/subagents/skeleton/skeleton.dsp eol=crlf
 src/agent/subagents/skeleton/skeleton.dsw eol=crlf
 src/agent/subagents/sms/sms.dsp eol=crlf
-src/agent/subagents/sms/sms.dsw eol=crlf
+src/agent/subagents/sms/sms.vcproj -text
 src/agent/subagents/ups/doc/apc_protocol_files/nut-banner.png -text
 src/agent/subagents/ups/doc/apc_protocol_files/vh401.png -text
 src/agent/subagents/ups/ups.dsp eol=crlf
-src/agent/subagents/ups/ups.dsw eol=crlf
+src/agent/subagents/ups/ups.vcproj -text
 src/agent/subagents/win9x/win9x.dsp eol=crlf
-src/agent/subagents/win9x/win9x.dsw eol=crlf
 src/agent/subagents/winnt/winnt.dsp eol=crlf
-src/agent/subagents/winnt/winnt.dsw eol=crlf
+src/agent/subagents/winnt/winnt.vcproj -text
 src/agent/subagents/winperf/winperf.dsp eol=crlf
-src/agent/subagents/winperf/winperf.dsw eol=crlf
+src/agent/subagents/winperf/winperf.vcproj -text
 src/agent/subagents/wmi/wmi.dsp eol=crlf
-src/agent/subagents/wmi/wmi.dsw eol=crlf
+src/agent/subagents/wmi/wmi.vcproj -text
 src/client/console/libnxmc/libnxmc.dsp eol=crlf
 src/client/console/nxmc/eppEditor.cpp -text
 src/client/console/nxmc/eppEditor.h -text
index e1976c8..b44a241 100644 (file)
 
 /********** WINDOWS ********************/
 
+#define _WIN32_WINNT           0x0500
+
 #define FS_PATH_SEPARATOR                      _T("\\")
 #define FS_PATH_SEPARATOR_CHAR _T('\\')
 
 #define pclose    _pclose
 #define strdup    _strdup
 #define stricmp   _stricmp
+#define strnicmp  _strnicmp
 #define open      _open
 #define read      _read
 #define write     _write
index 81480ff..942444d 100644 (file)
@@ -26,6 +26,69 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxagentd", "src\agent\core\
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
        EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "subagents", "subagents", "{451F583D-C2DB-4414-870C-7FA0189BE7DD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{71683564-472B-4216-BA74-0F34BC843D92}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agent", "agent", "{8BC9D64D-347C-41BE-A506-D21C8FB72D56}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{B93920F5-65F4-4531-B87E-A5B357AF2476}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "snmp", "snmp", "{268BC97D-BFC6-4BD7-BF78-E6AC1D8BA37E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winnt", "src\agent\subagents\winnt\winnt.vcproj", "{E95263B5-A248-4163-95F3-E33CA679AEB3}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winperf", "src\agent\subagents\winperf\winperf.vcproj", "{EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmi", "src\agent\subagents\wmi\wmi.vcproj", "{4E190DD5-70DA-41EC-8D05-5EE8D74F3709}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ups", "src\agent\subagents\ups\ups.vcproj", "{53A73D5F-C7E2-449E-A222-F2D78C85D514}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sms", "src\agent\subagents\sms\sms.vcproj", "{DE47D07A-C81B-4772-86D4-13389F263923}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portcheck", "src\agent\subagents\portcheck\portcheck.vcproj", "{F66A27F0-2943-4A16-ACC7-B450314B5163}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ping", "src\agent\subagents\ping\ping.vcproj", "{C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbcquery", "src\agent\subagents\odbcquery\odbcquery.vcproj", "{1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logwatch", "src\agent\subagents\logwatch\logwatch.vcproj", "{F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}"
+       ProjectSection(ProjectDependencies) = postProject
+               {64EFC0C2-C67B-41F6-851D-F11DAB27A60B} = {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ecs", "src\agent\subagents\ecs\ecs.vcproj", "{BBE9028E-725C-45C6-97C9-BFC443F19DB6}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{E431F5D5-AAD8-4315-928A-23F86969DB35}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -78,8 +141,97 @@ Global
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|Win32.ActiveCfg = Release|Win32
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|Win32.Build.0 = Release|Win32
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|x64.ActiveCfg = Release|Win32
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|Win32.Build.0 = Debug|Win32
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|x64.ActiveCfg = Debug|x64
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|x64.Build.0 = Debug|x64
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|Win32.ActiveCfg = Release|Win32
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|Win32.Build.0 = Release|Win32
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|x64.ActiveCfg = Release|Win32
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|Win32.ActiveCfg = Debug|Win32
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|Win32.Build.0 = Debug|Win32
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|x64.ActiveCfg = Debug|x64
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|x64.Build.0 = Debug|x64
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|Win32.ActiveCfg = Release|Win32
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|Win32.Build.0 = Release|Win32
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|x64.ActiveCfg = Release|Win32
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|Win32.ActiveCfg = Debug|Win32
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|Win32.Build.0 = Debug|Win32
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|x64.ActiveCfg = Debug|x64
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|x64.Build.0 = Debug|x64
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|Win32.ActiveCfg = Release|Win32
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|Win32.Build.0 = Release|Win32
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|x64.ActiveCfg = Release|Win32
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|Win32.ActiveCfg = Debug|Win32
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|Win32.Build.0 = Debug|Win32
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|x64.ActiveCfg = Debug|x64
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|x64.Build.0 = Debug|x64
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|Win32.ActiveCfg = Release|Win32
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|Win32.Build.0 = Release|Win32
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|x64.ActiveCfg = Release|Win32
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|Win32.ActiveCfg = Debug|Win32
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|Win32.Build.0 = Debug|Win32
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|x64.ActiveCfg = Debug|x64
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|x64.Build.0 = Debug|x64
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Release|Win32.ActiveCfg = Release|Win32
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Release|Win32.Build.0 = Release|Win32
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Release|x64.ActiveCfg = Release|Win32
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|Win32.Build.0 = Debug|Win32
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|x64.ActiveCfg = Debug|x64
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|x64.Build.0 = Debug|x64
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|Win32.ActiveCfg = Release|Win32
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|Win32.Build.0 = Release|Win32
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|x64.ActiveCfg = Release|Win32
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|Win32.ActiveCfg = Debug|Win32
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|Win32.Build.0 = Debug|Win32
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|x64.ActiveCfg = Debug|x64
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|x64.Build.0 = Debug|x64
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|Win32.ActiveCfg = Release|Win32
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|Win32.Build.0 = Release|Win32
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|x64.ActiveCfg = Release|Win32
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|Win32.ActiveCfg = Debug|Win32
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|Win32.Build.0 = Debug|Win32
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|x64.ActiveCfg = Debug|x64
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|x64.Build.0 = Debug|x64
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|Win32.ActiveCfg = Release|Win32
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|Win32.Build.0 = Release|Win32
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|x64.ActiveCfg = Release|Win32
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|Win32.Build.0 = Debug|Win32
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|x64.ActiveCfg = Debug|x64
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|x64.Build.0 = Debug|x64
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|Win32.ActiveCfg = Release|Win32
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|Win32.Build.0 = Release|Win32
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|x64.ActiveCfg = Release|Win32
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|Win32.ActiveCfg = Debug|Win32
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|Win32.Build.0 = Debug|Win32
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|x64.ActiveCfg = Debug|x64
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|x64.Build.0 = Debug|x64
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|Win32.ActiveCfg = Release|Win32
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|Win32.Build.0 = Release|Win32
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|x64.ActiveCfg = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
+       GlobalSection(NestedProjects) = preSolution
+               {E95263B5-A248-4163-95F3-E33CA679AEB3} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {DE47D07A-C81B-4772-86D4-13389F263923} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {F66A27F0-2943-4A16-ACC7-B450314B5163} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {6A88EF62-C4F2-4295-A833-549DAE4DF5ED} = {71683564-472B-4216-BA74-0F34BC843D92}
+               {F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA} = {71683564-472B-4216-BA74-0F34BC843D92}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {71683564-472B-4216-BA74-0F34BC843D92}
+               {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA} = {71683564-472B-4216-BA74-0F34BC843D92}
+               {64EFC0C2-C67B-41F6-851D-F11DAB27A60B} = {71683564-472B-4216-BA74-0F34BC843D92}
+               {57598B02-3295-4FE8-9322-94CE871CC84D} = {8BC9D64D-347C-41BE-A506-D21C8FB72D56}
+               {451F583D-C2DB-4414-870C-7FA0189BE7DD} = {8BC9D64D-347C-41BE-A506-D21C8FB72D56}
+       EndGlobalSection
 EndGlobal
index 6e00f08..09f385b 100644 (file)
@@ -20,8 +20,6 @@
 **
 **/
 
-#define _WIN32_WINNT 0x0400
-
 #include "nxagentd.h"
 #include <winioctl.h>
 #include <ata.h>
diff --git a/src/agent/subagents/ecs/ecs.dsw b/src/agent/subagents/ecs/ecs.dsw
deleted file mode 100644 (file)
index f95388c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ecs"=.\ecs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 78%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/ecs/ecs.vcproj
index fc4ab94..97cb2a9 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="ecs"\r
+       ProjectGUID="{BBE9028E-725C-45C6-97C9-BFC443F19DB6}"\r
+       RootNamespace="ecs"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ECS_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ECS_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ECS_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ECS_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\main.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\parser.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\rule.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\ecs.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/logwatch/logwatch.dsw b/src/agent/subagents/logwatch/logwatch.dsw
deleted file mode 100644 (file)
index 8dc3875..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "logwatch"=.\logwatch.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 79%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/logwatch/logwatch.vcproj
index fc4ab94..e352f5f 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="logwatch"\r
+       ProjectGUID="{F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}"\r
+       RootNamespace="logwatch"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOGWATCH_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LOGWATCH_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOGWATCH_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LOGWATCH_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\main.cpp"\r
+                               RelativePath=".\eventlog.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\parser.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\rule.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\main.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath=".\logwatch.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/odbcquery/odbcquery.dsw b/src/agent/subagents/odbcquery/odbcquery.dsw
deleted file mode 100644 (file)
index cff99cc..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "odbcquery"=.\odbcquery.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 79%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/odbcquery/odbcquery.vcproj
index fc4ab94..70e5589 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="odbcquery"\r
+       ProjectGUID="{1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}"\r
+       RootNamespace="odbcquery"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ODBCQUERY_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ODBCQUERY_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ODBCQUERY_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ODBCQUERY_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\main.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\parser.cpp"\r
+                               RelativePath=".\odbcquery.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\rule.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\odbcsapi.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath=".\odbcquery.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/ping/ping.dsw b/src/agent/subagents/ping/ping.dsw
deleted file mode 100644 (file)
index cd4b231..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ping"=.\ping.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 78%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/ping/ping.vcproj
index fc4ab94..5ccb8c7 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="ping"\r
+       ProjectGUID="{C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}"\r
+       RootNamespace="ping"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PING_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PING_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PING_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PING_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\main.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\parser.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\rule.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\ping.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath=".\ping.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/portCheck/portcheck.dsw b/src/agent/subagents/portCheck/portcheck.dsw
deleted file mode 100644 (file)
index 182bbb2..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "portcheck"=.\portcheck.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 75%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/portCheck/portcheck.vcproj
index fc4ab94..d10594d 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="portcheck"\r
+       ProjectGUID="{F66A27F0-2943-4A16-ACC7-B450314B5163}"\r
+       RootNamespace="portcheck"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PORTCHECK_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PORTCHECK_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PORTCHECK_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PORTCHECK_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\custom.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\http.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\main.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\parser.cpp"\r
+                               RelativePath=".\net.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\pop3.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\smtp.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\rule.cpp"\r
+                               RelativePath=".\ssh.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\telnet.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
+                               RelativePath=".\main.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath=".\net.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/sms/sms.dsw b/src/agent/subagents/sms/sms.dsw
deleted file mode 100644 (file)
index 8176455..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "sms"=.\sms.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 79%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/sms/sms.vcproj
index fc4ab94..b4f70f8 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="sms"\r
+       ProjectGUID="{DE47D07A-C81B-4772-86D4-13389F263923}"\r
+       RootNamespace="sms"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SMS_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\parser.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\rule.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\sender.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath=".\sms.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/ups/ups.dsw b/src/agent/subagents/ups/ups.dsw
deleted file mode 100644 (file)
index 2b434ff..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ups"=.\ups.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 76%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/ups/ups.vcproj
index fc4ab94..b30f787 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="ups"\r
+       ProjectGUID="{53A73D5F-C7E2-449E-A222-F2D78C85D514}"\r
+       RootNamespace="ups"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UPS_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="hid.lib setupapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UPS_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="hid.lib setupapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UPS_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="hid.lib setupapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UPS_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="hid.lib setupapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\apc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\bcmxcp.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\main.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\parser.cpp"\r
+                               RelativePath=".\microdowell.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\serial.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\rule.cpp"\r
+                               RelativePath=".\ups.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\usb.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath=".\ups.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/win9x/win9x.dsw b/src/agent/subagents/win9x/win9x.dsw
deleted file mode 100644 (file)
index 23e9ce9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "win9x"=.\win9x.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
index 94f39e7..c2d8484 100644 (file)
@@ -176,6 +176,7 @@ static BOOL GetProcessCommandLine(DWORD dwPId, TCHAR *pszCmdLine, DWORD dwLen)
 
        pfnGetCommandLineA = GetProcAddress(GetModuleHandle("KERNEL32.DLL"), "GetCommandLineA"); 
 
+       /* TODO: need different solution for 64bit Windows */
        hThread = CreateRemoteThread(hProcess, 0, 0, (LPTHREAD_START_ROUTINE)pfnGetCommandLineA, 0, 0, 0);
        if (hThread != INVALID_HANDLE_VALUE)
        {
@@ -320,7 +321,7 @@ LONG H_ProcInfo(const char *cmd, const char *arg, char *value)
    static char *typeList[]={ "min", "max", "avg", "sum", NULL };
 
    // Check attribute
-   attr = (int)arg;
+   attr = CAST_FROM_POINTER(arg, int);
    if (!IsAttributeSupported(attr))
       return SYSINFO_RC_UNSUPPORTED;     // Unsupported attribute
 
diff --git a/src/agent/subagents/winnt/winnt.dsw b/src/agent/subagents/winnt/winnt.dsw
deleted file mode 100644 (file)
index d9bc864..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "winnt"=.\winnt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 77%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/winnt/winnt.vcproj
index fc4ab94..1c09331 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="winnt"\r
+       ProjectGUID="{E95263B5-A248-4163-95F3-E33CA679AEB3}"\r
+       RootNamespace="winnt"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINNT_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="netapi32.lib psapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINNT_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="netapi32.lib psapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINNT_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="netapi32.lib psapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINNT_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="netapi32.lib psapi.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\parser.cpp"\r
+                               RelativePath=".\net.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\rule.cpp"\r
+                               RelativePath=".\procinfo.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\system.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath=".\winnt_subagent.h"\r
                                >\r
                        </File>\r
                </Filter>\r
index 4810499..18ca179 100644 (file)
@@ -125,7 +125,8 @@ static BOOL TranslateElement(TCHAR *pszText)
 BOOL TranslateCounterName(const TCHAR *pszName, TCHAR *pszOut)
 {
        const TCHAR *pCurr = pszName;
-       TCHAR *pSlash, *pBrace, *pNext, szTemp[MAX_ELEMENT_LENGTH];
+       const TCHAR *pSlash, *pBrace, *pNext;
+       TCHAR szTemp[MAX_ELEMENT_LENGTH];
        BOOL bs1, bs2;
        int nLen;
 
diff --git a/src/agent/subagents/winperf/winperf.dsw b/src/agent/subagents/winperf/winperf.dsw
deleted file mode 100644 (file)
index 00eb4bb..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "winperf"=.\winperf.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
index a1c325e..e848e4b 100644 (file)
@@ -23,8 +23,6 @@
 #ifndef _winperf_h_
 #define _winperf_h_
 
-#include <winsock2.h>
-#include <windows.h>
 #include <nms_common.h>
 #include <nms_agent.h>
 #include <nms_threads.h>
similarity index 78%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/winperf/winperf.vcproj
index fc4ab94..f88c979 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="winperf"\r
+       ProjectGUID="{EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}"\r
+       RootNamespace="winperf"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINPERF_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="pdh.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINPERF_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="pdh.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINPERF_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="pdh.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINPERF_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="pdh.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\main.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\parser.cpp"\r
+                               RelativePath=".\collect.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\rule.cpp"\r
+                               RelativePath=".\tools.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\winperf.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath=".\winperf.h"\r
                                >\r
                        </File>\r
                </Filter>\r
diff --git a/src/agent/subagents/wmi/wmi.dsw b/src/agent/subagents/wmi/wmi.dsw
deleted file mode 100644 (file)
index 650cf15..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wmi"=.\wmi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
index 5faae20..9028aaf 100644 (file)
@@ -25,8 +25,6 @@
 
 #define _WIN32_DCOM
 
-#include <winsock2.h>
-#include <windows.h>
 #include <nms_common.h>
 #include <nms_agent.h>
 #include <nms_threads.h>
similarity index 78%
copy from src/libnxlp/libnxlp.vcproj
copy to src/agent/subagents/wmi/wmi.vcproj
index fc4ab94..02746b8 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libnxlp"\r
-       ProjectGUID="{64EFC0C2-C67B-41F6-851D-F11DAB27A60B}"\r
-       RootNamespace="libnxlp"\r
+       Name="wmi"\r
+       ProjectGUID="{4E190DD5-70DA-41EC-8D05-5EE8D74F3709}"\r
+       RootNamespace="wmi"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,8 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WMI_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -64,6 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="wbemuuid.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WMI_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="wbemuuid.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WMI_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="wbemuuid.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WMI_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="wbemuuid.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName).nsm"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\main.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\parser.cpp"\r
+                               RelativePath=".\acpi.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\rule.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winfile.cpp"\r
+                               RelativePath=".\wmi.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libnxlp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\netxms-regex.h"\r
+                               RelativePath="..\..\..\..\include\nms_agent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\netxms-version.h"\r
+                               RelativePath="..\..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_common.h"\r
+                               RelativePath="..\..\..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_threads.h"\r
+                               RelativePath="..\..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\nms_util.h"\r
+                               RelativePath="..\..\..\..\include\nxlog.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\unicode.h"\r
+                               RelativePath=".\wmi.h"\r
                                >\r
                        </File>\r
                </Filter>\r
index fc4ab94..c83b3a5 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
-                               RuntimeLibrary="2"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include;..\libexpat\libexpat"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXLP_EXPORTS"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
index 5ce2655..c42b106 100644 (file)
@@ -7,8 +7,8 @@
                <CustomBuildRule\r
                        Name="Message compiler"\r
                        DisplayName="Message compiler"\r
-                       CommandLine="mc -s -U -h $(ProjectDir) -r $(ProjectDir) $(InputFileName)&#x0D;&#x0A;del $(ProjectDir)messages.rc&#x0D;&#x0A;"\r
-                       Outputs="$(InputName).h MSG00001.bin"\r
+                       CommandLine="mc -s -U -h &quot;$(ProjectDir)&quot; -r &quot;$(ProjectDir)&quot; &quot;$(InputFileName)&quot;&#x0D;&#x0A;del &quot;$(ProjectDir)messages.rc&quot;&#x0D;&#x0A;"\r
+                       Outputs="$(InputName).h;MSG00001.bin"\r
                        FileExtensions="*.mc"\r
                        ExecutionDescription="Running message compiler"\r
                        >\r