Hi,
In my unicode port [1], I ported the existing GetWindowLong to
GetWindowLongW and SetWindowLong to SetWindowLongW to have the dialogs
Unicode enabled. To be win64 compatible, occurrences GetWindowLong
have been converted to GetWindowLongPtr and SetWindowLong to
SetWindowLongPtr in the trunk, in the meantime.
So I can see some conflicts during the merge, and missing *W functions
of unicode port in favor of *Ptr. Hence the best solution now would be
to convert the GetWindowLongPtr to GetWindowLongPtrW and
SetWindowLongPtr to SetWindowLongPtrW, as in this commit. (*PtrW)
Similarly the remaining GetWindowLong and SetWindowLong are also
should be ported to GetWindowLongPtrW and SetWindowLongPtrW to be
win64 compatible as well as unicode enabled. (*PtrW)
Thank you for the great work. I will provide a list of bugs/TODOs of
the port as it was in the gsoc2009unicode branch, on my final commit.
I will get back to the further development and maintenance on this,
once I complete my academic semester. :)
Thank you.
Regards.
Pradeeban.
[1] http://svn.abisource.com/abiword/branches/gsoc2009unicode/
On Mon, Nov 23, 2009 at 11:58 PM, <cvs@abisource.com> wrote:
>
> Author: strbafridrich
> Date: 2009-11-23 19:28:54 +0100 (Mon, 23 Nov 2009)
> New Revision: 28495
>
> Modified:
> abiword/trunk/plugins/collab/backends/tcp/win/TCPWin32AccountHandler.cpp
> abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp
> abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp
> abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp
> abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationShare.cpp
> abiword/trunk/plugins/collab/core/sync/xp/Synchronizer.cpp
> abiword/trunk/src/af/xap/win/xap_Win32DialogBase.cpp
> abiword/trunk/src/af/xap/win/xap_Win32DialogHelper.cpp
> abiword/trunk/src/af/xap/win/xap_Win32Dlg_About.cpp
> abiword/trunk/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp
> abiword/trunk/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp
> abiword/trunk/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.cpp
> abiword/trunk/src/af/xap/win/xap_Win32Dlg_Language.cpp
> abiword/trunk/src/af/xap/win/xap_Win32Dlg_ListDocuments.cpp
> abiword/trunk/src/af/xap/win/xap_Win32Dlg_Print.cpp
> abiword/trunk/src/af/xap/win/xap_Win32FrameImpl.cpp
> abiword/trunk/src/af/xap/win/xap_Win32LabelledSeparator.cpp
> abiword/trunk/src/af/xap/win/xap_Win32PreviewWidget.cpp
> abiword/trunk/src/af/xap/win/xap_Win32PropertySheet.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Background.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatFrame.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatTable.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Goto.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Latex.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_MergeCells.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Options.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Paragraph.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Replace.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Spell.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_SplitCells.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Styles.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Stylist.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32Dialog_WordCount.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32FrameImpl.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32LeftRuler.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32StatusBar.cpp
> abiword/trunk/src/wp/ap/win/ap_Win32TopRuler.cpp
> Log:
> some grep/sed job that barely compiles
>
> Modified: abiword/trunk/plugins/collab/backends/tcp/win/TCPWin32AccountHandler.cpp
> ===================================================================
> --- abiword/trunk/plugins/collab/backends/tcp/win/TCPWin32AccountHandler.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/plugins/collab/backends/tcp/win/TCPWin32AccountHandler.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -42,7 +42,7 @@
> if (!m_hServerEntry || !m_hPortEntry)
> return false; // we are still initializing the dialog
>
> - AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
> UT_return_val_if_fail(pThis, false);
>
> WORD wId = LOWORD(wParam);
>
> Modified: abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp
> ===================================================================
> --- abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAccounts.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -38,26 +38,26 @@
> {
> AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)lParam;
> UT_return_val_if_fail(pThis, false);
> - SetWindowLongPtr(hWnd,DWLP_USER,lParam);
> + SetWindowLongPtrW(hWnd,DWLP_USER,lParam);
> return pThis->_onInitDialog(hWnd,wParam,lParam);
> }
> case WM_COMMAND:
> {
> - AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLongPtr(hWnd,DWLP_USER);
> + AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLongPtrW(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 *)GetWindowLongPtr(hWnd,DWLP_USER);
> + AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLongPtrW(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 *)GetWindowLongPtr(hWnd,DWLP_USER);
> + AP_Win32Dialog_CollaborationAccounts* pThis = (AP_Win32Dialog_CollaborationAccounts *)GetWindowLongPtrW(hWnd,DWLP_USER);
> UT_return_val_if_fail(pThis, false);
> return pThis->_onNotify(hWnd,wParam,lParam);
> }
>
> Modified: abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp
> ===================================================================
> --- abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationAddAccount.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -42,19 +42,19 @@
> {
> AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)lParam;
> UT_return_val_if_fail(pThis, false);
> - SetWindowLongPtr(hWnd,DWLP_USER,lParam);
> + SetWindowLongPtrW(hWnd,DWLP_USER,lParam);
> return pThis->_onInitDialog(hWnd,wParam,lParam);
> }
> case WM_COMMAND:
> {
> - AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtr(hWnd,DWLP_USER);
> + AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtrW(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,DWLP_USER);
> + AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtrW(hWnd,DWLP_USER);
> UT_return_val_if_fail(pThis, false);
> DELETEP(pThis->m_pWin32Dialog);
> return true;
> @@ -66,7 +66,7 @@
>
> BOOL CALLBACK AP_Win32Dialog_CollaborationAddAccount::s_detailsProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
> {
> - AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + AP_Win32Dialog_CollaborationAddAccount* pThis = (AP_Win32Dialog_CollaborationAddAccount *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
> UT_return_val_if_fail(pThis, false);
>
> switch (msg)
> @@ -146,9 +146,9 @@
>
> // trap the messages that will be sent to the m_hDetails window, so we can forward
> // them to the account handler
> - m_pOldDetailsProc = GetWindowLongPtr(m_hDetails, GWLP_WNDPROC);
> - SetWindowLongPtr(m_hDetails, GWLP_WNDPROC, (LPARAM)s_detailsProc);
> - SetWindowLongPtr(m_hDetails, GWLP_USERDATA, (LPARAM)this);
> + m_pOldDetailsProc = GetWindowLongPtrW(m_hDetails, GWLP_WNDPROC);
> + SetWindowLongPtrW(m_hDetails, GWLP_WNDPROC, (LPARAM)s_detailsProc);
> + SetWindowLongPtrW(m_hDetails, GWLP_USERDATA, (LPARAM)this);
>
> // we need to trap the account details window's message hook,
> // so we can make TAB stops work
>
> Modified: abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp
> ===================================================================
> --- abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationJoin.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -40,16 +40,16 @@
> case WM_INITDIALOG:
> pThis = (AP_Win32Dialog_CollaborationJoin *)lParam;
> UT_return_val_if_fail(pThis, 0);
> - SetWindowLongPtr(hWnd,DWLP_USER,lParam);
> + SetWindowLongPtrW(hWnd,DWLP_USER,lParam);
> return pThis->_onInitDialog(hWnd,wParam,lParam);
>
> case WM_COMMAND:
> - pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtr(hWnd,DWLP_USER);
> + pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtrW(hWnd,DWLP_USER);
> UT_return_val_if_fail(pThis, 0);
> return pThis->_onCommand(hWnd,wParam,lParam);
>
> case WM_DESTROY:
> - pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtr(hWnd,DWLP_USER);
> + pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtrW(hWnd,DWLP_USER);
> pThis->_freeBuddyList();
> if (pThis->p_win32Dialog)
> {
> @@ -60,7 +60,7 @@
> return 0;
>
> case WM_NOTIFY:
> - pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtr(hWnd,DWLP_USER);
> + pThis = (AP_Win32Dialog_CollaborationJoin *)GetWindowLongPtrW(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
> - LONG_PTR styles = GetWindowLongPtr(m_hDocumentTreeview, GWL_STYLE);
> + LONG_PTR styles = GetWindowLongPtrW(m_hDocumentTreeview, GWL_STYLE);
> _freeBuddyList();
>
> // Loop through accounts
> @@ -264,7 +264,7 @@
> }
>
> // reset the window styles; shows all items
> - SetWindowLongPtr(m_hDocumentTreeview, GWL_STYLE, styles);
> + SetWindowLongPtrW(m_hDocumentTreeview, GWL_STYLE, styles);
>
> _updateSelection();
> }
>
> Modified: abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationShare.cpp
> ===================================================================
> --- abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationShare.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/plugins/collab/core/dialogs/win/ap_Win32Dialog_CollaborationShare.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -38,16 +38,16 @@
> case WM_INITDIALOG:
> pThis = (AP_Win32Dialog_CollaborationShare *)lParam;
> UT_return_val_if_fail(pThis, 0);
> - SetWindowLongPtr(hWnd,DWLP_USER,lParam);
> + SetWindowLongPtrW(hWnd,DWLP_USER,lParam);
> return pThis->_onInitDialog(hWnd,wParam,lParam);
>
> case WM_COMMAND:
> - pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLongPtr(hWnd,DWLP_USER);
> + pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLongPtrW(hWnd,DWLP_USER);
> UT_return_val_if_fail(pThis, 0);
> return pThis->_onCommand(hWnd,wParam,lParam);
>
> case WM_DESTROY:
> - pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLongPtr(hWnd,DWLP_USER);
> + pThis = (AP_Win32Dialog_CollaborationShare *)GetWindowLongPtrW(hWnd,DWLP_USER);
> pThis->_freeBuddyList();
> if (pThis->m_pWin32Dialog)
> {
>
> Modified: abiword/trunk/plugins/collab/core/sync/xp/Synchronizer.cpp
> ===================================================================
> --- abiword/trunk/plugins/collab/core/sync/xp/Synchronizer.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/plugins/collab/core/sync/xp/Synchronizer.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -58,7 +58,7 @@
> UT_return_val_if_fail(pThis, 0);
> pThis->m_hWnd = hWnd;
> SetLastError(0);
> - swlresult=SetWindowLongPtr(hWnd,GWLP_USERDATA,LONG_PTR(pThis));
> + swlresult=SetWindowLongPtrW(hWnd,GWLP_USERDATA,LONG_PTR(pThis));
> if (swlresult==0)
> {
> // we might have an error
> @@ -73,7 +73,7 @@
>
> case WM_ABI_SYNCHRONIZER:
> UT_DEBUGMSG(("Received a message in Synchronizer message loop! 0x%x\n", msg));
> - pThis = (Synchronizer *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
> + pThis = (Synchronizer *)GetWindowLongPtrW(hWnd,GWLP_USERDATA);
> UT_return_val_if_fail(pThis, 0);
> if (pThis->m_bIsProcessing)
> {
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32DialogBase.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32DialogBase.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32DialogBase.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -377,7 +377,7 @@
> UT_ASSERT(IsWindow(m_hDlg));
> HWND hControl = GetDlgItem(m_hDlg, controlId);
> if (hControl) {
> - return (GetWindowLongPtr(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
> + return (GetWindowLongPtrW(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
> true : false;
> }
> return false;
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32DialogHelper.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32DialogHelper.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32DialogHelper.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -293,7 +293,7 @@
> _assertValidDlgHandle(m_hDlg);
> HWND hControl = GetDlgItem(m_hDlg, controlId);
> if (hControl) {
> - return (GetWindowLongPtr(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
> + return (GetWindowLongPtrW(m_hDlg, GWL_STYLE) & WS_VISIBLE) ?
> true : false;
> }
> return false;
> @@ -303,14 +303,14 @@
> {
> _assertValidDlgHandle(m_hDlg);
> XAP_FrameImpl *pFrameImpl = frame.getFrameImpl();
> - return ((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) ==
> + return ((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) ==
> static_cast<XAP_Win32FrameImpl *>(pFrameImpl)->getTopLevelWindow()) ? true : false;
> }
>
> void XAP_Win32DialogHelper::setParentFrame(const XAP_Frame* pFrame)
> {
> _assertValidDlgHandle(m_hDlg);
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)(pFrame ? static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow() : NULL));
> + SetWindowLongPtrW(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);
> }
>
> @@ -319,7 +319,7 @@
> {
> _assertValidDlgHandle(m_hDlg);
> return reinterpret_cast<XAP_Frame*>(
> - GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT));
> + GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT));
> }
>
> void XAP_Win32DialogHelper::centerDialog()
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32Dlg_About.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32Dlg_About.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32Dlg_About.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -144,7 +144,7 @@
> return;
> }
>
> - SetWindowLongPtr(hwndAbout, GWLP_USERDATA, (LONG_PTR)this);
> + SetWindowLongPtrW(hwndAbout, GWLP_USERDATA, (LONG_PTR)this);
>
> RECT rcClient;
> GetClientRect(hwndAbout, &rcClient);
> @@ -331,7 +331,7 @@
> {
> // This is a static function.
>
> - XAP_Win32Dialog_About * pThis = (XAP_Win32Dialog_About *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
> + XAP_Win32Dialog_About * pThis = (XAP_Win32Dialog_About *)GetWindowLongPtrW(hWnd,GWLP_USERDATA);
>
> if (!pThis)
> {
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -602,7 +602,7 @@
> */
> UINT CALLBACK XAP_Win32Dialog_FileOpenSaveAs::s_hookInsertPicProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
> {
> - XAP_Win32Dialog_FileOpenSaveAs* pThis = (XAP_Win32Dialog_FileOpenSaveAs *) GetWindowLongPtr(hDlg,GWLP_USERDATA);
> + XAP_Win32Dialog_FileOpenSaveAs* pThis = (XAP_Win32Dialog_FileOpenSaveAs *) GetWindowLongPtrW(hDlg,GWLP_USERDATA);
> bool bPreviewImage = ( IsDlgButtonChecked( hDlg, XAP_RID_DIALOG_INSERT_PICTURE_CHECK_ACTIVATE_PREVIEW )
> == BST_CHECKED );
>
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -284,18 +284,18 @@
> {
> case WM_INITDIALOG:
> pThis = (XAP_Win32Dialog_FontChooser *) ((CHOOSEFONTW *)lParam)->lCustData;
> - SetWindowLongPtr(hDlg,DWLP_USER,(LPARAM) pThis);
> + SetWindowLongPtrW(hDlg,DWLP_USER,(LPARAM) pThis);
> return pThis->_onInitDialog(hDlg,wParam,lParam);
>
> case WM_COMMAND:
> - pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLongPtr(hDlg,DWLP_USER);
> + pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLongPtrW(hDlg,DWLP_USER);
> if (pThis)
> return pThis->_onCommand(hDlg,wParam,lParam);
> else
> return 0;
>
> case WM_HELP:
> - pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLongPtr(hDlg,DWLP_USER);
> + pThis = (XAP_Win32Dialog_FontChooser *)GetWindowLongPtrW(hDlg,DWLP_USER);
> if (pThis)
> return pThis->_callHelp();
> else
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -115,13 +115,13 @@
> UT_return_if_fail(pFrame);
>
> HWND frameHWND = static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow();
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != frameHWND)
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != frameHWND)
> {
> // Update the caption
> ConstructWindowName();
> setDialogTitle(m_WindowName);
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)frameHWND);
> + SetWindowLongPtrW(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);
> }
> @@ -130,9 +130,9 @@
> void XAP_Win32Dialog_Insert_Symbol::notifyCloseFrame(XAP_Frame *pFrame)
> {
> UT_return_if_fail(pFrame);
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, NULL);
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, NULL);
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32Dlg_Language.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32Dlg_Language.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32Dlg_Language.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -140,7 +140,7 @@
> // The user has double clicked on a tree item (a language name)
> if (msg==WM_LBUTTONDBLCLK)
> {
> - pThis = (XAP_Win32Dialog_Language *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
> + pThis = (XAP_Win32Dialog_Language *)GetWindowLongPtrW(hWnd,GWLP_USERDATA);
> TVITEM tvi;
>
> // Selected item
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32Dlg_ListDocuments.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32Dlg_ListDocuments.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32Dlg_ListDocuments.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -88,7 +88,7 @@
> // set the column headings
> HWND h = GetDlgItem(hWnd, XAP_RID_DIALOG_LIST_DOCUMENTS_LIST);
>
> - DWORD dwStyle = GetWindowLongPtr(h, GWL_STYLE);
> + DWORD dwStyle = GetWindowLongPtrW(h, GWL_STYLE);
>
> RECT r;
> GetWindowRect(h, &r);
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32Dlg_Print.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32Dlg_Print.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32Dlg_Print.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -44,7 +44,7 @@
> {
> PRINTDLGW * pDlgInfo = (PRINTDLGW*)lParam;
> pThis = (XAP_Win32Dialog_Print*)pDlgInfo->lCustData;
> - SetWindowLongPtr(hdlg, DWLP_USER, (LONG_PTR) pThis);
> + SetWindowLongPtrW(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*)GetWindowLongPtr(hdlg, DWLP_USER);
> + pThis = (XAP_Win32Dialog_Print*)GetWindowLongPtrW(hdlg, DWLP_USER);
> }
>
> if(uiMsg == WM_COMMAND)
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32FrameImpl.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32FrameImpl.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32FrameImpl.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -248,7 +248,7 @@
>
> // bind this frame to its window
> // WARNING: We assume in many places this refers to a XAP_Frame or descendant!!!
> - //SetWindowLongPtr(m_hwndFrame, GWLP_USERDATA,(LONG_PTR)this);
> + //SetWindowLongPtrW(m_hwndFrame, GWLP_USERDATA,(LONG_PTR)this);
> SetWindowLongPtrW(m_hwndFrame, GWLP_USERDATA,(LONG_PTR)getFrame());
>
> #ifndef UNICODE
> @@ -469,7 +469,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 = GetWindowLongPtr(hwndFrame, GWL_STYLE);
> + long hStyle = GetWindowLongPtrW(hwndFrame, GWL_STYLE);
>
> if (isFullScreen)
> {
> @@ -510,7 +510,7 @@
> }
>
> // Add or remove title-bar and border
> - SetWindowLongPtr(hwndFrame, GWL_STYLE, isFullScreen ? hStyle & ~WS_CAPTION : hStyle | WS_CAPTION);
> + SetWindowLongPtrW(hwndFrame, GWL_STYLE, isFullScreen ? hStyle & ~WS_CAPTION : hStyle | WS_CAPTION);
>
> // We hide the window before maximizing
> // to ensure it displays with the proper geometry
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32LabelledSeparator.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32LabelledSeparator.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32LabelledSeparator.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -25,8 +25,8 @@
>
> /*****************************************************************/
>
> -#define GWL(hwnd) (HFONT)GetWindowLongPtr((hwnd), GWLP_USERDATA)
> -#define SWL(hwnd, f) (HFONT)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
> +#define GWL(hwnd) (HFONT)GetWindowLongPtrW((hwnd), GWLP_USERDATA)
> +#define SWL(hwnd, f) (HFONT)SetWindowLongPtrW((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
>
> /*!
> Spacing between the label text and the line separator part of the
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32PreviewWidget.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32PreviewWidget.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32PreviewWidget.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -30,8 +30,8 @@
> //////////////////////////////////////////////////////////////////
> //////////////////////////////////////////////////////////////////
>
> -#define GWL(hwnd) (XAP_Win32PreviewWidget *)GetWindowLongPtr((hwnd), GWLP_USERDATA)
> -#define SWL(hwnd, f) (XAP_Win32PreviewWidget *)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
> +#define GWL(hwnd) (XAP_Win32PreviewWidget *)GetWindowLongPtrW((hwnd), GWLP_USERDATA)
> +#define SWL(hwnd, f) (XAP_Win32PreviewWidget *)SetWindowLongPtrW((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
>
> //////////////////////////////////////////////////////////////////
> //////////////////////////////////////////////////////////////////
>
> Modified: abiword/trunk/src/af/xap/win/xap_Win32PropertySheet.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/win/xap_Win32PropertySheet.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/af/xap/win/xap_Win32PropertySheet.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -72,7 +72,7 @@
> {
> PROPSHEETPAGEW* pStruct = (PROPSHEETPAGEW*)lParam;
> XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)pStruct->lParam;
> - SetWindowLongPtr(hWnd,DWLP_USER,pStruct->lParam);
> + SetWindowLongPtrW(hWnd,DWLP_USER,pStruct->lParam);
> pThis->m_hDlg = hWnd;
> pThis->_onInitDialog();
> return 0;
> @@ -81,7 +81,7 @@
>
> case WM_NOTIFY:
> {
> - XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtr(hWnd,DWLP_USER);
> + XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtrW(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 *)GetWindowLongPtr(hWnd,DWLP_USER);
> + XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtrW(hWnd,DWLP_USER);
> pThis->_onKillActive();
> }
> break;
> @@ -97,7 +97,7 @@
>
> case WM_COMMAND:
> {
> - XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtr(hWnd,DWLP_USER);
> + XAP_Win32PropertyPage *pThis = (XAP_Win32PropertyPage *)GetWindowLongPtrW(hWnd,DWLP_USER);
>
> if (pThis)
> pThis->_onCommand(hWnd, wParam, lParam);
> @@ -170,7 +170,7 @@
> */
> INT_PTR CALLBACK XAP_Win32PropertySheet::s_sheetWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
> {
> - XAP_Win32PropertySheet *pThis = (XAP_Win32PropertySheet*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + XAP_Win32PropertySheet *pThis = (XAP_Win32PropertySheet*)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
>
> switch(msg)
> {
> @@ -329,9 +329,9 @@
> EnableWindow(m_psh.hwndParent, FALSE);
>
> /* Subclassing */
> - 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);
> + m_lpfnDefSheet = (WHICHPROC)GetWindowLongPtrW(m_hWnd, GWLP_WNDPROC);
> + SetWindowLongPtrW(m_hWnd, GWLP_USERDATA, (LONG_PTR)this);
> + SetWindowLongPtrW(m_hWnd, GWLP_WNDPROC, (LONG_PTR)m_pfnDlgProc);
>
> _onInitDialog(m_hWnd);
>
> @@ -394,9 +394,9 @@
>
> /* Subclassing */
>
> - 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);
> + m_lpfnDefSheet = (WHICHPROC)GetWindowLongPtrW(m_hWnd, GWLP_WNDPROC);
> + SetWindowLongPtrW(m_hWnd, GWLP_USERDATA, (LONG_PTR)this);
> + SetWindowLongPtrW(m_hWnd, GWLP_WNDPROC, (LONG_PTR)m_pfnDlgProc);
>
> _onInitDialog(m_hWnd);
> XAP_Win32DialogHelper::s_centerDialog(m_hWnd);
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Background.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Background.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Background.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -61,14 +61,14 @@
> CHOOSECOLORW * pCC = NULL;
> pCC = (CHOOSECOLORW *) lParam;
> pThis = (AP_Win32Dialog_Background *)pCC->lCustData;
> - SetWindowLongPtr(hdlg, DWLP_USER, (LONG_PTR) pThis);
> + SetWindowLongPtrW(hdlg, DWLP_USER, (LONG_PTR) pThis);
> pThis->m_hDlg = hdlg;
> pThis->_centerDialog();
> return 1;
> }
> else
> {
> - pThis = (AP_Win32Dialog_Background *)GetWindowLongPtr(hdlg, DWLP_USER);
> + pThis = (AP_Win32Dialog_Background *)GetWindowLongPtrW(hdlg, DWLP_USER);
> }
>
> if (uiMsg==WM_HELP)
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatFrame.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatFrame.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatFrame.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -427,13 +427,13 @@
> {
> setAllSensitivities();
>
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> // Update the caption
> ConstructWindowName();
> setDialogTitle (m_WindowName);
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
>
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatTable.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatTable.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_FormatTable.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -379,13 +379,13 @@
> {
> setAllSensitivities();
>
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> // Update the caption
> ConstructWindowName();
> setDialogTitle(m_WindowName);
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Goto.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Goto.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Goto.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -72,12 +72,12 @@
>
> void AP_Win32Dialog_Goto::notifyActiveFrame(XAP_Frame *pFrame)
> {
> - if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hWnd, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> // Update the caption
> ConstructWindowName();
> setDialogTitle(m_WindowName);
> - SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> + SetWindowLongPtrW(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);
> }
> @@ -85,9 +85,9 @@
>
> void AP_Win32Dialog_Goto::notifyCloseFrame(XAP_Frame *pFrame)
> {
> - if((HWND)GetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hWnd, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> - SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, NULL);
> + SetWindowLongPtrW(m_hWnd, GWLP_HWNDPARENT, NULL);
> SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Latex.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Latex.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Latex.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -97,13 +97,13 @@
> UT_return_if_fail(pFrame);
>
> HWND frameHWND = static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow();
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != frameHWND)
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != frameHWND)
> {
> // Update the caption
> ConstructWindowName();
> setDialogTitle((LPCSTR)(AP_Win32App::s_fromUTF8ToWinLocale(m_sWindowName.utf8_str())).c_str());
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)frameHWND);
> + SetWindowLongPtrW(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)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, NULL);
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, NULL);
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_MergeCells.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_MergeCells.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_MergeCells.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -171,12 +171,12 @@
>
> void AP_Win32Dialog_MergeCells::notifyActiveFrame(XAP_Frame *pFrame)
> {
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> ConstructWindowName();
> setDialogTitle (m_WindowName);
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Options.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Options.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Options.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -56,8 +56,8 @@
>
> /*****************************************************************/
>
> -#define GWL(hwnd) (AP_Win32Dialog_Options*)GetWindowLongPtr((hwnd), DWLP_USER)
> -#define SWL(hwnd, d) (AP_Win32Dialog_Options*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG_PTR)(d))
> +#define GWL(hwnd) (AP_Win32Dialog_Options*)GetWindowLongPtrW((hwnd), DWLP_USER)
> +#define SWL(hwnd, d) (AP_Win32Dialog_Options*)SetWindowLongPtrW((hwnd), DWLP_USER,(LONG_PTR)(d))
> #define MINAUTOSAVEPERIOD 1
> #define MAXAUTOSAVEPERIOD 120
>
> @@ -511,9 +511,9 @@
>
> if (wID==IDOK)
> {
> - AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLongPtrW(hWnd, GWLP_USERDATA);
> HWND hWndPref = t->getParent()->getPage(PG_DOCUMENT);
> - AP_Win32Dialog_Options_Document * prefPag = (AP_Win32Dialog_Options_Document *) GetWindowLongPtr(hWndPref, GWLP_USERDATA);
> + AP_Win32Dialog_Options_Document * prefPag = (AP_Win32Dialog_Options_Document *) GetWindowLongPtrW(hWndPref, GWLP_USERDATA);
>
> if (!prefPag->isAutoSaveInRange()) return 0;
>
> @@ -524,7 +524,7 @@
>
> if (wID==ID_APPLY_NOW) // Save default button
> {
> - AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + AP_Win32Dialog_Options_Sheet * t = (AP_Win32Dialog_Options_Sheet *) GetWindowLongPtrW(hWnd, GWLP_USERDATA);
> t->getParent()->_event_SetDefaults();
> return 0;
> }
> @@ -752,7 +752,7 @@
> EnableWindow(GetDlgItem(getHandle(), AP_RID_DIALOG_OPTIONS_COMBO_UILANG), FALSE);
>
>
> - SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
> + SetWindowLongPtrW(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
> SendMessageW(GetDlgItem (m_hDlg, AP_RID_DIALOG_OPTIONS_COMBO_UNITS),
> WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), MAKELPARAM(TRUE, 0));
>
> @@ -766,7 +766,7 @@
> {
> if (msg==WM_NOTIFY)
> {
> - AP_Win32Dialog_Options_General *pThis = (AP_Win32Dialog_Options_General *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + AP_Win32Dialog_Options_General *pThis = (AP_Win32Dialog_Options_General *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
>
> NMHDR* pHdr = (NMHDR*)lParam;
>
> @@ -856,7 +856,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);
> - SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
> + SetWindowLongPtrW(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};
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_PageSetup.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -184,7 +184,7 @@
>
> if (msg==WM_NOTIFY)
> {
> - AP_Win32Dialog_PageSetup_Page *pThis = (AP_Win32Dialog_PageSetup_Page *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + AP_Win32Dialog_PageSetup_Page *pThis = (AP_Win32Dialog_PageSetup_Page *) GetWindowLongPtrW(hWnd, GWLP_USERDATA);
>
> NMHDR* pHdr = (NMHDR*)lParam;
> LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
> @@ -503,7 +503,7 @@
> (LPARAM)m_pParent->m_bmpPreview );
>
>
> - SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
> + SetWindowLongPtrW(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
> }
>
> /*
> @@ -661,14 +661,14 @@
> addItemToCombo (AP_RID_DIALOG_PAGE_SETUP_LBX_MARGINUNITS, _GVX(DLG_Unit_mm));
> // Initialize Data
> selectComboItem (AP_RID_DIALOG_PAGE_SETUP_LBX_MARGINUNITS, (WPARAM) m_pParent->getMarginUnits() );
> - SetWindowLongPtr(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
> + SetWindowLongPtrW(getHandle(), GWLP_USERDATA, (LONG_PTR)this);
> }
>
> 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 *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
> + AP_Win32Dialog_PageSetup_Margin *pThis = (AP_Win32Dialog_PageSetup_Margin *) GetWindowLongPtrW(hWnd, GWLP_USERDATA);
>
> LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
>
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Paragraph.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Paragraph.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Paragraph.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -42,8 +42,8 @@
>
> /*****************************************************************/
>
> -#define GWL(hwnd) (AP_Win32Dialog_Paragraph*)GetWindowLongPtr((hwnd), DWLP_USER)
> -#define SWL(hwnd, d) (AP_Win32Dialog_Paragraph*)SetWindowLongPtr((hwnd), DWLP_USER,(LONG_PTR)(d))
> +#define GWL(hwnd) (AP_Win32Dialog_Paragraph*)GetWindowLongPtrW((hwnd), DWLP_USER)
> +#define SWL(hwnd, d) (AP_Win32Dialog_Paragraph*)SetWindowLongPtrW((hwnd), DWLP_USER,(LONG_PTR)(d))
>
> /*****************************************************************/
>
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Replace.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Replace.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Replace.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -111,13 +111,13 @@
>
> void AP_Win32Dialog_Replace::notifyActiveFrame(XAP_Frame *pFrame)
> {
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> // Update the caption
> ConstructWindowName();
> setDialogTitle(m_WindowName);
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
> @@ -125,9 +125,9 @@
>
> void AP_Win32Dialog_Replace::notifyCloseFrame(XAP_Frame *pFrame)
> {
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) == static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, NULL);
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, NULL);
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Spell.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Spell.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Spell.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -93,11 +93,11 @@
> {
> case WM_INITDIALOG:
> pThis = (AP_Win32Dialog_Spell *)lParam;
> - SetWindowLongPtr(hWnd,DWLP_USER,lParam);
> + SetWindowLongPtrW(hWnd,DWLP_USER,lParam);
> return pThis->_onInitDialog(hWnd,wParam,lParam);
>
> case WM_COMMAND:
> - pThis = (AP_Win32Dialog_Spell *)GetWindowLongPtr(hWnd,DWLP_USER);
> + pThis = (AP_Win32Dialog_Spell *)GetWindowLongPtrW(hWnd,DWLP_USER);
> return pThis->_onCommand(hWnd,wParam,lParam);
>
> default:
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_SplitCells.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_SplitCells.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_SplitCells.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -192,12 +192,12 @@
>
> void AP_Win32Dialog_SplitCells::notifyActiveFrame(XAP_Frame *pFrame)
> {
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> ConstructWindowName();
> setDialogTitle (m_WindowName);
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
> }
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Styles.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Styles.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Styles.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -83,12 +83,12 @@
> {
> case WM_INITDIALOG:
> pThis = (AP_Win32Dialog_Styles *)lParam;
> - SetWindowLongPtr(hWnd,DWLP_USER,lParam);
> + SetWindowLongPtrW(hWnd,DWLP_USER,lParam);
> return pThis->_onInitDialog(hWnd,wParam,lParam);
>
> case WM_COMMAND:
>
> - pThis = (AP_Win32Dialog_Styles *)GetWindowLongPtr(hWnd,DWLP_USER);
> + pThis = (AP_Win32Dialog_Styles *)GetWindowLongPtrW(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 = GetWindowLongPtr(hWnd,DWLP_USER);
> + lData = GetWindowLongPtrW(hWnd,DWLP_USER);
> AP_Win32Dialog_Styles * pParent = (AP_Win32Dialog_Styles *)lData;
> const XAP_StringSet * pSS = pParent->m_pApp->getStringSet();
>
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Stylist.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Stylist.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_Stylist.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -192,9 +192,9 @@
> _populateWindowData();
>
> HWND hTree = GetDlgItem(m_hDlg, AP_RID_DIALOG_STYLIST_TREE_STYLIST);
> - 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);
> + hTreeProc = (WHICHPROC) GetWindowLongPtrW(hTree, GWLP_WNDPROC); // save off our prior callback
> + SetWindowLongPtrW(hTree, GWLP_WNDPROC, (LONG_PTR)s_treeProc); // tie the treeview to the new callback
> + SetWindowLongPtrW(hTree, GWLP_USERDATA, (LONG_PTR)this);
> centerDialog();
>
> return 1; // 1 == we did not call SetFocus()
> @@ -336,7 +336,7 @@
> if (msg == WM_LBUTTONDBLCLK)
> {
> // The user has double clicked on a tree item
> - AP_Win32Dialog_Stylist * pThis = (AP_Win32Dialog_Stylist *)GetWindowLongPtr(hWnd,GWLP_USERDATA);
> + AP_Win32Dialog_Stylist * pThis = (AP_Win32Dialog_Stylist *)GetWindowLongPtrW(hWnd,GWLP_USERDATA);
> if (pThis->_styleClicked())
> pThis->Apply();
> return 1;
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32Dialog_WordCount.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32Dialog_WordCount.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32Dialog_WordCount.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -142,13 +142,13 @@
>
> void AP_Win32Dialog_WordCount::notifyActiveFrame(XAP_Frame *pFrame)
> {
> - if((HWND)GetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> + if((HWND)GetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT) != static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow())
> {
> // Update the caption
> ConstructWindowName();
> setDialogTitle (m_WindowName);
>
> - SetWindowLongPtr(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> + SetWindowLongPtrW(m_hDlg, GWLP_HWNDPARENT, (LONG_PTR)static_cast<XAP_Win32FrameImpl*>(pFrame->getFrameImpl())->getTopLevelWindow());
> SetWindowPos(m_hDlg, NULL, 0, 0, 0, 0,
> SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
>
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32FrameImpl.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32FrameImpl.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32FrameImpl.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -52,8 +52,8 @@
> #define UNICODE_NOCHAR 0xFFFF
> #endif
>
> -#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)))
> +#define GWL(hwnd) reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtrW((hwnd), GWLP_USERDATA))
> +#define SWL(hwnd, f) reinterpret_cast<AP_Win32Frame *>(SetWindowLongPtrW((hwnd), GWLP_USERDATA,(LONG_PTR)(f)))
>
> // reserve space for static variables
> wchar_t AP_Win32FrameImpl::s_ContainerWndClassName[MAXCNTWNDCLSNMSIZE];
> @@ -826,7 +826,7 @@
>
> LRESULT CALLBACK AP_Win32FrameImpl::_ContainerWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
> {
> - AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
> + AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
> if (!f)
> {
> return UT_DefWindowProc(hwnd, iMsg, wParam, lParam);
> @@ -1031,7 +1031,7 @@
>
> LRESULT CALLBACK AP_Win32FrameImpl::_DocumentWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
> {
> - AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
> + AP_Win32Frame * f = reinterpret_cast<AP_Win32Frame *>(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
> if (!f || !IsWindow(hwnd))
> {
> return UT_DefWindowProc(hwnd, iMsg, wParam, lParam);
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32LeftRuler.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32LeftRuler.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32LeftRuler.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -31,8 +31,8 @@
>
> /*****************************************************************/
>
> -#define GWL(hwnd) (AP_Win32LeftRuler*)GetWindowLongPtr((hwnd), GWLP_USERDATA)
> -#define SWL(hwnd, f) (AP_Win32LeftRuler*)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
> +#define GWL(hwnd) (AP_Win32LeftRuler*)GetWindowLongPtrW((hwnd), GWLP_USERDATA)
> +#define SWL(hwnd, f) (AP_Win32LeftRuler*)SetWindowLongPtrW((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
>
> #define ENSUREP(p) do { UT_ASSERT_HARMLESS(p); if (!p) goto Cleanup; } while (0)
>
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32StatusBar.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32StatusBar.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32StatusBar.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -33,7 +33,7 @@
>
> LRESULT APIENTRY StatusbarWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
>
> - AP_Win32StatusBar *pBar = reinterpret_cast<AP_Win32StatusBar *>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
> + AP_Win32StatusBar *pBar = reinterpret_cast<AP_Win32StatusBar *>(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
> UT_return_val_if_fail (pBar, 0);
>
> if ((uMsg == WM_SIZE || uMsg == SB_SETPARTS) && hwnd) {
> @@ -211,7 +211,7 @@
>
> // attach a pointer to the s:tatusbar window to <this> so we can get the
> // original wndproc and previous window-width
> - SetWindowLongPtr(m_hwndStatusBar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
> + SetWindowLongPtrW(m_hwndStatusBar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
>
> for (UT_sint32 k = 0; k < getFields()->getItemCount(); k++)
> {
>
> Modified: abiword/trunk/src/wp/ap/win/ap_Win32TopRuler.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/win/ap_Win32TopRuler.cpp 2009-11-23 16:37:22 UTC (rev 28494)
> +++ abiword/trunk/src/wp/ap/win/ap_Win32TopRuler.cpp 2009-11-23 18:28:54 UTC (rev 28495)
> @@ -34,8 +34,8 @@
>
> /*****************************************************************/
>
> -#define GWL(hwnd) (AP_Win32TopRuler*)GetWindowLongPtr((hwnd), GWLP_USERDATA)
> -#define SWL(hwnd, f) (AP_Win32TopRuler*)SetWindowLongPtr((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
> +#define GWL(hwnd) (AP_Win32TopRuler*)GetWindowLongPtrW((hwnd), GWLP_USERDATA)
> +#define SWL(hwnd, f) (AP_Win32TopRuler*)SetWindowLongPtrW((hwnd), GWLP_USERDATA,(LONG_PTR)(f))
>
> #define ENSUREP(p) do { UT_ASSERT_HARMLESS(p); if (!p) goto Cleanup; } while (0)
>
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
>
-- Pradeeban. University of Moratuwa. [06CSE] http://kkpradeeban.blogspot.com/Received on Mon Nov 23 20:53:44 2009
This archive was generated by hypermail 2.1.8 : Mon Nov 23 2009 - 20:53:44 CET