Skip to content

Commit 8d517f2

Browse files
hakrilhakril
authored
Merge pull request #62 from hakril/1.0.1
Version 1.0.1
2 parents e0852a2 + 2ff11e7 commit 8d517f2

Some content is hidden

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

66 files changed

+13692
-4094
lines changed

‎ctypes_generation/definitions/com/IActivationStageInfo.txt‎ renamed to ‎ctypes_generation/definitions/com/combase/IActivationStageInfo.txt‎

File renamed without changes.

‎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: 92d6a80a7446628386dc1fdf3dc6b1c0
3+
config: 01121266b90a8b5351869d0cc2981bae
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.0 documentation</title>
7+
<title>Overview: module code &#8212; PythonForWindows 1.0.1 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=8d563738"></script>
12+
<script src="../_static/documentation_options.js?v=292eb321"></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.0 documentation</a> &#187;</li>
28+
<li class="nav-item nav-item-0"><a href="../index.html">PythonForWindows 1.0.1 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.0 documentation</a> &#187;</li>
118+
<li class="nav-item nav-item-0"><a href="../index.html">PythonForWindows 1.0.1 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/com.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@ <h1>Source code for windows.com</h1><div class="highlight"><pre>
111111
<span class="bp">self</span><span class="o">.</span><span class="n">GetDocumentation</span><span class="p">(</span><span class="nb">id</span><span class="p">,</span> <span class="n">res</span><span class="p">,</span> <span class="kc">None</span><span class="p">,</span> <span class="kc">None</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span>
112112
<span class="k">return</span> <span class="n">res</span>
113113

114+
115+
<span class="k">class</span> <span class="nc">MemoryIStream</span><span class="p">(</span><span class="n">gdef</span><span class="o">.</span><span class="n">IStream</span><span class="p">):</span>
116+
<span class="nd">@classmethod</span>
117+
<span class="k">def</span> <span class="nf">create</span><span class="p">(</span><span class="bp">cls</span><span class="p">):</span>
118+
<span class="bp">self</span> <span class="o">=</span> <span class="bp">cls</span><span class="p">()</span>
119+
<span class="n">windows</span><span class="o">.</span><span class="n">winproxy</span><span class="o">.</span><span class="n">CreateStreamOnHGlobal</span><span class="p">(</span><span class="n">ppstm</span><span class="o">=</span><span class="bp">self</span><span class="p">)</span>
120+
<span class="k">return</span> <span class="bp">self</span>
121+
114122
<div class="viewcode-block" id="create_instance">
115123
<a class="viewcode-back" href="../../com.html#windows.com.create_instance">[docs]</a>
116124
<span class="k">def</span> <span class="nf">create_instance</span><span class="p">(</span><span class="n">clsiid</span><span class="p">,</span> <span class="n">targetinterface</span><span class="p">,</span> <span class="n">custom_iid</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">context</span><span class="o">=</span><span class="n">CLSCTX_INPROC_SERVER</span> <span class="o">|</span> <span class="n">CLSCTX_LOCAL_SERVER</span><span class="p">):</span>
@@ -119,6 +127,8 @@ <h1>Source code for windows.com</h1><div class="highlight"><pre>
119127
<span class="n">custom_iid</span> <span class="o">=</span> <span class="n">targetinterface</span><span class="o">.</span><span class="n">IID</span>
120128
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">clsiid</span><span class="p">,</span> <span class="n">basestring</span><span class="p">):</span>
121129
<span class="n">clsiid</span> <span class="o">=</span> <span class="n">IID</span><span class="o">.</span><span class="n">from_string</span><span class="p">(</span><span class="n">clsiid</span><span class="p">)</span>
130+
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">custom_iid</span><span class="p">,</span> <span class="n">basestring</span><span class="p">):</span>
131+
<span class="n">custom_iid</span> <span class="o">=</span> <span class="n">IID</span><span class="o">.</span><span class="n">from_string</span><span class="p">(</span><span class="n">custom_iid</span><span class="p">)</span>
122132
<span class="n">winproxy</span><span class="o">.</span><span class="n">CoCreateInstance</span><span class="p">(</span><span class="n">byref</span><span class="p">(</span><span class="n">clsiid</span><span class="p">),</span> <span class="kc">None</span><span class="p">,</span> <span class="n">context</span><span class="p">,</span> <span class="n">byref</span><span class="p">(</span><span class="n">custom_iid</span><span class="p">),</span> <span class="n">byref</span><span class="p">(</span><span class="n">targetinterface</span><span class="p">))</span>
123133
<span class="k">return</span> <span class="n">targetinterface</span></div>
124134

‎docs/build/html/_modules/windows/debug/breakpoints.html‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,17 @@ <h1>Source code for windows.debug.breakpoints</h1><div class="highlight"><pre>
190190
<span class="n">t</span> <span class="o">=</span> <span class="n">rt</span><span class="p">(</span><span class="n">value</span><span class="p">,</span> <span class="n">cproc</span><span class="p">)</span>
191191
<span class="k">else</span><span class="p">:</span>
192192
<span class="n">t</span> <span class="o">=</span> <span class="n">rt</span><span class="p">(</span><span class="n">value</span><span class="p">)</span>
193-
<span class="k">if</span> <span class="ow">not</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">t</span><span class="p">,</span> <span class="s2">&quot;contents&quot;</span><span class="p">):</span>
194-
<span class="k">try</span><span class="p">:</span>
195-
<span class="n">t</span> <span class="o">=</span> <span class="n">t</span><span class="o">.</span><span class="n">value</span>
196-
<span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
197-
<span class="k">pass</span>
193+
194+
<span class="n">content</span> <span class="o">=</span> <span class="kc">None</span>
195+
<span class="k">try</span><span class="p">:</span>
196+
<span class="n">content</span> <span class="o">=</span> <span class="n">t</span><span class="o">.</span><span class="n">contents</span>
197+
<span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
198+
<span class="c1"># contents will fail on basic type</span>
199+
<span class="c1"># Not really an expected behavior</span>
200+
<span class="c1"># But it works for now.. (and since a while)</span>
201+
<span class="k">pass</span>
202+
<span class="k">if</span> <span class="n">content</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
203+
<span class="n">t</span> <span class="o">=</span> <span class="n">t</span><span class="o">.</span><span class="n">value</span>
198204
<span class="n">res</span><span class="p">[</span><span class="n">name</span><span class="p">[</span><span class="mi">1</span><span class="p">]]</span> <span class="o">=</span> <span class="n">t</span>
199205
<span class="k">return</span> <span class="n">res</span>
200206

‎docs/build/html/_modules/windows/debug/symbols.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ <h1>Source code for windows.debug.symbols</h1><div class="highlight"><pre>
283283
<span class="nd">@property</span>
284284
<span class="k">def</span> <span class="nf">children</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
285285
<span class="n">count</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">nb_children</span>
286+
<span class="k">if</span> <span class="n">count</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
287+
<span class="k">return</span> <span class="kc">None</span>
286288
<span class="k">class</span> <span class="nc">res_struct</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">Structure</span><span class="p">):</span>
287289
<span class="n">_fields_</span> <span class="o">=</span> <span class="p">[(</span><span class="s2">&quot;Count&quot;</span><span class="p">,</span> <span class="n">gdef</span><span class="o">.</span><span class="n">ULONG</span><span class="p">),</span> <span class="p">(</span><span class="s2">&quot;Start&quot;</span><span class="p">,</span> <span class="n">gdef</span><span class="o">.</span><span class="n">ULONG</span><span class="p">),</span> <span class="p">(</span><span class="s2">&quot;Types&quot;</span><span class="p">,</span> <span class="p">(</span><span class="n">gdef</span><span class="o">.</span><span class="n">ULONG</span> <span class="o">*</span> <span class="n">count</span><span class="p">))]</span>
288290
<span class="n">x</span> <span class="o">=</span> <span class="n">res_struct</span><span class="p">()</span>
@@ -568,7 +570,7 @@ <h1>Source code for windows.debug.symbols</h1><div class="highlight"><pre>
568570
<span class="k">else</span><span class="p">:</span>
569571
<span class="n">callback</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">WINFUNCTYPE</span><span class="p">(</span><span class="n">gdef</span><span class="o">.</span><span class="n">BOOL</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">SymbolInfo</span><span class="p">),</span> <span class="n">gdef</span><span class="o">.</span><span class="n">ULONG</span> <span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">py_object</span><span class="p">)(</span><span class="n">callback</span><span class="p">)</span>
570572

571-
<span class="n">addr</span> <span class="o">=</span> <span class="nb">getattr</span><span class="p">(</span><span class="n">mod</span><span class="p">,</span> <span class="s2">&quot;addr&quot;</span><span class="p">,</span> <span class="n">mod</span><span class="p">)</span> <span class="c1"># Retrieve mod.addr, else us the value directly</span>
573+
<span class="n">addr</span> <span class="o">=</span> <span class="nb">getattr</span><span class="p">(</span><span class="n">mod</span><span class="p">,</span> <span class="s2">&quot;addr&quot;</span><span class="p">,</span> <span class="n">mod</span><span class="p">)</span> <span class="c1"># Retrieve mod.addr, else use the value directly</span>
572574
<span class="n">windows</span><span class="o">.</span><span class="n">winproxy</span><span class="o">.</span><span class="n">SymSearchW</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">handle</span><span class="p">,</span> <span class="n">gdef</span><span class="o">.</span><span class="n">DWORD64</span><span class="p">(</span><span class="n">addr</span><span class="p">),</span> <span class="mi">0</span><span class="p">,</span> <span class="n">tag</span><span class="p">,</span> <span class="n">mask</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">callback</span><span class="p">,</span> <span class="n">res</span><span class="p">,</span> <span class="n">options</span><span class="p">)</span>
573575
<span class="k">for</span> <span class="n">sym</span> <span class="ow">in</span> <span class="n">res</span><span class="p">:</span>
574576
<span class="n">sym</span><span class="o">.</span><span class="n">resolver</span> <span class="o">=</span> <span class="bp">self</span>

0 commit comments

Comments
 (0)