-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathx64.patch
2482 lines (2224 loc) · 84.4 KB
/
x64.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Index: COM_Component_Src/ATLCPImplMT.h
===================================================================
--- COM_Component_Src/ATLCPImplMT.h (revision 71)
+++ COM_Component_Src/ATLCPImplMT.h (working copy)
@@ -154,7 +154,7 @@
STDMETHODIMP IConnectionPointImplMT<T, piid, CDV>::Unadvise(DWORD dwCookie)
{
m_CPMTCritSec.Lock();
- DWORD dwGITCookie = (DWORD)_CDV::GetUnknown(dwCookie);
+ DWORD dwGITCookie = (DWORD)m_vec.GetUnknown(dwCookie);
HRESULT hRes = m_vec.Remove(dwCookie) ? S_OK : CONNECT_E_NOCONNECTION;
m_CPMTCritSec.Unlock();
if (hRes == S_OK && dwGITCookie != NULL)
@@ -202,7 +202,7 @@
{
// AddRef() implicit in GetInterfaceFromGlobal():
pend->pUnk = pUnk;
- pend->dwCookie = _CDV::GetCookie(reinterpret_cast<IUnknown **>(pDWCookie));
+ pend->dwCookie = m_vec.GetCookie(reinterpret_cast<IUnknown **>(pDWCookie));
pend++;
}
}
Index: COM_Component_Src/csDLMan.cpp
===================================================================
--- COM_Component_Src/csDLMan.cpp (revision 71)
+++ COM_Component_Src/csDLMan.cpp (working copy)
@@ -2065,7 +2065,7 @@
&& (wbhookdata[H_KEYBOARD].hwndTarget)
&& (::IsWindow(wbhookdata[H_KEYBOARD].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
//UINT umsg = WM_KEYDOWN;
////wParam = virtual-key code
//// Reference: WM_KEYDOWN on MSDN
@@ -2112,7 +2112,7 @@
&& (wbhookdata[H_MOUSE].hwndTarget)
&& (::IsWindow(wbhookdata[H_MOUSE].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
::SendMessageTimeout(wbhookdata[H_MOUSE].hwndTarget, wbhookdata[H_MOUSE].uiHookMsgID ,
wParam, lParam, SMTO_ABORTIFHUNG, 500, &dwresult);
long lret = (long)dwresult;
@@ -2134,7 +2134,7 @@
&& (wbhookdata[H_KEYBOARD_LL].hwndTarget)
&& (::IsWindow(wbhookdata[H_KEYBOARD_LL].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
::SendMessageTimeout(wbhookdata[H_KEYBOARD_LL].hwndTarget,
wbhookdata[H_KEYBOARD_LL].uiHookMsgID ,
@@ -2159,7 +2159,7 @@
&& (wbhookdata[H_CALLWNDPROC].hwndTarget)
&& (::IsWindow(wbhookdata[H_CALLWNDPROC].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
::SendMessageTimeout(wbhookdata[H_CALLWNDPROC].hwndTarget,
wbhookdata[H_CALLWNDPROC].uiHookMsgID ,
wParam, lParam, SMTO_ABORTIFHUNG, 500, &dwresult);
@@ -2180,7 +2180,7 @@
&& (wbhookdata[H_CBT].hwndTarget)
&& (::IsWindow(wbhookdata[H_CBT].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
nCode_CBTProc = nCode;
//nCode
//HCBT_ACTIVATE
@@ -2216,7 +2216,7 @@
&& (wbhookdata[H_GETMESSAGE].hwndTarget)
&& (::IsWindow(wbhookdata[H_GETMESSAGE].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
::SendMessageTimeout(wbhookdata[H_GETMESSAGE].hwndTarget,
wbhookdata[H_GETMESSAGE].uiHookMsgID ,
wParam, lParam, SMTO_ABORTIFHUNG, 500, &dwresult);
@@ -2237,7 +2237,7 @@
&& (wbhookdata[H_MSGFILTER].hwndTarget)
&& (::IsWindow(wbhookdata[H_MSGFILTER].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
nCode_MessageProc = nCode;
//nCode
//MSGF_DDEMGR
@@ -2264,7 +2264,7 @@
&& (wbhookdata[H_MOUSE_LL].hwndTarget)
&& (::IsWindow(wbhookdata[H_MOUSE_LL].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
//wParam, one of WM_LBUTTONDOWN, WM_LBUTTONUP, WM_MOUSEMOVE,
//WM_MOUSEWHEEL, WM_RBUTTONDOWN, or WM_RBUTTONUP.
//LPMSLLHOOKSTRUCT msg = (LPMSLLHOOKSTRUCT)lParam
@@ -2286,7 +2286,7 @@
&& (wbhookdata[H_FOREGROUNDIDLE].hwndTarget)
&& (::IsWindow(wbhookdata[H_FOREGROUNDIDLE].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
//wParam and lParam are not used
::SendMessageTimeout(wbhookdata[H_FOREGROUNDIDLE].hwndTarget,
wbhookdata[H_FOREGROUNDIDLE].uiHookMsgID ,
@@ -2306,7 +2306,7 @@
&& (wbhookdata[H_CALLWNDPROCRET].hwndTarget)
&& (::IsWindow(wbhookdata[H_CALLWNDPROCRET].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
//wParam, Specifies whether the message is sent by the current process.
//If the message is sent by the current process, it is nonzero; otherwise, it is NULL.
//LPCWPRETSTRUCT msg = (LPCWPRETSTRUCT)lParam;
@@ -2328,7 +2328,7 @@
&& (wbhookdata[H_SYSMSGFILTER].hwndTarget)
&& (::IsWindow(wbhookdata[H_SYSMSGFILTER].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
nCode_SysMsgProc = nCode;
//nCode
//MSGF_DIALOGBOX
@@ -2354,7 +2354,7 @@
&& (wbhookdata[H_SHELL].hwndTarget)
&& (::IsWindow(wbhookdata[H_SHELL].hwndTarget)) )
{
- DWORD dwresult = 0;
+ DWORD_PTR dwresult = 0;
nCode_ShellProc = nCode;
//contents of wParam and lParam depend on nCode
::SendMessageTimeout(wbhookdata[H_SHELL].hwndTarget,
Index: COM_Component_Src/csExWBDLMan.h
===================================================================
--- COM_Component_Src/csExWBDLMan.h (revision 71)
+++ COM_Component_Src/csExWBDLMan.h (working copy)
@@ -1,19 +1,27 @@
+
+
/* this ALWAYS GENERATED file contains the definitions for the interfaces */
-/* File created by MIDL compiler version 5.01.0164 */
-/* at Wed Aug 22 07:24:48 2007
+ /* File created by MIDL compiler version 8.00.0603 */
+/* at Sat Dec 06 22:56:54 2014
*/
-/* Compiler settings for C:\Temp\COM_Component_Source_Binaries\csExWBDLMan.idl:
- Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
+/* Compiler settings for csExWBDLMan.idl:
+ Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.00.0603
+ protocol : dce , ms_ext, c_ext, robust
error checks: allocation ref bounds_check enum stub_data
+ VC __declspec() decoration level:
+ __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+ DECLSPEC_UUID(), MIDL_INTERFACE()
*/
-//@@MIDL_FILE_HEADING( )
+/* @@MIDL_FILE_HEADING( ) */
+#pragma warning( disable: 4049 ) /* more than 64k source lines */
+
/* verify that the <rpcndr.h> version is high enough to compile this file*/
#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 440
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
#endif
#include "rpc.h"
@@ -31,9 +39,9 @@
#ifndef __csExWBDLMan_h__
#define __csExWBDLMan_h__
-#ifdef __cplusplus
-extern "C"{
-#endif
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
/* Forward Declarations */
@@ -40,6 +48,7 @@
#ifndef __IDownloadManager_FWD_DEFINED__
#define __IDownloadManager_FWD_DEFINED__
typedef interface IDownloadManager IDownloadManager;
+
#endif /* __IDownloadManager_FWD_DEFINED__ */
@@ -46,6 +55,7 @@
#ifndef __IcsDLMan_FWD_DEFINED__
#define __IcsDLMan_FWD_DEFINED__
typedef interface IcsDLMan IcsDLMan;
+
#endif /* __IcsDLMan_FWD_DEFINED__ */
@@ -52,6 +62,7 @@
#ifndef ___IcsDLManEvents_FWD_DEFINED__
#define ___IcsDLManEvents_FWD_DEFINED__
typedef interface _IcsDLManEvents _IcsDLManEvents;
+
#endif /* ___IcsDLManEvents_FWD_DEFINED__ */
@@ -71,9 +82,11 @@
#include "oaidl.h"
#include "ocidl.h"
-void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free( void __RPC_FAR * );
+#ifdef __cplusplus
+extern "C"{
+#endif
+
#ifndef __IDownloadManager_INTERFACE_DEFINED__
#define __IDownloadManager_INTERFACE_DEFINED__
@@ -90,11 +103,11 @@
{
public:
virtual HRESULT STDMETHODCALLTYPE Download(
- /* [in] */ IMoniker __RPC_FAR *pmk,
- /* [in] */ IBindCtx __RPC_FAR *pbc,
+ /* [in] */ IMoniker *pmk,
+ /* [in] */ IBindCtx *pbc,
/* [in] */ DWORD dwBindVerb,
/* [in] */ LONG grfBINDF,
- /* [in] */ BINDINFO __RPC_FAR *pBindInfo,
+ /* [in] */ BINDINFO *pBindInfo,
/* [in] */ LPCOLESTR pszHeaders,
/* [in] */ LPCOLESTR pszRedir,
/* [in] */ UINT uiCP) = 0;
@@ -101,6 +114,7 @@
};
+
#else /* C style interface */
typedef struct IDownloadManagerVtbl
@@ -107,24 +121,25 @@
{
BEGIN_INTERFACE
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
- IDownloadManager __RPC_FAR * This,
+ HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+ IDownloadManager * This,
/* [in] */ REFIID riid,
- /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
+ /* [annotation][iid_is][out] */
+ _COM_Outptr_ void **ppvObject);
- ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
- IDownloadManager __RPC_FAR * This);
+ ULONG ( STDMETHODCALLTYPE *AddRef )(
+ IDownloadManager * This);
- ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
- IDownloadManager __RPC_FAR * This);
+ ULONG ( STDMETHODCALLTYPE *Release )(
+ IDownloadManager * This);
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Download )(
- IDownloadManager __RPC_FAR * This,
- /* [in] */ IMoniker __RPC_FAR *pmk,
- /* [in] */ IBindCtx __RPC_FAR *pbc,
+ HRESULT ( STDMETHODCALLTYPE *Download )(
+ IDownloadManager * This,
+ /* [in] */ IMoniker *pmk,
+ /* [in] */ IBindCtx *pbc,
/* [in] */ DWORD dwBindVerb,
/* [in] */ LONG grfBINDF,
- /* [in] */ BINDINFO __RPC_FAR *pBindInfo,
+ /* [in] */ BINDINFO *pBindInfo,
/* [in] */ LPCOLESTR pszHeaders,
/* [in] */ LPCOLESTR pszRedir,
/* [in] */ UINT uiCP);
@@ -134,7 +149,7 @@
interface IDownloadManager
{
- CONST_VTBL struct IDownloadManagerVtbl __RPC_FAR *lpVtbl;
+ CONST_VTBL struct IDownloadManagerVtbl *lpVtbl;
};
@@ -143,17 +158,17 @@
#define IDownloadManager_QueryInterface(This,riid,ppvObject) \
- (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
+ ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
#define IDownloadManager_AddRef(This) \
- (This)->lpVtbl -> AddRef(This)
+ ( (This)->lpVtbl -> AddRef(This) )
#define IDownloadManager_Release(This) \
- (This)->lpVtbl -> Release(This)
+ ( (This)->lpVtbl -> Release(This) )
#define IDownloadManager_Download(This,pmk,pbc,dwBindVerb,grfBINDF,pBindInfo,pszHeaders,pszRedir,uiCP) \
- (This)->lpVtbl -> Download(This,pmk,pbc,dwBindVerb,grfBINDF,pBindInfo,pszHeaders,pszRedir,uiCP)
+ ( (This)->lpVtbl -> Download(This,pmk,pbc,dwBindVerb,grfBINDF,pBindInfo,pszHeaders,pszRedir,uiCP) )
#endif /* COBJMACROS */
@@ -162,52 +177,34 @@
-HRESULT STDMETHODCALLTYPE IDownloadManager_Download_Proxy(
- IDownloadManager __RPC_FAR * This,
- /* [in] */ IMoniker __RPC_FAR *pmk,
- /* [in] */ IBindCtx __RPC_FAR *pbc,
- /* [in] */ DWORD dwBindVerb,
- /* [in] */ LONG grfBINDF,
- /* [in] */ BINDINFO __RPC_FAR *pBindInfo,
- /* [in] */ LPCOLESTR pszHeaders,
- /* [in] */ LPCOLESTR pszRedir,
- /* [in] */ UINT uiCP);
-
-void __RPC_STUB IDownloadManager_Download_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-
#endif /* __IDownloadManager_INTERFACE_DEFINED__ */
-/* interface __MIDL_itf_csExWBDLMan_0258 */
+/* interface __MIDL_itf_csExWBDLMan_0000_0001 */
/* [local] */
typedef
enum WINDOWSHOOK_TYPES
- { WHT_CALLWNDPROC = 0,
- WHT_CBT = 1,
- WHT_GETMESSAGE = 2,
- WHT_KEYBOARD = 3,
- WHT_MOUSE = 4,
- WHT_MSGFILTER = 5,
- WHT_KEYBOARD_LL = 6,
- WHT_MOUSE_LL = 7,
- WHT_FOREGROUNDIDLE = 8,
- WHT_CALLWNDPROCRET = 9,
- WHT_SYSMSGFILTER = 10,
- WHT_SHELL = 11
- } WINDOWSHOOK_TYPES;
+ {
+ WHT_CALLWNDPROC = 0,
+ WHT_CBT = 1,
+ WHT_GETMESSAGE = 2,
+ WHT_KEYBOARD = 3,
+ WHT_MOUSE = 4,
+ WHT_MSGFILTER = 5,
+ WHT_KEYBOARD_LL = 6,
+ WHT_MOUSE_LL = 7,
+ WHT_FOREGROUNDIDLE = 8,
+ WHT_CALLWNDPROCRET = 9,
+ WHT_SYSMSGFILTER = 10,
+ WHT_SHELL = 11
+ } WINDOWSHOOK_TYPES;
-extern RPC_IF_HANDLE __MIDL_itf_csExWBDLMan_0258_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_csExWBDLMan_0258_v0_0_s_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_csExWBDLMan_0000_0001_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_csExWBDLMan_0000_0001_v0_0_s_ifspec;
#ifndef __IcsDLMan_INTERFACE_DEFINED__
#define __IcsDLMan_INTERFACE_DEFINED__
@@ -226,22 +223,22 @@
public:
virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE DownloadUrlAsync(
/* [in] */ BSTR URL,
- /* [out][in] */ long __RPC_FAR *DLUID) = 0;
+ /* [out][in] */ long *DLUID) = 0;
virtual /* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE get_HWNDInternetExplorerServer(
- /* [retval][out] */ long __RPC_FAR *pVal) = 0;
+ /* [retval][out] */ long *pVal) = 0;
virtual /* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE put_HWNDInternetExplorerServer(
/* [in] */ long newVal) = 0;
virtual /* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE get_HTTPSprotocol(
- /* [retval][out] */ VARIANT_BOOL __RPC_FAR *pVal) = 0;
+ /* [retval][out] */ VARIANT_BOOL *pVal) = 0;
virtual /* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE put_HTTPSprotocol(
/* [in] */ VARIANT_BOOL newVal) = 0;
virtual /* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE get_HTTPprotocol(
- /* [retval][out] */ VARIANT_BOOL __RPC_FAR *pVal) = 0;
+ /* [retval][out] */ VARIANT_BOOL *pVal) = 0;
virtual /* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE put_HTTPprotocol(
/* [in] */ VARIANT_BOOL newVal) = 0;
@@ -253,14 +250,15 @@
/* [in] */ WINDOWSHOOK_TYPES lHookType,
/* [in] */ long hwndTargetWnd,
/* [in] */ VARIANT_BOOL bStart,
- /* [out][in] */ long __RPC_FAR *lUWMHookMsgID) = 0;
+ /* [out][in] */ long *lUWMHookMsgID) = 0;
virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE HookProcNCode(
/* [in] */ WINDOWSHOOK_TYPES lHookType,
- /* [out][in] */ long __RPC_FAR *nCode) = 0;
+ /* [out][in] */ long *nCode) = 0;
};
+
#else /* C style interface */
typedef struct IcsDLManVtbl
@@ -267,90 +265,99 @@
{
BEGIN_INTERFACE
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
- IcsDLMan __RPC_FAR * This,
+ HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+ IcsDLMan * This,
/* [in] */ REFIID riid,
- /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
+ /* [annotation][iid_is][out] */
+ _COM_Outptr_ void **ppvObject);
- ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
- IcsDLMan __RPC_FAR * This);
+ ULONG ( STDMETHODCALLTYPE *AddRef )(
+ IcsDLMan * This);
- ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
- IcsDLMan __RPC_FAR * This);
+ ULONG ( STDMETHODCALLTYPE *Release )(
+ IcsDLMan * This);
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )(
- IcsDLMan __RPC_FAR * This,
- /* [out] */ UINT __RPC_FAR *pctinfo);
+ HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )(
+ IcsDLMan * This,
+ /* [out] */ UINT *pctinfo);
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )(
- IcsDLMan __RPC_FAR * This,
+ HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )(
+ IcsDLMan * This,
/* [in] */ UINT iTInfo,
/* [in] */ LCID lcid,
- /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
+ /* [out] */ ITypeInfo **ppTInfo);
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )(
- IcsDLMan __RPC_FAR * This,
+ HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )(
+ IcsDLMan * This,
/* [in] */ REFIID riid,
- /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
- /* [in] */ UINT cNames,
+ /* [size_is][in] */ LPOLESTR *rgszNames,
+ /* [range][in] */ UINT cNames,
/* [in] */ LCID lcid,
- /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
+ /* [size_is][out] */ DISPID *rgDispId);
- /* [local] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ DISPID dispIdMember,
- /* [in] */ REFIID riid,
- /* [in] */ LCID lcid,
- /* [in] */ WORD wFlags,
- /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
- /* [out] */ VARIANT __RPC_FAR *pVarResult,
- /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
- /* [out] */ UINT __RPC_FAR *puArgErr);
+ /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )(
+ IcsDLMan * This,
+ /* [annotation][in] */
+ _In_ DISPID dispIdMember,
+ /* [annotation][in] */
+ _In_ REFIID riid,
+ /* [annotation][in] */
+ _In_ LCID lcid,
+ /* [annotation][in] */
+ _In_ WORD wFlags,
+ /* [annotation][out][in] */
+ _In_ DISPPARAMS *pDispParams,
+ /* [annotation][out] */
+ _Out_opt_ VARIANT *pVarResult,
+ /* [annotation][out] */
+ _Out_opt_ EXCEPINFO *pExcepInfo,
+ /* [annotation][out] */
+ _Out_opt_ UINT *puArgErr);
- /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *DownloadUrlAsync )(
- IcsDLMan __RPC_FAR * This,
+ /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *DownloadUrlAsync )(
+ IcsDLMan * This,
/* [in] */ BSTR URL,
- /* [out][in] */ long __RPC_FAR *DLUID);
+ /* [out][in] */ long *DLUID);
- /* [helpstring][id][propget] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_HWNDInternetExplorerServer )(
- IcsDLMan __RPC_FAR * This,
- /* [retval][out] */ long __RPC_FAR *pVal);
+ /* [helpstring][id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_HWNDInternetExplorerServer )(
+ IcsDLMan * This,
+ /* [retval][out] */ long *pVal);
- /* [helpstring][id][propput] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_HWNDInternetExplorerServer )(
- IcsDLMan __RPC_FAR * This,
+ /* [helpstring][id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_HWNDInternetExplorerServer )(
+ IcsDLMan * This,
/* [in] */ long newVal);
- /* [helpstring][id][propget] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_HTTPSprotocol )(
- IcsDLMan __RPC_FAR * This,
- /* [retval][out] */ VARIANT_BOOL __RPC_FAR *pVal);
+ /* [helpstring][id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_HTTPSprotocol )(
+ IcsDLMan * This,
+ /* [retval][out] */ VARIANT_BOOL *pVal);
- /* [helpstring][id][propput] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_HTTPSprotocol )(
- IcsDLMan __RPC_FAR * This,
+ /* [helpstring][id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_HTTPSprotocol )(
+ IcsDLMan * This,
/* [in] */ VARIANT_BOOL newVal);
- /* [helpstring][id][propget] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_HTTPprotocol )(
- IcsDLMan __RPC_FAR * This,
- /* [retval][out] */ VARIANT_BOOL __RPC_FAR *pVal);
+ /* [helpstring][id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_HTTPprotocol )(
+ IcsDLMan * This,
+ /* [retval][out] */ VARIANT_BOOL *pVal);
- /* [helpstring][id][propput] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_HTTPprotocol )(
- IcsDLMan __RPC_FAR * This,
+ /* [helpstring][id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_HTTPprotocol )(
+ IcsDLMan * This,
/* [in] */ VARIANT_BOOL newVal);
- /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *CancelFileDownload )(
- IcsDLMan __RPC_FAR * This,
+ /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *CancelFileDownload )(
+ IcsDLMan * This,
/* [in] */ long DlUid);
- /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetupWindowsHook )(
- IcsDLMan __RPC_FAR * This,
+ /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SetupWindowsHook )(
+ IcsDLMan * This,
/* [in] */ WINDOWSHOOK_TYPES lHookType,
/* [in] */ long hwndTargetWnd,
/* [in] */ VARIANT_BOOL bStart,
- /* [out][in] */ long __RPC_FAR *lUWMHookMsgID);
+ /* [out][in] */ long *lUWMHookMsgID);
- /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *HookProcNCode )(
- IcsDLMan __RPC_FAR * This,
+ /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *HookProcNCode )(
+ IcsDLMan * This,
/* [in] */ WINDOWSHOOK_TYPES lHookType,
- /* [out][in] */ long __RPC_FAR *nCode);
+ /* [out][in] */ long *nCode);
END_INTERFACE
} IcsDLManVtbl;
@@ -357,7 +364,7 @@
interface IcsDLMan
{
- CONST_VTBL struct IcsDLManVtbl __RPC_FAR *lpVtbl;
+ CONST_VTBL struct IcsDLManVtbl *lpVtbl;
};
@@ -366,57 +373,57 @@
#define IcsDLMan_QueryInterface(This,riid,ppvObject) \
- (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
+ ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
#define IcsDLMan_AddRef(This) \
- (This)->lpVtbl -> AddRef(This)
+ ( (This)->lpVtbl -> AddRef(This) )
#define IcsDLMan_Release(This) \
- (This)->lpVtbl -> Release(This)
+ ( (This)->lpVtbl -> Release(This) )
#define IcsDLMan_GetTypeInfoCount(This,pctinfo) \
- (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
+ ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) )
#define IcsDLMan_GetTypeInfo(This,iTInfo,lcid,ppTInfo) \
- (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
+ ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) )
#define IcsDLMan_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) \
- (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
+ ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) )
#define IcsDLMan_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) \
- (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
+ ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) )
#define IcsDLMan_DownloadUrlAsync(This,URL,DLUID) \
- (This)->lpVtbl -> DownloadUrlAsync(This,URL,DLUID)
+ ( (This)->lpVtbl -> DownloadUrlAsync(This,URL,DLUID) )
#define IcsDLMan_get_HWNDInternetExplorerServer(This,pVal) \
- (This)->lpVtbl -> get_HWNDInternetExplorerServer(This,pVal)
+ ( (This)->lpVtbl -> get_HWNDInternetExplorerServer(This,pVal) )
#define IcsDLMan_put_HWNDInternetExplorerServer(This,newVal) \
- (This)->lpVtbl -> put_HWNDInternetExplorerServer(This,newVal)
+ ( (This)->lpVtbl -> put_HWNDInternetExplorerServer(This,newVal) )
#define IcsDLMan_get_HTTPSprotocol(This,pVal) \
- (This)->lpVtbl -> get_HTTPSprotocol(This,pVal)
+ ( (This)->lpVtbl -> get_HTTPSprotocol(This,pVal) )
#define IcsDLMan_put_HTTPSprotocol(This,newVal) \
- (This)->lpVtbl -> put_HTTPSprotocol(This,newVal)
+ ( (This)->lpVtbl -> put_HTTPSprotocol(This,newVal) )
#define IcsDLMan_get_HTTPprotocol(This,pVal) \
- (This)->lpVtbl -> get_HTTPprotocol(This,pVal)
+ ( (This)->lpVtbl -> get_HTTPprotocol(This,pVal) )
#define IcsDLMan_put_HTTPprotocol(This,newVal) \
- (This)->lpVtbl -> put_HTTPprotocol(This,newVal)
+ ( (This)->lpVtbl -> put_HTTPprotocol(This,newVal) )
#define IcsDLMan_CancelFileDownload(This,DlUid) \
- (This)->lpVtbl -> CancelFileDownload(This,DlUid)
+ ( (This)->lpVtbl -> CancelFileDownload(This,DlUid) )
#define IcsDLMan_SetupWindowsHook(This,lHookType,hwndTargetWnd,bStart,lUWMHookMsgID) \
- (This)->lpVtbl -> SetupWindowsHook(This,lHookType,hwndTargetWnd,bStart,lUWMHookMsgID)
+ ( (This)->lpVtbl -> SetupWindowsHook(This,lHookType,hwndTargetWnd,bStart,lUWMHookMsgID) )
#define IcsDLMan_HookProcNCode(This,lHookType,nCode) \
- (This)->lpVtbl -> HookProcNCode(This,lHookType,nCode)
+ ( (This)->lpVtbl -> HookProcNCode(This,lHookType,nCode) )
#endif /* COBJMACROS */
@@ -425,132 +432,7 @@
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IcsDLMan_DownloadUrlAsync_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ BSTR URL,
- /* [out][in] */ long __RPC_FAR *DLUID);
-
-void __RPC_STUB IcsDLMan_DownloadUrlAsync_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE IcsDLMan_get_HWNDInternetExplorerServer_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [retval][out] */ long __RPC_FAR *pVal);
-
-
-void __RPC_STUB IcsDLMan_get_HWNDInternetExplorerServer_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE IcsDLMan_put_HWNDInternetExplorerServer_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ long newVal);
-
-
-void __RPC_STUB IcsDLMan_put_HWNDInternetExplorerServer_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE IcsDLMan_get_HTTPSprotocol_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [retval][out] */ VARIANT_BOOL __RPC_FAR *pVal);
-
-
-void __RPC_STUB IcsDLMan_get_HTTPSprotocol_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE IcsDLMan_put_HTTPSprotocol_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ VARIANT_BOOL newVal);
-
-
-void __RPC_STUB IcsDLMan_put_HTTPSprotocol_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE IcsDLMan_get_HTTPprotocol_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [retval][out] */ VARIANT_BOOL __RPC_FAR *pVal);
-
-
-void __RPC_STUB IcsDLMan_get_HTTPprotocol_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE IcsDLMan_put_HTTPprotocol_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ VARIANT_BOOL newVal);
-
-
-void __RPC_STUB IcsDLMan_put_HTTPprotocol_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IcsDLMan_CancelFileDownload_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ long DlUid);
-
-
-void __RPC_STUB IcsDLMan_CancelFileDownload_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IcsDLMan_SetupWindowsHook_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ WINDOWSHOOK_TYPES lHookType,
- /* [in] */ long hwndTargetWnd,
- /* [in] */ VARIANT_BOOL bStart,
- /* [out][in] */ long __RPC_FAR *lUWMHookMsgID);
-
-
-void __RPC_STUB IcsDLMan_SetupWindowsHook_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IcsDLMan_HookProcNCode_Proxy(
- IcsDLMan __RPC_FAR * This,
- /* [in] */ WINDOWSHOOK_TYPES lHookType,
- /* [out][in] */ long __RPC_FAR *nCode);
-
-
-void __RPC_STUB IcsDLMan_HookProcNCode_Stub(
- IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage,
- DWORD *_pdwStubPhase);
-
-
-
#endif /* __IcsDLMan_INTERFACE_DEFINED__ */
@@ -586,45 +468,54 @@
{
BEGIN_INTERFACE
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
- _IcsDLManEvents __RPC_FAR * This,
+ HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+ _IcsDLManEvents * This,
/* [in] */ REFIID riid,
- /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
+ /* [annotation][iid_is][out] */
+ _COM_Outptr_ void **ppvObject);
- ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
- _IcsDLManEvents __RPC_FAR * This);
+ ULONG ( STDMETHODCALLTYPE *AddRef )(
+ _IcsDLManEvents * This);
- ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
- _IcsDLManEvents __RPC_FAR * This);
+ ULONG ( STDMETHODCALLTYPE *Release )(
+ _IcsDLManEvents * This);
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )(
- _IcsDLManEvents __RPC_FAR * This,
- /* [out] */ UINT __RPC_FAR *pctinfo);
+ HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )(
+ _IcsDLManEvents * This,
+ /* [out] */ UINT *pctinfo);
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )(
- _IcsDLManEvents __RPC_FAR * This,
+ HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )(
+ _IcsDLManEvents * This,
/* [in] */ UINT iTInfo,
/* [in] */ LCID lcid,
- /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
+ /* [out] */ ITypeInfo **ppTInfo);
- HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )(
- _IcsDLManEvents __RPC_FAR * This,
+ HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )(
+ _IcsDLManEvents * This,
/* [in] */ REFIID riid,
- /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
- /* [in] */ UINT cNames,
+ /* [size_is][in] */ LPOLESTR *rgszNames,
+ /* [range][in] */ UINT cNames,
/* [in] */ LCID lcid,
- /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
+ /* [size_is][out] */ DISPID *rgDispId);
- /* [local] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )(
- _IcsDLManEvents __RPC_FAR * This,
- /* [in] */ DISPID dispIdMember,
- /* [in] */ REFIID riid,
- /* [in] */ LCID lcid,
- /* [in] */ WORD wFlags,
- /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
- /* [out] */ VARIANT __RPC_FAR *pVarResult,
- /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
- /* [out] */ UINT __RPC_FAR *puArgErr);
+ /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )(
+ _IcsDLManEvents * This,
+ /* [annotation][in] */
+ _In_ DISPID dispIdMember,
+ /* [annotation][in] */
+ _In_ REFIID riid,
+ /* [annotation][in] */
+ _In_ LCID lcid,
+ /* [annotation][in] */
+ _In_ WORD wFlags,
+ /* [annotation][out][in] */
+ _In_ DISPPARAMS *pDispParams,
+ /* [annotation][out] */
+ _Out_opt_ VARIANT *pVarResult,
+ /* [annotation][out] */
+ _Out_opt_ EXCEPINFO *pExcepInfo,
+ /* [annotation][out] */
+ _Out_opt_ UINT *puArgErr);
END_INTERFACE
} _IcsDLManEventsVtbl;
@@ -631,7 +522,7 @@
interface _IcsDLManEvents
{
- CONST_VTBL struct _IcsDLManEventsVtbl __RPC_FAR *lpVtbl;
+ CONST_VTBL struct _IcsDLManEventsVtbl *lpVtbl;
};
@@ -640,26 +531,26 @@
#define _IcsDLManEvents_QueryInterface(This,riid,ppvObject) \
- (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
+ ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
#define _IcsDLManEvents_AddRef(This) \
- (This)->lpVtbl -> AddRef(This)
+ ( (This)->lpVtbl -> AddRef(This) )
#define _IcsDLManEvents_Release(This) \
- (This)->lpVtbl -> Release(This)
+ ( (This)->lpVtbl -> Release(This) )
#define _IcsDLManEvents_GetTypeInfoCount(This,pctinfo) \
- (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
+ ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) )
#define _IcsDLManEvents_GetTypeInfo(This,iTInfo,lcid,ppTInfo) \
- (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
+ ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) )
#define _IcsDLManEvents_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) \
- (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
+ ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) )
#define _IcsDLManEvents_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) \
- (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
+ ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) )
#endif /* COBJMACROS */
@@ -681,10 +572,10 @@
/* Additional Prototypes for ALL interfaces */
-unsigned long __RPC_USER BSTR_UserSize( unsigned long __RPC_FAR *, unsigned long , BSTR __RPC_FAR * );
-unsigned char __RPC_FAR * __RPC_USER BSTR_UserMarshal( unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * );
-unsigned char __RPC_FAR * __RPC_USER BSTR_UserUnmarshal(unsigned long __RPC_FAR *, unsigned char __RPC_FAR *, BSTR __RPC_FAR * );
-void __RPC_USER BSTR_UserFree( unsigned long __RPC_FAR *, BSTR __RPC_FAR * );
+unsigned long __RPC_USER BSTR_UserSize( unsigned long *, unsigned long , BSTR * );
+unsigned char * __RPC_USER BSTR_UserMarshal( unsigned long *, unsigned char *, BSTR * );
+unsigned char * __RPC_USER BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * );
+void __RPC_USER BSTR_UserFree( unsigned long *, BSTR * );
/* end of Additional Prototypes */
@@ -693,3 +584,5 @@
#endif
#endif
+
+
Index: COM_Component_Src/csExWBDLMan.tlb
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: COM_Component_Src/csExWBDLMan_i.c
===================================================================
--- COM_Component_Src/csExWBDLMan_i.c (revision 71)
+++ COM_Component_Src/csExWBDLMan_i.c (working copy)
@@ -1,22 +1,49 @@
-/* this file contains the actual definitions of */
-/* the IIDs and CLSIDs */
+
+/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
+
/* link this file in with the server and any clients */
-/* File created by MIDL compiler version 5.01.0164 */
-/* at Wed Aug 22 07:24:48 2007
+ /* File created by MIDL compiler version 8.00.0603 */
+/* at Sat Dec 06 22:56:54 2014
*/
-/* Compiler settings for C:\Temp\COM_Component_Source_Binaries\csExWBDLMan.idl:
- Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
+/* Compiler settings for csExWBDLMan.idl:
+ Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.00.0603
+ protocol : dce , ms_ext, c_ext, robust
error checks: allocation ref bounds_check enum stub_data
+ VC __declspec() decoration level:
+ __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+ DECLSPEC_UUID(), MIDL_INTERFACE()
*/
-//@@MIDL_FILE_HEADING( )
+/* @@MIDL_FILE_HEADING( ) */
+
+#pragma warning( disable: 4049 ) /* more than 64k source lines */
+
+
#ifdef __cplusplus
extern "C"{
#endif
+#include <rpc.h>
+#include <rpcndr.h>
+
+#ifdef _MIDL_USE_GUIDDEF_
+
+#ifndef INITGUID
+#define INITGUID
+#include <guiddef.h>