Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24183/com/win32comext/shell/src
Modified Files:
shell.cpp
Log Message:
Changle 's#' formats to Py_ssize_t
Index: shell.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/shell.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** shell.cpp 24 May 2007 06:01:05 -0000 1.53
--- shell.cpp 30 May 2007 00:54:44 -0000 1.54
***************
*** 1661,1665 ****
{
char *szPIDL;
! int pidllen;
// @pyparm string|pidl||The PIDL as a raw string.
if (!PyArg_ParseTuple(args, "s#:StringAsPIDL", &szPIDL, &pidllen))
--- 1661,1665 ----
{
char *szPIDL;
! Py_ssize_t pidllen;
// @pyparm string|pidl||The PIDL as a raw string.
if (!PyArg_ParseTuple(args, "s#:StringAsPIDL", &szPIDL, &pidllen))
***************
*** 1676,1684 ****
if (!PyArg_ParseTuple(args, "O:AddressAsPIDL", &obpidl))
return NULL;
! lpidl=(LPCITEMIDLIST)PyLong_AsVoidPtr(obpidl);
! if (lpidl==NULL && PyErr_Occurred())
return NULL;
return PyObject_FromPIDL(lpidl, FALSE);
! }
// @pymethod <o PyIDL>, list|shell|StringAsCIDA|Given a CIDA as a raw string, return the folder PIDL and list of children
--- 1676,1683 ----
if (!PyArg_ParseTuple(args, "O:AddressAsPIDL", &obpidl))
return NULL;
! if (!PyWinLong_AsVoidPtr(obpidl, (void **)&lpidl))
return NULL;
return PyObject_FromPIDL(lpidl, FALSE);
! }
// @pymethod <o PyIDL>, list|shell|StringAsCIDA|Given a CIDA as a raw string, return the folder PIDL and list of children
***************
*** 1686,1690 ****
{
char *szCIDA;
! int pidllen;
// @pyparm string|pidl||The PIDL as a raw string.
if (!PyArg_ParseTuple(args, "s#:StringAsCIDA", &szCIDA, &pidllen))
--- 1685,1689 ----
{
char *szCIDA;
! Py_ssize_t pidllen;
// @pyparm string|pidl||The PIDL as a raw string.
if (!PyArg_ParseTuple(args, "s#:StringAsCIDA", &szCIDA, &pidllen))
***************
*** 1943,1947 ****
FILEGROUPDESCRIPTORW *fgdw = NULL;
void *buf;
! int i, cb, size_a, size_w, num;
BOOL ok = FALSE;
// @pyparm buffer|buf||A string packed as either FILEGROUPDESCRIPTORW or FILEGROUPDESCRIPTORW
--- 1942,1947 ----
FILEGROUPDESCRIPTORW *fgdw = NULL;
void *buf;
! int i, num;
! Py_ssize_t cb, size_a, size_w;
BOOL ok = FALSE;
// @pyparm buffer|buf||A string packed as either FILEGROUPDESCRIPTORW or FILEGROUPDESCRIPTORW
***************
*** 1951,1955 ****
// you will need to specify this parameter.
int make_unicode = -1;
! if (!PyArg_ParseTuple(args, "z#|i", &buf, &cb, make_unicode))
return NULL;
if (!buf) {
--- 1951,1955 ----
// you will need to specify this parameter.
int make_unicode = -1;
! if (!PyArg_ParseTuple(args, "z#|i", &buf, &cb, &make_unicode))
return NULL;
if (!buf) {
|
