Index: af/ev/win/ev_Win32Toolbar.cpp =================================================================== --- af/ev/win/ev_Win32Toolbar.cpp (revision 28492) +++ af/ev/win/ev_Win32Toolbar.cpp (working copy) @@ -285,7 +285,7 @@ /* Draws the font preview in the font selection combobox*/ case WM_DRAWITEM: { - EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtr(hWnd, GWLP_USERDATA); + EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtrW(hWnd, GWLP_USERDATA); UINT u = GetDlgCtrlID(hWnd); XAP_Toolbar_Id id = t->ItemIdFromWmCommand(u); @@ -418,7 +418,7 @@ UT_UCS4_strncpy_char(ucs_buf, str.utf8_str().utf8_str(), COMBO_BUF_LEN-1); UT_UCSChar * pData = (UT_UCSChar *) ucs_buf; // HACK: should be void * - EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtr(hWnd, GWLP_USERDATA); + EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtrW(hWnd, GWLP_USERDATA); UT_ASSERT(t); if(dataLength) @@ -469,7 +469,7 @@ case WM_KEYDOWN: { - EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtr(hWnd, GWLP_USERDATA); + EV_Win32Toolbar * t = (EV_Win32Toolbar *) GetWindowLongPtrW(hWnd, GWLP_USERDATA); UT_ASSERT(t); switch (wParam) @@ -568,9 +568,9 @@ UT_ASSERT(m_hwnd); // override the window procedure - s_lpfnDefToolBar = (WHICHPROC)GetWindowLongPtr(m_hwnd, GWLP_WNDPROC); - SetWindowLongPtr(m_hwnd, GWLP_WNDPROC, (LONG_PTR)_ToolBarWndProc); - SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); + s_lpfnDefToolBar = (WHICHPROC)GetWindowLongPtrW(m_hwnd, GWLP_WNDPROC); + SetWindowLongPtrW(m_hwnd, GWLP_WNDPROC, (LONG_PTR)_ToolBarWndProc); + SetWindowLongPtrW(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); SendMessageW(m_hwnd, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0); @@ -737,9 +737,9 @@ } // override the window procedure for the combo box - s_lpfnDefCombo = (WHICHPROC)GetWindowLongPtr(hwndCombo, GWLP_WNDPROC); - SetWindowLongPtr(hwndCombo, GWLP_WNDPROC, (LONG_PTR)_ComboWndProc); - SetWindowLongPtr(hwndCombo, GWLP_USERDATA, (LONG_PTR)this); + s_lpfnDefCombo = (WHICHPROC)GetWindowLongPtrW(hwndCombo, GWLP_WNDPROC); + SetWindowLongPtrW(hwndCombo, GWLP_WNDPROC, (LONG_PTR)_ComboWndProc); + SetWindowLongPtrW(hwndCombo, GWLP_USERDATA, (LONG_PTR)this); // Get the handle to the tooltip window. HWND hwndTT = (HWND)SendMessageW(m_hwnd, TB_GETTOOLTIPS, 0, 0); Index: af/util/win/ut_Win32LocaleString.cpp =================================================================== --- af/util/win/ut_Win32LocaleString.cpp (revision 28492) +++ af/util/win/ut_Win32LocaleString.cpp (working copy) @@ -367,7 +367,7 @@ void UT_Win32LocaleString::fromUTF8 (const char* utf8_str) { UT_UCS2Char * pText = (UT_UCS2Char *) UT_convert (utf8_str, - strlen (utf8_str), + strlen (utf8_str)+1, "UTF-8", "UCS-2LE", NULL, NULL); Index: af/util/win/ut_Win32Misc.cpp =================================================================== --- af/util/win/ut_Win32Misc.cpp (revision 28492) +++ af/util/win/ut_Win32Misc.cpp (working copy) @@ -493,11 +493,11 @@ switch (msg){ case WM_INITDIALOG: pThis = (UT_Win32AssertDlg *)lParam; - SetWindowLongPtr(hWnd,DWLP_USER,lParam); + SetWindowLongPtrW(hWnd,DWLP_USER,lParam); return pThis->_onInitDialog(hWnd,wParam,lParam); case WM_COMMAND: - pThis = (UT_Win32AssertDlg *)GetWindowLongPtr(hWnd,DWLP_USER); + pThis = (UT_Win32AssertDlg *)GetWindowLongPtrW(hWnd,DWLP_USER); return pThis->_onCommand(hWnd,wParam,lParam); default: Index: af/xap/win/xap_Win32DialogHelper.cpp =================================================================== --- af/xap/win/xap_Win32DialogHelper.cpp (revision 28492) +++ af/xap/win/xap_Win32DialogHelper.cpp (working copy) @@ -92,18 +92,18 @@ pThis = (XAP_Win32DialogHelper *)lParam; pThis->m_hDlg = hWnd; _assertValidDlgHandle(hWnd); - SetWindowLongPtr(hWnd,DWLP_USER,lParam); + SetWindowLongPtrW(hWnd,DWLP_USER,lParam); return pThis->m_pDialog->_onInitDialog(hWnd,wParam,lParam); case WM_COMMAND: - pThis = (XAP_Win32DialogHelper *)GetWindowLongPtr(hWnd,DWLP_USER); + pThis = (XAP_Win32DialogHelper *)GetWindowLongPtrW(hWnd,DWLP_USER); if(pThis) return pThis->m_pDialog->_onCommand(hWnd,wParam,lParam); else return 0; case WM_NOTIFY: - pThis = (XAP_Win32DialogHelper *)GetWindowLongPtr(hWnd,DWLP_USER); + pThis = (XAP_Win32DialogHelper *)GetWindowLongPtrW(hWnd,DWLP_USER); switch (((LPNMHDR)lParam)->code) { case UDN_DELTAPOS: return pThis->m_pDialog->_onDeltaPos((NM_UPDOWN *)lParam); Index: af/xap/win/xap_Win32Dlg_Language.cpp =================================================================== --- af/xap/win/xap_Win32Dlg_Language.cpp (revision 28492) +++ af/xap/win/xap_Win32Dlg_Language.cpp (working copy) @@ -202,9 +202,9 @@ _fillTreeview(hTree); - gTreeProc = (WHICHPROC) GetWindowLongPtr(hTree, GWLP_WNDPROC); - SetWindowLongPtr(hTree, GWLP_WNDPROC, (LONG_PTR)s_treeProc); - SetWindowLongPtr(hTree, GWLP_USERDATA, (LONG_PTR)this); + gTreeProc = (WHICHPROC) GetWindowLongPtrW(hTree, GWLP_WNDPROC); + SetWindowLongPtrW(hTree, GWLP_WNDPROC, (LONG_PTR)s_treeProc); + SetWindowLongPtrW(hTree, GWLP_USERDATA, (LONG_PTR)this); CheckDlgButton(hWnd, XAP_RID_DIALOG_LANGUAGE_DOCLANG_CHKBOX, BST_UNCHECKED ); Index: af/xap/win/xap_Win32FrameImpl.cpp =================================================================== --- af/xap/win/xap_Win32FrameImpl.cpp (revision 28492) +++ af/xap/win/xap_Win32FrameImpl.cpp (working copy) @@ -111,10 +111,7 @@ break; } - if(UT_IsWinNT()) - return CallWindowProcW(s_oldRedBar, hWnd, uMessage, wParam, lParam); - else - return CallWindowProc(s_oldRedBar, hWnd, uMessage, wParam, lParam); + return CallWindowProcW(s_oldRedBar, hWnd, uMessage, wParam, lParam); } @@ -152,7 +149,7 @@ // have to reset the window long, so our message functions do not // try to derefernce it - SetWindowLongPtr(m_hwndFrame, GWLP_USERDATA,0); + SetWindowLongPtrW(m_hwndFrame, GWLP_USERDATA,0); } @@ -252,7 +249,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); - SetWindowLongPtr(m_hwndFrame, GWLP_USERDATA,(LONG_PTR)getFrame()); + SetWindowLongPtrW(m_hwndFrame, GWLP_USERDATA,(LONG_PTR)getFrame()); #ifndef UNICODE // remove this when we are a true unicode app @@ -289,8 +286,8 @@ UT_ASSERT(m_hwndRebar); /* override the window procedure*/ - s_oldRedBar = (WHICHPROC)GetWindowLongPtr(m_hwndRebar, GWLP_WNDPROC); - SetWindowLongPtr(m_hwndRebar, GWLP_WNDPROC, (LONG_PTR)s_rebarWndProc); + s_oldRedBar = (WHICHPROC)GetWindowLongPtrW(m_hwndRebar, GWLP_WNDPROC); + SetWindowLongPtrW(m_hwndRebar, GWLP_WNDPROC, (LONG_PTR)s_rebarWndProc); // create a toolbar instance for each toolbar listed in our base class. @@ -656,7 +653,7 @@ LRESULT CALLBACK XAP_Win32FrameImpl::_FrameWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { - XAP_Frame * f = (XAP_Frame*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + XAP_Frame * f = (XAP_Frame*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); if (!f) { return UT_DefWindowProc(hwnd,iMsg,wParam,lParam); @@ -808,13 +810,13 @@ case TBN_DROPDOWN: { HWND hWnd = ((LPNMHDR) lParam)->hwndFrom; - EV_Win32Toolbar * t = (EV_Win32Toolbar *)GetWindowLongPtr(hWnd, GWLP_USERDATA); + EV_Win32Toolbar * t = (EV_Win32Toolbar *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); t->onDropArrow(((LPNMTOOLBARW) lParam)->iItem); Sleep(500); /* At least, half second where the arrow is shown as pressed*/ return TBDDRET_DEFAULT; /* Windows restores the pushed button*/ } - case TTN_NEEDTEXT: + case TTN_NEEDTEXTW: { UT_uint32 nrToolbars, k; nrToolbars = fimpl->m_vecToolbars.getItemCount(); Index: wp/ap/win/ap_Win32StatusBar.cpp =================================================================== --- wp/ap/win/ap_Win32StatusBar.cpp (revision 28492) +++ wp/ap/win/ap_Win32StatusBar.cpp (working copy) @@ -205,7 +205,7 @@ UT_return_val_if_fail (m_hwndStatusBar,0); // route messages through our handler first (to size the status panels). - m_pOrgStatusbarWndProc = reinterpret_cast(SetWindowLongPtr( + m_pOrgStatusbarWndProc = reinterpret_cast(SetWindowLongPtrW( m_hwndStatusBar, GWLP_WNDPROC, reinterpret_cast(StatusbarWndProc)) );