https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fab4e82647e0fdae484319f72c57ca4083a90dd7
commit fab4e82647e0fdae484319f72c57ca4083a90dd7 Author: Jérôme Gardou <[email protected]> AuthorDate: Thu Nov 26 16:01:08 2020 +0100 Commit: Jérôme Gardou <[email protected]> CommitDate: Tue Dec 22 13:14:13 2020 +0100 [INCLUDE/IDL] Give implicit handles a more unique name This avoids duplicated symbols when linking DLLs using more than one client or server stub --- dll/win32/netapi32/wksta_new.c | 2 +- sdk/include/reactos/idl/browser.idl | 2 +- sdk/include/reactos/idl/netdfs.acf | 2 +- sdk/include/reactos/idl/netdfs.idl | 2 +- sdk/include/reactos/idl/netlogon.idl | 2 +- sdk/include/reactos/idl/srvsvc.acf | 2 +- sdk/include/reactos/idl/srvsvc.idl | 2 +- sdk/include/reactos/idl/wkssvc.acf | 2 +- sdk/include/reactos/idl/wkssvc.idl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c index 1853b2052a7..4bc96d01dbd 100644 --- a/dll/win32/netapi32/wksta_new.c +++ b/dll/win32/netapi32/wksta_new.c @@ -191,7 +191,7 @@ NetpUnbind( FIXME("NetpUnbind(%p)\n", BindingHandle); - status = RpcBindingFree(&hBinding); + status = RpcBindingFree(&wkssvc_hBinding); if (status) { TRACE("RpcBindingFree returned 0x%x\n", status); diff --git a/sdk/include/reactos/idl/browser.idl b/sdk/include/reactos/idl/browser.idl index 65f2ff8f7ed..52003155294 100644 --- a/sdk/include/reactos/idl/browser.idl +++ b/sdk/include/reactos/idl/browser.idl @@ -133,7 +133,7 @@ typedef struct _BROWSER_STATISTICS_STRUCT #endif endpoint("ncacn_np:[\\pipe\\browser]") #ifndef __midl - ,implicit_handle(handle_t hBinding) + ,implicit_handle(handle_t browser_hBinding) #endif ] interface browser diff --git a/sdk/include/reactos/idl/netdfs.acf b/sdk/include/reactos/idl/netdfs.acf index fc3b35f2821..31bceacf0a4 100644 --- a/sdk/include/reactos/idl/netdfs.acf +++ b/sdk/include/reactos/idl/netdfs.acf @@ -1,5 +1,5 @@ [ - implicit_handle(handle_t hBinding) + implicit_handle(handle_t netdfs_hBinding) ] interface netdfs { diff --git a/sdk/include/reactos/idl/netdfs.idl b/sdk/include/reactos/idl/netdfs.idl index bd4ca88ce03..a1d1016c634 100644 --- a/sdk/include/reactos/idl/netdfs.idl +++ b/sdk/include/reactos/idl/netdfs.idl @@ -346,7 +346,7 @@ typedef struct _DFS_INFO_ENUM_STRUCT #endif endpoint("ncacn_np:[\\pipe\\netdfs]") #ifndef __midl - ,implicit_handle(handle_t hBinding) + ,implicit_handle(handle_t netdfs_hBinding) #endif ] interface netdfs diff --git a/sdk/include/reactos/idl/netlogon.idl b/sdk/include/reactos/idl/netlogon.idl index 808361a00a5..d1e2c8f10ae 100644 --- a/sdk/include/reactos/idl/netlogon.idl +++ b/sdk/include/reactos/idl/netlogon.idl @@ -988,7 +988,7 @@ cpp_quote("#endif") #endif endpoint("ncacn_np:[\\pipe\\netlogon]") #ifndef __midl - ,implicit_handle(handle_t hBinding) + ,implicit_handle(handle_t netlogon_hBinding) #endif ] interface logon diff --git a/sdk/include/reactos/idl/srvsvc.acf b/sdk/include/reactos/idl/srvsvc.acf index 822ee3bfcd3..81122aac71e 100644 --- a/sdk/include/reactos/idl/srvsvc.acf +++ b/sdk/include/reactos/idl/srvsvc.acf @@ -1,5 +1,5 @@ [ - implicit_handle(handle_t hBinding) + implicit_handle(handle_t srvsvc_hBinding) ] interface srvsvc { diff --git a/sdk/include/reactos/idl/srvsvc.idl b/sdk/include/reactos/idl/srvsvc.idl index 4a80140f44e..f1567c67c17 100644 --- a/sdk/include/reactos/idl/srvsvc.idl +++ b/sdk/include/reactos/idl/srvsvc.idl @@ -1060,7 +1060,7 @@ typedef [switch_type(unsigned long)] union _SERVER_ALIAS_INFO pointer_default(unique), endpoint("ncacn_np:[\\pipe\\srvsvc]") #ifndef __midl - ,implicit_handle(handle_t hBinding) + ,implicit_handle(handle_t srvsvc_hBinding) #endif ] interface srvsvc diff --git a/sdk/include/reactos/idl/wkssvc.acf b/sdk/include/reactos/idl/wkssvc.acf index 1f0682b9fe3..c97dbf3d3ca 100644 --- a/sdk/include/reactos/idl/wkssvc.acf +++ b/sdk/include/reactos/idl/wkssvc.acf @@ -1,5 +1,5 @@ [ - implicit_handle(handle_t hBinding) + implicit_handle(handle_t wkssvc_hBinding) ] interface wkssvc { diff --git a/sdk/include/reactos/idl/wkssvc.idl b/sdk/include/reactos/idl/wkssvc.idl index a456795d7dc..3f960f63725 100644 --- a/sdk/include/reactos/idl/wkssvc.idl +++ b/sdk/include/reactos/idl/wkssvc.idl @@ -354,7 +354,7 @@ typedef struct _NET_COMPUTER_NAME_ARRAY pointer_default(unique), endpoint("ncacn_np:[\\pipe\\wkssvc]") #ifndef __midl - ,implicit_handle(handle_t hBinding) + ,implicit_handle(handle_t wkssvc_hBinding) #endif ]
