CVS update: php31/os/nt
| From: | shane | Date: | Wed, 02 Sep 1998 19:34:45 +0000 |
| Subject: | CVS update: php31/os/nt | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-752@lists.php.net to get a copy of this message | ||
Date: Wednesday September 2, 1998 @ 15:34
Author: shane
Update of /repository/php31/os/nt
In directory asf:/u2/tmp/cvs-serv13530/os/nt
Modified Files:
registry.c
Log Message:
dl's load from extensions value in registry now
Index: php31/os/nt/registry.c
diff -c php31/os/nt/registry.c:1.2 php31/os/nt/registry.c:1.3
*** php31/os/nt/registry.c:1.2 Wed Sep 2 15:18:27 1998
--- php31/os/nt/registry.c Wed Sep 2 15:34:44 1998
***************
*** 4,11 ****
#include "php3_list.h"
#include "registry.h"
#include "winutil.h"
-
static struct {
char * name;
HKEY hkey;
--- 4,11 ----
#include "php3_list.h"
#include "registry.h"
#include "winutil.h"
+ #include "dl.h"
static struct {
char * name;
HKEY hkey;
***************
*** 464,470 ****
int _reg_get_default_config(INLINE_TLS_VOID){
TCHAR regkey[1024];
! BYTE * pbuffer,*key,*value;
DWORD dwType, dwValue, dwbSize, dwSize, i;
RegKey *pRegKey;
pval tmp;
--- 464,470 ----
int _reg_get_default_config(INLINE_TLS_VOID){
TCHAR regkey[1024];
! BYTE * pbuffer,*key;
DWORD dwType, dwValue, dwbSize, dwSize, i;
RegKey *pRegKey;
pval tmp;
***************
*** 495,522 ****
if (_php3_win32_reg_read_value(pRegKey, key, &dwSize, &dwType, pbuffer, &dwbSize
_INLINE_TLS)) {
if (dwType == REG_SZ) {
{
! char buf[10];
! snprintf(buf,10," (%u) = ",dwSize);
! OutputDebugString(key);
! OutputDebugString(buf);
! OutputDebugString(pbuffer);
! snprintf(buf,10," (%u)",dwbSize);
! OutputDebugString(buf);
! OutputDebugString("\n");
}
if (strcmp(key,"extensions")) {
/* ok, we have the keyname and it's value,
lets put it into the config hash */
- //tmp=emalloc(sizeof(pval));
tmp.value.str.val = php3_strndup(pbuffer,dwbSize);
tmp.value.str.len = dwbSize;
tmp.type = IS_STRING;
_php3_hash_update(&configuration_hash,key,dwSize+1,(void *) &tmp,sizeof(pval),NULL);
} else {
! /*we have to split the data into the different dl names
! php3_dladd(pbuffer);
! */
}
}
numread++;
--- 495,539 ----
if (_php3_win32_reg_read_value(pRegKey, key, &dwSize, &dwType, pbuffer, &dwbSize
_INLINE_TLS)) {
if (dwType == REG_SZ) {
+ #if 0
{
! char buf[10];
! snprintf(buf,10," (%u) = ",dwSize);
! OutputDebugString(key);
! OutputDebugString(buf);
! OutputDebugString(pbuffer);
! snprintf(buf,10," (%u)",dwbSize);
! OutputDebugString(buf);
! OutputDebugString("\n");
}
+ #endif
if (strcmp(key,"extensions")) {
/* ok, we have the keyname and it's value,
lets put it into the config hash */
tmp.value.str.val = php3_strndup(pbuffer,dwbSize);
tmp.value.str.len = dwbSize;
tmp.type = IS_STRING;
_php3_hash_update(&configuration_hash,key,dwSize+1,(void *) &tmp,sizeof(pval),NULL);
} else {
! char *p1, *p2;
! /*we have to split the data into the different dl names */
! p1=pbuffer;
! while (p1) {
! p2 = strstr(p1," ");
! if (p2) {
! *p2 = '\0';
! if (p1 && *p1) php3_dladd(p1);
! *p2 = ' ';
! if (*(p2+1)) {
! p1 = p2+1;
! } else {
! p1 = NULL;
! }
! } else if (*p1) {
! php3_dladd(p1);
! p1 = NULL;
! }
! }
}
}
numread++;
***************
*** 528,548 ****
}
{
! char buf[4];
! OutputDebugString("Number of entries = ");
! snprintf(buf,4,"%u",pRegKey->dwcValues);
! OutputDebugString(buf);
! OutputDebugString("\n");
! OutputDebugString("Entries read = ");
! snprintf(buf,4,"%d",numread);
! OutputDebugString(buf);
! OutputDebugString("\n");
}
_php3_win32_reg_close(pRegKey _INLINE_TLS);
- // tmp=emalloc(sizeof(tmp));
tmp.value.str.val = php3_strndup("Registry",8);
tmp.value.str.len = 8;
tmp.type = IS_STRING;
--- 545,566 ----
}
+ #if 0
{
! char buf[4];
! OutputDebugString("Number of entries = ");
! snprintf(buf,4,"%u",pRegKey->dwcValues);
! OutputDebugString(buf);
! OutputDebugString("\n");
! OutputDebugString("Entries read = ");
! snprintf(buf,4,"%d",numread);
! OutputDebugString(buf);
! OutputDebugString("\n");
}
+ #endif
_php3_win32_reg_close(pRegKey _INLINE_TLS);
tmp.value.str.val = php3_strndup("Registry",8);
tmp.value.str.len = 8;
tmp.type = IS_STRING;
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net