Merge branch 'PHP-7.4'

* PHP-7.4:
  Use regedit to register event source

Author: cmb69

.gitignore

@@ -214,6 +214,7 @@ php
 /win32/*.positions
 /win32/*.suo
 /win32/ext
+/win32/syslog.reg
 /win32/wsyslog.h
 
 # Standard object files generated by Visual Studio

win32/build/Makefile

@@ -264,3 +264,4 @@ really-install:
 	@echo Registering event source with syslog (requires admin rights)
 	@echo It's okay for this step to fail:
 	-$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL)
+	-regedit /s win32\syslog.reg

win32/build/registersyslog.php

@@ -1,33 +1,10 @@
 <?php
 
-/* This script sets up an event source for use by the php syslog() function. */
-
-if (!extension_loaded("win32std")) {
-	@dl("php_win32std.dll");
-}
+/* This script generates the .reg file to set up an event source for use by the php syslog() function. */
 
 $PATH = "SYSTEM\\CurrentControlSet\\Services\\Eventlog\\Application\\PHP-" . phpversion();
 
 $dll = $argv[1];
-
-if (extension_loaded("win32std")) {
-	$key = @reg_create_key(HKEY_LOCAL_MACHINE, $PATH, KEY_ALL_ACCESS);
-
-	if (!$key)
-		$key = reg_open_key(HKEY_LOCAL_MACHINE, $PATH, KEY_ALL_ACCESS);
-
-	if ($key) {
-		reg_set_value($key, "TypesSupported", REG_DWORD, 7) or die("Types");
-		reg_set_value($key, "EventMessageFile", REG_SZ, $dll) or die("EventMessageFile");
-
-		syslog(LOG_NOTICE, "Registered PHP Event source");
-	} else {
-		echo "Could not register event source\n";
-	}
-}
-
-/* let's also generate/update the bundled .reg file */
-
 $dll = addslashes($dll);
 
 file_put_contents("win32/syslog.reg", <<<REG
@@ -40,5 +17,4 @@
 REG
 );
 
-
 ?>