ole32: Simplify a function by removing no-op code (PVS-Studio).

Michael Stefaniuc mstefani at redhat.de
Wed Nov 19 02:26:18 CST 2014


MSHLFLAGS_NORMAL is 0.
---
 dlls/ole32/stubmanager.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c
index 96d710d..1aca924 100644
--- a/dlls/ole32/stubmanager.c
+++ b/dlls/ole32/stubmanager.c
@@ -536,7 +536,6 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt,
 /* returns TRUE if it is possible to unmarshal, FALSE otherwise. */
 BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid)
 {
-    BOOL ret = TRUE;
     struct ifstub *ifstub;
 
     if (!(ifstub = stub_manager_ipid_to_ifstub(m, ipid)))
@@ -545,23 +544,7 @@ BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid)
         return FALSE;
     }
 
-    EnterCriticalSection(&m->lock);
-
-    /* track normal marshals so we can enforce rules whilst in-process */
-    if (ifstub->flags & MSHLFLAGS_NORMAL)
-    {
-        if (m->norm_refs)
-            m->norm_refs--;
-        else
-        {
-            ERR("attempted invalid normal unmarshal, norm_refs is zero\n");
-            ret = FALSE;
-        }
-    }
-
-    LeaveCriticalSection(&m->lock);
-
-    return ret;
+    return TRUE;
 }
 
 /* handles refcounting for CoReleaseMarshalData */
-- 
1.9.3



More information about the wine-patches mailing list