pywin32-checkins

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21199

Modified Files:
      Tag: py3k
	win32gui.i 
Log Message:
PyGetString is only used raw bytes

Index: win32gui.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32gui.i,v
retrieving revision 1.118.2.1
retrieving revision 1.118.2.2
diff -C2 -d -r1.118.2.1 -r1.118.2.2
*** win32gui.i	29 Aug 2008 04:59:26 -0000	1.118.2.1
--- win32gui.i	11 Sep 2008 07:44:23 -0000	1.118.2.2
***************
*** 1590,1597 ****
  
  %{
! // @pyswig object|PyGetString|Returns a string object from an address.
  static PyObject *PyGetString(PyObject *self, PyObject *args)
  {
! 	TCHAR *addr = 0;
  	size_t len = -1;
  #ifdef _WIN64
--- 1590,1597 ----
  
  %{
! // @pyswig bytes|PyGetString|Returns bytes from an address.
  static PyObject *PyGetString(PyObject *self, PyObject *args)
  {
! 	char *addr = 0;
  	size_t len = -1;
  #ifdef _WIN64
***************
*** 1614,1621 ****
  			return NULL;
  			}
! 		return PyWinObject_FromTCHAR(addr, len);
  		}
  	// This should probably be in a __try just in case.
! 	return PyWinObject_FromTCHAR(addr);
  }
  %}
--- 1614,1621 ----
  			return NULL;
  			}
! 		return PyString_FromStringAndSize(addr, len);
  		}
  	// This should probably be in a __try just in case.
! 	return PyString_FromString(addr);
  }
  %}