Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
fc84f246
Commit
fc84f246
authored
Mar 07, 2017
by
Sebastian Lackner
Committed by
Alexandre Julliard
Mar 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Avoid typedef for tls_data.
Signed-off-by:
Sebastian Lackner
<
sebastian@fds-team.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f3842e78
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
test.h
include/wine/test.h
+15
-15
No files found.
include/wine/test.h
View file @
fc84f246
...
@@ -218,7 +218,7 @@ static LONG todo_successes; /* number of successful tests inside todo block */
...
@@ -218,7 +218,7 @@ static LONG todo_successes; /* number of successful tests inside todo block */
static
LONG
todo_failures
;
/* number of failures inside todo block */
static
LONG
todo_failures
;
/* number of failures inside todo block */
/* The following data must be kept track of on a per-thread basis */
/* The following data must be kept track of on a per-thread basis */
typedef
struct
struct
tls_data
{
{
const
char
*
current_file
;
/* file of current check */
const
char
*
current_file
;
/* file of current check */
int
current_line
;
/* line of current check */
int
current_line
;
/* line of current check */
...
@@ -226,19 +226,19 @@ typedef struct
...
@@ -226,19 +226,19 @@ typedef struct
int
todo_do_loop
;
int
todo_do_loop
;
char
*
str_pos
;
/* position in debug buffer */
char
*
str_pos
;
/* position in debug buffer */
char
strings
[
2000
];
/* buffer for debug strings */
char
strings
[
2000
];
/* buffer for debug strings */
}
tls_data
;
};
static
DWORD
tls_index
;
static
DWORD
tls_index
;
static
tls_data
*
get_tls_data
(
void
)
static
struct
tls_data
*
get_tls_data
(
void
)
{
{
tls_data
*
data
;
struct
tls_data
*
data
;
DWORD
last_error
;
DWORD
last_error
;
last_error
=
GetLastError
();
last_error
=
GetLastError
();
data
=
TlsGetValue
(
tls_index
);
data
=
TlsGetValue
(
tls_index
);
if
(
!
data
)
if
(
!
data
)
{
{
data
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
tls_
data
));
data
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
data
));
data
->
str_pos
=
data
->
strings
;
data
->
str_pos
=
data
->
strings
;
TlsSetValue
(
tls_index
,
data
);
TlsSetValue
(
tls_index
,
data
);
}
}
...
@@ -249,7 +249,7 @@ static tls_data* get_tls_data(void)
...
@@ -249,7 +249,7 @@ static tls_data* get_tls_data(void)
/* allocate some tmp space for a string */
/* allocate some tmp space for a string */
static
char
*
get_temp_buffer
(
size_t
n
)
static
char
*
get_temp_buffer
(
size_t
n
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
char
*
res
=
data
->
str_pos
;
char
*
res
=
data
->
str_pos
;
if
(
res
+
n
>=
&
data
->
strings
[
sizeof
(
data
->
strings
)])
res
=
data
->
strings
;
if
(
res
+
n
>=
&
data
->
strings
[
sizeof
(
data
->
strings
)])
res
=
data
->
strings
;
...
@@ -260,7 +260,7 @@ static char *get_temp_buffer( size_t n )
...
@@ -260,7 +260,7 @@ static char *get_temp_buffer( size_t n )
/* release extra space that we requested in get_temp_buffer() */
/* release extra space that we requested in get_temp_buffer() */
static
void
release_temp_buffer
(
char
*
ptr
,
size_t
size
)
static
void
release_temp_buffer
(
char
*
ptr
,
size_t
size
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
data
->
str_pos
=
ptr
+
size
;
data
->
str_pos
=
ptr
+
size
;
}
}
...
@@ -273,7 +273,7 @@ static void exit_process( int code )
...
@@ -273,7 +273,7 @@ static void exit_process( int code )
void
winetest_set_location
(
const
char
*
file
,
int
line
)
void
winetest_set_location
(
const
char
*
file
,
int
line
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
data
->
current_file
=
strrchr
(
file
,
'/'
);
data
->
current_file
=
strrchr
(
file
,
'/'
);
if
(
data
->
current_file
==
NULL
)
if
(
data
->
current_file
==
NULL
)
data
->
current_file
=
strrchr
(
file
,
'\\'
);
data
->
current_file
=
strrchr
(
file
,
'\\'
);
...
@@ -301,7 +301,7 @@ int broken( int condition )
...
@@ -301,7 +301,7 @@ int broken( int condition )
*/
*/
int
winetest_vok
(
int
condition
,
const
char
*
msg
,
__winetest_va_list
args
)
int
winetest_vok
(
int
condition
,
const
char
*
msg
,
__winetest_va_list
args
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
if
(
data
->
todo_level
)
if
(
data
->
todo_level
)
{
{
...
@@ -358,7 +358,7 @@ void __winetest_cdecl winetest_ok( int condition, const char *msg, ... )
...
@@ -358,7 +358,7 @@ void __winetest_cdecl winetest_ok( int condition, const char *msg, ... )
void
__winetest_cdecl
winetest_trace
(
const
char
*
msg
,
...
)
void
__winetest_cdecl
winetest_trace
(
const
char
*
msg
,
...
)
{
{
__winetest_va_list
valist
;
__winetest_va_list
valist
;
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
if
(
winetest_debug
>
0
)
if
(
winetest_debug
>
0
)
{
{
...
@@ -371,7 +371,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... )
...
@@ -371,7 +371,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... )
void
winetest_vskip
(
const
char
*
msg
,
__winetest_va_list
args
)
void
winetest_vskip
(
const
char
*
msg
,
__winetest_va_list
args
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
printf
(
"%s:%d: Tests skipped: "
,
data
->
current_file
,
data
->
current_line
);
printf
(
"%s:%d: Tests skipped: "
,
data
->
current_file
,
data
->
current_line
);
vprintf
(
msg
,
args
);
vprintf
(
msg
,
args
);
...
@@ -399,14 +399,14 @@ void __winetest_cdecl winetest_win_skip( const char *msg, ... )
...
@@ -399,14 +399,14 @@ void __winetest_cdecl winetest_win_skip( const char *msg, ... )
void
winetest_start_todo
(
int
is_todo
)
void
winetest_start_todo
(
int
is_todo
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
data
->
todo_level
=
(
data
->
todo_level
<<
1
)
|
(
is_todo
!=
0
);
data
->
todo_level
=
(
data
->
todo_level
<<
1
)
|
(
is_todo
!=
0
);
data
->
todo_do_loop
=
1
;
data
->
todo_do_loop
=
1
;
}
}
int
winetest_loop_todo
(
void
)
int
winetest_loop_todo
(
void
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
int
do_loop
=
data
->
todo_do_loop
;
int
do_loop
=
data
->
todo_do_loop
;
data
->
todo_do_loop
=
0
;
data
->
todo_do_loop
=
0
;
return
do_loop
;
return
do_loop
;
...
@@ -414,7 +414,7 @@ int winetest_loop_todo(void)
...
@@ -414,7 +414,7 @@ int winetest_loop_todo(void)
void
winetest_end_todo
(
void
)
void
winetest_end_todo
(
void
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
data
->
todo_level
>>=
1
;
data
->
todo_level
>>=
1
;
}
}
...
@@ -613,7 +613,7 @@ static void usage( const char *argv0 )
...
@@ -613,7 +613,7 @@ static void usage( const char *argv0 )
/* trap unhandled exceptions */
/* trap unhandled exceptions */
static
LONG
CALLBACK
exc_filter
(
EXCEPTION_POINTERS
*
ptrs
)
static
LONG
CALLBACK
exc_filter
(
EXCEPTION_POINTERS
*
ptrs
)
{
{
tls_data
*
data
=
get_tls_data
();
struct
tls_data
*
data
=
get_tls_data
();
if
(
data
->
current_file
)
if
(
data
->
current_file
)
printf
(
"%s:%d: this is the last test seen before the exception
\n
"
,
printf
(
"%s:%d: this is the last test seen before the exception
\n
"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment