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
1d093acc
Commit
1d093acc
authored
Jul 06, 2020
by
Piotr Caban
Committed by
Alexandre Julliard
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Fix 64-bit values printing in relay.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ef90b6e5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
relay.c
dlls/ntdll/relay.c
+10
-10
No files found.
dlls/ntdll/relay.c
View file @
1d093acc
...
@@ -305,14 +305,14 @@ static const char *func_name( struct relay_private_data *data, unsigned int ordi
...
@@ -305,14 +305,14 @@ static const char *func_name( struct relay_private_data *data, unsigned int ordi
static
void
trace_string_a
(
INT_PTR
ptr
)
static
void
trace_string_a
(
INT_PTR
ptr
)
{
{
if
(
!
IS_INTARG
(
ptr
))
TRACE
(
"%08
l
x %s"
,
ptr
,
debugstr_a
(
(
char
*
)
ptr
));
if
(
!
IS_INTARG
(
ptr
))
TRACE
(
"%08
I
x %s"
,
ptr
,
debugstr_a
(
(
char
*
)
ptr
));
else
TRACE
(
"%08
l
x"
,
ptr
);
else
TRACE
(
"%08
I
x"
,
ptr
);
}
}
static
void
trace_string_w
(
INT_PTR
ptr
)
static
void
trace_string_w
(
INT_PTR
ptr
)
{
{
if
(
!
IS_INTARG
(
ptr
))
TRACE
(
"%08
l
x %s"
,
ptr
,
debugstr_w
(
(
WCHAR
*
)
ptr
));
if
(
!
IS_INTARG
(
ptr
))
TRACE
(
"%08
I
x %s"
,
ptr
,
debugstr_w
(
(
WCHAR
*
)
ptr
));
else
TRACE
(
"%08
l
x"
,
ptr
);
else
TRACE
(
"%08
I
x"
,
ptr
);
}
}
#ifdef __i386__
#ifdef __i386__
...
@@ -635,13 +635,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
...
@@ -635,13 +635,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
break
;
break
;
case
'i'
:
/* long */
case
'i'
:
/* long */
default
:
default
:
TRACE
(
"%08
l
x"
,
stack
[
i
]
);
TRACE
(
"%08
z
x"
,
stack
[
i
]
);
break
;
break
;
}
}
if
(
!
is_ret_val
(
arg_types
[
i
+
1
]
))
TRACE
(
","
);
if
(
!
is_ret_val
(
arg_types
[
i
+
1
]
))
TRACE
(
","
);
}
}
*
nb_args
=
i
;
*
nb_args
=
i
;
TRACE
(
") ret=%08
l
x
\n
"
,
stack
[
-
1
]
);
TRACE
(
") ret=%08
z
x
\n
"
,
stack
[
-
1
]
);
return
entry_point
->
orig_func
;
return
entry_point
->
orig_func
;
}
}
...
@@ -651,7 +651,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
...
@@ -651,7 +651,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
DECLSPEC_HIDDEN
void
WINAPI
relay_trace_exit
(
struct
relay_descr
*
descr
,
unsigned
int
idx
,
DECLSPEC_HIDDEN
void
WINAPI
relay_trace_exit
(
struct
relay_descr
*
descr
,
unsigned
int
idx
,
INT_PTR
retaddr
,
INT_PTR
retval
)
INT_PTR
retaddr
,
INT_PTR
retval
)
{
{
TRACE
(
"
\1
Ret %s() retval=%08
lx ret=%08l
x
\n
"
,
TRACE
(
"
\1
Ret %s() retval=%08
zx ret=%08z
x
\n
"
,
func_name
(
descr
->
private
,
LOWORD
(
idx
)
),
retval
,
retaddr
);
func_name
(
descr
->
private
,
LOWORD
(
idx
)
),
retval
,
retaddr
);
}
}
...
@@ -741,13 +741,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
...
@@ -741,13 +741,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
break
;
break
;
case
'i'
:
/* long */
case
'i'
:
/* long */
default
:
default
:
TRACE
(
"%08
l
x"
,
stack
[
i
]
);
TRACE
(
"%08
z
x"
,
stack
[
i
]
);
break
;
break
;
}
}
if
(
!
is_ret_val
(
arg_types
[
i
+
1
]
))
TRACE
(
","
);
if
(
!
is_ret_val
(
arg_types
[
i
+
1
]
))
TRACE
(
","
);
}
}
*
nb_args
=
i
;
*
nb_args
=
i
;
TRACE
(
") ret=%08
l
x
\n
"
,
stack
[
-
1
]
);
TRACE
(
") ret=%08
z
x
\n
"
,
stack
[
-
1
]
);
return
entry_point
->
orig_func
;
return
entry_point
->
orig_func
;
}
}
...
@@ -757,7 +757,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
...
@@ -757,7 +757,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
DECLSPEC_HIDDEN
void
WINAPI
relay_trace_exit
(
struct
relay_descr
*
descr
,
unsigned
int
idx
,
DECLSPEC_HIDDEN
void
WINAPI
relay_trace_exit
(
struct
relay_descr
*
descr
,
unsigned
int
idx
,
INT_PTR
retaddr
,
INT_PTR
retval
)
INT_PTR
retaddr
,
INT_PTR
retval
)
{
{
TRACE
(
"
\1
Ret %s() retval=%08
lx ret=%08l
x
\n
"
,
TRACE
(
"
\1
Ret %s() retval=%08
zx ret=%08z
x
\n
"
,
func_name
(
descr
->
private
,
LOWORD
(
idx
)
),
retval
,
retaddr
);
func_name
(
descr
->
private
,
LOWORD
(
idx
)
),
retval
,
retaddr
);
}
}
...
...
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