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
8b368859
Commit
8b368859
authored
Jun 26, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Fix some stdcall/cdecl calling convention mismatches.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
dde38fda
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
relay.c
dlls/ntdll/relay.c
+3
-3
resource.c
dlls/ntdll/resource.c
+1
-1
rtl.c
dlls/ntdll/rtl.c
+2
-2
No files found.
dlls/ntdll/relay.c
View file @
8b368859
...
@@ -395,7 +395,7 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne
...
@@ -395,7 +395,7 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne
}
}
extern
LONGLONG
WINAPI
relay_call
(
struct
relay_descr
*
descr
,
unsigned
int
idx
);
extern
LONGLONG
WINAPI
relay_call
(
struct
relay_descr
*
descr
,
unsigned
int
idx
);
__ASM_
GLOBAL_FUNC
(
relay_call
,
__ASM_
STDCALL_FUNC
(
relay_call
,
8
,
"pushl %ebp
\n\t
"
"pushl %ebp
\n\t
"
__ASM_CFI
(
".cfi_adjust_cfa_offset 4
\n\t
"
)
__ASM_CFI
(
".cfi_adjust_cfa_offset 4
\n\t
"
)
__ASM_CFI
(
".cfi_rel_offset %ebp,0
\n\t
"
)
__ASM_CFI
(
".cfi_rel_offset %ebp,0
\n\t
"
)
...
@@ -414,7 +414,7 @@ __ASM_GLOBAL_FUNC( relay_call,
...
@@ -414,7 +414,7 @@ __ASM_GLOBAL_FUNC( relay_call,
"pushl %esi
\n\t
"
"pushl %esi
\n\t
"
"pushl 12(%ebp)
\n\t
"
"pushl 12(%ebp)
\n\t
"
"pushl 8(%ebp)
\n\t
"
"pushl 8(%ebp)
\n\t
"
"call "
__ASM_
NAME
(
"relay_trace_entry"
)
"
\n\t
"
"call "
__ASM_
STDCALL
(
"relay_trace_entry"
,
16
)
"
\n\t
"
/* copy the arguments*/
/* copy the arguments*/
"movzwl -16(%ebp),%ecx
\n\t
"
/* number of args */
"movzwl -16(%ebp),%ecx
\n\t
"
/* number of args */
"jecxz 1f
\n\t
"
"jecxz 1f
\n\t
"
...
@@ -441,7 +441,7 @@ __ASM_GLOBAL_FUNC( relay_call,
...
@@ -441,7 +441,7 @@ __ASM_GLOBAL_FUNC( relay_call,
"pushl 16(%ebp)
\n\t
"
"pushl 16(%ebp)
\n\t
"
"pushl 12(%ebp)
\n\t
"
"pushl 12(%ebp)
\n\t
"
"pushl 8(%ebp)
\n\t
"
"pushl 8(%ebp)
\n\t
"
"call "
__ASM_
NAME
(
"relay_trace_exit"
)
"
\n\t
"
"call "
__ASM_
STDCALL
(
"relay_trace_exit"
,
20
)
"
\n\t
"
/* restore return value and return */
/* restore return value and return */
"leal -12(%ebp),%esp
\n\t
"
"leal -12(%ebp),%esp
\n\t
"
"movl %esi,%eax
\n\t
"
"movl %esi,%eax
\n\t
"
...
...
dlls/ntdll/resource.c
View file @
8b368859
...
@@ -367,7 +367,7 @@ __ASM_STDCALL_FUNC( LdrAccessResource, 16,
...
@@ -367,7 +367,7 @@ __ASM_STDCALL_FUNC( LdrAccessResource, 16,
"pushl 16(%ebp)
\n\t
"
"pushl 16(%ebp)
\n\t
"
"pushl 12(%ebp)
\n\t
"
"pushl 12(%ebp)
\n\t
"
"pushl 8(%ebp)
\n\t
"
"pushl 8(%ebp)
\n\t
"
"call "
__ASM_
NAME
(
"access_resource"
)
"
\n\t
"
"call "
__ASM_
STDCALL
(
"access_resource"
,
16
)
"
\n\t
"
"leave
\n\t
"
"leave
\n\t
"
"ret $16"
"ret $16"
)
)
...
...
dlls/ntdll/rtl.c
View file @
8b368859
...
@@ -439,7 +439,7 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM
...
@@ -439,7 +439,7 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM
/******************************************************************************
/******************************************************************************
* RtlEnumerateGenericTableWithoutSplaying [NTDLL.@]
* RtlEnumerateGenericTableWithoutSplaying [NTDLL.@]
*/
*/
void
*
RtlEnumerateGenericTableWithoutSplaying
(
RTL_GENERIC_TABLE
*
table
,
void
*
previous
)
void
*
WINAPI
RtlEnumerateGenericTableWithoutSplaying
(
RTL_GENERIC_TABLE
*
table
,
void
*
previous
)
{
{
static
int
warn_once
;
static
int
warn_once
;
...
@@ -451,7 +451,7 @@ void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *p
...
@@ -451,7 +451,7 @@ void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *p
/******************************************************************************
/******************************************************************************
* RtlNumberGenericTableElements [NTDLL.@]
* RtlNumberGenericTableElements [NTDLL.@]
*/
*/
ULONG
RtlNumberGenericTableElements
(
RTL_GENERIC_TABLE
*
table
)
ULONG
WINAPI
RtlNumberGenericTableElements
(
RTL_GENERIC_TABLE
*
table
)
{
{
FIXME
(
"(%p) stub!
\n
"
,
table
);
FIXME
(
"(%p) stub!
\n
"
,
table
);
return
0
;
return
0
;
...
...
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