From f34db7fc2a29983be26d3e2412c6d23c15fba289 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Thu, 18 Jul 2019 09:06:10 +0200
Subject: [PATCH] Use regedit to register event source

ext/win32std is unmaintained for years, so it is highly unlikely that
it is available.  We therefore use regedit instead to register the
event source.  We also remove the bundled syslog.reg, since it is of no
use, unless generated for the respective installation.
---
 .gitignore                     |  1 +
 win32/build/Makefile           |  1 +
 win32/build/registersyslog.php | 26 +-------------------------
 win32/syslog.reg               |  5 -----
 4 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 win32/syslog.reg

diff --git a/.gitignore b/.gitignore
index cc4481db6b7..250a23efa26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,6 +208,7 @@ php
 /win32/*.positions
 /win32/*.suo
 /win32/ext
+/win32/syslog.reg
 /win32/wsyslog.h
 
 # Standard object files generated by Visual Studio
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 26b73b625ac..9435df5c461 100644
--- a/win32/build/Makefile
+++ b/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
diff --git a/win32/build/registersyslog.php b/win32/build/registersyslog.php
index ce28cbf4201..fa8503a4b81 100755
--- a/win32/build/registersyslog.php
+++ b/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 @@ REGEDIT4
 REG
 );
 
-
 ?>
diff --git a/win32/syslog.reg b/win32/syslog.reg
deleted file mode 100644
index a817b52faf2..00000000000
--- a/win32/syslog.reg
+++ /dev/null
@@ -1,5 +0,0 @@
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Eventlog\Application\PHP-7.3.0-dev]
-"TypesSupported"=dword:00000007
-"EventMessageFile"="g:\\test\\srctrunkinstall\\php7ts.dll"