paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pacth from Joost van der Sluis : Delphi CoInitialize/CoUninitialize handling separated from FPC code

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@680 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa 2009-01-27 16:53:43 +00:00
parent c972082d9f
commit e107b3682f
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wst/trunk/indy_http_server.pas
View File

@ -91,13 +91,13 @@ implementation
uses uses
{$IFDEF WST_DELPHI} {$IFDEF WST_DELPHI}
ActiveX, ActiveX,
{$IFDEF INDY_9}
wst_indy9_utils,
{$ENDIF INDY_9}
{$IFDEF INDY_10}
wst_indy10_utils, IdSchedulerOfThread, IdSchedulerOfThreadDefault,
{$ENDIF}
{$ENDIF WST_DELPHI} {$ENDIF WST_DELPHI}
{$IFDEF INDY_9}
wst_indy9_utils,
{$ENDIF INDY_9}
{$IFDEF INDY_10}
wst_indy10_utils, IdSchedulerOfThread, IdSchedulerOfThreadDefault,
{$ENDIF}
base_service_intf, base_service_intf,
server_service_intf, server_service_imputils, server_service_intf, server_service_imputils,
metadata_wsdl; metadata_wsdl;

3
wst/trunk/samples/delphi/http_server/http_server.dpr
View File

@ -19,8 +19,7 @@ uses
user_service_intf in '..\..\user_service_intf.pas', user_service_intf in '..\..\user_service_intf.pas',
user_service_intf_binder in '..\..\user_service_intf_binder.pas', user_service_intf_binder in '..\..\user_service_intf_binder.pas',
user_service_intf_imp in '..\..\user_service_intf_imp.pas', user_service_intf_imp in '..\..\user_service_intf_imp.pas',
server_service_intf in '..\..\..\server_service_intf.pas', server_service_intf in '..\..\..\server_service_intf.pas';
wst_indy10_utils in '..\..\..\wst_indy10_utils.pas';
var var
AppObject : TwstListener; AppObject2 : TwstListener; AppObject : TwstListener; AppObject2 : TwstListener;

5
wst/trunk/samples/http_server/http_server.lpi
View File

@ -52,7 +52,7 @@
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="8"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="http_server"/> <Filename Value="http_server"/>
@ -67,9 +67,6 @@
<IncludeAssertionCode Value="True"/> <IncludeAssertionCode Value="True"/>
</SyntaxOptions> </SyntaxOptions>
</Parsing> </Parsing>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
<Linking> <Linking>
<Debugging> <Debugging>
<UseLineInfoUnit Value="False"/> <UseLineInfoUnit Value="False"/>

10
wst/trunk/wst_indy10_utils.pas
View File

@ -27,20 +27,28 @@ type
end; end;
implementation implementation
uses ActiveX;
{$IFDEF WST_DELPHI}
uses
ActiveX;
{$ENDIF WST_DELPHI}
{ TwstIndy10Thread } { TwstIndy10Thread }
procedure TwstIndy10Thread.AfterExecute(); procedure TwstIndy10Thread.AfterExecute();
begin begin
{$IFDEF WST_DELPHI}
CoUninitialize(); CoUninitialize();
{$ENDIF WST_DELPHI}
inherited; inherited;
end; end;
procedure TwstIndy10Thread.BeforeExecute(); procedure TwstIndy10Thread.BeforeExecute();
begin begin
inherited; inherited;
{$IFDEF WST_DELPHI}
CoInitialize(nil); CoInitialize(nil);
{$ENDIF WST_DELPHI}
end; end;

9
wst/trunk/wst_indy9_utils.pas
View File

@ -26,20 +26,27 @@ type
end; end;
implementation implementation
uses ActiveX; {$IFDEF WST_DELPHI}
uses
ActiveX;
{$ENDIF WST_DELPHI}
{ TwstIndy9Thread } { TwstIndy9Thread }
procedure TwstIndy9Thread.AfterExecute; procedure TwstIndy9Thread.AfterExecute;
begin begin
{$IFDEF WST_DELPHI}
CoUninitialize(); CoUninitialize();
{$ENDIF WST_DELPHI}
inherited; inherited;
end; end;
procedure TwstIndy9Thread.BeforeExecute; procedure TwstIndy9Thread.BeforeExecute;
begin begin
inherited; inherited;
{$IFDEF WST_DELPHI}
CoInitialize(nil); CoInitialize(nil);
{$ENDIF WST_DELPHI}
end; end;
end. end.