| ... |
... |
@@ -189,16 +189,16 @@ index 07cedbe4e..4adf5772c 100644 |
|
189
|
189
|
--- a/mingw-w64-headers/include/wrl/client.h
|
|
190
|
190
|
+++ b/mingw-w64-headers/include/wrl/client.h
|
|
191
|
191
|
@@ -9,12 +9,15 @@
|
|
192
|
|
-
|
|
|
192
|
+
|
|
193
|
193
|
#include <cstddef>
|
|
194
|
194
|
#include <unknwn.h>
|
|
195
|
195
|
-/* #include <weakreference.h> */
|
|
196
|
196
|
+#include <weakreference.h>
|
|
197
|
197
|
#include <roapi.h>
|
|
198
|
|
-
|
|
|
198
|
+
|
|
199
|
199
|
/* #include <wrl/def.h> */
|
|
200
|
200
|
#include <wrl/internal.h>
|
|
201
|
|
-
|
|
|
201
|
+
|
|
202
|
202
|
+#define WrlFinal final
|
|
203
|
203
|
+#define WrlSealed sealed
|
|
204
|
204
|
+
|
| ... |
... |
@@ -581,10 +581,10 @@ index 000000000..2e883e241 |
|
581
|
581
|
+#endif
|
|
582
|
582
|
diff --git a/mingw-w64-headers/include/wrl/implements.h b/mingw-w64-headers/include/wrl/implements.h
|
|
583
|
583
|
new file mode 100644
|
|
584
|
|
-index 000000000..9d5fe962f
|
|
|
584
|
+index 000000000..c8261e55a
|
|
585
|
585
|
--- /dev/null
|
|
586
|
586
|
+++ b/mingw-w64-headers/include/wrl/implements.h
|
|
587
|
|
-@@ -0,0 +1,619 @@
|
|
|
587
|
+@@ -0,0 +1,627 @@
|
|
588
|
588
|
+#ifndef _WRL_IMPLEMENTS_H_
|
|
589
|
589
|
+#define _WRL_IMPLEMENTS_H_
|
|
590
|
590
|
+
|
| ... |
... |
@@ -631,6 +631,11 @@ index 000000000..9d5fe962f |
|
631
|
631
|
+
|
|
632
|
632
|
+ class Nil {};
|
|
633
|
633
|
+
|
|
|
634
|
++ template <typename T, typename ...TArgs>
|
|
|
635
|
++ ComPtr<T> Make(TArgs&&... args) {
|
|
|
636
|
++ return nullptr;
|
|
|
637
|
++ }
|
|
|
638
|
++
|
|
634
|
639
|
+ class DontUseNewUseMake {
|
|
635
|
640
|
+ private:
|
|
636
|
641
|
+ void* operator new(size_t) throw() {
|
| ... |
... |
@@ -1198,6 +1203,9 @@ index 000000000..9d5fe962f |
|
1198
|
1203
|
+
|
|
1199
|
1204
|
+ typedef RuntimeClass RuntimeClassT;
|
|
1200
|
1205
|
+ };
|
|
|
1206
|
++
|
|
|
1207
|
++ using Details::Make;
|
|
|
1208
|
++
|
|
1201
|
1209
|
+ }
|
|
1202
|
1210
|
+}
|
|
1203
|
1211
|
+
|
| ... |
... |
@@ -1211,11 +1219,11 @@ index 715ef74e3..dffa7153d 100644 |
|
1211
|
1219
|
@@ -7,6 +7,8 @@
|
|
1212
|
1220
|
#ifndef _WRL_INTERNAL_H_
|
|
1213
|
1221
|
#define _WRL_INTERNAL_H_
|
|
1214
|
|
-
|
|
|
1222
|
+
|
|
1215
|
1223
|
+#define __WRL_IMPLEMENTS_FTM_BASE__(flags) (false)
|
|
1216
|
1224
|
+
|
|
1217
|
1225
|
#include <windows.h>
|
|
1218
|
|
-
|
|
|
1226
|
+
|
|
1219
|
1227
|
namespace Microsoft {
|
|
1220
|
1228
|
@@ -29,6 +31,26 @@ namespace Microsoft {
|
|
1221
|
1229
|
struct EnableIf<true, T> {
|
| ... |
... |
@@ -1250,7 +1258,7 @@ index 182d4b063..6d42fb341 100644 |
|
1250
|
1258
|
+++ b/mingw-w64-headers/include/wrl/wrappers/corewrappers.h
|
|
1251
|
1259
|
@@ -24,6 +24,129 @@ namespace Microsoft {
|
|
1252
|
1260
|
}
|
|
1253
|
|
-
|
|
|
1261
|
+
|
|
1254
|
1262
|
namespace Wrappers {
|
|
1255
|
1263
|
+ namespace HandleTraits {
|
|
1256
|
1264
|
+ struct SRWLockSharedTraits {
|