Use SetConsoleTitle on Windows, instead of an Event. Also update test to run on Windows using some PowerShell commands.

Author: keyurdg

sapi/cli/ps_title.c

@@ -105,13 +105,17 @@ extern char** environ;
 #define PS_PADDING ' '
 #endif
 
-#ifndef PS_USE_CLOBBER_ARGV
+#ifdef PS_USE_WIN32
+static char windows_error_details[64];
+static char ps_buffer[MAX_PATH];
+static const size_t ps_buffer_size = MAX_PATH;
+#elif PS_USE_CLOBBER_ARGV
+static char *ps_buffer;         /* will point to argv area */
+static size_t ps_buffer_size;   /* space determined at run time */
+#else
 #define PS_BUFFER_SIZE 256
 static char ps_buffer[PS_BUFFER_SIZE];
 static const size_t ps_buffer_size = PS_BUFFER_SIZE;
-#else
-static char *ps_buffer;         /* will point to argv area */
-static size_t ps_buffer_size;   /* space determined at run time */
 #endif
 
 static size_t ps_buffer_cur_len; /* actual string length in ps_buffer */
@@ -297,6 +301,12 @@ const char* ps_title_errno(int rc)
 
     case PS_TITLE_BUFFER_NOT_AVAILABLE:
         return "Buffer not contiguous";
+
+#ifdef PS_USE_WIN32
+    case PS_TITLE_WINDOWS_ERROR:
+        sprintf(windows_error_details, "Windows error code: %d", GetLastError());
+        return windows_error_details;
+#endif
     }
 
     return "Unknown error code";
@@ -348,20 +358,8 @@ int set_ps_title(const char* title)
 
 #ifdef PS_USE_WIN32
     {
-        /*
-         * Win32 does not support showing any changed arguments. To make it at
-         * all possible to track which backend is doing what, we create a
-         * named object that can be viewed with for example Process Explorer.
-         */
-        static HANDLE ident_handle = INVALID_HANDLE_VALUE;
-        char name[PS_BUFFER_SIZE + 32];
-
-        if (ident_handle != INVALID_HANDLE_VALUE)
-            CloseHandle(ident_handle);
-
-        sprintf(name, "php-process(%d): %s", _getpid(), ps_buffer);
-
-        ident_handle = CreateEvent(NULL, TRUE, FALSE, name);
+        if (!SetConsoleTitle(ps_buffer))
+            return PS_TITLE_WINDOWS_ERROR;
     }
 #endif /* PS_USE_WIN32 */
 
@@ -374,12 +372,16 @@ int set_ps_title(const char* title)
  * length into *displen.
  * The return code indicates the error.
  */
-int get_ps_title(int *displen, const char** string)
+int get_ps_title(size_t *displen, const char** string)
 {
     int rc = is_ps_title_available();
     if (rc != PS_TITLE_SUCCESS)
         return rc;
 
+#ifdef PS_USE_WIN32
+    if (!(ps_buffer_cur_len = GetConsoleTitle(ps_buffer, ps_buffer_size)))
+        return PS_TITLE_WINDOWS_ERROR;
+#endif
     *displen = ps_buffer_cur_len;
     *string = ps_buffer;
     return PS_TITLE_SUCCESS;

sapi/cli/ps_title.h

@@ -25,12 +25,13 @@
 #define PS_TITLE_NOT_AVAILABLE 1
 #define PS_TITLE_NOT_INITIALIZED 2
 #define PS_TITLE_BUFFER_NOT_AVAILABLE 3
+#define PS_TITLE_WINDOWS_ERROR 4
 
 extern char** save_ps_args(int argc, char** argv);
 
 extern int set_ps_title(const char* new_str);
 
-extern int get_ps_title(int* displen, const char** string);
+extern int get_ps_title(size_t* displen, const char** string);
 
 extern const char* ps_title_errno(int rc);
 

sapi/cli/tests/cli_process_title.phpt

@@ -1,21 +1,22 @@
 --TEST--
 Check cli_process_title support
---SKIPIF--
-<?php
-    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') print "skip";
-?>
 --FILE--
 <?php
 echo "*** Testing setting the process title ***\n";
 
-$set_title = $original_title = "test title for php cli";
+$set_title = $original_title = uniqid("title", true);
 $pid = getmypid();
 
 if (cli_set_process_title($original_title) === true)
   echo "Successfully set title\n";
 
-$ps_output = shell_exec("ps -p $pid -o command | tail -n 1");
-if ($ps_output === null) {
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+  $ps_output = shell_exec("PowerShell \"get-process cmd*,powershell* | Select-Object mainWindowTitle | ft -hide\"");
+else
+  $ps_output = shell_exec("ps -p $pid -o command | tail -n 1");
+
+if ($ps_output === null)
+{
   echo "ps failed\n";
   die();
 }
@@ -26,6 +27,22 @@ if (strpos(strtoupper(substr(PHP_OS, 0, 13)), "BSD") !== false)
   // Fix title for BSD
   $set_title = "php: $original_title (php)";
 }
+else if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+{
+  // Kind of convoluted. So when the test is run, the console where the run-tests.php
+  // is executed forks a php.exe, which forks a cmd.exe, which then forks a final php.exe
+  // to run the actual test. But the console title is set for the original console.
+  // I couldn't figure out a good way to navigate this, so we're "grep'ing" all possible
+  // console windows for our very unique title. It should occur exactly once in the grep
+  // output.
+  $pos = strpos($ps_output, $set_title, 0);
+  if ($pos !== false)
+  {
+    $pos = strpos($ps_output, $set_title, $pos + strlen($set_title));
+    if ($pos === false)
+      $load_title = $set_title;
+  }
+}
 
 if ($load_title == $set_title)
   echo "Successfully verified title using ps\n";