Andrew Talbot : ole32: Void functions should not return a value.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 65bf44868c6d12e243a578e61c828d696ea9b28e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=65bf44868c6d12e243a578e61c...

Author: Andrew Talbot 
Date:   Thu Apr 12 21:30:19 2007 +0100

ole32: Void functions should not return a value.

---

dlls/ole32/rpc.c        |    9 +++++++--
 dlls/ole32/usrmarshal.c |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index c7604b7..9c3ab83 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -1352,7 +1352,11 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg)
     TRACE("ipid = %s, iMethod = %d\n", debugstr_guid(&ipid), msg->ProcNum);

params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params));
-    if (!params) return RpcRaiseException(E_OUTOFMEMORY);
+    if (!params)
+    {
+        RpcRaiseException(E_OUTOFMEMORY);
+        return;
+    }

hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan,
                                   &params->iid, &params->iface);
@@ -1360,7 +1364,8 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg)
     {
         ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid));
         HeapFree(GetProcessHeap(), 0, params);
-        return RpcRaiseException(hr);
+        RpcRaiseException(hr);
+        return;
     }

params->msg = (RPCOLEMESSAGE *)msg;
diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index 1651cd7..c1b5542 100644
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c
@@ -321,7 +321,7 @@ static void __RPC_USER handle_UserFree(ULONG *pFlags, HANDLE *phMenu)
     void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \
     { \
         TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \
-        return handle_UserFree(pFlags, (HANDLE *)handle); \
+        handle_UserFree(pFlags, (HANDLE *)handle); \
     }

IMPL_WIREM_HANDLE(HACCEL)