|
29 | 29 | #include "php_com_dotnet.h"
|
30 | 30 | #include "php_com_dotnet_internal.h"
|
31 | 31 | #include "Zend/zend_exceptions.h"
|
| 32 | +#include "com_persist_arginfo.h" |
32 | 33 |
|
33 | 34 | /* {{{ expose php_stream as a COM IStream */
|
34 | 35 |
|
@@ -336,6 +337,10 @@ CPH_METHOD(GetCurFileName)
|
336 | 337 | OLECHAR *olename = NULL;
|
337 | 338 | CPH_FETCH();
|
338 | 339 |
|
| 340 | + if (zend_parse_parameters_none() == FAILURE) { |
| 341 | + RETURN_THROWS(); |
| 342 | + } |
| 343 | + |
339 | 344 | CPH_NO_OBJ();
|
340 | 345 |
|
341 | 346 | res = get_persist_file(helper);
|
@@ -374,15 +379,15 @@ CPH_METHOD(SaveToFile)
|
374 | 379 | OLECHAR *olefilename = NULL;
|
375 | 380 | CPH_FETCH();
|
376 | 381 |
|
| 382 | + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "p!|b", |
| 383 | + &filename, &filename_len, &remember)) { |
| 384 | + RETURN_THROWS(); |
| 385 | + } |
| 386 | + |
377 | 387 | CPH_NO_OBJ();
|
378 | 388 |
|
379 | 389 | res = get_persist_file(helper);
|
380 | 390 | if (helper->ipf) {
|
381 |
| - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "p!|b", |
382 |
| - &filename, &filename_len, &remember)) { |
383 |
| - RETURN_THROWS(); |
384 |
| - } |
385 |
| - |
386 | 391 | if (filename) {
|
387 | 392 | fullpath = expand_filepath(filename, NULL);
|
388 | 393 | if (!fullpath) {
|
@@ -436,16 +441,15 @@ CPH_METHOD(LoadFromFile)
|
436 | 441 | OLECHAR *olefilename;
|
437 | 442 | CPH_FETCH();
|
438 | 443 |
|
| 444 | + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", |
| 445 | + &filename, &filename_len, &flags)) { |
| 446 | + RETURN_THROWS(); |
| 447 | + } |
| 448 | + |
439 | 449 | CPH_NO_OBJ();
|
440 | 450 |
|
441 | 451 | res = get_persist_file(helper);
|
442 | 452 | if (helper->ipf) {
|
443 |
| - |
444 |
| - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", |
445 |
| - &filename, &filename_len, &flags)) { |
446 |
| - RETURN_THROWS(); |
447 |
| - } |
448 |
| - |
449 | 453 | if (!(fullpath = expand_filepath(filename, NULL))) {
|
450 | 454 | RETURN_FALSE;
|
451 | 455 | }
|
@@ -479,6 +483,10 @@ CPH_METHOD(GetMaxStreamSize)
|
479 | 483 | ULARGE_INTEGER size;
|
480 | 484 | CPH_FETCH();
|
481 | 485 |
|
| 486 | + if (zend_parse_parameters_none() == FAILURE) { |
| 487 | + RETURN_THROWS(); |
| 488 | + } |
| 489 | + |
482 | 490 | CPH_NO_OBJ();
|
483 | 491 |
|
484 | 492 | res = get_persist_stream_init(helper);
|
@@ -510,6 +518,10 @@ CPH_METHOD(InitNew)
|
510 | 518 | HRESULT res;
|
511 | 519 | CPH_FETCH();
|
512 | 520 |
|
| 521 | + if (zend_parse_parameters_none() == FAILURE) { |
| 522 | + RETURN_THROWS(); |
| 523 | + } |
| 524 | + |
513 | 525 | CPH_NO_OBJ();
|
514 | 526 |
|
515 | 527 | res = get_persist_stream_init(helper);
|
@@ -671,14 +683,14 @@ CPH_METHOD(__construct)
|
671 | 683 |
|
672 | 684 |
|
673 | 685 | static const zend_function_entry com_persist_helper_methods[] = {
|
674 |
| - CPH_ME(__construct, NULL) |
675 |
| - CPH_ME(GetCurFileName, NULL) |
676 |
| - CPH_ME(SaveToFile, NULL) |
677 |
| - CPH_ME(LoadFromFile, NULL) |
678 |
| - CPH_ME(GetMaxStreamSize, NULL) |
679 |
| - CPH_ME(InitNew, NULL) |
680 |
| - CPH_ME(LoadFromStream, NULL) |
681 |
| - CPH_ME(SaveToStream, NULL) |
| 686 | + CPH_ME(__construct, arginfo_class_COMPersistHelper___construct) |
| 687 | + CPH_ME(GetCurFileName, arginfo_class_COMPersistHelper_GetCurFileName) |
| 688 | + CPH_ME(SaveToFile, arginfo_class_COMPersistHelper_SaveToFile) |
| 689 | + CPH_ME(LoadFromFile, arginfo_class_COMPersistHelper_LoadFromFile) |
| 690 | + CPH_ME(GetMaxStreamSize, arginfo_class_COMPersistHelper_GetMaxStreamSize) |
| 691 | + CPH_ME(InitNew, arginfo_class_COMPersistHelper_InitNew) |
| 692 | + CPH_ME(LoadFromStream, arginfo_class_COMPersistHelper_LoadFromStream) |
| 693 | + CPH_ME(SaveToStream, arginfo_class_COMPersistHelper_SaveToStream) |
682 | 694 | PHP_FE_END
|
683 | 695 | };
|
684 | 696 |
|
|
0 commit comments