Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 67658bd

Browse files
returned D2010 support
1 parent d5a2f2a commit 67658bd

File tree

110 files changed

+1125
-1092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1125
-1092
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
__history/
2-
32
__recovery/
43
*.dcu
54
*.local
65
*.exe
76
*.identcache
87
*.stat
98
*.res
9+
*.~pas
10+
*.~dcu

‎Source/AutomaticConversion.log‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Source/DelphiFunctions.pas‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
interface
1818
uses
1919
SysUtils, Classes,
20-
VCL.Controls,
21-
ZendTypes, ZendAPI, PHPTypes, PHPAPI, VCL.Dialogs, typinfo,
22-
VCL.Forms, VCL.stdctrls;
20+
ZendTypes, ZendAPI, PHPTypes, PHPAPI, typinfo;
2321

2422
{$ifdef fpc}
2523
{$mode delphi}

‎Source/Demos Delphi 2009 (WideString support)/Extensions/Delphi Class 2/delphi_class2.dpr‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -59,43 +59,24 @@ begin
5959

6060
DelphiTable[4].fname := 'delphi_extract_file_ext';
6161
DelphiTable[4].handler := @delphi_extract_file_ext;
62-
{$IFDEF PHP4}
63-
DelphiTable[4].func_arg_types := nil;
64-
{$ELSE}
6562
DelphiTable[4].arg_info := nil;
66-
{$ENDIF}
6763

6864
DelphiTable[5].fname := 'delphi_show_message';
6965
DelphiTable[5].handler := @delphi_show_message;
70-
{$IFDEF PHP4}
71-
DelphiTable[5].func_arg_types := nil;
72-
{$ELSE}
7366
DelphiTable[5].arg_info := nil;
74-
{$ENDIF}
7567

7668
DelphiTable[6].fname := 'register_delphi_object';
7769
delphitable[6].handler := @register_delphi_object;
78-
{$IFDEF PHP4}
79-
DelphiTable[6].func_arg_types := nil;
80-
{$ELSE}
8170
DelphiTable[6].arg_info := nil;
82-
{$ENDIF}
8371

8472
DelphiTable[7].fname := 'delphi_get_author';
8573
DelphiTable[7].handler := @delphi_get_author;
86-
{$IFDEF PHP4}
87-
DelphiTable[7].func_arg_types := nil;
88-
{$ELSE}
8974
DelphiTable[7].arg_info := nil;
90-
{$ENDIF}
75+
9176

9277
DelphiTable[8].fname := 'delphi_str_date';
9378
DelphiTable[8].handler := @delphi_str_date;
94-
{$IFDEF PHP4}
95-
DelphiTable[8].func_arg_types := nil;
96-
{$ELSE}
9779
DelphiTable[8].arg_info := nil;
98-
{$ENDIF}
9980

10081

10182
PHP_FUNCTION(DelphiTable[9], 'delphi_get_system_directory', @delphi_get_system_directory);
@@ -122,9 +103,6 @@ begin
122103
ModuleEntry.request_startup_func := @rinit;
123104
ModuleEntry.request_shutdown_func := @rshutdown;
124105
ModuleEntry.info_func := @php_info_module;
125-
{$IFDEF PHP4}
126-
Module_entry_table[0].func_arg_types := nil;
127-
{$ENDIF}
128106
ModuleEntry.functions := @DelphiTable[0];
129107
ModuleEntry._type := MODULE_PERSISTENT;
130108
{$IFDEF PHP530}

‎Source/Demos Delphi 2009 (WideString support)/Extensions/css/css.dpr‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ begin
114114
ModuleEntry.info_func := @php_info_module;
115115
module_entry_table[0].fname := 'delphi_css';
116116
module_entry_table[0].handler := @delphi_css;
117-
{$IFDEF PHP4}
118-
Module_entry_table[0].func_arg_types := nil;
119-
{$ENDIF}
117+
120118
ModuleEntry.functions := @module_entry_table[0];
121119
ModuleEntry._type := MODULE_PERSISTENT;
122120
{$IFDEF PHP530}

‎Source/Demos Delphi 2009 (WideString support)/Extensions/php class/php_class.dpr‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,12 @@ begin
100100
properties[0] := 'name';
101101
properties[1] := 'tool';
102102
properties[2] := 'height';
103-
{$IFDEF PHP4}
104-
_object_init_ex(return_value, ce, nil, 0, TSRMLS_DC );
105-
{$ELSE}
106103
object_init(return_value, ce, TSRMLS_DC );
107-
{$ENDIF}
108104

109-
{$IFDEF PHP4}
110-
add_property_string_ex(return_value, properties[0], strlen(properties[0]) + 1, 'Serhiy', 1);
111-
add_property_string_ex(return_value, properties[1], strlen(properties[1]) + 1, 'Delphi', 1);
112-
{$ELSE}
113105
add_property_string_ex(return_value, properties[0], strlen(properties[0]) + 1, 'Serhiy', 1, TSRMLS_DC);
114106
add_property_string_ex(return_value, properties[1], strlen(properties[1]) + 1, 'Delphi', 1, TSRMLS_DC);
115-
{$ENDIF}
116107

117-
{$IFDEF PHP4}
118-
add_property_long_ex(return_value, properties[2], strlen(properties[2]) + 1, 185);
119-
{$ELSE}
120108
add_property_long_ex(return_value, properties[2], strlen(properties[2]) + 1, 185, TSRMLS_DC);
121-
{$ENDIF}
122109
end;
123110

124111

@@ -143,9 +130,6 @@ begin
143130
ModuleEntry.info_func := @php_info_module;
144131
module_entry_table[0].fname := 'get_demo_class';
145132
module_entry_table[0].handler := @get_demo_class;
146-
{$IFDEF PHP4}
147-
module_entry_table[0].func_arg_types := nil;
148-
{$ENDIF}
149133
ModuleEntry.functions := @module_entry_table[0];
150134
ModuleEntry._type := MODULE_PERSISTENT;
151135
{$IFDEF PHP530}

‎Source/Demos Delphi 2009 (WideString support)/Extensions/skeleton/skeleton.dpr‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ begin
102102
ModuleEntry.info_func := @php_info_module;
103103
Module_entry_table[0].fname := 'confirm_extname_compiled';
104104
Module_entry_table[0].handler := @confirm_extname_compiled;
105-
{$IFDEF PHP4}
106-
Module_entry_table[0].func_arg_types := nil;
107-
{$ENDIF}
108105
ModuleEntry.functions := @module_entry_table[0];
109106
ModuleEntry._type := MODULE_PERSISTENT;
110107
{$IFDEF PHP530}

‎Source/Demos Delphi 2009 (WideString support)/psvPHP/Components/Unit1.pas‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,6 @@ procedure TfrmTest.FormCreate(Sender: TObject);
8686
memScript.Lines.Clear;
8787
with memScript.Lines do
8888
begin
89-
{$IFDEF PHP4}
90-
Add('$btnClose = register_delphi_component("btnClose");');
91-
Add('$frmTest = register_delphi_component("frmTest");');
92-
Add('$btnClose->Caption = "&Exit";');
93-
Add('$frmTest->Caption = "PHP4Delphi demo";');
94-
Add('$btnClose->Top = 150;');
95-
Add('$btnClose->Font->Size = 10;');
96-
Add('$btnClose->Cursor = -21;');
97-
Add('$frmTest->Color = clGreen;');
98-
Add('$st = delphi_input_box("InputBox", "Type your message", "Done");');
99-
Add('delphi_show_message($st);');
100-
{$ELSE}
10189
Add('$btnClose = register_delphi_component("btnClose");');
10290
Add('$frmTest = register_delphi_component("frmTest");');
10391
Add('$btnClose->Caption = "&Exit";');
@@ -108,7 +96,6 @@ procedure TfrmTest.FormCreate(Sender: TObject);
10896
Add('$frmTest->Color = clGreen;');
10997
Add('$st = delphi_input_box("InputBox", "Type your message", "Done");');
11098
Add('delphi_show_message($st);');
111-
{$ENDIF}
11299
end;
113100
PHPEngine.StartupEngine;
114101
end;

‎Source/Demos Delphi 2009 (WideString support)/psvPHP/sample1/frm_phpDemo.pas‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,8 @@ procedure TfrmPHPDemo.DisplayResultInBrowser(AStr: AnsiString);
118118
AStr := StringReplace(AStr, 'src="?=PHPE9568F34-D428-11d2-A769-00AA001ACF42"',
119119
'src="res://'+ParamStr(0)+'/php"', [rfReplaceAll, rfIgnoreCase]);
120120

121-
{$IFDEF PHP4}
122-
AStr := StringReplace(AStr, 'src="?=PHPE9568F35-D428-11d2-A769-00AA001ACF42"',
123-
'src="res://'+ ParamStr(0) + '/zend1"', [rfReplaceAll, rfIgnoreCase]);
124-
{$ELSE}
125121
AStr := StringReplace(AStr, 'src="?=PHPE9568F35-D428-11d2-A769-00AA001ACF42"',
126122
'src="res://'+ ParamStr(0) + '/zend2"', [rfReplaceAll, rfIgnoreCase]);
127-
{$ENDIF}
128123

129124
Stream := StringToOleStream(AStr);
130125
StreamInit := Webbrowser1.Document as IPersistStreamInit;

‎Source/Demos/Bonus/JpegConverter/php_jpeg.dpr‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,6 @@ begin
266266
Module_entry_table[2].fname := 'sign_jpeg';
267267
Module_entry_table[2].handler := @sign_jpeg;
268268

269-
{$IFDEF PHP4}
270-
Module_entry_table[0].func_arg_types := nil;
271-
{$ENDIF}
272269
ModuleEntry.functions := @module_entry_table[0];
273270
ModuleEntry._type := MODULE_PERSISTENT;
274271

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /