Add win32_api patch

Author: crazywhalecc

patches/Readme.md

@@ -13,6 +13,7 @@ vcruntime140 | Windows | 必须 Nessesary | 禁用sfx启动时GetModuleHandle(vc
 win32 | Windows | 必须 Nessesary | 修改构建系统以静态构建 Modify build system for build sfx file
 zend_stream | Windows | 必须 Nessesary | 修改构建系统以静态构建 Modify build system for build sfx file
 comctl32 | Windows | 可选 Optional | 添加comctl32.dll manifest以启用[visual style](https://learn.microsoft.com/en-us/windows/win32/controls/visual-styles-overview) (会让窗口控件好看一些) Add manifest dependency for comctl32 to enable [visual style](https://learn.microsoft.com/en-us/windows/win32/controls/visual-styles-overview) (makes window control looks modern)
+win32_api | Windows | 必须 Necessary | 修复一些win32 api的声明 Fix declarations of some win32 apis
 
 ## Usage
 
@@ -85,3 +86,10 @@ This bypasses many hard-coded cli SAPI name checks.
 允许Windows的cli静态构建，不是给micro用的
 
 This allows the Windows cli SAPI to be built fully statically. It is not a patch for micro.
+
+### win32_api
+
+修复一些win32 api的声明，避免编译警告。这些修改已经在新版本 PHP （>=8.4）中合并，但保证旧版本也能用，这些补丁仍然需要
+
+This fixes declarations of some win32 apis to avoid compilation warnings. These changes have been merged into newer versions of PHP (>=8.4), but to ensure that older versions can still be used, these patches are still needed.
+

patches/cli_static_80.patch

@@ -3,19 +3,18 @@ index 0ad53e813c..a8cc1bee29 100644
 --- a/sapi/cli/php_cli.c
 +++ b/sapi/cli/php_cli.c
 @@ -97,7 +97,7 @@ PHPAPI extern char *php_ini_scanned_files;
- 
+
  #if defined(PHP_WIN32)
  #if defined(ZTS)
 -ZEND_TSRMLS_CACHE_DEFINE()
 +//ZEND_TSRMLS_CACHE_DEFINE()
  #endif
  static DWORD orig_cp = 0;
  #endif
-@@ -1160,6 +1160,11 @@ int main(int argc, char *argv[])
+@@ -1160,6 +1160,10 @@ int main(int argc, char *argv[])
  #endif
  {
  #if defined(PHP_WIN32)
-+    php_win32_init_gettimeofday();
 +    if (!php_win32_ioutil_init()) {
 +        fprintf(stderr, "ioutil initialization failed");
 +        return 1;

patches/win32_api_80.patch

@@ -0,0 +1,88 @@
+diff --git a/win32/dllmain.c b/win32/dllmain.c
+index a507f1e1..ab625bf3 100644
+--- a/win32/dllmain.c
++++ b/win32/dllmain.c
+@@ -38,20 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy)
+ 	switch (reason)
+ 	{
+ 		case DLL_PROCESS_ATTACH:
+-			/*
+-			 * We do not need to check the return value of php_win32_init_gettimeofday()
+-			 * because the symbol bare minimum symbol we need is always available on our
+-			 * lowest supported platform.
+-			 *
+-			 * On Windows 8 or greater, we use a more precise symbol to obtain the system
+-			 * time, which is dynamically. The fallback allows us to proper support
+-			 * Vista/7/Server 2003 R2/Server 2008/Server 2008 R2.
+-			 *
+-			 * Instead simply initialize the global in win32/time.c for gettimeofday()
+-			 * use later on
+-			 */
+-			php_win32_init_gettimeofday();
+-
+ 			ret = ret && php_win32_ioutil_init();
+ 			if (!ret) {
+ 				fprintf(stderr, "ioutil initialization failed");
+diff --git a/win32/time.c b/win32/time.c
+index d1fe5145..57db914e 100644
+--- a/win32/time.c
++++ b/win32/time.c
+@@ -23,42 +23,13 @@
+ #include <errno.h>
+ #include "php_win32_globals.h"
+
+-typedef VOID (WINAPI *MyGetSystemTimeAsFileTime)(LPFILETIME lpSystemTimeAsFileTime);
+-
+-static MyGetSystemTimeAsFileTime timefunc = NULL;
+-
+-#ifdef PHP_EXPORTS
+-static zend_always_inline MyGetSystemTimeAsFileTime get_time_func(void)
+-{/*{{{*/
+-	MyGetSystemTimeAsFileTime timefunc = NULL;
+-	HMODULE hMod = GetModuleHandle("kernel32.dll");
+-
+-	if (hMod) {
+-		/* Max possible resolution <1us, win8/server2012 */
+-		timefunc = (MyGetSystemTimeAsFileTime)GetProcAddress(hMod, "GetSystemTimePreciseAsFileTime");
+-	}
+-
+-	if(!timefunc) {
+-		/* 100ns blocks since 01-Jan-1641 */
+-		timefunc = (MyGetSystemTimeAsFileTime) GetSystemTimeAsFileTime;
+-	}
+-
+-	return timefunc;
+-}/*}}}*/
+-
+-void php_win32_init_gettimeofday(void)
+-{/*{{{*/
+-	timefunc = get_time_func();
+-}/*}}}*/
+-#endif
+-
+ static zend_always_inline int getfilesystemtime(struct timeval *tv)
+ {/*{{{*/
+ 	FILETIME ft;
+ 	unsigned __int64 ff = 0;
+ 	ULARGE_INTEGER fft;
+
+-	timefunc(&ft);
++	GetSystemTimePreciseAsFileTime(&ft);
+
+         /*
+ 	 * Do not cast a pointer to a FILETIME structure to either a
+diff --git a/win32/time.h b/win32/time.h
+index 51090ccf..77d1cbfd 100644
+--- a/win32/time.h
++++ b/win32/time.h
+@@ -54,10 +54,4 @@ PHPAPI int nanosleep( const struct timespec * rqtp, struct timespec * rmtp );
+
+ PHPAPI int usleep(unsigned int useconds);
+
+-#ifdef PHP_EXPORTS
+-/* This symbols are needed only for the DllMain, but should not be exported
+-	or be available when used with PHP binaries. */
+-void php_win32_init_gettimeofday(void);
+-#endif
+-
+ #endif

patches/win32_api_84.patch

@@ -54,9 +54,6 @@ BOOL php_win32_shutdown_random_bytes(void);
 #if PHP_VERSION_ID < 80500
 BOOL php_win32_ioutil_init(void);
 #endif
-#if PHP_VERSION_ID < 80400
-void php_win32_init_gettimeofday(void);
-#endif
 #else
 #    define php_select(m, r, w, e, t) select(m, r, w, e, t)
 #    include <fcntl.h>
@@ -593,9 +590,6 @@ int main(int argc, char *argv[])
 #if PHP_VERSION_ID < 80500
     php_win32_ioutil_init();
 #endif
-#if PHP_VERSION_ID < 80400
-    php_win32_init_gettimeofday();
-#endif
 
     _fmode = _O_BINARY;                 /* sets default for file streams to binary */
     setmode(_fileno(stdin), O_BINARY);  /* make the stdio mode be binary */

php_micro.c

@@ -25,7 +25,7 @@ limitations under the License.
 
 #define PHP_MICRO_VER_MAJ 0
 #define PHP_MICRO_VER_MIN 2
-#define PHP_MICRO_VER_PAT 1
+#define PHP_MICRO_VER_PAT 2
 // #define PHP_MICRO_VER_APP "nope"
 #ifdef PHP_MICRO_VER_APP
 #    define PHP_MICRO_VER_STR \