wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillClosedCurve.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: 784fe04994f1558ea67b16990ef2690c8c83ca18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784fe04994f1558ea67b16990… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 7 12:28:01 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillClosedCurve. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 989ecd0..c28ce4b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -487,6 +487,20 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +typedef struct EmfPlusFillClosedCurve +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + float Tension; + DWORD Count; + union + { + EmfPlusPointR7 pointsR[1]; + EmfPlusPoint points[1]; + EmfPlusPointF pointsF[1]; + } PointData; +} EmfPlusFillClosedCurve; + typedef struct EmfPlusFillEllipse { EmfPlusRecordHeader Header; @@ -2982,6 +2996,86 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillClosedCurve: + { + static const UINT fixed_part_size = FIELD_OFFSET(EmfPlusFillClosedCurve, PointData) - + sizeof(EmfPlusRecordHeader); + EmfPlusFillClosedCurve *fill = (EmfPlusFillClosedCurve *)header; + GpSolidFill *solidfill = NULL; + GpFillMode mode; + GpBrush *brush; + UINT size, i; + + if (dataSize <= fixed_part_size) + return InvalidParameter; + + if (fill->Count == 0) + return InvalidParameter; + + if (flags & 0x800) /* P */ + size = (fixed_part_size + sizeof(EmfPlusPointR7) * fill->Count + 3) & ~3; + else if (flags & 0x4000) /* C */ + size = fixed_part_size + sizeof(EmfPlusPoint) * fill->Count; + else + size = fixed_part_size + sizeof(EmfPlusPointF) * fill->Count; + + if (dataSize != size) + return InvalidParameter; + + mode = flags & 0x200 ? FillModeWinding : FillModeAlternate; /* W */ + + if (flags & 0x8000) /* S */ + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & (0x800 | 0x4000)) + { + GpPointF *points = GdipAlloc(fill->Count * sizeof(*points)); + if (points) + { + if (flags & 0x800) /* P */ + { + for (i = 1; i < fill->Count; i++) + { + points[i].X = points[i - 1].X + fill->PointData.pointsR[i].X; + points[i].Y = points[i - 1].Y + fill->PointData.pointsR[i].Y; + } + } + else + { + for (i = 0; i < fill->Count; i++) + { + points[i].X = fill->PointData.points[i].X; + points[i].Y = fill->PointData.points[i].Y; + } + } + + stat = GdipFillClosedCurve2(real_metafile->playback_graphics, brush, + points, fill->Count, fill->Tension, mode); + GdipFree(points); + } + else + stat = OutOfMemory; + } + else + stat = GdipFillClosedCurve2(real_metafile->playback_graphics, brush, + (const GpPointF *)fill->PointData.pointsF, fill->Count, fill->Tension, mode); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeFillEllipse: { EmfPlusFillEllipse *fill = (EmfPlusFillEllipse *)header;

1 0

Alexandre Julliard : user32: Pass the text length explicitly to EDIT_EM_ReplaceSel.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: 9215aabd2ef84821ff3fb81c379c0986e3d9371a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9215aabd2ef84821ff3fb81c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 7 21:20:24 2017 +0100 user32: Pass the text length explicitly to EDIT_EM_ReplaceSel. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 63 ++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ee9b45e..c93d3c3 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -176,7 +176,6 @@ typedef struct (LPARAM)(es->hwndSelf)); \ } while(0) -static const WCHAR empty_stringW[] = {0}; static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap); /********************************************************************* @@ -2560,9 +2559,9 @@ static LRESULT EDIT_EM_GetSel(const EDITSTATE *es, PUINT start, PUINT end) * FIXME: handle ES_NUMBER and ES_OEMCONVERT here * */ -static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit) +static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_replace, UINT strl, + BOOL send_update, BOOL honor_limit) { - UINT strl = strlenW(lpsz_replace); UINT tl = get_text_length(es); UINT utl; UINT s; @@ -3043,7 +3042,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); EDIT_EM_EmptyUndoBuffer(es); - EDIT_EM_ReplaceSel(es, TRUE, utext, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, utext, ulength, TRUE, TRUE); EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); /* send the notification after the selection start and end are set */ EDIT_NOTIFY_PARENT(es, EN_CHANGE); @@ -3077,7 +3076,7 @@ static inline BOOL EDIT_IsInsideDialog(EDITSTATE *es) static void EDIT_WM_Paste(EDITSTATE *es) { HGLOBAL hsrc; - LPWSTR src, new_src, ptr; + LPWSTR src, ptr; int len; /* Protect read-only edit control from modification */ @@ -3087,25 +3086,19 @@ static void EDIT_WM_Paste(EDITSTATE *es) OpenClipboard(es->hwndSelf); if ((hsrc = GetClipboardData(CF_UNICODETEXT))) { src = GlobalLock(hsrc); - + len = strlenW(src); /* Protect single-line edit against pasting new line character */ if (!(es->style & ES_MULTILINE) && ((ptr = strchrW(src, '\n')))) { len = ptr - src; if (len && src[len - 1] == '\r') --len; - new_src = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)); - if (new_src != NULL) { - lstrcpynW(new_src, src, len+1); - EDIT_EM_ReplaceSel(es, TRUE, new_src, TRUE, TRUE); - HeapFree(GetProcessHeap(), 0, new_src); - } - } else - EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); + } + EDIT_EM_ReplaceSel(es, TRUE, src, len, TRUE, TRUE); GlobalUnlock(hsrc); } else if (es->style & ES_PASSWORD) { /* clear selected text in password edit box even with empty clipboard */ - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); } CloseClipboard(); } @@ -3151,7 +3144,7 @@ static inline void EDIT_WM_Clear(EDITSTATE *es) if(es->style & ES_READONLY) return; - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); } @@ -3193,18 +3186,18 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) EDIT_MoveHome(es, FALSE, FALSE); EDIT_MoveDown_ML(es, FALSE); } else { - static const WCHAR cr_lfW[] = {'\r','\n',0}; - EDIT_EM_ReplaceSel(es, TRUE, cr_lfW, TRUE, TRUE); + static const WCHAR cr_lfW[] = {'\r','\n'}; + EDIT_EM_ReplaceSel(es, TRUE, cr_lfW, 2, TRUE, TRUE); } } break; case '\t': if ((es->style & ES_MULTILINE) && !(es->style & ES_READONLY)) { - static const WCHAR tabW[] = {'\t',0}; + static const WCHAR tabW[] = {'\t'}; if (EDIT_IsInsideDialog(es)) break; - EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, tabW, 1, TRUE, TRUE); } break; case VK_BACK: @@ -3241,12 +3234,8 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) if( (es->style & ES_NUMBER) && !( c >= '0' && c <= '9') ) break; - if (!(es->style & ES_READONLY) && (c >= ' ') && (c != 127)) { - WCHAR str[2]; - str[0] = c; - str[1] = '\0'; - EDIT_EM_ReplaceSel(es, TRUE, str, TRUE, TRUE); - } + if (!(es->style & ES_READONLY) && (c >= ' ') && (c != 127)) + EDIT_EM_ReplaceSel(es, TRUE, &c, 1, TRUE, TRUE); break; } return 1; @@ -3904,14 +3893,14 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode) if (text) { TRACE("%s\n", debugstr_w(text)); - EDIT_EM_ReplaceSel(es, FALSE, text, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, text, strlenW(text), FALSE, FALSE); if(!unicode) HeapFree(GetProcessHeap(), 0, textW); } else { TRACE("<NULL>\n"); - EDIT_EM_ReplaceSel(es, FALSE, empty_stringW, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, NULL, 0, FALSE, FALSE); } es->x_offset = 0; es->flags &= ~EF_MODIFIED; @@ -4325,7 +4314,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen + sizeof(WCHAR)); + lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -4334,7 +4323,6 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) if (buflen) ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, buflen); - lpCompStr[buflen/sizeof(WCHAR)] = 0; if (CompFlag & GCS_COMPATTR) { @@ -4371,7 +4359,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) else es->selection_end = es->selection_start; - EDIT_EM_ReplaceSel(es, FALSE, lpCompStr, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, FALSE, lpCompStr, buflen / sizeof(WCHAR), TRUE, TRUE); es->composition_len = abs(es->composition_start - es->selection_end); es->selection_start = es->composition_start; @@ -4392,7 +4380,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen+sizeof(WCHAR)); + lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); @@ -4400,7 +4388,6 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) } ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, buflen); - lpResultStr[buflen/sizeof(WCHAR)] = 0; /* check for change in composition start */ if (es->selection_end < es->composition_start) @@ -4408,7 +4395,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) es->selection_start = es->composition_start; es->selection_end = es->composition_start + es->composition_len; - EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, buflen / sizeof(WCHAR), TRUE, TRUE); es->composition_start = es->selection_end; es->composition_len = 0; @@ -4422,7 +4409,7 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) if (es->composition_len == 0 && es->selection_start != es->selection_end) { - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); es->composition_start = es->selection_end; } @@ -4587,7 +4574,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) EDIT_SetRectNP(es, &clientRect); if (name && *name) { - EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, name, strlenW(name), FALSE, FALSE); /* if we insert text to the editline, the text scrolls out * of the window, as the caret is placed after the insert * pos normally; thus we reset es->selection... to 0 and @@ -4771,7 +4758,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } - EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, strlenW(textW), TRUE, TRUE); result = 1; if(!unicode) @@ -5175,7 +5162,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_IME_ENDCOMPOSITION: if (es->composition_len > 0) { - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); es->selection_end = es->selection_start; es->composition_len= 0; }

1 0

Rafał Harabień : user32: Protect single-line edit against pasting new line character.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: 6653d430236d829ab499be858d3ef4fdccb0517d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6653d430236d829ab499be858… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Sun Nov 5 19:28:38 2017 +0100 user32: Protect single-line edit against pasting new line character. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 18 +++++++++-- dlls/user32/tests/edit.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 00a7fba..ee9b45e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3077,7 +3077,8 @@ static inline BOOL EDIT_IsInsideDialog(EDITSTATE *es) static void EDIT_WM_Paste(EDITSTATE *es) { HGLOBAL hsrc; - LPWSTR src; + LPWSTR src, new_src, ptr; + int len; /* Protect read-only edit control from modification */ if(es->style & ES_READONLY) @@ -3086,7 +3087,20 @@ static void EDIT_WM_Paste(EDITSTATE *es) OpenClipboard(es->hwndSelf); if ((hsrc = GetClipboardData(CF_UNICODETEXT))) { src = GlobalLock(hsrc); - EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); + + /* Protect single-line edit against pasting new line character */ + if (!(es->style & ES_MULTILINE) && ((ptr = strchrW(src, '\n')))) { + len = ptr - src; + if (len && src[len - 1] == '\r') + --len; + new_src = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)); + if (new_src != NULL) { + lstrcpynW(new_src, src, len+1); + EDIT_EM_ReplaceSel(es, TRUE, new_src, TRUE, TRUE); + HeapFree(GetProcessHeap(), 0, new_src); + } + } else + EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); GlobalUnlock(hsrc); } else if (es->style & ES_PASSWORD) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b9aa1c9..d842dce 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -867,7 +867,7 @@ static LRESULT CALLBACK edit3_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR return DefWindowProcA(hWnd, msg, wParam, lParam); } -/* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notificatisons sent in response +/* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notifications sent in response * to these messages. */ static void test_edit_control_3(void) @@ -969,6 +969,19 @@ static void test_edit_control_3(void) ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); test_notify(1, 0, 1); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); @@ -2831,6 +2844,74 @@ static void test_EM_GETHANDLE(void) DestroyWindow(hEdit); } +static void test_paste(void) +{ + HWND hEdit, hMultilineEdit; + HANDLE hmem, hmem_ret; + char *buffer; + int r, len; + static const char *str = "this is a simple text"; + static const char *str2 = "first line\r\nsecond line"; + + hEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hMultilineEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + + /* Prepare clipboard data with simple text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste single line */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str) == len, "expected %d, got %d\n", strlen(str), len); + + /* Prepare clipboard data with multiline text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str2); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste multiline text in singleline edit - should be cut */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen("first line") == len, "expected %d, got %d\n", strlen("first line"), len); + + /* Paste multiline text in multiline edit */ + SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); + len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str2) == len, "expected %d, got %d\n", strlen(str2), len); + + /* Cleanup */ + DestroyWindow(hEdit); + DestroyWindow(hMultilineEdit); +} START_TEST(edit) { @@ -2871,6 +2952,7 @@ START_TEST(edit) win_skip("EndMenu is not available\n"); test_EM_GETHANDLE(); + test_paste(); UnregisterWindowClasses(); }

1 0

Rafał Harabień : riched20: Protect read-only Richedit against pasting and cutting data.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: 55412553e8535386e2bcbfa538a9e65dbe9536f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55412553e8535386e2bcbfa53… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Mon Nov 6 23:12:23 2017 +0100 riched20: Protect read-only Richedit against pasting and cutting data. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 62 ++++++++++++++++++++++++-------------------- dlls/riched20/tests/editor.c | 15 +++++++++++ 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a7b1bc7..88e3d8e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2294,6 +2294,14 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO struct paste_format *format; IDataObject *data; + /* Protect read-only edit control from modification */ + if (editor->styleFlags & ES_READONLY) + { + if (!check_only) + MessageBeep(MB_ICONERROR); + return FALSE; + } + init_paste_formats(); if (ps && ps->dwAspect != DVASPECT_CONTENT) @@ -2351,6 +2359,30 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) return SUCCEEDED(hr); } +static BOOL copy_or_cut(ME_TextEditor *editor, BOOL cut) +{ + BOOL result; + int offs, num_chars; + int start_cursor = ME_GetSelectionOfs(editor, &offs, &num_chars); + ME_Cursor *sel_start = &editor->pCursors[start_cursor]; + + if (cut && (editor->styleFlags & ES_READONLY)) + { + MessageBeep(MB_ICONERROR); + return FALSE; + } + + num_chars -= offs; + result = ME_Copy(editor, sel_start, num_chars); + if (result && cut) + { + ME_InternalDeleteText(editor, sel_start, num_chars, FALSE); + ME_CommitUndo(editor); + ME_UpdateRepaint(editor, TRUE); + } + return result; +} + /* helper to send a msg filter notification */ static BOOL ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) @@ -2645,22 +2677,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'C': case 'X': if (ctrl_is_down) - { - BOOL result; - int nOfs, nChars; - int nStartCur = ME_GetSelectionOfs(editor, &nOfs, &nChars); - ME_Cursor *selStart = &editor->pCursors[nStartCur]; - - nChars -= nOfs; - result = ME_Copy(editor, selStart, nChars); - if (result && nKey == 'X') - { - ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); - } - return result; - } + return copy_or_cut(editor, nKey == 'X'); break; case 'Z': if (ctrl_is_down) @@ -4068,19 +4085,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_CUT: case WM_COPY: - { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); - int nChars = nTo - nFrom; - ME_Cursor *selStart = &editor->pCursors[nStartCur]; - - if (ME_Copy(editor, selStart, nChars) && msg == WM_CUT) - { - ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); - } + copy_or_cut(editor, msg == WM_CUT); return 0; - } case WM_GETTEXTLENGTH: { GETTEXTLENGTHEX how; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 20189c6..a19ec85 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5498,6 +5498,21 @@ static void test_WM_PASTE(void) "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); + /* Paste into read-only control */ + result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer,"cut\r\n"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + + /* Cut from read-only control */ + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, WM_CUT, 0, 0); + result = strcmp(buffer,"cut\r\n"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + DestroyWindow(hwndRichEdit); }

1 0

Stefan Dösinger : d3d9/tests: Windows 10 17.09 added an undocumented query type.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: d334097c0947fdd8dd2466460128ce85c9c9ab01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d334097c0947fdd8dd2466460… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 6 19:03:39 2017 +0100 d3d9/tests: Windows 10 17.09 added an undocumented query type. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/query.c | 6 +++++- dlls/d3d9/tests/device.c | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 335a960..df7eb6e 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -187,7 +187,11 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER if (type > D3DQUERYTYPE_MEMORYPRESSURE) { - WARN("Invalid query type %#x.\n", type); + if (type == 0x16) + FIXME("Undocumented query %#x created.\n", type); + else + WARN("Invalid query type %#x.\n", type); + return D3DERR_NOTAVAILABLE; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8f9985c..82ced83 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5561,7 +5561,9 @@ static void test_query_support(void) for (i = 0; i < 40; ++i) { - if (D3DQUERYTYPE_VCACHE <= i && i <= D3DQUERYTYPE_MEMORYPRESSURE) + /* Windows 10 17.09 (build 16299.19) added an undocumented query with an enum value of 0x16 (=22). + * It returns D3D_OK when asking for support and E_FAIL when trying to actually create it. */ + if ((D3DQUERYTYPE_VCACHE <= i && i <= D3DQUERYTYPE_MEMORYPRESSURE) || i == 0x16) continue; hr = IDirect3DDevice9_CreateQuery(device, i, NULL);

1 0

Piotr Caban : vbscript: Add UBound implementation.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: e95492bc83c65b1d84c4976338be909a3d05bf64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95492bc83c65b1d84c497633… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 6 16:53:08 2017 +0100 vbscript: Add UBound implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 10 ++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f523820..a5df54a 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -822,8 +822,40 @@ static HRESULT Global_LBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_UBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SAFEARRAY *sa; + HRESULT hres; + LONG ubound; + int dim; + + assert(args_cnt == 1 || args_cnt == 2); + + TRACE("%s %s\n", debugstr_variant(arg), args_cnt == 2 ? debugstr_variant(arg + 1) : "1"); + + switch(V_VT(arg)) { + case VT_VARIANT|VT_ARRAY: + sa = V_ARRAY(arg); + break; + case VT_VARIANT|VT_ARRAY|VT_BYREF: + sa = *V_ARRAYREF(arg); + break; + default: + FIXME("arg %s not supported\n", debugstr_variant(arg)); + return E_NOTIMPL; + } + + if(args_cnt == 2) { + hres = to_int(arg + 1, &dim); + if(FAILED(hres)) + return hres; + }else { + dim = 1; + } + + hres = SafeArrayGetUBound(sa, dim, &ubound); + if(FAILED(hres)) + return hres; + + return return_int(res, ubound); } static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -2256,7 +2288,7 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_RND, Global_Rnd, 0, 1}, {DISPID_GLOBAL_TIMER, Global_Timer, 0, 0}, {DISPID_GLOBAL_LBOUND, Global_LBound, 0, 1}, - {DISPID_GLOBAL_UBOUND, Global_UBound, 0, 1}, + {DISPID_GLOBAL_UBOUND, Global_UBound, 0, 1, 2}, {DISPID_GLOBAL_RGB, Global_RGB, 0, 3}, {DISPID_GLOBAL_LEN, Global_Len, 0, 1}, {DISPID_GLOBAL_LENB, Global_LenB, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index baa0553..8ebbfb6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -227,6 +227,16 @@ new_array = x x(0) = "new value" Call ok(new_array(0) = "a1", "new_array(0) = " & new_array(0)) +Call ok(getVT(UBound(x)) = "VT_I4", "getVT(UBound(x)) = " & getVT(UBound(x))) +Call ok(UBound(x) = 2, "UBound(x) = " & UBound(x)) +Call ok(getVT(UBound(x, 1)) = "VT_I4", "getVT(UBound(x, 1)) = " & getVT(UBound(x, 1))) +Call ok(UBound(x, 1) = 2, "UBound(x) = " & UBound(x, 1)) + +Dim arr2(2, 4) +Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) +Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x)) +Call ok(UBound(arr2, 2) = 4, "UBound(x) = " & UBound(x)) + Dim newObject Set newObject = New ValClass newObject.myval = 1

1 0

Rosanne DiMesio : Show/ hide What doesnt work and Workarounds textareas based on user input
by Jeremy Newman 07 Nov '17

07 Nov '17

Module: appdb Branch: master Commit: 88f3a7acddf72c1660af7b873ed5b219ea0711ae URL: http://source.winehq.org/git/appdb.git/?a=commit;h=88f3a7acddf72c1660af7b87… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Nov 6 11:13:13 2017 -0600 Show/hide What doesnt work and Workarounds textareas based on user input Hides these textareas by default and only shows them if the user responds "Yes" to the accompanying yes/no question. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/include/testData.php b/include/testData.php index ad4dea9..1083cfb 100644 --- a/include/testData.php +++ b/include/testData.php @@ -858,44 +858,51 @@ class testData{ // What Does not work echo '<tr valign=top><td><b>What does not work</b></td>',"\n"; echo '<td>'; - echo 'Were there any problems that do not exist in Windows? <i>If yes, describe the problems in the box below.</i><br>'; + echo 'Were there any problems that do not exist in Windows? <br>'; if(isset($this->sHasProblems)) { if($this->sHasProblems == "Yes") { - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="Yes" checked>Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="No">No</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=true name="sHasProblems" value="Yes" checked>Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=false name="sHasProblems" value="No">No</label>'; }else{ - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="No" checked>No</label>'; + echo '<label class="radio-inline"><input type="radio"data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=true name="sHasProblems" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=false name="sHasProblems" value="No" checked>No</label>'; } } else { - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="No">No</label><br>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=true name="sHasProblems" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=false name="sHasProblems" value="No">No</label>'; }; + echo '<div id="whatdoesnt" style="display:none">'; + echo '<i>Describe the problem(s) in the box below.</i><br>'; echo '<p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">'; echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n"; + echo '</div>'; // Workarounds echo '<tr valign=top><td><b>Workarounds</b></td>',"\n"; echo '<td>'; - echo 'Were any workarounds used for problems that do not exist in Windows? <i>If yes, describe the workaround(s) in the box below.</i><br>'; + echo 'Were any workarounds used for problems that do not exist in Windows? <br>'; if(isset($this->sUsedWorkaround)) { if($this->sUsedWorkaround == "Yes") { - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="Yes" checked>Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="No">No</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=true name="sUsedWorkaround" value="Yes" checked>Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=false name="sUsedWorkaround" value="No">No</label>'; }else{ - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="No" checked>No</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=true name="sUsedWorkaround" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=false name="sUsedWorkaround" value="No" checked>No</label>'; } } else { - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="No">No</label><br>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=true name="sUsedWorkaround" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=false name="sUsedWorkaround" value="No">No</label><br>'; }; + + echo '<div id="workarounds" style="display:none">'; + echo '<i>Describe the workaround(s) in the box below.</i><br>'; echo '<textarea cols="80" rows="20" id="Test4" name="shWorkarounds" class="wysiwyg">'; echo $this->shWorkarounds.'</textarea></p></td></tr>',"\n"; + echo '</div>'; // What was not tested echo '<tr valign=top><td><b>What was not tested</b></td>',"\n";

1 0

Rosanne DiMesio : Show/hide div based on radio button clicks
by Jeremy Newman 07 Nov '17

07 Nov '17

Module: appdb Branch: master Commit: 622dd64c06406c30f40148b33227cc4da1aa78db URL: http://source.winehq.org/git/appdb.git/?a=commit;h=622dd64c06406c30f40148b3… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Nov 6 11:11:44 2017 -0600 Show/hide div based on radio button clicks Adds javascript function that will be used to show or hide the test report form textareas that have radio button yes/no questions (currently the What does not work and Workarounds fields). Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- js/utils.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/js/utils.js b/js/utils.js index 0fdcb92..b4adc9a 100644 --- a/js/utils.js +++ b/js/utils.js @@ -222,9 +222,19 @@ $(document).ready(function() $(this).collapse('show'); } }); - - // HTML editor (redactor loader) + + /* Show/hide div based on radio button clicks. */ + $('input[type=radio][data-toggle=radioshow]').click(function(){ + if($(this).data("showdiv") == true) { + $($(this).data("target")).show(); + } + else if($(this).data("showdiv") == false) { + $($(this).data("target")).hide(); + } + }); + $('[data-toggle="radioshow"]:checked').trigger('click'); + // HTML editor (redactor loader) });

1 0

Alex Henrie : kernel32/tests: Detect and handle a redirected stdin.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: f962bb0039c87c084214ca0bd4f40693db376195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f962bb0039c87c084214ca0bd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 3 11:43:20 2017 +0100 kernel32/tests: Detect and handle a redirected stdin. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a14bc45..926c052 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2582,6 +2582,11 @@ static void test_ReadConsole(void) SetLastError(0xdeadbeef); ret = GetFileSize(std_input, NULL); + if (GetLastError() == 0xdeadbeef) + { + skip("stdin is redirected\n"); + return; + } ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */

1 0

Gerald Pfeifer : advapi32/tests: Fix two clang warnings in test_LookupAccount SID_NAME_USE being out of range.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 50fe77a35821b852f0b0a51aee8838f33541d5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fe77a35821b852f0b0a51ae… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 5 10:46:22 2017 +0100 advapi32/tests: Fix two clang warnings in test_LookupAccount SID_NAME_USE being out of range. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d41e42e..73fd752 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2534,7 +2534,7 @@ static void test_LookupAccountName(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(sid_size != 0, "Expected non-zero sid size\n"); ok(domain_size != 0, "Expected non-zero domain size\n"); - ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + ok(sid_use == (SID_NAME_USE)0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); sid_save = sid_size; domain_save = domain_size; @@ -2621,7 +2621,7 @@ static void test_LookupAccountName(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(sid_size != 0, "Expected non-zero sid size\n"); ok(domain_size != 0, "Expected non-zero domain size\n"); - ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + ok(sid_use == (SID_NAME_USE)0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); psid = HeapAlloc(GetProcessHeap(), 0, sid_size); domain = HeapAlloc(GetProcessHeap(), 0, domain_size);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
44
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 November 2017