Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 12:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use standard TLS instead of custom TEB field.

Browse source 
- Use W32API.

svn path=/trunk/; revision=15945
This commit is contained in:
Filip Navara 2005-06-17 07:53:34 +00:00
parent c7ccd70dbd
commit c893e787ea
2 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
reactos/lib/libwine/debug.c
View file

@ -29,6 +29,18 @@
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static CRITICAL_SECTION WineDebugCS;
static CRITICAL_SECTION_DEBUG critsect_debug =
{
0, 0, &WineDebugCS,
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
0, 0, { 0, 0 }
};
static CRITICAL_SECTION WineDebugCS = { &critsect_debug, -1, 0, 0, 0, 0 };
static DWORD WineDebugTlsIndex = TLS_OUT_OF_INDEXES;
/* ---------------------------------------------------------------------- */
struct debug_info struct debug_info
{ {
char *str_pos; /* current position in strings buffer */ char *str_pos; /* current position in strings buffer */
@ -37,28 +49,40 @@ struct debug_info
char output[1024]; /* current output line */ char output[1024]; /* current output line */
}; };
static struct debug_info tmp; static struct debug_info tmp = { tmp.strings, tmp.output };
/* get the debug info pointer for the current thread */ /* get the debug info pointer for the current thread */
static inline struct debug_info *get_info(void) static inline struct debug_info *get_info(void)
{ {
struct debug_info *info = NtCurrentTeb()->WineDebugInfo; struct debug_info *info;
if (!info)
if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES)
{ {
if (!tmp.str_pos) EnterCriticalSection(&WineDebugCS);
if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES)
{ {
tmp.str_pos = tmp.strings; DWORD NewTlsIndex = TlsAlloc();
tmp.out_pos = tmp.output; if (NewTlsIndex == TLS_OUT_OF_INDEXES)
{
LeaveCriticalSection(&WineDebugCS);
return &tmp;
}
info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info));
if (!info)
{
LeaveCriticalSection(&WineDebugCS);
TlsFree(NewTlsIndex);
return &tmp;
}
info->str_pos = info->strings;
info->out_pos = info->output;
TlsSetValue(NewTlsIndex, info);
WineDebugTlsIndex = NewTlsIndex;
} }
if (!RtlGetProcessHeap()) return &tmp; LeaveCriticalSection(&WineDebugCS);
/* setup the temp structure in case HeapAlloc wants to print something */
NtCurrentTeb()->WineDebugInfo = &tmp;
info = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(*info));
info->str_pos = info->strings;
info->out_pos = info->output;
NtCurrentTeb()->WineDebugInfo = info;
} }
return info;
return TlsGetValue(WineDebugTlsIndex);
} }
/* allocate some tmp space for a string */ /* allocate some tmp space for a string */
@ -75,7 +99,11 @@ static void *gimme1(int n)
/* release extra space that we requested in gimme1() */ /* release extra space that we requested in gimme1() */
static inline void release(void *ptr) static inline void release(void *ptr)
{ {
struct debug_info *info = NtCurrentTeb()->WineDebugInfo; struct debug_info *info;
if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES)
info = &tmp;
else
info = TlsGetValue(WineDebugTlsIndex);
info->str_pos = ptr; info->str_pos = ptr;
} }

1
reactos/lib/libwine/libwine.xml
View file

@ -1,5 +1,6 @@
<module name="wine" type="staticlibrary"> <module name="wine" type="staticlibrary">
<define name="_DISABLE_TIDENTS" /> <define name="_DISABLE_TIDENTS" />
<define name="__REACTOS__" /> <define name="__REACTOS__" />
<define name="__USE_W32API" />
<file>debug.c</file> <file>debug.c</file>
</module> </module>