Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Davide Beatrici
wine
Commits
f0d05628
Commit
f0d05628
authored
11 months ago
by
eric pouech
Committed by
Alexandre Julliard
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
dbghelp: Store thread names in minidump.
Signed-off-by:
Eric Pouech
<
epouech@codeweavers.com
>
parent
167902f3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/dbghelp/minidump.c
+61
-1
61 additions, 1 deletion
dlls/dbghelp/minidump.c
dlls/dbghelp/tests/minidump.c
+1
-3
1 addition, 3 deletions
dlls/dbghelp/tests/minidump.c
with
62 additions
and
4 deletions
dlls/dbghelp/minidump.c
+
61
−
1
View file @
f0d05628
...
...
@@ -771,6 +771,60 @@ static unsigned dump_threads(struct dump_context* dc)
return
sz
;
}
/******************************************************************
* dump_threads_names
*
* Dumps into File the information about threads's name
*/
static
unsigned
dump_threads_names
(
struct
dump_context
*
dc
)
{
MINIDUMP_THREAD_NAME
md_thread_name
;
MINIDUMP_THREAD_NAME_LIST
md_thread_name_list
;
unsigned
i
,
sz
;
RVA
rva_base
;
/* FIXME this could be optimized
* (we use dc->num_threads disk space, could be optimized to the number of threads with name)
*/
rva_base
=
dc
->
rva
;
dc
->
rva
+=
sz
=
offsetof
(
MINIDUMP_THREAD_NAME_LIST
,
ThreadNames
[
dc
->
num_threads
]);
md_thread_name_list
.
NumberOfThreadNames
=
0
;
for
(
i
=
0
;
i
<
dc
->
num_threads
;
i
++
)
{
HANDLE
thread
;
WCHAR
*
thread_name
;
if
((
thread
=
OpenThread
(
THREAD_ALL_ACCESS
,
FALSE
,
dc
->
threads
[
i
].
tid
))
!=
NULL
)
{
if
(
GetThreadDescription
(
thread
,
&
thread_name
))
{
MINIDUMP_STRING
md_string
;
md_thread_name
.
ThreadId
=
dc
->
threads
[
i
].
tid
;
md_thread_name
.
RvaOfThreadName
=
dc
->
rva
;
md_string
.
Length
=
wcslen
(
thread_name
)
*
sizeof
(
WCHAR
);
append
(
dc
,
&
md_string
.
Length
,
sizeof
(
md_string
.
Length
));
append
(
dc
,
thread_name
,
md_string
.
Length
);
writeat
(
dc
,
rva_base
+
offsetof
(
MINIDUMP_THREAD_NAME_LIST
,
ThreadNames
[
md_thread_name_list
.
NumberOfThreadNames
]),
&
md_thread_name
,
sizeof
(
md_thread_name
));
md_thread_name_list
.
NumberOfThreadNames
++
;
LocalFree
(
thread_name
);
}
CloseHandle
(
thread
);
}
}
if
(
!
md_thread_name_list
.
NumberOfThreadNames
)
return
0
;
writeat
(
dc
,
rva_base
,
&
md_thread_name_list
.
NumberOfThreadNames
,
sizeof
(
md_thread_name_list
.
NumberOfThreadNames
));
return
sz
;
}
/******************************************************************
* dump_memory_info
*
...
...
@@ -896,7 +950,7 @@ static DWORD CALLBACK write_minidump(void *_args)
fetch_modules_info
(
dc
);
/* 1) init */
nStreams
=
6
+
(
dc
->
except_param
?
1
:
0
)
+
nStreams
=
7
+
(
dc
->
except_param
?
1
:
0
)
+
(
dc
->
user_stream
?
dc
->
user_stream
->
UserStreamCount
:
0
);
/* pad the directory size to a multiple of 4 for alignment purposes */
...
...
@@ -931,6 +985,12 @@ static DWORD CALLBACK write_minidump(void *_args)
writeat
(
dc
,
mdHead
.
StreamDirectoryRva
+
idx_stream
++
*
sizeof
(
mdDir
),
&
mdDir
,
sizeof
(
mdDir
));
mdDir
.
StreamType
=
ThreadNamesStream
;
mdDir
.
Location
.
Rva
=
dc
->
rva
;
if
((
mdDir
.
Location
.
DataSize
=
dump_threads_names
(
dc
)))
writeat
(
dc
,
mdHead
.
StreamDirectoryRva
+
idx_stream
++
*
sizeof
(
mdDir
),
&
mdDir
,
sizeof
(
mdDir
));
mdDir
.
StreamType
=
ModuleListStream
;
mdDir
.
Location
.
Rva
=
dc
->
rva
;
mdDir
.
Location
.
DataSize
=
dump_modules
(
dc
,
FALSE
);
...
...
This diff is collapsed.
Click to expand it.
dlls/dbghelp/tests/minidump.c
+
1
−
3
View file @
f0d05628
...
...
@@ -105,7 +105,7 @@ typedef DWORD64 stream_mask_t;
STREAM2MASK(ProcessVmCountersStream))
/* streams added in Win8 & Win10... */
#define BASIC_STREAM_BROKEN_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream))
#define BASIC_STREAM_TODO_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream)
| STREAM2MASK(ThreadNamesStream)
)
#define BASIC_STREAM_TODO_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream))
static
void
test_minidump_contents
(
void
)
{
static
const
struct
minidump_streams
...
...
@@ -234,9 +234,7 @@ static void minidump_check_threads_name(void *data, DWORD tid, const WCHAR* name
if
(
!
pSetThreadDescription
)
return
;
ret
=
MiniDumpReadDumpStream
(
data
,
ThreadNamesStream
,
NULL
,
(
void
**
)
&
thread_name_list
,
&
stream_size
);
todo_wine
ok
(
ret
&&
thread_name_list
,
"Couldn't find thread-name-list stream
\n
"
);
if
(
!
ret
)
return
;
/* temp */
ok
(
stream_size
==
sizeof
(
thread_name_list
->
NumberOfThreadNames
)
+
thread_name_list
->
NumberOfThreadNames
*
sizeof
(
thread_name_list
->
ThreadNames
[
0
]),
"Unexpected size
\n
"
);
for
(
i
=
0
;
i
<
thread_name_list
->
NumberOfThreadNames
;
i
++
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment