Alexandre Julliard : ntdll: Get rid of the vm86 structure in the TEB.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 73d1b89a128de9aebc0256f77b1816102daf61fd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=73d1b89a128de9aebc0256f77...

Author: Alexandre Julliard 
Date:   Mon Feb  5 17:16:44 2018 +0100

ntdll: Get rid of the vm86 structure in the TEB.

Signed-off-by: Alexandre Julliard

---

dlls/ntdll/ntdll_misc.h |  6 ------
 include/winternl.h      | 12 ------------
 2 files changed, 18 deletions(-)

diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index a980dc7..8a64338 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -226,9 +226,6 @@ struct debug_info
 /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */
 struct ntdll_thread_data
 {
-#ifdef __i386__
-    WINE_VM86_TEB_INFO __vm86;        /* FIXME: placeholder for vm86 data from struct x86_thread_data */
-#endif
     struct debug_info *debug_info;    /* info for debugstr functions */
     void              *start_stack;   /* stack for thread startup */
     int                request_fd;    /* fd for sending server requests */
@@ -239,9 +236,6 @@ struct ntdll_thread_data
 };

C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) );
-#ifdef __i386__
-C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 ) == 0x1fc );
-#endif

static inline struct ntdll_thread_data *ntdll_get_thread_data(void)
 {
diff --git a/include/winternl.h b/include/winternl.h
index 4c02873..2911ff6 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2913,18 +2913,6 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le)

#ifdef __WINESRC__

-/* FIXME: private structure for vm86 mode, stored in teb->GdiTebBatch */
-typedef struct
-{
-    DWORD        dpmi_vif;
-    DWORD        vm86_pending;
-} WINE_VM86_TEB_INFO;
-
-static inline WINE_VM86_TEB_INFO *get_vm86_teb_info(void)
-{
-    return (WINE_VM86_TEB_INFO *)&NtCurrentTeb()->GdiTebBatch;
-}
-
 /* The thread information for 16-bit threads */
 /* NtCurrentTeb()->SubSystemTib points to this */
 typedef struct