File abiword-2.8.2-win64.patch of Package mingw32-abiword

Overview Repositories Revisions Requests Users Attributes Meta

File abiword-2.8.2-win64.patch of Package mingw32-abiword (Revision e44afd0201807d65f4d34ba249650247)

Currently displaying revision e44afd0201807d65f4d34ba249650247 , Show latest

--- src/af/xap/xp/xap_App.cpp	(revision 28704)
+++ src/af/xap/xp/xap_App.cpp	(working copy)
@@ -974,12 +974,12 @@
 
 UT_sint32 XAP_App::safefindFrame( XAP_Frame * f) const
 {
-	long ff = reinterpret_cast<long>(f);
+	UT_sintptr ff = reinterpret_cast<UT_sintptr>(f);
 	UT_sint32 num_frames = m_vecFrames.getItemCount();
 	UT_sint32 i;
 	for( i = 0; i< num_frames; i++)
 	{
-		long lf = reinterpret_cast<long>( m_vecFrames.getNthItem(i));
+		UT_sintptr lf = reinterpret_cast<UT_sintptr>( m_vecFrames.getNthItem(i));
 		if( lf == ff) break;
 	}
 	if( i == num_frames ) i = -1;
--- src/af/xap/win/xap_Win32Dlg_DocComparison.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_DocComparison.cpp	(working copy)
@@ -96,11 +96,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (XAP_Win32Dialog_DocComparison *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (XAP_Win32Dialog_DocComparison *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (XAP_Win32Dialog_DocComparison *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 
 	default:
--- src/af/xap/win/xap_Win32Clipboard.h	(revision 28704)
+++ src/af/xap/win/xap_Win32Clipboard.h	(working copy)
@@ -36,8 +36,8 @@
 	virtual bool			addData(const char* format, void* pData, UT_sint32 iNumBytes);
 	virtual HANDLE			getHandleInFormat(const char * format);
 	virtual bool			hasFormat(const char * format);
-	virtual UT_uint32		convertFormatString(const char * format) const;
-	virtual const char *	convertToFormatString(UT_uint32 fmt) const;
+	virtual UT_uintptr		convertFormatString(const char * format) const;
+	virtual const char *	convertToFormatString(UT_uintptr fmt) const;
 
 	bool					m_bOpen;
 	UT_Vector				m_vecFormat;
--- src/af/xap/win/xap_Win32Dlg_Language.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_Language.cpp	(working copy)
@@ -103,11 +103,11 @@
 	{			
 	case WM_INITDIALOG:
 		pThis = (XAP_Win32Dialog_Language *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 		
 	case WM_COMMAND:
-		pThis = (XAP_Win32Dialog_Language *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (XAP_Win32Dialog_Language *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 		
 	default:
@@ -164,7 +164,7 @@
 			hSel = hItem;	
 	}
 	
-	::SendMessage(hTV, TVM_SELECTITEM, TVGN_CARET,  (LONG)hSel);	
+	::SendMessage(hTV, TVM_SELECTITEM, TVGN_CARET,  (LONG_PTR)hSel);	
 	delete pVec;
 }
 
@@ -178,7 +178,7 @@
 	// The user has double clicked on a tree item (a language name)
 	if (msg==WM_LBUTTONDBLCLK)
 	{
-		pThis = (XAP_Win32Dialog_Language *)GetWindowLong(hWnd,GWL_USERDATA);
+		pThis = (XAP_Win32Dialog_Language *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
 		TVITEM tvi;		
 		
 		// Selected item
@@ -242,9 +242,9 @@
 	
 	_fillTreeview(hTree);
 	
-	gTreeProc = (WHICHPROC) GetWindowLong(hTree, GWL_WNDPROC);
-	SetWindowLong(hTree, GWL_WNDPROC, (LONG)s_treeProc);
-	SetWindowLong(hTree, GWL_USERDATA, (LONG)this);
+	gTreeProc = (WHICHPROC) GetWindowLongPtr(hTree, GWLP_WNDPROC);
+	SetWindowLongPtr(hTree, GWLP_WNDPROC, (LONG_PTR)s_treeProc);
+	SetWindowLongPtr(hTree, GWLP_USERDATA, (LONG_PTR)this);
 	
 	CheckDlgButton(hWnd, XAP_RID_DIALOG_LANGUAGE_DOCLANG_CHKBOX, BST_UNCHECKED );
 
--- src/af/xap/win/xap_Win32PropertySheet.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32PropertySheet.cpp	(working copy)
@@ -61,7 +61,7 @@
 	SendMessage(hWnd, bChanged ? PSM_CHANGED : PSM_UNCHANGED, (WPARAM)m_hWnd, 0);	
 }
 
-int CALLBACK XAP_Win32PropertyPage::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,
+INT_PTR CALLBACK XAP_Win32PropertyPage::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,
    LPARAM lParam)
 {	
 	NMHDR* pNMHDR;
@@ -72,7 +72,7 @@
 		{	
 			PROPSHEETPAGE*	pStruct = (PROPSHEETPAGE*)lParam;  		
 			XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)pStruct->lParam;
-			SetWindowLong(hWnd,DWL_USER,pStruct->lParam);
+			SetWindowLongPtr(hWnd,DWLP_USER,pStruct->lParam);
 			pThis->m_hWnd = hWnd;
 			pThis->_onInitDialog();
 			return 0;
@@ -81,7 +81,7 @@
 
 		case WM_NOTIFY:
 		{
-			XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLong(hWnd,DWL_USER);
+			XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtr(hWnd,DWLP_USER);
 
 			if (pThis)
 				pThis->_onNotify((LPNMHDR) lParam, wParam); 
@@ -89,7 +89,7 @@
 			pNMHDR = (NMHDR*)lParam;					
 			if (pNMHDR->code==PSN_KILLACTIVE)
 			{
-				XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLong(hWnd,DWL_USER);
+				XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtr(hWnd,DWLP_USER);
 				pThis->_onKillActive();
 			}
 			break;
@@ -97,7 +97,7 @@
 		
 		case WM_COMMAND:
 		{
-			XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLong(hWnd,DWL_USER);
+			XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtr(hWnd,DWLP_USER);
 
 			if (pThis)
 				pThis->_onCommand(hWnd, wParam, lParam); 	
@@ -169,9 +169,9 @@
 /*
 
 */
-int CALLBACK XAP_Win32PropertySheet::s_sheetWndProc(HWND hWnd, UINT msg, WPARAM wParam,  LPARAM lParam)
+INT_PTR CALLBACK XAP_Win32PropertySheet::s_sheetWndProc(HWND hWnd, UINT msg, WPARAM wParam,  LPARAM lParam)
 {			
-	XAP_Win32PropertySheet *pThis = (XAP_Win32PropertySheet*)GetWindowLong(hWnd, GWL_USERDATA);			
+	XAP_Win32PropertySheet *pThis = (XAP_Win32PropertySheet*)GetWindowLongPtr(hWnd, GWLP_USERDATA);			
 	
 	switch(msg) 
 	{			
@@ -326,9 +326,9 @@
 	EnableWindow(m_psh.hwndParent, FALSE);
 
 	/* Subclassing */
-	m_lpfnDefSheet = (WHICHPROC)GetWindowLong(m_hWnd, GWL_WNDPROC);
-	SetWindowLong(m_hWnd, GWL_USERDATA, (LONG)this);	
-	SetWindowLong(m_hWnd, GWL_WNDPROC, (LONG)m_pfnDlgProc);
+	m_lpfnDefSheet = (WHICHPROC)GetWindowLongPtr(m_hWnd, GWLP_WNDPROC);
+	SetWindowLongPtr(m_hWnd, GWLP_USERDATA, (LONG_PTR)this);	
+	SetWindowLongPtr(m_hWnd, GWLP_WNDPROC, (LONG_PTR)m_pfnDlgProc);
 		
 	_onInitDialog(m_hWnd);		
 
@@ -388,9 +388,9 @@
 
 	/* Subclassing */
 
-	m_lpfnDefSheet = (WHICHPROC)GetWindowLong(m_hWnd, GWL_WNDPROC);
-	SetWindowLong(m_hWnd, GWL_USERDATA, (LONG)this);	
-	SetWindowLong(m_hWnd, GWL_WNDPROC, (LONG)m_pfnDlgProc);
+	m_lpfnDefSheet = (WHICHPROC)GetWindowLongPtr(m_hWnd, GWLP_WNDPROC);
+	SetWindowLongPtr(m_hWnd, GWLP_USERDATA, (LONG_PTR)this);	
+	SetWindowLongPtr(m_hWnd, GWLP_WNDPROC, (LONG_PTR)m_pfnDlgProc);
 		
 	_onInitDialog(m_hWnd);	
 	XAP_Win32DialogHelper::s_centerDialog(m_hWnd);
--- src/af/xap/win/xap_Win32DialogHelper.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32DialogHelper.cpp	(working copy)
@@ -93,18 +93,18 @@
 		pThis = (XAP_Win32DialogHelper *)lParam;
 		pThis->m_hDlg = hWnd;
 		_assertValidDlgHandle(hWnd);
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->m_pDialog->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (XAP_Win32DialogHelper *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (XAP_Win32DialogHelper *)GetWindowLongPtr(hWnd,DWLP_USER);
 		if(pThis)
 			return pThis->m_pDialog->_onCommand(hWnd,wParam,lParam);
 		else
 			return 0;
 
 	case WM_NOTIFY:
-		pThis = (XAP_Win32DialogHelper *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (XAP_Win32DialogHelper *)GetWindowLongPtr(hWnd,DWLP_USER);
 		switch (((LPNMHDR)lParam)->code)
 		{
 			case UDN_DELTAPOS:		return pThis->m_pDialog->_onDeltaPos((NM_UPDOWN *)lParam);
@@ -294,7 +294,7 @@
 	_assertValidDlgHandle(m_hDlg);
 	HWND hControl = GetDlgItem(m_hDlg, controlId);
 	if (hControl) {
-		return (GetWindowLong(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
+		return (GetWindowLongPtr(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
 				true : false;
 	}
 	return false;
@@ -304,14 +304,14 @@
 {
 	_assertValidDlgHandle(m_hDlg);
 	XAP_FrameImpl *pFrameImpl = frame.getFrameImpl();
-	return ((HWND)GetWindowLong(m_hDlg, GWL_HWNDPARENT) ==
+	return ((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) ==
 		static_cast<XAP_Win32FrameImpl *>(pFrameImpl)->getTopLevelWindow()) ? true : false;
 }
 
 void XAP_Win32DialogHelper::setParentFrame(const XAP_Frame* pFrame)
 {
 	_assertValidDlgHandle(m_hDlg);
-	SetWindowLong(m_hDlg, GWL_HWNDPARENT, (long)(pFrame ? static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow() : NULL));
+	SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)(pFrame ? static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow() : NULL));
 	SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 }
 
@@ -320,7 +320,7 @@
 {
 	_assertValidDlgHandle(m_hDlg);
 	return reinterpret_cast<XAP_Frame*>(
-			GetWindowLong(m_hDlg, GWL_HWNDPARENT));
+			GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT));
 }
 
 void XAP_Win32DialogHelper::centerDialog()
--- src/af/xap/win/xap_Win32Dlg_About.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_About.cpp	(working copy)
@@ -142,7 +142,7 @@
 		return;
 	}
 
-	SetWindowLong(hwndAbout, GWL_USERDATA, reinterpret_cast<LONG>(this));
+	SetWindowLongPtr(hwndAbout, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
 
 	RECT rcClient;
 	GetClientRect(hwndAbout, &rcClient);
@@ -322,7 +322,7 @@
 {
 	// This is a static function.
 
-	XAP_Win32Dialog_About * pThis = (XAP_Win32Dialog_About *)GetWindowLong(hWnd,GWL_USERDATA);
+	XAP_Win32Dialog_About * pThis = (XAP_Win32Dialog_About *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
 
 	if (!pThis)
 	{
--- src/af/xap/win/xap_Win32FrameImpl.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32FrameImpl.cpp	(working copy)
@@ -150,7 +150,7 @@
 
 	// have to reset the window long, so our message functions do not
 	// try to derefernce it
-	SetWindowLong(m_hwndFrame, GWL_USERDATA,0);
+	SetWindowLongPtr(m_hwndFrame, GWLP_USERDATA,0);
 
 }
 
@@ -246,8 +246,8 @@
 
 	// bind this frame to its window
 	// WARNING: We assume in many places this refers to a XAP_Frame or descendant!!!
-	//SetWindowLong(m_hwndFrame, GWL_USERDATA,(LONG)this);
-	SetWindowLong(m_hwndFrame, GWL_USERDATA,(LONG)getFrame());
+	//SetWindowLongPtr(m_hwndFrame, GWLP_USERDATA,(LONG)this);
+	SetWindowLongPtr(m_hwndFrame, GWLP_USERDATA,(LONG_PTR)getFrame());
 
 	m_mouseWheelMessage = RegisterWindowMessage(MSH_MOUSEWHEEL);
 
@@ -279,8 +279,8 @@
 	UT_ASSERT(m_hwndRebar);
 	
 	/* override the window procedure*/
-	s_oldRedBar = (WHICHPROC)GetWindowLong(m_hwndRebar, GWL_WNDPROC);
-	SetWindowLong(m_hwndRebar, GWL_WNDPROC, (LONG)s_rebarWndProc);
+	s_oldRedBar = (WHICHPROC)GetWindowLongPtr(m_hwndRebar, GWLP_WNDPROC);
+	SetWindowLongPtr(m_hwndRebar, GWLP_WNDPROC, (LONG_PTR)s_rebarWndProc);
 
 	// create a toolbar instance for each toolbar listed in our base class.
 
@@ -462,7 +462,7 @@
 	HWND hwndFrame = static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow();
 
 	// Get the window's style so we can add or remove the titlebar later
-	long hStyle = GetWindowLong(hwndFrame, GWL_STYLE);
+	long hStyle = GetWindowLongPtr(hwndFrame, GWL_STYLE);
 
 	if (isFullScreen)
 	{
@@ -503,7 +503,7 @@
 	}
 
 	// Add or remove title-bar and border
-	SetWindowLong(hwndFrame, GWL_STYLE, isFullScreen ? hStyle & ~WS_CAPTION : hStyle | WS_CAPTION);
+	SetWindowLongPtr(hwndFrame, GWL_STYLE, isFullScreen ? hStyle & ~WS_CAPTION : hStyle | WS_CAPTION);
 
 	// We hide the window before maximizing
 	// to ensure it displays with the proper geometry
@@ -646,7 +646,7 @@
 
 LRESULT CALLBACK XAP_Win32FrameImpl::_FrameWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
-	XAP_Frame * f = (XAP_Frame*)GetWindowLong(hwnd, GWL_USERDATA);
+	XAP_Frame * f = (XAP_Frame*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
 	if (!f)
 	{
@@ -799,7 +799,7 @@
 		case TBN_DROPDOWN:
 		{
 			HWND hWnd = ((LPNMHDR) lParam)->hwndFrom;
-			EV_Win32Toolbar * t = (EV_Win32Toolbar *)GetWindowLong(hWnd, GWL_USERDATA);						
+			EV_Win32Toolbar * t = (EV_Win32Toolbar *)GetWindowLongPtr(hWnd, GWLP_USERDATA);						
 			t->onDropArrow(((LPNMTOOLBAR) lParam)->iItem);			
 			Sleep(500); /* At least, half second where the arrow is shown as pressed*/			
 			return TBDDRET_DEFAULT;			/* Windows restores the pushed button*/
--- src/af/xap/win/xap_Win32PropertySheet.h	(revision 28704)
+++ src/af/xap/win/xap_Win32PropertySheet.h	(working copy)
@@ -57,7 +57,7 @@
 	virtual	void				_onApply(){}; 
 	virtual void				_onCommand(HWND /*hWnd*/, WPARAM /*wParam*/, LPARAM /*lParam*/){};
 	virtual void				_onNotify(LPNMHDR /*hdr*/, int /*iCtrlID*/){};
-	static int CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,LPARAM lParam);
+	static INT_PTR CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,LPARAM lParam);
 	void						setChanged (bool bChanged); // Unables or disables apply button
 	
 	
@@ -84,7 +84,7 @@
 	int 						runModeless (XAP_Win32App* pWin32App, XAP_Frame * pFrame, XAP_String_Id nID = 0);
 	void 						addPage(XAP_Win32PropertyPage* pPage);
 	PROPSHEETPAGE* 				_buildPageArray(void);	
-	static int CALLBACK			s_sheetWndProc(HWND hWnd, UINT msg, WPARAM wParam,LPARAM lParam);	
+	static INT_PTR CALLBACK			s_sheetWndProc(HWND hWnd, UINT msg, WPARAM wParam,LPARAM lParam);	
 	virtual	void				_onInitDialog(HWND /*hwnd*/){};	
 	virtual void 				destroy(void);
 	virtual void 				cleanup(void);
--- src/af/xap/win/xap_Win32LabelledSeparator.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32LabelledSeparator.cpp	(working copy)
@@ -25,8 +25,8 @@
 
 /*****************************************************************/
 
-#define GWL(hwnd)		(HFONT)GetWindowLong((hwnd), GWL_USERDATA)
-#define SWL(hwnd, f)	(HFONT)SetWindowLong((hwnd), GWL_USERDATA,(LONG)(f))
+#define GWL(hwnd)		(HFONT)GetWindowLongPtr((hwnd), GWLP_USERDATA)
+#define SWL(hwnd, f)	(HFONT)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
 
 /*!
   Spacing between the label text and the line separator part of the 
--- src/af/xap/win/xap_Win32DialogBase.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32DialogBase.cpp	(working copy)
@@ -339,7 +339,7 @@
 	UT_ASSERT(IsWindow(m_hDlg));
 	HWND hControl = GetDlgItem(m_hDlg, controlId);
 	if (hControl) {
-		return (GetWindowLong(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
+		return (GetWindowLongPtr(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
 				true : false;
 	}
 	return false;
--- src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp	(working copy)
@@ -261,7 +261,7 @@
 	ofn.lpstrInitialDir = NULL;
 	ofn.Flags = OFN_PATHMUSTEXIST | OFN_NOCHANGEDIR | OFN_HIDEREADONLY;
 	ofn.lpstrDefExt = _getDefaultExtension(0);
-	ofn.lCustData = (DWORD)this;
+	ofn.lCustData = (DWORD_PTR)this;
 	// use the persistence info and/or the suggested filename
 	// to properly seed the dialog.
 
@@ -574,7 +574,7 @@
  */
 UINT CALLBACK XAP_Win32Dialog_FileOpenSaveAs::s_hookInsertPicProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	XAP_Win32Dialog_FileOpenSaveAs* pThis = (XAP_Win32Dialog_FileOpenSaveAs *) GetWindowLong(hDlg,GWL_USERDATA);
+	XAP_Win32Dialog_FileOpenSaveAs* pThis = (XAP_Win32Dialog_FileOpenSaveAs *) GetWindowLongPtr(hDlg,GWLP_USERDATA);
 	bool bPreviewImage = ( IsDlgButtonChecked( hDlg, XAP_RID_DIALOG_INSERT_PICTURE_CHECK_ACTIVATE_PREVIEW )
 							  == BST_CHECKED );
 
--- src/af/xap/win/xap_Win32AppImpl.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32AppImpl.cpp	(working copy)
@@ -134,7 +134,7 @@
 	XAP_Win32FrameImpl *pFImp =  (XAP_Win32FrameImpl *) pFrame->getFrameImpl();
 	UT_return_val_if_fail(pFImp, false);
 
-	int res = (int) ShellExecute(pFImp->getTopLevelWindow() /*(HWND)*/,
+	UT_sintptr res = (UT_sintptr) ShellExecute(pFImp->getTopLevelWindow() /*(HWND)*/,
 								 "open", sBrowser.c_str(), sParams.c_str(), NULL, SW_SHOW );
 
 	// TODO: localized error messages
--- src/af/xap/win/xap_Win32Dlg_Insert_Symbol.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_Insert_Symbol.cpp	(working copy)
@@ -115,13 +115,13 @@
 	UT_return_if_fail(pFrame);
 
 	HWND frameHWND = static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow();
-	if((HWND)GetWindowLong(m_hDlg, GWL_HWNDPARENT) != frameHWND)
+	if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != frameHWND)
 	{
 		// Update the caption
 		ConstructWindowName();
 		SetWindowText(m_hDlg, (AP_Win32App::s_fromUTF8ToWinLocale(m_WindowName)).c_str());
 
-		SetWindowLong(m_hDlg, GWL_HWNDPARENT, (long)frameHWND);
+		SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, reinterpret_cast<LONG_PTR>(frameHWND));
 		SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
@@ -130,9 +130,9 @@
 void XAP_Win32Dialog_Insert_Symbol::notifyCloseFrame(XAP_Frame *pFrame)
 {
 	UT_return_if_fail(pFrame);
-	if((HWND)GetWindowLong(m_hDlg, GWL_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
-		SetWindowLong(m_hDlg, GWL_HWNDPARENT, NULL);
+		SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, NULL);
 		SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
--- src/af/xap/win/xap_Win32Dlg_FontChooser.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_FontChooser.cpp	(working copy)
@@ -278,18 +278,18 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (XAP_Win32Dialog_FontChooser *) ((CHOOSEFONT *)lParam)->lCustData;
-		SetWindowLong(hDlg,DWL_USER,(LPARAM) pThis);
+		SetWindowLongPtr(hDlg,DWLP_USER,(LPARAM) pThis);
 		return pThis->_onInitDialog(hDlg,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLong(hDlg,DWL_USER);
+		pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLongPtr(hDlg,DWLP_USER);
 		if (pThis)
 			return pThis->_onCommand(hDlg,wParam,lParam);
 		else
 			return 0;
 		
 	case WM_HELP:
-		pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLong(hDlg,DWL_USER);
+		pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLongPtr(hDlg,DWLP_USER);
 		if (pThis)
 			return pThis->_callHelp();
 		else
--- src/af/xap/win/xap_Win32Dlg_Print.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_Print.cpp	(working copy)
@@ -31,7 +31,7 @@
 #include "ap_Win32App.h"
 
 /*****************************************************************/
-static UINT CALLBACK s_PrintHookProc(
+static UINT_PTR CALLBACK s_PrintHookProc(
   HWND hdlg,      // handle to the dialog box window
   UINT uiMsg,     // message identifier
   WPARAM wParam,  // message parameter
@@ -44,7 +44,7 @@
 	{
 		PRINTDLG * pDlgInfo = (PRINTDLG*)lParam;
 		pThis = (XAP_Win32Dialog_Print*)pDlgInfo->lCustData;
-		SetWindowLong(hdlg, DWL_USER, (LONG) pThis);
+		SetWindowLongPtr(hdlg, DWLP_USER, (LONG_PTR) pThis);
 
 		// reset the 'closed' flag which indicates that the dialog should be considered
 		// 'closed' rather than aborted
@@ -65,7 +65,7 @@
 	}
 	else
 	{
-		pThis = (XAP_Win32Dialog_Print*)GetWindowLong(hdlg, DWL_USER);
+		pThis = (XAP_Win32Dialog_Print*)GetWindowLongPtr(hdlg, DWLP_USER);
 	}
 	
 	if(uiMsg == WM_COMMAND)
@@ -196,7 +196,7 @@
 	m_pPersistPrintDlg->nMaxPage	= (WORD)m_nLastPage;
 	m_pPersistPrintDlg->Flags		= PD_ALLPAGES | PD_RETURNDC | PD_ENABLEPRINTHOOK;
 	m_pPersistPrintDlg->lpfnPrintHook   = s_PrintHookProc;
-	m_pPersistPrintDlg->lCustData       = (DWORD)this;
+	m_pPersistPrintDlg->lCustData       = (DWORD_PTR)this;
 		
 	if (!m_bEnablePageRange)
 		m_pPersistPrintDlg->Flags	|= PD_NOPAGENUMS;
--- src/af/xap/win/xap_Win32Dlg_ListDocuments.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_ListDocuments.cpp	(working copy)
@@ -94,11 +94,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (XAP_Win32Dialog_ListDocuments *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (XAP_Win32Dialog_ListDocuments *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (XAP_Win32Dialog_ListDocuments *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 
 	default:
@@ -125,7 +125,7 @@
 	// set the column headings
 	HWND h = GetDlgItem(hWnd, XAP_RID_DIALOG_LIST_DOCUMENTS_LIST);
 
-	DWORD dwStyle = GetWindowLong(h, GWL_STYLE);
+	DWORD dwStyle = GetWindowLongPtr(h, GWL_STYLE);
 
 	RECT r;
 	GetWindowRect(h, &r);
--- src/af/xap/win/xap_Win32PreviewWidget.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32PreviewWidget.cpp	(working copy)
@@ -30,8 +30,8 @@
 //////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
 
-#define GWL(hwnd)		(XAP_Win32PreviewWidget *)GetWindowLong((hwnd), GWL_USERDATA)
-#define SWL(hwnd, f)	(XAP_Win32PreviewWidget *)SetWindowLong((hwnd), GWL_USERDATA,(LONG)(f))
+#define GWL(hwnd)		(XAP_Win32PreviewWidget *)GetWindowLongPtr((hwnd), GWLP_USERDATA)
+#define SWL(hwnd, f)	(XAP_Win32PreviewWidget *)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
 
 //////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
--- src/af/xap/win/xap_Win32Dlg_History.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Dlg_History.cpp	(working copy)
@@ -100,11 +100,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (XAP_Win32Dialog_History *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (XAP_Win32Dialog_History *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (XAP_Win32Dialog_History *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 
 	default:
--- src/af/xap/win/xap_Win32Clipboard.cpp	(revision 28704)
+++ src/af/xap/win/xap_Win32Clipboard.cpp	(working copy)
@@ -118,7 +118,7 @@
 //////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
 
-UT_uint32 XAP_Win32Clipboard::convertFormatString(const char * format) const
+UT_uintptr XAP_Win32Clipboard::convertFormatString(const char * format) const
 {
 	// convert from named type (like "text-8bit") to a registered
 	// clipboard format (either a MSFT-defined CF_ symbol or something
@@ -129,12 +129,12 @@
 
 	for (k=0; k<kLimit; k++)
 		if (g_ascii_strcasecmp(format,(const char *)m_vecFormat.getNthItem(k)) == 0)
-			return (UT_uint32)m_vecCF.getNthItem(k);
+			return (UT_uintptr)m_vecCF.getNthItem(k);
 
 	return 0;
 }
 
-const char * XAP_Win32Clipboard::convertToFormatString(UT_uint32 fmt) const
+const char * XAP_Win32Clipboard::convertToFormatString(UT_uintptr fmt) const
 {
 	// convert from a CF_ symbol or something that we registered
 	// into a named format type (like "text-8bit").
@@ -143,7 +143,7 @@
 	int k;
 
 	for (k=0; k<kLimit; k++)
-		if (fmt == (UT_uint32)m_vecCF.getNthItem(k))
+		if (fmt == (UT_uintptr)m_vecCF.getNthItem(k))
 			return (const char *)m_vecFormat.getNthItem(k);
 
 	return NULL;
--- src/af/ev/win/ev_Win32Toolbar.cpp	(revision 28704)
+++ src/af/ev/win/ev_Win32Toolbar.cpp	(working copy)
@@ -282,7 +282,7 @@
 		/* Draws the font preview in the font selection combobox*/
 		case WM_DRAWITEM:
 		{						
-			EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLong(hWnd, GWL_USERDATA);			
+			EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtr(hWnd, GWLP_USERDATA);			
 			UINT u = GetDlgCtrlID(hWnd);
 			XAP_Toolbar_Id id = t->ItemIdFromWmCommand(u);
 						
@@ -412,7 +412,7 @@
 						UT_UCS4_strncpy_char(ucs_buf, buf, COMBO_BUF_LEN-1);
 						UT_UCSChar * pData = (UT_UCSChar *) ucs_buf;	// HACK: should be void *
 
-						EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLong(hWnd, GWL_USERDATA);
+						EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
 						UT_ASSERT(t);
 
 						if(dataLength)
@@ -463,7 +463,7 @@
 			
 		case WM_KEYDOWN:
 		{
-			EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLong(hWnd, GWL_USERDATA);
+			EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
 			UT_ASSERT(t);
 
 			switch (wParam)
@@ -562,9 +562,9 @@
 	UT_ASSERT(m_hwnd);
 
 	// override the window procedure 		
-	s_lpfnDefToolBar = (WHICHPROC)GetWindowLong(m_hwnd, GWL_WNDPROC);
-	SetWindowLong(m_hwnd, GWL_WNDPROC, (LONG)_ToolBarWndProc);
-	SetWindowLong(m_hwnd, GWL_USERDATA, (LONG)this);
+	s_lpfnDefToolBar = (WHICHPROC)GetWindowLongPtr(m_hwnd, GWLP_WNDPROC);
+	SetWindowLongPtr(m_hwnd, GWLP_WNDPROC, (LONG_PTR)_ToolBarWndProc);
+	SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this);
 
 
 	SendMessage(m_hwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);  
@@ -730,9 +730,9 @@
 						}
 
 						// override the window procedure for the combo box
-						s_lpfnDefCombo = (WHICHPROC)GetWindowLong(hwndCombo, GWL_WNDPROC);
-						SetWindowLong(hwndCombo, GWL_WNDPROC, (LONG)_ComboWndProc);
-						SetWindowLong(hwndCombo, GWL_USERDATA, (LONG)this);
+						s_lpfnDefCombo = (WHICHPROC)GetWindowLongPtr(hwndCombo, GWLP_WNDPROC);
+						SetWindowLongPtr(hwndCombo, GWLP_WNDPROC, (LONG_PTR)_ComboWndProc);
+						SetWindowLongPtr(hwndCombo, GWLP_USERDATA, (LONG_PTR)this);
 
 						// Get the handle to the tooltip window.
 						HWND hwndTT = (HWND)SendMessage(m_hwnd, TB_GETTOOLTIPS, 0, 0);
@@ -752,13 +752,13 @@
 							ti.uFlags = TTF_IDISHWND | TTF_CENTERTIP;
 							ti.lpszText = (char *) szToolTip;
 							ti.hwnd = m_hwnd;		// TODO: should this be the frame?
-							ti.uId = (UINT)hwndCombo;
+							ti.uId = (UINT_PTR)hwndCombo;
 							// Set up tooltips for the combo box.
 							SendMessage(hwndTT, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti);
 						}
 						
 						// bind this separator to its control
-						tbb.dwData = (DWORD) hwndCombo;
+						tbb.dwData = (DWORD_PTR) hwndCombo;
 
 						// for now, we never repopulate, so can just toss it
 						DELETEP(pControl);
--- src/af/ev/win/ev_Win32Menu.cpp	(revision 28704)
+++ src/af/ev/win/ev_Win32Menu.cpp	(working copy)
@@ -356,7 +356,7 @@
 				// map our XAP_Menu_Id into a windows WM_COMMAND id.
 				
 				UINT flags = MF_STRING | MF_ENABLED | MF_UNCHECKED;
-				UINT u = WmCommandFromMenuId(id);
+				UINT_PTR u = WmCommandFromMenuId(id);
 
 				/*
 					This a menu bar
@@ -370,7 +370,7 @@
 
 					flags |= MF_POPUP;
 					stack.push(sub);
-					u = (UINT) sub;					
+					u = (UINT_PTR) sub;					
 					
 					if (szLabelName && *szLabelName)					
 					{
@@ -469,7 +469,7 @@
 	UT_uint32 nrLabelItemsInLayout = m_pMenuLayout->getLayoutItemCount();
 	
 
-	UT_uint32 pos = 0;
+	UT_uintptr pos = 0;
 	bool bResult;
 	UT_Stack stackPos;
 	stackPos.push((void*)pos);
--- src/af/util/xp/ut_assert.h	(revision 28704)
+++ src/af/util/xp/ut_assert.h	(working copy)
@@ -79,19 +79,14 @@
 #  endif
 
 # ifndef UT_DEBUG_BREAK
-// Some compiler/architecture for which we do not know how to generate inline assembly to pass
-// control to the debugger; we use win32s DebugBreak().
-// 
-// TODO !!! This currently does not work; if someone one day wants to build AW on non-x86
-// win32 architecture, they will need to fix this (including <windows.h> from here, which
-// is what would work, screws up things in MS Word importer, because the wv library
-// redefines some of the win32 structures; but we probably do not want to include
-// windows.h from here anyway because of the overhead -- ut_assert.h gets included in
-// almost everything.). Really, we want to do something similar as we do for x86.
-#  error "Proper implementation needed for this compiler/architecture"
-
 #    ifndef _WINBASE_
+#      ifdef __cplusplus
+extern "C" {
+#endif
        __declspec(dllimport) void __stdcall DebugBreak(void);
+#      ifdef __cplusplus
+}
+#      endif
 #    endif /* ifdef _WINBASE_ */
 
 #    define UT_DEBUG_BREAK DebugBreak();
--- src/af/util/xp/ut_types.h	(revision 28704)
+++ src/af/util/xp/ut_types.h	(working copy)
@@ -60,6 +60,14 @@
 typedef guint64 UT_uint64;
 typedef gint64 UT_sint64;
 
+#ifdef _WIN32
+typedef guintptr 	UT_uintptr;
+typedef gintptr 	UT_sintptr;
+#else
+typedef unsigned long UT_uintptr;
+typedef long        UT_sintptr;
+#endif
+
 /** use to mark variable as unused */
 #define UT_UNUSED(x) (void)(x);
 
--- src/af/util/win/ut_Win32Misc.cpp	(revision 28704)
+++ src/af/util/win/ut_Win32Misc.cpp	(working copy)
@@ -488,11 +488,11 @@
 	switch (msg){
 	case WM_INITDIALOG:
 		pThis = (UT_Win32AssertDlg *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 		
 	case WM_COMMAND:
-		pThis = (UT_Win32AssertDlg *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (UT_Win32AssertDlg *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 		
 	default:
--- src/af/util/win/ut_Xpm2Bmp.cpp	(revision 28704)
+++ src/af/util/win/ut_Xpm2Bmp.cpp	(working copy)
@@ -166,7 +166,7 @@
 				bufPixel[kPx] = *p++;
 
 			sTmp = bufPixel;
-			guint32 pEntry = (guint32) hash.pick(sTmp);
+			guintptr pEntry = (guintptr) hash.pick(sTmp);
 			*pPixel++ = ((UT_Byte)(pEntry)) - 1;
 		}
 
--- src/wp/ap/win/ap_Win32Dialog_Latex.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Latex.cpp	(working copy)
@@ -97,13 +97,13 @@
 	UT_return_if_fail(pFrame);
 
 	HWND frameHWND = static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow();
-	if((HWND)GetWindowLong(m_hDlg, GWL_HWNDPARENT) != frameHWND)
+	if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != frameHWND)
 	{
 		// Update the caption
 		ConstructWindowName();
 		setDialogTitle((LPCSTR)(AP_Win32App::s_fromUTF8ToWinLocale(m_sWindowName.utf8_str())).c_str());
 
-		SetWindowLong(m_hDlg, GWL_HWNDPARENT, (long)frameHWND);
+		SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)frameHWND);
 		SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
@@ -112,9 +112,9 @@
 void AP_Win32Dialog_Latex::notifyCloseFrame(XAP_Frame *pFrame)
 {
 	UT_return_if_fail(pFrame);
-	if((HWND)GetWindowLong(m_hDlg, GWL_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
-		SetWindowLong(m_hDlg, GWL_HWNDPARENT, NULL);
+		SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, NULL);
 		SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
--- src/wp/ap/win/ap_Win32Dialog_Field.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Field.cpp	(working copy)
@@ -81,11 +81,11 @@
 	switch (msg){
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_Field *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 		
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_Field *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_Field *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 		
 	default:
--- src/wp/ap/win/ap_Win32LeftRuler.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32LeftRuler.cpp	(working copy)
@@ -30,8 +30,8 @@
 
 /*****************************************************************/
 
-#define GWL(hwnd)		(AP_Win32LeftRuler*)GetWindowLong((hwnd), GWL_USERDATA)
-#define SWL(hwnd, f)	(AP_Win32LeftRuler*)SetWindowLong((hwnd), GWL_USERDATA,(LONG)(f))
+#define GWL(hwnd)		(AP_Win32LeftRuler*)GetWindowLongPtr((hwnd), GWLP_USERDATA)
+#define SWL(hwnd, f)	(AP_Win32LeftRuler*)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
 
 #define ENSUREP(p)		do { UT_ASSERT_HARMLESS(p); if (!p) goto Cleanup; } while (0)
 
--- src/wp/ap/win/ap_Win32Dialog_Paragraph.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Paragraph.cpp	(working copy)
@@ -42,8 +42,8 @@
 
 /*****************************************************************/
 
-#define GWL(hwnd)		(AP_Win32Dialog_Paragraph*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_Paragraph*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_Paragraph*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_Paragraph*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG_PTR)(d))
 
 /*****************************************************************/
 
--- src/wp/ap/win/ap_Win32Dialog_Annotation.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Annotation.cpp	(working copy)
@@ -82,11 +82,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_Annotation *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_Annotation *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_Annotation *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 
 	default:
--- src/wp/ap/win/ap_Win32Dialog_InsertTable.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_InsertTable.cpp	(working copy)
@@ -85,8 +85,8 @@
 
 /*****************************************************************/
 
-#define GWL(hwnd)		(AP_Win32Dialog_InsertTable*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_InsertTable*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_InsertTable*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_InsertTable*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 
 
 BOOL CALLBACK AP_Win32Dialog_InsertTable::s_dlgProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
--- src/wp/ap/win/ap_Win32StatusBar.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32StatusBar.cpp	(working copy)
@@ -32,7 +32,7 @@
 
 LRESULT APIENTRY StatusbarWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { 
 
-	AP_Win32StatusBar *pBar = reinterpret_cast<AP_Win32StatusBar *>(GetWindowLong(hwnd, GWL_USERDATA));
+	AP_Win32StatusBar *pBar = reinterpret_cast<AP_Win32StatusBar *>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
 	UT_return_val_if_fail (pBar, 0);
 
     if ((uMsg == WM_SIZE || uMsg == SB_SETPARTS) && hwnd) {
@@ -203,13 +203,13 @@
 	UT_return_val_if_fail (m_hwndStatusBar,0);	
 
 	// route messages through our handler first (to size the status panels).
-	m_pOrgStatusbarWndProc = reinterpret_cast<WNDPROC>(SetWindowLong(
-		m_hwndStatusBar, GWL_WNDPROC, reinterpret_cast<LONG>(StatusbarWndProc))
+	m_pOrgStatusbarWndProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(
+		m_hwndStatusBar, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(StatusbarWndProc))
 		);
 	
 	// attach a pointer to the s:tatusbar window to <this> so we can get the 
 	// original wndproc and previous window-width
-	SetWindowLong(m_hwndStatusBar, GWL_USERDATA, reinterpret_cast<LONG>(this));
+	SetWindowLongPtr(m_hwndStatusBar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
 
 	for (UT_sint32 k = 0; k < getFields()->getItemCount(); k++) 
 	{
--- src/wp/ap/win/ap_Win32Dialog_Spell.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Spell.cpp	(working copy)
@@ -93,11 +93,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_Spell *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 		
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_Spell *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_Spell *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 		
 	default:
--- src/wp/ap/win/ap_Win32Dialog_MergeCells.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_MergeCells.cpp	(working copy)
@@ -38,8 +38,8 @@
 #define BITMAP_WITDH	32
 #define BITMAP_HEIGHT	32
 
-#define GWL(hwnd)		(AP_Win32Dialog_MergeCells*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_MergeCells*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_MergeCells*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_MergeCells*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 
 
 XAP_Dialog * AP_Win32Dialog_MergeCells::static_constructor(XAP_DialogFactory * pFactory,
@@ -223,12 +223,12 @@
 
 void AP_Win32Dialog_MergeCells::notifyActiveFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hwndDlg, GWL_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
 		ConstructWindowName();
 		SetWindowText(m_hwndDlg, m_WindowName);
 
-		SetWindowLong(m_hwndDlg, GWL_HWNDPARENT, (long)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
+		SetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
 		SetWindowPos(m_hwndDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
--- src/wp/ap/win/ap_Win32Dialog_FormatFootnotes.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_FormatFootnotes.cpp	(working copy)
@@ -37,8 +37,8 @@
 #define _DS(c,s)	SetDlgItemText(hWnd,AP_RID_DIALOG_FORMATFOOTNOTES_##c,pSS->getValue(AP_STRING_ID_##s))
 #define _DSX(c,s)	SetDlgItemText(hWnd,AP_RID_DIALOG_FORMATFOOTNOTES_##c,pSS->getValue(XAP_STRING_ID_##s))
 
-#define GWL(hwnd)		(AP_Win32Dialog_FormatFootnotes*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_FormatFootnotes*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_FormatFootnotes*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_FormatFootnotes*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 
 /*****************************************************************/
 
--- src/wp/ap/win/ap_Win32Dialog_Background.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Background.cpp	(working copy)
@@ -53,7 +53,7 @@
 {
 }
 
-UINT CALLBACK AP_Win32Dialog_Background::s_hookProc(HWND hdlg,UINT uiMsg,WPARAM /*wParam*/,LPARAM lParam)
+UINT_PTR CALLBACK AP_Win32Dialog_Background::s_hookProc(HWND hdlg,UINT uiMsg,WPARAM /*wParam*/,LPARAM lParam)
 {
 	AP_Win32Dialog_Background * pThis = NULL;
 	if (uiMsg==WM_INITDIALOG)
@@ -61,14 +61,14 @@
 		CHOOSECOLOR * pCC = NULL;
 		pCC = (CHOOSECOLOR *) lParam;
 		pThis = (AP_Win32Dialog_Background *)pCC->lCustData;
-		SetWindowLong(hdlg, DWL_USER, (LONG) pThis);
+		SetWindowLongPtr(hdlg, DWLP_USER, (LONG_PTR) pThis);
 		pThis->m_hDlg = hdlg;
 		pThis->_centerDialog();
 		return 1;
 	}
 	else
 	{
-		pThis = (AP_Win32Dialog_Background *)GetWindowLong(hdlg, DWL_USER);
+		pThis = (AP_Win32Dialog_Background *)GetWindowLongPtr(hdlg, DWLP_USER);
 	}
 
 	if (uiMsg==WM_HELP)
--- src/wp/ap/win/ap_Win32Dialog_Insert_DateTime.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Insert_DateTime.cpp	(working copy)
@@ -83,11 +83,11 @@
     switch (msg){
     case WM_INITDIALOG:
         pThis = (AP_Win32Dialog_Insert_DateTime *)lParam;
-        SetWindowLong(hWnd,DWL_USER,lParam);
+        SetWindowLongPtr(hWnd,DWLP_USER,lParam);
         return pThis->_onInitDialog(hWnd,wParam,lParam);
 
     case WM_COMMAND:
-        pThis = (AP_Win32Dialog_Insert_DateTime *)GetWindowLong(hWnd,DWL_USER);
+        pThis = (AP_Win32Dialog_Insert_DateTime *)GetWindowLongPtr(hWnd,DWLP_USER);
         return pThis->_onCommand(hWnd,wParam,lParam);
 
     default:
--- src/wp/ap/win/ap_Win32Dialog_WordCount.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_WordCount.cpp	(working copy)
@@ -180,13 +180,13 @@
 
 void AP_Win32Dialog_WordCount::notifyActiveFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hWnd, GWL_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
 		// Update the caption
 		ConstructWindowName();
 		SetWindowText(m_hWnd, (AP_Win32App::s_fromUTF8ToWinLocale(m_WindowName)).c_str());
 
-		SetWindowLong(m_hWnd, GWL_HWNDPARENT, (long)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
+		SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
 		SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 		
@@ -196,9 +196,9 @@
 
 void AP_Win32Dialog_WordCount::notifyCloseFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hWnd, GWL_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
-		SetWindowLong(m_hWnd, GWL_HWNDPARENT, NULL);
+		SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, NULL);
 		SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
@@ -214,18 +214,18 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_WordCount *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 		
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_WordCount *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_WordCount *)GetWindowLongPtr(hWnd,DWLP_USER);
 		if (pThis)
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		else
 			return 0;
 		
 	case WM_VSCROLL:
-		pThis = (AP_Win32Dialog_WordCount *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_WordCount *)GetWindowLongPtr(hWnd,DWLP_USER);
 		pThis->setUpdateCounter( (UT_uint32)HIWORD(wParam) );
 		pThis->event_Update();
 		return 1;
--- src/wp/ap/win/ap_Win32Dialog_MarkRevisions.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_MarkRevisions.cpp	(working copy)
@@ -89,11 +89,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_MarkRevisions *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_MarkRevisions *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_MarkRevisions *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 
 	default:
--- src/wp/ap/win/ap_Win32Dialog_FormatFrame.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_FormatFrame.cpp	(working copy)
@@ -39,8 +39,8 @@
 #define BITMAP_WITDH	15
 #define BITMAP_HEIGHT	15
 
-#define GWL(hwnd)		(AP_Win32Dialog_FormatFrame*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_FormatFrame*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_FormatFrame*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_FormatFrame*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 
 
 const char * sThickness[FORMAT_FRAME_NUMTHICKNESS] = {"0.25pt","0.5pt",
@@ -464,13 +464,13 @@
 { 	
 	setAllSensitivities();
 	
-	if((HWND)GetWindowLong(m_hwndDlg, GWL_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
 		// Update the caption
 		ConstructWindowName();
 		SetWindowText(m_hwndDlg, m_WindowName);
 
-		SetWindowLong(m_hwndDlg, GWL_HWNDPARENT, (long)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
+		SetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
 		SetWindowPos(m_hwndDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 
--- src/wp/ap/win/ap_Win32Res_Manifest.rc2	(revision 28704)
+++ src/wp/ap/win/ap_Win32Res_Manifest.rc2	(working copy)
@@ -38,6 +38,10 @@
 #define RT_MANIFEST 24
 #endif
 
+#ifdef _WIN64
+AP_RID_MANIFEST RT_MANIFEST "../../main/win/AbiWord.exe.x64.MANIFEST"
+#else
 AP_RID_MANIFEST RT_MANIFEST "../../main/win/AbiWord.exe.MANIFEST"
+#endif
 
 #endif /* RC_INVOKED */
--- src/wp/ap/win/ap_Win32Dialog_Options.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Options.cpp	(working copy)
@@ -55,8 +55,8 @@
 
 /*****************************************************************/
 
-#define GWL(hwnd)		(AP_Win32Dialog_Options*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_Options*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_Options*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_Options*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 #define MINAUTOSAVEPERIOD	1
 #define MAXAUTOSAVEPERIOD	120
 
@@ -517,9 +517,9 @@
 	
 	if (wID==IDOK)
 	{			
-		AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLong(hWnd, GWL_USERDATA);					
+		AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLongPtr(hWnd, GWLP_USERDATA);					
 		HWND hWndPref = t->getParent()->getPage(PG_DOCUMENT);
-		AP_Win32Dialog_Options_Document * prefPag = (AP_Win32Dialog_Options_Document *) GetWindowLong(hWndPref, GWL_USERDATA);							
+		AP_Win32Dialog_Options_Document * prefPag = (AP_Win32Dialog_Options_Document *) GetWindowLongPtr(hWndPref, GWLP_USERDATA);							
 				
 		if (!prefPag->isAutoSaveInRange()) return 0;
 		
@@ -530,7 +530,7 @@
 	
 	if (wID==ID_APPLY_NOW)	// Save default button
 	{
-		AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLong(hWnd, GWL_USERDATA);					
+		AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLongPtr(hWnd, GWLP_USERDATA);					
 		t->getParent()->_event_SetDefaults();				
 		return 0;
 	}
@@ -758,16 +758,16 @@
 		EnableWindow(hCtrlUILang, FALSE);
 
 
-	SetWindowLong(getHandle(), GWL_USERDATA, (LONG)this);
+	SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
 	
 }
 
 
-int CALLBACK AP_Win32Dialog_Options_General::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK AP_Win32Dialog_Options_General::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 { 	
 	if (msg==WM_NOTIFY)
 	{
-		AP_Win32Dialog_Options_General *pThis = (AP_Win32Dialog_Options_General *)GetWindowLong(hWnd, GWL_USERDATA);					
+		AP_Win32Dialog_Options_General *pThis = (AP_Win32Dialog_Options_General *)GetWindowLongPtr(hWnd, GWLP_USERDATA);					
 		
 		NMHDR* pHdr = (NMHDR*)lParam;
 
@@ -855,7 +855,7 @@
 	
 	// Limit the extension to 5 characters (plus the period)
 	SendMessage(GetDlgItem(getHandle(),AP_RID_DIALOG_OPTIONS_TXT_AutoSaveExtension),EM_LIMITTEXT,(WPARAM)6,(WPARAM)0);
-	SetWindowLong(getHandle(), GWL_USERDATA, (LONG)this);	
+	SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);	
 	
 	// Setup bold font for some controls	
 	UINT boldFields[]={AP_RID_DIALOG_OPTIONS_CHK_AutoSaveFile, AP_RID_DIALOG_OPTIONS_STATIC_BidiOptions, 0};
--- src/wp/ap/win/ap_Win32Toolbar_FontCombo.h	(revision 28704)
+++ src/wp/ap/win/ap_Win32Toolbar_FontCombo.h	(working copy)
@@ -40,7 +40,7 @@
 	UT_Vector*	 getFontsCharset(){return &m_vecFontCharSet;};
 
 protected:
-	static int CALLBACK				_EnumFontsProc(LPLOGFONT lplf, 
+	static INT_PTR CALLBACK				_EnumFontsProc(LPLOGFONT lplf, 
 												   LPTEXTMETRIC lptm,
 												   DWORD dwStyle, 
 												   LONG lParam);
--- src/wp/ap/win/ap_Win32Dialog_Styles.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Styles.cpp	(working copy)
@@ -83,12 +83,12 @@
 	{
 	case WM_INITDIALOG:	
 		pThis = (AP_Win32Dialog_Styles *)lParam;		
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
 		
-		pThis = (AP_Win32Dialog_Styles *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_Styles *)GetWindowLongPtr(hWnd,DWLP_USER);
 		if(pThis)
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		else		
@@ -129,7 +129,7 @@
 	
 	// Get parent object and get the App object from there
 	hParent = GetParent(hWnd);	
-	lData = GetWindowLong(hWnd,DWL_USER);			
+	lData = GetWindowLongPtr(hWnd,DWLP_USER);			
 	AP_Win32Dialog_Styles * pParent = (AP_Win32Dialog_Styles *)lData;
 	const XAP_StringSet * pSS = pParent->m_pApp->getStringSet();		
 	
--- src/wp/ap/win/ap_Win32Toolbar_FontCombo.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Toolbar_FontCombo.cpp	(working copy)
@@ -65,13 +65,13 @@
 	// populate the vector
 	HWND hwnd = NULL;
     HDC hdc = GetDC(hwnd) ;
-    EnumFontFamilies(hdc, (LPTSTR) NULL, (FONTENUMPROC) AP_Win32Toolbar_FontCombo::_EnumFontsProc, (LONG) this) ;
+    EnumFontFamilies(hdc, (LPTSTR) NULL, (FONTENUMPROC) AP_Win32Toolbar_FontCombo::_EnumFontsProc, (LONG_PTR) this) ;
     ReleaseDC(hwnd, hdc) ;
 
 	return true;
 }
 
-int CALLBACK AP_Win32Toolbar_FontCombo::_EnumFontsProc(LPLOGFONT lplf, 
+INT_PTR CALLBACK AP_Win32Toolbar_FontCombo::_EnumFontsProc(LPLOGFONT lplf, 
 													  LPTEXTMETRIC lptm,
 													  DWORD dwStyle, 
 													  LONG lParam)
--- src/wp/ap/win/ap_Win32TopRuler.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32TopRuler.cpp	(working copy)
@@ -33,8 +33,8 @@
 
 /*****************************************************************/
 
-#define GWL(hwnd)		(AP_Win32TopRuler*)GetWindowLong((hwnd), GWL_USERDATA)
-#define SWL(hwnd, f)	(AP_Win32TopRuler*)SetWindowLong((hwnd), GWL_USERDATA,(LONG)(f))
+#define GWL(hwnd)		(AP_Win32TopRuler*)GetWindowLongPtr((hwnd), GWLP_USERDATA)
+#define SWL(hwnd, f)	(AP_Win32TopRuler*)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
 
 #define ENSUREP(p)		do { UT_ASSERT_HARMLESS(p); if (!p) goto Cleanup; } while (0)
 
--- src/wp/ap/win/ap_Win32Dialog_FormatTable.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_FormatTable.cpp	(working copy)
@@ -44,8 +44,8 @@
 	
 
 
-#define GWL(hwnd)		(AP_Win32Dialog_FormatTable*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_FormatTable*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_FormatTable*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_FormatTable*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 
 XAP_Dialog * AP_Win32Dialog_FormatTable::static_constructor(XAP_DialogFactory * pFactory,
 													       XAP_Dialog_Id id)
@@ -455,13 +455,13 @@
 { 	
 	setAllSensitivities();
 	
-	if((HWND)GetWindowLong(m_hwndDlg, GWL_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
 		// Update the caption
 		ConstructWindowName();
 		SetWindowText(m_hwndDlg, m_WindowName);
 
-		SetWindowLong(m_hwndDlg, GWL_HWNDPARENT, (long)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
+		SetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
 		SetWindowPos(m_hwndDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 
--- src/wp/ap/win/ap_Win32Dialog_PageSetup.h	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_PageSetup.h	(working copy)
@@ -56,7 +56,7 @@
 
 	void						setContainer(AP_Win32Dialog_PageSetup*	pParent){m_pParent=pParent;};
 	AP_Win32Dialog_PageSetup*	getContainer(){return m_pParent;};
-	static int CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
+	static INT_PTR CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
 
 protected:
 	void						doSpinControl(UT_uint32 id, UT_sint32 delta);
@@ -82,7 +82,7 @@
 
 	void						setContainer(AP_Win32Dialog_PageSetup*	pParent){m_pParent=pParent;};
 	AP_Win32Dialog_PageSetup*	getContainer(){return m_pParent;};
-	static int CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
+	static INT_PTR CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
 
 protected:
 	void						doSpinControl(UT_uint32 id, UT_sint32 delta);
--- src/wp/ap/win/ap_Win32Dialog_Goto.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Goto.cpp	(working copy)
@@ -84,13 +84,13 @@
 
 void AP_Win32Dialog_Goto::notifyActiveFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hWnd, GWL_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
 		// Update the caption
 		ConstructWindowName();
 		SetWindowText(m_hWnd, m_WindowName);
 
-		SetWindowLong(m_hWnd, GWL_HWNDPARENT, (long)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
+		SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
 		SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
@@ -98,9 +98,9 @@
 
 void AP_Win32Dialog_Goto::notifyCloseFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hWnd, GWL_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
-		SetWindowLong(m_hWnd, GWL_HWNDPARENT, NULL);
+		SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, NULL);
 		SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
@@ -148,11 +148,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_Goto *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_Goto *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_Goto *)GetWindowLongPtr(hWnd,DWLP_USER);
 		if (pThis)
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		else
--- src/wp/ap/win/ap_Win32Dialog_SplitCells.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_SplitCells.cpp	(working copy)
@@ -36,8 +36,8 @@
 #include "ap_Win32Resources.rc2"
 
 
-#define GWL(hwnd)		(AP_Win32Dialog_SplitCells*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_SplitCells*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_SplitCells*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_SplitCells*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 
 #define BITMAP_WITDH	50
 #define BITMAP_HEIGHT	50
@@ -239,12 +239,12 @@
 
 void AP_Win32Dialog_SplitCells::notifyActiveFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hwndDlg, GWL_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
 		ConstructWindowName();
 		SetWindowText(m_hwndDlg, m_WindowName);
 
-		SetWindowLong(m_hwndDlg, GWL_HWNDPARENT, (long)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
+		SetWindowLongPtr(m_hwndDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
 		SetWindowPos(m_hwndDlg, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
--- src/wp/ap/win/ap_Win32Dialog_Background.h	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Background.h	(working copy)
@@ -37,7 +37,7 @@
 	static XAP_Dialog *		static_constructor(XAP_DialogFactory *, XAP_Dialog_Id id);
 	
 private:
-	static UINT CALLBACK s_hookProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam);
+	static UINT_PTR CALLBACK s_hookProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam);
 	
 	void _centerDialog();
 	void _callHelp();
--- src/wp/ap/win/ap_Win32FrameImpl.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32FrameImpl.cpp	(working copy)
@@ -51,8 +51,8 @@
 #define UNICODE_NOCHAR 0xFFFF
 #endif
 
-#define GWL(hwnd)		reinterpret_cast<AP_Win32Frame *>(GetWindowLong((hwnd), GWL_USERDATA))
-#define SWL(hwnd, f)	reinterpret_cast<AP_Win32Frame *>(SetWindowLong((hwnd), GWL_USERDATA,(LONG)(f)))
+#define GWL(hwnd)		reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtr((hwnd), GWLP_USERDATA))
+#define SWL(hwnd, f)	reinterpret_cast<AP_Win32Frame *>(SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f)))
 
 // reserve space for static variables
 char AP_Win32FrameImpl::s_ContainerWndClassName[MAXCNTWNDCLSNMSIZE];
@@ -843,7 +843,7 @@
 
 LRESULT CALLBACK AP_Win32FrameImpl::_ContainerWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
-	AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLong(hwnd, GWL_USERDATA));
+	AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
 
 	if (!f)
 	{
@@ -1049,7 +1049,7 @@
 
 LRESULT CALLBACK AP_Win32FrameImpl::_DocumentWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
-	AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLong(hwnd, GWL_USERDATA));
+	AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
 
 	if (!f || !IsWindow(hwnd))
 	{
--- src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp	(working copy)
@@ -182,12 +182,12 @@
 
 }
 
-int CALLBACK AP_Win32Dialog_PageSetup_Page::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK AP_Win32Dialog_PageSetup_Page::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	
 	if (msg==WM_NOTIFY)
 	{
-		AP_Win32Dialog_PageSetup_Page *pThis = (AP_Win32Dialog_PageSetup_Page *) GetWindowLong(hWnd, GWL_USERDATA);					
+		AP_Win32Dialog_PageSetup_Page *pThis = (AP_Win32Dialog_PageSetup_Page *) GetWindowLongPtr(hWnd, GWLP_USERDATA);					
 
 		NMHDR* pHdr = (NMHDR*)lParam;
 		LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
@@ -509,7 +509,7 @@
 						(LPARAM)m_pParent->m_bmpPreview );			
 
 
-	SetWindowLong(getHandle(), GWL_USERDATA, (LONG)this);
+	SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
 }
 
 /*
@@ -667,14 +667,14 @@
 
 		// Initialize Data
 		SendMessage( hwndMarginUnits, CB_SETCURSEL, (WPARAM) m_pParent->getMarginUnits(), (LPARAM) 0 );
-		SetWindowLong(getHandle(), GWL_USERDATA, (LONG)this);
+		SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
 }
 
-int CALLBACK AP_Win32Dialog_PageSetup_Margin::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK AP_Win32Dialog_PageSetup_Margin::s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	if (msg==WM_NOTIFY)
 	{
-		AP_Win32Dialog_PageSetup_Margin *pThis = (AP_Win32Dialog_PageSetup_Margin *) GetWindowLong(hWnd, GWL_USERDATA);					
+		AP_Win32Dialog_PageSetup_Margin *pThis = (AP_Win32Dialog_PageSetup_Margin *) GetWindowLongPtr(hWnd, GWLP_USERDATA);					
 
 		LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
 
--- src/wp/ap/win/ap_Win32Dialog_MailMerge.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_MailMerge.cpp	(working copy)
@@ -33,8 +33,8 @@
 #include "ap_Win32Dialog_MailMerge.h"
 #include "ap_Win32Resources.rc2"
 
-#define GWL(hwnd)		(AP_Win32Dialog_MailMerge*)GetWindowLong((hwnd), DWL_USER)
-#define SWL(hwnd, d)	(AP_Win32Dialog_MailMerge*)SetWindowLong((hwnd), DWL_USER,(LONG)(d))
+#define GWL(hwnd)		(AP_Win32Dialog_MailMerge*)GetWindowLongPtr((hwnd), DWLP_USER)
+#define SWL(hwnd, d)	(AP_Win32Dialog_MailMerge*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG)(d))
 
 
 /*****************************************************************/
--- src/wp/ap/win/ap_Win32Dialog_Stylist.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Stylist.cpp	(working copy)
@@ -128,18 +128,18 @@
 	{
 		case WM_INITDIALOG:
 			pThis = (AP_Win32Dialog_Stylist *)lParam;
-			SetWindowLong(hWnd,DWL_USER,lParam);
+			SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 			return pThis->_onInitDialog(hWnd,wParam,lParam);
 			
 		case WM_COMMAND:
-			pThis = (AP_Win32Dialog_Stylist *)GetWindowLong(hWnd,DWL_USER);
+			pThis = (AP_Win32Dialog_Stylist *)GetWindowLongPtr(hWnd,DWLP_USER);
 			if (pThis)
 				return pThis->_onCommand(hWnd,wParam,lParam);
 			else
 				return 0;
 
 		case WM_DESTROY:
-			pThis = (AP_Win32Dialog_Stylist *)GetWindowLong(hWnd,DWL_USER);
+			pThis = (AP_Win32Dialog_Stylist *)GetWindowLongPtr(hWnd,DWLP_USER);
 			if (pThis)
 				pThis->destroy();
 			return 0;
@@ -242,9 +242,9 @@
 	_populateWindowData();
 
 	HWND hTree = GetDlgItem(m_hWnd, AP_RID_DIALOG_STYLIST_TREE_STYLIST);
-	hTreeProc = (WHICHPROC) GetWindowLong(hTree, GWL_WNDPROC); // save off our prior callback
-	SetWindowLong(hTree, GWL_WNDPROC, (LONG)s_treeProc); // tie the treeview to the new callback
-	SetWindowLong(hTree, GWL_USERDATA, (LONG)this);
+	hTreeProc = (WHICHPROC) GetWindowLongPtr(hTree, GWLP_WNDPROC); // save off our prior callback
+	SetWindowLongPtr(hTree, GWLP_WNDPROC, (LONG_PTR)s_treeProc); // tie the treeview to the new callback
+	SetWindowLongPtr(hTree, GWLP_USERDATA, (LONG_PTR)this);
 	XAP_Win32DialogHelper::s_centerDialog(hWnd);
 
 	return 1;							// 1 == we did not call SetFocus()
@@ -384,7 +384,7 @@
 	if (msg == WM_LBUTTONDBLCLK)
 	{
 		// The user has double clicked on a tree item
-		AP_Win32Dialog_Stylist * pThis = (AP_Win32Dialog_Stylist *)GetWindowLong(hWnd,GWL_USERDATA);
+		AP_Win32Dialog_Stylist * pThis = (AP_Win32Dialog_Stylist *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
 		if (pThis->_styleClicked())
 			pThis->Apply();
 		return 1;
--- src/wp/ap/win/ap_Win32Dialog_ListRevisions.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_ListRevisions.cpp	(working copy)
@@ -101,11 +101,11 @@
 	{
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_ListRevisions *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_ListRevisions *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_ListRevisions *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 
 	default:
--- src/wp/ap/win/ap_Win32Dialog_Options.h	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Options.h	(working copy)
@@ -68,7 +68,7 @@
 	void						setContainer(AP_Win32Dialog_Options*	pParent){m_pParent=pParent;};
 	AP_Win32Dialog_Options*		getContainer(){return m_pParent;};
 	void						transferData();
-	static int CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
+	static INT_PTR CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
 	
 private:
 
@@ -94,7 +94,7 @@
 	void						setContainer(AP_Win32Dialog_Options*	pParent){m_pParent=pParent;};
 	AP_Win32Dialog_Options*		getContainer(){return m_pParent;};
 	void						transferData();
-	static int CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
+	static INT_PTR CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
 	
 private:
 
@@ -121,7 +121,7 @@
 	void						setContainer(AP_Win32Dialog_Options*	pParent){m_pParent=pParent;};
 	AP_Win32Dialog_Options*		getContainer(){return m_pParent;};
 	void						transferData();
-	static int CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
+	static INT_PTR CALLBACK			s_pageWndProc(HWND hWnd, UINT msg, WPARAM wParam,   LPARAM lParam);
 	bool						isAutoSaveInRange();
 	
 private:
--- src/wp/ap/win/ap_Win32Dialog_Replace.cpp	(revision 28704)
+++ src/wp/ap/win/ap_Win32Dialog_Replace.cpp	(working copy)
@@ -116,13 +116,13 @@
 
 void AP_Win32Dialog_Replace::notifyActiveFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hWnd, GWL_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
 		// Update the caption
 		ConstructWindowName();
 		SetWindowText(m_hWnd, (AP_Win32App::s_fromUTF8ToWinLocale(m_WindowName)).c_str()); 
 
-		SetWindowLong(m_hWnd, GWL_HWNDPARENT, (long)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
+		SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
 		SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
@@ -130,9 +130,9 @@
 
 void AP_Win32Dialog_Replace::notifyCloseFrame(XAP_Frame *pFrame)
 {
-	if((HWND)GetWindowLong(m_hWnd, GWL_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
+	if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
 	{
-		SetWindowLong(m_hWnd, GWL_HWNDPARENT, NULL);
+		SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, NULL);
 		SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0,
 						SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 	}
@@ -191,7 +191,7 @@
 	     	
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_Replace *)lParam;
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 	
 	// The second time that the dialog box is displayed
@@ -201,7 +201,7 @@
 		if (wParam==IDOK)
 			wParam=AP_RID_DIALOG_REPLACE_BTN_FINDNEXT;
 			
-		pThis = (AP_Win32Dialog_Replace *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_Replace *)GetWindowLongPtr(hWnd,DWLP_USER);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 
 	default:
--- src/wp/impexp/win/ie_impGraphic_Win32GDIPlus.cpp	(revision 28704)
+++ src/wp/impexp/win/ie_impGraphic_Win32GDIPlus.cpp	(working copy)
@@ -35,7 +35,9 @@
 */
 
 typedef DWORD Status;
+#ifndef __MINGW32__
 typedef DWORD ULONG_PTR;
+#endif
 typedef DWORD EncoderParameters;
 class GpImage {};
 
--- src/wp/main/win/AbiWord.exe.x64.MANIFEST	(revision 0)
+++ src/wp/main/win/AbiWord.exe.x64.MANIFEST	(revision 0)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+<assemblyIdentity version="1.0.0.0" processorArchitecture="amd64" name="AbiWord" 
+type="win32" /> 
+<dependency> 
+<dependentAssembly> 
+<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" 
+version="6.0.0.0" processorArchitecture="amd64" 
+publicKeyToken="6595b64144ccf1df" language="*" /> 
+</dependentAssembly> 
+</dependency> 
+</assembly> 
--- plugins/aiksaurus/win/AiksaurusDlg.cpp	(revision 28704)
+++ plugins/aiksaurus/win/AiksaurusDlg.cpp	(working copy)
@@ -33,11 +33,11 @@
 		pThis = (AiksaurusDlg *)lParam;
 		pThis->m_hDlg = hWnd;
 		//_assertValidDlgHandle(hWnd);
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 
 	case WM_SETCURSOR:
-		pThis = (AiksaurusDlg *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AiksaurusDlg *)GetWindowLongPtr(hWnd,DWLP_USER);
 		if(pThis)
 			return pThis->_onSetCursor(hWnd,wParam,lParam);
 		else
@@ -45,14 +45,14 @@
 
 		
 	case WM_COMMAND:
-		pThis = (AiksaurusDlg *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AiksaurusDlg *)GetWindowLongPtr(hWnd,DWLP_USER);
 		if(pThis)
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		else
 			return 0;
 
 	case WM_NOTIFY:
-		pThis = (AiksaurusDlg *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AiksaurusDlg *)GetWindowLongPtr(hWnd,DWLP_USER);
 		switch (((LPNMHDR)lParam)->code)
 		{
 			case UDN_DELTAPOS:		return pThis->_onDeltaPos((NM_UPDOWN *)lParam);
--- plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp	(revision 28704)
+++ plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp	(working copy)
@@ -42,19 +42,19 @@
 		{
 			AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)lParam;
 			UT_return_val_if_fail(pThis, false);
-			SetWindowLong(hWnd,DWL_USER,lParam);
+			SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 			return pThis->_onInitDialog(hWnd,wParam,lParam);
 		}
 		case WM_COMMAND:
 		{
-			AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtr(hWnd,DWL_USER);
+			AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		}
 		case WM_DESTROY:
 		{
 			UT_DEBUGMSG(("Got WM_DESTROY\n"));
-			AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtr(hWnd,DWL_USER);
+			AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			DELETEP(pThis->m_pWin32Dialog);
 			return true;
--- plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp	(revision 28704)
+++ plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp	(working copy)
@@ -38,26 +38,26 @@
 		{
 			AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)lParam;
 			UT_return_val_if_fail(pThis, false);
-			SetWindowLong(hWnd,DWL_USER,lParam);
+			SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 			return pThis->_onInitDialog(hWnd,wParam,lParam);
 		}
 		case WM_COMMAND:
 		{
-			AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLong(hWnd,DWL_USER);
+			AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		}
 		case WM_DESTROY:
 		{
 			UT_DEBUGMSG(("Got WM_DESTROY\n"));
-			AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLong(hWnd,DWL_USER);
+			AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			DELETEP(pThis->m_pWin32Dialog);
 			return true;
 		}
 		case WM_NOTIFY:
 		{
-			AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLong(hWnd,DWL_USER);
+			AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			return pThis->_onNotify(hWnd,wParam,lParam);
 		}
--- plugins/collab/core/dialogs/win/Makefile.am	(revision 28704)
+++ plugins/collab/core/dialogs/win/Makefile.am	(working copy)
@@ -24,7 +24,7 @@
 libwin_la_LIBADD = ap_Win32Res_CollaborationDialogs.lo
 
 ap_Win32Res_CollaborationDialogs.lo: ap_Win32Res_CollaborationDialogs.rc $(libwin_la_OBJECTS)
-	CPPFLAGS="$(COLLAB_RCFLAGS)" $(top_srcdir)/lt-compile-resource $< $@
+	CPPFLAGS="$(COLLAB_RCFLAGS) -I$(top_srcdir)/plugins/collab/core/dialogs/win " $(top_srcdir)/lt-compile-resource $< $@
 
 EXTRA_DIST = \
 	ap_Win32Res_CollaborationDialogs.rc \
--- plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp	(revision 28704)
+++ plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp	(working copy)
@@ -40,16 +40,16 @@
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_CollaborationJoin *)lParam;
 		UT_return_val_if_fail(pThis, 0);
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 		
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtr(hWnd,DWLP_USER);
 		UT_return_val_if_fail(pThis, 0);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 		
 	case WM_DESTROY:
-		pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtr(hWnd,DWLP_USER);
 		pThis->_freeBuddyList();
 		if (pThis->p_win32Dialog)
 		{
@@ -60,7 +60,7 @@
 		return 0;
 		
 	case WM_NOTIFY:
-		pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtr(hWnd,DWLP_USER);
 		UT_return_val_if_fail(pThis, 0);
 		UT_return_val_if_fail(lParam, 0);
 		return pThis->_onNotify(hWnd, wParam, lParam);
@@ -231,7 +231,7 @@
 	const std::vector<AccountHandler *>& accounts = pManager->getAccounts();
 	
 	// clear out the old contents, if any; items will not be displayed until the window styles are reset
-	DWORD styles = GetWindowLong(m_hDocumentTreeview, GWL_STYLE);
+	DWORD styles = GetWindowLongPtr(m_hDocumentTreeview, GWL_STYLE);
 	_freeBuddyList();
 
 	// Loop through accounts
@@ -264,7 +264,7 @@
 	}
 	
 	// reset the window styles; shows all items
-	SetWindowLong(m_hDocumentTreeview, GWL_STYLE, styles);
+	SetWindowLongPtr(m_hDocumentTreeview, GWL_STYLE, styles);
 
 	_updateSelection();
 }
--- plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationShare.cpp	(revision 28704)
+++ plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationShare.cpp	(working copy)
@@ -38,16 +38,16 @@
 	case WM_INITDIALOG:
 		pThis = (AP_Win32Dialog_CollaborationShare *)lParam;
 		UT_return_val_if_fail(pThis, 0);
-		SetWindowLong(hWnd,DWL_USER,lParam);
+		SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 		return pThis->_onInitDialog(hWnd,wParam,lParam);
 		
 	case WM_COMMAND:
-		pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLongPtr(hWnd,DWLP_USER);
 		UT_return_val_if_fail(pThis, 0);
 		return pThis->_onCommand(hWnd,wParam,lParam);
 		
 	case WM_DESTROY:
-		pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLong(hWnd,DWL_USER);
+		pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLongPtr(hWnd,DWLP_USER);
 		pThis->_freeBuddyList();
 		if (pThis->m_pWin32Dialog)
 		{
--- plugins/collab/core/sync/xp/Synchronizer.cpp	(revision 28704)
+++ plugins/collab/core/sync/xp/Synchronizer.cpp	(working copy)
@@ -58,14 +58,14 @@
 		UT_return_val_if_fail(pThis, 0);
 		pThis->m_hWnd = hWnd;
 		SetLastError(0);
-		swlresult=SetWindowLong(hWnd,GWL_USERDATA,long(pThis));
+		swlresult=SetWindowLongPtr(hWnd,GWLP_USERDATA,(LONG_PTR)pThis);
 		if (swlresult==0)
 		{
 			// we might have an error
 			int errorcode=GetLastError();
 			if (errorcode)
 			{
-				UT_DEBUGMSG(("Error in setting the WindowLong GWL_USERDATA: %d\n", errorcode));
+				UT_DEBUGMSG(("Error in setting the WindowLong GWLP_USERDATA: %d\n", errorcode));
 			}
 			
 		}
@@ -73,7 +73,7 @@
 		
 	case WM_ABI_SYNCHRONIZER:
 		UT_DEBUGMSG(("Received a message in Synchronizer message loop! 0x%x\n", msg));
-		pThis = (Synchronizer *)GetWindowLong(hWnd,GWL_USERDATA);
+		pThis = (Synchronizer *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
 		UT_return_val_if_fail(pThis, 0);
 		if (pThis->m_bIsProcessing)
 		{
@@ -199,7 +199,7 @@
 			(void *) this
 		);
 	UT_DEBUGMSG(("Created message window: HWND 0x%x\n", m_hWnd));
-	switch ((int)m_hWnd)
+	switch ((size_t)m_hWnd)
 	{
 		case NULL:
 			UT_DEBUGMSG(("Win32 error: %d.\n", GetLastError()));
--- plugins/collab/Makefile.am	(revision 28704)
+++ plugins/collab/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 SUBDIRS = backends core
 
 if TOOLKIT_WIN
-SYSTEM_LIBS=-lwsock32 -lws2_32 -lcomdlg32 -lgdi32 -lcomctl32
+SYSTEM_LIBS=-lws2_32 -lmswsock -lcomdlg32 -lgdi32 -lcomctl32
 else
 SYSTEM_LIBS=
 endif
--- plugins/collab/backends/service/win/ap_Win32Dialog_GenericInput.cpp	(revision 28704)
+++ plugins/collab/backends/service/win/ap_Win32Dialog_GenericInput.cpp	(working copy)
@@ -35,18 +35,18 @@
 		{
 			AP_Win32Dialog_GenericInput* pThis = (AP_Win32Dialog_GenericInput *)lParam;
 			UT_return_val_if_fail(pThis, false);
-			SetWindowLong(hWnd,DWL_USER,lParam);
+			SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 			return pThis->_onInitDialog(hWnd,wParam,lParam);
 		}
 		case WM_COMMAND:
 		{
-			AP_Win32Dialog_GenericInput* pThis = (AP_Win32Dialog_GenericInput *)GetWindowLong(hWnd,DWL_USER);
+			AP_Win32Dialog_GenericInput* pThis = (AP_Win32Dialog_GenericInput *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		}
 		case WM_DESTROY:
 		{
-			AP_Win32Dialog_GenericInput* pThis = (AP_Win32Dialog_GenericInput *)GetWindowLong(hWnd,DWL_USER);
+			AP_Win32Dialog_GenericInput* pThis = (AP_Win32Dialog_GenericInput *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			DELETEP(pThis->m_pWin32Dialog);
 			return true;
--- plugins/collab/backends/service/win/ap_Win32Dialog_GenericProgress.cpp	(revision 28704)
+++ plugins/collab/backends/service/win/ap_Win32Dialog_GenericProgress.cpp	(working copy)
@@ -35,18 +35,18 @@
 		{
 			AP_Win32Dialog_GenericProgress* pThis = (AP_Win32Dialog_GenericProgress *)lParam;
 			UT_return_val_if_fail(pThis, false);
-			SetWindowLong(hWnd,DWL_USER,lParam);
+			SetWindowLongPtr(hWnd,DWLP_USER,lParam);
 			return pThis->_onInitDialog(hWnd,wParam,lParam);
 		}
 		case WM_COMMAND:
 		{
-			AP_Win32Dialog_GenericProgress* pThis = (AP_Win32Dialog_GenericProgress *)GetWindowLong(hWnd,DWL_USER);
+			AP_Win32Dialog_GenericProgress* pThis = (AP_Win32Dialog_GenericProgress *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			return pThis->_onCommand(hWnd,wParam,lParam);
 		}
 		case WM_DESTROY:
 		{
-			AP_Win32Dialog_GenericProgress* pThis = (AP_Win32Dialog_GenericProgress *)GetWindowLong(hWnd,DWL_USER);
+			AP_Win32Dialog_GenericProgress* pThis = (AP_Win32Dialog_GenericProgress *)GetWindowLongPtr(hWnd,DWLP_USER);
 			UT_return_val_if_fail(pThis, false);
 			DELETEP(pThis->m_pWin32Dialog);
 			return true;

Places

File abiword-2.8.2-win64.patch of Package mingw32-abiword (Revision e44afd0201807d65f4d34ba249650247)

Places