August 2009 - Wine-Commits - list.winehq.org

Dylan Smith : richedit: Use ME_Cursor instead of offsets for ME_CharFromPos .
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 02228ee176a2e1403cb4320b13febe6d9b0b5179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02228ee176a2e1403cb4320b1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:44:09 2009 -0400 richedit: Use ME_Cursor instead of offsets for ME_CharFromPos. --- dlls/riched20/caret.c | 16 +++++++++------- dlls/riched20/editor.c | 32 ++++++++++++++++++-------------- dlls/riched20/editor.h | 2 +- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0cece5e..fe594a0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1004,30 +1004,32 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, } -/* Returns the character offset closest to the pixel position +/* Sets the cursor to the position closest to the pixel position * * x & y are pixel positions in client coordinates. * * isExact will be set to TRUE if the run is directly under the pixel * position, FALSE if it not, unless isExact is set to NULL. + * + * return FALSE if outside client area and the cursor is not set, + * otherwise TRUE is returned. */ -int ME_CharFromPos(ME_TextEditor *editor, int x, int y, BOOL *isExact) +BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, + ME_Cursor *cursor, BOOL *isExact) { - ME_Cursor cursor; RECT rc; BOOL bResult; ITextHost_TxGetClientRect(editor->texthost, &rc); if (x < 0 || y < 0 || x >= rc.right || y >= rc.bottom) { if (isExact) *isExact = FALSE; - return -1; + return FALSE; } x += editor->horz_si.nPos; y += editor->vert_si.nPos; - bResult = ME_FindPixelPos(editor, x, y, &cursor, NULL); + bResult = ME_FindPixelPos(editor, x, y, cursor, NULL); if (isExact) *isExact = bResult; - return cursor.pPara->member.para.nCharOfs - + cursor.pRun->member.run.nCharOfs + cursor.nOffset; + return TRUE; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0b7ee7f..e56d8d4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2476,9 +2476,9 @@ static int ME_CalculateClickCount(ME_TextEditor *editor, UINT msg, WPARAM wParam static BOOL ME_SetCursor(ME_TextEditor *editor) { + ME_Cursor cursor; POINT pt; BOOL isExact; - int offset; SCROLLBARINFO sbi; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); @@ -2533,13 +2533,11 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) ITextHost_TxSetCursor(editor->texthost, hLeft, FALSE); return TRUE; } - offset = ME_CharFromPos(editor, pt.x, pt.y, &isExact); + ME_CharFromPos(editor, pt.x, pt.y, &cursor, &isExact); if (isExact) { - ME_Cursor cursor; ME_Run *run; - ME_CursorFromCharOfs(editor, offset, &cursor); run = &cursor.pRun->member.run; if (run->style->fmt.dwMask & CFM_LINK && run->style->fmt.dwEffects & CFE_LINK) @@ -2553,6 +2551,7 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) if (ME_IsSelection(editor)) { int selStart, selEnd; + int offset = ME_GetCursorOfs(&cursor); ME_GetSelectionOfs(editor, &selStart, &selEnd); if (selStart <= offset && selEnd >= offset) { @@ -2926,20 +2925,17 @@ get_msg_name(UINT msg) static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { int x,y; - ME_DisplayItem *para, *run; BOOL isExact; - int nCharOfs; /* The start of the clicked text. Absolute character offset */ + ME_Cursor cursor; /* The start of the clicked text. */ ENLINK info; x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); - nCharOfs = ME_CharFromPos(editor, x, y, &isExact); + ME_CharFromPos(editor, x, y, &cursor, &isExact); if (!isExact) return; - ME_RunOfsFromCharOfs(editor, nCharOfs, &para, &run, NULL); - - if ((run->member.run.style->fmt.dwMask & CFM_LINK) - && (run->member.run.style->fmt.dwEffects & CFE_LINK)) + if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && + cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) { /* The clicked run has CFE_LINK set */ info.nmhdr.hwndFrom = editor->hWnd; info.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); @@ -2947,8 +2943,9 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM info.msg = msg; info.wParam = wParam; info.lParam = lParam; - info.chrg.cpMin = ME_CharOfsFromRunOfs(editor, para, run, 0); - info.chrg.cpMax = info.chrg.cpMin + run->member.run.strText->nLen; + cursor.nOffset = 0; + info.chrg.cpMin = ME_GetCursorOfs(&cursor); + info.chrg.cpMax = info.chrg.cpMin + cursor.pRun->member.run.strText->nLen; SendMessageW(GetParent(editor->hWnd), WM_NOTIFY,info.nmhdr.idFrom, (LPARAM)&info); } } @@ -3824,7 +3821,14 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETZOOM: return ME_SetZoom(editor, wParam, lParam); case EM_CHARFROMPOS: - return ME_CharFromPos(editor, ((POINTL *)lParam)->x, ((POINTL *)lParam)->y, NULL); + { + ME_Cursor cursor; + if (ME_CharFromPos(editor, ((POINTL *)lParam)->x, ((POINTL *)lParam)->y, + &cursor, NULL)) + return ME_GetCursorOfs(&cursor); + else + return -1; + } case EM_POSFROMCHAR: { ME_DisplayItem *pPara, *pRun; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 3dc00b8..1cffe99 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -162,7 +162,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to); void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed); void ME_MoveCaret(ME_TextEditor *ed); -int ME_CharFromPos(ME_TextEditor *editor, int x, int y, BOOL *isExact); +BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, ME_Cursor *cursor, BOOL *isExact); void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum); void ME_MouseMove(ME_TextEditor *editor, int x, int y); BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars);

1 0

Dylan Smith : richedit: Use ME_Cursor instead of offsets for copying text.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: a69ef26599d2242ea92f6f861776144fe8abae7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69ef26599d2242ea92f6f861… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:44:05 2009 -0400 richedit: Use ME_Cursor instead of offsets for copying text. --- dlls/riched20/clipboard.c | 27 ++++++++++++++------------- dlls/riched20/editor.c | 31 ++++++++++++++++++++----------- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 13 +++++++++---- 4 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index d573369..3a8e547 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -326,26 +326,23 @@ static const IDataObjectVtbl VT_DataObjectImpl = DataObjectImpl_EnumDAdvise }; -static HGLOBAL get_unicode_text(ME_TextEditor *editor, const CHARRANGE *lpchrg) +static HGLOBAL get_unicode_text(ME_TextEditor *editor, const ME_Cursor *start, int nChars) { int pars = 0; - int len; WCHAR *data; HANDLE ret; - ME_Cursor start; ME_DisplayItem *para; + int nEnd = ME_GetCursorOfs(start) + nChars; - ME_CursorFromCharOfs(editor, lpchrg->cpMin, &start); /* count paragraphs in range */ - para = start.pPara; + para = start->pPara; while((para = para->member.para.next_para) && - para->member.para.nCharOfs <= lpchrg->cpMax) + para->member.para.nCharOfs <= nEnd) pars++; - len = lpchrg->cpMax-lpchrg->cpMin; - ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR)*(len+pars+1)); + ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR) * (nChars + pars + 1)); data = GlobalLock(ret); - len = ME_GetTextW(editor, data, len+pars, &start, len, TRUE); + ME_GetTextW(editor, data, nChars + pars, start, nChars, TRUE); GlobalUnlock(ret); return ret; } @@ -392,10 +389,11 @@ static HGLOBAL get_rtf_text(ME_TextEditor *editor, const CHARRANGE *lpchrg) return gds.hData; } -HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj) +HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, + int nChars, LPDATAOBJECT *lplpdataobj) { DataObjectImpl *obj; - TRACE("(%p,%d,%d)\n", editor, lpchrg->cpMin, lpchrg->cpMax); + TRACE("(%p,%d,%d)\n", editor, ME_GetCursorOfs(start), nChars); obj = heap_alloc(sizeof(DataObjectImpl)); if(cfRTF == 0) @@ -403,7 +401,7 @@ HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAO obj->lpVtbl = &VT_DataObjectImpl; obj->ref = 1; - obj->unicode = get_unicode_text(editor, lpchrg); + obj->unicode = get_unicode_text(editor, start, nChars); obj->rtf = NULL; obj->fmtetc_cnt = 1; @@ -412,7 +410,10 @@ HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAO obj->fmtetc = GlobalAlloc(GMEM_ZEROINIT, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_UNICODETEXT, TYMED_HGLOBAL); if(editor->mode & TM_RICHTEXT) { - obj->rtf = get_rtf_text(editor, lpchrg); + CHARRANGE chrg; + chrg.cpMin = ME_GetCursorOfs(start); + chrg.cpMax = chrg.cpMin + nChars; + obj->rtf = get_rtf_text(editor, &chrg); InitFormatEtc(obj->fmtetc[1], cfRTF, TYMED_HGLOBAL); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 685e0f1..0b7ee7f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2001,7 +2001,7 @@ static BOOL ME_Paste(ME_TextEditor *editor) return TRUE; } -static BOOL ME_Copy(ME_TextEditor *editor, CHARRANGE *range) +static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) { LPDATAOBJECT dataObj = NULL; HRESULT hr = S_OK; @@ -2010,9 +2010,14 @@ static BOOL ME_Copy(ME_TextEditor *editor, CHARRANGE *range) return FALSE; /* Copying or Cutting masked text isn't allowed */ if(editor->lpOleCallback) - hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, range, RECO_COPY, &dataObj); + { + CHARRANGE range; + range.cpMin = ME_GetCursorOfs(start); + range.cpMax = range.cpMin + nChars; + hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); + } if(FAILED(hr) || !dataObj) - hr = ME_GetDataObject(editor, range, &dataObj); + hr = ME_GetDataObject(editor, start, nChars, &dataObj); if(SUCCEEDED(hr)) { hr = OleSetClipboard(dataObj); IDataObject_Release(dataObj); @@ -2270,14 +2275,16 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'X': if (ctrl_is_down) { - CHARRANGE range; BOOL result; + int nOfs, nChars; + int nStartCur = ME_GetSelectionOfs(editor, &nOfs, &nChars); + ME_Cursor *selStart = &editor->pCursors[nStartCur]; - ME_GetSelectionOfs(editor, &range.cpMin, &range.cpMax); - result = ME_Copy(editor, &range); + nChars -= nOfs; + result = ME_Copy(editor, selStart, nChars); if (result && nKey == 'X') { - ME_InternalDeleteText(editor, range.cpMin, range.cpMax-range.cpMin, FALSE); + ME_InternalDeleteText(editor, nOfs, nChars, FALSE); ME_CommitUndo(editor); ME_UpdateRepaint(editor); } @@ -3537,12 +3544,14 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_CUT: case WM_COPY: { - CHARRANGE range; - ME_GetSelectionOfs(editor, &range.cpMin, &range.cpMax); + int nOfs, nChars; + int nStartCur = ME_GetSelectionOfs(editor, &nOfs, &nChars); + ME_Cursor *selStart = &editor->pCursors[nStartCur]; - if (ME_Copy(editor, &range) && msg == WM_CUT) + nChars -= nOfs; + if (ME_Copy(editor, selStart, nChars) && msg == WM_CUT) { - ME_InternalDeleteText(editor, range.cpMin, range.cpMax-range.cpMin, FALSE); + ME_InternalDeleteText(editor, nOfs, nChars, FALSE); ME_CommitUndo(editor); ME_UpdateRepaint(editor); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 14750c8..3dc00b8 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -335,4 +335,4 @@ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, int nStart, int LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream); /* clipboard.c */ -HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj); +HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, int nChars, LPDATAOBJECT *lplpdataobj); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dc5619a..2a9dc01 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -315,16 +315,21 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg, DWORD reco, LPDATAOBJECT *lplpdataobj) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); - CHARRANGE tmpchrg; + ME_Cursor start; + int nChars; TRACE("(%p,%p,%d)\n",This, lpchrg, reco); if(!lplpdataobj) return E_INVALIDARG; if(!lpchrg) { - ME_GetSelectionOfs(This->editor, &tmpchrg.cpMin, &tmpchrg.cpMax); - lpchrg = &tmpchrg; + int nFrom, nTo, nStartCur = ME_GetSelectionOfs(This->editor, &nFrom, &nTo); + start = This->editor->pCursors[nStartCur]; + nChars = nTo - nFrom; + } else { + ME_CursorFromCharOfs(This->editor, lpchrg->cpMin, &start); + nChars = lpchrg->cpMax - lpchrg->cpMin; } - return ME_GetDataObject(This->editor, lpchrg, lplpdataobj); + return ME_GetDataObject(This->editor, &start, nChars, lplpdataobj); } static LONG WINAPI IRichEditOle_fnGetLinkCount(IRichEditOle *me)

1 0

Dylan Smith : richedit: Use ME_Cursor instead of offsets for ME_UpdateLinkAttribute.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 60a72583f4b64e0b399ef87e4078b3be0e8aeabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a72583f4b64e0b399ef87e4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:44:02 2009 -0400 richedit: Use ME_Cursor instead of offsets for ME_UpdateLinkAttribute. --- dlls/riched20/editor.c | 213 +++++++++++++++++++++++++----------------------- 1 files changed, 111 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60a72583f4b64e0b399ef…

1 0

Dylan Smith : richedit: Modified ME_MoveCursorsChars to move multiple chars .
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 27c28ab2928c97b925264f5e0d028426208ac245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c28ab2928c97b925264f5e0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:43:57 2009 -0400 richedit: Modified ME_MoveCursorsChars to move multiple chars. Previously the function was only used to move a single character in either direction, so I made the function more general so that it could be used in more places. --- dlls/riched20/caret.c | 132 +++++++++++++++++++++++++----------------------- dlls/riched20/editor.h | 1 + dlls/riched20/undo.c | 3 +- 3 files changed, 72 insertions(+), 64 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 328109d..0cece5e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -24,9 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -static BOOL -ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs); - void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) { cursor->pPara = editor->pBuffer->pFirst->member.para.next_para; @@ -183,7 +180,8 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) } ME_CursorFromCharOfs(editor, from, &editor->pCursors[1]); - ME_CursorFromCharOfs(editor, to, &editor->pCursors[0]); + editor->pCursors[0] = editor->pCursors[1]; + ME_MoveCursorChars(editor, &editor->pCursors[0], to - from); /* Selection is not allowed in the middle of an end paragraph run. */ if (editor->pCursors[1].pRun->member.run.nFlags & MERF_ENDPARA) editor->pCursors[1].nOffset = 0; @@ -601,77 +599,85 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } } - -static BOOL -ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) +/* Move the cursor nRelOfs characters (either forwards or backwards) + * + * returns the actual number of characters moved. + **/ +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { - ME_DisplayItem *pRun = pCursor->pRun; - - if (nRelOfs == -1) + cursor->nOffset += nRelOfs; + if (cursor->nOffset < 0) { - if (!pCursor->nOffset) + cursor->nOffset += cursor->pRun->member.run.nCharOfs; + if (cursor->nOffset >= 0) { - ME_DisplayItem *pPara = pCursor->pPara; + /* new offset in the same paragraph */ do { - pRun = ME_FindItemBack(pRun, diRunOrParagraph); - assert(pRun); - switch (pRun->type) - { - case diRun: - break; - case diParagraph: - pPara = pRun; - if (pPara->member.para.prev_para->type == diTextStart) - return FALSE; - pRun = ME_FindItemBack(pPara, diRunOrParagraph); - pPara = pPara->member.para.prev_para; - /* every paragraph ought to have at least one run */ - assert(pRun && pRun->type == diRun); - assert(pRun->member.run.nFlags & MERF_ENDPARA); - break; - default: - assert(pRun->type != diRun && pRun->type != diParagraph); - return FALSE; - } - } while (RUN_IS_HIDDEN(&pRun->member.run) || - pRun->member.run.nFlags & MERF_HIDDEN); - pCursor->pPara = pPara; - pCursor->pRun = pRun; - if (pRun->member.run.nFlags & MERF_ENDPARA) - pCursor->nOffset = 0; - else - pCursor->nOffset = pRun->member.run.strText->nLen; + cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); + } while (cursor->nOffset < cursor->pRun->member.run.nCharOfs); + cursor->nOffset -= cursor->pRun->member.run.nCharOfs; + return nRelOfs; } - if (pCursor->nOffset) - pCursor->nOffset = pCursor->nOffset + nRelOfs; - return TRUE; - } - else - { - if (!(pRun->member.run.nFlags & MERF_ENDPARA)) + cursor->nOffset += cursor->pPara->member.para.nCharOfs; + if (cursor->nOffset <= 0) { - int new_ofs = pCursor->nOffset + nRelOfs; + /* moved to the start of the text */ + nRelOfs -= cursor->nOffset; + ME_SetCursorToStart(editor, cursor); + return nRelOfs; + } - if (new_ofs < pRun->member.run.strText->nLen) - { - pCursor->nOffset = new_ofs; - return TRUE; - } + /* new offset in a previous paragraph */ + do { + cursor->pPara = cursor->pPara->member.para.prev_para; + } while (cursor->nOffset < cursor->pPara->member.para.nCharOfs); + cursor->nOffset -= cursor->pPara->member.para.nCharOfs; + + cursor->pRun = ME_FindItemBack(cursor->pPara->member.para.next_para, diRun); + while (cursor->nOffset < cursor->pRun->member.run.nCharOfs) { + cursor->pRun = ME_FindItemBack(cursor->pRun, diRun); } + cursor->nOffset -= cursor->pRun->member.run.nCharOfs; + } else if (cursor->nOffset >= cursor->pRun->member.run.strText->nLen) { + ME_DisplayItem *next_para; + int new_offset; + + new_offset = ME_GetCursorOfs(cursor); + next_para = cursor->pPara->member.para.next_para; + if (new_offset < next_para->member.para.nCharOfs) + { + /* new offset in the same paragraph */ + do { + cursor->nOffset -= cursor->pRun->member.run.strText->nLen; + cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); + } while (cursor->nOffset >= cursor->pRun->member.run.strText->nLen); + return nRelOfs; + } + + if (new_offset >= ME_GetTextLength(editor)) + { + /* new offset at the end of the text */ + ME_SetCursorToEnd(editor, cursor); + nRelOfs -= new_offset - ME_GetTextLength(editor); + return nRelOfs; + } + + /* new offset in a following paragraph */ do { - pRun = ME_FindItemFwd(pRun, diRun); - } while (pRun && (RUN_IS_HIDDEN(&pRun->member.run) || - pRun->member.run.nFlags & MERF_HIDDEN)); - if (pRun) + cursor->pPara = next_para; + next_para = next_para->member.para.next_para; + } while (new_offset >= next_para->member.para.nCharOfs); + + cursor->nOffset = new_offset - cursor->pPara->member.para.nCharOfs; + cursor->pRun = ME_FindItemFwd(cursor->pPara, diRun); + while (cursor->nOffset >= cursor->pRun->member.run.strText->nLen) { - pCursor->pPara = ME_GetParagraph(pRun); - pCursor->pRun = pRun; - pCursor->nOffset = 0; - return TRUE; + cursor->nOffset -= cursor->pRun->member.run.strText->nLen; + cursor->pRun = ME_FindItemFwd(cursor->pRun, diRun); } - } - return FALSE; + } /* else new offset is in the same run */ + return nRelOfs; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 07fabdb..14750c8 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -169,6 +169,7 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars); void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style); void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); int ME_GetCursorOfs(const ME_Cursor *cursor); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 84285b8..908a5ac 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -300,7 +300,8 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) { ME_Cursor start, end; ME_CursorFromCharOfs(editor, pUItem->nStart, &start); - ME_CursorFromCharOfs(editor, pUItem->nStart + pUItem->nLen, &end); + end = start; + ME_MoveCursorChars(editor, &end, pUItem->nLen); ME_SetCharFormat(editor, &start, &end, &pItem->member.ustyle->fmt); break; }

1 0

Tony Wasserka : ddraw: Add DDSD_DEPTH to ddraw.h.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 0f858959351b5f58a3a8585b55fd0e35450393a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f858959351b5f58a3a8585b5… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Thu Aug 13 12:29:17 2009 +0200 ddraw: Add DDSD_DEPTH to ddraw.h. --- include/ddraw.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index a7648b1..eea7e09 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -940,7 +940,8 @@ typedef struct _DDPIXELFORMAT { #define DDSD_TEXTURESTAGE 0x00100000 #define DDSD_FVF 0x00200000 #define DDSD_SRCVBHANDLE 0x00400000 -#define DDSD_ALL 0x007ff9ee +#define DDSD_DEPTH 0x00800000 +#define DDSD_ALL 0x00fff9ee /* EnumSurfaces flags */ #define DDENUMSURFACES_ALL 0x00000001

1 0

Henri Verbeet : wined3d: Recognize GL_VENDOR "Tungsten Graphics, Inc." as VENDOR_MESA.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 914a21740cb611f88811c237e8ef9ba030d040c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=914a21740cb611f88811c237e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 10:03:07 2009 +0200 wined3d: Recognize GL_VENDOR "Tungsten Graphics, Inc." as VENDOR_MESA. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 131f5e1..22a05cf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1008,7 +1008,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) { gl_info->gl_vendor = VENDOR_INTEL; } - else if (strstr(gl_string, "Mesa")) + else if (strstr(gl_string, "Mesa") + || strstr(gl_string, "Tungsten Graphics, Inc.")) { gl_info->gl_vendor = VENDOR_MESA; }

1 0

Henri Verbeet : wined3d: Remove the redundant vs_nv_version and ps_nv_version fields from struct wined3d_gl_info .
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: e205973915eb10cf4c92c8f42496fe459893cb46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e205973915eb10cf4c92c8f42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 10:03:06 2009 +0200 wined3d: Remove the redundant vs_nv_version and ps_nv_version fields from struct wined3d_gl_info. --- dlls/wined3d/directx.c | 30 +++--------------------------- dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/wined3d_gl.h | 27 --------------------------- 3 files changed, 9 insertions(+), 58 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 045a893..131f5e1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -379,7 +379,7 @@ static void select_shader_mode(const struct wined3d_gl_info *gl_info, /* Geforce4 cards support GLSL but for vertex shaders only. Further its reported GLSL caps are * wrong. This combined with the fact that glsl won't offer more features or performance, use ARB * shaders only on this card. */ - if(gl_info->vs_nv_version && gl_info->vs_nv_version < VS_VERSION_20) + if (gl_info->supported[NV_VERTEX_PROGRAM] && !gl_info->supported[NV_VERTEX_PROGRAM2]) *vs_selected = SHADER_ARB; else *vs_selected = SHADER_GLSL; @@ -1191,7 +1191,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) gl_info->ps_arb_max_instructions = 0; gl_info->vs_arb_max_temps = 0; gl_info->vs_arb_max_instructions = 0; - gl_info->vs_nv_version = VS_VERSION_NOT_SUPPORTED; gl_info->vs_glsl_constantsF = 0; gl_info->ps_glsl_constantsF = 0; gl_info->vs_arb_constantsF = 0; @@ -1469,30 +1468,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) gl_info->max_glsl_varyings = gl_max; TRACE_(d3d_caps)("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4); } - if (gl_info->supported[NV_VERTEX_PROGRAM3]) - { - gl_info->vs_nv_version = VS_VERSION_30; - } - else if (gl_info->supported[NV_VERTEX_PROGRAM2]) - { - gl_info->vs_nv_version = VS_VERSION_20; - } - else if (gl_info->supported[NV_VERTEX_PROGRAM1_1]) - { - gl_info->vs_nv_version = VS_VERSION_11; - } - else if (gl_info->supported[NV_VERTEX_PROGRAM]) - { - gl_info->vs_nv_version = VS_VERSION_10; - } - if (gl_info->supported[NV_FRAGMENT_PROGRAM2]) - { - gl_info->ps_nv_version = PS_VERSION_30; - } - else if (gl_info->supported[NV_FRAGMENT_PROGRAM]) - { - gl_info->ps_nv_version = PS_VERSION_20; - } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) { glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->max_shininess); @@ -1601,7 +1576,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ - if(WINE_D3D9_CAPABLE(gl_info) && (gl_info->vs_nv_version == VS_VERSION_30)) { + if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + { /* Geforce 200 - highend */ if (strstr(gl_renderer, "GTX 280") || strstr(gl_renderer, "GTX 285") diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d0c8713..0531596 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4577,14 +4577,15 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { /* Nvidia Geforce6/7 or Ati R4xx/R5xx cards with GLSL support, support VS 3.0 but older Nvidia/Ati - * models with GLSL support only support 2.0. In case of nvidia we can detect VS 2.0 support using - * vs_nv_version which is based on NV_vertex_program. + * models with GLSL support only support 2.0. In case of nvidia we can detect VS 2.0 support based + * on the version of NV_vertex_program. * For Ati cards there's no way using glsl (it abstracts the lowlevel info away) and also not * using ARB_vertex_program. It is safe to assume that when a card supports pixel shader 2.0 it * supports vertex shader 2.0 too and the way around. We can detect ps2.0 using the maximum number * of native instructions, so use that here. For more info see the pixel shader versioning code below. */ - if((GLINFO_LOCATION.vs_nv_version == VS_VERSION_20) || (GLINFO_LOCATION.ps_arb_max_instructions <= 512)) + if ((gl_info->supported[NV_VERTEX_PROGRAM2] && !gl_info->supported[NV_VERTEX_PROGRAM3]) + || gl_info->ps_arb_max_instructions <= 512) pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); else pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); @@ -4602,7 +4603,8 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, * of instructions is 512 or less we have to do with ps2.0 hardware. * NOTE: ps3.0 hardware requires 512 or more instructions but ati and nvidia offer 'enough' (1024 vs 4096) on their most basic ps3.0 hardware. */ - if((GLINFO_LOCATION.ps_nv_version == PS_VERSION_20) || (GLINFO_LOCATION.ps_arb_max_instructions <= 512)) + if ((gl_info->supported[NV_FRAGMENT_PROGRAM] && !gl_info->supported[NV_FRAGMENT_PROGRAM2]) + || (gl_info->ps_arb_max_instructions <= 512)) pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); else pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b58e1dd..8ff55b0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3394,29 +3394,6 @@ typedef enum _GL_Cards { #define WINE_DEFAULT_VIDMEM 64*1024*1024 -typedef enum _GL_VSVersion { - VS_VERSION_NOT_SUPPORTED = 0x0, - VS_VERSION_10 = 0x10, - VS_VERSION_11 = 0x11, - VS_VERSION_20 = 0x20, - VS_VERSION_30 = 0x30, - /*Force 32-bits*/ - VS_VERSION_FORCE_DWORD = 0x7FFFFFFF -} GL_VSVersion; - -typedef enum _GL_PSVersion { - PS_VERSION_NOT_SUPPORTED = 0x0, - PS_VERSION_10 = 0x10, - PS_VERSION_11 = 0x11, - PS_VERSION_12 = 0x12, - PS_VERSION_13 = 0x13, - PS_VERSION_14 = 0x14, - PS_VERSION_20 = 0x20, - PS_VERSION_30 = 0x30, - /*Force 32-bits*/ - PS_VERSION_FORCE_DWORD = 0x7FFFFFFF -} GL_PSVersion; - #define MAKEDWORD_VERSION(maj, min) ((maj & 0x0000FFFF) << 16) | (min & 0x0000FFFF) /* OpenGL Supported Extensions (ARB and EXT) */ @@ -4004,10 +3981,6 @@ struct wined3d_gl_info unsigned int vs_glsl_constantsF; unsigned int ps_glsl_constantsF; - GL_PSVersion ps_nv_version; - - GL_VSVersion vs_nv_version; - DWORD reserved_glsl_constants; DWORD quirks;

1 0

Henri Verbeet : wined3d: Remove some unused fields from struct wined3d_gl_info.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: fbc3cf89e2af5b89e1d0ac63fe9e6aed14f2ff64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc3cf89e2af5b89e1d0ac63f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 10:03:05 2009 +0200 wined3d: Remove some unused fields from struct wined3d_gl_info. --- dlls/wined3d/directx.c | 9 --------- dlls/wined3d/wined3d_gl.h | 3 --- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c158f39..045a893 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1187,14 +1187,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) gl_info->max_vertex_samplers = 0; gl_info->max_combined_samplers = gl_info->max_fragment_samplers + gl_info->max_vertex_samplers; gl_info->max_sampler_stages = 1; - gl_info->ps_arb_version = PS_VERSION_NOT_SUPPORTED; gl_info->ps_arb_max_temps = 0; gl_info->ps_arb_max_instructions = 0; - gl_info->vs_arb_version = VS_VERSION_NOT_SUPPORTED; gl_info->vs_arb_max_temps = 0; gl_info->vs_arb_max_instructions = 0; gl_info->vs_nv_version = VS_VERSION_NOT_SUPPORTED; - gl_info->vs_ati_version = VS_VERSION_NOT_SUPPORTED; gl_info->vs_glsl_constantsF = 0; gl_info->ps_glsl_constantsF = 0; gl_info->vs_arb_constantsF = 0; @@ -1433,7 +1430,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { - gl_info->ps_arb_version = PS_VERSION_11; GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->ps_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d.\n", gl_info->ps_arb_constantsF); @@ -1446,7 +1442,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } if (gl_info->supported[ARB_VERTEX_PROGRAM]) { - gl_info->vs_arb_version = VS_VERSION_11; GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->vs_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM float constants: %d.\n", gl_info->vs_arb_constantsF); @@ -1474,10 +1469,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) gl_info->max_glsl_varyings = gl_max; TRACE_(d3d_caps)("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4); } - if (gl_info->supported[EXT_VERTEX_SHADER]) - { - gl_info->vs_ati_version = VS_VERSION_11; - } if (gl_info->supported[NV_VERTEX_PROGRAM3]) { gl_info->vs_nv_version = VS_VERSION_30; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5802bf8..b58e1dd 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4004,12 +4004,9 @@ struct wined3d_gl_info unsigned int vs_glsl_constantsF; unsigned int ps_glsl_constantsF; - GL_PSVersion ps_arb_version; GL_PSVersion ps_nv_version; - GL_VSVersion vs_arb_version; GL_VSVersion vs_nv_version; - GL_VSVersion vs_ati_version; DWORD reserved_glsl_constants;

1 0

Henri Verbeet : wined3d: Don't make wgl calls from under the GL lock.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 42c2d06bc06fe4d256c49420e63e46aa81db26d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c2d06bc06fe4d256c49420e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 10:03:04 2009 +0200 wined3d: Don't make wgl calls from under the GL lock. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5cd017e..c158f39 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1545,6 +1545,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } checkGLcall("extension detection"); + LEAVE_GL(); + /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment * shaders), but 8 texture stages (register combiners). */ @@ -2052,7 +2054,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } } } - LEAVE_GL(); fixup_extensions(gl_info, gl_renderer); add_gl_compat_wrappers(gl_info);

1 0

Dylan Smith : richedit: Fixed regression in ME_SetCharFormat.
by Alexandre Julliard Aug. 13, 2009

Aug. 13, 2009

Module: wine Branch: master Commit: 326f9b3f3f1dc6c1dab0e14c73ea58739f7c2a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=326f9b3f3f1dc6c1dab0e14c7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 01:25:30 2009 -0400 richedit: Fixed regression in ME_SetCharFormat. Missed an assignment for end_run when the end cursor is provided and the end position doesn't cause a split. --- dlls/riched20/run.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 7b790eb..64befb8 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -787,6 +787,8 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C { end_run = end->pRun = ME_SplitRunSimple(editor, end->pRun, end->nOffset); end->nOffset = 0; + } else if (end) { + end_run = end->pRun; } run = start->pRun;

1 0