[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: 2 new changesets

[<pyw...@li...>]

changeset ba46bcfb6b56 in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=ba46bcfb6b56
summary: add new test method GetVariantAndType and add some missing return values

changeset d812236c54bc in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=d812236c54bc
summary: fix broken link in .chm docs

diffstat:

 AutoDuck/pywin32-document.xml           |   2 +-
 com/TestSources/PyCOMTest/PyCOMImpl.cpp |  13 +++++++++++++
 com/TestSources/PyCOMTest/PyCOMImpl.h   |   1 +
 com/TestSources/PyCOMTest/PyCOMTest.idl |   1 +
 4 files changed, 16 insertions(+), 1 deletions(-)

diffs (78 lines):

diff -r 760405084d20 -r d812236c54bc AutoDuck/pywin32-document.xml
--- a/AutoDuck/pywin32-document.xml	Sun Sep 25 15:39:15 2011 +1000
+++ b/AutoDuck/pywin32-document.xml	Tue Oct 11 17:06:16 2011 +1100
@@ -23,7 +23,7 @@
             <item name="win32com readme" href="com/win32com/readme.htm"/>
             <item name="ADSI Python" href="com/help/adsi.html"/>
             <item name="Active Directory" href="com/help/active_directory.html"/>
-            <item name="Important notes about COM currency support changes" href="html/com/win32com/readme.htm#currency"/>
+            <item name="Important notes about COM currency support changes" href="com/win32com/readme.htm#currency"/>
         </overviews>
     </category>
     <category id="pythonwin" label="Pythonwin and win32ui">
diff -r 760405084d20 -r d812236c54bc com/TestSources/PyCOMTest/PyCOMImpl.cpp
--- a/com/TestSources/PyCOMTest/PyCOMImpl.cpp	Sun Sep 25 15:39:15 2011 +1000
+++ b/com/TestSources/PyCOMTest/PyCOMImpl.cpp	Tue Oct 11 17:06:16 2011 +1100
@@ -211,6 +211,7 @@
 	if (!outvar)
 		return E_POINTER;
 	*outvar = invar;
+	return S_OK;
 }
 
 STDMETHODIMP CPyCOMTest::GetSetUnsignedInt(unsigned int invar, unsigned int *outvar)
@@ -218,6 +219,7 @@
 	if (!outvar)
 		return E_POINTER;
 	*outvar = invar;
+	return S_OK;
 }
 
 STDMETHODIMP CPyCOMTest::GetSetLong(long invar, long *outvar)
@@ -225,6 +227,7 @@
 	if (!outvar)
 		return E_POINTER;
 	*outvar = invar;
+	return S_OK;
 }
 
 STDMETHODIMP CPyCOMTest::GetSetUnsignedLong(unsigned long invar, unsigned long *outvar)
@@ -232,6 +235,16 @@
 	if (!outvar)
 		return E_POINTER;
 	*outvar = invar;
+	return S_OK;
+}
+
+STDMETHODIMP CPyCOMTest::GetVariantAndType(VARIANT var, unsigned short *vt, VARIANT *vout)
+{
+	if (!vt || !vout)
+		return E_POINTER;
+	VariantClear(vout);
+	*vt = V_VT(&var);
+	return VariantCopy(vout, &var);
 }
 
 STDMETHODIMP CPyCOMTest::TestByRefVariant(VARIANT *v)
diff -r 760405084d20 -r d812236c54bc com/TestSources/PyCOMTest/PyCOMImpl.h
--- a/com/TestSources/PyCOMTest/PyCOMImpl.h	Sun Sep 25 15:39:15 2011 +1000
+++ b/com/TestSources/PyCOMTest/PyCOMImpl.h	Tue Oct 11 17:06:16 2011 +1100
@@ -70,6 +70,7 @@
 	STDMETHOD(GetSetUnsignedInt)(unsigned int invar, unsigned int *outvar);
 	STDMETHOD(GetSetLong)(long invar, long *outvar);
 	STDMETHOD(GetSetUnsignedLong)(unsigned long invar, unsigned long *outvar);
+	STDMETHOD(GetVariantAndType)(VARIANT vin, unsigned short *vt, VARIANT *vout);
 	STDMETHOD(TestByRefVariant)(VARIANT *v);
 	STDMETHOD(TestByRefString)(BSTR *v);
 	STDMETHOD(TakeByRefTypedDispatch)(IPyCOMTest **inout);
diff -r 760405084d20 -r d812236c54bc com/TestSources/PyCOMTest/PyCOMTest.idl
--- a/com/TestSources/PyCOMTest/PyCOMTest.idl	Sun Sep 25 15:39:15 2011 +1000
+++ b/com/TestSources/PyCOMTest/PyCOMTest.idl	Tue Oct 11 17:06:16 2011 +1100
@@ -205,6 +205,7 @@
 		HRESULT GetSetUnsignedInt([in] unsigned int invar, [out, retval] unsigned int *outunk);
 		HRESULT GetSetLong([in] long invar, [out, retval] long *outunk);
 		HRESULT GetSetUnsignedLong([in] unsigned long invar, [out, retval] unsigned long *outunk);
+		HRESULT GetVariantAndType([in] VARIANT vin, [out] unsigned short *vt, [out] VARIANT *vout);
 		HRESULT TestByRefVariant([in, out] VARIANT *v);
 		HRESULT TestByRefString([in, out] BSTR *v);
 		HRESULT TakeByRefTypedDispatch([in, out] IPyCOMTest **inout);