Module: wine Branch: master Commit: fc5c459d63f09457f18b852c816ce9cf5d00e312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5c459d63f09457f18b852c81...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Dec 28 17:26:55 2009 +0100
kernel32: Move the kernel thread data definitions to kernel16_private.h.
---
dlls/kernel32/kernel16_private.h | 19 +++++++++++++++++++ dlls/kernel32/kernel_private.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index 7a0e2f5..0509471 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -239,6 +239,9 @@ extern void SNOOP16_RegisterDLL(HMODULE16,LPCSTR); extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16); extern int SNOOP16_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname);
+/* syslevel.c */ +extern VOID SYSLEVEL_CheckNotLevel( INT level ); + /* task.c */ extern void TASK_CreateMainTask(void); extern HTASK16 TASK_SpawnTask( NE_MODULE *pModule, WORD cmdShow, @@ -271,6 +274,22 @@ extern DWORD CallTo16_TebSelector; extern SEGPTR CALL32_CBClient_RetAddr; extern SEGPTR CALL32_CBClientEx_RetAddr;
+struct tagSYSLEVEL; + +struct kernel_thread_data +{ + WORD stack_sel; /* 16-bit stack selector */ + WORD htask16; /* Win16 task handle */ + DWORD sys_count[4]; /* syslevel mutex entry counters */ + struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ + void *pad[45]; /* change this if you add fields! */ +}; + +static inline struct kernel_thread_data *kernel_get_thread_data(void) +{ + return (struct kernel_thread_data *)NtCurrentTeb()->SystemReserved1; +} + #ifdef __i386__ #define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 9ec20d6..df753d7 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -23,22 +23,6 @@
#include "wine/server.h"
-struct tagSYSLEVEL; - -struct kernel_thread_data -{ - WORD stack_sel; /* 16-bit stack selector */ - WORD htask16; /* Win16 task handle */ - DWORD sys_count[4]; /* syslevel mutex entry counters */ - struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ - void *pad[45]; /* change this if you add fields! */ -}; - -static inline struct kernel_thread_data *kernel_get_thread_data(void) -{ - return (struct kernel_thread_data *)NtCurrentTeb()->SystemReserved1; -} - HANDLE WINAPI OpenConsoleW(LPCWSTR, DWORD, BOOL, DWORD); BOOL WINAPI VerifyConsoleIoHandle(HANDLE); HANDLE WINAPI DuplicateConsoleHandle(HANDLE, DWORD, BOOL, DWORD); @@ -68,8 +52,6 @@ extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; extern const WCHAR *DIR_SysWow64;
-extern VOID SYSLEVEL_CheckNotLevel( INT level ); - extern void FILE_SetDosError(void); extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ); extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen );