wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Hadrien Boizard : winemac.drv: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 5d96ef42a58e09a2d6cf47a685abb3f42b513ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d96ef42a58e09a2d6cf47a68… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Wed Sep 28 23:53:32 2016 +0200 winemac.drv: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 4 ++-- dlls/winemac.drv/window.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e1953dd..6e1f151 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1652,7 +1652,7 @@ static BOOL sync_context_rect(struct wgl_context *context) { RECT rect = data->client_rect; OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); - if (memcmp(&context->draw_rect, &rect, sizeof(context->draw_rect))) + if (!EqualRect(&context->draw_rect, &rect)) { context->draw_rect = rect; ret = TRUE; @@ -4327,7 +4327,7 @@ void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, cons OffsetRect(&old, -old_whole_rect->left, -old_whole_rect->top); OffsetRect(&new, -data->whole_rect.left, -data->whole_rect.top); - if (memcmp(&old, &new, sizeof(old))) + if (!EqualRect(&old, &new)) { TRACE("GL view %p changed position; marking contexts\n", data->client_cocoa_view); mark_contexts_for_moved_view(data->client_cocoa_view); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index f4be7ce..0359ef7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -746,7 +746,7 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) */ static void create_cocoa_view(struct macdrv_win_data *data) { - BOOL equal = !memcmp(&data->window_rect, &data->client_rect, sizeof(data->whole_rect)); + BOOL equal = EqualRect(&data->window_rect, &data->client_rect); CGRect frame = cgrect_from_rect(data->window_rect); data->shaped = FALSE; @@ -1055,7 +1055,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c else { BOOL were_equal = (data->cocoa_view == data->client_cocoa_view); - BOOL now_equal = !memcmp(&data->whole_rect, &data->client_rect, sizeof(data->whole_rect)); + BOOL now_equal = EqualRect(&data->whole_rect, &data->client_rect); if (were_equal && !now_equal) { @@ -1781,7 +1781,7 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * OffsetRect(&rect, -window_rect->left, -window_rect->top); surface = data->surface; - if (!surface || memcmp(&surface->rect, &rect, sizeof(RECT))) + if (!surface || !EqualRect(&surface->rect, &rect)) { data->surface = create_surface(data->cocoa_window, &rect, NULL, TRUE); set_window_surface(data->cocoa_window, data->surface); @@ -1967,7 +1967,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags surface_rect = get_surface_rect(visible_rect); if (data->surface) { - if (!memcmp(&data->surface->rect, &surface_rect, sizeof(surface_rect))) + if (EqualRect(&data->surface->rect, &surface_rect)) { /* existing surface is good enough */ surface_clip_to_visible_rect(data->surface, visible_rect); @@ -2051,7 +2051,7 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, old_client_rect.right - data->client_rect.right == x_offset && old_client_rect.top - data->client_rect.top == y_offset && old_client_rect.bottom - data->client_rect.bottom == y_offset && - !memcmp(&valid_rects[0], &data->client_rect, sizeof(RECT))) + EqualRect(&valid_rects[0], &data->client_rect)) { /* A Cocoa window's bits are moved automatically */ if (!window && (x_offset != 0 || y_offset != 0))

1 0

Aric Stewart : hidclass.sys: Minidriver handling for IRP_MN_REMOVE_DEVICE finished the IRP.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 4163642b99166fad6fbfb97442577e9e7c605744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4163642b99166fad6fbfb9744… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 4 05:35:35 2016 -0500 hidclass.sys: Minidriver handling for IRP_MN_REMOVE_DEVICE finished the IRP. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 7df8374..81514c0 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -256,8 +256,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_REMOVE_DEVICE: { HID_DeleteDevice(&minidriver->minidriver, device); - minidriver->PNPDispatch(device, irp); - break; + return minidriver->PNPDispatch(device, irp); } default: {

1 0

Huw Davies : riched20: Move the wrap context struct into wrap.c .
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: ef2e53f9813a959931aa9ac0cc42d5ba9686941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2e53f9813a959931aa9ac0c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:37 2016 +0100 riched20: Move the wrap context struct into wrap.c . Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 15 --------------- dlls/riched20/wrap.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 261a701..35555a9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -460,19 +460,4 @@ typedef struct tagME_Context ME_TextEditor *editor; } ME_Context; -typedef struct tagME_WrapContext -{ - ME_Style *style; - ME_Context *context; - int nLeftMargin, nRightMargin, nFirstMargin; - int nAvailWidth; - int nRow; - POINT pt; - BOOL bOverflown, bWordWrap; - ME_DisplayItem *pPara; - ME_DisplayItem *pRowStart; - - ME_DisplayItem *pLastSplittableRun; -} ME_WrapContext; - #endif diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 195eb8d..24a7b16 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -33,6 +33,20 @@ WINE_DECLARE_DEBUG_CHANNEL(richedit_check); * - no tabs */ +typedef struct tagME_WrapContext +{ + ME_Style *style; + ME_Context *context; + int nLeftMargin, nRightMargin, nFirstMargin; + int nAvailWidth; + int nRow; + POINT pt; + BOOL bOverflown, bWordWrap; + ME_DisplayItem *pPara; + ME_DisplayItem *pRowStart; + + ME_DisplayItem *pLastSplittableRun; +} ME_WrapContext; static BOOL get_run_glyph_buffers( ME_Run *run ) {

1 0

Huw Davies : riched20: Clearing the insert style should not depend on the event mask.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: df1b51dfa48d14f4e3dfe776c73050e3ad42608e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1b51dfa48d14f4e3dfe776c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:36 2016 +0100 riched20: Clearing the insert style should not depend on the event mask. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1dacdfa..a47930f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1515,9 +1515,6 @@ void ME_SendSelChange(ME_TextEditor *editor) { SELCHANGE sc; - if (!(editor->nEventMask & ENM_SELCHANGE)) - return; - sc.nmhdr.hwndFrom = NULL; sc.nmhdr.idFrom = 0; sc.nmhdr.code = EN_SELCHANGE; @@ -1527,16 +1524,21 @@ void ME_SendSelChange(ME_TextEditor *editor) sc.seltyp |= SEL_TEXT; if (sc.chrg.cpMin < sc.chrg.cpMax+1) /* what were RICHEDIT authors thinking ? */ sc.seltyp |= SEL_MULTICHAR; - TRACE("cpMin=%d cpMax=%d seltyp=%d (%s %s)\n", - sc.chrg.cpMin, sc.chrg.cpMax, sc.seltyp, - (sc.seltyp & SEL_TEXT) ? "SEL_TEXT" : "", - (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); + if (sc.chrg.cpMin != editor->notified_cr.cpMin || sc.chrg.cpMax != editor->notified_cr.cpMax) { ME_ClearTempStyle(editor); editor->notified_cr = sc.chrg; - ITextHost_TxNotify(editor->texthost, sc.nmhdr.code, &sc); + + if (editor->nEventMask & ENM_SELCHANGE) + { + TRACE("cpMin=%d cpMax=%d seltyp=%d (%s %s)\n", + sc.chrg.cpMin, sc.chrg.cpMax, sc.seltyp, + (sc.seltyp & SEL_TEXT) ? "SEL_TEXT" : "", + (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); + ITextHost_TxNotify(editor->texthost, sc.nmhdr.code, &sc); + } } }

1 0

Huw Davies : riched20: Allow selecting the final end-of-paragraph when using the mouse.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 304c8320c9b86b770f98396b86499b200d20b92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=304c8320c9b86b770f98396b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:35 2016 +0100 riched20: Allow selecting the final end-of-paragraph when using the mouse. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 74239af..1dacdfa 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -961,11 +961,13 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, * x & y are pixel positions in virtual coordinates into the rich edit control, * so client coordinates must first be adjusted by the scroll position. * + * If final_eop is TRUE consider the final end-of-paragraph. + * * returns TRUE if the result was exactly under the cursor, otherwise returns * FALSE, and result is set to the closest position to the coordinates. */ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, - ME_Cursor *result, BOOL *is_eol) + ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; BOOL isExact = TRUE; @@ -1001,7 +1003,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, if (!pp) break; p = pp; } - if (p == editor->pBuffer->pLast) + if (p == editor->pBuffer->pLast && !final_eop) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to @@ -1016,10 +1018,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, if( p->type == diStartRow ) return ME_FindRunInRow( editor, p, x, result, is_eol ) && isExact; - result->pRun = ME_FindItemBack(p, diRun); - result->pPara = ME_GetParagraph(result->pRun); - result->nOffset = 0; - assert(result->pRun->member.run.nFlags & MERF_ENDPARA); + ME_SetCursorToEnd(editor, result, TRUE); return FALSE; } @@ -1047,7 +1046,7 @@ BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, } 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, FALSE); if (isExact) *isExact = bResult; return TRUE; } @@ -1130,7 +1129,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) is_selection = ME_IsSelection(editor); is_shift = GetKeyState(VK_SHIFT) < 0; - ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); + ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd, FALSE); if (x >= editor->rcFormat.left || is_shift) { @@ -1190,7 +1189,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) tmp_cursor = editor->pCursors[0]; /* FIXME: do something with the return value of ME_FindPixelPos */ - ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd); + ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd, TRUE); ME_InvalidateSelection(editor); editor->pCursors[0] = tmp_cursor;

1 0

Huw Davies : riched20: Allow selecting to the start / end when using the up / down arrow keys.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 7eb683772931f749cf27fa54d54003214923970d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb683772931f749cf27fa54d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:34 2016 +0100 riched20: Allow selecting to the start / end when using the up / down arrow keys. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b137c5f..74239af 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1237,7 +1237,7 @@ static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) static void -ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) +ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *pOldPara = pCursor->pPara; @@ -1255,8 +1255,12 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) assert(pItem); /* start of the previous row */ pItem = ME_FindItemBack(pItem, diStartRow); - if (!pItem) - return; /* row not found - ignore */ + if (!pItem) /* row not found */ + { + if (extend) + ME_SetCursorToStart(editor, pCursor); + return; + } pNewPara = ME_GetParagraph(pItem); if (pOldPara->member.para.nFlags & MEPF_ROWEND || (pOldPara->member.para.pCell && @@ -1282,8 +1286,12 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) { /* start of the next row */ pItem = ME_FindItemFwd(pRun, diStartRow); - if (!pItem) - return; /* row not found - ignore */ + if (!pItem) /* row not found */ + { + if (extend) + ME_SetCursorToEnd(editor, pCursor, TRUE); + return; + } pNewPara = ME_GetParagraph(pItem); if (pOldPara->member.para.nFlags & MEPF_ROWSTART || (pOldPara->member.para.pCell && @@ -1558,10 +1566,10 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: - ME_MoveCursorLines(editor, &tmp_curs, -1); + ME_MoveCursorLines(editor, &tmp_curs, -1, extend); break; case VK_DOWN: - ME_MoveCursorLines(editor, &tmp_curs, +1); + ME_MoveCursorLines(editor, &tmp_curs, +1, extend); break; case VK_PRIOR: ME_ArrowPageUp(editor, &tmp_curs);

1 0

Huw Davies : riched20: Allow selecting the final end-of-paragraph when using the right arrow key.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 58a48aa79b0f763e44ce29523f26d1ad82a60584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a48aa79b0f763e44ce29523… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:33 2016 +0100 riched20: Allow selecting the final end-of-paragraph when using the right arrow key. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 15 ++++++++------- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/table.c | 2 +- dlls/riched20/undo.c | 2 +- dlls/riched20/writer.c | 5 +---- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 279bdcd..b137c5f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -200,7 +200,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) ME_CursorFromCharOfs(editor, from, &editor->pCursors[1]); editor->pCursors[0] = editor->pCursors[1]; - ME_MoveCursorChars(editor, &editor->pCursors[0], to - from); + ME_MoveCursorChars(editor, &editor->pCursors[0], to - from, FALSE); /* 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; @@ -627,10 +627,11 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } /* Move the cursor nRelOfs characters (either forwards or backwards) + * If final_eop is TRUE, allow moving the cursor to the end of the final eop. * * returns the actual number of characters moved. **/ -int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) { cursor->nOffset += nRelOfs; if (cursor->nOffset < 0) @@ -682,11 +683,11 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) return nRelOfs; } - if (new_offset >= ME_GetTextLength(editor)) + if (new_offset >= ME_GetTextLength(editor) + (final_eop ? 1 : 0)) { /* new offset at the end of the text */ - ME_SetCursorToEnd(editor, cursor, FALSE); - nRelOfs -= new_offset - ME_GetTextLength(editor); + ME_SetCursorToEnd(editor, cursor, final_eop); + nRelOfs -= new_offset - (ME_GetTextLength(editor) + (final_eop ? 1 : 0)); return nRelOfs; } @@ -1547,14 +1548,14 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, -1); else - success = ME_MoveCursorChars(editor, &tmp_curs, -1); + success = ME_MoveCursorChars(editor, &tmp_curs, -1, extend); break; case VK_RIGHT: editor->bCaretAtEnd = FALSE; if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, +1); else - success = ME_MoveCursorChars(editor, &tmp_curs, +1); + success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: ME_MoveCursorLines(editor, &tmp_curs, -1); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 97c2d59..4adc74f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1650,7 +1650,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre int linebreakSize = editor->bEmulateVersion10 ? 2 : 1; ME_Cursor linebreakCursor = *selEnd; - ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize); + ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); if (lastchar[0] == '\r' && (lastchar[1] == '\n' || lastchar[1] == '\0')) { ME_InternalDeleteText(editor, &linebreakCursor, linebreakSize, FALSE); @@ -1805,7 +1805,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { ME_CursorFromCharOfs(editor, nMin - 1, &cursor); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); - ME_MoveCursorChars(editor, &cursor, 1); + ME_MoveCursorChars(editor, &cursor, 1, FALSE); } else { ME_CursorFromCharOfs(editor, nMin, &cursor); } @@ -1881,7 +1881,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { ME_CursorFromCharOfs(editor, nMax + 1, &cursor); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); - ME_MoveCursorChars(editor, &cursor, -1); + ME_MoveCursorChars(editor, &cursor, -1, FALSE); } else { ME_CursorFromCharOfs(editor, nMax, &cursor); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cc1654a..c62b3a4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -178,7 +178,7 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) DECLS void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style) DECLSPEC_HIDDEN; void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; -int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) DECLSPEC_HIDDEN; BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl) DECLSPEC_HIDDEN; int ME_GetCursorOfs(const ME_Cursor *cursor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 77e7b57..c5f0441 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -451,7 +451,7 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, ME_CursorFromCharOfs(reole->editor, pos, &from); to = from; - ME_MoveCursorChars(reole->editor, &to, 1); + ME_MoveCursorChars(reole->editor, &to, 1, FALSE); ME_GetCharFormat(reole->editor, &from, &to, &fmt); switch (propid) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index c22f92a..b834bc7 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -291,7 +291,7 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC ME_DisplayItem *this_para = c->pPara; ME_DisplayItem *end_para; - ME_MoveCursorChars(editor, &c2, *nChars); + ME_MoveCursorChars(editor, &c2, *nChars, FALSE); end_para = c2.pPara; if (c2.pRun->member.run.nFlags & MERF_ENDPARA) { /* End offset might be in the middle of the end paragraph run. diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 7a8c333..582f888 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -349,7 +349,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) ME_Cursor start, end; ME_CursorFromCharOfs(editor, undo->u.set_char_fmt.pos, &start); end = start; - ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len); + ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len, FALSE); ME_SetCharFormat(editor, &start, &end, &undo->u.set_char_fmt.fmt); break; } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a3eaffe..0204215 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -881,11 +881,8 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, ME_Cursor cursor = *start; ME_DisplayItem *prev_para = cursor.pPara; ME_Cursor endCur = cursor; - int actual_chars; - actual_chars = ME_MoveCursorChars(editor, &endCur, nChars); - /* Include the final \r which MoveCursorChars will ignore. */ - if (actual_chars != nChars) endCur.nOffset++; + ME_MoveCursorChars(editor, &endCur, nChars, TRUE); if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE;

1 0

Huw Davies : riched20: Add an option to move the cursor to after the final end-of-paragraph.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: c005b98d9119138f8cfea1b6b5be4f5c78ca8d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c005b98d9119138f8cfea1b6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:32 2016 +0100 riched20: Add an option to move the cursor to after the final end-of-paragraph. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e5c60a0..279bdcd 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -31,11 +31,11 @@ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) cursor->nOffset = 0; } -static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor) +static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL final_eop) { cursor->pPara = editor->pBuffer->pLast->member.para.prev_para; cursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - cursor->nOffset = 0; + cursor->nOffset = final_eop ? cursor->pRun->member.run.len : 0; } @@ -83,7 +83,7 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) int ME_GetTextLength(ME_TextEditor *editor) { ME_Cursor cursor; - ME_SetCursorToEnd(editor, &cursor); + ME_SetCursorToEnd(editor, &cursor, FALSE); return ME_GetCursorOfs(&cursor); } @@ -138,8 +138,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (from == 0 && to == -1) { ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0]); - editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); ME_InvalidateSelection(editor); return len + 1; } @@ -193,7 +192,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (selectionEnd) { - ME_SetCursorToEnd(editor, &editor->pCursors[0]); + ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); editor->pCursors[1] = editor->pCursors[0]; ME_InvalidateSelection(editor); return len; @@ -686,7 +685,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) if (new_offset >= ME_GetTextLength(editor)) { /* new offset at the end of the text */ - ME_SetCursorToEnd(editor, cursor); + ME_SetCursorToEnd(editor, cursor, FALSE); nRelOfs -= new_offset - ME_GetTextLength(editor); return nRelOfs; } @@ -859,7 +858,7 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) /* Select everything with cursor anchored from the start of the text */ editor->nSelectionType = stDocument; ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0]); + ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); break; default: assert(0); } @@ -1383,7 +1382,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) { - ME_SetCursorToEnd(editor, pCursor); + ME_SetCursorToEnd(editor, pCursor, FALSE); editor->bCaretAtEnd = FALSE; } else { ME_DisplayItem *pRun = pCursor->pRun; @@ -1480,7 +1479,7 @@ static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_SetCursorToEnd(editor, pCursor); + ME_SetCursorToEnd(editor, pCursor, FALSE); editor->bCaretAtEnd = FALSE; }

1 0

Huw Davies : riched20: Set the end-of-paragraph run width to that of a space.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 4c322698dad93edccc55c1462e7d8428a3177ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c322698dad93edccc55c1462… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:31 2016 +0100 riched20: Set the end-of-paragraph run width to that of a space. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 778a952..984f8f5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -611,17 +611,16 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i int startx, int *pAscent, int *pDescent) { SIZE size; - int nMaxLen = run->len; + WCHAR spaceW[] = {' ',0}; - if (nLen>nMaxLen) - nLen = nMaxLen; + nLen = min( nLen, run->len ); - /* FIXME the following call also ensures that TEXTMETRIC structure is filled - * this is wasteful for MERF_NONTEXT runs, but that shouldn't matter - * in practice - */ - - if (para->nFlags & MEPF_COMPLEX) + if (run->nFlags & MERF_ENDPARA) + { + nLen = min( nLen, 1 ); + ME_GetTextExtent(c, spaceW, nLen, run->style, &size); + } + else if (para->nFlags & MEPF_COMPLEX) { size.cx = run->nWidth; }

1 0

Hans Leidekker : webservices: Add support for writing WS_BYTES values.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: c8a90e5de9305b3b34c2094c59fa3781d9be8c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a90e5de9305b3b34c2094c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:36 2016 +0200 webservices: Add support for writing WS_BYTES values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 100 ++++++++++++++++++++++------------------ dlls/webservices/writer.c | 75 ++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a90e5de9305b3b34c20…

1 0

← Newer
1
...
38
39
40
41
42
43
44
45
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016