Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

make hyperwave build under win32

PHP-4.0.5
Daniel Beulshausen 26 years ago
parent
a96174dbe3
commit
adcd6e7b0b
5 changed files with 220 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ext/hyperwave/hg_comm.c
  2. 168
      ext/hyperwave/hw.c
  3. 120
      ext/hyperwave/hyperwave.dsp
  4. 1
      ext/hyperwave/php_hyperwave.h
  5. 12
      win32/php_modules.dsw

3
ext/hyperwave/hg_comm.c
View File

@ -31,7 +31,7 @@
#include <string.h>
#include <sys/types.h>
#ifdef PHP_WIN32
# include <winsock2.h>
# include <winsock.h>
# define EWOULDBLOCK WSAEWOULDBLOCK
# define ETIMEDOUT WSAETIMEDOUT
# define bcopy memcpy
@ -619,6 +619,7 @@ char *fnInsAnchorsIntoText(char *text, DLIST *pAnchorList, char **bodytag, char
int laststart=0;
char emptystring[BUFFERLEN];
int i;
ELS_FETCH();
emptystring[0] = '\0';

168
ext/hyperwave/hw.c
View File

@ -43,6 +43,8 @@
#include "php_ini.h"
#include "php_hyperwave.h"
static int le_socketp, le_psocketp, le_document;
/*hw_module php_hw_module;*/
#define HW_ATTR_NONE 1
@ -144,6 +146,7 @@ void print_msg(hg_msg *msg, char *str, int txt);
void _close_hw_link(zend_rsrc_list_entry *rsrc)
{
HwSLS_FETCH();
hw_connection *conn = (hw_connection *)rsrc->ptr;
if(conn->hostname)
free(conn->hostname);
@ -156,6 +159,7 @@ void _close_hw_link(zend_rsrc_list_entry *rsrc)
void _close_hw_plink(zend_rsrc_list_entry *rsrc)
{
HwSLS_FETCH();
hw_connection *conn = (hw_connection *)rsrc->ptr;
if(conn->hostname)
free(conn->hostname);
@ -186,7 +190,6 @@ static void php_hw_init_globals(zend_hw_globals *hw_globals)
static PHP_INI_MH(OnHyperwavePort) {
HwSLS_FETCH();
if (new_value==NULL) {
HwSG(default_port) = HG_SERVER_PORT;
} else {
@ -204,9 +207,9 @@ PHP_MINIT_FUNCTION(hw) {
ZEND_INIT_MODULE_GLOBALS(hw, php_hw_init_globals, NULL);
REGISTER_INI_ENTRIES();
HwSG(le_socketp) = zend_register_list_destructors_ex(_close_hw_link, NULL, "hyperwave link", module_number);
HwSG(le_psocketp) = zend_register_list_destructors_ex(NULL, _close_hw_plink, "hyperwave link persistent", module_number);
HwSG(le_document) = zend_register_list_destructors_ex(_free_hw_document, NULL, "hyperwave document", module_number);
le_socketp = zend_register_list_destructors_ex(_close_hw_link, NULL, "hyperwave link", module_number);
le_psocketp = zend_register_list_destructors_ex(NULL, _close_hw_plink, "hyperwave link persistent", module_number);
le_document = zend_register_list_destructors_ex(_free_hw_document, NULL, "hyperwave document", module_number);
hw_module_entry.type = type;
REGISTER_LONG_CONSTANT("HW_ATTR_LANG", HW_ATTR_LANG, CONST_CS | CONST_PERSISTENT);
@ -685,6 +688,7 @@ static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
hw_connection *ptr;
int do_swap;
int version = 0;
HwSLS_FETCH();
argc = ZEND_NUM_ARGS();
switch(argc) {
@ -793,7 +797,7 @@ static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
ptr->username = strdup("anonymous");
new_le.ptr = (void *) ptr;
new_le.type = HwSG(le_psocketp);
new_le.type = le_psocketp;
if (zend_hash_update(&EG(persistent_list),hashed_details,hashed_details_length+1,(void *) &new_le, sizeof(list_entry), NULL)==FAILURE) {
php_error(E_ERROR, "Could not hash table with connection details");
@ -809,13 +813,13 @@ static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
HwSG(num_persistent)++;
} else {
/*php_printf("Found already open connection\n"); */
if (le->type != HwSG(le_psocketp)) {
if (le->type != le_psocketp) {
RETURN_FALSE;
}
ptr = le->ptr;
}
return_value->value.lval = zend_list_insert(ptr,HwSG(le_psocketp));
return_value->value.lval = zend_list_insert(ptr,le_psocketp);
return_value->type = IS_RESOURCE;
} else {
@ -835,7 +839,7 @@ static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
}
link = (int) index_ptr->ptr;
ptr = (hw_connection *) zend_list_find(link,&type); /* check if the link is still there */
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
return_value->value.lval = HwSG(default_link) = link;
return_value->type = IS_LONG;
efree(hashed_details);
@ -887,7 +891,7 @@ static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
ptr->hostname = strdup(host);
ptr->username = strdup("anonymous");
return_value->value.lval = zend_list_insert(ptr,HwSG(le_socketp));
return_value->value.lval = zend_list_insert(ptr,le_socketp);
return_value->type = IS_RESOURCE;
new_index_ptr.ptr = (void *) return_value->value.lval;
@ -956,7 +960,7 @@ PHP_FUNCTION(hw_close) {
convert_to_long_ex(arg1);
id=(*arg1)->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -980,7 +984,7 @@ PHP_FUNCTION(hw_info)
convert_to_long_ex(arg1);
id=(*arg1)->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1012,7 +1016,7 @@ PHP_FUNCTION(hw_error)
convert_to_long_ex(arg1);
id=(*arg1)->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1035,7 +1039,7 @@ PHP_FUNCTION(hw_errormsg)
convert_to_long_ex(arg1);
id=(*arg1)->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1140,7 +1144,7 @@ char *php_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) {
convert_to_long_ex(arg1);
link=(*arg1)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
return NULL;
}
@ -1303,7 +1307,7 @@ PHP_FUNCTION(hw_dummy) {
id=(*arg2)->value.lval;
msgid=(*arg3)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1353,7 +1357,7 @@ PHP_FUNCTION(hw_getobject) {
link=(*argv[0])->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d", link);
RETURN_FALSE;
}
@ -1427,7 +1431,7 @@ PHP_FUNCTION(hw_insertobject) {
objrec=arg2->value.str.val;
parms=arg3->value.str.val;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -1458,7 +1462,7 @@ PHP_FUNCTION(hw_getandlock) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1489,7 +1493,7 @@ PHP_FUNCTION(hw_unlock) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1517,7 +1521,7 @@ PHP_FUNCTION(hw_deleteobject) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1549,7 +1553,7 @@ PHP_FUNCTION(hw_changeobject) {
id=arg2->value.lval;
newobjarr=arg3->value.ht;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1651,7 +1655,7 @@ PHP_FUNCTION(hw_modifyobject) {
remobjarr=(*argv[2])->value.ht;
addobjarr=(*argv[3])->value.ht;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -1880,7 +1884,7 @@ void php_hw_mvcp(INTERNAL_FUNCTION_PARAMETERS, int mvcp) {
break;
}
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -1988,7 +1992,7 @@ PHP_FUNCTION(hw_gettext) {
link=argv[0]->value.lval;
id=argv[1]->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2007,7 +2011,7 @@ PHP_FUNCTION(hw_gettext) {
doc->attributes = attributes;
doc->bodytag = bodytag;
doc->size = count;
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
}
@ -2029,7 +2033,7 @@ PHP_FUNCTION(hw_edittext) {
link=arg1->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find socket identifier %d",link);
RETURN_FALSE;
}
@ -2037,7 +2041,7 @@ PHP_FUNCTION(hw_edittext) {
doc=arg2->value.lval;
docptr = zend_list_find(doc,&type);
if(!docptr || (type!=HwSG(le_document))) {
if(!docptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find document identifier %d", doc);
RETURN_FALSE;
}
@ -2071,7 +2075,7 @@ PHP_FUNCTION(hw_getcgi) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2109,7 +2113,7 @@ PHP_FUNCTION(hw_getcgi) {
doc->attributes = attributes;
doc->bodytag = NULL;
doc->size = count;
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
}
@ -2132,7 +2136,7 @@ PHP_FUNCTION(hw_getremote) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2150,7 +2154,7 @@ PHP_FUNCTION(hw_getremote) {
doc->attributes = attributes;
doc->bodytag = NULL;
doc->size = count;
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
}
@ -2172,7 +2176,7 @@ PHP_FUNCTION(hw_getremotechildren) {
link=arg1->value.lval;
objrec=arg2->value.str.val;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d", link);
RETURN_FALSE;
}
@ -2238,7 +2242,7 @@ php_printf("count = %d, remainder = <HR>%s---<HR>", count, remainder);
doc->attributes = strdup(objrec);
doc->bodytag = NULL;
doc->size = strlen(doc->data);
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
} else {
if (array_init(return_value) == FAILURE) {
@ -2275,7 +2279,7 @@ PHP_FUNCTION(hw_setlinkroot) {
link = arg1->value.lval;
rootid = arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -2320,7 +2324,7 @@ PHP_FUNCTION(hw_pipedocument) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d", link);
RETURN_FALSE;
}
@ -2396,7 +2400,7 @@ PHP_FUNCTION(hw_pipedocument) {
doc->bodytag = bodytag;
doc->size = count;
/* fprintf(stderr, "size = %d\n", count); */
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
}
@ -2432,7 +2436,7 @@ PHP_FUNCTION(hw_oldpipedocument) {
*/ link=argv[0]->value.lval;
id=argv[1]->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d", link);
RETURN_FALSE;
}
@ -2464,7 +2468,7 @@ PHP_FUNCTION(hw_oldpipedocument) {
doc->bodytag = bodytag;
doc->size = count;
/* fprintf(stderr, "size = %d\n", count); */
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
}
@ -2492,7 +2496,7 @@ PHP_FUNCTION(hw_pipecgi) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2529,7 +2533,7 @@ PHP_FUNCTION(hw_pipecgi) {
doc->attributes = attributes;
doc->bodytag = NULL;
doc->size = count;
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
}
@ -2557,14 +2561,14 @@ PHP_FUNCTION(hw_insertdocument) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find connection identifier %d",link);
RETURN_FALSE;
}
doc=arg3->value.lval;
docptr = zend_list_find(doc,&type);
if(!docptr || (type!=HwSG(le_document))) {
if(!docptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find document identifier %d",doc);
RETURN_FALSE;
}
@ -2614,7 +2618,7 @@ PHP_FUNCTION(hw_new_document) {
doc->attributes = strdup(arg1->value.str.val);
doc->bodytag = NULL;
doc->size = arg3->value.lval;
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
/* }}} */
@ -2716,7 +2720,7 @@ PHP_FUNCTION(hw_new_document_from_file) {
doc->attributes = strdup((*arg1)->value.str.val);
doc->bodytag = NULL;
doc->size = bcount;
return_value->value.lval = zend_list_insert(doc,HwSG(le_document));
return_value->value.lval = zend_list_insert(doc,le_document);
return_value->type = IS_LONG;
}
/* }}} */
@ -2735,7 +2739,7 @@ PHP_FUNCTION(hw_free_document) {
convert_to_long(arg1);
id=arg1->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_document))) {
if(!ptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2761,7 +2765,7 @@ PHP_FUNCTION(hw_output_document) {
convert_to_long(arg1);
id=arg1->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_document))) {
if(!ptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2794,7 +2798,7 @@ PHP_FUNCTION(hw_document_bodytag) {
convert_to_long(argv[0]);
id=argv[0]->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_document))) {
if(!ptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2838,7 +2842,7 @@ PHP_FUNCTION(hw_document_content) {
convert_to_long(argv[0]);
id=argv[0]->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_document))) {
if(!ptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2866,7 +2870,7 @@ PHP_FUNCTION(hw_document_setcontent) {
convert_to_string(argv[1]);
id=argv[0]->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_document))) {
if(!ptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2900,7 +2904,7 @@ PHP_FUNCTION(hw_document_size) {
convert_to_long(arg1);
id=arg1->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_document))) {
if(!ptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2926,7 +2930,7 @@ PHP_FUNCTION(hw_document_attributes) {
convert_to_long(arg1);
id=arg1->value.lval;
ptr = zend_list_find(id,&type);
if(!ptr || (type!=HwSG(le_document))) {
if(!ptr || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2953,7 +2957,7 @@ PHP_FUNCTION(hw_getparentsobj) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -2987,7 +2991,7 @@ PHP_FUNCTION(hw_getparents) {
link=arg1->value.lval;
id=arg2->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3032,7 +3036,7 @@ PHP_FUNCTION(hw_children) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3078,7 +3082,7 @@ PHP_FUNCTION(hw_childrenobj) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3112,7 +3116,7 @@ PHP_FUNCTION(hw_getchildcoll) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3158,7 +3162,7 @@ PHP_FUNCTION(hw_getchildcollobj) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3191,7 +3195,7 @@ PHP_FUNCTION(hw_docbyanchor) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3222,7 +3226,7 @@ PHP_FUNCTION(hw_docbyanchorobj) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3263,7 +3267,7 @@ PHP_FUNCTION(hw_getobjectbyquery) {
maxhits=(*arg3)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3306,7 +3310,7 @@ PHP_FUNCTION(hw_getobjectbyqueryobj) {
maxhits=(*arg3)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3346,7 +3350,7 @@ PHP_FUNCTION(hw_getobjectbyquerycoll) {
maxhits=(*arg4)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3391,7 +3395,7 @@ PHP_FUNCTION(hw_getobjectbyquerycollobj) {
maxhits=(*arg4)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3430,7 +3434,7 @@ PHP_FUNCTION(hw_getobjectbyftquery) {
maxhits=(*arg3)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3474,7 +3478,7 @@ PHP_FUNCTION(hw_getobjectbyftqueryobj) {
maxhits=(*arg3)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3515,7 +3519,7 @@ PHP_FUNCTION(hw_getobjectbyftquerycoll) {
maxhits=(*arg4)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3561,7 +3565,7 @@ PHP_FUNCTION(hw_getobjectbyftquerycollobj) {
maxhits=(*arg4)->value.lval;
if (maxhits < 0) maxhits=0x7FFFFFFF;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3595,7 +3599,7 @@ PHP_FUNCTION(hw_getchilddoccoll) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3634,7 +3638,7 @@ PHP_FUNCTION(hw_getchilddoccollobj) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3669,7 +3673,7 @@ PHP_FUNCTION(hw_getanchors) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3708,7 +3712,7 @@ PHP_FUNCTION(hw_getanchorsobj) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = (hw_connection *) zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
@ -3738,7 +3742,7 @@ PHP_FUNCTION(hw_getusername) {
convert_to_long_ex(arg1);
link = (*arg1)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3767,7 +3771,7 @@ PHP_FUNCTION(hw_identify) {
name=(*arg2)->value.str.val;
passwd=(*arg3)->value.str.val;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3861,7 +3865,7 @@ PHP_FUNCTION(hw_incollections) {
link = (*arg1)->value.lval;
retcoll=(*arg4)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3921,7 +3925,7 @@ PHP_FUNCTION(hw_inscoll) {
link = (*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -3969,7 +3973,7 @@ PHP_FUNCTION(hw_insdoc) {
link = (*argv[0])->value.lval;
id = (*argv[1])->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -4001,7 +4005,7 @@ PHP_FUNCTION(hw_getsrcbydestobj) {
link=(*arg1)->value.lval;
id=(*arg2)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -4035,7 +4039,7 @@ PHP_FUNCTION(hw_mapid) {
servid=(*arg2)->value.lval;
id=(*arg3)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -4070,7 +4074,7 @@ PHP_FUNCTION(hw_getrellink) {
sourceid=(*arg3)->value.lval;
destid=(*arg4)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}
@ -4119,8 +4123,8 @@ PHP_FUNCTION(hw_insertanchors) {
convert_to_array_ex(arg3);
docid=(*arg1)->value.lval;
hwdoc = zend_list_find(docid, &type);
if(!hwdoc || (type!=HwSG(le_document))) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
if(!hwdoc || (type!=le_document)) {
php_error(E_WARNING,"Unable to find file identifier %d",docid);
RETURN_FALSE;
}
@ -4215,7 +4219,7 @@ PHP_FUNCTION(hw_connection_info)
convert_to_long_ex(arg1);
link=(*arg1)->value.lval;
ptr = zend_list_find(link,&type);
if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) {
if(!ptr || (type!=le_socketp && type!=le_psocketp)) {
php_error(E_WARNING,"Unable to find file identifier %d",link);
RETURN_FALSE;
}

120
ext/hyperwave/hyperwave.dsp
View File

@ -0,0 +1,120 @@
# Microsoft Developer Studio Project File - Name="hyperwave" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=hyperwave - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "hyperwave.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "hyperwave.mak" CFG="hyperwave - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "hyperwave - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "hyperwave - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "hyperwave - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release_TS"
# PROP BASE Intermediate_Dir "Release_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release_TS"
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HYPERWAVE_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_HYPERWAVE" /D ZTS=1 /D HYPERWAVE=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_hyperwave.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "hyperwave - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug_TS"
# PROP BASE Intermediate_Dir "Debug_TS"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug_TS"
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HYPERWAVE_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_HYPERWAVE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HYPERWAVE=1 /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_hyperwave.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
# Begin Target
# Name "hyperwave - Win32 Release_TS"
# Name "hyperwave - Win32 Debug_TS"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\hg_comm.c
# End Source File
# Begin Source File
SOURCE=.\hw.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\hg_comm.h
# End Source File
# Begin Source File
SOURCE=.\hw_error.h
# End Source File
# Begin Source File
SOURCE=.\php_hyperwave.h
# End Source File
# End Group
# End Target
# End Project

1
ext/hyperwave/php_hyperwave.h
View File

@ -47,7 +47,6 @@ typedef struct {
long num_links,num_persistent;
long max_links,max_persistent;
long allow_persistent;
int le_socketp, le_psocketp, le_document;
} zend_hw_globals;
#ifdef ZTS

12
win32/php_modules.dsw
View File

@ -207,6 +207,18 @@ Package=<4>
###############################################################################
Project: "hyperwave"=..\ext\hyperwave\hyperwave.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "iisfunc"=..\ext\iisfunc\iisfunc.dsp - Package Owner=<4>
Package=<5>

Write Preview
Loading…
Cancel
Save