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

Nikolay Sivov : dwrite: Fix potential null pointer dereference in GetInlineObject() (Coverity).
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 9351596538d012c6ed11c59576246f524f90aa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9351596538d012c6ed11c5957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 15:11:56 2015 +0300 dwrite: Fix potential null pointer dereference in GetInlineObject() (Coverity). --- dlls/dwrite/layout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index cb191b0..365f0b2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2016,8 +2016,11 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout2 *iface TRACE("(%p)->(%u %p %p)\n", This, position, object, r); + if (position >= This->len) + return S_OK; + range = get_layout_range_by_pos(This, position); - *object = range ? range->object : NULL; + *object = range->object; if (*object) IDWriteInlineObject_AddRef(*object);

1 0

Nikolay Sivov : wined3d: Remove unnecessary test for 0 (Coverity).
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 5daf08f2cb3b020d43059c084b929e6f8046c349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5daf08f2cb3b020d43059c084… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 02:46:37 2015 +0300 wined3d: Remove unnecessary test for 0 (Coverity). --- dlls/wined3d/shader.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 279ec42..9bc3bac 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1569,26 +1569,23 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, shader_dump_register(&param->reg, shader_version); - if (src_modifier) - { - switch (src_modifier) - { - case WINED3DSPSM_NONE: break; - case WINED3DSPSM_NEG: break; - case WINED3DSPSM_NOT: break; - case WINED3DSPSM_BIAS: TRACE("_bias"); break; - case WINED3DSPSM_BIASNEG: TRACE("_bias"); break; - case WINED3DSPSM_SIGN: TRACE("_bx2"); break; - case WINED3DSPSM_SIGNNEG: TRACE("_bx2"); break; - case WINED3DSPSM_COMP: break; - case WINED3DSPSM_X2: TRACE("_x2"); break; - case WINED3DSPSM_X2NEG: TRACE("_x2"); break; - case WINED3DSPSM_DZ: TRACE("_dz"); break; - case WINED3DSPSM_DW: TRACE("_dw"); break; - case WINED3DSPSM_ABSNEG: TRACE(")"); break; - case WINED3DSPSM_ABS: TRACE(")"); break; - default: TRACE("_unknown_modifier(%#x)", src_modifier); - } + switch (src_modifier) + { + case WINED3DSPSM_NONE: break; + case WINED3DSPSM_NEG: break; + case WINED3DSPSM_NOT: break; + case WINED3DSPSM_BIAS: TRACE("_bias"); break; + case WINED3DSPSM_BIASNEG: TRACE("_bias"); break; + case WINED3DSPSM_SIGN: TRACE("_bx2"); break; + case WINED3DSPSM_SIGNNEG: TRACE("_bx2"); break; + case WINED3DSPSM_COMP: break; + case WINED3DSPSM_X2: TRACE("_x2"); break; + case WINED3DSPSM_X2NEG: TRACE("_x2"); break; + case WINED3DSPSM_DZ: TRACE("_dz"); break; + case WINED3DSPSM_DW: TRACE("_dw"); break; + case WINED3DSPSM_ABSNEG: TRACE(")"); break; + case WINED3DSPSM_ABS: TRACE(")"); break; + default: TRACE("_unknown_modifier(%#x)", src_modifier); } if (swizzle != WINED3DSP_NOSWIZZLE)

1 0

Nikolay Sivov : urlmon: Remove unreachable code (Coverity).
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 6e94edd36fcb8d21d0d8e841485570b6d12b749f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e94edd36fcb8d21d0d8e8414… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 03:17:19 2015 +0300 urlmon: Remove unreachable code (Coverity). --- dlls/urlmon/mimefilter.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index cee1a19..ee95755 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -697,8 +697,5 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, if(pwzMimeProposed || pBuffer) return find_mime_from_buffer(pBuffer, cbSize, pwzMimeProposed, pwzUrl, ppwzMimeOut); - if(pwzUrl) - return find_mime_from_url(pwzUrl, ppwzMimeOut); - - return E_FAIL; + return find_mime_from_url(pwzUrl, ppwzMimeOut); }

1 0

Dmitry Timoshkov : mshtml: Handle VT_INT/VT_UI4 same way as VT_I4/ VT_UINT in IHTMLElementCollection::item.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 242beac6374efb64658376bc56e67b26071f81da URL: http://source.winehq.org/git/wine.git/?a=commit;h=242beac6374efb64658376bc5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 1 21:52:04 2015 +0300 mshtml: Handle VT_INT/VT_UI4 same way as VT_I4/VT_UINT in IHTMLElementCollection::item. --- dlls/mshtml/htmlelemcol.c | 2 ++ dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index ca5e1d5..a57f39e 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -419,11 +419,13 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, switch(V_VT(&name)) { case VT_I4: + case VT_INT: if(V_I4(&name) < 0) return E_INVALIDARG; hres = get_item_idx(This, V_I4(&name), pdisp); break; + case VT_UI4: case VT_UINT: hres = get_item_idx(This, V_UINT(&name), pdisp); break; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3e83e64..077f6e2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2437,6 +2437,27 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_UI4; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + + V_VT(&name) = VT_INT; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + + V_VT(&name) = VT_UINT; + V_I4(&name) = len; + disp = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_I4; V_I4(&name) = -1; disp = (void*)0xdeadbeef;

1 0

Nikolay Sivov : riched20/tests: Don't use global vars for host/ textservices.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: a50e0d71a49e4af7cc1483e993f1b20a8490d410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50e0d71a49e4af7cc1483e99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 22:45:43 2015 +0300 riched20/tests: Don't use global vars for host/textservices. --- dlls/riched20/tests/txtsrv.c | 75 ++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index c154e2d..1a6ca61 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -506,8 +506,6 @@ static ITextHostVtbl itextHostVtbl = { ITextHostImpl_TxGetSelectionBarWidth }; -static ITextServices *txtserv = NULL; -static ITextHostTestImpl *dummyTextHost; static void *wrapperCodeMem = NULL; #include "pshpack1.h" @@ -606,14 +604,15 @@ static void setup_thiscall_wrappers(void) /* Conformance test functions. */ /* Initialize the test texthost structure */ -static BOOL init_texthost(void) +static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) { + ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { - skip("Insufficient memory to create ITextHost interface\n"); + win_skip("Insufficient memory to create ITextHost interface\n"); return FALSE; } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; @@ -622,54 +621,53 @@ static BOOL init_texthost(void) /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a ITextServices object. */ - result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init); + result = pCreateTextServices(NULL, &dummyTextHost->ITextHost_iface, &init); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); if (result != S_OK) { CoTaskMemFree(dummyTextHost); - skip("CreateTextServices failed.\n"); + win_skip("CreateTextServices failed.\n"); return FALSE; } - result = IUnknown_QueryInterface(init, pIID_ITextServices, - (void **)&txtserv); - ok((result == S_OK) && (txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, txtserv); + result = IUnknown_QueryInterface(init, pIID_ITextServices, (void**)txtserv); + ok((result == S_OK) && (*txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, *txtserv); IUnknown_Release(init); - if (!((result == S_OK) && (txtserv != NULL))) { + if (!((result == S_OK) && (*txtserv != NULL))) { CoTaskMemFree(dummyTextHost); - skip("Could not retrieve ITextServices interface\n"); + win_skip("Could not retrieve ITextServices interface\n"); return FALSE; } + *ret = &dummyTextHost->ITextHost_iface; return TRUE; } -static void free_texthost(void) -{ - ITextServices_Release(txtserv); - CoTaskMemFree(dummyTextHost); -} - static void test_TxGetText(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; BSTR rettext; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hres = ITextServices_TxGetText(txtserv, &rettext); ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } static void test_TxSetText(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; BSTR rettext; WCHAR settext[] = {'T','e','s','t',0}; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hres = ITextServices_TxSetText(txtserv, settext); @@ -684,10 +682,14 @@ static void test_TxSetText(void) "String returned differs\n"); SysFreeString(rettext); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } -static void test_TxGetNaturalSize(void) { +static void test_TxGetNaturalSize(void) +{ + ITextServices *txtserv; + ITextHost *host; HRESULT result; BOOL ret; @@ -710,7 +712,7 @@ static void test_TxGetNaturalSize(void) { INT charwidth_caps_text[26]; TEXTMETRICA tmInfo_text; - if (!init_texthost()) + if (!init_texthost(&txtserv, &host)) return; hdcDraw = GetDC(NULL); @@ -759,11 +761,14 @@ static void test_TxGetNaturalSize(void) { cleanup: RestoreDC(hdcDraw,1); ReleaseDC(NULL,hdcDraw); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } static void test_TxDraw(void) { + ITextServices *txtserv; + ITextHost *host; HDC tmphdc = GetDC(NULL); DWORD dwAspect = DVASPECT_CONTENT; HDC hicTargetDev = NULL; /* Means "default" device */ @@ -772,7 +777,8 @@ static void test_TxDraw(void) HRESULT result; RECTL client = {0,0,100,100}; - if (!init_texthost()) + + if (!init_texthost(&txtserv, &host)) return; todo_wine { @@ -782,8 +788,8 @@ static void test_TxDraw(void) ok(result == S_OK, "TxDraw failed (result = %x)\n", result); } - free_texthost(); - + ITextServices_Release(txtserv); + ITextHost_Release(host); } DEFINE_GUID(expected_iid_itextservices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); @@ -872,12 +878,14 @@ static ULONG get_refcount(IUnknown *iface) static void test_QueryInterface(void) { + ITextServices *txtserv; + ITextHost *host; HRESULT hres; IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; ULONG refcount; - if(!init_texthost()) + if(!init_texthost(&txtserv, &host)) return; refcount = get_refcount((IUnknown *)txtserv); @@ -927,11 +935,15 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); } START_TEST( txtsrv ) { + ITextServices *txtserv; + ITextHost *host; + setup_thiscall_wrappers(); /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -947,9 +959,10 @@ START_TEST( txtsrv ) test_IIDs(); test_COM(); - if (init_texthost()) + if (init_texthost(&txtserv, &host)) { - free_texthost(); + ITextServices_Release(txtserv); + ITextHost_Release(host); test_TxGetText(); test_TxSetText();

1 0

Nikolay Sivov : riched20: Reduce code duplication in WM_SETTEXT/ WM_CREATE handler.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 0b94369bb757305926aa46199e533d4ecc284625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b94369bb757305926aa46199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 09:14:18 2015 +0300 riched20: Reduce code duplication in WM_SETTEXT/WM_CREATE handler. --- dlls/riched20/editor.c | 152 ++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 78 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8d878a4..38861fd 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3158,13 +3158,84 @@ void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int l ME_UpdateRepaint(editor, FALSE); } +static void ME_SetText(ME_TextEditor *editor, void *text, BOOL unicode) +{ + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + int textLen; + + LPWSTR wszText = ME_ToUnicode(codepage, text, &textLen); + + if (textLen > 0) + { + int len = -1; + + /* uses default style! */ + if (!(editor->styleFlags & ES_MULTILINE)) + { + WCHAR *p = wszText; + + while (*p != '\0' && *p != '\r' && *p != '\n') p++; + len = p - wszText; + } + ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); + } + ME_EndToUnicode(codepage, wszText); +} + +static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) +{ + CREATESTRUCTW *createW = (CREATESTRUCTW*)lParam; + CREATESTRUCTA *createA = (CREATESTRUCTA*)lParam; + void *text = NULL; + INT max; + + if (lParam) + text = unicode ? (void*)createW->lpszName : (void*)createA->lpszName; + + ME_SetDefaultFormatRect(editor); + + max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); + + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); + + if (editor->styleFlags & ES_DISABLENOSCROLL) + { + if (editor->styleFlags & WS_VSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); + } + if (editor->styleFlags & WS_HSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); + } + } + + if (text) + { + ME_SetText(editor, text, unicode); + ME_SetCursorToStart(editor, &editor->pCursors[0]); + ME_SetCursorToStart(editor, &editor->pCursors[1]); + } + + ME_CommitUndo(editor); + ME_WrapMarkedParagraphs(editor); + ME_MoveCaret(editor); + return 0; +} + + #define UNSUPPORTED_MSG(e) \ case e: \ FIXME(#e ": stub\n"); \ *phresult = S_FALSE; \ return 0; -/* Handle messages for windowless and windoweded richedit controls. +/* Handle messages for windowless and windowed richedit controls. * * The LRESULT that is returned is a return value for window procs, * and the phresult parameter is the COM return code needed by the @@ -3689,28 +3760,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_StreamInRTFString(editor, 0, (char *)lParam); } else - { - int textLen; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &textLen); - TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ - if (textLen > 0) - { - int len = -1; - - /* uses default style! */ - if (!(editor->styleFlags & ES_MULTILINE)) - { - WCHAR * p; - - p = wszText; - while (*p != '\0' && *p != '\r' && *p != '\n') p++; - len = p - wszText; - } - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); - } - ME_EndToUnicode(codepage, wszText); - } + ME_SetText(editor, (void*)lParam, unicode); } else TRACE("WM_SETTEXT - NULL\n"); @@ -4065,61 +4115,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return (wParam >= 0x40000) ? 0 : MAKELONG( pt.x, pt.y ); } case WM_CREATE: - { - void *text = NULL; - INT max; - - ME_SetDefaultFormatRect(editor); - - max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) - ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); - - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) - ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); - - if (editor->styleFlags & ES_DISABLENOSCROLL) - { - if (editor->styleFlags & WS_VSCROLL) - { - ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); - } - if (editor->styleFlags & WS_HSCROLL) - { - ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); - } - } - - if (lParam) - { - text = (unicode ? (void*)((CREATESTRUCTW*)lParam)->lpszName - : (void*)((CREATESTRUCTA*)lParam)->lpszName); - } - if (text) - { - WCHAR *textW; - int len; - LONG codepage = unicode ? CP_UNICODE : CP_ACP; - textW = ME_ToUnicode(codepage, text, &len); - if (!(editor->styleFlags & ES_MULTILINE)) - { - len = 0; - while(textW[len] != '\0' && textW[len] != '\r' && textW[len] != '\n') - len++; - } - ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); - ME_EndToUnicode(codepage, textW); - ME_SetCursorToStart(editor, &editor->pCursors[0]); - ME_SetCursorToStart(editor, &editor->pCursors[1]); - } - - ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); - ME_MoveCaret(editor); - return 0; - } + return ME_WmCreate(editor, lParam, unicode); case WM_DESTROY: ME_DestroyEditor(editor); return 0;

1 0

Nikolay Sivov : riched20: Avoid extra host calls during CreateTextServices ().
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: b75cd7e2f0f6f40655f690695ab0843fce472e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75cd7e2f0f6f40655f690695… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 10:01:45 2015 +0300 riched20: Avoid extra host calls during CreateTextServices(). --- dlls/riched20/txtsrv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index e9c1061..1bf9cf2 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -399,7 +399,7 @@ static const ITextServicesVtbl textservices_vtbl = HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, IUnknown **ppUnk) { ITextServicesImpl *ITextImpl; - HRESULT hres; + TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); if (pITextHost == NULL) return E_POINTER; @@ -421,8 +421,6 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->editor->rcFormat.right = 0; ITextImpl->editor->rcFormat.bottom = 0; - ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); - if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter; else

1 0

Damjan Jovanovic : qcap: Implement the SmartTee allocator functions.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 95c2b22c569757e0fccfc87967511fb3ea9b780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c2b22c569757e0fccfc8796… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:10:30 2015 +0200 qcap: Implement the SmartTee allocator functions. --- dlls/qcap/smartteefilter.c | 29 ++++++++++++++++---------- dlls/qcap/tests/smartteefilter.c | 44 ++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 9af2e9a..d550169 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -374,12 +374,13 @@ static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(BasePin *base, int iPos return S_FALSE; } -static HRESULT WINAPI SmartTeeFilterCapture_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, - ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p, %p, %p): stub\n", This, alloc, ppropInputRequest); - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); + *pAlloc = This->input->pAllocator; + IMemAllocator_AddRef(This->input->pAllocator); + return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base) @@ -396,8 +397,8 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { SmartTeeFilterCapture_GetMediaTypeVersion, SmartTeeFilterCapture_GetMediaType }, - SmartTeeFilterCapture_DecideBufferSize, - BaseOutputPinImpl_DecideAllocator, + NULL, + SmartTeeFilterCapture_DecideAllocator, SmartTeeFilterCapture_BreakConnect }; @@ -466,11 +467,13 @@ static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(BasePin *base, int iPos return S_FALSE; } -static HRESULT WINAPI SmartTeeFilterPreview_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p, %p, %p): stub\n", This, alloc, ppropInputRequest); - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); + *pAlloc = This->input->pAllocator; + IMemAllocator_AddRef(This->input->pAllocator); + return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base) @@ -487,8 +490,8 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { SmartTeeFilterPreview_GetMediaTypeVersion, SmartTeeFilterPreview_GetMediaType }, - SmartTeeFilterPreview_DecideBufferSize, - BaseOutputPinImpl_DecideAllocator, + NULL, + SmartTeeFilterPreview_DecideAllocator, SmartTeeFilterPreview_BreakConnect }; IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) @@ -521,6 +524,10 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) &SmartTeeFilterInputFuncs, &This->filter.csFilter, NULL, (IPin**)&This->input); if (FAILED(hr)) goto end; + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void**)&This->input->pAllocator); + if (FAILED(hr)) + goto end; capturePinInfo.pFilter = &This->filter.IBaseFilter_iface; hr = BaseOutputPin_Construct(&SmartTeeFilterCaptureVtbl, sizeof(BaseOutputPin), &capturePinInfo, diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 1255887..e23e66f 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -41,6 +41,7 @@ typedef struct { DWORD receiveThreadId; IPin IPin_iface; IMemInputPin IMemInputPin_iface; + IMemAllocator *allocator; IBaseFilter *nullRenderer; IPin *nullRendererPin; IMemInputPin *nullRendererMemInputPin; @@ -106,6 +107,8 @@ static ULONG WINAPI SinkFilter_Release(IBaseFilter *iface) SinkFilter *This = impl_from_SinkFilter_IBaseFilter(iface); ULONG ref = InterlockedDecrement(&This->ref); if(!ref) { + if (This->allocator) + IMemAllocator_Release(This->allocator); IMemInputPin_Release(This->nullRendererMemInputPin); IPin_Release(This->nullRendererPin); IBaseFilter_Release(This->nullRenderer); @@ -493,6 +496,7 @@ static ULONG WINAPI SinkMemInputPin_Release(IMemInputPin *iface) static HRESULT WINAPI SinkMemInputPin_GetAllocator(IMemInputPin *iface, IMemAllocator **ppAllocator) { SinkFilter *This = impl_from_SinkFilter_IMemInputPin(iface); + ok(0, "SmartTeeFilter never calls IMemInputPin_GetAllocator()\n"); return IMemInputPin_GetAllocator(This->nullRendererMemInputPin, ppAllocator); } @@ -500,6 +504,9 @@ static HRESULT WINAPI SinkMemInputPin_NotifyAllocator(IMemInputPin *iface, IMemA BOOL bReadOnly) { SinkFilter *This = impl_from_SinkFilter_IMemInputPin(iface); + This->allocator = pAllocator; + IMemAllocator_AddRef(This->allocator); + ok(bReadOnly, "bReadOnly isn't supposed to be FALSE\n"); return IMemInputPin_NotifyAllocator(This->nullRendererMemInputPin, pAllocator, bReadOnly); } @@ -507,6 +514,7 @@ static HRESULT WINAPI SinkMemInputPin_GetAllocatorRequirements(IMemInputPin *ifa ALLOCATOR_PROPERTIES *pProps) { SinkFilter *This = impl_from_SinkFilter_IMemInputPin(iface); + ok(0, "SmartTeeFilter never calls IMemInputPin_GetAllocatorRequirements()\n"); return IMemInputPin_GetAllocatorRequirements(This->nullRendererMemInputPin, pProps); } @@ -727,7 +735,7 @@ static DWORD WINAPI media_thread(LPVOID param) } hr = IMemInputPin_Receive(This->memInputPin, sample); - ok(SUCCEEDED(hr), "delivering sample to SmartTeeFilter's Input pin failed, hr=0x%08x\n", hr); + todo_wine ok(SUCCEEDED(hr), "delivering sample to SmartTeeFilter's Input pin failed, hr=0x%08x\n", hr); IMediaSample_Release(sample); } @@ -1016,7 +1024,7 @@ static HRESULT WINAPI SourcePin_Connect(IPin *iface, IPin *pReceivePin, const AM hr = IPin_QueryInterface(pReceivePin, &IID_IMemInputPin, (void**)&This->memInputPin); if (SUCCEEDED(hr)) { hr = IMemInputPin_GetAllocator(This->memInputPin, &This->allocator); - todo_wine ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); + ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); if (SUCCEEDED(hr)) { ALLOCATOR_PROPERTIES requested, actual; ZeroMemory(&requested, sizeof(ALLOCATOR_PROPERTIES)); @@ -1272,6 +1280,7 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in SourceFilter *sourceFilter = NULL; SinkFilter *captureSinkFilter = NULL; SinkFilter *previewSinkFilter = NULL; + DWORD endTime; hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&graphBuilder); @@ -1322,7 +1331,7 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in goto end; hr = IGraphBuilder_Connect(graphBuilder, &sourceFilter->IPin_iface, inputPin); - todo_wine ok(SUCCEEDED(hr), "couldn't connect source filter to Input pin, hr=0x%08x\n", hr); + ok(SUCCEEDED(hr), "couldn't connect source filter to Input pin, hr=0x%08x\n", hr); if (FAILED(hr)) goto end; hr = IGraphBuilder_Connect(graphBuilder, capturePin, &captureSinkFilter->IPin_iface); @@ -1334,6 +1343,9 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in if (FAILED(hr)) goto end; + ok(sourceFilter->allocator == captureSinkFilter->allocator, "input and capture allocators don't match\n"); + ok(sourceFilter->allocator == previewSinkFilter->allocator, "input and preview allocators don't match\n"); + hr = IGraphBuilder_QueryInterface(graphBuilder, &IID_IMediaControl, (void**)&mediaControl); ok(SUCCEEDED(hr), "couldn't get IMediaControl interface from IGraphBuilder, hr=0x%08x\n", hr); if (FAILED(hr)) @@ -1343,14 +1355,24 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in if (FAILED(hr)) goto end; - while (previewSinkFilter->receiveThreadId == 0 || captureSinkFilter->receiveThreadId == 0) - WaitForSingleObject(event, INFINITE); - ok(sourceFilter->mediaThreadId != captureSinkFilter->receiveThreadId, - "sending thread should != capture receiving thread\n"); - ok(sourceFilter->mediaThreadId != previewSinkFilter->receiveThreadId, - "sending thread should != preview receiving thread\n"); - ok(captureSinkFilter->receiveThreadId != previewSinkFilter->receiveThreadId, - "capture receiving thread should != preview receiving thread"); + endTime = GetTickCount() + 5000; + while (previewSinkFilter->receiveThreadId == 0 || captureSinkFilter->receiveThreadId == 0) { + DWORD now = GetTickCount(); + if (now < endTime) + WaitForSingleObject(event, endTime - now); + else + break; + } + if (previewSinkFilter->receiveThreadId != 0 && captureSinkFilter->receiveThreadId != 0) { + ok(sourceFilter->mediaThreadId != captureSinkFilter->receiveThreadId, + "sending thread should != capture receiving thread\n"); + ok(sourceFilter->mediaThreadId != previewSinkFilter->receiveThreadId, + "sending thread should != preview receiving thread\n"); + ok(captureSinkFilter->receiveThreadId != previewSinkFilter->receiveThreadId, + "capture receiving thread should != preview receiving thread"); + } else { + todo_wine ok(0, "timeout: threads did not receive sample in time\n"); + } IMediaControl_Stop(mediaControl);

1 0

Damjan Jovanovic : qcap: Get the SmartTee filter to a minimally functional level.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 419be23964d4b4048f451acb64e46eb883a35842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419be23964d4b4048f451acb6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:11:44 2015 +0200 qcap: Get the SmartTee filter to a minimally functional level. --- dlls/qcap/smartteefilter.c | 161 +++++++++++++++++++++++++++++++++++++-- dlls/qcap/tests/smartteefilter.c | 16 ++-- 2 files changed, 161 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=419be23964d4b4048f451…

1 0

Damjan Jovanovic : qcap: Add the SmartTee filter automatically as necessary, and test this.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 982be1dea23915b02b05b4c5ebefd59e45754f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=982be1dea23915b02b05b4c5e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:12:05 2015 +0200 qcap: Add the SmartTee filter automatically as necessary, and test this. --- dlls/qcap/capturegraph.c | 147 +++++++++-- dlls/qcap/tests/qcap.c | 160 +----------- dlls/qcap/tests/smartteefilter.c | 508 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 615 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=982be1dea23915b02b05b…

1 0