Module: wine Branch: master Commit: 448317dca654c6146b3c10c95ee6f1a6b7bf5dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=448317dca654c6146b3c10c95...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Jul 28 20:27:11 2021 +0200
include: Introduce combaseapi.h.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/Makefile.in | 1 + include/combaseapi.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 11 +---------- 3 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/include/Makefile.in b/include/Makefile.in index 46cb0f53a5e..9b397ffa183 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -74,6 +74,7 @@ SOURCES = \ colinf.idl \ colordlg.h \ colrst.idl \ + combaseapi.h \ comcat.idl \ commctrl.h \ commctrl.rh \ diff --git a/include/combaseapi.h b/include/combaseapi.h new file mode 100644 index 00000000000..4b8cb457328 --- /dev/null +++ b/include/combaseapi.h @@ -0,0 +1,53 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <rpc.h> +#include <rpcndr.h> + +#ifndef _COMBASEAPI_H_ +#define _COMBASEAPI_H_ + +#ifndef RC_INVOKED +#include <stdlib.h> +#endif + +#include <objidlbase.h> +#include <guiddef.h> + +#ifndef INITGUID +#include <cguid.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct tagServerInformation +{ + DWORD dwServerPid; + DWORD dwServerTid; + UINT64 ui64ServerAddress; +} ServerInformation, *PServerInformation; + +HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info); + +#ifdef __cplusplus +} +#endif + +#endif /* _COMBASEAPI_H_ */ diff --git a/include/objbase.h b/include/objbase.h index 714d56f2f16..8bf6ad9da84 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -256,20 +256,11 @@ typedef interface IRpcStubBuffer IRpcStubBuffer; typedef interface IRpcChannelBuffer IRpcChannelBuffer; #endif
-#ifndef RC_INVOKED -/* For compatibility only, at least for now */ -#include <stdlib.h> -#endif - +#include <combaseapi.h> #include <wtypes.h> #include <unknwn.h> #include <objidl.h>
-#include <guiddef.h> -#ifndef INITGUID -#include <cguid.h> -#endif - #ifdef __cplusplus extern "C" { #endif