Alexandre Julliard : include: Don' t use the Ndr functions at all when using registration resources.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9626a976ad28af6a673d86b2eefd114a57490d8a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9626a976ad28af6a673d86b2ee...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Nov 30 11:55:54 2010 +0100

include: Don't use the Ndr functions at all when using registration resources.

---

 include/rpcproxy.h |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/include/rpcproxy.h b/include/rpcproxy.h
index fe7eb3e..991ace8 100644
--- a/include/rpcproxy.h
+++ b/include/rpcproxy.h
@@ -289,22 +289,11 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \
 #endif
 
 #ifdef WINE_REGISTER_DLL
-
-#define WINE_DO_REGISTER_DLL(pfl, clsid) \
-    HRESULT hr = NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ); \
-    if (SUCCEEDED(hr)) hr = __wine_register_resources( hProxyDll, clsid ); \
-    return hr
-
-#define WINE_DO_UNREGISTER_DLL(pfl, clsid) \
-    HRESULT hr = __wine_unregister_resources( hProxyDll, clsid ); \
-    if (SUCCEEDED(hr)) hr = NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ); \
-    return hr
-
+# define WINE_DO_REGISTER_DLL(pfl, clsid) return __wine_register_resources( hProxyDll, (clsid) )
+# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return __wine_unregister_resources( hProxyDll, (clsid) )
 #else
-
-#define WINE_DO_REGISTER_DLL(pfl, clsid)   return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) )
-#define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) )
-
+# define WINE_DO_REGISTER_DLL(pfl, clsid)   return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) )
+# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) )
 #endif