pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Fix compilation of test-project with -Define-WST_HANDLE_D (Thanks Juha Maninnen)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3180 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2014-06-16 19:05:44 +00:00
parent a10ed81837
commit f1b0922aa1
4 changed files with 155 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

295
wst/trunk/ide/lazarus/test/test_import.lpi
View File

@ -1,17 +1,20 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<PathDelim Value="\"/>
<Version Value="5"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
</Flags>
<MainUnit Value="0"/>
<IconPath Value="./"/>
<TargetFileExt Value=".exe"/>
<ActiveEditorIndexAtStart Value="2"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
<IgnoreBinaries Value="False"/>
@ -29,348 +32,336 @@
<PackageName Value="LCL"/>
</Item1>
</RequiredPackages>
<Units Count="40">
<Units Count="42">
<Unit0>
<Filename Value="test_import.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="test_import"/>
<CursorPos X="1" Y="17"/>
<TopLine Value="1"/>
<UnitName Value=""/>
<IsVisibleTab Value="True"/>
<CursorPos X="3" Y="11"/>
<UsageCount Value="73"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="..\wstimportdlg.pas"/>
<ComponentName Value="formImport"/>
<IsPartOfProject Value="True"/>
<ResourceFilename Value="..\wstimportdlg.lrs"/>
<UnitName Value="wstimportdlg"/>
<CursorPos X="1" Y="5"/>
<TopLine Value="1"/>
<EditorIndex Value="0"/>
<ComponentName Value="formImport"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<EditorIndex Value="2"/>
<TopLine Value="32"/>
<CursorPos X="60" Y="50"/>
<UsageCount Value="73"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit1>
<Unit2>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\lcl\interfaces\win32\interfaces.pp"/>
<UnitName Value="Interfaces"/>
<Filename Value="C:\lazarus_23_215\lcl\interfaces\win32\interfaces.pp"/>
<UnitName Value=""/>
<CursorPos X="41" Y="11"/>
<TopLine Value="1"/>
<UsageCount Value="7"/>
</Unit2>
<Unit3>
<Filename Value="..\..\..\ws_helper\command_line_parser.pas"/>
<UnitName Value="command_line_parser"/>
<CursorPos X="1" Y="31"/>
<UnitName Value=""/>
<TopLine Value="16"/>
<CursorPos Y="31"/>
<UsageCount Value="7"/>
</Unit3>
<Unit4>
<Filename Value="..\..\..\ws_helper\pscanner.pp"/>
<UnitName Value="PScanner"/>
<CursorPos X="12" Y="76"/>
<UnitName Value=""/>
<TopLine Value="323"/>
<CursorPos X="12" Y="76"/>
<UsageCount Value="14"/>
</Unit4>
<Unit5>
<Filename Value="..\..\..\ws_helper\pascal_parser_intf.pas"/>
<UnitName Value="pascal_parser_intf"/>
<CursorPos X="1" Y="390"/>
<EditorIndex Value="-1"/>
<TopLine Value="375"/>
<EditorIndex Value="8"/>
<CursorPos Y="390"/>
<UsageCount Value="35"/>
<Loaded Value="True"/>
</Unit5>
<Unit6>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\win32\classes.pp"/>
<UnitName Value="Classes"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\win32\classes.pp"/>
<UnitName Value=""/>
<UsageCount Value="7"/>
</Unit6>
<Unit7>
<Filename Value="..\..\..\ws_helper\wsdl2pas_imp.pas"/>
<UnitName Value="wsdl2pas_imp"/>
<CursorPos X="18" Y="747"/>
<UnitName Value=""/>
<EditorIndex Value="-1"/>
<TopLine Value="736"/>
<EditorIndex Value="7"/>
<CursorPos X="18" Y="747"/>
<UsageCount Value="36"/>
<Loaded Value="True"/>
</Unit7>
<Unit8>
<Filename Value="..\..\..\ws_helper\logger_intf.pas"/>
<UnitName Value="logger_intf"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UnitName Value=""/>
<UsageCount Value="7"/>
</Unit8>
<Unit9>
<Filename Value="..\..\..\ws_helper\source_utils.pas"/>
<UnitName Value="source_utils"/>
<EditorIndex Value="-1"/>
<TopLine Value="271"/>
<CursorPos X="14" Y="311"/>
<TopLine Value="291"/>
<EditorIndex Value="9"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit9>
<Unit10>
<Filename Value="..\..\..\ws_helper\generator.pas"/>
<UnitName Value="generator"/>
<CursorPos X="31" Y="1645"/>
<TopLine Value="1633"/>
<EditorIndex Value="6"/>
<EditorIndex Value="-1"/>
<TopLine Value="187"/>
<UsageCount Value="36"/>
<Loaded Value="True"/>
</Unit10>
<Unit11>
<Filename Value="..\..\..\ws_helper\metadata_generator.pas"/>
<UnitName Value="metadata_generator"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="5"/>
<UnitName Value=""/>
<EditorIndex Value="-1"/>
<UsageCount Value="36"/>
<Loaded Value="True"/>
</Unit11>
<Unit12>
<Filename Value="..\..\..\binary_streamer.pas"/>
<UnitName Value="binary_streamer"/>
<UnitName Value=""/>
<CursorPos X="23" Y="21"/>
<TopLine Value="1"/>
<UsageCount Value="7"/>
</Unit12>
<Unit13>
<Filename Value="..\..\..\ws_helper\wst_resources_utils.pas"/>
<UnitName Value="wst_resources_utils"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="2"/>
<UnitName Value=""/>
<EditorIndex Value="-1"/>
<UsageCount Value="36"/>
<Loaded Value="True"/>
</Unit13>
<Unit14>
<Filename Value="..\..\..\wst_rtti_filter\cursor_intf.pas"/>
<UnitName Value="cursor_intf"/>
<CursorPos X="2" Y="13"/>
<TopLine Value="1"/>
<EditorIndex Value="4"/>
<EditorIndex Value="-1"/>
<CursorPos X="22" Y="19"/>
<UsageCount Value="16"/>
<Loaded Value="True"/>
</Unit14>
<Unit15>
<Filename Value="..\..\..\wst_rtti_filter\dom_cursors.pas"/>
<UnitName Value="dom_cursors"/>
<CursorPos X="1" Y="227"/>
<UnitName Value=""/>
<TopLine Value="205"/>
<CursorPos Y="227"/>
<UsageCount Value="16"/>
</Unit15>
<Unit16>
<Filename Value="..\..\..\ws_helper\parserutils.pas"/>
<UnitName Value="parserutils"/>
<CursorPos X="9" Y="91"/>
<TopLine Value="39"/>
<EditorIndex Value="-1"/>
<TopLine Value="235"/>
<CursorPos X="26" Y="258"/>
<UsageCount Value="11"/>
</Unit16>
<Unit17>
<Filename Value="..\..\..\wst_rtti_filter\rtti_filters.pas"/>
<UnitName Value="rtti_filters"/>
<CursorPos X="1" Y="565"/>
<UnitName Value=""/>
<TopLine Value="543"/>
<CursorPos Y="565"/>
<UsageCount Value="11"/>
</Unit17>
<Unit18>
<Filename Value="..\..\..\wst.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UnitName Value=""/>
<UsageCount Value="7"/>
</Unit18>
<Unit19>
<Filename Value="..\..\..\wst_delphi.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UnitName Value=""/>
<UsageCount Value="7"/>
</Unit19>
<Unit20>
<Filename Value="..\..\..\ws_helper\pastree.pp"/>
<UnitName Value="PasTree"/>
<CursorPos X="3" Y="663"/>
<UnitName Value=""/>
<TopLine Value="659"/>
<CursorPos X="3" Y="663"/>
<UsageCount Value="16"/>
</Unit20>
<Unit21>
<Filename Value="uform2.pas"/>
<ComponentName Value="Form2"/>
<IsPartOfProject Value="True"/>
<ResourceFilename Value="uform2.lrs"/>
<UnitName Value="uform2"/>
<CursorPos X="45" Y="28"/>
<TopLine Value="19"/>
<EditorIndex Value="3"/>
<ComponentName Value="Form2"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<EditorIndex Value="1"/>
<CursorPos X="38" Y="20"/>
<UsageCount Value="73"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit21>
<Unit22>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\inc\heaptrc.pp"/>
<UnitName Value="heaptrc"/>
<CursorPos X="29" Y="46"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\inc\heaptrc.pp"/>
<UnitName Value=""/>
<TopLine Value="34"/>
<CursorPos X="29" Y="46"/>
<UsageCount Value="7"/>
</Unit22>
<Unit23>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\inc\objpash.inc"/>
<CursorPos X="22" Y="149"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\inc\objpash.inc"/>
<UnitName Value=""/>
<TopLine Value="135"/>
<CursorPos X="22" Y="149"/>
<UsageCount Value="7"/>
</Unit23>
<Unit24>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\packages\fcl-base\src\inc\contnrs.pp"/>
<UnitName Value="contnrs"/>
<CursorPos X="15" Y="125"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\packages\fcl-base\src\inc\contnrs.pp"/>
<UnitName Value=""/>
<TopLine Value="111"/>
<CursorPos X="15" Y="125"/>
<UsageCount Value="7"/>
</Unit24>
<Unit25>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\objpas\sysutils\sysutils.inc"/>
<CursorPos X="1" Y="109"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\objpas\sysutils\sysutils.inc"/>
<UnitName Value=""/>
<TopLine Value="95"/>
<CursorPos Y="109"/>
<UsageCount Value="7"/>
</Unit25>
<Unit26>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\inc\objpas.inc"/>
<CursorPos X="66" Y="85"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\inc\objpas.inc"/>
<UnitName Value=""/>
<TopLine Value="58"/>
<CursorPos X="66" Y="85"/>
<UsageCount Value="11"/>
</Unit26>
<Unit27>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\inc\wstrings.inc"/>
<CursorPos X="1" Y="188"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\inc\wstrings.inc"/>
<UnitName Value=""/>
<TopLine Value="174"/>
<CursorPos Y="188"/>
<UsageCount Value="7"/>
</Unit27>
<Unit28>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\objpas\classes\lists.inc"/>
<CursorPos X="1" Y="388"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\objpas\classes\lists.inc"/>
<UnitName Value=""/>
<TopLine Value="374"/>
<CursorPos Y="388"/>
<UsageCount Value="7"/>
</Unit28>
<Unit29>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\inc\heap.inc"/>
<CursorPos X="1" Y="607"/>
<Filename Value="C:\lazarus_23_215\fpc\2.1.5\source\rtl\inc\heap.inc"/>
<UnitName Value=""/>
<TopLine Value="595"/>
<CursorPos Y="607"/>
<UsageCount Value="11"/>
</Unit29>
<Unit30>
<Filename Value="..\..\..\ws_helper\pparser.pp"/>
<UnitName Value="PParser"/>
<CursorPos X="22" Y="49"/>
<UnitName Value=""/>
<TopLine Value="32"/>
<CursorPos X="22" Y="49"/>
<UsageCount Value="15"/>
</Unit30>
<Unit31>
<Filename Value="..\..\..\..\..\..\..\lazarus2204\lcl\include\screen.inc"/>
<CursorPos X="1" Y="471"/>
<Filename Value="C:\lazarus2204\lcl\include\screen.inc"/>
<UnitName Value=""/>
<TopLine Value="457"/>
<CursorPos Y="471"/>
<UsageCount Value="7"/>
</Unit31>
<Unit32>
<Filename Value="..\wst_register.pas"/>
<UnitName Value="wst_register"/>
<UnitName Value=""/>
<EditorIndex Value="-1"/>
<CursorPos X="14" Y="6"/>
<TopLine Value="1"/>
<EditorIndex Value="1"/>
<UsageCount Value="30"/>
<Loaded Value="True"/>
</Unit32>
<Unit33>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215XX\lcl\graphics.pp"/>
<UnitName Value="Graphics"/>
<CursorPos X="15" Y="36"/>
<Filename Value="C:\lazarus_23_215XX\lcl\graphics.pp"/>
<UnitName Value=""/>
<TopLine Value="26"/>
<CursorPos X="15" Y="36"/>
<UsageCount Value="8"/>
</Unit33>
<Unit34>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\heaptrc.pp"/>
<UnitName Value="heaptrc"/>
<CursorPos X="8" Y="115"/>
<Filename Value="C:\lazarus_23_215XX\fpc\source\rtl\inc\heaptrc.pp"/>
<UnitName Value=""/>
<TopLine Value="109"/>
<CursorPos X="8" Y="115"/>
<UsageCount Value="8"/>
</Unit34>
<Unit35>
<Filename Value="..\..\..\..\..\..\..\lazarus2204\lcl\interfaces\win32\win32memostrings.inc"/>
<CursorPos X="1" Y="74"/>
<Filename Value="C:\lazarus2204\lcl\interfaces\win32\win32memostrings.inc"/>
<UnitName Value=""/>
<TopLine Value="60"/>
<CursorPos Y="74"/>
<UsageCount Value="8"/>
</Unit35>
<Unit36>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\classes\classesh.inc"/>
<CursorPos X="14" Y="242"/>
<Filename Value="C:\lazarus_23_215XX\fpc\source\rtl\objpas\classes\classesh.inc"/>
<UnitName Value=""/>
<TopLine Value="220"/>
<CursorPos X="14" Y="242"/>
<UsageCount Value="8"/>
</Unit36>
<Unit37>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysutilh.inc"/>
<CursorPos X="13" Y="233"/>
<Filename Value="C:\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysutilh.inc"/>
<UnitName Value=""/>
<TopLine Value="196"/>
<CursorPos X="13" Y="233"/>
<UsageCount Value="8"/>
</Unit37>
<Unit38>
<Filename Value="..\..\..\..\..\..\..\lazarus_23_215XX\lcl\include\screen.inc"/>
<CursorPos X="1" Y="480"/>
<Filename Value="C:\lazarus_23_215XX\lcl\include\screen.inc"/>
<UnitName Value=""/>
<TopLine Value="465"/>
<CursorPos Y="480"/>
<UsageCount Value="10"/>
</Unit38>
<Unit39>
<Filename Value="..\..\..\service_intf.pas"/>
<UnitName Value="service_intf"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UnitName Value=""/>
<UsageCount Value="10"/>
</Unit39>
<Unit40>
<Filename Value="..\..\..\wst_global.inc"/>
<UnitName Value=""/>
<EditorIndex Value="-1"/>
<UsageCount Value="10"/>
</Unit40>
<Unit41>
<Filename Value="..\..\..\ws_helper\ws_parser_imp.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="30"/>
<CursorPos X="9" Y="56"/>
<UsageCount Value="10"/>
</Unit41>
</Units>
<JumpHistory Count="5" HistoryIndex="4">
<JumpHistory Count="3" HistoryIndex="2">
<Position1>
<Filename Value="..\..\..\wst_rtti_filter\cursor_intf.pas"/>
<Caret Line="99" Column="1" TopLine="77"/>
</Position1>
<Position2>
<Filename Value="..\..\..\ws_helper\wst_resources_utils.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position2>
<Position3>
<Filename Value="..\wstimportdlg.pas"/>
<Caret Line="256" Column="22" TopLine="233"/>
</Position1>
<Position2>
<Filename Value="test_import.lpr"/>
<Caret Line="11" Column="3"/>
</Position2>
<Position3>
<Filename Value="uform2.pas"/>
<Caret Line="28" Column="45"/>
</Position3>
<Position4>
<Filename Value="..\wstimportdlg.pas"/>
<Caret Line="12" Column="31" TopLine="54"/>
</Position4>
<Position5>
<Filename Value="..\..\..\ws_helper\wst_resources_utils.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position5>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
<Version Value="11"/>
<PathDelim Value="\"/>
<SearchPaths>
<IncludeFiles Value="..\..\..\"/>
<OtherUnitFiles Value="..\;..\..\..\;..\..\..\ws_helper\;..\..\..\wst_rtti_filter\"/>
<IncludeFiles Value="..\..\.."/>
<OtherUnitFiles Value="..;..\..\..;..\..\..\ws_helper;..\..\..\wst_rtti_filter"/>
<UnitOutputDirectory Value="obj"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
<UseAnsiStrings Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<Generate Value="Faster"/>
<Optimizations>
<OptimizationLevel Value="2"/>
</Optimizations>
</CodeGeneration>
<Linking>
<Debugging>
<GenerateDebugInfo Value="False"/>
<UseLineInfoUnit Value="False"/>
</Debugging>
<LinkSmart Value="True"/>
@ -381,16 +372,22 @@
</Options>
</Linking>
<Other>
<CompilerPath Value="$(CompPath)"/>
<CustomOptions Value="-dWST_HANDLE_DOC"/>
</Other>
</CompilerOptions>
<Debugging>
<BreakPoints Count="2">
<Item1>
<Kind Value="bpkSource"/>
<WatchScope Value="wpsGlobal"/>
<WatchKind Value="wpkWrite"/>
<Source Value="..\..\..\ws_helper\wsdl2pas_imp.pas"/>
<Line Value="1359"/>
</Item1>
<Item2>
<Kind Value="bpkSource"/>
<WatchScope Value="wpsGlobal"/>
<WatchKind Value="wpkWrite"/>
<Source Value="..\..\..\ws_helper\source_utils.pas"/>
<Line Value="207"/>
</Item2>

4
wst/trunk/ide/lazarus/test/test_import.lpr
View File

@ -7,8 +7,8 @@ uses
cthreads,
{$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset
Forms
{ add your units here }, wstimportdlg, uform2;
Forms,
wstimportdlg, uform2;
begin
Application.Initialize;

8
wst/trunk/ide/lazarus/test/uform2.lrs
View File

@ -1,8 +0,0 @@
LazarusResources.Add('TForm2','FORMDATA',[
'TPF0'#6'TForm2'#5'Form2'#4'Left'#3'B'#1#6'Height'#3','#1#3'Top'#3#19#1#5'Wid'
+'th'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#13
+'ActiveControl'#7#7'Button1'#7'Caption'#6#5'Form2'#12'ClientHeight'#3','#1#11
+'ClientWidth'#3#144#1#0#7'TButton'#7'Button1'#4'Left'#3#190#0#6'Height'#2#25
+#3'Top'#2'A'#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7
+'Button1'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#0#0#0#0
]);

14
wst/trunk/ide/lazarus/test/uform2.pas
View File

@ -5,25 +5,26 @@ unit uform2;
interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons;
StdCtrls, Forms;
type
{ TForm2 }
TForm2 = class(TForm)
Button1: TButton;
procedure Button1Click(Sender: TObject);
private
{ private declarations }
public
{ public declarations }
end;
var
Form2: TForm2;
implementation
{$R *.lfm}
uses wstimportdlg;//, HeapTrc;
{ TForm2 }
@ -40,9 +41,8 @@ begin
end;
end;
initialization
//initialization
//SetHeapTraceOutput('heapTrace.txt');
{$I uform2.lrs}
end.