[pywin32-checkins] pywin32/Pythonwin win32win.cpp,1.22,1.23

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

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28600/Pythonwin

Modified Files:
	win32win.cpp 
Log Message:
64bit friendly handles and PYWINTYPES_TRY to catch win32 exceptions loading toolbar state

Index: win32win.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32win.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** win32win.cpp	13 Nov 2008 04:04:50 -0000	1.22
--- win32win.cpp	5 Jan 2009 10:47:28 -0000	1.23
***************
*** 3205,3209 ****
  	HICON hiconRetVal = pWnd->SetIcon(hiconPrevIcon, bBigIcon);
  	GUI_END_SAVE;
! 	return Py_BuildValue("i", hiconRetVal);
  }
  
--- 3205,3209 ----
  	HICON hiconRetVal = pWnd->SetIcon(hiconPrevIcon, bBigIcon);
  	GUI_END_SAVE;
! 	return PyWinLong_FromHANDLE(hiconRetVal);
  }
  
***************
*** 3707,3714 ****
  		return NULL;
  	GUI_BGN_SAVE;
! 	try {
  		pFrame->LoadBarState(profileName); // @pyseemfc CFrameWnd|LoadBarState
  	}
! 	catch (...) {
  		GUI_BLOCK_THREADS;
  		PyWinObject_FreeTCHAR(profileName);
--- 3707,3714 ----
  		return NULL;
  	GUI_BGN_SAVE;
! 	PYWINTYPES_TRY {
  		pFrame->LoadBarState(profileName); // @pyseemfc CFrameWnd|LoadBarState
  	}
! 	PYWINTYPES_EXCEPT {
  		GUI_BLOCK_THREADS;
  		PyWinObject_FreeTCHAR(profileName);