Commit: e94c4e3920591fd2ab0c231c4cdad5043d7c6e7f - mingw-wsl-patches (hg)

Mercurial Patch Queue for Windows System Libraries

Commit MetaInfo

• Revision: e94c4e3920591fd2ab0c231c4cdad5043d7c6e7f (tree)
• Zeit: 2019-04-20 21:22:48
• Autor: Cesar Strauss <cestrauss@gmai...>
• Commiter: Cesar Strauss

Log Message

Add patch to forward declare CONTEXT for Win64.

Ändern Zusammenfassung

• modified: series
• add: win64-context.patch

Diff

diff -r 0e5d279d52ab -r e94c4e392059 series
--- a/series	Tue Apr 02 23:00:03 2019 +0100
+++ b/series	Sat Apr 20 12:22:48 2019 +0000
@@ -1,3 +1,4 @@
+win64-context.patch #+win64
 win64-time-typedef.patch #+win64
 cpu-features-x86-64.patch #+win64
 alloca-testing.patch #+void #-void

diff -r 0e5d279d52ab -r e94c4e392059 win64-context.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win64-context.patch	Sat Apr 20 12:22:48 2019 +0000
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User Cesar Strauss <[e-mail]>
+# Date 1555182688 0
+# Parent  a7cb15fb5ac2a68b8b58cacc752a0941553dc2c7
+Forward declare CONTEXT for Win64, in place of an actual declaration.
+
+Allow uses of pointers to CONTEXT to compile, while postponing the work
+of determining the actual declaration for Win64.
+
+diff -r a7cb15fb5ac2 wslapi/include/winbase.h
+--- a/wslapi/include/winbase.h	Mon Apr 08 10:03:40 2019 +0100
++++ b/wslapi/include/winbase.h	Sat Apr 20 12:19:34 2019 +0000
+@@ -2386,7 +2386,8 @@
+ WINBASEAPI DWORD WINAPI SetTapePosition
+ (HANDLE, DWORD, DWORD, DWORD, DWORD, BOOL);
+ WINBASEAPI DWORD WINAPI SetThreadAffinityMask (HANDLE, DWORD);
+-WINBASEAPI BOOL WINAPI SetThreadContext (HANDLE, const CONTEXT *);
++/* TODO: remove the struct keyword after CONTEXT is defined for x86_64 */
++WINBASEAPI BOOL WINAPI SetThreadContext (HANDLE, const struct CONTEXT *);
+ 
+ WINBASEAPI DWORD WINAPI SetThreadIdealProcessor (HANDLE, DWORD);
+ WINBASEAPI BOOL WINAPI SetThreadPriority (HANDLE, int);
+diff -r a7cb15fb5ac2 wslapi/include/winnt.h
+--- a/wslapi/include/winnt.h	Mon Apr 08 10:03:40 2019 +0100
++++ b/wslapi/include/winnt.h	Sat Apr 20 12:19:34 2019 +0000
+@@ -2430,10 +2430,15 @@
+   ULONG 		Psr;
+ } CONTEXT;
+ 
++#elif defined(_M_AMD64)
++/* TODO: Find out the definition of CONTEXT for x86_64 */
++struct CONTEXT;
++
+ #else
+ #error "undefined processor type"
+ #endif
+-typedef CONTEXT *PCONTEXT, *LPCONTEXT;
++/* TODO: remove the struct keyword after CONTEXT is defined for x86_64 */
++typedef struct CONTEXT *PCONTEXT, *LPCONTEXT;
+ 
+ typedef struct _EXCEPTION_RECORD
+ { DWORD 			ExceptionCode;