From 6542214e59bb03c5d5a72c388fd2391d68fe3db2 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sun, 18 Feb 2007 08:08:12 +0000 Subject: [PATCH] 2007-02-18 Jiri Malak * include/windef.h [WATCOM]: Fix !NONAMELESSUNION defines. * include/winnt.h [WATCOM] (GetCurrentFiber, GetFiberData): Add prototypes. [WATCOM] (NtCurrentTeb): Add protype and inline asm definition. 2007-02-18 Vesa Jskelinen * lib/user32.def (InternalGetWindowText): Add stub. --- winsup/w32api/ChangeLog | 11 +++++++++++ winsup/w32api/include/windef.h | 7 +++---- winsup/w32api/include/winnt.h | 8 ++++++++ winsup/w32api/lib/user32.def | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index eafd517b2..308497186 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,14 @@ +2007-02-18 Jiri Malak + + * include/windef.h [WATCOM]: Fix !NONAMELESSUNION defines. + * include/winnt.h [WATCOM] (GetCurrentFiber, GetFiberData): + Add prototypes. + [WATCOM] (NtCurrentTeb): Add protype and inline asm definition. + +2007-02-18 Vesa Jskelinen + + * lib/user32.def (InternalGetWindowText): Add stub. + 2007-02-11 Daniel Atallah * include/winnt.h (LANG_SERBIAN_NEUTRAL, LANG_BOSNIAN, diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h index 0411c42c5..3fd01c5bb 100644 --- a/winsup/w32api/include/windef.h +++ b/winsup/w32api/include/windef.h @@ -156,8 +156,8 @@ extern "C" { #define DBG_UNREFERENCED_PARAMETER(P) #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) -#ifdef __GNUC__ #ifndef NONAMELESSUNION +#ifdef __GNUC__ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -166,11 +166,11 @@ extern "C" { #define _ANONYMOUS_UNION __extension__ #endif /* __cplusplus */ #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ -#endif /* NONAMELESSUNION */ #elif defined(__WATCOMC__) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif /* __GNUC__/__WATCOMC__ */ +#endif /* NONAMELESSUNION */ #ifndef _ANONYMOUS_UNION #define _ANONYMOUS_UNION @@ -279,12 +279,11 @@ DECLARE_HANDLE(HFONT); DECLARE_HANDLE(HICON); DECLARE_HANDLE(HKEY); /* FIXME: How to handle these. SM_CMONITORS etc in winuser.h also. */ -/* #if (WINVER >= 0x0500) */ DECLARE_HANDLE(HMONITOR); #define HMONITOR_DECLARED 1 DECLARE_HANDLE(HTERMINAL); DECLARE_HANDLE(HWINEVENTHOOK); -/* #endif */ + typedef HKEY *PHKEY; DECLARE_HANDLE(HMENU); DECLARE_HANDLE(HMETAFILE); diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 24ab2004b..2db64bd93 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -3897,16 +3897,24 @@ static __inline__ struct _TEB * NtCurrentTeb(void) #else +PVOID GetCurrentFiber(void); #pragma aux GetCurrentFiber = \ "mov eax, dword ptr fs:0x10" \ value [eax] \ modify [eax]; +PVOID GetFiberData(void); #pragma aux GetFiberData = \ "mov eax, dword ptr fs:0x10" \ "mov eax, [eax]" \ value [eax] \ modify [eax]; + +struct _TEB * NtCurrentTeb(void); +#pragma aux NtCurrentTeb = \ + "mov eax, dword ptr fs:0x18" \ + value [eax] \ + modify [eax]; #endif /* __GNUC__ */ #endif /* _X86_ */ diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index b1960a004..b06bb0a35 100644 --- a/winsup/w32api/lib/user32.def +++ b/winsup/w32api/lib/user32.def @@ -366,6 +366,7 @@ InsertMenuA@20 InsertMenuItemA@16 InsertMenuItemW@16 InsertMenuW@20 +InternalGetWindowText@12 IntersectRect@12 InvalidateRect@12 InvalidateRgn@12