commit 0a860a01f918b12dc54e5fa5153ffc69480f2319
author Alexandre Julliard <julliard@winehq.org> Tue Jun 22 11:43:42 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jun 22 11:43:42 1999 +0000
tree b48662c5bcb0c057e65abe2dd5457df87b9d5b38
parent 385287a011e39c09e2c9cb19b53f9162540ca71f

Merged THDB and TEB structures.
Made SetLastError(), GetCurrentThreadId() and PROCESS_Current() inline.

include/stackframe.h

diff --git a/include/stackframe.h b/include/stackframe.h
index 66bc1dc..1a08630 100644
--- a/include/stackframe.h
+++ b/include/stackframe.h
@@ -47,8 +47,8 @@
 
 #include "poppack.h"
 
-#define THREAD_STACK16(thdb) ((STACK16FRAME*)PTR_SEG_TO_LIN((thdb)->cur_stack))
-#define CURRENT_STACK16      (THREAD_STACK16(THREAD_Current()))
+#define THREAD_STACK16(teb)  ((STACK16FRAME*)PTR_SEG_TO_LIN((teb)->cur_stack))
+#define CURRENT_STACK16      (THREAD_STACK16(NtCurrentTeb()))
 #define CURRENT_DS           (CURRENT_STACK16->ds)
 
 /* varargs lists on the 16-bit stack */
@@ -66,17 +66,17 @@
 /* Push bytes on the 16-bit stack of a thread;
  * return a segptr to the first pushed byte
  */
-#define STACK16_PUSH(thdb,size) \
- (memmove((char*)THREAD_STACK16(thdb)-(size),THREAD_STACK16(thdb), \
+#define STACK16_PUSH(teb,size) \
+ (memmove((char*)THREAD_STACK16(teb)-(size),THREAD_STACK16(teb), \
           sizeof(STACK16FRAME)), \
-  (thdb)->cur_stack -= (size), \
-  (SEGPTR)((thdb)->cur_stack + sizeof(STACK16FRAME)))
+  (teb)->cur_stack -= (size), \
+  (SEGPTR)((teb)->cur_stack + sizeof(STACK16FRAME)))
 
 /* Pop bytes from the 16-bit stack of a thread */
-#define STACK16_POP(thdb,size) \
- (memmove((char*)THREAD_STACK16(thdb)+(size),THREAD_STACK16(thdb), \
+#define STACK16_POP(teb,size) \
+ (memmove((char*)THREAD_STACK16(teb)+(size),THREAD_STACK16(teb), \
           sizeof(STACK16FRAME)), \
-  (thdb)->cur_stack += (size))
+  (teb)->cur_stack += (size))
 
 /* Push a DWORD on the 32-bit stack */
 #define STACK32_PUSH(context,val) (*--(*(DWORD **)&ESP_reg(context)) = (val))