[pywin32-checkins] pywin32/win32/src win32dynamicdialog.cpp, 1.3, 1.4 win32dynamicdialog.h, 1.1, 1.2

[Mark H. <mha...@us...>]

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

Modified Files:
	win32dynamicdialog.cpp win32dynamicdialog.h 
Log Message:
remove 64bit warnings for dynamic dialogs.


Index: win32dynamicdialog.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32dynamicdialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** win32dynamicdialog.h	9 Oct 2000 22:43:44 -0000	1.1
--- win32dynamicdialog.h	29 May 2007 13:03:26 -0000	1.2
***************
*** 103,107 ****
  protected:
  	HGLOBAL m_h;
! 	int m_alloc, m_len;
  #ifdef WIN32
  	DLGTEMPLATE *m_ptr;
--- 103,107 ----
  protected:
  	HGLOBAL m_h;
! 	size_t m_alloc, m_len;
  #ifdef WIN32
  	DLGTEMPLATE *m_ptr;

Index: win32dynamicdialog.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32dynamicdialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** win32dynamicdialog.cpp	10 Jan 2006 03:43:21 -0000	1.3
--- win32dynamicdialog.cpp	29 May 2007 13:03:26 -0000	1.4
***************
*** 219,223 ****
  	DwordAlign((PCHAR*)&ptr);
  #endif
! 	int len = (BYTE*)ptr - (BYTE*)hdr;
  	ASSERT(len <= m_alloc);
  	m_len = len;
--- 219,223 ----
  	DwordAlign((PCHAR*)&ptr);
  #endif
! 	ssize_t len = (BYTE*)ptr - (BYTE*)hdr;
  	ASSERT(len <= m_alloc);
  	m_len = len;
***************
*** 245,249 ****
  	RESCSTR wclass = MAKERESSTR(wc);
  	RESCSTR txt = MAKERESSTR(text);
! 	int len = sizeof(DLGITEMTEMPLATE) + alloclenR(wclass) + datalen + 20;
  	if (txt)
  	{
--- 245,249 ----
  	RESCSTR wclass = MAKERESSTR(wc);
  	RESCSTR txt = MAKERESSTR(text);
! 	size_t len = sizeof(DLGITEMTEMPLATE) + alloclenR(wclass) + datalen + 20;
  	if (txt)
  	{
***************
*** 307,311 ****
  #endif
  	RESCSTR txt = MAKERESSTR(text);
! 	int len = sizeof(DLGITEMTEMPLATE) + 20;
  	if (txt)
  	{
--- 307,311 ----
  #endif
  	RESCSTR txt = MAKERESSTR(text);
! 	ssize_t len = sizeof(DLGITEMTEMPLATE) + 20;
  	if (txt)
  	{
***************
*** 419,423 ****
  static void FillList(PyObject *list, int n)
  {
! 	int size = PyList_Size(list);
  	while (n > size)
  	{
--- 419,423 ----
  static void FillList(PyObject *list, int n)
  {
! 	Py_ssize_t size = PyList_Size(list);
  	while (n > size)
  	{
***************
*** 604,608 ****
  	if (!PyList_Check(tmpl))
  		return NULL;
! 	int size = PyList_Size(tmpl);
  	if (size < 3 || size > 7)
  		return NULL;
--- 604,608 ----
  	if (!PyList_Check(tmpl))
  		return NULL;
! 	Py_ssize_t size = PyList_Size(tmpl);
  	if (size < 3 || size > 7)
  		return NULL;
***************
*** 715,719 ****
  	if (!PyList_Check(tmpl))
  		return FALSE;
! 	int size = PyList_Size(tmpl);
  	if (size < 5 || size > 7)
  		return FALSE;
--- 715,719 ----
  	if (!PyList_Check(tmpl))
  		return FALSE;
! 	Py_ssize_t size = PyList_Size(tmpl);
  	if (size < 5 || size > 7)
  		return FALSE;
***************
*** 808,812 ****
  	// @tupleitem 6|string|extraData|A string of bytes used as extra data for the control.  The value depends on the control.
  	BYTE *data = NULL;
! 	int datalen = 0;
  	if (size > 6)
  	{
--- 808,812 ----
  	// @tupleitem 6|string|extraData|A string of bytes used as extra data for the control.  The value depends on the control.
  	BYTE *data = NULL;
! 	Py_ssize_t datalen = 0;
  	if (size > 6)
  	{
***************
*** 824,829 ****
  		dlg->Add(bclass, &tpl, text);
  	else
! 		dlg->Add(wclass, &tpl, text, datalen, data);
! 
  	return TRUE;
  }
--- 824,830 ----
  		dlg->Add(bclass, &tpl, text);
  	else
! 		dlg->Add(wclass, &tpl, text,
! 		         PyWin_SAFE_DOWNCAST(datalen, Py_ssize_t, int), 
! 		         data);
  	return TRUE;
  }
***************
*** 836,840 ****
  		RETURN_ERR("Passed object must be a dialog template list");
  	}
! 	int size = PyList_Size(tmpl);
  	if (size < 1)
  	{
--- 837,841 ----
  		RETURN_ERR("Passed object must be a dialog template list");
  	}
! 	Py_ssize_t size = PyList_Size(tmpl);
  	if (size < 1)
  	{