From aca5a83a4653b91b8e8353ce1f986ec8a62a4b74 Mon Sep 17 00:00:00 2001 From: skidder Date: Sun, 30 Aug 2009 19:00:46 +0000 Subject: [PATCH] Fixed CORE-2609: Update support for Windows 98/ME and NT4.0 --- builds/win32/adjust_vc7_files.cmd | 37 + builds/win32/msvc7/Firebird2.sln | 310 +- builds/win32/msvc7/alice.vcproj | 4 +- builds/win32/msvc7/btyacc.vcproj | 4 +- builds/win32/msvc7/build_msg.vcproj | 4 +- builds/win32/msvc7/burp.vcproj | 4 +- builds/win32/msvc7/codes.vcproj | 4 +- builds/win32/msvc7/common.vcproj | 8 +- builds/win32/msvc7/common_classic.vcproj | 10 +- builds/win32/msvc7/common_static.vcproj | 4 +- builds/win32/msvc7/config.vcproj | 4 +- builds/win32/msvc7/dsql_server.vcproj | 4 +- builds/win32/msvc7/dsql_server_classic.vcproj | 4 +- builds/win32/msvc7/empbuild.vcproj | 4 +- builds/win32/msvc7/engine.vcproj | 12 +- builds/win32/msvc7/engine_classic.vcproj | 8 +- builds/win32/msvc7/engine_embed.vcproj | 10 +- builds/win32/msvc7/fb_inet_server.vcproj | 10 +- builds/win32/msvc7/fb_lock_print.vcproj | 8 +- builds/win32/msvc7/fbclient.vcproj | 6 +- builds/win32/msvc7/fbembed.vcproj | 10 +- builds/win32/msvc7/fbguard.vcproj | 4 +- builds/win32/msvc7/fbrmclib.vcproj | 4 +- builds/win32/msvc7/fbserver.vcproj | 10 +- builds/win32/msvc7/fbsvcmgr.vcproj | 4 +- builds/win32/msvc7/fbtrace.vcproj | 116 + builds/win32/msvc7/fbtracemgr.vcproj | 78 + builds/win32/msvc7/fbudf.vcproj | 4 +- builds/win32/msvc7/gbak.vcproj | 4 +- builds/win32/msvc7/gbak_embed.vcproj | 4 +- builds/win32/msvc7/gdef.vcproj | 4 +- builds/win32/msvc7/gfix.vcproj | 4 +- builds/win32/msvc7/gpre.vcproj | 4 +- builds/win32/msvc7/gpre_boot.vcproj | 6 +- builds/win32/msvc7/gpre_embed.vcproj | 4 +- builds/win32/msvc7/gsec.vcproj | 4 +- builds/win32/msvc7/gsplit.vcproj | 4 +- builds/win32/msvc7/gstat.vcproj | 4 +- builds/win32/msvc7/ib_udf.vcproj | 4 +- builds/win32/msvc7/ib_util.vcproj | 4 +- builds/win32/msvc7/instclient.vcproj | 4 +- builds/win32/msvc7/instreg.vcproj | 4 +- builds/win32/msvc7/instsvc.vcproj | 4 +- builds/win32/msvc7/intl.vcproj | 36 +- builds/win32/msvc7/intlbuild.vcproj | 4 +- builds/win32/msvc7/isql.vcproj | 4 +- builds/win32/msvc7/isql_embed.vcproj | 4 +- builds/win32/msvc7/lock.vcproj | 4 +- builds/win32/msvc7/lock_classic.vcproj | 4 +- builds/win32/msvc7/nbackup.vcproj | 4 +- builds/win32/msvc7/qli.vcproj | 4 +- builds/win32/msvc7/remote.vcproj | 4 +- builds/win32/msvc7/remote_classic.vcproj | 4 +- builds/win32/msvc7/utilities.vcproj | 4 +- builds/win32/msvc7/utilities_embed.vcproj | 4 +- builds/win32/msvc8/Firebird2.sln | 127 +- builds/win32/msvc8/intl.vcproj | 58 +- builds/win32/msvc9/Firebird2.sln | 55 +- builds/win32/msvc9/intl.vcproj | 56 +- builds/win32/setenvvar.bat | 6 - doc/README.Win9X_NT_embedding | 31 + extern/icu/source/allinone/allinone.sln | 253 ++ extern/icu/source/common/common.vcproj | 2812 ++++++----------- extern/icu/source/data/makedata.vcproj | 123 +- extern/icu/source/extra/uconv/uconv.vcproj | 280 +- extern/icu/source/i18n/i18n.vcproj | 1948 ++++-------- extern/icu/source/io/io.vcproj | 383 +-- extern/icu/source/layout/layout.vcproj | 1193 +++---- extern/icu/source/layoutex/layoutex.vcproj | 314 +- extern/icu/source/samples/cal/cal.vcproj | 4 +- extern/icu/source/samples/date/date.vcproj | 4 +- .../icu/source/samples/datefmt/datefmt.vcproj | 4 +- .../icu/source/samples/layout/layout.vcproj | 4 +- .../icu/source/samples/msgfmt/msgfmt.vcproj | 4 +- .../icu/source/samples/numfmt/numfmt.vcproj | 4 +- extern/icu/source/samples/props/props.vcproj | 4 +- .../source/samples/translit/translit.vcproj | 4 +- .../icu/source/samples/uciter8/uciter8.vcproj | 4 +- extern/icu/source/samples/ucnv/ucnv.vcproj | 4 +- extern/icu/source/samples/udata/reader.vcproj | 4 +- extern/icu/source/samples/udata/writer.vcproj | 4 +- .../source/samples/ufortune/ufortune.vcproj | 4 +- extern/icu/source/samples/ugrep/ugrep.vcproj | 4 +- extern/icu/source/samples/uresb/uresb.vcproj | 4 +- .../icu/source/samples/ustring/ustring.vcproj | 4 +- extern/icu/source/stubdata/stubdata.vcproj | 226 +- .../icu/source/test/cintltst/cintltst.vcproj | 866 ++--- .../icu/source/test/intltest/intltest.vcproj | 1314 +++----- extern/icu/source/test/iotest/iotest.vcproj | 230 +- .../test/perf/ustrperf/stringperf.vcproj | 4 +- .../icu/source/tools/ctestfw/ctestfw.vcproj | 271 +- extern/icu/source/tools/genbrk/genbrk.vcproj | 222 +- .../icu/source/tools/genccode/genccode.vcproj | 219 +- extern/icu/source/tools/gencmn/decmn.vcproj | 222 +- extern/icu/source/tools/gencmn/gencmn.vcproj | 222 +- .../icu/source/tools/gencnval/gencnval.vcproj | 222 +- .../icu/source/tools/gennames/gennames.vcproj | 222 +- .../icu/source/tools/gennorm/gennorm.vcproj | 232 +- .../icu/source/tools/genpname/genpname.vcproj | 227 +- .../icu/source/tools/genprops/genprops.vcproj | 247 +- extern/icu/source/tools/genrb/derb.vcproj | 229 +- extern/icu/source/tools/genrb/genrb.vcproj | 315 +- .../icu/source/tools/gensprep/gensprep.vcproj | 229 +- .../icu/source/tools/gentest/gentest.vcproj | 226 +- extern/icu/source/tools/genuca/genuca.vcproj | 227 +- .../icu/source/tools/icuswap/icuswap.vcproj | 222 +- .../icu/source/tools/makeconv/makeconv.vcproj | 245 +- .../icu/source/tools/pkgdata/pkgdata.vcproj | 257 +- .../icu/source/tools/toolutil/toolutil.vcproj | 311 +- src/common/classes/RefCounted.h | 5 +- src/common/classes/locks.cpp | 141 +- src/common/classes/locks.h | 19 +- src/common/fb_exception.cpp | 3 + src/iscguard/iscguard.cpp | 4 +- src/jrd/common.h | 5 + src/jrd/ext.cpp | 8 + src/jrd/gds.cpp | 30 +- src/jrd/isc.cpp | 61 +- src/jrd/isc_proto.h | 4 + src/jrd/os/win32/guid.cpp | 4 +- src/jrd/os/win32/os_utils.cpp | 43 +- src/jrd/os/win32/win9x_nt.h | 196 ++ src/jrd/os/win32/winnt.cpp | 12 +- src/jrd/trace/TraceConfigStorage.cpp | 11 +- src/remote/os/win32/property.cpp | 6 +- src/utilities/install/services.cpp | 4 +- 126 files changed, 6206 insertions(+), 10091 deletions(-) create mode 100755 builds/win32/adjust_vc7_files.cmd create mode 100644 builds/win32/msvc7/fbtrace.vcproj create mode 100644 builds/win32/msvc7/fbtracemgr.vcproj create mode 100644 doc/README.Win9X_NT_embedding create mode 100644 src/jrd/os/win32/win9x_nt.h diff --git a/builds/win32/adjust_vc7_files.cmd b/builds/win32/adjust_vc7_files.cmd new file mode 100755 index 0000000000..270fa57111 --- /dev/null +++ b/builds/win32/adjust_vc7_files.cmd @@ -0,0 +1,37 @@ +@echo off +:: This is the helper script to convert MSVC8 build to MSVC7 build. +:: It changes build to use static CRT instead of DLL. +:: +:: Use it after you converted your project files using VSPC +:: (http://sourceforge.net/projects/vspc/) +:: +:: USAGE: +:: 1) adjust_vc7_files without parameters +:: fix all project files in MSVC7 direcotry +:: +:: 2) adjust_vc7_files -L +:: fix all files in list +:: +:: 3) adjust_vc7_files +:: fix a particular project file +:: + +if "%1" == "" ( + for %%i in (msvc7\*.vcproj) do call :adjust_files %%i + + goto :eof +) + +if "%1" == "-L" ( + for /f %%i in (%2) do call :adjust_files %%i + + goto :eof +) + + +:adjust_files +echo Editing %1... +sed -e "s|RuntimeLibrary=\"3\"|RuntimeLibrary=\"1\"|" %1 > %1.sed_tmp +sed -e "s|RuntimeLibrary=\"2\"|RuntimeLibrary=\"0\"|" %1.sed_tmp > %1 +del %1.sed_tmp +goto :eof diff --git a/builds/win32/msvc7/Firebird2.sln b/builds/win32/msvc7/Firebird2.sln index 7de31b0929..9acef21736 100644 --- a/builds/win32/msvc7/Firebird2.sln +++ b/builds/win32/msvc7/Firebird2.sln @@ -1,43 +1,61 @@ Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alice", "alice.vcproj", "{0D616380-1A5A-4230-A80B-021360E4E669}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "burp", "burp.vcproj", "{D1507562-A363-4685-96AF-B036F5E5E47F}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{15605F44-BFFD-444F-AD4C-55DC9D704465}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_classic", "common_classic.vcproj", "{F5746066-8613-4811-B27C-0ED70FF9F0FF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsql_server", "dsql_server.vcproj", "{520DF501-5775-44FD-BDC6-37753A17696A}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsql_server_classic", "dsql_server_classic.vcproj", "{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine.vcproj", "{F8798A49-9D20-451E-A7BD-FEB5237103B5}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_classic", "engine_classic.vcproj", "{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_embed", "engine_embed.vcproj", "{F55ACA54-70DF-4343-8E16-FA97C757CCF6}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_inet_server", "fb_inet_server.vcproj", "{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}" ProjectSection(ProjectDependencies) = postProject + {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} + {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} {3C4993E4-946C-4029-97B8-1A111F32F4FC} = {3C4993E4-946C-4029-97B8-1A111F32F4FC} {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} - {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} - {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} - {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_lock_print", "fb_lock_print.vcproj", "{E8397148-0E9C-449B-9F45-7FB377A08242}" @@ -52,20 +70,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbclient", "fbclient.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbembed", "fbembed.vcproj", "{C5A60E3D-7815-4127-B856-96277BEC1D11}" ProjectSection(ProjectDependencies) = postProject + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} + {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} - {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} - {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} - {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbguard", "fbguard.vcproj", "{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}" @@ -76,28 +94,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbguard", "fbguard.vcproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbserver", "fbserver.vcproj", "{23EC8DAA-6718-4EF3-979F-89F611C7D504}" ProjectSection(ProjectDependencies) = postProject + {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} + {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} + {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} + {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} - {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} - {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} - {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbudf", "fbudf.vcproj", "{9DC67B05-AC3E-49A3-B0CC-83B25D757445}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gbak", "gbak.vcproj", "{B732F5D2-B5D9-417F-B156-D790F466CB8E}" ProjectSection(ProjectDependencies) = postProject @@ -130,6 +150,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsec", "gsec.vcproj", "{704 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsplit", "gsplit.vcproj", "{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstat", "gstat.vcproj", "{7E862973-37C4-4202-80E7-490ED4DEDA14}" ProjectSection(ProjectDependencies) = postProject @@ -143,8 +165,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_udf", "ib_udf.vcproj", " EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_util", "ib_util.vcproj", "{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instreg", "instreg.vcproj", "{19470DE6-1975-4F9B-B1BE-E87A83240B15}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsvc", "instsvc.vcproj", "{72894398-38CA-47A6-95FE-9647DE2BE968}" ProjectSection(ProjectDependencies) = postProject @@ -152,6 +178,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsvc", "instsvc.vcproj", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intl", "intl.vcproj", "{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}" + ProjectSection(ProjectDependencies) = postProject + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcproj", "{DEE75AD5-F165-40E1-80B2-400E27725D5C}" ProjectSection(ProjectDependencies) = postProject @@ -160,8 +189,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcproj", "{DEE EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock", "lock.vcproj", "{604E1144-1A22-43AF-9A3E-08650EE4EE90}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock_classic", "lock_classic.vcproj", "{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qli", "qli.vcproj", "{EBB8361B-49D5-43A5-8771-940DF3E308EF}" ProjectSection(ProjectDependencies) = postProject @@ -170,10 +203,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qli", "qli.vcproj", "{EBB83 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote", "remote.vcproj", "{4BCC693D-1745-45ED-8302-E5E2F979549A}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_classic", "remote_classic.vcproj", "{3C4993E4-946C-4029-97B8-1A111F32F4FC}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities", "utilities.vcproj", "{E9AAC310-465E-4384-8BCC-674F297F777C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcproj", "{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}" ProjectSection(ProjectDependencies) = postProject @@ -182,12 +221,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcproj", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "config.vcproj", "{E83187C1-AAC2-445D-B8B2-883EFC10C39A}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instclient", "instclient.vcproj", "{C6A31374-178C-4680-A404-76BE24D0229B}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb2control", "fb2control.vcproj", "{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities_embed", "utilities_embed.vcproj", "{B0833E27-BCB2-4D0D-B6D2-F4621224CFD8}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbrmclib", "fbrmclib.vcproj", "{FAF9AD25-8238-49E9-9AC9-8C56E190440A}" ProjectSection(ProjectDependencies) = postProject @@ -202,14 +249,205 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbsvcmgr", "fbsvcmgr.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtrace", "fbtrace.vcproj", "{53F75437-15B8-4A5C-86BF-E238CC68FCBC}" ProjectSection(ProjectDependencies) = postProject - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D} = {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcproj", "{34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtracemgr", "fbtracemgr.vcproj", "{58C7E370-0EDD-4F5E-8617-3F5071170205}" + ProjectSection(ProjectDependencies) = postProject + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + EndProjectSection EndProject Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {0D616380-1A5A-4230-A80B-021360E4E669}.Debug.ActiveCfg = Debug|Win32 + {0D616380-1A5A-4230-A80B-021360E4E669}.Debug.Build.0 = Debug|Win32 + {0D616380-1A5A-4230-A80B-021360E4E669}.Release.ActiveCfg = Release|Win32 + {0D616380-1A5A-4230-A80B-021360E4E669}.Release.Build.0 = Release|Win32 + {D1507562-A363-4685-96AF-B036F5E5E47F}.Debug.ActiveCfg = Debug|Win32 + {D1507562-A363-4685-96AF-B036F5E5E47F}.Debug.Build.0 = Debug|Win32 + {D1507562-A363-4685-96AF-B036F5E5E47F}.Release.ActiveCfg = Release|Win32 + {D1507562-A363-4685-96AF-B036F5E5E47F}.Release.Build.0 = Release|Win32 + {15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug.ActiveCfg = Debug|Win32 + {15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug.Build.0 = Debug|Win32 + {15605F44-BFFD-444F-AD4C-55DC9D704465}.Release.ActiveCfg = Release|Win32 + {15605F44-BFFD-444F-AD4C-55DC9D704465}.Release.Build.0 = Release|Win32 + {F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug.ActiveCfg = Debug|Win32 + {F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug.Build.0 = Debug|Win32 + {F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release.ActiveCfg = Release|Win32 + {F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release.Build.0 = Release|Win32 + {520DF501-5775-44FD-BDC6-37753A17696A}.Debug.ActiveCfg = Debug|Win32 + {520DF501-5775-44FD-BDC6-37753A17696A}.Debug.Build.0 = Debug|Win32 + {520DF501-5775-44FD-BDC6-37753A17696A}.Release.ActiveCfg = Release|Win32 + {520DF501-5775-44FD-BDC6-37753A17696A}.Release.Build.0 = Release|Win32 + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug.ActiveCfg = Debug|Win32 + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug.Build.0 = Debug|Win32 + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release.ActiveCfg = Release|Win32 + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release.Build.0 = Release|Win32 + {F8798A49-9D20-451E-A7BD-FEB5237103B5}.Debug.ActiveCfg = Debug|Win32 + {F8798A49-9D20-451E-A7BD-FEB5237103B5}.Debug.Build.0 = Debug|Win32 + {F8798A49-9D20-451E-A7BD-FEB5237103B5}.Release.ActiveCfg = Release|Win32 + {F8798A49-9D20-451E-A7BD-FEB5237103B5}.Release.Build.0 = Release|Win32 + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Debug.ActiveCfg = Debug|Win32 + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Debug.Build.0 = Debug|Win32 + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Release.ActiveCfg = Release|Win32 + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Release.Build.0 = Release|Win32 + {F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug.ActiveCfg = Debug|Win32 + {F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug.Build.0 = Debug|Win32 + {F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release.ActiveCfg = Release|Win32 + {F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release.Build.0 = Release|Win32 + {664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Debug.ActiveCfg = Debug|Win32 + {664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Debug.Build.0 = Debug|Win32 + {664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Release.ActiveCfg = Release|Win32 + {664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Release.Build.0 = Release|Win32 + {E8397148-0E9C-449B-9F45-7FB377A08242}.Debug.ActiveCfg = Debug|Win32 + {E8397148-0E9C-449B-9F45-7FB377A08242}.Debug.Build.0 = Debug|Win32 + {E8397148-0E9C-449B-9F45-7FB377A08242}.Release.ActiveCfg = Release|Win32 + {E8397148-0E9C-449B-9F45-7FB377A08242}.Release.Build.0 = Release|Win32 + {492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Debug.ActiveCfg = Debug|Win32 + {492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Debug.Build.0 = Debug|Win32 + {492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Release.ActiveCfg = Release|Win32 + {492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Release.Build.0 = Release|Win32 + {C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug.ActiveCfg = Debug|Win32 + {C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug.Build.0 = Debug|Win32 + {C5A60E3D-7815-4127-B856-96277BEC1D11}.Release.ActiveCfg = Release|Win32 + {C5A60E3D-7815-4127-B856-96277BEC1D11}.Release.Build.0 = Release|Win32 + {BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Debug.ActiveCfg = Debug|Win32 + {BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Debug.Build.0 = Debug|Win32 + {BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Release.ActiveCfg = Release|Win32 + {BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Release.Build.0 = Release|Win32 + {23EC8DAA-6718-4EF3-979F-89F611C7D504}.Debug.ActiveCfg = Debug|Win32 + {23EC8DAA-6718-4EF3-979F-89F611C7D504}.Debug.Build.0 = Debug|Win32 + {23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release.ActiveCfg = Release|Win32 + {23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release.Build.0 = Release|Win32 + {9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug.ActiveCfg = Debug|Win32 + {9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug.Build.0 = Debug|Win32 + {9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release.ActiveCfg = Release|Win32 + {9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release.Build.0 = Release|Win32 + {B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug.ActiveCfg = Debug|Win32 + {B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug.Build.0 = Debug|Win32 + {B732F5D2-B5D9-417F-B156-D790F466CB8E}.Release.ActiveCfg = Release|Win32 + {B732F5D2-B5D9-417F-B156-D790F466CB8E}.Release.Build.0 = Release|Win32 + {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Debug.ActiveCfg = Debug|Win32 + {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Debug.Build.0 = Debug|Win32 + {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release.ActiveCfg = Release|Win32 + {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release.Build.0 = Release|Win32 + {44A9E4AD-B932-4620-B319-431A153BB341}.Debug.ActiveCfg = Debug|Win32 + {44A9E4AD-B932-4620-B319-431A153BB341}.Debug.Build.0 = Debug|Win32 + {44A9E4AD-B932-4620-B319-431A153BB341}.Release.ActiveCfg = Release|Win32 + {44A9E4AD-B932-4620-B319-431A153BB341}.Release.Build.0 = Release|Win32 + {D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Debug.ActiveCfg = Debug|Win32 + {D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Debug.Build.0 = Debug|Win32 + {D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Release.ActiveCfg = Release|Win32 + {D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Release.Build.0 = Release|Win32 + {7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Debug.ActiveCfg = Debug|Win32 + {7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Debug.Build.0 = Debug|Win32 + {7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Release.ActiveCfg = Release|Win32 + {7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Release.Build.0 = Release|Win32 + {B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Debug.ActiveCfg = Debug|Win32 + {B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Debug.Build.0 = Debug|Win32 + {B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Release.ActiveCfg = Release|Win32 + {B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Release.Build.0 = Release|Win32 + {7E862973-37C4-4202-80E7-490ED4DEDA14}.Debug.ActiveCfg = Debug|Win32 + {7E862973-37C4-4202-80E7-490ED4DEDA14}.Debug.Build.0 = Debug|Win32 + {7E862973-37C4-4202-80E7-490ED4DEDA14}.Release.ActiveCfg = Release|Win32 + {7E862973-37C4-4202-80E7-490ED4DEDA14}.Release.Build.0 = Release|Win32 + {0D4A2D8E-6461-479E-9399-F7929174E050}.Debug.ActiveCfg = Debug|Win32 + {0D4A2D8E-6461-479E-9399-F7929174E050}.Debug.Build.0 = Debug|Win32 + {0D4A2D8E-6461-479E-9399-F7929174E050}.Release.ActiveCfg = Release|Win32 + {0D4A2D8E-6461-479E-9399-F7929174E050}.Release.Build.0 = Release|Win32 + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug.ActiveCfg = Debug|Win32 + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug.Build.0 = Debug|Win32 + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release.ActiveCfg = Release|Win32 + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release.Build.0 = Release|Win32 + {19470DE6-1975-4F9B-B1BE-E87A83240B15}.Debug.ActiveCfg = Debug|Win32 + {19470DE6-1975-4F9B-B1BE-E87A83240B15}.Debug.Build.0 = Debug|Win32 + {19470DE6-1975-4F9B-B1BE-E87A83240B15}.Release.ActiveCfg = Release|Win32 + {19470DE6-1975-4F9B-B1BE-E87A83240B15}.Release.Build.0 = Release|Win32 + {72894398-38CA-47A6-95FE-9647DE2BE968}.Debug.ActiveCfg = Debug|Win32 + {72894398-38CA-47A6-95FE-9647DE2BE968}.Debug.Build.0 = Debug|Win32 + {72894398-38CA-47A6-95FE-9647DE2BE968}.Release.ActiveCfg = Release|Win32 + {72894398-38CA-47A6-95FE-9647DE2BE968}.Release.Build.0 = Release|Win32 + {DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Debug.ActiveCfg = Debug|Win32 + {DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Debug.Build.0 = Debug|Win32 + {DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Release.ActiveCfg = Release|Win32 + {DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Release.Build.0 = Release|Win32 + {DEE75AD5-F165-40E1-80B2-400E27725D5C}.Debug.ActiveCfg = Debug|Win32 + {DEE75AD5-F165-40E1-80B2-400E27725D5C}.Debug.Build.0 = Debug|Win32 + {DEE75AD5-F165-40E1-80B2-400E27725D5C}.Release.ActiveCfg = Release|Win32 + {DEE75AD5-F165-40E1-80B2-400E27725D5C}.Release.Build.0 = Release|Win32 + {604E1144-1A22-43AF-9A3E-08650EE4EE90}.Debug.ActiveCfg = Debug|Win32 + {604E1144-1A22-43AF-9A3E-08650EE4EE90}.Debug.Build.0 = Debug|Win32 + {604E1144-1A22-43AF-9A3E-08650EE4EE90}.Release.ActiveCfg = Release|Win32 + {604E1144-1A22-43AF-9A3E-08650EE4EE90}.Release.Build.0 = Release|Win32 + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug.ActiveCfg = Debug|Win32 + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug.Build.0 = Debug|Win32 + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release.ActiveCfg = Release|Win32 + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release.Build.0 = Release|Win32 + {EBB8361B-49D5-43A5-8771-940DF3E308EF}.Debug.ActiveCfg = Debug|Win32 + {EBB8361B-49D5-43A5-8771-940DF3E308EF}.Debug.Build.0 = Debug|Win32 + {EBB8361B-49D5-43A5-8771-940DF3E308EF}.Release.ActiveCfg = Release|Win32 + {EBB8361B-49D5-43A5-8771-940DF3E308EF}.Release.Build.0 = Release|Win32 + {4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug.ActiveCfg = Debug|Win32 + {4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug.Build.0 = Debug|Win32 + {4BCC693D-1745-45ED-8302-E5E2F979549A}.Release.ActiveCfg = Release|Win32 + {4BCC693D-1745-45ED-8302-E5E2F979549A}.Release.Build.0 = Release|Win32 + {3C4993E4-946C-4029-97B8-1A111F32F4FC}.Debug.ActiveCfg = Debug|Win32 + {3C4993E4-946C-4029-97B8-1A111F32F4FC}.Debug.Build.0 = Debug|Win32 + {3C4993E4-946C-4029-97B8-1A111F32F4FC}.Release.ActiveCfg = Release|Win32 + {3C4993E4-946C-4029-97B8-1A111F32F4FC}.Release.Build.0 = Release|Win32 + {E9AAC310-465E-4384-8BCC-674F297F777C}.Debug.ActiveCfg = Debug|Win32 + {E9AAC310-465E-4384-8BCC-674F297F777C}.Debug.Build.0 = Debug|Win32 + {E9AAC310-465E-4384-8BCC-674F297F777C}.Release.ActiveCfg = Release|Win32 + {E9AAC310-465E-4384-8BCC-674F297F777C}.Release.Build.0 = Release|Win32 + {01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Debug.ActiveCfg = Debug|Win32 + {01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Debug.Build.0 = Debug|Win32 + {01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release.ActiveCfg = Release|Win32 + {01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release.Build.0 = Release|Win32 + {E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug.ActiveCfg = Debug|Win32 + {E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug.Build.0 = Debug|Win32 + {E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release.ActiveCfg = Release|Win32 + {E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release.Build.0 = Release|Win32 + {C6A31374-178C-4680-A404-76BE24D0229B}.Debug.ActiveCfg = Debug|Win32 + {C6A31374-178C-4680-A404-76BE24D0229B}.Debug.Build.0 = Debug|Win32 + {C6A31374-178C-4680-A404-76BE24D0229B}.Release.ActiveCfg = Release|Win32 + {C6A31374-178C-4680-A404-76BE24D0229B}.Release.Build.0 = Release|Win32 + {1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Debug.ActiveCfg = Debug|Win32 + {1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Debug.Build.0 = Debug|Win32 + {1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Release.ActiveCfg = Release|Win32 + {1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Release.Build.0 = Release|Win32 + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8}.Debug.ActiveCfg = Debug|Win32 + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8}.Debug.Build.0 = Debug|Win32 + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8}.Release.ActiveCfg = Release|Win32 + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8}.Release.Build.0 = Release|Win32 + {FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Debug.ActiveCfg = Debug|Win32 + {FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Debug.Build.0 = Debug|Win32 + {FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Release.ActiveCfg = Release|Win32 + {FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Release.Build.0 = Release|Win32 + {EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Debug.ActiveCfg = Debug|Win32 + {EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Debug.Build.0 = Debug|Win32 + {EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Release.ActiveCfg = Release|Win32 + {EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Release.Build.0 = Release|Win32 + {53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug.ActiveCfg = Debug|Win32 + {53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug.Build.0 = Debug|Win32 + {53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release.ActiveCfg = Release|Win32 + {53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release.Build.0 = Release|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug.ActiveCfg = Debug|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug.Build.0 = Debug|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Release.ActiveCfg = Release|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 @@ -559,14 +797,14 @@ Global {53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|Win32.Build.0 = Release|Win32 {53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|x64.ActiveCfg = Release|x64 {53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|x64.Build.0 = Release|x64 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Debug|Win32.ActiveCfg = Debug|Win32 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Debug|Win32.Build.0 = Debug|Win32 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Debug|x64.ActiveCfg = Debug|x64 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Debug|x64.Build.0 = Debug|x64 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Release|Win32.ActiveCfg = Release|Win32 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Release|Win32.Build.0 = Release|Win32 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Release|x64.ActiveCfg = Release|x64 - {34FDEFC1-F14D-4ADD-ADC1-25134C28A73D}.Release|x64.Build.0 = Release|x64 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|Win32.ActiveCfg = Debug|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|Win32.Build.0 = Debug|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|x64.ActiveCfg = Debug|x64 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|x64.Build.0 = Debug|x64 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|Win32.ActiveCfg = Release|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|Win32.Build.0 = Release|Win32 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|x64.ActiveCfg = Release|x64 + {58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/builds/win32/msvc7/alice.vcproj b/builds/win32/msvc7/alice.vcproj index 62918e4d2e..16147ea6df 100644 --- a/builds/win32/msvc7/alice.vcproj +++ b/builds/win32/msvc7/alice.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/btyacc.vcproj b/builds/win32/msvc7/btyacc.vcproj index 5b867b1a74..e93704c7b9 100644 --- a/builds/win32/msvc7/btyacc.vcproj +++ b/builds/win32/msvc7/btyacc.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/build_msg.vcproj b/builds/win32/msvc7/build_msg.vcproj index 05e3e458ee..c91e9d43ca 100644 --- a/builds/win32/msvc7/build_msg.vcproj +++ b/builds/win32/msvc7/build_msg.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/burp.vcproj b/builds/win32/msvc7/burp.vcproj index a1263c971e..0b742ab11b 100644 --- a/builds/win32/msvc7/burp.vcproj +++ b/builds/win32/msvc7/burp.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/codes.vcproj b/builds/win32/msvc7/codes.vcproj index f3141ffbe0..7329072afb 100644 --- a/builds/win32/msvc7/codes.vcproj +++ b/builds/win32/msvc7/codes.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/common.vcproj b/builds/win32/msvc7/common.vcproj index 561fef1f45..959b62c584 100644 --- a/builds/win32/msvc7/common.vcproj +++ b/builds/win32/msvc7/common.vcproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -125,6 +125,8 @@ + + diff --git a/builds/win32/msvc7/common_classic.vcproj b/builds/win32/msvc7/common_classic.vcproj index febcd73245..d1777b02ca 100644 --- a/builds/win32/msvc7/common_classic.vcproj +++ b/builds/win32/msvc7/common_classic.vcproj @@ -1,5 +1,5 @@ - - + + @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -125,6 +125,8 @@ + + diff --git a/builds/win32/msvc7/common_static.vcproj b/builds/win32/msvc7/common_static.vcproj index 570f3c302a..a6da9b9b04 100644 --- a/builds/win32/msvc7/common_static.vcproj +++ b/builds/win32/msvc7/common_static.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/config.vcproj b/builds/win32/msvc7/config.vcproj index 671976eb1d..1e14043cf6 100644 --- a/builds/win32/msvc7/config.vcproj +++ b/builds/win32/msvc7/config.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/dsql_server.vcproj b/builds/win32/msvc7/dsql_server.vcproj index 99785d4849..0a1330ca29 100644 --- a/builds/win32/msvc7/dsql_server.vcproj +++ b/builds/win32/msvc7/dsql_server.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/dsql_server_classic.vcproj b/builds/win32/msvc7/dsql_server_classic.vcproj index 2541d065d5..8369b0e1b7 100644 --- a/builds/win32/msvc7/dsql_server_classic.vcproj +++ b/builds/win32/msvc7/dsql_server_classic.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/empbuild.vcproj b/builds/win32/msvc7/empbuild.vcproj index 4f41aa9dbe..8baff92d5e 100644 --- a/builds/win32/msvc7/empbuild.vcproj +++ b/builds/win32/msvc7/empbuild.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/engine.vcproj b/builds/win32/msvc7/engine.vcproj index 721c31feca..818d4d20aa 100644 --- a/builds/win32/msvc7/engine.vcproj +++ b/builds/win32/msvc7/engine.vcproj @@ -1,5 +1,5 @@ - - + + @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -175,6 +175,8 @@ + + @@ -647,4 +649,4 @@ - + \ No newline at end of file diff --git a/builds/win32/msvc7/engine_classic.vcproj b/builds/win32/msvc7/engine_classic.vcproj index 1aa9f4b8d8..86db187252 100644 --- a/builds/win32/msvc7/engine_classic.vcproj +++ b/builds/win32/msvc7/engine_classic.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -175,6 +175,8 @@ + + @@ -645,4 +647,4 @@ - + \ No newline at end of file diff --git a/builds/win32/msvc7/engine_embed.vcproj b/builds/win32/msvc7/engine_embed.vcproj index ffad6eb09c..ebae3af853 100644 --- a/builds/win32/msvc7/engine_embed.vcproj +++ b/builds/win32/msvc7/engine_embed.vcproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -175,6 +175,8 @@ + + @@ -645,4 +647,4 @@ - + \ No newline at end of file diff --git a/builds/win32/msvc7/fb_inet_server.vcproj b/builds/win32/msvc7/fb_inet_server.vcproj index 26f1a0b4f4..e5c3ed566e 100644 --- a/builds/win32/msvc7/fb_inet_server.vcproj +++ b/builds/win32/msvc7/fb_inet_server.vcproj @@ -12,11 +12,11 @@ - + - + @@ -33,11 +33,11 @@ - + - + @@ -53,8 +53,6 @@ - - diff --git a/builds/win32/msvc7/fb_lock_print.vcproj b/builds/win32/msvc7/fb_lock_print.vcproj index 5574a1abd9..49625471e7 100644 --- a/builds/win32/msvc7/fb_lock_print.vcproj +++ b/builds/win32/msvc7/fb_lock_print.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -63,10 +63,10 @@ - - + + diff --git a/builds/win32/msvc7/fbclient.vcproj b/builds/win32/msvc7/fbclient.vcproj index 8bc1e2597a..1a82a1c889 100644 --- a/builds/win32/msvc7/fbclient.vcproj +++ b/builds/win32/msvc7/fbclient.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -83,8 +83,6 @@ - - diff --git a/builds/win32/msvc7/fbembed.vcproj b/builds/win32/msvc7/fbembed.vcproj index b89c0a17d9..63efbaee88 100644 --- a/builds/win32/msvc7/fbembed.vcproj +++ b/builds/win32/msvc7/fbembed.vcproj @@ -12,11 +12,11 @@ - + - + @@ -33,11 +33,11 @@ - + - + @@ -55,8 +55,6 @@ - - diff --git a/builds/win32/msvc7/fbguard.vcproj b/builds/win32/msvc7/fbguard.vcproj index 31f112c30c..265cb9107d 100644 --- a/builds/win32/msvc7/fbguard.vcproj +++ b/builds/win32/msvc7/fbguard.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/fbrmclib.vcproj b/builds/win32/msvc7/fbrmclib.vcproj index 0f42d32f98..c86ad2b8b1 100644 --- a/builds/win32/msvc7/fbrmclib.vcproj +++ b/builds/win32/msvc7/fbrmclib.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/fbserver.vcproj b/builds/win32/msvc7/fbserver.vcproj index c0a0b84bd6..d34e2f1522 100644 --- a/builds/win32/msvc7/fbserver.vcproj +++ b/builds/win32/msvc7/fbserver.vcproj @@ -12,11 +12,11 @@ - + - + @@ -33,11 +33,11 @@ - + - + @@ -53,8 +53,6 @@ - - diff --git a/builds/win32/msvc7/fbsvcmgr.vcproj b/builds/win32/msvc7/fbsvcmgr.vcproj index 523e570980..4408a41bdf 100644 --- a/builds/win32/msvc7/fbsvcmgr.vcproj +++ b/builds/win32/msvc7/fbsvcmgr.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/fbtrace.vcproj b/builds/win32/msvc7/fbtrace.vcproj new file mode 100644 index 0000000000..f37f3a5002 --- /dev/null +++ b/builds/win32/msvc7/fbtrace.vcproj @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/win32/msvc7/fbtracemgr.vcproj b/builds/win32/msvc7/fbtracemgr.vcproj new file mode 100644 index 0000000000..021bdb0f71 --- /dev/null +++ b/builds/win32/msvc7/fbtracemgr.vcproj @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/win32/msvc7/fbudf.vcproj b/builds/win32/msvc7/fbudf.vcproj index 9ea0009021..63ff0d0904 100644 --- a/builds/win32/msvc7/fbudf.vcproj +++ b/builds/win32/msvc7/fbudf.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gbak.vcproj b/builds/win32/msvc7/gbak.vcproj index 3856b630d2..161fb5ba4c 100644 --- a/builds/win32/msvc7/gbak.vcproj +++ b/builds/win32/msvc7/gbak.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gbak_embed.vcproj b/builds/win32/msvc7/gbak_embed.vcproj index e2d076fc6a..873d08f8ce 100644 --- a/builds/win32/msvc7/gbak_embed.vcproj +++ b/builds/win32/msvc7/gbak_embed.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gdef.vcproj b/builds/win32/msvc7/gdef.vcproj index d9347b259b..ee281e5b65 100644 --- a/builds/win32/msvc7/gdef.vcproj +++ b/builds/win32/msvc7/gdef.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gfix.vcproj b/builds/win32/msvc7/gfix.vcproj index 333503a2a8..a54dab84fb 100644 --- a/builds/win32/msvc7/gfix.vcproj +++ b/builds/win32/msvc7/gfix.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gpre.vcproj b/builds/win32/msvc7/gpre.vcproj index a71e337c79..88117bcb1b 100644 --- a/builds/win32/msvc7/gpre.vcproj +++ b/builds/win32/msvc7/gpre.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gpre_boot.vcproj b/builds/win32/msvc7/gpre_boot.vcproj index b32bd92f2d..17f7631650 100644 --- a/builds/win32/msvc7/gpre_boot.vcproj +++ b/builds/win32/msvc7/gpre_boot.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -103,8 +103,6 @@ - - diff --git a/builds/win32/msvc7/gpre_embed.vcproj b/builds/win32/msvc7/gpre_embed.vcproj index 5b5452fc1e..eda1a3a24b 100644 --- a/builds/win32/msvc7/gpre_embed.vcproj +++ b/builds/win32/msvc7/gpre_embed.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gsec.vcproj b/builds/win32/msvc7/gsec.vcproj index bf0df0afdf..39ab4ec5d3 100644 --- a/builds/win32/msvc7/gsec.vcproj +++ b/builds/win32/msvc7/gsec.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gsplit.vcproj b/builds/win32/msvc7/gsplit.vcproj index b9f6aff05d..369f277978 100644 --- a/builds/win32/msvc7/gsplit.vcproj +++ b/builds/win32/msvc7/gsplit.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/gstat.vcproj b/builds/win32/msvc7/gstat.vcproj index 7379b957c2..c0e2145db1 100644 --- a/builds/win32/msvc7/gstat.vcproj +++ b/builds/win32/msvc7/gstat.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/ib_udf.vcproj b/builds/win32/msvc7/ib_udf.vcproj index e7fdf17589..2349cbc0f7 100644 --- a/builds/win32/msvc7/ib_udf.vcproj +++ b/builds/win32/msvc7/ib_udf.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/ib_util.vcproj b/builds/win32/msvc7/ib_util.vcproj index d6c176606b..a27b381fc4 100644 --- a/builds/win32/msvc7/ib_util.vcproj +++ b/builds/win32/msvc7/ib_util.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/instclient.vcproj b/builds/win32/msvc7/instclient.vcproj index c403f26850..6f0987cb83 100644 --- a/builds/win32/msvc7/instclient.vcproj +++ b/builds/win32/msvc7/instclient.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/instreg.vcproj b/builds/win32/msvc7/instreg.vcproj index 1f239e3de8..62f490fd86 100644 --- a/builds/win32/msvc7/instreg.vcproj +++ b/builds/win32/msvc7/instreg.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/instsvc.vcproj b/builds/win32/msvc7/instsvc.vcproj index b87d0d59a4..1ba3c78bd4 100644 --- a/builds/win32/msvc7/instsvc.vcproj +++ b/builds/win32/msvc7/instsvc.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/intl.vcproj b/builds/win32/msvc7/intl.vcproj index 372412b60e..42fae6e86e 100644 --- a/builds/win32/msvc7/intl.vcproj +++ b/builds/win32/msvc7/intl.vcproj @@ -12,11 +12,11 @@ - + - + @@ -33,11 +33,11 @@ - + - + @@ -273,8 +273,12 @@ + + + + @@ -295,6 +299,8 @@ + + @@ -343,8 +349,6 @@ - - @@ -387,28 +391,20 @@ - - - - - - - - - - - - - - + + + + + + diff --git a/builds/win32/msvc7/intlbuild.vcproj b/builds/win32/msvc7/intlbuild.vcproj index 0dea8c9f49..7a9c68e3c7 100644 --- a/builds/win32/msvc7/intlbuild.vcproj +++ b/builds/win32/msvc7/intlbuild.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/isql.vcproj b/builds/win32/msvc7/isql.vcproj index 4abece9691..0661fd71be 100644 --- a/builds/win32/msvc7/isql.vcproj +++ b/builds/win32/msvc7/isql.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/isql_embed.vcproj b/builds/win32/msvc7/isql_embed.vcproj index d231430e96..f3972d31b3 100644 --- a/builds/win32/msvc7/isql_embed.vcproj +++ b/builds/win32/msvc7/isql_embed.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/lock.vcproj b/builds/win32/msvc7/lock.vcproj index acfc11f967..9fa0af74fb 100644 --- a/builds/win32/msvc7/lock.vcproj +++ b/builds/win32/msvc7/lock.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/lock_classic.vcproj b/builds/win32/msvc7/lock_classic.vcproj index 2f0f803a74..901c8bd314 100644 --- a/builds/win32/msvc7/lock_classic.vcproj +++ b/builds/win32/msvc7/lock_classic.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/nbackup.vcproj b/builds/win32/msvc7/nbackup.vcproj index 28809492e2..94007c2be6 100644 --- a/builds/win32/msvc7/nbackup.vcproj +++ b/builds/win32/msvc7/nbackup.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/qli.vcproj b/builds/win32/msvc7/qli.vcproj index ed1487c9a5..a23702cc78 100644 --- a/builds/win32/msvc7/qli.vcproj +++ b/builds/win32/msvc7/qli.vcproj @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/builds/win32/msvc7/remote.vcproj b/builds/win32/msvc7/remote.vcproj index 473f66899f..fad9080a4e 100644 --- a/builds/win32/msvc7/remote.vcproj +++ b/builds/win32/msvc7/remote.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/remote_classic.vcproj b/builds/win32/msvc7/remote_classic.vcproj index b03d25ef73..a7a033df95 100644 --- a/builds/win32/msvc7/remote_classic.vcproj +++ b/builds/win32/msvc7/remote_classic.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/utilities.vcproj b/builds/win32/msvc7/utilities.vcproj index 850de6741c..f0b5b889ae 100644 --- a/builds/win32/msvc7/utilities.vcproj +++ b/builds/win32/msvc7/utilities.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc7/utilities_embed.vcproj b/builds/win32/msvc7/utilities_embed.vcproj index 9fd557651e..5244a70e8c 100644 --- a/builds/win32/msvc7/utilities_embed.vcproj +++ b/builds/win32/msvc7/utilities_embed.vcproj @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/builds/win32/msvc8/Firebird2.sln b/builds/win32/msvc8/Firebird2.sln index 220e7da2bd..f480c5fd84 100644 --- a/builds/win32/msvc8/Firebird2.sln +++ b/builds/win32/msvc8/Firebird2.sln @@ -20,25 +20,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_embed", "engine_embe EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_inet_server", "fb_inet_server.vcproj", "{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}" ProjectSection(ProjectDependencies) = postProject - {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} - {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} - {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} - {3C4993E4-946C-4029-97B8-1A111F32F4FC} = {3C4993E4-946C-4029-97B8-1A111F32F4FC} - {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} - {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} - {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} + {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} + {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} + {3C4993E4-946C-4029-97B8-1A111F32F4FC} = {3C4993E4-946C-4029-97B8-1A111F32F4FC} + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} + {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} + {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_lock_print", "fb_lock_print.vcproj", "{E8397148-0E9C-449B-9F45-7FB377A08242}" @@ -53,89 +53,89 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbclient", "fbclient.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbembed", "fbembed.vcproj", "{C5A60E3D-7815-4127-B856-96277BEC1D11}" ProjectSection(ProjectDependencies) = postProject - {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} - {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} - {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} - {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} - {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} + {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbguard", "fbguard.vcproj", "{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbserver", "fbserver.vcproj", "{23EC8DAA-6718-4EF3-979F-89F611C7D504}" ProjectSection(ProjectDependencies) = postProject - {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} - {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} - {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} - {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} - {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} - {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} - {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} + {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} + {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} + {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} + {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbudf", "fbudf.vcproj", "{9DC67B05-AC3E-49A3-B0CC-83B25D757445}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gbak", "gbak.vcproj", "{B732F5D2-B5D9-417F-B156-D790F466CB8E}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdef", "gdef.vcproj", "{E8B8E0CE-F47F-48BD-8911-C11805A711D9}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfix", "gfix.vcproj", "{44A9E4AD-B932-4620-B319-431A153BB341}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre", "gpre.vcproj", "{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsec", "gsec.vcproj", "{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsplit", "gsplit.vcproj", "{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstat", "gstat.vcproj", "{7E862973-37C4-4202-80E7-490ED4DEDA14}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_udf", "ib_udf.vcproj", "{0D4A2D8E-6461-479E-9399-F7929174E050}" @@ -153,11 +153,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsvc", "instsvc.vcproj", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intl", "intl.vcproj", "{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}" + ProjectSection(ProjectDependencies) = postProject + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcproj", "{DEE75AD5-F165-40E1-80B2-400E27725D5C}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock", "lock.vcproj", "{604E1144-1A22-43AF-9A3E-08650EE4EE90}" @@ -166,8 +169,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock_classic", "lock_classi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qli", "qli.vcproj", "{EBB8361B-49D5-43A5-8771-940DF3E308EF}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote", "remote.vcproj", "{4BCC693D-1745-45ED-8302-E5E2F979549A}" @@ -178,8 +181,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities", "utilities.vcpr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcproj", "{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "config.vcproj", "{E83187C1-AAC2-445D-B8B2-883EFC10C39A}" @@ -197,20 +200,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbrmclib", "fbrmclib.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbsvcmgr", "fbsvcmgr.vcproj", "{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtrace", "fbtrace.vcproj", "{53F75437-15B8-4A5C-86BF-E238CC68FCBC}" ProjectSection(ProjectDependencies) = postProject - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtracemgr", "fbtracemgr.vcproj", "{58C7E370-0EDD-4F5E-8617-3F5071170205}" ProjectSection(ProjectDependencies) = postProject - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject Global diff --git a/builds/win32/msvc8/intl.vcproj b/builds/win32/msvc8/intl.vcproj index 293b57793b..29086fe0a1 100644 --- a/builds/win32/msvc8/intl.vcproj +++ b/builds/win32/msvc8/intl.vcproj @@ -1,7 +1,7 @@ @@ -778,10 +778,18 @@ RelativePath="..\..\..\src\intl\collations\db866ru0.h" > + + + + @@ -822,6 +830,10 @@ RelativePath="..\..\..\src\jrd\os\mod_loader.h" > + + @@ -918,10 +930,6 @@ RelativePath="..\..\..\src\intl\collations\pw1253turk.h" > - - @@ -1026,50 +1034,34 @@ - - - - - - - - - - - - - - + + + + + + diff --git a/builds/win32/msvc9/Firebird2.sln b/builds/win32/msvc9/Firebird2.sln index f9be69d056..d648ac12f7 100644 --- a/builds/win32/msvc9/Firebird2.sln +++ b/builds/win32/msvc9/Firebird2.sln @@ -20,25 +20,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_embed", "engine_embe EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_inet_server", "fb_inet_server.vcproj", "{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}" ProjectSection(ProjectDependencies) = postProject + {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} + {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} + {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} + {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} {3C4993E4-946C-4029-97B8-1A111F32F4FC} = {3C4993E4-946C-4029-97B8-1A111F32F4FC} {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} - {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} - {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} = {E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E} - {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_lock_print", "fb_lock_print.vcproj", "{E8397148-0E9C-449B-9F45-7FB377A08242}" @@ -53,20 +53,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbclient", "fbclient.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbembed", "fbembed.vcproj", "{C5A60E3D-7815-4127-B856-96277BEC1D11}" ProjectSection(ProjectDependencies) = postProject + {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} + {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} + {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} = {B0833E27-BCB2-4D0D-B6D2-F4621224CFD8} - {F55ACA54-70DF-4343-8E16-FA97C757CCF6} = {F55ACA54-70DF-4343-8E16-FA97C757CCF6} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} - {F5746066-8613-4811-B27C-0ED70FF9F0FF} = {F5746066-8613-4811-B27C-0ED70FF9F0FF} {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} = {488199DD-D9F3-41C8-AED6-8AFFFB294CFF} - {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} = {213C6F21-D83F-48C7-BBB5-B35AB1B706B1} - {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbguard", "fbguard.vcproj", "{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}" @@ -77,25 +77,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbguard", "fbguard.vcproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbserver", "fbserver.vcproj", "{23EC8DAA-6718-4EF3-979F-89F611C7D504}" ProjectSection(ProjectDependencies) = postProject + {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} {E9AAC310-465E-4384-8BCC-674F297F777C} = {E9AAC310-465E-4384-8BCC-674F297F777C} + {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} + {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} + {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} + {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} + {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} - {4BCC693D-1745-45ED-8302-E5E2F979549A} = {4BCC693D-1745-45ED-8302-E5E2F979549A} - {604E1144-1A22-43AF-9A3E-08650EE4EE90} = {604E1144-1A22-43AF-9A3E-08650EE4EE90} - {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} - {F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5} - {D1507562-A363-4685-96AF-B036F5E5E47F} = {D1507562-A363-4685-96AF-B036F5E5E47F} - {0D616380-1A5A-4230-A80B-021360E4E669} = {0D616380-1A5A-4230-A80B-021360E4E669} {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - {520DF501-5775-44FD-BDC6-37753A17696A} = {520DF501-5775-44FD-BDC6-37753A17696A} - {53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbudf", "fbudf.vcproj", "{9DC67B05-AC3E-49A3-B0CC-83B25D757445}" @@ -153,6 +153,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsvc", "instsvc.vcproj", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intl", "intl.vcproj", "{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}" + ProjectSection(ProjectDependencies) = postProject + {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcproj", "{DEE75AD5-F165-40E1-80B2-400E27725D5C}" ProjectSection(ProjectDependencies) = postProject @@ -203,8 +206,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbsvcmgr", "fbsvcmgr.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtrace", "fbtrace.vcproj", "{53F75437-15B8-4A5C-86BF-E238CC68FCBC}" ProjectSection(ProjectDependencies) = postProject - {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} + {E83187C1-AAC2-445D-B8B2-883EFC10C39A} = {E83187C1-AAC2-445D-B8B2-883EFC10C39A} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtracemgr", "fbtracemgr.vcproj", "{58C7E370-0EDD-4F5E-8617-3F5071170205}" diff --git a/builds/win32/msvc9/intl.vcproj b/builds/win32/msvc9/intl.vcproj index 62e468b74a..8f4ed07f56 100644 --- a/builds/win32/msvc9/intl.vcproj +++ b/builds/win32/msvc9/intl.vcproj @@ -398,6 +398,10 @@ RelativePath="..\..\..\src\intl\cv_unicode_fss.cpp" > + + @@ -775,10 +779,18 @@ RelativePath="..\..\..\src\intl\collations\db866ru0.h" > + + + + @@ -819,6 +831,10 @@ RelativePath="..\..\..\src\jrd\os\mod_loader.h" > + + @@ -915,10 +931,6 @@ RelativePath="..\..\..\src\intl\collations\pw1253turk.h" > - - @@ -1023,42 +1035,18 @@ - - - - - - - - - - - - - - + + @@ -1067,6 +1055,10 @@ RelativePath="..\..\..\src\jrd\os\win32\mod_loader.cpp" > + + diff --git a/builds/win32/setenvvar.bat b/builds/win32/setenvvar.bat index a0c0243f61..5b910e7af6 100644 --- a/builds/win32/setenvvar.bat +++ b/builds/win32/setenvvar.bat @@ -87,15 +87,9 @@ if DEFINED VS71COMNTOOLS ( @set FB_OUTPUT_DIR=%FB_ROOT_PATH%\output_%FB_TARGET_PLATFORM% @set FB_TEMP_DIR=%FB_ROOT_PATH%\temp\%FB_TARGET_PLATFORM% @set FB_INSTALL_SCRIPTS=%FB_ROOT_PATH%\builds\install\arch-specific\win32 -@if %MSVC_VERSION% GEQ 8 ( @set FB_GEN_DIR=%FB_ROOT_PATH%\gen\%FB_TARGET_PLATFORM% @set FB_GEN_DB_DIR=%FB_DB_PATH%/gen/%FB_TARGET_PLATFORM% @set FB_ICU_SOURCE_BIN=%FB_ROOT_PATH%\extern\icu\%FB_TARGET_PLATFORM%\release\bin\ -) else ( -@set FB_GEN_DIR=%FB_ROOT_PATH%\gen -@set FB_GEN_DB_DIR=%FB_DB_PATH%/gen -@set FB_ICU_SOURCE_BIN=%FB_ROOT_PATH%\extern\icu\bin\ -) diff --git a/doc/README.Win9X_NT_embedding b/doc/README.Win9X_NT_embedding new file mode 100644 index 0000000000..0a61a0885c --- /dev/null +++ b/doc/README.Win9X_NT_embedding @@ -0,0 +1,31 @@ +Issue: +====== + Embedded systems need to run engine on Windows 98/ME or Windows NT 4.0 hosts. + CRT dependency is also not a good thing for such systems. + +Rationale: +========== + + Although these systems are out of support by Microsoft we found that as of 2009 + - NT4 and its specialized derivatives remain the platform of choice for + closed-circuit environments + - Win98 is still being used as a platform for secure fund transfer systems + (that is, sealed appliances using dial-up to transfer financial data) + + We assume the situation will continue for the foreseeable future. + +Document author: +================= + Nikolay Samofatov (skidder at users.sourceforge.net) + +Solution: +========= + MSVC7 build of Firebird 2.5 produces statically linked binaries that can work + on Windows 98SE, Windows ME and Windows NT 4.0 SP3+ systems as well as the + newer platforms all the way to Windows 7. + +Known issues: +============= + You need Comctl32.dll version 5.8 or later installed for Guardian and server + running as application to display property pages. This library is distributed + with Internet Explorer 5. diff --git a/extern/icu/source/allinone/allinone.sln b/extern/icu/source/allinone/allinone.sln index 4d2d7248c1..28ad341d51 100644 --- a/extern/icu/source/allinone/allinone.sln +++ b/extern/icu/source/allinone/allinone.sln @@ -206,6 +206,8 @@ Global Debug = Debug Release = Release EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug.ActiveCfg = Debug|Win32 {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug.Build.0 = Debug|Win32 @@ -332,4 +334,255 @@ Global EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|Win32.Build.0 = Debug|Win32 + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|x64.ActiveCfg = Debug|x64 + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|x64.Build.0 = Debug|x64 + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|Win32.ActiveCfg = Release|Win32 + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|Win32.Build.0 = Release|Win32 + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|x64.ActiveCfg = Release|x64 + {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|x64.Build.0 = Release|x64 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.ActiveCfg = Debug|Win32 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.Build.0 = Debug|Win32 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|x64.ActiveCfg = Debug|x64 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|x64.Build.0 = Debug|x64 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.ActiveCfg = Release|Win32 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.Build.0 = Release|Win32 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|x64.ActiveCfg = Release|x64 + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|x64.Build.0 = Release|x64 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|Win32.ActiveCfg = Debug|Win32 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|Win32.Build.0 = Debug|Win32 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|x64.ActiveCfg = Debug|x64 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|x64.Build.0 = Debug|x64 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|Win32.ActiveCfg = Release|Win32 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|Win32.Build.0 = Release|Win32 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|x64.ActiveCfg = Release|x64 + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|x64.Build.0 = Release|x64 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Debug|Win32.Build.0 = Debug|Win32 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Debug|x64.ActiveCfg = Debug|x64 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Debug|x64.Build.0 = Debug|x64 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Release|Win32.ActiveCfg = Release|Win32 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Release|Win32.Build.0 = Release|Win32 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Release|x64.ActiveCfg = Release|x64 + {20869594-A3DD-4A75-8068-99B03A5CF4E4}.Release|x64.Build.0 = Release|x64 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|Win32.ActiveCfg = Debug|Win32 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|Win32.Build.0 = Debug|Win32 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|x64.ActiveCfg = Debug|x64 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|x64.Build.0 = Debug|x64 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|Win32.ActiveCfg = Release|Win32 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|Win32.Build.0 = Release|Win32 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|x64.ActiveCfg = Release|x64 + {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|x64.Build.0 = Release|x64 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|Win32.ActiveCfg = Debug|Win32 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|Win32.Build.0 = Debug|Win32 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|x64.ActiveCfg = Debug|x64 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|x64.Build.0 = Debug|x64 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|Win32.ActiveCfg = Release|Win32 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|Win32.Build.0 = Release|Win32 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|x64.ActiveCfg = Release|x64 + {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|x64.Build.0 = Release|x64 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|Win32.ActiveCfg = Debug|Win32 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|Win32.Build.0 = Debug|Win32 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|x64.ActiveCfg = Debug|x64 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|x64.Build.0 = Debug|x64 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|Win32.ActiveCfg = Release|Win32 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|Win32.Build.0 = Release|Win32 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|x64.ActiveCfg = Release|x64 + {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|x64.Build.0 = Release|x64 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|Win32.Build.0 = Debug|Win32 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|x64.ActiveCfg = Debug|x64 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|x64.Build.0 = Debug|x64 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|Win32.ActiveCfg = Release|Win32 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|Win32.Build.0 = Release|Win32 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|x64.ActiveCfg = Release|x64 + {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|x64.Build.0 = Release|x64 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|Win32.ActiveCfg = Debug|Win32 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|Win32.Build.0 = Debug|Win32 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|x64.ActiveCfg = Debug|x64 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|x64.Build.0 = Debug|x64 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|Win32.ActiveCfg = Release|Win32 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|Win32.Build.0 = Release|Win32 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|x64.ActiveCfg = Release|x64 + {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|x64.Build.0 = Release|x64 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug|Win32.ActiveCfg = Debug|Win32 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug|Win32.Build.0 = Debug|Win32 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug|x64.ActiveCfg = Debug|x64 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug|x64.Build.0 = Debug|x64 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release|Win32.ActiveCfg = Release|Win32 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release|Win32.Build.0 = Release|Win32 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release|x64.ActiveCfg = Release|x64 + {F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release|x64.Build.0 = Release|x64 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug|Win32.ActiveCfg = Debug|Win32 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug|Win32.Build.0 = Debug|Win32 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug|x64.ActiveCfg = Debug|x64 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug|x64.Build.0 = Debug|x64 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release|Win32.ActiveCfg = Release|Win32 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release|Win32.Build.0 = Release|Win32 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release|x64.ActiveCfg = Release|x64 + {F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release|x64.Build.0 = Release|x64 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug|Win32.ActiveCfg = Debug|Win32 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug|Win32.Build.0 = Debug|Win32 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug|x64.ActiveCfg = Debug|x64 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug|x64.Build.0 = Debug|x64 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release|Win32.ActiveCfg = Release|Win32 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release|Win32.Build.0 = Release|Win32 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release|x64.ActiveCfg = Release|x64 + {DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release|x64.Build.0 = Release|x64 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug|Win32.ActiveCfg = Debug|Win32 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug|Win32.Build.0 = Debug|Win32 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug|x64.ActiveCfg = Debug|x64 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug|x64.Build.0 = Debug|x64 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Release|Win32.ActiveCfg = Release|Win32 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Release|Win32.Build.0 = Release|Win32 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Release|x64.ActiveCfg = Release|x64 + {6F744648-D15F-478A-90C6-58E353B5DDB3}.Release|x64.Build.0 = Release|x64 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|Win32.ActiveCfg = Debug|Win32 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|Win32.Build.0 = Debug|Win32 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|x64.ActiveCfg = Debug|x64 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|x64.Build.0 = Debug|x64 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|Win32.ActiveCfg = Release|Win32 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|Win32.Build.0 = Release|Win32 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|x64.ActiveCfg = Release|x64 + {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|x64.Build.0 = Release|x64 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|Win32.ActiveCfg = Debug|Win32 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|Win32.Build.0 = Debug|Win32 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|x64.ActiveCfg = Debug|x64 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|x64.Build.0 = Debug|x64 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|Win32.ActiveCfg = Release|Win32 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|Win32.Build.0 = Release|Win32 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|x64.ActiveCfg = Release|x64 + {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|x64.Build.0 = Release|x64 + {86829694-A375-4C58-B4EA-96EF514E3225}.Debug|Win32.ActiveCfg = Debug|Win32 + {86829694-A375-4C58-B4EA-96EF514E3225}.Debug|Win32.Build.0 = Debug|Win32 + {86829694-A375-4C58-B4EA-96EF514E3225}.Debug|x64.ActiveCfg = Debug|x64 + {86829694-A375-4C58-B4EA-96EF514E3225}.Debug|x64.Build.0 = Debug|x64 + {86829694-A375-4C58-B4EA-96EF514E3225}.Release|Win32.ActiveCfg = Release|Win32 + {86829694-A375-4C58-B4EA-96EF514E3225}.Release|Win32.Build.0 = Release|Win32 + {86829694-A375-4C58-B4EA-96EF514E3225}.Release|x64.ActiveCfg = Release|x64 + {86829694-A375-4C58-B4EA-96EF514E3225}.Release|x64.Build.0 = Release|x64 + {0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.ActiveCfg = Debug|Win32 + {0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.Build.0 = Debug|Win32 + {0178B127-6269-407D-B112-93877BB62776}.Debug|x64.ActiveCfg = Debug|x64 + {0178B127-6269-407D-B112-93877BB62776}.Debug|x64.Build.0 = Debug|x64 + {0178B127-6269-407D-B112-93877BB62776}.Release|Win32.ActiveCfg = Release|Win32 + {0178B127-6269-407D-B112-93877BB62776}.Release|Win32.Build.0 = Release|Win32 + {0178B127-6269-407D-B112-93877BB62776}.Release|x64.ActiveCfg = Release|x64 + {0178B127-6269-407D-B112-93877BB62776}.Release|x64.Build.0 = Release|x64 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|Win32.ActiveCfg = Debug|Win32 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|Win32.Build.0 = Debug|Win32 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|x64.ActiveCfg = Debug|x64 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|x64.Build.0 = Debug|x64 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|Win32.ActiveCfg = Release|Win32 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|Win32.Build.0 = Release|Win32 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|x64.ActiveCfg = Release|x64 + {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|x64.Build.0 = Release|x64 + {C920062A-0647-4553-A3B2-37C58065664B}.Debug|Win32.ActiveCfg = Debug|Win32 + {C920062A-0647-4553-A3B2-37C58065664B}.Debug|Win32.Build.0 = Debug|Win32 + {C920062A-0647-4553-A3B2-37C58065664B}.Debug|x64.ActiveCfg = Debug|x64 + {C920062A-0647-4553-A3B2-37C58065664B}.Debug|x64.Build.0 = Debug|x64 + {C920062A-0647-4553-A3B2-37C58065664B}.Release|Win32.ActiveCfg = Release|Win32 + {C920062A-0647-4553-A3B2-37C58065664B}.Release|Win32.Build.0 = Release|Win32 + {C920062A-0647-4553-A3B2-37C58065664B}.Release|x64.ActiveCfg = Release|x64 + {C920062A-0647-4553-A3B2-37C58065664B}.Release|x64.Build.0 = Release|x64 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug|Win32.ActiveCfg = Debug|Win32 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug|Win32.Build.0 = Debug|Win32 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug|x64.ActiveCfg = Debug|x64 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug|x64.Build.0 = Debug|x64 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Release|Win32.ActiveCfg = Release|Win32 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Release|Win32.Build.0 = Release|Win32 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Release|x64.ActiveCfg = Release|x64 + {37FC2C7F-1904-4811-8955-2F478830EAD1}.Release|x64.Build.0 = Release|x64 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|Win32.ActiveCfg = Debug|Win32 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|Win32.Build.0 = Debug|Win32 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|x64.ActiveCfg = Debug|x64 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|x64.Build.0 = Debug|x64 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|Win32.ActiveCfg = Release|Win32 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|Win32.Build.0 = Release|Win32 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|x64.ActiveCfg = Release|x64 + {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|x64.Build.0 = Release|x64 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|Win32.ActiveCfg = Debug|Win32 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|Win32.Build.0 = Debug|Win32 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|x64.ActiveCfg = Debug|x64 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|x64.Build.0 = Debug|x64 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|Win32.ActiveCfg = Release|Win32 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|Win32.Build.0 = Release|Win32 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|x64.ActiveCfg = Release|x64 + {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|x64.Build.0 = Release|x64 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|Win32.ActiveCfg = Debug|Win32 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|Win32.Build.0 = Debug|Win32 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|x64.ActiveCfg = Debug|x64 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|x64.Build.0 = Debug|x64 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|Win32.ActiveCfg = Release|Win32 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|Win32.Build.0 = Release|Win32 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|x64.ActiveCfg = Release|x64 + {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|x64.Build.0 = Release|x64 + {203EC78A-0531-43F0-A636-285439BDE025}.Debug|Win32.ActiveCfg = Debug|Win32 + {203EC78A-0531-43F0-A636-285439BDE025}.Debug|Win32.Build.0 = Debug|Win32 + {203EC78A-0531-43F0-A636-285439BDE025}.Debug|x64.ActiveCfg = Debug|x64 + {203EC78A-0531-43F0-A636-285439BDE025}.Debug|x64.Build.0 = Debug|x64 + {203EC78A-0531-43F0-A636-285439BDE025}.Release|Win32.ActiveCfg = Release|Win32 + {203EC78A-0531-43F0-A636-285439BDE025}.Release|Win32.Build.0 = Release|Win32 + {203EC78A-0531-43F0-A636-285439BDE025}.Release|x64.ActiveCfg = Release|x64 + {203EC78A-0531-43F0-A636-285439BDE025}.Release|x64.Build.0 = Release|x64 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|Win32.Build.0 = Debug|Win32 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|x64.ActiveCfg = Debug|x64 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|x64.Build.0 = Debug|x64 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|Win32.ActiveCfg = Release|Win32 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|Win32.Build.0 = Release|Win32 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|x64.ActiveCfg = Release|x64 + {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|x64.Build.0 = Release|x64 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|Win32.ActiveCfg = Debug|Win32 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|Win32.Build.0 = Debug|Win32 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|x64.ActiveCfg = Debug|x64 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|x64.Build.0 = Debug|x64 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|Win32.ActiveCfg = Release|Win32 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|Win32.Build.0 = Release|Win32 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|x64.ActiveCfg = Release|x64 + {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|x64.Build.0 = Release|x64 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|Win32.ActiveCfg = Debug|Win32 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|Win32.Build.0 = Debug|Win32 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|x64.ActiveCfg = Debug|x64 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|x64.Build.0 = Debug|x64 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|Win32.ActiveCfg = Release|Win32 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|Win32.Build.0 = Release|Win32 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|x64.ActiveCfg = Release|x64 + {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|x64.Build.0 = Release|x64 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|Win32.ActiveCfg = Debug|Win32 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|Win32.Build.0 = Debug|Win32 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|x64.ActiveCfg = Debug|x64 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|x64.Build.0 = Debug|x64 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|Win32.ActiveCfg = Release|Win32 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|Win32.Build.0 = Release|Win32 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|x64.ActiveCfg = Release|x64 + {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|x64.Build.0 = Release|x64 + {6FC24387-370C-4561-9582-7A819749E2C5}.Debug|Win32.ActiveCfg = Debug|Win32 + {6FC24387-370C-4561-9582-7A819749E2C5}.Debug|Win32.Build.0 = Debug|Win32 + {6FC24387-370C-4561-9582-7A819749E2C5}.Debug|x64.ActiveCfg = Debug|x64 + {6FC24387-370C-4561-9582-7A819749E2C5}.Debug|x64.Build.0 = Debug|x64 + {6FC24387-370C-4561-9582-7A819749E2C5}.Release|Win32.ActiveCfg = Release|Win32 + {6FC24387-370C-4561-9582-7A819749E2C5}.Release|Win32.Build.0 = Release|Win32 + {6FC24387-370C-4561-9582-7A819749E2C5}.Release|x64.ActiveCfg = Release|x64 + {6FC24387-370C-4561-9582-7A819749E2C5}.Release|x64.Build.0 = Release|x64 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|Win32.Build.0 = Debug|Win32 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|x64.ActiveCfg = Debug|x64 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|x64.Build.0 = Debug|x64 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|Win32.ActiveCfg = Release|Win32 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|Win32.Build.0 = Release|Win32 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|x64.ActiveCfg = Release|x64 + {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/extern/icu/source/common/common.vcproj b/extern/icu/source/common/common.vcproj index c8599e72c4..073fcee463 100644 --- a/extern/icu/source/common/common.vcproj +++ b/extern/icu/source/common/common.vcproj @@ -1,1898 +1,916 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/data/makedata.vcproj b/extern/icu/source/data/makedata.vcproj index 7cb1eb4c82..1c250c72e1 100644 --- a/extern/icu/source/data/makedata.vcproj +++ b/extern/icu/source/data/makedata.vcproj @@ -1,79 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/extra/uconv/uconv.vcproj b/extern/icu/source/extra/uconv/uconv.vcproj index 3e3f07c9e0..15aa82775a 100644 --- a/extern/icu/source/extra/uconv/uconv.vcproj +++ b/extern/icu/source/extra/uconv/uconv.vcproj @@ -1,198 +1,84 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/i18n/i18n.vcproj b/extern/icu/source/i18n/i18n.vcproj index 9bafbb4f16..dc0bd5c15e 100644 --- a/extern/icu/source/i18n/i18n.vcproj +++ b/extern/icu/source/i18n/i18n.vcproj @@ -1,1282 +1,668 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/io/io.vcproj b/extern/icu/source/io/io.vcproj index 6f580459a6..c3962e5a3a 100644 --- a/extern/icu/source/io/io.vcproj +++ b/extern/icu/source/io/io.vcproj @@ -1,267 +1,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/layout/layout.vcproj b/extern/icu/source/layout/layout.vcproj index 0234bdc110..e75a6c231d 100644 --- a/extern/icu/source/layout/layout.vcproj +++ b/extern/icu/source/layout/layout.vcproj @@ -1,773 +1,422 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/layoutex/layoutex.vcproj b/extern/icu/source/layoutex/layoutex.vcproj index 7c62ef5127..0025759193 100644 --- a/extern/icu/source/layoutex/layoutex.vcproj +++ b/extern/icu/source/layoutex/layoutex.vcproj @@ -1,222 +1,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/samples/cal/cal.vcproj b/extern/icu/source/samples/cal/cal.vcproj index 99b1886a82..09efb174fb 100644 --- a/extern/icu/source/samples/cal/cal.vcproj +++ b/extern/icu/source/samples/cal/cal.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/cal.pch" @@ -85,7 +85,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/cal.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/samples/date/date.vcproj b/extern/icu/source/samples/date/date.vcproj index 501da73560..46c1acba92 100644 --- a/extern/icu/source/samples/date/date.vcproj +++ b/extern/icu/source/samples/date/date.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/date.pch" @@ -85,7 +85,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/date.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/samples/datefmt/datefmt.vcproj b/extern/icu/source/samples/datefmt/datefmt.vcproj index 3ef44c12a5..98b0cd9654 100644 --- a/extern/icu/source/samples/datefmt/datefmt.vcproj +++ b/extern/icu/source/samples/datefmt/datefmt.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/datefmt.pch" AssemblerListingLocation=".\Debug/" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/datefmt.pch" diff --git a/extern/icu/source/samples/layout/layout.vcproj b/extern/icu/source/samples/layout/layout.vcproj index 0217997a94..41fdbd5b72 100644 --- a/extern/icu/source/samples/layout/layout.vcproj +++ b/extern/icu/source/samples/layout/layout.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include,..\..\..\include\layout,..\..\common" PreprocessorDefinitions="NDEBUG,_CONSOLE,WIN32,UNICODE,_WIN32_WINNT=0X500,LE_USE_CMEMORY" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/layout.pch" @@ -85,7 +85,7 @@ AdditionalIncludeDirectories="..\..\..\include,..\..\..\include\layout,..\..\common" PreprocessorDefinitions="_DEBUG,WIN32,UNICODE,_WIN32_WINNT=0X500,LE_USE_CMEMORY" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/layout.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/samples/msgfmt/msgfmt.vcproj b/extern/icu/source/samples/msgfmt/msgfmt.vcproj index 753e04cf23..3ee3854727 100644 --- a/extern/icu/source/samples/msgfmt/msgfmt.vcproj +++ b/extern/icu/source/samples/msgfmt/msgfmt.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/msgfmt.pch" @@ -85,7 +85,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/msgfmt.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/samples/numfmt/numfmt.vcproj b/extern/icu/source/samples/numfmt/numfmt.vcproj index 5b4041def0..912734c1fe 100644 --- a/extern/icu/source/samples/numfmt/numfmt.vcproj +++ b/extern/icu/source/samples/numfmt/numfmt.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="../../../include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/numfmt.pch" AssemblerListingLocation=".\Debug/" @@ -86,7 +86,7 @@ AdditionalIncludeDirectories="../../../include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/numfmt.pch" diff --git a/extern/icu/source/samples/props/props.vcproj b/extern/icu/source/samples/props/props.vcproj index 8d4a755afe..29d71dfe69 100644 --- a/extern/icu/source/samples/props/props.vcproj +++ b/extern/icu/source/samples/props/props.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="3" + RuntimeLibrary="1" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/props.pch" @@ -85,7 +85,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/props.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/samples/translit/translit.vcproj b/extern/icu/source/samples/translit/translit.vcproj index f4675e0e18..354d35adc7 100644 --- a/extern/icu/source/samples/translit/translit.vcproj +++ b/extern/icu/source/samples/translit/translit.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/translit.pch" AssemblerListingLocation=".\Debug/" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/translit.pch" diff --git a/extern/icu/source/samples/uciter8/uciter8.vcproj b/extern/icu/source/samples/uciter8/uciter8.vcproj index 56a3d51533..84435f8c4e 100644 --- a/extern/icu/source/samples/uciter8/uciter8.vcproj +++ b/extern/icu/source/samples/uciter8/uciter8.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/uciter8.pch" AssemblerListingLocation=".\Debug/" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/uciter8.pch" diff --git a/extern/icu/source/samples/ucnv/ucnv.vcproj b/extern/icu/source/samples/ucnv/ucnv.vcproj index 1e4b711567..081886603a 100644 --- a/extern/icu/source/samples/ucnv/ucnv.vcproj +++ b/extern/icu/source/samples/ucnv/ucnv.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/ucnv.pch" AssemblerListingLocation=".\Debug/" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/ucnv.pch" diff --git a/extern/icu/source/samples/udata/reader.vcproj b/extern/icu/source/samples/udata/reader.vcproj index ad00eedd42..e562e1084f 100644 --- a/extern/icu/source/samples/udata/reader.vcproj +++ b/extern/icu/source/samples/udata/reader.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include,..\..\tools\toolutil" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\reader_Win32_Debug/reader.pch" AssemblerListingLocation=".\reader_Win32_Debug/" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\include,..\..\tools\toolutil" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\reader_Win32_Release/reader.pch" diff --git a/extern/icu/source/samples/udata/writer.vcproj b/extern/icu/source/samples/udata/writer.vcproj index 3bc4938cb3..424236a97c 100644 --- a/extern/icu/source/samples/udata/writer.vcproj +++ b/extern/icu/source/samples/udata/writer.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include,..\..\tools\toolutil" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/writer.pch" AssemblerListingLocation=".\Debug/" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\include,..\..\tools\toolutil" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/writer.pch" diff --git a/extern/icu/source/samples/ufortune/ufortune.vcproj b/extern/icu/source/samples/ufortune/ufortune.vcproj index b6e812b8f4..39dd8b6484 100644 --- a/extern/icu/source/samples/ufortune/ufortune.vcproj +++ b/extern/icu/source/samples/ufortune/ufortune.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile=".\Debug/ufortune.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" @@ -86,7 +86,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/ufortune.pch" AssemblerListingLocation=".\Release/" diff --git a/extern/icu/source/samples/ugrep/ugrep.vcproj b/extern/icu/source/samples/ugrep/ugrep.vcproj index 428ac180f7..a7e5c0eb67 100644 --- a/extern/icu/source/samples/ugrep/ugrep.vcproj +++ b/extern/icu/source/samples/ugrep/ugrep.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/ugrep.pch" AssemblerListingLocation=".\Debug/" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/ugrep.pch" diff --git a/extern/icu/source/samples/uresb/uresb.vcproj b/extern/icu/source/samples/uresb/uresb.vcproj index 487152c50a..8f230fc9a8 100644 --- a/extern/icu/source/samples/uresb/uresb.vcproj +++ b/extern/icu/source/samples/uresb/uresb.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="../../../include,../../tools/toolutil" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/uresb.pch" @@ -84,7 +84,7 @@ AdditionalIncludeDirectories="../../../include,../../tools/toolutil" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/uresb.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/samples/ustring/ustring.vcproj b/extern/icu/source/samples/ustring/ustring.vcproj index 9a7184aa89..c717b58805 100644 --- a/extern/icu/source/samples/ustring/ustring.vcproj +++ b/extern/icu/source/samples/ustring/ustring.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/ustring.pch" @@ -86,7 +86,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/ustring.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/stubdata/stubdata.vcproj b/extern/icu/source/stubdata/stubdata.vcproj index 28355c2392..f0132d4535 100644 --- a/extern/icu/source/stubdata/stubdata.vcproj +++ b/extern/icu/source/stubdata/stubdata.vcproj @@ -1,164 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/test/cintltst/cintltst.vcproj b/extern/icu/source/test/cintltst/cintltst.vcproj index c62aa766a2..5923b13462 100644 --- a/extern/icu/source/test/cintltst/cintltst.vcproj +++ b/extern/icu/source/test/cintltst/cintltst.vcproj @@ -1,552 +1,316 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/test/intltest/intltest.vcproj b/extern/icu/source/test/intltest/intltest.vcproj index 7214089d05..21911b7803 100644 --- a/extern/icu/source/test/intltest/intltest.vcproj +++ b/extern/icu/source/test/intltest/intltest.vcproj @@ -1,822 +1,494 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/test/iotest/iotest.vcproj b/extern/icu/source/test/iotest/iotest.vcproj index 0a76107671..acd8f56463 100644 --- a/extern/icu/source/test/iotest/iotest.vcproj +++ b/extern/icu/source/test/iotest/iotest.vcproj @@ -1,164 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/test/perf/ustrperf/stringperf.vcproj b/extern/icu/source/test/perf/ustrperf/stringperf.vcproj index cd81e86949..3dca1908be 100644 --- a/extern/icu/source/test/perf/ustrperf/stringperf.vcproj +++ b/extern/icu/source/test/perf/ustrperf/stringperf.vcproj @@ -26,7 +26,7 @@ AdditionalIncludeDirectories="..\..\..\..\include,..\..\..\tools\toolutil,..\..\..\common" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/stringperf.pch" @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="..\..\..\..\include,..\..\..\tools\toolutil,..\..\..\common" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/stringperf.pch" AssemblerListingLocation=".\Debug/" diff --git a/extern/icu/source/tools/ctestfw/ctestfw.vcproj b/extern/icu/source/tools/ctestfw/ctestfw.vcproj index e3becd7b50..a2777b756c 100644 --- a/extern/icu/source/tools/ctestfw/ctestfw.vcproj +++ b/extern/icu/source/tools/ctestfw/ctestfw.vcproj @@ -1,191 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/genbrk/genbrk.vcproj b/extern/icu/source/tools/genbrk/genbrk.vcproj index 2401885315..4c760a2f2c 100644 --- a/extern/icu/source/tools/genbrk/genbrk.vcproj +++ b/extern/icu/source/tools/genbrk/genbrk.vcproj @@ -1,160 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/genccode/genccode.vcproj b/extern/icu/source/tools/genccode/genccode.vcproj index 7379af129d..d4c386c45e 100644 --- a/extern/icu/source/tools/genccode/genccode.vcproj +++ b/extern/icu/source/tools/genccode/genccode.vcproj @@ -1,157 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/gencmn/decmn.vcproj b/extern/icu/source/tools/gencmn/decmn.vcproj index 3d0d1d4ee3..5464dfc69e 100644 --- a/extern/icu/source/tools/gencmn/decmn.vcproj +++ b/extern/icu/source/tools/gencmn/decmn.vcproj @@ -1,160 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/gencmn/gencmn.vcproj b/extern/icu/source/tools/gencmn/gencmn.vcproj index 8e51fbd36d..f23b2fda31 100644 --- a/extern/icu/source/tools/gencmn/gencmn.vcproj +++ b/extern/icu/source/tools/gencmn/gencmn.vcproj @@ -1,160 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/gencnval/gencnval.vcproj b/extern/icu/source/tools/gencnval/gencnval.vcproj index 5c6d523568..d315f7625e 100644 --- a/extern/icu/source/tools/gencnval/gencnval.vcproj +++ b/extern/icu/source/tools/gencnval/gencnval.vcproj @@ -1,160 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/gennames/gennames.vcproj b/extern/icu/source/tools/gennames/gennames.vcproj index b552c71fe2..fd90f9af5a 100644 --- a/extern/icu/source/tools/gennames/gennames.vcproj +++ b/extern/icu/source/tools/gennames/gennames.vcproj @@ -1,160 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/gennorm/gennorm.vcproj b/extern/icu/source/tools/gennorm/gennorm.vcproj index ed098248bf..acda5ca00d 100644 --- a/extern/icu/source/tools/gennorm/gennorm.vcproj +++ b/extern/icu/source/tools/gennorm/gennorm.vcproj @@ -1,166 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/genpname/genpname.vcproj b/extern/icu/source/tools/genpname/genpname.vcproj index 5ec0debb85..fa80bfb525 100644 --- a/extern/icu/source/tools/genpname/genpname.vcproj +++ b/extern/icu/source/tools/genpname/genpname.vcproj @@ -1,163 +1,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/genprops/genprops.vcproj b/extern/icu/source/tools/genprops/genprops.vcproj index f09fee0de7..53e093d4ef 100644 --- a/extern/icu/source/tools/genprops/genprops.vcproj +++ b/extern/icu/source/tools/genprops/genprops.vcproj @@ -1,175 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/genrb/derb.vcproj b/extern/icu/source/tools/genrb/derb.vcproj index 99f1489593..6651102d18 100644 --- a/extern/icu/source/tools/genrb/derb.vcproj +++ b/extern/icu/source/tools/genrb/derb.vcproj @@ -1,167 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/genrb/genrb.vcproj b/extern/icu/source/tools/genrb/genrb.vcproj index 4fa362705a..6a31771c5c 100644 --- a/extern/icu/source/tools/genrb/genrb.vcproj +++ b/extern/icu/source/tools/genrb/genrb.vcproj @@ -1,215 +1,102 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/gensprep/gensprep.vcproj b/extern/icu/source/tools/gensprep/gensprep.vcproj index d984e26122..fb8b297a20 100644 --- a/extern/icu/source/tools/gensprep/gensprep.vcproj +++ b/extern/icu/source/tools/gensprep/gensprep.vcproj @@ -1,163 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/gentest/gentest.vcproj b/extern/icu/source/tools/gentest/gentest.vcproj index 4397f3747d..9aa138daff 100644 --- a/extern/icu/source/tools/gentest/gentest.vcproj +++ b/extern/icu/source/tools/gentest/gentest.vcproj @@ -1,160 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/genuca/genuca.vcproj b/extern/icu/source/tools/genuca/genuca.vcproj index e4962744e2..300d208085 100644 --- a/extern/icu/source/tools/genuca/genuca.vcproj +++ b/extern/icu/source/tools/genuca/genuca.vcproj @@ -1,163 +1,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/icuswap/icuswap.vcproj b/extern/icu/source/tools/icuswap/icuswap.vcproj index 030a991d27..720aa0a12e 100644 --- a/extern/icu/source/tools/icuswap/icuswap.vcproj +++ b/extern/icu/source/tools/icuswap/icuswap.vcproj @@ -1,160 +1,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/makeconv/makeconv.vcproj b/extern/icu/source/tools/makeconv/makeconv.vcproj index 614528a672..fac274569f 100644 --- a/extern/icu/source/tools/makeconv/makeconv.vcproj +++ b/extern/icu/source/tools/makeconv/makeconv.vcproj @@ -1,173 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/pkgdata/pkgdata.vcproj b/extern/icu/source/tools/pkgdata/pkgdata.vcproj index 89b358afe0..ca0fd85b6b 100644 --- a/extern/icu/source/tools/pkgdata/pkgdata.vcproj +++ b/extern/icu/source/tools/pkgdata/pkgdata.vcproj @@ -1,181 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/icu/source/tools/toolutil/toolutil.vcproj b/extern/icu/source/tools/toolutil/toolutil.vcproj index 91d61fd35b..e4fcb157b5 100644 --- a/extern/icu/source/tools/toolutil/toolutil.vcproj +++ b/extern/icu/source/tools/toolutil/toolutil.vcproj @@ -1,215 +1,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/common/classes/RefCounted.h b/src/common/classes/RefCounted.h index b17d83e339..8efbefa0b5 100644 --- a/src/common/classes/RefCounted.h +++ b/src/common/classes/RefCounted.h @@ -146,10 +146,13 @@ namespace Firebird return ptr; } + /* NS: you cannot have operator bool here. It creates ambiguity with + operator T* with some of the compilers (at least VS2003) + operator bool() const { return ptr ? true : false; - } + }*/ bool operator !() const { diff --git a/src/common/classes/locks.cpp b/src/common/classes/locks.cpp index c5dc7758b2..6b68566ef5 100644 --- a/src/common/classes/locks.cpp +++ b/src/common/classes/locks.cpp @@ -25,6 +25,9 @@ * Contributor(s): ______________________________________. */ +// minimum win32 version: win98 / winnt4 SP3 +#define _WIN32_WINNT 0x0403 + #include "../../include/firebird.h" #include "../../common/classes/locks.h" #include "../../common/thd.h" @@ -38,44 +41,122 @@ namespace Firebird { #if defined(WIN_NT) -TryEnterCS::tTryEnterCriticalSection* TryEnterCS::m_funct = &TryEnterCS::notImpl; +// Win9X support +#ifdef WIN9X_SUPPORT + +// NS: This code is adopted from from KernelEx project, with the explicit +// permission from the author. KernelEx project aims to provide Windows XP +// compatibility layer for Windows 98 and Windows ME. For futher information +// please refer to http://www.sourceforge.net/projects/kernelex/ + +static const K32OBJ_CRITICAL_SECTION = 4; +static const TDBX_WIN98 = 0x50; +static const TDBX_WINME = 0x80; + +typedef struct _CRIT_SECT // Size = 0x20 +{ + BYTE Type; // 00 = 4: K32_OBJECT_CRITICAL_SECTION + int RecursionCount; // 04 initially 0, incremented on lock + void* OwningThread; // 08 pointer to TDBX + DWORD un3; // 0C + int LockCount; // 10 initially 1, decremented on lock + struct _CRIT_SECT* Next; // 14 + void* PLst; // 18 list of processes using it? + struct _WIN_CRITICAL_SECTION* UserCS; // 1C pointer to user defined CRITICAL_SECTION +} CRIT_SECT, *PCRIT_SECT; + +typedef struct _WIN_CRITICAL_SECTION +{ + BYTE Type; //= 4: K32_OBJECT_CRITICAL_SECTION + PCRIT_SECT crit; + DWORD un1; + DWORD un2; + DWORD un3; + DWORD un4; +} WIN_CRITICAL_SECTION, *PWIN_CRITICAL_SECTION; + +static DWORD tdbx_offset; + +__declspec(naked) BOOL WINAPI TryEnterCrst(CRIT_SECT* crit) +{ +__asm { + mov edx, [esp+4] + xor eax, eax + inc eax + xor ecx, ecx + cmpxchg [edx+10h], ecx ;if (OP1==eax) { OP1=OP2; ZF=1; } else { eax=OP1; ZF=0 } + ;mov ecx, ppTDBXCur + mov ecx, fs:[18h] + add ecx, [tdbx_offset] + mov ecx, [ecx] ;ecx will contain TDBX now + cmp eax, 1 + jnz L1 + ;critical section was unowned => successful lock + mov [edx+8], ecx + inc dword ptr [edx+4] + ret 4 +L1: + cmp [edx+8], ecx + jnz L2 + ;critical section owned by this thread + dec dword ptr [edx+10h] + inc dword ptr [edx+4] + xor eax, eax + inc eax + ret 4 +L2: + ;critical section owned by other thread - do nothing + xor eax, eax + ret 4 + } +} + +BOOL WINAPI TryEnterCriticalSection_Win9X(CRITICAL_SECTION* cs) +{ + WIN_CRITICAL_SECTION* mycs = (WIN_CRITICAL_SECTION*) cs; + if (mycs->Type != K32OBJ_CRITICAL_SECTION) + RaiseException(STATUS_ACCESS_VIOLATION, 0, 0, NULL); + + return TryEnterCrst(mycs->crit); +} + +#endif + +// On Win 98 and Win ME TryEnterCriticalSection is defined, but not implemented +// So direct linking to it won't hurt and will signal our incompatibility with Win 95 +TryEnterCS::tTryEnterCriticalSection* TryEnterCS::m_funct = &TryEnterCriticalSection; static TryEnterCS tryEnterCS; TryEnterCS::TryEnterCS() { - HMODULE kernel32 = GetModuleHandle("kernel32.dll"); - if (kernel32) { - m_funct = (tTryEnterCriticalSection*) - GetProcAddress(kernel32, "TryEnterCriticalSection"); +// Win9X support +#ifdef WIN9X_SUPPORT + OSVERSIONINFO OsVersionInfo; + + OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if (GetVersionEx((LPOSVERSIONINFO) &OsVersionInfo)) + { + if (OsVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS && + OsVersionInfo.dwMajorVersion == 4) + { + // Windows 98 + if (OsVersionInfo.dwMinorVersion == 10) { + tdbx_offset = TDBX_WIN98; + m_funct = TryEnterCriticalSection_Win9X; + } + + // Windows ME + if (OsVersionInfo.dwMinorVersion == 90) { + tdbx_offset = TDBX_WINME; + m_funct = TryEnterCriticalSection_Win9X; + } + } } +#endif } - -#define MISS_SPIN_COUNT ((tSetCriticalSectionSpinCount *)(-1)) -#define INIT_SPIN_COUNT ((tSetCriticalSectionSpinCount *)(0)) - -tSetCriticalSectionSpinCount* Spinlock::SetCriticalSectionSpinCount = INIT_SPIN_COUNT; - -void Spinlock::init() -{ - if (SetCriticalSectionSpinCount == MISS_SPIN_COUNT) - return; - - if (SetCriticalSectionSpinCount == INIT_SPIN_COUNT) { - HMODULE kernel32 = GetModuleHandle("kernel32.dll"); - if (!kernel32) { - SetCriticalSectionSpinCount = MISS_SPIN_COUNT; - return; - } - SetCriticalSectionSpinCount = - (tSetCriticalSectionSpinCount*) GetProcAddress(kernel32, "SetCriticalSectionSpinCount"); - if (!SetCriticalSectionSpinCount) { - SetCriticalSectionSpinCount = MISS_SPIN_COUNT; - return; - } - } - +void Spinlock::init() { SetCriticalSectionSpinCount(&spinlock, 4000); } diff --git a/src/common/classes/locks.h b/src/common/classes/locks.h index 0c5a59e29a..3a69bf27e3 100644 --- a/src/common/classes/locks.h +++ b/src/common/classes/locks.h @@ -67,12 +67,6 @@ private: typedef WINBASEAPI BOOL WINAPI tTryEnterCriticalSection (LPCRITICAL_SECTION lpCriticalSection); - static BOOL WINAPI notImpl(LPCRITICAL_SECTION) - { - system_call_failed::raise("TryEnterCriticalSection is not implemented", 0); - return false; - } - static tTryEnterCriticalSection* m_funct; }; @@ -93,7 +87,7 @@ public: ~Mutex() { -#ifdef DEV_BUILD +#if defined DEV_BUILD && !defined WIN9X_SUPPORT if (spinlock.OwningThread != 0) DebugBreak(); #endif @@ -112,7 +106,9 @@ public: void leave() { -#ifdef DEV_BUILD +#if defined DEV_BUILD && !defined WIN9X_SUPPORT + // NS: This check is based on internal structure on CRITICAL_SECTION + // On 9X it works differently, and future OS versions may break this check as well if ((U_IPTR) spinlock.OwningThread != GetCurrentThreadId()) DebugBreak(); #endif @@ -123,16 +119,9 @@ public: static void initMutexes() { } }; -typedef WINBASEAPI DWORD WINAPI tSetCriticalSectionSpinCount ( - LPCRITICAL_SECTION lpCriticalSection, - DWORD dwSpinCount -); - class Spinlock : public Mutex { private: - static tSetCriticalSectionSpinCount* SetCriticalSectionSpinCount; - void init(); public: diff --git a/src/common/fb_exception.cpp b/src/common/fb_exception.cpp index 7930b60285..df80a03648 100644 --- a/src/common/fb_exception.cpp +++ b/src/common/fb_exception.cpp @@ -360,6 +360,9 @@ int system_error::getSystemError() system_call_failed::system_call_failed(const char* syscall, int error_code) : system_error(syscall, error_code) { + // NS: something unexpected has happened. Log the error to log file + // In the future we may consider terminating the process even in PROD_BUILD + gds__log("Operating system call %s failed. Error core %d", syscall, error_code); #ifdef DEV_BUILD // raised failed system call exception in DEV_BUILD in 99.99% means // problems with the code - let's create memory dump now diff --git a/src/iscguard/iscguard.cpp b/src/iscguard/iscguard.cpp index cb4ea9a0c5..a51faef2c1 100644 --- a/src/iscguard/iscguard.cpp +++ b/src/iscguard/iscguard.cpp @@ -852,8 +852,10 @@ HWND DisplayPropSheet(HWND hParentWnd, HINSTANCE hInst) hPSDlg = (HWND) PropertySheet(&PSHdr); - if (hPSDlg <= 0) + if (hPSDlg == 0 || hPSDlg == (HWND)-1) { + gds__log("Create property sheet window failed. Error code %d", GetLastError()); hPSDlg = NULL; + } return hPSDlg; } diff --git a/src/jrd/common.h b/src/jrd/common.h index 18d817c391..9e9b45d04b 100644 --- a/src/jrd/common.h +++ b/src/jrd/common.h @@ -489,6 +489,11 @@ extern "C" int remove(const char* path); #define INET_ERRNO WSAGetLastError() #define H_ERRNO WSAGetLastError() +// For Visual Studio 2003 and earlier enable Windows 9X support +#if defined _MSC_VER && (_MSC_VER < 1400) +#define WIN9X_SUPPORT +#endif + #endif /* WIN_NT */ diff --git a/src/jrd/ext.cpp b/src/jrd/ext.cpp index 50dbad8085..11d697b34e 100644 --- a/src/jrd/ext.cpp +++ b/src/jrd/ext.cpp @@ -58,6 +58,14 @@ #include "../jrd/os/path_utils.h" #include "../common/classes/init.h" +#if defined _MSC_VER && _MSC_VER < 1400 +// NS: in VS2003 these only work with static CRT +extern "C" { +int __cdecl _fseeki64(FILE *, __int64, int); +__int64 __cdecl _ftelli64(FILE *); +} +#endif + #ifdef WIN_NT #define FTELL64 _ftelli64 #define FSEEK64 _fseeki64 diff --git a/src/jrd/gds.cpp b/src/jrd/gds.cpp index 690bb13753..11c4d60982 100644 --- a/src/jrd/gds.cpp +++ b/src/jrd/gds.cpp @@ -121,6 +121,7 @@ static const TEXT gdslogid[] = ""; #ifdef WIN_NT #include +#include #define _WINSOCKAPI_ #include #include "err_proto.h" @@ -3675,11 +3676,32 @@ public: if (!fb_utils::readenv(FB_LOCK_ENV, lockPrefix)) { #ifdef WIN_NT - char cmnData[MAXPATHLEN]; - if (!SHGetSpecialFolderPath(NULL, cmnData, CSIDL_COMMON_APPDATA, TRUE)) { - Firebird::system_call_failed::raise("SHGetSpecialFolderPath"); + // shell32.dll version 5.0 and later supports SHGetFolderPath entry point + HMODULE hShFolder = LoadLibrary("shell32.dll"); + PFNSHGETFOLDERPATHA pfnSHGetFolderPath = + (PFNSHGETFOLDERPATHA)GetProcAddress(hShFolder, "SHGetFolderPathA"); + + if (!pfnSHGetFolderPath) { + // For old OS versions fall back to shfolder.dll + FreeLibrary(hShFolder); + hShFolder = LoadLibrary("shfolder.dll"); + pfnSHGetFolderPath = + (PFNSHGETFOLDERPATHA)GetProcAddress(hShFolder, "SHGetFolderPathA"); } - PathUtils::concatPath(lockPrefix, cmnData, LOCKDIR); + + char cmnData[MAXPATHLEN]; + if (pfnSHGetFolderPath && + pfnSHGetFolderPath(NULL, CSIDL_COMMON_APPDATA | CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_CURRENT, cmnData) == S_OK) + { + PathUtils::concatPath(lockPrefix, cmnData, LOCKDIR); + } + else + { + // If shfolder.dll is missing or API fails fall back to using old style location for locks + lockPrefix = prefix; + } + FreeLibrary(hShFolder); #else PathUtils::concatPath(lockPrefix, WORKFILE, LOCKDIR); #endif diff --git a/src/jrd/isc.cpp b/src/jrd/isc.cpp index c660ff1759..02a2708e38 100644 --- a/src/jrd/isc.cpp +++ b/src/jrd/isc.cpp @@ -72,8 +72,27 @@ public: // Ensure that our process has the SYNCHRONIZE privilege granted to everyone PSECURITY_DESCRIPTOR pOldSD = NULL; PACL pOldACL = NULL; - GetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, - NULL, NULL, &pOldACL, NULL, &pOldSD); + + // Pseudo-handles do not work on WinNT. Need real process handle. + HANDLE hCurrentProcess = OpenProcess(READ_CONTROL | WRITE_DAC, FALSE, GetCurrentProcessId()); + if (hCurrentProcess == NULL) { + Firebird::system_call_failed::raise("OpenProcess"); + } + + DWORD result = GetSecurityInfo(hCurrentProcess, SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pOldACL, NULL, &pOldSD); + + if (result == ERROR_CALL_NOT_IMPLEMENTED) { + // For Win9X - sumulate that the call worked alright + pOldACL = NULL; + result = ERROR_SUCCESS; + } + + if (result != ERROR_SUCCESS) + { + CloseHandle(hCurrentProcess); + Firebird::system_call_failed::raise("GetSecurityInfo", result); + } // NULL pOldACL means all privileges. If we assign pNewACL in this case // we'll lost all privileges except assigned SYNCHRONIZE @@ -96,7 +115,7 @@ public: PACL pNewACL = NULL; SetEntriesInAcl(1, &ea, pOldACL, &pNewACL); - SetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, + SetSecurityInfo(hCurrentProcess, SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pNewACL, NULL); if (pSID) { @@ -104,9 +123,11 @@ public: } if (pNewACL) { LocalFree(pNewACL); - } + } } + CloseHandle(hCurrentProcess); + if (pOldSD) { LocalFree(pOldSD); } @@ -517,6 +538,38 @@ SLONG ISC_set_prefix(const TEXT* sw, const TEXT* path) } +#ifdef WIN9X_SUPPORT + +static DWORD os_type; + +// Returns the type of OS: true for NT, +// false for the 16-bit based ones (9x/ME, ...). +// +bool ISC_is_WinNT() +{ + // NS: this is thread safe. + // In the worst case initialization will be called more than once + if (!os_type) + { + /* The first time this routine is called we use the Windows API + call GetVersion to determine whether Windows NT or 9X + is running. */ + OSVERSIONINFO OsVersionInfo; + + OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if (GetVersionEx((LPOSVERSIONINFO) & OsVersionInfo)) + { + os_type = OsVersionInfo.dwPlatformId; + fb_assert(os_type); + } else { + os_type = VER_PLATFORM_WIN32_NT; /* Default to NT */ + } + } + + return os_type >= VER_PLATFORM_WIN32_NT; // Windows NT, CE and future platforms +} +#endif + #ifdef WIN_NT LPSECURITY_ATTRIBUTES ISC_get_security_desc() { diff --git a/src/jrd/isc_proto.h b/src/jrd/isc_proto.h index e050b9e7ac..7fdac86b07 100644 --- a/src/jrd/isc_proto.h +++ b/src/jrd/isc_proto.h @@ -36,6 +36,10 @@ SLONG ISC_set_prefix(const TEXT*, const TEXT*); void iscLogStatus(const TEXT* text, const ISC_STATUS* status_vector); void iscLogException(const TEXT* text, const Firebird::Exception& e); +#ifdef WIN9X_SUPPORT +bool ISC_is_WinNT(); +#endif + #ifdef WIN_NT struct _SECURITY_ATTRIBUTES* ISC_get_security_desc(); #endif diff --git a/src/jrd/os/win32/guid.cpp b/src/jrd/os/win32/guid.cpp index 59450f25a5..2ae58f6c0e 100644 --- a/src/jrd/os/win32/guid.cpp +++ b/src/jrd/os/win32/guid.cpp @@ -26,8 +26,8 @@ * */ -// minimum win32 version: win95 / winnt4 -#define _WIN32_WINNT 0x0400 +// minimum win32 version: win98 / winnt4 SP3 +#define _WIN32_WINNT 0x0403 #include #include diff --git a/src/jrd/os/win32/os_utils.cpp b/src/jrd/os/win32/os_utils.cpp index 502a64334d..5b55b845aa 100644 --- a/src/jrd/os/win32/os_utils.cpp +++ b/src/jrd/os/win32/os_utils.cpp @@ -75,7 +75,8 @@ bool get_user_home(int /*user_id*/, Firebird::PathName& /*homeDir*/) void adjustLockDirectoryAccess(const char* pathname) { PSECURITY_DESCRIPTOR pSecDesc = NULL; - PSID pSID = NULL; + PSID pSID_Users = NULL; + PSID pSID_Administrators = NULL; PACL pNewACL = NULL; try { @@ -111,22 +112,35 @@ void adjustLockDirectoryAccess(const char* pathname) SID_IDENTIFIER_AUTHORITY sidAuth = SECURITY_NT_AUTHORITY; if (!AllocateAndInitializeSid(&sidAuth, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &pSID)) + DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &pSID_Users)) { Firebird::system_error::raise("AllocateAndInitializeSid"); } - EXPLICIT_ACCESS ea; - memset(&ea, 0, sizeof(ea)); + if (!AllocateAndInitializeSid(&sidAuth, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &pSID_Administrators)) + { + Firebird::system_error::raise("AllocateAndInitializeSid"); + } - ea.grfAccessPermissions = FILE_GENERIC_READ | FILE_GENERIC_WRITE | DELETE; - ea.grfAccessMode = GRANT_ACCESS; - ea.grfInheritance = SUB_OBJECTS_ONLY_INHERIT; - ea.Trustee.TrusteeForm = TRUSTEE_IS_SID; - ea.Trustee.TrusteeType = TRUSTEE_IS_GROUP; - ea.Trustee.ptstrName = (LPSTR) pSID; + EXPLICIT_ACCESS eas[2]; + memset(eas, 0, sizeof(eas)); - if (SetEntriesInAcl(1, &ea, pOldACL, &pNewACL) != ERROR_SUCCESS) + eas[0].grfAccessPermissions = FILE_GENERIC_READ | FILE_GENERIC_WRITE | DELETE; + eas[0].grfAccessMode = GRANT_ACCESS; + eas[0].grfInheritance = SUB_OBJECTS_ONLY_INHERIT; + eas[0].Trustee.TrusteeForm = TRUSTEE_IS_SID; + eas[0].Trustee.TrusteeType = TRUSTEE_IS_GROUP; + eas[0].Trustee.ptstrName = (LPSTR) pSID_Users; + + eas[1].grfAccessPermissions = FILE_GENERIC_READ | FILE_GENERIC_WRITE | DELETE; + eas[1].grfAccessMode = GRANT_ACCESS; + eas[1].grfInheritance = SUB_OBJECTS_ONLY_INHERIT; + eas[1].Trustee.TrusteeForm = TRUSTEE_IS_SID; + eas[1].Trustee.TrusteeType = TRUSTEE_IS_GROUP; + eas[1].Trustee.ptstrName = (LPSTR) pSID_Administrators; + + if (SetEntriesInAcl(2, eas, pOldACL, &pNewACL) != ERROR_SUCCESS) Firebird::system_error::raise("SetEntriesInAcl"); if (SetNamedSecurityInfo((LPSTR) pathname, @@ -144,8 +158,11 @@ void adjustLockDirectoryAccess(const char* pathname) iscLogException(str.c_str(), ex); } - if (pSID) { - FreeSid(pSID); + if (pSID_Users) { + FreeSid(pSID_Users); + } + if (pSID_Administrators) { + FreeSid(pSID_Administrators); } if (pNewACL) { LocalFree(pNewACL); diff --git a/src/jrd/os/win32/win9x_nt.h b/src/jrd/os/win32/win9x_nt.h new file mode 100644 index 0000000000..f5f90786a8 --- /dev/null +++ b/src/jrd/os/win32/win9x_nt.h @@ -0,0 +1,196 @@ +/* + * PROGRAM: JRD Access Method + * MODULE: win9x_nt.h + * DESCRIPTION: Windows 9X IO support module + * + * This file needs to be included in winnt.cpp. It is designed to + * mimic Windows NT overlapped API when application runs on Win9X. + * + * The contents of this file are subject to the Initial + * Developer's Public License Version 1.0 (the "License"); + * you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. + * + * Software distributed under the License is distributed AS IS, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. + * See the License for the specific language governing rights + * and limitations under the License. + * + * The Original Code was created by Alexander Peshkoff + * for the Firebird Open Source RDBMS project. + * + * Copyright (c) 2009 Nikolay Samofatov + * and all contributors signed below. + * + * All Rights Reserved. + * Contributor(s): ______________________________________. + */ + +// This file needs to be explicitly included in winnt.cpp + + +#include "../common/classes/fb_pair.h" + +namespace Jrd { + +using Firebird::MutexLockGuard; + +Firebird::Mutex file_locks_mutex; + +struct LocksArrayItem { + HANDLE first; + Firebird::Mutex* second; + + LocksArrayItem() {} + LocksArrayItem(HANDLE handle, Firebird::Mutex* mutex) : first(handle), second(mutex) { } + static HANDLE generate(const void*, LocksArrayItem value) { + return value.first; + } +}; + +Firebird::SortedArray< + LocksArrayItem, + Firebird::InlineStorage, + HANDLE, + LocksArrayItem > file_locks_9X(*getDefaultMemoryPool()); + +// This header can be included in winnt.h +// It converts Win32 overlapped API calls to synchronized regular API calls +HANDLE CreateFile_9X( + LPCSTR lpFileName, + DWORD dwDesiredAccess, + DWORD dwShareMode, + LPSECURITY_ATTRIBUTES lpSecurityAttributes, + DWORD dwCreationDisposition, + DWORD dwFlagsAndAttributes, + HANDLE hTemplateFile) +{ + if (!ISC_is_WinNT()) + dwShareMode &= ~FILE_SHARE_DELETE; + + HANDLE file = CreateFileA( + lpFileName, + dwDesiredAccess, + dwShareMode, + lpSecurityAttributes, + dwCreationDisposition, + dwFlagsAndAttributes, + hTemplateFile); + + DWORD dwLastError = GetLastError(); + + if (!ISC_is_WinNT() && file != INVALID_HANDLE_VALUE) { + MutexLockGuard sync(file_locks_mutex); + file_locks_9X.add( + LocksArrayItem( + file, + new Firebird::Mutex())); + } + + SetLastError(dwLastError); + return file; +} + +BOOL CloseHandle_9X(HANDLE hObject) +{ + if (!ISC_is_WinNT()) { + MutexLockGuard sync(file_locks_mutex); + size_t pos; + if (file_locks_9X.find(hObject, pos)) { + delete file_locks_9X[pos].second; + file_locks_9X.remove(pos); + } + } + + return CloseHandle(hObject); +} + +BOOL ReadFile_9X( + HANDLE hFile, + LPVOID lpBuffer, + DWORD nNumberOfBytesToRead, + LPDWORD lpNumberOfBytesRead, + LPOVERLAPPED lpOverlapped) +{ + if (ISC_is_WinNT()) + return ReadFile(hFile, lpBuffer, nNumberOfBytesToRead, lpNumberOfBytesRead, lpOverlapped); + + Firebird::Mutex* fileMutex = NULL; + { + MutexLockGuard sync(file_locks_mutex); + size_t pos; + if (file_locks_9X.find(hFile, pos)) + fileMutex = file_locks_9X[pos].second; + } + + BOOL result; + DWORD dwLastError; + { + MutexLockGuard sync(*fileMutex); + + if (lpOverlapped != NULL) { + const DWORD ret = SetFilePointer(hFile, lpOverlapped->Offset, + (PLONG)&lpOverlapped->OffsetHigh, FILE_BEGIN); + if (ret == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) + return 0; + } + + result = ReadFile(hFile, lpBuffer, nNumberOfBytesToRead, lpNumberOfBytesRead, NULL); + dwLastError = GetLastError(); + } + + SetLastError(dwLastError); + return result; +} + +BOOL WriteFile_9X( + HANDLE hFile, + LPCVOID lpBuffer, + DWORD nNumberOfBytesToWrite, + LPDWORD lpNumberOfBytesWritten, + LPOVERLAPPED lpOverlapped +) +{ + if (ISC_is_WinNT()) + return WriteFile(hFile, lpBuffer, nNumberOfBytesToWrite, lpNumberOfBytesWritten, lpOverlapped); + + Firebird::Mutex* fileMutex = NULL; + { + MutexLockGuard sync(file_locks_mutex); + size_t pos; + if (file_locks_9X.find(hFile, pos)) + fileMutex = file_locks_9X[pos].second; + } + + BOOL result; + DWORD dwLastError; + { + MutexLockGuard sync(*fileMutex); + + if (lpOverlapped != NULL) { + const DWORD ret = SetFilePointer(hFile, lpOverlapped->Offset, + (PLONG)&lpOverlapped->OffsetHigh, FILE_BEGIN); + if (ret == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) + return 0; + lpOverlapped = NULL; + } + result = WriteFile(hFile, lpBuffer, nNumberOfBytesToWrite, lpNumberOfBytesWritten, NULL); + dwLastError = GetLastError(); + } + + SetLastError(dwLastError); + return result; +} + + +} + +#if defined CreateFile +#undef CreateFile +#endif + +#define CreateFile CreateFile_9X +#define CloseHandle CloseHandle_9X +#define ReadFile ReadFile_9X +#define WriteFile WriteFile_9X diff --git a/src/jrd/os/win32/winnt.cpp b/src/jrd/os/win32/winnt.cpp index 8600581544..4bad84f447 100644 --- a/src/jrd/os/win32/winnt.cpp +++ b/src/jrd/os/win32/winnt.cpp @@ -55,6 +55,10 @@ #include +#ifdef WIN9X_SUPPORT +#include "win9x_nt.h" +#endif + namespace Jrd { class FileExtendLockGuard @@ -1072,7 +1076,13 @@ static jrd_file* setup_file(Database* dbb, if (pageSpace && pageSpace->file) return file; - file->fil_ext_lock = FB_NEW(*dbb->dbb_permanent) Firebird::RWLock(); +#ifdef WIN9X_SUPPORT + // Disable sophisticated file extension when running on 9X + if (ISC_is_WinNT()) +#endif + { + file->fil_ext_lock = FB_NEW(*dbb->dbb_permanent) Firebird::RWLock(); + } } catch (const Firebird::Exception&) { diff --git a/src/jrd/trace/TraceConfigStorage.cpp b/src/jrd/trace/TraceConfigStorage.cpp index 76cb047010..7955c6b171 100644 --- a/src/jrd/trace/TraceConfigStorage.cpp +++ b/src/jrd/trace/TraceConfigStorage.cpp @@ -87,8 +87,17 @@ ConfigStorage::ConfigStorage() PathName filename; #ifdef WIN_NT DWORD sesID = 0; + + typedef BOOL (WINAPI *PFnProcessIdToSessionId) (DWORD, DWORD *); + + HMODULE hmodKernel32 = GetModuleHandle("kernel32.dll"); + + PFnProcessIdToSessionId pfnProcessIdToSessionId = + (PFnProcessIdToSessionId) GetProcAddress(hmodKernel32, "ProcessIdToSessionId"); + if (fb_utils::isGlobalKernelPrefix() || - ProcessIdToSessionId(GetCurrentProcessId(), &sesID) == 0 || + !pfnProcessIdToSessionId || + pfnProcessIdToSessionId(GetCurrentProcessId(), &sesID) == 0 || sesID == 0) { filename.printf(TRACE_FILE); // TODO: it must be per engine instance diff --git a/src/remote/os/win32/property.cpp b/src/remote/os/win32/property.cpp index 1499163ae6..618567b26f 100644 --- a/src/remote/os/win32/property.cpp +++ b/src/remote/os/win32/property.cpp @@ -103,15 +103,17 @@ HWND DisplayProperties(HWND hParentWnd, HINSTANCE hInst, USHORT usServerFlagMask PSHdr.nStartPage = 0; PSHdr.ppsp = (LPCPROPSHEETPAGE) & PSPages; PSHdr.pfnCallback = NULL; - + // Initialize the gray brush to paint the background // for all prop. sheet pages and their controls hGrayBrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); hPSDlg = (HWND) PropertySheet(&PSHdr); - if (hPSDlg <= 0) + if (hPSDlg == 0 || hPSDlg == (HWND)-1) { + gds__log("Create property sheet window failed. Error code %d", GetLastError()); hPSDlg = NULL; + } return hPSDlg; } diff --git a/src/utilities/install/services.cpp b/src/utilities/install/services.cpp index d6d297d298..cfab2582c7 100644 --- a/src/utilities/install/services.cpp +++ b/src/utilities/install/services.cpp @@ -442,7 +442,9 @@ USHORT SERVICES_grant_privilege(const TEXT* account, pfnSvcError err_handler, co PLSA_UNICODE_STRING UserRights; ULONG CountOfRights = 0; - LsaEnumerateAccountRights(PolicyHandle, pSid, &UserRights, &CountOfRights); + NTSTATUS ntStatus = LsaEnumerateAccountRights(PolicyHandle, pSid, &UserRights, &CountOfRights); + if (ntStatus == (NTSTATUS)0xC0000034L) //STATUS_OBJECT_NAME_NOT_FOUND + CountOfRights = 0; // Check if the seServiceLogonRight is already granted ULONG i; for (i = 0; i < CountOfRights; i++)