Removed dependency from SHELL32.DLL

diff --git a/NEWS b/NEWS
index df6f5309fd5e27fe1c2e38b999ad1b19e9b36737..8aa6279f0157de11142e2681c461184c1c6e402c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Dec 2006, PHP 5.2.1RC2
+- Removed dependency from SHELL32.DLL. (Dmitry)
 - Added function stream_socket_shutdown(). It is a wraper for system shutdown()
   function, that shut downs part of a full-duplex connection. (Dmitry)
 - Added internal heap protection (Dmitry)

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index bd350689d37b5e0ac00350292b854b5213bad990..f52790dfd5e40516ee46c224bda27e4ab9094027 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -35,11 +35,6 @@
 #ifdef TSRM_WIN32
 #include <io.h>
 #include "tsrm_win32.h"
-# if HAVE_NEWAPIS_H
-#  define WANT_GETLONGPATHNAME_WRAPPER
-#  define COMPILE_NEWAPIS_STUBS
-#  include <NewAPIs.h>
-# endif
 #endif
 
 #ifdef NETWARE

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index a87cf177fa146888e9519f14d2a9a8d4ef453a93..0552b034d2d267751725e80ce30d916cc74520dc 100644 (file)
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -86,11 +86,19 @@ TSRM_API void tsrm_win32_shutdown(void)
 
 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
-       SHFILEINFO sfi;
-
        if (mode == 1 /*X_OK*/) {
+#if 1
+               /* This code is not supported by Windows 98, 
+                * but we don't support it anymore */
+               DWORD type;
+
+               return GetBinaryType(pathname, &type)?0:-1;
+#else
+               SHFILEINFO sfi;
+
                return access(pathname, 0) == 0 && 
                        SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
+#endif
        } else {
                return access(pathname, mode);
        }