1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00

Tidy up a few loose ends.

Override normal php.ini behaviour so that only the launching applications
folder is searched; this avoids picking up a default php.ini with an execution
time limit set.
This commit is contained in:
Wez Furlong
2004-07-27 22:36:56 +00:00
parent a783891e76
commit 20eac88e58
5 changed files with 119 additions and 65 deletions
+22
View File
@@ -69,6 +69,12 @@ static int get_script_dispatch_mdef[] = {
APHPT_TERM
};
static int parse_procedure_text_mdef[] = {
APHPT_UNK, 4, APHPM_IN,
APHPT_DISP, 9, APHPM_OUT,
APHPT_TERM
};
static int *mdef_by_func[APHP__Max] = {
parse_script_text_mdef,
NULL, /* InitNew */
@@ -78,6 +84,7 @@ static int *mdef_by_func[APHP__Max] = {
NULL, /* Close */
NULL, /* AddTypeLib */
NULL, /* AddScriptlet */
parse_procedure_text_mdef,
};
static HRESULT do_marshal_in(int stub, void *args[16], int *mdef, LPSTREAM *ppstm)
@@ -254,6 +261,7 @@ static const char *func_names[APHP__Max] = {
"Close",
"AddTypeLib",
"AddScriptlet",
"ParseProcedureText",
};
HRESULT marshal_call(class TPHPScriptingEngine *engine, enum activephp_engine_func func, int nargs, ...)
@@ -391,6 +399,20 @@ HRESULT marshal_stub(LPARAM lparam)
(EXCEPINFO*)msg->args[10]);
break;
case APHP_ParseProcedureText:
msg->ret = msg->engine->ParseProcedureText(
(LPCOLESTR)msg->args[0],
(LPCOLESTR)msg->args[1],
(LPCOLESTR)msg->args[2],
(LPCOLESTR)msg->args[3],
(IUnknown*)msg->args[4],
(LPCOLESTR)msg->args[5],
(DWORD)msg->args[6],
(ULONG)msg->args[7],
(DWORD)msg->args[8],
(IDispatch**)msg->args[9]);
break;
default:
msg->ret = E_NOTIMPL;
}