Patch level : 12.00 1146

Files correlati     : fp/sql/fp0126.sql ca0.exe
This commit is contained in:
Alessandro Bonazzi 2024-07-29 13:57:05 +02:00
parent eb90b152d1
commit cd49b046bb
11 changed files with 22 additions and 36 deletions

View File

@ -186,6 +186,7 @@
<ClInclude Include="..\src\include\mask.h" />
<ClInclude Include="..\src\include\maskfld.h" />
<ClInclude Include="..\src\include\modaut.h" />
<ClInclude Include="..\src\include\modreport.h" />
<ClInclude Include="..\src\include\modtbapp.h" />
<ClInclude Include="..\src\include\mov.h" />
<ClInclude Include="..\src\include\msg.h" />

View File

@ -538,6 +538,9 @@
<ClInclude Include="..\src\include\codeb.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\include\modreport.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\include\about.cpp">

View File

@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cg7", "Cg7.vcxproj", "{95FE
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "f1lib", "f1lib.vcxproj", "{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
@ -39,6 +37,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -85,10 +85,6 @@ Global
{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Debug|Win32.ActiveCfg = Debug|Win32
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Debug|Win32.Build.0 = Debug|Win32
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Release|Win32.ActiveCfg = Release|Win32
@ -109,6 +105,10 @@ Global
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -61,7 +61,6 @@
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<StringPooling>true</StringPooling>
@ -291,15 +290,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</Library>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\src\setup\dninst.txt">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dncrypt %(FullPath) $(TargetDir)%(FileName).zip</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(FileName).zip</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dncrypt %(FullPath) $(TargetDir)%(Filename).zip</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename).zip</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" />

View File

@ -16,9 +16,6 @@
<Filter Include="Ini">
<UniqueIdentifier>{18793e00-9586-46b2-a2e5-7da381a369df}</UniqueIdentifier>
</Filter>
<Filter Include="Txt">
<UniqueIdentifier>{8092c16a-242b-4c96-aa9b-e3b8cc4ec586}</UniqueIdentifier>
</Filter>
<Filter Include="Library Files">
<UniqueIdentifier>{aebe04a0-bdea-4877-a1a1-012ce9434862}</UniqueIdentifier>
<Extensions>lib</Extensions>
@ -124,9 +121,4 @@
<Filter>Library Files</Filter>
</Library>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\src\setup\dninst.txt">
<Filter>Txt</Filter>
</CustomBuild>
</ItemGroup>
</Project>

View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32126.317
# Visual Studio 15
VisualStudioVersion = 15.0.34320.172
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tf0", "tf0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
ProjectSection(ProjectDependencies) = postProject

View File

@ -193,12 +193,6 @@
<ClCompile Include="..\src\ve\ve1700.cpp" />
<ClCompile Include="..\src\ve\ve1800.cpp" />
<ClCompile Include="..\src\ve\ve1900.cpp" />
<ClCompile Include="..\src\ve\velib04.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\ve\velib07.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

View File

@ -48,9 +48,6 @@
<ClCompile Include="..\src\ve\ve1500.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\velib04.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\velib07.cpp">
<Filter>Sources</Filter>
</ClCompile>

View File

@ -278,7 +278,9 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve2400f.uml" />
<MskCompiler Include="..\src\ve\ve2400f.uml">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve2400k.uml" />
<MskCompiler Include="..\src\ve\ve2500ac.uml" />
<MskCompiler Include="..\src\ve\ve2500al.uml" />

4
src/fp/sql/fp0126.sql Normal file
View File

@ -0,0 +1,4 @@
-- DROP PAF1800_NEWDF_DTINIZ
ALTER TABLE PAF1800F DROP CONSTRAINT PAF1800_NEWDF_DTINIZ;
-- DROP PAF1800_NEWDF_DTFIN
ALTER TABLE PAF1800F DROP CONSTRAINT PAF1800_NEWDF_DTFIN;

View File

@ -742,7 +742,10 @@ HIDDEN void odbc_send(const TString & dsn, int num, TAuto_token_string & elab_fi
}
else
check_statement << name << "';";
int err = recset.exec(check_statement);
message_box("%s %d", (const char *)check_statement, err);
if (err <= 0)
{
create_table(recset, curr_file_num, name, wrk);