Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix ftok() multibyte path support

Author: weltling

win32/ftok.c

@@ -21,31 +21,41 @@
 #include <windows.h>
 #include <sys/stat.h>
 
+#include "ioutil.h"
 
 PHP_WIN32_IPC_API key_t
 ftok(const char *pathname, int proj_id)
 {/*{{{*/
 	HANDLE fh;
-	struct stat st;
+	struct _stat st;
 	BY_HANDLE_FILE_INFORMATION bhfi;
 	key_t ret;
+	PHP_WIN32_IOUTIL_INIT_W(pathname)
 
-	if (stat(pathname, &st) < 0) {
+	if (!pathw) {
 		return (key_t)-1;
 	}
 
-	if ((fh = CreateFile(pathname, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) {
+	if (_wstat(pathw, &st) < 0) {
+		PHP_WIN32_IOUTIL_CLEANUP_W()
+		return (key_t)-1;
+	}
+
+	if ((fh = CreateFileW(pathw, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) {
+		PHP_WIN32_IOUTIL_CLEANUP_W()
 		return (key_t)-1;
 	}
 
 	if (!GetFileInformationByHandle(fh, &bhfi)) {
+		PHP_WIN32_IOUTIL_CLEANUP_W()
 		CloseHandle(fh);
 		return (key_t)-1;
 	}
 
 	ret = (key_t) ((proj_id & 0xff) << 24 | (st.st_dev & 0xff) << 16 | ((bhfi.nFileIndexLow | (__int64)bhfi.nFileIndexHigh << 32) & 0xffff));
 
 	CloseHandle(fh);
+	PHP_WIN32_IOUTIL_CLEANUP_W()
 
 	return ret;
 }/*}}}*/