Skip to content

Commit 17d4644

Browse files
hakrilhakril
authored
Merge pull request #66 from hakril/multiversion_localthis
Multiversion ORPC call in `RpcClient`
2 parents 9a67dca + 315ad8e commit 17d4644

67 files changed

Lines changed: 1365 additions & 325 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ctypes_generation/definitions/defines/combase.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@
2626
#define SORF_OXRES7 ( 0x400 )
2727
#define SORF_OXRES8 ( 0x800 )
2828
#define SORF_NULL ( 0 )
29-
#define SORF_NOPING ( 0x1000 )
29+
#define SORF_NOPING ( 0x1000 )
30+
31+
#define UNIQUE_FLAG_PADDING 2
32+
#define MAINHDRSIG 0x414E554B
33+
#define ENTRYHDRSIG 0x494E414E

‎ctypes_generation/definitions/structures/combase.txt‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -334,16 +334,6 @@ typedef struct _LOCALTHIS {
334334
PVOID pTouchedAstaArray; // Ptr32 __MIDL_XmitDefs_0002
335335
} LOCALTHIS;
336336

337-
typedef struct _LOCALTHIS32 {
338-
DWORD dwFlags;
339-
DWORD dwClientThread;
340-
GUID passthroughTraceActivity;
341-
GUID callTraceActivity;
342-
MIDL_XmitDefs_0001 asyncRequestBlock;
343-
DWORD reserved;
344-
PVOID32 pTouchedAstaArray; // Ptr32 __MIDL_XmitDefs_0002
345-
} LOCALTHIS32;
346-
347337
/* LOCALTHAT & sub structures */
348338

349339
typedef struct _MIDL_XmitDefs_0007 {
@@ -406,15 +396,6 @@ typedef struct _LOCALTHAT {
406396
} LOCALTHAT;
407397

408398

409-
typedef struct _LOCALTHAT32 {
410-
UINT64 marshalingSetId;
411-
ULONG reserved;
412-
PVOID32 pAsyncResponseBlock;
413-
PVOID32 containerErrorInformation;
414-
PVOID32 containerPassthroughData;
415-
} LOCALTHAT32;
416-
417-
418399
typedef struct tagORPCTHAT {
419400
ULONG flags;
420401
tagORPC_EXTENT_ARRAY *extensions;
@@ -424,4 +405,35 @@ typedef struct tagORPCTHAT {
424405
typedef struct ORPCTHAT32 {
425406
ULONG flags;
426407
PVOID32 extensions; // tagORPC_EXTENT_ARRAY tagORPC_EXTENT_ARRAY
427-
} ORPCTHAT32;
408+
} ORPCTHAT32;
409+
410+
// From: com\ole32\com\dcomrem\chock.hxx
411+
typedef struct
412+
{
413+
ULONG size; // Number of extents.
414+
ULONG reserved; // Must be zero.
415+
ULONG unique; // Flag to indicate presence of unique_flag array.
416+
ULONG rounded_size; // Actual number of extents.
417+
ULONG unique_flag[UNIQUE_FLAG_PADDING]; // Flags to indicate presense of ORPC_EXTENTs
418+
} WireExtentArray;
419+
420+
typedef struct
421+
{
422+
ULONG rounded_size; // Actual number of extents.
423+
GUID id; // Extension identifier.
424+
ULONG size; // Extension size.
425+
426+
// byte data[]; // Extension data.
427+
} WireExtent;
428+
429+
typedef struct tagMainHeader
430+
{
431+
ULONG Signature;
432+
ULONG Version;
433+
ULONG cPolicies;
434+
ULONG cbBuffer;
435+
ULONG cbSize;
436+
LONG hr;
437+
LONG hrServer;
438+
LONG reserved;
439+
} MainHeader;

‎ctypes_generation/definitions/structures/combase_localthisthat_versions.txt‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
/* Summary of seen version on combase symbols for LOCALTHIS:
2+
3+
Nb fields: 2
4+
6.1.7601.17514 -> 6.2.9200.22376
5+
* 6.1.7601.17514
6+
* 6.1.7601.17514
7+
* 6.2.9200.22376
8+
Nb fields: 4
9+
6.3.9600.17031 -> 6.3.9600.20772
10+
* 6.3.9600.17031
11+
* 6.3.9600.20772
12+
Nb fields: 5
13+
10.0.10240.16384 -> 10.0.15063.2679
14+
* 10.0.10240.16384
15+
* 10.0.10240.20747
16+
* 10.0.10586.0
17+
* 10.0.14393.576
18+
* 10.0.14393.6451
19+
* 10.0.14393.7426
20+
* 10.0.15063.251
21+
* 10.0.15063.1563
22+
* 10.0.15063.2500
23+
* 10.0.15063.2679
24+
Nb fields: 7
25+
10.0.16299.1 -> 10.0.26100.2454
26+
* 10.0.16299.1
27+
* 10.0.16299.15
28+
* 10.0.17134.1
29+
* 10.0.17134.48
30+
* 10.0.17134.2145
31+
* 10.0.17134.2145
32+
* 10.0.17763.1
33+
* 10.0.17763.2931
34+
* 10.0.22621.2792
35+
* 10.0.22621.3958
36+
* 10.0.22621.4111
37+
* 10.0.22621.4541
38+
* 10.0.26100.2454
39+
*/
40+
41+
/* Summary of seen version on combase symbols for LOCALTHAT:
42+
43+
Nb fields: 2
44+
6.3.9600.17031 -> 6.3.9600.20772
45+
* 6.3.9600.17031
46+
* 6.3.9600.17031
47+
* 6.3.9600.17031
48+
* 6.3.9600.20772
49+
Nb fields: 3
50+
10.0.18362.900 -> 10.0.18362.1916
51+
* 10.0.18362.900
52+
* 10.0.18362.900
53+
* 10.0.18362.1016
54+
* 10.0.18362.1916
55+
Nb fields: 4
56+
10.0.10240.16384 -> 10.0.17763.6040
57+
* 10.0.10240.16384
58+
* 10.0.10240.16384
59+
* 10.0.10240.20747
60+
* 10.0.10586.0
61+
* 10.0.14393.576
62+
* 10.0.14393.6451
63+
* 10.0.14393.7426
64+
* 10.0.15063.251
65+
* 10.0.15063.1563
66+
* 10.0.15063.2500
67+
* 10.0.15063.2679
68+
* 10.0.16299.1
69+
* 10.0.16299.15
70+
* 10.0.17134.1
71+
* 10.0.17134.48
72+
* 10.0.17134.2145
73+
* 10.0.17134.2145
74+
* 10.0.17763.1
75+
* 10.0.17763.2931
76+
* 10.0.17763.6040
77+
Nb fields: 5
78+
10.0.19039.1 -> 10.0.26100.2454
79+
* 10.0.19039.1
80+
* 10.0.19041.84
81+
* 10.0.19041.4894
82+
* 10.0.22000.65
83+
* 10.0.22621.2792
84+
* 10.0.22621.3958
85+
* 10.0.22621.4111
86+
* 10.0.22621.4541
87+
* 10.0.26100.2454
88+
* 10.0.26100.2454
89+
*/
90+
91+
92+
/* Seen on 6.2.9200.22376 (win8_ldr_escrow.180222-0941) */
93+
/* also seen on previous version : XP / Win7 / Server 2012 */
94+
95+
typedef struct LOCALTHIS32_NT_62 {
96+
ULONG dwFlags;
97+
ULONG dwClientThread;
98+
};
99+
100+
// NO LOCALTHAT for these previous version as far as I now
101+
102+
/* Seen on 6.3.9600.17031 (winblue_gdr.140221-1952) */
103+
104+
typedef struct __MIDL_XmitDefs_0001_NT_63 {
105+
ULONG size;
106+
ULONG reserved;
107+
UINT64 *pAstaOxids;
108+
};
109+
110+
typedef struct LOCALTHIS32_NT_63 {
111+
ULONG dwFlags;
112+
ULONG dwClientThread;
113+
ULONG reserved;
114+
PVOID32 pTouchedAstaArray;
115+
};
116+
117+
118+
typedef struct LOCALTHAT32_NT_63 {
119+
UINT64 marshalingSetAcknowledgmentOxid;
120+
UINT64 marshalingSetId;
121+
};
122+
123+
/* NT_1607 : combase 10.0.14393.576 from a WS2016 ISO*/
124+
125+
typedef struct __MIDL_XmitDefs_0002_NT_1607 {
126+
ULONG size;
127+
ULONG reserved;
128+
PVOID32 pAstaOxids;
129+
};
130+
131+
typedef struct __MIDL_XmitDefs_0001_NT_1607 {
132+
_GUID asyncOperationId;
133+
UINT64 oxidClientProcessNA;
134+
_GUID originalClientLogicalThreadId;
135+
UINT64 uClientCausalityTraceId;
136+
} MIDL_XmitDefs_0001_NT_1607;
137+
138+
typedef struct _LOCALTHIS32_NT_1607 {
139+
ULONG dwFlags;
140+
ULONG dwClientThread;
141+
MIDL_XmitDefs_0001_NT_1607 asyncRequestBlock;
142+
ULONG reserved;
143+
PVOID32 pTouchedAstaArray;
144+
} LOCALTHIS32_NT_1607;
145+
146+
typedef struct __MIDL_XmitDefs_0007 {
147+
INT pointOfFailure;
148+
HRESULT hrFailure;
149+
ULONG sizeOfMarshaledErrorInfo;
150+
ULONG reserved;
151+
BYTE *pMarshaledErrorInfo;
152+
} MIDL_XmitDefs_0007;
153+
154+
typedef struct __MIDL_XmitDefs_0005 {
155+
ULONG sizeOfMarshaledResults;
156+
ULONG reserved;
157+
BYTE *pMarshaledResults;
158+
} MIDL_XmitDefs_0005;
159+
160+
typedef struct __MIDL_XmitDefs_0008 {
161+
INT outcome;
162+
MIDL_XmitDefs_0005 successDetails;
163+
MIDL_XmitDefs_0007 failureDetails;
164+
} MIDL_XmitDefs_0008;
165+
166+
typedef struct __MIDL_XmitDefs_0010 {
167+
ULONG asyncStatus;
168+
ULONG reserved1;
169+
UINT64 uServerCausalityTraceId;
170+
ULONG reserved2;
171+
PVOID32 *pOutcomeDetails; //__MIDL_XmitDefs_0008
172+
} MIDL_XmitDefs_0010;
173+
174+
typedef struct LOCALTHAT32_NT_1607 {
175+
UINT64 marshalingSetAcknowledgmentOxid;
176+
UINT64 marshalingSetId;
177+
ULONG reserved;
178+
PVOID32 pAsyncResponseBlock;
179+
};
180+
181+
/* ! NT_1607: combase 10.0.14393.576 */
182+
183+
184+
/* */
185+
186+
/* Seen only in 10.0.18362 versions of combase */
187+
188+
typedef struct _LOCALTHAT32_10_1903 {
189+
UINT64 marshalingSetId;
190+
PVOID32 pAsyncResponseBlock;
191+
PVOID32 containerPassthroughData;
192+
} LOCALTHAT32_10_1903;
193+
194+
/* NT 10.22 ? seen on 10.0.22621.1 */
195+
196+
typedef struct _LOCALTHIS32 {
197+
DWORD dwFlags;
198+
DWORD dwClientThread;
199+
GUID passthroughTraceActivity;
200+
GUID callTraceActivity;
201+
MIDL_XmitDefs_0001 asyncRequestBlock;
202+
DWORD reserved;
203+
PVOID32 pTouchedAstaArray; // Ptr32 __MIDL_XmitDefs_0002
204+
} LOCALTHIS32;
205+
206+
typedef struct _LOCALTHAT32 {
207+
UINT64 marshalingSetId;
208+
ULONG reserved;
209+
PVOID32 pAsyncResponseBlock;
210+
PVOID32 containerErrorInformation;
211+
PVOID32 containerPassthroughData;
212+
} LOCALTHAT32;

‎docs/build/html/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: d169f6535010227fa35e2e21d62ad586
3+
config: 79eb4f6d749f8afd0854dfaf20582dd7
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/build/html/_modules/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<head>
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Overview: module code &#8212; PythonForWindows 1.0.2 documentation</title>
7+
<title>Overview: module code &#8212; PythonForWindows 1.0.3 documentation</title>
88
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=fa44fd50" />
99
<link rel="stylesheet" type="text/css" href="../_static/classic.css?v=def86cc0" />
1010
<link rel="stylesheet" type="text/css" href="../_static/css/mbasic.css?v=957880af" />
1111

12-
<script src="../_static/documentation_options.js?v=1ed6394b"></script>
12+
<script src="../_static/documentation_options.js?v=baaebd52"></script>
1313
<script src="../_static/doctools.js?v=9a2dae69"></script>
1414
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
1515

@@ -25,7 +25,7 @@ <h3>Navigation</h3>
2525
<li class="right" >
2626
<a href="../py-modindex.html" title="Python Module Index"
2727
>modules</a> |</li>
28-
<li class="nav-item nav-item-0"><a href="../index.html">PythonForWindows 1.0.2 documentation</a> &#187;</li>
28+
<li class="nav-item nav-item-0"><a href="../index.html">PythonForWindows 1.0.3 documentation</a> &#187;</li>
2929
<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
3030
</ul>
3131
</div>
@@ -115,7 +115,7 @@ <h3>Navigation</h3>
115115
<li class="right" >
116116
<a href="../py-modindex.html" title="Python Module Index"
117117
>modules</a> |</li>
118-
<li class="nav-item nav-item-0"><a href="../index.html">PythonForWindows 1.0.2 documentation</a> &#187;</li>
118+
<li class="nav-item nav-item-0"><a href="../index.html">PythonForWindows 1.0.3 documentation</a> &#187;</li>
119119
<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
120120
</ul>
121121
</div>

‎docs/build/html/_modules/windows/alpc.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<head>
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>windows.alpc &#8212; PythonForWindows 1.0.2 documentation</title>
7+
<title>windows.alpc &#8212; PythonForWindows 1.0.3 documentation</title>
88
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=fa44fd50" />
99
<link rel="stylesheet" type="text/css" href="../../_static/classic.css?v=def86cc0" />
1010
<link rel="stylesheet" type="text/css" href="../../_static/css/mbasic.css?v=957880af" />
1111

12-
<script src="../../_static/documentation_options.js?v=1ed6394b"></script>
12+
<script src="../../_static/documentation_options.js?v=baaebd52"></script>
1313
<script src="../../_static/doctools.js?v=9a2dae69"></script>
1414
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
1515

@@ -25,7 +25,7 @@ <h3>Navigation</h3>
2525
<li class="right" >
2626
<a href="../../py-modindex.html" title="Python Module Index"
2727
>modules</a> |</li>
28-
<li class="nav-item nav-item-0"><a href="../../index.html">PythonForWindows 1.0.2 documentation</a> &#187;</li>
28+
<li class="nav-item nav-item-0"><a href="../../index.html">PythonForWindows 1.0.3 documentation</a> &#187;</li>
2929
<li class="nav-item nav-item-1"><a href="../index.html" accesskey="U">Module code</a> &#187;</li>
3030
<li class="nav-item nav-item-this"><a href="">windows.alpc</a></li>
3131
</ul>
@@ -505,6 +505,8 @@ <h1>Source code for windows.alpc</h1><div class="highlight"><pre>
505505
<span class="k">def</span> <span class="nf">disconnect</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
506506
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">handle</span><span class="p">:</span>
507507
<span class="bp">self</span><span class="o">.</span><span class="n">_close_port</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">handle</span><span class="p">)</span>
508+
<span class="bp">self</span><span class="o">.</span><span class="n">handle</span> <span class="o">=</span> <span class="kc">None</span>
509+
508510

509511
<span class="k">def</span> <span class="fm">__del__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
510512
<span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">path</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
@@ -608,8 +610,10 @@ <h1>Source code for windows.alpc</h1><div class="highlight"><pre>
608610
<span class="k">def</span> <span class="nf">disconnect</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
609611
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">handle</span><span class="p">:</span>
610612
<span class="bp">self</span><span class="o">.</span><span class="n">_close_port</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">handle</span><span class="p">)</span>
613+
<span class="bp">self</span><span class="o">.</span><span class="n">handle</span> <span class="o">=</span> <span class="kc">None</span>
611614
<span class="k">for</span> <span class="n">com_port_handle</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">communication_port_list</span><span class="p">:</span>
612615
<span class="bp">self</span><span class="o">.</span><span class="n">_close_port</span><span class="p">(</span><span class="n">com_port_handle</span><span class="p">)</span>
616+
<span class="k">del</span> <span class="bp">self</span><span class="o">.</span><span class="n">communication_port_list</span><span class="p">[:]</span>
613617

614618
<span class="c1"># TODO: add an API to close a communication port ?</span>
615619

@@ -648,7 +652,7 @@ <h3>Navigation</h3>
648652
<li class="right" >
649653
<a href="../../py-modindex.html" title="Python Module Index"
650654
>modules</a> |</li>
651-
<li class="nav-item nav-item-0"><a href="../../index.html">PythonForWindows 1.0.2 documentation</a> &#187;</li>
655+
<li class="nav-item nav-item-0"><a href="../../index.html">PythonForWindows 1.0.3 documentation</a> &#187;</li>
652656
<li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
653657
<li class="nav-item nav-item-this"><a href="">windows.alpc</a></li>
654658
</ul>

0 commit comments

Comments
 (0)