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

James Hawkins : mscms: Only check the first three characters of the color space name.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: f564ed5f1f7d3a41ee900a5faf70f1878c0c87b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f564ed5f1f7d3a41ee900a5fa… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jun 24 16:26:32 2008 -0500 mscms: Only check the first three characters of the color space name. --- dlls/mscms/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index efcd3b5..7d77baa 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -569,7 +569,7 @@ static void check_registry(BOOL *has_space_rgb) dwNameLen = sizeof(szName); dwDataLen = sizeof(szData); res = RegEnumValueA( hkIcmKey, i, szName, &dwNameLen, NULL, &dwType, (LPBYTE)szData, &dwDataLen ); - if (strcmp(szName, "RGB") == 0) + if (!strncmp(szName, "RGB", 3)) *has_space_rgb = TRUE; if (res != ERROR_SUCCESS) {

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::put_disabled implementation.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 9338979c11c5d85a69134d3f8baad7bc39c030c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9338979c11c5d85a69134d3f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:24:42 2008 -0500 mshtml: Added IHTMLInputElement::put_disabled implementation. --- dlls/mshtml/htmlinput.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 92a1f48..f8a6466 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -226,8 +226,15 @@ static HRESULT WINAPI HTMLInputElement_get_status(IHTMLInputElement *iface, VARI static HRESULT WINAPI HTMLInputElement_put_disabled(IHTMLInputElement *iface, VARIANT_BOOL v) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetDisabled(This->nsinput, v != VARIANT_FALSE); + if(NS_FAILED(nsres)) + ERR("SetDisabled failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 07708b9..3c51ec7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -919,6 +919,17 @@ static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VA ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); } +#define test_input_set_disabled(i,b) _test_input_set_disabled(__LINE__,i,b) +static void _test_input_set_disabled(unsigned line, IHTMLInputElement *input, VARIANT_BOOL b) +{ + HRESULT hres; + + hres = IHTMLInputElement_put_disabled(input, b); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + + _test_input_get_disabled(line, input, b); +} + #define test_input_value(o,t) _test_input_value(__LINE__,o,t) static void _test_input_value(unsigned line, IUnknown *unk, const char *exval) { @@ -2062,6 +2073,8 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_id((IUnknown*)elem, "in"); test_elem_put_id((IUnknown*)elem, "newin"); test_input_get_disabled(input, VARIANT_FALSE); + test_input_set_disabled(input, VARIANT_TRUE); + test_input_set_disabled(input, VARIANT_FALSE); test_elem_client_size((IUnknown*)elem); test_node_get_value_str((IUnknown*)elem, NULL);

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::put_onchange implementation .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: a3a9a317de928700d266cde5dda61a605ebbeeb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a9a317de928700d266cde5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:23:30 2008 -0500 mshtml: Added IHTMLSelectElement::put_onchange implementation. --- dlls/mshtml/htmlevent.c | 4 ++++ dlls/mshtml/htmlselect.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 82ee58b..eb29241 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -35,6 +35,9 @@ struct event_target_t { IDispatch *event_table[EVENTID_LAST]; }; +static const WCHAR changeW[] = {'c','h','a','n','g','e',0}; +static const WCHAR onchangeW[] = {'o','n','c','h','a','n','g','e',0}; + static const WCHAR clickW[] = {'c','l','i','c','k',0}; static const WCHAR onclickW[] = {'o','n','c','l','i','c','k',0}; @@ -53,6 +56,7 @@ typedef struct { #define EVENT_DEFAULTLISTENER 0x0001 static const event_info_t event_info[] = { + {changeW, onchangeW, EVENT_DEFAULTLISTENER}, {clickW, onclickW, EVENT_DEFAULTLISTENER}, {keyupW, onkeyupW, EVENT_DEFAULTLISTENER}, {loadW, onloadW, 0} diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 986e174..9bd2693 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -177,8 +177,10 @@ static HRESULT WINAPI HTMLSelectElement_get_options(IHTMLSelectElement *iface, I static HRESULT WINAPI HTMLSelectElement_put_onchange(IHTMLSelectElement *iface, VARIANT v) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->element.node, EVENTID_CHANGE, &v); } static HRESULT WINAPI HTMLSelectElement_get_onchange(IHTMLSelectElement *iface, VARIANT *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ceacde1..7b2bf9e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -99,6 +99,7 @@ typedef enum { } tid_t; typedef enum { + EVENTID_CHANGE, EVENTID_CLICK, EVENTID_KEYUP, EVENTID_LOAD,

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_title implementation.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: f911e240d0ba98dd26b1f28b547ce818bcdb8b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f911e240d0ba98dd26b1f28b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:23:46 2008 -0500 mshtml: Added IHTMLElement::get_title implementation. --- dlls/mshtml/htmlelem.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/dom.c | 23 ++++++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 91e4b6a..3ab3ac1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -601,8 +601,24 @@ static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString title_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&title_str, NULL); + nsres = nsIDOMHTMLElement_GetTitle(This->nselem, &title_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *title; + + nsAString_GetData(&title_str, &title); + *p = *title ? SysAllocString(title) : NULL; + }else { + ERR("GetTitle failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement_put_language(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f909c4f..e8f8468 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -42,7 +42,7 @@ static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" "<body>text test" "<a href=\"http://test\" name=\"x\">link</a>" - "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" />" + "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" @@ -1090,6 +1090,24 @@ static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) _test_elem_id(line, unk, new_id); } +#define test_elem_title(u,t) _test_elem_title(__LINE__,u,t) +static void _test_elem_title(unsigned line, IUnknown *unk, const char *extitle) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR title; + HRESULT hres; + + hres = IHTMLElement_get_title(elem, &title); + IHTMLElement_Release(elem); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + if(extitle) + ok_(__FILE__,line) (!strcmp_wa(title, extitle), "unexpected title %s\n", dbgstr_w(title)); + else + ok_(__FILE__,line) (!title, "title=%s, expected NULL\n", dbgstr_w(title)); + + SysFreeString(title); +} + #define test_node_get_value_str(u,e) _test_node_get_value_str(__LINE__,u,e) static void _test_node_get_value_str(unsigned line, IUnknown *unk, const char *exval) { @@ -1985,6 +2003,8 @@ static void test_elems(IHTMLDocument2 *doc) test_select_elem(select); + test_elem_title((IUnknown*)select, NULL); + node = get_first_child((IUnknown*)select); ok(node != NULL, "node == NULL\n"); if(node) { @@ -2036,6 +2056,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_class((IUnknown*)elem, "testclass"); test_elem_tabindex((IUnknown*)elem, 2); test_elem_set_tabindex((IUnknown*)elem, 3); + test_elem_title((IUnknown*)elem, "test title"); IHTMLInputElement_Release(input); IHTMLElement_Release(elem);

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_title implementation.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 6314becd8cf34346505974168a0d3d3142535b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6314becd8cf34346505974168… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:24:06 2008 -0500 mshtml: Added IHTMLElement::put_title implementation. --- dlls/mshtml/htmlelem.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3ab3ac1..9be2964 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -594,8 +594,18 @@ static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch ** static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString title_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&title_str, v); + nsres = nsIDOMHTMLElement_SetTitle(This->nselem, &title_str); + nsAString_Finish(&title_str); + if(NS_FAILED(nsres)) + ERR("SetTitle failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e8f8468..07708b9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1108,6 +1108,21 @@ static void _test_elem_title(unsigned line, IUnknown *unk, const char *extitle) SysFreeString(title); } +#define test_elem_set_title(u,t) _test_elem_set_title(__LINE__,u,t) +static void _test_elem_set_title(unsigned line, IUnknown *unk, const char *title) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(title); + hres = IHTMLElement_put_title(elem, tmp); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + + IHTMLElement_Release(elem); + SysFreeString(tmp); +} + #define test_node_get_value_str(u,e) _test_node_get_value_str(__LINE__,u,e) static void _test_node_get_value_str(unsigned line, IUnknown *unk, const char *exval) { @@ -2004,6 +2019,8 @@ static void test_elems(IHTMLDocument2 *doc) test_select_elem(select); test_elem_title((IUnknown*)select, NULL); + test_elem_set_title((IUnknown*)select, "Title"); + test_elem_title((IUnknown*)select, "Title"); node = get_first_child((IUnknown*)select); ok(node != NULL, "node == NULL\n");

1 0

Jacek Caban : mshtml: Return NULL instead of empty string in IHTMLSelectElement::get_value.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: da8560bbf70cfba80c75eef8b8575c9e1cdb9496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8560bbf70cfba80c75eef8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:23:12 2008 -0500 mshtml: Return NULL instead of empty string in IHTMLSelectElement::get_value. --- dlls/mshtml/htmlselect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 433945d..986e174 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -256,7 +256,7 @@ static HRESULT WINAPI HTMLSelectElement_get_value(IHTMLSelectElement *iface, BST nsres = nsIDOMHTMLSelectElement_GetValue(This->nsselect, &value_str); if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&value_str, &value); - *p = SysAllocString(value); + *p = *value ? SysAllocString(value) : NULL; }else { ERR("GetValue failed: %08x\n", nsres); }

1 0

Maarten Lankhorst : quartz: Make the memory allocator emit more warnings and fix race condition.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 8bedda7e1f3a9c8300b40d1473a4b43f577f527e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bedda7e1f3a9c8300b40d147… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jun 23 12:08:10 2008 -0700 quartz: Make the memory allocator emit more warnings and fix race condition. --- dlls/quartz/memallocator.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 7969193..2ee8d71 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -289,7 +289,10 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa EnterCriticalSection(This->pCritSect); if (!This->bCommitted || This->bDecommitQueued) + { + WARN("Not committed\n"); hr = VFW_E_NOT_COMMITTED; + } else ++This->lWaiting; LeaveCriticalSection(This->pCritSect); @@ -298,7 +301,10 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa if (WaitForSingleObject(This->hSemWaiting, (dwFlags & AM_GBF_NOWAIT) ? 0 : INFINITE) != WAIT_OBJECT_0) { - InterlockedDecrement(&This->lWaiting); + EnterCriticalSection(This->pCritSect); + --This->lWaiting; + LeaveCriticalSection(This->pCritSect); + WARN("Timed out\n"); return VFW_E_TIMEOUT; } @@ -324,6 +330,8 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa } LeaveCriticalSection(This->pCritSect); + if (hr != S_OK) + WARN("%08x\n", hr); return hr; } @@ -614,7 +622,10 @@ static HRESULT WINAPI StdMediaSample2_SetActualDataLength(IMediaSample2 * iface, TRACE("(%d)\n", len); if ((len > This->props.cbBuffer) || (len < 0)) + { + WARN("Tried to set length to %d, while max is %d\n", len, This->props.cbBuffer); return VFW_E_BUFFER_OVERFLOW; + } else { This->props.lActual = len;

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::put_value implementation.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: c2759cb80d8fc046a9b11d9a4b458758b06db73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2759cb80d8fc046a9b11d9a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:22:54 2008 -0500 mshtml: Added IHTMLSelectElement::put_value implementation. --- dlls/mshtml/htmlselect.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 1783bab..433945d 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -228,8 +228,18 @@ static HRESULT WINAPI HTMLSelectElement_get_type(IHTMLSelectElement *iface, BSTR static HRESULT WINAPI HTMLSelectElement_put_value(IHTMLSelectElement *iface, BSTR v) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString value_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&value_str, v); + nsres = nsIDOMHTMLSelectElement_SetValue(This->nsselect, &value_str); + nsAString_Finish(&value_str); + if(NS_FAILED(nsres)) + ERR("SetValue failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_value(IHTMLSelectElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9ee1f07..f909c4f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -43,7 +43,7 @@ static const char elem_test_str[] = "<body>text test" "<a href=\"http://test\" name=\"x\">link</a>" "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" />" - "<select id=\"s\"><option id=\"x\">opt1</option><option id=\"y\">opt2</option></select>" + "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" "<script id=\"sc\" type=\"text/javascript\"></script>" @@ -630,6 +630,32 @@ static void _test_select_put_selidx(unsigned line, IHTMLSelectElement *select, l _test_select_selidx(line, select, index); } +#define test_select_value(s,v) _test_select_value(__LINE__,s,v) +static void _test_select_value(unsigned line, IHTMLSelectElement *select, const char *exval) +{ + BSTR val; + HRESULT hres; + + hres = IHTMLSelectElement_get_value(select, &val); + ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line) (!strcmp_wa(val, exval), "unexpected value %s\n", dbgstr_w(val)); + else + ok_(__FILE__,line) (val == NULL, "val=%s, expected NULL\n", dbgstr_w(val)); +} + +#define test_select_set_value(s,v) _test_select_set_value(__LINE__,s,v) +static void _test_select_set_value(unsigned line, IHTMLSelectElement *select, const char *val) +{ + BSTR bstr; + HRESULT hres; + + bstr = a2bstr(val); + hres = IHTMLSelectElement_put_value(select, bstr); + SysFreeString(bstr); + ok_(__FILE__,line) (hres == S_OK, "put_value failed: %08x\n", hres); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -1301,6 +1327,9 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_length(select, 2); test_select_selidx(select, 0); test_select_put_selidx(select, 1); + + test_select_set_value(select, "val1"); + test_select_value(select, "val1"); } static void test_create_option_elem(IHTMLDocument2 *doc)

1 0

Maarten Lankhorst : quartz: Create thread after connection is made.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 6aabf5d39e1a5bd13d95a9ad7a9b318f775c95fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aabf5d39e1a5bd13d95a9ad7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 24 08:52:52 2008 -0700 quartz: Create thread after connection is made. --- dlls/quartz/parser.c | 33 +++--------- dlls/quartz/pin.c | 127 +++++++++++----------------------------------- dlls/quartz/pin.h | 3 +- dlls/quartz/waveparser.c | 2 +- 4 files changed, 38 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6aabf5d39e1a5bd13d95a…

1 0

Maarten Lankhorst : quartz: Handle case where ReceiveConnection is called on an already connected pin.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: cdb66444edc807c50db247d020fe568d728e45c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb66444edc807c50db247d02… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jun 22 00:57:47 2008 -0700 quartz: Handle case where ReceiveConnection is called on an already connected pin. --- dlls/quartz/pin.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 766dad9..edf321d 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1287,6 +1287,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const dump_AM_MEDIA_TYPE(pmt); EnterCriticalSection(This->pin.pCritSec); + if (!This->pin.pConnectedTo) { ALLOCATOR_PROPERTIES props; @@ -1295,9 +1296,6 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const props.cbAlign = 1; props.cbPrefix = 0; - if (This->pin.pConnectedTo) - hr = VFW_E_ALREADY_CONNECTED; - if (SUCCEEDED(hr) && (This->pin.fnQueryAccept(This->pin.pUserData, pmt) != S_OK)) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */ @@ -1349,6 +1347,8 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const This->pAlloc = NULL; } } + else + hr = VFW_E_ALREADY_CONNECTED; LeaveCriticalSection(This->pin.pCritSec); return hr; }

1 0