Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr --- Cherry-pick https://git.reactos.org/?p=reactos.git;a=commit;h=a16a37fd2d0506fed4006cb976... --- dlls/rpcrt4/rpcrt4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0492776..9c85037 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -276,7 +276,7 @@ @ stdcall NdrSendReceive(ptr ptr) @ stdcall NdrServerCall2(ptr) @ stdcall NdrServerCall(ptr) -@ stdcall NdrServerCallAll(ptr) +@ stdcall -arch=x86_64 NdrServerCallAll(ptr) @ stdcall NdrServerContextMarshall(ptr ptr ptr) @ stdcall NdrServerContextNewMarshall(ptr ptr ptr ptr) # wxp @ stdcall NdrServerContextNewUnmarshall(ptr ptr) # wxp
On 4/26/20 7:54 PM, Serge Gautherie wrote:
Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr
Cherry-pick https://git.reactos.org/?p=reactos.git;a=commit;h=a16a37fd2d0506fed4006cb976...
dlls/rpcrt4/rpcrt4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0492776..9c85037 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -276,7 +276,7 @@ @ stdcall NdrSendReceive(ptr ptr) @ stdcall NdrServerCall2(ptr) @ stdcall NdrServerCall(ptr) -@ stdcall NdrServerCallAll(ptr) +@ stdcall -arch=x86_64 NdrServerCallAll(ptr) @ stdcall NdrServerContextMarshall(ptr ptr ptr) @ stdcall NdrServerContextNewMarshall(ptr ptr ptr ptr) # wxp @ stdcall NdrServerContextNewUnmarshall(ptr ptr) # wxp
The function is present on arm64 as well, according to SDK import libraries, so presumably -arch=win64 should be used instead.
Presumably the corresponding code should be guarded with #ifdef _WIN64.
On 27/04/2020 02:51, Zebediah Figura wrote:
The function is present on arm64 as well, according to SDK import libraries, so presumably -arch=win64 should be used instead.
Yeah, I suggested that on ReactOS, but I couldn't confirm it. Thanks! Done.
Presumably the corresponding code should be guarded with #ifdef _WIN64.
MS .h has a comment only and no #ifdef :-/ This is why I prefer not to do that (myself). "Instead", I added a test ;-)
On 4/26/20 9:57 PM, change_serge_150609@gautherie.fr wrote:
On 27/04/2020 02:51, Zebediah Figura wrote:
The function is present on arm64 as well, according to SDK import libraries, so presumably -arch=win64 should be used instead.
Yeah, I suggested that on ReactOS, but I couldn't confirm it. Thanks! Done.
Presumably the corresponding code should be guarded with #ifdef _WIN64.
MS .h has a comment only and no #ifdef :-/ This is why I prefer not to do that (myself). "Instead", I added a test ;-)
I don't necessarily mean the headers, but rather the implementation. With this patch as it is, we're building unused code on 32-bit platforms.
-
change_serge_150609ļ¼ gautherie.fr -
Serge Gautherie -
Zebediah Figura