[pywin32-checkins] pywin32/com/win32comext/bits/src PyIBackgroundCopyError.cpp, 1.1.2.4, 1.1.2.5 PyIBackgroundCopyJob.cpp, 1.1.2.4, 1.1.2.5

[Sidnei da S. <dre...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/bits/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24481/com/win32comext/bits/src

Modified Files:
      Tag: sidnei-bits
	PyIBackgroundCopyError.cpp PyIBackgroundCopyJob.cpp 
Log Message:
 - Fixup WCHAR/LPWSTR confusion

Index: PyIBackgroundCopyError.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/PyIBackgroundCopyError.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** PyIBackgroundCopyError.cpp	7 Feb 2008 09:05:58 -0000	1.1.2.4
--- PyIBackgroundCopyError.cpp	8 Feb 2008 02:00:31 -0000	1.1.2.5
***************
*** 69,73 ****
  		return NULL;
  	// @pyparm int|LanguageId||Description for LanguageId
! 	WCHAR *pErrorDescription;
  	DWORD LanguageId = 0;
  	if ( !PyArg_ParseTuple(args, "|l:GetErrorDescription", &LanguageId) )
--- 69,73 ----
  		return NULL;
  	// @pyparm int|LanguageId||Description for LanguageId
! 	LPWSTR pErrorDescription;
  	DWORD LanguageId = 0;
  	if ( !PyArg_ParseTuple(args, "|l:GetErrorDescription", &LanguageId) )
***************
*** 79,83 ****
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCE, IID_IBackgroundCopyError );
! 	PyObject *ret = PyString_FromUnicode(pErrorDescription);
  	CoTaskMemFree(pErrorDescription);
  	return ret;
--- 79,83 ----
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCE, IID_IBackgroundCopyError );
! 	PyObject *ret = PyWinObject_FromWCHAR(pErrorDescription);
  	CoTaskMemFree(pErrorDescription);
  	return ret;
***************
*** 91,95 ****
  		return NULL;
  	// @pyparm int|LanguageId||Description for LanguageId
! 	WCHAR *pContextDescription;
  	DWORD LanguageId;
  	if ( !PyArg_ParseTuple(args, "l:GetErrorContextDescription", &LanguageId) )
--- 91,95 ----
  		return NULL;
  	// @pyparm int|LanguageId||Description for LanguageId
! 	LPWSTR pContextDescription;
  	DWORD LanguageId;
  	if ( !PyArg_ParseTuple(args, "l:GetErrorContextDescription", &LanguageId) )
***************
*** 101,105 ****
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCE, IID_IBackgroundCopyError );
! 	PyObject *ret = PyString_FromUnicode(pContextDescription);
  	CoTaskMemFree(pContextDescription);
  	return ret;
--- 101,105 ----
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCE, IID_IBackgroundCopyError );
! 	PyObject *ret = PyWinObject_FromWCHAR(pContextDescription);
  	CoTaskMemFree(pContextDescription);
  	return ret;
***************
*** 112,116 ****
  	if ( pIBCE == NULL )
  		return NULL;
! 	WCHAR *pProtocol;
  	if ( !PyArg_ParseTuple(args, ":GetProtocol") )
  		return NULL;
--- 112,116 ----
  	if ( pIBCE == NULL )
  		return NULL;
! 	LPWSTR pProtocol;
  	if ( !PyArg_ParseTuple(args, ":GetProtocol") )
  		return NULL;
***************
*** 121,125 ****
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCE, IID_IBackgroundCopyError );
! 	PyObject *ret = PyString_FromUnicode(pProtocol);
  	CoTaskMemFree(pProtocol);
  	return ret;
--- 121,125 ----
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCE, IID_IBackgroundCopyError );
! 	PyObject *ret = PyWinObject_FromWCHAR(pProtocol);
  	CoTaskMemFree(pProtocol);
  	return ret;

Index: PyIBackgroundCopyJob.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/PyIBackgroundCopyJob.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** PyIBackgroundCopyJob.cpp	7 Feb 2008 08:01:42 -0000	1.1.2.4
--- PyIBackgroundCopyJob.cpp	8 Feb 2008 02:00:31 -0000	1.1.2.5
***************
*** 329,333 ****
  	if ( pIBCJ == NULL )
  		return NULL;
! 	WCHAR *pVal;
  	if ( !PyArg_ParseTuple(args, ":GetDisplayName") )
  		return NULL;
--- 329,333 ----
  	if ( pIBCJ == NULL )
  		return NULL;
! 	LPWSTR pVal;
  	if ( !PyArg_ParseTuple(args, ":GetDisplayName") )
  		return NULL;
***************
*** 338,342 ****
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCJ, IID_IBackgroundCopyJob );
! 	PyObject *ret = PyString_FromUnicode(pVal);
  	CoTaskMemFree(pVal);
  	return ret;
--- 338,342 ----
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCJ, IID_IBackgroundCopyJob );
! 	PyObject *ret = PyWinObject_FromWCHAR(pVal);
  	CoTaskMemFree(pVal);
  	return ret;
***************
*** 374,378 ****
  	if ( pIBCJ == NULL )
  		return NULL;
! 	WCHAR *pVal;
  	if ( !PyArg_ParseTuple(args, ":GetDescription") )
  		return NULL;
--- 374,378 ----
  	if ( pIBCJ == NULL )
  		return NULL;
! 	LPWSTR pVal;
  	if ( !PyArg_ParseTuple(args, ":GetDescription") )
  		return NULL;
***************
*** 383,387 ****
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCJ, IID_IBackgroundCopyJob );
! 	PyObject *ret = PyString_FromUnicode(pVal);
  	CoTaskMemFree(pVal);
  	return ret;
--- 383,387 ----
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCJ, IID_IBackgroundCopyJob );
! 	PyObject *ret = PyWinObject_FromWCHAR(pVal);
  	CoTaskMemFree(pVal);
  	return ret;