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
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Yoann Laissus
wine
Commits
4ea3c26a
Commit
4ea3c26a
authored
23 years ago
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Display thread id instead of %fs in relay trace.
parent
a9f8997f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
relay32/relay386.c
+9
-7
9 additions, 7 deletions
relay32/relay386.c
scheduler/process.c
+2
-1
2 additions, 1 deletion
scheduler/process.c
scheduler/thread.c
+3
-0
3 additions, 0 deletions
scheduler/thread.c
with
14 additions
and
8 deletions
relay32/relay386.c
+
9
−
7
View file @
4ea3c26a
...
...
@@ -128,8 +128,10 @@ static void get_entry_point( char *buffer, DEBUG_ENTRY_POINT *relay )
/* Now find the function */
name
=
find_exported_name
(
base
,
exp
,
ordinal
+
exp
->
Base
);
sprintf
(
buffer
,
"%s.%ld: %s"
,
base
+
exp
->
Name
,
ordinal
+
exp
->
Base
,
name
?
name
:
"@"
);
if
((
name
=
find_exported_name
(
base
,
exp
,
ordinal
+
exp
->
Base
)))
sprintf
(
buffer
,
"%s.%s"
,
base
+
exp
->
Name
,
name
);
else
sprintf
(
buffer
,
"%s.%ld"
,
base
+
exp
->
Name
,
ordinal
+
exp
->
Base
);
}
...
...
@@ -183,7 +185,7 @@ static LONGLONG RELAY_CallFrom32( int ret_addr, ... )
DPRINTF
(
"Call %s("
,
buffer
);
RELAY_PrintArgs
(
args
,
nb_args
,
relay
->
argtypes
);
DPRINTF
(
") ret=%08x
fs
=%0
4
x
\n
"
,
ret_addr
,
__get_fs
()
);
DPRINTF
(
") ret=%08x
tid
=%0
8l
x
\n
"
,
ret_addr
,
GetCurrentThreadId
()
);
ret64
=
(
relay
->
argtypes
&
0x80000000
)
&&
(
nb_args
<
16
);
/* the user driver functions may be called with the window lock held */
...
...
@@ -277,11 +279,11 @@ static LONGLONG RELAY_CallFrom32( int ret_addr, ... )
}
}
if
(
ret64
)
DPRINTF
(
"Ret %s() retval=%08x%08x ret=%08x
fs
=%0
4
x
\n
"
,
buffer
,
(
UINT
)(
ret
>>
32
),
(
UINT
)
ret
,
ret_addr
,
__get_fs
()
);
DPRINTF
(
"Ret %s() retval=%08x%08x ret=%08x
tid
=%0
8l
x
\n
"
,
buffer
,
(
UINT
)(
ret
>>
32
),
(
UINT
)
ret
,
ret_addr
,
GetCurrentThreadId
()
);
else
DPRINTF
(
"Ret %s() retval=%08x ret=%08x
fs
=%0
4
x
\n
"
,
buffer
,
(
UINT
)
ret
,
ret_addr
,
__get_fs
()
);
DPRINTF
(
"Ret %s() retval=%08x ret=%08x
tid
=%0
8l
x
\n
"
,
buffer
,
(
UINT
)
ret
,
ret_addr
,
GetCurrentThreadId
()
);
if
(
memcmp
(
buffer
,
"x11drv."
,
7
)
&&
memcmp
(
buffer
,
"ttydrv."
,
7
))
SYSLEVEL_CheckNotLevel
(
2
);
...
...
This diff is collapsed.
Click to expand it.
scheduler/process.c
+
2
−
1
View file @
4ea3c26a
...
...
@@ -393,7 +393,8 @@ static void start_process(void)
/* Call UserSignalProc ( USIG_PROCESS_RUNNING ... ) only for non-GUI win32 apps */
if
(
console_app
)
PROCESS_CallUserSignalProc
(
USIG_PROCESS_RUNNING
,
0
);
TRACE_
(
relay
)(
"Starting Win32 process %s (entryproc=%p)
\n
"
,
main_exe_name
,
entry
);
TRACE_
(
relay
)(
"Starting Win32 process %s (entryproc=%p) tid=%08lx
\n
"
,
main_exe_name
,
entry
,
GetCurrentThreadId
()
);
if
(
debugged
)
DbgBreakPoint
();
/* FIXME: should use _PEB as parameter for NT 3.5 programs !
* Dunno about other OSs */
...
...
This diff is collapsed.
Click to expand it.
scheduler/thread.c
+
3
−
0
View file @
4ea3c26a
...
...
@@ -30,6 +30,7 @@
#include
"winnls.h"
DEFAULT_DEBUG_CHANNEL
(
thread
);
DECLARE_DEBUG_CHANNEL
(
relay
);
/* TEB of the initial thread */
static
TEB
initial_teb
;
...
...
@@ -271,6 +272,8 @@ static void THREAD_Start(void)
NtCurrentTeb
()
->
cleanup
=
SERVICE_AddObject
(
cleanup_object
,
(
PAPCFUNC
)
THREAD_FreeTEB
,
(
ULONG_PTR
)
NtCurrentTeb
()
);
TRACE_
(
relay
)(
"Starting thread %08lx
\n
"
,
GetCurrentThreadId
());
PROCESS_CallUserSignalProc
(
USIG_THREAD_INIT
,
0
);
PE_InitTls
();
MODULE_DllThreadAttach
(
NULL
);
...
...
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