nxconfig ported to VS2005; server installer fixed
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 2 Mar 2010 00:35:08 +0000 (00:35 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 2 Mar 2010 00:35:08 +0000 (00:35 +0000)
13 files changed:
.gitattributes
netxms.sln
src/client/windows/nxcon/StdAfx.h
src/install/windows/netxms.iss
src/server/tools/nxconfig/ConfigWizard.cpp
src/server/tools/nxconfig/ProcessingPage.cpp
src/server/tools/nxconfig/ProcessingPage.h
src/server/tools/nxconfig/StdAfx.h
src/server/tools/nxconfig/SummaryPage.cpp
src/server/tools/nxconfig/WizardWorker.cpp
src/server/tools/nxconfig/nxconfig.cpp
src/server/tools/nxconfig/nxconfig.h
src/server/tools/nxconfig/nxconfig.vcproj [new file with mode: 0644]

index cb5b831..daaf9af 100644 (file)
@@ -738,6 +738,7 @@ src/server/smsdrv/generic/generic.vcproj -text
 src/server/smsdrv/nxagent/nxagent.vcproj -text
 src/server/tools/nxaction/nxaction.vcproj -text
 src/server/tools/nxadm/nxadm.vcproj -text
+src/server/tools/nxconfig/nxconfig.vcproj -text
 src/server/tools/nxconfig/res/failed.ico -text
 src/server/tools/nxconfig/res/nxconfig.ico -text
 src/server/tools/nxconfig/res/ok.ico -text
index 88d60b7..c34c16e 100644 (file)
@@ -386,6 +386,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "src\db\dbdrv\sqli
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxconfig", "src\server\tools\nxconfig\nxconfig.vcproj", "{A76CCCF5-D70B-4307-B84C-219289CEAA6D}"
+       ProjectSection(ProjectDependencies) = postProject
+               {F3E29541-3A0E-45EC-8BEC-E193F2401622} = {F3E29541-3A0E-45EC-8BEC-E193F2401622}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4)
@@ -1028,6 +1034,14 @@ Global
                {AA18FD4D-7B01-4932-BA04-B0F54F001F66}.Release|Win32.Build.0 = Release|Win32
                {AA18FD4D-7B01-4932-BA04-B0F54F001F66}.Release|x64.ActiveCfg = Release|x64
                {AA18FD4D-7B01-4932-BA04-B0F54F001F66}.Release|x64.Build.0 = Release|x64
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Debug|Win32.Build.0 = Debug|Win32
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Debug|x64.ActiveCfg = Debug|Win32
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Release|Win32.ActiveCfg = Release|Win32
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Release|Win32.Build.0 = Release|Win32
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D}.Release|x64.ActiveCfg = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -1085,6 +1099,7 @@ Global
                {DA863269-ED58-4910-AA6A-2572A3EE745D} = {64482674-7B36-4A14-A612-247333174315}
                {4940613E-A11C-4259-95C8-8D23217EE60E} = {64482674-7B36-4A14-A612-247333174315}
                {49F5280F-147B-46D0-98BF-931F0646CF82} = {64482674-7B36-4A14-A612-247333174315}
+               {A76CCCF5-D70B-4307-B84C-219289CEAA6D} = {64482674-7B36-4A14-A612-247333174315}
                {AC0CB89C-E27A-43FA-A049-1FF4B2FE2121} = {7C6B32C4-53F9-4378-903E-1DA05748376B}
                {E9F4A68D-4BF2-45AD-BDD6-210AFF857661} = {7C6B32C4-53F9-4378-903E-1DA05748376B}
                {0D98A1CD-48E0-4F11-9151-B53497E1F7DA} = {7C6B32C4-53F9-4378-903E-1DA05748376B}
index 9a58873..faa48d0 100644 (file)
@@ -22,7 +22,6 @@
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
-
 #if _MSC_VER >= 1400
 
 #ifndef WINVER
index 491c8d7..922da61 100644 (file)
@@ -3,8 +3,8 @@
 
 [Setup]
 AppName=NetXMS
-AppVerName=NetXMS 0.2.25
-AppVersion=0.2.25
+AppVerName=NetXMS 1.1.0
+AppVersion=1.10
 AppPublisher=NetXMS Team
 AppPublisherURL=http://www.netxms.org
 AppSupportURL=http://www.netxms.org
@@ -13,7 +13,7 @@ DefaultDirName=C:\NetXMS
 DefaultGroupName=NetXMS
 AllowNoIcons=yes
 LicenseFile=..\..\..\copying
-OutputBaseFilename=netxms-0.2.25
+OutputBaseFilename=netxms-1.1.0
 Compression=lzma
 SolidCompression=yes
 LanguageDetectionMethod=none
@@ -37,155 +37,141 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 [Files]
 ; Common files
 Source: "..\..\..\ChangeLog"; DestDir: "{app}\doc"; Flags: ignoreversion; Components: base
-Source: "..\..\libnetxms\Release\libnetxms.dll"; DestDir: "{app}\bin"; BeforeInstall: StopAllServices; Flags: ignoreversion; Components: base
-Source: "..\..\libnetxms\Release\libnetxms.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base and pdb
-Source: "..\..\libnetxms\Release_UNICODE\libnetxmsw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "..\..\libnetxms\Release_UNICODE\libnetxmsw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base and pdb
+Source: "..\..\..\Release\libnetxms.dll"; DestDir: "{app}\bin"; BeforeInstall: StopAllServices; Flags: ignoreversion; Components: base
+Source: "..\..\..\Release\libnetxms.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base and pdb
+Source: "..\..\..\Release\libnetxmsw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
+Source: "..\..\..\Release\libnetxmsw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base and pdb
+Source: "..\..\..\Release\libexpat.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
+Source: "..\..\..\Release\libexpat.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base and pdb
+Source: "..\..\..\Release\nxzlib.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
+Source: "..\..\..\Release\nxzlib.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base and pdb
 ; Executables and DLLs shared between different components (server, console, etc.)
-Source: "..\..\libnxcl\Release\libnxcl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console tools websrv
-Source: "..\..\libnxcl\Release\libnxcl.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (console or tools or websrv) and pdb
-Source: "..\..\libnxcl\Release_UNICODE\libnxclw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console tools
-Source: "..\..\libnxcl\Release_UNICODE\libnxclw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (console or tools) and pdb
-Source: "..\..\libnxmap\Release\libnxmap.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console server websrv
-Source: "..\..\libnxmap\Release\libnxmap.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (console or server or websrv) and pdb
-Source: "..\..\libnxmap\Release_UNICODE\libnxmapw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\libnxmap\Release_UNICODE\libnxmapw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\libnxsnmp\Release\libnxsnmp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server console
-Source: "..\..\libnxsnmp\Release\libnxsnmp.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (server or console) and pdb
-Source: "..\..\libnxsnmp\Release_UNICODE\libnxsnmpw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\libnxsnmp\Release_UNICODE\libnxsnmpw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\libnxsl\Release\libnxsl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server console
-Source: "..\..\libnxsl\Release\libnxsl.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (server or console) and pdb
-Source: "..\..\nxscript\Release\nxscript.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server console
-Source: "..\..\server\tools\nxconfig\Release\nxconfig.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server websrv
-Source: "nxconfig.exe.manifest"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server websrv
+Source: "..\..\..\Release\libnxcl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console tools websrv
+Source: "..\..\..\Release\libnxcl.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (console or tools or websrv) and pdb
+Source: "..\..\..\Release\libnxclw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console tools
+Source: "..\..\..\Release\libnxclw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (console or tools) and pdb
+Source: "..\..\..\Release\libnxmap.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console server websrv
+Source: "..\..\..\Release\libnxmap.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (console or server or websrv) and pdb
+Source: "..\..\..\Release\libnxmapw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\libnxmapw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
+Source: "..\..\..\Release\libnxsnmp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server console
+Source: "..\..\..\Release\libnxsnmp.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (server or console) and pdb
+Source: "..\..\..\Release\libnxsl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server console
+Source: "..\..\..\Release\libnxsl.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: (server or console) and pdb
+Source: "..\..\..\Release\nxscript.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server console
+Source: "..\..\..\Release\nxconfig.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server websrv
 ; Server files
-Source: "..\..\libnxlp\Release\libnxlp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\libnxlp\Release\libnxlp.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\libnxsrv\Release\libnxsrv.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\libnxsrv\Release\libnxsrv.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\core\Release\nxcore.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\core\Release\nxcore.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\netxmsd\Release\netxmsd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\netxmsd\Release\netxmsd.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\dbdrv\mysql\Release\mysql.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\dbdrv\mysql\Release\mysql.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\dbdrv\mssql\Release\mssql.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\dbdrv\mssql\Release\mssql.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\dbdrv\odbc\Release\odbc.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\dbdrv\pgsql\Release\pgsql.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\dbdrv\sqlite\Release\sqlite.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\dbdrv\oracle\Release\oracle.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\smsdrv\generic\Release\generic.sms"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\smsdrv\generic\Release\generic.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\smsdrv\nxagent\Release\nxagent.sms"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\smsdrv\nxagent\Release\nxagent.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\tools\nxaction\Release\nxaction.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\tools\nxadm\Release\nxadm.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\tools\nxdbmgr\Release\nxdbmgr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\tools\nxget\Release\nxget.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\tools\nxget\Release\nxget.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\server\tools\nxsnmpget\Release\nxsnmpget.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\tools\nxsnmpwalk\Release\nxsnmpwalk.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\tools\nxsnmpset\Release\nxsnmpset.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\server\tools\nxupload\Release\nxupload.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\nxmibc\Release\nxmibc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\core\Release\nxagentd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\winnt\Release\winnt.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\winnt\Release\winnt.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\agent\subagents\win9x\Release\win9x.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\winperf\Release\winperf.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\winperf\Release\winperf.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\agent\subagents\wmi\Release\wmi.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-;Source: "..\..\agent\subagents\wmi\Release\wmi.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\agent\subagents\ping\Release\ping.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\ping\Release\ping.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\agent\subagents\portCheck\Release\portcheck.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\portCheck\Release\portcheck.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\agent\subagents\ecs\Release\ecs.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\ecs\Release\ecs.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\agent\subagents\ups\Release\ups.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\ups\Release\ups.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
-Source: "..\..\agent\subagents\odbcquery\Release\odbcquery.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
-Source: "..\..\agent\subagents\odbcquery\Release\odbcquery.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\nxsqlite.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxsqlite.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\libnxlp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\libnxlp.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\libnxdb.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\libnxdb.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\libnxsrv.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\libnxsrv.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\nxcore.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxcore.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\netxmsd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\netxmsd.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\mysql.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\mysql.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\mssql.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\mssql.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\odbc.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\pgsql.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\sqlite.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\oracle.ddr"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\generic.sms"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\generic.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\nxagent.sms"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxagent.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\nxaction.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxadm.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxdbmgr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxget.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxget.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\nxsnmpget.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxsnmpwalk.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxsnmpset.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxupload.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxmibc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\nxagentd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\winnt.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\winnt.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+;Source: "..\..\..\Release\win9x.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\winperf.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\winperf.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\wmi.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\wmi.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\ping.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\ping.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\portcheck.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\portcheck.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\ecs.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\ecs.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\ups.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\ups.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
+Source: "..\..\..\Release\odbcquery.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server
+Source: "..\..\..\Release\odbcquery.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server and pdb
 Source: "..\..\..\sql\dbinit_mssql.sql"; DestDir: "{app}\lib\sql"; Flags: ignoreversion; Components: server
 Source: "..\..\..\sql\dbinit_mysql.sql"; DestDir: "{app}\lib\sql"; Flags: ignoreversion; Components: server
 Source: "..\..\..\sql\dbinit_oracle.sql"; DestDir: "{app}\lib\sql"; Flags: ignoreversion; Components: server
 Source: "..\..\..\sql\dbinit_pgsql.sql"; DestDir: "{app}\lib\sql"; Flags: ignoreversion; Components: server
 Source: "..\..\..\sql\dbinit_sqlite.sql"; DestDir: "{app}\lib\sql"; Flags: ignoreversion; Components: server
-Source: "..\..\..\images\*.ico"; DestDir: "{app}\var\images"; Flags: ignoreversion; Components: server
-Source: "..\..\..\images\*.png"; DestDir: "{app}\var\images"; Flags: ignoreversion; Components: server
 Source: "..\..\..\contrib\mibs\*.txt"; DestDir: "{app}\var\mibs"; Flags: ignoreversion; Components: server
 Source: "..\..\..\contrib\netxmsd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 Source: "..\..\..\contrib\nxagentd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: server
 ; Console files
-Source: "..\..\console\nxuilib\Release\nxuilib.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\console\nxuilib\Release\nxuilib.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\console\nxuilib\Release_UNICODE\nxuilibw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\console\nxuilib\Release_UNICODE\nxuilibw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\console\nxlexer\Release\nxlexer.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\console\nxlexer\Release\nxlexer.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\console\win32\Release_UNICODE\nxcon.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\console\win32\Release_UNICODE\nxcon.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\console\nxav\Release_UNICODE\nxav.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\console\nxav\Release_UNICODE\nxav.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\console\nxnotify\Release\nxnotify.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\console\nxnotify\Release\nxnotify.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
-Source: "..\..\client\console\libnxmc\Release_UNICODE\libnxmc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\client\console\nxmc\Release_UNICODE\nxmc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "..\..\client\console\plugins\AlarmBrowser\Release_UNICODE\AlarmBrowser.so"; DestDir: "{app}\lib\nxmc"; Flags: ignoreversion; Components: console
-Source: "..\..\client\console\plugins\Dashboard\Release_UNICODE\Dashboard.so"; DestDir: "{app}\lib\nxmc"; Flags: ignoreversion; Components: console
-Source: "..\..\client\console\plugins\ObjectBrowser\Release_UNICODE\ObjectBrowser.so"; DestDir: "{app}\lib\nxmc"; Flags: ignoreversion; Components: console
-Source: "nxcon.exe.manifest"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "nxav.exe.manifest"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "nxnotify.exe.manifest"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "nxmc.exe.manifest"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\scilexer.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\scilexer.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
+Source: "..\..\..\Release\libnxsnmpw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\libnxsnmpw.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
+Source: "..\..\..\Release\nxuilib.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\nxuilib.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
+Source: "..\..\..\Release\nxlexer.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\nxlexer.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
+Source: "..\..\..\Release\nxcon.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\nxcon.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
+Source: "..\..\..\Release\nxav.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\nxav.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
+Source: "..\..\..\Release\nxnotify.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "..\..\..\Release\nxnotify.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console and pdb
 ; Command-line tools files
-Source: "..\..\client\nxalarm\Release\nxalarm.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
-Source: "..\..\client\nxsms\Release\nxsms.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
-Source: "..\..\nxevent\Release\nxevent.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
-Source: "..\..\nxpush\Release\nxpush.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
+Source: "..\..\..\Release\nxalarm.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
+Source: "..\..\..\Release\nxsms.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
+Source: "..\..\..\Release\nxevent.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
+Source: "..\..\..\Release\nxpush.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: tools
 ; Web server files
-Source: "..\..\nxhttpd\Release\nxhttpd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\*.js"; DestDir: "{app}\var\www"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\netxms.css"; DestDir: "{app}\var\www"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\images\*.png"; DestDir: "{app}\var\www\images"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\images\buttons\normal\*.png"; DestDir: "{app}\var\www\images\buttons\normal"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\images\buttons\pressed\*.png"; DestDir: "{app}\var\www\images\buttons\pressed"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\images\ctrlpanel\*.png"; DestDir: "{app}\var\www\images\ctrlpanel"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\images\objects\*.png"; DestDir: "{app}\var\www\images\objects"; Flags: ignoreversion; Components: websrv
-Source: "..\..\nxhttpd\static\images\status\*.png"; DestDir: "{app}\var\www\images\status"; Flags: ignoreversion; Components: websrv
+Source: "..\..\..\Release\libgd.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: websrv
+Source: "..\..\..\Release\libgd.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: websrv and pdb
+Source: "..\..\..\Release\nxhttpd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: websrv
+Source: "..\..\..\Release\nxhttpd.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: websrv and pdb
+Source: "..\..\webui\nxhttpd\static\*.js"; DestDir: "{app}\var\www"; Flags: ignoreversion; Components: websrv
+Source: "..\..\webui\nxhttpd\static\netxms.css"; DestDir: "{app}\var\www"; Flags: ignoreversion; Components: websrv
+Source: "..\..\webui\nxhttpd\static\images\*.png"; DestDir: "{app}\var\www\images"; Flags: ignoreversion; Components: websrv
+Source: "..\..\webui\nxhttpd\static\images\buttons\normal\*.png"; DestDir: "{app}\var\www\images\buttons\normal"; Flags: ignoreversion; Components: websrv
+Source: "..\..\webui\nxhttpd\static\images\buttons\pressed\*.png"; DestDir: "{app}\var\www\images\buttons\pressed"; Flags: ignoreversion; Components: websrv
+Source: "..\..\webui\nxhttpd\static\images\ctrlpanel\*.png"; DestDir: "{app}\var\www\images\ctrlpanel"; Flags: ignoreversion; Components: websrv
+Source: "..\..\webui\nxhttpd\static\images\objects\*.png"; DestDir: "{app}\var\www\images\objects"; Flags: ignoreversion; Components: websrv
+Source: "..\..\webui\nxhttpd\static\images\status\*.png"; DestDir: "{app}\var\www\images\status"; Flags: ignoreversion; Components: websrv
 ; Third party files
-Source: "Files\mfc42.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\mfc42u.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\scilexer.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
+Source: "Files\Microsoft.VC80.CRT\*"; DestDir: "{app}\bin\Microsoft.VC80.CRT"; Flags: ignoreversion; Components: base
+Source: "Files\Microsoft.VC80.MFC\*"; DestDir: "{app}\bin\Microsoft.VC80.MFC"; Flags: ignoreversion; Components: server console
 Source: "Files\libmysql.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\mysql
 Source: "Files\ntwdblib.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\mssql
 Source: "Files\libpq.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
-Source: "Files\libintl-2.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
+Source: "Files\libintl-8.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
 Source: "Files\libiconv-2.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
-Source: "Files\comerr32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
 Source: "Files\krb5_32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
+Source: "Files\comerr32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
+Source: "Files\k5sprt32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
 Source: "Files\gssapi32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
+Source: "Files\msvcr71.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
 Source: "Files\ssleay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\pgsql
 Source: "Files\oci.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\oracle
 Source: "Files\orannzsbb10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\oracle
-Source: "Files\oraociicus10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: server\oracle
 Source: "Files\libeay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "Files\bgd.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: websrv
-Source: "Files\zlib1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
 Source: "Files\dbghelp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "Files\libexpat.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "Files\libexpatw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "Files\wxbase28u_net_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxbase28u_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxbase28u_xml_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxmsw28u_adv_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxmsw28u_aui_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxmsw28u_core_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxmsw28u_html_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxmsw28u_media_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
-Source: "Files\wxmsw28u_xrc_vc.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console
 
 [Icons]
 Name: "{group}\Alarm Notifier"; Filename: "{app}\bin\nxnotify.exe"; Components: console
index e36c0c7..7c98d22 100644 (file)
@@ -4,6 +4,7 @@
 #include "stdafx.h"
 #include "nxconfig.h"
 #include "ConfigWizard.h"
+#include <nxconfig.h>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -122,9 +123,13 @@ void CConfigWizard::DefaultConfig()
       cfgTemplate[6].pBuffer = &dwFlags;
       cfgTemplate[7].pBuffer = m_cfg.m_szLogFile;
 
-      if (NxLoadConfig(m_cfg.m_szConfigFile, _T(""), cfgTemplate, FALSE) == NXCFG_ERR_OK)
+               Config config;
+      if (config.loadConfig(m_cfg.m_szConfigFile, _T("server")))
       {
-         m_cfg.m_bLogFailedSQLQueries = (dwFlags ? TRUE : FALSE);
+                       if (config.parseTemplate(_T("server"), cfgTemplate))
+                       {
+                               m_cfg.m_bLogFailedSQLQueries = (dwFlags ? TRUE : FALSE);
+                       }
       }
    }
 }
index 1278a17..e35cced 100644 (file)
@@ -81,11 +81,12 @@ BOOL CProcessingPage::OnInitDialog()
 // WM_START_STAGE message handler
 //
 
-void CProcessingPage::OnStartStage(WPARAM wParam, LPARAM lParam)
+LRESULT CProcessingPage::OnStartStage(WPARAM wParam, LPARAM lParam)
 {
    m_iLastItem = m_wndListCtrl.InsertItem(0x7FFFFFFF, _T(""), 0);
    if (m_iLastItem != -1)
       m_wndListCtrl.SetItemText(m_iLastItem, 1, (TCHAR *)lParam);
+       return 0;
 }
 
 
@@ -93,7 +94,7 @@ void CProcessingPage::OnStartStage(WPARAM wParam, LPARAM lParam)
 // WM_STAGE_COMPLETED message handler
 //
 
-void CProcessingPage::OnStageCompleted(WPARAM wParam, LPARAM lParam)
+LRESULT CProcessingPage::OnStageCompleted(WPARAM wParam, LPARAM lParam)
 {
    LVITEM item;
 
@@ -102,6 +103,7 @@ void CProcessingPage::OnStageCompleted(WPARAM wParam, LPARAM lParam)
    item.mask = LVIF_IMAGE;
    item.iImage = wParam ? 1 : 2;
    m_wndListCtrl.SetItem(&item);
+       return 0;
 }
 
 
@@ -109,7 +111,7 @@ void CProcessingPage::OnStageCompleted(WPARAM wParam, LPARAM lParam)
 // WM_JOB_FINISHED message handler
 //
 
-void CProcessingPage::OnJobFinished(WPARAM wParam, LPARAM lParam)
+LRESULT CProcessingPage::OnJobFinished(WPARAM wParam, LPARAM lParam)
 {
    SetDlgItemText(IDC_STATIC_STATUS, wParam ? _T("Completed") : _T("Failed"));
    if (wParam)
@@ -118,6 +120,7 @@ void CProcessingPage::OnJobFinished(WPARAM wParam, LPARAM lParam)
    else
       MessageBox(g_szWizardErrorText, _T("Error"), MB_OK | MB_ICONSTOP);
    ((CPropertySheet *)GetParent())->SetWizardButtons(wParam ? PSWIZB_NEXT : PSWIZB_BACK);
+       return 0;
 }
 
 
index a71fc0a..7ec0f9b 100644 (file)
@@ -43,9 +43,9 @@ protected:
        //{{AFX_MSG(CProcessingPage)
        virtual BOOL OnInitDialog();
        //}}AFX_MSG
-   afx_msg void OnStartStage(WPARAM wParam, LPARAM lParam);
-   afx_msg void OnStageCompleted(WPARAM wParam, LPARAM lParam);
-   afx_msg void OnJobFinished(WPARAM wParam, LPARAM lParam);
+   afx_msg LRESULT OnStartStage(WPARAM wParam, LPARAM lParam);
+   afx_msg LRESULT OnStageCompleted(WPARAM wParam, LPARAM lParam);
+   afx_msg LRESULT OnJobFinished(WPARAM wParam, LPARAM lParam);
        DECLARE_MESSAGE_MAP()
 
 };
index 3047f17..8cd43fb 100644 (file)
@@ -6,11 +6,56 @@
 #if !defined(AFX_STDAFX_H__A95D0F64_D7CC_410F_B665_891EBFEF5171__INCLUDED_)
 #define AFX_STDAFX_H__A95D0F64_D7CC_410F_B665_891EBFEF5171__INCLUDED_
 
+#if defined _M_IX86
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#elif defined _M_IA64
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#elif defined _M_X64
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#else
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#endif
+
 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
 
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#if _MSC_VER >= 1400
+
+#ifndef WINVER
+#define WINVER 0x0501
+#endif
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif                                         
+
+#else
+
+#ifndef WINVER
+#define WINVER 0x0500
+#endif
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif                                         
+
+#endif
+
+#ifndef _WIN32_WINDOWS         // Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE                      // Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600       // Change this to the appropriate value to target other versions of IE.
+#endif
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS     // some CString constructors will be explicit
+
 #define VC_EXTRALEAN           // Exclude rarely-used stuff from Windows headers
+#define _WINSOCKAPI_    /* Prevent inclusion of winsock.h in windows.h */
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
@@ -20,9 +65,6 @@
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#include <winsock2.h>
-#include <afxsock.h>           // MFC socket extensions
-
 #include <winsvc.h>
 
 //{{AFX_INSERT_LOCATION}}
index d6f7905..5578fe4 100644 (file)
@@ -99,13 +99,13 @@ BOOL CSummaryPage::OnSetActive()
 
    AddParam(szBuffer, _T("\r\nRun IP autodiscovery: %s\r\n"), pc->m_bRunAutoDiscovery ? _T("yes") : _T("no"));
    if (pc->m_bRunAutoDiscovery)
-      AddParam(szBuffer, _T("Interval between discovery polls: %d\r\n"), (void *)pc->m_dwDiscoveryPI);
+      AddParam(szBuffer, _T("Interval between discovery polls: %d\r\n"), CAST_TO_POINTER(pc->m_dwDiscoveryPI, void *));
 
-   AddParam(szBuffer, _T("\r\nNumber of status pollers: %d\r\n"), (void *)pc->m_dwNumStatusPollers);
-   AddParam(szBuffer, _T("Interval between status polls: %d\r\n"), (void *)pc->m_dwStatusPI);
+   AddParam(szBuffer, _T("\r\nNumber of status pollers: %d\r\n"), CAST_TO_POINTER(pc->m_dwNumStatusPollers, void *));
+   AddParam(szBuffer, _T("Interval between status polls: %d\r\n"), CAST_TO_POINTER(pc->m_dwStatusPI, void *));
    
-   AddParam(szBuffer, _T("\r\nNumber of configuration pollers: %d\r\n"), (void *)pc->m_dwNumConfigPollers);
-   AddParam(szBuffer, _T("Interval between configuration polls: %d\r\n"), (void *)pc->m_dwConfigurationPI);
+   AddParam(szBuffer, _T("\r\nNumber of configuration pollers: %d\r\n"), CAST_TO_POINTER(pc->m_dwNumConfigPollers, void *));
+   AddParam(szBuffer, _T("Interval between configuration polls: %d\r\n"), CAST_TO_POINTER(pc->m_dwConfigurationPI, void *));
 
    AddParam(szBuffer, _T("\r\nSMTP server: %s\r\n"), pc->m_szSMTPServer);
    AddParam(szBuffer, _T("System's email address: %s\r\n"), pc->m_szSMTPMailFrom);
index 57a121f..9b462e4 100644 (file)
@@ -1,7 +1,7 @@
 /* 
 ** NetXMS - Network Management System
 ** Server Configurator for Windows
-** Copyright (C) 2005 Victor Kirhenshtein
+** Copyright (C) 2005-2010 Victor Kirhenshtein
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **
-** $module: WizardWorker.cpp
+** File: WizardWorker.cpp
 ** Worker thread for configuration wizard
 **
 **/
 
 #include "stdafx.h"
 #include "nxconfig.h"
+#include <nxsrvapi.h>
 
 
 //
@@ -395,7 +396,7 @@ static BOOL CreateSQLiteDB(WIZARD_CFG_INFO *pc)
    _stprintf(szBaseDir, _T("%s\\database"), pc->m_szInstallDir);
    SetCurrentDirectory(szBaseDir);
    DeleteFile(pc->m_szDBName);
-   hConn = DBConnectEx(NULL, pc->m_szDBName, NULL, NULL);
+       hConn = DBConnect(pc->m_dbDriver, NULL, pc->m_szDBName, NULL, NULL);
    if (hConn != NULL)
    {
       DBDisconnect(hConn);
@@ -422,9 +423,9 @@ static BOOL CreateDatabase(WIZARD_CFG_INFO *pc)
    else
    {
       PostMessage(m_hStatusWnd, WM_START_STAGE, 0, (LPARAM)_T("Connecting to database server as DBA"));
-      hConn = DBConnectEx(pc->m_szDBServer, 
-                          (pc->m_iDBEngine == DB_ENGINE_PGSQL) ? _T("template1") : NULL,
-                          pc->m_szDBALogin, pc->m_szDBAPassword);
+               hConn = DBConnect(pc->m_dbDriver, pc->m_szDBServer, 
+                        (pc->m_iDBEngine == DB_ENGINE_PGSQL) ? _T("template1") : NULL,
+                        pc->m_szDBALogin, pc->m_szDBAPassword);
       if (hConn != NULL)
       {
          PostMessage(m_hStatusWnd, WM_STAGE_COMPLETED, TRUE, 0);
@@ -479,9 +480,13 @@ static DWORD __stdcall WorkerThread(void *pArg)
    if (bResult)
    {
       PostMessage(m_hStatusWnd, WM_START_STAGE, 0, (LPARAM)_T("Loading database driver"));
-      nx_strncpy(g_szDbDriver, pc->m_szDBDriver, MAX_PATH);
-      nx_strncpy(g_szDbServer, pc->m_szDBServer, MAX_PATH);
-      bResult = DBInit(FALSE, FALSE, FALSE, NULL);
+      bResult = DBInit(0, 0);
+               if (bResult)
+               {
+                       pc->m_dbDriver = DBLoadDriver(pc->m_szDBDriver, _T(""), false, NULL, NULL);
+                       if (pc->m_dbDriver == NULL)
+                               bResult = FALSE;
+               }
       if (!bResult)
          _tcscpy(g_szWizardErrorText, _T("Error loading database driver"));
       PostMessage(m_hStatusWnd, WM_STAGE_COMPLETED, bResult, 0);
@@ -495,7 +500,7 @@ static DWORD __stdcall WorkerThread(void *pArg)
    if (bResult)
    {
       PostMessage(m_hStatusWnd, WM_START_STAGE, 0, (LPARAM)_T("Connecting to database"));
-      hConn = DBConnectEx(pc->m_szDBServer, pc->m_szDBName, pc->m_szDBLogin, pc->m_szDBPassword);
+               hConn = DBConnect(pc->m_dbDriver, pc->m_szDBServer, pc->m_szDBName, pc->m_szDBLogin, pc->m_szDBPassword);
       bResult = (hConn != NULL);
       if (!bResult)
          _tcscpy(g_szWizardErrorText, _T("Unable to connect to database"));
index 863231d..26cd80c 100644 (file)
@@ -19,6 +19,8 @@
 #include "LoggingPage.h"
 #include "FinishPage.h"
 
+#include <winsock2.h>
+#include <afxsock.h>           // MFC socket extensions
 #include <iphlpapi.h>
 #include <iprtrmib.h>
 #include <rtinfo.h>
@@ -119,12 +121,6 @@ BOOL CNxconfigApp::InitInstance()
        //  of your final executable, you should remove from the following
        //  the specific initialization routines you do not need.
 
-#ifdef _AFXDLL
-       Enable3dControls();                     // Call this when using MFC in a shared DLL
-#else
-       Enable3dControlsStatic();       // Call this when linking to MFC statically
-#endif
-
        // Change the registry key under which our settings are stored.
        SetRegistryKey(_T("NetXMS"));
 
index 4d12933..77d9c4a 100644 (file)
@@ -9,12 +9,12 @@
 #endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
-       #error include 'stdafx.h' before including this file for PCH
+#error include 'stdafx.h' before including this file for PCH
 #endif
 
 #include <nms_common.h>
 #include <nms_util.h>
-#include <nxsrvapi.h>
+#include <nxdbapi.h>
 
 
 #define MAX_ERROR_TEXT        4096
@@ -78,6 +78,7 @@ struct WIZARD_CFG_INFO
    TCHAR m_szServicePassword[MAX_DB_STRING];
    DWORD m_dwDependencyListSize;
    TCHAR *m_pszDependencyList;
+       DB_DRIVER m_dbDriver;
 };
 
 
diff --git a/src/server/tools/nxconfig/nxconfig.vcproj b/src/server/tools/nxconfig/nxconfig.vcproj
new file mode 100644 (file)
index 0000000..949fecc
--- /dev/null
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="nxconfig"\r
+       ProjectGUID="{A76CCCF5-D70B-4307-B84C-219289CEAA6D}"\r
+       RootNamespace="nxconfig"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include;..\..\include"\r
+                               PreprocessorDefinitions="_AFXDLL;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="2"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="iphlpapi.lib"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\..\..\include;..\..\include"\r
+                               PreprocessorDefinitions="_AFXDLL;_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="2"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="iphlpapi.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\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=".\ChildView.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ConfigFilePage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ConfigWizard.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DBSelectPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ExecBatch.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\FinishPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\IntroPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LoggingPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\MainFrm.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxconfig.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ODBCPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\PollCfgPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ProcessingPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SMTPPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SrvDepsPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StdAfx.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SummaryPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\tools.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\WinSrvPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\WizardWorker.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\ChildView.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ConfigFilePage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ConfigWizard.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DBSelectPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\FinishPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\IntroPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LoggingPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\MainFrm.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\nxconfig.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ODBCPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\PollCfgPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ProcessingPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\resource.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SMTPPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SrvDepsPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StdAfx.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SummaryPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\tools.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\WinSrvPage.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\nxconfig.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r