May 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : riched20: Implement SetText for regular range.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: d27234617cbcf1bc0f9ecefe7087fb928b1ecb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27234617cbcf1bc0f9ecefe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 00:45:25 2015 +0300 riched20: Implement SetText for regular range. --- dlls/riched20/richole.c | 73 ++++++++++++++++++++++++++++++++++-- dlls/riched20/tests/richole.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a34c210..06ff9aa 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -201,6 +201,10 @@ typedef union { BSTR str; } textfont_prop_val; +enum range_update_op { + RANGE_UPDATE_DELETE +}; + typedef struct IRichEditOleImpl { IUnknown IUnknown_inner; IRichEditOle IRichEditOle_iface; @@ -304,6 +308,35 @@ static inline ITextParaImpl *impl_from_ITextPara(ITextPara *iface) static HRESULT create_textfont(ITextRange*, const ITextFontImpl*, ITextFont**); static HRESULT create_textpara(ITextRange*, ITextPara**); +static void textranges_update_ranges(IRichEditOleImpl *reole, LONG start, LONG end, enum range_update_op op) +{ + ITextRangeImpl *range; + + LIST_FOR_EACH_ENTRY(range, &reole->rangelist, ITextRangeImpl, entry) { + switch (op) + { + case RANGE_UPDATE_DELETE: + /* range fully covered by deleted range - collapse to insertion point */ + if (range->start >= start && range->end <= end) + range->start = range->end = start; + /* deleted range cuts from the right */ + else if (range->start < start && range->end <= end) + range->end = start; + /* deleted range cuts from the left */ + else if (range->start >= start && range->end > end) { + range->start = start; + range->end -= end - start; + } + /* deleted range cuts within */ + else + range->end -= end - start; + break; + default: + FIXME("unknown update op, %d\n", op); + } + } +} + static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, textfont_prop_val *left, textfont_prop_val *right) { @@ -1376,14 +1409,48 @@ static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *pbstr) return E_NOTIMPL; } -static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr) +static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_TextEditor *editor; + ME_Cursor cursor; + ME_Style *style; + int len; + + TRACE("(%p)->(%s)\n", This, debugstr_w(str)); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + editor = This->reOle->editor; + + /* delete only where's something to delete */ + if (This->start != This->end) { + ME_CursorFromCharOfs(editor, This->start, &cursor); + ME_InternalDeleteText(editor, &cursor, This->end - This->start, FALSE); + } + + if (!str || !*str) { + /* will update this range as well */ + textranges_update_ranges(This->reOle, This->start, This->end, RANGE_UPDATE_DELETE); + return S_OK; + } + + /* it's safer not to rely on stored BSTR length */ + len = strlenW(str); + cursor = editor->pCursors[0]; + ME_CursorFromCharOfs(editor, This->start, &editor->pCursors[0]); + style = ME_GetInsertStyle(editor, 0); + ME_InsertTextFromCursor(editor, 0, str, len, style); + ME_ReleaseStyle(style); + editor->pCursors[0] = cursor; + + if (len < This->end - This->start) + textranges_update_ranges(This->reOle, This->start + len, This->end, RANGE_UPDATE_DELETE); + else + This->end = len - This->start; + + return S_OK; } static HRESULT range_GetChar(ME_TextEditor *editor, ME_Cursor *cursor, LONG *pch) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index adb96c3..7d90a98 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2401,6 +2401,92 @@ todo_wine release_interfaces(&hwnd, &reOle, &doc, NULL); } +static void test_SetText(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + static const WCHAR textW[] = {'a','b','c','d','e','f','g','h','i',0}; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextRange *range, *range2; + LONG value; + HRESULT hr; + HWND hwnd; + BSTR str; + + create_interfaces(&hwnd, &reOle, &doc, NULL); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextDocument_Range(doc, 0, 4, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = 1; + hr = ITextRange_GetStart(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 4, "got %d\n", value); + + hr = ITextRange_SetText(range, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = 1; + hr = ITextRange_GetEnd(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + + str = SysAllocString(textW); + hr = ITextRange_SetText(range, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = 1; + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 9, "got %d\n", value); + + value = 1; + hr = ITextRange_GetStart(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + + str = SysAllocStringLen(NULL, 0); + hr = ITextRange_SetText(range, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + value = 1; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + SysFreeString(str); + + ITextRange_Release(range2); + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_SetText(range, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + str = SysAllocStringLen(NULL, 0); + hr = ITextRange_SetText(range, str); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + SysFreeString(str); + + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -2427,4 +2513,5 @@ START_TEST(richole) test_dispatch(); test_ITextFont(); test_Delete(); + test_SetText(); }

1 0

Nikolay Sivov : riched20: Implement SetText() for selection range.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: 251e1685909d6b77e04fdcf4ca0aee06b8f3f67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=251e1685909d6b77e04fdcf4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 01:17:41 2015 +0300 riched20: Implement SetText() for selection range. --- dlls/riched20/editor.c | 45 ++++++++++++++++++++++++++------------------- dlls/riched20/editor.h | 1 + dlls/riched20/richole.c | 18 +++++++++++++++--- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3ed06ef..8d878a4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3134,6 +3134,30 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM } } +void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) +{ + int from, to, nStartCursor; + ME_Style *style; + + nStartCursor = ME_GetSelectionOfs(editor, &from, &to); + style = ME_GetSelectionInsertStyle(editor); + ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); + ME_InsertTextFromCursor(editor, 0, str, len, style); + ME_ReleaseStyle(style); + /* drop temporary style if line end */ + /* + * FIXME question: does abc\n mean: put abc, + * clear temp style, put \n? (would require a change) + */ + if (len>0 && str[len-1] == '\n') + ME_ClearTempStyle(editor); + ME_CommitUndo(editor); + ME_UpdateSelectionLinkAttribute(editor); + if (!can_undo) + ME_EmptyUndoStack(editor); + ME_UpdateRepaint(editor, FALSE); +} + #define UNSUPPORTED_MSG(e) \ case e: \ FIXME(#e ": stub\n"); \ @@ -3609,31 +3633,14 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_REPLACESEL: { - int from, to, nStartCursor; - ME_Style *style; int len = 0; LONG codepage = unicode ? CP_UNICODE : CP_ACP; LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &len); + TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); - nStartCursor = ME_GetSelectionOfs(editor, &from, &to); - style = ME_GetSelectionInsertStyle(editor); - ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); - ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_ReleaseStyle(style); - /* drop temporary style if line end */ - /* - * FIXME question: does abc\n mean: put abc, - * clear temp style, put \n? (would require a change) - */ - if (len>0 && wszText[len-1] == '\n') - ME_ClearTempStyle(editor); + ME_ReplaceSel(editor, !!wParam, wszText, len); ME_EndToUnicode(codepage, wszText); - ME_CommitUndo(editor); - ME_UpdateSelectionLinkAttribute(editor); - if (!wParam) - ME_EmptyUndoStack(editor); - ME_UpdateRepaint(editor, FALSE); return len; } case EM_SCROLLCARET: diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b3691c8..3e42ed8 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -262,6 +262,7 @@ void ME_RTFTblAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; +void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 06ff9aa..14c4c8e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -3860,14 +3860,26 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr) return S_OK; } -static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr) +static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR str) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ME_TextEditor *editor; + int len, to, from; + + TRACE("(%p)->(%s)\n", This, debugstr_w(str)); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + editor = This->reOle->editor; + len = strlenW(str); + ME_GetSelectionOfs(editor, &from, &to); + ME_ReplaceSel(editor, FALSE, str, len); + + if (len < to - from) + textranges_update_ranges(This->reOle, from, len, RANGE_UPDATE_DELETE); + + return S_OK; } static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch)

1 0

Jactry Zeng : ntdll/tests: Test opening a directory with NULL ObjectName.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: c9e1b6fb575d0d591e0683e0c8825d741b60ba50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e1b6fb575d0d591e0683e0c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed May 27 11:12:53 2015 +0800 ntdll/tests: Test opening a directory with NULL ObjectName. --- dlls/ntdll/tests/file.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index fb31b3a..2df0edc 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -297,9 +297,10 @@ static void create_file_test(void) static void open_file_test(void) { + static const WCHAR fooW[] = {'f','o','o',0}; NTSTATUS status; - HANDLE dir, root, handle; - WCHAR path[MAX_PATH]; + HANDLE dir, root, handle, file; + WCHAR path[MAX_PATH], tmpfile[MAX_PATH]; BYTE data[1024]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; @@ -426,6 +427,33 @@ static void open_file_test(void) CloseHandle( dir ); CloseHandle( root ); + + GetTempPathW( MAX_PATH, path ); + GetTempFileNameW( path, fooW, 0, tmpfile ); + pRtlDosPathNameToNtPathName_U( tmpfile, &nameW, NULL, NULL ); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = pNtOpenFile( &file, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + + nameW.Length = 0; + nameW.Buffer = NULL; + attr.RootDirectory = file; + attr.ObjectName = &nameW; + status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); + todo_wine ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); + + CloseHandle( file ); + CloseHandle( root ); + DeleteFileW( tmpfile ); } static void delete_file_test(void)

1 0

Alexandre Julliard : user32: Remove some unnecessary clipboard helper functions.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: 7ab517c3c696a7f289837173cc3ec1f4d4526810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab517c3c696a7f289837173c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 17:42:59 2015 +0900 user32: Remove some unnecessary clipboard helper functions. --- dlls/user32/clipboard.c | 84 ++++++++++++++----------------------------------- 1 file changed, 24 insertions(+), 60 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index eb9f559..de1ec60 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -61,8 +61,6 @@ typedef struct { HWND hWndOpen; HWND hWndOwner; - HWND hWndViewer; - UINT seqno; UINT flags; } CLIPBOARDINFO, *LPCLIPBOARDINFO; @@ -111,8 +109,6 @@ static BOOL CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) { cbInfo->hWndOpen = wine_server_ptr_handle( reply->old_clipboard ); cbInfo->hWndOwner = wine_server_ptr_handle( reply->old_owner ); - cbInfo->hWndViewer = wine_server_ptr_handle( reply->old_viewer ); - cbInfo->seqno = reply->seqno; cbInfo->flags = reply->flags; } } @@ -149,45 +145,6 @@ BOOL CLIPBOARD_ReleaseOwner(void) /************************************************************************** - * CLIPBOARD_OpenClipboard - */ -static BOOL CLIPBOARD_OpenClipboard(HWND hWnd) -{ - BOOL bRet; - - SERVER_START_REQ( set_clipboard_info ) - { - req->flags = SET_CB_OPEN; - req->clipboard = wine_server_user_handle( hWnd ); - bRet = !wine_server_call( req ); - } - SERVER_END_REQ; - - return bRet; -} - - -/************************************************************************** - * CLIPBOARD_CloseClipboard - */ -static BOOL CLIPBOARD_CloseClipboard(void) -{ - BOOL bRet; - - TRACE(" Changed=%d\n", bCBHasChanged); - - SERVER_START_REQ( set_clipboard_info ) - { - req->flags = SET_CB_CLOSE; - if (bCBHasChanged) req->flags |= SET_CB_SEQNO; - bRet = !wine_server_call_err( req ); - } - SERVER_END_REQ; - - return bRet; -} - -/************************************************************************** * CLIPBOARD_SetClipboardViewer */ static HWND CLIPBOARD_SetClipboardViewer( HWND hWnd ) @@ -259,7 +216,13 @@ BOOL WINAPI OpenClipboard( HWND hWnd ) TRACE("(%p)...\n", hWnd); - bRet = CLIPBOARD_OpenClipboard(hWnd); + SERVER_START_REQ( set_clipboard_info ) + { + req->flags = SET_CB_OPEN; + req->clipboard = wine_server_user_handle( hWnd ); + bRet = !wine_server_call( req ); + } + SERVER_END_REQ; TRACE(" returning %i\n", bRet); @@ -272,28 +235,29 @@ BOOL WINAPI OpenClipboard( HWND hWnd ) */ BOOL WINAPI CloseClipboard(void) { - BOOL bRet = FALSE; + HWND viewer = 0; + BOOL ret; TRACE("() Changed=%d\n", bCBHasChanged); - if (CLIPBOARD_CloseClipboard()) + SERVER_START_REQ( set_clipboard_info ) { - if (bCBHasChanged) - { - HWND hWndViewer = GetClipboardViewer(); - - USER_Driver->pEndClipboardUpdate(); - - bCBHasChanged = FALSE; + req->flags = SET_CB_CLOSE; + if (bCBHasChanged) req->flags |= SET_CB_SEQNO; + if ((ret = !wine_server_call_err( req ))) + viewer = wine_server_ptr_handle( reply->old_viewer ); + } + SERVER_END_REQ; - if (hWndViewer) - SendNotifyMessageW(hWndViewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); - } + if (!ret) return FALSE; - bRet = TRUE; + if (bCBHasChanged) + { + USER_Driver->pEndClipboardUpdate(); + bCBHasChanged = FALSE; + if (viewer) SendNotifyMessageW(viewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); } - - return bRet; + return TRUE; } @@ -326,7 +290,7 @@ BOOL WINAPI EmptyClipboard(void) * this before acquiring the selection so that when we do acquire the * selection and the selection loser gets notified, it can check if * it has lost the Wine clipboard ownership. If it did then it knows - * that a WM_DESTORYCLIPBOARD has already been sent. Otherwise it + * that a WM_DESTROYCLIPBOARD has already been sent. Otherwise it * lost the selection to a X app and it should send the * WM_DESTROYCLIPBOARD itself. */ CLIPBOARD_SetClipboardOwner(cbinfo.hWndOpen);

1 0

Nikolay Sivov : dwrite/tests: Some tests for control characters handling.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: 39d71c52ef7839fe7daad97b009d029b71f691ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d71c52ef7839fe7daad97b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 12:53:32 2015 +0300 dwrite/tests: Some tests for control characters handling. --- dlls/dwrite/tests/analyzer.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/layout.c | 44 ++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 43c2a66..ffa4aed 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1192,15 +1192,18 @@ static void test_GetGlyphs(void) { static const WCHAR test1W[] = {'<','B',' ','C',0}; static const WCHAR test2W[] = {'<','B','\t','C',0}; + static const WCHAR test3W[] = {0x202a,0x202c,0}; DWRITE_SHAPING_GLYPH_PROPERTIES shapingprops[20]; DWRITE_SHAPING_TEXT_PROPERTIES props[20]; UINT32 maxglyphcount, actual_count; IDWriteTextAnalyzer *analyzer; IDWriteFontFace *fontface; DWRITE_SCRIPT_ANALYSIS sa; + DWRITE_GLYPH_OFFSET offsets[10]; UINT16 clustermap[10]; UINT16 glyphs1[10]; UINT16 glyphs2[10]; + FLOAT advances[10]; HRESULT hr; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); @@ -1262,6 +1265,55 @@ if (0) { ok(actual_count == 4, "got %d\n", actual_count); ok(glyphs1[0] != glyphs2[0], "got %d\n", glyphs1[0]); + /* embedded control codes, with unknown script id 0 */ + actual_count = 0; + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test3W, lstrlenW(test3W), fontface, FALSE, TRUE, &sa, NULL, + NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(actual_count == 2, "got %d\n", actual_count); + ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); + ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); + ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); + ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); + ok(shapingprops[1].isZeroWidthSpace == 0, "got %d\n", shapingprops[1].isZeroWidthSpace); + ok(clustermap[0] == 0, "got %d\n", clustermap[0]); + ok(clustermap[1] == 1, "got %d\n", clustermap[1]); + + memset(advances, 0, sizeof(advances)); + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, test3W, clustermap, props, lstrlenW(test3W), + glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, + NULL, 0, advances, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advances[0] == 10.0, "got %.2f\n", advances[0]); + ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + + /* embedded control codes with proper script */ + sa.script = 0; + get_script_analysis(test3W, &sa); + ok(sa.script != 0, "got %d\n", sa.script); + actual_count = 0; + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test3W, lstrlenW(test3W), fontface, FALSE, FALSE, &sa, NULL, + NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(actual_count == 2, "got %d\n", actual_count); + ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); + ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); + ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); + ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); + ok(shapingprops[1].isZeroWidthSpace == 0, "got %d\n", shapingprops[1].isZeroWidthSpace); + ok(clustermap[0] == 0, "got %d\n", clustermap[0]); + ok(clustermap[1] == 1, "got %d\n", clustermap[1]); + + memset(advances, 0, sizeof(advances)); + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, test3W, clustermap, props, lstrlenW(test3W), + glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, + NULL, 0, advances, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advances[0] == 10.0, "got %.2f\n", advances[0]); + ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + IDWriteTextAnalyzer_Release(analyzer); IDWriteFontFace_Release(fontface); } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 54ebeed..5711cb3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -990,6 +990,7 @@ static void test_typography(void) static void test_GetClusterMetrics(void) { + static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[4]; @@ -1096,8 +1097,49 @@ todo_wine ok(inline_metrics.width > 0.0 && inline_metrics.width == metrics[0].width, "got %.2f, expected %.2f\n", inline_metrics.width, metrics[0].width); - IDWriteInlineObject_Release(trimm); IDWriteTextLayout_Release(layout); + + /* text with non-visual control codes */ + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 3, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* bidi control codes take a separate cluster */ + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 3, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 3, "got %u\n", count); + +todo_wine + ok(metrics[0].width == 0.0, "got %.2f\n", metrics[0].width); + ok(metrics[0].length == 1, "got %d\n", metrics[0].length); + ok(metrics[0].canWrapLineAfter == 0, "got %d\n", metrics[0].canWrapLineAfter); + ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); + ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); + ok(metrics[0].isSoftHyphen == 0, "got %d\n", metrics[0].isSoftHyphen); + ok(metrics[0].isRightToLeft == 0, "got %d\n", metrics[0].isRightToLeft); + +todo_wine + ok(metrics[1].width == 0.0, "got %.2f\n", metrics[1].width); + ok(metrics[1].length == 1, "got %d\n", metrics[1].length); + ok(metrics[1].canWrapLineAfter == 0, "got %d\n", metrics[1].canWrapLineAfter); + ok(metrics[1].isWhitespace == 0, "got %d\n", metrics[1].isWhitespace); + ok(metrics[1].isNewline == 0, "got %d\n", metrics[1].isNewline); + ok(metrics[1].isSoftHyphen == 0, "got %d\n", metrics[1].isSoftHyphen); + ok(metrics[1].isRightToLeft == 0, "got %d\n", metrics[1].isRightToLeft); + + ok(metrics[2].width > 0.0, "got %.2f\n", metrics[2].width); + ok(metrics[2].length == 1, "got %d\n", metrics[2].length); +todo_wine + ok(metrics[2].canWrapLineAfter == 1, "got %d\n", metrics[2].canWrapLineAfter); + ok(metrics[2].isWhitespace == 0, "got %d\n", metrics[2].isWhitespace); + ok(metrics[2].isNewline == 0, "got %d\n", metrics[2].isNewline); + ok(metrics[2].isSoftHyphen == 0, "got %d\n", metrics[2].isSoftHyphen); + ok(metrics[2].isRightToLeft == 0, "got %d\n", metrics[2].isRightToLeft); + + IDWriteTextLayout_Release(layout); + + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Bruno Jesus : user32: Set the expected errors in GetRawInputDeviceList.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: e0ba6d8fdb9562810231df8fb0b37dd05188e3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ba6d8fdb9562810231df8fb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue May 26 12:14:29 2015 -0300 user32: Set the expected errors in GetRawInputDeviceList. --- dlls/user32/input.c | 13 ++++++++++++- dlls/user32/tests/input.c | 14 ++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 4fcc531..40e35a9 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -496,7 +496,17 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun { TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); - if (size != sizeof(*devices) || !device_count) return ~0U; + if (size != sizeof(*devices)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return ~0U; + } + + if (!device_count) + { + SetLastError(ERROR_NOACCESS); + return ~0U; + } if (!devices) { @@ -506,6 +516,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun if (*device_count < 2) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); *device_count = 2; return ~0U; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 7639b66..29b655c 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1491,21 +1491,19 @@ static void test_GetMouseMovePointsEx(void) static void test_GetRawInputDeviceList(void) { RAWINPUTDEVICELIST devices[32]; - UINT ret, devcount, odevcount; + UINT ret, oret, devcount, odevcount; DWORD err; SetLastError(0xdeadbeef); ret = pGetRawInputDeviceList(NULL, NULL, 0); err = GetLastError(); ok(ret == -1, "expected -1, got %d\n", ret); -todo_wine ok(err == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", err); SetLastError(0xdeadbeef); ret = pGetRawInputDeviceList(NULL, NULL, sizeof(devices[0])); err = GetLastError(); ok(ret == -1, "expected -1, got %d\n", ret); -todo_wine ok(err == ERROR_NOACCESS, "expected 998, got %d\n", err); devcount = 0; @@ -1518,19 +1516,23 @@ todo_wine ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); err = GetLastError(); ok(ret == -1, "expected -1, got %d\n", ret); -todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "expected 122, got %d\n", err); ok(devcount > 0, "expected non-zero\n"); - /* devcount contain now the correct number of devices */ + /* devcount contains now the correct number of devices */ ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); ok(ret > 0, "expected non-zero\n"); /* check if variable changes from larger to smaller value */ devcount = odevcount = sizeof(devices) / sizeof(devices[0]); - ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0])); + oret = ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0])); ok(ret > 0, "expected non-zero\n"); ok(devcount == odevcount, "expected %d, got %d\n", devcount, odevcount); + devcount = odevcount; + odevcount = sizeof(devices) / sizeof(devices[0]); + ret = pGetRawInputDeviceList(NULL, &odevcount, sizeof(devices[0])); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } static void test_key_map(void)

1 0

Andrew Eikum : msacm32: Make ACM driver details match native more closely.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: ab22ea74a41b36787e544cda076efa70e5d7d169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab22ea74a41b36787e544cda0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 26 15:09:31 2015 -0500 msacm32: Make ACM driver details match native more closely. --- dlls/imaadp32.acm/imaadp32.c | 4 ++-- dlls/msacm32/pcmconverter.c | 6 +++--- dlls/msacm32/tests/msacm.c | 24 ++++++++++++++++++++++++ dlls/msadp32.acm/msadp32.c | 4 ++-- dlls/msg711.acm/msg711.c | 6 +++--- dlls/msgsm32.acm/msgsm32.c | 4 ++-- dlls/winemp3.acm/mpegl3.c | 6 +++--- include/mmreg.h | 12 ++++++++++++ include/mmsystem.h | 3 ++- 9 files changed, 53 insertions(+), 16 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 19c2ae2..c5c65f6 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -507,8 +507,8 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0x1; - add->wPid = 0x22; + add->wMid = MM_MICROSOFT; + add->wPid = MM_MSFT_ACM_IMAADPCM; add->vdwACM = 0x3320000; add->vdwDriver = 0x04000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index 9bfed20..cf92d93 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -723,15 +723,15 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; + add->wMid = MM_MICROSOFT; + add->wPid = MM_MSFT_ACM_PCM; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; add->cFormatTags = 1; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-PCM", -1, + MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index c36bdbf..747c5fe 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -127,8 +127,30 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, TODO: should it be *exactly* sizeof(dd), as tested here? */ if (rc == MMSYSERR_NOERROR) { + struct { + const char *shortname; + const WORD mid; + const WORD pid; + } *iter, expected_ids[] = { + { "Microsoft IMA ADPCM", MM_MICROSOFT, MM_MSFT_ACM_IMAADPCM }, + { "MS-ADPCM", MM_MICROSOFT, MM_MSFT_ACM_MSADPCM }, + { "Microsoft CCITT G.711", MM_MICROSOFT, MM_MSFT_ACM_G711}, + { "MPEG Layer-3 Codec", MM_FRAUNHOFER_IIS, MM_FHGIIS_MPEGLAYER3_DECODE }, + { "MS-PCM", MM_MICROSOFT, MM_MSFT_ACM_PCM }, + { 0 } + }; + ok(dd.cbStruct == sizeof(dd), "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); + + for (iter = expected_ids; iter->shortname; ++iter) { + if (dd.szShortName && !strcmp(iter->shortname, dd.szShortName)) { + ok(iter->mid == dd.wMid && iter->pid == dd.wPid, + "Got wrong manufacturer (0x%x vs 0x%x) or product (0x%x vs 0x%x)\n", + dd.wMid, iter->mid, + dd.wPid, iter->pid); + } + } } if (rc == MMSYSERR_NOERROR && winetest_interactive) { @@ -139,6 +161,8 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, trace(" Features: %s\n", dd.szFeatures); trace(" Supports %u formats\n", dd.cFormatTags); trace(" Supports %u filter formats\n", dd.cFilterTags); + trace(" Mid: 0x%x\n", dd.wMid); + trace(" Pid: 0x%x\n", dd.wPid); } /* try bad pointer */ diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 59f71b5..83d1b46 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -372,8 +372,8 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; + add->wMid = MM_MICROSOFT; + add->wPid = MM_MSFT_ACM_MSADPCM; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index f6f2ae6..e74d329 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -653,15 +653,15 @@ static LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add) { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; + add->wMid = MM_MICROSOFT; + add->wPid = MM_MSFT_ACM_G711; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; add->cFormatTags = 3; /* PCM, G711 A-LAW & MU-LAW */ add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-G711", -1, + MultiByteToWideChar( CP_ACP, 0, "Microsoft CCITT G.711", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine G711 converter", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index c32c656..cce1303 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -117,14 +117,14 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add) add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; /* Details found from probing native msgsm32.acm */ add->wMid = MM_MICROSOFT; - add->wPid = 36; + add->wPid = MM_MSFT_ACM_GSM610; add->vdwACM = 0x3320000; add->vdwDriver = 0x4000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; add->cFormatTags = 2; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10", -1, + MultiByteToWideChar( CP_ACP, 0, "Microsoft GSM 6.10", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10 libgsm codec", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 57193b3..37993b4 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -658,15 +658,15 @@ static LRESULT MPEG3_DriverDetails(PACMDRIVERDETAILSW add) { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; + add->wMid = MM_FRAUNHOFER_IIS; + add->wPid = MM_FHGIIS_MPEGLAYER3_DECODE; add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; add->cFormatTags = 3; /* PCM, MPEG3 */ add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-MPEG3", -1, + MultiByteToWideChar( CP_ACP, 0, "MPEG Layer-3 Codec", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Wine MPEG3 decoder", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); diff --git a/include/mmreg.h b/include/mmreg.h index 64a3991..08517a8 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -115,6 +115,18 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_OLISBC 0x1003 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIOPR 0x1004 /* Ing C. Olivetti & C., S.p.A. */ +#ifndef MM_MICROSOFT +#define MM_MICROSOFT 0x01 +#endif +#define MM_MSFT_ACM_MSADPCM 0x21 +#define MM_MSFT_ACM_IMAADPCM 0x22 +#define MM_MSFT_ACM_GSM610 0x24 +#define MM_MSFT_ACM_G711 0x25 +#define MM_MSFT_ACM_PCM 0x26 + +#define MM_FRAUNHOFER_IIS 0xAC +#define MM_FHGIIS_MPEGLAYER3_DECODE 0x09 + #if !defined(WAVE_FORMAT_EXTENSIBLE) #define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ #endif diff --git a/include/mmsystem.h b/include/mmsystem.h index 60d93e3..f53f11d 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -243,8 +243,9 @@ DWORD WINAPI GetDriverFlags(HDRVR hDriver); typedef void (CALLBACK *LPDRVCALLBACK)(HDRVR,UINT,DWORD_PTR,DWORD_PTR,DWORD_PTR); +#ifndef MM_MICROSOFT #define MM_MICROSOFT 1 /* Microsoft Corp. */ -#define MM_CREATIVE 2 /* Creative labs */ +#endif #define MM_MIDI_MAPPER 1 /* MIDI Mapper */ #define MM_WAVE_MAPPER 2 /* Wave Mapper */

1 0

André Hentschel : libport: Fix build on PowerPC.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: 3b9f6449cde8756f8aa179944bd226f1acd545c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9f6449cde8756f8aa179944… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 26 22:16:23 2015 +0200 libport: Fix build on PowerPC. --- libs/port/interlocked.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index cd6201a..efdfd2a 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -181,6 +181,9 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg128, "ret") #elif defined(__powerpc__) + +#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) void* interlocked_cmpxchg_ptr( void **dest, void* xchg, void* compare) { void *ret = 0; @@ -198,13 +201,17 @@ void* interlocked_cmpxchg_ptr( void **dest, void* xchg, void* compare) : "cr0","memory"); return ret; } +#endif +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) { /* FIXME: add code */ assert(0); } +#endif +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_cmpxchg( int *dest, int xchg, int compare) { int ret = 0; @@ -222,7 +229,9 @@ int interlocked_cmpxchg( int *dest, int xchg, int compare) : "cr0","memory","r0"); return ret; } +#endif +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg_add( int *dest, int incr ) { int ret = 0; @@ -239,7 +248,9 @@ int interlocked_xchg_add( int *dest, int incr ) ); return ret-incr; } +#endif +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg( int* dest, int val ) { int ret = 0; @@ -253,7 +264,10 @@ int interlocked_xchg( int* dest, int val ) : "cr0","memory","r0"); return ret; } +#endif +#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) void* interlocked_xchg_ptr( void** dest, void* val ) { void *ret = NULL; @@ -267,6 +281,7 @@ void* interlocked_xchg_ptr( void** dest, void* val ) : "cr0","memory","r0"); return ret; } +#endif #else

1 0

Nikolay Sivov : riched20: Implement font property setters.
by Alexandre Julliard 27 May '15

27 May '15

Module: wine Branch: master Commit: 43a80b80237b818971391c1a0176663f645e1f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a80b80237b818971391c1a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 11:25:16 2015 +0300 riched20: Implement font property setters. --- dlls/riched20/richole.c | 89 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b6f047c..8b611d5 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -171,10 +171,10 @@ enum textfont_prop_id { static const DWORD textfont_prop_masks[][2] = { { CFM_ALLCAPS, CFE_ALLCAPS }, { CFM_ANIMATION }, - { CFM_BACKCOLOR }, + { CFM_BACKCOLOR, CFE_AUTOBACKCOLOR }, { CFM_BOLD, CFE_BOLD }, { CFM_EMBOSS, CFE_EMBOSS }, - { CFM_COLOR }, + { CFM_COLOR, CFE_AUTOCOLOR }, { CFM_HIDDEN, CFE_HIDDEN }, { CFM_IMPRINT, CFE_IMPRINT }, { CFM_ITALIC, CFE_ITALIC }, @@ -570,6 +570,36 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop case FONT_UNDERLINE: fmt.dwEffects = value->l == tomTrue ? textfont_prop_masks[propid][1] : 0; break; + case FONT_ANIMATION: + fmt.bAnimation = value->l; + break; + case FONT_BACKCOLOR: + case FONT_FORECOLOR: + if (value->l == tomAutoColor) + fmt.dwEffects = textfont_prop_masks[propid][1]; + else if (propid == FONT_BACKCOLOR) + fmt.crBackColor = value->l; + else + fmt.crTextColor = value->l; + break; + case FONT_KERNING: + fmt.wKerning = value->f; + break; + case FONT_LANGID: + fmt.lcid = value->l; + break; + case FONT_POSITION: + fmt.yOffset = value->f; + break; + case FONT_SIZE: + fmt.yHeight = value->f; + break; + case FONT_SPACING: + fmt.sSpacing = value->f; + break; + case FONT_WEIGHT: + fmt.wWeight = value->l; + break; default: FIXME("unhandled font property %d\n", propid); return E_FAIL; @@ -585,6 +615,20 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop return S_OK; } +static inline HRESULT set_textfont_propl(ITextFontImpl *font, enum textfont_prop_id propid, LONG value) +{ + textfont_prop_val v; + v.l = value; + return set_textfont_prop(font, propid, &v); +} + +static inline HRESULT set_textfont_propf(ITextFontImpl *font, enum textfont_prop_id propid, FLOAT value) +{ + textfont_prop_val v; + v.f = value; + return set_textfont_prop(font, propid, &v); +} + static HRESULT set_textfont_propd(ITextFontImpl *font, enum textfont_prop_id propid, LONG value) { textfont_prop_val v; @@ -2339,8 +2383,13 @@ static HRESULT WINAPI TextFont_GetAnimation(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetAnimation(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, value); + + if (value < tomNoAnimation || value > tomAnimationMax) + return E_INVALIDARG; + + return set_textfont_propl(This, FONT_ANIMATION, value); } static HRESULT WINAPI TextFont_GetBackColor(ITextFont *iface, LONG *value) @@ -2353,8 +2402,8 @@ static HRESULT WINAPI TextFont_GetBackColor(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetBackColor(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, value); + return set_textfont_propl(This, FONT_BACKCOLOR, value); } static HRESULT WINAPI TextFont_GetBold(ITextFont *iface, LONG *value) @@ -2395,8 +2444,8 @@ static HRESULT WINAPI TextFont_GetForeColor(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetForeColor(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, value); + return set_textfont_propl(This, FONT_FORECOLOR, value); } static HRESULT WINAPI TextFont_GetHidden(ITextFont *iface, LONG *value) @@ -2451,8 +2500,8 @@ static HRESULT WINAPI TextFont_GetKerning(ITextFont *iface, FLOAT *value) static HRESULT WINAPI TextFont_SetKerning(ITextFont *iface, FLOAT value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%.2f): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%.2f)\n", This, value); + return set_textfont_propf(This, FONT_KERNING, value); } static HRESULT WINAPI TextFont_GetLanguageID(ITextFont *iface, LONG *value) @@ -2465,8 +2514,8 @@ static HRESULT WINAPI TextFont_GetLanguageID(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetLanguageID(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, value); + return set_textfont_propl(This, FONT_LANGID, value); } static HRESULT WINAPI TextFont_GetName(ITextFont *iface, BSTR *value) @@ -2522,8 +2571,8 @@ static HRESULT WINAPI TextFont_GetPosition(ITextFont *iface, FLOAT *value) static HRESULT WINAPI TextFont_SetPosition(ITextFont *iface, FLOAT value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%.2f): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%.2f)\n", This, value); + return set_textfont_propf(This, FONT_POSITION, value); } static HRESULT WINAPI TextFont_GetProtected(ITextFont *iface, LONG *value) @@ -2564,8 +2613,8 @@ static HRESULT WINAPI TextFont_GetSize(ITextFont *iface, FLOAT *value) static HRESULT WINAPI TextFont_SetSize(ITextFont *iface, FLOAT value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%.2f): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%.2f)\n", This, value); + return set_textfont_propf(This, FONT_SIZE, value); } static HRESULT WINAPI TextFont_GetSmallCaps(ITextFont *iface, LONG *value) @@ -2592,8 +2641,8 @@ static HRESULT WINAPI TextFont_GetSpacing(ITextFont *iface, FLOAT *value) static HRESULT WINAPI TextFont_SetSpacing(ITextFont *iface, FLOAT value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%.2f): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%.2f)\n", This, value); + return set_textfont_propf(This, FONT_SPACING, value); } static HRESULT WINAPI TextFont_GetStrikeThrough(ITextFont *iface, LONG *value) @@ -2662,8 +2711,8 @@ static HRESULT WINAPI TextFont_GetWeight(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetWeight(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, value); + return set_textfont_propl(This, FONT_WEIGHT, value); } static ITextFontVtbl textfontvtbl = {

1 0

Nikolay Sivov : riched20: Initial support for changing font properties.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 64faf03cf3248d6fed7b89d9246e4b13f20300db URL: http://source.winehq.org/git/wine.git/?a=commit;h=64faf03cf3248d6fed7b89d92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 09:17:02 2015 +0300 riched20: Initial support for changing font properties. --- dlls/riched20/richole.c | 90 ++++++++++++++++++++++++++++++++++++++++++- dlls/riched20/tests/richole.c | 49 +++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index eb803e7..063522b 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -237,6 +237,7 @@ typedef struct ITextFontImpl { ITextRange *range; textfont_prop_val props[FONT_PROPID_LAST]; BOOL get_cache_enabled; + BOOL set_cache_enabled; } ITextFontImpl; typedef struct ITextParaImpl { @@ -556,6 +557,75 @@ static HRESULT get_textfont_propl(const ITextFontImpl *font, enum textfont_prop_ return hr; } +/* Value should already have a terminal value, for boolean properties it means tomToggle is not handled */ +static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id propid, const textfont_prop_val *value) +{ + const IRichEditOleImpl *reole; + ME_Cursor from, to; + CHARFORMAT2W fmt; + LONG start, end; + + /* when font is not attached to any range use cache */ + if (!font->range || font->set_cache_enabled) { + font->props[propid] = *value; + return S_OK; + } + + if (!(reole = get_range_reole(font->range))) + return CO_E_RELEASED; + + memset(&fmt, 0, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + fmt.dwMask = textfont_prop_masks[propid]; + + switch (propid) + { + case FONT_ITALIC: + fmt.dwEffects = value->l == tomTrue ? CFE_ITALIC : 0; + break; + default: + FIXME("unhandled font property %d\n", propid); + return E_FAIL; + } + + ITextRange_GetStart(font->range, &start); + ITextRange_GetEnd(font->range, &end); + + ME_CursorFromCharOfs(reole->editor, start, &from); + ME_CursorFromCharOfs(reole->editor, end, &to); + ME_SetCharFormat(reole->editor, &from, &to, &fmt); + + return S_OK; +} + +static HRESULT set_textfont_propd(ITextFontImpl *font, enum textfont_prop_id propid, LONG value) +{ + textfont_prop_val v; + + switch (value) + { + case tomUndefined: + return S_OK; + case tomToggle: { + LONG oldvalue; + get_textfont_propl(font, propid, &oldvalue); + if (oldvalue == tomFalse) + value = tomTrue; + else if (oldvalue == tomTrue) + value = tomFalse; + else + return E_INVALIDARG; + /* fallthrough */ + } + case tomTrue: + case tomFalse: + v.l = value; + return set_textfont_prop(font, propid, &v); + default: + return E_INVALIDARG; + } +} + static HRESULT textfont_getname_from_range(ITextRange *range, BSTR *ret) { const IRichEditOleImpl *reole; @@ -2178,6 +2248,13 @@ static void textfont_reset_to_undefined(ITextFontImpl *font) } } +static void textfont_apply_range_props(ITextFontImpl *font) +{ + enum textfont_prop_id propid; + for (propid = FONT_PROPID_FIRST; propid < FONT_PROPID_LAST; propid++) + set_textfont_prop(font, propid, &font->props[propid]); +} + static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); @@ -2201,6 +2278,13 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) case tomTrackParms: This->get_cache_enabled = FALSE; break; + case tomApplyLater: + This->set_cache_enabled = TRUE; + break; + case tomApplyNow: + This->set_cache_enabled = FALSE; + textfont_apply_range_props(This); + break; default: FIXME("reset mode %d not supported\n", value); } @@ -2366,8 +2450,8 @@ static HRESULT WINAPI TextFont_GetItalic(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetItalic(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, value); + return set_textfont_propd(This, FONT_ITALIC, value); } static HRESULT WINAPI TextFont_GetKerning(ITextFont *iface, FLOAT *value) @@ -2675,6 +2759,7 @@ static HRESULT create_textfont(ITextRange *range, const ITextFontImpl *src, ITex if (src) { font->range = NULL; font->get_cache_enabled = TRUE; + font->set_cache_enabled = TRUE; memcpy(&font->props, &src->props, sizeof(font->props)); if (font->props[FONT_NAME].str) font->props[FONT_NAME].str = SysAllocString(font->props[FONT_NAME].str); @@ -2685,6 +2770,7 @@ static HRESULT create_textfont(ITextRange *range, const ITextFontImpl *src, ITex /* cache current properties */ font->get_cache_enabled = FALSE; + font->set_cache_enabled = FALSE; textfont_cache_range_props(font); } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 72cb1db..adb96c3 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2214,6 +2214,13 @@ static void test_ITextFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); test_textfont_global_defaults(font2); + hr = ITextFont_SetItalic(font2, tomUndefined); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_GetItalic(font2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + hr = ITextFont_Reset(font2, tomCacheParms); ok(hr == S_OK, "got 0x%08x\n", hr); test_textfont_global_defaults(font2); @@ -2292,6 +2299,48 @@ static void test_ITextFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(value == tomTrue, "got %d\n", value); + /* tomApplyLater */ + hr = ITextFont_Reset(font, tomApplyLater); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_SetItalic(font, tomFalse); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + cf.dwEffects = 0; + SendMessageA(hwnd, EM_SETSEL, 0, 10); + ret = SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + ok((cf.dwEffects & CFE_ITALIC) == CFE_ITALIC, "got 0x%08x\n", cf.dwEffects); + + hr = ITextFont_Reset(font, tomApplyNow); + ok(hr == S_OK, "got 0x%08x\n", hr); + + cf.dwEffects = 0; + SendMessageA(hwnd, EM_SETSEL, 0, 10); + ret = SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + ok((cf.dwEffects & CFE_ITALIC) == 0, "got 0x%08x\n", cf.dwEffects); + + hr = ITextFont_SetItalic(font, tomUndefined); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextFont_SetItalic(font, tomAutoColor); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cf.dwEffects = 0; + SendMessageA(hwnd, EM_SETSEL, 0, 10); + ret = SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + ok((cf.dwEffects & CFE_ITALIC) == 0, "got 0x%08x\n", cf.dwEffects); + ITextRange_Release(range); ITextFont_Release(font); release_interfaces(&hwnd, &reOle, &doc, NULL);

1 0