wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 14529012da91580119c1712cd24fcf67c780789b.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-01-14 19:09:45 +01:00
parent a82ee1887f
commit aeb9cdf06f
3 changed files with 31 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "26c9bd9f15c364215be9731bb050454c14d90767"
echo "14529012da91580119c1712cd24fcf67c780789b"
}
# Show version information
@ -4939,12 +4939,12 @@ fi
# | * [#38766] Implement stub for RpcBindingServerFromClient
# |
# | Modified files:
# | * dlls/rpcrt4/rpc_binding.c, dlls/rpcrt4/rpcrt4.spec
# | * dlls/rpcrt4/rpc_binding.c
# |
if test "$enable_rpcrt4_RpcBindingServerFromClient" -eq 1; then
patch_apply rpcrt4-RpcBindingServerFromClient/0001-rpcrt4-add-a-stub-for-RpcBindingServerFromClient.patch
patch_apply rpcrt4-RpcBindingServerFromClient/0001-rpcrt4-Fix-prototype-of-RpcBindingServerFromClient.patch
(
echo '+ { "Austin English", "rpcrt4: Add a stub for RpcBindingServerFromClient.", 1 },';
echo '+ { "Sebastian Lackner", "rpcrt4: Fix prototype of RpcBindingServerFromClient.", 1 },';
) >> "$patchlist"
fi

27
patches/rpcrt4-RpcBindingServerFromClient/0001-rpcrt4-Fix-prototype-of-RpcBindingServerFromClient.patch Normal file
View File

@ -0,0 +1,27 @@
From e96dbcea16b0f61eeb3547688613774e2c8b778e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 14 Jan 2016 19:08:08 +0100
Subject: rpcrt4: Fix prototype of RpcBindingServerFromClient.
---
dlls/rpcrt4/rpc_binding.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
index 7212a18..2503d31 100644
--- a/dlls/rpcrt4/rpc_binding.c
+++ b/dlls/rpcrt4/rpc_binding.c
@@ -1636,8 +1636,8 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *
/***********************************************************************
* RpcBindingServerFromClient (RPCRT4.@)
*/
-
-RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding)
+RPCRTAPI RPC_STATUS RPC_ENTRY
+RpcBindingServerFromClient( RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding )
{
FIXME("%p %p: stub\n", ClientBinding, ServerBinding);
return RPC_S_INVALID_BINDING;
--
2.6.4

50
patches/rpcrt4-RpcBindingServerFromClient/0001-rpcrt4-add-a-stub-for-RpcBindingServerFromClient.patch
View File

@ -1,50 +0,0 @@
From a5a814e54e48a63984de39b7753cc579b5445eef Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Wed, 6 Jan 2016 03:21:36 -0600
Subject: rpcrt4: add a stub for RpcBindingServerFromClient
https://bugs.winehq.org/show_bug.cgi?id=38766
Signed-off-by: Austin English <austinenglish@gmail.com>
---
dlls/rpcrt4/rpc_binding.c | 10 ++++++++++
dlls/rpcrt4/rpcrt4.spec | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
index 72b2fc2..2503d31 100644
--- a/dlls/rpcrt4/rpc_binding.c
+++ b/dlls/rpcrt4/rpc_binding.c
@@ -1634,6 +1634,16 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *
}
/***********************************************************************
+ * RpcBindingServerFromClient (RPCRT4.@)
+ */
+RPCRTAPI RPC_STATUS RPC_ENTRY
+RpcBindingServerFromClient( RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding )
+{
+ FIXME("%p %p: stub\n", ClientBinding, ServerBinding);
+ return RPC_S_INVALID_BINDING;
+}
+
+/***********************************************************************
* RpcBindingSetAuthInfoExA (RPCRT4.@)
*/
RPCRTAPI RPC_STATUS RPC_ENTRY
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index 244bc2a..af8d639 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -352,7 +352,7 @@
@ stdcall RpcBindingInqObject(ptr ptr)
@ stub RpcBindingInqOption
@ stdcall RpcBindingReset(ptr)
-@ stub RpcBindingServerFromClient
+@ stdcall RpcBindingServerFromClient(ptr ptr)
@ stdcall RpcBindingSetAuthInfoA(ptr str long long ptr long)
@ stdcall RpcBindingSetAuthInfoExA(ptr str long long ptr long ptr)
@ stdcall RpcBindingSetAuthInfoExW(ptr wstr long long ptr long ptr)
--
2.6.4