Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[52188] firebird/trunk
|
From: <hv...@us...> - 2011-01-24 12:51:41
|
Revision: 52188
http://firebird.svn.sourceforge.net/firebird/?rev=52188&view=rev
Author: hvlad
Date: 2011-01-24 12:51:32 +0000 (Mon, 24 Jan 2011)
Log Message:
-----------
Make it compiles on Windows after Alex's changes. MSVC10 build will follow later.
Modified Paths:
--------------
firebird/trunk/builds/win32/defs/firebird.def
firebird/trunk/builds/win32/defs/udr_engine.def
firebird/trunk/builds/win32/msvc8/engine.vcproj
firebird/trunk/builds/win32/msvc8/fbtrace.vcproj
firebird/trunk/builds/win32/msvc8/user_management.vcproj
firebird/trunk/builds/win32/msvc8/yvalve.vcproj
firebird/trunk/builds/win32/msvc9/engine.vcproj
firebird/trunk/builds/win32/msvc9/fbtrace.vcproj
firebird/trunk/builds/win32/msvc9/user_management.vcproj
firebird/trunk/builds/win32/msvc9/yvalve.vcproj
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/auth/trusted/AuthSspi.h
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/dsql/dsql.h
firebird/trunk/src/jrd/Attachment.h
firebird/trunk/src/jrd/JrdStatement.h
firebird/trunk/src/jrd/blb.h
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/tra.h
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/jrd/trace/TraceObjects.h
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/utilities/ntrace/PluginLogWriter.h
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/why.cpp
Added Paths:
-----------
firebird/trunk/builds/win32/defs/plugin.def
Modified: firebird/trunk/builds/win32/defs/firebird.def
===================================================================
--- firebird/trunk/builds/win32/defs/firebird.def 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/defs/firebird.def 2011-01-24 12:51:32 UTC (rev 52188)
@@ -350,10 +350,8 @@
_isc_expand_dpb=isc_expand_dpb
_isc_event_block=isc_event_block
- fb_register_plugin
- fb_query_plugin
fb_ping
- fb_get_status_instance
+ fb_get_master_interface
gds__trace
gds__trace_raw
Added: firebird/trunk/builds/win32/defs/plugin.def
===================================================================
--- firebird/trunk/builds/win32/defs/plugin.def (rev 0)
+++ firebird/trunk/builds/win32/defs/plugin.def 2011-01-24 12:51:32 UTC (rev 52188)
@@ -0,0 +1,23 @@
+; 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 Khorsun Vladyslav
+; for the Firebird Open Source RDBMS project.
+;
+; Copyright (c) 2011 Khorsun Vladyslav <hv...@us...>
+; and all contributors signed below.
+;
+; All Rights Reserved.
+; Contributor(s): ______________________________________.
+
+EXPORTS
+ firebird_plugin
+
Property changes on: firebird/trunk/builds/win32/defs/plugin.def
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: firebird/trunk/builds/win32/defs/udr_engine.def
===================================================================
--- firebird/trunk/builds/win32/defs/udr_engine.def 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/defs/udr_engine.def 2011-01-24 12:51:32 UTC (rev 52188)
@@ -19,7 +19,7 @@
; Contributor(s): ______________________________________.
EXPORTS
- firebirdPlugin
+ firebird_plugin
fbUdrRegFunction
fbUdrRegProcedure
fbUdrRegTrigger
Modified: firebird/trunk/builds/win32/msvc8/engine.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/engine.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/engine.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -19,7 +19,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -62,6 +62,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -90,7 +91,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -135,6 +136,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -163,7 +165,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -210,6 +212,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -238,7 +241,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -286,6 +289,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -488,10 +492,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\jrd\PreparedStatement.cpp"
>
</File>
@@ -1424,10 +1424,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.h"
- >
- </File>
- <File
RelativePath="..\..\..\src\utilities\gstat\ppg_proto.h"
>
</File>
@@ -1852,6 +1848,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc8/fbtrace.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/fbtrace.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/fbtrace.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -58,6 +58,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -127,6 +128,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -199,6 +201,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -271,6 +274,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -372,6 +376,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc8/user_management.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/user_management.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/user_management.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -125,6 +126,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -196,6 +198,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -267,6 +270,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -330,6 +334,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc8/yvalve.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/yvalve.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/yvalve.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -377,6 +377,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\prepa_proto.h"
>
</File>
@@ -437,10 +441,18 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\MasterImplementation.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\perf.cpp"
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\preparse.cpp"
>
</File>
Modified: firebird/trunk/builds/win32/msvc9/engine.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/engine.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/engine.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -19,7 +19,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -62,6 +62,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -90,7 +91,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -135,6 +136,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -163,7 +165,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -210,6 +212,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -238,7 +241,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -286,6 +289,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -488,10 +492,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\jrd\PreparedStatement.cpp"
>
</File>
@@ -1424,10 +1424,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.h"
- >
- </File>
- <File
RelativePath="..\..\..\src\utilities\gstat\ppg_proto.h"
>
</File>
@@ -1852,6 +1848,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc9/fbtrace.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/fbtrace.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/fbtrace.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -58,6 +58,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -127,6 +128,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -199,6 +201,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -271,6 +274,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -372,6 +376,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc9/user_management.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/user_management.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/user_management.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -126,6 +127,7 @@
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
TargetMachine="17"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -196,6 +198,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -267,6 +270,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -330,6 +334,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc9/yvalve.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/yvalve.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/yvalve.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -377,6 +377,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\prepa_proto.h"
>
</File>
@@ -437,10 +441,18 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\MasterImplementation.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\perf.cpp"
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\preparse.cpp"
>
</File>
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -42,10 +42,10 @@
{
}
- Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb);
- Result contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb);
+ Result FB_CARG contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size);
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
};
void registerLegacyClient(Firebird::IPlugin* iPlugin);
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -41,12 +41,12 @@
}
// work in progress - we must avoid both internal_user_data and callback function
- int execLine(ISC_STATUS* isc_status, const char* realUser,
+ int FB_CARG execLine(ISC_STATUS* isc_status, const char* realUser,
FB_API_HANDLE db, FB_API_HANDLE trans,
internal_user_data* io_user_data,
FPTR_SECURITY_CALLBACK display_func, void* callback_arg);
- int release();
+ int FB_CARG release();
};
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -122,13 +122,13 @@
{
}
- Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
- Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
+ Result FB_CARG contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
};
void registerLegacyServer(Firebird::IPlugin* iPlugin);
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -30,7 +30,7 @@
#ifdef TRUSTED_AUTH
#include "../common/classes/ClumpletReader.h"
-#include "../common/classes/Interface.h"
+#include "Interface.h"
#include "../common/classes/ImplementHelper.h"
using namespace Firebird;
@@ -397,7 +397,7 @@
*dataSize = sspiData.getCount();
}
-void WinSspiServer::release()
+int WinSspiServer::release()
{
if (--refCounter == 0)
{
@@ -469,13 +469,13 @@
void registerTrustedClient(Firebird::IPlugin* iPlugin)
{
- clientFactory.addRef();
+ clientFactory->addRef();
iPlugin->registerPlugin(Firebird::PluginType::AuthClient, plugName, &clientFactory);
}
void registerTrustedServer(Firebird::IPlugin* iPlugin)
{
- serverFactory.addRef();
+ serverFactory->addRef();
iPlugin->registerPlugin(Firebird::PluginType::AuthServer, plugName, &serverFactory);
}
Modified: firebird/trunk/src/auth/trusted/AuthSspi.h
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/trusted/AuthSspi.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -99,13 +99,13 @@
class WinSspiServer : public Firebird::StdPlugin<Server, FB_AUTH_SERVER_VERSION>
{
public:
- Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
- Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
+ Result FB_CARG contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
WinSspiServer(Firebird::IFactoryParameter*);
@@ -117,12 +117,12 @@
class WinSspiClient : public Firebird::StdPlugin<Client, FB_AUTH_CLIENT_VERSION>
{
public:
- Result startAuthentication(Firebird::Status* status, bool isService,
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService,
const char* dbName, DpbInterface* dpb);
- Result contAuthentication(Firebird::Status* status,
+ Result FB_CARG contAuthentication(Firebird::Status* status,
const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
WinSspiClient(Firebird::IFactoryParameter*);
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/common/StatusHolder.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -38,27 +38,27 @@
class BaseStatus : public Status
{
public:
- virtual void set(const ISC_STATUS* value)
+ virtual void FB_CARG set(const ISC_STATUS* value)
{
set(fb_utils::statusLength(value), value);
}
- virtual void set(unsigned int length, const ISC_STATUS* value)
+ virtual void FB_CARG set(unsigned int length, const ISC_STATUS* value)
{
fb_utils::copyStatus(vector, FB_NELEM(vector), value, length);
}
- virtual void init()
+ virtual void FB_CARG init()
{
fb_utils::init_status(vector);
}
- virtual const ISC_STATUS* get() const
+ virtual const ISC_STATUS* FB_CARG get() const
{
return vector;
}
- virtual int isSuccess() const
+ virtual int FB_CARG isSuccess() const
{
return vector[1] == 0;
}
Modified: firebird/trunk/src/dsql/dsql.h
===================================================================
--- firebird/trunk/src/dsql/dsql.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/dsql/dsql.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -579,19 +579,19 @@
friend class Firebird::MemoryPool;
public:
- virtual int release();
+ virtual int FB_CARG release();
//virtual Sqlda* describeInput(Status* status);
//virtual Sqlda* describeOutput(Status* status);
- virtual Firebird::IStatement* prepare(Status* status, Firebird::ITransaction* tra,
+ virtual Firebird::IStatement* FB_CARG prepare(Status* status, Firebird::ITransaction* tra,
unsigned int stmtLength, const char* sqlStmt, unsigned int dialect,
unsigned int item_length, const unsigned char* items,
unsigned int buffer_length, unsigned char* buffer);
- virtual void getInfo(Status* status,
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void setCursor(Status* status, const char* name, unsigned int type);
+ virtual void FB_CARG setCursor(Status* status, const char* name, unsigned int type);
// virtual Firebird::ITransaction* execute(Status* status, Firebird::ITransaction* tra, Sqlda* in, Sqlda* out);
- virtual Firebird::ITransaction* executeMessage(Status* status, Firebird::ITransaction* tra,
+ virtual Firebird::ITransaction* FB_CARG executeMessage(Status* status, Firebird::ITransaction* tra,
unsigned int in_blr_length, const unsigned char* in_blr,
unsigned int in_msg_type,
unsigned int in_msg_length, const unsigned char* in_message,
@@ -599,16 +599,16 @@
unsigned int out_msg_type,
unsigned int out_msg_length, unsigned char* out_message);
// virtual int fetch(Status* status, Sqlda* out); // returns 100 if EOF, 101 if fragmented
- virtual int fetchMessage(Status* status,
+ virtual int FB_CARG fetchMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, unsigned char* message); // returns 100 if EOF, 101 if fragmented
// virtual void insert(Status* status, Sqlda* in);
- virtual void insertMessage(Status* status,
+ virtual void FB_CARG insertMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, const unsigned char* message);
- virtual void free(Status* status, unsigned int option);
+ virtual void FB_CARG free(Status* status, unsigned int option);
};
// Blob
Modified: firebird/trunk/src/jrd/Attachment.h
===================================================================
--- firebird/trunk/src/jrd/Attachment.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/Attachment.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -220,29 +220,29 @@
bool checkHandle() const;
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
// virtual Firebird::ITransaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb);
// second form is tmp - not to rewrite external engines right now
- virtual Firebird::ITransaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
+ virtual Firebird::ITransaction* FB_CARG startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
FB_API_HANDLE api);
- virtual Firebird::ITransaction* reconnectTransaction(Status* status, unsigned int length, const unsigned char* id);
- virtual Firebird::IStatement* allocateStatement(Status* status);
- virtual Firebird::IRequest* compileRequest(Status* status, unsigned int blr_length, const unsigned char* blr);
- virtual Firebird::ITransaction* execute(Status* status, Firebird::ITransaction* transaction,
+ virtual Firebird::ITransaction* FB_CARG reconnectTransaction(Status* status, unsigned int length, const unsigned char* id);
+ virtual Firebird::IStatement* FB_CARG allocateStatement(Status* status);
+ virtual Firebird::IRequest* FB_CARG compileRequest(Status* status, unsigned int blr_length, const unsigned char* blr);
+ virtual Firebird::ITransaction* FB_CARG execute(Status* status, Firebird::ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect,
unsigned int in_blr_length, const unsigned char* in_blr,
unsigned int in_msg_type, unsigned int in_msg_length, const unsigned char* in_msg,
unsigned int out_blr_length, unsigned char* out_blr,
unsigned int out_msg_type, unsigned int out_msg_length, unsigned char* out_msg);
- virtual Firebird::IEvents* queEvents(Status* status, Firebird::EventCallback* callback,
+ virtual Firebird::IEvents* FB_CARG queEvents(Status* status, Firebird::EventCallback* callback,
unsigned int length, const unsigned char* events);
- virtual void cancelOperation(Status* status, int option);
- virtual void ping(Status* status);
- virtual void detach(Status* status);
- virtual void drop(Status* status);
+ virtual void FB_CARG cancelOperation(Status* status, int option);
+ virtual void FB_CARG ping(Status* status);
+ virtual void FB_CARG detach(Status* status);
+ virtual void FB_CARG drop(Status* status);
private:
Attachment(MemoryPool* pool, Database* dbb, FB_API_HANDLE publicHandle);
Modified: firebird/trunk/src/jrd/JrdStatement.h
===================================================================
--- firebird/trunk/src/jrd/JrdStatement.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/JrdStatement.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -83,19 +83,19 @@
MapItemInfo mapItemInfo; // Map item to item info
public:
- virtual int release();
- virtual void receive(Status* status, int level, unsigned int msg_type,
+ virtual int FB_CARG release();
+ virtual void FB_CARG receive(Status* status, int level, unsigned int msg_type,
unsigned int length, unsigned char* message);
- virtual void send(Status* status, int level, unsigned int msg_type,
+ virtual void FB_CARG send(Status* status, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void getInfo(Status* status, int level,
+ virtual void FB_CARG getInfo(Status* status, int level,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void start(Status* status, Firebird::ITransaction* tra, int level);
- virtual void startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
+ virtual void FB_CARG start(Status* status, Firebird::ITransaction* tra, int level);
+ virtual void FB_CARG startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void unwind(Status* status, int level);
- virtual void free(Status* status);
+ virtual void FB_CARG unwind(Status* status, int level);
+ virtual void FB_CARG free(Status* status);
};
Modified: firebird/trunk/src/jrd/blb.h
===================================================================
--- firebird/trunk/src/jrd/blb.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/blb.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -209,15 +209,15 @@
static void destroy(blb* blob, const bool purge_flag);
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual unsigned int getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
- virtual void putSegment(Status* status, unsigned int length, const unsigned char* buffer);
- virtual void cancel(Status* status);
- virtual void close(Status* status);
- virtual int seek(Status* status, int mode, int offset); // returns position
+ virtual unsigned int FB_CARG getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
+ virtual void FB_CARG putSegment(Status* status, unsigned int length, const unsigned char* buffer);
+ virtual void FB_CARG cancel(Status* status);
+ virtual void FB_CARG close(Status* status);
+ virtual int FB_CARG seek(Status* status, int mode, int offset); // returns position
};
const int BLB_temporary = 1; // Newly created blob
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/jrd.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -150,8 +150,8 @@
class Events : public StdIface<IEvents, FB_I_EVENTS_VERSION, pool_alloc<type_Events> >
{
public:
- virtual int release();
- virtual void cancel(Status* status);
+ virtual int FB_CARG release();
+ virtual void FB_CARG cancel(Status* status);
public:
Events(int h, Attachment* att) : id(h), attachment(att) { }
@@ -219,13 +219,13 @@
class Svc : public StdIface<IService, FB_I_SERVICE_VERSION>
{
public:
- virtual int release();
- virtual void detach(Status* status);
- virtual void query(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG detach(Status* status);
+ virtual void FB_CARG query(Status* status,
unsigned int sendLength, const unsigned char* sendItems,
unsigned int receiveLength, const unsigned char* receiveItems,
unsigned int bufferLength, unsigned char* buffer);
- virtual void start(Status* status,
+ virtual void FB_CARG start(Status* status,
unsigned int spbLength, const unsigned char* spb);
public:
@@ -249,16 +249,16 @@
explicit Provider(IFactoryParameter*)
{ }
- virtual void attachDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
+ virtual void FB_CARG attachDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
unsigned int dpbLength, const unsigned char* dpb);
- virtual void createDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
+ virtual void FB_CARG createDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
unsigned int dpbLength, const unsigned char* dpb);
- virtual Firebird::IService* attachServiceManager(Status* status, const char* service,
+ virtual Firebird::IService* FB_CARG attachServiceManager(Status* status, const char* service,
unsigned int spbLength, const unsigned char* spb);
//virtual Firebird::ITransaction* startTransaction(Status* status, unsigned int count, ...);
//virtual Firebird::ITransaction* startMultiple(Status* status, MultipleTransaction* multi);
- virtual void shutdown(Status* status, unsigned int timeout, const int reason);
- virtual int release();
+ virtual void FB_CARG shutdown(Status* status, unsigned int timeout, const int reason);
+ virtual int FB_CARG release();
};
int Provider::release()
@@ -687,16 +687,16 @@
public:
TraceFailedConnection(const char* filename, const DatabaseOptions* options);
- virtual int getConnectionID() { return 0; }
- virtual int getProcessID() { return m_options->dpb_remote_pid; }
- virtual const char* getDatabaseName() { return m_filename; }
- virtual const char* getUserName() { return m_id.usr_user_name.c_str(); }
- virtual const char* getRoleName() { return m_options->dpb_role_name.c_str(); }
- virtual const char* getCharSet() { return m_options->dpb_lc_ctype.c_str(); }
- virtual const char* getRemoteProtocol() { return m_options->dpb_network_protocol.c_str(); }
- virtual const char* getRemoteAddress() { return m_options->dpb_remote_address.c_str(); }
- virtual int getRemoteProcessID() { return m_options->dpb_remote_pid; }
- virtual const char* getRemoteProcessName() { return m_options->dpb_remote_process.c_str(); }
+ virtual int FB_CARG getConnectionID() { return 0; }
+ virtual int FB_CARG getProcessID() { return m_options->dpb_remote_pid; }
+ virtual const char* FB_CARG getDatabaseName() { return m_filename; }
+ virtual const char* FB_CARG getUserName() { return m_id.usr_user_name.c_str(); }
+ virtual const char* FB_CARG getRoleName() { return m_options->dpb_role_name.c_str(); }
+ virtual const char* FB_CARG getCharSet() { return m_options->dpb_lc_ctype.c_str(); }
+ virtual const char* FB_CARG getRemoteProtocol() { return m_options->dpb_network_protocol.c_str(); }
+ virtual const char* FB_CARG getRemoteAddress() { return m_options->dpb_remote_address.c_str(); }
+ virtual int FB_CARG getRemoteProcessID() { return m_options->dpb_remote_pid; }
+ virtual const char* FB_CARG getRemoteProcessName() { return m_options->dpb_remote_process.c_str(); }
private:
const char* m_filename;
Modified: firebird/trunk/src/jrd/tra.h
===================================================================
--- firebird/trunk/src/jrd/tra.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/tra.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -315,38 +315,38 @@
UserManagement* getUserManagement();
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual Firebird::IBlob* createBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG createBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual Firebird::IBlob* openBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG openBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual int getSlice(Status* status, ISC_QUAD* id,
+ virtual int FB_CARG getSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void putSlice(Status* status, ISC_QUAD* id,
+ virtual void FB_CARG putSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void transactRequest(Status* status,
+ virtual void FB_CARG transactRequest(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int in_msg_length, const unsigned char* in_msg,
unsigned int out_msg_length, unsigned char* out_msg,
Firebird::IAttachment* att = 0);
- virtual void prepare(Status* status,
+ virtual void FB_CARG prepare(Status* status,
unsigned int msg_length = 0, const unsigned char* message = 0);
- virtual void ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
- virtual void commit(Status* status);
- virtual void commitRetaining(Status* status);
- virtual void rollback(Status* status);
- virtual void rollbackRetaining(Status* status);
+ virtual void FB_CARG ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
+ virtual void FB_CARG commit(Status* status);
+ virtual void FB_CARG commitRetaining(Status* status);
+ virtual void FB_CARG rollback(Status* status);
+ virtual void FB_CARG rollbackRetaining(Status* status);
};
// System transaction is always transaction 0.
Modified: firebird/trunk/src/jrd/trace/TraceObjects.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/trace/TraceObjects.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -293,7 +293,8 @@
// Use descriptor for nulls signaling
USHORT null_flag = 0;
- if (parameter->par_null &&
+ if (parameter->par_null &&
+ parameter->par_null->par_desc.dsc_address &&
*((SSHORT*) parameter->par_null->par_desc.dsc_address))
{
null_flag = DSC_null;
@@ -450,9 +451,9 @@
m_maxSize = Config::getMaxUserTraceLogSize();
}
- virtual size_t write(const void* buf, size_t size);
+ virtual size_t FB_CARG write(const void* buf, size_t size);
- virtual int release()
+ virtual int FB_CARG release()
{
if (--refCounter == 0)
{
Modified: firebird/trunk/src/jrd/trace/TraceObjects.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/trace/TraceObjects.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -56,16 +56,16 @@
m_att(att)
{}
- virtual int getConnectionID();
- virtual int getProcessID();
- virtual const char* getDatabaseName();
- virtual const char* getUserName();
- virtual const char* getRoleName();
- virtual const char* getCharSet();
- virtual const char* getRemoteProtocol();
- virtual const char* getRemoteAddress();
- virtual int getRemoteProcessID();
- virtual const char* getRemoteProcessName();
+ virtual int FB_CARG getConnectionID();
+ virtual int FB_CARG getProcessID();
+ virtual const char* FB_CARG getDatabaseName();
+ virtual const char* FB_CARG getUserName();
+ virtual const char* FB_CARG getRoleName();
+ virtual const char* FB_CARG getCharSet();
+ virtual const char* FB_CARG getRemoteProtocol();
+ virtual const char* FB_CARG getRemoteAddress();
+ virtual int FB_CARG getRemoteProcessID();
+ virtual const char* FB_CARG getRemoteProcessName();
private:
const Attachment* const m_att;
@@ -80,11 +80,11 @@
m_perf(perf)
{}
- virtual int getTransactionID();
- virtual bool getReadOnly();
- virtual int getWait();
- virtual ntrace_tra_isolation_t getIsolation();
- virtual PerformanceInfo* getPerf() { return m_perf; }
+ virtual int FB_CARG getTransactionID();
+ virtual bool FB_CARG getReadOnly();
+ virtual int FB_CARG getWait();
+ virtual ntrace_tra_isolation_t FB_CARG getIsolation();
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; }
private:
const jrd_tra* const m_tran;
@@ -101,9 +101,9 @@
m_text(*getDefaultMemoryPool())
{}
- virtual const unsigned char* getData() { return m_blr; }
- virtual size_t getDataLength() { return m_length; }
- virtual const char* getText();
+ virtual const unsigned char* FB_CARG getData() { return m_blr; }
+ virtual size_t FB_CARG getDataLength() { return m_length; }
+ virtual const char* FB_CARG getText();
private:
static void print_blr(void* arg, SSHORT offset, const char* line);
@@ -123,8 +123,8 @@
m_perf(perf)
{}
- virtual int getStmtID() { return m_stmt->req_id; }
- virtual PerformanceInfo* getPerf() { return m_perf; }
+ virtual int FB_CARG getStmtID() { return m_stmt->req_id; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; }
private:
const jrd_req* const m_stmt;
@@ -139,8 +139,8 @@
BLRPrinter(blr, length)
{}
- virtual int getStmtID() { return 0; }
- virtual PerformanceInfo* getPerf() { return NULL; }
+ virtual int FB_CARG getStmtID() { return 0; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return NULL; }
};
@@ -157,12 +157,12 @@
~TraceSQLStatementImpl();
- virtual int getStmtID();
- virtual PerformanceInfo* getPerf();
- virtual TraceParams* getInputs();
- virtual const char* getText();
- virtual const char* getPlan();
- virtual const char* getTextUTF8();
+ virtual int FB_CARG getStmtID();
+ virtual PerformanceInfo* FB_CARG getPerf();
+ virtual TraceParams* FB_CARG getInputs();
+ virtual const char* FB_CARG getText();
+ virtual const char* FB_CARG getPlan();
+ virtual const char* FB_CARG getTextUTF8();
private:
class DSQLParamsImpl : public Firebird::StackIface<TraceParams, FB_TRACE_PARAMS_VERSION>
@@ -173,8 +173,8 @@
m_descs(pool)
{}
- virtual size_t getCount();
- virtual const dsc* getParam(size_t idx);
+ virtual size_t FB_CARG getCount();
+ virtual const dsc* FB_CARG getParam(size_t idx);
private:
void fillParams();
@@ -198,12 +198,12 @@
m_text(text)
{}
- virtual int getStmtID() { return 0; }
- virtual PerformanceInfo* getPerf() { return NULL; }
- virtual TraceParams* getInputs() { return NULL; }
- virtual const char* getText() { return m_text.c_str(); }
- virtual const char* getPlan() { return ""; }
- virtual const char* getTextUTF8();
+ virtual int FB_CARG getStmtID() { return 0; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return NULL; }
+ virtual TraceParams* FB_CARG getInputs() { return NULL; }
+ virtual const char* FB_CARG getText() { return m_text.c_str(); }
+ virtual const char* FB_CARG getPlan() { return ""; }
+ virtual const char* FB_CARG getTextUTF8();
private:
Firebird::string& m_text;
@@ -220,9 +220,9 @@
m_value(value)
{}
- virtual const char* getNameSpace() { return m_namespace; }
- virtual const char* getVarName() { return m_name; }
- virtual const char* getVarValue() { return m_value; }
+ virtual const char* FB_CARG getNameSpace() { return m_namespace; }
+ virtual const char* FB_CARG getVarName() { return m_name; }
+ virtual const char* FB_CARG getVarValue() { return m_value; }
private:
const char* const m_namespace;
@@ -239,13 +239,13 @@
m_inputs(*getDefaultMemoryPool(), request->req_proc_caller, request->req_proc_inputs)
{}
- virtual const char* getProcName()
+ virtual const char* FB_CARG getProcName()
{
return m_request->getStatement()->procedure->getName().identifier.c_str();
}
- virtual TraceParams* getInputs() { return &m_inputs; }
- virtual PerformanceInfo* getPerf() { return m_perf; };
+ virtual TraceParams* FB_CARG getInputs() { return &m_inputs; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; };
private:
class JrdParamsImpl : public Firebird::StackIface<TraceParams, FB_TRACE_PARAMS_VERSION>
@@ -257,8 +257,8 @@
m_descs(pool)
{}
- virtual size_t getCount();
- virtual const dsc* getParam(size_t idx);
+ virtual size_t FB_CARG getCount();
+ virtual const dsc* FB_CARG getParam(size_t idx);
private:
void fillParams();
@@ -283,11 +283,11 @@
m_perf(perf)
{}
- virtual const char* getTriggerName();
- virtual const char* getRelationName();
- virtual int getAction() { return m_trig->req_trigger_action; }
- virtual int getWhich() { return m_which; }
- virtual PerformanceInfo* getPerf() { return m_perf; }
+ virtual const char* FB_CARG getTriggerName();
+ virtual const char* FB_CARG getRelationName();
+ virtual int FB_CARG getAction() { return m_trig->req_trigger_action; }
+ virtual int FB_CARG getWhich() { return m_which; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; }
private:
const jrd_req* const m_trig;
@@ -303,16 +303,16 @@
m_svc(svc)
{}
- virtual ntrace_service_t getServiceID();
- virtual const char* getServiceMgr();
- virtual const char* getServiceName();
- virtual const char* getUserName();
- virtual const char* getRoleName();
- virtual int getProcessID();
- virtual const char* getRemoteProtocol();
- virtual const char* getRemoteAddress();
- virtual int getRemoteProcessID();
- virtual const char* getRemoteProcessName();
+ virtual ntrace_service_t FB_CARG getServiceID();
+ virtual const char* FB_CARG getServiceMgr();
+ virtual const char* FB_CARG getServiceName();
+ virtual const char* FB_CARG getUserName();
+ virtual const char* FB_CARG getRoleName();
+ virtual int FB_CARG getProcessID();
+ virtual const char* FB_CARG getRemoteProtocol();
+ virtual const char* FB_CARG getRemoteAddress();
+ virtual int FB_CARG getRemoteProcessID();
+ virtual const char* FB_CARG getRemoteProcessName();
private:
const Service* const m_svc;
@@ -325,7 +325,7 @@
TraceRuntimeStats(Database* dbb, RuntimeStatistics* baseline, RuntimeStatistics* stats,
SINT64 clock, SINT64 records_fetched);
- PerformanceInfo* getPerf() { return &m_info; }
+ PerformanceInfo* FB_CARG getPerf() { return &m_info; }
private:
PerformanceInfo m_info;
@@ -350,14 +350,14 @@
m_logWriter = NULL;
}
- virtual const char* getConfigText() { return m_session.ses_config.c_str(); }
- virtual int getTraceSessionID() { return m_session.ses_id; }
- virtual const char* getTraceSessionName() { return m_session.ses_name.c_str(); }
+ virtual const char* FB_CARG getConfigText() { return m_session.ses_config.c_str(); }
+ virtual int FB_CARG getTraceSessionID() { return m_session.ses_id; }
+ virtual const char* FB_CARG getTraceSessionName() { return m_session.ses_name.c_str(); }
- virtual const char* getFirebirdRootDirectory();
- virtual const char* getDatabaseName() { return m_filename; }
+ virtual const char* FB_CARG getFirebirdRootDirectory();
+ virtual const char* FB_CARG getDatabaseName() { return m_filename; }
- virtual TraceConnection* getConnection()
+ virtual TraceConnection* FB_CARG getConnection()
{
if (m_attachment)
return &m_trace_conn;
@@ -365,7 +365,7 @@
return NULL;
}
- virtual TraceLogWriter* getLogWriter();
+ virtual TraceLogWriter* FB_CARG getLogWriter();
private:
const Firebird::TraceSession& m_session;
Modified: firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
===================================================================
--- firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -119,7 +119,7 @@
}
}
- int release()
+ int FB_CARG release()
{
if (--refCounter == 0)
{
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/remote/client/interface.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -135,15 +135,15 @@
class Blob : public Firebird::StdIface<Firebird::IBlob, FB_I_BLOB_VERSION>
{
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual unsigned int getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
- virtual void putSegment(Status* status, unsigned int length, const unsigned char* buffer);
- virtual void cancel(Status* status);
- virtual void close(Status* status);
- virtual int seek(Status* status, int mode, int offset); // returns position
+ virtual unsigned int FB_CARG getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
+ virtual void FB_CARG putSegment(Status* status, unsigned int length, const unsigned char* buffer);
+ virtual void FB_CARG cancel(Status* status);
+ virtual void FB_CARG close(Status* status);
+ virtual int FB_CARG seek(Status* status, int mode, int offset); // returns position
public:
Blob(Rbl* handle) : blob(handle) { }
@@ -173,38 +173,38 @@
class Transaction : public Firebird::StdIface<Firebird::ITransaction, FB_I_TRANSACTION_VERSION>
{
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual Firebird::IBlob* createBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG createBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual Firebird::IBlob* openBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG openBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual int getSlice(Status* status, ISC_QUAD* id,
+ virtual int FB_CARG getSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void putSlice(Status* status, ISC_QUAD* id,
+ virtual void FB_CARG putSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void transactRequest(Status* status,
+ virtual void FB_CARG transactRequest(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int in_msg_length, const unsigned char* in_msg,
unsigned int out_msg_length, unsigned char* out_msg,
Firebird::IAttachment* att = 0);
- virtual void prepare(Status* status,
+ virtual void FB_CARG prepare(Status* status,
unsigned int msg_length = 0, const unsigned char* message = 0);
- virtual void ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
- virtual void commit(Status* status);
- virtual void commitRetaining(Status* status);
- virtual void rollback(Status* status);
- virtual void rollbackRetaining(Status* status);
+ virtual void FB_CARG ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
+ virtual void FB_CARG commit(Status* status);
+ virtual void FB_CARG commitRetaining(Status* status);
+ virtual void FB_CARG rollback(Status* status);
+ virtual void FB_CARG rollbackRetaining(Status* status);
public:
Transaction(Rtr* handle) : transaction(handle) { }
@@ -243,19 +243,19 @@
class Statement : public Firebird::StdIface<Firebird::IStatement, FB_I_STATEMENT_VERSION>
{
public:
- virtual int release();
+ virtual int FB_CARG release();
//virtual Sqlda* describeInput(Status* status);
//virtual Sqlda* describeOutput(Status* status);
- virtual Statement* prepare(Status* status, Firebird::ITransaction* tra,
+ virtual Statement* FB_CARG prepare(Status* status, Firebird::ITransaction* tra,
unsigned int stmtLength, const char* sqlStmt, unsigned int dialect,
unsigned int item_length, const unsigned char* items,
unsigned int buffer_length, unsigned char* buffer);
- virtual void getInfo(Status* status,
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void setCursor(Status* status, const char* name, unsigned int type);
+ virtual void FB_CARG setCursor(Status* status, const char* name, unsigned int type);
// virtual Firebird::ITransaction* execute(Status* status, Firebird::ITransaction* tra, Sqlda* in, Sqlda* out);
- virtual Firebird::ITransaction* executeMessage(Status* status, Firebird::ITransaction* tra,
+ virtual Firebird::ITransaction* FB_CARG executeMessage(Status* status, Firebird::ITransaction* tra,
unsigned int in_blr_length, const unsigned char* in_blr,
unsigned int in_msg_type,
unsigned int in_msg_length, const unsigned char* in_message,
@@ -263,16 +263,16 @@
unsigned int out_msg_type,
unsigned int out_msg_length, unsigned char* out_message);
// virtual int fetch(Status* status, Sqlda* out); // returns 100 if EOF, 101 if fragmented
- virtual int fetchMessage(Status* status,
+ virtual int FB_CARG fetchMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, unsigned char* message); // returns 100 if EOF, 101 if fragmented
// virtual void insert(Status* status, Sqlda* in);
- virtual void insertMessage(Status* status,
+ virtual void FB_CARG insertMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, const unsigned char* message);
- virtual void free(Status* status, unsigned int option);
+ virtual void FB_CARG free(Status* status, unsigned int option);
public:
Statement(Rsr* handle) : statement(handle) { }
@@ -300,19 +300,19 @@
class Request : public Firebird::StdIface<Firebird::IRequest, FB_I_REQUEST_VERSION>
{
public:
- virtual int release();
- virtual void receive(Status* status, int level, unsigned int msg_type,
+ virtual int FB_CARG release();
+ virtual void FB_CARG receive(Status* status, int level, unsigned int msg_type,
unsigned int length, unsigned char* message);
- virtual void send(Status* status, int level, unsigned int msg_type,
+ virtual void FB_CARG send(Status* status, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void getInfo(Status* status, int level,
+ virtual void FB_CARG getInfo(Status* status, int level,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void start(Status* status, Firebird::ITransaction* tra, int level);
- virtual void startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
+ virtual void FB_CARG start(Status* status, Firebird::ITransaction* tra, int level);
+ virtual void FB_CARG startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void unwind(Status* status, int level);
- virtual void free(Status* status);
+ virtual void FB_CARG unwind(Status* status, int level);
+ virtual void FB_CARG free(Status* status);
public:
Request(Rrq* handle) : rq(handle) { }
@@ -340,8 +340,8 @@
class Events : public Firebird::StdIface<Firebird::IEvents, FB_I_EVENTS_VERSION>
{
public:
- virtual int release();
- virtual void ...
[truncated message content] |
