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
d01470ad
Commit
d01470ad
authored
Sep 27, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Return value pointer needs to be in x8 on ARM64.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f4ecef45
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
typelib.c
dlls/oleaut32/typelib.c
+5
-4
No files found.
dlls/oleaut32/typelib.c
View file @
d01470ad
...
@@ -6823,7 +6823,7 @@ __ASM_GLOBAL_FUNC( call_method,
...
@@ -6823,7 +6823,7 @@ __ASM_GLOBAL_FUNC( call_method,
"ldr x4, [x2, x1, lsl #3]
\n\t
"
"ldr x4, [x2, x1, lsl #3]
\n\t
"
"str x4, [sp, x1, lsl #3]
\n\t
"
"str x4, [sp, x1, lsl #3]
\n\t
"
"cbnz x1, 1b
\n
"
"cbnz x1, 1b
\n
"
"2:
\t
mov x
8
, x0
\n\t
"
"2:
\t
mov x
16
, x0
\n\t
"
"mov x9, x3
\n\t
"
"mov x9, x3
\n\t
"
"ldp d0, d1, [x9]
\n\t
"
"ldp d0, d1, [x9]
\n\t
"
"ldp d2, d3, [x9, #0x10]
\n\t
"
"ldp d2, d3, [x9, #0x10]
\n\t
"
...
@@ -6833,7 +6833,8 @@ __ASM_GLOBAL_FUNC( call_method,
...
@@ -6833,7 +6833,8 @@ __ASM_GLOBAL_FUNC( call_method,
"ldp x2, x3, [x9, #0x50]
\n\t
"
"ldp x2, x3, [x9, #0x50]
\n\t
"
"ldp x4, x5, [x9, #0x60]
\n\t
"
"ldp x4, x5, [x9, #0x60]
\n\t
"
"ldp x6, x7, [x9, #0x70]
\n\t
"
"ldp x6, x7, [x9, #0x70]
\n\t
"
"blr x8
\n\t
"
"ldr x8, [x9, #0x80]
\n\t
"
"blr x16
\n\t
"
"mov sp, x29
\n\t
"
"mov sp, x29
\n\t
"
"ldp x29, x30, [sp], #16
\n\t
"
"ldp x29, x30, [sp], #16
\n\t
"
"ret"
)
"ret"
)
...
@@ -6856,7 +6857,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART
...
@@ -6856,7 +6857,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART
float
f
;
float
f
;
double
d
;
double
d
;
}
fp
[
8
];
}
fp
[
8
];
DWORD_PTR
x
[
8
];
DWORD_PTR
x
[
9
];
}
regs
;
}
regs
;
int
rcount
;
/* 64-bit register index count */
int
rcount
;
/* 64-bit register index count */
int
fpcount
=
0
;
/* float register index count */
int
fpcount
=
0
;
/* float register index count */
...
@@ -6887,7 +6888,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART
...
@@ -6887,7 +6888,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART
{
{
case
VT_DECIMAL
:
case
VT_DECIMAL
:
case
VT_VARIANT
:
case
VT_VARIANT
:
regs
.
x
[
rcount
++
]
=
(
DWORD_PTR
)
result
;
/* arg 0
is a pointer to the result */
regs
.
x
[
8
]
=
(
DWORD_PTR
)
result
;
/* x8
is a pointer to the result */
break
;
break
;
case
VT_HRESULT
:
case
VT_HRESULT
:
WARN
(
"invalid return type %u
\n
"
,
ret_type
);
WARN
(
"invalid return type %u
\n
"
,
ret_type
);
...
...
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