From 58fa31451aae4bb1b13e46e207ade81b845006b0 Mon Sep 17 00:00:00 2001 From: foobar Date: Thu, 28 Aug 2003 14:34:15 +0000 Subject: [PATCH] - Made MCVE extension available on win32. # requires libmcve 3.2.2 (http://www.mcve.com) --- NEWS | 1 + ext/mcve/config.m4 | 1 + ext/mcve/mcve.c | 17 +++++-- ext/mcve/mcve.dsp | 107 ++++++++++++++++++++++++++++++++++++++++++ win32/php_modules.dsw | 12 +++++ 5 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 ext/mcve/mcve.dsp diff --git a/NEWS b/NEWS index 803eed57cc..390155006d 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2003, Version 4.3.4 +- Made MCVE extension available on win32. (Jani) - Fixed disk_total_space() and disk_free_space() under FreeBSD. (Jon Parise) - Fixed crash bug when non-existing save/serializer handler was used. (Jani) - Fixed bug #25239 (ftp_fopen_wrapper not RFC compliant). (Sara) diff --git a/ext/mcve/config.m4 b/ext/mcve/config.m4 index 6a5ad4eb73..6e83a8775b 100644 --- a/ext/mcve/config.m4 +++ b/ext/mcve/config.m4 @@ -22,4 +22,5 @@ if test "$PHP_MCVE" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(mcve, $MCVE_DIR/lib, MCVE_SHARED_LIBADD) PHP_NEW_EXTENSION(mcve, mcve.c, $ext_shared) PHP_SUBST(MCVE_SHARED_LIBADD) + AC_DEFINE(HAVE_MCVE, 1, [ ]) fi diff --git a/ext/mcve/mcve.c b/ext/mcve/mcve.c index 44cefacbfc..ab62ec4829 100644 --- a/ext/mcve/mcve.c +++ b/ext/mcve/mcve.c @@ -19,6 +19,12 @@ /* $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef HAVE_MCVE + /* standard php include(s) */ #include "php.h" #include "ext/standard/head.h" @@ -39,8 +45,7 @@ static int mcve_init; /* For Safe Memory Deallocation */ /* }}} */ /* {{{ extension definition structures */ -static unsigned char second_arg_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; - +static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; function_entry mcve_functions[] = { PHP_FE(mcve_initengine, NULL) PHP_FE(mcve_initconn, NULL) @@ -77,7 +82,7 @@ function_entry mcve_functions[] = { PHP_FE(mcve_monitor, NULL) PHP_FE(mcve_transinqueue, NULL) PHP_FE(mcve_checkstatus, NULL) - PHP_FE(mcve_completeauthorizations, second_arg_force_ref) + PHP_FE(mcve_completeauthorizations, second_args_force_ref) PHP_FE(mcve_sale, NULL) PHP_FE(mcve_preauth, NULL) PHP_FE(mcve_void, NULL) @@ -148,7 +153,7 @@ ZEND_GET_MODULE(mcve) #endif /* {{{ MCVE_CONN destructor */ -static void _free_mcve_conn(zend_rsrc_list_entry *rsrc) +static void _free_mcve_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC) { MCVE_CONN *conn; @@ -503,7 +508,9 @@ PHP_FUNCTION(mcve_deletetrans) Destroy the connection and MCVE_CONN structure */ PHP_FUNCTION(mcve_destroyconn) { +#if 0 MCVE_CONN *conn; +#endif zval **arg; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) @@ -2250,6 +2257,8 @@ PHP_FUNCTION(mcve_text_cv) } /* }}} */ +#endif + /* END OF MCVE PHP EXTENSION */ /* diff --git a/ext/mcve/mcve.dsp b/ext/mcve/mcve.dsp new file mode 100644 index 0000000000..33842ecf46 --- /dev/null +++ b/ext/mcve/mcve.dsp @@ -0,0 +1,107 @@ +# Microsoft Developer Studio Project File - Name="mcve" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=mcve - 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 "mcve.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 "mcve.mak" CFG="mcve - Win32 Debug_TS" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mcve - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mcve - 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)" == "mcve - 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 "MCVE_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MCVE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_MCVE=1 /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 libmcve.lib ssleay32.lib libeay32.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 /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mcve.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" + +!ELSEIF "$(CFG)" == "mcve - 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 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 "mcve_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 "COMPILE_DL_MCVE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_MCVE=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 libmcve.lib ssleay32.lib libeay32.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 /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mcve.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" + +!ENDIF + +# Begin Target + +# Name "mcve - Win32 Release_TS" +# Name "mcve - Win32 Debug_TS" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\mcve.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\php_mcve.h +# End Source File +# End Group +# End Target +# End Project diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw index 8a6b92f10a..1e06ea4b87 100644 --- a/win32/php_modules.dsw +++ b/win32/php_modules.dsw @@ -327,6 +327,18 @@ Package=<4> ############################################################################### +Project: "mcve"=..\ext\mcve\mcve\mcve.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "mhash"=..\ext\mhash\mhash.dsp - Package Owner=<4> Package=<5> -- 2.40.0