Skip to content

Commit 65b6667

Browse files
[PSDK] update some headers from wine-10.0
1 parent d260c1d commit 65b6667

22 files changed

+1979
-10
lines changed

sdk/cmake/gcc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ function(spec2def _dllname _spec_file)
492492
cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY;WITH_DBG;NO_DBG" "VERSION" "" ${ARGN})
493493

494494
# Get library basename
495-
get_filename_component(_file ${_dllname} NAME_WE)
495+
get_filename_component(_file ${_dllname} NAME_WLE)
496496

497497
# Error out on anything else than spec
498498
if(NOT ${_spec_file} MATCHES ".*\\.spec")

sdk/cmake/msvc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ function(spec2def _dllname _spec_file)
406406
cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY;WITH_DBG;NO_DBG" "VERSION" "" ${ARGN})
407407

408408
# Get library basename
409-
get_filename_component(_file ${_dllname} NAME_WE)
409+
get_filename_component(_file ${_dllname} NAME_WLE)
410410

411411
# Error out on anything else than spec
412412
if(NOT ${_spec_file} MATCHES ".*\\.spec")

sdk/include/psdk/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
55

66
list(APPEND SOURCE
77
# access.idl
8+
activation.idl
89
activaut.idl
910
activdbg.idl
1011
activscp.idl
@@ -52,6 +53,7 @@ list(APPEND SOURCE
5253
exdisp.idl
5354
fusion.idl
5455
hlink.idl
56+
hstring.idl
5557
htiface.idl
5658
htiframe.idl
5759
httprequest.idl
@@ -63,6 +65,7 @@ list(APPEND SOURCE
6365
indexsrv.idl
6466
inputscope.idl
6567
inseng.idl
68+
inspectable.idl
6669
mediaobj.idl
6770
metahost.idl
6871
mfidl.idl
@@ -88,6 +91,7 @@ list(APPEND SOURCE
8891
oaidl.idl
8992
objectarray.idl
9093
objidl.idl
94+
objidlbase.idl
9195
objsafe.idl
9296
ocidl.idl
9397
ocmm.idl
@@ -100,7 +104,9 @@ list(APPEND SOURCE
100104
propidl.idl
101105
propsys.idl
102106
pstore.idl
107+
restrictederrorinfo.idl
103108
richole.idl
109+
roparameterizediid.idl
104110
# row.idl
105111
# rowchg.idl
106112
# rstbas.idl

sdk/include/psdk/activation.idl

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Copyright 2016 Michael Müller
3+
*
4+
* This library is free software; you can redistribute it and/or
5+
* modify it under the terms of the GNU Lesser General Public
6+
* License as published by the Free Software Foundation; either
7+
* version 2.1 of the License, or (at your option) any later version.
8+
*
9+
* This library is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+
* Lesser General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU Lesser General Public
15+
* License along with this library; if not, write to the Free Software
16+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
17+
*/
18+
19+
#ifndef DO_NO_IMPORTS
20+
import "inspectable.idl";
21+
#endif
22+
23+
[
24+
object,
25+
uuid(00000035-0000-0000-c000-000000000046),
26+
pointer_default(unique)
27+
]
28+
interface IActivationFactory : IInspectable
29+
{
30+
HRESULT ActivateInstance([out] IInspectable **instance);
31+
}

sdk/include/psdk/combaseapi.h

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
* Copyright 2021 Jacek Caban for CodeWeavers
3+
*
4+
* This library is free software; you can redistribute it and/or
5+
* modify it under the terms of the GNU Lesser General Public
6+
* License as published by the Free Software Foundation; either
7+
* version 2.1 of the License, or (at your option) any later version.
8+
*
9+
* This library is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+
* Lesser General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU Lesser General Public
15+
* License along with this library; if not, write to the Free Software
16+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
17+
*/
18+
19+
#include <rpc.h>
20+
#include <rpcndr.h>
21+
22+
#ifndef _COMBASEAPI_H_
23+
#define _COMBASEAPI_H_
24+
25+
#ifndef RC_INVOKED
26+
#include <stdlib.h>
27+
#endif
28+
29+
#include <objidlbase.h>
30+
#include <guiddef.h>
31+
32+
#ifndef INITGUID
33+
#include <cguid.h>
34+
#endif
35+
36+
#ifdef __cplusplus
37+
extern "C" {
38+
#endif
39+
40+
typedef struct tagServerInformation
41+
{
42+
DWORD dwServerPid;
43+
DWORD dwServerTid;
44+
UINT64 ui64ServerAddress;
45+
} ServerInformation, *PServerInformation;
46+
47+
enum AgileReferenceOptions
48+
{
49+
AGILEREFERENCE_DEFAULT,
50+
AGILEREFERENCE_DELAYEDMARSHAL
51+
};
52+
53+
HRESULT WINAPI CoDecodeProxy(_In_ DWORD client_pid, _In_ UINT64 proxy_addr, _Out_ ServerInformation *server_info);
54+
HRESULT WINAPI RoGetAgileReference(_In_ enum AgileReferenceOptions options, _In_ REFIID riid, _In_ IUnknown *obj, _Out_ IAgileReference **agile_reference);
55+
56+
#ifdef __cplusplus
57+
extern "C++" template<typename T> void **IID_PPV_ARGS_Helper(T **obj)
58+
{
59+
(void)static_cast<IUnknown *>(*obj);
60+
return reinterpret_cast<void **>(obj);
61+
}
62+
#define IID_PPV_ARGS(obj) __uuidof(**(obj)), IID_PPV_ARGS_Helper(obj)
63+
#endif /* __cplusplus */
64+
65+
#ifdef __cplusplus
66+
}
67+
#endif
68+
69+
#endif /* _COMBASEAPI_H_ */

0 commit comments

Comments
 (0)