From 28cc4ff877cc81cdd5e42ac7192b8fe8112a4044 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Thu, 5 Mar 2009 12:18:48 +0000
Subject: [PATCH] =?UTF-8?q?-=20Nuevas=20versiones=20de=20las=20librer?=
 =?UTF-8?q?=C3=ADas=20-=20Adaptar=20el=20c=C3=B3digo=20a=20las=20nuevas=20?=
 =?UTF-8?q?versiones=20-=20Incluye=20VCLFixPack=20(http://andy.jgknet.de/b?=
 =?UTF-8?q?log/=3Fpage=5Fid=3D288)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@921 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Build/Build.fbp5                              |   16 +-
 Installer/librerias.txt                       |    2 +-
 Source/ApplicationBase/ApplicationBase.dpk    |    2 +-
 Source/ApplicationBase/ApplicationBase.dproj  |   11 +-
 .../Empresas/Servidor/srvEmpresas_Impl.dfm    |    1 -
 .../Empresas/Servidor/srvEmpresas_Impl.pas    |    2 +-
 .../Usuarios/Servidor/srvUsuarios_Impl.dfm    |    1 -
 .../Usuarios/Servidor/srvUsuarios_Impl.pas    |    2 +-
 Source/Base/Base.dpk                          |    2 +-
 Source/Base/Base.dproj                        |  102 +-
 Source/Base/Utiles/uGridClipboardUtils.pas    |   12 +-
 Source/Base/Utiles/uReferenciasUtils.pas      |    2 +-
 Source/Cliente/FactuGES.dpr                   |    4 +-
 Source/Cliente/FactuGES.dproj                 |   23 +-
 Source/Cliente/FactuGES.res                   |  Bin 171984 -> 172184 bytes
 Source/Cliente/VCLFixPack.pas                 | 2830 +++++++++++++++++
 Source/GUIBase/uViewGridBase.pas              |    4 +-
 .../Servidor/srvAlbaranesCliente_Impl.dfm     |    1 -
 .../Servidor/srvAlbaranesCliente_Impl.pas     |    2 +-
 .../Servidor/srvAlbaranesProveedor_Impl.dfm   |    2 -
 .../Servidor/srvAlbaranesProveedor_Impl.pas   |    2 +-
 .../Almacenes/Servidor/srvAlmacenes_Impl.dfm  |    2 -
 .../Almacenes/Servidor/srvAlmacenes_Impl.pas  |    2 +-
 .../Articulos/Plugin/Articulos_plugin.dpk     |  Bin 616 -> 616 bytes
 .../Articulos/Plugin/Articulos_plugin.dproj   |    2 +-
 .../Articulos/Servidor/srvArticulos_Impl.dfm  |    2 -
 .../Articulos/Servidor/srvArticulos_Impl.pas  |    2 +-
 .../Articulos/Views/Articulos_view.dpk        |    2 +-
 .../Articulos/Views/Articulos_view.dproj      |    2 +-
 .../Controller/Contactos_controller.dpk       |    2 +-
 .../Controller/Contactos_controller.dproj     |    2 +-
 .../Contactos/Plugin/Contactos_plugin.dpk     |  Bin 711 -> 711 bytes
 .../Contactos/Plugin/Contactos_plugin.dproj   |    2 +-
 .../Contactos/Servidor/srvContactos_Impl.dfm  |    1 -
 .../Contactos/Servidor/srvContactos_Impl.pas  |    2 +-
 .../Contactos/Views/Contactos_view.dpk        |    2 +-
 .../Contactos/Views/Contactos_view.dproj      |    2 +-
 .../Fabricantes/Plugin/Fabricantes_plugin.dpk |  Bin 725 -> 725 bytes
 .../Plugin/Fabricantes_plugin.dproj           |    2 +-
 .../Servidor/srvFabricantes_Impl.dfm          |    2 -
 .../Servidor/srvFacturasCliente_Impl.dfm      |    1 -
 .../Servidor/srvFacturasCliente_Impl.pas      |    2 +-
 .../Servidor/srvFacturasProveedor_Impl.dfm    |    2 -
 .../Servidor/srvFacturasProveedor_Impl.pas    |    2 +-
 .../Familias/Plugin/Familias_plugin.dpk       |  Bin 687 -> 687 bytes
 .../Familias/Plugin/Familias_plugin.dproj     |    2 +-
 .../Familias/Servidor/srvFamilias_Impl.dfm    |    1 -
 .../Familias/Servidor/srvFamilias_Impl.pas    |    2 +-
 .../Plugin/FormasPago_plugin.dpk              |  Bin 716 -> 715 bytes
 .../Plugin/FormasPago_plugin.dproj            |    2 +-
 .../Servidor/srvFormasPago_Impl.dfm           |    1 -
 .../Servidor/srvFormasPago_Impl.pas           |    2 +-
 .../Servidor/NewService_Impl.dfm              |    1 -
 .../Servidor/srvGestorInformes_Impl.dfm       |    1 -
 .../Views/GestorInformes_view.dpk             |    2 +-
 .../Views/GestorInformes_view.dproj           |    2 +-
 .../Servidor/srvHistoricoMovimientos_Impl.dfm |    1 -
 .../Servidor/srvInventario_Impl.dfm           |    1 -
 .../Modulos/Obras/Servidor/srvObras_Impl.dfm  |    2 -
 .../Modulos/Obras/Servidor/srvObras_Impl.pas  |    2 +-
 .../Servidor/srvPedidosProveedor_Impl.dfm     |    1 -
 .../Servidor/srvPedidosProveedor_Impl.pas     |    2 +-
 .../Servidor/srvPresupuestosCliente_Impl.dfm  |    1 -
 .../Servidor/srvPresupuestosCliente_Impl.pas  |    2 +-
 .../Servidor/srvRecibosCliente_Impl.dfm       |    2 -
 .../Servidor/srvRecibosCliente_Impl.pas       |    2 +-
 .../Servidor/srvRecibosProveedor_Impl.dfm     |    1 -
 .../Servidor/srvRecibosProveedor_Impl.pas     |    2 +-
 .../Servidor/srvReferencias_Impl.dfm          |    1 -
 .../Servidor/srvReferencias_Impl.pas          |    2 +-
 .../Servidor/srvRemesasCliente_Impl.dfm       |    2 -
 .../Servidor/srvRemesasCliente_Impl.pas       |    2 +-
 .../Servidor/srvRemesasProveedor_Impl.dfm     |    2 -
 .../Servidor/srvRemesasProveedor_Impl.pas     |    2 +-
 .../Tipos de IVA/Plugin/TiposIVA_plugin.dpk   |  Bin 687 -> 687 bytes
 .../Tipos de IVA/Plugin/TiposIVA_plugin.dproj |    2 +-
 .../Servidor/srvTiposIVA_Impl.dfm             |    2 -
 .../Servidor/srvTiposIVA_Impl.pas             |    2 +-
 .../Plugin/UnidadesMedida_plugin.dpk          |  Bin 723 -> 723 bytes
 .../Plugin/UnidadesMedida_plugin.dproj        |    2 +-
 .../Servidor/srvUnidadesMedida_Impl.dfm       |    2 -
 .../Servidor/srvUnidadesMedida_Impl.pas       |    2 +-
 Source/Servicios/FactuGES.RODL                |   38 +-
 Source/Servicios/FactuGES_Intf.pas            |  124 +-
 Source/Servicios/FactuGES_Invk.pas            |  332 +-
 Source/Servicios/RODLFILE.res                 |  Bin 41332 -> 42558 bytes
 .../Configuracion/srvConfiguracion_Impl.dfm   |    1 -
 .../Configuracion/srvConfiguracion_Impl.pas   |    2 +-
 Source/Servidor/Configuracion/uConexionBD.pas |    6 +-
 Source/Servidor/FactuGES_Server.RES           |  Bin 23200 -> 23480 bytes
 Source/Servidor/FactuGES_Server.dproj         |    4 +-
 Source/Servidor/FactuGES_Server.rc            |    2 +-
 92 files changed, 3333 insertions(+), 295 deletions(-)
 create mode 100644 Source/Cliente/VCLFixPack.pas

diff --git a/Build/Build.fbp5 b/Build/Build.fbp5
index 139edd5e..9e08fb88 100644
--- a/Build/Build.fbp5
+++ b/Build/Build.fbp5
@@ -683,7 +683,7 @@ source_path
               <Property name="MajorVersion" type="Integer">1</Property>
               <Property MultiValue="0" name="ManifestFile" type="string"></Property>
               <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-              <Property name="MinorVersion" type="Integer">4</Property>
+              <Property name="MinorVersion" type="Integer">6</Property>
               <Property name="NodeCollapsed" type="Boolean">False</Property>
               <Property name="PauseInterval" type="Cardinal">0</Property>
               <Property MultiValue="0" name="ProjectFile" type="WideString">%source_path%\Servidor\FactuGES_Server.dpr</Property>
@@ -703,15 +703,15 @@ source_path
               <Property name="UseVersionFromDOF" type="Boolean">True</Property>
               <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=
 FileDescription=
-FileVersion=1.4.7.0
+FileVersion=1.6.7.0
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
-ProductVersion=1.4.7.0
+ProductVersion=1.6.8.0
 Comments=
-CompileDate=jueves, 27 de noviembre de 2008 16:53
+CompileDate=viernes, 27 de febrero de 2009 11:47
 ]]>
                 </Property>
               <Property MultiValue="0" name="VersionInfoPropertySetName" type="string"></Property>
@@ -19259,7 +19259,7 @@ Comments=
               <Property name="MajorVersion" type="Integer">1</Property>
               <Property MultiValue="0" name="ManifestFile" type="string"></Property>
               <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-              <Property name="MinorVersion" type="Integer">4</Property>
+              <Property name="MinorVersion" type="Integer">6</Property>
               <Property name="NodeCollapsed" type="Boolean">False</Property>
               <Property name="PauseInterval" type="Cardinal">0</Property>
               <Property MultiValue="0" name="ProjectFile" type="WideString">%source_path%\Cliente\FactuGES.dpr</Property>
@@ -19279,13 +19279,13 @@ Comments=
               <Property name="UseVersionFromDOF" type="Boolean">False</Property>
               <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=Rodax Software S.L.
 FileDescription=
-FileVersion=1.4.8.0
+FileVersion=1.6.8.0
 InternalName=FactuGES
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=FactuGES
-ProductVersion=1.4.8.0
+ProductVersion=1.6.8.0
 Comments=
 ]]>
                 </Property>
@@ -19329,7 +19329,7 @@ Comments=
                 <Property name="Optimisation" type="WordBool">False</Property>
                 <Property MultiValue="0" name="OutputDir" type="WideString">%output_path%\Cliente</Property>
                 <Property name="OverflowChecking" type="WordBool">False</Property>
-                <Property MultiValue="0" name="Packages" type="WideString">PluginSDK_D10R;GUISDK_D11;Base;GUIBase;ApplicationBase;</Property>
+                <Property MultiValue="0" name="Packages" type="WideString">PluginSDK_D11R;GUISDK_D11R;Base;GUIBase;ApplicationBase;</Property>
                 <Property name="RangeChecking" type="WordBool">False</Property>
                 <Property name="RecordFieldAlign" type="TFieldAlign">fa8</Property>
                 <Property name="ReferenceInfo" type="WordBool">True</Property>
diff --git a/Installer/librerias.txt b/Installer/librerias.txt
index 31ced891..e61b4da0 100644
--- a/Installer/librerias.txt
+++ b/Installer/librerias.txt
@@ -28,7 +28,7 @@ frxe11.bpl
 frxTee11.bpl
 fs11.bpl
 fsTee11.bpl
-GUISDK_D11.bpl
+GUISDK_D11R.bpl
 Jcl110.bpl
 JclVcl110.bpl
 JSDialog100.bpl
diff --git a/Source/ApplicationBase/ApplicationBase.dpk b/Source/ApplicationBase/ApplicationBase.dpk
index 2400cb64..c17b8d7e 100644
--- a/Source/ApplicationBase/ApplicationBase.dpk
+++ b/Source/ApplicationBase/ApplicationBase.dpk
@@ -27,7 +27,7 @@ package ApplicationBase;
 
 requires
   JvJansD11R,
-  PluginSDK_D10R,
+  PluginSDK_D11R,
   Base,
   GUIBase;
 
diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index 82f5ea20..7f62faa8 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -55,6 +55,11 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\JvJansD11R.dcp" />
+    <DCCReference Include="..\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\PluginSDK_D110R.dcp" />
     <DCCReference Include="Empresas\Controller\uDatosBancariosEmpresaController.pas" />
     <DCCReference Include="Empresas\Controller\uEmpresasController.pas" />
     <DCCReference Include="Empresas\Controller\View\uIEditorDatosBancarioEmpresa.pas" />
@@ -63,11 +68,7 @@
     <DCCReference Include="Empresas\Data\uDataModuleEmpresas.pas">
       <Form>DataModuleEmpresasObj</Form>
     </DCCReference>
-    <DCCReference Include="Empresas\Model\Base.dcp" />
     <DCCReference Include="Empresas\Model\Data\uIDataModuleEmpresas.pas" />
-    <DCCReference Include="Empresas\Model\GUIBase.dcp" />
-    <DCCReference Include="Empresas\Model\JvJansD11R.dcp" />
-    <DCCReference Include="Empresas\Model\PluginSDK_D10R.dcp" />
     <DCCReference Include="Empresas\Model\schEmpresasClient_Intf.pas" />
     <DCCReference Include="Empresas\Model\schEmpresasServer_Intf.pas" />
     <DCCReference Include="Empresas\Model\uBizEmpresas.pas" />
@@ -77,7 +78,7 @@
       <DesignClass>TForm</DesignClass>
     </DCCReference>
     <DCCReference Include="Empresas\Views\uEditorEmpresa.pas">
-      <Form>fEditorEmpresa</Form>
+      <Form>fEditorEmpresas</Form>
       <DesignClass>TForm</DesignClass>
     </DCCReference>
     <DCCReference Include="Empresas\Views\uEmpresasViewRegister.pas" />
diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
index 48a0c97e..0c8dc3f7 100644
--- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
+++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
@@ -1,7 +1,6 @@
 object srvEmpresas: TsrvEmpresas
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
   ConnectionName = 'IBX'
   ServiceSchema = schEmpresas
   ServiceDataStreamer = DABin2DataStreamer
diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas
index 9308087d..fc8b3813 100644
--- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas
+++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas
@@ -119,7 +119,7 @@ end;
 
 procedure TsrvEmpresas.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpEmpresas.BusinessRulesID := BIZ_SERVER_EMPRESAS;  
 end;
 
diff --git a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm
index 77511a83..a6279fc0 100644
--- a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm
+++ b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm
@@ -1,7 +1,6 @@
 object srvUsuarios: TsrvUsuarios
   OldCreateOrder = True
   OnCreate = DataAbstractServiceCreate
-  SessionManager = dmServer.SessionManager
   ServiceSchema = schUsuarios
   ServiceDataStreamer = Bin2DataStreamer
   AllowExecuteSQL = True
diff --git a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas
index 4007ec6c..8a1c84fa 100644
--- a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas
+++ b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas
@@ -54,7 +54,7 @@ end;
 
 procedure TsrvUsuarios.DataAbstractServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 initialization
diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk
index 39d71f7b..61b65b18 100644
--- a/Source/Base/Base.dpk
+++ b/Source/Base/Base.dpk
@@ -30,7 +30,7 @@ requires
   rtl,
   vcl,
   TB2k_D10,
-  GUISDK_D11,
+  GUISDK_D11RR,
   RemObjects_Core_D11,
   DataAbstract_Core_D11,
   vcljpg,
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 9dca296b..3c77ab2c 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -54,57 +54,57 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\designide.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\xmlrtl.dcp" />
+    <DCCReference Include="..\Cliente\adortl.dcp" />
+    <DCCReference Include="..\Cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\Cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Cliente\cxExportD11.dcp" />
+    <DCCReference Include="..\Cliente\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Cliente\cxGridD11.dcp" />
+    <DCCReference Include="..\Cliente\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Cliente\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Cliente\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Cliente\dclIndyCore.dcp" />
+    <DCCReference Include="..\Cliente\designide.dcp" />
+    <DCCReference Include="..\Cliente\dsnap.dcp" />
+    <DCCReference Include="..\Cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Cliente\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\Cliente\GUISDK_D11RR.dcp" />
+    <DCCReference Include="..\Cliente\IndyCore.dcp" />
+    <DCCReference Include="..\Cliente\IndyProtocols.dcp" />
+    <DCCReference Include="..\Cliente\IndySystem.dcp" />
+    <DCCReference Include="..\Cliente\Jcl.dcp" />
+    <DCCReference Include="..\Cliente\JclVcl.dcp" />
+    <DCCReference Include="..\Cliente\JSDialog100.dcp" />
+    <DCCReference Include="..\Cliente\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvMMD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvNetD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Cliente\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Cliente\pckMD5.dcp" />
+    <DCCReference Include="..\Cliente\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\Cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Cliente\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="..\Cliente\rtl.dcp" />
+    <DCCReference Include="..\Cliente\TB2k_D10.dcp" />
+    <DCCReference Include="..\Cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\Cliente\vcl.dcp" />
+    <DCCReference Include="..\Cliente\vclactnband.dcp" />
+    <DCCReference Include="..\Cliente\vcldb.dcp" />
+    <DCCReference Include="..\Cliente\vcljpg.dcp" />
+    <DCCReference Include="..\Cliente\VclSmp.dcp" />
+    <DCCReference Include="..\Cliente\vclx.dcp" />
+    <DCCReference Include="..\Cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
diff --git a/Source/Base/Utiles/uGridClipboardUtils.pas b/Source/Base/Utiles/uGridClipboardUtils.pas
index 35760c1e..e854dde8 100644
--- a/Source/Base/Utiles/uGridClipboardUtils.pas
+++ b/Source/Base/Utiles/uGridClipboardUtils.pas
@@ -273,12 +273,12 @@ begin
 
   try
     AIndex := -1;
-    ACaption := AReader.ReadString;
+    ACaption := AReader.ReadAnsiString;
     NumCols := AReader.ReadInteger; // nº de columnas
     for iContador := 0 to NumCols - 1 do
     begin
-      AValueName := AReader.ReadString;
-      AValueType := AReader.ReadString;
+      AValueName := AReader.ReadAnsiString;
+      AValueType := AReader.ReadAnsiString;
 
       AValueNameList.Add(AValueName);
       AValueTypeList.Add(AValueType);
@@ -380,7 +380,7 @@ begin
 
   AWriter := TcxWriter.Create(AStream);
   try
-    AWriter.WriteString(ACaption);
+    AWriter.WriteAnsiString(ACaption);
 
     AWriter.WriteInteger(AView.ItemCount);
     for i := 0 to AView.ItemCount - 1 do
@@ -396,8 +396,8 @@ begin
 
       AValueType := AView.Items[i].DataBinding.ValueType;
 
-      AWriter.WriteString(AName);
-      AWriter.WriteString(AValueType);
+      AWriter.WriteAnsiString(AName);
+      AWriter.WriteAnsiString(AValueType);
     end;
 
     with AView.DataController do
diff --git a/Source/Base/Utiles/uReferenciasUtils.pas b/Source/Base/Utiles/uReferenciasUtils.pas
index 05b2d92d..300efec6 100644
--- a/Source/Base/Utiles/uReferenciasUtils.pas
+++ b/Source/Base/Utiles/uReferenciasUtils.pas
@@ -12,7 +12,7 @@ function CompararReferencias(const ARef1, ARef2 : String) : Integer;
 implementation
 
 uses
-  JclStrings, cxVariants;
+  JclAnsiStrings, cxVariants;
 
 function CompararReferencias(const ARef1, ARef2 : String) : Integer;
 var
diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index f5693134..b105df38 100644
--- a/Source/Cliente/FactuGES.dpr
+++ b/Source/Cliente/FactuGES.dpr
@@ -14,14 +14,14 @@ uses
   uNavPaneUtils in 'Utiles\uNavPaneUtils.pas',
   uMainMenuController in 'uMainMenuController.pas',
   uClienteUtils in 'Utiles\uClienteUtils.pas',
-  uBootStrap in 'uBootStrap.pas';
+  uBootStrap in 'uBootStrap.pas',
+  VCLFixPack in 'VCLFixPack.pas';
 
 {$R *.res}
 
 begin
   Application.Initialize;
 
-
   //ReportMemoryLeaksOnShutdown := True;
 
   // ¡¡¡Fallo en Delphi 2007!!!
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 876919ec..45f8bf9d 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -5,7 +5,7 @@
     <MainSource>FactuGES.dpr</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_UsePackage>PluginSDK_D10R;GUISDK_D11;Base;GUIBase;ApplicationBase;vclx;vcl;rtl;vclactnband;xmlrtl;JSDialog100</DCC_UsePackage>
+    <DCC_UsePackage>PluginSDK_D11R;GUISDK_D11R;Base;GUIBase;ApplicationBase;vclx;vcl;rtl;vclactnband;xmlrtl;JSDialog100</DCC_UsePackage>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
     <DCC_DependencyCheckOutputName>..\..\Output\Debug\Cliente\FactuGES.exe</DCC_DependencyCheckOutputName>
     <DCC_EnabledPackages>true</DCC_EnabledPackages>
@@ -41,11 +41,10 @@
     <DCC_HppOutput>.\</DCC_HppOutput>
     <DCC_BplOutput>.\</DCC_BplOutput>
     <DCC_DcpOutput>.\</DCC_DcpOutput>
-    <DCC_UnitSearchPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_UnitSearchPath>
-    <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
-    <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
-    <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG;</DCC_Define>
+    <DCC_UnitSearchPath>C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_UnitSearchPath>
+    <DCC_ResourcePath>C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
+    <DCC_ObjPath>C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
+    <DCC_IncludePath>C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
     <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
     <DCC_DebugVN>True</DCC_DebugVN>
     <DCC_SymbolReferenceInfo>2</DCC_SymbolReferenceInfo>
@@ -54,16 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">8</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.6.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.6.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
-      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PluginSDK_D10R.bpl">PluginSDK for Delphi 10 (Runtime)</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-    </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">9</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.6.9.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.6.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
@@ -83,6 +73,7 @@
     <DCCReference Include="Utiles\uClienteUtils.pas" />
     <DCCReference Include="Utiles\uMenuUtils.pas" />
     <DCCReference Include="Utiles\uNavPaneUtils.pas" />
+    <DCCReference Include="VCLFixPack.pas" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index d978c2e30fdbe1da90da16082b693ceb1ccac9c5..5d69e2ebaf6a900f550b4a0655d31bc7f450fb65 100644
GIT binary patch
delta 521
zcmY+AzfQtX6vltOg3?M%Cqta7MuVCd1{Y$YM2#|-xUfT`28e<LU7TQWz}=)Sl$8f?
zU@^wc(PwaT^#$<U-XifNx3^!uKj&*d-<;=nr~6>Ns6@Zxx=xzEu}I^(V3DGh)VDz%
zwFD?K8N+?d!c2@jdNw5RJi`rBkc^SXP|{|}<zj9D=3*q=8f95jC}`3ndjK}YqCve9
zI8-VI4WD41ZZ}q@bWs>7#0TTCE60*I$T9t(kqW;0YA0(;1<l&*M;cvMC;gvA73_s-
z#rg^SP?a|}MPPAEoog;Rl5@*BZNV+><atBW_=DF_ZCUx?J5;-!^~iN9>MFiC4@KAF
zKJrzmiPMZppXy4Y@VO9QL+&<LvTZU(dlqNZWv@=2G}EXdzG#Bgf%2F0Y|DRurKpUq
Q(1;{WSs%p)j{|k`3%*ZBoB#j-

delta 323
zcmYL^y=nqM6otRJ*)`)TvQ1#iB@oy`WQr7m5G9S438Z(^<t?&B3Liii8`qRRfW6qI
z^chm8@D0rD54#sGhwq+yhclZ~a6SgvmpX{I{WM|Frzu6BFa$-!hhJzz9tcrXc|RSv
zX=v32k2tQpy#~J}_gV*IYHt9yEj_SAGn-Xr@(f)Ti;7ln5Rj(z;Tn2mS-q)?pm0$T
zJH1{**A846+7Dfn{oTrAqFsc-)lAEsBCc0XYAoeN*{59Y)zH4@vb2A>Bx-E$b~3T&
OouvMl5yrlL%lsczRVuCk

diff --git a/Source/Cliente/VCLFixPack.pas b/Source/Cliente/VCLFixPack.pas
new file mode 100644
index 00000000..5854f246
--- /dev/null
+++ b/Source/Cliente/VCLFixPack.pas
@@ -0,0 +1,2830 @@
+{**************************************************************************************************}
+{                                                                                                  }
+{ VCLFixPack unit - Unoffical bug fixes for Delphi/C++Builder                                      }
+{ Version 1.2 (2009-03-03)                                                                         }
+{                                                                                                  }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (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.mozilla.org/MPL/                                                           }
+{                                                                                                  }
+{ Software distributed under the License is distributed on an "AS IS" basis, 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 is VCLFixPack.pas.                                                             }
+{                                                                                                  }
+{ The Initial Developer of the Original Code is Andreas Hausladen (Andreas.Hausladen@gmx.de).      }
+{ Portions created by Andreas Hausladen are Copyright (C) 2008 Andreas Hausladen.                  }
+{ All Rights Reserved.                                                                             }
+{                                                                                                  }
+{**************************************************************************************************}
+                                   
+{$IFNDEF CONDITIONALEXPRESSIONS}
+  Delphi5_is_not_supported
+{$ENDIF}
+
+{$A8,B-,C+,D-,E-,F-,G+,H+,I+,J-,K-,L+,M-,N-,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1}
+
+{ If you define VCLFIXPACK_DEBUG the patches are compiled with debug information. }
+{$IFDEF VCLFIXPACK_DEBUG} {$D+} {$ENDIF}
+
+{ If you use Delphi 6/7/2005 Personal you must disable the VCLFIXPACK_DB_SUPPORT define. }
+{$DEFINE VCLFIXPACK_DB_SUPPORT}
+
+unit VCLFixPack;
+
+{
+ Usage
+ =====
+   Add the unit to the .dpr file's uses-list.
+   C++Builder user can add the file to the project (Menu Project/Add to project)
+
+ Example
+ =======
+   uses
+     FastMM4, // optional memory manager
+     VCLFixPack,
+     Forms,
+     Unit1 in 'Unit1.pas';
+
+
+ Fixes the following bug
+ =======================
+   - [2006-2009]
+     QC #68647: Infinite loop in Forms.GetNonToolWindowPopupParent
+     (http://qc.codegear.com/wc/qcmain.aspx?d=68647)
+
+   - [2007-2009]
+     QC #68740: Lost focus after TOpenDialog when MainFormOnTaskBar is set
+     (http://qc.codegear.com/wc/qcmain.aspx?d=68740)
+
+   - [2005-2009]
+     QC #59963: Closing non-modal forms after a task switch can deactivate the application
+     (http://qc.codegear.com/wc/qcmain.aspx?d=59963)
+
+   - [2009]
+     QC #66892: Closing forms deactivates the application (missing "stdcall")
+     (http://qc.codegear.com/wc/qcmain.aspx?d=66892)
+
+   - [6-2007]
+     Control resize bugfix for kernel stack overflow due to WH_CALLWNDPROC hook
+
+   - [6-2007]
+     QC #59654: TActionList access already released FActions field
+     (http://qc.codegear.com/wc/qcmain.aspx?d=59654)
+
+   - [6-2007]
+     QC #54286 : Parent-PopupMenu overrides standard context menu (edit, memo, combobox, ...)
+     (http://qc.codegear.com/wc/qcmain.aspx?d=54286)
+
+   - [2006-2007]
+     QC #50097: ObjAuto access violation on XEON (Data Execution Prevention bug)
+     (http://qc.codegear.com/wc/qcmain.aspx?d=50097)
+
+   - [6-2009]
+     Classes.MakeObjectInstance memory leak fix
+     (for usage in a DLL)
+
+   - [2007]
+     QC #58938: MainForm Minimize minimizes in the background
+     (http://qc.codegear.com/wc/qcmain.aspx?d=58938)
+
+   - [6-2009]
+     QC #64484: SysUtils.Abort can raise an AccessViolation
+     (http://qc.codegear.com/wc/qcmain.aspx?d=64484)
+
+   - [2007]
+     QC #58939: No taskbar button when starting from ShellLink with Show=Minimized
+     (http://qc.codegear.com/wc/qcmain.aspx?d=58939)
+
+   - [6-2009]
+     QC #35001: MDIChild's active control focus is not set correctly
+     (http://qc.codegear.com/wc/qcmain.aspx?d=35001)
+
+   - [7-2009]
+     QC #56252: TPageControl flickers a lot with active theming
+     (http://qc.codegear.com/wc/qcmain.aspx?d=56252)
+     QC #68730: TLabel is not painted on a themed, double-buffered TTabSheet in Vista
+     (http://qc.codegear.com/wc/qcmain.aspx?d=68730)
+     TLabels on TTabSheet are not painted (themes) if a TWinControl like TMemo is on the TTabSheet (TWinControl.PaintWindow bug)
+
+   - [7-2009]
+     Grid flickers with active theming (DBGrid, StringGrid and DrawGrid only, no derived classes)
+
+   - [2009]
+     QC #69112: TSpeedButton is painted as a black rectangle on a double buffered panel on a sheet of glass.
+
+   - [2009]
+     QC #69294: TProgressBar fails with PBS_MARQUEE and disabled Themes (Vista)
+     http://qc.codegear.com/wc/qcmain.aspx?d=69294
+
+   - [Windows Vista]
+     Workaround for Windows Vista CompareString bug
+     (Workaround is disabled by default, define "VistaCompareStringFix" to activate it)
+
+   - [2007-2009]
+     QC #52439: DbNavigator paints incorrectly when flat=true in themed mode
+
+   - [2009]
+     QC #70441: ToUpper and ToLower modify a Const argument
+
+   - [2009]
+     QC #69752: ToUpper and ToLower with NullString
+
+   - [2009]
+     QC #69875: StringBuilder.Replace is incorrect
+     QC #67564: Error in TStringBuilder.Replace
+
+
+ Changlog:
+   2009-03-03:
+     Fixed: Rewritten patch for QC #59963 (AppDeActivateZOrderFix) to fix the cause instead of the symptom
+     Added: QC #52439: DbNavigator paints incorrectly when flat=true in themed mode
+     Added: QC #70441: ToUpper and ToLower modify a Const argument
+     Added: QC #69752: ToUpper and ToLower with NullString
+     Added: QC #69875, #67564: StringBuilder.Replace is incorrect
+            + a much faster implementation
+
+   2009-01-25:
+     Fixed: DBGrid ScrollBar gab wasn't painted correctly in BiDiMode <> bdLeftToRight
+     Fixed: TTabSheet could throw an access violation if no PageControl was assigned to it
+     Changed: Rewritten TaskModalDialog bugfix
+     Added: QC #69294: TProgressBar fails with PBS_MARQUEE and disabled Themes (Vista)
+
+}
+
+interface
+
+{ ---------------------------------------------------------------------------- }
+
+{$DEFINE DBTextColorBugFix} // Delphi 6+
+
+{$IF CompilerVersion >= 18.0} // Delphi 2006+
+  {$DEFINE GetNonToolWindowPopupParentFix}
+{$IFEND}
+
+{$IF CompilerVersion >= 18.5} // Delphi 2007+
+  {$DEFINE TaskModalDialogFix}
+{$IFEND}
+
+{$IF CompilerVersion >= 16.0} // Delphi 2005
+  {$DEFINE AppDeActivateZOrderFix}
+{$IFEND}
+
+{$IF CompilerVersion = 20.0} // Delphi 2009
+  {$DEFINE HideStackTrashingFix}
+{$IFEND}
+
+{$IF CompilerVersion < 20.0} // Delphi 6-2007
+  {$DEFINE ControlResizeFix}
+  { The OPTIMIZED_RESIZE_REDRAW option is experimental. It speeds up the resizing of forms
+    by not redrawing each control when it is realigned but by invalidating them all after
+    one align round is done. }
+  {.$DEFINE OPTIMIZED_RESIZE_REDRAW}
+{$IFEND}
+
+{$IF CompilerVersion < 20.0} // Delphi 6-2007
+  {$DEFINE ActionListAVFix}
+{$IFEND}
+
+{$IF CompilerVersion < 20.0} // Delphi 6-2007
+  {$DEFINE ContextMenuFix}
+{$IFEND}
+
+{$IF (CompilerVersion >= 18.0) and (CompilerVersion < 20.0)} // Delphi 2006-2007
+  {$DEFINE ObjAutoDEPFix}
+{$IFEND}
+
+{$DEFINE MkObjInstLeakFix} // Delphi 6+
+
+{$DEFINE SysUtilsAbortFix} // Delphi 6+
+
+{$IF CompilerVersion = 18.5} // Delphi 2007
+  {$DEFINE AppMinimizeFix}
+{$IFEND}
+
+{$IF CompilerVersion = 18.5} // Delphi 2007
+  {$DEFINE CmdShowMinimizeFix}
+{$IFEND}
+
+{$DEFINE MDIChildFocusFix} // Delphi 6+
+
+{$IF CompilerVersion >= 15} // Delphi 7+
+  {$DEFINE PageControlPaintingFix}
+{$IFEND}
+
+{$IF CompilerVersion >= 15} // Delphi 7+
+  {$DEFINE GridFlickerFix}
+{$IFEND}
+
+{$IF CompilerVersion = 20.0} // Delphi 2009
+  {$DEFINE SpeedButtonGlassFix}
+{$IFEND}
+
+{$IF CompilerVersion = 20.0} // Delphi 2009
+  {$DEFINE VistaProgressBarMarqueeFix}
+{$IFEND}
+
+{$IF CompilerVersion = 20.0} // Delphi 2009
+  {$DEFINE CharacterFix}
+{$IFEND}
+
+{$IF CompilerVersion = 20.0} // Delphi 2009
+  {$DEFINE StringBuilderFix}
+{$IFEND}
+
+{$IF (CompilerVersion >= 18.5) and (CompilerVersion <= 20.0)} // Delphi 2007-2009
+  {$IFDEF VCLFIXPACK_DB_SUPPORT}
+    {$DEFINE DBNavigatorFix}
+  {$ENDIF VCLFIXPACK_DB_SUPPORT}
+{$IFEND}
+
+{**************************************************************************************************}
+{ Workaround for Windows Vista CompareString bug.                                                  }
+{ The Ü/ü ($DC/$FC) and the UE/ue are treated equal in all locales, but they aren't equal. There   }
+{ was a bugfix intended for Vista SP1 but it was removed before SP1 was released.                  }
+{ Windows 2008 Server still includes this bugfix but Vista will never get this bugfix.             }
+{ Microsoft: new versions are for correctness; service packs are for consistency and compatibility }
+{**************************************************************************************************}
+{ WARNING: This bugfix can slow down CompareString }
+{.$DEFINE VistaCompareStringFix}
+
+
+implementation
+
+{$IF CompilerVersion >= 18.0}
+ {$DEFINE DELPHI2006_UP}
+{$IFEND}
+{$IF CompilerVersion >= 17.0}
+ {$DEFINE DELPHI2005_UP}
+{$IFEND}
+
+uses
+  Windows, Messages, SysUtils, Classes, TypInfo, ActnList, SysConst,
+  {$IFDEF ObjAutoDEPFix}
+  ObjAuto,
+  {$ENDIF ObjAutoDEPFix}
+  {$IF CompilerVersion >= 15.0}
+  Themes,
+  {$IFEND}
+  {$IF CompilerVersion >= 20.0}
+  Character,
+  {$IFEND}
+  {$IFDEF VCLFIXPACK_DB_SUPPORT}
+  DBGrids, DBCtrls,
+  {$ENDIF VCLFIXPACK_DB_SUPPORT}
+  Graphics, Controls, Forms, Dialogs, StdCtrls, Grids, ComCtrls, Buttons,
+  CommCtrl;
+
+{ ---------------------------------------------------------------------------- }
+{ Helper functions, shared }
+type
+  TOpenWinControl = class(TWinControl);
+  TOpenCustomForm = class(TCustomForm);
+  TOpenCommonDialog = class(TCommonDialog);
+  TOpenCustomActionList = class(TCustomActionList);
+  TOpenComponent = class(TComponent);
+  TOpenCustomCombo = class(TCustomCombo);
+
+  TJumpOfs = Integer;
+  PPointer = ^Pointer;
+
+type
+  PXRedirCode = ^TXRedirCode;
+  TXRedirCode = packed record
+    Jump: Byte;
+    Offset: TJumpOfs;
+  end;
+
+  PWin9xDebugThunk = ^TWin9xDebugThunk;
+  TWin9xDebugThunk = packed record
+    PUSH: Byte;
+    Addr: Pointer;
+    JMP: TXRedirCode;
+  end;
+
+  PAbsoluteIndirectJmp = ^TAbsoluteIndirectJmp;
+  TAbsoluteIndirectJmp = packed record
+    OpCode: Word;   //$FF25(Jmp, FF /4)
+    Addr: PPointer;
+  end;
+
+var
+  TaskActiveWindow: HWND;
+  TaskFirstWindow: HWND;
+  TaskFirstTopMost: HWND;
+
+function DoFindWindow(Window: HWND; Param: LPARAM): Bool; stdcall;
+begin
+  if (Window <> TaskActiveWindow) and (Window <> Application.Handle) and
+     IsWindowVisible(Window) and IsWindowEnabled(Window) then
+  begin
+    if GetWindowLong(Window, GWL_EXSTYLE) and WS_EX_TOPMOST = 0 then
+    begin
+      if TaskFirstWindow = 0 then
+        TaskFirstWindow := Window;
+    end else
+    begin
+      if TaskFirstTopMost = 0 then
+        TaskFirstTopMost := Window;
+    end;
+  end;
+  Result := True;
+end;
+
+function FindTopMostWindow(ActiveWindow: HWND): HWND;
+begin
+  TaskActiveWindow := ActiveWindow;
+  TaskFirstWindow := 0;
+  TaskFirstTopMost := 0;
+  EnumThreadWindows(GetCurrentThreadID, @DoFindWindow, 0);
+  if TaskFirstWindow <> 0 then
+    Result := TaskFirstWindow
+  else
+    Result := TaskFirstTopMost;
+end;
+
+{ Hooking }
+
+function GetActualAddr(Proc: Pointer): Pointer;
+
+  function IsWin9xDebugThunk(AAddr: Pointer): Boolean;
+  begin
+    Result := (AAddr <> nil) and
+              (PWin9xDebugThunk(AAddr).PUSH = $68) and
+              (PWin9xDebugThunk(AAddr).JMP.Jump = $E9);
+  end;
+
+begin
+  if Proc <> nil then
+  begin
+    if (Win32Platform <> VER_PLATFORM_WIN32_NT) and IsWin9xDebugThunk(Proc) then
+      Proc := PWin9xDebugThunk(Proc).Addr;
+    if (PAbsoluteIndirectJmp(Proc).OpCode = $25FF) then
+      Result := PAbsoluteIndirectJmp(Proc).Addr^
+    else
+      Result := Proc;
+  end
+  else
+    Result := nil;
+end;
+
+procedure HookProc(Proc, Dest: Pointer; var BackupCode: TXRedirCode);
+var
+  n: DWORD;
+  Code: TXRedirCode;
+begin
+  Proc := GetActualAddr(Proc);
+  Assert(Proc <> nil);
+  if ReadProcessMemory(GetCurrentProcess, Proc, @BackupCode, SizeOf(BackupCode), n) then
+  begin
+    Code.Jump := $E9;
+    Code.Offset := PAnsiChar(Dest) - PAnsiChar(Proc) - SizeOf(Code);
+    WriteProcessMemory(GetCurrentProcess, Proc, @Code, SizeOf(Code), n);
+  end;
+end;
+
+procedure UnhookProc(Proc: Pointer; var BackupCode: TXRedirCode);
+var
+  n: Cardinal;
+begin
+  if (BackupCode.Jump <> 0) and (Proc <> nil) then
+  begin
+    Proc := GetActualAddr(Proc);
+    Assert(Proc <> nil);
+    WriteProcessMemory(GetCurrentProcess, Proc, @BackupCode, SizeOf(BackupCode), n);
+    BackupCode.Jump := 0;
+  end;
+end;
+
+procedure ReplaceVmtField(AClass: TClass; OldProc, NewProc: Pointer);
+type
+  PVmt = ^TVmt;
+  TVmt = array[0..MaxInt div SizeOf(Pointer) - 1] of Pointer;
+var
+  I: Integer;
+  Vmt: PVmt;
+  n: Cardinal;
+  P: Pointer;
+begin
+  OldProc := GetActualAddr(OldProc);
+  NewProc := GetActualAddr(NewProc);
+
+  I := vmtSelfPtr div SizeOf(Pointer);
+  Vmt := Pointer(AClass);
+  while (I < 0) or (Vmt[I] <> nil) do
+  begin
+    P := Vmt[I];
+    if (P <> OldProc) and (Integer(P) > $10000) and not IsBadReadPtr(P, 6) then
+      P := GetActualAddr(P);
+    if P = OldProc then
+    begin
+      WriteProcessMemory(GetCurrentProcess, @Vmt[I], @NewProc, SizeOf(NewProc), n);
+      Exit;
+    end;
+    Inc(I);
+  end;
+end;
+
+function GetDynamicMethod(AClass: TClass; Index: Integer): Pointer;
+asm
+  call System.@FindDynaClass
+end;
+
+procedure DebugLog(const S: string);
+begin
+  OutputDebugString(PChar('VCLFixPack patch installed: ' + S));
+end;
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #68647: Infinite loop in Forms.GetNonToolWindowPopupParent }
+{$IFDEF GetNonToolWindowPopupParentFix}
+{
+Forms.pas.4712: Result := GetParent(WndParent);  <= must be "Result := GetParent(Result);"
+56               push esi                        <= must be "push ebx"
+E8181EFAFF       call GetParent
+8BD8             mov ebx,eax
+Forms.pas.4711: while (Result <> 0) and (GetWindowLong(Result, GWL_EXSTYLE) and WS_EX_TOOLWINDOW = WS_EX_TOOLWINDOW) do
+85DB             test ebx,ebx
+}
+procedure FixGetNonToolWindowPopupParent;
+var
+  P: PAnsiChar;
+  Len: Integer;
+  Buf: Byte;
+  n: Cardinal;
+begin
+  P := GetActualAddr(@TOpenCustomForm.CreateParams);
+  Dec(P);
+  Len := 0;
+  while Len < 112 do
+  begin
+    if //(P[0] = #$56) and // push esi
+       (P[1] = #$E8) and // call GetParent
+       (P[6] = #$8B) and (P[7] = #$D8) and // mov ebx,eax
+       (P[8] = #$85) and (P[9] = #$DB) then // test ebx,ebx
+    begin
+      if P[0] = #$56 then // push esi
+      begin
+        Buf := $53; // push esi (WndParent) => push ebx (Result)
+        WriteProcessMemory(GetCurrentProcess, P, @Buf, 1, n);
+        DebugLog('GetNonToolWindowPopupParentFix');
+        Exit;
+      end else
+      if P[0] = #$53 then // push ebx => already fixed, abort search
+        Exit;
+    end;
+    Dec(P);
+    Inc(Len);
+  end;
+end;
+{$ENDIF GetNonToolWindowPopupParentFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #68740: Lost focus after TOpenDialog when MainFormOnTaskBar is set }
+{$IFDEF TaskModalDialogFix}
+var
+  DialogsTaskModalDialogHook: TXRedirCode;
+  DialogsTaskModalDialogCritSect: TRTLCriticalSection;
+
+function TCommonDialog_TaskModalDialog(Instance: TObject; DialogFunc: Pointer; var DialogData): Bool;
+var
+  FocusWindow: HWND;
+  Func: function(Instance: TObject; DialogFunc: Pointer; var DialogData): Bool;
+begin
+  EnterCriticalSection(DialogsTaskModalDialogCritSect);
+  try
+    UnhookProc(@TOpenCommonDialog.TaskModalDialog, DialogsTaskModalDialogHook);
+    try
+      FocusWindow := GetFocus;
+      try
+        Func := @TOpenCommonDialog.TaskModalDialog;
+        Result := Func(Instance, DialogFunc, DialogData);
+      finally
+        SetFocus(FocusWindow);
+      end;
+    finally
+      HookProc(@TOpenCommonDialog.TaskModalDialog, @TCommonDialog_TaskModalDialog, DialogsTaskModalDialogHook);
+    end;
+  finally
+    LeaveCriticalSection(DialogsTaskModalDialogCritSect);
+  end;
+end;
+
+procedure InitTaskModalDialogFix;
+begin
+  InitializeCriticalSection(DialogsTaskModalDialogCritSect);
+  HookProc(@TOpenCommonDialog.TaskModalDialog, @TCommonDialog_TaskModalDialog, DialogsTaskModalDialogHook);
+  DebugLog('FixTaskModalDialog');
+end;
+
+procedure FiniTaskModalDialogFix;
+begin
+  UnhookProc(@TOpenCommonDialog.TaskModalDialog, DialogsTaskModalDialogHook);
+  DeleteCriticalSection(DialogsTaskModalDialogCritSect);
+end;
+{$ENDIF TaskModalDialogFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #59963: Closing non-modal forms after a task switch can deactivate the application }
+{$IFDEF AppDeActivateZOrderFix}
+{
+// Release
+0047B1FD F6401C08         test byte ptr [eax+$1c],$08
+0047B201 7522             jnz $0047b225     << replace by $90 $90 => nop nop
+0047B203 8BC3             mov eax,ebx
+0047B205 8B150C824500     mov edx,[$0045820c]
+0047B20B E85C8BF8FF       call @IsClass
+0047B210 84C0             test al,al
+0047B212 7509             jnz $0047b21d
+0047B214 83BBCC01000000   cmp dword ptr [ebx+$000001cc],$00
+0047B21B 7408             jz $0047b225
+0047B21D 8B45FC           mov eax,[ebp-$04]
+0047B220 E8DFFDFFFF       call TWinControl.UpdateShowing
+0047B225 5E               pop esi
+0047B226 5B               pop ebx
+0047B227 59               pop ecx
+0047B228 5D               pop ebp
+0047B229 C3               ret
+}
+
+procedure InitAppDeActivateZOrderFix;
+var
+  P: PAnsiChar;
+  Len: Integer;
+  Buf: Word;
+  n: Cardinal;
+begin
+  P := GetActualAddr(@TWinControl.UpdateControlState);
+  Len := 0;
+  while Len < 200 do
+  begin
+    if (P[0] = #$F6) and (P[1] = #$40) and (P[2] = #$1C) and (P[3] = #$08) and // test byte ptr [eax+$1c],$08
+       (P[4] = #$75) and (P[5] = #$22) and                                     // jnz +$22
+       (P[6] = #$8B) and (P[7] = #$C3) and                                     // mov eax,ebx
+       (P[8] = #$8B) then                                                      // mov edx,[TCustomForm]
+    begin
+      Buf := $9090; // nop nop
+      WriteProcessMemory(GetCurrentProcess, @P[4], @Buf, SizeOf(Buf), n);
+      DebugLog('AppDeActivateZOrderFix');
+      Exit;
+    end
+    else
+    if (P[0] = #$59) and (P[0] = #$5D) and (P[1] = #$C3) then // function end reached
+      Break;
+
+    Inc(P);
+    Inc(Len);
+  end;
+end;
+
+procedure FiniAppDeActivateZOrderFix;
+begin
+end;
+
+{$ENDIF AppDeActivateZOrderFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #66892: Closing forms deactivates the application (missing "stdcall") }
+{$IFDEF HideStackTrashingFix}
+var
+  FindTopMostWindowHook: TXRedirCode;
+  FindTopMostWindowProc: Pointer;
+
+{
+Forms.pas.1880: begin
+53               push ebx
+Forms.pas.1881: TaskActiveWindow := ActiveWindow;
+A3D8784700       mov [$004778d8],eax
+Forms.pas.1882: TaskFirstWindow := 0;
+33C0             xor eax,eax
+A3DC784700       mov [$004778dc],eax
+Forms.pas.1883: TaskFirstTopMost := 0;
+33C0             xor eax,eax
+A3E0784700       mov [$004778e0],eax
+Forms.pas.1884: EnumProc := @DoFindWindow;
+BBBCB64500       mov ebx,$0045b6bc
+Forms.pas.1885: EnumThreadWindows(GetCurrentThreadID, EnumProc, 0);
+6A00             push $00
+53               push ebx
+E8DBCBFAFF       call GetCurrentThreadId
+50               push eax
+E821D1FAFF       call EnumThreadWindows
+
+}
+function GetAddrOfFindTopMostWindow: Pointer;
+var
+  P: PByte;
+  Len: Integer;
+  NeedsFix: Boolean;
+begin
+  NeedsFix := False;
+  P := GetActualAddr(@EnableTaskWindows);
+  Len := 0;
+  while Len < 2048 do
+  begin
+    {  DoFindWindow "begin" }
+    if (P[0] = $53) and
+       (P[1] = $8B) and (P[2] = $D8) then
+    begin
+      if (P[3] = $3B) and (P[4] = $1D) and
+         (P[9] = $74) and ({Release}(P[10] = $4D) or {Debug}(P[10] = $4F)) then
+      begin
+        NeedsFix := True;
+      end
+    end
+    else { FindTopMostWindow "begin", Release & Debug }
+    if (P[0] = $53) and
+       (P[1] = $A3) then
+    begin
+      if (P[6] = $33) and (P[7] = $C0) and
+         (P[8] = $A3) and
+         (P[13] = $33) and (P[14] = $C0) and
+         (P[15] = $A3) and
+         (P[20] = $BB) and
+         (P[25] = $6A) and (P[26] = $00) and
+         (P[27] = $53) then
+      begin
+        Result := nil;
+        if NeedsFix then
+          Result := P;
+        Exit;
+      end;
+    end;
+    Inc(P);
+    Inc(Len);
+  end;
+  Result := nil;
+end;
+{$ENDIF HideStackTrashingFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ Control resize bugfix for kernel stack overflow due to WH_CALLWNDPROC hook }
+{$IFDEF ControlResizeFix}
+{2008-05-25:
+  - Added code to detect endless resizing controls.
+  - Added experimental OPTIMIZED_RESIZE_REDRAW option for faster form resizing }
+var
+  WinControl_AlignControlProc, WinControl_WMSize, WinControl_SetBounds: Pointer;
+  BackupAlignControl, BackupWMSize, BackupSetBounds: TXRedirCode;
+
+type
+  TControlResizeFixWinControl = class(TWinControl)
+  private
+    procedure AlignControl(AControl: TControl);
+    procedure HandleAlignControls(AControl: TControl; var R: TRect);
+  protected
+    procedure WMSize(var Message: TWMSize); message WM_SIZE;
+    procedure SetBounds(ALeft, ATop, AWidth, AHeight: Integer); override;
+  end;
+
+  {$IFNDEF DELPHI2005_UP}
+  TD5WinControlPrivate = class(TControl)
+  public
+    FAlignLevel: Word;
+  end;
+  {$ENDIF ~DELPHI2005_UP}
+
+threadvar
+  AlignControlList: TList;
+
+procedure TControlResizeFixWinControl.SetBounds(ALeft, ATop, AWidth, AHeight: Integer);
+var
+  WindowPlacement: TWindowPlacement;
+begin
+  if (ALeft <> Left) or (ATop <> Top) or
+    (AWidth <> Width) or (AHeight <> Height) then
+  begin
+    if HandleAllocated and not IsIconic(WindowHandle) then
+    begin
+      if AlignControlList <> nil then
+        SetWindowPos(WindowHandle, 0, ALeft, ATop, AWidth, AHeight,
+          SWP_NOZORDER or SWP_NOACTIVATE or SWP_DEFERERASE)
+      else
+        SetWindowPos(WindowHandle, 0, ALeft, ATop, AWidth, AHeight,
+          SWP_NOZORDER or SWP_NOACTIVATE);
+    end
+    else
+    begin
+      PInteger(@Left)^ := ALeft;
+      PInteger(@Top)^ := ATop;
+      PInteger(@Width)^ := AWidth;
+      PInteger(@Height)^ := AHeight;
+      if HandleAllocated then
+      begin
+        WindowPlacement.Length := SizeOf(WindowPlacement);
+        GetWindowPlacement(WindowHandle, @WindowPlacement);
+        WindowPlacement.rcNormalPosition := BoundsRect;
+        SetWindowPlacement(WindowHandle, @WindowPlacement);
+      end;
+    end;
+    UpdateBoundsRect(Rect(Left, Top, Left + Width, Top + Height));
+    RequestAlign;
+  end;
+end;
+
+procedure TControlResizeFixWinControl.HandleAlignControls(AControl: TControl; var R: TRect);
+
+  function AlignWork: Boolean;
+  var
+    I: Integer;
+  begin
+    Result := True;
+    for I := ControlCount - 1 downto 0 do
+      if (Controls[I].Align <> alNone) or
+         (Controls[I].Anchors <> [akLeft, akTop]) then
+        Exit;
+    Result := False;
+  end;
+
+var
+  OwnAlignControlList, TempAlignControlList: TList;
+  ResizeList: TList;
+  ResizeCounts: TList; // of Integer
+  Ctrl: TWinControl;
+  I, Index: Integer;
+begin
+  if AlignWork then
+  begin
+    OwnAlignControlList := nil;
+    try
+      if AlignControlList = nil then
+      begin
+        OwnAlignControlList := TList.Create;
+        AlignControlList := OwnAlignControlList;
+      end;
+
+      AlignControls(AControl, R);
+
+      if (OwnAlignControlList <> nil) and (OwnAlignControlList.Count > 0) then
+      begin
+        { Convert recursion into an iteration to prevent the kernel stack overflow }
+        ResizeList := TList.Create;
+        ResizeCounts := TList.Create;
+        try
+          { The controls in the OwnAlignControlList must be added to ResizeList in reverse order.
+            Otherwise the OnResize events aren't fired in correct order. }
+          AlignControlList := TList.Create;
+          try
+            repeat
+              try
+                for I := OwnAlignControlList.Count - 1 downto 0 do
+                begin
+                  Ctrl := TWinControl(OwnAlignControlList[I]);
+                  Index := ResizeList.IndexOf(Ctrl);
+
+                  { An endless resizing component was stopped by the kernel stack overflow bug.
+                    So we must catch this condition to prevent an endless loop. }
+                  if (Index = -1) or (Integer(ResizeCounts[Index]) < 30) then
+                  begin
+                    Ctrl.Realign;
+
+                    if Index <> -1 then
+                      ResizeCounts[Index] := Pointer(Integer(ResizeCounts[Index]) + 1);
+                    ResizeCounts.Add(Pointer(0)); // keep index in sync
+                    ResizeList.Add(Ctrl);
+                  end
+                  else if Index <> -1 then
+                  begin
+                    {$WARNINGS OFF}
+                    if DebugHook <> 0 then
+                    {$WARNINGS ON}
+                      OutputDebugString(PChar(Format('The component "%s" of class %s has an endless resize loop', [Ctrl.Name, Ctrl.ClassName])));
+                  end;
+                end;
+              finally
+                OwnAlignControlList.Clear;
+
+                { Switch lists }
+                TempAlignControlList := AlignControlList;
+                AlignControlList := OwnAlignControlList;
+                OwnAlignControlList := TempAlignControlList;
+              end;
+            until (OwnAlignControlList.Count = 0) {or EndlessResizeDetection};
+          finally
+            { Let another AlignControlList handle any alignment that comes from the
+              OnResize method. }
+            FreeAndNil(AlignControlList);
+          end;
+
+          { Fire Resize events }
+          for I := ResizeList.Count - 1 downto 0 do
+          begin
+            Ctrl := TWinControl(ResizeList[I]);
+            if not (csLoading in Ctrl.ComponentState) then
+              TOpenWinControl(Ctrl).Resize;
+          end;
+        finally
+          ResizeCounts.Free;
+          ResizeList.Free;
+        end;
+        {$IFDEF OPTIMIZED_RESIZE_REDRAW}
+        Invalidate;
+        {$ENDIF OPTIMIZED_RESIZE_REDRAW}
+      end;
+    finally
+      if OwnAlignControlList <> nil then
+      begin
+        AlignControlList := nil;
+        FreeAndNil(OwnAlignControlList);
+      end;
+    end;
+  end
+  else
+    AlignControls(AControl, R);
+end;
+
+procedure TControlResizeFixWinControl.WMSize(var Message: TWMSize);
+begin
+  {$IFDEF DELPHI2005_UP}
+  UpdateBounds;
+    {$IFDEF DELPHI2006_UP}
+  UpdateExplicitBounds;
+    {$ENDIF DELPHI2006_UP}
+  {$ELSE}
+  if HandleAllocated then
+    Perform(WM_MOVE, 0, LPARAM(Left and $0000ffff) or (Top shl 16)); // calls the private UpdateBounds
+  {$ENDIF DELPHI2005_UP}
+  DefaultHandler(Message);
+  if AlignControlList <> nil then
+  begin
+    if AlignControlList.IndexOf(Self) = -1 then
+      AlignControlList.Add(Self)
+  end
+  else
+  begin
+    Realign;
+    if not (csLoading in ComponentState) then
+      Resize;
+  end;
+end;
+
+procedure TControlResizeFixWinControl.AlignControl(AControl: TControl);
+var
+  Rect: TRect;
+begin
+  if not HandleAllocated or (csDestroying in ComponentState) then
+    Exit;
+  {$IFDEF DELPHI2005_UP}
+  if AlignDisabled then
+  {$ELSE}
+  if TD5WinControlPrivate(Self).FAlignLevel <> 0 then
+  {$ENDIF DELPHI2005_UP}
+    ControlState := ControlState + [csAlignmentNeeded]
+  else
+  begin
+    DisableAlign;
+    try
+      Rect := GetClientRect;
+
+      HandleAlignControls(AControl, Rect);
+    finally
+      ControlState := ControlState - [csAlignmentNeeded];
+      EnableAlign;
+    end;
+  end;
+end;
+
+function GetAlignControlProc: Pointer;
+var
+  P: PByteArray;
+  Offset: Integer;
+  MemInfo: TMemoryBasicInformation;
+begin
+  P := GetActualAddr(@TWinControl.Realign);
+  if (P <> nil) and (VirtualQuery(P, MemInfo, SizeOf(MemInfo)) = SizeOf(MemInfo)) then
+  begin
+    if (MemInfo.AllocationProtect <> PAGE_NOACCESS) then
+    begin
+      Offset := 0;
+      while Offset < $40 do
+      begin
+        if ((P[0] = $33) and (P[1] = $D2)) or   // xor edx,edx
+           ((P[0] = $31) and (P[1] = $D2)) then // xor edx,edx
+        begin
+          if P[2] = $E8 then // call TWinControl.AlignControl
+          begin
+            Inc(PByte(P), 2);
+            Result := PAnsiChar(P) + 5 + PInteger(PAnsiChar(P) + 1)^;
+            Exit;
+          end
+          else if (P[2] = $8B) and (P[3] = $45) and (P[4] = $FC) and // mov eax,[ebp-$04]
+                  (P[5] = $E8) then // call TWinControl.AlignControl
+          begin
+            Inc(PByte(P), 5);
+            Result := PAnsiChar(P) + 5 + PInteger(PAnsiChar(P) + 1)^;
+            Exit;
+          end;
+        end;
+        Inc(PByte(P));
+        Inc(Offset);
+      end;
+    end;
+  end;
+  Result := nil;
+end;
+
+procedure InitControlResizeFix;
+begin
+  WinControl_AlignControlProc := GetAlignControlProc;
+  WinControl_WMSize := GetDynamicMethod(TWinControl, WM_SIZE);
+  WinControl_SetBounds := @TOpenWinControl.SetBounds;
+  if (WinControl_AlignControlProc <> nil) and (WinControl_WMSize <> nil) then
+  begin
+    DebugLog('ControlResizeFix');
+    { Redirect the original function to the bug fixed version }
+    HookProc(WinControl_AlignControlProc, @TControlResizeFixWinControl.AlignControl, BackupAlignControl);
+    HookProc(WinControl_WMSize, @TControlResizeFixWinControl.WMSize, BackupWMSize);
+    {$IFDEF OPTIMIZED_RESIZE_REDRAW}
+    HookProc(WinControl_SetBounds, @TControlResizeFixWinControl.SetBounds, BackupSetBounds);
+    {$ENDIF OPTIMIZED_RESIZE_REDRAW}
+  end;
+end;
+
+procedure FiniControlResizeFix;
+begin
+  { Restore the original function }
+  UnhookProc(WinControl_AlignControlProc, BackupAlignControl);
+  UnhookProc(WinControl_WMSize, BackupWMSize);
+  UnhookProc(WinControl_SetBounds, BackupSetBounds);
+end;
+
+{$ENDIF ControlResizeFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #59654: TActionList access already released FActions field }
+{$IFDEF ActionListAVFix}
+var
+  HookTCustomActionList_Notification: TXRedirCode;
+
+type
+  TCustomActionListFix = class(TCustomActionList)
+  protected
+    procedure Notification(AComponent: TComponent; Operation: TOperation); override;
+  end;
+
+procedure TCustomActionListFix.Notification(AComponent: TComponent; Operation: TOperation);
+var
+  P: procedure(Instance: TComponent; AComponent: TComponent; Operation: TOperation);
+begin
+  { inherited: }
+  P := @TOpenComponent.Notification;
+  P(Self, AComponent, Operation);
+
+  if Operation = opRemove then
+  begin
+    if AComponent = Images then
+      Images := nil
+    else if {<*}not (csDestroying in ComponentState) and{*>} (AComponent is TContainedAction) then
+      RemoveAction(TContainedAction(AComponent));
+  end;
+end;
+
+procedure InitActionListAVFix;
+begin
+  DebugLog('ActionListAVFix');
+  HookProc(@TOpenCustomActionList.Notification, @TCustomActionListFix.Notification, HookTCustomActionList_Notification);
+end;
+
+procedure FiniActionListAVFix;
+begin
+  UnhookProc(@TOpenCustomActionList.Notification, HookTCustomActionList_Notification);
+end;
+{$ENDIF ActionListAVFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #54286 : Parent-PopupMenu overrides standard context menu (edit, memo, combobox, ...) }
+{$IFDEF ContextMenuFix}
+type
+  TContextMenuFixWinControl = class(TWinControl)
+  public
+    procedure DefaultHandler(var Message); override;
+  end;
+
+var
+  RM_GetObjectInstance: DWORD;
+  BackupDefaultHandler: TXRedirCode;
+
+procedure TContextMenuFixWinControl.DefaultHandler(var Message);
+type
+  TDefHandler = procedure(Self: TControl; var Message);
+begin
+  if HandleAllocated then
+  begin
+    with TMessage(Message) do
+    begin
+      { Here was the WM_CONTEXTMENU Code that is not necessary because
+        DefWndProc will send this message to the parent control. }
+
+      { Keep the odd bahavior for grids because everybody seems to be used to it. }
+      if (Msg = WM_CONTEXTMENU) and (Parent <> nil) and (Parent is TCustomGrid) then
+      begin
+        Result := Parent.Perform(Msg, WParam, LParam);
+        if Result <> 0 then Exit;
+      end;
+
+      case Msg of
+        WM_CTLCOLORMSGBOX..WM_CTLCOLORSTATIC:
+          Result := SendMessage(LParam, CN_BASE + Msg, WParam, LParam);
+        CN_CTLCOLORMSGBOX..CN_CTLCOLORSTATIC:
+          begin
+            SetTextColor(WParam, ColorToRGB(Font.Color));
+            SetBkColor(WParam, ColorToRGB(Brush.Color));
+            Result := Brush.Handle;
+          end;
+      else
+        if Msg = RM_GetObjectInstance then
+          Result := LRESULT(Self)
+        else
+          Result := CallWindowProc(DefWndProc, Handle, Msg, WParam, LParam);
+      end;
+      if Msg = WM_SETTEXT then
+        SendDockNotification(Msg, WParam, LParam);
+    end;
+  end
+  else
+    //inherited DefaultHandler(Message);
+    TDefHandler(@TControl.DefaultHandler)(Self, Message);
+end;
+
+procedure InitContextMenuFix;
+var
+  HInst: HMODULE;
+begin
+  HInst := FindHInstance(Pointer(TWinControl)); // get the HInstance of the module that contains Controls.pas
+  RM_GetObjectInstance := RegisterWindowMessage(PChar(Format('ControlOfs%.8X%.8X', [HInst, GetCurrentThreadId])));
+
+  DebugLog('ContextMenuFix');
+  { Redirect the original function to the bug fixed version }
+  HookProc(@TWinControl.DefaultHandler, @TContextMenuFixWinControl.DefaultHandler, BackupDefaultHandler);
+end;
+
+procedure FiniContextMenuFix;
+begin
+  UnhookProc(@TWinControl.DefaultHandler, BackupDefaultHandler);
+end;
+{$ENDIF ContextMenuFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #50097: ObjAuto access violation on XEON (Data Execution Prevention bug) }
+{$IFDEF ObjAutoDEPFix}
+
+type
+  PParameterInfos = ^TParameterInfos;
+  TParameterInfos = array[0..255] of ^PTypeInfo;
+
+  TMethodHandlerInstance = class
+  protected
+    MethodHandler: IMethodHandler;
+    TypeData: PTypeData;
+    ParamInfos: PParameterInfos;
+    Return: array[0..2] of Byte;
+    ParamOffsets: array of Word;
+  end;
+
+{ procedure TMethodHandlerInstance.RegisterStub;
+ 50               push eax
+ 51               push ecx
+ 52               push edx
+ 89E2             mov edx,esp
+ E866FDFFFF       call TMethodHandlerInstance.Handler
+ 89442404         mov [esp+$04],eax
+ 58               pop eax
+ 58               pop eax
+ 59               pop ecx
+ 8D4910           lea ecx,[ecx+$10]
+ FFE1             jmp ecx
+ C3               ret }
+
+type
+  PRegisterStubRec = ^TRegisterStubRec;
+  TRegisterStubRec = packed record
+    Push3Reg: array[0..2] of Byte;
+    MovEdxEsp: Word;
+    CallHandler: array[0..4] of Byte;
+    SaveRetValue: LongWord;
+    Pop3Reg: array[0..2] of Byte;
+    case Integer of
+      0: (LeaEcxEcx: Word;
+          Off: Byte;
+          JmpEcx: Word);
+      1: (Jmp: Byte;
+          Offset: TJumpOfs);
+  end;
+
+var
+  RegisterStub: PRegisterStubRec;
+  OrgCode: array[0..4] of Byte;
+
+procedure RegisterStubRet;
+asm
+  lea ecx, [ecx].TMethodHandlerInstance.Return
+  cmp byte ptr [ecx], $C2
+  jne @@Leave
+  movzx ecx, word ptr [ecx+$01]
+  add ecx, 3
+  and ecx, $FC
+  add esp, ecx
+
+  { restore return address }
+  neg ecx
+  mov ecx, [esp+ecx] // load return address
+  push ecx // restore return address
+@@Leave:
+end;
+
+procedure InitObjAutoDEPFix;
+var
+  Func: TTypeData;
+  M: TMethod;
+  OldProtect: Cardinal;
+begin
+  FillChar(Func, SizeOf(Func), 0);
+  Func.MethodKind := mkProcedure;
+  Func.ParamCount := 0;
+  M := CreateMethodPointer(nil, @Func);
+  RegisterStub := M.Code;
+  ReleaseMethodPointer(M);
+
+  if (RegisterStub.Push3Reg[0] = $50) and
+     (RegisterStub.Push3Reg[1] = $51) and
+     (RegisterStub.Push3Reg[2] = $52) and
+     (RegisterStub.MovEdxEsp = $E289) and
+     (RegisterStub.SaveRetValue = $04244489) and
+     (RegisterStub.Pop3Reg[0] = $58) and
+     (RegisterStub.Pop3Reg[1] = $58) and
+     (RegisterStub.Pop3Reg[2] = $59) and
+     (RegisterStub.LeaEcxEcx = $498D) and
+     (RegisterStub.JmpEcx = $E1FF) then
+  begin
+    if VirtualProtect(@RegisterStub.Jmp, SizeOf(TXRedirCode), PAGE_EXECUTE_READWRITE, OldProtect) then
+    begin
+      DebugLog('ObjAutoDEPFix');
+      Move(RegisterStub.Jmp, OrgCode[0], SizeOf(OrgCode));
+      RegisterStub.Jmp := $E9;
+      RegisterStub.Offset := TJumpOfs(@RegisterStubRet) - (TJumpOfs(@RegisterStub.Jmp) + SizeOf(TXRedirCode));
+      VirtualProtect(@RegisterStub.Jmp, SizeOf(TXRedirCode), OldProtect, OldProtect);
+      FlushInstructionCache(GetCurrentProcess, @RegisterStub.Jmp, SizeOf(TXRedirCode));
+    end;
+  end
+  else
+    RegisterStub := nil;
+end;
+
+procedure FiniObjAutoDEPFix;
+var
+  OldProtect: Cardinal;
+begin
+  if RegisterStub <> nil then
+  begin
+    if VirtualProtect(@RegisterStub.Jmp, SizeOf(TXRedirCode), PAGE_EXECUTE_READWRITE, OldProtect) then
+    begin
+      Move(OrgCode[0], RegisterStub.Jmp, SizeOf(OrgCode));
+      VirtualProtect(@RegisterStub.Jmp, SizeOf(TXRedirCode), OldProtect, OldProtect);
+      FlushInstructionCache(GetCurrentProcess, @RegisterStub.Jmp, SizeOf(TXRedirCode));
+    end;
+  end;
+end;
+{$ENDIF ObjAutoDEPFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ Classes.MakeObjectInstance memory leak fix }
+{$IFDEF MkObjInstLeakFix}
+{ Limitation:
+    The memory is only released if there is no dangling object instance in the
+    memory block. }
+var
+  UnRegisterModuleClassesHook: TXRedirCode;
+  MkObjInstLeakHooked: Boolean;
+
+procedure HookedUnRegisterModuleClasses(Module: HMODULE);
+  forward;
+
+
+const
+  InstanceCount = 313;
+  PageSize = 4096;
+
+{ Object instance management }
+
+type
+  PPObjectInstance = ^PObjectInstance;
+  PObjectInstance = ^TObjectInstance;
+  TObjectInstance = packed record
+    Code: Byte;
+    Offset: Integer;
+    case Integer of
+      0: (Next: PObjectInstance);
+      1: (Method: TWndMethod);
+  end;
+
+  PPInstanceBlock = ^PInstanceBlock;
+  PInstanceBlock = ^TInstanceBlock;
+  TInstanceBlock = packed record
+    Next: PInstanceBlock;
+    Code: array[1..2] of Byte;
+    WndProcPtr: Pointer;
+    Instances: array[0..InstanceCount] of TObjectInstance;
+  end;
+
+(*
+ procedure FreeObjectInstance(ObjectInstance: Pointer);
+ begin
+   if ObjectInstance <> nil then
+   begin
+    // 85C0             test eax,eax
+    // 740E             jz $0041b2f6
+     PObjectInstance(ObjectInstance)^.Next := InstFreeList;
+    // 8B15E8594600     mov edx,[$004659e8]
+    // 895005           mov [eax+$05],edx
+     InstFreeList := ObjectInstance;
+    // A3E8594600       mov [$004659e8],eax
+   end;
+ end;
+    // C3               ret
+*)
+
+type
+  TParamRec = packed record
+    Op: Word;
+    Off: Byte;
+  end;
+
+  PFreeObjInstRec = ^TFreeObjInstRec;
+  TFreeObjInstRec = packed record
+    TestEaxEax: Word;
+    Jz1: Word;
+    AssignToNext: packed record
+                    MovEdx: Word;
+                    Address: Cardinal;
+                    MovEaxOffEdx: Word;
+                    Off: Byte;
+                  end;
+    AssignToInstFreeList: packed record
+                            MovMemToEax: Byte;
+                            Address: Cardinal;
+                          end;
+    Ret: Byte;
+  end;
+
+  PFreeObjInstNoOptRec = ^TFreeObjInstNoOptRec;
+  TFreeObjInstNoOptRec = packed record
+    PushEbp: Byte;                 // $55
+    MovEbpEsp: Word;               // $8B EC
+    PushEcx: Byte;                 // $51
+    MovOffReg: TParamRec;          // $89 45 FC
+    Cmp: packed record
+           Op: Word;               // $83 7D
+           Off: Byte;              // $FC
+           Value: Byte;            // $00
+         end;
+    Jz1: Word;                     // $74 14
+    LoadParam1: TParamRec;         // $8B 45 FC
+    AssignToNext: packed record
+                    MovEdx: Word;  // $8B 15
+                    Address: Cardinal;
+                  end;
+  end;
+
+procedure GetObjectInstancePointers(out InstFreeListP: PPObjectInstance; out InstBlockListP: PPInstanceBlock);
+var
+  FreeObjInst: PFreeObjInstRec;
+  FreeObjInstNoOpt: PFreeObjInstNoOptRec;
+begin
+  InstFreeListP := nil;
+  InstBlockListP := nil;
+  FreeObjInst := GetActualAddr(@Classes.FreeObjectInstance);
+  FreeObjInstNoOpt := Pointer(FreeObjInst);
+
+  if (FreeObjInst.TestEaxEax = $C085) and (FreeObjInst.Jz1 = $0E74) and
+     (FreeObjInst.AssignToNext.MovEdx = $158B) and
+     (FreeObjInst.AssignToNext.MovEaxOffEdx = $5089) and (FreeObjInst.AssignToNext.Off = $05) and
+     (FreeObjInst.AssignToInstFreeList.MovMemToEax = $A3) and
+     (FreeObjInst.Ret = $C3) then
+  begin
+    InstFreeListP := PPObjectInstance(FreeObjInst.AssignToNext.Address);
+    InstBlockListP := PPInstanceBlock(FreeObjInst.AssignToNext.Address - SizeOf(Pointer));
+  end
+  else
+  if (FreeObjInstNoOpt.PushEbp = $55) and (FreeObjInstNoOpt.MovEbpEsp = $EC8B) and
+     (FreeObjInstNoOpt.PushEcx = $51) and
+     (FreeObjInstNoOpt.MovOffReg.Op = $4589) and (FreeObjInstNoOpt.MovOffReg.Off = $FC) and
+     (FreeObjInstNoOpt.Cmp.Op = $7D83) and (FreeObjInstNoOpt.Cmp.Off = $FC) and (FreeObjInstNoOpt.Cmp.Value = $00) and
+     (FreeObjInstNoOpt.Jz1 = $1474) and
+     (FreeObjInstNoOpt.LoadParam1.Op = $458B) and (FreeObjInstNoOpt.LoadParam1.Off = $FC) and
+     (FreeObjInstNoOpt.AssignToNext.MovEdx = $158B) then
+  begin
+    InstFreeListP := PPObjectInstance(FreeObjInstNoOpt.AssignToNext.Address);
+    InstBlockListP := PPInstanceBlock(FreeObjInstNoOpt.AssignToNext.Address - SizeOf(Pointer));
+  end;
+end;
+
+procedure CleanupInstFreeList(var InstFreeList: PObjectInstance; BlockStart, BlockEnd: PAnsiChar);
+var
+  Prev, Next, Item: PObjectInstance;
+begin
+  Prev := nil;
+  Item := InstFreeList;
+  while Item <> nil do
+  begin
+    Next := Item.Next;
+    if (PAnsiChar(Item) >= BlockStart) and (PAnsiChar(Item) <= BlockEnd) then
+    begin
+      Item := Prev;
+      if Prev = nil then
+        InstFreeList := Next
+      else
+        Prev.Next := Next;
+    end;
+    Prev := Item;
+    Item := Next;
+  end;
+end;
+
+function CalcFreeInstBlockItems(Item: PObjectInstance; Block: PInstanceBlock): Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  while Item <> nil do
+  begin
+    for I := High(Block.Instances) downto 0 do
+    begin
+      if @Block.Instances[I] = Item then
+      begin
+        Inc(Result);
+        Break;
+      end;
+    end;
+    Item := Item.Next;
+  end;
+end;
+
+procedure ReleaseObjectInstanceBlocks;
+var
+  InstFreeListP: PPObjectInstance;
+  InstBlockListP: PPInstanceBlock;
+  NextBlock, Block, PrevBlock: PInstanceBlock;
+  FreeCount: Integer;
+begin
+  GetObjectInstancePointers(InstFreeListP, InstBlockListP);
+  if (InstFreeListP = nil) or (InstBlockListP = nil) then
+  begin
+    OutputDebugString('Cannot apply Classes.FreeObjectInstance memory leak-fix');
+    Exit;
+  end;
+
+  Block := InstBlockListP^;
+  PrevBlock := nil;
+  while Block <> nil do
+  begin
+    NextBlock := Block.Next;
+
+    { Obtain the number of free items in the InstanceBlock }
+    FreeCount := CalcFreeInstBlockItems(InstFreeListP^, Block);
+
+    { Release memory if the InstanceBlock contains only "free" items }
+    if FreeCount = Length(Block.Instances) then
+    begin
+      { Remove all InstFreeList items that refer to the InstanceBlock }
+      CleanupInstFreeList(InstFreeListP^, PAnsiChar(Block), PAnsiChar(Block) + SizeOf(TInstanceBlock) - 1);
+
+      VirtualFree(Block, 0, MEM_RELEASE);
+
+      Block := PrevBlock;
+      if PrevBlock = nil then
+        InstBlockListP^ := NextBlock
+      else
+        PrevBlock.Next := NextBlock;
+    end;
+
+    { Next InstanceBlock }
+    PrevBlock := Block;
+    Block := NextBlock;
+  end;
+
+  { Maybe the finalization was executed before the Application object was destroyed.
+    Classes.Finalization calls UnRegisterModuleClasses(). We hook into that function
+    to execute our finalization in the Classes.Finalization. }
+  if (InstBlockListP^ <> nil) and not MkObjInstLeakHooked and
+     (FindHInstance(GetActualAddr(@UnRegisterModuleClasses)) = HInstance) then
+  begin
+    MkObjInstLeakHooked := True;
+    HookProc(@UnRegisterModuleClasses, @HookedUnRegisterModuleClasses, UnRegisterModuleClassesHook);
+  end;
+end;
+
+procedure HookedUnRegisterModuleClasses(Module: HMODULE);
+begin
+  UnhookProc(@UnRegisterModuleClasses, UnRegisterModuleClassesHook);
+  try
+    UnRegisterModuleClasses(Module);
+    if Module = HInstance then
+      ReleaseObjectInstanceBlocks;
+  finally
+    HookProc(@UnRegisterModuleClasses, @HookedUnRegisterModuleClasses, UnRegisterModuleClassesHook);
+  end;
+end;
+{$ENDIF MkObjInstLeakFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #58938: MainForm Minimize minimizes in the background }
+{$IFDEF AppMinimizeFix}
+var
+  AppMinimizePatchAddress: ^TJumpOfs;
+  OrgAppMinimizeSetActiveWindowOffset: TJumpOfs;
+
+function ApplicationMinimizeSetActiveWindow(hWnd: HWND): HWND; stdcall;
+begin
+  if Application.MainFormOnTaskBar then
+    Result := GetActiveWindow
+  else
+    Result := SetActiveWindow(hWnd);
+end;
+
+{
+Forms.pas.7850: NormalizeTopMosts;
+8BC3             mov eax,ebx
+E84AF4FFFF       call TApplication.NormalizeTopMosts
+Forms.pas.7851: SetActiveWindow(FHandle); // WM_ACTIVATEAPP can set AppIconic to False
+8B4330           mov eax,[ebx+$30]
+50               push eax
+E87D1AFAFF       call SetActiveWindow
+Forms.pas.7852: AppIconic := True;        // Set AppIconic here just to be safe
+C605A8EC4B0001   mov byte ptr [$004beca8],$01
+}
+
+procedure InitAppMinimizeFix;
+var
+  P: PAnsiChar;
+  Len: Integer;
+  NewOffset: TJumpOfs;
+  n: Cardinal;
+begin
+  P := GetActualAddr(@TApplication.Minimize);
+  Len := 0;
+  while Len < 64 do
+  begin
+    if (P[0] = #$8B) and (P[1] = #$C3) and // mov eax,ebx
+       (P[2] = #$E8) and // call TApplication.NormalizeTopMosts
+       (P[7] = #$8B) and (P[8] = #$43) and (P[9] = #$30) and // mov eax,[ebx+$30]
+       (P[10] = #$50) and // push eax
+       (P[11] = #$E8) and // call SetActiveWindow
+       (P[16] = #$C6) and (P[17] = #$05) and (P[22] = #$01) then // mov byte ptr [$004beca8],$01
+    begin
+      DebugLog('AppMinimizeFix');
+      AppMinimizePatchAddress := Pointer(P + 12);
+      OrgAppMinimizeSetActiveWindowOffset := AppMinimizePatchAddress^;
+      NewOffset := PAnsiChar(@ApplicationMinimizeSetActiveWindow) - PAnsiChar(AppMinimizePatchAddress) - SizeOf(TJumpOfs);
+      WriteProcessMemory(GetCurrentProcess, AppMinimizePatchAddress, @NewOffset, SizeOf(NewOffset), n);
+      Exit;
+    end;
+    Inc(P);
+    Inc(Len);
+  end;
+end;
+
+procedure FiniAppMinimizeFix;
+var
+  n: Cardinal;
+begin
+  if AppMinimizePatchAddress <> nil then
+    WriteProcessMemory(GetCurrentProcess, AppMinimizePatchAddress, @OrgAppMinimizeSetActiveWindowOffset, SizeOf(TJumpOfs), n);
+end;
+{$ENDIF AppMinimizeFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #64484: SysUtils.Abort can raise an AccessViolation }
+{$IFDEF SysUtilsAbortFix}
+var
+  SysUtilsAbortHook: TXRedirCode;
+
+procedure SysUtilsAbort;
+{ No dependency on EBP register }
+
+  procedure ThrowException(ReturnAddr: Pointer);
+  begin
+    raise EAbort.CreateRes(@SOperationAborted) at ReturnAddr;
+  end;
+
+asm
+  pop eax
+  jmp ThrowException
+end;
+
+procedure InitSysUtilsAbortFix;
+begin
+  DebugLog('SysUtilsAbortFix');
+  HookProc(@SysUtils.Abort, @SysUtilsAbort, SysUtilsAbortHook);
+end;
+
+procedure FiniSysUtilsAbortFix;
+begin
+  UnhookProc(@SysUtils.Abort, SysUtilsAbortHook);
+end;
+{$ENDIF SysUtilsAbortFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #58939: No taskbar button when starting from shelllink with Show=Minimized }
+{$IFDEF CmdShowMinimizeFix}
+var
+  ApplicationRunHook: TXRedirCode;
+  InitialMainFormState: ^TWindowState;
+
+procedure ApplicationRun(App: TApplication);
+begin
+  UnhookProc(@TApplication.Run, ApplicationRunHook);
+  ApplicationRunHook.Jump := 0;
+  {$WARNINGS OFF}
+  if (CmdShow = SW_SHOWMINNOACTIVE) and (InitialMainFormState <> nil) then
+  {$WARNINGS ON}
+    InitialMainFormState^ := wsMinimized;
+  App.Run;
+end;
+
+{
+Forms.pas.8214: if (FMainForm.FWindowState = wsMinimized) or (InitialMainFormState = wsMinimized) then
+8B45FC           mov eax,[ebp-$04]
+8B4044           mov eax,[eax+$44]
+80B87302000001   cmp byte ptr [eax+$00000273],$01
+7409             jz $004669a5
+803DC8784B0001   cmp byte ptr [$004b78c8],$01
+751E             jnz $004669c3
+Forms.pas.8216: Minimize;
+8B45FC           mov eax,[ebp-$04]
+E8FFF5FFFF       call TApplication.Minimize
+Forms.pas.8217: if (InitialMainFormState = wsMinimized) then
+803DC8784B0001   cmp byte ptr [$004b78c8],$01
+7514             jnz $004669ca
+}
+
+function FindInitialMainFormState: Pointer;
+var
+  P: PAnsiChar;
+  Len: Integer;
+begin
+  P := GetActualAddr(@TApplication.Run);
+  Len := 0;
+  while Len < 128 do
+  begin
+    if (P[0] = #$74) and (P[1] = #$09) and // jz $004669a5
+       (P[2] = #$80) and (P[3] = #$3D) and (P[8] = #$01) and // cmp byte ptr [$004b78c8],$01
+       (P[9] = #$75) and (P[10] = #$1E) and // jnz $004669c3
+       (P[11] = #$8B) and (P[12] = #$45) and (P[13] = #$FC) then // mov eax,[ebp-$04]
+    begin
+      DebugLog('CmdShowMinimizeFix');
+      Result := PPointer(P + 4)^;
+      Exit;
+    end;
+    Inc(P);
+    Inc(Len);
+  end;
+  Result := nil;
+end;
+
+procedure InitCmdShowMinimizeFix;
+begin
+  InitialMainFormState := FindInitialMainFormState;
+  if InitialMainFormState <> nil then
+    HookProc(@TApplication.Run, @ApplicationRun, ApplicationRunHook);
+end;
+
+procedure FiniCmdShowMinimizeFix;
+begin
+  UnhookProc(@TApplication.Run, ApplicationRunHook);
+end;
+
+{$ENDIF CmdShowMinimizeFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #35001: MDIChild's active control focus is not set correctly }
+{$IFDEF MDIChildFocusFix}
+var
+  CustomFormFocusControlHook: TXRedirCode;
+
+procedure CustomFormFocusControl(Self: TOpenCustomForm; Control: TWinControl);
+var
+  WasActive: Boolean;
+begin
+  with Self do
+  begin
+    WasActive := Active;
+
+    { Synchronize Windows's focus with VCL's focus }
+    if WasActive and (FormStyle = fsMDIChild) and (Control <> nil) and (Control = ActiveControl) and
+       Control.HandleAllocated and not Control.Focused then
+    begin
+      Windows.SetFocus(Control.Handle);
+    end;
+
+    ActiveControl := Control;
+    if not WasActive then
+      SetFocus;
+  end;
+end;
+
+procedure InitMDIChildFocusFix;
+begin
+  DebugLog('MDIChildFocusFix');
+  HookProc(@TOpenCustomForm.FocusControl, @CustomFormFocusControl, CustomFormFocusControlHook);
+end;
+
+procedure FiniMDIChildFocusFix;
+begin
+  UnhookProc(@TOpenCustomForm.FocusControl, CustomFormFocusControlHook);
+end;
+{$ENDIF MDIChildFocusFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #56252: TPageControl flickers a lot with active theming }
+{ QC #68730: TLabel is not painted on a themed, double-buffered TTabSheet in Vista }
+{ TLabels on TTabSheet are not painted (themes) if a TWinControl like TMemo is on the TTabSheet (TWinControl.PaintWindow bug) }
+{$IFDEF PageControlPaintingFix}
+type
+  TFlickerlessPageControl = class(TPageControl)
+    procedure NewWndProc(var Msg: TMessage);
+  end;
+
+  TFlickerlessTabSheet = class(TTabSheet)
+  protected
+    procedure NewCreateParams(var Params: TCreateParams);
+    procedure WMPrintClient(var Message: TWMPrintClient); message WM_PRINTCLIENT;
+    procedure WMEraseBkgnd(var Message: TWMEraseBkgnd); message WM_ERASEBKGND;
+
+    procedure NewWndProc(var Msg: TMessage);
+  end;
+
+{ TFlickerlessPageControl }
+
+procedure TFlickerlessPageControl.NewWndProc(var Msg: TMessage);
+begin
+  case Msg.Msg of
+    WM_SIZE:
+      begin
+        inherited WndProc(Msg);
+        { Update the page control immediately to prevent flicker }
+        if ThemeServices.ThemesEnabled then
+          RedrawWindow(Handle, nil, 0, RDW_UPDATENOW or RDW_ERASE);
+      end;
+  else
+    inherited WndProc(Msg); // "inherited" is required here, otherwise this would be an endless recursion
+  end;
+end;
+
+{ TFlickerlessTabSheet }
+
+procedure TFlickerlessTabSheet.WMEraseBkgnd(var Message: TWMEraseBkgnd);
+var
+  R: TRect;
+begin
+  if (PageControl <> nil) and (PageControl.Style = tsTabs) and ThemeServices.ThemesEnabled then
+  begin
+    { Paint the TabSheet background without filling the gray color from the parent.
+      And fill it in WM_ERASEBKGND where it belongs instead of WM_PRINTCLIENT. }
+    GetWindowRect(Handle, R);
+    OffsetRect(R, -R.Left, -R.Top);
+    ThemeServices.DrawElement(Message.DC, ThemeServices.GetElementDetails(ttBody), R);
+    Message.Result := 1;
+  end
+  else
+    inherited;
+end;
+
+procedure TFlickerlessTabSheet.WMPrintClient(var Message: TWMPrintClient);
+begin
+  { Fixes "Labels are not painted if themes are enabled" bug }
+
+  { Description see QC #3850 / RAID #159864, same as in TFrame.
+
+    A better solution would be to change TWinControl.PaintWindow to
+    use WM_PRINTCLIENT if it is called from a WM_PRINTCLIENT handler
+    and to use WM_PAINT only if it is called from a WM_PAINT handler. }
+
+  DefaultHandler(Message);
+  PaintControls(Message.DC, nil);
+end;
+
+procedure TFlickerlessTabSheet.NewCreateParams(var Params: TCreateParams);
+begin
+  inherited CreateParams(Params);
+  if ThemeServices.ThemesEnabled then
+    Params.WindowClass.style := Params.WindowClass.style and not (CS_VREDRAW or CS_HREDRAW);
+end;
+
+procedure TFlickerlessTabSheet.NewWndProc(var Msg: TMessage);
+begin
+  { Instead of hooking the DMT we simply call the replacement handlers directly }
+  case Msg.Msg of
+    WM_ERASEBKGND:
+      WMEraseBkgnd(TWMEraseBkgnd(Msg));
+    WM_PRINTCLIENT:
+      WMPrintClient(TWMPrintClient(Msg));
+    WM_SIZE:
+      begin
+        inherited WndProc(Msg);
+        if ThemeServices.ThemesEnabled then
+          RedrawWindow(Handle, nil, 0, RDW_UPDATENOW or RDW_INVALIDATE or RDW_ERASE or RDW_ALLCHILDREN);
+      end;
+  else
+    inherited WndProc(Msg); // "inherited" is required here, otherwise this would be an endless recursion
+  end;
+end;
+
+procedure InitPageControlPaintingFix;
+begin
+  DebugLog('PageControlPaintingFix');
+  ReplaceVmtField(TTabSheet, @TFlickerlessTabSheet.WndProc, @TFlickerlessTabSheet.NewWndProc);
+  ReplaceVmtField(TTabSheet, @TFlickerlessTabSheet.CreateParams, @TFlickerlessTabSheet.NewCreateParams);
+  ReplaceVmtField(TPageControl, @TFlickerlessPageControl.WndProc, @TFlickerlessPageControl.NewWndProc);
+end;
+
+procedure FiniPageControlPaintingFix;
+begin
+  ReplaceVmtField(TTabSheet, @TFlickerlessTabSheet.NewWndProc, @TFlickerlessTabSheet.WndProc);
+  ReplaceVmtField(TTabSheet, @TFlickerlessTabSheet.NewCreateParams, @TFlickerlessTabSheet.CreateParams);
+  ReplaceVmtField(TPageControl, @TFlickerlessPageControl.NewWndProc, @TFlickerlessPageControl.WndProc);
+end;
+{$ENDIF PageControlPaintingFix}
+{---------------------------------------------------------------------------}
+
+
+
+{---------------------------------------------------------------------------}
+{$IFDEF GridFlickerFix}
+type
+  {$IFDEF VCLFIXPACK_DB_SUPPORT}
+  TFlickerlessDBGrid = class(TDBGrid)
+  protected
+    procedure NewWndProc(var Msg: TMessage);
+  end;
+  {$ENDIF VCLFIXPACK_DB_SUPPORT}
+
+  TFlickerlessStringGrid = class(TStringGrid)
+  protected
+    procedure NewWndProc(var Msg: TMessage);
+  end;
+
+  TFlickerlessDrawGrid = class(TDrawGrid)
+  protected
+    procedure NewWndProc(var Msg: TMessage);
+  end;
+
+{ TFlickerlessDBGrid }
+
+procedure GridWMEraseBkgnd(Grid: TCustomGrid; var Message: TWMEraseBkgnd);
+var
+  R: TRect;
+  Size: TSize;
+begin
+  { Fill the area between the two scroll bars. }
+  Size.cx := GetSystemMetrics(SM_CXVSCROLL);
+  Size.cy := GetSystemMetrics(SM_CYHSCROLL);
+  if {Grid.BiDiMode <> bdLeftToRight}Grid.UseRightToLeftAlignment then
+    R := Bounds(0, Grid.Height - Size.cy, Size.cx, Size.cy)
+  else
+    R := Bounds(Grid.Width - Size.cx, Grid.Height - Size.cy, Size.cx, Size.cy);
+  FillRect(Message.DC, R, Grid.Brush.Handle);
+  Message.Result := 1;
+end;
+
+{$IFDEF VCLFIXPACK_DB_SUPPORT}
+procedure TFlickerlessDBGrid.NewWndProc(var Msg: TMessage);
+{var
+  Rect: TRect;}
+begin
+  if Msg.Msg = WM_ERASEBKGND then
+    GridWMEraseBkgnd(Self, TWMEraseBkgnd(Msg))
+  else if Msg.Msg = WM_PAINT then
+  begin
+    {if UseRightToLeftAlignment then
+    Begin
+      Rect.TopLeft := ClientRect.TopLeft;
+      Rect.BottomRight := ClientRect.BottomRight;
+      InvalidateRect(Handle, @Rect, False);
+    end;}
+    inherited WndProc(Msg);
+  end
+  else
+    inherited WndProc(Msg);
+end;
+{$ENDIF VCLFIXPACK_DB_SUPPORT}
+
+procedure TFlickerlessStringGrid.NewWndProc(var Msg: TMessage);
+begin
+  if Msg.Msg = WM_ERASEBKGND then
+    GridWMEraseBkgnd(Self, TWMEraseBkgnd(Msg))
+  else
+    inherited WndProc(Msg);
+end;
+
+procedure TFlickerlessDrawGrid.NewWndProc(var Msg: TMessage);
+begin
+  if Msg.Msg = WM_ERASEBKGND then
+    GridWMEraseBkgnd(Self, TWMEraseBkgnd(Msg))
+  else
+    inherited WndProc(Msg);
+end;
+
+procedure InitGridFlickerFix;
+begin
+  DebugLog('GridFlickerFix');
+  {$IFDEF VCLFIXPACK_DB_SUPPORT}
+  ReplaceVmtField(TDBGrid, @TFlickerlessDBGrid.WndProc, @TFlickerlessDBGrid.NewWndProc);
+  {$ENDIF VCLFIXPACK_DB_SUPPORT}
+  ReplaceVmtField(TStringGrid, @TFlickerlessStringGrid.WndProc, @TFlickerlessStringGrid.NewWndProc);
+  ReplaceVmtField(TDrawGrid, @TFlickerlessDrawGrid.WndProc, @TFlickerlessDrawGrid.NewWndProc);
+end;
+
+procedure FiniGridFlickerFix;
+begin
+  {$IFDEF VCLFIXPACK_DB_SUPPORT}
+  ReplaceVmtField(TDBGrid, @TFlickerlessDBGrid.NewWndProc, @TFlickerlessDBGrid.WndProc);
+  {$ENDIF VCLFIXPACK_DB_SUPPORT}
+  ReplaceVmtField(TStringGrid, @TFlickerlessStringGrid.NewWndProc, @TFlickerlessStringGrid.WndProc);
+  ReplaceVmtField(TDrawGrid, @TFlickerlessDrawGrid.NewWndProc, @TFlickerlessDrawGrid.WndProc);
+end;
+{$ENDIF GridFlickerFix}
+{---------------------------------------------------------------------------}
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #69112: TSpeedButton is painted as a black rectangle on a double buffered panel on a sheet of glass. }
+{$IFDEF SpeedButtonGlassFix}
+type
+  TGlassableSpeedButton = class(TSpeedButton)
+    procedure NewWndProc(var Msg: TMessage);
+  end;
+
+function ControlInGlassPaint(AControl: TControl): Boolean;
+var
+  Parent: TWinControl;
+begin
+  Result := csGlassPaint in AControl.ControlState;
+  if Result then
+  begin
+    { Control could be on a double buffered control. In that case the csGlassPaint flag
+      shouldn't be set. }
+    Parent := AControl.Parent;
+    while (Parent <> nil) and not Parent.DoubleBuffered and not (Parent is TCustomForm) do
+      Parent := Parent.Parent;
+    Result := (Parent = nil) or not Parent.DoubleBuffered or (Parent is TCustomForm);
+  end;
+end;
+
+{ TGlassableSpeedButton }
+
+procedure TGlassableSpeedButton.NewWndProc(var Msg: TMessage);
+begin
+  if (Msg.Msg = WM_PAINT) and (csGlassPaint in ControlState) and
+     not ControlInGlassPaint(Self) then
+  begin
+    ControlState := ControlState - [csGlassPaint];
+    try
+      inherited WndProc(Msg);
+    finally
+      ControlState := ControlState + [csGlassPaint];
+    end;
+  end
+  else
+    inherited WndProc(Msg);
+end;
+
+procedure InitSpeedButtonGlassFix;
+begin
+  DebugLog('SpeedButtonGlassFix');
+  ReplaceVmtField(TSpeedButton, @TGlassableSpeedButton.WndProc, @TGlassableSpeedButton.NewWndProc);
+  {$IFDEF VCLFIXPACK_DB_SUPPORT}
+  ReplaceVmtField(TNavButton, @TGlassableSpeedButton.WndProc, @TGlassableSpeedButton.NewWndProc);
+  {$ENDIF VCLFIXPACK_DB_SUPPORT}
+end;
+
+procedure FiniSpeedButtonGlassFix;
+begin
+  ReplaceVmtField(TSpeedButton, @TGlassableSpeedButton.NewWndProc, @TGlassableSpeedButton.WndProc);
+  {$IFDEF VCLFIXPACK_DB_SUPPORT}
+  ReplaceVmtField(TNavButton, @TGlassableSpeedButton.NewWndProc, @TGlassableSpeedButton.WndProc);
+  {$ENDIF VCLFIXPACK_DB_SUPPORT}
+end;
+{$ENDIF SpeedButtonGlassFix}
+{ ---------------------------------------------------------------------------- }
+
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #69294: TProgressBar fails with PBS_MARQUEE and disabled Themes }
+{$IFDEF VistaProgressBarMarqueeFix}
+type
+  TVistaProgressBarMarqueeFix = class(TProgressBar)
+  protected
+    procedure SetMarqueeInterval(Value: Integer);
+    procedure CreateParamsFix(var Params: TCreateParams);
+    procedure CreateWndFix;
+  end;
+
+var
+  SetMarqueeIntervalHook: TXRedirCode;
+  SetMarqueeInterval: Pointer;
+
+procedure TVistaProgressBarMarqueeFix.SetMarqueeInterval(Value: Integer);
+var
+  MarqueeEnabled: Boolean;
+begin
+  PInteger(@MarqueeInterval)^ := Value;
+  if (Style = pbstMarquee) and HandleAllocated then
+  begin
+    MarqueeEnabled := Style = pbstMarquee;
+    SendMessage(Handle, PBM_SETMARQUEE, WPARAM(MarqueeEnabled), LPARAM(MarqueeInterval));
+  end;
+end;
+
+procedure TVistaProgressBarMarqueeFix.CreateParamsFix(var Params: TCreateParams);
+begin
+  inherited CreateParams(Params);
+  if Style = pbstMarquee then
+    Params.Style := Params.Style or PBS_MARQUEE;
+end;
+
+procedure TVistaProgressBarMarqueeFix.CreateWndFix;
+var
+  MarqueeEnabled: Boolean;
+begin
+  inherited CreateWnd;
+  MarqueeEnabled := Style = pbstMarquee;
+  SendMessage(Handle, PBM_SETMARQUEE, WPARAM(THandle(MarqueeEnabled)), LPARAM(MarqueeInterval));
+end;
+
+procedure InitVistaProgressBarMarqueeFix;
+var
+  PropInfo: PPropInfo;
+begin
+  if CheckWin32Version(6, 0) then
+  begin
+    ReplaceVmtField(TProgressBar, @TVistaProgressBarMarqueeFix.CreateParams, @TVistaProgressBarMarqueeFix.CreateParamsFix);
+    ReplaceVmtField(TProgressBar, @TVistaProgressBarMarqueeFix.CreateWnd, @TVistaProgressBarMarqueeFix.CreateWndFix);
+    PropInfo := GetPropInfo(TProgressBar, 'MarqueeInterval');
+    if (PropInfo <> nil) and (PropInfo.SetProc <> nil) and
+       not (Byte(DWORD_PTR(PropInfo.SetProc) shr 24) in [$FF, $FE]) then
+    begin
+      SetMarqueeInterval := PropInfo.SetProc;
+      HookProc(SetMarqueeInterval, @TVistaProgressBarMarqueeFix.SetMarqueeInterval, SetMarqueeIntervalHook);
+    end;
+    DebugLog('VistaProgressBarMarqueeFix');
+  end;
+end;
+
+procedure FiniVistaProgressBarMarqueeFix;
+begin
+  if CheckWin32Version(6, 0) then
+  begin
+    ReplaceVmtField(TProgressBar, @TVistaProgressBarMarqueeFix.CreateParamsFix, @TVistaProgressBarMarqueeFix.CreateParams);
+    ReplaceVmtField(TProgressBar, @TVistaProgressBarMarqueeFix.CreateWndFix, @TVistaProgressBarMarqueeFix.CreateWnd);
+    UnhookProc(SetMarqueeInterval, SetMarqueeIntervalHook);
+  end;
+end;
+{$ENDIF VistaProgressBarMarqueeFix}
+{ ---------------------------------------------------------------------------- }
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #52439: DbNavigator paints incorrectly when flat=true in themed mode }
+{$IFDEF DBNavigatorFix}
+type
+  TOpenDBNavigator = class(TDBNavigator)
+  public
+    procedure SetFlatFixed(Value: Boolean);
+  end;
+
+var
+  DBNavigatorSetFlat: Pointer;
+  DBNavigatorSetFlatHook: TXRedirCode;
+
+procedure TOpenDBNavigator.SetFlatFixed(Value: Boolean);
+var
+  I: TNavigateBtn;
+begin
+  if Flat <> Value then
+  begin
+    Boolean(Pointer(@Flat)^) := Value; // FFlat := Value
+    for I := Low(Buttons) to High(Buttons) do
+      Buttons[I].Flat := Value;
+    if Flat then
+      ControlStyle := ControlStyle - [csOpaque]
+    else
+      ControlStyle := ControlStyle + [csOpaque];
+  end;
+end;
+
+procedure InitDBNavigatorFix;
+var
+  Info: PPropInfo;
+begin
+  Info := GetPropInfo(TDBNavigator, 'Flat');
+  if (Info <> nil) and (Info.SetProc <> nil) then
+  begin
+    DBNavigatorSetFlat := Info.SetProc;
+    HookProc(DBNavigatorSetFlat, @TOpenDBNavigator.SetFlatFixed, DBNavigatorSetFlatHook);
+    DebugLog('DBNavigatorFix');
+  end;
+end;
+
+procedure FiniDBNavigatorFix;
+begin
+  UnhookProc(DBNavigatorSetFlat, DBNavigatorSetFlatHook);
+end;
+{$ENDIF DBNavigatorFix}
+{ ---------------------------------------------------------------------------- }
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #70441: ToUpper and ToLower modify a Const argument
+  QC #69752: ToUpper and ToLower with NullString }
+{$IFDEF CharacterFix}
+var
+  TCharacter_ToLowerHook, TCharacter_ToUpperHook: TXRedirCode;
+
+function TCharacter_ToLower(const S: string): string;
+var
+  Len: Integer;
+begin
+  if S <> '' then
+  begin
+    Len := Length(S);
+    SetLength(Result, Len);
+    if LCMapString(GetThreadLocale, LCMAP_LOWERCASE, PChar(S), Len, PChar(Result), Len) = 0 then
+      RaiseLastOSError;
+  end
+  else
+    Result := S;
+end;
+
+function TCharacter_ToUpper(const S: string): string;
+var
+  Len: Integer;
+begin
+  if S <> '' then
+  begin
+    Len := Length(S);
+    SetLength(Result, Len);
+    if LCMapString(GetThreadLocale, LCMAP_UPPERCASE, PChar(S), Len, PChar(Result), Len) = 0 then
+      RaiseLastOSError;
+  end
+  else
+    Result := S;
+end;
+
+procedure InitCharacterFix;
+begin
+  DebugLog('CharacterFix');
+  HookProc(@TCharacter.ToLower, @TCharacter_ToLower, TCharacter_ToLowerHook);
+  HookProc(@TCharacter.ToUpper, @TCharacter_ToUpper, TCharacter_ToUpperHook);
+end;
+
+procedure FiniCharacterFix;
+begin
+  UnhookProc(@TCharacter.ToLower, TCharacter_ToLowerHook);
+  UnhookProc(@TCharacter.ToUpper, TCharacter_ToUpperHook);
+end;
+{$ENDIF CharacterFix}
+{ ---------------------------------------------------------------------------- }
+
+
+{ ---------------------------------------------------------------------------- }
+{ QC #69875: StringBuilder.Replace is incorrect
+             + a much faster implementation }
+{$IFDEF StringBuilderFix}
+var
+  TStringBuilder_ReplaceHook: TXRedirCode;
+
+type
+  TStringBuilderFix = class(TStringBuilder)
+  public
+    function Replace(const OldValue, NewValue: string; StartIndex, Count: Integer): TStringBuilder;
+  end;
+
+function TStringBuilderFix.Replace(const OldValue, NewValue: string;
+  StartIndex, Count: Integer): TStringBuilder;
+
+  procedure OffsetChars(Data: PChar; Offset: Integer; EndP: PChar); inline;
+  begin
+    Move(Data^, PChar(Data + Offset)^, (EndP - Data) * SizeOf(Char));
+  end;
+
+var
+  P, EndP, F: PChar;
+  FirstChar: Char;
+  OldValueLen, NewValueLen, DataLen: Integer;
+  FoundCount, I: Integer;
+  StackStart: Pointer;
+  StackP: ^PChar;
+  SizeChange: Integer;
+  NewLength: Integer;
+begin
+  { Bounds checking }
+  DataLen := System.Length(FData);
+  if StartIndex + Count >= DataLen then
+    Count := DataLen - StartIndex;
+
+  if (Count <= 0) or (StartIndex < 0) or (StartIndex >= DataLen) or (OldValue = '') then
+    Exit(Self);
+
+  OldValueLen := System.Length(OldValue);
+  NewValueLen := System.Length(NewValue);
+  SizeChange := NewValueLen - OldValueLen;
+
+  { Start stack position-buffer }
+  asm mov StackStart, esp end;
+
+  FoundCount := 0;
+  FirstChar := PChar(Pointer(OldValue))^;
+
+  P := PChar(@FData[StartIndex]);
+  while Count > 0 do
+  begin
+    while (Count > 0) and (P^ <> FirstChar) do
+    begin
+      Inc(P);
+      Dec(Count);
+    end;
+
+    if Count > 0 then
+    begin
+      if (OldValueLen = 1) or (StrLComp(P + 1, PChar(Pointer(OldValue)) + 1, OldValueLen - 1) = 0) then
+      begin
+        if SizeChange = 0 then
+        begin
+          { Replace inplace }
+          Move(NewValue[1], P^, OldValueLen * SizeOf(Char));
+        end
+        else
+        begin
+          { Save position to the stack and proceed }
+          asm push P end;
+          Inc(FoundCount);
+        end;
+        Inc(P, OldValueLen - 1);
+        Dec(Count, OldValueLen - 1);
+      end;
+    end;
+    Inc(P);
+    Dec(Count);
+  end;
+
+  NewLength := FLength + SizeChange * FoundCount;
+  if FoundCount > 0 then { Expand }
+  begin
+    { Offset the data from right to left }
+    if SizeChange > 0 then
+    begin
+      { Resize FData to the new length }
+      F := @FData[0];
+      if NewLength > System.Length(FData) then
+        SetLength(FData, NewLength);
+      EndP := PChar(@FData[FLength - 1]) + 1;
+
+      while FoundCount > 0 do
+      begin
+        asm pop P end; { take the last position from the stack }
+        P := PChar(@FData[0]) + (P - F);
+        { Offset all chars right to the OldValue by FoundCount*SizeChange }
+        OffsetChars(P + OldValueLen, FoundCount * SizeChange, EndP);
+        EndP := P;
+        { Put the NewValue into the buffer }
+        Move(NewValue[1], PChar(P + (FoundCount - 1) * SizeChange)^, NewValueLen * SizeOf(Char));
+        Dec(FoundCount);
+      end;
+    end
+    else { SizeChange < 0, Shrink }
+    begin
+      { Offset the data from left to right }
+
+      { Push the terminator to the stack; the loop uses the "next position" as EndP }
+      EndP := PChar(@FData[FLength - 1]) + 1;
+      asm push EndP end;
+
+      StackP := Pointer(INT_PTR(StackStart) - SizeOf(Pointer));
+      I := 0;
+      while FoundCount > 0 do
+      begin
+        P := StackP^;
+        Dec(StackP);
+        EndP := StackP^;
+        { Offset all chars right to the OldValue by FoundCount*SizeChange }
+        OffsetChars(@P[OldValueLen], (I + 1) * SizeChange, EndP);
+        { Put the NewValue into the buffer }
+        if NewValue <> '' then
+          Move(NewValue[1], P[I * SizeChange], NewValueLen * SizeOf(Char));
+        Inc(I);
+        Dec(FoundCount);
+      end;
+
+      {if NewLength > System.Length(FData) then
+        SetLength(FData, NewLength);}
+    end;
+  end;
+
+  { Release stack memory }
+  asm mov esp, StackStart end;
+
+  FLength := NewLength;
+  Result := Self;
+end;
+
+procedure InitStringBuilderFix;
+var
+  Proc: function(const OldValue: string; const NewValue: string; StartIndex: Integer; Count: Integer): TStringBuilder of object;
+begin
+  DebugLog('StringBuilderFix');
+  Proc := TStringBuilder(nil).Replace;
+  HookProc(TMethod(Proc).Code, @TStringBuilderFix.Replace, TStringBuilder_ReplaceHook);
+end;
+
+procedure FiniStringBuilderFix;
+var
+  Proc: function(const OldValue: string; const NewValue: string; StartIndex: Integer; Count: Integer): TStringBuilder of object;
+begin
+  Proc := TStringBuilder(nil).Replace;
+  UnhookProc(TMethod(Proc).Code, TStringBuilder_ReplaceHook);
+end;
+{$ENDIF StringBuilderFix}
+{ ---------------------------------------------------------------------------- }
+
+
+{ ---------------------------------------------------------------------------- }
+{ Workaround for Windows Vista CompareString bug }
+{$IFDEF VistaCompareStringFix}
+
+{**************************************************************************************************}
+{                                                                                                  }
+{ CompareString Fix                                                                                }
+{                                                                                                  }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (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.mozilla.org/MPL/                                                           }
+{                                                                                                  }
+{ Software distributed under the License is distributed on an "AS IS" basis, 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 is CompareStringFix.pas.                                                       }
+{                                                                                                  }
+{ The Initial Developer of the Original Code is Andreas Hausladen.                                 }
+{ Portions created by Andreas Hausladen are Copyright (C) 2008 Andreas Hausladen.                  }
+{ All Rights Reserved.                                                                             }
+{                                                                                                  }
+{ Contributor(s):                                                                                  }
+{ Apr 18, 2008 A. Garrels - When parameter Locale or user default LCID matches (German-Germany)    }
+{ and sort order equals SORT_GERMAN_PHONE_BOOK the patch must not be applied.                      }
+{                                                                                                  }
+{**************************************************************************************************}
+{ This unit contains a workaround for a Windows Vista bug.                                         }
+{ The Ü/ü ($DC/$FC) and the UE/ue are treated equal in all locales, but they aren't equal. There   }
+{ was a bugfix intended for Vista SP1 but it was removed before SP1 was released.                  }
+{ Windows 2008 Server still includes this bugfix but Vista will never get this bugfix.             }
+{ Microsoft: new versions are for correctness; service packs are for consistency and compatibility }
+{**************************************************************************************************}
+
+function _CompareStringA(Locale: LCID; dwCmpFlags: DWORD; lpString1: PAnsiChar;
+  cchCount1: Integer; lpString2: PAnsiChar; cchCount2: Integer): Integer; stdcall;
+  external kernel32 name 'CompareStringA';
+function _CompareStringW(Locale: LCID; dwCmpFlags: DWORD; lpString1: PWideChar;
+  cchCount1: Integer; lpString2: PWideChar; cchCount2: Integer): Integer; stdcall;
+  external kernel32 name 'CompareStringW';
+
+var
+  CompareStringAProc: function(Locale: LCID; dwCmpFlags: DWORD; lpString1: PAnsiChar;
+    cchCount1: Integer; lpString2: PAnsiChar; cchCount2: Integer): Integer; stdcall;
+  CompareStringWProc: function(Locale: LCID; dwCmpFlags: DWORD; lpString1: PWideChar;
+    cchCount1: Integer; lpString2: PWideChar; cchCount2: Integer): Integer; stdcall;
+  CompareStringFixRequired: Boolean;
+
+const
+  MaxCompareStringFixBuffer = 2047;
+var
+  CachedUserDefaultLCID: LCID = 0;
+  CachedSystemDefaultLCID: LCID = 0;
+
+function IsGermanPhonebookSortOrder(ALcid: LCID): Boolean; {$IF CompilerVersion >= 18.0} inline; {$IFEND}
+begin
+  if ALcid <> 0 then
+  begin
+    if ALcid = LOCALE_USER_DEFAULT then
+    begin
+      if CachedUserDefaultLCID = 0 then
+        CachedUserDefaultLCID := GetUserDefaultLCID();
+      ALcid := CachedUserDefaultLCID;
+    end
+    else if ALcid = LOCALE_SYSTEM_DEFAULT then
+    begin
+      if CachedSystemDefaultLCID = 0 then
+        CachedSystemDefaultLCID := GetSystemDefaultLCID();
+      ALcid := CachedSystemDefaultLCID;
+    end;
+
+    Result := (Word(ALcid) = $0407) and (ALcid shr 16 and $0F = SORT_GERMAN_PHONE_BOOK);
+  end
+  else
+    Result := False;
+end;
+
+function GetUmlautFixedString(P: PWideChar; var Count: Integer; Buf: PWideChar): PWideChar;
+const
+  CombiningDiaresis = $308;
+var
+  ValidCount, EndIndex, EndCount, I, CollationCount, Size, Cnt: Integer;
+  Ch: WideChar;
+  Source, Dest: PWideChar;
+begin
+  ValidCount := -1;
+  CollationCount := 0;
+  EndIndex := -1;
+  Source := P;
+
+  { Test for the affected code points }
+  if Count = -1 then
+  begin
+    Ch := Source^;
+    while Ch <> #0 do
+    begin
+      while Ch <> #0 do
+      begin
+        case Ch of
+          #$00DC, #$00FC:
+            Break;
+        end;
+        Inc(Source);
+        Ch := Source^;
+      end;
+
+      if Ch <> #0 then
+      begin
+        I := Source - P;
+        if ValidCount = -1 then
+          ValidCount := I;
+        EndIndex := I + 1;
+        Inc(CollationCount);
+        Inc(Source);
+        Ch := Source^;
+      end;
+    end;
+
+    Count := Source - P;
+  end
+  else
+  begin
+    Cnt := Count;
+    while Cnt > 0 do
+    begin
+      while Cnt <> 0 do
+      begin
+        case Source^ of
+          #$00DC, #$00FC:
+            Break;
+        end;
+        Inc(Source);
+        Dec(Cnt);
+      end;
+
+      if Cnt <> 0 then
+      begin
+        I := Source - P;
+        if ValidCount = -1 then
+          ValidCount := I;
+        EndIndex := I + 1;
+        Inc(CollationCount);
+        Inc(Source);
+        Dec(Cnt);
+      end;
+    end;
+  end;
+
+  if CollationCount > 0 then
+  begin
+    { Re-encode the string with combining diaresis }
+
+    EndCount := Count - EndIndex;
+    if EndCount < 4 then
+    begin
+      { Move() isn't faster if there are too less code points to copy }
+      EndIndex := Count;
+      EndCount := 0;
+    end;
+
+    { Allocate enough memory or use the stack based buffer if the string fits
+      into it. }
+    Inc(Count, CollationCount);
+    Size := (Count + 1) * SizeOf(WideChar);
+    if Count < MaxCompareStringFixBuffer then
+      Result := Buf
+    else
+      GetMem(Result, Size);
+
+    { Copy untouched code points }
+    if ValidCount >= 4 then
+      Move(P^, Result^, ValidCount * SizeOf(WideChar))
+    else
+      ValidCount := 0;
+
+    { Copy code points and replace "Ü" ($DC) and "ü" ($FC) with "U"/"u" + combining diaresis }
+    Source := P + ValidCount;
+    Dest := Result + ValidCount;
+    for I := ValidCount to EndIndex - 1 do
+    begin
+      Ch := Source^;
+      case Ch of
+        #$00DC:
+          begin
+            PLongint(Dest)^ := (CombiningDiaresis shl 16) or $55;
+            Inc(Dest);
+          end;
+        #$00FC:
+          begin
+            PLongint(Dest)^ := (CombiningDiaresis shl 16) or $75;
+            Inc(Dest);
+          end;
+      else
+        Dest^ := Ch;
+      end;
+      Inc(Dest);
+      Inc(Source);
+    end;
+
+    { Copy remaining untouched code points }
+    if EndCount > 0 then
+    begin
+      Move(Source^, Dest^, EndCount * SizeOf(WideChar));
+      Inc(Dest, EndCount);
+    end;
+    Dest^ := #0;
+  end
+  else
+    Result := P;
+end;
+
+function CompareStringW(Locale: LCID; dwCmpFlags: DWORD; lpString1: PWideChar;
+  cchCount1: Integer; lpString2: PWideChar; cchCount2: Integer): Integer; stdcall;
+var
+  String1, String2: PWideChar;
+  // Stack allocation is much faster than heap allocation
+  Buf1, Buf2: array[0..MaxCompareStringFixBuffer] of WideChar;
+begin
+  if (lpString1 <> nil) and (lpString2 <> nil) and (cchCount1 <> 0) and (cchCount2 <> 0) and
+     (lpString1 <> lpString2) and
+     not IsGermanPhonebookSortOrder(Locale) then
+  begin
+    String1 := GetUmlautFixedString(lpString1, cchCount1, Buf1);
+    String2 := GetUmlautFixedString(lpString2, cchCount2, Buf2);
+
+    Result := CompareStringWProc(Locale, dwCmpFlags, String1, cchCount1, String2, cchCount2);
+
+    if (String1 <> lpString1) and (String1 <> @Buf1[0]) then
+      FreeMem(String1);
+    if (String2 <> lpString2) and (String2 <> @Buf2[0]) then
+      FreeMem(String2);
+  end
+  else
+    Result := CompareStringWProc(Locale, dwCmpFlags, lpString1, cchCount1, lpString2, cchCount2);
+end;
+
+function CompareStringA(Locale: LCID; dwCmpFlags: DWORD; lpString1: PAnsiChar;
+  cchCount1: Integer; lpString2: PAnsiChar; cchCount2: Integer): Integer; stdcall;
+
+  function ContainsProblematicUmlaut(P: PAnsiChar; Count: Integer): Boolean;
+  begin
+    Result := True;
+    while Count > 0 do
+    begin
+      if P^ in [#$DC, #$FC] then
+        Exit;
+      Inc(P);
+      Dec(Count);
+    end;
+    Result := False;
+  end;
+
+var
+  String1, String2: WideString;
+begin
+  if (lpString1 <> nil) and (lpString2 <> nil) and (cchCount1 <> 0) and (cchCount2 <> 0) and
+     (lpString1 <> lpString2) and
+     not IsGermanPhonebookSortOrder(Locale) then
+  begin
+    case GetACP of
+      {1250,} 1252{, 1254, 1257, 1258}:
+        begin
+          if cchCount1 = -1 then
+            cchCount1 := StrLen(lpString1);
+          if cchCount2 = -1 then
+            cchCount2 := StrLen(lpString2);
+
+          if ContainsProblematicUmlaut(lpString1, cchCount1) or
+             ContainsProblematicUmlaut(lpString2, cchCount2) then
+          begin
+            SetString(String1, lpString1, cchCount1);
+            SetString(String2, lpString2, cchCount2);
+            Result := CompareStringW(Locale, dwCmpFlags, PWideChar(String1), Length(String1),
+                                     PWideChar(String2), Length(String2));
+            Exit;
+          end;
+        end;
+    end;
+  end;
+  Result := CompareStringAProc(Locale, dwCmpFlags, lpString1, cchCount1, lpString2, cchCount2);
+end;
+
+type
+  TJumpItem = packed record
+    Code: TXRedirCode;
+    Jump: Byte;
+    Offset: Integer;
+  end;
+  PJumpTable = ^TJumpTable;
+  TJumpTable = array[0..1] of TJumpItem;
+
+var
+  JumpTable: PJumpTable;
+
+procedure PatchWinAPI(Proc, Dest: Pointer; var JumpItem: TJumpItem);
+var
+  n: DWORD;
+  Code: TXRedirCode;
+begin
+  Proc := GetActualAddr(Proc);
+  Assert(Proc <> nil);
+
+  if ReadProcessMemory(GetCurrentProcess, Proc, @JumpItem.Code, SizeOf(JumpItem.Code), n) then
+  begin
+    JumpItem.Jump := $E9;
+    JumpItem.Offset := Integer(Proc) - Integer(@JumpItem) - SizeOf(JumpItem.Code);
+
+    Code.Jump := $E9;
+    Code.Offset := Integer(Dest) - Integer(Proc) - SizeOf(Code);
+
+    WriteProcessMemory(GetCurrentProcess, Proc, @Code, SizeOf(Code), n);
+  end;
+end;
+
+procedure UnpatchWinAPI(Proc: Pointer; const JumpItem: TJumpItem);
+var
+  n: Cardinal;
+begin
+  if JumpItem.Code.Jump <> 0 then
+  begin
+    Proc := GetActualAddr(Proc);
+    Assert(Proc <> nil);
+
+    WriteProcessMemory(GetCurrentProcess, Proc, @JumpItem.Code, SizeOf(JumpItem.Code), n);
+  end;
+end;
+
+procedure InitCompareStringFix;
+const
+  CSTR_EQUAL = 2;
+begin
+  { Only Vista is affected, Windows 2008 Server is not affected }
+  if (Win32Platform = VER_PLATFORM_WIN32_NT) and
+     (Win32MajorVersion = 6) and (Win32MinorVersion = 0) then
+  begin
+    CompareStringFixRequired := _CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, #$FC, 1, 'ue', 2) = CSTR_EQUAL;
+    if CompareStringFixRequired then
+    begin
+      OutputDebugStringW('Installing CompareString workaround for Windows Vista');
+      JumpTable := VirtualAlloc(nil, SizeOf(TJumpTable), MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+
+      PatchWinAPI(@_CompareStringA, @CompareStringA, JumpTable[0]);
+      CompareStringAProc := @JumpTable[0];
+      PatchWinAPI(@_CompareStringW, @CompareStringW, JumpTable[1]);
+      CompareStringWProc := @JumpTable[1];
+    end;
+  end;
+end;
+
+procedure FiniCompareStringFix;
+begin
+  if CompareStringFixRequired then
+  begin
+    UnpatchWinAPI(@_CompareStringA, JumpTable[0]);
+    UnpatchWinAPI(@_CompareStringW, JumpTable[1]);
+
+    VirtualFree(JumpTable, 0, MEM_RELEASE);
+    JumpTable := nil;
+  end;
+end;
+{$ENDIF VistaCompareStringFix}
+{ ---------------------------------------------------------------------------- }
+
+
+initialization
+  {$IFDEF GetNonToolWindowPopupParentFix}
+  FixGetNonToolWindowPopupParent;
+  {$ENDIF GetNonToolWindowPopupParentFix}
+
+  {$IFDEF TaskModalDialogFix}
+  InitTaskModalDialogFix;
+  {$ENDIF TaskModalDialogFix}
+
+  {$IFDEF AppDeActivateZOrderFix}
+  InitAppDeActivateZOrderFix;
+  {$ENDIF AppDeActivateZOrderFix}
+
+  {$IFDEF HideStackTrashingFix}
+  FindTopMostWindowProc := GetAddrOfFindTopMostWindow;
+  if FindTopMostWindowProc <> nil then
+  begin
+    DebugLog('HideStackTrashingFix');
+    HookProc(FindTopMostWindowProc, @FindTopMostWindow, FindTopMostWindowHook);
+  end;
+  {$ENDIF HideStackTrashingFix}
+
+  {$IFDEF ControlResizeFix}
+  InitControlResizeFix;
+  {$ENDIF ControlResizeFix}
+
+  {$IFDEF ActionListAVFix}
+  InitActionListAVFix;
+  {$ENDIF ActionListAVFix}
+
+  {$IFDEF ContextMenuFix}
+  InitContextMenuFix;
+  {$ENDIF ContextMenuFix}
+
+  {$IFDEF ObjAutoDEPFix}
+  InitObjAutoDEPFix;
+  {$ENDIF ObjAutoDEPFix}
+
+  {$IFDEF AppMinimizeFix}
+  InitAppMinimizeFix;
+  {$ENDIF AppMinimizeFix}
+
+  {$IFDEF SysUtilsAbortFix}
+  InitSysUtilsAbortFix;
+  {$ENDIF SysUtilsAbortFix}
+
+  {$IFDEF CmdShowMinimizeFix}
+  InitCmdShowMinimizeFix;
+  {$ENDIF CmdShowMinimizeFix}
+
+  {$IFDEF MDIChildFocusFix}
+  InitMDIChildFocusFix;
+  {$ENDIF MDIChildFocusFix}
+
+  {$IFDEF PageControlPaintingFix}
+  InitPageControlPaintingFix;
+  {$ENDIF PageControlPaintingFix}
+
+  {$IFDEF GridFlickerFix}
+  InitGridFlickerFix;
+  {$ENDIF GridFlickerFix}
+
+  {$IFDEF SpeedButtonGlassFix}
+  InitSpeedButtonGlassFix;
+  {$ENDIF SpeedButtonGlassFix}
+
+  {$IFDEF VistaProgressBarMarqueeFix}
+  InitVistaProgressBarMarqueeFix;
+  {$ENDIF VistaProgressBarMarqueeFix}
+
+  {$IFDEF DBNavigatorFix}
+  InitDBNavigatorFix;
+  {$ENDIF DBNavigatorFix}
+
+  {$IFDEF CharacterFix}
+  InitCharacterFix;
+  {$ENDIF CharacterFix}
+
+  {$IFDEF StringBuilderFix}
+  InitStringBuilderFix;
+  {$ENDIF StringBuilderFix}
+
+  {$IFDEF VistaCompareStringFix}
+  InitCompareStringFix;
+  {$ENDIF VistaCompareStringFix}
+
+finalization
+  // In revers order
+
+  {$IFDEF VistaCompareStringFix}
+  FiniCompareStringFix;
+  {$ENDIF VistaCompareStringFix}
+
+  {$IFDEF StringBuilderFix}
+  FiniStringBuilderFix;
+  {$ENDIF StringBuilderFix}
+
+  {$IFDEF CharacterFix}
+  FiniCharacterFix;
+  {$ENDIF CharacterFix}
+
+  {$IFDEF DBNavigatorFix}
+  FiniDBNavigatorFix;
+  {$ENDIF DBNavigatorFix}
+
+  {$IFDEF VistaProgressBarMarqueeFix}
+  FiniVistaProgressBarMarqueeFix;
+  {$ENDIF VistaProgressBarMarqueeFix}
+
+  {$IFDEF SpeedButtonGlassFix}
+  FiniSpeedButtonGlassFix;
+  {$ENDIF SpeedButtonGlassFix}
+
+  {$IFDEF GridFlickerFix}
+  FiniGridFlickerFix;
+  {$ENDIF GridFlickerFix}
+
+  {$IFDEF PageControlPaintingFix}
+  FiniPageControlPaintingFix;
+  {$ENDIF PageControlPaintingFix}
+
+  {$IFDEF MDIChildFocusFix}
+  FiniMDIChildFocusFix;
+  {$ENDIF MDIChildFocusFix}
+
+  {$IFDEF CmdShowMinimizeFix}
+  FiniCmdShowMinimizeFix;
+  {$ENDIF CmdShowMinimizeFix}
+
+  {$IFDEF SysUtilsAbortFix}
+  FiniSysUtilsAbortFix;
+  {$ENDIF SysUtilsAbortFix}
+
+  {$IFDEF AppMinimizeFix}
+  FiniAppMinimizeFix;
+  {$ENDIF AppMinimizeFix}
+
+  {$IFDEF ObjAutoDEPFix}
+  FiniObjAutoDEPFix;
+  {$ENDIF ObjAutoDEPFix}
+
+  {$IFDEF ContextMenuFix}
+  FiniContextMenuFix;
+  {$ENDIF ContextMenuFix}
+
+  {$IFDEF ActionListAVFix}
+  FiniActionListAVFix;
+  {$ENDIF ActionListAVFix}
+
+  {$IFDEF ControlResizeFix}
+  FiniControlResizeFix;
+  {$ENDIF ControlResizeFix}
+
+  {$IFDEF HideStackTrashingFix}
+  if FindTopMostWindowProc <> nil then
+    UnhookProc(FindTopMostWindowProc, FindTopMostWindowHook);
+  {$ENDIF HideStackTrashingFix}
+
+  {$IFDEF TaskModalDialogFix}
+  FiniTaskModalDialogFix;
+  {$ENDIF TaskModalDialogFix}
+
+  {$IFDEF AppDeActivateZOrderFix}
+  FiniAppDeActivateZOrderFix;
+  {$ENDIF AppDeActivateZOrderFix}
+
+  {$IFDEF MkObjInstLeakFix}
+  MkObjInstLeakHooked := False;
+  ReleaseObjectInstanceBlocks;
+  {$ENDIF MkObjInstLeakFix}
+
+end.
diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas
index 13bb5a08..6579c186 100644
--- a/Source/GUIBase/uViewGridBase.pas
+++ b/Source/GUIBase/uViewGridBase.pas
@@ -190,14 +190,14 @@ procedure Register;
 implementation
 
 uses
-  CCReg, uDMBase, cxGridBandedTableView, uDBSelectionListUtils,
+  uDMBase, cxGridBandedTableView, uDBSelectionListUtils,
   uSistemaFunc, SHFolder, uAppInfoUtils;
 
 {$R *.dfm}
 
 procedure Register;
 begin
-  RegisterCustomContainer(TfrViewGridBase);
+  //RegisterCustomContainer(TfrViewGridBase);
 end;
 
 { TfrViewGrid }
diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm
index 49304abe..d43c086f 100644
--- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm	
@@ -1,7 +1,6 @@
 object srvAlbaranesCliente: TsrvAlbaranesCliente
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schAlbaranesCliente
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas
index f238a8ad..b5c0b8bc 100644
--- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas	
+++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas	
@@ -68,7 +68,7 @@ end;
 
 procedure TsrvAlbaranesCliente.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpAlbaranesCliente.BusinessRulesID := BIZ_SERVER_ALBARAN_CLIENTE;
 end;
 
diff --git a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm
index 6c6f40fd..68a9dc1f 100644
--- a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm	
@@ -1,8 +1,6 @@
 object srvAlbaranesProveedor: TsrvAlbaranesProveedor
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schAlbaranesProveedor
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas
index b53fdb8f..84bcd473 100644
--- a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas	
@@ -72,7 +72,7 @@ end;
 
 procedure TsrvAlbaranesProveedor.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpAlbaranesProveedor.BusinessRulesID := BIZ_SERVER_ALBARAN_PROVEEDOR;
 end;
 
diff --git a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm
index 0bc5b8bf..76e621d5 100644
--- a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm
+++ b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm
@@ -1,8 +1,6 @@
 object srvAlmacenes: TsrvAlmacenes
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schAlmacenes
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas
index 1abaf9e8..e6a9d17b 100644
--- a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas
+++ b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas
@@ -63,7 +63,7 @@ end;
 
 procedure TsrvAlmacenes.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 function TsrvAlmacenes.DarListaAlmacenes(const IDEmpresa: Integer): Binary;
diff --git a/Source/Modulos/Articulos/Plugin/Articulos_plugin.dpk b/Source/Modulos/Articulos/Plugin/Articulos_plugin.dpk
index bf6268f0c101693dd4900681514769c1a1a41272..d3304256ee09a8cf46a63015bdb959500548065c 100644
GIT binary patch
delta 13
UcmaFC@`7c<XGTWD$zK>t04j|Is{jB1

delta 13
UcmaFC@`7c<XGTVY$zK>t04j(DssI20

diff --git a/Source/Modulos/Articulos/Plugin/Articulos_plugin.dproj b/Source/Modulos/Articulos/Plugin/Articulos_plugin.dproj
index 088d1bf5..a52a5e2b 100644
--- a/Source/Modulos/Articulos/Plugin/Articulos_plugin.dproj
+++ b/Source/Modulos/Articulos/Plugin/Articulos_plugin.dproj
@@ -89,7 +89,7 @@
     </DelphiCompile>
     <DCCReference Include="Articulos_controller.dcp" />
     <DCCReference Include="Articulos_view.dcp" />
-    <DCCReference Include="PluginSDK_D10R.dcp" />
+    <DCCReference Include="PluginSDK_D11R.dcp" />
     <DCCReference Include="uPluginArticulos.pas" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
index 4c3fe585..127e71b0 100644
--- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
+++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
@@ -1,8 +1,6 @@
 object srvArticulos: TsrvArticulos
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schArticulos
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas
index b5a0bff5..876b9730 100644
--- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas
+++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas
@@ -64,7 +64,7 @@ end;
 
 procedure TsrvArticulos.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpArticulos.BusinessRulesID := BIZ_SERVER_ARTICULOS;
 end;
 
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dpk b/Source/Modulos/Articulos/Views/Articulos_view.dpk
index 07b01a16..c143bb7e 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dpk
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dpk
@@ -32,7 +32,7 @@ requires
   UnidadesMedida_controller,
   Contactos_view,
   Fabricantes_controller,
-  GUISDK_D11;
+  GUISDK_D11R;
 
 contains
   uViewArticulos in 'uViewArticulos.pas' {frViewArticulos: TFrame},
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj
index c9e48c1f..c4420a14 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dproj
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj
@@ -61,7 +61,7 @@
     <DCCReference Include="..\..\..\Servidor\Fabricantes_controller.dcp" />
     <DCCReference Include="..\..\..\Servidor\Familias_controller.dcp" />
     <DCCReference Include="..\..\..\Servidor\GUIBase.dcp" />
-    <DCCReference Include="..\..\..\Servidor\GUISDK_D11.dcp" />
+    <DCCReference Include="..\..\..\Servidor\GUISDK_D11R.dcp" />
     <DCCReference Include="..\..\..\Servidor\UnidadesMedida_controller.dcp" />
     <DCCReference Include="uArticulosViewRegister.pas" />
     <DCCReference Include="uEditorArticulo.pas">
diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.dpk b/Source/Modulos/Contactos/Controller/Contactos_controller.dpk
index a5ede5b8..fc2d5ac3 100644
--- a/Source/Modulos/Contactos/Controller/Contactos_controller.dpk
+++ b/Source/Modulos/Contactos/Controller/Contactos_controller.dpk
@@ -32,7 +32,7 @@ requires
   ApplicationBase,
   Contactos_model,
   Contactos_data,
-  GUISDK_D11,
+  GUISDK_D11R,
   xmlrtl,
   cfpack_d11,
   vclx,
diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
index 987ceef1..8ca053f3 100644
--- a/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
+++ b/Source/Modulos/Contactos/Controller/Contactos_controller.dproj
@@ -73,7 +73,7 @@
     <DCCReference Include="View\Contactos_model.dcp" />
     <DCCReference Include="View\designide.dcp" />
     <DCCReference Include="View\GUIBase.dcp" />
-    <DCCReference Include="View\GUISDK_D11.dcp" />
+    <DCCReference Include="View\GUISDK_D11R.dcp" />
     <DCCReference Include="View\rtl.dcp" />
     <DCCReference Include="View\uIEditorCliente.pas" />
     <DCCReference Include="View\uIEditorClientes.pas" />
diff --git a/Source/Modulos/Contactos/Plugin/Contactos_plugin.dpk b/Source/Modulos/Contactos/Plugin/Contactos_plugin.dpk
index 2225d921f411c554249618c6c0ac4641dfa2a9c3..66267c4ee2f5c9b7ef699213b23457464cad2786 100644
GIT binary patch
delta 13
UcmX@kdYp9wGZUlXWEQ5w03DM9+yDRo

delta 13
UcmX@kdYp9wGZUl1WEQ5w03D74+W-In

diff --git a/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj b/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj
index 82a3ff5a..7c36759f 100644
--- a/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj
+++ b/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj
@@ -53,7 +53,7 @@
     <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_data.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D10R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
     <DCCReference Include="uPluginContactos.pas">
diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
index e43c75c1..10a03ccc 100644
--- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
+++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
@@ -1,7 +1,6 @@
 object srvContactos: TsrvContactos
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schContactos
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas
index e629e66d..8c7864fb 100644
--- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas
+++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas
@@ -79,7 +79,7 @@ end;
 
 procedure TsrvContactos.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 
   bpContactos.BusinessRulesID := BIZ_SERVER_CONTACTO;
   bpEmpleados.BusinessRulesID := BIZ_SERVER_EMPLEADO;
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dpk b/Source/Modulos/Contactos/Views/Contactos_view.dpk
index 681f1760..21126751 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dpk
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dpk
@@ -62,7 +62,7 @@ requires
   JclVcl,
   bdertl,
   JvSystemD11R,
-  GUISDK_D11,
+  GUISDK_D11R,
   xmlrtl,
   cfpack_d11,
   designide,
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index f4a01bad..3aef4823 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -75,7 +75,7 @@
     <DCCReference Include="..\FormasPago_controller.dcp" />
     <DCCReference Include="..\FormasPago_model.dcp" />
     <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\GUISDK_D11.dcp" />
+    <DCCReference Include="..\GUISDK_D11R.dcp" />
     <DCCReference Include="..\Jcl.dcp" />
     <DCCReference Include="..\JclVcl.dcp" />
     <DCCReference Include="..\JvCoreD11R.dcp" />
diff --git a/Source/Modulos/Fabricantes/Plugin/Fabricantes_plugin.dpk b/Source/Modulos/Fabricantes/Plugin/Fabricantes_plugin.dpk
index de41f2fa762553a9bc3cd3c59a41644c69b14dc0..207b2527c8558d900ef6e963814aca77f8eca91b 100644
GIT binary patch
delta 13
Ucmcc0dX;qpD-)yPWHzSr03QVe2mk;8

delta 13
Ucmcc0dX;qpD-)x^WHzSr03QGZ2LJ#7

diff --git a/Source/Modulos/Fabricantes/Plugin/Fabricantes_plugin.dproj b/Source/Modulos/Fabricantes/Plugin/Fabricantes_plugin.dproj
index 504c3050..36496b75 100644
--- a/Source/Modulos/Fabricantes/Plugin/Fabricantes_plugin.dproj
+++ b/Source/Modulos/Fabricantes/Plugin/Fabricantes_plugin.dproj
@@ -53,7 +53,7 @@
     <DCCReference Include="Fabricantes_model.dcp" />
     <DCCReference Include="Fabricantes_view.dcp" />
     <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="PluginSDK_D10R.dcp" />
+    <DCCReference Include="PluginSDK_D11R.dcp" />
     <DCCReference Include="rtl.dcp" />
     <DCCReference Include="uPluginFabricantes.pas">
       <Form>PluginFabricantes</Form>
diff --git a/Source/Modulos/Fabricantes/Servidor/srvFabricantes_Impl.dfm b/Source/Modulos/Fabricantes/Servidor/srvFabricantes_Impl.dfm
index b8dcedaf..12cb86a0 100644
--- a/Source/Modulos/Fabricantes/Servidor/srvFabricantes_Impl.dfm
+++ b/Source/Modulos/Fabricantes/Servidor/srvFabricantes_Impl.dfm
@@ -1,8 +1,6 @@
 object srvFabricantes: TsrvFabricantes
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ServiceSchema = schFabricantes
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <>
diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
index b2e8b34d..15d98fad 100644
--- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
+++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
@@ -1,7 +1,6 @@
 object srvFacturasCliente: TsrvFacturasCliente
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schFacturasCliente
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas
index b5107913..d235698e 100644
--- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas	
+++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas	
@@ -73,7 +73,7 @@ end;
 
 procedure TsrvFacturasCliente.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpFacturasCliente.BusinessRulesID := BIZ_SERVER_FACTURAS_CLIENTE;
 end;
 
diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm
index f4e5b984..a6dd3196 100644
--- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm	
@@ -1,8 +1,6 @@
 object srvFacturasProveedor: TsrvFacturasProveedor
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schFacturasProveedor
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas
index 210bce0c..bfde10a1 100644
--- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas	
+++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas	
@@ -67,7 +67,7 @@ end;
 
 procedure TsrvFacturasProveedor.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpFacturasProveedor.BusinessRulesID := BIZ_SERVER_FACTURAS_PROVEEDOR;
 end;
 
diff --git a/Source/Modulos/Familias/Plugin/Familias_plugin.dpk b/Source/Modulos/Familias/Plugin/Familias_plugin.dpk
index 7e6e631cf8b92a0df56db5f4434c340168a3a828..2effbfe6864f832f65bb4543091e792aa3c556f5 100644
GIT binary patch
delta 13
UcmZ3_x}J4I1{0&<<V+?v03R&_`2YX_

delta 13
UcmZ3_x}J4I1{0&f<V+?v03Rp=_y7O^

diff --git a/Source/Modulos/Familias/Plugin/Familias_plugin.dproj b/Source/Modulos/Familias/Plugin/Familias_plugin.dproj
index 0aa38933..e5d0baa3 100644
--- a/Source/Modulos/Familias/Plugin/Familias_plugin.dproj
+++ b/Source/Modulos/Familias/Plugin/Familias_plugin.dproj
@@ -52,7 +52,7 @@
     <DCCReference Include="C:\Documents and Settings\Usuario\Familias_model.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\Familias_view.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D10R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
     <DCCReference Include="uPluginFamilias.pas" />
diff --git a/Source/Modulos/Familias/Servidor/srvFamilias_Impl.dfm b/Source/Modulos/Familias/Servidor/srvFamilias_Impl.dfm
index 9e6f53ab..8657dcb9 100644
--- a/Source/Modulos/Familias/Servidor/srvFamilias_Impl.dfm
+++ b/Source/Modulos/Familias/Servidor/srvFamilias_Impl.dfm
@@ -1,7 +1,6 @@
 object srvFamilias: TsrvFamilias
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schFamilias
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Familias/Servidor/srvFamilias_Impl.pas b/Source/Modulos/Familias/Servidor/srvFamilias_Impl.pas
index 3fca6745..bee0295d 100644
--- a/Source/Modulos/Familias/Servidor/srvFamilias_Impl.pas
+++ b/Source/Modulos/Familias/Servidor/srvFamilias_Impl.pas
@@ -46,7 +46,7 @@ end;
 { srvFamilias }
 procedure TsrvFamilias.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 procedure TsrvFamilias.DataAbstractServiceBeforeAcquireConnection(
diff --git a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dpk b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dpk
index d5d4f391ab75b524ab39664204e8e379313a63e4..4a518989db94e47e9ccde1387b50121a5cdbb07e 100644
GIT binary patch
delta 13
UcmX@ZdYW}ZBNL<H<R&Ih03z@NX8-^I

delta 15
WcmX@jdWLmFBNL;+<R&IhMg{;Yw*+SZ

diff --git a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj
index aa09e22e..20442ca6 100644
--- a/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj	
+++ b/Source/Modulos/Formas de pago/Plugin/FormasPago_plugin.dproj	
@@ -53,7 +53,7 @@
     <DCCReference Include="..\FormasPago_model.dcp" />
     <DCCReference Include="..\FormasPago_view.dcp" />
     <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\PluginSDK_D11R.dcp" />
     <DCCReference Include="..\rtl.dcp" />
     <DCCReference Include="..\vcl.dcp" />
     <DCCReference Include="uPluginFormasPago.pas" />
diff --git a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm
index 639d9c59..467eab3b 100644
--- a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm	
+++ b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.dfm	
@@ -1,7 +1,6 @@
 object srvFormasPago: TsrvFormasPago
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ServiceSchema = schFormasPago
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <>
diff --git a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas
index 0cf6e35b..b56f2a37 100644
--- a/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas	
+++ b/Source/Modulos/Formas de pago/Servidor/srvFormasPago_Impl.pas	
@@ -49,7 +49,7 @@ end;
 { srvFormasPago }
 procedure TsrvFormasPago.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+//  SessionManager := dmServer.SessionManager;
 end;
 
 function TsrvFormasPago.DarListaFormasPago: Binary;
diff --git a/Source/Modulos/Gestor de informes/Servidor/NewService_Impl.dfm b/Source/Modulos/Gestor de informes/Servidor/NewService_Impl.dfm
index 76f3ebcb..c10ac509 100644
--- a/Source/Modulos/Gestor de informes/Servidor/NewService_Impl.dfm	
+++ b/Source/Modulos/Gestor de informes/Servidor/NewService_Impl.dfm	
@@ -1,6 +1,5 @@
 object NewService: TNewService
   OldCreateOrder = True
-  SessionManager = dmServer.SessionManager
   ServiceSchema = Schema
   ServiceDataStreamer = DABinDataStreamer1
   ExportedDataTables = <
diff --git a/Source/Modulos/Gestor de informes/Servidor/srvGestorInformes_Impl.dfm b/Source/Modulos/Gestor de informes/Servidor/srvGestorInformes_Impl.dfm
index 00a2ec96..de4c57ad 100644
--- a/Source/Modulos/Gestor de informes/Servidor/srvGestorInformes_Impl.dfm	
+++ b/Source/Modulos/Gestor de informes/Servidor/srvGestorInformes_Impl.dfm	
@@ -1,6 +1,5 @@
 object srvGestorInformes: TsrvGestorInformes
   OldCreateOrder = True
-  SessionManager = dmServer.SessionManager
   ServiceSchema = Schema
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <
diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk
index 806c9a69..958b4734 100644
--- a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk	
+++ b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk	
@@ -50,7 +50,7 @@ requires
   JvSystemD11R,
   JvStdCtrlsD11R,
   JvPageCompsD11R,
-  GUISDK_D11,
+  GUISDK_D11R,
   xmlrtl,
   cfpack_d11,
   designide,
diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj
index 6cb7c4a4..6a768ffc 100644
--- a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj	
+++ b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj	
@@ -59,7 +59,7 @@
     <DCCReference Include="fs11.dcp" />
     <DCCReference Include="GestorInformes_controller.dcp" />
     <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="GUISDK_D11.dcp" />
+    <DCCReference Include="GUISDK_D11R.dcp" />
     <DCCReference Include="Jcl.dcp" />
     <DCCReference Include="JclVcl.dcp" />
     <DCCReference Include="JvCoreD11R.dcp" />
diff --git a/Source/Modulos/Historico de movimientos/Servidor/srvHistoricoMovimientos_Impl.dfm b/Source/Modulos/Historico de movimientos/Servidor/srvHistoricoMovimientos_Impl.dfm
index 0245f6d1..5077183e 100644
--- a/Source/Modulos/Historico de movimientos/Servidor/srvHistoricoMovimientos_Impl.dfm	
+++ b/Source/Modulos/Historico de movimientos/Servidor/srvHistoricoMovimientos_Impl.dfm	
@@ -1,6 +1,5 @@
 object srvHistoricoMovimientos: TsrvHistoricoMovimientos
   OldCreateOrder = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schHistoricoMovimientos
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm b/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
index b852946f..a669f164 100644
--- a/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
+++ b/Source/Modulos/Inventario/Servidor/srvInventario_Impl.dfm
@@ -1,6 +1,5 @@
 object srvInventario: TsrvInventario
   OldCreateOrder = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schInventario
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm b/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
index 8e6f64b1..d41cde7d 100644
--- a/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
+++ b/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
@@ -1,8 +1,6 @@
 object srvObras: TsrvObras
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schObras
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Obras/Servidor/srvObras_Impl.pas b/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
index c89b58e5..d77f9d96 100644
--- a/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
+++ b/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
@@ -67,7 +67,7 @@ end;
 
 procedure TsrvObras.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+//  SessionManager := dmServer.SessionManager;
   bpObras.BusinessRulesID := BIZ_SERVER_OBRA;
 end;
 
diff --git a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm
index 72ef9a74..f278a93e 100644
--- a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm	
@@ -1,7 +1,6 @@
 object srvPedidosProveedor: TsrvPedidosProveedor
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schPedidosProveedor
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas
index 3172164a..45a4fef4 100644
--- a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas	
@@ -76,7 +76,7 @@ end;
 
 procedure TsrvPedidosProveedor.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpPedidosProveedor.BusinessRulesID := BIZ_SERVER_PEDIDOS_PROVEEDOR;
 end;
 
diff --git a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm
index 89f09b2d..f176f8e3 100644
--- a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm	
@@ -1,7 +1,6 @@
 object srvPresupuestosCliente: TsrvPresupuestosCliente
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schPresupuestosCliente
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.pas b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.pas
index 862faac0..268ca59e 100644
--- a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.pas	
@@ -72,7 +72,7 @@ end;
 
 procedure TsrvPresupuestosCliente.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpPresupuestosCliente.BusinessRulesID := BIZ_SERVER_PRESUPUESTOS_CLIENTE;
 end;
 
diff --git a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm
index ecb4ab48..89b0d41f 100644
--- a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm	
+++ b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm	
@@ -1,8 +1,6 @@
 object srvRecibosCliente: TsrvRecibosCliente
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schRecibosCliente
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas
index 075055dc..4e3b4e40 100644
--- a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas	
+++ b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas	
@@ -68,7 +68,7 @@ end;
 
 procedure TsrvRecibosCliente.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 procedure TsrvRecibosCliente.DataAbstractServiceBeforeAcquireConnection(aSender: TObject; var aConnectionName: string);
diff --git a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm
index 3406bc57..716cfb2d 100644
--- a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm	
+++ b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm	
@@ -1,7 +1,6 @@
 object srvRecibosProveedor: TsrvRecibosProveedor
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schRecibosProveedor
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.pas b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.pas
index 2c8345ab..846e5657 100644
--- a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.pas	
+++ b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.pas	
@@ -66,7 +66,7 @@ end;
 
 procedure TsrvRecibosProveedor.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 procedure TsrvRecibosProveedor.DataAbstractServiceBeforeAcquireConnection(
diff --git a/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.dfm b/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.dfm
index 52eef274..4bd91111 100644
--- a/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.dfm
+++ b/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.dfm
@@ -1,7 +1,6 @@
 object srvReferencias: TsrvReferencias
   OldCreateOrder = True
   OnCreate = DataAbstractServiceCreate
-  SessionManager = dmServer.SessionManager
   ServiceSchema = schReferencias
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <>
diff --git a/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas b/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas
index abe2dcf8..341c5380 100644
--- a/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas
+++ b/Source/Modulos/Referencias/Servidor/srvReferencias_Impl.pas
@@ -112,7 +112,7 @@ end;
 
 procedure TsrvReferencias.DataAbstractServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 function TsrvReferencias.IncrementarValorReferencia(const NombreReferencia: String;
diff --git a/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.dfm b/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.dfm
index 684f7b8c..ee80139d 100644
--- a/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.dfm	
+++ b/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.dfm	
@@ -1,8 +1,6 @@
 object srvRemesasCliente: TsrvRemesasCliente
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schRemesasCliente
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas b/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas
index c4b2194c..25f34b95 100644
--- a/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas	
+++ b/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas	
@@ -67,7 +67,7 @@ end;
 
 procedure TsrvRemesasCliente.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpRemesasCliente.BusinessRulesID := BIZ_SERVER_REMESAS_CLIENTE;  
 end;
 
diff --git a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm
index 816d130a..8eeef385 100644
--- a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm	
+++ b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm	
@@ -1,8 +1,6 @@
 object srvRemesasProveedor: TsrvRemesasProveedor
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schRemesasProveedor
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas
index 890392c3..29375395 100644
--- a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas	
+++ b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas	
@@ -66,7 +66,7 @@ end;
 
 procedure TsrvRemesasProveedor.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
   bpRemesasProveedor.BusinessRulesID := BIZ_SERVER_REMESAS_PROVEEDOR;  
 end;
 
diff --git a/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dpk b/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dpk
index 447d8e4c4cc9290ea96514353713b34dce86ee0a..2965d2e4290c6597d9abbfde3a378b352af235f0 100644
GIT binary patch
delta 13
UcmZ3_x}J3d6BDE1WM-x{02?s_lK=n!

delta 13
UcmZ3_x}J3d6BDDsWM-x{02?d=k^lez

diff --git a/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj b/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj
index 9775a151..ff863ac3 100644
--- a/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj	
+++ b/Source/Modulos/Tipos de IVA/Plugin/TiposIVA_plugin.dproj	
@@ -50,7 +50,7 @@
     <DCCReference Include="..\ApplicationBase.dcp" />
     <DCCReference Include="..\Base.dcp" />
     <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\PluginSDK_D11R.dcp" />
     <DCCReference Include="..\rtl.dcp" />
     <DCCReference Include="..\TiposIVA_controller.dcp" />
     <DCCReference Include="..\TiposIVA_model.dcp" />
diff --git a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm
index dc637b57..e2e6b466 100644
--- a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm	
+++ b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.dfm	
@@ -1,8 +1,6 @@
 object srvTiposIVA: TsrvTiposIVA
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ServiceSchema = schTiposIVA
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <>
diff --git a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas
index 45009983..720486f7 100644
--- a/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas	
+++ b/Source/Modulos/Tipos de IVA/Servidor/srvTiposIVA_Impl.pas	
@@ -47,7 +47,7 @@ end;
 { srvTiposIVA }
 procedure TsrvTiposIVA.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 function TsrvTiposIVA.DarListaTiposIVA: Binary;
diff --git a/Source/Modulos/Unidades de medida/Plugin/UnidadesMedida_plugin.dpk b/Source/Modulos/Unidades de medida/Plugin/UnidadesMedida_plugin.dpk
index d0a7fd25029e5f9cfd89686d410e7465ff8d1d3e..4248fa3a5814763ed3fe7a1c1e7b19196d165404 100644
GIT binary patch
delta 13
Ucmcc2dYN?t2NR>=WKO1203PuK1poj5

delta 13
Ucmcc2dYN?t2NR>gWKO1203PfF1ONa4

diff --git a/Source/Modulos/Unidades de medida/Plugin/UnidadesMedida_plugin.dproj b/Source/Modulos/Unidades de medida/Plugin/UnidadesMedida_plugin.dproj
index e238ce0d..c416c7ea 100644
--- a/Source/Modulos/Unidades de medida/Plugin/UnidadesMedida_plugin.dproj	
+++ b/Source/Modulos/Unidades de medida/Plugin/UnidadesMedida_plugin.dproj	
@@ -50,7 +50,7 @@
     <DCCReference Include="..\..\..\Cliente\ApplicationBase.dcp" />
     <DCCReference Include="..\..\..\Cliente\Base.dcp" />
     <DCCReference Include="..\..\..\Cliente\GUIBase.dcp" />
-    <DCCReference Include="..\..\..\Cliente\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\..\..\Cliente\PluginSDK_D11R.dcp" />
     <DCCReference Include="..\..\..\Cliente\rtl.dcp" />
     <DCCReference Include="..\..\..\Cliente\UnidadesMedida_controller.dcp" />
     <DCCReference Include="..\..\..\Cliente\UnidadesMedida_model.dcp" />
diff --git a/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.dfm b/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.dfm
index 6472a7f2..2c39445a 100644
--- a/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.dfm	
+++ b/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.dfm	
@@ -1,8 +1,6 @@
 object srvUnidadesMedida: TsrvUnidadesMedida
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  RequiresSession = True
-  SessionManager = dmServer.SessionManager
   ServiceSchema = schUnidadesMedida
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <>
diff --git a/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.pas b/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.pas
index b116c352..de1942ea 100644
--- a/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.pas	
+++ b/Source/Modulos/Unidades de medida/Servidor/srvUnidadesMedida_Impl.pas	
@@ -46,7 +46,7 @@ end;
 { srvUnidadesMedida }
 procedure TsrvUnidadesMedida.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 procedure TsrvUnidadesMedida.DataAbstractServiceBeforeAcquireConnection(
diff --git a/Source/Servicios/FactuGES.RODL b/Source/Servicios/FactuGES.RODL
index 63b01073..d52537dd 100644
--- a/Source/Servicios/FactuGES.RODL
+++ b/Source/Servicios/FactuGES.RODL
@@ -27,13 +27,13 @@
 </Operation>
 <Operation Name="DarListaDescripcionesProveedores" UID="{F3C0D310-7A7D-4944-9E69-B8AC84FEFA00}">
 <Parameters>
-<Parameter Name="Result" DataType="String" Flag="Result">
+<Parameter Name="Result" DataType="AnsiString" Flag="Result">
 </Parameter>
 </Parameters>
 </Operation>
 <Operation Name="DarListaContratosEmpleados" UID="{988C2AB6-4815-4F1B-891C-CFBB57E7B85E}">
 <Parameters>
-<Parameter Name="Result" DataType="String" Flag="Result">
+<Parameter Name="Result" DataType="AnsiString" Flag="Result">
 </Parameter>
 </Parameters>
 </Operation>
@@ -50,9 +50,9 @@
 <Parameters>
 <Parameter Name="Result" DataType="Boolean" Flag="Result">
 </Parameter>
-<Parameter Name="User" DataType="String" Flag="In" >
+<Parameter Name="User" DataType="AnsiString" Flag="In" >
 </Parameter>
-<Parameter Name="Password" DataType="String" Flag="In" >
+<Parameter Name="Password" DataType="AnsiString" Flag="In" >
 </Parameter>
 <Parameter Name="LoginInfo" DataType="TRdxLoginInfo" Flag="Out" >
 </Parameter>
@@ -116,11 +116,11 @@
 <Operations>
 <Operation Name="darValor" UID="{DC5B2492-2918-4631-9E1A-A89C5C4AEB79}">
 <Parameters>
-<Parameter Name="Result" DataType="String" Flag="Result">
+<Parameter Name="Result" DataType="AnsiString" Flag="Result">
 </Parameter>
-<Parameter Name="CODIGO" DataType="String" Flag="In" >
+<Parameter Name="CODIGO" DataType="AnsiString" Flag="In" >
 </Parameter>
-<Parameter Name="ValorPorDefecto" DataType="String" Flag="In" >
+<Parameter Name="ValorPorDefecto" DataType="AnsiString" Flag="In" >
 </Parameter>
 </Parameters>
 </Operation>
@@ -441,15 +441,16 @@
 </Interfaces>
 </Service>
 <Service Name="srvReferencias" UID="{89B1A7B4-E6D5-4520-97BE-52CEA7C97110}" Ancestor="DataAbstractService">
-<Documentation><![CDATA[Para uso interno del servidor. Para modulo de gestion de referencias del cliente]]></Documentation><Group Under="{3FE097B9-EDAC-4F49-989D-60719DC0A2C7}" />
+<Documentation><![CDATA[Para uso interno del servidor. Para modulo de gestion de referencias del cliente]]></Documentation>
+<Group Under="{3FE097B9-EDAC-4F49-989D-60719DC0A2C7}" />
 <Interfaces>
 <Interface Name="Default" UID="{B957528D-3BE1-412D-A35E-801C97CCD252}">
 <Operations>
 <Operation Name="DarNuevaReferencia" UID="{EA3276C4-2F49-4BFC-A2F8-97C705FC7C4C}">
 <Parameters>
-<Parameter Name="Result" DataType="String" Flag="Result">
+<Parameter Name="Result" DataType="AnsiString" Flag="Result">
 </Parameter>
-<Parameter Name="NombreReferencia" DataType="String" Flag="In" >
+<Parameter Name="NombreReferencia" DataType="AnsiString" Flag="In" >
 </Parameter>
 <Parameter Name="EmpresaID" DataType="Integer" Flag="In" >
 </Parameter>
@@ -459,9 +460,9 @@
 <Parameters>
 <Parameter Name="Result" DataType="Boolean" Flag="Result">
 </Parameter>
-<Parameter Name="NombreReferencia" DataType="String" Flag="In" >
+<Parameter Name="NombreReferencia" DataType="AnsiString" Flag="In" >
 </Parameter>
-<Parameter Name="Valor" DataType="String" Flag="In" >
+<Parameter Name="Valor" DataType="AnsiString" Flag="In" >
 </Parameter>
 <Parameter Name="EmpresaID" DataType="Integer" Flag="In" >
 </Parameter>
@@ -551,7 +552,7 @@
 </Parameter>
 <Parameter Name="ID" DataType="Integer" Flag="In" >
 </Parameter>
-<Parameter Name="NombreFichero" DataType="String" Flag="In" >
+<Parameter Name="NombreFichero" DataType="AnsiString" Flag="In" >
 </Parameter>
 </Parameters>
 </Operation>
@@ -563,7 +564,7 @@
 </Parameter>
 <Parameter Name="ID" DataType="Integer" Flag="In" >
 </Parameter>
-<Parameter Name="NombreFichero" DataType="String" Flag="In" >
+<Parameter Name="NombreFichero" DataType="AnsiString" Flag="In" >
 </Parameter>
 <Parameter Name="Fichero" DataType="Binary" Flag="In" >
 </Parameter>
@@ -577,7 +578,7 @@
 </Parameter>
 <Parameter Name="ID" DataType="Integer" Flag="In" >
 </Parameter>
-<Parameter Name="NombreFichero" DataType="String" Flag="In" >
+<Parameter Name="NombreFichero" DataType="AnsiString" Flag="In" >
 </Parameter>
 </Parameters>
 </Operation>
@@ -859,9 +860,9 @@
 <Elements>
 <Element Name="UserID" DataType="Integer">
 </Element>
-<Element Name="SessionID" DataType="String">
+<Element Name="SessionID" DataType="AnsiString">
 </Element>
-<Element Name="Usuario" DataType="String">
+<Element Name="Usuario" DataType="AnsiString">
 </Element>
 <Element Name="Perfiles" DataType="StringArray">
 </Element>
@@ -888,5 +889,6 @@
 </Arrays>
 <Uses>
 <Use Name="DataAbstract4" UID="{1E2905B4-36C9-4EAA-9BB9-DF3D3C9BBE75}" Rodl="$(Data Abstract for Delphi)\Source\DataAbstract4.RODL" AbsoluteRodl="C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\DataAbstract4.RODL">
-</Use></Uses>
+</Use>
+</Uses>
 </Library>
diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas
index 57d017fe..772b2ec1 100644
--- a/Source/Servicios/FactuGES_Intf.pas
+++ b/Source/Servicios/FactuGES_Intf.pas
@@ -8,7 +8,7 @@ unit FactuGES_Intf;
 { unit is regenerated the next time you compile the project.                 }
 {----------------------------------------------------------------------------}
 
-{$I Remobjects.inc}
+{$I RemObjects.inc}
 
 interface
 
@@ -101,8 +101,8 @@ type
   TRdxLoginInfo = class(TROComplexType)
   private
     fUserID: Integer;
-    fSessionID: String;
-    fUsuario: String;
+    fSessionID: AnsiString;
+    fUsuario: AnsiString;
     fPerfiles: StringArray;
     fEmpresas: TRdxEmpresasArray;
     function GetPerfiles: StringArray;
@@ -113,8 +113,8 @@ type
     procedure WriteComplex(ASerializer: TObject); override;
   published
     property UserID:Integer read fUserID write fUserID;
-    property SessionID:String read fSessionID write fSessionID;
-    property Usuario:String read fUsuario write fUsuario;
+    property SessionID:AnsiString read fSessionID write fSessionID;
+    property Usuario:AnsiString read fUsuario write fUsuario;
     property Perfiles:StringArray read GetPerfiles write fPerfiles;
     property Empresas:TRdxEmpresasArray read GetEmpresas write fEmpresas;
   end;
@@ -204,8 +204,8 @@ type
     ['{28CCDC07-A3A4-4917-89B4-64423DC70C9D}']
     function GenerarInformeFichaEmpleado(const ListaID: TIntegerArray): Binary;
     function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
-    function DarListaDescripcionesProveedores: String;
-    function DarListaContratosEmpleados: String;
+    function DarListaDescripcionesProveedores: AnsiString;
+    function DarListaContratosEmpleados: AnsiString;
   end;
 
   { CosrvContactos }
@@ -220,14 +220,14 @@ type
 
     function GenerarInformeFichaEmpleado(const ListaID: TIntegerArray): Binary;
     function GenerarInformeEtiquetas(const ListaID: TIntegerArray): Binary;
-    function DarListaDescripcionesProveedores: String;
-    function DarListaContratosEmpleados: String;
+    function DarListaDescripcionesProveedores: AnsiString;
+    function DarListaContratosEmpleados: AnsiString;
   end;
 
   { IsrvLogin }
   IsrvLogin = interface(IDataAbstractService)
     ['{399F9DB4-1B34-4140-AB6E-3BC10C0A7034}']
-    function Login(const User: String; const Password: String; out LoginInfo: TRdxLoginInfo): Boolean;
+    function Login(const User: AnsiString; const Password: AnsiString; out LoginInfo: TRdxLoginInfo): Boolean;
     procedure Logout;
     function Ping: Boolean;
   end;
@@ -242,7 +242,7 @@ type
   protected
     function __GetInterfaceName:string; override;
 
-    function Login(const User: String; const Password: String; out LoginInfo: TRdxLoginInfo): Boolean;
+    function Login(const User: AnsiString; const Password: AnsiString; out LoginInfo: TRdxLoginInfo): Boolean;
     procedure Logout;
     function Ping: Boolean;
   end;
@@ -305,7 +305,7 @@ type
   { IsrvConfiguracion }
   IsrvConfiguracion = interface(IDataAbstractService)
     ['{0882B8A4-C8AA-424E-8FC1-C6226B670522}']
-    function darValor(const CODIGO: String; const ValorPorDefecto: String): String;
+    function darValor(const CODIGO: AnsiString; const ValorPorDefecto: AnsiString): AnsiString;
   end;
 
   { CosrvConfiguracion }
@@ -318,7 +318,7 @@ type
   protected
     function __GetInterfaceName:string; override;
 
-    function darValor(const CODIGO: String; const ValorPorDefecto: String): String;
+    function darValor(const CODIGO: AnsiString; const ValorPorDefecto: AnsiString): AnsiString;
   end;
 
   { IsrvFamilias }
@@ -639,8 +639,8 @@ type
       Para uso interno del servidor. Para modulo de gestion de referencias del cliente }
   IsrvReferencias = interface(IDataAbstractService)
     ['{B957528D-3BE1-412D-A35E-801C97CCD252}']
-    function DarNuevaReferencia(const NombreReferencia: String; const EmpresaID: Integer): String;
-    function IncrementarValorReferencia(const NombreReferencia: String; const Valor: String; const EmpresaID: Integer): Boolean;
+    function DarNuevaReferencia(const NombreReferencia: AnsiString; const EmpresaID: Integer): AnsiString;
+    function IncrementarValorReferencia(const NombreReferencia: AnsiString; const Valor: AnsiString; const EmpresaID: Integer): Boolean;
   end;
 
   { CosrvReferencias }
@@ -653,8 +653,8 @@ type
   protected
     function __GetInterfaceName:string; override;
 
-    function DarNuevaReferencia(const NombreReferencia: String; const EmpresaID: Integer): String;
-    function IncrementarValorReferencia(const NombreReferencia: String; const Valor: String; const EmpresaID: Integer): Boolean;
+    function DarNuevaReferencia(const NombreReferencia: AnsiString; const EmpresaID: Integer): AnsiString;
+    function IncrementarValorReferencia(const NombreReferencia: AnsiString; const Valor: AnsiString; const EmpresaID: Integer): Boolean;
   end;
 
   { IsrvUnidadesMedida }
@@ -735,9 +735,9 @@ type
   IsrvGestorDocumentos = interface(IDataAbstractService)
     ['{2FFB4EEA-F314-442C-920A-E1D37F378929}']
     function DarListaFicheros(const Almacen: TRdxAlmacenes; const ID: Integer): StringArray;
-    function DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Binary;
-    function SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String; const Fichero: Binary): Boolean;
-    function EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Boolean;
+    function DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Binary;
+    function SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString; const Fichero: Binary): Boolean;
+    function EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Boolean;
     function EliminarID(const Almacen: TRdxAlmacenes; const ID: Integer): Boolean;
   end;
 
@@ -752,9 +752,9 @@ type
     function __GetInterfaceName:string; override;
 
     function DarListaFicheros(const Almacen: TRdxAlmacenes; const ID: Integer): StringArray;
-    function DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Binary;
-    function SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String; const Fichero: Binary): Boolean;
-    function EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Boolean;
+    function DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Binary;
+    function SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString; const Fichero: Binary): Boolean;
+    function EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Boolean;
     function EliminarID(const Almacen: TRdxAlmacenes; const ID: Integer): Boolean;
   end;
 
@@ -892,9 +892,7 @@ end;
 procedure TRdxEmpresasArray.SetItems(aIndex: integer; const Value: Integer);
 begin
   if (aIndex < 0) or (aIndex >= Count) then RaiseError(err_ArrayIndexOutOfBounds,[aIndex]);
-  if fItems[aIndex] <> Value then begin
-    fItems[aIndex] := Value;
-  end;
+  fItems[aIndex] := Value;
 end;
 
 procedure TRdxEmpresasArray.Resize(ElementCount: integer);
@@ -1024,9 +1022,7 @@ end;
 procedure TIntegerArray.SetItems(aIndex: integer; const Value: Integer);
 begin
   if (aIndex < 0) or (aIndex >= Count) then RaiseError(err_ArrayIndexOutOfBounds,[aIndex]);
-  if fItems[aIndex] <> Value then begin
-    fItems[aIndex] := Value;
-  end;
+  fItems[aIndex] := Value;
 end;
 
 procedure TIntegerArray.Resize(ElementCount: integer);
@@ -1125,19 +1121,19 @@ procedure TRdxLoginInfo.ReadComplex(ASerializer: TObject);
 var
   l_Empresas: TRdxEmpresasArray;
   l_Perfiles: StringArray;
-  l_SessionID: String;
+  l_SessionID: AnsiString;
   l_UserID: Integer;
-  l_Usuario: String;
+  l_Usuario: AnsiString;
 begin
   if TROSerializer(ASerializer).RecordStrictOrder then begin
     l_UserID := UserID;
     TROSerializer(ASerializer).ReadInteger('UserID', otSLong, l_UserID);
     UserID := l_UserID;
     l_SessionID := SessionID;
-    TROSerializer(ASerializer).ReadUTF8String('SessionID', l_SessionID);
+    TROSerializer(ASerializer).ReadAnsiString('SessionID', l_SessionID);
     SessionID := l_SessionID;
     l_Usuario := Usuario;
-    TROSerializer(ASerializer).ReadUTF8String('Usuario', l_Usuario);
+    TROSerializer(ASerializer).ReadAnsiString('Usuario', l_Usuario);
     Usuario := l_Usuario;
     l_Perfiles := Perfiles;
     TROSerializer(ASerializer).ReadArray('Perfiles', StringArray, l_Perfiles);
@@ -1158,13 +1154,13 @@ begin
     if Perfiles <> l_Perfiles then Perfiles.Free;
     Perfiles := l_Perfiles;
     l_SessionID := SessionID;
-    TROSerializer(ASerializer).ReadUTF8String('SessionID', l_SessionID);
+    TROSerializer(ASerializer).ReadAnsiString('SessionID', l_SessionID);
     SessionID := l_SessionID;
     l_UserID := UserID;
     TROSerializer(ASerializer).ReadInteger('UserID', otSLong, l_UserID);
     UserID := l_UserID;
     l_Usuario := Usuario;
-    TROSerializer(ASerializer).ReadUTF8String('Usuario', l_Usuario);
+    TROSerializer(ASerializer).ReadAnsiString('Usuario', l_Usuario);
     Usuario := l_Usuario;
   end;
 end;
@@ -1173,18 +1169,18 @@ procedure TRdxLoginInfo.WriteComplex(ASerializer: TObject);
 var
   l_Empresas: TRdxEmpresasArray;
   l_Perfiles: StringArray;
-  l_SessionID: String;
+  l_SessionID: AnsiString;
   l_UserID: Integer;
-  l_Usuario: String;
+  l_Usuario: AnsiString;
 begin
   if TROSerializer(ASerializer).RecordStrictOrder then begin
     TROSerializer(ASerializer).ChangeClass(TRdxLoginInfo);
     l_UserID := UserID;
     TROSerializer(ASerializer).WriteInteger('UserID', otSLong, l_UserID);
     l_SessionID := SessionID;
-    TROSerializer(ASerializer).WriteUTF8String('SessionID', l_SessionID);
+    TROSerializer(ASerializer).WriteAnsiString('SessionID', l_SessionID);
     l_Usuario := Usuario;
-    TROSerializer(ASerializer).WriteUTF8String('Usuario', l_Usuario);
+    TROSerializer(ASerializer).WriteAnsiString('Usuario', l_Usuario);
     l_Perfiles := Perfiles;
     TROSerializer(ASerializer).WriteArray('Perfiles', l_Perfiles, StringArray);
     l_Empresas := Empresas;
@@ -1196,11 +1192,11 @@ begin
     l_Perfiles := Perfiles;
     TROSerializer(ASerializer).WriteArray('Perfiles', l_Perfiles, StringArray);
     l_SessionID := SessionID;
-    TROSerializer(ASerializer).WriteUTF8String('SessionID', l_SessionID);
+    TROSerializer(ASerializer).WriteAnsiString('SessionID', l_SessionID);
     l_UserID := UserID;
     TROSerializer(ASerializer).WriteInteger('UserID', otSLong, l_UserID);
     l_Usuario := Usuario;
-    TROSerializer(ASerializer).WriteUTF8String('Usuario', l_Usuario);
+    TROSerializer(ASerializer).WriteAnsiString('Usuario', l_Usuario);
   end;
 end;
 
@@ -1278,7 +1274,7 @@ begin
   end
 end;
 
-function TsrvContactos_Proxy.DarListaDescripcionesProveedores: String;
+function TsrvContactos_Proxy.DarListaDescripcionesProveedores: AnsiString;
 begin
   try
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DarListaDescripcionesProveedores');
@@ -1286,14 +1282,14 @@ begin
 
     __TransportChannel.Dispatch(__Message);
 
-    __Message.Read('Result', TypeInfo(String), result, []);
+    __Message.Read('Result', TypeInfo(AnsiString), result, []);
   finally
     __Message.UnsetAttributes(__TransportChannel);
     __Message.FreeStream;
   end
 end;
 
-function TsrvContactos_Proxy.DarListaContratosEmpleados: String;
+function TsrvContactos_Proxy.DarListaContratosEmpleados: AnsiString;
 begin
   try
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DarListaContratosEmpleados');
@@ -1301,7 +1297,7 @@ begin
 
     __TransportChannel.Dispatch(__Message);
 
-    __Message.Read('Result', TypeInfo(String), result, []);
+    __Message.Read('Result', TypeInfo(AnsiString), result, []);
   finally
     __Message.UnsetAttributes(__TransportChannel);
     __Message.FreeStream;
@@ -1322,13 +1318,13 @@ begin
   result := 'srvLogin';
 end;
 
-function TsrvLogin_Proxy.Login(const User: String; const Password: String; out LoginInfo: TRdxLoginInfo): Boolean;
+function TsrvLogin_Proxy.Login(const User: AnsiString; const Password: AnsiString; out LoginInfo: TRdxLoginInfo): Boolean;
 begin
   try
     LoginInfo := nil;
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'Login');
-    __Message.Write('User', TypeInfo(String), User, []);
-    __Message.Write('Password', TypeInfo(String), Password, []);
+    __Message.Write('User', TypeInfo(AnsiString), User, []);
+    __Message.Write('Password', TypeInfo(AnsiString), Password, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
@@ -1453,17 +1449,17 @@ begin
   result := 'srvConfiguracion';
 end;
 
-function TsrvConfiguracion_Proxy.darValor(const CODIGO: String; const ValorPorDefecto: String): String;
+function TsrvConfiguracion_Proxy.darValor(const CODIGO: AnsiString; const ValorPorDefecto: AnsiString): AnsiString;
 begin
   try
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'darValor');
-    __Message.Write('CODIGO', TypeInfo(String), CODIGO, []);
-    __Message.Write('ValorPorDefecto', TypeInfo(String), ValorPorDefecto, []);
+    __Message.Write('CODIGO', TypeInfo(AnsiString), CODIGO, []);
+    __Message.Write('ValorPorDefecto', TypeInfo(AnsiString), ValorPorDefecto, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
 
-    __Message.Read('Result', TypeInfo(String), result, []);
+    __Message.Read('Result', TypeInfo(AnsiString), result, []);
   finally
     __Message.UnsetAttributes(__TransportChannel);
     __Message.FreeStream;
@@ -2042,29 +2038,29 @@ begin
   result := 'srvReferencias';
 end;
 
-function TsrvReferencias_Proxy.DarNuevaReferencia(const NombreReferencia: String; const EmpresaID: Integer): String;
+function TsrvReferencias_Proxy.DarNuevaReferencia(const NombreReferencia: AnsiString; const EmpresaID: Integer): AnsiString;
 begin
   try
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DarNuevaReferencia');
-    __Message.Write('NombreReferencia', TypeInfo(String), NombreReferencia, []);
+    __Message.Write('NombreReferencia', TypeInfo(AnsiString), NombreReferencia, []);
     __Message.Write('EmpresaID', TypeInfo(Integer), EmpresaID, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
 
-    __Message.Read('Result', TypeInfo(String), result, []);
+    __Message.Read('Result', TypeInfo(AnsiString), result, []);
   finally
     __Message.UnsetAttributes(__TransportChannel);
     __Message.FreeStream;
   end
 end;
 
-function TsrvReferencias_Proxy.IncrementarValorReferencia(const NombreReferencia: String; const Valor: String; const EmpresaID: Integer): Boolean;
+function TsrvReferencias_Proxy.IncrementarValorReferencia(const NombreReferencia: AnsiString; const Valor: AnsiString; const EmpresaID: Integer): Boolean;
 begin
   try
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'IncrementarValorReferencia');
-    __Message.Write('NombreReferencia', TypeInfo(String), NombreReferencia, []);
-    __Message.Write('Valor', TypeInfo(String), Valor, []);
+    __Message.Write('NombreReferencia', TypeInfo(AnsiString), NombreReferencia, []);
+    __Message.Write('Valor', TypeInfo(AnsiString), Valor, []);
     __Message.Write('EmpresaID', TypeInfo(Integer), EmpresaID, []);
     __Message.Finalize;
 
@@ -2211,14 +2207,14 @@ begin
   end
 end;
 
-function TsrvGestorDocumentos_Proxy.DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Binary;
+function TsrvGestorDocumentos_Proxy.DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Binary;
 begin
   try
     result := nil;
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DescargarFichero');
     __Message.Write('Almacen', TypeInfo(FactuGES_Intf.TRdxAlmacenes), Almacen, []);
     __Message.Write('ID', TypeInfo(Integer), ID, []);
-    __Message.Write('NombreFichero', TypeInfo(String), NombreFichero, []);
+    __Message.Write('NombreFichero', TypeInfo(AnsiString), NombreFichero, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
@@ -2230,13 +2226,13 @@ begin
   end
 end;
 
-function TsrvGestorDocumentos_Proxy.SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String; const Fichero: Binary): Boolean;
+function TsrvGestorDocumentos_Proxy.SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString; const Fichero: Binary): Boolean;
 begin
   try
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'SubirFichero');
     __Message.Write('Almacen', TypeInfo(FactuGES_Intf.TRdxAlmacenes), Almacen, []);
     __Message.Write('ID', TypeInfo(Integer), ID, []);
-    __Message.Write('NombreFichero', TypeInfo(String), NombreFichero, []);
+    __Message.Write('NombreFichero', TypeInfo(AnsiString), NombreFichero, []);
     __Message.Write('Fichero', TypeInfo(Binary), Fichero, []);
     __Message.Finalize;
 
@@ -2249,13 +2245,13 @@ begin
   end
 end;
 
-function TsrvGestorDocumentos_Proxy.EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Boolean;
+function TsrvGestorDocumentos_Proxy.EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Boolean;
 begin
   try
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'EliminarFichero');
     __Message.Write('Almacen', TypeInfo(FactuGES_Intf.TRdxAlmacenes), Almacen, []);
     __Message.Write('ID', TypeInfo(Integer), ID, []);
-    __Message.Write('NombreFichero', TypeInfo(String), NombreFichero, []);
+    __Message.Write('NombreFichero', TypeInfo(AnsiString), NombreFichero, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
diff --git a/Source/Servicios/FactuGES_Invk.pas b/Source/Servicios/FactuGES_Invk.pas
index d67343c7..d99c29b8 100644
--- a/Source/Servicios/FactuGES_Invk.pas
+++ b/Source/Servicios/FactuGES_Invk.pas
@@ -8,7 +8,7 @@ unit FactuGES_Invk;
 { unit is regenerated the next time you compile the project.                 }
 {----------------------------------------------------------------------------}
 
-{$I Remobjects.inc}
+{$I RemObjects.inc}
 
 interface
 
@@ -23,6 +23,8 @@ type
   TsrvContactos_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInformeFichaEmpleado(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -33,6 +35,8 @@ type
   TsrvLogin_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_Login(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_Logout(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -42,18 +46,24 @@ type
   TsrvInventario_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvHistoricoMovimientos_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvEmpresas_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_DarListaFormasPago(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_DarListaTiposIVA(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -62,6 +72,8 @@ type
   TsrvConfiguracion_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_darValor(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
@@ -69,30 +81,40 @@ type
   TsrvFamilias_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvFormasPago_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvTiposIVA_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvUsuarios_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvAlmacenes_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_DarListaAlmacenes(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
@@ -100,6 +122,8 @@ type
   TsrvArticulos_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_DarListaProveedoresConArticulos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
@@ -107,6 +131,8 @@ type
   TsrvRecibosCliente_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
@@ -114,24 +140,32 @@ type
   TsrvRecibosProveedor_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvRemesasCliente_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvRemesasProveedor_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvFacturasCliente_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeEnWord(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -141,12 +175,16 @@ type
   TsrvFacturasProveedor_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvPresupuestosCliente_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeEnWord(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -157,6 +195,8 @@ type
   TsrvPedidosProveedor_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeEnWord(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -166,6 +206,8 @@ type
   TsrvAlbaranesCliente_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeEtiquetas(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -176,6 +218,8 @@ type
   TsrvAlbaranesProveedor_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeEnWord(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -185,6 +229,8 @@ type
   TsrvReferencias_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_DarNuevaReferencia(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_IncrementarValorReferencia(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -193,18 +239,24 @@ type
   TsrvUnidadesMedida_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvFabricantes_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
   end;
 
   TsrvObras_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_DarListaObras(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
@@ -212,6 +264,8 @@ type
   TsrvProvinciasPoblaciones_Invoker = class(TROInvoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_DarListaProvincias(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_DarListaPoblaciones(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -220,6 +274,8 @@ type
   TsrvGestorDocumentos_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_DarListaFicheros(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_DescargarFichero(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -231,6 +287,8 @@ type
   TsrvGestorInformes_Invoker = class(TDataAbstractService_Invoker)
   private
   protected
+  public
+    constructor Create; override;
   published
     procedure Invoke_GenerarInformeIVAClientes(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerarInformeIVAProveedores(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
@@ -253,6 +311,12 @@ uses
 
 { TsrvContactos_Invoker }
 
+constructor TsrvContactos_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvContactos_Invoker.Invoke_GenerarInformeFichaEmpleado(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInformeFichaEmpleado(const ListaID: TIntegerArray): Binary; }
 var
@@ -314,15 +378,15 @@ begin
 end;
 
 procedure TsrvContactos_Invoker.Invoke_DarListaDescripcionesProveedores(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function DarListaDescripcionesProveedores: String; }
+{ function DarListaDescripcionesProveedores: AnsiString; }
 var
-  lResult: String;
+  lResult: AnsiString;
 begin
   try
     lResult := (__Instance as IsrvContactos).DarListaDescripcionesProveedores;
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContactos', 'DarListaDescripcionesProveedoresResponse');
-    __Message.Write('Result', TypeInfo(String), lResult, []);
+    __Message.Write('Result', TypeInfo(AnsiString), lResult, []);
     __Message.Finalize;
     __Message.UnsetAttributes(__Transport);
 
@@ -331,15 +395,15 @@ begin
 end;
 
 procedure TsrvContactos_Invoker.Invoke_DarListaContratosEmpleados(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function DarListaContratosEmpleados: String; }
+{ function DarListaContratosEmpleados: AnsiString; }
 var
-  lResult: String;
+  lResult: AnsiString;
 begin
   try
     lResult := (__Instance as IsrvContactos).DarListaContratosEmpleados;
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContactos', 'DarListaContratosEmpleadosResponse');
-    __Message.Write('Result', TypeInfo(String), lResult, []);
+    __Message.Write('Result', TypeInfo(AnsiString), lResult, []);
     __Message.Finalize;
     __Message.UnsetAttributes(__Transport);
 
@@ -349,19 +413,25 @@ end;
 
 { TsrvLogin_Invoker }
 
+constructor TsrvLogin_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvLogin_Invoker.Invoke_Login(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function Login(const User: String; const Password: String; out LoginInfo: TRdxLoginInfo): Boolean; }
+{ function Login(const User: AnsiString; const Password: AnsiString; out LoginInfo: TRdxLoginInfo): Boolean; }
 var
-  User: String;
-  Password: String;
+  User: AnsiString;
+  Password: AnsiString;
   LoginInfo: FactuGES_Intf.TRdxLoginInfo;
   lResult: Boolean;
   __lObjectDisposer: TROObjectDisposer;
 begin
   LoginInfo := nil;
   try
-    __Message.Read('User', TypeInfo(String), User, []);
-    __Message.Read('Password', TypeInfo(String), Password, []);
+    __Message.Read('User', TypeInfo(AnsiString), User, []);
+    __Message.Read('Password', TypeInfo(AnsiString), Password, []);
 
     lResult := (__Instance as IsrvLogin).Login(User, Password, LoginInfo);
 
@@ -413,8 +483,30 @@ begin
   end;
 end;
 
+{ TsrvInventario_Invoker }
+
+constructor TsrvInventario_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+{ TsrvHistoricoMovimientos_Invoker }
+
+constructor TsrvHistoricoMovimientos_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 { TsrvEmpresas_Invoker }
 
+constructor TsrvEmpresas_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvEmpresas_Invoker.Invoke_DarListaFormasPago(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarListaFormasPago: Binary; }
 var
@@ -467,21 +559,27 @@ end;
 
 { TsrvConfiguracion_Invoker }
 
+constructor TsrvConfiguracion_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvConfiguracion_Invoker.Invoke_darValor(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function darValor(const CODIGO: String; const ValorPorDefecto: String): String; }
+{ function darValor(const CODIGO: AnsiString; const ValorPorDefecto: AnsiString): AnsiString; }
 var
-  CODIGO: String;
-  ValorPorDefecto: String;
-  lResult: String;
+  CODIGO: AnsiString;
+  ValorPorDefecto: AnsiString;
+  lResult: AnsiString;
 begin
   try
-    __Message.Read('CODIGO', TypeInfo(String), CODIGO, []);
-    __Message.Read('ValorPorDefecto', TypeInfo(String), ValorPorDefecto, []);
+    __Message.Read('CODIGO', TypeInfo(AnsiString), CODIGO, []);
+    __Message.Read('ValorPorDefecto', TypeInfo(AnsiString), ValorPorDefecto, []);
 
     lResult := (__Instance as IsrvConfiguracion).darValor(CODIGO, ValorPorDefecto);
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvConfiguracion', 'darValorResponse');
-    __Message.Write('Result', TypeInfo(String), lResult, []);
+    __Message.Write('Result', TypeInfo(AnsiString), lResult, []);
     __Message.Finalize;
     __Message.UnsetAttributes(__Transport);
 
@@ -489,8 +587,46 @@ begin
   end;
 end;
 
+{ TsrvFamilias_Invoker }
+
+constructor TsrvFamilias_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+{ TsrvFormasPago_Invoker }
+
+constructor TsrvFormasPago_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+{ TsrvTiposIVA_Invoker }
+
+constructor TsrvTiposIVA_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+{ TsrvUsuarios_Invoker }
+
+constructor TsrvUsuarios_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 { TsrvAlmacenes_Invoker }
 
+constructor TsrvAlmacenes_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvAlmacenes_Invoker.Invoke_DarListaAlmacenes(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarListaAlmacenes(const IDEmpresa: Integer): Binary; }
 var
@@ -521,6 +657,12 @@ end;
 
 { TsrvArticulos_Invoker }
 
+constructor TsrvArticulos_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvArticulos_Invoker.Invoke_DarListaProveedoresConArticulos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarListaProveedoresConArticulos(const IDEmpresa: Integer): Binary; }
 var
@@ -551,6 +693,12 @@ end;
 
 { TsrvRecibosCliente_Invoker }
 
+constructor TsrvRecibosCliente_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvRecibosCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInforme(const ListaID: TIntegerArray): Binary; }
 var
@@ -581,8 +729,38 @@ begin
   end;
 end;
 
+{ TsrvRecibosProveedor_Invoker }
+
+constructor TsrvRecibosProveedor_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+{ TsrvRemesasCliente_Invoker }
+
+constructor TsrvRemesasCliente_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+{ TsrvRemesasProveedor_Invoker }
+
+constructor TsrvRemesasProveedor_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 { TsrvFacturasCliente_Invoker }
 
+constructor TsrvFacturasCliente_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvFacturasCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean): Binary; }
 var
@@ -677,8 +855,22 @@ begin
   end;
 end;
 
+{ TsrvFacturasProveedor_Invoker }
+
+constructor TsrvFacturasProveedor_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 { TsrvPresupuestosCliente_Invoker }
 
+constructor TsrvPresupuestosCliente_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvPresupuestosCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInforme(const ListaID: TIntegerArray): Binary; }
 var
@@ -797,6 +989,12 @@ end;
 
 { TsrvPedidosProveedor_Invoker }
 
+constructor TsrvPedidosProveedor_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvPedidosProveedor_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary; }
 var
@@ -899,6 +1097,12 @@ end;
 
 { TsrvAlbaranesCliente_Invoker }
 
+constructor TsrvAlbaranesCliente_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvAlbaranesCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInforme(const ListaID: TIntegerArray): Binary; }
 var
@@ -1019,6 +1223,12 @@ end;
 
 { TsrvAlbaranesProveedor_Invoker }
 
+constructor TsrvAlbaranesProveedor_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvAlbaranesProveedor_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInforme(const ListaID: TIntegerArray): Binary; }
 var
@@ -1109,21 +1319,27 @@ end;
 
 { TsrvReferencias_Invoker }
 
+constructor TsrvReferencias_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvReferencias_Invoker.Invoke_DarNuevaReferencia(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function DarNuevaReferencia(const NombreReferencia: String; const EmpresaID: Integer): String; }
+{ function DarNuevaReferencia(const NombreReferencia: AnsiString; const EmpresaID: Integer): AnsiString; }
 var
-  NombreReferencia: String;
+  NombreReferencia: AnsiString;
   EmpresaID: Integer;
-  lResult: String;
+  lResult: AnsiString;
 begin
   try
-    __Message.Read('NombreReferencia', TypeInfo(String), NombreReferencia, []);
+    __Message.Read('NombreReferencia', TypeInfo(AnsiString), NombreReferencia, []);
     __Message.Read('EmpresaID', TypeInfo(Integer), EmpresaID, []);
 
     lResult := (__Instance as IsrvReferencias).DarNuevaReferencia(NombreReferencia, EmpresaID);
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvReferencias', 'DarNuevaReferenciaResponse');
-    __Message.Write('Result', TypeInfo(String), lResult, []);
+    __Message.Write('Result', TypeInfo(AnsiString), lResult, []);
     __Message.Finalize;
     __Message.UnsetAttributes(__Transport);
 
@@ -1132,16 +1348,16 @@ begin
 end;
 
 procedure TsrvReferencias_Invoker.Invoke_IncrementarValorReferencia(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function IncrementarValorReferencia(const NombreReferencia: String; const Valor: String; const EmpresaID: Integer): Boolean; }
+{ function IncrementarValorReferencia(const NombreReferencia: AnsiString; const Valor: AnsiString; const EmpresaID: Integer): Boolean; }
 var
-  NombreReferencia: String;
-  Valor: String;
+  NombreReferencia: AnsiString;
+  Valor: AnsiString;
   EmpresaID: Integer;
   lResult: Boolean;
 begin
   try
-    __Message.Read('NombreReferencia', TypeInfo(String), NombreReferencia, []);
-    __Message.Read('Valor', TypeInfo(String), Valor, []);
+    __Message.Read('NombreReferencia', TypeInfo(AnsiString), NombreReferencia, []);
+    __Message.Read('Valor', TypeInfo(AnsiString), Valor, []);
     __Message.Read('EmpresaID', TypeInfo(Integer), EmpresaID, []);
 
     lResult := (__Instance as IsrvReferencias).IncrementarValorReferencia(NombreReferencia, Valor, EmpresaID);
@@ -1155,8 +1371,30 @@ begin
   end;
 end;
 
+{ TsrvUnidadesMedida_Invoker }
+
+constructor TsrvUnidadesMedida_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
+{ TsrvFabricantes_Invoker }
+
+constructor TsrvFabricantes_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 { TsrvObras_Invoker }
 
+constructor TsrvObras_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvObras_Invoker.Invoke_DarListaObras(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarListaObras(const IDEmpresa: Integer): Binary; }
 var
@@ -1187,6 +1425,12 @@ end;
 
 { TsrvProvinciasPoblaciones_Invoker }
 
+constructor TsrvProvinciasPoblaciones_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvProvinciasPoblaciones_Invoker.Invoke_DarListaProvincias(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarListaProvincias: Binary; }
 var
@@ -1242,6 +1486,12 @@ end;
 
 { TsrvGestorDocumentos_Invoker }
 
+constructor TsrvGestorDocumentos_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvGestorDocumentos_Invoker.Invoke_DarListaFicheros(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function DarListaFicheros(const Almacen: TRdxAlmacenes; const ID: Integer): StringArray; }
 var
@@ -1273,11 +1523,11 @@ begin
 end;
 
 procedure TsrvGestorDocumentos_Invoker.Invoke_DescargarFichero(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Binary; }
+{ function DescargarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Binary; }
 var
   Almacen: FactuGES_Intf.TRdxAlmacenes;
   ID: Integer;
-  NombreFichero: String;
+  NombreFichero: AnsiString;
   lResult: Binary;
   __lObjectDisposer: TROObjectDisposer;
 begin
@@ -1285,7 +1535,7 @@ begin
   try
     __Message.Read('Almacen', TypeInfo(FactuGES_Intf.TRdxAlmacenes), Almacen, []);
     __Message.Read('ID', TypeInfo(Integer), ID, []);
-    __Message.Read('NombreFichero', TypeInfo(String), NombreFichero, []);
+    __Message.Read('NombreFichero', TypeInfo(AnsiString), NombreFichero, []);
 
     lResult := (__Instance as IsrvGestorDocumentos).DescargarFichero(Almacen, ID, NombreFichero);
 
@@ -1305,11 +1555,11 @@ begin
 end;
 
 procedure TsrvGestorDocumentos_Invoker.Invoke_SubirFichero(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String; const Fichero: Binary): Boolean; }
+{ function SubirFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString; const Fichero: Binary): Boolean; }
 var
   Almacen: FactuGES_Intf.TRdxAlmacenes;
   ID: Integer;
-  NombreFichero: String;
+  NombreFichero: AnsiString;
   Fichero: Binary;
   lResult: Boolean;
   __lObjectDisposer: TROObjectDisposer;
@@ -1318,7 +1568,7 @@ begin
   try
     __Message.Read('Almacen', TypeInfo(FactuGES_Intf.TRdxAlmacenes), Almacen, []);
     __Message.Read('ID', TypeInfo(Integer), ID, []);
-    __Message.Read('NombreFichero', TypeInfo(String), NombreFichero, []);
+    __Message.Read('NombreFichero', TypeInfo(AnsiString), NombreFichero, []);
     __Message.Read('Fichero', TypeInfo(Binary), Fichero, []);
 
     lResult := (__Instance as IsrvGestorDocumentos).SubirFichero(Almacen, ID, NombreFichero, Fichero);
@@ -1339,17 +1589,17 @@ begin
 end;
 
 procedure TsrvGestorDocumentos_Invoker.Invoke_EliminarFichero(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: String): Boolean; }
+{ function EliminarFichero(const Almacen: TRdxAlmacenes; const ID: Integer; const NombreFichero: AnsiString): Boolean; }
 var
   Almacen: FactuGES_Intf.TRdxAlmacenes;
   ID: Integer;
-  NombreFichero: String;
+  NombreFichero: AnsiString;
   lResult: Boolean;
 begin
   try
     __Message.Read('Almacen', TypeInfo(FactuGES_Intf.TRdxAlmacenes), Almacen, []);
     __Message.Read('ID', TypeInfo(Integer), ID, []);
-    __Message.Read('NombreFichero', TypeInfo(String), NombreFichero, []);
+    __Message.Read('NombreFichero', TypeInfo(AnsiString), NombreFichero, []);
 
     lResult := (__Instance as IsrvGestorDocumentos).EliminarFichero(Almacen, ID, NombreFichero);
 
@@ -1386,6 +1636,12 @@ end;
 
 { TsrvGestorInformes_Invoker }
 
+constructor TsrvGestorInformes_Invoker.Create;
+begin
+  inherited Create;
+  FAbstract := False;
+end;
+
 procedure TsrvGestorInformes_Invoker.Invoke_GenerarInformeIVAClientes(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
 { function GenerarInformeIVAClientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; 
                                        const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; }
diff --git a/Source/Servicios/RODLFILE.res b/Source/Servicios/RODLFILE.res
index 2388d1b3acae0da48e93865a035b8d3745a392bd..438480034278579eceef1a53b654f74ed0832a0f 100644
GIT binary patch
delta 688
zcma)3O=}ZT6lG$?P?FNrXc520k=japWG3@w<~=d$d`hK-O4Wo4*3nLALZ;egqODcx
z#+4i8R;}sAjkq;FK@jbth^ub8a_h>a8~p)h2+4?UT%L2!z31M0er?7!wqlR@*pF9D
z!QqBvLzXR5bdYUQjIb=*h-$itERl+iN(|Fh_4^?1I|EzXcQCFVVcW50uX4@{EH`lN
zMS;IGYUPDxF{kLNEn0{uL`E2!8X}J3AXT?)NmFc$RR`R0AC?ne;lW^vx0dEyzkH)G
z>n(W2@iBo9=UrU7<>iG!dB&>&zw0PW97Jp-ndV?6nL?3Sj$kK8RTJq%H4v6W8xfsK
zNXuE_4j~KNj0X8Qg?ovy|MkkUr+p9md-S<l8P4t)4&CA9a2#$Q4kGd!F0niOJFd+<
ziDQ@+(p|t_3tGG*)?iO&pj(0~nf-0RRdl#EJ^J><Kn6CCSKw~pW7Ogo4|H4Dr=s?U
z(a2OPD*03KL}%Ou_N6ot3EBDC_ie<u%Fj&Rtk;5@z8(Y%<?HpptDR2vp0d1>TdxNE
zWw%;yy&OpbpAGr!-(qM!Kg9Z;J?a5|tskkKys2SISRn?IB!{;0whcriiy~2#D3N8=
tX=MT1jX?<3PNpa4tN-RZzq%JTR*%7p#)tMDsm2g2uJ7&w_GbO_&fmE2-6sG5

delta 282
zcmdmYhUv>8rU?p6DhoF%xiPAk8(5lHSh^bP8aukV>YA9CSn67sI0Lx`rp`tdW=2lN
zCKj7}7}XdjGs-G$zQ(kUYjY#NAmipgg6#s6&!@9ZJ|3+&*?>)V^1l?0$&Zyv;9>>-
zX`5dtZ(*FQ$Zj(EimC{R-mIWz&H+_nIC+wu5Loh#p7dl#0msP(({(4GkC)rrt}mcH
zIngL%GGp`}sA6BRZl4%)h;h4P1;ILfV#2|?@=atmFNw?G1{xEzIVsB@tZMVi?Cp#|
tk-*8mIUJk+=FZZd{A|9|=1()bStdu%-!)lqrs`z71;QYDbJc<)tN=wYX6*m~

diff --git a/Source/Servidor/Configuracion/srvConfiguracion_Impl.dfm b/Source/Servidor/Configuracion/srvConfiguracion_Impl.dfm
index 97d462a6..4f24e052 100644
--- a/Source/Servidor/Configuracion/srvConfiguracion_Impl.dfm
+++ b/Source/Servidor/Configuracion/srvConfiguracion_Impl.dfm
@@ -1,7 +1,6 @@
 object srvConfiguracion: TsrvConfiguracion
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  SessionManager = dmServer.SessionManager
   ConnectionName = 'IBX'
   ServiceSchema = schConfiguracion
   ServiceDataStreamer = Bin2DataStreamer
diff --git a/Source/Servidor/Configuracion/srvConfiguracion_Impl.pas b/Source/Servidor/Configuracion/srvConfiguracion_Impl.pas
index 10cd8e43..a753c365 100644
--- a/Source/Servidor/Configuracion/srvConfiguracion_Impl.pas
+++ b/Source/Servidor/Configuracion/srvConfiguracion_Impl.pas
@@ -46,7 +46,7 @@ end;
 { srvConfiguracion }
 procedure TsrvConfiguracion.DARemoteServiceCreate(Sender: TObject);
 begin
-  SessionManager := dmServer.SessionManager;
+  //SessionManager := dmServer.SessionManager;
 end;
 
 function TsrvConfiguracion.DarValor(const CODIGO: String; const ValorPorDefecto: String = ''): String;
diff --git a/Source/Servidor/Configuracion/uConexionBD.pas b/Source/Servidor/Configuracion/uConexionBD.pas
index e5c79ca3..825734a1 100644
--- a/Source/Servidor/Configuracion/uConexionBD.pas
+++ b/Source/Servidor/Configuracion/uConexionBD.pas
@@ -4,9 +4,9 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, 
-  Dialogs, StdCtrls, ExtCtrls, cxShellBrowserDialog, cxControls,
-  cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxButtonEdit, IBServices,
-  DB, IBDatabase, uFrameConfiguracion;
+  Dialogs, StdCtrls, ExtCtrls, IBServices,
+  DB, IBDatabase, uFrameConfiguracion, cxControls, cxContainer, cxEdit,
+  cxTextEdit, cxMaskEdit, cxButtonEdit;
 
 type
   TfrConexionBD = class(TFrameConfiguracion)
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 094309bf29c324465b2900d674facf3142afbab2..88834ed7a2b10b36f3ce08656865ce67f565731f 100644
GIT binary patch
delta 488
zcmY*Uu}T9$6r5dil8DGvRuYbYA_^Kokl0v6gn&j1!P|6)N-pYo$9XAi^c!S<z%r$c
zXkp`z_z!kg;@s|<kO#ZNd-G;?_W4!3zloP3yz>3Id5lY77QPP%R1te6+Acs`0VIOJ
za-%9R<GKJNDk^9;9k&2@t|PY$dIBF(e}#2P_zkyLYn%yAYuIyd)80&6YhX$0o@&S+
zp&!)ZQG>id8z~ZGh;WO0bcqQr$D%c}bASPEINj&D!#Q&H84BJhRi^ZlT7PU|0}Ku8
z+#y#`krN~8r@dE<^C9`ZVapsD6O`V4#8ld{2_}1|+=y^NT|&%p%|x!cu*=8JWZ)kD
lk6*@^e9neE;ciO1A-`2jN7SEcQ?&HAio6}{VoRU(I)A~-MI`_L

delta 209
zcmdn7opHfd#tkJASq1`JJPdHa$iT)RAi%)D$RNRx!3v_`JQfB9CI$rsh};Se1_ovX
z52%BM!N342$H&0Hir}d-0L^4zSi(5@UW6PIkop&4qQMRnV+4w_GuT7zW&xT25<vzm
ujFY1xm6#qdOs<O*oBSkFgVmftkHKK_%_x0F^U0jiiL53JRzQA!v?l;IARPSw

diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 433db052..476e34d0 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -7,7 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
     <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -35,7 +35,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType />
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.6.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.6.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 27 de febrero de 2009 11:47</VersionInfoKeys></VersionInfoKeys><Excluded_Packages /><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">9</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.6.9.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.6.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 03 de marzo de 2009 17:16</VersionInfoKeys></VersionInfoKeys><Excluded_Packages /><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 0a083e1a..70397847 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.6.7.0\0"
               VALUE "ProductVersion", "1.6.7.0\0"
-              VALUE "CompileDate", "martes, 03 de marzo de 2009 14:06\0"
+              VALUE "CompileDate", "martes, 03 de marzo de 2009 17:16\0"
          END
     END
     BLOCK "VarFileInfo"